[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()

[deliverable/linux.git] / drivers / net / wireless / libertas / main.c

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 6304bd97d39971cc346060e3f8fae61949a1a50f..5ead08312e1e48b4443ec9cd3fe830dc1288afdd 100644 (file)
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -123,28 +123,28 @@ struct region_cfp_table {
 static struct region_cfp_table region_cfp_table[] = {
        {0x10,                  /*US FCC */
         channel_freq_power_US_BG,
-        sizeof(channel_freq_power_US_BG) / sizeof(struct chan_freq_power),
+        ARRAY_SIZE(channel_freq_power_US_BG),
         }
        ,
        {0x20,                  /*CANADA IC */
         channel_freq_power_US_BG,
-        sizeof(channel_freq_power_US_BG) / sizeof(struct chan_freq_power),
+        ARRAY_SIZE(channel_freq_power_US_BG),
         }
        ,
        {0x30, /*EU*/ channel_freq_power_EU_BG,
-        sizeof(channel_freq_power_EU_BG) / sizeof(struct chan_freq_power),
+        ARRAY_SIZE(channel_freq_power_EU_BG),
         }
        ,
        {0x31, /*SPAIN*/ channel_freq_power_SPN_BG,
-        sizeof(channel_freq_power_SPN_BG) / sizeof(struct chan_freq_power),
+        ARRAY_SIZE(channel_freq_power_SPN_BG),
         }
        ,
        {0x32, /*FRANCE*/ channel_freq_power_FR_BG,
-        sizeof(channel_freq_power_FR_BG) / sizeof(struct chan_freq_power),
+        ARRAY_SIZE(channel_freq_power_FR_BG),
         }
        ,
        {0x40, /*JAPAN*/ channel_freq_power_JPN_BG,
-        sizeof(channel_freq_power_JPN_BG) / sizeof(struct chan_freq_power),
+        ARRAY_SIZE(channel_freq_power_JPN_BG),
         }
        ,
 /*Add new region here */
@@ -256,7 +256,7 @@ void libertas_remove_rtap(wlan_private *priv);
 static ssize_t libertas_rtap_get(struct device * dev,
                struct device_attribute *attr, char * buf)
 {
-       wlan_private *priv = (wlan_private *) dev->driver_data;
+       wlan_private *priv = (wlan_private *) (to_net_dev(dev))->priv;
        wlan_adapter *adapter = priv->adapter;
        return snprintf(buf, 5, "0x%X\n", adapter->monitormode);
 }
@@ -268,7 +268,7 @@ static ssize_t libertas_rtap_set(struct device * dev,
                struct device_attribute *attr, const char * buf, size_t count)
 {
        int monitor_mode;
-       wlan_private *priv = (wlan_private *) dev->driver_data;
+       wlan_private *priv = (wlan_private *) (to_net_dev(dev))->priv;
        wlan_adapter *adapter = priv->adapter;
 
        sscanf(buf, "%x", &monitor_mode);
@@ -677,6 +677,7 @@ static void libertas_set_multicast_list(struct net_device *dev)
        wlan_private *priv = dev->priv;
        wlan_adapter *adapter = priv->adapter;
        int oldpacketfilter;
+       DECLARE_MAC_BUF(mac);
 
        lbs_deb_enter(LBS_DEB_NET);
 
@@ -723,14 +724,9 @@ static void libertas_set_multicast_list(struct net_device *dev)
                                       dev->mc_count);
 
                                for (i = 0; i < dev->mc_count; i++) {
-                                       lbs_deb_net("Multicast address %d:"
-                                              MAC_FMT "\n", i,
-                                              adapter->multicastlist[i][0],
-                                              adapter->multicastlist[i][1],
-                                              adapter->multicastlist[i][2],
-                                              adapter->multicastlist[i][3],
-                                              adapter->multicastlist[i][4],
-                                              adapter->multicastlist[i][5]);
+                                       lbs_deb_net("Multicast address %d:%s\n",
+                                              i, print_mac(mac,
+                                              adapter->multicastlist[i]));
                                }
                                /* send multicast addresses to firmware */
                                libertas_prepare_and_send_command(priv,
@@ -1138,7 +1134,7 @@ wlan_private *libertas_add_card(void *card, struct device *dmdev)
                lbs_pr_err("init ethX device failed\n");
                goto done;
        }
-       dmdev->driver_data = priv = dev->priv;
+       priv = dev->priv;
 
        /* allocate buffer for wlan_adapter */
        if (!(priv->adapter = kzalloc(sizeof(wlan_adapter), GFP_KERNEL))) {
@@ -1157,8 +1153,6 @@ wlan_private *libertas_add_card(void *card, struct device *dmdev)
        priv->infra_open = 0;
        priv->hotplug_device = dmdev;
 
-       SET_MODULE_OWNER(dev);
-
        /* Setup the OS Interface to our functions */
        dev->open = libertas_open;
        dev->hard_start_xmit = libertas_pre_start_xmit;
@@ -1340,8 +1334,6 @@ int libertas_add_mesh(wlan_private *priv, struct device *dev)
        mesh_dev->priv = priv;
        priv->mesh_dev = mesh_dev;
 
-       SET_MODULE_OWNER(mesh_dev);
-
        mesh_dev->open = libertas_mesh_open;
        mesh_dev->hard_start_xmit = libertas_mesh_pre_start_xmit;
        mesh_dev->stop = libertas_mesh_close;
@@ -1426,7 +1418,7 @@ struct chan_freq_power *libertas_get_region_cfp_table(u8 region, u8 band, int *c
 
        lbs_deb_enter(LBS_DEB_MAIN);
 
-       end = sizeof(region_cfp_table)/sizeof(struct region_cfp_table);
+       end = ARRAY_SIZE(region_cfp_table);
 
        for (i = 0; i < end ; i++) {
                lbs_deb_main("region_cfp_table[i].region=%d\n",