1 files changed, 9 insertions, 21 deletions

diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index b80f514877d8..ab61d2b558d6 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -18,6 +18,7 @@
 #include <linux/init.h>
 #include <linux/if.h>
 #include <linux/skbuff.h>
+#include <linux/slab.h>
 #include <linux/etherdevice.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
@@ -39,7 +40,7 @@ static unsigned int rx_ring_size __read_mostly = 16;
 module_param(tx_ring_size, uint, 0);
 module_param(rx_ring_size, uint, 0);
 
-static struct pci_device_id adm8211_pci_id_table[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(adm8211_pci_id_table) = {
         /* ADMtek ADM8211 */
         { PCI_DEVICE(0x10B7, 0x6000) }, /* 3Com 3CRSHPW796 */
         { PCI_DEVICE(0x1200, 0x8201) }, /* ? */
@@ -302,18 +303,6 @@ static int adm8211_get_stats(struct ieee80211_hw *dev,
         return 0;
 }
 
-static int adm8211_get_tx_stats(struct ieee80211_hw *dev,
-                                struct ieee80211_tx_queue_stats *stats)
-{
-        struct adm8211_priv *priv = dev->priv;
-
-        stats[0].len = priv->cur_tx - priv->dirty_tx;
-        stats[0].limit = priv->tx_ring_size - 2;
-        stats[0].count = priv->dirty_tx;
-
-        return 0;
-}
-
 static void adm8211_interrupt_tci(struct ieee80211_hw *dev)
 {
         struct adm8211_priv *priv = dev->priv;
@@ -1400,15 +1389,15 @@ static void adm8211_configure_filter(struct ieee80211_hw *dev,
 }
 
 static int adm8211_add_interface(struct ieee80211_hw *dev,
-                                 struct ieee80211_if_init_conf *conf)
+                                 struct ieee80211_vif *vif)
 {
         struct adm8211_priv *priv = dev->priv;
         if (priv->mode != NL80211_IFTYPE_MONITOR)
                 return -EOPNOTSUPP;
 
-        switch (conf->type) {
+        switch (vif->type) {
         case NL80211_IFTYPE_STATION:
-                priv->mode = conf->type;
+                priv->mode = vif->type;
                 break;
         default:
                 return -EOPNOTSUPP;
@@ -1416,8 +1405,8 @@ static int adm8211_add_interface(struct ieee80211_hw *dev,
 
         ADM8211_IDLE();
 
-        ADM8211_CSR_WRITE(PAR0, le32_to_cpu(*(__le32 *)conf->mac_addr));
-        ADM8211_CSR_WRITE(PAR1, le16_to_cpu(*(__le16 *)(conf->mac_addr + 4)));
+        ADM8211_CSR_WRITE(PAR0, le32_to_cpu(*(__le32 *)vif->addr));
+        ADM8211_CSR_WRITE(PAR1, le16_to_cpu(*(__le16 *)(vif->addr + 4)));
 
         adm8211_update_mode(dev);
 
@@ -1427,7 +1416,7 @@ static int adm8211_add_interface(struct ieee80211_hw *dev,
 }
 
 static void adm8211_remove_interface(struct ieee80211_hw *dev,
-                                     struct ieee80211_if_init_conf *conf)
+                                     struct ieee80211_vif *vif)
 {
         struct adm8211_priv *priv = dev->priv;
         priv->mode = NL80211_IFTYPE_MONITOR;
@@ -1538,7 +1527,7 @@ static int adm8211_start(struct ieee80211_hw *dev)
         adm8211_hw_init(dev);
         adm8211_rf_set_channel(dev, priv->channel);
 
-        retval = request_irq(priv->pdev->irq, &adm8211_interrupt,
+        retval = request_irq(priv->pdev->irq, adm8211_interrupt,
                              IRQF_SHARED, "adm8211", dev);
         if (retval) {
                 printk(KERN_ERR "%s: failed to register IRQ handler\n",
@@ -1773,7 +1762,6 @@ static const struct ieee80211_ops adm8211_ops = {
         .prepare_multicast      = adm8211_prepare_multicast,
         .configure_filter       = adm8211_configure_filter,
         .get_stats              = adm8211_get_stats,
-        .get_tx_stats           = adm8211_get_tx_stats,
         .get_tsf                = adm8211_get_tsft
 };