1027 files changed, 43722 insertions, 56429 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 3263b68cdfa3..3188da3df8da 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -250,6 +250,10 @@ static int __acpi_bus_set_power(struct acpi_device *device, int state)
                 return -ENODEV;
         }
 
+        /* For D3cold we should execute _PS3, not _PS4. */
+        if (state == ACPI_STATE_D3_COLD)
+                object_name[3] = '3';
+
         /*
          * Transition Power
          * ----------------
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 7049a7d27c4f..0500f719f63e 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -631,7 +631,7 @@ int acpi_power_get_inferred_state(struct acpi_device *device, int *state)
          * We know a device's inferred power state when all the resources
          * required for a given D-state are 'on'.
          */
-        for (i = ACPI_STATE_D0; i < ACPI_STATE_D3; i++) {
+        for (i = ACPI_STATE_D0; i < ACPI_STATE_D3_HOT; i++) {
                 list = &device->power.states[i].resources;
                 if (list->count < 1)
                         continue;
@@ -660,7 +660,7 @@ int acpi_power_on_resources(struct acpi_device *device, int state)
 
 int acpi_power_transition(struct acpi_device *device, int state)
 {
-        int result;
+        int result = 0;
 
         if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3_COLD))
                 return -EINVAL;
@@ -679,8 +679,11 @@ int acpi_power_transition(struct acpi_device *device, int state)
          * (e.g. so the device doesn't lose power while transitioning).  Then,
          * we dereference all power resources used in the current list.
          */
-        result = acpi_power_on_list(&device->power.states[state].resources);
-        if (!result)
+        if (state < ACPI_STATE_D3_COLD)
+                result = acpi_power_on_list(
+                        &device->power.states[state].resources);
+
+        if (!result && device->power.state < ACPI_STATE_D3_COLD)
                 acpi_power_off_list(
                         &device->power.states[device->power.state].resources);
 
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 767e2dcb9616..85cbfdccc97c 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -869,7 +869,7 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
         /*
          * Enumerate supported power management states
          */
-        for (i = ACPI_STATE_D0; i <= ACPI_STATE_D3; i++) {
+        for (i = ACPI_STATE_D0; i <= ACPI_STATE_D3_HOT; i++) {
                 struct acpi_device_power_state *ps = &device->power.states[i];
                 char object_name[5] = { '_', 'P', 'R', '0' + i, '\0' };
 
@@ -884,21 +884,18 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
                                 acpi_bus_add_power_resource(ps->resources.handles[j]);
                 }
 
-                /* The exist of _PR3 indicates D3Cold support */
-                if (i == ACPI_STATE_D3) {
-                        status = acpi_get_handle(device->handle, object_name, &handle);
-                        if (ACPI_SUCCESS(status))
-                                device->power.states[ACPI_STATE_D3_COLD].flags.valid = 1;
-                }
-
                 /* Evaluate "_PSx" to see if we can do explicit sets */
                 object_name[2] = 'S';
                 status = acpi_get_handle(device->handle, object_name, &handle);
                 if (ACPI_SUCCESS(status))
                         ps->flags.explicit_set = 1;
 
-                /* State is valid if we have some power control */
-                if (ps->resources.count || ps->flags.explicit_set)
+                /*
+                 * State is valid if there are means to put the device into it.
+                 * D3hot is only valid if _PR3 present.
+                 */
+                if (ps->resources.count ||
+                    (ps->flags.explicit_set && i < ACPI_STATE_D3_HOT))
                         ps->flags.valid = 1;
 
                 ps->power = -1; /* Unknown - driver assigned */
@@ -911,6 +908,10 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
         device->power.states[ACPI_STATE_D3].flags.valid = 1;
         device->power.states[ACPI_STATE_D3].power = 0;
 
+        /* Set D3cold's explicit_set flag if _PS3 exists. */
+        if (device->power.states[ACPI_STATE_D3_HOT].flags.explicit_set)
+                device->power.states[ACPI_STATE_D3_COLD].flags.explicit_set = 1;
+
         acpi_bus_init_power(device);
 
         return 0;
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 1d661b5c3287..eb6fd233764b 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -28,23 +28,33 @@
 #include "internal.h"
 #include "sleep.h"
 
+u8 wake_sleep_flags = ACPI_NO_OPTIONAL_METHODS;
 static unsigned int gts, bfs;
-module_param(gts, uint, 0644);
-module_param(bfs, uint, 0644);
-MODULE_PARM_DESC(gts, "Enable evaluation of _GTS on suspend.");
-MODULE_PARM_DESC(bfs, "Enable evaluation of _BFS on resume".);
-
-static u8 wake_sleep_flags(void)
+static int set_param_wake_flag(const char *val, struct kernel_param *kp)
 {
-        u8 flags = ACPI_NO_OPTIONAL_METHODS;
+        int ret = param_set_int(val, kp);
 
-        if (gts)
-                flags |= ACPI_EXECUTE_GTS;
-        if (bfs)
-                flags |= ACPI_EXECUTE_BFS;
+        if (ret)
+                return ret;
 
-        return flags;
+        if (kp->arg == (const char *)&gts) {
+                if (gts)
+                        wake_sleep_flags |= ACPI_EXECUTE_GTS;
+                else
+                        wake_sleep_flags &= ~ACPI_EXECUTE_GTS;
+        }
+        if (kp->arg == (const char *)&bfs) {
+                if (bfs)
+                        wake_sleep_flags |= ACPI_EXECUTE_BFS;
+                else
+                        wake_sleep_flags &= ~ACPI_EXECUTE_BFS;
+        }
+        return ret;
 }
+module_param_call(gts, set_param_wake_flag, param_get_int, &gts, 0644);
+module_param_call(bfs, set_param_wake_flag, param_get_int, &bfs, 0644);
+MODULE_PARM_DESC(gts, "Enable evaluation of _GTS on suspend.");
+MODULE_PARM_DESC(bfs, "Enable evaluation of _BFS on resume".);
 
 static u8 sleep_states[ACPI_S_STATE_COUNT];
 
@@ -263,7 +273,6 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
 {
         acpi_status status = AE_OK;
         u32 acpi_state = acpi_target_sleep_state;
-        u8 flags = wake_sleep_flags();
         int error;
 
         ACPI_FLUSH_CPU_CACHE();
@@ -271,7 +280,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
         switch (acpi_state) {
         case ACPI_STATE_S1:
                 barrier();
-                status = acpi_enter_sleep_state(acpi_state, flags);
+                status = acpi_enter_sleep_state(acpi_state, wake_sleep_flags);
                 break;
 
         case ACPI_STATE_S3:
@@ -286,7 +295,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
         acpi_write_bit_register(ACPI_BITREG_SCI_ENABLE, 1);
 
         /* Reprogram control registers and execute _BFS */
-        acpi_leave_sleep_state_prep(acpi_state, flags);
+        acpi_leave_sleep_state_prep(acpi_state, wake_sleep_flags);
 
         /* ACPI 3.0 specs (P62) says that it's the responsibility
          * of the OSPM to clear the status bit [ implying that the
@@ -550,30 +559,27 @@ static int acpi_hibernation_begin(void)
 
 static int acpi_hibernation_enter(void)
 {
-        u8 flags = wake_sleep_flags();
         acpi_status status = AE_OK;
 
         ACPI_FLUSH_CPU_CACHE();
 
         /* This shouldn't return.  If it returns, we have a problem */
-        status = acpi_enter_sleep_state(ACPI_STATE_S4, flags);
+        status = acpi_enter_sleep_state(ACPI_STATE_S4, wake_sleep_flags);
         /* Reprogram control registers and execute _BFS */
-        acpi_leave_sleep_state_prep(ACPI_STATE_S4, flags);
+        acpi_leave_sleep_state_prep(ACPI_STATE_S4, wake_sleep_flags);
 
         return ACPI_SUCCESS(status) ? 0 : -EFAULT;
 }
 
 static void acpi_hibernation_leave(void)
 {
-        u8 flags = wake_sleep_flags();
-
         /*
          * If ACPI is not enabled by the BIOS and the boot kernel, we need to
          * enable it here.
          */
         acpi_enable();
         /* Reprogram control registers and execute _BFS */
-        acpi_leave_sleep_state_prep(ACPI_STATE_S4, flags);
+        acpi_leave_sleep_state_prep(ACPI_STATE_S4, wake_sleep_flags);
         /* Check the hardware signature */
         if (facs && s4_hardware_signature != facs->hardware_signature) {
                 printk(KERN_EMERG "ACPI: Hardware changed while hibernated, "
@@ -828,12 +834,10 @@ static void acpi_power_off_prepare(void)
 
 static void acpi_power_off(void)
 {
-        u8 flags = wake_sleep_flags();
-
         /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
         printk(KERN_DEBUG "%s called\n", __func__);
         local_irq_disable();
-        acpi_enter_sleep_state(ACPI_STATE_S5, flags);
+        acpi_enter_sleep_state(ACPI_STATE_S5, wake_sleep_flags);
 }
 
 /*
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index cc273226dbd0..b7e728517284 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -527,9 +527,9 @@ int amba_device_add(struct amba_device *dev, struct resource *parent)
         if (ret)
                 goto err_release;
 
-        if (dev->irq[0] && dev->irq[0] != NO_IRQ)
+        if (dev->irq[0])
                 ret = device_create_file(&dev->dev, &dev_attr_irq0);
-        if (ret == 0 && dev->irq[1] && dev->irq[1] != NO_IRQ)
+        if (ret == 0 && dev->irq[1])
                 ret = device_create_file(&dev->dev, &dev_attr_irq1);
         if (ret == 0)
                 return ret;
@@ -543,6 +543,55 @@ int amba_device_add(struct amba_device *dev, struct resource *parent)
 }
 EXPORT_SYMBOL_GPL(amba_device_add);
 
+static struct amba_device *
+amba_aphb_device_add(struct device *parent, const char *name,
+                     resource_size_t base, size_t size, int irq1, int irq2,
+                     void *pdata, unsigned int periphid, u64 dma_mask)
+{
+        struct amba_device *dev;
+        int ret;
+
+        dev = amba_device_alloc(name, base, size);
+        if (!dev)
+                return ERR_PTR(-ENOMEM);
+
+        dev->dma_mask = dma_mask;
+        dev->dev.coherent_dma_mask = dma_mask;
+        dev->irq[0] = irq1;
+        dev->irq[1] = irq2;
+        dev->periphid = periphid;
+        dev->dev.platform_data = pdata;
+        dev->dev.parent = parent;
+
+        ret = amba_device_add(dev, &iomem_resource);
+        if (ret) {
+                amba_device_put(dev);
+                return ERR_PTR(ret);
+        }
+
+        return dev;
+}
+
+struct amba_device *
+amba_apb_device_add(struct device *parent, const char *name,
+                    resource_size_t base, size_t size, int irq1, int irq2,
+                    void *pdata, unsigned int periphid)
+{
+        return amba_aphb_device_add(parent, name, base, size, irq1, irq2, pdata,
+                                    periphid, 0);
+}
+EXPORT_SYMBOL_GPL(amba_apb_device_add);
+
+struct amba_device *
+amba_ahb_device_add(struct device *parent, const char *name,
+                    resource_size_t base, size_t size, int irq1, int irq2,
+                    void *pdata, unsigned int periphid)
+{
+        return amba_aphb_device_add(parent, name, base, size, irq1, irq2, pdata,
+                                    periphid, ~0ULL);
+}
+EXPORT_SYMBOL_GPL(amba_ahb_device_add);
+
 static void amba_device_initialize(struct amba_device *dev, const char *name)
 {
         device_initialize(&dev->dev);
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 79a1e9dd56d9..ebaf67e4b2bc 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -394,6 +394,8 @@ static const struct pci_device_id ahci_pci_tbl[] = {
           .driver_data = board_ahci_yes_fbs },                  /* 88se9128 */
         { PCI_DEVICE(0x1b4b, 0x9125),
           .driver_data = board_ahci_yes_fbs },                  /* 88se9125 */
+        { PCI_DEVICE(0x1b4b, 0x917a),
+          .driver_data = board_ahci_yes_fbs },                  /* 88se9172 */
         { PCI_DEVICE(0x1b4b, 0x91a3),
           .driver_data = board_ahci_yes_fbs },
 
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index 0c86c77764bc..9e419e1c2006 100644
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -280,6 +280,7 @@ static struct dev_pm_ops ahci_pm_ops = {
 
 static const struct of_device_id ahci_of_match[] = {
         { .compatible = "calxeda,hb-ahci", },
+        { .compatible = "snps,spear-ahci", },
         {},
 };
 MODULE_DEVICE_TABLE(of, ahci_of_match);
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 28db50b57b91..23763a1ec570 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -95,7 +95,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
 static void ata_dev_xfermask(struct ata_device *dev);
 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
 
-atomic_t ata_print_id = ATOMIC_INIT(1);
+atomic_t ata_print_id = ATOMIC_INIT(0);
 
 struct ata_force_param {
         const char      *name;
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index c61316e9d2f7..d1fbd59ead16 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -3501,7 +3501,8 @@ static int ata_count_probe_trials_cb(struct ata_ering_entry *ent, void *void_arg
         u64 now = get_jiffies_64();
         int *trials = void_arg;
 
-        if (ent->timestamp < now - min(now, interval))
+        if ((ent->eflags & ATA_EFLAG_OLD_ER) ||
+            (ent->timestamp < now - min(now, interval)))
                 return -1;
 
         (*trials)++;
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 93dabdcd2cbe..22226350cd0c 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3399,7 +3399,8 @@ int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht)
                  */
                 shost->max_host_blocked = 1;
 
-                rc = scsi_add_host(ap->scsi_host, &ap->tdev);
+                rc = scsi_add_host_with_dma(ap->scsi_host,
+                                                &ap->tdev, ap->host->dev);
                 if (rc)
                         goto err_add;
         }
@@ -3838,18 +3839,25 @@ void ata_sas_port_stop(struct ata_port *ap)
 }
 EXPORT_SYMBOL_GPL(ata_sas_port_stop);
 
-int ata_sas_async_port_init(struct ata_port *ap)
+/**
+ * ata_sas_async_probe - simply schedule probing and return
+ * @ap: Port to probe
+ *
+ * For batch scheduling of probe for sas attached ata devices, assumes
+ * the port has already been through ata_sas_port_init()
+ */
+void ata_sas_async_probe(struct ata_port *ap)
 {
-        int rc = ap->ops->port_start(ap);
-
-        if (!rc) {
-                ap->print_id = atomic_inc_return(&ata_print_id);
-                __ata_port_probe(ap);
-        }
+        __ata_port_probe(ap);
+}
+EXPORT_SYMBOL_GPL(ata_sas_async_probe);
 
-        return rc;
+int ata_sas_sync_probe(struct ata_port *ap)
+{
+        return ata_port_probe(ap);
 }
-EXPORT_SYMBOL_GPL(ata_sas_async_port_init);
+EXPORT_SYMBOL_GPL(ata_sas_sync_probe);
+
 
 /**
  *      ata_sas_port_init - Initialize a SATA device
@@ -3866,12 +3874,10 @@ int ata_sas_port_init(struct ata_port *ap)
 {
         int rc = ap->ops->port_start(ap);
 
-        if (!rc) {
-                ap->print_id = atomic_inc_return(&ata_print_id);
-                rc = ata_port_probe(ap);
-        }
-
-        return rc;
+        if (rc)
+                return rc;
+        ap->print_id = atomic_inc_return(&ata_print_id);
+        return 0;
 }
 EXPORT_SYMBOL_GPL(ata_sas_port_init);
 
diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
index fc2db2a89a6b..3239517f4d90 100644
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
@@ -943,9 +943,9 @@ static int arasan_cf_resume(struct device *dev)
 
         return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(arasan_cf_pm_ops, arasan_cf_suspend, arasan_cf_resume);
-#endif
 
 static struct platform_driver arasan_cf_driver = {
         .probe          = arasan_cf_probe,
@@ -953,9 +953,7 @@ static struct platform_driver arasan_cf_driver = {
         .driver         = {
                 .name   = DRIVER_NAME,
                 .owner  = THIS_MODULE,
-#ifdef CONFIG_PM
                 .pm     = &arasan_cf_pm_ops,
-#endif
         },
 };
 
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index f8f41e0e8a8c..89b30f32ba68 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -802,7 +802,7 @@ static void fill_rx_pool (amb_dev * dev, unsigned char pool,
     }
     // cast needed as there is no %? for pointer differences
     PRINTD (DBG_SKB, "allocated skb at %p, head %p, area %li",
-            skb, skb->head, (long) (skb_end_pointer(skb) - skb->head));
+            skb, skb->head, (long) skb_end_offset(skb));
     rx.handle = virt_to_bus (skb);
     rx.host_address = cpu_to_be32 (virt_to_bus (skb->data));
     if (rx_give (dev, &rx, pool))
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index 75fd691cd43e..7d01c2a75256 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -2182,7 +2182,6 @@ static int hrz_open (struct atm_vcc *atm_vcc)
     default:
       PRINTD (DBG_QOS|DBG_VCC, "Bad AAL!");
       return -EINVAL;
-      break;
   }
   
   // TX traffic parameters
@@ -2357,7 +2356,6 @@ static int hrz_open (struct atm_vcc *atm_vcc)
       default: {
         PRINTD (DBG_QOS, "unsupported TX traffic class");
         return -EINVAL;
-        break;
       }
     }
   }
@@ -2433,7 +2431,6 @@ static int hrz_open (struct atm_vcc *atm_vcc)
       default: {
         PRINTD (DBG_QOS, "unsupported RX traffic class");
         return -EINVAL;
-        break;
       }
     }
   }
@@ -2581,7 +2578,6 @@ static int hrz_getsockopt (struct atm_vcc * atm_vcc, int level, int optname,
 //        break;
         default:
           return -ENOPROTOOPT;
-          break;
       };
       break;
   }
@@ -2601,7 +2597,6 @@ static int hrz_setsockopt (struct atm_vcc * atm_vcc, int level, int optname,
 //        break;
         default:
           return -ENOPROTOOPT;
-          break;
       };
       break;
   }
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index 1c052127548c..8974bd2b961e 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -1258,7 +1258,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
         tail = readl(SAR_REG_RAWCT);
 
         pci_dma_sync_single_for_cpu(card->pcidev, IDT77252_PRV_PADDR(queue),
-                                    skb_end_pointer(queue) - queue->head - 16,
+                                    skb_end_offset(queue) - 16,
                                     PCI_DMA_FROMDEVICE);
 
         while (head != tail) {
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 7a3f535e481c..bb80853ff27a 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -775,9 +775,11 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val,
                         map->format.parse_val(val + i);
         } else {
                 for (i = 0; i < val_count; i++) {
-                        ret = regmap_read(map, reg + i, val + (i * val_bytes));
+                        unsigned int ival;
+                        ret = regmap_read(map, reg + i, &ival);
                         if (ret != 0)
                                 return ret;
+                        memcpy(val + (i * val_bytes), &ival, val_bytes);
                 }
         }
 
diff --git a/drivers/bcma/sprom.c b/drivers/bcma/sprom.c
index cdcf75c0954f..3e2a6002aae6 100644
--- a/drivers/bcma/sprom.c
+++ b/drivers/bcma/sprom.c
@@ -404,16 +404,19 @@ int bcma_sprom_get(struct bcma_bus *bus)
                 return -EOPNOTSUPP;
 
         if (!bcma_sprom_ext_available(bus)) {
+                bool sprom_onchip;
+
                 /*
                  * External SPROM takes precedence so check
                  * on-chip OTP only when no external SPROM
                  * is present.
                  */
-                if (bcma_sprom_onchip_available(bus)) {
+                sprom_onchip = bcma_sprom_onchip_available(bus);
+                if (sprom_onchip) {
                         /* determine offset */
                         offset = bcma_sprom_onchip_offset(bus);
                 }
-                if (!offset) {
+                if (!offset || !sprom_onchip) {
                         /*
                          * Maybe there is no SPROM on the device?
                          * Now we ask the arch code if there is some sprom
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 8db9089127c5..9a13e889837e 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -6580,24 +6580,21 @@ static const struct file_operations dac960_user_command_proc_fops = {
 
 static void DAC960_CreateProcEntries(DAC960_Controller_T *Controller)
 {
-        struct proc_dir_entry *StatusProcEntry;
         struct proc_dir_entry *ControllerProcEntry;
-        struct proc_dir_entry *UserCommandProcEntry;
 
         if (DAC960_ProcDirectoryEntry == NULL) {
-                DAC960_ProcDirectoryEntry = proc_mkdir("rd", NULL);
-                StatusProcEntry = proc_create("status", 0,
-                                           DAC960_ProcDirectoryEntry,
-                                           &dac960_proc_fops);
+                DAC960_ProcDirectoryEntry = proc_mkdir("rd", NULL);
+                proc_create("status", 0, DAC960_ProcDirectoryEntry,
+                            &dac960_proc_fops);
         }
 
-      sprintf(Controller->ControllerName, "c%d", Controller->ControllerNumber);
-      ControllerProcEntry = proc_mkdir(Controller->ControllerName,
-                                       DAC960_ProcDirectoryEntry);
-      proc_create_data("initial_status", 0, ControllerProcEntry, &dac960_initial_status_proc_fops, Controller);
-      proc_create_data("current_status", 0, ControllerProcEntry, &dac960_current_status_proc_fops, Controller);
-      UserCommandProcEntry = proc_create_data("user_command", S_IWUSR | S_IRUSR, ControllerProcEntry, &dac960_user_command_proc_fops, Controller);
-      Controller->ControllerProcEntry = ControllerProcEntry;
+        sprintf(Controller->ControllerName, "c%d", Controller->ControllerNumber);
+        ControllerProcEntry = proc_mkdir(Controller->ControllerName,
+                                         DAC960_ProcDirectoryEntry);
+        proc_create_data("initial_status", 0, ControllerProcEntry, &dac960_initial_status_proc_fops, Controller);
+        proc_create_data("current_status", 0, ControllerProcEntry, &dac960_current_status_proc_fops, Controller);
+        proc_create_data("user_command", S_IWUSR | S_IRUSR, ControllerProcEntry, &dac960_user_command_proc_fops, Controller);
+        Controller->ControllerProcEntry = ControllerProcEntry;
 }
 
 
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index abfaacaaf346..946166e13953 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -2297,7 +2297,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms
                 return;
         }
 
-        if (!cap_raised(current_cap(), CAP_SYS_ADMIN)) {
+        if (!capable(CAP_SYS_ADMIN)) {
                 retcode = ERR_PERM;
                 goto fail;
         }
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 43beaca53179..436f519bed1c 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -664,7 +664,7 @@ static struct socket *drbd_wait_for_connect(struct drbd_conf *mdev)
         timeo = mdev->net_conf->try_connect_int * HZ;
         timeo += (random32() & 1) ? timeo / 7 : -timeo / 7; /* 28.5% random jitter */
 
-        s_listen->sk->sk_reuse    = 1; /* SO_REUSEADDR */
+        s_listen->sk->sk_reuse    = SK_CAN_REUSE; /* SO_REUSEADDR */
         s_listen->sk->sk_rcvtimeo = timeo;
         s_listen->sk->sk_sndtimeo = timeo;
         drbd_setbufsize(s_listen, mdev->net_conf->sndbuf_size,
@@ -841,8 +841,8 @@ retry:
                 }
         } while (1);
 
-        msock->sk->sk_reuse = 1; /* SO_REUSEADDR */
-        sock->sk->sk_reuse = 1; /* SO_REUSEADDR */
+        msock->sk->sk_reuse = SK_CAN_REUSE; /* SO_REUSEADDR */
+        sock->sk->sk_reuse = SK_CAN_REUSE; /* SO_REUSEADDR */
 
         sock->sk->sk_allocation = GFP_NOIO;
         msock->sk->sk_allocation = GFP_NOIO;
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 00f9fc992090..304000c3d433 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -2510,8 +2510,10 @@ static struct scatterlist *mtip_hw_get_scatterlist(struct driver_data *dd,
                 up(&dd->port->cmd_slot);
                 return NULL;
         }
-        if (unlikely(*tag < 0))
+        if (unlikely(*tag < 0)) {
+                up(&dd->port->cmd_slot);
                 return NULL;
+        }
 
         return dd->port->commands[*tag].sg;
 }
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index ae9edca7b56d..57fd867553d7 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -75,6 +75,8 @@ static struct usb_device_id ath3k_table[] = {
         { USB_DEVICE(0x0CF3, 0x311D) },
         { USB_DEVICE(0x13d3, 0x3375) },
         { USB_DEVICE(0x04CA, 0x3005) },
+        { USB_DEVICE(0x13d3, 0x3362) },
+        { USB_DEVICE(0x0CF3, 0xE004) },
 
         /* Atheros AR5BBU12 with sflash firmware */
         { USB_DEVICE(0x0489, 0xE02C) },
@@ -94,6 +96,8 @@ static struct usb_device_id ath3k_blist_tbl[] = {
         { USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
 
         { }     /* Terminating entry */
 };
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 3311b812a0c6..9217121362e1 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -101,12 +101,16 @@ static struct usb_device_id btusb_table[] = {
         { USB_DEVICE(0x0c10, 0x0000) },
 
         /* Broadcom BCM20702A0 */
+        { USB_DEVICE(0x0489, 0xe042) },
         { USB_DEVICE(0x0a5c, 0x21e3) },
         { USB_DEVICE(0x0a5c, 0x21e6) },
         { USB_DEVICE(0x0a5c, 0x21e8) },
         { USB_DEVICE(0x0a5c, 0x21f3) },
         { USB_DEVICE(0x413c, 0x8197) },
 
+        /* Foxconn - Hon Hai */
+        { USB_DEVICE(0x0489, 0xe033) },
+
         { }     /* Terminating entry */
 };
 
@@ -133,6 +137,8 @@ static struct usb_device_id blacklist_table[] = {
         { USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
 
         /* Atheros AR5BBU12 with sflash firmware */
         { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index ddf86b6500b7..cdf2f5451c76 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1895,6 +1895,13 @@ static int virtcons_restore(struct virtio_device *vdev)
 
                 /* Get port open/close status on the host */
                 send_control_msg(port, VIRTIO_CONSOLE_PORT_READY, 1);
+
+                /*
+                 * If a port was open at the time of suspending, we
+                 * have to let the host know that it's still open.
+                 */
+                if (port->guest_connected)
+                        send_control_msg(port, VIRTIO_CONSOLE_PORT_OPEN, 1);
         }
         return 0;
 }
diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index 6db161f64ae0..c535cf8c5770 100644
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
@@ -35,7 +35,12 @@ static DEFINE_MUTEX(clocks_mutex);
 static struct clk_lookup *clk_find(const char *dev_id, const char *con_id)
 {
         struct clk_lookup *p, *cl = NULL;
-        int match, best = 0;
+        int match, best_found = 0, best_possible = 0;
+
+        if (dev_id)
+                best_possible += 2;
+        if (con_id)
+                best_possible += 1;
 
         list_for_each_entry(p, &clocks, node) {
                 match = 0;
@@ -50,10 +55,10 @@ static struct clk_lookup *clk_find(const char *dev_id, const char *con_id)
                         match += 1;
                 }
 
-                if (match > best) {
+                if (match > best_found) {
                         cl = p;
-                        if (match != 3)
-                                best = match;
+                        if (match != best_possible)
+                                best_found = match;
                         else
                                 break;
                 }
@@ -89,6 +94,51 @@ void clk_put(struct clk *clk)
 }
 EXPORT_SYMBOL(clk_put);
 
+static void devm_clk_release(struct device *dev, void *res)
+{
+        clk_put(*(struct clk **)res);
+}
+
+struct clk *devm_clk_get(struct device *dev, const char *id)
+{
+        struct clk **ptr, *clk;
+
+        ptr = devres_alloc(devm_clk_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return ERR_PTR(-ENOMEM);
+
+        clk = clk_get(dev, id);
+        if (!IS_ERR(clk)) {
+                *ptr = clk;
+                devres_add(dev, ptr);
+        } else {
+                devres_free(ptr);
+        }
+
+        return clk;
+}
+EXPORT_SYMBOL(devm_clk_get);
+
+static int devm_clk_match(struct device *dev, void *res, void *data)
+{
+        struct clk **c = res;
+        if (!c || !*c) {
+                WARN_ON(!c || !*c);
+                return 0;
+        }
+        return *c == data;
+}
+
+void devm_clk_put(struct device *dev, struct clk *clk)
+{
+        int ret;
+
+        ret = devres_destroy(dev, devm_clk_release, devm_clk_match, clk);
+
+        WARN_ON(ret);
+}
+EXPORT_SYMBOL(devm_clk_put);
+
 void clkdev_add(struct clk_lookup *cl)
 {
         mutex_lock(&clocks_mutex);
@@ -116,8 +166,9 @@ struct clk_lookup_alloc {
         char    con_id[MAX_CON_ID];
 };
 
-struct clk_lookup * __init_refok
-clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...)
+static struct clk_lookup * __init_refok
+vclkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt,
+        va_list ap)
 {
         struct clk_lookup_alloc *cla;
 
@@ -132,16 +183,25 @@ clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...)
         }
 
         if (dev_fmt) {
-                va_list ap;
-
-                va_start(ap, dev_fmt);
                 vscnprintf(cla->dev_id, sizeof(cla->dev_id), dev_fmt, ap);
                 cla->cl.dev_id = cla->dev_id;
-                va_end(ap);
         }
 
         return &cla->cl;
 }
+
+struct clk_lookup * __init_refok
+clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...)
+{
+        struct clk_lookup *cl;
+        va_list ap;
+
+        va_start(ap, dev_fmt);
+        cl = vclkdev_alloc(clk, con_id, dev_fmt, ap);
+        va_end(ap);
+
+        return cl;
+}
 EXPORT_SYMBOL(clkdev_alloc);
 
 int clk_add_alias(const char *alias, const char *alias_dev_name, char *id,
@@ -173,3 +233,65 @@ void clkdev_drop(struct clk_lookup *cl)
         kfree(cl);
 }
 EXPORT_SYMBOL(clkdev_drop);
+
+/**
+ * clk_register_clkdev - register one clock lookup for a struct clk
+ * @clk: struct clk to associate with all clk_lookups
+ * @con_id: connection ID string on device
+ * @dev_id: format string describing device name
+ *
+ * con_id or dev_id may be NULL as a wildcard, just as in the rest of
+ * clkdev.
+ *
+ * To make things easier for mass registration, we detect error clks
+ * from a previous clk_register() call, and return the error code for
+ * those.  This is to permit this function to be called immediately
+ * after clk_register().
+ */
+int clk_register_clkdev(struct clk *clk, const char *con_id,
+        const char *dev_fmt, ...)
+{
+        struct clk_lookup *cl;
+        va_list ap;
+
+        if (IS_ERR(clk))
+                return PTR_ERR(clk);
+
+        va_start(ap, dev_fmt);
+        cl = vclkdev_alloc(clk, con_id, dev_fmt, ap);
+        va_end(ap);
+
+        if (!cl)
+                return -ENOMEM;
+
+        clkdev_add(cl);
+
+        return 0;
+}
+
+/**
+ * clk_register_clkdevs - register a set of clk_lookup for a struct clk
+ * @clk: struct clk to associate with all clk_lookups
+ * @cl: array of clk_lookup structures with con_id and dev_id pre-initialized
+ * @num: number of clk_lookup structures to register
+ *
+ * To make things easier for mass registration, we detect error clks
+ * from a previous clk_register() call, and return the error code for
+ * those.  This is to permit this function to be called immediately
+ * after clk_register().
+ */
+int clk_register_clkdevs(struct clk *clk, struct clk_lookup *cl, size_t num)
+{
+        unsigned i;
+
+        if (IS_ERR(clk))
+                return PTR_ERR(clk);
+
+        for (i = 0; i < num; i++, cl++) {
+                cl->clk = clk;
+                clkdev_add(cl);
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(clk_register_clkdevs);
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index ab9abb46d01a..371f13cc38eb 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -111,6 +111,7 @@ config CRYPTO_DES_S390
         depends on S390
         select CRYPTO_ALGAPI
         select CRYPTO_BLKCIPHER
+        select CRYPTO_DES
         help
           This is the s390 hardware accelerated implementation of the
           DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
@@ -164,6 +165,7 @@ config CRYPTO_DEV_MV_CESA
         select CRYPTO_ALGAPI
         select CRYPTO_AES
         select CRYPTO_BLKCIPHER2
+        select CRYPTO_HASH
         help
           This driver allows you to utilize the Cryptographic Engines and
           Security Accelerator (CESA) which can be found on the Marvell Orion
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index c301a8ec31aa..3d704abd7912 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -1429,6 +1429,7 @@ static int pl08x_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
                          * signal
                          */
                         release_phy_channel(plchan);
+                        plchan->phychan_hold = 0;
                 }
                 /* Dequeue jobs and free LLIs */
                 if (plchan->at) {
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index 7aa58d204892..bf0d7e4e345b 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -221,10 +221,6 @@ static void atc_dostart(struct at_dma_chan *atchan, struct at_desc *first)
 
         vdbg_dump_regs(atchan);
 
-        /* clear any pending interrupt */
-        while (dma_readl(atdma, EBCISR))
-                cpu_relax();
-
         channel_writel(atchan, SADDR, 0);
         channel_writel(atchan, DADDR, 0);
         channel_writel(atchan, CTRLA, 0);
@@ -249,7 +245,9 @@ atc_chain_complete(struct at_dma_chan *atchan, struct at_desc *desc)
         dev_vdbg(chan2dev(&atchan->chan_common),
                 "descriptor %u complete\n", txd->cookie);
 
-        dma_cookie_complete(txd);
+        /* mark the descriptor as complete for non cyclic cases only */
+        if (!atc_chan_is_cyclic(atchan))
+                dma_cookie_complete(txd);
 
         /* move children to free_list */
         list_splice_init(&desc->tx_list, &atchan->free_list);
diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
index e6f133b78dc2..f6e9b572b998 100644
--- a/drivers/dma/ep93xx_dma.c
+++ b/drivers/dma/ep93xx_dma.c
@@ -703,7 +703,9 @@ static void ep93xx_dma_tasklet(unsigned long data)
         desc = ep93xx_dma_get_active(edmac);
         if (desc) {
                 if (desc->complete) {
-                        dma_cookie_complete(&desc->txd);
+                        /* mark descriptor complete for non cyclic case only */
+                        if (!test_bit(EP93XX_DMA_IS_CYCLIC, &edmac->flags))
+                                dma_cookie_complete(&desc->txd);
                         list_splice_init(&edmac->active, &list);
                 }
                 callback = desc->txd.callback;
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index a45b5d2a5987..bb787d8e1529 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -571,11 +571,14 @@ static void imxdma_tasklet(unsigned long data)
         if (desc->desc.callback)
                 desc->desc.callback(desc->desc.callback_param);
 
-        dma_cookie_complete(&desc->desc);
-
-        /* If we are dealing with a cyclic descriptor keep it on ld_active */
+        /* If we are dealing with a cyclic descriptor keep it on ld_active
+         * and dont mark the descripor as complete.
+         * Only in non-cyclic cases it would be marked as complete
+         */
         if (imxdma_chan_is_doing_cyclic(imxdmac))
                 goto out;
+        else
+                dma_cookie_complete(&desc->desc);
 
         /* Free 2D slot if it was an interleaved transfer */
         if (imxdmac->enabled_2d) {
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index c81ef7e10e08..655d4ce6ed0d 100644
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -201,10 +201,6 @@ static struct mxs_dma_chan *to_mxs_dma_chan(struct dma_chan *chan)
 
 static dma_cookie_t mxs_dma_tx_submit(struct dma_async_tx_descriptor *tx)
 {
-        struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(tx->chan);
-
-        mxs_dma_enable_chan(mxs_chan);
-
         return dma_cookie_assign(tx);
 }
 
@@ -558,9 +554,9 @@ static enum dma_status mxs_dma_tx_status(struct dma_chan *chan,
 
 static void mxs_dma_issue_pending(struct dma_chan *chan)
 {
-        /*
-         * Nothing to do. We only have a single descriptor.
-         */
+        struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);
+
+        mxs_dma_enable_chan(mxs_chan);
 }
 
 static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma)
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 282caf118be8..fa3fb21e60be 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -2225,12 +2225,9 @@ static inline void free_desc_list(struct list_head *list)
 {
         struct dma_pl330_dmac *pdmac;
         struct dma_pl330_desc *desc;
-        struct dma_pl330_chan *pch;
+        struct dma_pl330_chan *pch = NULL;
         unsigned long flags;
 
-        if (list_empty(list))
-                return;
-
         /* Finish off the work list */
         list_for_each_entry(desc, list, node) {
                 dma_async_tx_callback callback;
@@ -2247,6 +2244,10 @@ static inline void free_desc_list(struct list_head *list)
                 desc->pchan = NULL;
         }
 
+        /* pch will be unset if list was empty */
+        if (!pch)
+                return;
+
         pdmac = pch->dmac;
 
         spin_lock_irqsave(&pdmac->pool_lock, flags);
@@ -2257,12 +2258,9 @@ static inline void free_desc_list(struct list_head *list)
 static inline void handle_cyclic_desc_list(struct list_head *list)
 {
         struct dma_pl330_desc *desc;
-        struct dma_pl330_chan *pch;
+        struct dma_pl330_chan *pch = NULL;
         unsigned long flags;
 
-        if (list_empty(list))
-                return;
-
         list_for_each_entry(desc, list, node) {
                 dma_async_tx_callback callback;
 
@@ -2274,6 +2272,10 @@ static inline void handle_cyclic_desc_list(struct list_head *list)
                         callback(desc->txd.callback_param);
         }
 
+        /* pch will be unset if list was empty */
+        if (!pch)
+                return;
+
         spin_lock_irqsave(&pch->lock, flags);
         list_splice_tail_init(list, &pch->work_list);
         spin_unlock_irqrestore(&pch->lock, flags);
@@ -2320,7 +2322,8 @@ static void pl330_tasklet(unsigned long data)
         /* Pick up ripe tomatoes */
         list_for_each_entry_safe(desc, _dt, &pch->work_list, node)
                 if (desc->status == DONE) {
-                        dma_cookie_complete(&desc->txd);
+                        if (pch->cyclic)
+                                dma_cookie_complete(&desc->txd);
                         list_move_tail(&desc->node, &list);
                 }
 
@@ -2926,8 +2929,11 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
         INIT_LIST_HEAD(&pd->channels);
 
         /* Initialize channel parameters */
-        num_chan = max(pdat ? pdat->nr_valid_peri : (u8)pi->pcfg.num_peri,
-                        (u8)pi->pcfg.num_chan);
+        if (pdat)
+                num_chan = max_t(int, pdat->nr_valid_peri, pi->pcfg.num_chan);
+        else
+                num_chan = max_t(int, pi->pcfg.num_peri, pi->pcfg.num_chan);
+
         pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL);
 
         for (i = 0; i < num_chan; i++) {
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index bdd41d4bfa8d..2ed1ac3513f3 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -18,6 +18,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/err.h>
 #include <linux/amba/bus.h>
+#include <linux/regulator/consumer.h>
 
 #include <plat/ste_dma40.h>
 
@@ -69,6 +70,22 @@ enum d40_command {
 };
 
 /*
+ * enum d40_events - The different Event Enables for the event lines.
+ *
+ * @D40_DEACTIVATE_EVENTLINE: De-activate Event line, stopping the logical chan.
+ * @D40_ACTIVATE_EVENTLINE: Activate the Event line, to start a logical chan.
+ * @D40_SUSPEND_REQ_EVENTLINE: Requesting for suspending a event line.
+ * @D40_ROUND_EVENTLINE: Status check for event line.
+ */
+
+enum d40_events {
+        D40_DEACTIVATE_EVENTLINE        = 0,
+        D40_ACTIVATE_EVENTLINE          = 1,
+        D40_SUSPEND_REQ_EVENTLINE       = 2,
+        D40_ROUND_EVENTLINE             = 3
+};
+
+/*
  * These are the registers that has to be saved and later restored
  * when the DMA hw is powered off.
  * TODO: Add save/restore of D40_DREG_GCC on dma40 v3 or later, if that works.
@@ -870,8 +887,8 @@ static void d40_save_restore_registers(struct d40_base *base, bool save)
 }
 #endif
 
-static int d40_channel_execute_command(struct d40_chan *d40c,
-                                       enum d40_command command)
+static int __d40_execute_command_phy(struct d40_chan *d40c,
+                                     enum d40_command command)
 {
         u32 status;
         int i;
@@ -880,6 +897,12 @@ static int d40_channel_execute_command(struct d40_chan *d40c,
         unsigned long flags;
         u32 wmask;
 
+        if (command == D40_DMA_STOP) {
+                ret = __d40_execute_command_phy(d40c, D40_DMA_SUSPEND_REQ);
+                if (ret)
+                        return ret;
+        }
+
         spin_lock_irqsave(&d40c->base->execmd_lock, flags);
 
         if (d40c->phy_chan->num % 2 == 0)
@@ -973,67 +996,109 @@ static void d40_term_all(struct d40_chan *d40c)
                 }
 
         d40c->pending_tx = 0;
-        d40c->busy = false;
 }
 
-static void __d40_config_set_event(struct d40_chan *d40c, bool enable,
-                                   u32 event, int reg)
+static void __d40_config_set_event(struct d40_chan *d40c,
+                                   enum d40_events event_type, u32 event,
+                                   int reg)
 {
         void __iomem *addr = chan_base(d40c) + reg;
         int tries;
+        u32 status;
+
+        switch (event_type) {
+
+        case D40_DEACTIVATE_EVENTLINE:
 
-        if (!enable) {
                 writel((D40_DEACTIVATE_EVENTLINE << D40_EVENTLINE_POS(event))
                        | ~D40_EVENTLINE_MASK(event), addr);
-                return;
-        }
+                break;
+
+        case D40_SUSPEND_REQ_EVENTLINE:
+                status = (readl(addr) & D40_EVENTLINE_MASK(event)) >>
+                          D40_EVENTLINE_POS(event);
+
+                if (status == D40_DEACTIVATE_EVENTLINE ||
+                    status == D40_SUSPEND_REQ_EVENTLINE)
+                        break;
 
+                writel((D40_SUSPEND_REQ_EVENTLINE << D40_EVENTLINE_POS(event))
+                       | ~D40_EVENTLINE_MASK(event), addr);
+
+                for (tries = 0 ; tries < D40_SUSPEND_MAX_IT; tries++) {
+
+                        status = (readl(addr) & D40_EVENTLINE_MASK(event)) >>
+                                  D40_EVENTLINE_POS(event);
+
+                        cpu_relax();
+                        /*
+                         * Reduce the number of bus accesses while
+                         * waiting for the DMA to suspend.
+                         */
+                        udelay(3);
+
+                        if (status == D40_DEACTIVATE_EVENTLINE)
+                                break;
+                }
+
+                if (tries == D40_SUSPEND_MAX_IT) {
+                        chan_err(d40c,
+                                "unable to stop the event_line chl %d (log: %d)"
+                                "status %x\n", d40c->phy_chan->num,
+                                 d40c->log_num, status);
+                }
+                break;
+
+        case D40_ACTIVATE_EVENTLINE:
         /*
          * The hardware sometimes doesn't register the enable when src and dst
          * event lines are active on the same logical channel.  Retry to ensure
          * it does.  Usually only one retry is sufficient.
          */
-        tries = 100;
-        while (--tries) {
-                writel((D40_ACTIVATE_EVENTLINE << D40_EVENTLINE_POS(event))
-                       | ~D40_EVENTLINE_MASK(event), addr);
+                tries = 100;
+                while (--tries) {
+                        writel((D40_ACTIVATE_EVENTLINE <<
+                                D40_EVENTLINE_POS(event)) |
+                                ~D40_EVENTLINE_MASK(event), addr);
 
-                if (readl(addr) & D40_EVENTLINE_MASK(event))
-                        break;
-        }
+                        if (readl(addr) & D40_EVENTLINE_MASK(event))
+                                break;
+                }
 
-        if (tries != 99)
-                dev_dbg(chan2dev(d40c),
-                        "[%s] workaround enable S%cLNK (%d tries)\n",
-                        __func__, reg == D40_CHAN_REG_SSLNK ? 'S' : 'D',
-                        100 - tries);
+                if (tries != 99)
+                        dev_dbg(chan2dev(d40c),
+                                "[%s] workaround enable S%cLNK (%d tries)\n",
+                                __func__, reg == D40_CHAN_REG_SSLNK ? 'S' : 'D',
+                                100 - tries);
 
-        WARN_ON(!tries);
-}
+                WARN_ON(!tries);
+                break;
 
-static void d40_config_set_event(struct d40_chan *d40c, bool do_enable)
-{
-        unsigned long flags;
+        case D40_ROUND_EVENTLINE:
+                BUG();
+                break;
 
-        spin_lock_irqsave(&d40c->phy_chan->lock, flags);
+        }
+}
 
+static void d40_config_set_event(struct d40_chan *d40c,
+                                 enum d40_events event_type)
+{
         /* Enable event line connected to device (or memcpy) */
         if ((d40c->dma_cfg.dir ==  STEDMA40_PERIPH_TO_MEM) ||
             (d40c->dma_cfg.dir == STEDMA40_PERIPH_TO_PERIPH)) {
                 u32 event = D40_TYPE_TO_EVENT(d40c->dma_cfg.src_dev_type);
 
-                __d40_config_set_event(d40c, do_enable, event,
+                __d40_config_set_event(d40c, event_type, event,
                                        D40_CHAN_REG_SSLNK);
         }
 
         if (d40c->dma_cfg.dir !=  STEDMA40_PERIPH_TO_MEM) {
                 u32 event = D40_TYPE_TO_EVENT(d40c->dma_cfg.dst_dev_type);
 
-                __d40_config_set_event(d40c, do_enable, event,
+                __d40_config_set_event(d40c, event_type, event,
                                        D40_CHAN_REG_SDLNK);
         }
-
-        spin_unlock_irqrestore(&d40c->phy_chan->lock, flags);
 }
 
 static u32 d40_chan_has_events(struct d40_chan *d40c)
@@ -1047,6 +1112,64 @@ static u32 d40_chan_has_events(struct d40_chan *d40c)
         return val;
 }
 
+static int
+__d40_execute_command_log(struct d40_chan *d40c, enum d40_command command)
+{
+        unsigned long flags;
+        int ret = 0;
+        u32 active_status;
+        void __iomem *active_reg;
+
+        if (d40c->phy_chan->num % 2 == 0)
+                active_reg = d40c->base->virtbase + D40_DREG_ACTIVE;
+        else
+                active_reg = d40c->base->virtbase + D40_DREG_ACTIVO;
+
+
+        spin_lock_irqsave(&d40c->phy_chan->lock, flags);
+
+        switch (command) {
+        case D40_DMA_STOP:
+        case D40_DMA_SUSPEND_REQ:
+
+                active_status = (readl(active_reg) &
+                                 D40_CHAN_POS_MASK(d40c->phy_chan->num)) >>
+                                 D40_CHAN_POS(d40c->phy_chan->num);
+
+                if (active_status == D40_DMA_RUN)
+                        d40_config_set_event(d40c, D40_SUSPEND_REQ_EVENTLINE);
+                else
+                        d40_config_set_event(d40c, D40_DEACTIVATE_EVENTLINE);
+
+                if (!d40_chan_has_events(d40c) && (command == D40_DMA_STOP))
+                        ret = __d40_execute_command_phy(d40c, command);
+
+                break;
+
+        case D40_DMA_RUN:
+
+                d40_config_set_event(d40c, D40_ACTIVATE_EVENTLINE);
+                ret = __d40_execute_command_phy(d40c, command);
+                break;
+
+        case D40_DMA_SUSPENDED:
+                BUG();
+                break;
+        }
+
+        spin_unlock_irqrestore(&d40c->phy_chan->lock, flags);
+        return ret;
+}
+
+static int d40_channel_execute_command(struct d40_chan *d40c,
+                                       enum d40_command command)
+{
+        if (chan_is_logical(d40c))
+                return __d40_execute_command_log(d40c, command);
+        else
+                return __d40_execute_command_phy(d40c, command);
+}
+
 static u32 d40_get_prmo(struct d40_chan *d40c)
 {
         static const unsigned int phy_map[] = {
@@ -1149,15 +1272,7 @@ static int d40_pause(struct d40_chan *d40c)
         spin_lock_irqsave(&d40c->lock, flags);
 
         res = d40_channel_execute_command(d40c, D40_DMA_SUSPEND_REQ);
-        if (res == 0) {
-                if (chan_is_logical(d40c)) {
-                        d40_config_set_event(d40c, false);
-                        /* Resume the other logical channels if any */
-                        if (d40_chan_has_events(d40c))
-                                res = d40_channel_execute_command(d40c,
-                                                                  D40_DMA_RUN);
-                }
-        }
+
         pm_runtime_mark_last_busy(d40c->base->dev);
         pm_runtime_put_autosuspend(d40c->base->dev);
         spin_unlock_irqrestore(&d40c->lock, flags);
@@ -1174,45 +1289,17 @@ static int d40_resume(struct d40_chan *d40c)
 
         spin_lock_irqsave(&d40c->lock, flags);
         pm_runtime_get_sync(d40c->base->dev);
-        if (d40c->base->rev == 0)
-                if (chan_is_logical(d40c)) {
-                        res = d40_channel_execute_command(d40c,
-                                                          D40_DMA_SUSPEND_REQ);
-                        goto no_suspend;
-                }
 
         /* If bytes left to transfer or linked tx resume job */
-        if (d40_residue(d40c) || d40_tx_is_linked(d40c)) {
-
-                if (chan_is_logical(d40c))
-                        d40_config_set_event(d40c, true);
-
+        if (d40_residue(d40c) || d40_tx_is_linked(d40c))
                 res = d40_channel_execute_command(d40c, D40_DMA_RUN);
-        }
 
-no_suspend:
         pm_runtime_mark_last_busy(d40c->base->dev);
         pm_runtime_put_autosuspend(d40c->base->dev);
         spin_unlock_irqrestore(&d40c->lock, flags);
         return res;
 }
 
-static int d40_terminate_all(struct d40_chan *chan)
-{
-        unsigned long flags;
-        int ret = 0;
-
-        ret = d40_pause(chan);
-        if (!ret && chan_is_physical(chan))
-                ret = d40_channel_execute_command(chan, D40_DMA_STOP);
-
-        spin_lock_irqsave(&chan->lock, flags);
-        d40_term_all(chan);
-        spin_unlock_irqrestore(&chan->lock, flags);
-
-        return ret;
-}
-
 static dma_cookie_t d40_tx_submit(struct dma_async_tx_descriptor *tx)
 {
         struct d40_chan *d40c = container_of(tx->chan,
@@ -1232,20 +1319,6 @@ static dma_cookie_t d40_tx_submit(struct dma_async_tx_descriptor *tx)
 
 static int d40_start(struct d40_chan *d40c)
 {
-        if (d40c->base->rev == 0) {
-                int err;
-
-                if (chan_is_logical(d40c)) {
-                        err = d40_channel_execute_command(d40c,
-                                                          D40_DMA_SUSPEND_REQ);
-                        if (err)
-                                return err;
-                }
-        }
-
-        if (chan_is_logical(d40c))
-                d40_config_set_event(d40c, true);
-
         return d40_channel_execute_command(d40c, D40_DMA_RUN);
 }
 
@@ -1258,10 +1331,10 @@ static struct d40_desc *d40_queue_start(struct d40_chan *d40c)
         d40d = d40_first_queued(d40c);
 
         if (d40d != NULL) {
-                if (!d40c->busy)
+                if (!d40c->busy) {
                         d40c->busy = true;
-
-                pm_runtime_get_sync(d40c->base->dev);
+                        pm_runtime_get_sync(d40c->base->dev);
+                }
 
                 /* Remove from queue */
                 d40_desc_remove(d40d);
@@ -1388,8 +1461,8 @@ static void dma_tasklet(unsigned long data)
 
         return;
 
- err:
-        /* Rescue manoeuvre if receiving double interrupts */
+err:
+        /* Rescue manouver if receiving double interrupts */
         if (d40c->pending_tx > 0)
                 d40c->pending_tx--;
         spin_unlock_irqrestore(&d40c->lock, flags);
@@ -1770,7 +1843,6 @@ static int d40_config_memcpy(struct d40_chan *d40c)
         return 0;
 }
 
-
 static int d40_free_dma(struct d40_chan *d40c)
 {
 
@@ -1806,43 +1878,18 @@ static int d40_free_dma(struct d40_chan *d40c)
         }
 
         pm_runtime_get_sync(d40c->base->dev);
-        res = d40_channel_execute_command(d40c, D40_DMA_SUSPEND_REQ);
+        res = d40_channel_execute_command(d40c, D40_DMA_STOP);
         if (res) {
-                chan_err(d40c, "suspend failed\n");
+                chan_err(d40c, "stop failed\n");
                 goto out;
         }
 
-        if (chan_is_logical(d40c)) {
-                /* Release logical channel, deactivate the event line */
+        d40_alloc_mask_free(phy, is_src, chan_is_logical(d40c) ? event : 0);
 
-                d40_config_set_event(d40c, false);
+        if (chan_is_logical(d40c))
                 d40c->base->lookup_log_chans[d40c->log_num] = NULL;
-
-                /*
-                 * Check if there are more logical allocation
-                 * on this phy channel.
-                 */
-                if (!d40_alloc_mask_free(phy, is_src, event)) {
-                        /* Resume the other logical channels if any */
-                        if (d40_chan_has_events(d40c)) {
-                                res = d40_channel_execute_command(d40c,
-                                                                  D40_DMA_RUN);
-                                if (res)
-                                        chan_err(d40c,
-                                                "Executing RUN command\n");
-                        }
-                        goto out;
-                }
-        } else {
-                (void) d40_alloc_mask_free(phy, is_src, 0);
-        }
-
-        /* Release physical channel */
-        res = d40_channel_execute_command(d40c, D40_DMA_STOP);
-        if (res) {
-                chan_err(d40c, "Failed to stop channel\n");
-                goto out;
-        }
+        else
+                d40c->base->lookup_phy_chans[phy->num] = NULL;
 
         if (d40c->busy) {
                 pm_runtime_mark_last_busy(d40c->base->dev);
@@ -1852,7 +1899,6 @@ static int d40_free_dma(struct d40_chan *d40c)
         d40c->busy = false;
         d40c->phy_chan = NULL;
         d40c->configured = false;
-        d40c->base->lookup_phy_chans[phy->num] = NULL;
 out:
 
         pm_runtime_mark_last_busy(d40c->base->dev);
@@ -2070,7 +2116,7 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist *sg_src,
         if (sg_next(&sg_src[sg_len - 1]) == sg_src)
                 desc->cyclic = true;
 
-        if (direction != DMA_NONE) {
+        if (direction != DMA_TRANS_NONE) {
                 dma_addr_t dev_addr = d40_get_dev_addr(chan, direction);
 
                 if (direction == DMA_DEV_TO_MEM)
@@ -2371,6 +2417,31 @@ static void d40_issue_pending(struct dma_chan *chan)
         spin_unlock_irqrestore(&d40c->lock, flags);
 }
 
+static void d40_terminate_all(struct dma_chan *chan)
+{
+        unsigned long flags;
+        struct d40_chan *d40c = container_of(chan, struct d40_chan, chan);
+        int ret;
+
+        spin_lock_irqsave(&d40c->lock, flags);
+
+        pm_runtime_get_sync(d40c->base->dev);
+        ret = d40_channel_execute_command(d40c, D40_DMA_STOP);
+        if (ret)
+                chan_err(d40c, "Failed to stop channel\n");
+
+        d40_term_all(d40c);
+        pm_runtime_mark_last_busy(d40c->base->dev);
+        pm_runtime_put_autosuspend(d40c->base->dev);
+        if (d40c->busy) {
+                pm_runtime_mark_last_busy(d40c->base->dev);
+                pm_runtime_put_autosuspend(d40c->base->dev);
+        }
+        d40c->busy = false;
+
+        spin_unlock_irqrestore(&d40c->lock, flags);
+}
+
 static int
 dma40_config_to_halfchannel(struct d40_chan *d40c,
                             struct stedma40_half_channel_info *info,
@@ -2551,7 +2622,8 @@ static int d40_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
 
         switch (cmd) {
         case DMA_TERMINATE_ALL:
-                return d40_terminate_all(d40c);
+                d40_terminate_all(chan);
+                return 0;
         case DMA_PAUSE:
                 return d40_pause(d40c);
         case DMA_RESUME:
@@ -2908,6 +2980,12 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev)
         dev_info(&pdev->dev, "hardware revision: %d @ 0x%x\n",
                  rev, res->start);
 
+        if (rev < 2) {
+                d40_err(&pdev->dev, "hardware revision: %d is not supported",
+                        rev);
+                goto failure;
+        }
+
         plat_data = pdev->dev.platform_data;
 
         /* Count the number of logical channels in use */
@@ -2998,6 +3076,7 @@ failure:
 
         if (base) {
                 kfree(base->lcla_pool.alloc_map);
+                kfree(base->reg_val_backup_chan);
                 kfree(base->lookup_log_chans);
                 kfree(base->lookup_phy_chans);
                 kfree(base->phy_res);
diff --git a/drivers/dma/ste_dma40_ll.h b/drivers/dma/ste_dma40_ll.h
index 8d3d490968a3..51e8e5396e9b 100644
--- a/drivers/dma/ste_dma40_ll.h
+++ b/drivers/dma/ste_dma40_ll.h
@@ -62,8 +62,6 @@
 #define D40_SREG_ELEM_LOG_LIDX_MASK     (0xFF << D40_SREG_ELEM_LOG_LIDX_POS)
 
 /* Link register */
-#define D40_DEACTIVATE_EVENTLINE        0x0
-#define D40_ACTIVATE_EVENTLINE          0x1
 #define D40_EVENTLINE_POS(i)            (2 * i)
 #define D40_EVENTLINE_MASK(i)           (0x3 << D40_EVENTLINE_POS(i))
 
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index d25599f2a3f8..47408e802ab6 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -191,6 +191,190 @@ utf16_strncmp(const efi_char16_t *a, const efi_char16_t *b, size_t len)
         }
 }
 
+static bool
+validate_device_path(struct efi_variable *var, int match, u8 *buffer,
+                     unsigned long len)
+{
+        struct efi_generic_dev_path *node;
+        int offset = 0;
+
+        node = (struct efi_generic_dev_path *)buffer;
+
+        if (len < sizeof(*node))
+                return false;
+
+        while (offset <= len - sizeof(*node) &&
+               node->length >= sizeof(*node) &&
+                node->length <= len - offset) {
+                offset += node->length;
+
+                if ((node->type == EFI_DEV_END_PATH ||
+                     node->type == EFI_DEV_END_PATH2) &&
+                    node->sub_type == EFI_DEV_END_ENTIRE)
+                        return true;
+
+                node = (struct efi_generic_dev_path *)(buffer + offset);
+        }
+
+        /*
+         * If we're here then either node->length pointed past the end
+         * of the buffer or we reached the end of the buffer without
+         * finding a device path end node.
+         */
+        return false;
+}
+
+static bool
+validate_boot_order(struct efi_variable *var, int match, u8 *buffer,
+                    unsigned long len)
+{
+        /* An array of 16-bit integers */
+        if ((len % 2) != 0)
+                return false;
+
+        return true;
+}
+
+static bool
+validate_load_option(struct efi_variable *var, int match, u8 *buffer,
+                     unsigned long len)
+{
+        u16 filepathlength;
+        int i, desclength = 0, namelen;
+
+        namelen = utf16_strnlen(var->VariableName, sizeof(var->VariableName));
+
+        /* Either "Boot" or "Driver" followed by four digits of hex */
+        for (i = match; i < match+4; i++) {
+                if (var->VariableName[i] > 127 ||
+                    hex_to_bin(var->VariableName[i] & 0xff) < 0)
+                        return true;
+        }
+
+        /* Reject it if there's 4 digits of hex and then further content */
+        if (namelen > match + 4)
+                return false;
+
+        /* A valid entry must be at least 8 bytes */
+        if (len < 8)
+                return false;
+
+        filepathlength = buffer[4] | buffer[5] << 8;
+
+        /*
+         * There's no stored length for the description, so it has to be
+         * found by hand
+         */
+        desclength = utf16_strsize((efi_char16_t *)(buffer + 6), len - 6) + 2;
+
+        /* Each boot entry must have a descriptor */
+        if (!desclength)
+                return false;
+
+        /*
+         * If the sum of the length of the description, the claimed filepath
+         * length and the original header are greater than the length of the
+         * variable, it's malformed
+         */
+        if ((desclength + filepathlength + 6) > len)
+                return false;
+
+        /*
+         * And, finally, check the filepath
+         */
+        return validate_device_path(var, match, buffer + desclength + 6,
+                                    filepathlength);
+}
+
+static bool
+validate_uint16(struct efi_variable *var, int match, u8 *buffer,
+                unsigned long len)
+{
+        /* A single 16-bit integer */
+        if (len != 2)
+                return false;
+
+        return true;
+}
+
+static bool
+validate_ascii_string(struct efi_variable *var, int match, u8 *buffer,
+                      unsigned long len)
+{
+        int i;
+
+        for (i = 0; i < len; i++) {
+                if (buffer[i] > 127)
+                        return false;
+
+                if (buffer[i] == 0)
+                        return true;
+        }
+
+        return false;
+}
+
+struct variable_validate {
+        char *name;
+        bool (*validate)(struct efi_variable *var, int match, u8 *data,
+                         unsigned long len);
+};
+
+static const struct variable_validate variable_validate[] = {
+        { "BootNext", validate_uint16 },
+        { "BootOrder", validate_boot_order },
+        { "DriverOrder", validate_boot_order },
+        { "Boot*", validate_load_option },
+        { "Driver*", validate_load_option },
+        { "ConIn", validate_device_path },
+        { "ConInDev", validate_device_path },
+        { "ConOut", validate_device_path },
+        { "ConOutDev", validate_device_path },
+        { "ErrOut", validate_device_path },
+        { "ErrOutDev", validate_device_path },
+        { "Timeout", validate_uint16 },
+        { "Lang", validate_ascii_string },
+        { "PlatformLang", validate_ascii_string },
+        { "", NULL },
+};
+
+static bool
+validate_var(struct efi_variable *var, u8 *data, unsigned long len)
+{
+        int i;
+        u16 *unicode_name = var->VariableName;
+
+        for (i = 0; variable_validate[i].validate != NULL; i++) {
+                const char *name = variable_validate[i].name;
+                int match;
+
+                for (match = 0; ; match++) {
+                        char c = name[match];
+                        u16 u = unicode_name[match];
+
+                        /* All special variables are plain ascii */
+                        if (u > 127)
+                                return true;
+
+                        /* Wildcard in the matching name means we've matched */
+                        if (c == '*')
+                                return variable_validate[i].validate(var,
+                                                             match, data, len);
+
+                        /* Case sensitive match */
+                        if (c != u)
+                                break;
+
+                        /* Reached the end of the string while matching */
+                        if (!c)
+                                return variable_validate[i].validate(var,
+                                                             match, data, len);
+                }
+        }
+
+        return true;
+}
+
 static efi_status_t
 get_var_data_locked(struct efivars *efivars, struct efi_variable *var)
 {
@@ -324,6 +508,12 @@ efivar_store_raw(struct efivar_entry *entry, const char *buf, size_t count)
                 return -EINVAL;
         }
 
+        if ((new_var->Attributes & ~EFI_VARIABLE_MASK) != 0 ||
+            validate_var(new_var, new_var->Data, new_var->DataSize) == false) {
+                printk(KERN_ERR "efivars: Malformed variable content\n");
+                return -EINVAL;
+        }
+
         spin_lock(&efivars->lock);
         status = efivars->ops->set_variable(new_var->VariableName,
                                             &new_var->VendorGuid,
@@ -626,6 +816,12 @@ static ssize_t efivar_create(struct file *filp, struct kobject *kobj,
         if (!capable(CAP_SYS_ADMIN))
                 return -EACCES;
 
+        if ((new_var->Attributes & ~EFI_VARIABLE_MASK) != 0 ||
+            validate_var(new_var, new_var->Data, new_var->DataSize) == false) {
+                printk(KERN_ERR "efivars: Malformed variable content\n");
+                return -EINVAL;
+        }
+
         spin_lock(&efivars->lock);
 
         /*
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 1adc2ec1e383..4461540653a8 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -965,18 +965,15 @@ static void omap_gpio_mod_init(struct gpio_bank *bank)
         }
 
         _gpio_rmw(base, bank->regs->irqenable, l, bank->regs->irqenable_inv);
-        _gpio_rmw(base, bank->regs->irqstatus, l,
-                                        bank->regs->irqenable_inv == false);
-        _gpio_rmw(base, bank->regs->irqenable, l, bank->regs->debounce_en != 0);
-        _gpio_rmw(base, bank->regs->irqenable, l, bank->regs->ctrl != 0);
+        _gpio_rmw(base, bank->regs->irqstatus, l, !bank->regs->irqenable_inv);
         if (bank->regs->debounce_en)
-                _gpio_rmw(base, bank->regs->debounce_en, 0, 1);
+                __raw_writel(0, base + bank->regs->debounce_en);
 
         /* Save OE default value (0xffffffff) in the context */
         bank->context.oe = __raw_readl(bank->base + bank->regs->direction);
          /* Initialize interface clk ungated, module enabled */
         if (bank->regs->ctrl)
-                _gpio_rmw(base, bank->regs->ctrl, 0, 1);
+                __raw_writel(0, base + bank->regs->ctrl);
 }
 
 static __devinit void
diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c
index e8729cc2ba2b..2cd958e0b822 100644
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@ -230,16 +230,12 @@ static void pch_gpio_setup(struct pch_gpio *chip)
 
 static int pch_irq_type(struct irq_data *d, unsigned int type)
 {
-        u32 im;
-        u32 __iomem *im_reg;
-        u32 ien;
-        u32 im_pos;
-        int ch;
-        unsigned long flags;
-        u32 val;
-        int irq = d->irq;
         struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
         struct pch_gpio *chip = gc->private;
+        u32 im, im_pos, val;
+        u32 __iomem *im_reg;
+        unsigned long flags;
+        int ch, irq = d->irq;
 
         ch = irq - chip->irq_base;
         if (irq <= chip->irq_base + 7) {
@@ -270,30 +266,22 @@ static int pch_irq_type(struct irq_data *d, unsigned int type)
         case IRQ_TYPE_LEVEL_LOW:
                 val = PCH_LEVEL_L;
                 break;
-        case IRQ_TYPE_PROBE:
-                goto end;
         default:
-                dev_warn(chip->dev, "%s: unknown type(%dd)",
-                        __func__, type);
-                goto end;
+                goto unlock;
         }
 
         /* Set interrupt mode */
         im = ioread32(im_reg) & ~(PCH_IM_MASK << (im_pos * 4));
         iowrite32(im | (val << (im_pos * 4)), im_reg);
 
-        /* iclr */
-        iowrite32(BIT(ch), &chip->reg->iclr);
+        /* And the handler */
+        if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
+                __irq_set_handler_locked(d->irq, handle_level_irq);
+        else if (type & (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING))
+                __irq_set_handler_locked(d->irq, handle_edge_irq);
 
-        /* IMASKCLR */
-        iowrite32(BIT(ch), &chip->reg->imaskclr);
-
-        /* Enable interrupt */
-        ien = ioread32(&chip->reg->ien);
-        iowrite32(ien | BIT(ch), &chip->reg->ien);
-end:
+unlock:
         spin_unlock_irqrestore(&chip->spinlock, flags);
-
         return 0;
 }
 
@@ -313,18 +301,24 @@ static void pch_irq_mask(struct irq_data *d)
         iowrite32(1 << (d->irq - chip->irq_base), &chip->reg->imask);
 }
 
+static void pch_irq_ack(struct irq_data *d)
+{
+        struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
+        struct pch_gpio *chip = gc->private;
+
+        iowrite32(1 << (d->irq - chip->irq_base), &chip->reg->iclr);
+}
+
 static irqreturn_t pch_gpio_handler(int irq, void *dev_id)
 {
         struct pch_gpio *chip = dev_id;
         u32 reg_val = ioread32(&chip->reg->istatus);
-        int i;
-        int ret = IRQ_NONE;
+        int i, ret = IRQ_NONE;
 
         for (i = 0; i < gpio_pins[chip->ioh]; i++) {
                 if (reg_val & BIT(i)) {
                         dev_dbg(chip->dev, "%s:[%d]:irq=%d  status=0x%x\n",
                                 __func__, i, irq, reg_val);
-                        iowrite32(BIT(i), &chip->reg->iclr);
                         generic_handle_irq(chip->irq_base + i);
                         ret = IRQ_HANDLED;
                 }
@@ -343,6 +337,7 @@ static __devinit void pch_gpio_alloc_generic_chip(struct pch_gpio *chip,
         gc->private = chip;
         ct = gc->chip_types;
 
+        ct->chip.irq_ack = pch_irq_ack;
         ct->chip.irq_mask = pch_irq_mask;
         ct->chip.irq_unmask = pch_irq_unmask;
         ct->chip.irq_set_type = pch_irq_type;
@@ -357,6 +352,7 @@ static int __devinit pch_gpio_probe(struct pci_dev *pdev,
         s32 ret;
         struct pch_gpio *chip;
         int irq_base;
+        u32 msk;
 
         chip = kzalloc(sizeof(*chip), GFP_KERNEL);
         if (chip == NULL)
@@ -408,8 +404,13 @@ static int __devinit pch_gpio_probe(struct pci_dev *pdev,
         }
         chip->irq_base = irq_base;
 
+        /* Mask all interrupts, but enable them */
+        msk = (1 << gpio_pins[chip->ioh]) - 1;
+        iowrite32(msk, &chip->reg->imask);
+        iowrite32(msk, &chip->reg->ien);
+
         ret = request_irq(pdev->irq, pch_gpio_handler,
-                             IRQF_SHARED, KBUILD_MODNAME, chip);
+                          IRQF_SHARED, KBUILD_MODNAME, chip);
         if (ret != 0) {
                 dev_err(&pdev->dev,
                         "%s request_irq failed\n", __func__);
@@ -418,8 +419,6 @@ static int __devinit pch_gpio_probe(struct pci_dev *pdev,
 
         pch_gpio_alloc_generic_chip(chip, irq_base, gpio_pins[chip->ioh]);
 
-        /* Initialize interrupt ien register */
-        iowrite32(0, &chip->reg->ien);
 end:
         return 0;
 
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index 5689ce62fd81..fc3ace3fd4cb 100644
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -64,6 +64,7 @@ struct pxa_gpio_chip {
         unsigned long   irq_mask;
         unsigned long   irq_edge_rise;
         unsigned long   irq_edge_fall;
+        int (*set_wake)(unsigned int gpio, unsigned int on);
 
 #ifdef CONFIG_PM
         unsigned long   saved_gplr;
@@ -269,7 +270,8 @@ static void pxa_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
                                 (value ? GPSR_OFFSET : GPCR_OFFSET));
 }
 
-static int __devinit pxa_init_gpio_chip(int gpio_end)
+static int __devinit pxa_init_gpio_chip(int gpio_end,
+                                        int (*set_wake)(unsigned int, unsigned int))
 {
         int i, gpio, nbanks = gpio_to_bank(gpio_end) + 1;
         struct pxa_gpio_chip *chips;
@@ -285,6 +287,7 @@ static int __devinit pxa_init_gpio_chip(int gpio_end)
 
                 sprintf(chips[i].label, "gpio-%d", i);
                 chips[i].regbase = gpio_reg_base + BANK_OFF(i);
+                chips[i].set_wake = set_wake;
 
                 c->base  = gpio;
                 c->label = chips[i].label;
@@ -412,6 +415,17 @@ static void pxa_mask_muxed_gpio(struct irq_data *d)
         writel_relaxed(gfer, c->regbase + GFER_OFFSET);
 }
 
+static int pxa_gpio_set_wake(struct irq_data *d, unsigned int on)
+{
+        int gpio = pxa_irq_to_gpio(d->irq);
+        struct pxa_gpio_chip *c = gpio_to_pxachip(gpio);
+
+        if (c->set_wake)
+                return c->set_wake(gpio, on);
+        else
+                return 0;
+}
+
 static void pxa_unmask_muxed_gpio(struct irq_data *d)
 {
         int gpio = pxa_irq_to_gpio(d->irq);
@@ -427,6 +441,7 @@ static struct irq_chip pxa_muxed_gpio_chip = {
         .irq_mask       = pxa_mask_muxed_gpio,
         .irq_unmask     = pxa_unmask_muxed_gpio,
         .irq_set_type   = pxa_gpio_irq_type,
+        .irq_set_wake   = pxa_gpio_set_wake,
 };
 
 static int pxa_gpio_nums(void)
@@ -471,6 +486,7 @@ static int __devinit pxa_gpio_probe(struct platform_device *pdev)
         struct pxa_gpio_chip *c;
         struct resource *res;
         struct clk *clk;
+        struct pxa_gpio_platform_data *info;
         int gpio, irq, ret;
         int irq0 = 0, irq1 = 0, irq_mux, gpio_offset = 0;
 
@@ -516,7 +532,8 @@ static int __devinit pxa_gpio_probe(struct platform_device *pdev)
         }
 
         /* Initialize GPIO chips */
-        pxa_init_gpio_chip(pxa_last_gpio);
+        info = dev_get_platdata(&pdev->dev);
+        pxa_init_gpio_chip(pxa_last_gpio, info ? info->gpio_set_wake : NULL);
 
         /* clear all GPIO edge detects */
         for_each_gpio_chip(gpio, c) {
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index 19d6fc0229c3..e991d9171961 100644
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -452,12 +452,14 @@ static struct samsung_gpio_cfg s3c24xx_gpiocfg_banka = {
 };
 #endif
 
+#if defined(CONFIG_ARCH_EXYNOS4) || defined(CONFIG_ARCH_EXYNOS5)
 static struct samsung_gpio_cfg exynos_gpio_cfg = {
         .set_pull       = exynos_gpio_setpull,
         .get_pull       = exynos_gpio_getpull,
         .set_config     = samsung_gpio_setcfg_4bit,
         .get_config     = samsung_gpio_getcfg_4bit,
 };
+#endif
 
 #if defined(CONFIG_CPU_S5P6440) || defined(CONFIG_CPU_S5P6450)
 static struct samsung_gpio_cfg s5p64x0_gpio_cfg_rbank = {
@@ -2123,8 +2125,8 @@ static struct samsung_gpio_chip s5pv210_gpios_4bit[] = {
  * uses the above macro and depends on the banks being listed in order here.
  */
 
-static struct samsung_gpio_chip exynos4_gpios_1[] = {
 #ifdef CONFIG_ARCH_EXYNOS4
+static struct samsung_gpio_chip exynos4_gpios_1[] = {
         {
                 .chip   = {
                         .base   = EXYNOS4_GPA0(0),
@@ -2222,11 +2224,11 @@ static struct samsung_gpio_chip exynos4_gpios_1[] = {
                         .label  = "GPF3",
                 },
         },
-#endif
 };
+#endif
 
-static struct samsung_gpio_chip exynos4_gpios_2[] = {
 #ifdef CONFIG_ARCH_EXYNOS4
+static struct samsung_gpio_chip exynos4_gpios_2[] = {
         {
                 .chip   = {
                         .base   = EXYNOS4_GPJ0(0),
@@ -2367,11 +2369,11 @@ static struct samsung_gpio_chip exynos4_gpios_2[] = {
                         .to_irq = samsung_gpiolib_to_irq,
                 },
         },
-#endif
 };
+#endif
 
-static struct samsung_gpio_chip exynos4_gpios_3[] = {
 #ifdef CONFIG_ARCH_EXYNOS4
+static struct samsung_gpio_chip exynos4_gpios_3[] = {
         {
                 .chip   = {
                         .base   = EXYNOS4_GPZ(0),
@@ -2379,8 +2381,8 @@ static struct samsung_gpio_chip exynos4_gpios_3[] = {
                         .label  = "GPZ",
                 },
         },
-#endif
 };
+#endif
 
 #ifdef CONFIG_ARCH_EXYNOS5
 static struct samsung_gpio_chip exynos5_gpios_1[] = {
@@ -2719,7 +2721,9 @@ static __init int samsung_gpiolib_init(void)
 {
         struct samsung_gpio_chip *chip;
         int i, nr_chips;
+#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS5250)
         void __iomem *gpio_base1, *gpio_base2, *gpio_base3, *gpio_base4;
+#endif
         int group = 0;
 
         samsung_gpiolib_set_cfg(samsung_gpio_cfgs, ARRAY_SIZE(samsung_gpio_cfgs));
@@ -2971,6 +2975,7 @@ static __init int samsung_gpiolib_init(void)
 
         return 0;
 
+#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS5250)
 err_ioremap4:
         iounmap(gpio_base3);
 err_ioremap3:
@@ -2979,6 +2984,7 @@ err_ioremap2:
         iounmap(gpio_base1);
 err_ioremap1:
         return -ENOMEM;
+#endif
 }
 core_initcall(samsung_gpiolib_init);
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index 392ce71ed6a1..1dffa8359f88 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -149,22 +149,12 @@ static int exynos_drm_gem_map_pages(struct drm_gem_object *obj,
         unsigned long pfn;
 
         if (exynos_gem_obj->flags & EXYNOS_BO_NONCONTIG) {
-                unsigned long usize = buf->size;
-
                 if (!buf->pages)
                         return -EINTR;
 
-                while (usize > 0) {
-                        pfn = page_to_pfn(buf->pages[page_offset++]);
-                        vm_insert_mixed(vma, f_vaddr, pfn);
-                        f_vaddr += PAGE_SIZE;
-                        usize -= PAGE_SIZE;
-                }
-
-                return 0;
-        }
-
-        pfn = (buf->dma_addr >> PAGE_SHIFT) + page_offset;
+                pfn = page_to_pfn(buf->pages[page_offset++]);
+        } else
+                pfn = (buf->dma_addr >> PAGE_SHIFT) + page_offset;
 
         return vm_insert_mixed(vma, f_vaddr, pfn);
 }
@@ -524,6 +514,8 @@ static int exynos_drm_gem_mmap_buffer(struct file *filp,
                 if (!buffer->pages)
                         return -EINVAL;
 
+                vma->vm_flags |= VM_MIXEDMAP;
+
                 do {
                         ret = vm_insert_page(vma, uaddr, buffer->pages[i++]);
                         if (ret) {
@@ -710,7 +702,6 @@ int exynos_drm_gem_dumb_destroy(struct drm_file *file_priv,
 int exynos_drm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct drm_gem_object *obj = vma->vm_private_data;
-        struct exynos_drm_gem_obj *exynos_gem_obj = to_exynos_gem_obj(obj);
         struct drm_device *dev = obj->dev;
         unsigned long f_vaddr;
         pgoff_t page_offset;
@@ -722,21 +713,10 @@ int exynos_drm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 
         mutex_lock(&dev->struct_mutex);
 
-        /*
-         * allocate all pages as desired size if user wants to allocate
-         * physically non-continuous memory.
-         */
-        if (exynos_gem_obj->flags & EXYNOS_BO_NONCONTIG) {
-                ret = exynos_drm_gem_get_pages(obj);
-                if (ret < 0)
-                        goto err;
-        }
-
         ret = exynos_drm_gem_map_pages(obj, vma, f_vaddr, page_offset);
         if (ret < 0)
                 DRM_ERROR("failed to map pages.\n");
 
-err:
         mutex_unlock(&dev->struct_mutex);
 
         return convert_to_vm_err_msg(ret);
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index b505b70dba05..e6162a1681f0 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1224,6 +1224,9 @@ static int i915_emon_status(struct seq_file *m, void *unused)
         unsigned long temp, chipset, gfx;
         int ret;
 
+        if (!IS_GEN5(dev))
+                return -ENODEV;
+
         ret = mutex_lock_interruptible(&dev->struct_mutex);
         if (ret)
                 return ret;
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 785f67f963ef..ba60f3c8f911 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1701,6 +1701,9 @@ void i915_update_gfx_val(struct drm_i915_private *dev_priv)
         unsigned long diffms;
         u32 count;
 
+        if (dev_priv->info->gen != 5)
+                return;
+
         getrawmonotonic(&now);
         diff1 = timespec_sub(now, dev_priv->last_time2);
 
@@ -2121,12 +2124,14 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
         setup_timer(&dev_priv->hangcheck_timer, i915_hangcheck_elapsed,
                     (unsigned long) dev);
 
-        spin_lock(&mchdev_lock);
-        i915_mch_dev = dev_priv;
-        dev_priv->mchdev_lock = &mchdev_lock;
-        spin_unlock(&mchdev_lock);
+        if (IS_GEN5(dev)) {
+                spin_lock(&mchdev_lock);
+                i915_mch_dev = dev_priv;
+                dev_priv->mchdev_lock = &mchdev_lock;
+                spin_unlock(&mchdev_lock);
 
-        ips_ping_for_i915_load();
+                ips_ping_for_i915_load();
+        }
 
         return 0;
 
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index f51a696486cb..de431942ded4 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1133,6 +1133,11 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
                         return -EINVAL;
                 }
 
+                if (args->num_cliprects > UINT_MAX / sizeof(*cliprects)) {
+                        DRM_DEBUG("execbuf with %u cliprects\n",
+                                  args->num_cliprects);
+                        return -EINVAL;
+                }
                 cliprects = kmalloc(args->num_cliprects * sizeof(*cliprects),
                                     GFP_KERNEL);
                 if (cliprects == NULL) {
@@ -1404,7 +1409,8 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data,
         struct drm_i915_gem_exec_object2 *exec2_list = NULL;
         int ret;
 
-        if (args->buffer_count < 1) {
+        if (args->buffer_count < 1 ||
+            args->buffer_count > UINT_MAX / sizeof(*exec2_list)) {
                 DRM_DEBUG("execbuf2 with %d buffers\n", args->buffer_count);
                 return -EINVAL;
         }
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index b4bb1ef77ddc..9d24d65f0c3e 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -568,6 +568,7 @@
 #define   CM0_MASK_SHIFT          16
 #define   CM0_IZ_OPT_DISABLE      (1<<6)
 #define   CM0_ZR_OPT_DISABLE      (1<<5)
+#define   CM0_STC_EVICT_DISABLE_LRA_SNB (1<<5)
 #define   CM0_DEPTH_EVICT_DISABLE (1<<4)
 #define   CM0_COLOR_EVICT_DISABLE (1<<3)
 #define   CM0_DEPTH_WRITE_DISABLE (1<<1)
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 4d3d736a4f56..90b9793fd5da 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -430,8 +430,8 @@ intel_crt_detect(struct drm_connector *connector, bool force)
 {
         struct drm_device *dev = connector->dev;
         struct intel_crt *crt = intel_attached_crt(connector);
-        struct drm_crtc *crtc;
         enum drm_connector_status status;
+        struct intel_load_detect_pipe tmp;
 
         if (I915_HAS_HOTPLUG(dev)) {
                 if (intel_crt_detect_hotplug(connector)) {
@@ -450,23 +450,16 @@ intel_crt_detect(struct drm_connector *connector, bool force)
                 return connector->status;
 
         /* for pre-945g platforms use load detect */
-        crtc = crt->base.base.crtc;
-        if (crtc && crtc->enabled) {
-                status = intel_crt_load_detect(crt);
-        } else {
-                struct intel_load_detect_pipe tmp;
-
-                if (intel_get_load_detect_pipe(&crt->base, connector, NULL,
-                                               &tmp)) {
-                        if (intel_crt_detect_ddc(connector))
-                                status = connector_status_connected;
-                        else
-                                status = intel_crt_load_detect(crt);
-                        intel_release_load_detect_pipe(&crt->base, connector,
-                                                       &tmp);
-                } else
-                        status = connector_status_unknown;
-        }
+        if (intel_get_load_detect_pipe(&crt->base, connector, NULL,
+                                       &tmp)) {
+                if (intel_crt_detect_ddc(connector))
+                        status = connector_status_connected;
+                else
+                        status = intel_crt_load_detect(crt);
+                intel_release_load_detect_pipe(&crt->base, connector,
+                                               &tmp);
+        } else
+                status = connector_status_unknown;
 
         return status;
 }
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 5908cd563400..1b1cf3b3ff51 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7072,9 +7072,6 @@ static void intel_decrease_pllclock(struct drm_crtc *crtc)
         struct drm_device *dev = crtc->dev;
         drm_i915_private_t *dev_priv = dev->dev_private;
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-        int pipe = intel_crtc->pipe;
-        int dpll_reg = DPLL(pipe);
-        int dpll = I915_READ(dpll_reg);
 
         if (HAS_PCH_SPLIT(dev))
                 return;
@@ -7087,10 +7084,15 @@ static void intel_decrease_pllclock(struct drm_crtc *crtc)
          * the manual case.
          */
         if (!HAS_PIPE_CXSR(dev) && intel_crtc->lowfreq_avail) {
+                int pipe = intel_crtc->pipe;
+                int dpll_reg = DPLL(pipe);
+                u32 dpll;
+
                 DRM_DEBUG_DRIVER("downclocking LVDS\n");
 
                 assert_panel_unlocked(dev_priv, pipe);
 
+                dpll = I915_READ(dpll_reg);
                 dpll |= DISPLAY_RATE_SELECT_FPA1;
                 I915_WRITE(dpll_reg, dpll);
                 intel_wait_for_vblank(dev, pipe);
@@ -7098,7 +7100,6 @@ static void intel_decrease_pllclock(struct drm_crtc *crtc)
                 if (!(dpll & DISPLAY_RATE_SELECT_FPA1))
                         DRM_DEBUG_DRIVER("failed to downclock LVDS!\n");
         }
-
 }
 
 /**
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index cae3e5f17a49..2d7f47b56b6a 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -136,7 +136,7 @@ static void i9xx_write_infoframe(struct drm_encoder *encoder,
 
         val &= ~VIDEO_DIP_SELECT_MASK;
 
-        I915_WRITE(VIDEO_DIP_CTL, val | port | flags);
+        I915_WRITE(VIDEO_DIP_CTL, VIDEO_DIP_ENABLE | val | port | flags);
 
         for (i = 0; i < len; i += 4) {
                 I915_WRITE(VIDEO_DIP_DATA, *data);
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 30e2c82101de..9c71183629c2 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -750,7 +750,7 @@ static const struct dmi_system_id intel_no_lvds[] = {
                 .ident = "Hewlett-Packard t5745",
                 .matches = {
                         DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
-                        DMI_MATCH(DMI_BOARD_NAME, "hp t5745"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "hp t5745"),
                 },
         },
         {
@@ -758,7 +758,7 @@ static const struct dmi_system_id intel_no_lvds[] = {
                 .ident = "Hewlett-Packard st5747",
                 .matches = {
                         DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
-                        DMI_MATCH(DMI_BOARD_NAME, "hp st5747"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "hp st5747"),
                 },
         },
         {
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index f75806e5bff5..62892a826ede 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -398,6 +398,17 @@ static int init_render_ring(struct intel_ring_buffer *ring)
                         return ret;
         }
 
+
+        if (IS_GEN6(dev)) {
+                /* From the Sandybridge PRM, volume 1 part 3, page 24:
+                 * "If this bit is set, STCunit will have LRA as replacement
+                 *  policy. [...] This bit must be reset.  LRA replacement
+                 *  policy is not supported."
+                 */
+                I915_WRITE(CACHE_MODE_0,
+                           CM0_STC_EVICT_DISABLE_LRA_SNB << CM0_MASK_SHIFT);
+        }
+
         if (INTEL_INFO(dev)->gen >= 6) {
                 I915_WRITE(INSTPM,
                            INSTPM_FORCE_ORDERING << 16 | INSTPM_FORCE_ORDERING);
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index e36b171c1e7d..ae5e748f39bb 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -731,6 +731,7 @@ static void intel_sdvo_get_dtd_from_mode(struct intel_sdvo_dtd *dtd,
         uint16_t width, height;
         uint16_t h_blank_len, h_sync_len, v_blank_len, v_sync_len;
         uint16_t h_sync_offset, v_sync_offset;
+        int mode_clock;
 
         width = mode->crtc_hdisplay;
         height = mode->crtc_vdisplay;
@@ -745,7 +746,11 @@ static void intel_sdvo_get_dtd_from_mode(struct intel_sdvo_dtd *dtd,
         h_sync_offset = mode->crtc_hsync_start - mode->crtc_hblank_start;
         v_sync_offset = mode->crtc_vsync_start - mode->crtc_vblank_start;
 
-        dtd->part1.clock = mode->clock / 10;
+        mode_clock = mode->clock;
+        mode_clock /= intel_mode_get_pixel_multiplier(mode) ?: 1;
+        mode_clock /= 10;
+        dtd->part1.clock = mode_clock;
+
         dtd->part1.h_active = width & 0xff;
         dtd->part1.h_blank = h_blank_len & 0xff;
         dtd->part1.h_high = (((width >> 8) & 0xf) << 4) |
@@ -996,7 +1001,7 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder,
         struct intel_sdvo *intel_sdvo = to_intel_sdvo(encoder);
         u32 sdvox;
         struct intel_sdvo_in_out_map in_out;
-        struct intel_sdvo_dtd input_dtd;
+        struct intel_sdvo_dtd input_dtd, output_dtd;
         int pixel_multiplier = intel_mode_get_pixel_multiplier(adjusted_mode);
         int rate;
 
@@ -1021,20 +1026,13 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder,
                                           intel_sdvo->attached_output))
                 return;
 
-        /* We have tried to get input timing in mode_fixup, and filled into
-         * adjusted_mode.
-         */
-        if (intel_sdvo->is_tv || intel_sdvo->is_lvds) {
-                input_dtd = intel_sdvo->input_dtd;
-        } else {
-                /* Set the output timing to the screen */
-                if (!intel_sdvo_set_target_output(intel_sdvo,
-                                                  intel_sdvo->attached_output))
-                        return;
-
-                intel_sdvo_get_dtd_from_mode(&input_dtd, adjusted_mode);
-                (void) intel_sdvo_set_output_timing(intel_sdvo, &input_dtd);
-        }
+        /* lvds has a special fixed output timing. */
+        if (intel_sdvo->is_lvds)
+                intel_sdvo_get_dtd_from_mode(&output_dtd,
+                                             intel_sdvo->sdvo_lvds_fixed_mode);
+        else
+                intel_sdvo_get_dtd_from_mode(&output_dtd, mode);
+        (void) intel_sdvo_set_output_timing(intel_sdvo, &output_dtd);
 
         /* Set the input timing to the screen. Assume always input 0. */
         if (!intel_sdvo_set_target_input(intel_sdvo))
@@ -1052,6 +1050,10 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder,
             !intel_sdvo_set_tv_format(intel_sdvo))
                 return;
 
+        /* We have tried to get input timing in mode_fixup, and filled into
+         * adjusted_mode.
+         */
+        intel_sdvo_get_dtd_from_mode(&input_dtd, adjusted_mode);
         (void) intel_sdvo_set_input_timing(intel_sdvo, &input_dtd);
 
         switch (pixel_multiplier) {
@@ -1218,8 +1220,14 @@ static bool intel_sdvo_get_capabilities(struct intel_sdvo *intel_sdvo, struct in
 
 static int intel_sdvo_supports_hotplug(struct intel_sdvo *intel_sdvo)
 {
+        struct drm_device *dev = intel_sdvo->base.base.dev;
         u8 response[2];
 
+        /* HW Erratum: SDVO Hotplug is broken on all i945G chips, there's noise
+         * on the line. */
+        if (IS_I945G(dev) || IS_I945GM(dev))
+                return false;
+
         return intel_sdvo_get_value(intel_sdvo, SDVO_CMD_GET_HOT_PLUG_SUPPORT,
                                     &response, 2) && response[0];
 }
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
index 7814a760c164..284bd25d5d21 100644
--- a/drivers/gpu/drm/nouveau/nouveau_acpi.c
+++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
@@ -270,7 +270,7 @@ static bool nouveau_dsm_detect(void)
         struct acpi_buffer buffer = {sizeof(acpi_method_name), acpi_method_name};
         struct pci_dev *pdev = NULL;
         int has_dsm = 0;
-        int has_optimus;
+        int has_optimus = 0;
         int vga_count = 0;
         bool guid_valid;
         int retval;
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 80963d05b54a..0be4a815e706 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -6156,10 +6156,14 @@ dcb_fake_connectors(struct nvbios *bios)
 
         /* heuristic: if we ever get a non-zero connector field, assume
          * that all the indices are valid and we don't need fake them.
+         *
+         * and, as usual, a blacklist of boards with bad bios data..
          */
-        for (i = 0; i < dcbt->entries; i++) {
-                if (dcbt->entry[i].connector)
-                        return;
+        if (!nv_match_device(bios->dev, 0x0392, 0x107d, 0x20a2)) {
+                for (i = 0; i < dcbt->entries; i++) {
+                        if (dcbt->entry[i].connector)
+                                return;
+                }
         }
 
         /* no useful connector info available, we need to make it up
diff --git a/drivers/gpu/drm/nouveau/nouveau_hdmi.c b/drivers/gpu/drm/nouveau/nouveau_hdmi.c
index 59ea1c14eca0..c3de36384522 100644
--- a/drivers/gpu/drm/nouveau/nouveau_hdmi.c
+++ b/drivers/gpu/drm/nouveau/nouveau_hdmi.c
@@ -32,7 +32,9 @@ static bool
 hdmi_sor(struct drm_encoder *encoder)
 {
         struct drm_nouveau_private *dev_priv = encoder->dev->dev_private;
-        if (dev_priv->chipset < 0xa3)
+        if (dev_priv->chipset <  0xa3 ||
+            dev_priv->chipset == 0xaa ||
+            dev_priv->chipset == 0xac)
                 return false;
         return true;
 }
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/nouveau_i2c.c
index e2be95af2e52..77e564667b5c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.c
+++ b/drivers/gpu/drm/nouveau/nouveau_i2c.c
@@ -29,10 +29,6 @@
 #include "nouveau_i2c.h"
 #include "nouveau_hw.h"
 
-#define T_TIMEOUT  2200000
-#define T_RISEFALL 1000
-#define T_HOLD     5000
-
 static void
 i2c_drive_scl(void *data, int state)
 {
@@ -113,175 +109,6 @@ i2c_sense_sda(void *data)
         return 0;
 }
 
-static void
-i2c_delay(struct nouveau_i2c_chan *port, u32 nsec)
-{
-        udelay((nsec + 500) / 1000);
-}
-
-static bool
-i2c_raise_scl(struct nouveau_i2c_chan *port)
-{
-        u32 timeout = T_TIMEOUT / T_RISEFALL;
-
-        i2c_drive_scl(port, 1);
-        do {
-                i2c_delay(port, T_RISEFALL);
-        } while (!i2c_sense_scl(port) && --timeout);
-
-        return timeout != 0;
-}
-
-static int
-i2c_start(struct nouveau_i2c_chan *port)
-{
-        int ret = 0;
-
-        port->state  = i2c_sense_scl(port);
-        port->state |= i2c_sense_sda(port) << 1;
-        if (port->state != 3) {
-                i2c_drive_scl(port, 0);
-                i2c_drive_sda(port, 1);
-                if (!i2c_raise_scl(port))
-                        ret = -EBUSY;
-        }
-
-        i2c_drive_sda(port, 0);
-        i2c_delay(port, T_HOLD);
-        i2c_drive_scl(port, 0);
-        i2c_delay(port, T_HOLD);
-        return ret;
-}
-
-static void
-i2c_stop(struct nouveau_i2c_chan *port)
-{
-        i2c_drive_scl(port, 0);
-        i2c_drive_sda(port, 0);
-        i2c_delay(port, T_RISEFALL);
-
-        i2c_drive_scl(port, 1);
-        i2c_delay(port, T_HOLD);
-        i2c_drive_sda(port, 1);
-        i2c_delay(port, T_HOLD);
-}
-
-static int
-i2c_bitw(struct nouveau_i2c_chan *port, int sda)
-{
-        i2c_drive_sda(port, sda);
-        i2c_delay(port, T_RISEFALL);
-
-        if (!i2c_raise_scl(port))
-                return -ETIMEDOUT;
-        i2c_delay(port, T_HOLD);
-
-        i2c_drive_scl(port, 0);
-        i2c_delay(port, T_HOLD);
-        return 0;
-}
-
-static int
-i2c_bitr(struct nouveau_i2c_chan *port)
-{
-        int sda;
-
-        i2c_drive_sda(port, 1);
-        i2c_delay(port, T_RISEFALL);
-
-        if (!i2c_raise_scl(port))
-                return -ETIMEDOUT;
-        i2c_delay(port, T_HOLD);
-
-        sda = i2c_sense_sda(port);
-
-        i2c_drive_scl(port, 0);
-        i2c_delay(port, T_HOLD);
-        return sda;
-}
-
-static int
-i2c_get_byte(struct nouveau_i2c_chan *port, u8 *byte, bool last)
-{
-        int i, bit;
-
-        *byte = 0;
-        for (i = 7; i >= 0; i--) {
-                bit = i2c_bitr(port);
-                if (bit < 0)
-                        return bit;
-                *byte |= bit << i;
-        }
-
-        return i2c_bitw(port, last ? 1 : 0);
-}
-
-static int
-i2c_put_byte(struct nouveau_i2c_chan *port, u8 byte)
-{
-        int i, ret;
-        for (i = 7; i >= 0; i--) {
-                ret = i2c_bitw(port, !!(byte & (1 << i)));
-                if (ret < 0)
-                        return ret;
-        }
-
-        ret = i2c_bitr(port);
-        if (ret == 1) /* nack */
-                ret = -EIO;
-        return ret;
-}
-
-static int
-i2c_addr(struct nouveau_i2c_chan *port, struct i2c_msg *msg)
-{
-        u32 addr = msg->addr << 1;
-        if (msg->flags & I2C_M_RD)
-                addr |= 1;
-        return i2c_put_byte(port, addr);
-}
-
-static int
-i2c_bit_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
-{
-        struct nouveau_i2c_chan *port = (struct nouveau_i2c_chan *)adap;
-        struct i2c_msg *msg = msgs;
-        int ret = 0, mcnt = num;
-
-        while (!ret && mcnt--) {
-                u8 remaining = msg->len;
-                u8 *ptr = msg->buf;
-
-                ret = i2c_start(port);
-                if (ret == 0)
-                        ret = i2c_addr(port, msg);
-
-                if (msg->flags & I2C_M_RD) {
-                        while (!ret && remaining--)
-                                ret = i2c_get_byte(port, ptr++, !remaining);
-                } else {
-                        while (!ret && remaining--)
-                                ret = i2c_put_byte(port, *ptr++);
-                }
-
-                msg++;
-        }
-
-        i2c_stop(port);
-        return (ret < 0) ? ret : num;
-}
-
-static u32
-i2c_bit_func(struct i2c_adapter *adap)
-{
-        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
-}
-
-const struct i2c_algorithm nouveau_i2c_bit_algo = {
-        .master_xfer = i2c_bit_xfer,
-        .functionality = i2c_bit_func
-};
-
 static const uint32_t nv50_i2c_port[] = {
         0x00e138, 0x00e150, 0x00e168, 0x00e180,
         0x00e254, 0x00e274, 0x00e764, 0x00e780,
@@ -384,12 +211,10 @@ nouveau_i2c_init(struct drm_device *dev)
                 case 0: /* NV04:NV50 */
                         port->drive = entry[0];
                         port->sense = entry[1];
-                        port->adapter.algo = &nouveau_i2c_bit_algo;
                         break;
                 case 4: /* NV4E */
                         port->drive = 0x600800 + entry[1];
                         port->sense = port->drive;
-                        port->adapter.algo = &nouveau_i2c_bit_algo;
                         break;
                 case 5: /* NV50- */
                         port->drive = entry[0] & 0x0f;
@@ -402,7 +227,6 @@ nouveau_i2c_init(struct drm_device *dev)
                                 port->drive = 0x00d014 + (port->drive * 0x20);
                                 port->sense = port->drive;
                         }
-                        port->adapter.algo = &nouveau_i2c_bit_algo;
                         break;
                 case 6: /* NV50- DP AUX */
                         port->drive = entry[0];
@@ -413,7 +237,7 @@ nouveau_i2c_init(struct drm_device *dev)
                         break;
                 }
 
-                if (!port->adapter.algo) {
+                if (!port->adapter.algo && !port->drive) {
                         NV_ERROR(dev, "I2C%d: type %d index %x/%x unknown\n",
                                  i, port->type, port->drive, port->sense);
                         kfree(port);
@@ -429,7 +253,26 @@ nouveau_i2c_init(struct drm_device *dev)
                 port->dcb = ROM32(entry[0]);
                 i2c_set_adapdata(&port->adapter, i2c);
 
-                ret = i2c_add_adapter(&port->adapter);
+                if (port->adapter.algo != &nouveau_dp_i2c_algo) {
+                        port->adapter.algo_data = &port->bit;
+                        port->bit.udelay = 10;
+                        port->bit.timeout = usecs_to_jiffies(2200);
+                        port->bit.data = port;
+                        port->bit.setsda = i2c_drive_sda;
+                        port->bit.setscl = i2c_drive_scl;
+                        port->bit.getsda = i2c_sense_sda;
+                        port->bit.getscl = i2c_sense_scl;
+
+                        i2c_drive_scl(port, 0);
+                        i2c_drive_sda(port, 1);
+                        i2c_drive_scl(port, 1);
+
+                        ret = i2c_bit_add_bus(&port->adapter);
+                } else {
+                        port->adapter.algo = &nouveau_dp_i2c_algo;
+                        ret = i2c_add_adapter(&port->adapter);
+                }
+
                 if (ret) {
                         NV_ERROR(dev, "I2C%d: failed register: %d\n", i, ret);
                         kfree(port);
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.h b/drivers/gpu/drm/nouveau/nouveau_i2c.h
index 4d2e4e9031be..1d083893a4d7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.h
+++ b/drivers/gpu/drm/nouveau/nouveau_i2c.h
@@ -34,6 +34,7 @@
 struct nouveau_i2c_chan {
         struct i2c_adapter adapter;
         struct drm_device *dev;
+        struct i2c_algo_bit_data bit;
         struct list_head head;
         u8  index;
         u8  type;
diff --git a/drivers/gpu/drm/nouveau/nv10_gpio.c b/drivers/gpu/drm/nouveau/nv10_gpio.c
index 550ad3fcf0af..9d79180069df 100644
--- a/drivers/gpu/drm/nouveau/nv10_gpio.c
+++ b/drivers/gpu/drm/nouveau/nv10_gpio.c
@@ -65,7 +65,7 @@ nv10_gpio_drive(struct drm_device *dev, int line, int dir, int out)
         if (line < 10) {
                 line = (line - 2) * 4;
                 reg  = NV_PCRTC_GPIO_EXT;
-                mask = 0x00000003 << ((line - 2) * 4);
+                mask = 0x00000003;
                 data = (dir << 1) | out;
         } else
         if (line < 14) {
diff --git a/drivers/gpu/drm/nouveau/nvc0_fb.c b/drivers/gpu/drm/nouveau/nvc0_fb.c
index 5bf55038fd92..f704e942372e 100644
--- a/drivers/gpu/drm/nouveau/nvc0_fb.c
+++ b/drivers/gpu/drm/nouveau/nvc0_fb.c
@@ -54,6 +54,11 @@ nvc0_mfb_isr(struct drm_device *dev)
                         nvc0_mfb_subp_isr(dev, unit, subp);
                 units &= ~(1 << unit);
         }
+
+        /* we do something horribly wrong and upset PMFB a lot, so mask off
+         * interrupts from it after the first one until it's fixed
+         */
+        nv_mask(dev, 0x000640, 0x02000000, 0x00000000);
 }
 
 static void
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index b5ff1f7b6f7e..af1054f8202a 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -575,6 +575,9 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
 
                 if (rdev->family < CHIP_RV770)
                         pll->flags |= RADEON_PLL_PREFER_MINM_OVER_MAXP;
+                /* use frac fb div on APUs */
+                if (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE61(rdev))
+                        pll->flags |= RADEON_PLL_USE_FRAC_FB_DIV;
         } else {
                 pll->flags |= RADEON_PLL_LEGACY;
 
@@ -955,8 +958,8 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode
                 break;
         }
 
-        if (radeon_encoder->active_device &
-            (ATOM_DEVICE_LCD_SUPPORT | ATOM_DEVICE_DFP_SUPPORT)) {
+        if ((radeon_encoder->active_device & (ATOM_DEVICE_LCD_SUPPORT | ATOM_DEVICE_DFP_SUPPORT)) ||
+            (radeon_encoder_get_dp_bridge_encoder_id(encoder) != ENCODER_OBJECT_ID_NONE)) {
                 struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
                 struct drm_connector *connector =
                         radeon_get_connector_for_encoder(encoder);
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index ea7df16e2f84..5992502a3448 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -241,8 +241,8 @@ int radeon_wb_init(struct radeon_device *rdev)
                                 rdev->wb.use_event = true;
                 }
         }
-        /* always use writeback/events on NI */
-        if (ASIC_IS_DCE5(rdev)) {
+        /* always use writeback/events on NI, APUs */
+        if (rdev->family >= CHIP_PALM) {
                 rdev->wb.enabled = true;
                 rdev->wb.use_event = true;
         }
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 8086c96e0b06..0a1d4bd65edc 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -533,7 +533,7 @@ static void radeon_crtc_init(struct drm_device *dev, int index)
                 radeon_legacy_init_crtc(dev, radeon_crtc);
 }
 
-static const char *encoder_names[36] = {
+static const char *encoder_names[37] = {
         "NONE",
         "INTERNAL_LVDS",
         "INTERNAL_TMDS1",
@@ -570,6 +570,7 @@ static const char *encoder_names[36] = {
         "INTERNAL_UNIPHY2",
         "NUTMEG",
         "TRAVIS",
+        "INTERNAL_VCE"
 };
 
 static const char *connector_names[15] = {
diff --git a/drivers/hsi/clients/hsi_char.c b/drivers/hsi/clients/hsi_char.c
index 88a050df2389..3ad91f6447d8 100644
--- a/drivers/hsi/clients/hsi_char.c
+++ b/drivers/hsi/clients/hsi_char.c
@@ -123,7 +123,7 @@ struct hsc_client_data {
 static unsigned int hsc_major;
 /* Maximum buffer size that hsi_char will accept from userspace */
 static unsigned int max_data_size = 0x1000;
-module_param(max_data_size, uint, S_IRUSR | S_IWUSR);
+module_param(max_data_size, uint, 0);
 MODULE_PARM_DESC(max_data_size, "max read/write data size [4,8..65536] (^2)");
 
 static void hsc_add_tail(struct hsc_channel *channel, struct hsi_msg *msg,
diff --git a/drivers/hsi/hsi.c b/drivers/hsi/hsi.c
index 4e2d79b79334..2d58f939d27f 100644
--- a/drivers/hsi/hsi.c
+++ b/drivers/hsi/hsi.c
@@ -21,26 +21,13 @@
  */
 #include <linux/hsi/hsi.h>
 #include <linux/compiler.h>
-#include <linux/rwsem.h>
 #include <linux/list.h>
-#include <linux/spinlock.h>
 #include <linux/kobject.h>
 #include <linux/slab.h>
 #include <linux/string.h>
+#include <linux/notifier.h>
 #include "hsi_core.h"
 
-static struct device_type hsi_ctrl = {
-        .name   = "hsi_controller",
-};
-
-static struct device_type hsi_cl = {
-        .name   = "hsi_client",
-};
-
-static struct device_type hsi_port = {
-        .name   = "hsi_port",
-};
-
 static ssize_t modalias_show(struct device *dev,
                         struct device_attribute *a __maybe_unused, char *buf)
 {
@@ -54,8 +41,7 @@ static struct device_attribute hsi_bus_dev_attrs[] = {
 
 static int hsi_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
-        if (dev->type == &hsi_cl)
-                add_uevent_var(env, "MODALIAS=hsi:%s", dev_name(dev));
+        add_uevent_var(env, "MODALIAS=hsi:%s", dev_name(dev));
 
         return 0;
 }
@@ -80,12 +66,10 @@ static void hsi_client_release(struct device *dev)
 static void hsi_new_client(struct hsi_port *port, struct hsi_board_info *info)
 {
         struct hsi_client *cl;
-        unsigned long flags;
 
         cl = kzalloc(sizeof(*cl), GFP_KERNEL);
         if (!cl)
                 return;
-        cl->device.type = &hsi_cl;
         cl->tx_cfg = info->tx_cfg;
         cl->rx_cfg = info->rx_cfg;
         cl->device.bus = &hsi_bus_type;
@@ -93,14 +77,11 @@ static void hsi_new_client(struct hsi_port *port, struct hsi_board_info *info)
         cl->device.release = hsi_client_release;
         dev_set_name(&cl->device, info->name);
         cl->device.platform_data = info->platform_data;
-        spin_lock_irqsave(&port->clock, flags);
-        list_add_tail(&cl->link, &port->clients);
-        spin_unlock_irqrestore(&port->clock, flags);
         if (info->archdata)
                 cl->device.archdata = *info->archdata;
         if (device_register(&cl->device) < 0) {
                 pr_err("hsi: failed to register client: %s\n", info->name);
-                kfree(cl);
+                put_device(&cl->device);
         }
 }
 
@@ -120,13 +101,6 @@ static void hsi_scan_board_info(struct hsi_controller *hsi)
 
 static int hsi_remove_client(struct device *dev, void *data __maybe_unused)
 {
-        struct hsi_client *cl = to_hsi_client(dev);
-        struct hsi_port *port = to_hsi_port(dev->parent);
-        unsigned long flags;
-
-        spin_lock_irqsave(&port->clock, flags);
-        list_del(&cl->link);
-        spin_unlock_irqrestore(&port->clock, flags);
         device_unregister(dev);
 
         return 0;
@@ -140,12 +114,17 @@ static int hsi_remove_port(struct device *dev, void *data __maybe_unused)
         return 0;
 }
 
-static void hsi_controller_release(struct device *dev __maybe_unused)
+static void hsi_controller_release(struct device *dev)
 {
+        struct hsi_controller *hsi = to_hsi_controller(dev);
+
+        kfree(hsi->port);
+        kfree(hsi);
 }
 
-static void hsi_port_release(struct device *dev __maybe_unused)
+static void hsi_port_release(struct device *dev)
 {
+        kfree(to_hsi_port(dev));
 }
 
 /**
@@ -170,20 +149,12 @@ int hsi_register_controller(struct hsi_controller *hsi)
         unsigned int i;
         int err;
 
-        hsi->device.type = &hsi_ctrl;
-        hsi->device.bus = &hsi_bus_type;
-        hsi->device.release = hsi_controller_release;
-        err = device_register(&hsi->device);
+        err = device_add(&hsi->device);
         if (err < 0)
                 return err;
         for (i = 0; i < hsi->num_ports; i++) {
-                hsi->port[i].device.parent = &hsi->device;
-                hsi->port[i].device.bus = &hsi_bus_type;
-                hsi->port[i].device.release = hsi_port_release;
-                hsi->port[i].device.type = &hsi_port;
-                INIT_LIST_HEAD(&hsi->port[i].clients);
-                spin_lock_init(&hsi->port[i].clock);
-                err = device_register(&hsi->port[i].device);
+                hsi->port[i]->device.parent = &hsi->device;
+                err = device_add(&hsi->port[i]->device);
                 if (err < 0)
                         goto out;
         }
@@ -192,7 +163,9 @@ int hsi_register_controller(struct hsi_controller *hsi)
 
         return 0;
 out:
-        hsi_unregister_controller(hsi);
+        while (i-- > 0)
+                device_del(&hsi->port[i]->device);
+        device_del(&hsi->device);
 
         return err;
 }
@@ -223,6 +196,29 @@ static inline int hsi_dummy_cl(struct hsi_client *cl __maybe_unused)
 }
 
 /**
+ * hsi_put_controller - Free an HSI controller
+ *
+ * @hsi: Pointer to the HSI controller to freed
+ *
+ * HSI controller drivers should only use this function if they need
+ * to free their allocated hsi_controller structures before a successful
+ * call to hsi_register_controller. Other use is not allowed.
+ */
+void hsi_put_controller(struct hsi_controller *hsi)
+{
+        unsigned int i;
+
+        if (!hsi)
+                return;
+
+        for (i = 0; i < hsi->num_ports; i++)
+                if (hsi->port && hsi->port[i])
+                        put_device(&hsi->port[i]->device);
+        put_device(&hsi->device);
+}
+EXPORT_SYMBOL_GPL(hsi_put_controller);
+
+/**
  * hsi_alloc_controller - Allocate an HSI controller and its ports
  * @n_ports: Number of ports on the HSI controller
  * @flags: Kernel allocation flags
@@ -232,55 +228,52 @@ static inline int hsi_dummy_cl(struct hsi_client *cl __maybe_unused)
 struct hsi_controller *hsi_alloc_controller(unsigned int n_ports, gfp_t flags)
 {
         struct hsi_controller   *hsi;
-        struct hsi_port         *port;
+        struct hsi_port         **port;
         unsigned int            i;
 
         if (!n_ports)
                 return NULL;
 
-        port = kzalloc(sizeof(*port)*n_ports, flags);
-        if (!port)
-                return NULL;
         hsi = kzalloc(sizeof(*hsi), flags);
         if (!hsi)
-                goto out;
-        for (i = 0; i < n_ports; i++) {
-                dev_set_name(&port[i].device, "port%d", i);
-                port[i].num = i;
-                port[i].async = hsi_dummy_msg;
-                port[i].setup = hsi_dummy_cl;
-                port[i].flush = hsi_dummy_cl;
-                port[i].start_tx = hsi_dummy_cl;
-                port[i].stop_tx = hsi_dummy_cl;
-                port[i].release = hsi_dummy_cl;
-                mutex_init(&port[i].lock);
+                return NULL;
+        port = kzalloc(sizeof(*port)*n_ports, flags);
+        if (!port) {
+                kfree(hsi);
+                return NULL;
         }
         hsi->num_ports = n_ports;
         hsi->port = port;
+        hsi->device.release = hsi_controller_release;
+        device_initialize(&hsi->device);
+
+        for (i = 0; i < n_ports; i++) {
+                port[i] = kzalloc(sizeof(**port), flags);
+                if (port[i] == NULL)
+                        goto out;
+                port[i]->num = i;
+                port[i]->async = hsi_dummy_msg;
+                port[i]->setup = hsi_dummy_cl;
+                port[i]->flush = hsi_dummy_cl;
+                port[i]->start_tx = hsi_dummy_cl;
+                port[i]->stop_tx = hsi_dummy_cl;
+                port[i]->release = hsi_dummy_cl;
+                mutex_init(&port[i]->lock);
+                ATOMIC_INIT_NOTIFIER_HEAD(&port[i]->n_head);
+                dev_set_name(&port[i]->device, "port%d", i);
+                hsi->port[i]->device.release = hsi_port_release;
+                device_initialize(&hsi->port[i]->device);
+        }
 
         return hsi;
 out:
-        kfree(port);
+        hsi_put_controller(hsi);
 
         return NULL;
 }
 EXPORT_SYMBOL_GPL(hsi_alloc_controller);
 
 /**
- * hsi_free_controller - Free an HSI controller
- * @hsi: Pointer to HSI controller
- */
-void hsi_free_controller(struct hsi_controller *hsi)
-{
-        if (!hsi)
-                return;
-
-        kfree(hsi->port);
-        kfree(hsi);
-}
-EXPORT_SYMBOL_GPL(hsi_free_controller);
-
-/**
  * hsi_free_msg - Free an HSI message
  * @msg: Pointer to the HSI message
  *
@@ -414,37 +407,67 @@ void hsi_release_port(struct hsi_client *cl)
 }
 EXPORT_SYMBOL_GPL(hsi_release_port);
 
-static int hsi_start_rx(struct hsi_client *cl, void *data __maybe_unused)
+static int hsi_event_notifier_call(struct notifier_block *nb,
+                                unsigned long event, void *data __maybe_unused)
 {
-        if (cl->hsi_start_rx)
-                (*cl->hsi_start_rx)(cl);
+        struct hsi_client *cl = container_of(nb, struct hsi_client, nb);
+
+        (*cl->ehandler)(cl, event);
 
         return 0;
 }
 
-static int hsi_stop_rx(struct hsi_client *cl, void *data __maybe_unused)
+/**
+ * hsi_register_port_event - Register a client to receive port events
+ * @cl: HSI client that wants to receive port events
+ * @cb: Event handler callback
+ *
+ * Clients should register a callback to be able to receive
+ * events from the ports. Registration should happen after
+ * claiming the port.
+ * The handler can be called in interrupt context.
+ *
+ * Returns -errno on error, or 0 on success.
+ */
+int hsi_register_port_event(struct hsi_client *cl,
+                        void (*handler)(struct hsi_client *, unsigned long))
 {
-        if (cl->hsi_stop_rx)
-                (*cl->hsi_stop_rx)(cl);
+        struct hsi_port *port = hsi_get_port(cl);
 
-        return 0;
+        if (!handler || cl->ehandler)
+                return -EINVAL;
+        if (!hsi_port_claimed(cl))
+                return -EACCES;
+        cl->ehandler = handler;
+        cl->nb.notifier_call = hsi_event_notifier_call;
+
+        return atomic_notifier_chain_register(&port->n_head, &cl->nb);
 }
+EXPORT_SYMBOL_GPL(hsi_register_port_event);
 
-static int hsi_port_for_each_client(struct hsi_port *port, void *data,
-                                int (*fn)(struct hsi_client *cl, void *data))
+/**
+ * hsi_unregister_port_event - Stop receiving port events for a client
+ * @cl: HSI client that wants to stop receiving port events
+ *
+ * Clients should call this function before releasing their associated
+ * port.
+ *
+ * Returns -errno on error, or 0 on success.
+ */
+int hsi_unregister_port_event(struct hsi_client *cl)
 {
-        struct hsi_client *cl;
+        struct hsi_port *port = hsi_get_port(cl);
+        int err;
 
-        spin_lock(&port->clock);
-        list_for_each_entry(cl, &port->clients, link) {
-                spin_unlock(&port->clock);
-                (*fn)(cl, data);
-                spin_lock(&port->clock);
-        }
-        spin_unlock(&port->clock);
+        WARN_ON(!hsi_port_claimed(cl));
 
-        return 0;
+        err = atomic_notifier_chain_unregister(&port->n_head, &cl->nb);
+        if (!err)
+                cl->ehandler = NULL;
+
+        return err;
 }
+EXPORT_SYMBOL_GPL(hsi_unregister_port_event);
 
 /**
  * hsi_event -Notifies clients about port events
@@ -458,22 +481,12 @@ static int hsi_port_for_each_client(struct hsi_port *port, void *data,
  * Events:
  * HSI_EVENT_START_RX - Incoming wake line high
  * HSI_EVENT_STOP_RX - Incoming wake line down
+ *
+ * Returns -errno on error, or 0 on success.
  */
-void hsi_event(struct hsi_port *port, unsigned int event)
+int hsi_event(struct hsi_port *port, unsigned long event)
 {
-        int (*fn)(struct hsi_client *cl, void *data);
-
-        switch (event) {
-        case HSI_EVENT_START_RX:
-                fn = hsi_start_rx;
-                break;
-        case HSI_EVENT_STOP_RX:
-                fn = hsi_stop_rx;
-                break;
-        default:
-                return;
-        }
-        hsi_port_for_each_client(port, NULL, fn);
+        return atomic_notifier_call_chain(&port->n_head, event, NULL);
 }
 EXPORT_SYMBOL_GPL(hsi_event);
 
diff --git a/drivers/hv/ring_buffer.c b/drivers/hv/ring_buffer.c
index 8af25a097d75..7233c88f01b8 100644
--- a/drivers/hv/ring_buffer.c
+++ b/drivers/hv/ring_buffer.c
@@ -30,37 +30,6 @@
 #include "hyperv_vmbus.h"
 
 
-/* #defines */
-
-
-/* Amount of space to write to */
-#define BYTES_AVAIL_TO_WRITE(r, w, z) \
-        ((w) >= (r)) ? ((z) - ((w) - (r))) : ((r) - (w))
-
-
-/*
- *
- * hv_get_ringbuffer_availbytes()
- *
- * Get number of bytes available to read and to write to
- * for the specified ring buffer
- */
-static inline void
-hv_get_ringbuffer_availbytes(struct hv_ring_buffer_info *rbi,
-                          u32 *read, u32 *write)
-{
-        u32 read_loc, write_loc;
-
-        smp_read_barrier_depends();
-
-        /* Capture the read/write indices before they changed */
-        read_loc = rbi->ring_buffer->read_index;
-        write_loc = rbi->ring_buffer->write_index;
-
-        *write = BYTES_AVAIL_TO_WRITE(read_loc, write_loc, rbi->ring_datasize);
-        *read = rbi->ring_datasize - *write;
-}
-
 /*
  * hv_get_next_write_location()
  *
diff --git a/drivers/hwmon/ad7314.c b/drivers/hwmon/ad7314.c
index ce43642ef03e..f85ce70d9677 100644
--- a/drivers/hwmon/ad7314.c
+++ b/drivers/hwmon/ad7314.c
@@ -47,7 +47,7 @@ struct ad7314_data {
         u16 rx ____cacheline_aligned;
 };
 
-static int ad7314_spi_read(struct ad7314_data *chip, s16 *data)
+static int ad7314_spi_read(struct ad7314_data *chip)
 {
         int ret;
 
@@ -57,9 +57,7 @@ static int ad7314_spi_read(struct ad7314_data *chip, s16 *data)
                 return ret;
         }
 
-        *data = be16_to_cpu(chip->rx);
-
-        return ret;
+        return be16_to_cpu(chip->rx);
 }
 
 static ssize_t ad7314_show_temperature(struct device *dev,
@@ -70,12 +68,12 @@ static ssize_t ad7314_show_temperature(struct device *dev,
         s16 data;
         int ret;
 
-        ret = ad7314_spi_read(chip, &data);
+        ret = ad7314_spi_read(chip);
         if (ret < 0)
                 return ret;
         switch (spi_get_device_id(chip->spi_dev)->driver_data) {
         case ad7314:
-                data = (data & AD7314_TEMP_MASK) >> AD7314_TEMP_OFFSET;
+                data = (ret & AD7314_TEMP_MASK) >> AD7314_TEMP_OFFSET;
                 data = (data << 6) >> 6;
 
                 return sprintf(buf, "%d\n", 250 * data);
@@ -86,7 +84,7 @@ static ssize_t ad7314_show_temperature(struct device *dev,
                  * with a sign bit - which is a 14 bit 2's complement
                  * register.  1lsb - 31.25 milli degrees centigrade
                  */
-                data &= ADT7301_TEMP_MASK;
+                data = ret & ADT7301_TEMP_MASK;
                 data = (data << 2) >> 2;
 
                 return sprintf(buf, "%d\n",
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 0d3141fbbc20..b9d512331ed4 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -52,7 +52,7 @@ module_param_named(tjmax, force_tjmax, int, 0444);
 MODULE_PARM_DESC(tjmax, "TjMax value in degrees Celsius");
 
 #define BASE_SYSFS_ATTR_NO      2       /* Sysfs Base attr no for coretemp */
-#define NUM_REAL_CORES          16      /* Number of Real cores per cpu */
+#define NUM_REAL_CORES          32      /* Number of Real cores per cpu */
 #define CORETEMP_NAME_LENGTH    17      /* String Length of attrs */
 #define MAX_CORE_ATTRS          4       /* Maximum no of basic attrs */
 #define TOTAL_ATTRS             (MAX_CORE_ATTRS + 1)
@@ -709,6 +709,10 @@ static void __cpuinit put_core_offline(unsigned int cpu)
 
         indx = TO_ATTR_NO(cpu);
 
+        /* The core id is too big, just return */
+        if (indx > MAX_CORE_DATA - 1)
+                return;
+
         if (pdata->core_data[indx] && pdata->core_data[indx]->cpu == cpu)
                 coretemp_remove_core(pdata, &pdev->dev, indx);
 
diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c
index 37a8fc92b44a..e8e18cab1fb8 100644
--- a/drivers/hwmon/fam15h_power.c
+++ b/drivers/hwmon/fam15h_power.c
@@ -128,17 +128,20 @@ static bool __devinit fam15h_power_is_internal_node0(struct pci_dev *f4)
  * counter saturations resulting in bogus power readings.
  * We correct this value ourselves to cope with older BIOSes.
  */
+static DEFINE_PCI_DEVICE_TABLE(affected_device) = {
+        { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
+        { 0 }
+};
+
 static void __devinit tweak_runavg_range(struct pci_dev *pdev)
 {
         u32 val;
-        const struct pci_device_id affected_device = {
-                PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) };
 
         /*
          * let this quirk apply only to the current version of the
          * northbridge, since future versions may change the behavior
          */
-        if (!pci_match_id(&affected_device, pdev))
+        if (!pci_match_id(affected_device, pdev))
                 return;
 
         pci_bus_read_config_dword(pdev->bus,
diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c
index f086131cb1c7..c811289b61e2 100644
--- a/drivers/i2c/busses/i2c-eg20t.c
+++ b/drivers/i2c/busses/i2c-eg20t.c
@@ -324,7 +324,7 @@ static s32 pch_i2c_wait_for_xfer_complete(struct i2c_algo_pch_data *adap)
 {
         long ret;
         ret = wait_event_timeout(pch_event,
-                        (adap->pch_event_flag != 0), msecs_to_jiffies(50));
+                        (adap->pch_event_flag != 0), msecs_to_jiffies(1000));
 
         if (ret == 0) {
                 pch_err(adap, "timeout: %x\n", adap->pch_event_flag);
@@ -1063,6 +1063,6 @@ module_exit(pch_pci_exit);
 
 MODULE_DESCRIPTION("Intel EG20T PCH/LAPIS Semico ML7213/ML7223/ML7831 IOH I2C");
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Tomoya MORINAGA. <tomoya-linux@dsn.lapis-semi.com>");
+MODULE_AUTHOR("Tomoya MORINAGA. <tomoya.rohm@gmail.com>");
 module_param(pch_i2c_speed, int, (S_IRUSR | S_IWUSR));
 module_param(pch_clk, int, (S_IRUSR | S_IWUSR));
diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c
index 3d471d56bf15..76b8af44f634 100644
--- a/drivers/i2c/busses/i2c-mxs.c
+++ b/drivers/i2c/busses/i2c-mxs.c
@@ -227,6 +227,7 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg,
                 return -EINVAL;
 
         init_completion(&i2c->cmd_complete);
+        i2c->cmd_err = 0;
 
         flags = stop ? MXS_I2C_CTRL0_POST_SEND_STOP : 0;
 
@@ -252,6 +253,9 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg,
 
         if (i2c->cmd_err == -ENXIO)
                 mxs_i2c_reset(i2c);
+        else
+                writel(MXS_I2C_QUEUECTRL_QUEUE_RUN,
+                                i2c->regs + MXS_I2C_QUEUECTRL_CLR);
 
         dev_dbg(i2c->dev, "Done with err=%d\n", i2c->cmd_err);
 
@@ -299,8 +303,6 @@ static irqreturn_t mxs_i2c_isr(int this_irq, void *dev_id)
                     MXS_I2C_CTRL1_SLAVE_STOP_IRQ | MXS_I2C_CTRL1_SLAVE_IRQ))
                 /* MXS_I2C_CTRL1_OVERSIZE_XFER_TERM_IRQ is only for slaves */
                 i2c->cmd_err = -EIO;
-        else
-                i2c->cmd_err = 0;
 
         is_last_cmd = (readl(i2c->regs + MXS_I2C_QUEUESTAT) &
                 MXS_I2C_QUEUESTAT_WRITE_QUEUE_CNT_MASK) == 0;
@@ -384,8 +386,6 @@ static int __devexit mxs_i2c_remove(struct platform_device *pdev)
         if (ret)
                 return -EBUSY;
 
-        writel(MXS_I2C_QUEUECTRL_QUEUE_RUN,
-                        i2c->regs + MXS_I2C_QUEUECTRL_CLR);
         writel(MXS_I2C_CTRL0_SFTRST, i2c->regs + MXS_I2C_CTRL0_SET);
 
         platform_set_drvdata(pdev, NULL);
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 04be9f82e14b..eb8ad538c79f 100644
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -546,8 +546,7 @@ static int i2c_pnx_controller_suspend(struct platform_device *pdev,
 {
         struct i2c_pnx_algo_data *alg_data = platform_get_drvdata(pdev);
 
-        /* FIXME: shouldn't this be clk_disable? */
-        clk_enable(alg_data->clk);
+        clk_disable(alg_data->clk);
 
         return 0;
 }
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index e978635e60f0..55e5ea62ccee 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -516,6 +516,14 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
         if (likely(i2c_dev->msg_err == I2C_ERR_NONE))
                 return 0;
 
+        /*
+         * NACK interrupt is generated before the I2C controller generates the
+         * STOP condition on the bus. So wait for 2 clock periods before resetting
+         * the controller so that STOP condition has been delivered properly.
+         */
+        if (i2c_dev->msg_err == I2C_ERR_NO_ACK)
+                udelay(DIV_ROUND_UP(2 * 1000000, i2c_dev->bus_clk_rate));
+
         tegra_i2c_init(i2c_dev);
         if (i2c_dev->msg_err == I2C_ERR_NO_ACK) {
                 if (msg->flags & I2C_M_IGNORE_NAK)
diff --git a/drivers/ieee802154/Kconfig b/drivers/ieee802154/Kconfig
index 9b9f43aa2f85..15c064073701 100644
--- a/drivers/ieee802154/Kconfig
+++ b/drivers/ieee802154/Kconfig
@@ -19,4 +19,12 @@ config IEEE802154_FAKEHARD
 
           This driver can also be built as a module. To do so say M here.
           The module will be called 'fakehard'.
+config IEEE802154_FAKELB
+        depends on IEEE802154_DRIVERS && MAC802154
+        tristate "IEEE 802.15.4 loopback driver"
+        ---help---
+          Say Y here to enable the fake driver that can emulate a net
+          of several interconnected radio devices.
 
+          This driver can also be built as a module. To do so say M here.
+          The module will be called 'fakelb'.
diff --git a/drivers/ieee802154/Makefile b/drivers/ieee802154/Makefile
index 800a3894af0d..ea784ea6f0f8 100644
--- a/drivers/ieee802154/Makefile
+++ b/drivers/ieee802154/Makefile
@@ -1 +1,2 @@
 obj-$(CONFIG_IEEE802154_FAKEHARD) += fakehard.o
+obj-$(CONFIG_IEEE802154_FAKELB) += fakelb.o
diff --git a/drivers/ieee802154/fakelb.c b/drivers/ieee802154/fakelb.c
new file mode 100644
index 000000000000..e7456fcd0913
--- /dev/null
+++ b/drivers/ieee802154/fakelb.c
@@ -0,0 +1,294 @@
+/*
+ * Loopback IEEE 802.15.4 interface
+ *
+ * Copyright 2007-2012 Siemens AG
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Written by:
+ * Sergey Lapin <slapin@ossfans.org>
+ * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+ * Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
+ */
+
+#include <linux/module.h>
+#include <linux/timer.h>
+#include <linux/platform_device.h>
+#include <linux/netdevice.h>
+#include <linux/spinlock.h>
+#include <net/mac802154.h>
+#include <net/wpan-phy.h>
+
+static int numlbs = 1;
+
+struct fakelb_dev_priv {
+        struct ieee802154_dev *dev;
+
+        struct list_head list;
+        struct fakelb_priv *fake;
+
+        spinlock_t lock;
+        bool working;
+};
+
+struct fakelb_priv {
+        struct list_head list;
+        rwlock_t lock;
+};
+
+static int
+fakelb_hw_ed(struct ieee802154_dev *dev, u8 *level)
+{
+        might_sleep();
+        BUG_ON(!level);
+        *level = 0xbe;
+
+        return 0;
+}
+
+static int
+fakelb_hw_channel(struct ieee802154_dev *dev, int page, int channel)
+{
+        pr_debug("set channel to %d\n", channel);
+
+        might_sleep();
+        dev->phy->current_page = page;
+        dev->phy->current_channel = channel;
+
+        return 0;
+}
+
+static void
+fakelb_hw_deliver(struct fakelb_dev_priv *priv, struct sk_buff *skb)
+{
+        struct sk_buff *newskb;
+
+        spin_lock(&priv->lock);
+        if (priv->working) {
+                newskb = pskb_copy(skb, GFP_ATOMIC);
+                ieee802154_rx_irqsafe(priv->dev, newskb, 0xcc);
+        }
+        spin_unlock(&priv->lock);
+}
+
+static int
+fakelb_hw_xmit(struct ieee802154_dev *dev, struct sk_buff *skb)
+{
+        struct fakelb_dev_priv *priv = dev->priv;
+        struct fakelb_priv *fake = priv->fake;
+
+        might_sleep();
+
+        read_lock_bh(&fake->lock);
+        if (priv->list.next == priv->list.prev) {
+                /* we are the only one device */
+                fakelb_hw_deliver(priv, skb);
+        } else {
+                struct fakelb_dev_priv *dp;
+                list_for_each_entry(dp, &priv->fake->list, list) {
+                        if (dp != priv &&
+                            (dp->dev->phy->current_channel ==
+                             priv->dev->phy->current_channel))
+                                fakelb_hw_deliver(dp, skb);
+                }
+        }
+        read_unlock_bh(&fake->lock);
+
+        return 0;
+}
+
+static int
+fakelb_hw_start(struct ieee802154_dev *dev) {
+        struct fakelb_dev_priv *priv = dev->priv;
+        int ret = 0;
+
+        spin_lock(&priv->lock);
+        if (priv->working)
+                ret = -EBUSY;
+        else
+                priv->working = 1;
+        spin_unlock(&priv->lock);
+
+        return ret;
+}
+
+static void
+fakelb_hw_stop(struct ieee802154_dev *dev) {
+        struct fakelb_dev_priv *priv = dev->priv;
+
+        spin_lock(&priv->lock);
+        priv->working = 0;
+        spin_unlock(&priv->lock);
+}
+
+static struct ieee802154_ops fakelb_ops = {
+        .owner = THIS_MODULE,
+        .xmit = fakelb_hw_xmit,
+        .ed = fakelb_hw_ed,
+        .set_channel = fakelb_hw_channel,
+        .start = fakelb_hw_start,
+        .stop = fakelb_hw_stop,
+};
+
+/* Number of dummy devices to be set up by this module. */
+module_param(numlbs, int, 0);
+MODULE_PARM_DESC(numlbs, " number of pseudo devices");
+
+static int fakelb_add_one(struct device *dev, struct fakelb_priv *fake)
+{
+        struct fakelb_dev_priv *priv;
+        int err;
+        struct ieee802154_dev *ieee;
+
+        ieee = ieee802154_alloc_device(sizeof(*priv), &fakelb_ops);
+        if (!ieee)
+                return -ENOMEM;
+
+        priv = ieee->priv;
+        priv->dev = ieee;
+
+        /* 868 MHz BPSK 802.15.4-2003 */
+        ieee->phy->channels_supported[0] |= 1;
+        /* 915 MHz BPSK 802.15.4-2003 */
+        ieee->phy->channels_supported[0] |= 0x7fe;
+        /* 2.4 GHz O-QPSK 802.15.4-2003 */
+        ieee->phy->channels_supported[0] |= 0x7FFF800;
+        /* 868 MHz ASK 802.15.4-2006 */
+        ieee->phy->channels_supported[1] |= 1;
+        /* 915 MHz ASK 802.15.4-2006 */
+        ieee->phy->channels_supported[1] |= 0x7fe;
+        /* 868 MHz O-QPSK 802.15.4-2006 */
+        ieee->phy->channels_supported[2] |= 1;
+        /* 915 MHz O-QPSK 802.15.4-2006 */
+        ieee->phy->channels_supported[2] |= 0x7fe;
+        /* 2.4 GHz CSS 802.15.4a-2007 */
+        ieee->phy->channels_supported[3] |= 0x3fff;
+        /* UWB Sub-gigahertz 802.15.4a-2007 */
+        ieee->phy->channels_supported[4] |= 1;
+        /* UWB Low band 802.15.4a-2007 */
+        ieee->phy->channels_supported[4] |= 0x1e;
+        /* UWB High band 802.15.4a-2007 */
+        ieee->phy->channels_supported[4] |= 0xffe0;
+        /* 750 MHz O-QPSK 802.15.4c-2009 */
+        ieee->phy->channels_supported[5] |= 0xf;
+        /* 750 MHz MPSK 802.15.4c-2009 */
+        ieee->phy->channels_supported[5] |= 0xf0;
+        /* 950 MHz BPSK 802.15.4d-2009 */
+        ieee->phy->channels_supported[6] |= 0x3ff;
+        /* 950 MHz GFSK 802.15.4d-2009 */
+        ieee->phy->channels_supported[6] |= 0x3ffc00;
+
+        INIT_LIST_HEAD(&priv->list);
+        priv->fake = fake;
+
+        spin_lock_init(&priv->lock);
+
+        ieee->parent = dev;
+
+        err = ieee802154_register_device(ieee);
+        if (err)
+                goto err_reg;
+
+        write_lock_bh(&fake->lock);
+        list_add_tail(&priv->list, &fake->list);
+        write_unlock_bh(&fake->lock);
+
+        return 0;
+
+err_reg:
+        ieee802154_free_device(priv->dev);
+        return err;
+}
+
+static void fakelb_del(struct fakelb_dev_priv *priv)
+{
+        write_lock_bh(&priv->fake->lock);
+        list_del(&priv->list);
+        write_unlock_bh(&priv->fake->lock);
+
+        ieee802154_unregister_device(priv->dev);
+        ieee802154_free_device(priv->dev);
+}
+
+static int __devinit fakelb_probe(struct platform_device *pdev)
+{
+        struct fakelb_priv *priv;
+        struct fakelb_dev_priv *dp;
+        int err = -ENOMEM;
+        int i;
+
+        priv = kzalloc(sizeof(struct fakelb_priv), GFP_KERNEL);
+        if (!priv)
+                goto err_alloc;
+
+        INIT_LIST_HEAD(&priv->list);
+        rwlock_init(&priv->lock);
+
+        for (i = 0; i < numlbs; i++) {
+                err = fakelb_add_one(&pdev->dev, priv);
+                if (err < 0)
+                        goto err_slave;
+        }
+
+        platform_set_drvdata(pdev, priv);
+        dev_info(&pdev->dev, "added ieee802154 hardware\n");
+        return 0;
+
+err_slave:
+        list_for_each_entry(dp, &priv->list, list)
+                fakelb_del(dp);
+        kfree(priv);
+err_alloc:
+        return err;
+}
+
+static int __devexit fakelb_remove(struct platform_device *pdev)
+{
+        struct fakelb_priv *priv = platform_get_drvdata(pdev);
+        struct fakelb_dev_priv *dp, *temp;
+
+        list_for_each_entry_safe(dp, temp, &priv->list, list)
+                fakelb_del(dp);
+        kfree(priv);
+
+        return 0;
+}
+
+static struct platform_device *ieee802154fake_dev;
+
+static struct platform_driver ieee802154fake_driver = {
+        .probe = fakelb_probe,
+        .remove = __devexit_p(fakelb_remove),
+        .driver = {
+                        .name = "ieee802154fakelb",
+                        .owner = THIS_MODULE,
+        },
+};
+
+static __init int fakelb_init_module(void)
+{
+        ieee802154fake_dev = platform_device_register_simple(
+                             "ieee802154fakelb", -1, NULL, 0);
+        return platform_driver_register(&ieee802154fake_driver);
+}
+
+static __exit void fake_remove_module(void)
+{
+        platform_driver_unregister(&ieee802154fake_driver);
+        platform_device_unregister(ieee802154fake_dev);
+}
+
+module_init(fakelb_init_module);
+module_exit(fake_remove_module);
+MODULE_LICENSE("GPL");
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index e3e470fecaa9..59fbd704a1ec 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -42,6 +42,7 @@
 #include <linux/inetdevice.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+#include <net/route.h>
 
 #include <net/tcp.h>
 #include <net/ipv6.h>
@@ -1826,7 +1827,10 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv)
         route->path_rec->reversible = 1;
         route->path_rec->pkey = cpu_to_be16(0xffff);
         route->path_rec->mtu_selector = IB_SA_EQ;
-        route->path_rec->sl = id_priv->tos >> 5;
+        route->path_rec->sl = netdev_get_prio_tc_map(
+                        ndev->priv_flags & IFF_802_1Q_VLAN ?
+                                vlan_dev_real_dev(ndev) : ndev,
+                        rt_tos2priority(id_priv->tos));
 
         route->path_rec->mtu = iboe_get_mtu(ndev->mtu);
         route->path_rec->rate_selector = IB_SA_EQ;
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 426bb7617ec6..b0d0bc8a6fb6 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -1854,6 +1854,8 @@ static bool generate_unmatched_resp(struct ib_mad_private *recv,
                 response->mad.mad.mad_hdr.method = IB_MGMT_METHOD_GET_RESP;
                 response->mad.mad.mad_hdr.status =
                         cpu_to_be16(IB_MGMT_MAD_STATUS_UNSUPPORTED_METHOD_ATTRIB);
+                if (recv->mad.mad.mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE)
+                        response->mad.mad.mad_hdr.status |= IB_SMP_DIRECTION;
 
                 return true;
         } else {
@@ -1869,6 +1871,7 @@ static void ib_mad_recv_done_handler(struct ib_mad_port_private *port_priv,
         struct ib_mad_list_head *mad_list;
         struct ib_mad_agent_private *mad_agent;
         int port_num;
+        int ret = IB_MAD_RESULT_SUCCESS;
 
         mad_list = (struct ib_mad_list_head *)(unsigned long)wc->wr_id;
         qp_info = mad_list->mad_queue->qp_info;
@@ -1952,8 +1955,6 @@ static void ib_mad_recv_done_handler(struct ib_mad_port_private *port_priv,
 local:
         /* Give driver "right of first refusal" on incoming MAD */
         if (port_priv->device->process_mad) {
-                int ret;
-
                 ret = port_priv->device->process_mad(port_priv->device, 0,
                                                      port_priv->port_num,
                                                      wc, &recv->grh,
@@ -1981,7 +1982,8 @@ local:
                  * or via recv_handler in ib_mad_complete_recv()
                  */
                 recv = NULL;
-        } else if (generate_unmatched_resp(recv, response)) {
+        } else if ((ret & IB_MAD_RESULT_SUCCESS) &&
+                   generate_unmatched_resp(recv, response)) {
                 agent_send_response(&response->mad.mad, &recv->grh, wc,
                                     port_priv->device, port_num, qp_info->qp->qp_num);
         }
diff --git a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c
index 396e29370304..e497dfbee435 100644
--- a/drivers/infiniband/core/netlink.c
+++ b/drivers/infiniband/core/netlink.c
@@ -125,7 +125,8 @@ int ibnl_put_attr(struct sk_buff *skb, struct nlmsghdr *nlh,
         unsigned char *prev_tail;
 
         prev_tail = skb_tail_pointer(skb);
-        NLA_PUT(skb, type, len, data);
+        if (nla_put(skb, type, len, data))
+                goto nla_put_failure;
         nlh->nlmsg_len += skb_tail_pointer(skb) - prev_tail;
         return 0;
 
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index 5861cdb22b7c..8002ae642cfe 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -66,12 +66,6 @@ static ctl_table ucma_ctl_table[] = {
         { }
 };
 
-static struct ctl_path ucma_ctl_path[] = {
-        { .procname = "net" },
-        { .procname = "rdma_ucm" },
-        { }
-};
-
 struct ucma_file {
         struct mutex            mut;
         struct file             *filp;
@@ -1392,7 +1386,7 @@ static int __init ucma_init(void)
                 goto err1;
         }
 
-        ucma_ctl_table_hdr = register_sysctl_paths(ucma_ctl_path, ucma_ctl_table);
+        ucma_ctl_table_hdr = register_net_sysctl(&init_net, "net/rdma_ucm", ucma_ctl_table);
         if (!ucma_ctl_table_hdr) {
                 printk(KERN_ERR "rdma_ucm: couldn't register sysctl paths\n");
                 ret = -ENOMEM;
@@ -1408,7 +1402,7 @@ err1:
 
 static void __exit ucma_cleanup(void)
 {
-        unregister_sysctl_table(ucma_ctl_table_hdr);
+        unregister_net_sysctl_table(ucma_ctl_table_hdr);
         device_remove_file(ucma_misc.this_device, &dev_attr_abi_version);
         misc_deregister(&ucma_misc);
         idr_destroy(&ctx_idr);
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 669673e81439..b948b6dd5d55 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -247,7 +247,7 @@ static int ib_link_query_port(struct ib_device *ibdev, u8 port,
                 err = mlx4_MAD_IFC(to_mdev(ibdev), 1, 1, port,
                                    NULL, NULL, in_mad, out_mad);
                 if (err)
-                        return err;
+                        goto out;
 
                 /* Checking LinkSpeedActive for FDR-10 */
                 if (out_mad->data[15] & 0x1)
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 8081a0a5d602..a4b14a41cbf4 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -274,7 +274,8 @@ static int synaptics_set_advanced_gesture_mode(struct psmouse *psmouse)
         static unsigned char param = 0xc8;
         struct synaptics_data *priv = psmouse->private;
 
-        if (!SYN_CAP_ADV_GESTURE(priv->ext_cap_0c))
+        if (!(SYN_CAP_ADV_GESTURE(priv->ext_cap_0c) ||
+              SYN_CAP_IMAGE_SENSOR(priv->ext_cap_0c)))
                 return 0;
 
         if (psmouse_sliced_command(psmouse, SYN_QUE_MODEL))
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index b902794bbf07..38c4bd87b2c9 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -336,11 +336,6 @@ static inline void
 capincci_alloc_minor(struct capidev *cdev, struct capincci *np) { }
 static inline void capincci_free_minor(struct capincci *np) { }
 
-static inline unsigned int capincci_minor_opencount(struct capincci *np)
-{
-        return 0;
-}
-
 #endif /* !CONFIG_ISDN_CAPI_MIDDLEWARE */
 
 static struct capincci *capincci_alloc(struct capidev *cdev, u32 ncci)
@@ -372,6 +367,7 @@ static void capincci_free(struct capidev *cdev, u32 ncci)
                 }
 }
 
+#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
 static struct capincci *capincci_find(struct capidev *cdev, u32 ncci)
 {
         struct capincci *np;
@@ -382,7 +378,6 @@ static struct capincci *capincci_find(struct capidev *cdev, u32 ncci)
         return NULL;
 }
 
-#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
 /* -------- handle data queue --------------------------------------- */
 
 static struct sk_buff *
@@ -578,8 +573,8 @@ static void capi_recv_message(struct capi20_appl *ap, struct sk_buff *skb)
         struct tty_struct *tty;
         struct capiminor *mp;
         u16 datahandle;
-#endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
         struct capincci *np;
+#endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
 
         mutex_lock(&cdev->lock);
 
@@ -597,6 +592,12 @@ static void capi_recv_message(struct capi20_appl *ap, struct sk_buff *skb)
                 goto unlock_out;
         }
 
+#ifndef CONFIG_ISDN_CAPI_MIDDLEWARE
+        skb_queue_tail(&cdev->recvqueue, skb);
+        wake_up_interruptible(&cdev->recvwait);
+
+#else /* CONFIG_ISDN_CAPI_MIDDLEWARE */
+
         np = capincci_find(cdev, CAPIMSG_CONTROL(skb->data));
         if (!np) {
                 printk(KERN_ERR "BUG: capi_signal: ncci not found\n");
@@ -605,12 +606,6 @@ static void capi_recv_message(struct capi20_appl *ap, struct sk_buff *skb)
                 goto unlock_out;
         }
 
-#ifndef CONFIG_ISDN_CAPI_MIDDLEWARE
-        skb_queue_tail(&cdev->recvqueue, skb);
-        wake_up_interruptible(&cdev->recvwait);
-
-#else /* CONFIG_ISDN_CAPI_MIDDLEWARE */
-
         mp = np->minorp;
         if (!mp) {
                 skb_queue_tail(&cdev->recvqueue, skb);
@@ -786,7 +781,6 @@ register_out:
                 return retval;
 
         case CAPI_GET_VERSION:
-        {
                 if (copy_from_user(&data.contr, argp,
                                    sizeof(data.contr)))
                         return -EFAULT;
@@ -796,11 +790,9 @@ register_out:
                 if (copy_to_user(argp, &data.version,
                                  sizeof(data.version)))
                         return -EFAULT;
-        }
-        return 0;
+                return 0;
 
         case CAPI_GET_SERIAL:
-        {
                 if (copy_from_user(&data.contr, argp,
                                    sizeof(data.contr)))
                         return -EFAULT;
@@ -810,10 +802,9 @@ register_out:
                 if (copy_to_user(argp, data.serial,
                                  sizeof(data.serial)))
                         return -EFAULT;
-        }
-        return 0;
+                return 0;
+
         case CAPI_GET_PROFILE:
-        {
                 if (copy_from_user(&data.contr, argp,
                                    sizeof(data.contr)))
                         return -EFAULT;
@@ -837,11 +828,9 @@ register_out:
                 }
                 if (retval)
                         return -EFAULT;
-        }
-        return 0;
+                return 0;
 
         case CAPI_GET_MANUFACTURER:
-        {
                 if (copy_from_user(&data.contr, argp,
                                    sizeof(data.contr)))
                         return -EFAULT;
@@ -853,8 +842,8 @@ register_out:
                                  sizeof(data.manufacturer)))
                         return -EFAULT;
 
-        }
-        return 0;
+                return 0;
+
         case CAPI_GET_ERRCODE:
                 data.errcode = cdev->errcode;
                 cdev->errcode = CAPI_NOERROR;
@@ -870,8 +859,7 @@ register_out:
                         return 0;
                 return -ENXIO;
 
-        case CAPI_MANUFACTURER_CMD:
-        {
+        case CAPI_MANUFACTURER_CMD: {
                 struct capi_manufacturer_cmd mcmd;
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
@@ -879,8 +867,6 @@ register_out:
                         return -EFAULT;
                 return capi20_manufacturer(mcmd.cmd, mcmd.data);
         }
-        return 0;
-
         case CAPI_SET_FLAGS:
         case CAPI_CLR_FLAGS: {
                 unsigned userflags;
@@ -902,6 +888,11 @@ register_out:
                         return -EFAULT;
                 return 0;
 
+#ifndef CONFIG_ISDN_CAPI_MIDDLEWARE
+        case CAPI_NCCI_OPENCOUNT:
+                return 0;
+
+#else /* CONFIG_ISDN_CAPI_MIDDLEWARE */
         case CAPI_NCCI_OPENCOUNT: {
                 struct capincci *nccip;
                 unsigned ncci;
@@ -918,7 +909,6 @@ register_out:
                 return count;
         }
 
-#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
         case CAPI_NCCI_GETUNIT: {
                 struct capincci *nccip;
                 struct capiminor *mp;
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index 6f5016b479f8..832bc807ed20 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -1593,7 +1593,7 @@ static int capidrv_command(isdn_ctrl *c, capidrv_contr *card)
                 return capidrv_ioctl(c, card);
 
         switch (c->command) {
-        case ISDN_CMD_DIAL:{
+        case ISDN_CMD_DIAL: {
                 u8 calling[ISDN_MSNLEN + 3];
                 u8 called[ISDN_MSNLEN + 2];
 
@@ -2072,7 +2072,8 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
         card->interface.writebuf_skb = if_sendbuf;
         card->interface.writecmd = NULL;
         card->interface.readstat = if_readstat;
-        card->interface.features = ISDN_FEATURE_L2_HDLC |
+        card->interface.features =
+                ISDN_FEATURE_L2_HDLC |
                 ISDN_FEATURE_L2_TRANS |
                 ISDN_FEATURE_L3_TRANS |
                 ISDN_FEATURE_P_UNKNOWN |
@@ -2080,7 +2081,8 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
                 ISDN_FEATURE_L2_X75UI |
                 ISDN_FEATURE_L2_X75BUI;
         if (profp->support1 & (1 << 2))
-                card->interface.features |= ISDN_FEATURE_L2_V11096 |
+                card->interface.features |=
+                        ISDN_FEATURE_L2_V11096 |
                         ISDN_FEATURE_L2_V11019 |
                         ISDN_FEATURE_L2_V11038;
         if (profp->support1 & (1 << 8))
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index afa080258bfa..3b9278b333ba 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -410,10 +410,10 @@ static void check_pending(struct bas_cardstate *ucs)
                 if (!(ucs->basstate & BS_RESETTING))
                         ucs->pending = 0;
                 break;
-                /*
-                 * HD_READ_ATMESSAGE and HD_WRITE_ATMESSAGE are handled separately
-                 * and should never end up here
-                 */
+        /*
+         * HD_READ_ATMESSAGE and HD_WRITE_ATMESSAGE are handled separately
+         * and should never end up here
+         */
         default:
                 dev_warn(&ucs->interface->dev,
                          "unknown pending request 0x%02x cleared\n",
@@ -877,8 +877,7 @@ static void read_iso_callback(struct urb *urb)
                 for (i = 0; i < BAS_NUMFRAMES; i++) {
                         ubc->isoinlost += urb->iso_frame_desc[i].actual_length;
                         if (unlikely(urb->iso_frame_desc[i].status != 0 &&
-                                     urb->iso_frame_desc[i].status !=
-                                     -EINPROGRESS))
+                                     urb->iso_frame_desc[i].status != -EINPROGRESS))
                                 ubc->loststatus = urb->iso_frame_desc[i].status;
                         urb->iso_frame_desc[i].status = 0;
                         urb->iso_frame_desc[i].actual_length = 0;
@@ -2078,16 +2077,14 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
 /* Free hardware dependent part of the B channel structure
  * parameter:
  *      bcs     B channel structure
- * return value:
- *      !=0 on success
  */
-static int gigaset_freebcshw(struct bc_state *bcs)
+static void gigaset_freebcshw(struct bc_state *bcs)
 {
         struct bas_bc_state *ubc = bcs->hw.bas;
         int i;
 
         if (!ubc)
-                return 0;
+                return;
 
         /* kill URBs and tasklets before freeing - better safe than sorry */
         ubc->running = 0;
@@ -2105,14 +2102,13 @@ static int gigaset_freebcshw(struct bc_state *bcs)
         kfree(ubc->isooutbuf);
         kfree(ubc);
         bcs->hw.bas = NULL;
-        return 1;
 }
 
 /* Initialize hardware dependent part of the B channel structure
  * parameter:
  *      bcs     B channel structure
  * return value:
- *      !=0 on success
+ *      0 on success, error code < 0 on failure
  */
 static int gigaset_initbcshw(struct bc_state *bcs)
 {
@@ -2122,7 +2118,7 @@ static int gigaset_initbcshw(struct bc_state *bcs)
         bcs->hw.bas = ubc = kmalloc(sizeof(struct bas_bc_state), GFP_KERNEL);
         if (!ubc) {
                 pr_err("out of memory\n");
-                return 0;
+                return -ENOMEM;
         }
 
         ubc->running = 0;
@@ -2139,7 +2135,7 @@ static int gigaset_initbcshw(struct bc_state *bcs)
                 pr_err("out of memory\n");
                 kfree(ubc);
                 bcs->hw.bas = NULL;
-                return 0;
+                return -ENOMEM;
         }
         tasklet_init(&ubc->sent_tasklet,
                      write_iso_tasklet, (unsigned long) bcs);
@@ -2164,7 +2160,7 @@ static int gigaset_initbcshw(struct bc_state *bcs)
         ubc->stolen0s = 0;
         tasklet_init(&ubc->rcvd_tasklet,
                      read_iso_tasklet, (unsigned long) bcs);
-        return 1;
+        return 0;
 }
 
 static void gigaset_reinitbcshw(struct bc_state *bcs)
@@ -2187,6 +2183,12 @@ static void gigaset_freecshw(struct cardstate *cs)
         cs->hw.bas = NULL;
 }
 
+/* Initialize hardware dependent part of the cardstate structure
+ * parameter:
+ *      cs      cardstate structure
+ * return value:
+ *      0 on success, error code < 0 on failure
+ */
 static int gigaset_initcshw(struct cardstate *cs)
 {
         struct bas_cardstate *ucs;
@@ -2194,13 +2196,13 @@ static int gigaset_initcshw(struct cardstate *cs)
         cs->hw.bas = ucs = kmalloc(sizeof *ucs, GFP_KERNEL);
         if (!ucs) {
                 pr_err("out of memory\n");
-                return 0;
+                return -ENOMEM;
         }
         ucs->int_in_buf = kmalloc(IP_MSGSIZE, GFP_KERNEL);
         if (!ucs->int_in_buf) {
                 kfree(ucs);
                 pr_err("out of memory\n");
-                return 0;
+                return -ENOMEM;
         }
 
         ucs->urb_cmd_in = NULL;
@@ -2219,7 +2221,7 @@ static int gigaset_initcshw(struct cardstate *cs)
         init_waitqueue_head(&ucs->waitqueue);
         INIT_WORK(&ucs->int_in_wq, int_in_work);
 
-        return 1;
+        return 0;
 }
 
 /* freeurbs
@@ -2379,18 +2381,20 @@ static int gigaset_probe(struct usb_interface *interface,
         /* save address of controller structure */
         usb_set_intfdata(interface, cs);
 
-        if (!gigaset_start(cs))
+        rc = gigaset_start(cs);
+        if (rc < 0)
                 goto error;
 
         return 0;
 
 allocerr:
         dev_err(cs->dev, "could not allocate URBs\n");
+        rc = -ENOMEM;
 error:
         freeurbs(cs);
         usb_set_intfdata(interface, NULL);
         gigaset_freecs(cs);
-        return -ENODEV;
+        return rc;
 }
 
 /* gigaset_disconnect
diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c
index 343b5c80cb7b..27e4a3e21d64 100644
--- a/drivers/isdn/gigaset/capi.c
+++ b/drivers/isdn/gigaset/capi.c
@@ -14,6 +14,7 @@
 #include "gigaset.h"
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/ratelimit.h>
 #include <linux/isdn/capilli.h>
 #include <linux/isdn/capicmd.h>
 #include <linux/isdn/capiutil.h>
@@ -108,51 +109,35 @@ static struct {
         u8 *bc;
         u8 *hlc;
 } cip2bchlc[] = {
-        [1] = { "8090A3", NULL },
-        /* Speech (A-law) */
-        [2] = { "8890", NULL },
-        /* Unrestricted digital information */
-        [3] = { "8990", NULL },
-        /* Restricted digital information */
-        [4] = { "9090A3", NULL },
-        /* 3,1 kHz audio (A-law) */
-        [5] = { "9190", NULL },
-        /* 7 kHz audio */
-        [6] = { "9890", NULL },
-        /* Video */
-        [7] = { "88C0C6E6", NULL },
-        /* Packet mode */
-        [8] = { "8890218F", NULL },
-        /* 56 kbit/s rate adaptation */
-        [9] = { "9190A5", NULL },
-        /* Unrestricted digital information with tones/announcements */
-        [16] = { "8090A3", "9181" },
-        /* Telephony */
-        [17] = { "9090A3", "9184" },
-        /* Group 2/3 facsimile */
-        [18] = { "8890", "91A1" },
-        /* Group 4 facsimile Class 1 */
-        [19] = { "8890", "91A4" },
-        /* Teletex service basic and mixed mode
-           and Group 4 facsimile service Classes II and III */
-        [20] = { "8890", "91A8" },
-        /* Teletex service basic and processable mode */
-        [21] = { "8890", "91B1" },
-        /* Teletex service basic mode */
-        [22] = { "8890", "91B2" },
-        /* International interworking for Videotex */
-        [23] = { "8890", "91B5" },
-        /* Telex */
-        [24] = { "8890", "91B8" },
-        /* Message Handling Systems in accordance with X.400 */
-        [25] = { "8890", "91C1" },
-        /* OSI application in accordance with X.200 */
-        [26] = { "9190A5", "9181" },
-        /* 7 kHz telephony */
-        [27] = { "9190A5", "916001" },
-        /* Video telephony, first connection */
-        [28] = { "8890", "916002" },
-        /* Video telephony, second connection */
+        [1] = { "8090A3", NULL },       /* Speech (A-law) */
+        [2] = { "8890", NULL },         /* Unrestricted digital information */
+        [3] = { "8990", NULL },         /* Restricted digital information */
+        [4] = { "9090A3", NULL },       /* 3,1 kHz audio (A-law) */
+        [5] = { "9190", NULL },         /* 7 kHz audio */
+        [6] = { "9890", NULL },         /* Video */
+        [7] = { "88C0C6E6", NULL },     /* Packet mode */
+        [8] = { "8890218F", NULL },     /* 56 kbit/s rate adaptation */
+        [9] = { "9190A5", NULL },       /* Unrestricted digital information
+                                         * with tones/announcements */
+        [16] = { "8090A3", "9181" },    /* Telephony */
+        [17] = { "9090A3", "9184" },    /* Group 2/3 facsimile */
+        [18] = { "8890", "91A1" },      /* Group 4 facsimile Class 1 */
+        [19] = { "8890", "91A4" },      /* Teletex service basic and mixed mode
+                                         * and Group 4 facsimile service
+                                         * Classes II and III */
+        [20] = { "8890", "91A8" },      /* Teletex service basic and
+                                         * processable mode */
+        [21] = { "8890", "91B1" },      /* Teletex service basic mode */
+        [22] = { "8890", "91B2" },      /* International interworking for
+                                         * Videotex */
+        [23] = { "8890", "91B5" },      /* Telex */
+        [24] = { "8890", "91B8" },      /* Message Handling Systems
+                                         * in accordance with X.400 */
+        [25] = { "8890", "91C1" },      /* OSI application
+                                         * in accordance with X.200 */
+        [26] = { "9190A5", "9181" },    /* 7 kHz telephony */
+        [27] = { "9190A5", "916001" },  /* Video telephony, first connection */
+        [28] = { "8890", "916002" },    /* Video telephony, second connection */
 };
 
 /*
@@ -223,10 +208,14 @@ get_appl(struct gigaset_capi_ctr *iif, u16 appl)
 static inline void dump_cmsg(enum debuglevel level, const char *tag, _cmsg *p)
 {
 #ifdef CONFIG_GIGASET_DEBUG
+        /* dump at most 20 messages in 20 secs */
+        static DEFINE_RATELIMIT_STATE(msg_dump_ratelimit, 20 * HZ, 20);
         _cdebbuf *cdb;
 
         if (!(gigaset_debuglevel & level))
                 return;
+        if (!___ratelimit(&msg_dump_ratelimit, tag))
+                return;
 
         cdb = capi_cmsg2str(p);
         if (cdb) {
@@ -1192,7 +1181,9 @@ static void do_facility_req(struct gigaset_capi_ctr *iif,
                         confparam[3] = 2;       /* length */
                         capimsg_setu16(confparam, 4, CapiSuccess);
                         break;
-                        /* ToDo: add supported services */
+
+                /* ToDo: add supported services */
+
                 default:
                         dev_notice(cs->dev,
                                    "%s: unsupported supplementary service function 0x%04x\n",
@@ -1766,7 +1757,8 @@ static void do_connect_b3_req(struct gigaset_capi_ctr *iif,
 
         /* NCPI parameter: not applicable for B3 Transparent */
         ignore_cstruct_param(cs, cmsg->NCPI, "CONNECT_B3_REQ", "NCPI");
-        send_conf(iif, ap, skb, (cmsg->NCPI && cmsg->NCPI[0]) ?
+        send_conf(iif, ap, skb,
+                  (cmsg->NCPI && cmsg->NCPI[0]) ?
                   CapiNcpiNotSupportedByProtocol : CapiSuccess);
 }
 
@@ -1882,6 +1874,9 @@ static void do_disconnect_req(struct gigaset_capi_ctr *iif,
 
         /* check for active logical connection */
         if (bcs->apconnstate >= APCONN_ACTIVE) {
+                /* clear it */
+                bcs->apconnstate = APCONN_SETUP;
+
                 /*
                  * emit DISCONNECT_B3_IND with cause 0x3301
                  * use separate cmsg structure, as the content of iif->acmsg
@@ -1906,6 +1901,7 @@ static void do_disconnect_req(struct gigaset_capi_ctr *iif,
                 }
                 capi_cmsg2message(b3cmsg,
                                   __skb_put(b3skb, CAPI_DISCONNECT_B3_IND_BASELEN));
+                dump_cmsg(DEBUG_CMD, __func__, b3cmsg);
                 kfree(b3cmsg);
                 capi_ctr_handle_message(&iif->ctr, ap->id, b3skb);
         }
@@ -1966,7 +1962,8 @@ static void do_disconnect_b3_req(struct gigaset_capi_ctr *iif,
         /* NCPI parameter: not applicable for B3 Transparent */
         ignore_cstruct_param(cs, cmsg->NCPI,
                              "DISCONNECT_B3_REQ", "NCPI");
-        send_conf(iif, ap, skb, (cmsg->NCPI && cmsg->NCPI[0]) ?
+        send_conf(iif, ap, skb,
+                  (cmsg->NCPI && cmsg->NCPI[0]) ?
                   CapiNcpiNotSupportedByProtocol : CapiSuccess);
 }
 
@@ -2059,12 +2056,6 @@ static void do_reset_b3_req(struct gigaset_capi_ctr *iif,
 }
 
 /*
- * dump unsupported/ignored messages at most twice per minute,
- * some apps send those very frequently
- */
-static unsigned long ignored_msg_dump_time;
-
-/*
  * unsupported CAPI message handler
  */
 static void do_unsupported(struct gigaset_capi_ctr *iif,
@@ -2073,8 +2064,7 @@ static void do_unsupported(struct gigaset_capi_ctr *iif,
 {
         /* decode message */
         capi_message2cmsg(&iif->acmsg, skb->data);
-        if (printk_timed_ratelimit(&ignored_msg_dump_time, 30 * 1000))
-                dump_cmsg(DEBUG_CMD, __func__, &iif->acmsg);
+        dump_cmsg(DEBUG_CMD, __func__, &iif->acmsg);
         send_conf(iif, ap, skb, CapiMessageNotSupportedInCurrentState);
 }
 
@@ -2085,11 +2075,9 @@ static void do_nothing(struct gigaset_capi_ctr *iif,
                        struct gigaset_capi_appl *ap,
                        struct sk_buff *skb)
 {
-        if (printk_timed_ratelimit(&ignored_msg_dump_time, 30 * 1000)) {
-                /* decode message */
-                capi_message2cmsg(&iif->acmsg, skb->data);
-                dump_cmsg(DEBUG_CMD, __func__, &iif->acmsg);
-        }
+        /* decode message */
+        capi_message2cmsg(&iif->acmsg, skb->data);
+        dump_cmsg(DEBUG_CMD, __func__, &iif->acmsg);
         dev_kfree_skb_any(skb);
 }
 
@@ -2358,7 +2346,7 @@ static const struct file_operations gigaset_proc_fops = {
  * @cs:         device descriptor structure.
  * @isdnid:     device name.
  *
- * Return value: 1 for success, 0 for failure
+ * Return value: 0 on success, error code < 0 on failure
  */
 int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
 {
@@ -2368,7 +2356,7 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
         iif = kmalloc(sizeof(*iif), GFP_KERNEL);
         if (!iif) {
                 pr_err("%s: out of memory\n", __func__);
-                return 0;
+                return -ENOMEM;
         }
 
         /* prepare controller structure */
@@ -2392,12 +2380,12 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
         if (rc) {
                 pr_err("attach_capi_ctr failed (%d)\n", rc);
                 kfree(iif);
-                return 0;
+                return rc;
         }
 
         cs->iif = iif;
         cs->hw_hdr_len = CAPI_DATA_B3_REQ_LEN;
-        return 1;
+        return 0;
 }
 
 /**
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 76792707f995..aa41485bc594 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -194,13 +194,13 @@ int gigaset_get_channel(struct bc_state *bcs)
                 gig_dbg(DEBUG_CHANNEL, "could not allocate channel %d",
                         bcs->channel);
                 spin_unlock_irqrestore(&bcs->cs->lock, flags);
-                return 0;
+                return -EBUSY;
         }
         ++bcs->use_count;
         bcs->busy = 1;
         gig_dbg(DEBUG_CHANNEL, "allocated channel %d", bcs->channel);
         spin_unlock_irqrestore(&bcs->cs->lock, flags);
-        return 1;
+        return 0;
 }
 
 struct bc_state *gigaset_get_free_channel(struct cardstate *cs)
@@ -258,7 +258,7 @@ int gigaset_get_channels(struct cardstate *cs)
                         spin_unlock_irqrestore(&cs->lock, flags);
                         gig_dbg(DEBUG_CHANNEL,
                                 "could not allocate all channels");
-                        return 0;
+                        return -EBUSY;
                 }
         for (i = 0; i < cs->channels; ++i)
                 ++cs->bcs[i].use_count;
@@ -266,7 +266,7 @@ int gigaset_get_channels(struct cardstate *cs)
 
         gig_dbg(DEBUG_CHANNEL, "allocated all channels");
 
-        return 1;
+        return 0;
 }
 
 void gigaset_free_channels(struct cardstate *cs)
@@ -362,7 +362,7 @@ struct event_t *gigaset_add_event(struct cardstate *cs,
 }
 EXPORT_SYMBOL_GPL(gigaset_add_event);
 
-static void free_strings(struct at_state_t *at_state)
+static void clear_at_state(struct at_state_t *at_state)
 {
         int i;
 
@@ -372,18 +372,13 @@ static void free_strings(struct at_state_t *at_state)
         }
 }
 
-static void clear_at_state(struct at_state_t *at_state)
-{
-        free_strings(at_state);
-}
-
-static void dealloc_at_states(struct cardstate *cs)
+static void dealloc_temp_at_states(struct cardstate *cs)
 {
         struct at_state_t *cur, *next;
 
         list_for_each_entry_safe(cur, next, &cs->temp_at_states, list) {
                 list_del(&cur->list);
-                free_strings(cur);
+                clear_at_state(cur);
                 kfree(cur);
         }
 }
@@ -393,8 +388,7 @@ static void gigaset_freebcs(struct bc_state *bcs)
         int i;
 
         gig_dbg(DEBUG_INIT, "freeing bcs[%d]->hw", bcs->channel);
-        if (!bcs->cs->ops->freebcshw(bcs))
-                gig_dbg(DEBUG_INIT, "failed");
+        bcs->cs->ops->freebcshw(bcs);
 
         gig_dbg(DEBUG_INIT, "clearing bcs[%d]->at_state", bcs->channel);
         clear_at_state(&bcs->at_state);
@@ -512,7 +506,7 @@ void gigaset_freecs(struct cardstate *cs)
         case 1: /* error when registering to LL */
                 gig_dbg(DEBUG_INIT, "clearing at_state");
                 clear_at_state(&cs->at_state);
-                dealloc_at_states(cs);
+                dealloc_temp_at_states(cs);
 
                 /* fall through */
         case 0: /* error in basic setup */
@@ -571,6 +565,8 @@ static void gigaset_inbuf_init(struct inbuf_t *inbuf, struct cardstate *cs)
  * @inbuf:      buffer structure.
  * @src:        received data.
  * @numbytes:   number of bytes received.
+ *
+ * Return value: !=0 if some data was appended
  */
 int gigaset_fill_inbuf(struct inbuf_t *inbuf, const unsigned char *src,
                        unsigned numbytes)
@@ -614,8 +610,8 @@ int gigaset_fill_inbuf(struct inbuf_t *inbuf, const unsigned char *src,
 EXPORT_SYMBOL_GPL(gigaset_fill_inbuf);
 
 /* Initialize the b-channel structure */
-static struct bc_state *gigaset_initbcs(struct bc_state *bcs,
-                                        struct cardstate *cs, int channel)
+static int gigaset_initbcs(struct bc_state *bcs, struct cardstate *cs,
+                           int channel)
 {
         int i;
 
@@ -654,11 +650,7 @@ static struct bc_state *gigaset_initbcs(struct bc_state *bcs,
         bcs->apconnstate = 0;
 
         gig_dbg(DEBUG_INIT, "  setting up bcs[%d]->hw", channel);
-        if (cs->ops->initbcshw(bcs))
-                return bcs;
-
-        gig_dbg(DEBUG_INIT, "  failed");
-        return NULL;
+        return cs->ops->initbcshw(bcs);
 }
 
 /**
@@ -757,7 +749,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
         cs->cmdbytes = 0;
 
         gig_dbg(DEBUG_INIT, "setting up iif");
-        if (!gigaset_isdn_regdev(cs, modulename)) {
+        if (gigaset_isdn_regdev(cs, modulename) < 0) {
                 pr_err("error registering ISDN device\n");
                 goto error;
         }
@@ -765,7 +757,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
         make_valid(cs, VALID_ID);
         ++cs->cs_init;
         gig_dbg(DEBUG_INIT, "setting up hw");
-        if (!cs->ops->initcshw(cs))
+        if (cs->ops->initcshw(cs) < 0)
                 goto error;
 
         ++cs->cs_init;
@@ -779,7 +771,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
         /* set up channel data structures */
         for (i = 0; i < channels; ++i) {
                 gig_dbg(DEBUG_INIT, "setting up bcs[%d]", i);
-                if (!gigaset_initbcs(cs->bcs + i, cs, i)) {
+                if (gigaset_initbcs(cs->bcs + i, cs, i) < 0) {
                         pr_err("could not allocate channel %d data\n", i);
                         goto error;
                 }
@@ -848,8 +840,7 @@ static void cleanup_cs(struct cardstate *cs)
         cs->mstate = MS_UNINITIALIZED;
 
         clear_at_state(&cs->at_state);
-        dealloc_at_states(cs);
-        free_strings(&cs->at_state);
+        dealloc_temp_at_states(cs);
         gigaset_at_init(&cs->at_state, NULL, cs, 0);
 
         cs->inbuf->inputstate = INS_command;
@@ -875,7 +866,7 @@ static void cleanup_cs(struct cardstate *cs)
 
         for (i = 0; i < cs->channels; ++i) {
                 gigaset_freebcs(cs->bcs + i);
-                if (!gigaset_initbcs(cs->bcs + i, cs, i))
+                if (gigaset_initbcs(cs->bcs + i, cs, i) < 0)
                         pr_err("could not allocate channel %d data\n", i);
         }
 
@@ -896,14 +887,14 @@ static void cleanup_cs(struct cardstate *cs)
  * waiting for completion of the initialization.
  *
  * Return value:
- *      1 - success, 0 - error
+ *      0 on success, error code < 0 on failure
  */
 int gigaset_start(struct cardstate *cs)
 {
         unsigned long flags;
 
         if (mutex_lock_interruptible(&cs->mutex))
-                return 0;
+                return -EBUSY;
 
         spin_lock_irqsave(&cs->lock, flags);
         cs->connected = 1;
@@ -927,11 +918,11 @@ int gigaset_start(struct cardstate *cs)
         wait_event(cs->waitqueue, !cs->waiting);
 
         mutex_unlock(&cs->mutex);
-        return 1;
+        return 0;
 
 error:
         mutex_unlock(&cs->mutex);
-        return 0;
+        return -ENOMEM;
 }
 EXPORT_SYMBOL_GPL(gigaset_start);
 
@@ -943,7 +934,7 @@ EXPORT_SYMBOL_GPL(gigaset_start);
  * waiting for completion of the shutdown.
  *
  * Return value:
- *      0 - success, -1 - error (no device associated)
+ *      0 - success, -ENODEV - error (no device associated)
  */
 int gigaset_shutdown(struct cardstate *cs)
 {
@@ -951,7 +942,7 @@ int gigaset_shutdown(struct cardstate *cs)
 
         if (!(cs->flags & VALID_MINOR)) {
                 mutex_unlock(&cs->mutex);
-                return -1;
+                return -ENODEV;
         }
 
         cs->waiting = 1;
diff --git a/drivers/isdn/gigaset/dummyll.c b/drivers/isdn/gigaset/dummyll.c
index 19b1c779d50f..570c2d53b84e 100644
--- a/drivers/isdn/gigaset/dummyll.c
+++ b/drivers/isdn/gigaset/dummyll.c
@@ -60,7 +60,7 @@ void gigaset_isdn_stop(struct cardstate *cs)
 
 int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
 {
-        return 1;
+        return 0;
 }
 
 void gigaset_isdn_unregdev(struct cardstate *cs)
diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c
index 624a8256a77f..2e6963dc740e 100644
--- a/drivers/isdn/gigaset/ev-layer.c
+++ b/drivers/isdn/gigaset/ev-layer.c
@@ -153,103 +153,104 @@ struct reply_t gigaset_tab_nocid[] =
  * action, command */
 
 /* initialize device, set cid mode if possible */
-        {RSP_INIT,       -1,  -1, SEQ_INIT,             100,  1, {ACT_TIMEOUT} },
+        {RSP_INIT,       -1,  -1, SEQ_INIT,     100,  1, {ACT_TIMEOUT} },
 
-        {EV_TIMEOUT,    100, 100, -1,                   101,  3, {0},   "Z\r"},
-        {RSP_OK,        101, 103, -1,                   120,  5, {ACT_GETSTRING},
-         "+GMR\r"},
+        {EV_TIMEOUT,    100, 100, -1,           101,  3, {0},   "Z\r"},
+        {RSP_OK,        101, 103, -1,           120,  5, {ACT_GETSTRING},
+                                                                "+GMR\r"},
 
-        {EV_TIMEOUT,    101, 101, -1,                   102,  5, {0},   "Z\r"},
-        {RSP_ERROR,     101, 101, -1,                   102,  5, {0},   "Z\r"},
+        {EV_TIMEOUT,    101, 101, -1,           102,  5, {0},   "Z\r"},
+        {RSP_ERROR,     101, 101, -1,           102,  5, {0},   "Z\r"},
 
-        {EV_TIMEOUT,    102, 102, -1,                   108,  5, {ACT_SETDLE1},
-         "^SDLE=0\r"},
-        {RSP_OK,        108, 108, -1,                   104, -1},
-        {RSP_ZDLE,      104, 104,  0,                   103,  5, {0},   "Z\r"},
-        {EV_TIMEOUT,    104, 104, -1,                     0,  0, {ACT_FAILINIT} },
-        {RSP_ERROR,     108, 108, -1,                     0,  0, {ACT_FAILINIT} },
+        {EV_TIMEOUT,    102, 102, -1,           108,  5, {ACT_SETDLE1},
+                                                                "^SDLE=0\r"},
+        {RSP_OK,        108, 108, -1,           104, -1},
+        {RSP_ZDLE,      104, 104,  0,           103,  5, {0},   "Z\r"},
+        {EV_TIMEOUT,    104, 104, -1,             0,  0, {ACT_FAILINIT} },
+        {RSP_ERROR,     108, 108, -1,             0,  0, {ACT_FAILINIT} },
 
-        {EV_TIMEOUT,    108, 108, -1,                   105,  2, {ACT_SETDLE0,
-                                                                  ACT_HUPMODEM,
-                                                                  ACT_TIMEOUT} },
-        {EV_TIMEOUT,    105, 105, -1,                   103,  5, {0},   "Z\r"},
+        {EV_TIMEOUT,    108, 108, -1,           105,  2, {ACT_SETDLE0,
+                                                          ACT_HUPMODEM,
+                                                          ACT_TIMEOUT} },
+        {EV_TIMEOUT,    105, 105, -1,           103,  5, {0},   "Z\r"},
 
-        {RSP_ERROR,     102, 102, -1,                   107,  5, {0},   "^GETPRE\r"},
-        {RSP_OK,        107, 107, -1,                     0,  0, {ACT_CONFIGMODE} },
-        {RSP_ERROR,     107, 107, -1,                     0,  0, {ACT_FAILINIT} },
-        {EV_TIMEOUT,    107, 107, -1,                     0,  0, {ACT_FAILINIT} },
+        {RSP_ERROR,     102, 102, -1,           107,  5, {0},   "^GETPRE\r"},
+        {RSP_OK,        107, 107, -1,             0,  0, {ACT_CONFIGMODE} },
+        {RSP_ERROR,     107, 107, -1,             0,  0, {ACT_FAILINIT} },
+        {EV_TIMEOUT,    107, 107, -1,             0,  0, {ACT_FAILINIT} },
 
-        {RSP_ERROR,     103, 103, -1,                     0,  0, {ACT_FAILINIT} },
-        {EV_TIMEOUT,    103, 103, -1,                     0,  0, {ACT_FAILINIT} },
+        {RSP_ERROR,     103, 103, -1,             0,  0, {ACT_FAILINIT} },
+        {EV_TIMEOUT,    103, 103, -1,             0,  0, {ACT_FAILINIT} },
 
-        {RSP_STRING,    120, 120, -1,                   121, -1, {ACT_SETVER} },
+        {RSP_STRING,    120, 120, -1,           121, -1, {ACT_SETVER} },
 
-        {EV_TIMEOUT,    120, 121, -1,                     0,  0, {ACT_FAILVER,
-                                                                  ACT_INIT} },
-        {RSP_ERROR,     120, 121, -1,                     0,  0, {ACT_FAILVER,
-                                                                  ACT_INIT} },
-        {RSP_OK,        121, 121, -1,                     0,  0, {ACT_GOTVER,
-                                                                  ACT_INIT} },
+        {EV_TIMEOUT,    120, 121, -1,             0,  0, {ACT_FAILVER,
+                                                          ACT_INIT} },
+        {RSP_ERROR,     120, 121, -1,             0,  0, {ACT_FAILVER,
+                                                          ACT_INIT} },
+        {RSP_OK,        121, 121, -1,             0,  0, {ACT_GOTVER,
+                                                          ACT_INIT} },
+        {RSP_NONE,      121, 121, -1,           120,  0, {ACT_GETSTRING} },
 
 /* leave dle mode */
-        {RSP_INIT,        0,   0, SEQ_DLE0,             201,  5, {0},   "^SDLE=0\r"},
-        {RSP_OK,        201, 201, -1,                   202, -1},
-        {RSP_ZDLE,      202, 202,  0,                     0,  0, {ACT_DLE0} },
-        {RSP_NODEV,     200, 249, -1,                     0,  0, {ACT_FAKEDLE0} },
-        {RSP_ERROR,     200, 249, -1,                     0,  0, {ACT_FAILDLE0} },
-        {EV_TIMEOUT,    200, 249, -1,                     0,  0, {ACT_FAILDLE0} },
+        {RSP_INIT,        0,   0, SEQ_DLE0,     201,  5, {0},   "^SDLE=0\r"},
+        {RSP_OK,        201, 201, -1,           202, -1},
+        {RSP_ZDLE,      202, 202,  0,             0,  0, {ACT_DLE0} },
+        {RSP_NODEV,     200, 249, -1,             0,  0, {ACT_FAKEDLE0} },
+        {RSP_ERROR,     200, 249, -1,             0,  0, {ACT_FAILDLE0} },
+        {EV_TIMEOUT,    200, 249, -1,             0,  0, {ACT_FAILDLE0} },
 
 /* enter dle mode */
-        {RSP_INIT,        0,   0, SEQ_DLE1,             251,  5, {0},   "^SDLE=1\r"},
-        {RSP_OK,        251, 251, -1,                   252, -1},
-        {RSP_ZDLE,      252, 252,  1,                     0,  0, {ACT_DLE1} },
-        {RSP_ERROR,     250, 299, -1,                     0,  0, {ACT_FAILDLE1} },
-        {EV_TIMEOUT,    250, 299, -1,                     0,  0, {ACT_FAILDLE1} },
+        {RSP_INIT,        0,   0, SEQ_DLE1,     251,  5, {0},   "^SDLE=1\r"},
+        {RSP_OK,        251, 251, -1,           252, -1},
+        {RSP_ZDLE,      252, 252,  1,             0,  0, {ACT_DLE1} },
+        {RSP_ERROR,     250, 299, -1,             0,  0, {ACT_FAILDLE1} },
+        {EV_TIMEOUT,    250, 299, -1,             0,  0, {ACT_FAILDLE1} },
 
 /* incoming call */
-        {RSP_RING,       -1,  -1, -1,                    -1, -1, {ACT_RING} },
+        {RSP_RING,       -1,  -1, -1,            -1, -1, {ACT_RING} },
 
 /* get cid */
-        {RSP_INIT,        0,   0, SEQ_CID,              301,  5, {0},   "^SGCI?\r"},
-        {RSP_OK,        301, 301, -1,                   302, -1},
-        {RSP_ZGCI,      302, 302, -1,                     0,  0, {ACT_CID} },
-        {RSP_ERROR,     301, 349, -1,                     0,  0, {ACT_FAILCID} },
-        {EV_TIMEOUT,    301, 349, -1,                     0,  0, {ACT_FAILCID} },
+        {RSP_INIT,        0,   0, SEQ_CID,      301,  5, {0},   "^SGCI?\r"},
+        {RSP_OK,        301, 301, -1,           302, -1},
+        {RSP_ZGCI,      302, 302, -1,             0,  0, {ACT_CID} },
+        {RSP_ERROR,     301, 349, -1,             0,  0, {ACT_FAILCID} },
+        {EV_TIMEOUT,    301, 349, -1,             0,  0, {ACT_FAILCID} },
 
 /* enter cid mode */
-        {RSP_INIT,        0,   0, SEQ_CIDMODE,          150,  5, {0},   "^SGCI=1\r"},
-        {RSP_OK,        150, 150, -1,                     0,  0, {ACT_CMODESET} },
-        {RSP_ERROR,     150, 150, -1,                     0,  0, {ACT_FAILCMODE} },
-        {EV_TIMEOUT,    150, 150, -1,                     0,  0, {ACT_FAILCMODE} },
+        {RSP_INIT,        0,   0, SEQ_CIDMODE,  150,  5, {0},   "^SGCI=1\r"},
+        {RSP_OK,        150, 150, -1,             0,  0, {ACT_CMODESET} },
+        {RSP_ERROR,     150, 150, -1,             0,  0, {ACT_FAILCMODE} },
+        {EV_TIMEOUT,    150, 150, -1,             0,  0, {ACT_FAILCMODE} },
 
 /* leave cid mode */
-        {RSP_INIT,        0,   0, SEQ_UMMODE,           160,  5, {0},   "Z\r"},
-        {RSP_OK,        160, 160, -1,                     0,  0, {ACT_UMODESET} },
-        {RSP_ERROR,     160, 160, -1,                     0,  0, {ACT_FAILUMODE} },
-        {EV_TIMEOUT,    160, 160, -1,                     0,  0, {ACT_FAILUMODE} },
+        {RSP_INIT,        0,   0, SEQ_UMMODE,   160,  5, {0},   "Z\r"},
+        {RSP_OK,        160, 160, -1,             0,  0, {ACT_UMODESET} },
+        {RSP_ERROR,     160, 160, -1,             0,  0, {ACT_FAILUMODE} },
+        {EV_TIMEOUT,    160, 160, -1,             0,  0, {ACT_FAILUMODE} },
 
 /* abort getting cid */
-        {RSP_INIT,        0,   0, SEQ_NOCID,              0,  0, {ACT_ABORTCID} },
+        {RSP_INIT,        0,   0, SEQ_NOCID,      0,  0, {ACT_ABORTCID} },
 
 /* reset */
-        {RSP_INIT,        0,   0, SEQ_SHUTDOWN,         504,  5, {0},   "Z\r"},
-        {RSP_OK,        504, 504, -1,                     0,  0, {ACT_SDOWN} },
-        {RSP_ERROR,     501, 599, -1,                     0,  0, {ACT_FAILSDOWN} },
-        {EV_TIMEOUT,    501, 599, -1,                     0,  0, {ACT_FAILSDOWN} },
-        {RSP_NODEV,     501, 599, -1,                     0,  0, {ACT_FAKESDOWN} },
-
-        {EV_PROC_CIDMODE, -1, -1, -1,                    -1, -1, {ACT_PROC_CIDMODE} },
-        {EV_IF_LOCK,     -1,  -1, -1,                    -1, -1, {ACT_IF_LOCK} },
-        {EV_IF_VER,      -1,  -1, -1,                    -1, -1, {ACT_IF_VER} },
-        {EV_START,       -1,  -1, -1,                    -1, -1, {ACT_START} },
-        {EV_STOP,        -1,  -1, -1,                    -1, -1, {ACT_STOP} },
-        {EV_SHUTDOWN,    -1,  -1, -1,                    -1, -1, {ACT_SHUTDOWN} },
+        {RSP_INIT,        0,   0, SEQ_SHUTDOWN, 504,  5, {0},   "Z\r"},
+        {RSP_OK,        504, 504, -1,             0,  0, {ACT_SDOWN} },
+        {RSP_ERROR,     501, 599, -1,             0,  0, {ACT_FAILSDOWN} },
+        {EV_TIMEOUT,    501, 599, -1,             0,  0, {ACT_FAILSDOWN} },
+        {RSP_NODEV,     501, 599, -1,             0,  0, {ACT_FAKESDOWN} },
+
+        {EV_PROC_CIDMODE, -1, -1, -1,            -1, -1, {ACT_PROC_CIDMODE} },
+        {EV_IF_LOCK,     -1,  -1, -1,            -1, -1, {ACT_IF_LOCK} },
+        {EV_IF_VER,      -1,  -1, -1,            -1, -1, {ACT_IF_VER} },
+        {EV_START,       -1,  -1, -1,            -1, -1, {ACT_START} },
+        {EV_STOP,        -1,  -1, -1,            -1, -1, {ACT_STOP} },
+        {EV_SHUTDOWN,    -1,  -1, -1,            -1, -1, {ACT_SHUTDOWN} },
 
 /* misc. */
-        {RSP_ERROR,      -1,  -1, -1,                    -1, -1, {ACT_ERROR} },
-        {RSP_ZCAU,       -1,  -1, -1,                    -1, -1, {ACT_ZCAU} },
-        {RSP_NONE,       -1,  -1, -1,                    -1, -1, {ACT_DEBUG} },
-        {RSP_ANY,        -1,  -1, -1,                    -1, -1, {ACT_WARN} },
+        {RSP_ERROR,      -1,  -1, -1,            -1, -1, {ACT_ERROR} },
+        {RSP_ZCAU,       -1,  -1, -1,            -1, -1, {ACT_ZCAU} },
+        {RSP_NONE,       -1,  -1, -1,            -1, -1, {ACT_DEBUG} },
+        {RSP_ANY,        -1,  -1, -1,            -1, -1, {ACT_WARN} },
         {RSP_LAST}
 };
 
@@ -261,90 +262,90 @@ struct reply_t gigaset_tab_cid[] =
  * action, command */
 
 /* dial */
-        {EV_DIAL,        -1,  -1, -1,                    -1, -1, {ACT_DIAL} },
-        {RSP_INIT,        0,   0, SEQ_DIAL,             601,  5, {ACT_CMD + AT_BC} },
-        {RSP_OK,        601, 601, -1,                   603,  5, {ACT_CMD + AT_PROTO} },
-        {RSP_OK,        603, 603, -1,                   604,  5, {ACT_CMD + AT_TYPE} },
-        {RSP_OK,        604, 604, -1,                   605,  5, {ACT_CMD + AT_MSN} },
-        {RSP_NULL,      605, 605, -1,                   606,  5, {ACT_CMD + AT_CLIP} },
-        {RSP_OK,        605, 605, -1,                   606,  5, {ACT_CMD + AT_CLIP} },
-        {RSP_NULL,      606, 606, -1,                   607,  5, {ACT_CMD + AT_ISO} },
-        {RSP_OK,        606, 606, -1,                   607,  5, {ACT_CMD + AT_ISO} },
-        {RSP_OK,        607, 607, -1,                   608,  5, {0},   "+VLS=17\r"},
-        {RSP_OK,        608, 608, -1,                   609, -1},
-        {RSP_ZSAU,      609, 609, ZSAU_PROCEEDING,      610,  5, {ACT_CMD + AT_DIAL} },
-        {RSP_OK,        610, 610, -1,                   650,  0, {ACT_DIALING} },
-
-        {RSP_ERROR,     601, 610, -1,                     0,  0, {ACT_ABORTDIAL} },
-        {EV_TIMEOUT,    601, 610, -1,                     0,  0, {ACT_ABORTDIAL} },
+        {EV_DIAL,        -1,  -1, -1,            -1, -1, {ACT_DIAL} },
+        {RSP_INIT,        0,   0, SEQ_DIAL,     601,  5, {ACT_CMD + AT_BC} },
+        {RSP_OK,        601, 601, -1,           603,  5, {ACT_CMD + AT_PROTO} },
+        {RSP_OK,        603, 603, -1,           604,  5, {ACT_CMD + AT_TYPE} },
+        {RSP_OK,        604, 604, -1,           605,  5, {ACT_CMD + AT_MSN} },
+        {RSP_NULL,      605, 605, -1,           606,  5, {ACT_CMD + AT_CLIP} },
+        {RSP_OK,        605, 605, -1,           606,  5, {ACT_CMD + AT_CLIP} },
+        {RSP_NULL,      606, 606, -1,           607,  5, {ACT_CMD + AT_ISO} },
+        {RSP_OK,        606, 606, -1,           607,  5, {ACT_CMD + AT_ISO} },
+        {RSP_OK,        607, 607, -1,           608,  5, {0},   "+VLS=17\r"},
+        {RSP_OK,        608, 608, -1,           609, -1},
+        {RSP_ZSAU,      609, 609, ZSAU_PROCEEDING, 610, 5, {ACT_CMD + AT_DIAL} },
+        {RSP_OK,        610, 610, -1,           650,  0, {ACT_DIALING} },
+
+        {RSP_ERROR,     601, 610, -1,             0,  0, {ACT_ABORTDIAL} },
+        {EV_TIMEOUT,    601, 610, -1,             0,  0, {ACT_ABORTDIAL} },
 
 /* optional dialing responses */
-        {EV_BC_OPEN,    650, 650, -1,                   651, -1},
-        {RSP_ZVLS,      609, 651, 17,                    -1, -1, {ACT_DEBUG} },
-        {RSP_ZCTP,      610, 651, -1,                    -1, -1, {ACT_DEBUG} },
-        {RSP_ZCPN,      610, 651, -1,                    -1, -1, {ACT_DEBUG} },
-        {RSP_ZSAU,      650, 651, ZSAU_CALL_DELIVERED,   -1, -1, {ACT_DEBUG} },
+        {EV_BC_OPEN,    650, 650, -1,           651, -1},
+        {RSP_ZVLS,      609, 651, 17,            -1, -1, {ACT_DEBUG} },
+        {RSP_ZCTP,      610, 651, -1,            -1, -1, {ACT_DEBUG} },
+        {RSP_ZCPN,      610, 651, -1,            -1, -1, {ACT_DEBUG} },
+        {RSP_ZSAU,      650, 651, ZSAU_CALL_DELIVERED, -1, -1, {ACT_DEBUG} },
 
 /* connect */
-        {RSP_ZSAU,      650, 650, ZSAU_ACTIVE,          800, -1, {ACT_CONNECT} },
-        {RSP_ZSAU,      651, 651, ZSAU_ACTIVE,          800, -1, {ACT_CONNECT,
-                                                                  ACT_NOTIFY_BC_UP} },
-        {RSP_ZSAU,      750, 750, ZSAU_ACTIVE,          800, -1, {ACT_CONNECT} },
-        {RSP_ZSAU,      751, 751, ZSAU_ACTIVE,          800, -1, {ACT_CONNECT,
-                                                                  ACT_NOTIFY_BC_UP} },
-        {EV_BC_OPEN,    800, 800, -1,                   800, -1, {ACT_NOTIFY_BC_UP} },
+        {RSP_ZSAU,      650, 650, ZSAU_ACTIVE,  800, -1, {ACT_CONNECT} },
+        {RSP_ZSAU,      651, 651, ZSAU_ACTIVE,  800, -1, {ACT_CONNECT,
+                                                          ACT_NOTIFY_BC_UP} },
+        {RSP_ZSAU,      750, 750, ZSAU_ACTIVE,  800, -1, {ACT_CONNECT} },
+        {RSP_ZSAU,      751, 751, ZSAU_ACTIVE,  800, -1, {ACT_CONNECT,
+                                                          ACT_NOTIFY_BC_UP} },
+        {EV_BC_OPEN,    800, 800, -1,           800, -1, {ACT_NOTIFY_BC_UP} },
 
 /* remote hangup */
-        {RSP_ZSAU,      650, 651, ZSAU_DISCONNECT_IND,    0,  0, {ACT_REMOTEREJECT} },
-        {RSP_ZSAU,      750, 751, ZSAU_DISCONNECT_IND,    0,  0, {ACT_REMOTEHUP} },
-        {RSP_ZSAU,      800, 800, ZSAU_DISCONNECT_IND,    0,  0, {ACT_REMOTEHUP} },
+        {RSP_ZSAU,      650, 651, ZSAU_DISCONNECT_IND, 0, 0, {ACT_REMOTEREJECT} },
+        {RSP_ZSAU,      750, 751, ZSAU_DISCONNECT_IND, 0, 0, {ACT_REMOTEHUP} },
+        {RSP_ZSAU,      800, 800, ZSAU_DISCONNECT_IND, 0, 0, {ACT_REMOTEHUP} },
 
 /* hangup */
-        {EV_HUP,         -1,  -1, -1,                    -1, -1, {ACT_HUP} },
-        {RSP_INIT,       -1,  -1, SEQ_HUP,              401,  5, {0},   "+VLS=0\r"},
-        {RSP_OK,        401, 401, -1,                   402,  5},
-        {RSP_ZVLS,      402, 402,  0,                   403,  5},
-        {RSP_ZSAU,      403, 403, ZSAU_DISCONNECT_REQ,   -1, -1, {ACT_DEBUG} },
-        {RSP_ZSAU,      403, 403, ZSAU_NULL,              0,  0, {ACT_DISCONNECT} },
-        {RSP_NODEV,     401, 403, -1,                     0,  0, {ACT_FAKEHUP} },
-        {RSP_ERROR,     401, 401, -1,                     0,  0, {ACT_ABORTHUP} },
-        {EV_TIMEOUT,    401, 403, -1,                     0,  0, {ACT_ABORTHUP} },
-
-        {EV_BC_CLOSED,    0,   0, -1,                     0, -1, {ACT_NOTIFY_BC_DOWN} },
+        {EV_HUP,         -1,  -1, -1,            -1, -1, {ACT_HUP} },
+        {RSP_INIT,       -1,  -1, SEQ_HUP,      401,  5, {0},   "+VLS=0\r"},
+        {RSP_OK,        401, 401, -1,           402,  5},
+        {RSP_ZVLS,      402, 402,  0,           403,  5},
+        {RSP_ZSAU,      403, 403, ZSAU_DISCONNECT_REQ, -1, -1, {ACT_DEBUG} },
+        {RSP_ZSAU,      403, 403, ZSAU_NULL,      0,  0, {ACT_DISCONNECT} },
+        {RSP_NODEV,     401, 403, -1,             0,  0, {ACT_FAKEHUP} },
+        {RSP_ERROR,     401, 401, -1,             0,  0, {ACT_ABORTHUP} },
+        {EV_TIMEOUT,    401, 403, -1,             0,  0, {ACT_ABORTHUP} },
+
+        {EV_BC_CLOSED,    0,   0, -1,             0, -1, {ACT_NOTIFY_BC_DOWN} },
 
 /* ring */
-        {RSP_ZBC,       700, 700, -1,                    -1, -1, {0} },
-        {RSP_ZHLC,      700, 700, -1,                    -1, -1, {0} },
-        {RSP_NMBR,      700, 700, -1,                    -1, -1, {0} },
-        {RSP_ZCPN,      700, 700, -1,                    -1, -1, {0} },
-        {RSP_ZCTP,      700, 700, -1,                    -1, -1, {0} },
-        {EV_TIMEOUT,    700, 700, -1,                   720, 720, {ACT_ICALL} },
-        {EV_BC_CLOSED,  720, 720, -1,                     0, -1, {ACT_NOTIFY_BC_DOWN} },
+        {RSP_ZBC,       700, 700, -1,            -1, -1, {0} },
+        {RSP_ZHLC,      700, 700, -1,            -1, -1, {0} },
+        {RSP_NMBR,      700, 700, -1,            -1, -1, {0} },
+        {RSP_ZCPN,      700, 700, -1,            -1, -1, {0} },
+        {RSP_ZCTP,      700, 700, -1,            -1, -1, {0} },
+        {EV_TIMEOUT,    700, 700, -1,           720, 720, {ACT_ICALL} },
+        {EV_BC_CLOSED,  720, 720, -1,             0, -1, {ACT_NOTIFY_BC_DOWN} },
 
 /*accept icall*/
-        {EV_ACCEPT,      -1,  -1, -1,                    -1, -1, {ACT_ACCEPT} },
-        {RSP_INIT,      720, 720, SEQ_ACCEPT,           721,  5, {ACT_CMD + AT_PROTO} },
-        {RSP_OK,        721, 721, -1,                   722,  5, {ACT_CMD + AT_ISO} },
-        {RSP_OK,        722, 722, -1,                   723,  5, {0},   "+VLS=17\r"},
-        {RSP_OK,        723, 723, -1,                   724,  5, {0} },
-        {RSP_ZVLS,      724, 724, 17,                   750, 50, {ACT_ACCEPTED} },
-        {RSP_ERROR,     721, 729, -1,                     0,  0, {ACT_ABORTACCEPT} },
-        {EV_TIMEOUT,    721, 729, -1,                     0,  0, {ACT_ABORTACCEPT} },
-        {RSP_ZSAU,      700, 729, ZSAU_NULL,              0,  0, {ACT_ABORTACCEPT} },
-        {RSP_ZSAU,      700, 729, ZSAU_ACTIVE,            0,  0, {ACT_ABORTACCEPT} },
-        {RSP_ZSAU,      700, 729, ZSAU_DISCONNECT_IND,    0,  0, {ACT_ABORTACCEPT} },
-
-        {EV_BC_OPEN,    750, 750, -1,                   751, -1},
-        {EV_TIMEOUT,    750, 751, -1,                     0,  0, {ACT_CONNTIMEOUT} },
+        {EV_ACCEPT,      -1,  -1, -1,            -1, -1, {ACT_ACCEPT} },
+        {RSP_INIT,      720, 720, SEQ_ACCEPT,   721,  5, {ACT_CMD + AT_PROTO} },
+        {RSP_OK,        721, 721, -1,           722,  5, {ACT_CMD + AT_ISO} },
+        {RSP_OK,        722, 722, -1,           723,  5, {0},   "+VLS=17\r"},
+        {RSP_OK,        723, 723, -1,           724,  5, {0} },
+        {RSP_ZVLS,      724, 724, 17,           750, 50, {ACT_ACCEPTED} },
+        {RSP_ERROR,     721, 729, -1,             0,  0, {ACT_ABORTACCEPT} },
+        {EV_TIMEOUT,    721, 729, -1,             0,  0, {ACT_ABORTACCEPT} },
+        {RSP_ZSAU,      700, 729, ZSAU_NULL,      0,  0, {ACT_ABORTACCEPT} },
+        {RSP_ZSAU,      700, 729, ZSAU_ACTIVE,    0,  0, {ACT_ABORTACCEPT} },
+        {RSP_ZSAU,      700, 729, ZSAU_DISCONNECT_IND, 0, 0, {ACT_ABORTACCEPT} },
+
+        {EV_BC_OPEN,    750, 750, -1,           751, -1},
+        {EV_TIMEOUT,    750, 751, -1,             0,  0, {ACT_CONNTIMEOUT} },
 
 /* B channel closed (general case) */
-        {EV_BC_CLOSED,   -1,  -1, -1,                    -1, -1, {ACT_NOTIFY_BC_DOWN} },
+        {EV_BC_CLOSED,   -1,  -1, -1,            -1, -1, {ACT_NOTIFY_BC_DOWN} },
 
 /* misc. */
-        {RSP_ZCON,       -1,  -1, -1,                    -1, -1, {ACT_DEBUG} },
-        {RSP_ZCAU,       -1,  -1, -1,                    -1, -1, {ACT_ZCAU} },
-        {RSP_NONE,       -1,  -1, -1,                    -1, -1, {ACT_DEBUG} },
-        {RSP_ANY,        -1,  -1, -1,                    -1, -1, {ACT_WARN} },
+        {RSP_ZCON,       -1,  -1, -1,            -1, -1, {ACT_DEBUG} },
+        {RSP_ZCAU,       -1,  -1, -1,            -1, -1, {ACT_ZCAU} },
+        {RSP_NONE,       -1,  -1, -1,            -1, -1, {ACT_DEBUG} },
+        {RSP_ANY,        -1,  -1, -1,            -1, -1, {ACT_WARN} },
         {RSP_LAST}
 };
 
@@ -648,16 +649,16 @@ static void disconnect(struct at_state_t **at_state_p)
 static inline struct at_state_t *get_free_channel(struct cardstate *cs,
                                                   int cid)
 /* cids: >0: siemens-cid
-   0: without cid
-   -1: no cid assigned yet
-*/
+ *        0: without cid
+ *       -1: no cid assigned yet
+ */
 {
         unsigned long flags;
         int i;
         struct at_state_t *ret;
 
         for (i = 0; i < cs->channels; ++i)
-                if (gigaset_get_channel(cs->bcs + i)) {
+                if (gigaset_get_channel(cs->bcs + i) >= 0) {
                         ret = &cs->bcs[i].at_state;
                         ret->cid = cid;
                         return ret;
@@ -922,18 +923,18 @@ static void do_stop(struct cardstate *cs)
  * channel >= 0: getting cid for the channel failed
  * channel < 0:  entering cid mode failed
  *
- * returns 0 on failure
+ * returns 0 on success, <0 on failure
  */
 static int reinit_and_retry(struct cardstate *cs, int channel)
 {
         int i;
 
         if (--cs->retry_count <= 0)
-                return 0;
+                return -EFAULT;
 
         for (i = 0; i < cs->channels; ++i)
                 if (cs->bcs[i].at_state.cid > 0)
-                        return 0;
+                        return -EBUSY;
 
         if (channel < 0)
                 dev_warn(cs->dev,
@@ -944,7 +945,7 @@ static int reinit_and_retry(struct cardstate *cs, int channel)
                 cs->bcs[channel].at_state.pending_commands |= PC_CID;
         }
         schedule_init(cs, MS_INIT);
-        return 1;
+        return 0;
 }
 
 static int at_state_invalid(struct cardstate *cs,
@@ -1015,7 +1016,7 @@ static int do_lock(struct cardstate *cs)
                         if (cs->bcs[i].at_state.pending_commands)
                                 return -EBUSY;
 
-                if (!gigaset_get_channels(cs))
+                if (gigaset_get_channels(cs) < 0)
                         return -EBUSY;
 
                 break;
@@ -1124,7 +1125,7 @@ static void do_action(int action, struct cardstate *cs,
                         init_failed(cs, M_UNKNOWN);
                         break;
                 }
-                if (!reinit_and_retry(cs, -1))
+                if (reinit_and_retry(cs, -1) < 0)
                         schedule_init(cs, MS_RECOVER);
                 break;
         case ACT_FAILUMODE:
@@ -1267,7 +1268,7 @@ static void do_action(int action, struct cardstate *cs,
         case ACT_FAILCID:
                 cs->cur_at_seq = SEQ_NONE;
                 channel = cs->curchannel;
-                if (!reinit_and_retry(cs, channel)) {
+                if (reinit_and_retry(cs, channel) < 0) {
                         dev_warn(cs->dev,
                                  "Could not get a call ID. Cannot dial.\n");
                         at_state2 = &cs->bcs[channel].at_state;
@@ -1314,8 +1315,9 @@ static void do_action(int action, struct cardstate *cs,
                 s = ev->ptr;
 
                 if (!strcmp(s, "OK")) {
+                        /* OK without version string: assume old response */
                         *p_genresp = 1;
-                        *p_resp_code = RSP_ERROR;
+                        *p_resp_code = RSP_NONE;
                         break;
                 }
 
@@ -1372,7 +1374,8 @@ static void do_action(int action, struct cardstate *cs,
                          ev->parameter, at_state->ConState);
                 break;
 
-                /* events from the LL */
+        /* events from the LL */
+
         case ACT_DIAL:
                 start_dial(at_state, ev->ptr, ev->parameter);
                 break;
@@ -1385,7 +1388,8 @@ static void do_action(int action, struct cardstate *cs,
                 cs->commands_pending = 1;
                 break;
 
-                /* hotplug events */
+        /* hotplug events */
+
         case ACT_STOP:
                 do_stop(cs);
                 break;
@@ -1393,7 +1397,8 @@ static void do_action(int action, struct cardstate *cs,
                 do_start(cs);
                 break;
 
-                /* events from the interface */
+        /* events from the interface */
+
         case ACT_IF_LOCK:
                 cs->cmd_result = ev->parameter ? do_lock(cs) : do_unlock(cs);
                 cs->waiting = 0;
@@ -1412,7 +1417,8 @@ static void do_action(int action, struct cardstate *cs,
                 wake_up(&cs->waitqueue);
                 break;
 
-                /* events from the proc file system */
+        /* events from the proc file system */
+
         case ACT_PROC_CIDMODE:
                 spin_lock_irqsave(&cs->lock, flags);
                 if (ev->parameter != cs->cidmode) {
@@ -1431,7 +1437,8 @@ static void do_action(int action, struct cardstate *cs,
                 wake_up(&cs->waitqueue);
                 break;
 
-                /* events from the hardware drivers */
+        /* events from the hardware drivers */
+
         case ACT_NOTIFY_BC_DOWN:
                 bchannel_down(bcs);
                 break;
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index 1dc25131e670..8e2fc8f31d16 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -163,8 +163,8 @@ void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
 #define BAS_LOWFRAME    5       /* "    "    with negative flow control */
 #define BAS_CORRFRAMES  4       /* flow control multiplicator */
 
-#define BAS_INBUFSIZE   (BAS_MAXFRAME * BAS_NUMFRAMES)
-/* size of isoc in buf per URB */
+#define BAS_INBUFSIZE   (BAS_MAXFRAME * BAS_NUMFRAMES)  /* size of isoc in buf
+                                                         * per URB */
 #define BAS_OUTBUFSIZE  4096            /* size of common isoc out buffer */
 #define BAS_OUTBUFPAD   BAS_MAXFRAME    /* size of pad area for isoc out buf */
 
@@ -471,18 +471,18 @@ struct cardstate {
                                            for */
         int commands_pending;           /* flag(s) in xxx.commands_pending have
                                            been set */
-        struct tasklet_struct event_tasklet;
-        /* tasklet for serializing AT commands.
-         * Scheduled
-         *   -> for modem reponses (and
-         *      incoming data for M10x)
-         *   -> on timeout
-         *   -> after setting bits in
-         *      xxx.at_state.pending_command
-         *      (e.g. command from LL) */
-        struct tasklet_struct write_tasklet;
-        /* tasklet for serial output
-         * (not used in base driver) */
+        struct tasklet_struct
+                event_tasklet;          /* tasklet for serializing AT commands.
+                                         * Scheduled
+                                         *   -> for modem reponses (and
+                                         *      incoming data for M10x)
+                                         *   -> on timeout
+                                         *   -> after setting bits in
+                                         *      xxx.at_state.pending_command
+                                         *      (e.g. command from LL) */
+        struct tasklet_struct
+                write_tasklet;          /* tasklet for serial output
+                                         * (not used in base driver) */
 
         /* event queue */
         struct event_t events[MAX_EVENTS];
@@ -583,7 +583,7 @@ struct gigaset_ops {
         int (*initbcshw)(struct bc_state *bcs);
 
         /* Called by gigaset_freecs() for freeing bcs->hw.xxx */
-        int (*freebcshw)(struct bc_state *bcs);
+        void (*freebcshw)(struct bc_state *bcs);
 
         /* Called by gigaset_bchannel_down() for resetting bcs->hw.xxx */
         void (*reinitbcshw)(struct bc_state *bcs);
diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c
index 0f13eb1de657..2d75329007f1 100644
--- a/drivers/isdn/gigaset/i4l.c
+++ b/drivers/isdn/gigaset/i4l.c
@@ -229,7 +229,7 @@ static int command_from_LL(isdn_ctrl *cntrl)
                         return -EINVAL;
                 }
                 bcs = cs->bcs + ch;
-                if (!gigaset_get_channel(bcs)) {
+                if (gigaset_get_channel(bcs) < 0) {
                         dev_err(cs->dev, "ISDN_CMD_DIAL: channel not free\n");
                         return -EBUSY;
                 }
@@ -618,7 +618,7 @@ void gigaset_isdn_stop(struct cardstate *cs)
  * @cs:         device descriptor structure.
  * @isdnid:     device name.
  *
- * Return value: 1 for success, 0 for failure
+ * Return value: 0 on success, error code < 0 on failure
  */
 int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
 {
@@ -627,14 +627,14 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
         iif = kmalloc(sizeof *iif, GFP_KERNEL);
         if (!iif) {
                 pr_err("out of memory\n");
-                return 0;
+                return -ENOMEM;
         }
 
         if (snprintf(iif->id, sizeof iif->id, "%s_%u", isdnid, cs->minor_index)
             >= sizeof iif->id) {
                 pr_err("ID too long: %s\n", isdnid);
                 kfree(iif);
-                return 0;
+                return -EINVAL;
         }
 
         iif->owner = THIS_MODULE;
@@ -656,13 +656,13 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
         if (!register_isdn(iif)) {
                 pr_err("register_isdn failed\n");
                 kfree(iif);
-                return 0;
+                return -EINVAL;
         }
 
         cs->iif = iif;
         cs->myid = iif->channels;               /* Set my device id */
         cs->hw_hdr_len = HW_HDR_LEN;
-        return 1;
+        return 0;
 }
 
 /**
diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/isdn/gigaset/isocdata.c
index a351c16705bd..bc29f1d52a2f 100644
--- a/drivers/isdn/gigaset/isocdata.c
+++ b/drivers/isdn/gigaset/isocdata.c
@@ -56,7 +56,7 @@ static inline int isowbuf_freebytes(struct isowbuf_t *iwb)
 
 /* start writing
  * acquire the write semaphore
- * return true if acquired, false if busy
+ * return 0 if acquired, <0 if busy
  */
 static inline int isowbuf_startwrite(struct isowbuf_t *iwb)
 {
@@ -64,12 +64,12 @@ static inline int isowbuf_startwrite(struct isowbuf_t *iwb)
                 atomic_inc(&iwb->writesem);
                 gig_dbg(DEBUG_ISO, "%s: couldn't acquire iso write semaphore",
                         __func__);
-                return 0;
+                return -EBUSY;
         }
         gig_dbg(DEBUG_ISO,
                 "%s: acquired iso write semaphore, data[write]=%02x, nbits=%d",
                 __func__, iwb->data[iwb->write], iwb->wbits);
-        return 1;
+        return 0;
 }
 
 /* finish writing
@@ -158,7 +158,7 @@ int gigaset_isowbuf_getbytes(struct isowbuf_t *iwb, int size)
                 /* no wraparound in valid data */
                 if (limit >= write) {
                         /* append idle frame */
-                        if (!isowbuf_startwrite(iwb))
+                        if (isowbuf_startwrite(iwb) < 0)
                                 return -EBUSY;
                         /* write position could have changed */
                         write = iwb->write;
@@ -403,7 +403,7 @@ static inline int hdlc_buildframe(struct isowbuf_t *iwb,
         unsigned char c;
 
         if (isowbuf_freebytes(iwb) < count + count / 5 + 6 ||
-            !isowbuf_startwrite(iwb)) {
+            isowbuf_startwrite(iwb) < 0) {
                 gig_dbg(DEBUG_ISO, "%s: %d bytes free -> -EAGAIN",
                         __func__, isowbuf_freebytes(iwb));
                 return -EAGAIN;
@@ -457,7 +457,7 @@ static inline int trans_buildframe(struct isowbuf_t *iwb,
                 return iwb->write;
 
         if (isowbuf_freebytes(iwb) < count ||
-            !isowbuf_startwrite(iwb)) {
+            isowbuf_startwrite(iwb) < 0) {
                 gig_dbg(DEBUG_ISO, "can't put %d bytes", count);
                 return -EAGAIN;
         }
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index 6f3fd4cf4378..8c91fd5eb6fd 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -340,17 +340,16 @@ static int gigaset_initbcshw(struct bc_state *bcs)
 {
         /* unused */
         bcs->hw.ser = NULL;
-        return 1;
+        return 0;
 }
 
 /*
  * Free B channel structure
  * Called by "gigaset_freebcs" in common.c
  */
-static int gigaset_freebcshw(struct bc_state *bcs)
+static void gigaset_freebcshw(struct bc_state *bcs)
 {
         /* unused */
-        return 1;
 }
 
 /*
@@ -398,7 +397,7 @@ static int gigaset_initcshw(struct cardstate *cs)
         scs = kzalloc(sizeof(struct ser_cardstate), GFP_KERNEL);
         if (!scs) {
                 pr_err("out of memory\n");
-                return 0;
+                return -ENOMEM;
         }
         cs->hw.ser = scs;
 
@@ -410,13 +409,13 @@ static int gigaset_initcshw(struct cardstate *cs)
                 pr_err("error %d registering platform device\n", rc);
                 kfree(cs->hw.ser);
                 cs->hw.ser = NULL;
-                return 0;
+                return rc;
         }
         dev_set_drvdata(&cs->hw.ser->dev.dev, cs);
 
         tasklet_init(&cs->write_tasklet,
                      gigaset_modem_fill, (unsigned long) cs);
-        return 1;
+        return 0;
 }
 
 /*
@@ -503,6 +502,7 @@ static int
 gigaset_tty_open(struct tty_struct *tty)
 {
         struct cardstate *cs;
+        int rc;
 
         gig_dbg(DEBUG_INIT, "Starting HLL for Gigaset M101");
 
@@ -515,8 +515,10 @@ gigaset_tty_open(struct tty_struct *tty)
 
         /* allocate memory for our device state and initialize it */
         cs = gigaset_initcs(driver, 1, 1, 0, cidmode, GIGASET_MODULENAME);
-        if (!cs)
+        if (!cs) {
+                rc = -ENODEV;
                 goto error;
+        }
 
         cs->dev = &cs->hw.ser->dev.dev;
         cs->hw.ser->tty = tty;
@@ -530,7 +532,8 @@ gigaset_tty_open(struct tty_struct *tty)
          */
         if (startmode == SM_LOCKED)
                 cs->mstate = MS_LOCKED;
-        if (!gigaset_start(cs)) {
+        rc = gigaset_start(cs);
+        if (rc < 0) {
                 tasklet_kill(&cs->write_tasklet);
                 goto error;
         }
@@ -542,7 +545,7 @@ error:
         gig_dbg(DEBUG_INIT, "Startup of HLL failed");
         tty->disc_data = NULL;
         gigaset_freecs(cs);
-        return -ENODEV;
+        return rc;
 }
 
 /*
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index 049da67f6392..bb12d8051732 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -549,10 +549,9 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
                                0, 0, &buf, 6, 2000);
 }
 
-static int gigaset_freebcshw(struct bc_state *bcs)
+static void gigaset_freebcshw(struct bc_state *bcs)
 {
         /* unused */
-        return 1;
 }
 
 /* Initialize the b-channel structure */
@@ -560,7 +559,7 @@ static int gigaset_initbcshw(struct bc_state *bcs)
 {
         /* unused */
         bcs->hw.usb = NULL;
-        return 1;
+        return 0;
 }
 
 static void gigaset_reinitbcshw(struct bc_state *bcs)
@@ -582,7 +581,7 @@ static int gigaset_initcshw(struct cardstate *cs)
                 kmalloc(sizeof(struct usb_cardstate), GFP_KERNEL);
         if (!ucs) {
                 pr_err("out of memory\n");
-                return 0;
+                return -ENOMEM;
         }
 
         ucs->bchars[0] = 0;
@@ -597,7 +596,7 @@ static int gigaset_initcshw(struct cardstate *cs)
         tasklet_init(&cs->write_tasklet,
                      gigaset_modem_fill, (unsigned long) cs);
 
-        return 1;
+        return 0;
 }
 
 /* Send data from current skb to the device. */
@@ -766,9 +765,9 @@ static int gigaset_probe(struct usb_interface *interface,
         if (startmode == SM_LOCKED)
                 cs->mstate = MS_LOCKED;
 
-        if (!gigaset_start(cs)) {
+        retval = gigaset_start(cs);
+        if (retval < 0) {
                 tasklet_kill(&cs->write_tasklet);
-                retval = -ENODEV;
                 goto error;
         }
         return 0;
@@ -898,8 +897,10 @@ static int __init usb_gigaset_init(void)
         driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
                                     GIGASET_MODULENAME, GIGASET_DEVNAME,
                                     &ops, THIS_MODULE);
-        if (driver == NULL)
+        if (driver == NULL) {
+                result = -ENOMEM;
                 goto error;
+        }
 
         /* register this driver with the USB subsystem */
         result = usb_register(&gigaset_usb_driver);
@@ -915,7 +916,7 @@ error:
         if (driver)
                 gigaset_freedriver(driver);
         driver = NULL;
-        return -1;
+        return result;
 }
 
 /*
diff --git a/drivers/isdn/hardware/eicon/capifunc.c b/drivers/isdn/hardware/eicon/capifunc.c
index a576f32e6635..7a0bdbdd87ea 100644
--- a/drivers/isdn/hardware/eicon/capifunc.c
+++ b/drivers/isdn/hardware/eicon/capifunc.c
@@ -1120,7 +1120,7 @@ int fax_head_line_time(char *buffer)
 /*
  * init (alloc) main structures
  */
-static int DIVA_INIT_FUNCTION init_main_structs(void)
+static int __init init_main_structs(void)
 {
         if (!(mapped_msg = (CAPI_MSG *) diva_os_malloc(0, MAX_MSG_SIZE))) {
                 DBG_ERR(("init: failed alloc mapped_msg."))
@@ -1181,7 +1181,7 @@ static void do_api_remove_start(void)
 /*
  * init
  */
-int DIVA_INIT_FUNCTION init_capifunc(void)
+int __init init_capifunc(void)
 {
         diva_os_initialize_spin_lock(&api_lock, "capifunc");
         memset(ControllerMap, 0, MAX_DESCRIPTORS + 1);
@@ -1209,7 +1209,7 @@ int DIVA_INIT_FUNCTION init_capifunc(void)
 /*
  * finit
  */
-void DIVA_EXIT_FUNCTION finit_capifunc(void)
+void __exit finit_capifunc(void)
 {
         do_api_remove_start();
         divacapi_disconnect_didd();
diff --git a/drivers/isdn/hardware/eicon/capimain.c b/drivers/isdn/hardware/eicon/capimain.c
index eabe0fa1b627..997d46abf5b2 100644
--- a/drivers/isdn/hardware/eicon/capimain.c
+++ b/drivers/isdn/hardware/eicon/capimain.c
@@ -118,7 +118,7 @@ void diva_os_set_controller_struct(struct capi_ctr *ctrl)
 /*
  * module init
  */
-static int DIVA_INIT_FUNCTION divacapi_init(void)
+static int __init divacapi_init(void)
 {
         char tmprev[32];
         int ret = 0;
@@ -144,7 +144,7 @@ static int DIVA_INIT_FUNCTION divacapi_init(void)
 /*
  * module exit
  */
-static void DIVA_EXIT_FUNCTION divacapi_exit(void)
+static void __exit divacapi_exit(void)
 {
         finit_capifunc();
         printk(KERN_INFO "%s: module unloaded.\n", DRIVERLNAME);
diff --git a/drivers/isdn/hardware/eicon/diddfunc.c b/drivers/isdn/hardware/eicon/diddfunc.c
index c4c8220c9d72..b0b23ed8b374 100644
--- a/drivers/isdn/hardware/eicon/diddfunc.c
+++ b/drivers/isdn/hardware/eicon/diddfunc.c
@@ -47,7 +47,7 @@ static void *didd_callback(void *context, DESCRIPTOR *adapter,
 /*
  * connect to didd
  */
-static int DIVA_INIT_FUNCTION connect_didd(void)
+static int __init connect_didd(void)
 {
         int x = 0;
         int dadapter = 0;
@@ -79,7 +79,7 @@ static int DIVA_INIT_FUNCTION connect_didd(void)
 /*
  * disconnect from didd
  */
-static void DIVA_EXIT_FUNCTION disconnect_didd(void)
+static void __exit disconnect_didd(void)
 {
         IDI_SYNC_REQ req;
 
@@ -92,7 +92,7 @@ static void DIVA_EXIT_FUNCTION disconnect_didd(void)
 /*
  * init
  */
-int DIVA_INIT_FUNCTION diddfunc_init(void)
+int __init diddfunc_init(void)
 {
         diva_didd_load_time_init();
 
@@ -107,7 +107,7 @@ int DIVA_INIT_FUNCTION diddfunc_init(void)
 /*
  * finit
  */
-void DIVA_EXIT_FUNCTION diddfunc_finit(void)
+void __exit diddfunc_finit(void)
 {
         DbgDeregister();
         disconnect_didd();
diff --git a/drivers/isdn/hardware/eicon/diva_didd.c b/drivers/isdn/hardware/eicon/diva_didd.c
index d1d3de03cced..fab6ccfb00d5 100644
--- a/drivers/isdn/hardware/eicon/diva_didd.c
+++ b/drivers/isdn/hardware/eicon/diva_didd.c
@@ -91,7 +91,7 @@ static const struct file_operations divadidd_proc_fops = {
         .release        = single_release,
 };
 
-static int DIVA_INIT_FUNCTION create_proc(void)
+static int __init create_proc(void)
 {
         proc_net_eicon = proc_mkdir("eicon", init_net.proc_net);
 
@@ -109,7 +109,7 @@ static void remove_proc(void)
         remove_proc_entry("eicon", init_net.proc_net);
 }
 
-static int DIVA_INIT_FUNCTION divadidd_init(void)
+static int __init divadidd_init(void)
 {
         char tmprev[32];
         int ret = 0;
@@ -141,7 +141,7 @@ out:
         return (ret);
 }
 
-static void DIVA_EXIT_FUNCTION divadidd_exit(void)
+static void __exit divadidd_exit(void)
 {
         diddfunc_finit();
         remove_proc();
diff --git a/drivers/isdn/hardware/eicon/divamnt.c b/drivers/isdn/hardware/eicon/divamnt.c
index ffa0c31be745..48db08d0bb3d 100644
--- a/drivers/isdn/hardware/eicon/divamnt.c
+++ b/drivers/isdn/hardware/eicon/divamnt.c
@@ -184,7 +184,7 @@ static void divas_maint_unregister_chrdev(void)
         unregister_chrdev(major, DEVNAME);
 }
 
-static int DIVA_INIT_FUNCTION divas_maint_register_chrdev(void)
+static int __init divas_maint_register_chrdev(void)
 {
         if ((major = register_chrdev(0, DEVNAME, &divas_maint_fops)) < 0)
         {
@@ -207,7 +207,7 @@ void diva_maint_wakeup_read(void)
 /*
  *  Driver Load
  */
-static int DIVA_INIT_FUNCTION maint_init(void)
+static int __init maint_init(void)
 {
         char tmprev[50];
         int ret = 0;
@@ -245,7 +245,7 @@ out:
 /*
 **  Driver Unload
 */
-static void DIVA_EXIT_FUNCTION maint_exit(void)
+static void __exit maint_exit(void)
 {
         divas_maint_unregister_chrdev();
         mntfunc_finit();
diff --git a/drivers/isdn/hardware/eicon/divasfunc.c b/drivers/isdn/hardware/eicon/divasfunc.c
index 60aaf9580956..4be5f8814777 100644
--- a/drivers/isdn/hardware/eicon/divasfunc.c
+++ b/drivers/isdn/hardware/eicon/divasfunc.c
@@ -153,7 +153,7 @@ static void *didd_callback(void *context, DESCRIPTOR *adapter,
 /*
  * connect to didd
  */
-static int DIVA_INIT_FUNCTION connect_didd(void)
+static int __init connect_didd(void)
 {
         int x = 0;
         int dadapter = 0;
@@ -209,7 +209,7 @@ static void disconnect_didd(void)
 /*
  * init
  */
-int DIVA_INIT_FUNCTION divasfunc_init(int dbgmask)
+int __init divasfunc_init(int dbgmask)
 {
         char *version;
 
diff --git a/drivers/isdn/hardware/eicon/divasi.c b/drivers/isdn/hardware/eicon/divasi.c
index a5c8f90b3b37..4103a8c178d7 100644
--- a/drivers/isdn/hardware/eicon/divasi.c
+++ b/drivers/isdn/hardware/eicon/divasi.c
@@ -114,7 +114,7 @@ static const struct file_operations um_idi_proc_fops = {
         .release        = single_release,
 };
 
-static int DIVA_INIT_FUNCTION create_um_idi_proc(void)
+static int __init create_um_idi_proc(void)
 {
         um_idi_proc_entry = proc_create(DRIVERLNAME, S_IRUGO, proc_net_eicon,
                                         &um_idi_proc_fops);
@@ -146,7 +146,7 @@ static void divas_idi_unregister_chrdev(void)
         unregister_chrdev(major, DEVNAME);
 }
 
-static int DIVA_INIT_FUNCTION divas_idi_register_chrdev(void)
+static int __init divas_idi_register_chrdev(void)
 {
         if ((major = register_chrdev(0, DEVNAME, &divas_idi_fops)) < 0)
         {
@@ -161,7 +161,7 @@ static int DIVA_INIT_FUNCTION divas_idi_register_chrdev(void)
 /*
 ** Driver Load
 */
-static int DIVA_INIT_FUNCTION divasi_init(void)
+static int __init divasi_init(void)
 {
         char tmprev[50];
         int ret = 0;
@@ -202,7 +202,7 @@ out:
 /*
 ** Driver Unload
 */
-static void DIVA_EXIT_FUNCTION divasi_exit(void)
+static void __exit divasi_exit(void)
 {
         idifunc_finit();
         remove_um_idi_proc();
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index 7eaab06276f9..ca6d276bb256 100644
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -673,7 +673,7 @@ static void divas_unregister_chrdev(void)
         unregister_chrdev(major, DEVNAME);
 }
 
-static int DIVA_INIT_FUNCTION divas_register_chrdev(void)
+static int __init divas_register_chrdev(void)
 {
         if ((major = register_chrdev(0, DEVNAME, &divas_fops)) < 0)
         {
@@ -767,7 +767,7 @@ static void __devexit divas_remove_one(struct pci_dev *pdev)
 /* --------------------------------------------------------------------------
    Driver Load / Startup
    -------------------------------------------------------------------------- */
-static int DIVA_INIT_FUNCTION divas_init(void)
+static int __init divas_init(void)
 {
         char tmprev[50];
         int ret = 0;
@@ -831,7 +831,7 @@ out:
 /* --------------------------------------------------------------------------
    Driver Unload
    -------------------------------------------------------------------------- */
-static void DIVA_EXIT_FUNCTION divas_exit(void)
+static void __exit divas_exit(void)
 {
         pci_unregister_driver(&diva_pci_driver);
         remove_divas_proc();
diff --git a/drivers/isdn/hardware/eicon/idifunc.c b/drivers/isdn/hardware/eicon/idifunc.c
index d153e3cdecf7..fef6586fe5ac 100644
--- a/drivers/isdn/hardware/eicon/idifunc.c
+++ b/drivers/isdn/hardware/eicon/idifunc.c
@@ -133,7 +133,7 @@ static void um_remove_card(DESCRIPTOR *d)
 /*
  * remove all adapter
  */
-static void DIVA_EXIT_FUNCTION remove_all_idi_proc(void)
+static void __exit remove_all_idi_proc(void)
 {
         udiva_card *card;
         diva_os_spin_lock_magic_t old_irql;
@@ -181,7 +181,7 @@ static void *didd_callback(void *context, DESCRIPTOR *adapter,
 /*
  * connect DIDD
  */
-static int DIVA_INIT_FUNCTION connect_didd(void)
+static int __init connect_didd(void)
 {
         int x = 0;
         int dadapter = 0;
@@ -225,7 +225,7 @@ static int DIVA_INIT_FUNCTION connect_didd(void)
 /*
  *  Disconnect from DIDD
  */
-static void DIVA_EXIT_FUNCTION disconnect_didd(void)
+static void __exit disconnect_didd(void)
 {
         IDI_SYNC_REQ req;
 
@@ -240,7 +240,7 @@ static void DIVA_EXIT_FUNCTION disconnect_didd(void)
 /*
  * init
  */
-int DIVA_INIT_FUNCTION idifunc_init(void)
+int __init idifunc_init(void)
 {
         diva_os_initialize_spin_lock(&ll_lock, "idifunc");
 
@@ -260,7 +260,7 @@ int DIVA_INIT_FUNCTION idifunc_init(void)
 /*
  * finit
  */
-void DIVA_EXIT_FUNCTION idifunc_finit(void)
+void __exit idifunc_finit(void)
 {
         diva_user_mode_idi_finit();
         disconnect_didd();
diff --git a/drivers/isdn/hardware/eicon/mntfunc.c b/drivers/isdn/hardware/eicon/mntfunc.c
index d6072607305c..1cd9affb6058 100644
--- a/drivers/isdn/hardware/eicon/mntfunc.c
+++ b/drivers/isdn/hardware/eicon/mntfunc.c
@@ -72,7 +72,7 @@ static void *didd_callback(void *context, DESCRIPTOR *adapter,
 /*
  * connect to didd
  */
-static int DIVA_INIT_FUNCTION connect_didd(void)
+static int __init connect_didd(void)
 {
         int x = 0;
         int dadapter = 0;
@@ -114,7 +114,7 @@ static int DIVA_INIT_FUNCTION connect_didd(void)
 /*
  * disconnect from didd
  */
-static void DIVA_EXIT_FUNCTION disconnect_didd(void)
+static void __exit disconnect_didd(void)
 {
         IDI_SYNC_REQ req;
 
@@ -300,7 +300,7 @@ int maint_read_write(void __user *buf, int count)
 /*
  *  init
  */
-int DIVA_INIT_FUNCTION mntfunc_init(int *buffer_length, void **buffer,
+int __init mntfunc_init(int *buffer_length, void **buffer,
                                     unsigned long diva_dbg_mem)
 {
         if (*buffer_length < 64) {
@@ -348,7 +348,7 @@ int DIVA_INIT_FUNCTION mntfunc_init(int *buffer_length, void **buffer,
 /*
  *  exit
  */
-void DIVA_EXIT_FUNCTION mntfunc_finit(void)
+void __exit mntfunc_finit(void)
 {
         void *buffer;
         int i = 100;
diff --git a/drivers/isdn/hardware/eicon/platform.h b/drivers/isdn/hardware/eicon/platform.h
index 7331c3b14a5f..b2edb7590dda 100644
--- a/drivers/isdn/hardware/eicon/platform.h
+++ b/drivers/isdn/hardware/eicon/platform.h
@@ -38,9 +38,6 @@
 #define DIVA_NO_DEBUGLIB
 #endif
 
-#define DIVA_INIT_FUNCTION  __init
-#define DIVA_EXIT_FUNCTION  __exit
-
 #define DIVA_USER_MODE_CARD_CONFIG 1
 #define USE_EXTENDED_DEBUGS 1
 
diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c
index c0b8c960ee3f..c08fc605e56b 100644
--- a/drivers/isdn/hardware/mISDN/avmfritz.c
+++ b/drivers/isdn/hardware/mISDN/avmfritz.c
@@ -30,7 +30,7 @@
 #include "ipac.h"
 
 
-#define AVMFRITZ_REV    "2.1"
+#define AVMFRITZ_REV    "2.3"
 
 static int AVM_cnt;
 static int debug;
@@ -69,6 +69,7 @@ enum {
 #define HDLC_MODE_TRANS         0x02
 #define HDLC_MODE_CCR_7         0x04
 #define HDLC_MODE_CCR_16        0x08
+#define HDLC_FIFO_SIZE_128      0x20
 #define HDLC_MODE_TESTLOOP      0x80
 
 #define HDLC_INT_XPR            0x80
@@ -80,13 +81,16 @@ enum {
 #define HDLC_STAT_RDO           0x10
 #define HDLC_STAT_CRCVFRRAB     0x0E
 #define HDLC_STAT_CRCVFR        0x06
-#define HDLC_STAT_RML_MASK      0x3f00
+#define HDLC_STAT_RML_MASK_V1   0x3f00
+#define HDLC_STAT_RML_MASK_V2   0x7f00
 
 #define HDLC_CMD_XRS            0x80
 #define HDLC_CMD_XME            0x01
 #define HDLC_CMD_RRS            0x20
 #define HDLC_CMD_XML_MASK       0x3f00
-#define HDLC_FIFO_SIZE          32
+
+#define HDLC_FIFO_SIZE_V1       32
+#define HDLC_FIFO_SIZE_V2       128
 
 /* Fritz PCI v2.0 */
 
@@ -346,11 +350,14 @@ modehdlc(struct bchannel *bch, int protocol)
 {
         struct fritzcard *fc = bch->hw;
         struct hdlc_hw *hdlc;
+        u8 mode;
 
         hdlc = &fc->hdlc[(bch->nr - 1) & 1];
         pr_debug("%s: hdlc %c protocol %x-->%x ch %d\n", fc->name,
                  '@' + bch->nr, bch->state, protocol, bch->nr);
         hdlc->ctrl.ctrl = 0;
+        mode = (fc->type == AVM_FRITZ_PCIV2) ? HDLC_FIFO_SIZE_128 : 0;
+
         switch (protocol) {
         case -1: /* used for init */
                 bch->state = -1;
@@ -358,7 +365,7 @@ modehdlc(struct bchannel *bch, int protocol)
                 if (bch->state == ISDN_P_NONE)
                         break;
                 hdlc->ctrl.sr.cmd  = HDLC_CMD_XRS | HDLC_CMD_RRS;
-                hdlc->ctrl.sr.mode = HDLC_MODE_TRANS;
+                hdlc->ctrl.sr.mode = mode | HDLC_MODE_TRANS;
                 write_ctrl(bch, 5);
                 bch->state = ISDN_P_NONE;
                 test_and_clear_bit(FLG_HDLC, &bch->Flags);
@@ -367,7 +374,7 @@ modehdlc(struct bchannel *bch, int protocol)
         case ISDN_P_B_RAW:
                 bch->state = protocol;
                 hdlc->ctrl.sr.cmd  = HDLC_CMD_XRS | HDLC_CMD_RRS;
-                hdlc->ctrl.sr.mode = HDLC_MODE_TRANS;
+                hdlc->ctrl.sr.mode = mode | HDLC_MODE_TRANS;
                 write_ctrl(bch, 5);
                 hdlc->ctrl.sr.cmd = HDLC_CMD_XRS;
                 write_ctrl(bch, 1);
@@ -377,7 +384,7 @@ modehdlc(struct bchannel *bch, int protocol)
         case ISDN_P_B_HDLC:
                 bch->state = protocol;
                 hdlc->ctrl.sr.cmd  = HDLC_CMD_XRS | HDLC_CMD_RRS;
-                hdlc->ctrl.sr.mode = HDLC_MODE_ITF_FLG;
+                hdlc->ctrl.sr.mode = mode | HDLC_MODE_ITF_FLG;
                 write_ctrl(bch, 5);
                 hdlc->ctrl.sr.cmd = HDLC_CMD_XRS;
                 write_ctrl(bch, 1);
@@ -397,39 +404,40 @@ hdlc_empty_fifo(struct bchannel *bch, int count)
         u32 *ptr;
         u8 *p;
         u32  val, addr;
-        int cnt = 0;
+        int cnt;
         struct fritzcard *fc = bch->hw;
 
         pr_debug("%s: %s %d\n", fc->name, __func__, count);
-        if (!bch->rx_skb) {
-                bch->rx_skb = mI_alloc_skb(bch->maxlen, GFP_ATOMIC);
-                if (!bch->rx_skb) {
-                        pr_info("%s: B receive out of memory\n",
-                                fc->name);
+        if (test_bit(FLG_RX_OFF, &bch->Flags)) {
+                p = NULL;
+                bch->dropcnt += count;
+        } else {
+                cnt = bchannel_get_rxbuf(bch, count);
+                if (cnt < 0) {
+                        pr_warning("%s.B%d: No bufferspace for %d bytes\n",
+                                   fc->name, bch->nr, count);
                         return;
                 }
+                p = skb_put(bch->rx_skb, count);
         }
-        if ((bch->rx_skb->len + count) > bch->maxlen) {
-                pr_debug("%s: overrun %d\n", fc->name,
-                         bch->rx_skb->len + count);
-                return;
-        }
-        p = skb_put(bch->rx_skb, count);
         ptr = (u32 *)p;
-        if (AVM_FRITZ_PCIV2 == fc->type)
+        if (fc->type == AVM_FRITZ_PCIV2)
                 addr = fc->addr + (bch->nr == 2 ?
                                    AVM_HDLC_FIFO_2 : AVM_HDLC_FIFO_1);
         else {
                 addr = fc->addr + CHIP_WINDOW;
                 outl(bch->nr == 2 ? AVM_HDLC_2 : AVM_HDLC_1, fc->addr);
         }
+        cnt = 0;
         while (cnt < count) {
                 val = le32_to_cpu(inl(addr));
-                put_unaligned(val, ptr);
-                ptr++;
+                if (p) {
+                        put_unaligned(val, ptr);
+                        ptr++;
+                }
                 cnt += 4;
         }
-        if (debug & DEBUG_HW_BFIFO) {
+        if (p && (debug & DEBUG_HW_BFIFO)) {
                 snprintf(fc->log, LOG_SIZE, "B%1d-recv %s %d ",
                          bch->nr, fc->name, count);
                 print_hex_dump_bytes(fc->log, DUMP_PREFIX_OFFSET, p, count);
@@ -441,30 +449,43 @@ hdlc_fill_fifo(struct bchannel *bch)
 {
         struct fritzcard *fc = bch->hw;
         struct hdlc_hw *hdlc;
-        int count, cnt = 0;
+        int count, fs, cnt = 0, idx, fillempty = 0;
         u8 *p;
         u32 *ptr, val, addr;
 
-        hdlc = &fc->hdlc[(bch->nr - 1) & 1];
-        if (!bch->tx_skb)
-                return;
-        count = bch->tx_skb->len - bch->tx_idx;
-        if (count <= 0)
-                return;
-        p = bch->tx_skb->data + bch->tx_idx;
+        idx = (bch->nr - 1) & 1;
+        hdlc = &fc->hdlc[idx];
+        fs = (fc->type == AVM_FRITZ_PCIV2) ?
+                HDLC_FIFO_SIZE_V2 : HDLC_FIFO_SIZE_V1;
+        if (!bch->tx_skb) {
+                if (!test_bit(FLG_TX_EMPTY, &bch->Flags))
+                        return;
+                count = fs;
+                p = bch->fill;
+                fillempty = 1;
+        } else {
+                count = bch->tx_skb->len - bch->tx_idx;
+                if (count <= 0)
+                        return;
+                p = bch->tx_skb->data + bch->tx_idx;
+        }
         hdlc->ctrl.sr.cmd &= ~HDLC_CMD_XME;
-        if (count > HDLC_FIFO_SIZE) {
-                count = HDLC_FIFO_SIZE;
+        if (count > fs) {
+                count = fs;
         } else {
                 if (test_bit(FLG_HDLC, &bch->Flags))
                         hdlc->ctrl.sr.cmd |= HDLC_CMD_XME;
         }
-        pr_debug("%s: %s %d/%d/%d", fc->name, __func__, count,
-                 bch->tx_idx, bch->tx_skb->len);
         ptr = (u32 *)p;
-        bch->tx_idx += count;
-        hdlc->ctrl.sr.xml = ((count == HDLC_FIFO_SIZE) ? 0 : count);
-        if (AVM_FRITZ_PCIV2 == fc->type) {
+        if (fillempty) {
+                pr_debug("%s.B%d: %d/%d/%d", fc->name, bch->nr, count,
+                         bch->tx_idx, bch->tx_skb->len);
+                bch->tx_idx += count;
+        } else {
+                pr_debug("%s.B%d: fillempty %d\n", fc->name, bch->nr, count);
+        }
+        hdlc->ctrl.sr.xml = ((count == fs) ? 0 : count);
+        if (fc->type == AVM_FRITZ_PCIV2) {
                 __write_ctrl_pciv2(fc, hdlc, bch->nr);
                 addr = fc->addr + (bch->nr == 2 ?
                                    AVM_HDLC_FIFO_2 : AVM_HDLC_FIFO_1);
@@ -472,13 +493,21 @@ hdlc_fill_fifo(struct bchannel *bch)
                 __write_ctrl_pci(fc, hdlc, bch->nr);
                 addr = fc->addr + CHIP_WINDOW;
         }
-        while (cnt < count) {
-                val = get_unaligned(ptr);
-                outl(cpu_to_le32(val), addr);
-                ptr++;
-                cnt += 4;
+        if (fillempty) {
+                while (cnt < count) {
+                        /* all bytes the same - no worry about endian */
+                        outl(*ptr, addr);
+                        cnt += 4;
+                }
+        } else {
+                while (cnt < count) {
+                        val = get_unaligned(ptr);
+                        outl(cpu_to_le32(val), addr);
+                        ptr++;
+                        cnt += 4;
+                }
         }
-        if (debug & DEBUG_HW_BFIFO) {
+        if ((debug & DEBUG_HW_BFIFO) && !fillempty) {
                 snprintf(fc->log, LOG_SIZE, "B%1d-send %s %d ",
                          bch->nr, fc->name, count);
                 print_hex_dump_bytes(fc->log, DUMP_PREFIX_OFFSET, p, count);
@@ -488,17 +517,17 @@ hdlc_fill_fifo(struct bchannel *bch)
 static void
 HDLC_irq_xpr(struct bchannel *bch)
 {
-        if (bch->tx_skb && bch->tx_idx < bch->tx_skb->len)
+        if (bch->tx_skb && bch->tx_idx < bch->tx_skb->len) {
                 hdlc_fill_fifo(bch);
-        else {
-                if (bch->tx_skb) {
-                        /* send confirm, on trans, free on hdlc. */
-                        if (test_bit(FLG_TRANSPARENT, &bch->Flags))
-                                confirm_Bsend(bch);
+        } else {
+                if (bch->tx_skb)
                         dev_kfree_skb(bch->tx_skb);
-                }
-                if (get_next_bframe(bch))
+                if (get_next_bframe(bch)) {
                         hdlc_fill_fifo(bch);
+                        test_and_clear_bit(FLG_TX_EMPTY, &bch->Flags);
+                } else if (test_bit(FLG_TX_EMPTY, &bch->Flags)) {
+                        hdlc_fill_fifo(bch);
+                }
         }
 }
 
@@ -506,13 +535,23 @@ static void
 HDLC_irq(struct bchannel *bch, u32 stat)
 {
         struct fritzcard *fc = bch->hw;
-        int             len;
+        int             len, fs;
+        u32             rmlMask;
         struct hdlc_hw  *hdlc;
 
         hdlc = &fc->hdlc[(bch->nr - 1) & 1];
         pr_debug("%s: ch%d stat %#x\n", fc->name, bch->nr, stat);
+        if (fc->type == AVM_FRITZ_PCIV2) {
+                rmlMask = HDLC_STAT_RML_MASK_V2;
+                fs = HDLC_FIFO_SIZE_V2;
+        } else {
+                rmlMask = HDLC_STAT_RML_MASK_V1;
+                fs = HDLC_FIFO_SIZE_V1;
+        }
         if (stat & HDLC_INT_RPR) {
                 if (stat & HDLC_STAT_RDO) {
+                        pr_warning("%s: ch%d stat %x RDO\n",
+                                   fc->name, bch->nr, stat);
                         hdlc->ctrl.sr.xml = 0;
                         hdlc->ctrl.sr.cmd |= HDLC_CMD_RRS;
                         write_ctrl(bch, 1);
@@ -521,21 +560,21 @@ HDLC_irq(struct bchannel *bch, u32 stat)
                         if (bch->rx_skb)
                                 skb_trim(bch->rx_skb, 0);
                 } else {
-                        len = (stat & HDLC_STAT_RML_MASK) >> 8;
+                        len = (stat & rmlMask) >> 8;
                         if (!len)
-                                len = 32;
+                                len = fs;
                         hdlc_empty_fifo(bch, len);
                         if (!bch->rx_skb)
                                 goto handle_tx;
-                        if ((stat & HDLC_STAT_RME) || test_bit(FLG_TRANSPARENT,
-                                                               &bch->Flags)) {
-                                if (((stat & HDLC_STAT_CRCVFRRAB) ==
-                                     HDLC_STAT_CRCVFR) ||
-                                    test_bit(FLG_TRANSPARENT, &bch->Flags)) {
-                                        recv_Bchannel(bch, 0);
+                        if (test_bit(FLG_TRANSPARENT, &bch->Flags)) {
+                                recv_Bchannel(bch, 0, false);
+                        } else if (stat & HDLC_STAT_RME) {
+                                if ((stat & HDLC_STAT_CRCVFRRAB) ==
+                                    HDLC_STAT_CRCVFR) {
+                                        recv_Bchannel(bch, 0, false);
                                 } else {
-                                        pr_debug("%s: got invalid frame\n",
-                                                 fc->name);
+                                        pr_warning("%s: got invalid frame\n",
+                                                   fc->name);
                                         skb_trim(bch->rx_skb, 0);
                                 }
                         }
@@ -547,16 +586,13 @@ handle_tx:
                  * restart transmitting the whole frame on HDLC
                  * in transparent mode we send the next data
                  */
-                if (bch->tx_skb)
-                        pr_debug("%s: ch%d XDU len(%d) idx(%d) Flags(%lx)\n",
-                                 fc->name, bch->nr, bch->tx_skb->len,
-                                 bch->tx_idx, bch->Flags);
-                else
-                        pr_debug("%s: ch%d XDU no tx_skb Flags(%lx)\n",
-                                 fc->name, bch->nr, bch->Flags);
+                pr_warning("%s: ch%d stat %x XDU %s\n", fc->name, bch->nr,
+                           stat, bch->tx_skb ? "tx_skb" : "no tx_skb");
                 if (bch->tx_skb && bch->tx_skb->len) {
                         if (!test_bit(FLG_TRANSPARENT, &bch->Flags))
                                 bch->tx_idx = 0;
+                } else if (test_bit(FLG_FILLEMPTY, &bch->Flags)) {
+                        test_and_set_bit(FLG_TX_EMPTY, &bch->Flags);
                 }
                 hdlc->ctrl.sr.xml = 0;
                 hdlc->ctrl.sr.cmd |= HDLC_CMD_XRS;
@@ -659,22 +695,17 @@ avm_l2l1B(struct mISDNchannel *ch, struct sk_buff *skb)
         struct fritzcard *fc = bch->hw;
         int ret = -EINVAL;
         struct mISDNhead *hh = mISDN_HEAD_P(skb);
-        u32 id;
-        u_long flags;
+        unsigned long flags;
 
         switch (hh->prim) {
         case PH_DATA_REQ:
                 spin_lock_irqsave(&fc->lock, flags);
                 ret = bchannel_senddata(bch, skb);
                 if (ret > 0) { /* direct TX */
-                        id = hh->id; /* skb can be freed */
                         hdlc_fill_fifo(bch);
                         ret = 0;
-                        spin_unlock_irqrestore(&fc->lock, flags);
-                        if (!test_bit(FLG_TRANSPARENT, &bch->Flags))
-                                queue_ch_frame(ch, PH_DATA_CNF, id, NULL);
-                } else
-                        spin_unlock_irqrestore(&fc->lock, flags);
+                }
+                spin_unlock_irqrestore(&fc->lock, flags);
                 return ret;
         case PH_ACTIVATE_REQ:
                 spin_lock_irqsave(&fc->lock, flags);
@@ -783,7 +814,7 @@ init_card(struct fritzcard *fc)
                 inithdlc(fc);
                 enable_hwirq(fc);
                 /* RESET Receiver and Transmitter */
-                if (AVM_FRITZ_PCIV2 == fc->type) {
+                if (fc->type == AVM_FRITZ_PCIV2) {
                         WriteISAC_V2(fc, ISACX_MASK, 0);
                         WriteISAC_V2(fc, ISACX_CMDRD, 0x41);
                 } else {
@@ -810,21 +841,7 @@ init_card(struct fritzcard *fc)
 static int
 channel_bctrl(struct bchannel *bch, struct mISDN_ctrl_req *cq)
 {
-        int ret = 0;
-        struct fritzcard *fc = bch->hw;
-
-        switch (cq->op) {
-        case MISDN_CTRL_GETOP:
-                cq->op = 0;
-                break;
-                /* Nothing implemented yet */
-        case MISDN_CTRL_FILL_EMPTY:
-        default:
-                pr_info("%s: %s unknown Op %x\n", fc->name, __func__, cq->op);
-                ret = -EINVAL;
-                break;
-        }
-        return ret;
+        return mISDN_ctrl_bchannel(bch, cq);
 }
 
 static int
@@ -839,14 +856,10 @@ avm_bctrl(struct mISDNchannel *ch, u32 cmd, void *arg)
         switch (cmd) {
         case CLOSE_CHANNEL:
                 test_and_clear_bit(FLG_OPEN, &bch->Flags);
-                if (test_bit(FLG_ACTIVE, &bch->Flags)) {
-                        spin_lock_irqsave(&fc->lock, flags);
-                        mISDN_freebchannel(bch);
-                        test_and_clear_bit(FLG_TX_BUSY, &bch->Flags);
-                        test_and_clear_bit(FLG_ACTIVE, &bch->Flags);
-                        modehdlc(bch, ISDN_P_NONE);
-                        spin_unlock_irqrestore(&fc->lock, flags);
-                }
+                spin_lock_irqsave(&fc->lock, flags);
+                mISDN_freebchannel(bch);
+                modehdlc(bch, ISDN_P_NONE);
+                spin_unlock_irqrestore(&fc->lock, flags);
                 ch->protocol = ISDN_P_NONE;
                 ch->peer = NULL;
                 module_put(THIS_MODULE);
@@ -868,7 +881,7 @@ channel_ctrl(struct fritzcard  *fc, struct mISDN_ctrl_req *cq)
 
         switch (cq->op) {
         case MISDN_CTRL_GETOP:
-                cq->op = MISDN_CTRL_LOOP;
+                cq->op = MISDN_CTRL_LOOP | MISDN_CTRL_L1_TIMER3;
                 break;
         case MISDN_CTRL_LOOP:
                 /* cq->channel: 0 disable, 1 B1 loop 2 B2 loop, 3 both */
@@ -878,6 +891,9 @@ channel_ctrl(struct fritzcard  *fc, struct mISDN_ctrl_req *cq)
                 }
                 ret = fc->isac.ctrl(&fc->isac, HW_TESTLOOP, cq->channel);
                 break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = fc->isac.ctrl(&fc->isac, HW_TIMER3_VALUE, cq->p1);
+                break;
         default:
                 pr_info("%s: %s unknown Op %x\n", fc->name, __func__, cq->op);
                 ret = -EINVAL;
@@ -898,7 +914,6 @@ open_bchannel(struct fritzcard *fc, struct channel_req *rq)
         bch = &fc->bch[rq->adr.channel - 1];
         if (test_and_set_bit(FLG_OPEN, &bch->Flags))
                 return -EBUSY; /* b-channel can be only open once */
-        test_and_clear_bit(FLG_FILLEMPTY, &bch->Flags);
         bch->ch.protocol = rq->protocol;
         rq->ch = &bch->ch;
         return 0;
@@ -1021,6 +1036,7 @@ static int __devinit
 setup_instance(struct fritzcard *card)
 {
         int i, err;
+        unsigned short minsize;
         u_long flags;
 
         snprintf(card->name, MISDN_MAX_IDLEN - 1, "AVM.%d", AVM_cnt + 1);
@@ -1040,7 +1056,11 @@ setup_instance(struct fritzcard *card)
         for (i = 0; i < 2; i++) {
                 card->bch[i].nr = i + 1;
                 set_channelmap(i + 1, card->isac.dch.dev.channelmap);
-                mISDN_initbchannel(&card->bch[i], MAX_DATA_MEM);
+                if (AVM_FRITZ_PCIV2 == card->type)
+                        minsize = HDLC_FIFO_SIZE_V2;
+                else
+                        minsize = HDLC_FIFO_SIZE_V1;
+                mISDN_initbchannel(&card->bch[i], MAX_DATA_MEM, minsize);
                 card->bch[i].hw = card;
                 card->bch[i].ch.send = avm_l2l1B;
                 card->bch[i].ch.ctrl = avm_bctrl;
diff --git a/drivers/isdn/hardware/mISDN/hfc_multi.h b/drivers/isdn/hardware/mISDN/hfc_multi.h
index b0588acbb47d..c601f880141e 100644
--- a/drivers/isdn/hardware/mISDN/hfc_multi.h
+++ b/drivers/isdn/hardware/mISDN/hfc_multi.h
@@ -205,18 +205,22 @@ struct hfc_multi {
 
         u_int           slots;  /* number of PCM slots */
         u_int           leds;   /* type of leds */
-        u_int           ledcount; /* used to animate leds */
         u_long          ledstate; /* save last state of leds */
         int             opticalsupport; /* has the e1 board */
                                         /* an optical Interface */
-        int             dslot;  /* channel # of d-channel (E1) default 16 */
+
+        u_int           bmask[32]; /* bitmask of bchannels for port */
+        u_char          dnum[32]; /* array of used dchannel numbers for port */
+        u_char          created[32]; /* what port is created */
+        u_int           activity_tx; /* if there is data TX / RX */
+        u_int           activity_rx; /* bitmask according to port number */
+                                     /* (will be cleared after */
+                                     /* showing led-states) */
+        u_int           flash[8]; /* counter for flashing 8 leds on activity */
 
         u_long          wdcount;        /* every 500 ms we need to */
                                         /* send the watchdog a signal */
         u_char          wdbyte; /* watchdog toggle byte */
-        u_int           activity[8];    /* if there is any action on this */
-                                        /* port (will be cleared after */
-                                        /* showing led-states) */
         int             e1_state; /* keep track of last state */
         int             e1_getclock; /* if sync is retrieved from interface */
         int             syncronized; /* keep track of existing sync interface */
@@ -233,7 +237,6 @@ struct hfc_multi {
          * the bch->channel is equvalent to the hfc-channel
          */
         struct hfc_chan chan[32];
-        u_char          created[8]; /* what port is created */
         signed char     slot_owner[256]; /* owner channel of slot */
 };
 
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 033223180b55..5e402cf2e795 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -103,14 +103,26 @@
  *      Omit this value, if all cards are interconnected or none is connected.
  *      If unsure, don't give this parameter.
  *
- * dslot:
- *      NOTE: only one dslot value must be given for every card.
- *      Also this value must be given for non-E1 cards. If omitted, the E1
- *      card has D-channel on time slot 16, which is default.
- *      If 1..15 or 17..31, an alternate time slot is used for D-channel.
- *      In this case, the application must be able to handle this.
- *      If -1 is given, the D-channel is disabled and all 31 slots can be used
- *      for B-channel. (only for specific applications)
+ * dmask and bmask:
+ *      NOTE: One dmask value must be given for every HFC-E1 card.
+ *      If omitted, the E1 card has D-channel on time slot 16, which is default.
+ *      dmask is a 32 bit mask. The bit must be set for an alternate time slot.
+ *      If multiple bits are set, multiple virtual card fragments are created.
+ *      For each bit set, a bmask value must be given. Each bit on the bmask
+ *      value stands for a B-channel. The bmask may not overlap with dmask or
+ *      with other bmask values for that card.
+ *      Example: dmask=0x00020002 bmask=0x0000fffc,0xfffc0000
+ *              This will create one fragment with D-channel on slot 1 with
+ *              B-channels on slots 2..15, and a second fragment with D-channel
+ *              on slot 17 with B-channels on slot 18..31. Slot 16 is unused.
+ *      If bit 0 is set (dmask=0x00000001) the D-channel is on slot 0 and will
+ *      not function.
+ *      Example: dmask=0x00000001 bmask=0xfffffffe
+ *              This will create a port with all 31 usable timeslots as
+ *              B-channels.
+ *      If no bits are set on bmask, no B-channel is created for that fragment.
+ *      Example: dmask=0xfffffffe bmask=0,0,0,0.... (31 0-values for bmask)
+ *              This will create 31 ports with one D-channel only.
  *      If you don't know how to use it, you don't need it!
  *
  * iomode:
@@ -172,6 +184,7 @@
 
 #define MAX_CARDS       8
 #define MAX_PORTS       (8 * MAX_CARDS)
+#define MAX_FRAGS       (32 * MAX_CARDS)
 
 static LIST_HEAD(HFClist);
 static spinlock_t HFClock; /* global hfc list lock */
@@ -203,7 +216,8 @@ static int nt_t1_count[] = { 3840, 1920, 960, 480, 240, 120, 60, 30  };
 
 static uint     type[MAX_CARDS];
 static int      pcm[MAX_CARDS];
-static int      dslot[MAX_CARDS];
+static uint     dmask[MAX_CARDS];
+static uint     bmask[MAX_FRAGS];
 static uint     iomode[MAX_CARDS];
 static uint     port[MAX_PORTS];
 static uint     debug;
@@ -218,7 +232,7 @@ static uint	clockdelay_nt = CLKDEL_NT;
 #define HWID_MINIP16    3
 static uint     hwid = HWID_NONE;
 
-static int      HFC_cnt, Port_cnt, PCM_cnt = 99;
+static int      HFC_cnt, E1_cnt, bmask_cnt, Port_cnt, PCM_cnt = 99;
 
 MODULE_AUTHOR("Andreas Eversberg");
 MODULE_LICENSE("GPL");
@@ -231,7 +245,8 @@ module_param(clockdelay_te, uint, S_IRUGO | S_IWUSR);
 module_param(clockdelay_nt, uint, S_IRUGO | S_IWUSR);
 module_param_array(type, uint, NULL, S_IRUGO | S_IWUSR);
 module_param_array(pcm, int, NULL, S_IRUGO | S_IWUSR);
-module_param_array(dslot, int, NULL, S_IRUGO | S_IWUSR);
+module_param_array(dmask, uint, NULL, S_IRUGO | S_IWUSR);
+module_param_array(bmask, uint, NULL, S_IRUGO | S_IWUSR);
 module_param_array(iomode, uint, NULL, S_IRUGO | S_IWUSR);
 module_param_array(port, uint, NULL, S_IRUGO | S_IWUSR);
 module_param(hwid, uint, S_IRUGO | S_IWUSR); /* The hardware ID */
@@ -1156,7 +1171,7 @@ init_chip(struct hfc_multi *hc)
         hc->DTMFbase = 0x1000;
         if (test_bit(HFC_CHIP_EXRAM_128, &hc->chip)) {
                 if (debug & DEBUG_HFCMULTI_INIT)
-                        printk(KERN_DEBUG "%s: changing to 128K extenal RAM\n",
+                        printk(KERN_DEBUG "%s: changing to 128K external RAM\n",
                                __func__);
                 hc->hw.r_ctrl |= V_EXT_RAM;
                 hc->hw.r_ram_sz = 1;
@@ -1167,7 +1182,7 @@ init_chip(struct hfc_multi *hc)
         }
         if (test_bit(HFC_CHIP_EXRAM_512, &hc->chip)) {
                 if (debug & DEBUG_HFCMULTI_INIT)
-                        printk(KERN_DEBUG "%s: changing to 512K extenal RAM\n",
+                        printk(KERN_DEBUG "%s: changing to 512K external RAM\n",
                                __func__);
                 hc->hw.r_ctrl |= V_EXT_RAM;
                 hc->hw.r_ram_sz = 2;
@@ -1607,40 +1622,46 @@ hfcmulti_leds(struct hfc_multi *hc)
         struct dchannel *dch;
         int led[4];
 
-        hc->ledcount += poll;
-        if (hc->ledcount > 4096) {
-                hc->ledcount -= 4096;
-                hc->ledstate = 0xAFFEAFFE;
-        }
-
         switch (hc->leds) {
         case 1: /* HFC-E1 OEM */
-                /* 2 red blinking: NT mode deactivate
-                 * 2 red steady:   TE mode deactivate
-                 * left green:     L1 active
-                 * left red:       frame sync, but no L1
-                 * right green:    L2 active
+                /* 2 red steady:       LOS
+                 * 1 red steady:       L1 not active
+                 * 2 green steady:     L1 active
+                 * 1st green flashing: activity on TX
+                 * 2nd green flashing: activity on RX
                  */
-                if (hc->chan[hc->dslot].sync != 2) { /* no frame sync */
-                        if (hc->chan[hc->dslot].dch->dev.D.protocol
-                            != ISDN_P_NT_E1) {
-                                led[0] = 1;
+                led[0] = 0;
+                led[1] = 0;
+                led[2] = 0;
+                led[3] = 0;
+                dch = hc->chan[hc->dnum[0]].dch;
+                if (dch) {
+                        if (hc->chan[hc->dnum[0]].los)
                                 led[1] = 1;
-                        } else if (hc->ledcount >> 11) {
+                        if (hc->e1_state != 1) {
                                 led[0] = 1;
-                                led[1] = 1;
+                                hc->flash[2] = 0;
+                                hc->flash[3] = 0;
                         } else {
-                                led[0] = 0;
-                                led[1] = 0;
+                                led[2] = 1;
+                                led[3] = 1;
+                                if (!hc->flash[2] && hc->activity_tx)
+                                        hc->flash[2] = poll;
+                                if (!hc->flash[3] && hc->activity_rx)
+                                        hc->flash[3] = poll;
+                                if (hc->flash[2] && hc->flash[2] < 1024)
+                                        led[2] = 0;
+                                if (hc->flash[3] && hc->flash[3] < 1024)
+                                        led[3] = 0;
+                                if (hc->flash[2] >= 2048)
+                                        hc->flash[2] = 0;
+                                if (hc->flash[3] >= 2048)
+                                        hc->flash[3] = 0;
+                                if (hc->flash[2])
+                                        hc->flash[2] += poll;
+                                if (hc->flash[3])
+                                        hc->flash[3] += poll;
                         }
-                        led[2] = 0;
-                        led[3] = 0;
-                } else { /* with frame sync */
-                        /* TODO make it work */
-                        led[0] = 0;
-                        led[1] = 0;
-                        led[2] = 0;
-                        led[3] = 1;
                 }
                 leds = (led[0] | (led[1]<<2) | (led[2]<<1) | (led[3]<<3))^0xF;
                 /* leds are inverted */
@@ -1651,9 +1672,9 @@ hfcmulti_leds(struct hfc_multi *hc)
                 break;
 
         case 2: /* HFC-4S OEM */
-                /* red blinking = PH_DEACTIVATE NT Mode
-                 * red steady   = PH_DEACTIVATE TE Mode
-                 * green steady = PH_ACTIVATE
+                /* red steady:     PH_DEACTIVATE
+                 * green steady:   PH_ACTIVATE
+                 * green flashing: activity on TX
                  */
                 for (i = 0; i < 4; i++) {
                         state = 0;
@@ -1669,17 +1690,20 @@ hfcmulti_leds(struct hfc_multi *hc)
                         if (state) {
                                 if (state == active) {
                                         led[i] = 1; /* led green */
-                                } else
-                                        if (dch->dev.D.protocol == ISDN_P_TE_S0)
-                                                /* TE mode: led red */
-                                                led[i] = 2;
-                                        else
-                                                if (hc->ledcount >> 11)
-                                                        /* led red */
-                                                        led[i] = 2;
-                                                else
-                                                        /* led off */
-                                                        led[i] = 0;
+                                        hc->activity_tx |= hc->activity_rx;
+                                        if (!hc->flash[i] &&
+                                                (hc->activity_tx & (1 << i)))
+                                                        hc->flash[i] = poll;
+                                        if (hc->flash[i] && hc->flash[i] < 1024)
+                                                led[i] = 0; /* led off */
+                                        if (hc->flash[i] >= 2048)
+                                                hc->flash[i] = 0;
+                                        if (hc->flash[i])
+                                                hc->flash[i] += poll;
+                                } else {
+                                        led[i] = 2; /* led red */
+                                        hc->flash[i] = 0;
+                                }
                         } else
                                 led[i] = 0; /* led off */
                 }
@@ -1712,9 +1736,9 @@ hfcmulti_leds(struct hfc_multi *hc)
                 break;
 
         case 3: /* HFC 1S/2S Beronet */
-                /* red blinking = PH_DEACTIVATE NT Mode
-                 * red steady   = PH_DEACTIVATE TE Mode
-                 * green steady = PH_ACTIVATE
+                /* red steady:     PH_DEACTIVATE
+                 * green steady:   PH_ACTIVATE
+                 * green flashing: activity on TX
                  */
                 for (i = 0; i < 2; i++) {
                         state = 0;
@@ -1730,22 +1754,23 @@ hfcmulti_leds(struct hfc_multi *hc)
                         if (state) {
                                 if (state == active) {
                                         led[i] = 1; /* led green */
-                                } else
-                                        if (dch->dev.D.protocol == ISDN_P_TE_S0)
-                                                /* TE mode: led red */
-                                                led[i] = 2;
-                                        else
-                                                if (hc->ledcount >> 11)
-                                                        /* led red */
-                                                        led[i] = 2;
-                                                else
-                                                        /* led off */
-                                                        led[i] = 0;
+                                        hc->activity_tx |= hc->activity_rx;
+                                        if (!hc->flash[i] &&
+                                                (hc->activity_tx & (1 << i)))
+                                                        hc->flash[i] = poll;
+                                        if (hc->flash[i] < 1024)
+                                                led[i] = 0; /* led off */
+                                        if (hc->flash[i] >= 2048)
+                                                hc->flash[i] = 0;
+                                        if (hc->flash[i])
+                                                hc->flash[i] += poll;
+                                } else {
+                                        led[i] = 2; /* led red */
+                                        hc->flash[i] = 0;
+                                }
                         } else
                                 led[i] = 0; /* led off */
                 }
-
-
                 leds = (led[0] > 0) | ((led[1] > 0) << 1) | ((led[0]&1) << 2)
                         | ((led[1]&1) << 3);
                 if (leds != (int)hc->ledstate) {
@@ -1757,8 +1782,11 @@ hfcmulti_leds(struct hfc_multi *hc)
                 }
                 break;
         case 8: /* HFC 8S+ Beronet */
-                lled = 0;
-
+                /* off:      PH_DEACTIVATE
+                 * steady:   PH_ACTIVATE
+                 * flashing: activity on TX
+                 */
+                lled = 0xff; /* leds off */
                 for (i = 0; i < 8; i++) {
                         state = 0;
                         active = -1;
@@ -1772,14 +1800,20 @@ hfcmulti_leds(struct hfc_multi *hc)
                         }
                         if (state) {
                                 if (state == active) {
-                                        lled |= 0 << i;
+                                        lled &= ~(1 << i); /* led on */
+                                        hc->activity_tx |= hc->activity_rx;
+                                        if (!hc->flash[i] &&
+                                                (hc->activity_tx & (1 << i)))
+                                                        hc->flash[i] = poll;
+                                        if (hc->flash[i] < 1024)
+                                                lled |= 1 << i; /* led off */
+                                        if (hc->flash[i] >= 2048)
+                                                hc->flash[i] = 0;
+                                        if (hc->flash[i])
+                                                hc->flash[i] += poll;
                                 } else
-                                        if (hc->ledcount >> 11)
-                                                lled |= 0 << i;
-                                        else
-                                                lled |= 1 << i;
-                        } else
-                                lled |= 1 << i;
+                                        hc->flash[i] = 0;
+                        }
                 }
                 leddw = lled << 24 | lled << 16 | lled << 8 | lled;
                 if (leddw != hc->ledstate) {
@@ -1794,6 +1828,8 @@ hfcmulti_leds(struct hfc_multi *hc)
                 }
                 break;
         }
+        hc->activity_tx = 0;
+        hc->activity_rx = 0;
 }
 /*
  * read dtmf coefficients
@@ -2093,7 +2129,8 @@ next_frame:
         *txpending = 1;
 
         /* show activity */
-        hc->activity[hc->chan[ch].port] = 1;
+        if (dch)
+                hc->activity_tx |= 1 << hc->chan[ch].port;
 
         /* fill fifo to what we have left */
         ii = len;
@@ -2129,13 +2166,9 @@ next_frame:
                 HFC_wait_nodebug(hc);
         }
 
-        /* send confirm, since get_net_bframe will not do it with trans */
-        if (bch && test_bit(FLG_TRANSPARENT, &bch->Flags))
-                confirm_Bsend(bch);
-
-        /* check for next frame */
         dev_kfree_skb(*sp);
-        if (bch && get_next_bframe(bch)) { /* hdlc is confirmed here */
+        /* check for next frame */
+        if (bch && get_next_bframe(bch)) {
                 len = (*sp)->len;
                 goto next_frame;
         }
@@ -2163,24 +2196,20 @@ hfcmulti_rx(struct hfc_multi *hc, int ch)
         int f1 = 0, f2 = 0; /* = 0, to make GCC happy */
         int again = 0;
         struct  bchannel *bch;
-        struct  dchannel *dch;
+        struct  dchannel *dch = NULL;
         struct sk_buff  *skb, **sp = NULL;
         int     maxlen;
 
         bch = hc->chan[ch].bch;
-        dch = hc->chan[ch].dch;
-        if ((!dch) && (!bch))
-                return;
-        if (dch) {
+        if (bch) {
+                if (!test_bit(FLG_ACTIVE, &bch->Flags))
+                        return;
+        } else if (hc->chan[ch].dch) {
+                dch = hc->chan[ch].dch;
                 if (!test_bit(FLG_ACTIVE, &dch->Flags))
                         return;
-                sp = &dch->rx_skb;
-                maxlen = dch->maxlen;
         } else {
-                if (!test_bit(FLG_ACTIVE, &bch->Flags))
-                        return;
-                sp = &bch->rx_skb;
-                maxlen = bch->maxlen;
+                return;
         }
 next_frame:
         /* on first AND before getting next valid frame, R_FIFO must be written
@@ -2195,8 +2224,11 @@ next_frame:
         HFC_wait_nodebug(hc);
 
         /* ignore if rx is off BUT change fifo (above) to start pending TX */
-        if (hc->chan[ch].rx_off)
+        if (hc->chan[ch].rx_off) {
+                if (bch)
+                        bch->dropcnt += poll; /* not exact but fair enough */
                 return;
+        }
 
         if (dch || test_bit(FLG_HDLC, &bch->Flags)) {
                 f1 = HFC_inb_nodebug(hc, A_F1);
@@ -2227,16 +2259,30 @@ next_frame:
         if (Zsize <= 0)
                 return;
 
-        if (*sp == NULL) {
-                *sp = mI_alloc_skb(maxlen + 3, GFP_ATOMIC);
-                if (*sp == NULL) {
-                        printk(KERN_DEBUG "%s: No mem for rx_skb\n",
-                               __func__);
+        if (bch) {
+                maxlen = bchannel_get_rxbuf(bch, Zsize);
+                if (maxlen < 0) {
+                        pr_warning("card%d.B%d: No bufferspace for %d bytes\n",
+                                   hc->id + 1, bch->nr, Zsize);
                         return;
                 }
+                sp = &bch->rx_skb;
+                maxlen = bch->maxlen;
+        } else { /* Dchannel */
+                sp = &dch->rx_skb;
+                maxlen = dch->maxlen + 3;
+                if (*sp == NULL) {
+                        *sp = mI_alloc_skb(maxlen, GFP_ATOMIC);
+                        if (*sp == NULL) {
+                                pr_warning("card%d: No mem for dch rx_skb\n",
+                                           hc->id + 1);
+                                return;
+                        }
+                }
         }
         /* show activity */
-        hc->activity[hc->chan[ch].port] = 1;
+        if (dch)
+                hc->activity_rx |= 1 << hc->chan[ch].port;
 
         /* empty fifo with what we have */
         if (dch || test_bit(FLG_HDLC, &bch->Flags)) {
@@ -2247,7 +2293,7 @@ next_frame:
                                Zsize, z1, z2, (f1 == f2) ? "fragment" : "COMPLETE",
                                f1, f2, Zsize + (*sp)->len, again);
                 /* HDLC */
-                if ((Zsize + (*sp)->len) > (maxlen + 3)) {
+                if ((Zsize + (*sp)->len) > maxlen) {
                         if (debug & DEBUG_HFCMULTI_FIFO)
                                 printk(KERN_DEBUG
                                        "%s(card %d): hdlc-frame too large.\n",
@@ -2309,7 +2355,7 @@ next_frame:
                         if (dch)
                                 recv_Dchannel(dch);
                         else
-                                recv_Bchannel(bch, MISDN_ID_ANY);
+                                recv_Bchannel(bch, MISDN_ID_ANY, false);
                         *sp = skb;
                         again++;
                         goto next_frame;
@@ -2317,32 +2363,14 @@ next_frame:
                 /* there is an incomplete frame */
         } else {
                 /* transparent */
-                if (Zsize > skb_tailroom(*sp))
-                        Zsize = skb_tailroom(*sp);
                 hc->read_fifo(hc, skb_put(*sp, Zsize), Zsize);
-                if (((*sp)->len) < MISDN_COPY_SIZE) {
-                        skb = *sp;
-                        *sp = mI_alloc_skb(skb->len, GFP_ATOMIC);
-                        if (*sp) {
-                                memcpy(skb_put(*sp, skb->len),
-                                       skb->data, skb->len);
-                                skb_trim(skb, 0);
-                        } else {
-                                printk(KERN_DEBUG "%s: No mem\n", __func__);
-                                *sp = skb;
-                                skb = NULL;
-                        }
-                } else {
-                        skb = NULL;
-                }
                 if (debug & DEBUG_HFCMULTI_FIFO)
                         printk(KERN_DEBUG
                                "%s(card %d): fifo(%d) reading %d bytes "
                                "(z1=%04x, z2=%04x) TRANS\n",
                                __func__, hc->id + 1, ch, Zsize, z1, z2);
                 /* only bch is transparent */
-                recv_Bchannel(bch, hc->chan[ch].Zfill);
-                *sp = skb;
+                recv_Bchannel(bch, hc->chan[ch].Zfill, false);
         }
 }
 
@@ -2430,55 +2458,55 @@ handle_timer_irq(struct hfc_multi *hc)
                         }
                 }
         if (hc->ctype == HFC_TYPE_E1 && hc->created[0]) {
-                dch = hc->chan[hc->dslot].dch;
-                if (test_bit(HFC_CFG_REPORT_LOS, &hc->chan[hc->dslot].cfg)) {
-                        /* LOS */
-                        temp = HFC_inb_nodebug(hc, R_SYNC_STA) & V_SIG_LOS;
-                        if (!temp && hc->chan[hc->dslot].los)
+                dch = hc->chan[hc->dnum[0]].dch;
+                /* LOS */
+                temp = HFC_inb_nodebug(hc, R_SYNC_STA) & V_SIG_LOS;
+                hc->chan[hc->dnum[0]].los = temp;
+                if (test_bit(HFC_CFG_REPORT_LOS, &hc->chan[hc->dnum[0]].cfg)) {
+                        if (!temp && hc->chan[hc->dnum[0]].los)
                                 signal_state_up(dch, L1_SIGNAL_LOS_ON,
                                                 "LOS detected");
-                        if (temp && !hc->chan[hc->dslot].los)
+                        if (temp && !hc->chan[hc->dnum[0]].los)
                                 signal_state_up(dch, L1_SIGNAL_LOS_OFF,
                                                 "LOS gone");
-                        hc->chan[hc->dslot].los = temp;
                 }
-                if (test_bit(HFC_CFG_REPORT_AIS, &hc->chan[hc->dslot].cfg)) {
+                if (test_bit(HFC_CFG_REPORT_AIS, &hc->chan[hc->dnum[0]].cfg)) {
                         /* AIS */
                         temp = HFC_inb_nodebug(hc, R_SYNC_STA) & V_AIS;
-                        if (!temp && hc->chan[hc->dslot].ais)
+                        if (!temp && hc->chan[hc->dnum[0]].ais)
                                 signal_state_up(dch, L1_SIGNAL_AIS_ON,
                                                 "AIS detected");
-                        if (temp && !hc->chan[hc->dslot].ais)
+                        if (temp && !hc->chan[hc->dnum[0]].ais)
                                 signal_state_up(dch, L1_SIGNAL_AIS_OFF,
                                                 "AIS gone");
-                        hc->chan[hc->dslot].ais = temp;
+                        hc->chan[hc->dnum[0]].ais = temp;
                 }
-                if (test_bit(HFC_CFG_REPORT_SLIP, &hc->chan[hc->dslot].cfg)) {
+                if (test_bit(HFC_CFG_REPORT_SLIP, &hc->chan[hc->dnum[0]].cfg)) {
                         /* SLIP */
                         temp = HFC_inb_nodebug(hc, R_SLIP) & V_FOSLIP_RX;
-                        if (!temp && hc->chan[hc->dslot].slip_rx)
+                        if (!temp && hc->chan[hc->dnum[0]].slip_rx)
                                 signal_state_up(dch, L1_SIGNAL_SLIP_RX,
                                                 " bit SLIP detected RX");
-                        hc->chan[hc->dslot].slip_rx = temp;
+                        hc->chan[hc->dnum[0]].slip_rx = temp;
                         temp = HFC_inb_nodebug(hc, R_SLIP) & V_FOSLIP_TX;
-                        if (!temp && hc->chan[hc->dslot].slip_tx)
+                        if (!temp && hc->chan[hc->dnum[0]].slip_tx)
                                 signal_state_up(dch, L1_SIGNAL_SLIP_TX,
                                                 " bit SLIP detected TX");
-                        hc->chan[hc->dslot].slip_tx = temp;
+                        hc->chan[hc->dnum[0]].slip_tx = temp;
                 }
-                if (test_bit(HFC_CFG_REPORT_RDI, &hc->chan[hc->dslot].cfg)) {
+                if (test_bit(HFC_CFG_REPORT_RDI, &hc->chan[hc->dnum[0]].cfg)) {
                         /* RDI */
                         temp = HFC_inb_nodebug(hc, R_RX_SL0_0) & V_A;
-                        if (!temp && hc->chan[hc->dslot].rdi)
+                        if (!temp && hc->chan[hc->dnum[0]].rdi)
                                 signal_state_up(dch, L1_SIGNAL_RDI_ON,
                                                 "RDI detected");
-                        if (temp && !hc->chan[hc->dslot].rdi)
+                        if (temp && !hc->chan[hc->dnum[0]].rdi)
                                 signal_state_up(dch, L1_SIGNAL_RDI_OFF,
                                                 "RDI gone");
-                        hc->chan[hc->dslot].rdi = temp;
+                        hc->chan[hc->dnum[0]].rdi = temp;
                 }
                 temp = HFC_inb_nodebug(hc, R_JATT_DIR);
-                switch (hc->chan[hc->dslot].sync) {
+                switch (hc->chan[hc->dnum[0]].sync) {
                 case 0:
                         if ((temp & 0x60) == 0x60) {
                                 if (debug & DEBUG_HFCMULTI_SYNC)
@@ -2487,10 +2515,10 @@ handle_timer_irq(struct hfc_multi *hc)
                                                "in clock sync\n",
                                                __func__, hc->id);
                                 HFC_outb(hc, R_RX_OFF,
-                                         hc->chan[hc->dslot].jitter | V_RX_INIT);
+                                    hc->chan[hc->dnum[0]].jitter | V_RX_INIT);
                                 HFC_outb(hc, R_TX_OFF,
-                                         hc->chan[hc->dslot].jitter | V_RX_INIT);
-                                hc->chan[hc->dslot].sync = 1;
+                                    hc->chan[hc->dnum[0]].jitter | V_RX_INIT);
+                                hc->chan[hc->dnum[0]].sync = 1;
                                 goto check_framesync;
                         }
                         break;
@@ -2501,7 +2529,7 @@ handle_timer_irq(struct hfc_multi *hc)
                                                "%s: (id=%d) E1 "
                                                "lost clock sync\n",
                                                __func__, hc->id);
-                                hc->chan[hc->dslot].sync = 0;
+                                hc->chan[hc->dnum[0]].sync = 0;
                                 break;
                         }
                 check_framesync:
@@ -2512,7 +2540,7 @@ handle_timer_irq(struct hfc_multi *hc)
                                                "%s: (id=%d) E1 "
                                                "now in frame sync\n",
                                                __func__, hc->id);
-                                hc->chan[hc->dslot].sync = 2;
+                                hc->chan[hc->dnum[0]].sync = 2;
                         }
                         break;
                 case 2:
@@ -2522,7 +2550,7 @@ handle_timer_irq(struct hfc_multi *hc)
                                                "%s: (id=%d) E1 lost "
                                                "clock & frame sync\n",
                                                __func__, hc->id);
-                                hc->chan[hc->dslot].sync = 0;
+                                hc->chan[hc->dnum[0]].sync = 0;
                                 break;
                         }
                         temp = HFC_inb_nodebug(hc, R_SYNC_STA);
@@ -2532,7 +2560,7 @@ handle_timer_irq(struct hfc_multi *hc)
                                                "%s: (id=%d) E1 "
                                                "lost frame sync\n",
                                                __func__, hc->id);
-                                hc->chan[hc->dslot].sync = 1;
+                                hc->chan[hc->dnum[0]].sync = 1;
                         }
                         break;
                 }
@@ -2673,7 +2701,7 @@ hfcmulti_interrupt(int intno, void *dev_id)
         int                     i;
         void __iomem            *plx_acc;
         u_short                 wval;
-        u_char                  e1_syncsta, temp;
+        u_char                  e1_syncsta, temp, temp2;
         u_long                  flags;
 
         if (!hc) {
@@ -2748,7 +2776,7 @@ hfcmulti_interrupt(int intno, void *dev_id)
                 if (r_irq_misc & V_STA_IRQ) {
                         if (hc->ctype == HFC_TYPE_E1) {
                                 /* state machine */
-                                dch = hc->chan[hc->dslot].dch;
+                                dch = hc->chan[hc->dnum[0]].dch;
                                 e1_syncsta = HFC_inb_nodebug(hc, R_SYNC_STA);
                                 if (test_bit(HFC_CHIP_PLXSD, &hc->chip)
                                     && hc->e1_getclock) {
@@ -2758,23 +2786,26 @@ hfcmulti_interrupt(int intno, void *dev_id)
                                                 hc->syncronized = 0;
                                 }
                                 /* undocumented: status changes during read */
-                                dch->state = HFC_inb_nodebug(hc, R_E1_RD_STA);
-                                while (dch->state != (temp =
+                                temp = HFC_inb_nodebug(hc, R_E1_RD_STA);
+                                while (temp != (temp2 =
                                                       HFC_inb_nodebug(hc, R_E1_RD_STA))) {
                                         if (debug & DEBUG_HFCMULTI_STATE)
                                                 printk(KERN_DEBUG "%s: reread "
                                                        "STATE because %d!=%d\n",
-                                                       __func__, temp,
-                                                       dch->state);
-                                        dch->state = temp; /* repeat */
+                                                    __func__, temp, temp2);
+                                        temp = temp2; /* repeat */
                                 }
-                                dch->state = HFC_inb_nodebug(hc, R_E1_RD_STA)
-                                        & 0x7;
-                                schedule_event(dch, FLG_PHCHANGE);
+                                /* broadcast state change to all fragments */
                                 if (debug & DEBUG_HFCMULTI_STATE)
                                         printk(KERN_DEBUG
                                                "%s: E1 (id=%d) newstate %x\n",
-                                               __func__, hc->id, dch->state);
+                                            __func__, hc->id, temp & 0x7);
+                                for (i = 0; i < hc->ports; i++) {
+                                        dch = hc->chan[hc->dnum[i]].dch;
+                                        dch->state = temp & 0x7;
+                                        schedule_event(dch, FLG_PHCHANGE);
+                                }
+
                                 if (test_bit(HFC_CHIP_PLXSD, &hc->chip))
                                         plxsd_checksync(hc, 0);
                         }
@@ -3018,8 +3049,10 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx,
                         HFC_outb(hc, A_CON_HDLC, 0x20 | V_HDLC_TRP | V_IFF);
                         HFC_outb(hc, A_SUBCH_CFG, 0);
                         HFC_outb(hc, A_IRQ_MSK, 0);
-                        HFC_outb(hc, R_INC_RES_FIFO, V_RES_F);
-                        HFC_wait(hc);
+                        if (hc->chan[ch].protocol != protocol) {
+                                HFC_outb(hc, R_INC_RES_FIFO, V_RES_F);
+                                HFC_wait(hc);
+                        }
                         HFC_outb(hc, R_SLOT, ((((ch / 4) * 8) +
                                                ((ch % 4) * 4) + 1) << 1) | 1);
                         HFC_outb(hc, A_SL_CFG, 0x80 | 0x20 | (ch << 1) | 1);
@@ -3039,8 +3072,10 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx,
                         HFC_outb(hc, A_CON_HDLC, 0x20 | V_HDLC_TRP | V_IFF);
                         HFC_outb(hc, A_SUBCH_CFG, 0);
                         HFC_outb(hc, A_IRQ_MSK, 0);
-                        HFC_outb(hc, R_INC_RES_FIFO, V_RES_F);
-                        HFC_wait(hc);
+                        if (hc->chan[ch].protocol != protocol) {
+                                HFC_outb(hc, R_INC_RES_FIFO, V_RES_F);
+                                HFC_wait(hc);
+                        }
                         /* tx silence */
                         HFC_outb_nodebug(hc, A_FIFO_DATA0_NOINC, hc->silence);
                         HFC_outb(hc, R_SLOT, (((ch / 4) * 8) +
@@ -3059,8 +3094,10 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx,
                                          V_HDLC_TRP | V_IFF);
                         HFC_outb(hc, A_SUBCH_CFG, 0);
                         HFC_outb(hc, A_IRQ_MSK, 0);
-                        HFC_outb(hc, R_INC_RES_FIFO, V_RES_F);
-                        HFC_wait(hc);
+                        if (hc->chan[ch].protocol != protocol) {
+                                HFC_outb(hc, R_INC_RES_FIFO, V_RES_F);
+                                HFC_wait(hc);
+                        }
                         /* tx silence */
                         HFC_outb_nodebug(hc, A_FIFO_DATA0_NOINC, hc->silence);
                         /* enable RX fifo */
@@ -3075,8 +3112,10 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx,
                                          V_HDLC_TRP);
                         HFC_outb(hc, A_SUBCH_CFG, 0);
                         HFC_outb(hc, A_IRQ_MSK, 0);
-                        HFC_outb(hc, R_INC_RES_FIFO, V_RES_F);
-                        HFC_wait(hc);
+                        if (hc->chan[ch].protocol != protocol) {
+                                HFC_outb(hc, R_INC_RES_FIFO, V_RES_F);
+                                HFC_wait(hc);
+                        }
                 }
                 if (hc->ctype != HFC_TYPE_E1) {
                         hc->hw.a_st_ctrl0[hc->chan[ch].port] |=
@@ -3433,8 +3472,7 @@ handle_bmsg(struct mISDNchannel *ch, struct sk_buff *skb)
         struct hfc_multi        *hc = bch->hw;
         int                     ret = -EINVAL;
         struct mISDNhead        *hh = mISDN_HEAD_P(skb);
-        unsigned int            id;
-        u_long                  flags;
+        unsigned long           flags;
 
         switch (hh->prim) {
         case PH_DATA_REQ:
@@ -3443,19 +3481,13 @@ handle_bmsg(struct mISDNchannel *ch, struct sk_buff *skb)
                 spin_lock_irqsave(&hc->lock, flags);
                 ret = bchannel_senddata(bch, skb);
                 if (ret > 0) { /* direct TX */
-                        id = hh->id; /* skb can be freed */
                         hfcmulti_tx(hc, bch->slot);
                         ret = 0;
                         /* start fifo */
                         HFC_outb_nodebug(hc, R_FIFO, 0);
                         HFC_wait_nodebug(hc);
-                        if (!test_bit(FLG_TRANSPARENT, &bch->Flags)) {
-                                spin_unlock_irqrestore(&hc->lock, flags);
-                                queue_ch_frame(ch, PH_DATA_CNF, id, NULL);
-                        } else
-                                spin_unlock_irqrestore(&hc->lock, flags);
-                } else
-                        spin_unlock_irqrestore(&hc->lock, flags);
+                }
+                spin_unlock_irqrestore(&hc->lock, flags);
                 return ret;
         case PH_ACTIVATE_REQ:
                 if (debug & DEBUG_HFCMULTI_MSG)
@@ -3545,10 +3577,11 @@ channel_bctrl(struct bchannel *bch, struct mISDN_ctrl_req *cq)
 
         switch (cq->op) {
         case MISDN_CTRL_GETOP:
-                cq->op = MISDN_CTRL_HFC_OP | MISDN_CTRL_HW_FEATURES_OP
-                        | MISDN_CTRL_RX_OFF | MISDN_CTRL_FILL_EMPTY;
+                ret = mISDN_ctrl_bchannel(bch, cq);
+                cq->op |= MISDN_CTRL_HFC_OP | MISDN_CTRL_HW_FEATURES_OP;
                 break;
         case MISDN_CTRL_RX_OFF: /* turn off / on rx stream */
+                ret = mISDN_ctrl_bchannel(bch, cq);
                 hc->chan[bch->slot].rx_off = !!cq->p1;
                 if (!hc->chan[bch->slot].rx_off) {
                         /* reset fifo on rx on */
@@ -3561,11 +3594,10 @@ channel_bctrl(struct bchannel *bch, struct mISDN_ctrl_req *cq)
                         printk(KERN_DEBUG "%s: RX_OFF request (nr=%d off=%d)\n",
                                __func__, bch->nr, hc->chan[bch->slot].rx_off);
                 break;
-        case MISDN_CTRL_FILL_EMPTY: /* fill fifo, if empty */
-                test_and_set_bit(FLG_FILLEMPTY, &bch->Flags);
-                if (debug & DEBUG_HFCMULTI_MSG)
-                        printk(KERN_DEBUG "%s: FILL_EMPTY request (nr=%d "
-                               "off=%d)\n", __func__, bch->nr, !!cq->p1);
+        case MISDN_CTRL_FILL_EMPTY:
+                ret = mISDN_ctrl_bchannel(bch, cq);
+                hc->silence = bch->fill[0];
+                memset(hc->silence_data, hc->silence, sizeof(hc->silence_data));
                 break;
         case MISDN_CTRL_HW_FEATURES: /* fill features structure */
                 if (debug & DEBUG_HFCMULTI_MSG)
@@ -3654,9 +3686,7 @@ channel_bctrl(struct bchannel *bch, struct mISDN_ctrl_req *cq)
                         ret = -EINVAL;
                 break;
         default:
-                printk(KERN_WARNING "%s: unknown Op %x\n",
-                       __func__, cq->op);
-                ret = -EINVAL;
+                ret = mISDN_ctrl_bchannel(bch, cq);
                 break;
         }
         return ret;
@@ -3676,8 +3706,7 @@ hfcm_bctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
         switch (cmd) {
         case CLOSE_CHANNEL:
                 test_and_clear_bit(FLG_OPEN, &bch->Flags);
-                if (test_bit(FLG_ACTIVE, &bch->Flags))
-                        deactivate_bchannel(bch); /* locked there */
+                deactivate_bchannel(bch); /* locked there */
                 ch->protocol = ISDN_P_NONE;
                 ch->peer = NULL;
                 module_put(THIS_MODULE);
@@ -3839,31 +3868,37 @@ hfcmulti_initmode(struct dchannel *dch)
         if (debug & DEBUG_HFCMULTI_INIT)
                 printk(KERN_DEBUG "%s: entered\n", __func__);
 
+        i = dch->slot;
+        pt = hc->chan[i].port;
         if (hc->ctype == HFC_TYPE_E1) {
-                hc->chan[hc->dslot].slot_tx = -1;
-                hc->chan[hc->dslot].slot_rx = -1;
-                hc->chan[hc->dslot].conf = -1;
-                if (hc->dslot) {
-                        mode_hfcmulti(hc, hc->dslot, dch->dev.D.protocol,
+                /* E1 */
+                hc->chan[hc->dnum[pt]].slot_tx = -1;
+                hc->chan[hc->dnum[pt]].slot_rx = -1;
+                hc->chan[hc->dnum[pt]].conf = -1;
+                if (hc->dnum[pt]) {
+                        mode_hfcmulti(hc, dch->slot, dch->dev.D.protocol,
                                       -1, 0, -1, 0);
                         dch->timer.function = (void *) hfcmulti_dbusy_timer;
                         dch->timer.data = (long) dch;
                         init_timer(&dch->timer);
                 }
                 for (i = 1; i <= 31; i++) {
-                        if (i == hc->dslot)
+                        if (!((1 << i) & hc->bmask[pt])) /* skip unused chan */
                                 continue;
                         hc->chan[i].slot_tx = -1;
                         hc->chan[i].slot_rx = -1;
                         hc->chan[i].conf = -1;
                         mode_hfcmulti(hc, i, ISDN_P_NONE, -1, 0, -1, 0);
                 }
-                /* E1 */
-                if (test_bit(HFC_CFG_REPORT_LOS, &hc->chan[hc->dslot].cfg)) {
+        }
+        if (hc->ctype == HFC_TYPE_E1 && pt == 0) {
+                /* E1, port 0 */
+                dch = hc->chan[hc->dnum[0]].dch;
+                if (test_bit(HFC_CFG_REPORT_LOS, &hc->chan[hc->dnum[0]].cfg)) {
                         HFC_outb(hc, R_LOS0, 255); /* 2 ms */
                         HFC_outb(hc, R_LOS1, 255); /* 512 ms */
                 }
-                if (test_bit(HFC_CFG_OPTICAL, &hc->chan[hc->dslot].cfg)) {
+                if (test_bit(HFC_CFG_OPTICAL, &hc->chan[hc->dnum[0]].cfg)) {
                         HFC_outb(hc, R_RX0, 0);
                         hc->hw.r_tx0 = 0 | V_OUT_EN;
                 } else {
@@ -3876,12 +3911,12 @@ hfcmulti_initmode(struct dchannel *dch)
                 HFC_outb(hc, R_TX_FR0, 0x00);
                 HFC_outb(hc, R_TX_FR1, 0xf8);
 
-                if (test_bit(HFC_CFG_CRC4, &hc->chan[hc->dslot].cfg))
+                if (test_bit(HFC_CFG_CRC4, &hc->chan[hc->dnum[0]].cfg))
                         HFC_outb(hc, R_TX_FR2, V_TX_MF | V_TX_E | V_NEG_E);
 
                 HFC_outb(hc, R_RX_FR0, V_AUTO_RESYNC | V_AUTO_RECO | 0);
 
-                if (test_bit(HFC_CFG_CRC4, &hc->chan[hc->dslot].cfg))
+                if (test_bit(HFC_CFG_CRC4, &hc->chan[hc->dnum[0]].cfg))
                         HFC_outb(hc, R_RX_FR1, V_RX_MF | V_RX_MF_SYNC);
 
                 if (dch->dev.D.protocol == ISDN_P_NT_E1) {
@@ -3944,13 +3979,14 @@ hfcmulti_initmode(struct dchannel *dch)
                         hc->syncronized = 0;
                         plxsd_checksync(hc, 0);
                 }
-        } else {
-                i = dch->slot;
+        }
+        if (hc->ctype != HFC_TYPE_E1) {
+                /* ST */
                 hc->chan[i].slot_tx = -1;
                 hc->chan[i].slot_rx = -1;
                 hc->chan[i].conf = -1;
                 mode_hfcmulti(hc, i, dch->dev.D.protocol, -1, 0, -1, 0);
-                dch->timer.function = (void *)hfcmulti_dbusy_timer;
+                dch->timer.function = (void *) hfcmulti_dbusy_timer;
                 dch->timer.data = (long) dch;
                 init_timer(&dch->timer);
                 hc->chan[i - 2].slot_tx = -1;
@@ -3961,8 +3997,6 @@ hfcmulti_initmode(struct dchannel *dch)
                 hc->chan[i - 1].slot_rx = -1;
                 hc->chan[i - 1].conf = -1;
                 mode_hfcmulti(hc, i - 1, ISDN_P_NONE, -1, 0, -1, 0);
-                /* ST */
-                pt = hc->chan[i].port;
                 /* select interface */
                 HFC_outb(hc, R_ST_SEL, pt);
                 /* undocumented: delay after R_ST_SEL */
@@ -4054,14 +4088,9 @@ open_dchannel(struct hfc_multi *hc, struct dchannel *dch,
                 hfcmulti_initmode(dch);
                 spin_unlock_irqrestore(&hc->lock, flags);
         }
-
-        if (((rq->protocol == ISDN_P_NT_S0) && (dch->state == 3)) ||
-            ((rq->protocol == ISDN_P_TE_S0) && (dch->state == 7)) ||
-            ((rq->protocol == ISDN_P_NT_E1) && (dch->state == 1)) ||
-            ((rq->protocol == ISDN_P_TE_E1) && (dch->state == 1))) {
+        if (test_bit(FLG_ACTIVE, &dch->Flags))
                 _queue_data(&dch->dev.D, PH_ACTIVATE_IND, MISDN_ID_ANY,
                             0, NULL, GFP_KERNEL);
-        }
         rq->ch = &dch->dev.D;
         if (!try_module_get(THIS_MODULE))
                 printk(KERN_WARNING "%s:cannot get module\n", __func__);
@@ -4091,7 +4120,6 @@ open_bchannel(struct hfc_multi *hc, struct dchannel *dch,
         }
         if (test_and_set_bit(FLG_OPEN, &bch->Flags))
                 return -EBUSY; /* b-channel can be only open once */
-        test_and_clear_bit(FLG_FILLEMPTY, &bch->Flags);
         bch->ch.protocol = rq->protocol;
         hc->chan[ch].rx_off = 0;
         rq->ch = &bch->ch;
@@ -4112,7 +4140,7 @@ channel_dctrl(struct dchannel *dch, struct mISDN_ctrl_req *cq)
 
         switch (cq->op) {
         case MISDN_CTRL_GETOP:
-                cq->op = MISDN_CTRL_HFC_OP;
+                cq->op = MISDN_CTRL_HFC_OP | MISDN_CTRL_L1_TIMER3;
                 break;
         case MISDN_CTRL_HFC_WD_INIT: /* init the watchdog */
                 wd_cnt = cq->p1 & 0xf;
@@ -4142,6 +4170,9 @@ channel_dctrl(struct dchannel *dch, struct mISDN_ctrl_req *cq)
                                __func__);
                 HFC_outb(hc, R_BERT_WD_MD, hc->hw.r_bert_wd_md | V_WD_RES);
                 break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = l1_event(dch->l1, HW_TIMER3_VALUE | (cq->p1 & 0xff));
+                break;
         default:
                 printk(KERN_WARNING "%s: unknown Op %x\n",
                        __func__, cq->op);
@@ -4545,6 +4576,8 @@ release_port(struct hfc_multi *hc, struct dchannel *dch)
                 }
                 /* free channels */
                 for (i = 0; i <= 31; i++) {
+                        if (!((1 << i) & hc->bmask[pt])) /* skip unused chan */
+                                continue;
                         if (hc->chan[i].bch) {
                                 if (debug & DEBUG_HFCMULTI_INIT)
                                         printk(KERN_DEBUG
@@ -4600,7 +4633,8 @@ release_port(struct hfc_multi *hc, struct dchannel *dch)
         spin_unlock_irqrestore(&hc->lock, flags);
 
         if (debug & DEBUG_HFCMULTI_INIT)
-                printk(KERN_DEBUG "%s: free port %d channel D\n", __func__, pt);
+                printk(KERN_DEBUG "%s: free port %d channel D(%d)\n", __func__,
+                        pt+1, ci);
         mISDN_freedchannel(dch);
         kfree(dch);
 
@@ -4622,15 +4656,19 @@ release_card(struct hfc_multi *hc)
         if (hc->iclock)
                 mISDN_unregister_clock(hc->iclock);
 
-        /* disable irq */
+        /* disable and free irq */
         spin_lock_irqsave(&hc->lock, flags);
         disable_hwirq(hc);
         spin_unlock_irqrestore(&hc->lock, flags);
         udelay(1000);
+        if (hc->irq) {
+                if (debug & DEBUG_HFCMULTI_INIT)
+                        printk(KERN_DEBUG "%s: free irq %d (hc=%p)\n",
+                            __func__, hc->irq, hc);
+                free_irq(hc->irq, hc);
+                hc->irq = 0;
 
-        /* dimm leds */
-        if (hc->leds)
-                hfcmulti_leds(hc);
+        }
 
         /* disable D-channels & B-channels */
         if (debug & DEBUG_HFCMULTI_INIT)
@@ -4641,15 +4679,11 @@ release_card(struct hfc_multi *hc)
                         release_port(hc, hc->chan[ch].dch);
         }
 
-        /* release hardware & irq */
-        if (hc->irq) {
-                if (debug & DEBUG_HFCMULTI_INIT)
-                        printk(KERN_DEBUG "%s: free irq %d\n",
-                               __func__, hc->irq);
-                free_irq(hc->irq, hc);
-                hc->irq = 0;
+        /* dimm leds */
+        if (hc->leds)
+                hfcmulti_leds(hc);
 
-        }
+        /* release hardware */
         release_io_hfcmulti(hc);
 
         if (debug & DEBUG_HFCMULTI_INIT)
@@ -4667,61 +4701,9 @@ release_card(struct hfc_multi *hc)
                        __func__);
 }
 
-static int
-init_e1_port(struct hfc_multi *hc, struct hm_map *m)
+static void
+init_e1_port_hw(struct hfc_multi *hc, struct hm_map *m)
 {
-        struct dchannel *dch;
-        struct bchannel *bch;
-        int             ch, ret = 0;
-        char            name[MISDN_MAX_IDLEN];
-
-        dch = kzalloc(sizeof(struct dchannel), GFP_KERNEL);
-        if (!dch)
-                return -ENOMEM;
-        dch->debug = debug;
-        mISDN_initdchannel(dch, MAX_DFRAME_LEN_L1, ph_state_change);
-        dch->hw = hc;
-        dch->dev.Dprotocols = (1 << ISDN_P_TE_E1) | (1 << ISDN_P_NT_E1);
-        dch->dev.Bprotocols = (1 << (ISDN_P_B_RAW & ISDN_P_B_MASK)) |
-                (1 << (ISDN_P_B_HDLC & ISDN_P_B_MASK));
-        dch->dev.D.send = handle_dmsg;
-        dch->dev.D.ctrl = hfcm_dctrl;
-        dch->dev.nrbchan = (hc->dslot) ? 30 : 31;
-        dch->slot = hc->dslot;
-        hc->chan[hc->dslot].dch = dch;
-        hc->chan[hc->dslot].port = 0;
-        hc->chan[hc->dslot].nt_timer = -1;
-        for (ch = 1; ch <= 31; ch++) {
-                if (ch == hc->dslot) /* skip dchannel */
-                        continue;
-                bch = kzalloc(sizeof(struct bchannel), GFP_KERNEL);
-                if (!bch) {
-                        printk(KERN_ERR "%s: no memory for bchannel\n",
-                               __func__);
-                        ret = -ENOMEM;
-                        goto free_chan;
-                }
-                hc->chan[ch].coeff = kzalloc(512, GFP_KERNEL);
-                if (!hc->chan[ch].coeff) {
-                        printk(KERN_ERR "%s: no memory for coeffs\n",
-                               __func__);
-                        ret = -ENOMEM;
-                        kfree(bch);
-                        goto free_chan;
-                }
-                bch->nr = ch;
-                bch->slot = ch;
-                bch->debug = debug;
-                mISDN_initbchannel(bch, MAX_DATA_MEM);
-                bch->hw = hc;
-                bch->ch.send = handle_bmsg;
-                bch->ch.ctrl = hfcm_bctrl;
-                bch->ch.nr = ch;
-                list_add(&bch->ch.list, &dch->dev.bchannels);
-                hc->chan[ch].bch = bch;
-                hc->chan[ch].port = 0;
-                set_channelmap(bch->nr, dch->dev.channelmap);
-        }
         /* set optical line type */
         if (port[Port_cnt] & 0x001) {
                 if (!m->opticalsupport)  {
@@ -4737,7 +4719,7 @@ init_e1_port(struct hfc_multi *hc, struct hm_map *m)
                                        __func__,
                                        HFC_cnt + 1, 1);
                         test_and_set_bit(HFC_CFG_OPTICAL,
-                                         &hc->chan[hc->dslot].cfg);
+                            &hc->chan[hc->dnum[0]].cfg);
                 }
         }
         /* set LOS report */
@@ -4747,7 +4729,7 @@ init_e1_port(struct hfc_multi *hc, struct hm_map *m)
                                "LOS report: card(%d) port(%d)\n",
                                __func__, HFC_cnt + 1, 1);
                 test_and_set_bit(HFC_CFG_REPORT_LOS,
-                                 &hc->chan[hc->dslot].cfg);
+                    &hc->chan[hc->dnum[0]].cfg);
         }
         /* set AIS report */
         if (port[Port_cnt] & 0x008) {
@@ -4756,7 +4738,7 @@ init_e1_port(struct hfc_multi *hc, struct hm_map *m)
                                "AIS report: card(%d) port(%d)\n",
                                __func__, HFC_cnt + 1, 1);
                 test_and_set_bit(HFC_CFG_REPORT_AIS,
-                                 &hc->chan[hc->dslot].cfg);
+                    &hc->chan[hc->dnum[0]].cfg);
         }
         /* set SLIP report */
         if (port[Port_cnt] & 0x010) {
@@ -4766,7 +4748,7 @@ init_e1_port(struct hfc_multi *hc, struct hm_map *m)
                                "card(%d) port(%d)\n",
                                __func__, HFC_cnt + 1, 1);
                 test_and_set_bit(HFC_CFG_REPORT_SLIP,
-                                 &hc->chan[hc->dslot].cfg);
+                    &hc->chan[hc->dnum[0]].cfg);
         }
         /* set RDI report */
         if (port[Port_cnt] & 0x020) {
@@ -4776,7 +4758,7 @@ init_e1_port(struct hfc_multi *hc, struct hm_map *m)
                                "card(%d) port(%d)\n",
                                __func__, HFC_cnt + 1, 1);
                 test_and_set_bit(HFC_CFG_REPORT_RDI,
-                                 &hc->chan[hc->dslot].cfg);
+                    &hc->chan[hc->dnum[0]].cfg);
         }
         /* set CRC-4 Mode */
         if (!(port[Port_cnt] & 0x100)) {
@@ -4785,7 +4767,7 @@ init_e1_port(struct hfc_multi *hc, struct hm_map *m)
                                " card(%d) port(%d)\n",
                                __func__, HFC_cnt + 1, 1);
                 test_and_set_bit(HFC_CFG_CRC4,
-                                 &hc->chan[hc->dslot].cfg);
+                    &hc->chan[hc->dnum[0]].cfg);
         } else {
                 if (debug & DEBUG_HFCMULTI_INIT)
                         printk(KERN_DEBUG "%s: PORT turn off CRC4"
@@ -4817,20 +4799,85 @@ init_e1_port(struct hfc_multi *hc, struct hm_map *m)
         }
         /* set elastic jitter buffer */
         if (port[Port_cnt] & 0x3000) {
-                hc->chan[hc->dslot].jitter = (port[Port_cnt]>>12) & 0x3;
+                hc->chan[hc->dnum[0]].jitter = (port[Port_cnt]>>12) & 0x3;
                 if (debug & DEBUG_HFCMULTI_INIT)
                         printk(KERN_DEBUG
                                "%s: PORT set elastic "
                                "buffer to %d: card(%d) port(%d)\n",
-                               __func__, hc->chan[hc->dslot].jitter,
+                            __func__, hc->chan[hc->dnum[0]].jitter,
                                HFC_cnt + 1, 1);
         } else
-                hc->chan[hc->dslot].jitter = 2; /* default */
-        snprintf(name, MISDN_MAX_IDLEN - 1, "hfc-e1.%d", HFC_cnt + 1);
+                hc->chan[hc->dnum[0]].jitter = 2; /* default */
+}
+
+static int
+init_e1_port(struct hfc_multi *hc, struct hm_map *m, int pt)
+{
+        struct dchannel *dch;
+        struct bchannel *bch;
+        int             ch, ret = 0;
+        char            name[MISDN_MAX_IDLEN];
+        int             bcount = 0;
+
+        dch = kzalloc(sizeof(struct dchannel), GFP_KERNEL);
+        if (!dch)
+                return -ENOMEM;
+        dch->debug = debug;
+        mISDN_initdchannel(dch, MAX_DFRAME_LEN_L1, ph_state_change);
+        dch->hw = hc;
+        dch->dev.Dprotocols = (1 << ISDN_P_TE_E1) | (1 << ISDN_P_NT_E1);
+        dch->dev.Bprotocols = (1 << (ISDN_P_B_RAW & ISDN_P_B_MASK)) |
+            (1 << (ISDN_P_B_HDLC & ISDN_P_B_MASK));
+        dch->dev.D.send = handle_dmsg;
+        dch->dev.D.ctrl = hfcm_dctrl;
+        dch->slot = hc->dnum[pt];
+        hc->chan[hc->dnum[pt]].dch = dch;
+        hc->chan[hc->dnum[pt]].port = pt;
+        hc->chan[hc->dnum[pt]].nt_timer = -1;
+        for (ch = 1; ch <= 31; ch++) {
+                if (!((1 << ch) & hc->bmask[pt])) /* skip unused channel */
+                        continue;
+                bch = kzalloc(sizeof(struct bchannel), GFP_KERNEL);
+                if (!bch) {
+                        printk(KERN_ERR "%s: no memory for bchannel\n",
+                            __func__);
+                        ret = -ENOMEM;
+                        goto free_chan;
+                }
+                hc->chan[ch].coeff = kzalloc(512, GFP_KERNEL);
+                if (!hc->chan[ch].coeff) {
+                        printk(KERN_ERR "%s: no memory for coeffs\n",
+                            __func__);
+                        ret = -ENOMEM;
+                        kfree(bch);
+                        goto free_chan;
+                }
+                bch->nr = ch;
+                bch->slot = ch;
+                bch->debug = debug;
+                mISDN_initbchannel(bch, MAX_DATA_MEM, poll >> 1);
+                bch->hw = hc;
+                bch->ch.send = handle_bmsg;
+                bch->ch.ctrl = hfcm_bctrl;
+                bch->ch.nr = ch;
+                list_add(&bch->ch.list, &dch->dev.bchannels);
+                hc->chan[ch].bch = bch;
+                hc->chan[ch].port = pt;
+                set_channelmap(bch->nr, dch->dev.channelmap);
+                bcount++;
+        }
+        dch->dev.nrbchan = bcount;
+        if (pt == 0)
+                init_e1_port_hw(hc, m);
+        if (hc->ports > 1)
+                snprintf(name, MISDN_MAX_IDLEN - 1, "hfc-e1.%d-%d",
+                                HFC_cnt + 1, pt+1);
+        else
+                snprintf(name, MISDN_MAX_IDLEN - 1, "hfc-e1.%d", HFC_cnt + 1);
         ret = mISDN_register_device(&dch->dev, &hc->pci_dev->dev, name);
         if (ret)
                 goto free_chan;
-        hc->created[0] = 1;
+        hc->created[pt] = 1;
         return ret;
 free_chan:
         release_port(hc, dch);
@@ -4881,7 +4928,7 @@ init_multi_port(struct hfc_multi *hc, int pt)
                 bch->nr = ch + 1;
                 bch->slot = i + ch;
                 bch->debug = debug;
-                mISDN_initbchannel(bch, MAX_DATA_MEM);
+                mISDN_initbchannel(bch, MAX_DATA_MEM, poll >> 1);
                 bch->hw = hc;
                 bch->ch.send = handle_bmsg;
                 bch->ch.ctrl = hfcm_bctrl;
@@ -4963,7 +5010,8 @@ hfcmulti_init(struct hm_map *m, struct pci_dev *pdev,
         struct hfc_multi        *hc;
         u_long          flags;
         u_char          dips = 0, pmj = 0; /* dip settings, port mode Jumpers */
-        int             i;
+        int             i, ch;
+        u_int           maskcheck;
 
         if (HFC_cnt >= MAX_CARDS) {
                 printk(KERN_ERR "too many cards (max=%d).\n",
@@ -4997,18 +5045,36 @@ hfcmulti_init(struct hm_map *m, struct pci_dev *pdev,
         hc->id = HFC_cnt;
         hc->pcm = pcm[HFC_cnt];
         hc->io_mode = iomode[HFC_cnt];
-        if (dslot[HFC_cnt] < 0 && hc->ctype == HFC_TYPE_E1) {
-                hc->dslot = 0;
-                printk(KERN_INFO "HFC-E1 card has disabled D-channel, but "
-                       "31 B-channels\n");
-        }
-        if (dslot[HFC_cnt] > 0 && dslot[HFC_cnt] < 32
-            && hc->ctype == HFC_TYPE_E1) {
-                hc->dslot = dslot[HFC_cnt];
-                printk(KERN_INFO "HFC-E1 card has alternating D-channel on "
-                       "time slot %d\n", dslot[HFC_cnt]);
-        } else
-                hc->dslot = 16;
+        if (hc->ctype == HFC_TYPE_E1 && dmask[E1_cnt]) {
+                /* fragment card */
+                pt = 0;
+                maskcheck = 0;
+                for (ch = 0; ch <= 31; ch++) {
+                        if (!((1 << ch) & dmask[E1_cnt]))
+                                continue;
+                        hc->dnum[pt] = ch;
+                        hc->bmask[pt] = bmask[bmask_cnt++];
+                        if ((maskcheck & hc->bmask[pt])
+                         || (dmask[E1_cnt] & hc->bmask[pt])) {
+                                printk(KERN_INFO
+                                       "HFC-E1 #%d has overlapping B-channels on fragment #%d\n",
+                                       E1_cnt + 1, pt);
+                                return -EINVAL;
+                        }
+                        maskcheck |= hc->bmask[pt];
+                        printk(KERN_INFO
+                               "HFC-E1 #%d uses D-channel on slot %d and a B-channel map of 0x%08x\n",
+                                E1_cnt + 1, ch, hc->bmask[pt]);
+                        pt++;
+                }
+                hc->ports = pt;
+        }
+        if (hc->ctype == HFC_TYPE_E1 && !dmask[E1_cnt]) {
+                /* default card layout */
+                hc->dnum[0] = 16;
+                hc->bmask[0] = 0xfffefffe;
+                hc->ports = 1;
+        }
 
         /* set chip specific features */
         hc->masterclk = -1;
@@ -5091,23 +5157,33 @@ hfcmulti_init(struct hm_map *m, struct pci_dev *pdev,
                         goto free_card;
                 }
                 if (hc->ctype == HFC_TYPE_E1)
-                        ret_err = init_e1_port(hc, m);
+                        ret_err = init_e1_port(hc, m, pt);
                 else
                         ret_err = init_multi_port(hc, pt);
                 if (debug & DEBUG_HFCMULTI_INIT)
                         printk(KERN_DEBUG
-                               "%s: Registering D-channel, card(%d) port(%d)"
+                            "%s: Registering D-channel, card(%d) port(%d) "
                                "result %d\n",
-                               __func__, HFC_cnt + 1, pt, ret_err);
+                            __func__, HFC_cnt + 1, pt + 1, ret_err);
 
                 if (ret_err) {
                         while (pt) { /* release already registered ports */
                                 pt--;
-                                release_port(hc, hc->chan[(pt << 2) + 2].dch);
+                                if (hc->ctype == HFC_TYPE_E1)
+                                        release_port(hc,
+                                                hc->chan[hc->dnum[pt]].dch);
+                                else
+                                        release_port(hc,
+                                                hc->chan[(pt << 2) + 2].dch);
                         }
                         goto free_card;
                 }
-                Port_cnt++;
+                if (hc->ctype != HFC_TYPE_E1)
+                        Port_cnt++; /* for each S0 port */
+        }
+        if (hc->ctype == HFC_TYPE_E1) {
+                Port_cnt++; /* for each E1 port */
+                E1_cnt++;
         }
 
         /* disp switches */
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index e2c83a2d7691..81363ffa5357 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -453,7 +453,7 @@ hfcpci_empty_bfifo(struct bchannel *bch, struct bzfifo *bz,
                 }
                 bz->za[new_f2].z2 = cpu_to_le16(new_z2);
                 bz->f2 = new_f2;        /* next buffer */
-                recv_Bchannel(bch, MISDN_ID_ANY);
+                recv_Bchannel(bch, MISDN_ID_ANY, false);
         }
 }
 
@@ -565,11 +565,6 @@ hfcpci_empty_fifo_trans(struct bchannel *bch, struct bzfifo *rxbz,
         if (new_z2 >= (B_FIFO_SIZE + B_SUB_VAL))
                 new_z2 -= B_FIFO_SIZE;  /* buffer wrap */
 
-        if (fcnt_rx > MAX_DATA_SIZE) {  /* flush, if oversized */
-                *z2r = cpu_to_le16(new_z2);             /* new position */
-                return;
-        }
-
         fcnt_tx = le16_to_cpu(*z2t) - le16_to_cpu(*z1t);
         if (fcnt_tx <= 0)
                 fcnt_tx += B_FIFO_SIZE;
@@ -577,8 +572,16 @@ hfcpci_empty_fifo_trans(struct bchannel *bch, struct bzfifo *rxbz,
         fcnt_tx = B_FIFO_SIZE - fcnt_tx;
         /* remaining bytes to send (bytes in tx-fifo) */
 
-        bch->rx_skb = mI_alloc_skb(fcnt_rx, GFP_ATOMIC);
-        if (bch->rx_skb) {
+        if (test_bit(FLG_RX_OFF, &bch->Flags)) {
+                bch->dropcnt += fcnt_rx;
+                *z2r = cpu_to_le16(new_z2);
+                return;
+        }
+        maxlen = bchannel_get_rxbuf(bch, fcnt_rx);
+        if (maxlen < 0) {
+                pr_warning("B%d: No bufferspace for %d bytes\n",
+                           bch->nr, fcnt_rx);
+        } else {
                 ptr = skb_put(bch->rx_skb, fcnt_rx);
                 if (le16_to_cpu(*z2r) + fcnt_rx <= B_FIFO_SIZE + B_SUB_VAL)
                         maxlen = fcnt_rx;       /* complete transfer */
@@ -596,10 +599,8 @@ hfcpci_empty_fifo_trans(struct bchannel *bch, struct bzfifo *rxbz,
                         ptr1 = bdata;   /* start of buffer */
                         memcpy(ptr, ptr1, fcnt_rx);     /* rest */
                 }
-                recv_Bchannel(bch, fcnt_tx); /* bch, id */
-        } else
-                printk(KERN_WARNING "HFCPCI: receive out of memory\n");
-
+                recv_Bchannel(bch, fcnt_tx, false); /* bch, id, !force */
+        }
         *z2r = cpu_to_le16(new_z2);             /* new position */
 }
 
@@ -760,9 +761,14 @@ hfcpci_fill_fifo(struct bchannel *bch)
 
         if ((bch->debug & DEBUG_HW_BCHANNEL) && !(bch->debug & DEBUG_HW_BFIFO))
                 printk(KERN_DEBUG "%s\n", __func__);
-        if ((!bch->tx_skb) || bch->tx_skb->len <= 0)
-                return;
-        count = bch->tx_skb->len - bch->tx_idx;
+        if ((!bch->tx_skb) || bch->tx_skb->len == 0) {
+                if (!test_bit(FLG_FILLEMPTY, &bch->Flags) &&
+                    !test_bit(FLG_TRANSPARENT, &bch->Flags))
+                        return;
+                count = HFCPCI_FILLEMPTY;
+        } else {
+                count = bch->tx_skb->len - bch->tx_idx;
+        }
         if ((bch->nr & 2) && (!hc->hw.bswapped)) {
                 bz = &((union fifo_area *)(hc->hw.fifos))->b_chans.txbz_b2;
                 bdata = ((union fifo_area *)(hc->hw.fifos))->b_chans.txdat_b2;
@@ -781,16 +787,10 @@ hfcpci_fill_fifo(struct bchannel *bch)
                 fcnt = le16_to_cpu(*z2t) - le16_to_cpu(*z1t);
                 if (fcnt <= 0)
                         fcnt += B_FIFO_SIZE;
-                /* fcnt contains available bytes in fifo */
-                fcnt = B_FIFO_SIZE - fcnt;
-                /* remaining bytes to send (bytes in fifo) */
-
-                /* "fill fifo if empty" feature */
-                if (test_bit(FLG_FILLEMPTY, &bch->Flags) && !fcnt) {
-                        /* printk(KERN_DEBUG "%s: buffer empty, so we have "
-                           "underrun\n", __func__); */
-                        /* fill buffer, to prevent future underrun */
-                        count = HFCPCI_FILLEMPTY;
+                if (test_bit(FLG_FILLEMPTY, &bch->Flags)) {
+                        /* fcnt contains available bytes in fifo */
+                        if (count > fcnt)
+                                count = fcnt;
                         new_z1 = le16_to_cpu(*z1t) + count;
                         /* new buffer Position */
                         if (new_z1 >= (B_FIFO_SIZE + B_SUB_VAL))
@@ -802,17 +802,20 @@ hfcpci_fill_fifo(struct bchannel *bch)
                                 printk(KERN_DEBUG "hfcpci_FFt fillempty "
                                        "fcnt(%d) maxl(%d) nz1(%x) dst(%p)\n",
                                        fcnt, maxlen, new_z1, dst);
-                        fcnt += count;
                         if (maxlen > count)
                                 maxlen = count;         /* limit size */
-                        memset(dst, 0x2a, maxlen);      /* first copy */
+                        memset(dst, bch->fill[0], maxlen); /* first copy */
                         count -= maxlen;                /* remaining bytes */
                         if (count) {
                                 dst = bdata;            /* start of buffer */
-                                memset(dst, 0x2a, count);
+                                memset(dst, bch->fill[0], count);
                         }
                         *z1t = cpu_to_le16(new_z1);     /* now send data */
+                        return;
                 }
+                /* fcnt contains available bytes in fifo */
+                fcnt = B_FIFO_SIZE - fcnt;
+                /* remaining bytes to send (bytes in fifo) */
 
         next_t_frame:
                 count = bch->tx_skb->len - bch->tx_idx;
@@ -849,9 +852,6 @@ hfcpci_fill_fifo(struct bchannel *bch)
                 *z1t = cpu_to_le16(new_z1);     /* now send data */
                 if (bch->tx_idx < bch->tx_skb->len)
                         return;
-                /* send confirm, on trans, free on hdlc. */
-                if (test_bit(FLG_TRANSPARENT, &bch->Flags))
-                        confirm_Bsend(bch);
                 dev_kfree_skb(bch->tx_skb);
                 if (get_next_bframe(bch))
                         goto next_t_frame;
@@ -1533,24 +1533,7 @@ deactivate_bchannel(struct bchannel *bch)
 static int
 channel_bctrl(struct bchannel *bch, struct mISDN_ctrl_req *cq)
 {
-        int     ret = 0;
-
-        switch (cq->op) {
-        case MISDN_CTRL_GETOP:
-                cq->op = MISDN_CTRL_FILL_EMPTY;
-                break;
-        case MISDN_CTRL_FILL_EMPTY: /* fill fifo, if empty */
-                test_and_set_bit(FLG_FILLEMPTY, &bch->Flags);
-                if (debug & DEBUG_HW_OPEN)
-                        printk(KERN_DEBUG "%s: FILL_EMPTY request (nr=%d "
-                               "off=%d)\n", __func__, bch->nr, !!cq->p1);
-                break;
-        default:
-                printk(KERN_WARNING "%s: unknown Op %x\n", __func__, cq->op);
-                ret = -EINVAL;
-                break;
-        }
-        return ret;
+        return mISDN_ctrl_bchannel(bch, cq);
 }
 static int
 hfc_bctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
@@ -1581,8 +1564,7 @@ hfc_bctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
                 break;
         case CLOSE_CHANNEL:
                 test_and_clear_bit(FLG_OPEN, &bch->Flags);
-                if (test_bit(FLG_ACTIVE, &bch->Flags))
-                        deactivate_bchannel(bch);
+                deactivate_bchannel(bch);
                 ch->protocol = ISDN_P_NONE;
                 ch->peer = NULL;
                 module_put(THIS_MODULE);
@@ -1692,22 +1674,17 @@ hfcpci_l2l1B(struct mISDNchannel *ch, struct sk_buff *skb)
         struct hfc_pci          *hc = bch->hw;
         int                     ret = -EINVAL;
         struct mISDNhead        *hh = mISDN_HEAD_P(skb);
-        unsigned int            id;
-        u_long                  flags;
+        unsigned long           flags;
 
         switch (hh->prim) {
         case PH_DATA_REQ:
                 spin_lock_irqsave(&hc->lock, flags);
                 ret = bchannel_senddata(bch, skb);
                 if (ret > 0) { /* direct TX */
-                        id = hh->id; /* skb can be freed */
                         hfcpci_fill_fifo(bch);
                         ret = 0;
-                        spin_unlock_irqrestore(&hc->lock, flags);
-                        if (!test_bit(FLG_TRANSPARENT, &bch->Flags))
-                                queue_ch_frame(ch, PH_DATA_CNF, id, NULL);
-                } else
-                        spin_unlock_irqrestore(&hc->lock, flags);
+                }
+                spin_unlock_irqrestore(&hc->lock, flags);
                 return ret;
         case PH_ACTIVATE_REQ:
                 spin_lock_irqsave(&hc->lock, flags);
@@ -1819,7 +1796,7 @@ channel_ctrl(struct hfc_pci *hc, struct mISDN_ctrl_req *cq)
         switch (cq->op) {
         case MISDN_CTRL_GETOP:
                 cq->op = MISDN_CTRL_LOOP | MISDN_CTRL_CONNECT |
-                        MISDN_CTRL_DISCONNECT;
+                         MISDN_CTRL_DISCONNECT | MISDN_CTRL_L1_TIMER3;
                 break;
         case MISDN_CTRL_LOOP:
                 /* channel 0 disabled loop */
@@ -1896,6 +1873,9 @@ channel_ctrl(struct hfc_pci *hc, struct mISDN_ctrl_req *cq)
                 Write_hfc(hc, HFCPCI_CONNECT, hc->hw.conn);
                 hc->hw.trm &= 0x7f;     /* disable IOM-loop */
                 break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = l1_event(hc->dch.l1, HW_TIMER3_VALUE | (cq->p1 & 0xff));
+                break;
         default:
                 printk(KERN_WARNING "%s: unknown Op %x\n",
                        __func__, cq->op);
@@ -1969,7 +1949,6 @@ open_bchannel(struct hfc_pci *hc, struct channel_req *rq)
         bch = &hc->bch[rq->adr.channel - 1];
         if (test_and_set_bit(FLG_OPEN, &bch->Flags))
                 return -EBUSY; /* b-channel can be only open once */
-        test_and_clear_bit(FLG_FILLEMPTY, &bch->Flags);
         bch->ch.protocol = rq->protocol;
         rq->ch = &bch->ch; /* TODO: E-channel */
         if (!try_module_get(THIS_MODULE))
@@ -2121,7 +2100,7 @@ setup_card(struct hfc_pci *card)
                 card->bch[i].nr = i + 1;
                 set_channelmap(i + 1, card->dch.dev.channelmap);
                 card->bch[i].debug = debug;
-                mISDN_initbchannel(&card->bch[i], MAX_DATA_MEM);
+                mISDN_initbchannel(&card->bch[i], MAX_DATA_MEM, poll >> 1);
                 card->bch[i].hw = card;
                 card->bch[i].ch.send = hfcpci_l2l1B;
                 card->bch[i].ch.ctrl = hfc_bctrl;
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c
index 8cde2a0538ab..83206e453d4e 100644
--- a/drivers/isdn/hardware/mISDN/hfcsusb.c
+++ b/drivers/isdn/hardware/mISDN/hfcsusb.c
@@ -226,19 +226,12 @@ hfcusb_l2l1B(struct mISDNchannel *ch, struct sk_buff *skb)
                 if (debug & DBG_HFC_CALL_TRACE)
                         printk(KERN_DEBUG "%s: %s PH_DATA_REQ ret(%i)\n",
                                hw->name, __func__, ret);
-                if (ret > 0) {
-                        /*
-                         * other l1 drivers don't send early confirms on
-                         * transp data, but hfcsusb does because tx_next
-                         * skb is needed in tx_iso_complete()
-                         */
-                        queue_ch_frame(ch, PH_DATA_CNF, hh->id, NULL);
+                if (ret > 0)
                         ret = 0;
-                }
                 return ret;
         case PH_ACTIVATE_REQ:
                 if (!test_and_set_bit(FLG_ACTIVE, &bch->Flags)) {
-                        hfcsusb_start_endpoint(hw, bch->nr);
+                        hfcsusb_start_endpoint(hw, bch->nr - 1);
                         ret = hfcsusb_setup_bch(bch, ch->protocol);
                 } else
                         ret = 0;
@@ -498,16 +491,9 @@ open_bchannel(struct hfcsusb *hw, struct channel_req *rq)
         bch = &hw->bch[rq->adr.channel - 1];
         if (test_and_set_bit(FLG_OPEN, &bch->Flags))
                 return -EBUSY; /* b-channel can be only open once */
-        test_and_clear_bit(FLG_FILLEMPTY, &bch->Flags);
         bch->ch.protocol = rq->protocol;
         rq->ch = &bch->ch;
 
-        /* start USB endpoint for bchannel */
-        if (rq->adr.channel  == 1)
-                hfcsusb_start_endpoint(hw, HFC_CHAN_B1);
-        else
-                hfcsusb_start_endpoint(hw, HFC_CHAN_B2);
-
         if (!try_module_get(THIS_MODULE))
                 printk(KERN_WARNING "%s: %s:cannot get module\n",
                        hw->name, __func__);
@@ -819,24 +805,7 @@ hfcsusb_ph_command(struct hfcsusb *hw, u_char command)
 static int
 channel_bctrl(struct bchannel *bch, struct mISDN_ctrl_req *cq)
 {
-        int     ret = 0;
-
-        switch (cq->op) {
-        case MISDN_CTRL_GETOP:
-                cq->op = MISDN_CTRL_FILL_EMPTY;
-                break;
-        case MISDN_CTRL_FILL_EMPTY: /* fill fifo, if empty */
-                test_and_set_bit(FLG_FILLEMPTY, &bch->Flags);
-                if (debug & DEBUG_HW_OPEN)
-                        printk(KERN_DEBUG "%s: FILL_EMPTY request (nr=%d "
-                               "off=%d)\n", __func__, bch->nr, !!cq->p1);
-                break;
-        default:
-                printk(KERN_WARNING "%s: unknown Op %x\n", __func__, cq->op);
-                ret = -EINVAL;
-                break;
-        }
-        return ret;
+        return mISDN_ctrl_bchannel(bch, cq);
 }
 
 /* collect data from incoming interrupt or isochron USB data */
@@ -873,7 +842,21 @@ hfcsusb_rx_frame(struct usb_fifo *fifo, __u8 *data, unsigned int len,
                 hdlc = 1;
         }
         if (fifo->bch) {
+                if (test_bit(FLG_RX_OFF, &fifo->bch->Flags)) {
+                        fifo->bch->dropcnt += len;
+                        spin_unlock(&hw->lock);
+                        return;
+                }
+                maxlen = bchannel_get_rxbuf(fifo->bch, len);
                 rx_skb = fifo->bch->rx_skb;
+                if (maxlen < 0) {
+                        if (rx_skb)
+                                skb_trim(rx_skb, 0);
+                        pr_warning("%s.B%d: No bufferspace for %d bytes\n",
+                                   hw->name, fifo->bch->nr, len);
+                        spin_unlock(&hw->lock);
+                        return;
+                }
                 maxlen = fifo->bch->maxlen;
                 hdlc = test_bit(FLG_HDLC, &fifo->bch->Flags);
         }
@@ -883,25 +866,22 @@ hfcsusb_rx_frame(struct usb_fifo *fifo, __u8 *data, unsigned int len,
                 hdlc = 1;
         }
 
-        if (!rx_skb) {
-                rx_skb = mI_alloc_skb(maxlen, GFP_ATOMIC);
-                if (rx_skb) {
-                        if (fifo->dch)
-                                fifo->dch->rx_skb = rx_skb;
-                        if (fifo->bch)
-                                fifo->bch->rx_skb = rx_skb;
-                        if (fifo->ech)
-                                fifo->ech->rx_skb = rx_skb;
-                        skb_trim(rx_skb, 0);
-                } else {
-                        printk(KERN_DEBUG "%s: %s: No mem for rx_skb\n",
-                               hw->name, __func__);
-                        spin_unlock(&hw->lock);
-                        return;
-                }
-        }
-
         if (fifo->dch || fifo->ech) {
+                if (!rx_skb) {
+                        rx_skb = mI_alloc_skb(maxlen, GFP_ATOMIC);
+                        if (rx_skb) {
+                                if (fifo->dch)
+                                        fifo->dch->rx_skb = rx_skb;
+                                if (fifo->ech)
+                                        fifo->ech->rx_skb = rx_skb;
+                                skb_trim(rx_skb, 0);
+                        } else {
+                                printk(KERN_DEBUG "%s: %s: No mem for rx_skb\n",
+                                       hw->name, __func__);
+                                spin_unlock(&hw->lock);
+                                return;
+                        }
+                }
                 /* D/E-Channel SKB range check */
                 if ((rx_skb->len + len) >= MAX_DFRAME_LEN_L1) {
                         printk(KERN_DEBUG "%s: %s: sbk mem exceeded "
@@ -911,16 +891,6 @@ hfcsusb_rx_frame(struct usb_fifo *fifo, __u8 *data, unsigned int len,
                         spin_unlock(&hw->lock);
                         return;
                 }
-        } else if (fifo->bch) {
-                /* B-Channel SKB range check */
-                if ((rx_skb->len + len) >= (MAX_BCH_SIZE + 3)) {
-                        printk(KERN_DEBUG "%s: %s: sbk mem exceeded "
-                               "for fifo(%d) HFCUSB_B_RX\n",
-                               hw->name, __func__, fifon);
-                        skb_trim(rx_skb, 0);
-                        spin_unlock(&hw->lock);
-                        return;
-                }
         }
 
         memcpy(skb_put(rx_skb, len), data, len);
@@ -948,7 +918,8 @@ hfcsusb_rx_frame(struct usb_fifo *fifo, __u8 *data, unsigned int len,
                                 if (fifo->dch)
                                         recv_Dchannel(fifo->dch);
                                 if (fifo->bch)
-                                        recv_Bchannel(fifo->bch, MISDN_ID_ANY);
+                                        recv_Bchannel(fifo->bch, MISDN_ID_ANY,
+                                                      0);
                                 if (fifo->ech)
                                         recv_Echannel(fifo->ech,
                                                       &hw->dch);
@@ -969,8 +940,7 @@ hfcsusb_rx_frame(struct usb_fifo *fifo, __u8 *data, unsigned int len,
                 }
         } else {
                 /* deliver transparent data to layer2 */
-                if (rx_skb->len >= poll)
-                        recv_Bchannel(fifo->bch, MISDN_ID_ANY);
+                recv_Bchannel(fifo->bch, MISDN_ID_ANY, false);
         }
         spin_unlock(&hw->lock);
 }
@@ -1200,8 +1170,8 @@ tx_iso_complete(struct urb *urb)
         int k, tx_offset, num_isoc_packets, sink, remain, current_len,
                 errcode, hdlc, i;
         int *tx_idx;
-        int frame_complete, fifon, status;
-        __u8 threshbit;
+        int frame_complete, fifon, status, fillempty = 0;
+        __u8 threshbit, *p;
 
         spin_lock(&hw->lock);
         if (fifo->stop_gracefull) {
@@ -1219,6 +1189,9 @@ tx_iso_complete(struct urb *urb)
                 tx_skb = fifo->bch->tx_skb;
                 tx_idx = &fifo->bch->tx_idx;
                 hdlc = test_bit(FLG_HDLC, &fifo->bch->Flags);
+                if (!tx_skb && !hdlc &&
+                    test_bit(FLG_FILLEMPTY, &fifo->bch->Flags))
+                        fillempty = 1;
         } else {
                 printk(KERN_DEBUG "%s: %s: neither BCH nor DCH\n",
                        hw->name, __func__);
@@ -1277,6 +1250,8 @@ tx_iso_complete(struct urb *urb)
                         /* Generate next ISO Packets */
                         if (tx_skb)
                                 remain = tx_skb->len - *tx_idx;
+                        else if (fillempty)
+                                remain = 15; /* > not complete */
                         else
                                 remain = 0;
 
@@ -1307,15 +1282,20 @@ tx_iso_complete(struct urb *urb)
                                 }
 
                                 /* copy tx data to iso-urb buffer */
-                                memcpy(context_iso_urb->buffer + tx_offset + 1,
-                                       (tx_skb->data + *tx_idx), current_len);
-                                *tx_idx += current_len;
-
+                                p = context_iso_urb->buffer + tx_offset + 1;
+                                if (fillempty) {
+                                        memset(p, fifo->bch->fill[0],
+                                               current_len);
+                                } else {
+                                        memcpy(p, (tx_skb->data + *tx_idx),
+                                               current_len);
+                                        *tx_idx += current_len;
+                                }
                                 urb->iso_frame_desc[k].offset = tx_offset;
                                 urb->iso_frame_desc[k].length = current_len + 1;
 
                                 /* USB data log for every D ISO out */
-                                if ((fifon == HFCUSB_D_RX) &&
+                                if ((fifon == HFCUSB_D_RX) && !fillempty &&
                                     (debug & DBG_HFC_USB_VERBOSE)) {
                                         printk(KERN_DEBUG
                                                "%s: %s (%d/%d) offs(%d) len(%d) ",
@@ -1365,12 +1345,8 @@ tx_iso_complete(struct urb *urb)
                                 if (fifo->dch && get_next_dframe(fifo->dch))
                                         tx_skb = fifo->dch->tx_skb;
                                 else if (fifo->bch &&
-                                         get_next_bframe(fifo->bch)) {
-                                        if (test_bit(FLG_TRANSPARENT,
-                                                     &fifo->bch->Flags))
-                                                confirm_Bsend(fifo->bch);
+                                         get_next_bframe(fifo->bch))
                                         tx_skb = fifo->bch->tx_skb;
-                                }
                         }
                 }
                 errcode = usb_submit_urb(urb, GFP_ATOMIC);
@@ -1812,7 +1788,7 @@ deactivate_bchannel(struct bchannel *bch)
         mISDN_clear_bchannel(bch);
         spin_unlock_irqrestore(&hw->lock, flags);
         hfcsusb_setup_bch(bch, ISDN_P_NONE);
-        hfcsusb_stop_endpoint(hw, bch->nr);
+        hfcsusb_stop_endpoint(hw, bch->nr - 1);
 }
 
 /*
@@ -1836,8 +1812,7 @@ hfc_bctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
 
         case CLOSE_CHANNEL:
                 test_and_clear_bit(FLG_OPEN, &bch->Flags);
-                if (test_bit(FLG_ACTIVE, &bch->Flags))
-                        deactivate_bchannel(bch);
+                deactivate_bchannel(bch);
                 ch->protocol = ISDN_P_NONE;
                 ch->peer = NULL;
                 module_put(THIS_MODULE);
@@ -1883,7 +1858,7 @@ setup_instance(struct hfcsusb *hw, struct device *parent)
                 hw->bch[i].nr = i + 1;
                 set_channelmap(i + 1, hw->dch.dev.channelmap);
                 hw->bch[i].debug = debug;
-                mISDN_initbchannel(&hw->bch[i], MAX_DATA_MEM);
+                mISDN_initbchannel(&hw->bch[i], MAX_DATA_MEM, poll >> 1);
                 hw->bch[i].hw = hw;
                 hw->bch[i].ch.send = hfcusb_l2l1B;
                 hw->bch[i].ch.ctrl = hfc_bctrl;
diff --git a/drivers/isdn/hardware/mISDN/mISDNipac.c b/drivers/isdn/hardware/mISDN/mISDNipac.c
index 884369f09cad..752e0825591f 100644
--- a/drivers/isdn/hardware/mISDN/mISDNipac.c
+++ b/drivers/isdn/hardware/mISDN/mISDNipac.c
@@ -603,10 +603,11 @@ isac_l1hw(struct mISDNchannel *ch, struct sk_buff *skb)
 }
 
 static int
-isac_ctrl(struct isac_hw *isac, u32 cmd, u_long para)
+isac_ctrl(struct isac_hw *isac, u32 cmd, unsigned long para)
 {
         u8 tl = 0;
-        u_long flags;
+        unsigned long flags;
+        int ret = 0;
 
         switch (cmd) {
         case HW_TESTLOOP:
@@ -626,12 +627,15 @@ isac_ctrl(struct isac_hw *isac, u32 cmd, u_long para)
                 }
                 spin_unlock_irqrestore(isac->hwlock, flags);
                 break;
+        case HW_TIMER3_VALUE:
+                ret = l1_event(isac->dch.l1, HW_TIMER3_VALUE | (para & 0xff));
+                break;
         default:
                 pr_debug("%s: %s unknown command %x %lx\n", isac->name,
                          __func__, cmd, para);
-                return -1;
+                ret = -1;
         }
-        return 0;
+        return ret;
 }
 
 static int
@@ -929,22 +933,21 @@ static void
 hscx_empty_fifo(struct hscx_hw *hscx, u8 count)
 {
         u8 *p;
+        int maxlen;
 
         pr_debug("%s: B%1d %d\n", hscx->ip->name, hscx->bch.nr, count);
-        if (!hscx->bch.rx_skb) {
-                hscx->bch.rx_skb = mI_alloc_skb(hscx->bch.maxlen, GFP_ATOMIC);
-                if (!hscx->bch.rx_skb) {
-                        pr_info("%s: B receive out of memory\n",
-                                hscx->ip->name);
-                        hscx_cmdr(hscx, 0x80); /* RMC */
-                        return;
-                }
+        if (test_bit(FLG_RX_OFF, &hscx->bch.Flags)) {
+                hscx->bch.dropcnt += count;
+                hscx_cmdr(hscx, 0x80); /* RMC */
+                return;
         }
-        if ((hscx->bch.rx_skb->len + count) > hscx->bch.maxlen) {
-                pr_debug("%s: overrun %d\n", hscx->ip->name,
-                         hscx->bch.rx_skb->len + count);
-                skb_trim(hscx->bch.rx_skb, 0);
+        maxlen = bchannel_get_rxbuf(&hscx->bch, count);
+        if (maxlen < 0) {
                 hscx_cmdr(hscx, 0x80); /* RMC */
+                if (hscx->bch.rx_skb)
+                        skb_trim(hscx->bch.rx_skb, 0);
+                pr_warning("%s.B%d: No bufferspace for %d bytes\n",
+                           hscx->ip->name, hscx->bch.nr, count);
                 return;
         }
         p = skb_put(hscx->bch.rx_skb, count);
@@ -971,22 +974,28 @@ hscx_fill_fifo(struct hscx_hw *hscx)
         int count, more;
         u8 *p;
 
-        if (!hscx->bch.tx_skb)
-                return;
-        count = hscx->bch.tx_skb->len - hscx->bch.tx_idx;
-        if (count <= 0)
-                return;
-        p = hscx->bch.tx_skb->data + hscx->bch.tx_idx;
-
-        more = test_bit(FLG_TRANSPARENT, &hscx->bch.Flags) ? 1 : 0;
-        if (count > hscx->fifo_size) {
+        if (!hscx->bch.tx_skb) {
+                if (!test_bit(FLG_TX_EMPTY, &hscx->bch.Flags))
+                        return;
                 count = hscx->fifo_size;
                 more = 1;
-        }
-        pr_debug("%s: B%1d %d/%d/%d\n", hscx->ip->name, hscx->bch.nr, count,
-                 hscx->bch.tx_idx, hscx->bch.tx_skb->len);
-        hscx->bch.tx_idx += count;
+                p = hscx->log;
+                memset(p, hscx->bch.fill[0], count);
+        } else {
+                count = hscx->bch.tx_skb->len - hscx->bch.tx_idx;
+                if (count <= 0)
+                        return;
+                p = hscx->bch.tx_skb->data + hscx->bch.tx_idx;
 
+                more = test_bit(FLG_TRANSPARENT, &hscx->bch.Flags) ? 1 : 0;
+                if (count > hscx->fifo_size) {
+                        count = hscx->fifo_size;
+                        more = 1;
+                }
+                pr_debug("%s: B%1d %d/%d/%d\n", hscx->ip->name, hscx->bch.nr,
+                         count, hscx->bch.tx_idx, hscx->bch.tx_skb->len);
+                hscx->bch.tx_idx += count;
+        }
         if (hscx->ip->type & IPAC_TYPE_IPACX)
                 hscx->ip->write_fifo(hscx->ip->hw,
                                      hscx->off + IPACX_XFIFOB, p, count);
@@ -997,7 +1006,7 @@ hscx_fill_fifo(struct hscx_hw *hscx)
         }
         hscx_cmdr(hscx, more ? 0x08 : 0x0a);
 
-        if (hscx->bch.debug & DEBUG_HW_BFIFO) {
+        if (hscx->bch.tx_skb && (hscx->bch.debug & DEBUG_HW_BFIFO)) {
                 snprintf(hscx->log, 64, "B%1d-send %s %d ",
                          hscx->bch.nr, hscx->ip->name, count);
                 print_hex_dump_bytes(hscx->log, DUMP_PREFIX_OFFSET, p, count);
@@ -1007,17 +1016,17 @@ hscx_fill_fifo(struct hscx_hw *hscx)
 static void
 hscx_xpr(struct hscx_hw *hx)
 {
-        if (hx->bch.tx_skb && hx->bch.tx_idx < hx->bch.tx_skb->len)
+        if (hx->bch.tx_skb && hx->bch.tx_idx < hx->bch.tx_skb->len) {
                 hscx_fill_fifo(hx);
-        else {
-                if (hx->bch.tx_skb) {
-                        /* send confirm, on trans, free on hdlc. */
-                        if (test_bit(FLG_TRANSPARENT, &hx->bch.Flags))
-                                confirm_Bsend(&hx->bch);
+        } else {
+                if (hx->bch.tx_skb)
                         dev_kfree_skb(hx->bch.tx_skb);
-                }
-                if (get_next_bframe(&hx->bch))
+                if (get_next_bframe(&hx->bch)) {
+                        hscx_fill_fifo(hx);
+                        test_and_clear_bit(FLG_TX_EMPTY, &hx->bch.Flags);
+                } else if (test_bit(FLG_TX_EMPTY, &hx->bch.Flags)) {
                         hscx_fill_fifo(hx);
+                }
         }
 }
 
@@ -1069,7 +1078,7 @@ ipac_rme(struct hscx_hw *hx)
                 skb_trim(hx->bch.rx_skb, 0);
         } else {
                 skb_trim(hx->bch.rx_skb, hx->bch.rx_skb->len - 1);
-                recv_Bchannel(&hx->bch, 0);
+                recv_Bchannel(&hx->bch, 0, false);
         }
 }
 
@@ -1120,11 +1129,8 @@ ipac_irq(struct hscx_hw *hx, u8 ista)
 
         if (istab & IPACX_B_RPF) {
                 hscx_empty_fifo(hx, hx->fifo_size);
-                if (test_bit(FLG_TRANSPARENT, &hx->bch.Flags)) {
-                        /* receive transparent audio data */
-                        if (hx->bch.rx_skb)
-                                recv_Bchannel(&hx->bch, 0);
-                }
+                if (test_bit(FLG_TRANSPARENT, &hx->bch.Flags))
+                        recv_Bchannel(&hx->bch, 0, false);
         }
 
         if (istab & IPACX_B_RFO) {
@@ -1137,7 +1143,9 @@ ipac_irq(struct hscx_hw *hx, u8 ista)
 
         if (istab & IPACX_B_XDU) {
                 if (test_bit(FLG_TRANSPARENT, &hx->bch.Flags)) {
-                        hscx_fill_fifo(hx);
+                        if (test_bit(FLG_FILLEMPTY, &hx->bch.Flags))
+                                test_and_set_bit(FLG_TX_EMPTY, &hx->bch.Flags);
+                        hscx_xpr(hx);
                         return;
                 }
                 pr_debug("%s: B%1d XDU error at len %d\n", hx->ip->name,
@@ -1338,22 +1346,17 @@ hscx_l2l1(struct mISDNchannel *ch, struct sk_buff *skb)
         struct hscx_hw  *hx = container_of(bch, struct hscx_hw, bch);
         int ret = -EINVAL;
         struct mISDNhead *hh = mISDN_HEAD_P(skb);
-        u32 id;
-        u_long flags;
+        unsigned long flags;
 
         switch (hh->prim) {
         case PH_DATA_REQ:
                 spin_lock_irqsave(hx->ip->hwlock, flags);
                 ret = bchannel_senddata(bch, skb);
                 if (ret > 0) { /* direct TX */
-                        id = hh->id; /* skb can be freed */
                         ret = 0;
                         hscx_fill_fifo(hx);
-                        spin_unlock_irqrestore(hx->ip->hwlock, flags);
-                        if (!test_bit(FLG_TRANSPARENT, &bch->Flags))
-                                queue_ch_frame(ch, PH_DATA_CNF, id, NULL);
-                } else
-                        spin_unlock_irqrestore(hx->ip->hwlock, flags);
+                }
+                spin_unlock_irqrestore(hx->ip->hwlock, flags);
                 return ret;
         case PH_ACTIVATE_REQ:
                 spin_lock_irqsave(hx->ip->hwlock, flags);
@@ -1388,20 +1391,7 @@ hscx_l2l1(struct mISDNchannel *ch, struct sk_buff *skb)
 static int
 channel_bctrl(struct bchannel *bch, struct mISDN_ctrl_req *cq)
 {
-        int     ret = 0;
-
-        switch (cq->op) {
-        case MISDN_CTRL_GETOP:
-                cq->op = 0;
-                break;
-                /* Nothing implemented yet */
-        case MISDN_CTRL_FILL_EMPTY:
-        default:
-                pr_info("%s: unknown Op %x\n", __func__, cq->op);
-                ret = -EINVAL;
-                break;
-        }
-        return ret;
+        return mISDN_ctrl_bchannel(bch, cq);
 }
 
 static int
@@ -1416,15 +1406,10 @@ hscx_bctrl(struct mISDNchannel *ch, u32 cmd, void *arg)
         switch (cmd) {
         case CLOSE_CHANNEL:
                 test_and_clear_bit(FLG_OPEN, &bch->Flags);
-                if (test_bit(FLG_ACTIVE, &bch->Flags)) {
-                        spin_lock_irqsave(hx->ip->hwlock, flags);
-                        mISDN_freebchannel(bch);
-                        hscx_mode(hx, ISDN_P_NONE);
-                        spin_unlock_irqrestore(hx->ip->hwlock, flags);
-                } else {
-                        skb_queue_purge(&bch->rqueue);
-                        bch->rcount = 0;
-                }
+                spin_lock_irqsave(hx->ip->hwlock, flags);
+                mISDN_freebchannel(bch);
+                hscx_mode(hx, ISDN_P_NONE);
+                spin_unlock_irqrestore(hx->ip->hwlock, flags);
                 ch->protocol = ISDN_P_NONE;
                 ch->peer = NULL;
                 module_put(hx->ip->owner);
@@ -1526,7 +1511,7 @@ channel_ctrl(struct ipac_hw *ipac, struct mISDN_ctrl_req *cq)
 
         switch (cq->op) {
         case MISDN_CTRL_GETOP:
-                cq->op = MISDN_CTRL_LOOP;
+                cq->op = MISDN_CTRL_LOOP | MISDN_CTRL_L1_TIMER3;
                 break;
         case MISDN_CTRL_LOOP:
                 /* cq->channel: 0 disable, 1 B1 loop 2 B2 loop, 3 both */
@@ -1536,6 +1521,9 @@ channel_ctrl(struct ipac_hw *ipac, struct mISDN_ctrl_req *cq)
                 }
                 ret = ipac->ctrl(ipac, HW_TESTLOOP, cq->channel);
                 break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = ipac->isac.ctrl(&ipac->isac, HW_TIMER3_VALUE, cq->p1);
+                break;
         default:
                 pr_info("%s: unknown CTRL OP %x\n", ipac->name, cq->op);
                 ret = -EINVAL;
@@ -1621,7 +1609,8 @@ mISDNipac_init(struct ipac_hw *ipac, void *hw)
                 set_channelmap(i + 1, ipac->isac.dch.dev.channelmap);
                 list_add(&ipac->hscx[i].bch.ch.list,
                          &ipac->isac.dch.dev.bchannels);
-                mISDN_initbchannel(&ipac->hscx[i].bch, MAX_DATA_MEM);
+                mISDN_initbchannel(&ipac->hscx[i].bch, MAX_DATA_MEM,
+                                   ipac->hscx[i].fifo_size);
                 ipac->hscx[i].bch.ch.nr = i + 1;
                 ipac->hscx[i].bch.ch.send = &hscx_l2l1;
                 ipac->hscx[i].bch.ch.ctrl = hscx_bctrl;
diff --git a/drivers/isdn/hardware/mISDN/mISDNisar.c b/drivers/isdn/hardware/mISDN/mISDNisar.c
index 9a6da6edcfa8..be5973ded6d6 100644
--- a/drivers/isdn/hardware/mISDN/mISDNisar.c
+++ b/drivers/isdn/hardware/mISDN/mISDNisar.c
@@ -421,13 +421,19 @@ deliver_status(struct isar_ch *ch, int status)
 static inline void
 isar_rcv_frame(struct isar_ch *ch)
 {
-        u8              *ptr;
+        u8      *ptr;
+        int     maxlen;
 
         if (!ch->is->clsb) {
                 pr_debug("%s; ISAR zero len frame\n", ch->is->name);
                 ch->is->write_reg(ch->is->hw, ISAR_IIA, 0);
                 return;
         }
+        if (test_bit(FLG_RX_OFF, &ch->bch.Flags)) {
+                ch->bch.dropcnt += ch->is->clsb;
+                ch->is->write_reg(ch->is->hw, ISAR_IIA, 0);
+                return;
+        }
         switch (ch->bch.state) {
         case ISDN_P_NONE:
                 pr_debug("%s: ISAR protocol 0 spurious IIS_RDATA %x/%x/%x\n",
@@ -437,36 +443,22 @@ isar_rcv_frame(struct isar_ch *ch)
         case ISDN_P_B_RAW:
         case ISDN_P_B_L2DTMF:
         case ISDN_P_B_MODEM_ASYNC:
-                if (!ch->bch.rx_skb) {
-                        ch->bch.rx_skb = mI_alloc_skb(ch->bch.maxlen,
-                                                      GFP_ATOMIC);
-                        if (unlikely(!ch->bch.rx_skb)) {
-                                pr_info("%s: B receive out of memory\n",
-                                        ch->is->name);
-                                ch->is->write_reg(ch->is->hw, ISAR_IIA, 0);
-                                break;
-                        }
+                maxlen = bchannel_get_rxbuf(&ch->bch, ch->is->clsb);
+                if (maxlen < 0) {
+                        pr_warning("%s.B%d: No bufferspace for %d bytes\n",
+                                   ch->is->name, ch->bch.nr, ch->is->clsb);
+                        ch->is->write_reg(ch->is->hw, ISAR_IIA, 0);
+                        break;
                 }
                 rcv_mbox(ch->is, skb_put(ch->bch.rx_skb, ch->is->clsb));
-                recv_Bchannel(&ch->bch, 0);
+                recv_Bchannel(&ch->bch, 0, false);
                 break;
         case ISDN_P_B_HDLC:
-                if (!ch->bch.rx_skb) {
-                        ch->bch.rx_skb = mI_alloc_skb(ch->bch.maxlen,
-                                                      GFP_ATOMIC);
-                        if (unlikely(!ch->bch.rx_skb)) {
-                                pr_info("%s: B receive out of memory\n",
-                                        ch->is->name);
-                                ch->is->write_reg(ch->is->hw, ISAR_IIA, 0);
-                                break;
-                        }
-                }
-                if ((ch->bch.rx_skb->len + ch->is->clsb) >
-                    (ch->bch.maxlen + 2)) {
-                        pr_debug("%s: incoming packet too large\n",
-                                 ch->is->name);
+                maxlen = bchannel_get_rxbuf(&ch->bch, ch->is->clsb);
+                if (maxlen < 0) {
+                        pr_warning("%s.B%d: No bufferspace for %d bytes\n",
+                                   ch->is->name, ch->bch.nr, ch->is->clsb);
                         ch->is->write_reg(ch->is->hw, ISAR_IIA, 0);
-                        skb_trim(ch->bch.rx_skb, 0);
                         break;
                 }
                 if (ch->is->cmsb & HDLC_ERROR) {
@@ -494,7 +486,7 @@ isar_rcv_frame(struct isar_ch *ch)
                                 break;
                         }
                         skb_trim(ch->bch.rx_skb, ch->bch.rx_skb->len - 2);
-                        recv_Bchannel(&ch->bch, 0);
+                        recv_Bchannel(&ch->bch, 0, false);
                 }
                 break;
         case ISDN_P_B_T30_FAX:
@@ -530,7 +522,7 @@ isar_rcv_frame(struct isar_ch *ch)
                                 ch->state = STFAX_ESCAPE;
                                 /* set_skb_flag(skb, DF_NOMOREDATA); */
                         }
-                        recv_Bchannel(&ch->bch, 0);
+                        recv_Bchannel(&ch->bch, 0, false);
                         if (ch->is->cmsb & SART_NMD)
                                 deliver_status(ch, HW_MOD_NOCARR);
                         break;
@@ -570,7 +562,7 @@ isar_rcv_frame(struct isar_ch *ch)
                                 break;
                         }
                         skb_trim(ch->bch.rx_skb, ch->bch.rx_skb->len - 2);
-                        recv_Bchannel(&ch->bch, 0);
+                        recv_Bchannel(&ch->bch, 0, false);
                 }
                 if (ch->is->cmsb & SART_NMD) { /* ABORT */
                         pr_debug("%s: isar_rcv_frame: no more data\n",
@@ -598,16 +590,25 @@ isar_fill_fifo(struct isar_ch *ch)
         u8 msb;
         u8 *ptr;
 
-        pr_debug("%s: ch%d  tx_skb %p tx_idx %d\n",
-                 ch->is->name, ch->bch.nr, ch->bch.tx_skb, ch->bch.tx_idx);
-        if (!ch->bch.tx_skb)
+        pr_debug("%s: ch%d  tx_skb %d tx_idx %d\n", ch->is->name, ch->bch.nr,
+                 ch->bch.tx_skb ? ch->bch.tx_skb->len : -1, ch->bch.tx_idx);
+        if (!(ch->is->bstat &
+              (ch->dpath == 1 ? BSTAT_RDM1 : BSTAT_RDM2)))
+                return;
+        if (!ch->bch.tx_skb) {
+                if (!test_bit(FLG_TX_EMPTY, &ch->bch.Flags) ||
+                    (ch->bch.state != ISDN_P_B_RAW))
+                        return;
+                count = ch->mml;
+                /* use the card buffer */
+                memset(ch->is->buf, ch->bch.fill[0], count);
+                send_mbox(ch->is, SET_DPS(ch->dpath) | ISAR_HIS_SDATA,
+                          0, count, ch->is->buf);
                 return;
+        }
         count = ch->bch.tx_skb->len - ch->bch.tx_idx;
         if (count <= 0)
                 return;
-        if (!(ch->is->bstat &
-              (ch->dpath == 1 ? BSTAT_RDM1 : BSTAT_RDM2)))
-                return;
         if (count > ch->mml) {
                 msb = 0;
                 count = ch->mml;
@@ -686,9 +687,9 @@ sel_bch_isar(struct isar_hw *isar, u8 dpath)
 static void
 send_next(struct isar_ch *ch)
 {
-        pr_debug("%s: %s ch%d tx_skb %p tx_idx %d\n",
-                 ch->is->name, __func__, ch->bch.nr,
-                 ch->bch.tx_skb, ch->bch.tx_idx);
+        pr_debug("%s: %s ch%d tx_skb %d tx_idx %d\n", ch->is->name, __func__,
+                 ch->bch.nr, ch->bch.tx_skb ? ch->bch.tx_skb->len : -1,
+                 ch->bch.tx_idx);
         if (ch->bch.state == ISDN_P_B_T30_FAX) {
                 if (ch->cmd == PCTRL_CMD_FTH) {
                         if (test_bit(FLG_LASTDATA, &ch->bch.Flags)) {
@@ -702,15 +703,14 @@ send_next(struct isar_ch *ch)
                         }
                 }
         }
-        if (ch->bch.tx_skb) {
-                /* send confirm, on trans, free on hdlc. */
-                if (test_bit(FLG_TRANSPARENT, &ch->bch.Flags))
-                        confirm_Bsend(&ch->bch);
+        if (ch->bch.tx_skb)
                 dev_kfree_skb(ch->bch.tx_skb);
-        }
-        if (get_next_bframe(&ch->bch))
+        if (get_next_bframe(&ch->bch)) {
                 isar_fill_fifo(ch);
-        else {
+                test_and_clear_bit(FLG_TX_EMPTY, &ch->bch.Flags);
+        } else if (test_bit(FLG_TX_EMPTY, &ch->bch.Flags)) {
+                isar_fill_fifo(ch);
+        } else {
                 if (test_and_clear_bit(FLG_DLEETX, &ch->bch.Flags)) {
                         if (test_and_clear_bit(FLG_LASTDATA,
                                                &ch->bch.Flags)) {
@@ -724,6 +724,8 @@ send_next(struct isar_ch *ch)
                         } else {
                                 deliver_status(ch, HW_MOD_CONNECT);
                         }
+                } else if (test_bit(FLG_FILLEMPTY, &ch->bch.Flags)) {
+                        test_and_set_bit(FLG_TX_EMPTY, &ch->bch.Flags);
                 }
         }
 }
@@ -1487,14 +1489,10 @@ isar_l2l1(struct mISDNchannel *ch, struct sk_buff *skb)
                 spin_lock_irqsave(ich->is->hwlock, flags);
                 ret = bchannel_senddata(bch, skb);
                 if (ret > 0) { /* direct TX */
-                        id = hh->id; /* skb can be freed */
                         ret = 0;
                         isar_fill_fifo(ich);
-                        spin_unlock_irqrestore(ich->is->hwlock, flags);
-                        if (!test_bit(FLG_TRANSPARENT, &bch->Flags))
-                                queue_ch_frame(ch, PH_DATA_CNF, id, NULL);
-                } else
-                        spin_unlock_irqrestore(ich->is->hwlock, flags);
+                }
+                spin_unlock_irqrestore(ich->is->hwlock, flags);
                 return ret;
         case PH_ACTIVATE_REQ:
                 spin_lock_irqsave(ich->is->hwlock, flags);
@@ -1575,20 +1573,7 @@ isar_l2l1(struct mISDNchannel *ch, struct sk_buff *skb)
 static int
 channel_bctrl(struct bchannel *bch, struct mISDN_ctrl_req *cq)
 {
-        int     ret = 0;
-
-        switch (cq->op) {
-        case MISDN_CTRL_GETOP:
-                cq->op = 0;
-                break;
-                /* Nothing implemented yet */
-        case MISDN_CTRL_FILL_EMPTY:
-        default:
-                pr_info("%s: unknown Op %x\n", __func__, cq->op);
-                ret = -EINVAL;
-                break;
-        }
-        return ret;
+        return mISDN_ctrl_bchannel(bch, cq);
 }
 
 static int
@@ -1603,15 +1588,10 @@ isar_bctrl(struct mISDNchannel *ch, u32 cmd, void *arg)
         switch (cmd) {
         case CLOSE_CHANNEL:
                 test_and_clear_bit(FLG_OPEN, &bch->Flags);
-                if (test_bit(FLG_ACTIVE, &bch->Flags)) {
-                        spin_lock_irqsave(ich->is->hwlock, flags);
-                        mISDN_freebchannel(bch);
-                        modeisar(ich, ISDN_P_NONE);
-                        spin_unlock_irqrestore(ich->is->hwlock, flags);
-                } else {
-                        skb_queue_purge(&bch->rqueue);
-                        bch->rcount = 0;
-                }
+                spin_lock_irqsave(ich->is->hwlock, flags);
+                mISDN_freebchannel(bch);
+                modeisar(ich, ISDN_P_NONE);
+                spin_unlock_irqrestore(ich->is->hwlock, flags);
                 ch->protocol = ISDN_P_NONE;
                 ch->peer = NULL;
                 module_put(ich->is->owner);
@@ -1677,7 +1657,6 @@ isar_open(struct isar_hw *isar, struct channel_req *rq)
         bch = &isar->ch[rq->adr.channel - 1].bch;
         if (test_and_set_bit(FLG_OPEN, &bch->Flags))
                 return -EBUSY; /* b-channel can be only open once */
-        test_and_clear_bit(FLG_FILLEMPTY, &bch->Flags);
         bch->ch.protocol = rq->protocol;
         rq->ch = &bch->ch;
         return 0;
@@ -1691,7 +1670,7 @@ mISDNisar_init(struct isar_hw *isar, void *hw)
         isar->hw = hw;
         for (i = 0; i < 2; i++) {
                 isar->ch[i].bch.nr = i + 1;
-                mISDN_initbchannel(&isar->ch[i].bch, MAX_DATA_MEM);
+                mISDN_initbchannel(&isar->ch[i].bch, MAX_DATA_MEM, 32);
                 isar->ch[i].bch.ch.nr = i + 1;
                 isar->ch[i].bch.ch.send = &isar_l2l1;
                 isar->ch[i].bch.ch.ctrl = isar_bctrl;
diff --git a/drivers/isdn/hardware/mISDN/netjet.c b/drivers/isdn/hardware/mISDN/netjet.c
index c726e09d0981..c3e3e7686273 100644
--- a/drivers/isdn/hardware/mISDN/netjet.c
+++ b/drivers/isdn/hardware/mISDN/netjet.c
@@ -386,24 +386,20 @@ read_dma(struct tiger_ch *bc, u32 idx, int cnt)
                         bc->bch.nr, idx);
         }
         bc->lastrx = idx;
-        if (!bc->bch.rx_skb) {
-                bc->bch.rx_skb = mI_alloc_skb(bc->bch.maxlen, GFP_ATOMIC);
-                if (!bc->bch.rx_skb) {
-                        pr_info("%s: B%1d receive out of memory\n",
-                                card->name, bc->bch.nr);
-                        return;
-                }
+        if (test_bit(FLG_RX_OFF, &bc->bch.Flags)) {
+                bc->bch.dropcnt += cnt;
+                return;
         }
-
-        if (test_bit(FLG_TRANSPARENT, &bc->bch.Flags)) {
-                if ((bc->bch.rx_skb->len + cnt) > bc->bch.maxlen) {
-                        pr_debug("%s: B%1d overrun %d\n", card->name,
-                                 bc->bch.nr, bc->bch.rx_skb->len + cnt);
-                        skb_trim(bc->bch.rx_skb, 0);
-                        return;
-                }
+        stat = bchannel_get_rxbuf(&bc->bch, cnt);
+        /* only transparent use the count here, HDLC overun is detected later */
+        if (stat == ENOMEM) {
+                pr_warning("%s.B%d: No memory for %d bytes\n",
+                           card->name, bc->bch.nr, cnt);
+                return;
+        }
+        if (test_bit(FLG_TRANSPARENT, &bc->bch.Flags))
                 p = skb_put(bc->bch.rx_skb, cnt);
-        } else
+        else
                 p = bc->hrbuf;
 
         for (i = 0; i < cnt; i++) {
@@ -414,48 +410,45 @@ read_dma(struct tiger_ch *bc, u32 idx, int cnt)
                         idx = 0;
                 p[i] = val & 0xff;
         }
+
+        if (test_bit(FLG_TRANSPARENT, &bc->bch.Flags)) {
+                recv_Bchannel(&bc->bch, 0, false);
+                return;
+        }
+
         pn = bc->hrbuf;
-next_frame:
-        if (test_bit(FLG_HDLC, &bc->bch.Flags)) {
+        while (cnt > 0) {
                 stat = isdnhdlc_decode(&bc->hrecv, pn, cnt, &i,
                                        bc->bch.rx_skb->data, bc->bch.maxlen);
-                if (stat > 0) /* valid frame received */
+                if (stat > 0) { /* valid frame received */
                         p = skb_put(bc->bch.rx_skb, stat);
-                else if (stat == -HDLC_CRC_ERROR)
+                        if (debug & DEBUG_HW_BFIFO) {
+                                snprintf(card->log, LOG_SIZE,
+                                         "B%1d-recv %s %d ", bc->bch.nr,
+                                         card->name, stat);
+                                print_hex_dump_bytes(card->log,
+                                                     DUMP_PREFIX_OFFSET, p,
+                                                     stat);
+                        }
+                        recv_Bchannel(&bc->bch, 0, false);
+                        stat = bchannel_get_rxbuf(&bc->bch, bc->bch.maxlen);
+                        if (stat < 0) {
+                                pr_warning("%s.B%d: No memory for %d bytes\n",
+                                           card->name, bc->bch.nr, cnt);
+                                return;
+                        }
+                } else if (stat == -HDLC_CRC_ERROR) {
                         pr_info("%s: B%1d receive frame CRC error\n",
                                 card->name, bc->bch.nr);
-                else if (stat == -HDLC_FRAMING_ERROR)
+                } else if (stat == -HDLC_FRAMING_ERROR) {
                         pr_info("%s: B%1d receive framing error\n",
                                 card->name, bc->bch.nr);
-                else if (stat == -HDLC_LENGTH_ERROR)
+                } else if (stat == -HDLC_LENGTH_ERROR) {
                         pr_info("%s: B%1d receive frame too long (> %d)\n",
                                 card->name, bc->bch.nr, bc->bch.maxlen);
-        } else
-                stat = cnt;
-
-        if (stat > 0) {
-                if (debug & DEBUG_HW_BFIFO) {
-                        snprintf(card->log, LOG_SIZE, "B%1d-recv %s %d ",
-                                 bc->bch.nr, card->name, stat);
-                        print_hex_dump_bytes(card->log, DUMP_PREFIX_OFFSET,
-                                             p, stat);
                 }
-                recv_Bchannel(&bc->bch, 0);
-        }
-        if (test_bit(FLG_HDLC, &bc->bch.Flags)) {
                 pn += i;
                 cnt -= i;
-                if (!bc->bch.rx_skb) {
-                        bc->bch.rx_skb = mI_alloc_skb(bc->bch.maxlen,
-                                                      GFP_ATOMIC);
-                        if (!bc->bch.rx_skb) {
-                                pr_info("%s: B%1d receive out of memory\n",
-                                        card->name, bc->bch.nr);
-                                return;
-                        }
-                }
-                if (cnt > 0)
-                        goto next_frame;
         }
 }
 
@@ -544,22 +537,31 @@ static void
 fill_dma(struct tiger_ch *bc)
 {
         struct tiger_hw *card = bc->bch.hw;
-        int count, i;
-        u32 m, v;
+        int count, i, fillempty = 0;
+        u32 m, v, n = 0;
         u8  *p;
 
         if (bc->free == 0)
                 return;
-        count = bc->bch.tx_skb->len - bc->bch.tx_idx;
-        if (count <= 0)
-                return;
-        pr_debug("%s: %s B%1d %d/%d/%d/%d state %x idx %d/%d\n", card->name,
-                 __func__, bc->bch.nr, count, bc->free, bc->bch.tx_idx,
-                 bc->bch.tx_skb->len, bc->txstate, bc->idx, card->send.idx);
+        if (!bc->bch.tx_skb) {
+                if (!test_bit(FLG_TX_EMPTY, &bc->bch.Flags))
+                        return;
+                fillempty = 1;
+                count = card->send.size >> 1;
+                p = bc->bch.fill;
+        } else {
+                count = bc->bch.tx_skb->len - bc->bch.tx_idx;
+                if (count <= 0)
+                        return;
+                pr_debug("%s: %s B%1d %d/%d/%d/%d state %x idx %d/%d\n",
+                         card->name, __func__, bc->bch.nr, count, bc->free,
+                         bc->bch.tx_idx, bc->bch.tx_skb->len, bc->txstate,
+                         bc->idx, card->send.idx);
+                p = bc->bch.tx_skb->data + bc->bch.tx_idx;
+        }
         if (bc->txstate & (TX_IDLE | TX_INIT | TX_UNDERRUN))
                 resync(bc, card);
-        p = bc->bch.tx_skb->data + bc->bch.tx_idx;
-        if (test_bit(FLG_HDLC, &bc->bch.Flags)) {
+        if (test_bit(FLG_HDLC, &bc->bch.Flags) && !fillempty) {
                 count = isdnhdlc_encode(&bc->hsend, p, count, &i,
                                         bc->hsbuf, bc->free);
                 pr_debug("%s: B%1d hdlc encoded %d in %d\n", card->name,
@@ -570,17 +572,33 @@ fill_dma(struct tiger_ch *bc)
         } else {
                 if (count > bc->free)
                         count = bc->free;
-                bc->bch.tx_idx += count;
+                if (!fillempty)
+                        bc->bch.tx_idx += count;
                 bc->free -= count;
         }
         m = (bc->bch.nr & 1) ? 0xffffff00 : 0xffff00ff;
-        for (i = 0; i < count; i++) {
-                if (bc->idx >= card->send.size)
-                        bc->idx = 0;
-                v = card->send.start[bc->idx];
-                v &= m;
-                v |= (bc->bch.nr & 1) ? (u32)(p[i]) : ((u32)(p[i])) << 8;
-                card->send.start[bc->idx++] = v;
+        if (fillempty) {
+                n = p[0];
+                if (!(bc->bch.nr & 1))
+                        n <<= 8;
+                for (i = 0; i < count; i++) {
+                        if (bc->idx >= card->send.size)
+                                bc->idx = 0;
+                        v = card->send.start[bc->idx];
+                        v &= m;
+                        v |= n;
+                        card->send.start[bc->idx++] = v;
+                }
+        } else {
+                for (i = 0; i < count; i++) {
+                        if (bc->idx >= card->send.size)
+                                bc->idx = 0;
+                        v = card->send.start[bc->idx];
+                        v &= m;
+                        n = p[i];
+                        v |= (bc->bch.nr & 1) ? n : n << 8;
+                        card->send.start[bc->idx++] = v;
+                }
         }
         if (debug & DEBUG_HW_BFIFO) {
                 snprintf(card->log, LOG_SIZE, "B%1d-send %s %d ",
@@ -595,21 +613,26 @@ fill_dma(struct tiger_ch *bc)
 static int
 bc_next_frame(struct tiger_ch *bc)
 {
-        if (bc->bch.tx_skb && bc->bch.tx_idx < bc->bch.tx_skb->len)
+        int ret = 1;
+
+        if (bc->bch.tx_skb && bc->bch.tx_idx < bc->bch.tx_skb->len) {
                 fill_dma(bc);
-        else {
-                if (bc->bch.tx_skb) {
-                        /* send confirm, on trans, free on hdlc. */
-                        if (test_bit(FLG_TRANSPARENT, &bc->bch.Flags))
-                                confirm_Bsend(&bc->bch);
+        } else {
+                if (bc->bch.tx_skb)
                         dev_kfree_skb(bc->bch.tx_skb);
-                }
-                if (get_next_bframe(&bc->bch))
+                if (get_next_bframe(&bc->bch)) {
                         fill_dma(bc);
-                else
-                        return 0;
+                        test_and_clear_bit(FLG_TX_EMPTY, &bc->bch.Flags);
+                } else if (test_bit(FLG_TX_EMPTY, &bc->bch.Flags)) {
+                        fill_dma(bc);
+                } else if (test_bit(FLG_FILLEMPTY, &bc->bch.Flags)) {
+                        test_and_set_bit(FLG_TX_EMPTY, &bc->bch.Flags);
+                        ret = 0;
+                } else {
+                        ret = 0;
+                }
         }
-        return 1;
+        return ret;
 }
 
 static void
@@ -732,22 +755,17 @@ nj_l2l1B(struct mISDNchannel *ch, struct sk_buff *skb)
         struct tiger_ch *bc = container_of(bch, struct tiger_ch, bch);
         struct tiger_hw *card = bch->hw;
         struct mISDNhead *hh = mISDN_HEAD_P(skb);
-        u32 id;
-        u_long flags;
+        unsigned long flags;
 
         switch (hh->prim) {
         case PH_DATA_REQ:
                 spin_lock_irqsave(&card->lock, flags);
                 ret = bchannel_senddata(bch, skb);
                 if (ret > 0) { /* direct TX */
-                        id = hh->id; /* skb can be freed */
                         fill_dma(bc);
                         ret = 0;
-                        spin_unlock_irqrestore(&card->lock, flags);
-                        if (!test_bit(FLG_TRANSPARENT, &bch->Flags))
-                                queue_ch_frame(ch, PH_DATA_CNF, id, NULL);
-                } else
-                        spin_unlock_irqrestore(&card->lock, flags);
+                }
+                spin_unlock_irqrestore(&card->lock, flags);
                 return ret;
         case PH_ACTIVATE_REQ:
                 spin_lock_irqsave(&card->lock, flags);
@@ -778,21 +796,7 @@ nj_l2l1B(struct mISDNchannel *ch, struct sk_buff *skb)
 static int
 channel_bctrl(struct tiger_ch *bc, struct mISDN_ctrl_req *cq)
 {
-        int ret = 0;
-        struct tiger_hw *card  = bc->bch.hw;
-
-        switch (cq->op) {
-        case MISDN_CTRL_GETOP:
-                cq->op = 0;
-                break;
-                /* Nothing implemented yet */
-        case MISDN_CTRL_FILL_EMPTY:
-        default:
-                pr_info("%s: %s unknown Op %x\n", card->name, __func__, cq->op);
-                ret = -EINVAL;
-                break;
-        }
-        return ret;
+        return mISDN_ctrl_bchannel(&bc->bch, cq);
 }
 
 static int
@@ -808,14 +812,10 @@ nj_bctrl(struct mISDNchannel *ch, u32 cmd, void *arg)
         switch (cmd) {
         case CLOSE_CHANNEL:
                 test_and_clear_bit(FLG_OPEN, &bch->Flags);
-                if (test_bit(FLG_ACTIVE, &bch->Flags)) {
-                        spin_lock_irqsave(&card->lock, flags);
-                        mISDN_freebchannel(bch);
-                        test_and_clear_bit(FLG_TX_BUSY, &bch->Flags);
-                        test_and_clear_bit(FLG_ACTIVE, &bch->Flags);
-                        mode_tiger(bc, ISDN_P_NONE);
-                        spin_unlock_irqrestore(&card->lock, flags);
-                }
+                spin_lock_irqsave(&card->lock, flags);
+                mISDN_freebchannel(bch);
+                mode_tiger(bc, ISDN_P_NONE);
+                spin_unlock_irqrestore(&card->lock, flags);
                 ch->protocol = ISDN_P_NONE;
                 ch->peer = NULL;
                 module_put(THIS_MODULE);
@@ -837,7 +837,7 @@ channel_ctrl(struct tiger_hw *card, struct mISDN_ctrl_req *cq)
 
         switch (cq->op) {
         case MISDN_CTRL_GETOP:
-                cq->op = MISDN_CTRL_LOOP;
+                cq->op = MISDN_CTRL_LOOP | MISDN_CTRL_L1_TIMER3;
                 break;
         case MISDN_CTRL_LOOP:
                 /* cq->channel: 0 disable, 1 B1 loop 2 B2 loop, 3 both */
@@ -847,6 +847,9 @@ channel_ctrl(struct tiger_hw *card, struct mISDN_ctrl_req *cq)
                 }
                 ret = card->isac.ctrl(&card->isac, HW_TESTLOOP, cq->channel);
                 break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = card->isac.ctrl(&card->isac, HW_TIMER3_VALUE, cq->p1);
+                break;
         default:
                 pr_info("%s: %s unknown Op %x\n", card->name, __func__, cq->op);
                 ret = -EINVAL;
@@ -1027,7 +1030,8 @@ setup_instance(struct tiger_hw *card)
         for (i = 0; i < 2; i++) {
                 card->bc[i].bch.nr = i + 1;
                 set_channelmap(i + 1, card->isac.dch.dev.channelmap);
-                mISDN_initbchannel(&card->bc[i].bch, MAX_DATA_MEM);
+                mISDN_initbchannel(&card->bc[i].bch, MAX_DATA_MEM,
+                                   NJ_DMA_RXSIZE >> 1);
                 card->bc[i].bch.hw = card;
                 card->bc[i].bch.ch.send = nj_l2l1B;
                 card->bc[i].bch.ch.ctrl = nj_bctrl;
diff --git a/drivers/isdn/hardware/mISDN/speedfax.c b/drivers/isdn/hardware/mISDN/speedfax.c
index 04689935148b..93f344d74e54 100644
--- a/drivers/isdn/hardware/mISDN/speedfax.c
+++ b/drivers/isdn/hardware/mISDN/speedfax.c
@@ -224,7 +224,7 @@ channel_ctrl(struct sfax_hw  *sf, struct mISDN_ctrl_req *cq)
 
         switch (cq->op) {
         case MISDN_CTRL_GETOP:
-                cq->op = MISDN_CTRL_LOOP;
+                cq->op = MISDN_CTRL_LOOP | MISDN_CTRL_L1_TIMER3;
                 break;
         case MISDN_CTRL_LOOP:
                 /* cq->channel: 0 disable, 1 B1 loop 2 B2 loop, 3 both */
@@ -234,6 +234,9 @@ channel_ctrl(struct sfax_hw  *sf, struct mISDN_ctrl_req *cq)
                 }
                 ret = sf->isac.ctrl(&sf->isac, HW_TESTLOOP, cq->channel);
                 break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = sf->isac.ctrl(&sf->isac, HW_TIMER3_VALUE, cq->p1);
+                break;
         default:
                 pr_info("%s: unknown Op %x\n", sf->name, cq->op);
                 ret = -EINVAL;
diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c
index 2183357f0799..26a86b846099 100644
--- a/drivers/isdn/hardware/mISDN/w6692.c
+++ b/drivers/isdn/hardware/mISDN/w6692.c
@@ -465,6 +465,7 @@ W6692_empty_Bfifo(struct w6692_ch *wch, int count)
 {
         struct w6692_hw *card = wch->bch.hw;
         u8 *ptr;
+        int maxlen;
 
         pr_debug("%s: empty_Bfifo %d\n", card->name, count);
         if (unlikely(wch->bch.state == ISDN_P_NONE)) {
@@ -474,20 +475,18 @@ W6692_empty_Bfifo(struct w6692_ch *wch, int count)
                         skb_trim(wch->bch.rx_skb, 0);
                 return;
         }
-        if (!wch->bch.rx_skb) {
-                wch->bch.rx_skb = mI_alloc_skb(wch->bch.maxlen, GFP_ATOMIC);
-                if (unlikely(!wch->bch.rx_skb)) {
-                        pr_info("%s: B receive out of memory\n", card->name);
-                        WriteW6692B(wch, W_B_CMDR, W_B_CMDR_RACK |
-                                    W_B_CMDR_RACT);
-                        return;
-                }
+        if (test_bit(FLG_RX_OFF, &wch->bch.Flags)) {
+                wch->bch.dropcnt += count;
+                WriteW6692B(wch, W_B_CMDR, W_B_CMDR_RACK | W_B_CMDR_RACT);
+                return;
         }
-        if (wch->bch.rx_skb->len + count > wch->bch.maxlen) {
-                pr_debug("%s: empty_Bfifo incoming packet too large\n",
-                         card->name);
+        maxlen = bchannel_get_rxbuf(&wch->bch, count);
+        if (maxlen < 0) {
                 WriteW6692B(wch, W_B_CMDR, W_B_CMDR_RACK | W_B_CMDR_RACT);
-                skb_trim(wch->bch.rx_skb, 0);
+                if (wch->bch.rx_skb)
+                        skb_trim(wch->bch.rx_skb, 0);
+                pr_warning("%s.B%d: No bufferspace for %d bytes\n",
+                           card->name, wch->bch.nr, count);
                 return;
         }
         ptr = skb_put(wch->bch.rx_skb, count);
@@ -504,16 +503,22 @@ static void
 W6692_fill_Bfifo(struct w6692_ch *wch)
 {
         struct w6692_hw *card = wch->bch.hw;
-        int count;
+        int count, fillempty = 0;
         u8 *ptr, cmd = W_B_CMDR_RACT | W_B_CMDR_XMS;
 
         pr_debug("%s: fill Bfifo\n", card->name);
-        if (!wch->bch.tx_skb)
-                return;
-        count = wch->bch.tx_skb->len - wch->bch.tx_idx;
-        if (count <= 0)
-                return;
-        ptr = wch->bch.tx_skb->data + wch->bch.tx_idx;
+        if (!wch->bch.tx_skb) {
+                if (!test_bit(FLG_TX_EMPTY, &wch->bch.Flags))
+                        return;
+                ptr = wch->bch.fill;
+                count = W_B_FIFO_THRESH;
+                fillempty = 1;
+        } else {
+                count = wch->bch.tx_skb->len - wch->bch.tx_idx;
+                if (count <= 0)
+                        return;
+                ptr = wch->bch.tx_skb->data + wch->bch.tx_idx;
+        }
         if (count > W_B_FIFO_THRESH)
                 count = W_B_FIFO_THRESH;
         else if (test_bit(FLG_HDLC, &wch->bch.Flags))
@@ -522,9 +527,16 @@ W6692_fill_Bfifo(struct w6692_ch *wch)
         pr_debug("%s: fill Bfifo%d/%d\n", card->name,
                  count, wch->bch.tx_idx);
         wch->bch.tx_idx += count;
-        outsb(wch->addr + W_B_XFIFO, ptr, count);
+        if (fillempty) {
+                while (count > 0) {
+                        outsb(wch->addr + W_B_XFIFO, ptr, MISDN_BCH_FILL_SIZE);
+                        count -= MISDN_BCH_FILL_SIZE;
+                }
+        } else {
+                outsb(wch->addr + W_B_XFIFO, ptr, count);
+        }
         WriteW6692B(wch, W_B_CMDR, cmd);
-        if (debug & DEBUG_HW_DFIFO) {
+        if ((debug & DEBUG_HW_BFIFO) && !fillempty) {
                 snprintf(card->log, 63, "B%1d-send %s %d ",
                          wch->bch.nr, card->name, count);
                 print_hex_dump_bytes(card->log, DUMP_PREFIX_OFFSET, ptr, count);
@@ -638,17 +650,17 @@ w6692_mode(struct w6692_ch *wch, u32 pr)
 static void
 send_next(struct w6692_ch *wch)
 {
-        if (wch->bch.tx_skb && wch->bch.tx_idx < wch->bch.tx_skb->len)
+        if (wch->bch.tx_skb && wch->bch.tx_idx < wch->bch.tx_skb->len) {
                 W6692_fill_Bfifo(wch);
-        else {
-                if (wch->bch.tx_skb) {
-                        /* send confirm, on trans, free on hdlc. */
-                        if (test_bit(FLG_TRANSPARENT, &wch->bch.Flags))
-                                confirm_Bsend(&wch->bch);
+        } else {
+                if (wch->bch.tx_skb)
                         dev_kfree_skb(wch->bch.tx_skb);
-                }
-                if (get_next_bframe(&wch->bch))
+                if (get_next_bframe(&wch->bch)) {
+                        W6692_fill_Bfifo(wch);
+                        test_and_clear_bit(FLG_TX_EMPTY, &wch->bch.Flags);
+                } else if (test_bit(FLG_TX_EMPTY, &wch->bch.Flags)) {
                         W6692_fill_Bfifo(wch);
+                }
         }
 }
 
@@ -698,7 +710,7 @@ W6692B_interrupt(struct w6692_hw *card, int ch)
                         if (count == 0)
                                 count = W_B_FIFO_THRESH;
                         W6692_empty_Bfifo(wch, count);
-                        recv_Bchannel(&wch->bch, 0);
+                        recv_Bchannel(&wch->bch, 0, false);
                 }
         }
         if (stat & W_B_EXI_RMR) {
@@ -714,9 +726,8 @@ W6692B_interrupt(struct w6692_hw *card, int ch)
                                     W_B_CMDR_RRST | W_B_CMDR_RACT);
                 } else {
                         W6692_empty_Bfifo(wch, W_B_FIFO_THRESH);
-                        if (test_bit(FLG_TRANSPARENT, &wch->bch.Flags) &&
-                            wch->bch.rx_skb && (wch->bch.rx_skb->len > 0))
-                                recv_Bchannel(&wch->bch, 0);
+                        if (test_bit(FLG_TRANSPARENT, &wch->bch.Flags))
+                                recv_Bchannel(&wch->bch, 0, false);
                 }
         }
         if (stat & W_B_EXI_RDOV) {
@@ -738,8 +749,8 @@ W6692B_interrupt(struct w6692_hw *card, int ch)
                                  wch->bch.nr, star);
                 }
                 if (star & W_B_STAR_XDOW) {
-                        pr_debug("%s: B%d XDOW proto=%x\n", card->name,
-                                 wch->bch.nr, wch->bch.state);
+                        pr_warning("%s: B%d XDOW proto=%x\n", card->name,
+                                   wch->bch.nr, wch->bch.state);
 #ifdef ERROR_STATISTIC
                         wch->bch.err_xdu++;
 #endif
@@ -752,20 +763,21 @@ W6692B_interrupt(struct w6692_hw *card, int ch)
                         }
                 }
                 send_next(wch);
-                if (stat & W_B_EXI_XDUN)
+                if (star & W_B_STAR_XDOW)
                         return; /* handle XDOW only once */
         }
         if (stat & W_B_EXI_XDUN) {
-                pr_debug("%s: B%d XDUN proto=%x\n", card->name,
-                         wch->bch.nr, wch->bch.state);
+                pr_warning("%s: B%d XDUN proto=%x\n", card->name,
+                           wch->bch.nr, wch->bch.state);
 #ifdef ERROR_STATISTIC
                 wch->bch.err_xdu++;
 #endif
-                WriteW6692B(wch, W_B_CMDR, W_B_CMDR_XRST | W_B_CMDR_RACT);
-                /* resend */
+                /* resend - no XRST needed */
                 if (wch->bch.tx_skb) {
                         if (!test_bit(FLG_TRANSPARENT, &wch->bch.Flags))
                                 wch->bch.tx_idx = 0;
+                } else if (test_bit(FLG_FILLEMPTY, &wch->bch.Flags)) {
+                        test_and_set_bit(FLG_TX_EMPTY, &wch->bch.Flags);
                 }
                 send_next(wch);
         }
@@ -944,22 +956,17 @@ w6692_l2l1B(struct mISDNchannel *ch, struct sk_buff *skb)
         struct w6692_hw *card = bch->hw;
         int ret = -EINVAL;
         struct mISDNhead *hh = mISDN_HEAD_P(skb);
-        u32 id;
-        u_long flags;
+        unsigned long flags;
 
         switch (hh->prim) {
         case PH_DATA_REQ:
                 spin_lock_irqsave(&card->lock, flags);
                 ret = bchannel_senddata(bch, skb);
                 if (ret > 0) { /* direct TX */
-                        id = hh->id; /* skb can be freed */
                         ret = 0;
                         W6692_fill_Bfifo(bc);
-                        spin_unlock_irqrestore(&card->lock, flags);
-                        if (!test_bit(FLG_TRANSPARENT, &bch->Flags))
-                                queue_ch_frame(ch, PH_DATA_CNF, id, NULL);
-                } else
-                        spin_unlock_irqrestore(&card->lock, flags);
+                }
+                spin_unlock_irqrestore(&card->lock, flags);
                 return ret;
         case PH_ACTIVATE_REQ:
                 spin_lock_irqsave(&card->lock, flags);
@@ -994,20 +1001,7 @@ w6692_l2l1B(struct mISDNchannel *ch, struct sk_buff *skb)
 static int
 channel_bctrl(struct bchannel *bch, struct mISDN_ctrl_req *cq)
 {
-        int     ret = 0;
-
-        switch (cq->op) {
-        case MISDN_CTRL_GETOP:
-                cq->op = 0;
-                break;
-                /* Nothing implemented yet */
-        case MISDN_CTRL_FILL_EMPTY:
-        default:
-                pr_info("%s: unknown Op %x\n", __func__, cq->op);
-                ret = -EINVAL;
-                break;
-        }
-        return ret;
+        return mISDN_ctrl_bchannel(bch, cq);
 }
 
 static int
@@ -1022,7 +1016,6 @@ open_bchannel(struct w6692_hw *card, struct channel_req *rq)
         bch = &card->bc[rq->adr.channel - 1].bch;
         if (test_and_set_bit(FLG_OPEN, &bch->Flags))
                 return -EBUSY; /* b-channel can be only open once */
-        test_and_clear_bit(FLG_FILLEMPTY, &bch->Flags);
         bch->ch.protocol = rq->protocol;
         rq->ch = &bch->ch;
         return 0;
@@ -1035,7 +1028,10 @@ channel_ctrl(struct w6692_hw *card, struct mISDN_ctrl_req *cq)
 
         switch (cq->op) {
         case MISDN_CTRL_GETOP:
-                cq->op = 0;
+                cq->op = MISDN_CTRL_L1_TIMER3;
+                break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = l1_event(card->dch.l1, HW_TIMER3_VALUE | (cq->p1 & 0xff));
                 break;
         default:
                 pr_info("%s: unknown CTRL OP %x\n", card->name, cq->op);
@@ -1058,15 +1054,10 @@ w6692_bctrl(struct mISDNchannel *ch, u32 cmd, void *arg)
         switch (cmd) {
         case CLOSE_CHANNEL:
                 test_and_clear_bit(FLG_OPEN, &bch->Flags);
-                if (test_bit(FLG_ACTIVE, &bch->Flags)) {
-                        spin_lock_irqsave(&card->lock, flags);
-                        mISDN_freebchannel(bch);
-                        w6692_mode(bc, ISDN_P_NONE);
-                        spin_unlock_irqrestore(&card->lock, flags);
-                } else {
-                        skb_queue_purge(&bch->rqueue);
-                        bch->rcount = 0;
-                }
+                spin_lock_irqsave(&card->lock, flags);
+                mISDN_freebchannel(bch);
+                w6692_mode(bc, ISDN_P_NONE);
+                spin_unlock_irqrestore(&card->lock, flags);
                 ch->protocol = ISDN_P_NONE;
                 ch->peer = NULL;
                 module_put(THIS_MODULE);
@@ -1320,7 +1311,8 @@ setup_instance(struct w6692_hw *card)
         card->dch.hw = card;
         card->dch.dev.nrbchan = 2;
         for (i = 0; i < 2; i++) {
-                mISDN_initbchannel(&card->bc[i].bch, MAX_DATA_MEM);
+                mISDN_initbchannel(&card->bc[i].bch, MAX_DATA_MEM,
+                                   W_B_FIFO_THRESH);
                 card->bc[i].bch.hw = card;
                 card->bc[i].bch.nr = i + 1;
                 card->bc[i].bch.ch.nr = i + 1;
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c
index ba91333e3e41..88e4f0ee073c 100644
--- a/drivers/isdn/hysdn/hysdn_proclog.c
+++ b/drivers/isdn/hysdn/hysdn_proclog.c
@@ -156,17 +156,9 @@ static ssize_t
 hysdn_log_write(struct file *file, const char __user *buf, size_t count, loff_t *off)
 {
         int rc;
-        unsigned char valbuf[128];
         hysdn_card *card = file->private_data;
 
-        if (count > (sizeof(valbuf) - 1))
-                count = sizeof(valbuf) - 1;     /* limit length */
-        if (copy_from_user(valbuf, buf, count))
-                return (-EFAULT);       /* copy failed */
-
-        valbuf[count] = 0;      /* terminating 0 */
-
-        rc = kstrtoul(valbuf, 0, &card->debug_flags);
+        rc = kstrtoul_from_user(buf, count, 0, &card->debug_flags);
         if (rc < 0)
                 return rc;
         hysdn_addlog(card, "debug set to 0x%lx", card->debug_flags);
diff --git a/drivers/isdn/i4l/isdn_bsdcomp.c b/drivers/isdn/i4l/isdn_bsdcomp.c
index c59e8d2c0675..8837ac5a492d 100644
--- a/drivers/isdn/i4l/isdn_bsdcomp.c
+++ b/drivers/isdn/i4l/isdn_bsdcomp.c
@@ -612,7 +612,7 @@ static int bsd_compress(void *state, struct sk_buff *skb_in, struct sk_buff *skb
                 db->n_bits++;
 
         /* If output length is too large then this is an incompressible frame. */
-        if (!skb_out || (skb_out && skb_out->len >= skb_in->len)) {
+        if (!skb_out || skb_out->len >= skb_in->len) {
                 ++db->incomp_count;
                 db->incomp_bytes += isize;
                 return 0;
diff --git a/drivers/isdn/mISDN/core.c b/drivers/isdn/mISDN/core.c
index a24530f05db0..c401634c00ec 100644
--- a/drivers/isdn/mISDN/core.c
+++ b/drivers/isdn/mISDN/core.c
@@ -355,6 +355,22 @@ mISDN_unregister_Bprotocol(struct Bprotocol *bp)
 }
 EXPORT_SYMBOL(mISDN_unregister_Bprotocol);
 
+static const char *msg_no_channel = "<no channel>";
+static const char *msg_no_stack = "<no stack>";
+static const char *msg_no_stackdev = "<no stack device>";
+
+const char *mISDNDevName4ch(struct mISDNchannel *ch)
+{
+        if (!ch)
+                return msg_no_channel;
+        if (!ch->st)
+                return msg_no_stack;
+        if (!ch->st->dev)
+                return msg_no_stackdev;
+        return dev_name(&ch->st->dev->dev);
+};
+EXPORT_SYMBOL(mISDNDevName4ch);
+
 static int
 mISDNInit(void)
 {
diff --git a/drivers/isdn/mISDN/dsp.h b/drivers/isdn/mISDN/dsp.h
index afe4173ae007..fc1733a08845 100644
--- a/drivers/isdn/mISDN/dsp.h
+++ b/drivers/isdn/mISDN/dsp.h
@@ -76,7 +76,9 @@ extern u8 dsp_silence;
 #define MAX_SECONDS_JITTER_CHECK 5
 
 extern struct timer_list dsp_spl_tl;
-extern u32 dsp_spl_jiffies;
+
+/* the datatype need to match jiffies datatype */
+extern unsigned long dsp_spl_jiffies;
 
 /* the structure of conferences:
  *
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
index 334feab060a1..a4f05c54c32b 100644
--- a/drivers/isdn/mISDN/dsp_cmx.c
+++ b/drivers/isdn/mISDN/dsp_cmx.c
@@ -742,8 +742,8 @@ dsp_cmx_hardware(struct dsp_conf *conf, struct dsp *dsp)
                                                member->dsp->pcm_slot_tx,
                                                member->dsp->pcm_bank_tx,
                                                member->dsp->pcm_bank_rx);
-                                conf->hardware = 0;
-                                conf->software = 1;
+                                conf->hardware = 1;
+                                conf->software = tx_data;
                                 return;
                         }
                         /* find a new slot */
@@ -834,8 +834,8 @@ dsp_cmx_hardware(struct dsp_conf *conf, struct dsp *dsp)
                                                nextm->dsp->name,
                                                member->dsp->pcm_slot_tx,
                                                member->dsp->pcm_slot_rx);
-                                conf->hardware = 0;
-                                conf->software = 1;
+                                conf->hardware = 1;
+                                conf->software = tx_data;
                                 return;
                         }
                         /* find two new slot */
@@ -939,8 +939,11 @@ dsp_cmx_hardware(struct dsp_conf *conf, struct dsp *dsp)
         /* for more than two members.. */
 
         /* if all members already have the same conference */
-        if (all_conf)
+        if (all_conf) {
+                conf->hardware = 1;
+                conf->software = tx_data;
                 return;
+        }
 
         /*
          * if there is an existing conference, but not all members have joined
@@ -1013,6 +1016,8 @@ dsp_cmx_hardware(struct dsp_conf *conf, struct dsp *dsp)
                         dsp_cmx_hw_message(member->dsp,
                                            MISDN_CTRL_HFC_CONF_JOIN, current_conf, 0, 0, 0);
                 }
+                conf->hardware = 1;
+                conf->software = tx_data;
                 return;
         }
 
@@ -1328,7 +1333,7 @@ dsp_cmx_send_member(struct dsp *dsp, int len, s32 *c, int members)
                 }
                 if (dsp->conf && dsp->conf->software && dsp->conf->hardware)
                         tx_data_only = 1;
-                if (dsp->conf->software && dsp->echo.hardware)
+                if (dsp->echo.software && dsp->echo.hardware)
                         tx_data_only = 1;
         }
 
@@ -1619,7 +1624,7 @@ send_packet:
 
 static u32      jittercount; /* counter for jitter check */
 struct timer_list dsp_spl_tl;
-u32     dsp_spl_jiffies; /* calculate the next time to fire */
+unsigned long   dsp_spl_jiffies; /* calculate the next time to fire */
 static u16      dsp_count; /* last sample count */
 static int      dsp_count_valid; /* if we have last sample count */
 
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c
index 2ac2d7a25a9f..28c99c623bcd 100644
--- a/drivers/isdn/mISDN/dsp_core.c
+++ b/drivers/isdn/mISDN/dsp_core.c
@@ -268,6 +268,7 @@ dsp_fill_empty(struct dsp *dsp)
         }
         cq.op = MISDN_CTRL_FILL_EMPTY;
         cq.p1 = 1;
+        cq.p2 = dsp_silence;
         if (dsp->ch.peer->ctrl(dsp->ch.peer, CONTROL_CHANNEL, &cq)) {
                 printk(KERN_DEBUG "%s: CONTROL_CHANNEL failed\n",
                        __func__);
diff --git a/drivers/isdn/mISDN/dsp_dtmf.c b/drivers/isdn/mISDN/dsp_dtmf.c
index 887860bdc63b..642f30be5ce2 100644
--- a/drivers/isdn/mISDN/dsp_dtmf.c
+++ b/drivers/isdn/mISDN/dsp_dtmf.c
@@ -222,16 +222,25 @@ coefficients:
                 goto storedigit;
         }
 
-        if (dsp_debug & DEBUG_DSP_DTMFCOEFF)
+        if (dsp_debug & DEBUG_DSP_DTMFCOEFF) {
+                s32 tresh_100 = tresh/100;
+
+                if (tresh_100 == 0) {
+                        tresh_100 = 1;
+                        printk(KERN_DEBUG
+                                "tresh(%d) too small set tresh/100 to 1\n",
+                                tresh);
+                }
                 printk(KERN_DEBUG "a %3d %3d %3d %3d %3d %3d %3d %3d"
                        " tr:%3d r %3d %3d %3d %3d %3d %3d %3d %3d\n",
                        result[0] / 10000, result[1] / 10000, result[2] / 10000,
                        result[3] / 10000, result[4] / 10000, result[5] / 10000,
                        result[6] / 10000, result[7] / 10000, tresh / 10000,
-                       result[0] / (tresh / 100), result[1] / (tresh / 100),
-                       result[2] / (tresh / 100), result[3] / (tresh / 100),
-                       result[4] / (tresh / 100), result[5] / (tresh / 100),
-                       result[6] / (tresh / 100), result[7] / (tresh / 100));
+                       result[0] / (tresh_100), result[1] / (tresh_100),
+                       result[2] / (tresh_100), result[3] / (tresh_100),
+                       result[4] / (tresh_100), result[5] / (tresh_100),
+                       result[6] / (tresh_100), result[7] / (tresh_100));
+        }
 
         /* calc digit (lowgroup/highgroup) */
         lowgroup = -1;
diff --git a/drivers/isdn/mISDN/hwchannel.c b/drivers/isdn/mISDN/hwchannel.c
index c74c363554c4..ef34fd40867c 100644
--- a/drivers/isdn/mISDN/hwchannel.c
+++ b/drivers/isdn/mISDN/hwchannel.c
@@ -81,10 +81,16 @@ mISDN_initdchannel(struct dchannel *ch, int maxlen, void *phf)
 EXPORT_SYMBOL(mISDN_initdchannel);
 
 int
-mISDN_initbchannel(struct bchannel *ch, int maxlen)
+mISDN_initbchannel(struct bchannel *ch, unsigned short maxlen,
+                   unsigned short minlen)
 {
         ch->Flags = 0;
+        ch->minlen = minlen;
+        ch->next_minlen = minlen;
+        ch->init_minlen = minlen;
         ch->maxlen = maxlen;
+        ch->next_maxlen = maxlen;
+        ch->init_maxlen = maxlen;
         ch->hw = NULL;
         ch->rx_skb = NULL;
         ch->tx_skb = NULL;
@@ -134,6 +140,14 @@ mISDN_clear_bchannel(struct bchannel *ch)
         test_and_clear_bit(FLG_TX_BUSY, &ch->Flags);
         test_and_clear_bit(FLG_TX_NEXT, &ch->Flags);
         test_and_clear_bit(FLG_ACTIVE, &ch->Flags);
+        test_and_clear_bit(FLG_FILLEMPTY, &ch->Flags);
+        test_and_clear_bit(FLG_TX_EMPTY, &ch->Flags);
+        test_and_clear_bit(FLG_RX_OFF, &ch->Flags);
+        ch->dropcnt = 0;
+        ch->minlen = ch->init_minlen;
+        ch->next_minlen = ch->init_minlen;
+        ch->maxlen = ch->init_maxlen;
+        ch->next_maxlen = ch->init_maxlen;
 }
 EXPORT_SYMBOL(mISDN_clear_bchannel);
 
@@ -148,6 +162,51 @@ mISDN_freebchannel(struct bchannel *ch)
 }
 EXPORT_SYMBOL(mISDN_freebchannel);
 
+int
+mISDN_ctrl_bchannel(struct bchannel *bch, struct mISDN_ctrl_req *cq)
+{
+        int ret = 0;
+
+        switch (cq->op) {
+        case MISDN_CTRL_GETOP:
+                cq->op = MISDN_CTRL_RX_BUFFER | MISDN_CTRL_FILL_EMPTY |
+                         MISDN_CTRL_RX_OFF;
+                break;
+        case MISDN_CTRL_FILL_EMPTY:
+                if (cq->p1) {
+                        memset(bch->fill, cq->p2 & 0xff, MISDN_BCH_FILL_SIZE);
+                        test_and_set_bit(FLG_FILLEMPTY, &bch->Flags);
+                } else {
+                        test_and_clear_bit(FLG_FILLEMPTY, &bch->Flags);
+                }
+                break;
+        case MISDN_CTRL_RX_OFF:
+                /* read back dropped byte count */
+                cq->p2 = bch->dropcnt;
+                if (cq->p1)
+                        test_and_set_bit(FLG_RX_OFF, &bch->Flags);
+                else
+                        test_and_clear_bit(FLG_RX_OFF, &bch->Flags);
+                bch->dropcnt = 0;
+                break;
+        case MISDN_CTRL_RX_BUFFER:
+                if (cq->p2 > MISDN_CTRL_RX_SIZE_IGNORE)
+                        bch->next_maxlen = cq->p2;
+                if (cq->p1 > MISDN_CTRL_RX_SIZE_IGNORE)
+                        bch->next_minlen = cq->p1;
+                /* we return the old values */
+                cq->p1 = bch->minlen;
+                cq->p2 = bch->maxlen;
+                break;
+        default:
+                pr_info("mISDN unhandled control %x operation\n", cq->op);
+                ret = -EINVAL;
+                break;
+        }
+        return ret;
+}
+EXPORT_SYMBOL(mISDN_ctrl_bchannel);
+
 static inline u_int
 get_sapi_tei(u_char *p)
 {
@@ -197,24 +256,37 @@ recv_Echannel(struct dchannel *ech, struct dchannel *dch)
 EXPORT_SYMBOL(recv_Echannel);
 
 void
-recv_Bchannel(struct bchannel *bch, unsigned int id)
+recv_Bchannel(struct bchannel *bch, unsigned int id, bool force)
 {
         struct mISDNhead *hh;
 
-        hh = mISDN_HEAD_P(bch->rx_skb);
-        hh->prim = PH_DATA_IND;
-        hh->id = id;
-        if (bch->rcount >= 64) {
-                printk(KERN_WARNING "B-channel %p receive queue overflow, "
-                       "flushing!\n", bch);
-                skb_queue_purge(&bch->rqueue);
-                bch->rcount = 0;
+        /* if allocation did fail upper functions still may call us */
+        if (unlikely(!bch->rx_skb))
                 return;
+        if (unlikely(!bch->rx_skb->len)) {
+                /* we have no data to send - this may happen after recovery
+                 * from overflow or too small allocation.
+                 * We need to free the buffer here */
+                dev_kfree_skb(bch->rx_skb);
+                bch->rx_skb = NULL;
+        } else {
+                if (test_bit(FLG_TRANSPARENT, &bch->Flags) &&
+                    (bch->rx_skb->len < bch->minlen) && !force)
+                                return;
+                hh = mISDN_HEAD_P(bch->rx_skb);
+                hh->prim = PH_DATA_IND;
+                hh->id = id;
+                if (bch->rcount >= 64) {
+                        printk(KERN_WARNING
+                               "B%d receive queue overflow - flushing!\n",
+                               bch->nr);
+                        skb_queue_purge(&bch->rqueue);
+                }
+                bch->rcount++;
+                skb_queue_tail(&bch->rqueue, bch->rx_skb);
+                bch->rx_skb = NULL;
+                schedule_event(bch, FLG_RECVQUEUE);
         }
-        bch->rcount++;
-        skb_queue_tail(&bch->rqueue, bch->rx_skb);
-        bch->rx_skb = NULL;
-        schedule_event(bch, FLG_RECVQUEUE);
 }
 EXPORT_SYMBOL(recv_Bchannel);
 
@@ -272,7 +344,7 @@ get_next_dframe(struct dchannel *dch)
 }
 EXPORT_SYMBOL(get_next_dframe);
 
-void
+static void
 confirm_Bsend(struct bchannel *bch)
 {
         struct sk_buff  *skb;
@@ -294,7 +366,6 @@ confirm_Bsend(struct bchannel *bch)
         skb_queue_tail(&bch->rqueue, skb);
         schedule_event(bch, FLG_RECVQUEUE);
 }
-EXPORT_SYMBOL(confirm_Bsend);
 
 int
 get_next_bframe(struct bchannel *bch)
@@ -305,8 +376,8 @@ get_next_bframe(struct bchannel *bch)
                 if (bch->tx_skb) {
                         bch->next_skb = NULL;
                         test_and_clear_bit(FLG_TX_NEXT, &bch->Flags);
-                        if (!test_bit(FLG_TRANSPARENT, &bch->Flags))
-                                confirm_Bsend(bch); /* not for transparent */
+                        /* confirm imediately to allow next data */
+                        confirm_Bsend(bch);
                         return 1;
                 } else {
                         test_and_clear_bit(FLG_TX_NEXT, &bch->Flags);
@@ -395,7 +466,62 @@ bchannel_senddata(struct bchannel *ch, struct sk_buff *skb)
                 /* write to fifo */
                 ch->tx_skb = skb;
                 ch->tx_idx = 0;
+                confirm_Bsend(ch);
                 return 1;
         }
 }
 EXPORT_SYMBOL(bchannel_senddata);
+
+/* The function allocates a new receive skb on demand with a size for the
+ * requirements of the current protocol. It returns the tailroom of the
+ * receive skb or an error.
+ */
+int
+bchannel_get_rxbuf(struct bchannel *bch, int reqlen)
+{
+        int len;
+
+        if (bch->rx_skb) {
+                len = skb_tailroom(bch->rx_skb);
+                if (len < reqlen) {
+                        pr_warning("B%d no space for %d (only %d) bytes\n",
+                                   bch->nr, reqlen, len);
+                        if (test_bit(FLG_TRANSPARENT, &bch->Flags)) {
+                                /* send what we have now and try a new buffer */
+                                recv_Bchannel(bch, 0, true);
+                        } else {
+                                /* on HDLC we have to drop too big frames */
+                                return -EMSGSIZE;
+                        }
+                } else {
+                        return len;
+                }
+        }
+        /* update current min/max length first */
+        if (unlikely(bch->maxlen != bch->next_maxlen))
+                bch->maxlen = bch->next_maxlen;
+        if (unlikely(bch->minlen != bch->next_minlen))
+                bch->minlen = bch->next_minlen;
+        if (unlikely(reqlen > bch->maxlen))
+                return -EMSGSIZE;
+        if (test_bit(FLG_TRANSPARENT, &bch->Flags)) {
+                if (reqlen >= bch->minlen) {
+                        len = reqlen;
+                } else {
+                        len = 2 * bch->minlen;
+                        if (len > bch->maxlen)
+                                len = bch->maxlen;
+                }
+        } else {
+                /* with HDLC we do not know the length yet */
+                len = bch->maxlen;
+        }
+        bch->rx_skb = mI_alloc_skb(len, GFP_ATOMIC);
+        if (!bch->rx_skb) {
+                pr_warning("B%d receive no memory for %d bytes\n",
+                           bch->nr, len);
+                len = -ENOMEM;
+        }
+        return len;
+}
+EXPORT_SYMBOL(bchannel_get_rxbuf);
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
index 0f88acf1185f..db50f788855d 100644
--- a/drivers/isdn/mISDN/l1oip_core.c
+++ b/drivers/isdn/mISDN/l1oip_core.c
@@ -1420,7 +1420,7 @@ init_card(struct l1oip *hc, int pri, int bundle)
                 bch->nr = i + ch;
                 bch->slot = i + ch;
                 bch->debug = debug;
-                mISDN_initbchannel(bch, MAX_DATA_MEM);
+                mISDN_initbchannel(bch, MAX_DATA_MEM, 0);
                 bch->hw = hc;
                 bch->ch.send = handle_bmsg;
                 bch->ch.ctrl = l1oip_bctrl;
diff --git a/drivers/isdn/mISDN/layer1.c b/drivers/isdn/mISDN/layer1.c
index 0fc49b375514..bebc57b72138 100644
--- a/drivers/isdn/mISDN/layer1.c
+++ b/drivers/isdn/mISDN/layer1.c
@@ -28,13 +28,15 @@ static u_int *debug;
 struct layer1 {
         u_long Flags;
         struct FsmInst l1m;
-        struct FsmTimer timer;
+        struct FsmTimer timer3;
+        struct FsmTimer timerX;
         int delay;
+        int t3_value;
         struct dchannel *dch;
         dchannel_l1callback *dcb;
 };
 
-#define TIMER3_VALUE 7000
+#define TIMER3_DEFAULT_VALUE    7000
 
 static
 struct Fsm l1fsm_s = {NULL, 0, 0, NULL, NULL};
@@ -134,7 +136,7 @@ l1_deact_req_s(struct FsmInst *fi, int event, void *arg)
         struct layer1 *l1 = fi->userdata;
 
         mISDN_FsmChangeState(fi, ST_L1_F3);
-        mISDN_FsmRestartTimer(&l1->timer, 550, EV_TIMER_DEACT, NULL, 2);
+        mISDN_FsmRestartTimer(&l1->timerX, 550, EV_TIMER_DEACT, NULL, 2);
         test_and_set_bit(FLG_L1_DEACTTIMER, &l1->Flags);
 }
 
@@ -179,11 +181,11 @@ l1_info4_ind(struct FsmInst *fi, int event, void *arg)
         mISDN_FsmChangeState(fi, ST_L1_F7);
         l1->dcb(l1->dch, INFO3_P8);
         if (test_and_clear_bit(FLG_L1_DEACTTIMER, &l1->Flags))
-                mISDN_FsmDelTimer(&l1->timer, 4);
+                mISDN_FsmDelTimer(&l1->timerX, 4);
         if (!test_bit(FLG_L1_ACTIVATED, &l1->Flags)) {
                 if (test_and_clear_bit(FLG_L1_T3RUN, &l1->Flags))
-                        mISDN_FsmDelTimer(&l1->timer, 3);
-                mISDN_FsmRestartTimer(&l1->timer, 110, EV_TIMER_ACT, NULL, 2);
+                        mISDN_FsmDelTimer(&l1->timer3, 3);
+                mISDN_FsmRestartTimer(&l1->timerX, 110, EV_TIMER_ACT, NULL, 2);
                 test_and_set_bit(FLG_L1_ACTTIMER, &l1->Flags);
         }
 }
@@ -201,7 +203,7 @@ l1_timer3(struct FsmInst *fi, int event, void *arg)
         }
         if (l1->l1m.state != ST_L1_F6) {
                 mISDN_FsmChangeState(fi, ST_L1_F3);
-                l1->dcb(l1->dch, HW_POWERUP_REQ);
+                /* do not force anything here, we need send INFO 0 */
         }
 }
 
@@ -233,8 +235,9 @@ l1_activate_s(struct FsmInst *fi, int event, void *arg)
 {
         struct layer1 *l1 = fi->userdata;
 
-        mISDN_FsmRestartTimer(&l1->timer, TIMER3_VALUE, EV_TIMER3, NULL, 2);
+        mISDN_FsmRestartTimer(&l1->timer3, l1->t3_value, EV_TIMER3, NULL, 2);
         test_and_set_bit(FLG_L1_T3RUN, &l1->Flags);
+        /* Tell HW to send INFO 1 */
         l1->dcb(l1->dch, HW_RESET_REQ);
 }
 
@@ -302,7 +305,8 @@ static struct FsmNode L1SFnList[] =
 
 static void
 release_l1(struct layer1 *l1) {
-        mISDN_FsmDelTimer(&l1->timer, 0);
+        mISDN_FsmDelTimer(&l1->timerX, 0);
+        mISDN_FsmDelTimer(&l1->timer3, 0);
         if (l1->dch)
                 l1->dch->l1 = NULL;
         module_put(THIS_MODULE);
@@ -356,6 +360,16 @@ l1_event(struct layer1 *l1, u_int event)
                 release_l1(l1);
                 break;
         default:
+                if ((event & ~HW_TIMER3_VMASK) == HW_TIMER3_VALUE) {
+                        int val = event & HW_TIMER3_VMASK;
+
+                        if (val < 5)
+                                val = 5;
+                        if (val > 30)
+                                val = 30;
+                        l1->t3_value = val;
+                        break;
+                }
                 if (*debug & DEBUG_L1)
                         printk(KERN_DEBUG "%s %x unhandled\n",
                                __func__, event);
@@ -377,13 +391,15 @@ create_l1(struct dchannel *dch, dchannel_l1callback *dcb) {
         nl1->l1m.fsm = &l1fsm_s;
         nl1->l1m.state = ST_L1_F3;
         nl1->Flags = 0;
+        nl1->t3_value = TIMER3_DEFAULT_VALUE;
         nl1->l1m.debug = *debug & DEBUG_L1_FSM;
         nl1->l1m.userdata = nl1;
         nl1->l1m.userint = 0;
         nl1->l1m.printdebug = l1m_debug;
         nl1->dch = dch;
         nl1->dcb = dcb;
-        mISDN_FsmInitTimer(&nl1->l1m, &nl1->timer);
+        mISDN_FsmInitTimer(&nl1->l1m, &nl1->timer3);
+        mISDN_FsmInitTimer(&nl1->l1m, &nl1->timerX);
         __module_get(THIS_MODULE);
         dch->l1 = nl1;
         return 0;
diff --git a/drivers/isdn/mISDN/layer2.c b/drivers/isdn/mISDN/layer2.c
index 39d7375fa551..0dc8abca1407 100644
--- a/drivers/isdn/mISDN/layer2.c
+++ b/drivers/isdn/mISDN/layer2.c
@@ -58,6 +58,8 @@ enum {
         EV_L1_DEACTIVATE,
         EV_L2_T200,
         EV_L2_T203,
+        EV_L2_T200I,
+        EV_L2_T203I,
         EV_L2_SET_OWN_BUSY,
         EV_L2_CLEAR_OWN_BUSY,
         EV_L2_FRAME_ERROR,
@@ -86,6 +88,8 @@ static char *strL2Event[] =
         "EV_L1_DEACTIVATE",
         "EV_L2_T200",
         "EV_L2_T203",
+        "EV_L2_T200I",
+        "EV_L2_T203I",
         "EV_L2_SET_OWN_BUSY",
         "EV_L2_CLEAR_OWN_BUSY",
         "EV_L2_FRAME_ERROR",
@@ -106,8 +110,8 @@ l2m_debug(struct FsmInst *fi, char *fmt, ...)
         vaf.fmt = fmt;
         vaf.va = &va;
 
-        printk(KERN_DEBUG "l2 (sapi %d tei %d): %pV\n",
-               l2->sapi, l2->tei, &vaf);
+        printk(KERN_DEBUG "%s l2 (sapi %d tei %d): %pV\n",
+               mISDNDevName4ch(&l2->ch), l2->sapi, l2->tei, &vaf);
 
         va_end(va);
 }
@@ -150,7 +154,8 @@ l2up(struct layer2 *l2, u_int prim, struct sk_buff *skb)
         mISDN_HEAD_ID(skb) = (l2->ch.nr << 16) | l2->ch.addr;
         err = l2->up->send(l2->up, skb);
         if (err) {
-                printk(KERN_WARNING "%s: err=%d\n", __func__, err);
+                printk(KERN_WARNING "%s: dev %s err=%d\n", __func__,
+                       mISDNDevName4ch(&l2->ch), err);
                 dev_kfree_skb(skb);
         }
 }
@@ -174,7 +179,8 @@ l2up_create(struct layer2 *l2, u_int prim, int len, void *arg)
                 memcpy(skb_put(skb, len), arg, len);
         err = l2->up->send(l2->up, skb);
         if (err) {
-                printk(KERN_WARNING "%s: err=%d\n", __func__, err);
+                printk(KERN_WARNING "%s: dev %s err=%d\n", __func__,
+                       mISDNDevName4ch(&l2->ch), err);
                 dev_kfree_skb(skb);
         }
 }
@@ -185,7 +191,8 @@ l2down_skb(struct layer2 *l2, struct sk_buff *skb) {
 
         ret = l2->ch.recv(l2->ch.peer, skb);
         if (ret && (*debug & DEBUG_L2_RECV))
-                printk(KERN_DEBUG "l2down_skb: ret(%d)\n", ret);
+                printk(KERN_DEBUG "l2down_skb: dev %s ret(%d)\n",
+                       mISDNDevName4ch(&l2->ch), ret);
         return ret;
 }
 
@@ -276,12 +283,37 @@ ph_data_confirm(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb) {
         return ret;
 }
 
+static void
+l2_timeout(struct FsmInst *fi, int event, void *arg)
+{
+        struct layer2 *l2 = fi->userdata;
+        struct sk_buff *skb;
+        struct mISDNhead *hh;
+
+        skb = mI_alloc_skb(0, GFP_ATOMIC);
+        if (!skb) {
+                printk(KERN_WARNING "%s: L2(%d,%d) nr:%x timer %s no skb\n",
+                       mISDNDevName4ch(&l2->ch), l2->sapi, l2->tei,
+                       l2->ch.nr, event == EV_L2_T200 ? "T200" : "T203");
+                return;
+        }
+        hh = mISDN_HEAD_P(skb);
+        hh->prim = event == EV_L2_T200 ? DL_TIMER200_IND : DL_TIMER203_IND;
+        hh->id = l2->ch.nr;
+        if (*debug & DEBUG_TIMER)
+                printk(KERN_DEBUG "%s: L2(%d,%d) nr:%x timer %s expired\n",
+                       mISDNDevName4ch(&l2->ch), l2->sapi, l2->tei,
+                       l2->ch.nr, event == EV_L2_T200 ? "T200" : "T203");
+        if (l2->ch.st)
+                l2->ch.st->own.recv(&l2->ch.st->own, skb);
+}
+
 static int
 l2mgr(struct layer2 *l2, u_int prim, void *arg) {
         long c = (long)arg;
 
-        printk(KERN_WARNING
-               "l2mgr: addr:%x prim %x %c\n", l2->id, prim, (char)c);
+        printk(KERN_WARNING "l2mgr: dev %s addr:%x prim %x %c\n",
+               mISDNDevName4ch(&l2->ch), l2->id, prim, (char)c);
         if (test_bit(FLG_LAPD, &l2->flag) &&
             !test_bit(FLG_FIXED_TEI, &l2->flag)) {
                 switch (c) {
@@ -603,8 +635,8 @@ send_uframe(struct layer2 *l2, struct sk_buff *skb, u_char cmd, u_char cr)
         else {
                 skb = mI_alloc_skb(i, GFP_ATOMIC);
                 if (!skb) {
-                        printk(KERN_WARNING "%s: can't alloc skbuff\n",
-                               __func__);
+                        printk(KERN_WARNING "%s: can't alloc skbuff in %s\n",
+                               mISDNDevName4ch(&l2->ch), __func__);
                         return;
                 }
         }
@@ -1089,8 +1121,8 @@ enquiry_cr(struct layer2 *l2, u_char typ, u_char cr, u_char pf)
                 tmp[i++] = (l2->vr << 5) | typ | (pf ? 0x10 : 0);
         skb = mI_alloc_skb(i, GFP_ATOMIC);
         if (!skb) {
-                printk(KERN_WARNING
-                       "isdnl2 can't alloc sbbuff for enquiry_cr\n");
+                printk(KERN_WARNING "%s: isdnl2 can't alloc sbbuff in %s\n",
+                       mISDNDevName4ch(&l2->ch), __func__);
                 return;
         }
         memcpy(skb_put(skb, i), tmp, i);
@@ -1150,7 +1182,7 @@ invoke_retransmission(struct layer2 *l2, unsigned int nr)
                         else
                                 printk(KERN_WARNING
                                        "%s: windowar[%d] is NULL\n",
-                                       __func__, p1);
+                                       mISDNDevName4ch(&l2->ch), p1);
                         l2->windowar[p1] = NULL;
                 }
                 mISDN_FsmEvent(&l2->l2m, EV_L2_ACK_PULL, NULL);
@@ -1461,8 +1493,8 @@ l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
                 p1 = (l2->vs - l2->va) % 8;
         p1 = (p1 + l2->sow) % l2->window;
         if (l2->windowar[p1]) {
-                printk(KERN_WARNING "isdnl2 try overwrite ack queue entry %d\n",
-                       p1);
+                printk(KERN_WARNING "%s: l2 try overwrite ack queue entry %d\n",
+                       mISDNDevName4ch(&l2->ch), p1);
                 dev_kfree_skb(l2->windowar[p1]);
         }
         l2->windowar[p1] = skb;
@@ -1482,12 +1514,14 @@ l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
                 memcpy(skb_push(nskb, i), header, i);
         else {
                 printk(KERN_WARNING
-                       "isdnl2 pull_iqueue skb header(%d/%d) too short\n", i, p1);
+                       "%s: L2 pull_iqueue skb header(%d/%d) too short\n",
+                       mISDNDevName4ch(&l2->ch), i, p1);
                 oskb = nskb;
                 nskb = mI_alloc_skb(oskb->len + i, GFP_ATOMIC);
                 if (!nskb) {
                         dev_kfree_skb(oskb);
-                        printk(KERN_WARNING "%s: no skb mem\n", __func__);
+                        printk(KERN_WARNING "%s: no skb mem in %s\n",
+                               mISDNDevName4ch(&l2->ch), __func__);
                         return;
                 }
                 memcpy(skb_put(nskb, i), header, i);
@@ -1814,11 +1848,16 @@ static struct FsmNode L2FnList[] =
         {ST_L2_8, EV_L2_SUPER, l2_st8_got_super},
         {ST_L2_7, EV_L2_I, l2_got_iframe},
         {ST_L2_8, EV_L2_I, l2_got_iframe},
-        {ST_L2_5, EV_L2_T200, l2_st5_tout_200},
-        {ST_L2_6, EV_L2_T200, l2_st6_tout_200},
-        {ST_L2_7, EV_L2_T200, l2_st7_tout_200},
-        {ST_L2_8, EV_L2_T200, l2_st8_tout_200},
-        {ST_L2_7, EV_L2_T203, l2_st7_tout_203},
+        {ST_L2_5, EV_L2_T200, l2_timeout},
+        {ST_L2_6, EV_L2_T200, l2_timeout},
+        {ST_L2_7, EV_L2_T200, l2_timeout},
+        {ST_L2_8, EV_L2_T200, l2_timeout},
+        {ST_L2_7, EV_L2_T203, l2_timeout},
+        {ST_L2_5, EV_L2_T200I, l2_st5_tout_200},
+        {ST_L2_6, EV_L2_T200I, l2_st6_tout_200},
+        {ST_L2_7, EV_L2_T200I, l2_st7_tout_200},
+        {ST_L2_8, EV_L2_T200I, l2_st8_tout_200},
+        {ST_L2_7, EV_L2_T203I, l2_st7_tout_203},
         {ST_L2_7, EV_L2_ACK_PULL, l2_pull_iqueue},
         {ST_L2_7, EV_L2_SET_OWN_BUSY, l2_set_own_busy},
         {ST_L2_8, EV_L2_SET_OWN_BUSY, l2_set_own_busy},
@@ -1858,7 +1897,8 @@ ph_data_indication(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb)
                 ptei = *datap++;
                 if ((psapi & 1) || !(ptei & 1)) {
                         printk(KERN_WARNING
-                               "l2 D-channel frame wrong EA0/EA1\n");
+                               "%s l2 D-channel frame wrong EA0/EA1\n",
+                               mISDNDevName4ch(&l2->ch));
                         return ret;
                 }
                 psapi >>= 2;
@@ -1867,7 +1907,8 @@ ph_data_indication(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb)
                         /* not our business */
                         if (*debug & DEBUG_L2)
                                 printk(KERN_DEBUG "%s: sapi %d/%d mismatch\n",
-                                       __func__, psapi, l2->sapi);
+                                       mISDNDevName4ch(&l2->ch), psapi,
+                                       l2->sapi);
                         dev_kfree_skb(skb);
                         return 0;
                 }
@@ -1875,7 +1916,7 @@ ph_data_indication(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb)
                         /* not our business */
                         if (*debug & DEBUG_L2)
                                 printk(KERN_DEBUG "%s: tei %d/%d mismatch\n",
-                                       __func__, ptei, l2->tei);
+                                       mISDNDevName4ch(&l2->ch), ptei, l2->tei);
                         dev_kfree_skb(skb);
                         return 0;
                 }
@@ -1916,7 +1957,8 @@ ph_data_indication(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb)
         } else
                 c = 'L';
         if (c) {
-                printk(KERN_WARNING "l2 D-channel frame error %c\n", c);
+                printk(KERN_WARNING "%s:l2 D-channel frame error %c\n",
+                       mISDNDevName4ch(&l2->ch), c);
                 mISDN_FsmEvent(&l2->l2m, EV_L2_FRAME_ERROR, (void *)(long)c);
         }
         return ret;
@@ -1930,8 +1972,17 @@ l2_send(struct mISDNchannel *ch, struct sk_buff *skb)
         int                     ret = -EINVAL;
 
         if (*debug & DEBUG_L2_RECV)
-                printk(KERN_DEBUG "%s: prim(%x) id(%x) sapi(%d) tei(%d)\n",
-                       __func__, hh->prim, hh->id, l2->sapi, l2->tei);
+                printk(KERN_DEBUG "%s: %s prim(%x) id(%x) sapi(%d) tei(%d)\n",
+                       __func__, mISDNDevName4ch(&l2->ch), hh->prim, hh->id,
+                       l2->sapi, l2->tei);
+        if (hh->prim == DL_INTERN_MSG) {
+                struct mISDNhead *chh = hh + 1; /* saved copy */
+
+                *hh = *chh;
+                if (*debug & DEBUG_L2_RECV)
+                        printk(KERN_DEBUG "%s: prim(%x) id(%x) internal msg\n",
+                                mISDNDevName4ch(&l2->ch), hh->prim, hh->id);
+        }
         switch (hh->prim) {
         case PH_DATA_IND:
                 ret = ph_data_indication(l2, hh, skb);
@@ -1987,6 +2038,12 @@ l2_send(struct mISDNchannel *ch, struct sk_buff *skb)
                 ret = mISDN_FsmEvent(&l2->l2m, EV_L2_DL_RELEASE_REQ,
                                      skb);
                 break;
+        case DL_TIMER200_IND:
+                mISDN_FsmEvent(&l2->l2m, EV_L2_T200I, NULL);
+                break;
+        case DL_TIMER203_IND:
+                mISDN_FsmEvent(&l2->l2m, EV_L2_T203I, NULL);
+                break;
         default:
                 if (*debug & DEBUG_L2)
                         l2m_debug(&l2->l2m, "l2 unknown pr %04x",
@@ -2005,7 +2062,8 @@ tei_l2(struct layer2 *l2, u_int cmd, u_long arg)
         int             ret = -EINVAL;
 
         if (*debug & DEBUG_L2_TEI)
-                printk(KERN_DEBUG "%s: cmd(%x)\n", __func__, cmd);
+                printk(KERN_DEBUG "%s: cmd(%x) in %s\n",
+                       mISDNDevName4ch(&l2->ch), cmd, __func__);
         switch (cmd) {
         case (MDL_ASSIGN_REQ):
                 ret = mISDN_FsmEvent(&l2->l2m, EV_L2_MDL_ASSIGN, (void *)arg);
@@ -2018,7 +2076,8 @@ tei_l2(struct layer2 *l2, u_int cmd, u_long arg)
                 break;
         case (MDL_ERROR_RSP):
                 /* ETS 300-125 5.3.2.1 Test: TC13010 */
-                printk(KERN_NOTICE "MDL_ERROR|REQ (tei_l2)\n");
+                printk(KERN_NOTICE "%s: MDL_ERROR|REQ (tei_l2)\n",
+                       mISDNDevName4ch(&l2->ch));
                 ret = mISDN_FsmEvent(&l2->l2m, EV_L2_MDL_ERROR, NULL);
                 break;
         }
@@ -2050,7 +2109,8 @@ l2_ctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
         u_int                   info;
 
         if (*debug & DEBUG_L2_CTRL)
-                printk(KERN_DEBUG "%s:(%x)\n", __func__, cmd);
+                printk(KERN_DEBUG "%s: %s cmd(%x)\n",
+                       mISDNDevName4ch(ch), __func__, cmd);
 
         switch (cmd) {
         case OPEN_CHANNEL:
diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c
index ba2bc0c776e2..be88728f1106 100644
--- a/drivers/isdn/mISDN/tei.c
+++ b/drivers/isdn/mISDN/tei.c
@@ -790,18 +790,23 @@ tei_ph_data_ind(struct teimgr *tm, u_int mt, u_char *dp, int len)
 static struct layer2 *
 create_new_tei(struct manager *mgr, int tei, int sapi)
 {
-        u_long          opt = 0;
-        u_long          flags;
-        int             id;
-        struct layer2   *l2;
+        unsigned long           opt = 0;
+        unsigned long           flags;
+        int                     id;
+        struct layer2           *l2;
+        struct channel_req      rq;
 
         if (!mgr->up)
                 return NULL;
         if ((tei >= 0) && (tei < 64))
                 test_and_set_bit(OPTION_L2_FIXEDTEI, &opt);
-        if (mgr->ch.st->dev->Dprotocols
-            & ((1 << ISDN_P_TE_E1) | (1 << ISDN_P_NT_E1)))
+        if (mgr->ch.st->dev->Dprotocols & ((1 << ISDN_P_TE_E1) |
+            (1 << ISDN_P_NT_E1))) {
                 test_and_set_bit(OPTION_L2_PMX, &opt);
+                rq.protocol = ISDN_P_NT_E1;
+        } else {
+                rq.protocol = ISDN_P_NT_S0;
+        }
         l2 = create_l2(mgr->up, ISDN_P_LAPD_NT, opt, tei, sapi);
         if (!l2) {
                 printk(KERN_WARNING "%s:no memory for layer2\n", __func__);
@@ -836,6 +841,14 @@ create_new_tei(struct manager *mgr, int tei, int sapi)
                 l2->ch.recv = mgr->ch.recv;
                 l2->ch.peer = mgr->ch.peer;
                 l2->ch.ctrl(&l2->ch, OPEN_CHANNEL, NULL);
+                /* We need open here L1 for the manager as well (refcounting) */
+                rq.adr.dev = mgr->ch.st->dev->id;
+                id = mgr->ch.st->own.ctrl(&mgr->ch.st->own, OPEN_CHANNEL, &rq);
+                if (id < 0) {
+                        printk(KERN_WARNING "%s: cannot open L1\n", __func__);
+                        l2->ch.ctrl(&l2->ch, CLOSE_CHANNEL, NULL);
+                        l2 = NULL;
+                }
         }
         return l2;
 }
@@ -978,10 +991,11 @@ TEIrelease(struct layer2 *l2)
 static int
 create_teimgr(struct manager *mgr, struct channel_req *crq)
 {
-        struct layer2   *l2;
-        u_long          opt = 0;
-        u_long          flags;
-        int             id;
+        struct layer2           *l2;
+        unsigned long           opt = 0;
+        unsigned long           flags;
+        int                     id;
+        struct channel_req      l1rq;
 
         if (*debug & DEBUG_L2_TEI)
                 printk(KERN_DEBUG "%s: %s proto(%x) adr(%d %d %d %d)\n",
@@ -1016,6 +1030,7 @@ create_teimgr(struct manager *mgr, struct channel_req *crq)
                 if (crq->protocol == ISDN_P_LAPD_TE)
                         test_and_set_bit(MGR_OPT_USER, &mgr->options);
         }
+        l1rq.adr = crq->adr;
         if (mgr->ch.st->dev->Dprotocols
             & ((1 << ISDN_P_TE_E1) | (1 << ISDN_P_NT_E1)))
                 test_and_set_bit(OPTION_L2_PMX, &opt);
@@ -1023,6 +1038,8 @@ create_teimgr(struct manager *mgr, struct channel_req *crq)
                 mgr->up = crq->ch;
                 id = DL_INFO_L2_CONNECT;
                 teiup_create(mgr, DL_INFORMATION_IND, sizeof(id), &id);
+                if (test_bit(MGR_PH_ACTIVE, &mgr->options))
+                        teiup_create(mgr, PH_ACTIVATE_IND, 0, NULL);
                 crq->ch = NULL;
                 if (!list_empty(&mgr->layer2)) {
                         read_lock_irqsave(&mgr->lock, flags);
@@ -1053,24 +1070,34 @@ create_teimgr(struct manager *mgr, struct channel_req *crq)
                 l2->tm->tei_m.fsm = &teifsmu;
                 l2->tm->tei_m.state = ST_TEI_NOP;
                 l2->tm->tval = 1000; /* T201  1 sec */
+                if (test_bit(OPTION_L2_PMX, &opt))
+                        l1rq.protocol = ISDN_P_TE_E1;
+                else
+                        l1rq.protocol = ISDN_P_TE_S0;
         } else {
                 l2->tm->tei_m.fsm = &teifsmn;
                 l2->tm->tei_m.state = ST_TEI_NOP;
                 l2->tm->tval = 2000; /* T202  2 sec */
+                if (test_bit(OPTION_L2_PMX, &opt))
+                        l1rq.protocol = ISDN_P_NT_E1;
+                else
+                        l1rq.protocol = ISDN_P_NT_S0;
         }
         mISDN_FsmInitTimer(&l2->tm->tei_m, &l2->tm->timer);
         write_lock_irqsave(&mgr->lock, flags);
         id = get_free_id(mgr);
         list_add_tail(&l2->list, &mgr->layer2);
         write_unlock_irqrestore(&mgr->lock, flags);
-        if (id < 0) {
-                l2->ch.ctrl(&l2->ch, CLOSE_CHANNEL, NULL);
-        } else {
+        if (id >= 0) {
                 l2->ch.nr = id;
                 l2->up->nr = id;
                 crq->ch = &l2->ch;
-                id = 0;
+                /* We need open here L1 for the manager as well (refcounting) */
+                id = mgr->ch.st->own.ctrl(&mgr->ch.st->own, OPEN_CHANNEL,
+                                          &l1rq);
         }
+        if (id < 0)
+                l2->ch.ctrl(&l2->ch, CLOSE_CHANNEL, NULL);
         return id;
 }
 
@@ -1096,12 +1123,16 @@ mgr_send(struct mISDNchannel *ch, struct sk_buff *skb)
                 break;
         case PH_ACTIVATE_IND:
                 test_and_set_bit(MGR_PH_ACTIVE, &mgr->options);
+                if (mgr->up)
+                        teiup_create(mgr, PH_ACTIVATE_IND, 0, NULL);
                 mISDN_FsmEvent(&mgr->deact, EV_ACTIVATE_IND, NULL);
                 do_send(mgr);
                 ret = 0;
                 break;
         case PH_DEACTIVATE_IND:
                 test_and_clear_bit(MGR_PH_ACTIVE, &mgr->options);
+                if (mgr->up)
+                        teiup_create(mgr, PH_DEACTIVATE_IND, 0, NULL);
                 mISDN_FsmEvent(&mgr->deact, EV_DEACTIVATE_IND, NULL);
                 ret = 0;
                 break;
@@ -1263,7 +1294,7 @@ static int
 mgr_bcast(struct mISDNchannel *ch, struct sk_buff *skb)
 {
         struct manager          *mgr = container_of(ch, struct manager, bcast);
-        struct mISDNhead        *hh = mISDN_HEAD_P(skb);
+        struct mISDNhead        *hhc, *hh = mISDN_HEAD_P(skb);
         struct sk_buff          *cskb = NULL;
         struct layer2           *l2;
         u_long                  flags;
@@ -1278,10 +1309,17 @@ mgr_bcast(struct mISDNchannel *ch, struct sk_buff *skb)
                                 skb = NULL;
                         } else {
                                 if (!cskb)
-                                        cskb = skb_copy(skb, GFP_KERNEL);
+                                        cskb = skb_copy(skb, GFP_ATOMIC);
                         }
                         if (cskb) {
-                                ret = l2->ch.send(&l2->ch, cskb);
+                                hhc = mISDN_HEAD_P(cskb);
+                                /* save original header behind normal header */
+                                hhc++;
+                                *hhc = *hh;
+                                hhc--;
+                                hhc->prim = DL_INTERN_MSG;
+                                hhc->id = l2->ch.nr;
+                                ret = ch->st->own.recv(&ch->st->own, cskb);
                                 if (ret) {
                                         if (*debug & DEBUG_SEND_ERR)
                                                 printk(KERN_DEBUG
diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c
index d8433f2d53bc..73973fdbd8be 100644
--- a/drivers/leds/leds-netxbig.c
+++ b/drivers/leds/leds-netxbig.c
@@ -112,7 +112,7 @@ err_free_addr:
         return err;
 }
 
-static void __devexit gpio_ext_free(struct netxbig_gpio_ext *gpio_ext)
+static void gpio_ext_free(struct netxbig_gpio_ext *gpio_ext)
 {
         int i;
 
@@ -294,7 +294,7 @@ static ssize_t netxbig_led_sata_show(struct device *dev,
 
 static DEVICE_ATTR(sata, 0644, netxbig_led_sata_show, netxbig_led_sata_store);
 
-static void __devexit delete_netxbig_led(struct netxbig_led_data *led_dat)
+static void delete_netxbig_led(struct netxbig_led_data *led_dat)
 {
         if (led_dat->mode_val[NETXBIG_LED_SATA] != NETXBIG_LED_INVALID_MODE)
                 device_remove_file(led_dat->cdev.dev, &dev_attr_sata);
diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
index 2f0a14421a73..01cf89ec6944 100644
--- a/drivers/leds/leds-ns2.c
+++ b/drivers/leds/leds-ns2.c
@@ -255,7 +255,7 @@ err_free_cmd:
         return ret;
 }
 
-static void __devexit delete_ns2_led(struct ns2_led_data *led_dat)
+static void delete_ns2_led(struct ns2_led_data *led_dat)
 {
         device_remove_file(led_dat->cdev.dev, &dev_attr_sata);
         led_classdev_unregister(&led_dat->cdev);
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 97e73e555d11..17e2b472e16d 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -1727,8 +1727,7 @@ int bitmap_create(struct mddev *mddev)
         bitmap->chunkshift = (ffz(~mddev->bitmap_info.chunksize)
                               - BITMAP_BLOCK_SHIFT);
 
-        /* now that chunksize and chunkshift are set, we can use these macros */
-        chunks = (blocks + bitmap->chunkshift - 1) >>
+        chunks = (blocks + (1 << bitmap->chunkshift) - 1) >>
                         bitmap->chunkshift;
         pages = (chunks + PAGE_COUNTER_RATIO - 1) / PAGE_COUNTER_RATIO;
 
diff --git a/drivers/md/bitmap.h b/drivers/md/bitmap.h
index 55ca5aec84e4..b44b0aba2d47 100644
--- a/drivers/md/bitmap.h
+++ b/drivers/md/bitmap.h
@@ -101,9 +101,6 @@ typedef __u16 bitmap_counter_t;
 
 #define BITMAP_BLOCK_SHIFT 9
 
-/* how many blocks per chunk? (this is variable) */
-#define CHUNK_BLOCK_RATIO(bitmap) ((bitmap)->mddev->bitmap_info.chunksize >> BITMAP_BLOCK_SHIFT)
-
 #endif
 
 /*
diff --git a/drivers/md/dm-log-userspace-transfer.c b/drivers/md/dm-log-userspace-transfer.c
index 1f23e048f077..08d9a207259a 100644
--- a/drivers/md/dm-log-userspace-transfer.c
+++ b/drivers/md/dm-log-userspace-transfer.c
@@ -134,7 +134,7 @@ static void cn_ulog_callback(struct cn_msg *msg, struct netlink_skb_parms *nsp)
 {
         struct dm_ulog_request *tfr = (struct dm_ulog_request *)(msg + 1);
 
-        if (!cap_raised(current_cap(), CAP_SYS_ADMIN))
+        if (!capable(CAP_SYS_ADMIN))
                 return;
 
         spin_lock(&receiving_list_lock);
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 922a3385eead..754f38f8a692 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -718,8 +718,8 @@ static int parse_hw_handler(struct dm_arg_set *as, struct multipath *m)
                 return 0;
 
         m->hw_handler_name = kstrdup(dm_shift_arg(as), GFP_KERNEL);
-        request_module("scsi_dh_%s", m->hw_handler_name);
-        if (scsi_dh_handler_exist(m->hw_handler_name) == 0) {
+        if (!try_then_request_module(scsi_dh_handler_exist(m->hw_handler_name),
+                                     "scsi_dh_%s", m->hw_handler_name)) {
                 ti->error = "unknown hardware handler type";
                 ret = -EINVAL;
                 goto fail;
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index b0ba52459ed7..68965e663248 100644
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -859,7 +859,7 @@ static int analyse_superblocks(struct dm_target *ti, struct raid_set *rs)
         int ret;
         unsigned redundancy = 0;
         struct raid_dev *dev;
-        struct md_rdev *rdev, *freshest;
+        struct md_rdev *rdev, *tmp, *freshest;
         struct mddev *mddev = &rs->md;
 
         switch (rs->raid_type->level) {
@@ -877,7 +877,7 @@ static int analyse_superblocks(struct dm_target *ti, struct raid_set *rs)
         }
 
         freshest = NULL;
-        rdev_for_each(rdev, mddev) {
+        rdev_for_each_safe(rdev, tmp, mddev) {
                 if (!rdev->meta_bdev)
                         continue;
 
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
index 213ae32a0fc4..eb3d138ff55a 100644
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@ -279,8 +279,10 @@ static void __cell_release(struct cell *cell, struct bio_list *inmates)
 
         hlist_del(&cell->list);
 
-        bio_list_add(inmates, cell->holder);
-        bio_list_merge(inmates, &cell->bios);
+        if (inmates) {
+                bio_list_add(inmates, cell->holder);
+                bio_list_merge(inmates, &cell->bios);
+        }
 
         mempool_free(cell, prison->cell_pool);
 }
@@ -303,9 +305,10 @@ static void cell_release(struct cell *cell, struct bio_list *bios)
  */
 static void __cell_release_singleton(struct cell *cell, struct bio *bio)
 {
-        hlist_del(&cell->list);
         BUG_ON(cell->holder != bio);
         BUG_ON(!bio_list_empty(&cell->bios));
+
+        __cell_release(cell, NULL);
 }
 
 static void cell_release_singleton(struct cell *cell, struct bio *bio)
@@ -1177,6 +1180,7 @@ static void no_space(struct cell *cell)
 static void process_discard(struct thin_c *tc, struct bio *bio)
 {
         int r;
+        unsigned long flags;
         struct pool *pool = tc->pool;
         struct cell *cell, *cell2;
         struct cell_key key, key2;
@@ -1218,7 +1222,9 @@ static void process_discard(struct thin_c *tc, struct bio *bio)
                         m->bio = bio;
 
                         if (!ds_add_work(&pool->all_io_ds, &m->list)) {
+                                spin_lock_irqsave(&pool->lock, flags);
                                 list_add(&m->list, &pool->prepared_discards);
+                                spin_unlock_irqrestore(&pool->lock, flags);
                                 wake_worker(pool);
                         }
                 } else {
@@ -1626,6 +1632,21 @@ static int bind_control_target(struct pool *pool, struct dm_target *ti)
         pool->low_water_blocks = pt->low_water_blocks;
         pool->pf = pt->pf;
 
+        /*
+         * If discard_passdown was enabled verify that the data device
+         * supports discards.  Disable discard_passdown if not; otherwise
+         * -EOPNOTSUPP will be returned.
+         */
+        if (pt->pf.discard_passdown) {
+                struct request_queue *q = bdev_get_queue(pt->data_dev->bdev);
+                if (!q || !blk_queue_discard(q)) {
+                        char buf[BDEVNAME_SIZE];
+                        DMWARN("Discard unsupported by data device (%s): Disabling discard passdown.",
+                               bdevname(pt->data_dev->bdev, buf));
+                        pool->pf.discard_passdown = 0;
+                }
+        }
+
         return 0;
 }
 
@@ -1982,19 +2003,6 @@ static int pool_ctr(struct dm_target *ti, unsigned argc, char **argv)
                 goto out_flags_changed;
         }
 
-        /*
-         * If discard_passdown was enabled verify that the data device
-         * supports discards.  Disable discard_passdown if not; otherwise
-         * -EOPNOTSUPP will be returned.
-         */
-        if (pf.discard_passdown) {
-                struct request_queue *q = bdev_get_queue(data_dev->bdev);
-                if (!q || !blk_queue_discard(q)) {
-                        DMWARN("Discard unsupported by data device: Disabling discard passdown.");
-                        pf.discard_passdown = 0;
-                }
-        }
-
         pt->pool = pool;
         pt->ti = ti;
         pt->metadata_dev = metadata_dev;
@@ -2379,7 +2387,7 @@ static int pool_status(struct dm_target *ti, status_type_t type,
                        (unsigned long long)pt->low_water_blocks);
 
                 count = !pool->pf.zero_new_blocks + !pool->pf.discard_enabled +
-                        !pool->pf.discard_passdown;
+                        !pt->pf.discard_passdown;
                 DMEMIT("%u ", count);
 
                 if (!pool->pf.zero_new_blocks)
@@ -2388,7 +2396,7 @@ static int pool_status(struct dm_target *ti, status_type_t type,
                 if (!pool->pf.discard_enabled)
                         DMEMIT("ignore_discard ");
 
-                if (!pool->pf.discard_passdown)
+                if (!pt->pf.discard_passdown)
                         DMEMIT("no_discard_passdown ");
 
                 break;
@@ -2626,8 +2634,10 @@ static int thin_endio(struct dm_target *ti,
         if (h->all_io_entry) {
                 INIT_LIST_HEAD(&work);
                 ds_dec(h->all_io_entry, &work);
+                spin_lock_irqsave(&pool->lock, flags);
                 list_for_each_entry_safe(m, tmp, &work, list)
                         list_add(&m->list, &pool->prepared_discards);
+                spin_unlock_irqrestore(&pool->lock, flags);
         }
 
         mempool_free(h, pool->endio_hook_pool);
@@ -2759,6 +2769,6 @@ static void dm_thin_exit(void)
 module_init(dm_thin_init);
 module_exit(dm_thin_exit);
 
-MODULE_DESCRIPTION(DM_NAME "device-mapper thin provisioning target");
+MODULE_DESCRIPTION(DM_NAME " thin provisioning target");
 MODULE_AUTHOR("Joe Thornber <dm-devel@redhat.com>");
 MODULE_LICENSE("GPL");
diff --git a/drivers/md/md.c b/drivers/md/md.c
index b572e1e386ce..01233d855eb2 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -391,6 +391,8 @@ void mddev_suspend(struct mddev *mddev)
         synchronize_rcu();
         wait_event(mddev->sb_wait, atomic_read(&mddev->active_io) == 0);
         mddev->pers->quiesce(mddev, 1);
+
+        del_timer_sync(&mddev->safemode_timer);
 }
 EXPORT_SYMBOL_GPL(mddev_suspend);
 
@@ -7560,14 +7562,14 @@ void md_check_recovery(struct mddev *mddev)
                  * any transients in the value of "sync_action".
                  */
                 set_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
-                clear_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
                 /* Clear some bits that don't mean anything, but
                  * might be left set
                  */
                 clear_bit(MD_RECOVERY_INTR, &mddev->recovery);
                 clear_bit(MD_RECOVERY_DONE, &mddev->recovery);
 
-                if (test_bit(MD_RECOVERY_FROZEN, &mddev->recovery))
+                if (!test_and_clear_bit(MD_RECOVERY_NEEDED, &mddev->recovery) ||
+                    test_bit(MD_RECOVERY_FROZEN, &mddev->recovery))
                         goto unlock;
                 /* no recovery is running.
                  * remove any failed drives, then
@@ -8140,7 +8142,8 @@ static int md_notify_reboot(struct notifier_block *this,
 
         for_each_mddev(mddev, tmp) {
                 if (mddev_trylock(mddev)) {
-                        __md_stop_writes(mddev);
+                        if (mddev->pers)
+                                __md_stop_writes(mddev);
                         mddev->safemode = 2;
                         mddev_unlock(mddev);
                 }
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index c8dbb84d5357..3f91c2e1dfe7 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3164,12 +3164,40 @@ raid10_size(struct mddev *mddev, sector_t sectors, int raid_disks)
         return size << conf->chunk_shift;
 }
 
+static void calc_sectors(struct r10conf *conf, sector_t size)
+{
+        /* Calculate the number of sectors-per-device that will
+         * actually be used, and set conf->dev_sectors and
+         * conf->stride
+         */
+
+        size = size >> conf->chunk_shift;
+        sector_div(size, conf->far_copies);
+        size = size * conf->raid_disks;
+        sector_div(size, conf->near_copies);
+        /* 'size' is now the number of chunks in the array */
+        /* calculate "used chunks per device" */
+        size = size * conf->copies;
+
+        /* We need to round up when dividing by raid_disks to
+         * get the stride size.
+         */
+        size = DIV_ROUND_UP_SECTOR_T(size, conf->raid_disks);
+
+        conf->dev_sectors = size << conf->chunk_shift;
+
+        if (conf->far_offset)
+                conf->stride = 1 << conf->chunk_shift;
+        else {
+                sector_div(size, conf->far_copies);
+                conf->stride = size << conf->chunk_shift;
+        }
+}
 
 static struct r10conf *setup_conf(struct mddev *mddev)
 {
         struct r10conf *conf = NULL;
         int nc, fc, fo;
-        sector_t stride, size;
         int err = -EINVAL;
 
         if (mddev->new_chunk_sectors < (PAGE_SIZE >> 9) ||
@@ -3219,28 +3247,7 @@ static struct r10conf *setup_conf(struct mddev *mddev)
         if (!conf->r10bio_pool)
                 goto out;
 
-        size = mddev->dev_sectors >> conf->chunk_shift;
-        sector_div(size, fc);
-        size = size * conf->raid_disks;
-        sector_div(size, nc);
-        /* 'size' is now the number of chunks in the array */
-        /* calculate "used chunks per device" in 'stride' */
-        stride = size * conf->copies;
-
-        /* We need to round up when dividing by raid_disks to
-         * get the stride size.
-         */
-        stride += conf->raid_disks - 1;
-        sector_div(stride, conf->raid_disks);
-
-        conf->dev_sectors = stride << conf->chunk_shift;
-
-        if (fo)
-                stride = 1;
-        else
-                sector_div(stride, fc);
-        conf->stride = stride << conf->chunk_shift;
-
+        calc_sectors(conf, mddev->dev_sectors);
 
         spin_lock_init(&conf->device_lock);
         INIT_LIST_HEAD(&conf->retry_list);
@@ -3468,7 +3475,8 @@ static int raid10_resize(struct mddev *mddev, sector_t sectors)
                 mddev->recovery_cp = oldsize;
                 set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
         }
-        mddev->dev_sectors = sectors;
+        calc_sectors(conf, sectors);
+        mddev->dev_sectors = conf->dev_sectors;
         mddev->resync_max_sectors = size;
         return 0;
 }
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 0f64d7182657..cb888d835a89 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1921,6 +1921,10 @@ static int dtv_set_frontend(struct dvb_frontend *fe)
         } else {
                 /* default values */
                 switch (c->delivery_system) {
+                case SYS_DVBS:
+                case SYS_DVBS2:
+                case SYS_ISDBS:
+                case SYS_TURBO:
                 case SYS_DVBC_ANNEX_A:
                 case SYS_DVBC_ANNEX_C:
                         fepriv->min_delay = HZ / 20;
diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c
index 860c112e0fd2..bef5296173c9 100644
--- a/drivers/media/rc/ene_ir.c
+++ b/drivers/media/rc/ene_ir.c
@@ -1018,22 +1018,6 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
 
         spin_lock_init(&dev->hw_lock);
 
-        /* claim the resources */
-        error = -EBUSY;
-        dev->hw_io = pnp_port_start(pnp_dev, 0);
-        if (!request_region(dev->hw_io, ENE_IO_SIZE, ENE_DRIVER_NAME)) {
-                dev->hw_io = -1;
-                dev->irq = -1;
-                goto error;
-        }
-
-        dev->irq = pnp_irq(pnp_dev, 0);
-        if (request_irq(dev->irq, ene_isr,
-                        IRQF_SHARED, ENE_DRIVER_NAME, (void *)dev)) {
-                dev->irq = -1;
-                goto error;
-        }
-
         pnp_set_drvdata(pnp_dev, dev);
         dev->pnp_dev = pnp_dev;
 
@@ -1086,6 +1070,22 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
         device_set_wakeup_capable(&pnp_dev->dev, true);
         device_set_wakeup_enable(&pnp_dev->dev, true);
 
+        /* claim the resources */
+        error = -EBUSY;
+        dev->hw_io = pnp_port_start(pnp_dev, 0);
+        if (!request_region(dev->hw_io, ENE_IO_SIZE, ENE_DRIVER_NAME)) {
+                dev->hw_io = -1;
+                dev->irq = -1;
+                goto error;
+        }
+
+        dev->irq = pnp_irq(pnp_dev, 0);
+        if (request_irq(dev->irq, ene_isr,
+                        IRQF_SHARED, ENE_DRIVER_NAME, (void *)dev)) {
+                dev->irq = -1;
+                goto error;
+        }
+
         error = rc_register_device(rdev);
         if (error < 0)
                 goto error;
diff --git a/drivers/media/rc/fintek-cir.c b/drivers/media/rc/fintek-cir.c
index 392d4be91f8f..4a3a238bcfbc 100644
--- a/drivers/media/rc/fintek-cir.c
+++ b/drivers/media/rc/fintek-cir.c
@@ -197,7 +197,7 @@ static int fintek_hw_detect(struct fintek_dev *fintek)
         /*
          * Newer reviews of this chipset uses port 8 instead of 5
          */
-        if ((chip != 0x0408) || (chip != 0x0804))
+        if ((chip != 0x0408) && (chip != 0x0804))
                 fintek->logical_dev_cir = LOGICAL_DEV_CIR_REV2;
         else
                 fintek->logical_dev_cir = LOGICAL_DEV_CIR_REV1;
@@ -514,16 +514,6 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id
 
         spin_lock_init(&fintek->fintek_lock);
 
-        ret = -EBUSY;
-        /* now claim resources */
-        if (!request_region(fintek->cir_addr,
-                            fintek->cir_port_len, FINTEK_DRIVER_NAME))
-                goto failure;
-
-        if (request_irq(fintek->cir_irq, fintek_cir_isr, IRQF_SHARED,
-                        FINTEK_DRIVER_NAME, (void *)fintek))
-                goto failure;
-
         pnp_set_drvdata(pdev, fintek);
         fintek->pdev = pdev;
 
@@ -558,6 +548,16 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id
         /* rx resolution is hardwired to 50us atm, 1, 25, 100 also possible */
         rdev->rx_resolution = US_TO_NS(CIR_SAMPLE_PERIOD);
 
+        ret = -EBUSY;
+        /* now claim resources */
+        if (!request_region(fintek->cir_addr,
+                            fintek->cir_port_len, FINTEK_DRIVER_NAME))
+                goto failure;
+
+        if (request_irq(fintek->cir_irq, fintek_cir_isr, IRQF_SHARED,
+                        FINTEK_DRIVER_NAME, (void *)fintek))
+                goto failure;
+
         ret = rc_register_device(rdev);
         if (ret)
                 goto failure;
diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
index 682009d76cdf..0e49c99abf68 100644
--- a/drivers/media/rc/ite-cir.c
+++ b/drivers/media/rc/ite-cir.c
@@ -1515,16 +1515,6 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
         /* initialize raw event */
         init_ir_raw_event(&itdev->rawir);
 
-        ret = -EBUSY;
-        /* now claim resources */
-        if (!request_region(itdev->cir_addr,
-                                dev_desc->io_region_size, ITE_DRIVER_NAME))
-                goto failure;
-
-        if (request_irq(itdev->cir_irq, ite_cir_isr, IRQF_SHARED,
-                        ITE_DRIVER_NAME, (void *)itdev))
-                goto failure;
-
         /* set driver data into the pnp device */
         pnp_set_drvdata(pdev, itdev);
         itdev->pdev = pdev;
@@ -1600,6 +1590,16 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
         rdev->driver_name = ITE_DRIVER_NAME;
         rdev->map_name = RC_MAP_RC6_MCE;
 
+        ret = -EBUSY;
+        /* now claim resources */
+        if (!request_region(itdev->cir_addr,
+                                dev_desc->io_region_size, ITE_DRIVER_NAME))
+                goto failure;
+
+        if (request_irq(itdev->cir_irq, ite_cir_isr, IRQF_SHARED,
+                        ITE_DRIVER_NAME, (void *)itdev))
+                goto failure;
+
         ret = rc_register_device(rdev);
         if (ret)
                 goto failure;
diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index 144f3f55d765..8b2c071ac0ab 100644
--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
@@ -1021,24 +1021,6 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
         spin_lock_init(&nvt->nvt_lock);
         spin_lock_init(&nvt->tx.lock);
 
-        ret = -EBUSY;
-        /* now claim resources */
-        if (!request_region(nvt->cir_addr,
-                            CIR_IOREG_LENGTH, NVT_DRIVER_NAME))
-                goto failure;
-
-        if (request_irq(nvt->cir_irq, nvt_cir_isr, IRQF_SHARED,
-                        NVT_DRIVER_NAME, (void *)nvt))
-                goto failure;
-
-        if (!request_region(nvt->cir_wake_addr,
-                            CIR_IOREG_LENGTH, NVT_DRIVER_NAME))
-                goto failure;
-
-        if (request_irq(nvt->cir_wake_irq, nvt_cir_wake_isr, IRQF_SHARED,
-                        NVT_DRIVER_NAME, (void *)nvt))
-                goto failure;
-
         pnp_set_drvdata(pdev, nvt);
         nvt->pdev = pdev;
 
@@ -1085,6 +1067,24 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
         rdev->tx_resolution = XYZ;
 #endif
 
+        ret = -EBUSY;
+        /* now claim resources */
+        if (!request_region(nvt->cir_addr,
+                            CIR_IOREG_LENGTH, NVT_DRIVER_NAME))
+                goto failure;
+
+        if (request_irq(nvt->cir_irq, nvt_cir_isr, IRQF_SHARED,
+                        NVT_DRIVER_NAME, (void *)nvt))
+                goto failure;
+
+        if (!request_region(nvt->cir_wake_addr,
+                            CIR_IOREG_LENGTH, NVT_DRIVER_NAME))
+                goto failure;
+
+        if (request_irq(nvt->cir_wake_irq, nvt_cir_wake_isr, IRQF_SHARED,
+                        NVT_DRIVER_NAME, (void *)nvt))
+                goto failure;
+
         ret = rc_register_device(rdev);
         if (ret)
                 goto failure;
diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c
index af526586fa26..342c2c8c1ddf 100644
--- a/drivers/media/rc/winbond-cir.c
+++ b/drivers/media/rc/winbond-cir.c
@@ -991,39 +991,10 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
                 "(w: 0x%lX, e: 0x%lX, s: 0x%lX, i: %u)\n",
                 data->wbase, data->ebase, data->sbase, data->irq);
 
-        if (!request_region(data->wbase, WAKEUP_IOMEM_LEN, DRVNAME)) {
-                dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
-                        data->wbase, data->wbase + WAKEUP_IOMEM_LEN - 1);
-                err = -EBUSY;
-                goto exit_free_data;
-        }
-
-        if (!request_region(data->ebase, EHFUNC_IOMEM_LEN, DRVNAME)) {
-                dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
-                        data->ebase, data->ebase + EHFUNC_IOMEM_LEN - 1);
-                err = -EBUSY;
-                goto exit_release_wbase;
-        }
-
-        if (!request_region(data->sbase, SP_IOMEM_LEN, DRVNAME)) {
-                dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
-                        data->sbase, data->sbase + SP_IOMEM_LEN - 1);
-                err = -EBUSY;
-                goto exit_release_ebase;
-        }
-
-        err = request_irq(data->irq, wbcir_irq_handler,
-                          IRQF_DISABLED, DRVNAME, device);
-        if (err) {
-                dev_err(dev, "Failed to claim IRQ %u\n", data->irq);
-                err = -EBUSY;
-                goto exit_release_sbase;
-        }
-
         led_trigger_register_simple("cir-tx", &data->txtrigger);
         if (!data->txtrigger) {
                 err = -ENOMEM;
-                goto exit_free_irq;
+                goto exit_free_data;
         }
 
         led_trigger_register_simple("cir-rx", &data->rxtrigger);
@@ -1062,9 +1033,38 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
         data->dev->priv = data;
         data->dev->dev.parent = &device->dev;
 
+        if (!request_region(data->wbase, WAKEUP_IOMEM_LEN, DRVNAME)) {
+                dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
+                        data->wbase, data->wbase + WAKEUP_IOMEM_LEN - 1);
+                err = -EBUSY;
+                goto exit_free_rc;
+        }
+
+        if (!request_region(data->ebase, EHFUNC_IOMEM_LEN, DRVNAME)) {
+                dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
+                        data->ebase, data->ebase + EHFUNC_IOMEM_LEN - 1);
+                err = -EBUSY;
+                goto exit_release_wbase;
+        }
+
+        if (!request_region(data->sbase, SP_IOMEM_LEN, DRVNAME)) {
+                dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
+                        data->sbase, data->sbase + SP_IOMEM_LEN - 1);
+                err = -EBUSY;
+                goto exit_release_ebase;
+        }
+
+        err = request_irq(data->irq, wbcir_irq_handler,
+                          IRQF_DISABLED, DRVNAME, device);
+        if (err) {
+                dev_err(dev, "Failed to claim IRQ %u\n", data->irq);
+                err = -EBUSY;
+                goto exit_release_sbase;
+        }
+
         err = rc_register_device(data->dev);
         if (err)
-                goto exit_free_rc;
+                goto exit_free_irq;
 
         device_init_wakeup(&device->dev, 1);
 
@@ -1072,14 +1072,6 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
 
         return 0;
 
-exit_free_rc:
-        rc_free_device(data->dev);
-exit_unregister_led:
-        led_classdev_unregister(&data->led);
-exit_unregister_rxtrigger:
-        led_trigger_unregister_simple(data->rxtrigger);
-exit_unregister_txtrigger:
-        led_trigger_unregister_simple(data->txtrigger);
 exit_free_irq:
         free_irq(data->irq, device);
 exit_release_sbase:
@@ -1088,6 +1080,14 @@ exit_release_ebase:
         release_region(data->ebase, EHFUNC_IOMEM_LEN);
 exit_release_wbase:
         release_region(data->wbase, WAKEUP_IOMEM_LEN);
+exit_free_rc:
+        rc_free_device(data->dev);
+exit_unregister_led:
+        led_classdev_unregister(&data->led);
+exit_unregister_rxtrigger:
+        led_trigger_unregister_simple(data->rxtrigger);
+exit_unregister_txtrigger:
+        led_trigger_unregister_simple(data->txtrigger);
 exit_free_data:
         kfree(data);
         pnp_set_drvdata(device, NULL);
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index db8e5084df06..863c755dd2b7 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -2923,6 +2923,10 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
          * not the JPEG end of frame ('ff d9').
          */
 
+        /* count the packets and their size */
+        sd->npkt++;
+        sd->pktsz += len;
+
 /*fixme: assumption about the following code:
  *      - there can be only one marker in a packet
  */
@@ -2945,10 +2949,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                 data += i;
         }
 
-        /* count the packets and their size */
-        sd->npkt++;
-        sd->pktsz += len;
-
         /* search backwards if there is a marker in the packet */
         for (i = len - 1; --i >= 0; ) {
                 if (data[i] != 0xff) {
diff --git a/drivers/media/video/marvell-ccic/mmp-driver.c b/drivers/media/video/marvell-ccic/mmp-driver.c
index d23552323f45..c4c17fe76c0d 100644
--- a/drivers/media/video/marvell-ccic/mmp-driver.c
+++ b/drivers/media/video/marvell-ccic/mmp-driver.c
@@ -181,7 +181,6 @@ static int mmpcam_probe(struct platform_device *pdev)
         INIT_LIST_HEAD(&cam->devlist);
 
         mcam = &cam->mcam;
-        mcam->platform = MHP_Armada610;
         mcam->plat_power_up = mmpcam_power_up;
         mcam->plat_power_down = mmpcam_power_down;
         mcam->dev = &pdev->dev;
diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c
index b06efd208328..7e9b2c612b03 100644
--- a/drivers/media/video/s5p-fimc/fimc-capture.c
+++ b/drivers/media/video/s5p-fimc/fimc-capture.c
@@ -246,28 +246,37 @@ int fimc_capture_resume(struct fimc_dev *fimc)
 
 }
 
-static unsigned int get_plane_size(struct fimc_frame *fr, unsigned int plane)
-{
-        if (!fr || plane >= fr->fmt->memplanes)
-                return 0;
-        return fr->f_width * fr->f_height * fr->fmt->depth[plane] / 8;
-}
-
-static int queue_setup(struct vb2_queue *vq,  const struct v4l2_format *pfmt,
+static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *pfmt,
                        unsigned int *num_buffers, unsigned int *num_planes,
                        unsigned int sizes[], void *allocators[])
 {
+        const struct v4l2_pix_format_mplane *pixm = NULL;
         struct fimc_ctx *ctx = vq->drv_priv;
-        struct fimc_fmt *fmt = ctx->d_frame.fmt;
+        struct fimc_frame *frame = &ctx->d_frame;
+        struct fimc_fmt *fmt = frame->fmt;
+        unsigned long wh;
         int i;
 
-        if (!fmt)
+        if (pfmt) {
+                pixm = &pfmt->fmt.pix_mp;
+                fmt = fimc_find_format(&pixm->pixelformat, NULL,
+                                       FMT_FLAGS_CAM | FMT_FLAGS_M2M, -1);
+                wh = pixm->width * pixm->height;
+        } else {
+                wh = frame->f_width * frame->f_height;
+        }
+
+        if (fmt == NULL)
                 return -EINVAL;
 
         *num_planes = fmt->memplanes;
 
         for (i = 0; i < fmt->memplanes; i++) {
-                sizes[i] = get_plane_size(&ctx->d_frame, i);
+                unsigned int size = (wh * fmt->depth[i]) / 8;
+                if (pixm)
+                        sizes[i] = max(size, pixm->plane_fmt[i].sizeimage);
+                else
+                        sizes[i] = size;
                 allocators[i] = ctx->fimc_dev->alloc_ctx;
         }
 
@@ -1383,7 +1392,7 @@ static int fimc_subdev_set_crop(struct v4l2_subdev *sd,
         fimc_capture_try_crop(ctx, r, crop->pad);
 
         if (crop->which == V4L2_SUBDEV_FORMAT_TRY) {
-                mutex_lock(&fimc->lock);
+                mutex_unlock(&fimc->lock);
                 *v4l2_subdev_get_try_crop(fh, crop->pad) = *r;
                 return 0;
         }
diff --git a/drivers/media/video/s5p-fimc/fimc-core.c b/drivers/media/video/s5p-fimc/fimc-core.c
index e184e650022a..e09ba7b0076e 100644
--- a/drivers/media/video/s5p-fimc/fimc-core.c
+++ b/drivers/media/video/s5p-fimc/fimc-core.c
@@ -1048,14 +1048,14 @@ static int fimc_m2m_g_fmt_mplane(struct file *file, void *fh,
  * @mask: the color flags to match
  * @index: offset in the fimc_formats array, ignored if negative
  */
-struct fimc_fmt *fimc_find_format(u32 *pixelformat, u32 *mbus_code,
+struct fimc_fmt *fimc_find_format(const u32 *pixelformat, const u32 *mbus_code,
                                   unsigned int mask, int index)
 {
         struct fimc_fmt *fmt, *def_fmt = NULL;
         unsigned int i;
         int id = 0;
 
-        if (index >= ARRAY_SIZE(fimc_formats))
+        if (index >= (int)ARRAY_SIZE(fimc_formats))
                 return NULL;
 
         for (i = 0; i < ARRAY_SIZE(fimc_formats); ++i) {
diff --git a/drivers/media/video/s5p-fimc/fimc-core.h b/drivers/media/video/s5p-fimc/fimc-core.h
index a18291e648e2..84fd83550bd7 100644
--- a/drivers/media/video/s5p-fimc/fimc-core.h
+++ b/drivers/media/video/s5p-fimc/fimc-core.h
@@ -718,7 +718,7 @@ void fimc_alpha_ctrl_update(struct fimc_ctx *ctx);
 int fimc_fill_format(struct fimc_frame *frame, struct v4l2_format *f);
 void fimc_adjust_mplane_format(struct fimc_fmt *fmt, u32 width, u32 height,
                                struct v4l2_pix_format_mplane *pix);
-struct fimc_fmt *fimc_find_format(u32 *pixelformat, u32 *mbus_code,
+struct fimc_fmt *fimc_find_format(const u32 *pixelformat, const u32 *mbus_code,
                                   unsigned int mask, int index);
 
 int fimc_check_scaler_ratio(struct fimc_ctx *ctx, int sw, int sh,
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index eb25756a07af..aedb970d13f6 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -530,7 +530,10 @@ static int soc_camera_open(struct file *file)
                 if (icl->reset)
                         icl->reset(icd->pdev);
 
+                /* Don't mess with the host during probe */
+                mutex_lock(&ici->host_lock);
                 ret = ici->ops->add(icd);
+                mutex_unlock(&ici->host_lock);
                 if (ret < 0) {
                         dev_err(icd->pdev, "Couldn't activate the camera: %d\n", ret);
                         goto eiciadd;
@@ -956,7 +959,7 @@ static void scan_add_host(struct soc_camera_host *ici)
 {
         struct soc_camera_device *icd;
 
-        mutex_lock(&list_lock);
+        mutex_lock(&ici->host_lock);
 
         list_for_each_entry(icd, &devices, list) {
                 if (icd->iface == ici->nr) {
@@ -967,7 +970,7 @@ static void scan_add_host(struct soc_camera_host *ici)
                 }
         }
 
-        mutex_unlock(&list_lock);
+        mutex_unlock(&ici->host_lock);
 }
 
 #ifdef CONFIG_I2C_BOARDINFO
@@ -1313,6 +1316,7 @@ int soc_camera_host_register(struct soc_camera_host *ici)
         list_add_tail(&ici->list, &hosts);
         mutex_unlock(&list_lock);
 
+        mutex_init(&ici->host_lock);
         scan_add_host(ici);
 
         return 0;
diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/video/videobuf2-dma-contig.c
index f17ad98fcc5f..4b7132660a93 100644
--- a/drivers/media/video/videobuf2-dma-contig.c
+++ b/drivers/media/video/videobuf2-dma-contig.c
@@ -15,6 +15,7 @@
 #include <linux/dma-mapping.h>
 
 #include <media/videobuf2-core.h>
+#include <media/videobuf2-dma-contig.h>
 #include <media/videobuf2-memops.h>
 
 struct vb2_dc_conf {
@@ -85,7 +86,7 @@ static void *vb2_dma_contig_vaddr(void *buf_priv)
 {
         struct vb2_dc_buf *buf = buf_priv;
         if (!buf)
-                return 0;
+                return NULL;
 
         return buf->vaddr;
 }
diff --git a/drivers/media/video/videobuf2-memops.c b/drivers/media/video/videobuf2-memops.c
index c41cb60245d6..504cd4cbe29e 100644
--- a/drivers/media/video/videobuf2-memops.c
+++ b/drivers/media/video/videobuf2-memops.c
@@ -55,6 +55,7 @@ struct vm_area_struct *vb2_get_vma(struct vm_area_struct *vma)
 
         return vma_copy;
 }
+EXPORT_SYMBOL_GPL(vb2_get_vma);
 
 /**
  * vb2_put_userptr() - release a userspace virtual memory area
diff --git a/drivers/message/fusion/mptlan.h b/drivers/message/fusion/mptlan.h
index c171afa93239..69e9d5463564 100644
--- a/drivers/message/fusion/mptlan.h
+++ b/drivers/message/fusion/mptlan.h
@@ -69,7 +69,6 @@
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
 #include <linux/delay.h>
-// #include <linux/trdevice.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index c8aae6640e64..7e96bb229724 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -25,6 +25,7 @@
 #include <linux/clk.h>
 #include <linux/dma-mapping.h>
 #include <linux/spinlock.h>
+#include <plat/cpu.h>
 #include <plat/usb.h>
 #include <linux/pm_runtime.h>
 
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 032b84791a16..b6f38421d541 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -94,6 +94,17 @@ static struct variant_data variant_u300 = {
         .signal_direction       = true,
 };
 
+static struct variant_data variant_nomadik = {
+        .fifosize               = 16 * 4,
+        .fifohalfsize           = 8 * 4,
+        .clkreg                 = MCI_CLK_ENABLE,
+        .datalength_bits        = 24,
+        .sdio                   = true,
+        .st_clkdiv              = true,
+        .pwrreg_powerup         = MCI_PWR_ON,
+        .signal_direction       = true,
+};
+
 static struct variant_data variant_ux500 = {
         .fifosize               = 30 * 4,
         .fifohalfsize           = 8 * 4,
@@ -1397,7 +1408,7 @@ static int __devinit mmci_probe(struct amba_device *dev,
         if (ret)
                 goto unmap;
 
-        if (dev->irq[1] == NO_IRQ || !dev->irq[1])
+        if (!dev->irq[1])
                 host->singleirq = true;
         else {
                 ret = request_irq(dev->irq[1], mmci_pio_irq, IRQF_SHARED,
@@ -1569,6 +1580,11 @@ static struct amba_id mmci_ids[] = {
                 .data   = &variant_u300,
         },
         {
+                .id     = 0x10180180,
+                .mask   = 0xf0ffffff,
+                .data   = &variant_nomadik,
+        },
+        {
                 .id     = 0x00280180,
                 .mask   = 0x00ffffff,
                 .data   = &variant_u300,
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index b0f2ef988188..e3f5af96ab87 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -363,6 +363,7 @@ static void mxs_mmc_bc(struct mxs_mmc_host *host)
                 goto out;
 
         dmaengine_submit(desc);
+        dma_async_issue_pending(host->dmach);
         return;
 
 out:
@@ -403,6 +404,7 @@ static void mxs_mmc_ac(struct mxs_mmc_host *host)
                 goto out;
 
         dmaengine_submit(desc);
+        dma_async_issue_pending(host->dmach);
         return;
 
 out:
@@ -531,6 +533,7 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host)
                 goto out;
 
         dmaengine_submit(desc);
+        dma_async_issue_pending(host->dmach);
         return;
 out:
         dev_warn(mmc_dev(host->mmc),
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 58fc65f5c817..f2f482bec573 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -376,7 +376,7 @@ static int otp_select_filemode(struct mtd_file_info *mfi, int mode)
          * Make a fake call to mtd_read_fact_prot_reg() to check if OTP
          * operations are supported.
          */
-        if (mtd_read_fact_prot_reg(mtd, -1, -1, &retlen, NULL) == -EOPNOTSUPP)
+        if (mtd_read_fact_prot_reg(mtd, -1, 0, &retlen, NULL) == -EOPNOTSUPP)
                 return -EOPNOTSUPP;
 
         switch (mode) {
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index 73416951f4c1..861ca8f7e47d 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -212,18 +212,17 @@ static int __devinit ams_delta_init(struct platform_device *pdev)
         /* Link the private data with the MTD structure */
         ams_delta_mtd->priv = this;
 
-        if (!request_mem_region(res->start, resource_size(res),
-                        dev_name(&pdev->dev))) {
-                dev_err(&pdev->dev, "request_mem_region failed\n");
-                err = -EBUSY;
-                goto out_free;
-        }
+        /*
+         * Don't try to request the memory region from here,
+         * it should have been already requested from the
+         * gpio-omap driver and requesting it again would fail.
+         */
 
         io_base = ioremap(res->start, resource_size(res));
         if (io_base == NULL) {
                 dev_err(&pdev->dev, "ioremap failed\n");
                 err = -EIO;
-                goto out_release_io;
+                goto out_free;
         }
 
         this->priv = io_base;
@@ -271,8 +270,6 @@ out_gpio:
         platform_set_drvdata(pdev, NULL);
         gpio_free(AMS_DELTA_GPIO_PIN_NAND_RB);
         iounmap(io_base);
-out_release_io:
-        release_mem_region(res->start, resource_size(res));
 out_free:
         kfree(ams_delta_mtd);
  out:
@@ -285,7 +282,6 @@ out_free:
 static int __devexit ams_delta_cleanup(struct platform_device *pdev)
 {
         void __iomem *io_base = platform_get_drvdata(pdev);
-        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
         /* Release resources, unregister device */
         nand_release(ams_delta_mtd);
@@ -293,7 +289,6 @@ static int __devexit ams_delta_cleanup(struct platform_device *pdev)
         gpio_free_array(_mandatory_gpio, ARRAY_SIZE(_mandatory_gpio));
         gpio_free(AMS_DELTA_GPIO_PIN_NAND_RB);
         iounmap(io_base);
-        release_mem_region(res->start, resource_size(res));
 
         /* Free the MTD device structure */
         kfree(ams_delta_mtd);
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 75b1dde16358..9ec51cec2e14 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -266,6 +266,7 @@ int start_dma_without_bch_irq(struct gpmi_nand_data *this,
         desc->callback          = dma_irq_callback;
         desc->callback_param    = this;
         dmaengine_submit(desc);
+        dma_async_issue_pending(get_dma_chan(this));
 
         /* Wait for the interrupt from the DMA block. */
         err = wait_for_completion_timeout(dma_c, msecs_to_jiffies(1000));
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b98285446a5a..0c2bd806950e 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -66,10 +66,7 @@ config DUMMY
           <http://www.tldp.org/docs.html#guide>.
 
           To compile this driver as a module, choose M here: the module
-          will be called dummy.  If you want to use more than one dummy
-          device at a time, you need to compile this driver as a module.
-          Instead of 'dummy', the devices will then be called 'dummy0',
-          'dummy1' etc.
+          will be called dummy.
 
 config EQUALIZER
         tristate "EQL (serial line load balancing) support"
@@ -285,8 +282,6 @@ source "drivers/net/slip/Kconfig"
 
 source "drivers/s390/net/Kconfig"
 
-source "drivers/net/tokenring/Kconfig"
-
 source "drivers/net/usb/Kconfig"
 
 source "drivers/net/wireless/Kconfig"
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index a6b8ce11a22f..3d375ca128a6 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -50,7 +50,6 @@ obj-$(CONFIG_SLIP) += slip/
 obj-$(CONFIG_SLHC) += slip/
 obj-$(CONFIG_NET_SB1000) += sb1000.o
 obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o
-obj-$(CONFIG_TR) += tokenring/
 obj-$(CONFIG_WAN) += wan/
 obj-$(CONFIG_WLAN) += wireless/
 obj-$(CONFIG_WIMAX) += wimax/
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 88bbd8ffa7fe..e3f0faca98d0 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -29,7 +29,6 @@
  */
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/trdevice.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/netlink.h>
@@ -134,22 +133,9 @@ static struct devprobe2 eisa_probes[] __initdata = {
         {NULL, 0},
 };
 
-static struct devprobe2 mca_probes[] __initdata = {
-#ifdef CONFIG_NE2_MCA
-        {ne2_probe, 0},
-#endif
-#ifdef CONFIG_ELMC              /* 3c523 */
-        {elmc_probe, 0},
-#endif
-#ifdef CONFIG_ELMC_II           /* 3c527 */
-        {mc32_probe, 0},
-#endif
-        {NULL, 0},
-};
-
 /*
  * ISA probes that touch addresses < 0x400 (including those that also
- * look for EISA/PCI/MCA cards in addition to ISA cards).
+ * look for EISA/PCI cards in addition to ISA cards).
  */
 static struct devprobe2 isa_probes[] __initdata = {
 #if defined(CONFIG_HP100) && defined(CONFIG_ISA)        /* ISA, EISA */
@@ -279,51 +265,10 @@ static void __init ethif_probe2(int unit)
 
         (void)( probe_list2(unit, m68k_probes, base_addr == 0) &&
                 probe_list2(unit, eisa_probes, base_addr == 0) &&
-                probe_list2(unit, mca_probes, base_addr == 0) &&
                 probe_list2(unit, isa_probes, base_addr == 0) &&
                 probe_list2(unit, parport_probes, base_addr == 0));
 }
 
-#ifdef CONFIG_TR
-/* Token-ring device probe */
-extern int ibmtr_probe_card(struct net_device *);
-extern struct net_device *smctr_probe(int unit);
-
-static struct devprobe2 tr_probes2[] __initdata = {
-#ifdef CONFIG_SMCTR
-        {smctr_probe, 0},
-#endif
-        {NULL, 0},
-};
-
-static __init int trif_probe(int unit)
-{
-        int err = -ENODEV;
-#ifdef CONFIG_IBMTR
-        struct net_device *dev = alloc_trdev(0);
-        if (!dev)
-                return -ENOMEM;
-
-        sprintf(dev->name, "tr%d", unit);
-        netdev_boot_setup_check(dev);
-        err = ibmtr_probe_card(dev);
-        if (err)
-                free_netdev(dev);
-#endif
-        return err;
-}
-
-static void __init trif_probe2(int unit)
-{
-        unsigned long base_addr = netdev_boot_base("tr", unit);
-
-        if (base_addr == 1)
-                return;
-        probe_list2(unit, tr_probes2, base_addr == 0);
-}
-#endif
-
-
 /*  Statically configured drivers -- order matters here. */
 static int __init net_olddevs_init(void)
 {
@@ -333,11 +278,6 @@ static int __init net_olddevs_init(void)
         for (num = 0; num < 8; ++num)
                 sbni_probe(num);
 #endif
-#ifdef CONFIG_TR
-        for (num = 0; num < 8; ++num)
-                if (!trif_probe(num))
-                        trif_probe2(num);
-#endif
         for (num = 0; num < 8; ++num)
                 ethif_probe2(num);
 
diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c
index 25197b698dd6..b8b4c7ba884f 100644
--- a/drivers/net/arcnet/arc-rimi.c
+++ b/drivers/net/arcnet/arc-rimi.c
@@ -89,16 +89,16 @@ static int __init arcrimi_probe(struct net_device *dev)
         BUGLVL(D_NORMAL) printk(VERSION);
         BUGLVL(D_NORMAL) printk("E-mail me if you actually test the RIM I driver, please!\n");
 
-        BUGMSG(D_NORMAL, "Given: node %02Xh, shmem %lXh, irq %d\n",
+        BUGLVL(D_NORMAL) printk("Given: node %02Xh, shmem %lXh, irq %d\n",
                dev->dev_addr[0], dev->mem_start, dev->irq);
 
         if (dev->mem_start <= 0 || dev->irq <= 0) {
-                BUGMSG(D_NORMAL, "No autoprobe for RIM I; you "
+                BUGLVL(D_NORMAL) printk("No autoprobe for RIM I; you "
                        "must specify the shmem and irq!\n");
                 return -ENODEV;
         }
         if (dev->dev_addr[0] == 0) {
-                BUGMSG(D_NORMAL, "You need to specify your card's station "
+                BUGLVL(D_NORMAL) printk("You need to specify your card's station "
                        "ID!\n");
                 return -ENODEV;
         }
@@ -109,7 +109,7 @@ static int __init arcrimi_probe(struct net_device *dev)
          * will be taken.
          */
         if (!request_mem_region(dev->mem_start, MIRROR_SIZE, "arcnet (90xx)")) {
-                BUGMSG(D_NORMAL, "Card memory already allocated\n");
+                BUGLVL(D_NORMAL) printk("Card memory already allocated\n");
                 return -ENODEV;
         }
         return arcrimi_found(dev);
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 793b00138275..3463b469e657 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2173,9 +2173,10 @@ re_arm:
  * received frames (loopback). Since only the payload is given to this
  * function, it check for loopback.
  */
-static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u16 length)
+static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u16 length)
 {
         struct port *port;
+        int ret = RX_HANDLER_ANOTHER;
 
         if (length >= sizeof(struct lacpdu)) {
 
@@ -2184,11 +2185,12 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
                 if (!port->slave) {
                         pr_warning("%s: Warning: port of slave %s is uninitialized\n",
                                    slave->dev->name, slave->dev->master->name);
-                        return;
+                        return ret;
                 }
 
                 switch (lacpdu->subtype) {
                 case AD_TYPE_LACPDU:
+                        ret = RX_HANDLER_CONSUMED;
                         pr_debug("Received LACPDU on port %d\n",
                                  port->actor_port_number);
                         /* Protect against concurrent state machines */
@@ -2198,6 +2200,7 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
                         break;
 
                 case AD_TYPE_MARKER:
+                        ret = RX_HANDLER_CONSUMED;
                         // No need to convert fields to Little Endian since we don't use the marker's fields.
 
                         switch (((struct bond_marker *)lacpdu)->tlv_type) {
@@ -2219,6 +2222,7 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
                         }
                 }
         }
+        return ret;
 }
 
 /**
@@ -2456,18 +2460,20 @@ out:
         return NETDEV_TX_OK;
 }
 
-void bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
+int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
                           struct slave *slave)
 {
+        int ret = RX_HANDLER_ANOTHER;
         if (skb->protocol != PKT_TYPE_LACPDU)
-                return;
+                return ret;
 
         if (!pskb_may_pull(skb, sizeof(struct lacpdu)))
-                return;
+                return ret;
 
         read_lock(&bond->lock);
-        bond_3ad_rx_indication((struct lacpdu *) skb->data, slave, skb->len);
+        ret = bond_3ad_rx_indication((struct lacpdu *) skb->data, slave, skb->len);
         read_unlock(&bond->lock);
+        return ret;
 }
 
 /*
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h
index 235b2cc58b28..5ee7e3c45db7 100644
--- a/drivers/net/bonding/bond_3ad.h
+++ b/drivers/net/bonding/bond_3ad.h
@@ -274,7 +274,7 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave);
 void bond_3ad_handle_link_change(struct slave *slave, char link);
 int  bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info);
 int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev);
-void bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
+int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
                           struct slave *slave);
 int bond_3ad_set_carrier(struct bonding *bond);
 void bond_3ad_update_lacp_rate(struct bonding *bond);
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 9abfde479316..0f59c1564e53 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -332,7 +332,7 @@ static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp)
         if ((client_info->assigned) &&
             (client_info->ip_src == arp->ip_dst) &&
             (client_info->ip_dst == arp->ip_src) &&
-            (compare_ether_addr_64bits(client_info->mac_dst, arp->mac_src))) {
+            (!ether_addr_equal_64bits(client_info->mac_dst, arp->mac_src))) {
                 /* update the clients MAC address */
                 memcpy(client_info->mac_dst, arp->mac_src, ETH_ALEN);
                 client_info->ntt = 1;
@@ -342,26 +342,26 @@ static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp)
         _unlock_rx_hashtbl_bh(bond);
 }
 
-static void rlb_arp_recv(struct sk_buff *skb, struct bonding *bond,
+static int rlb_arp_recv(struct sk_buff *skb, struct bonding *bond,
                          struct slave *slave)
 {
         struct arp_pkt *arp;
 
         if (skb->protocol != cpu_to_be16(ETH_P_ARP))
-                return;
+                goto out;
 
         arp = (struct arp_pkt *) skb->data;
         if (!arp) {
                 pr_debug("Packet has no ARP data\n");
-                return;
+                goto out;
         }
 
         if (!pskb_may_pull(skb, arp_hdr_len(bond->dev)))
-                return;
+                goto out;
 
         if (skb->len < sizeof(struct arp_pkt)) {
                 pr_debug("Packet is too small to be an ARP\n");
-                return;
+                goto out;
         }
 
         if (arp->op_code == htons(ARPOP_REPLY)) {
@@ -369,6 +369,8 @@ static void rlb_arp_recv(struct sk_buff *skb, struct bonding *bond,
                 rlb_update_entry_from_arp(bond, arp);
                 pr_debug("Server received an ARP Reply from client\n");
         }
+out:
+        return RX_HANDLER_ANOTHER;
 }
 
 /* Caller must hold bond lock for read */
@@ -448,8 +450,8 @@ static void rlb_clear_slave(struct bonding *bond, struct slave *slave)
 
                         if (assigned_slave) {
                                 rx_hash_table[index].slave = assigned_slave;
-                                if (compare_ether_addr_64bits(rx_hash_table[index].mac_dst,
-                                                              mac_bcast)) {
+                                if (!ether_addr_equal_64bits(rx_hash_table[index].mac_dst,
+                                                             mac_bcast)) {
                                         bond_info->rx_hashtbl[index].ntt = 1;
                                         bond_info->rx_ntt = 1;
                                         /* A slave has been removed from the
@@ -561,7 +563,7 @@ static void rlb_req_update_slave_clients(struct bonding *bond, struct slave *sla
                 client_info = &(bond_info->rx_hashtbl[hash_index]);
 
                 if ((client_info->slave == slave) &&
-                    compare_ether_addr_64bits(client_info->mac_dst, mac_bcast)) {
+                    !ether_addr_equal_64bits(client_info->mac_dst, mac_bcast)) {
                         client_info->ntt = 1;
                         ntt = 1;
                 }
@@ -600,9 +602,9 @@ static void rlb_req_update_subnet_clients(struct bonding *bond, __be32 src_ip)
                  * unicast mac address.
                  */
                 if ((client_info->ip_src == src_ip) &&
-                    compare_ether_addr_64bits(client_info->slave->dev->dev_addr,
-                           bond->dev->dev_addr) &&
-                    compare_ether_addr_64bits(client_info->mac_dst, mac_bcast)) {
+                    !ether_addr_equal_64bits(client_info->slave->dev->dev_addr,
+                                             bond->dev->dev_addr) &&
+                    !ether_addr_equal_64bits(client_info->mac_dst, mac_bcast)) {
                         client_info->ntt = 1;
                         bond_info->rx_ntt = 1;
                 }
@@ -629,7 +631,7 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bon
                 if ((client_info->ip_src == arp->ip_src) &&
                     (client_info->ip_dst == arp->ip_dst)) {
                         /* the entry is already assigned to this client */
-                        if (compare_ether_addr_64bits(arp->mac_dst, mac_bcast)) {
+                        if (!ether_addr_equal_64bits(arp->mac_dst, mac_bcast)) {
                                 /* update mac address from arp */
                                 memcpy(client_info->mac_dst, arp->mac_dst, ETH_ALEN);
                         }
@@ -664,7 +666,7 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bon
                 memcpy(client_info->mac_dst, arp->mac_dst, ETH_ALEN);
                 client_info->slave = assigned_slave;
 
-                if (compare_ether_addr_64bits(client_info->mac_dst, mac_bcast)) {
+                if (!ether_addr_equal_64bits(client_info->mac_dst, mac_bcast)) {
                         client_info->ntt = 1;
                         bond->alb_info.rx_ntt = 1;
                 } else {
@@ -1009,18 +1011,18 @@ static void alb_change_hw_addr_on_detach(struct bonding *bond, struct slave *sla
         int perm_curr_diff;
         int perm_bond_diff;
 
-        perm_curr_diff = compare_ether_addr_64bits(slave->perm_hwaddr,
-                                                   slave->dev->dev_addr);
-        perm_bond_diff = compare_ether_addr_64bits(slave->perm_hwaddr,
-                                                   bond->dev->dev_addr);
+        perm_curr_diff = !ether_addr_equal_64bits(slave->perm_hwaddr,
+                                                  slave->dev->dev_addr);
+        perm_bond_diff = !ether_addr_equal_64bits(slave->perm_hwaddr,
+                                                  bond->dev->dev_addr);
 
         if (perm_curr_diff && perm_bond_diff) {
                 struct slave *tmp_slave;
                 int i, found = 0;
 
                 bond_for_each_slave(bond, tmp_slave, i) {
-                        if (!compare_ether_addr_64bits(slave->perm_hwaddr,
-                                                       tmp_slave->dev->dev_addr)) {
+                        if (ether_addr_equal_64bits(slave->perm_hwaddr,
+                                                    tmp_slave->dev->dev_addr)) {
                                 found = 1;
                                 break;
                         }
@@ -1074,10 +1076,10 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
          * check uniqueness of slave's mac address against the other
          * slaves in the bond.
          */
-        if (compare_ether_addr_64bits(slave->perm_hwaddr, bond->dev->dev_addr)) {
+        if (!ether_addr_equal_64bits(slave->perm_hwaddr, bond->dev->dev_addr)) {
                 bond_for_each_slave(bond, tmp_slave1, i) {
-                        if (!compare_ether_addr_64bits(tmp_slave1->dev->dev_addr,
-                                                       slave->dev->dev_addr)) {
+                        if (ether_addr_equal_64bits(tmp_slave1->dev->dev_addr,
+                                                    slave->dev->dev_addr)) {
                                 found = 1;
                                 break;
                         }
@@ -1099,8 +1101,8 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
         bond_for_each_slave(bond, tmp_slave1, i) {
                 found = 0;
                 bond_for_each_slave(bond, tmp_slave2, j) {
-                        if (!compare_ether_addr_64bits(tmp_slave1->perm_hwaddr,
-                                                       tmp_slave2->dev->dev_addr)) {
+                        if (ether_addr_equal_64bits(tmp_slave1->perm_hwaddr,
+                                                    tmp_slave2->dev->dev_addr)) {
                                 found = 1;
                                 break;
                         }
@@ -1115,8 +1117,8 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
                 }
 
                 if (!has_bond_addr) {
-                        if (!compare_ether_addr_64bits(tmp_slave1->dev->dev_addr,
-                                                       bond->dev->dev_addr)) {
+                        if (ether_addr_equal_64bits(tmp_slave1->dev->dev_addr,
+                                                    bond->dev->dev_addr)) {
 
                                 has_bond_addr = tmp_slave1;
                         }
@@ -1257,7 +1259,7 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
         case ETH_P_IP: {
                 const struct iphdr *iph = ip_hdr(skb);
 
-                if (!compare_ether_addr_64bits(eth_data->h_dest, mac_bcast) ||
+                if (ether_addr_equal_64bits(eth_data->h_dest, mac_bcast) ||
                     (iph->daddr == ip_bcast) ||
                     (iph->protocol == IPPROTO_IGMP)) {
                         do_tx_balance = 0;
@@ -1271,7 +1273,7 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
                 /* IPv6 doesn't really use broadcast mac address, but leave
                  * that here just in case.
                  */
-                if (!compare_ether_addr_64bits(eth_data->h_dest, mac_bcast)) {
+                if (ether_addr_equal_64bits(eth_data->h_dest, mac_bcast)) {
                         do_tx_balance = 0;
                         break;
                 }
@@ -1279,7 +1281,7 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
                 /* IPv6 uses all-nodes multicast as an equivalent to
                  * broadcasts in IPv4.
                  */
-                if (!compare_ether_addr_64bits(eth_data->h_dest, mac_v6_allmcast)) {
+                if (ether_addr_equal_64bits(eth_data->h_dest, mac_v6_allmcast)) {
                         do_tx_balance = 0;
                         break;
                 }
@@ -1603,8 +1605,8 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave
                 struct slave *tmp_slave;
                 /* find slave that is holding the bond's mac address */
                 bond_for_each_slave(bond, tmp_slave, i) {
-                        if (!compare_ether_addr_64bits(tmp_slave->dev->dev_addr,
-                                                       bond->dev->dev_addr)) {
+                        if (ether_addr_equal_64bits(tmp_slave->dev->dev_addr,
+                                                    bond->dev->dev_addr)) {
                                 swap_slave = tmp_slave;
                                 break;
                         }
@@ -1681,8 +1683,8 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr)
         swap_slave = NULL;
 
         bond_for_each_slave(bond, slave, i) {
-                if (!compare_ether_addr_64bits(slave->dev->dev_addr,
-                                               bond_dev->dev_addr)) {
+                if (ether_addr_equal_64bits(slave->dev->dev_addr,
+                                            bond_dev->dev_addr)) {
                         swap_slave = slave;
                         break;
                 }
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 62d2409bb293..2ee8cf9e8a3b 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -549,9 +549,9 @@ down:
  * Get link speed and duplex from the slave's base driver
  * using ethtool. If for some reason the call fails or the
  * values are invalid, set speed and duplex to -1,
- * and return error.
+ * and return.
  */
-static int bond_update_speed_duplex(struct slave *slave)
+static void bond_update_speed_duplex(struct slave *slave)
 {
         struct net_device *slave_dev = slave->dev;
         struct ethtool_cmd ecmd;
@@ -563,24 +563,24 @@ static int bond_update_speed_duplex(struct slave *slave)
 
         res = __ethtool_get_settings(slave_dev, &ecmd);
         if (res < 0)
-                return -1;
+                return;
 
         slave_speed = ethtool_cmd_speed(&ecmd);
         if (slave_speed == 0 || slave_speed == ((__u32) -1))
-                return -1;
+                return;
 
         switch (ecmd.duplex) {
         case DUPLEX_FULL:
         case DUPLEX_HALF:
                 break;
         default:
-                return -1;
+                return;
         }
 
         slave->speed = slave_speed;
         slave->duplex = ecmd.duplex;
 
-        return 0;
+        return;
 }
 
 /*
@@ -1444,8 +1444,9 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
         struct sk_buff *skb = *pskb;
         struct slave *slave;
         struct bonding *bond;
-        void (*recv_probe)(struct sk_buff *, struct bonding *,
+        int (*recv_probe)(struct sk_buff *, struct bonding *,
                                 struct slave *);
+        int ret = RX_HANDLER_ANOTHER;
 
         skb = skb_share_check(skb, GFP_ATOMIC);
         if (unlikely(!skb))
@@ -1464,8 +1465,12 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
                 struct sk_buff *nskb = skb_clone(skb, GFP_ATOMIC);
 
                 if (likely(nskb)) {
-                        recv_probe(nskb, bond, slave);
+                        ret = recv_probe(nskb, bond, slave);
                         dev_kfree_skb(nskb);
+                        if (ret == RX_HANDLER_CONSUMED) {
+                                consume_skb(skb);
+                                return ret;
+                        }
                 }
         }
 
@@ -1487,7 +1492,7 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
                 memcpy(eth_hdr(skb)->h_dest, bond->dev->dev_addr, ETH_ALEN);
         }
 
-        return RX_HANDLER_ANOTHER;
+        return ret;
 }
 
 /* enslave device <slave> to bond device <master> */
@@ -1726,7 +1731,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
 
         read_lock(&bond->lock);
 
-        new_slave->last_arp_rx = jiffies;
+        new_slave->last_arp_rx = jiffies -
+                (msecs_to_jiffies(bond->params.arp_interval) + 1);
 
         if (bond->params.miimon && !bond->params.use_carrier) {
                 link_reporting = bond_check_dev_link(bond, slave_dev, 1);
@@ -1751,22 +1757,30 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         }
 
         /* check for initial state */
-        if (!bond->params.miimon ||
-            (bond_check_dev_link(bond, slave_dev, 0) == BMSR_LSTATUS)) {
-                if (bond->params.updelay) {
-                        pr_debug("Initial state of slave_dev is BOND_LINK_BACK\n");
-                        new_slave->link  = BOND_LINK_BACK;
-                        new_slave->delay = bond->params.updelay;
+        if (bond->params.miimon) {
+                if (bond_check_dev_link(bond, slave_dev, 0) == BMSR_LSTATUS) {
+                        if (bond->params.updelay) {
+                                new_slave->link = BOND_LINK_BACK;
+                                new_slave->delay = bond->params.updelay;
+                        } else {
+                                new_slave->link = BOND_LINK_UP;
+                        }
                 } else {
-                        pr_debug("Initial state of slave_dev is BOND_LINK_UP\n");
-                        new_slave->link  = BOND_LINK_UP;
+                        new_slave->link = BOND_LINK_DOWN;
                 }
-                new_slave->jiffies = jiffies;
+        } else if (bond->params.arp_interval) {
+                new_slave->link = (netif_carrier_ok(slave_dev) ?
+                        BOND_LINK_UP : BOND_LINK_DOWN);
         } else {
-                pr_debug("Initial state of slave_dev is BOND_LINK_DOWN\n");
-                new_slave->link  = BOND_LINK_DOWN;
+                new_slave->link = BOND_LINK_UP;
         }
 
+        if (new_slave->link != BOND_LINK_DOWN)
+                new_slave->jiffies = jiffies;
+        pr_debug("Initial state of slave_dev is BOND_LINK_%s\n",
+                new_slave->link == BOND_LINK_DOWN ? "DOWN" :
+                        (new_slave->link == BOND_LINK_UP ? "UP" : "BACK"));
+
         bond_update_speed_duplex(new_slave);
 
         if (USES_PRIMARY(bond->params.mode) && bond->params.primary[0]) {
@@ -1952,7 +1966,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
         write_lock_bh(&bond->lock);
 
         if (!bond->params.fail_over_mac) {
-                if (!compare_ether_addr(bond_dev->dev_addr, slave->perm_hwaddr) &&
+                if (ether_addr_equal(bond_dev->dev_addr, slave->perm_hwaddr) &&
                     bond->slave_cnt > 1)
                         pr_warning("%s: Warning: the permanent HWaddr of %s - %pM - is still in use by %s. Set the HWaddr of %s to a different address to avoid conflicts.\n",
                                    bond_dev->name, slave_dev->name,
@@ -2723,7 +2737,7 @@ static void bond_validate_arp(struct bonding *bond, struct slave *slave, __be32
         }
 }
 
-static void bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,
+static int bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,
                          struct slave *slave)
 {
         struct arphdr *arp;
@@ -2731,7 +2745,7 @@ static void bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,
         __be32 sip, tip;
 
         if (skb->protocol != __cpu_to_be16(ETH_P_ARP))
-                return;
+                return RX_HANDLER_ANOTHER;
 
         read_lock(&bond->lock);
 
@@ -2776,6 +2790,7 @@ static void bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,
 
 out_unlock:
         read_unlock(&bond->lock);
+        return RX_HANDLER_ANOTHER;
 }
 
 /*
@@ -4820,12 +4835,9 @@ static int bond_validate(struct nlattr *tb[], struct nlattr *data[])
         return 0;
 }
 
-static int bond_get_tx_queues(struct net *net, struct nlattr *tb[],
-                              unsigned int *num_queues,
-                              unsigned int *real_num_queues)
+static int bond_get_tx_queues(struct net *net, struct nlattr *tb[])
 {
-        *num_queues = tx_queues;
-        return 0;
+        return tx_queues;
 }
 
 static struct rtnl_link_ops bond_link_ops __read_mostly = {
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 9f2bae6616d3..4581aa5ccaba 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -218,7 +218,7 @@ struct bonding {
         struct   slave *primary_slave;
         bool     force_primary;
         s32      slave_cnt; /* never change this value outside the attach/detach wrappers */
-        void     (*recv_probe)(struct sk_buff *, struct bonding *,
+        int     (*recv_probe)(struct sk_buff *, struct bonding *,
                                struct slave *);
         rwlock_t lock;
         rwlock_t curr_slave_lock;
diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
index 9a66e2a910ae..1520814c77c7 100644
--- a/drivers/net/caif/caif_hsi.c
+++ b/drivers/net/caif/caif_hsi.c
@@ -6,6 +6,8 @@
  * License terms: GNU General Public License (GPL) version 2.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME fmt
+
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/device.h>
@@ -19,6 +21,7 @@
 #include <linux/if_arp.h>
 #include <linux/timer.h>
 #include <linux/rtnetlink.h>
+#include <linux/pkt_sched.h>
 #include <net/caif/caif_layer.h>
 #include <net/caif/caif_hsi.h>
 
@@ -34,6 +37,10 @@ static int inactivity_timeout = 1000;
 module_param(inactivity_timeout, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(inactivity_timeout, "Inactivity timeout on HSI, ms.");
 
+static int aggregation_timeout = 1;
+module_param(aggregation_timeout, int, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(aggregation_timeout, "Aggregation timeout on HSI, ms.");
+
 /*
  * HSI padding options.
  * Warning: must be a base of 2 (& operation used) and can not be zero !
@@ -86,24 +93,84 @@ static void cfhsi_inactivity_tout(unsigned long arg)
                 queue_work(cfhsi->wq, &cfhsi->wake_down_work);
 }
 
+static void cfhsi_update_aggregation_stats(struct cfhsi *cfhsi,
+                                           const struct sk_buff *skb,
+                                           int direction)
+{
+        struct caif_payload_info *info;
+        int hpad, tpad, len;
+
+        info = (struct caif_payload_info *)&skb->cb;
+        hpad = 1 + PAD_POW2((info->hdr_len + 1), hsi_head_align);
+        tpad = PAD_POW2((skb->len + hpad), hsi_tail_align);
+        len = skb->len + hpad + tpad;
+
+        if (direction > 0)
+                cfhsi->aggregation_len += len;
+        else if (direction < 0)
+                cfhsi->aggregation_len -= len;
+}
+
+static bool cfhsi_can_send_aggregate(struct cfhsi *cfhsi)
+{
+        int i;
+
+        if (cfhsi->aggregation_timeout < 0)
+                return true;
+
+        for (i = 0; i < CFHSI_PRIO_BEBK; ++i) {
+                if (cfhsi->qhead[i].qlen)
+                        return true;
+        }
+
+        /* TODO: Use aggregation_len instead */
+        if (cfhsi->qhead[CFHSI_PRIO_BEBK].qlen >= CFHSI_MAX_PKTS)
+                return true;
+
+        return false;
+}
+
+static struct sk_buff *cfhsi_dequeue(struct cfhsi *cfhsi)
+{
+        struct sk_buff *skb;
+        int i;
+
+        for (i = 0; i < CFHSI_PRIO_LAST; ++i) {
+                skb = skb_dequeue(&cfhsi->qhead[i]);
+                if (skb)
+                        break;
+        }
+
+        return skb;
+}
+
+static int cfhsi_tx_queue_len(struct cfhsi *cfhsi)
+{
+        int i, len = 0;
+        for (i = 0; i < CFHSI_PRIO_LAST; ++i)
+                len += skb_queue_len(&cfhsi->qhead[i]);
+        return len;
+}
+
 static void cfhsi_abort_tx(struct cfhsi *cfhsi)
 {
         struct sk_buff *skb;
 
         for (;;) {
                 spin_lock_bh(&cfhsi->lock);
-                skb = skb_dequeue(&cfhsi->qhead);
+                skb = cfhsi_dequeue(cfhsi);
                 if (!skb)
                         break;
 
                 cfhsi->ndev->stats.tx_errors++;
                 cfhsi->ndev->stats.tx_dropped++;
+                cfhsi_update_aggregation_stats(cfhsi, skb, -1);
                 spin_unlock_bh(&cfhsi->lock);
                 kfree_skb(skb);
         }
         cfhsi->tx_state = CFHSI_TX_STATE_IDLE;
         if (!test_bit(CFHSI_SHUTDOWN, &cfhsi->bits))
-                mod_timer(&cfhsi->timer,
+                mod_timer(&cfhsi->inactivity_timer,
                         jiffies + cfhsi->inactivity_timeout);
         spin_unlock_bh(&cfhsi->lock);
 }
@@ -169,7 +236,7 @@ static int cfhsi_tx_frm(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
         struct sk_buff *skb;
         u8 *pfrm = desc->emb_frm + CFHSI_MAX_EMB_FRM_SZ;
 
-        skb = skb_dequeue(&cfhsi->qhead);
+        skb = cfhsi_dequeue(cfhsi);
         if (!skb)
                 return 0;
 
@@ -196,11 +263,16 @@ static int cfhsi_tx_frm(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
                         pemb += hpad;
 
                         /* Update network statistics. */
+                        spin_lock_bh(&cfhsi->lock);
                         cfhsi->ndev->stats.tx_packets++;
                         cfhsi->ndev->stats.tx_bytes += skb->len;
+                        cfhsi_update_aggregation_stats(cfhsi, skb, -1);
+                        spin_unlock_bh(&cfhsi->lock);
 
                         /* Copy in embedded CAIF frame. */
                         skb_copy_bits(skb, 0, pemb, skb->len);
+
+                        /* Consume the SKB */
                         consume_skb(skb);
                         skb = NULL;
                 }
@@ -214,7 +286,7 @@ static int cfhsi_tx_frm(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
                 int tpad = 0;
 
                 if (!skb)
-                        skb = skb_dequeue(&cfhsi->qhead);
+                        skb = cfhsi_dequeue(cfhsi);
 
                 if (!skb)
                         break;
@@ -233,8 +305,11 @@ static int cfhsi_tx_frm(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
                 pfrm += hpad;
 
                 /* Update network statistics. */
+                spin_lock_bh(&cfhsi->lock);
                 cfhsi->ndev->stats.tx_packets++;
                 cfhsi->ndev->stats.tx_bytes += skb->len;
+                cfhsi_update_aggregation_stats(cfhsi, skb, -1);
+                spin_unlock_bh(&cfhsi->lock);
 
                 /* Copy in CAIF frame. */
                 skb_copy_bits(skb, 0, pfrm, skb->len);
@@ -244,6 +319,8 @@ static int cfhsi_tx_frm(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
 
                 /* Update frame pointer. */
                 pfrm += skb->len + tpad;
+
+                /* Consume the SKB */
                 consume_skb(skb);
                 skb = NULL;
 
@@ -258,8 +335,7 @@ static int cfhsi_tx_frm(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
         }
 
         /* Check if we can piggy-back another descriptor. */
-        skb = skb_peek(&cfhsi->qhead);
-        if (skb)
+        if (cfhsi_can_send_aggregate(cfhsi))
                 desc->header |= CFHSI_PIGGY_DESC;
         else
                 desc->header &= ~CFHSI_PIGGY_DESC;
@@ -267,61 +343,71 @@ static int cfhsi_tx_frm(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
         return CFHSI_DESC_SZ + pld_len;
 }
 
-static void cfhsi_tx_done(struct cfhsi *cfhsi)
+static void cfhsi_start_tx(struct cfhsi *cfhsi)
 {
-        struct cfhsi_desc *desc = NULL;
-        int len = 0;
-        int res;
+        struct cfhsi_desc *desc = (struct cfhsi_desc *)cfhsi->tx_buf;
+        int len, res;
 
         dev_dbg(&cfhsi->ndev->dev, "%s.\n", __func__);
 
         if (test_bit(CFHSI_SHUTDOWN, &cfhsi->bits))
                 return;
 
-        desc = (struct cfhsi_desc *)cfhsi->tx_buf;
-
         do {
-                /*
-                 * Send flow on if flow off has been previously signalled
-                 * and number of packets is below low water mark.
-                 */
-                spin_lock_bh(&cfhsi->lock);
-                if (cfhsi->flow_off_sent &&
-                                cfhsi->qhead.qlen <= cfhsi->q_low_mark &&
-                                cfhsi->cfdev.flowctrl) {
-
-                        cfhsi->flow_off_sent = 0;
-                        cfhsi->cfdev.flowctrl(cfhsi->ndev, ON);
-                }
-                spin_unlock_bh(&cfhsi->lock);
-
                 /* Create HSI frame. */
-                do {
-                        len = cfhsi_tx_frm(desc, cfhsi);
-                        if (!len) {
-                                spin_lock_bh(&cfhsi->lock);
-                                if (unlikely(skb_peek(&cfhsi->qhead))) {
-                                        spin_unlock_bh(&cfhsi->lock);
-                                        continue;
-                                }
-                                cfhsi->tx_state = CFHSI_TX_STATE_IDLE;
-                                /* Start inactivity timer. */
-                                mod_timer(&cfhsi->timer,
-                                        jiffies + cfhsi->inactivity_timeout);
+                len = cfhsi_tx_frm(desc, cfhsi);
+                if (!len) {
+                        spin_lock_bh(&cfhsi->lock);
+                        if (unlikely(cfhsi_tx_queue_len(cfhsi))) {
                                 spin_unlock_bh(&cfhsi->lock);
-                                goto done;
+                                res = -EAGAIN;
+                                continue;
                         }
-                } while (!len);
+                        cfhsi->tx_state = CFHSI_TX_STATE_IDLE;
+                        /* Start inactivity timer. */
+                        mod_timer(&cfhsi->inactivity_timer,
+                                jiffies + cfhsi->inactivity_timeout);
+                        spin_unlock_bh(&cfhsi->lock);
+                        break;
+                }
 
                 /* Set up new transfer. */
                 res = cfhsi->dev->cfhsi_tx(cfhsi->tx_buf, len, cfhsi->dev);
-                if (WARN_ON(res < 0)) {
+                if (WARN_ON(res < 0))
                         dev_err(&cfhsi->ndev->dev, "%s: TX error %d.\n",
                                 __func__, res);
-                }
         } while (res < 0);
+}
+
+static void cfhsi_tx_done(struct cfhsi *cfhsi)
+{
+        dev_dbg(&cfhsi->ndev->dev, "%s.\n", __func__);
+
+        if (test_bit(CFHSI_SHUTDOWN, &cfhsi->bits))
+                return;
+
+        /*
+         * Send flow on if flow off has been previously signalled
+         * and number of packets is below low water mark.
+         */
+        spin_lock_bh(&cfhsi->lock);
+        if (cfhsi->flow_off_sent &&
+                        cfhsi_tx_queue_len(cfhsi) <= cfhsi->q_low_mark &&
+                        cfhsi->cfdev.flowctrl) {
+
+                cfhsi->flow_off_sent = 0;
+                cfhsi->cfdev.flowctrl(cfhsi->ndev, ON);
+        }
+
+        if (cfhsi_can_send_aggregate(cfhsi)) {
+                spin_unlock_bh(&cfhsi->lock);
+                cfhsi_start_tx(cfhsi);
+        } else {
+                mod_timer(&cfhsi->aggregation_timer,
+                        jiffies + cfhsi->aggregation_timeout);
+                spin_unlock_bh(&cfhsi->lock);
+        }
 
-done:
         return;
 }
 
@@ -560,7 +646,7 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
 
         /* Update inactivity timer if pending. */
         spin_lock_bh(&cfhsi->lock);
-        mod_timer_pending(&cfhsi->timer,
+        mod_timer_pending(&cfhsi->inactivity_timer,
                         jiffies + cfhsi->inactivity_timeout);
         spin_unlock_bh(&cfhsi->lock);
 
@@ -744,14 +830,14 @@ static void cfhsi_wake_up(struct work_struct *work)
                 size_t fifo_occupancy = 0;
 
                 /* Wakeup timeout */
-                dev_err(&cfhsi->ndev->dev, "%s: Timeout.\n",
+                dev_dbg(&cfhsi->ndev->dev, "%s: Timeout.\n",
                         __func__);
 
                 /* Check FIFO to check if modem has sent something. */
                 WARN_ON(cfhsi->dev->cfhsi_fifo_occupancy(cfhsi->dev,
                                         &fifo_occupancy));
 
-                dev_err(&cfhsi->ndev->dev, "%s: Bytes in FIFO: %u.\n",
+                dev_dbg(&cfhsi->ndev->dev, "%s: Bytes in FIFO: %u.\n",
                                 __func__, (unsigned) fifo_occupancy);
 
                 /* Check if we misssed the interrupt. */
@@ -793,12 +879,12 @@ wake_ack:
 
         spin_lock_bh(&cfhsi->lock);
 
-        /* Resume transmit if queue is not empty. */
-        if (!skb_peek(&cfhsi->qhead)) {
+        /* Resume transmit if queues are not empty. */
+        if (!cfhsi_tx_queue_len(cfhsi)) {
                 dev_dbg(&cfhsi->ndev->dev, "%s: Peer wake, start timer.\n",
                         __func__);
                 /* Start inactivity timer. */
-                mod_timer(&cfhsi->timer,
+                mod_timer(&cfhsi->inactivity_timer,
                                 jiffies + cfhsi->inactivity_timeout);
                 spin_unlock_bh(&cfhsi->lock);
                 return;
@@ -934,20 +1020,53 @@ static void cfhsi_wake_down_cb(struct cfhsi_drv *drv)
         wake_up_interruptible(&cfhsi->wake_down_wait);
 }
 
+static void cfhsi_aggregation_tout(unsigned long arg)
+{
+        struct cfhsi *cfhsi = (struct cfhsi *)arg;
+
+        dev_dbg(&cfhsi->ndev->dev, "%s.\n",
+                __func__);
+
+        cfhsi_start_tx(cfhsi);
+}
+
 static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct cfhsi *cfhsi = NULL;
         int start_xfer = 0;
         int timer_active;
+        int prio;
 
         if (!dev)
                 return -EINVAL;
 
         cfhsi = netdev_priv(dev);
 
+        switch (skb->priority) {
+        case TC_PRIO_BESTEFFORT:
+        case TC_PRIO_FILLER:
+        case TC_PRIO_BULK:
+                prio = CFHSI_PRIO_BEBK;
+                break;
+        case TC_PRIO_INTERACTIVE_BULK:
+                prio = CFHSI_PRIO_VI;
+                break;
+        case TC_PRIO_INTERACTIVE:
+                prio = CFHSI_PRIO_VO;
+                break;
+        case TC_PRIO_CONTROL:
+        default:
+                prio = CFHSI_PRIO_CTL;
+                break;
+        }
+
         spin_lock_bh(&cfhsi->lock);
 
-        skb_queue_tail(&cfhsi->qhead, skb);
+        /* Update aggregation statistics  */
+        cfhsi_update_aggregation_stats(cfhsi, skb, 1);
+
+        /* Queue the SKB */
+        skb_queue_tail(&cfhsi->qhead[prio], skb);
 
         /* Sanity check; xmit should not be called after unregister_netdev */
         if (WARN_ON(test_bit(CFHSI_SHUTDOWN, &cfhsi->bits))) {
@@ -958,7 +1077,7 @@ static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev)
 
         /* Send flow off if number of packets is above high water mark. */
         if (!cfhsi->flow_off_sent &&
-                cfhsi->qhead.qlen > cfhsi->q_high_mark &&
+                cfhsi_tx_queue_len(cfhsi) > cfhsi->q_high_mark &&
                 cfhsi->cfdev.flowctrl) {
                 cfhsi->flow_off_sent = 1;
                 cfhsi->cfdev.flowctrl(cfhsi->ndev, OFF);
@@ -970,12 +1089,18 @@ static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         if (!start_xfer) {
+                /* Send aggregate if it is possible */
+                bool aggregate_ready =
+                        cfhsi_can_send_aggregate(cfhsi) &&
+                        del_timer(&cfhsi->aggregation_timer) > 0;
                 spin_unlock_bh(&cfhsi->lock);
+                if (aggregate_ready)
+                        cfhsi_start_tx(cfhsi);
                 return 0;
         }
 
         /* Delete inactivity timer if started. */
-        timer_active = del_timer_sync(&cfhsi->timer);
+        timer_active = del_timer_sync(&cfhsi->inactivity_timer);
 
         spin_unlock_bh(&cfhsi->lock);
 
@@ -1004,28 +1129,11 @@ static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev)
         return 0;
 }
 
-static int cfhsi_open(struct net_device *dev)
-{
-        netif_wake_queue(dev);
-
-        return 0;
-}
-
-static int cfhsi_close(struct net_device *dev)
-{
-        netif_stop_queue(dev);
-
-        return 0;
-}
-
-static const struct net_device_ops cfhsi_ops = {
-        .ndo_open = cfhsi_open,
-        .ndo_stop = cfhsi_close,
-        .ndo_start_xmit = cfhsi_xmit
-};
+static const struct net_device_ops cfhsi_ops;
 
 static void cfhsi_setup(struct net_device *dev)
 {
+        int i;
         struct cfhsi *cfhsi = netdev_priv(dev);
         dev->features = 0;
         dev->netdev_ops = &cfhsi_ops;
@@ -1034,7 +1142,8 @@ static void cfhsi_setup(struct net_device *dev)
         dev->mtu = CFHSI_MAX_CAIF_FRAME_SZ;
         dev->tx_queue_len = 0;
         dev->destructor = free_netdev;
-        skb_queue_head_init(&cfhsi->qhead);
+        for (i = 0; i < CFHSI_PRIO_LAST; ++i)
+                skb_queue_head_init(&cfhsi->qhead[i]);
         cfhsi->cfdev.link_select = CAIF_LINK_HIGH_BANDW;
         cfhsi->cfdev.use_frag = false;
         cfhsi->cfdev.use_stx = false;
@@ -1046,7 +1155,7 @@ int cfhsi_probe(struct platform_device *pdev)
 {
         struct cfhsi *cfhsi = NULL;
         struct net_device *ndev;
-        struct cfhsi_dev *dev;
+
         int res;
 
         ndev = alloc_netdev(sizeof(struct cfhsi), "cfhsi%d", cfhsi_setup);
@@ -1057,6 +1166,34 @@ int cfhsi_probe(struct platform_device *pdev)
         cfhsi->ndev = ndev;
         cfhsi->pdev = pdev;
 
+        /* Assign the HSI device. */
+        cfhsi->dev = pdev->dev.platform_data;
+
+        /* Assign the driver to this HSI device. */
+        cfhsi->dev->drv = &cfhsi->drv;
+
+        /* Register network device. */
+        res = register_netdev(ndev);
+        if (res) {
+                dev_err(&ndev->dev, "%s: Registration error: %d.\n",
+                        __func__, res);
+                free_netdev(ndev);
+        }
+        /* Add CAIF HSI device to list. */
+        spin_lock(&cfhsi_list_lock);
+        list_add_tail(&cfhsi->list, &cfhsi_list);
+        spin_unlock(&cfhsi_list_lock);
+
+        return res;
+}
+
+static int cfhsi_open(struct net_device *ndev)
+{
+        struct cfhsi *cfhsi = netdev_priv(ndev);
+        int res;
+
+        clear_bit(CFHSI_SHUTDOWN, &cfhsi->bits);
+
         /* Initialize state vaiables. */
         cfhsi->tx_state = CFHSI_TX_STATE_IDLE;
         cfhsi->rx_state.state = CFHSI_RX_STATE_DESC;
@@ -1066,12 +1203,6 @@ int cfhsi_probe(struct platform_device *pdev)
         cfhsi->q_low_mark = LOW_WATER_MARK;
         cfhsi->q_high_mark = HIGH_WATER_MARK;
 
-        /* Assign the HSI device. */
-        dev = (struct cfhsi_dev *)pdev->dev.platform_data;
-        cfhsi->dev = dev;
-
-        /* Assign the driver to this HSI device. */
-        dev->drv = &cfhsi->drv;
 
         /*
          * Allocate a TX buffer with the size of a HSI packet descriptors
@@ -1111,6 +1242,9 @@ int cfhsi_probe(struct platform_device *pdev)
                 cfhsi->inactivity_timeout = NEXT_TIMER_MAX_DELTA;
         }
 
+        /* Initialize aggregation timeout */
+        cfhsi->aggregation_timeout = aggregation_timeout;
+
         /* Initialize recieve vaiables. */
         cfhsi->rx_ptr = cfhsi->rx_buf;
         cfhsi->rx_len = CFHSI_DESC_SZ;
@@ -1136,9 +1270,9 @@ int cfhsi_probe(struct platform_device *pdev)
         clear_bit(CFHSI_AWAKE, &cfhsi->bits);
 
         /* Create work thread. */
-        cfhsi->wq = create_singlethread_workqueue(pdev->name);
+        cfhsi->wq = create_singlethread_workqueue(cfhsi->pdev->name);
         if (!cfhsi->wq) {
-                dev_err(&ndev->dev, "%s: Failed to create work queue.\n",
+                dev_err(&cfhsi->ndev->dev, "%s: Failed to create work queue.\n",
                         __func__);
                 res = -ENODEV;
                 goto err_create_wq;
@@ -1150,18 +1284,17 @@ int cfhsi_probe(struct platform_device *pdev)
         init_waitqueue_head(&cfhsi->flush_fifo_wait);
 
         /* Setup the inactivity timer. */
-        init_timer(&cfhsi->timer);
-        cfhsi->timer.data = (unsigned long)cfhsi;
-        cfhsi->timer.function = cfhsi_inactivity_tout;
+        init_timer(&cfhsi->inactivity_timer);
+        cfhsi->inactivity_timer.data = (unsigned long)cfhsi;
+        cfhsi->inactivity_timer.function = cfhsi_inactivity_tout;
         /* Setup the slowpath RX timer. */
         init_timer(&cfhsi->rx_slowpath_timer);
         cfhsi->rx_slowpath_timer.data = (unsigned long)cfhsi;
         cfhsi->rx_slowpath_timer.function = cfhsi_rx_slowpath;
-
-        /* Add CAIF HSI device to list. */
-        spin_lock(&cfhsi_list_lock);
-        list_add_tail(&cfhsi->list, &cfhsi_list);
-        spin_unlock(&cfhsi_list_lock);
+        /* Setup the aggregation timer. */
+        init_timer(&cfhsi->aggregation_timer);
+        cfhsi->aggregation_timer.data = (unsigned long)cfhsi;
+        cfhsi->aggregation_timer.function = cfhsi_aggregation_tout;
 
         /* Activate HSI interface. */
         res = cfhsi->dev->cfhsi_up(cfhsi->dev);
@@ -1175,21 +1308,10 @@ int cfhsi_probe(struct platform_device *pdev)
         /* Flush FIFO */
         res = cfhsi_flush_fifo(cfhsi);
         if (res) {
-                dev_err(&ndev->dev, "%s: Can't flush FIFO: %d.\n",
+                dev_err(&cfhsi->ndev->dev, "%s: Can't flush FIFO: %d.\n",
                         __func__, res);
                 goto err_net_reg;
         }
-
-        /* Register network device. */
-        res = register_netdev(ndev);
-        if (res) {
-                dev_err(&ndev->dev, "%s: Registration error: %d.\n",
-                        __func__, res);
-                goto err_net_reg;
-        }
-
-        netif_stop_queue(ndev);
-
         return res;
 
  err_net_reg:
@@ -1203,17 +1325,13 @@ int cfhsi_probe(struct platform_device *pdev)
  err_alloc_rx:
         kfree(cfhsi->tx_buf);
  err_alloc_tx:
-        free_netdev(ndev);
-
         return res;
 }
 
-static void cfhsi_shutdown(struct cfhsi *cfhsi)
+static int cfhsi_close(struct net_device *ndev)
 {
-        u8 *tx_buf, *rx_buf;
-
-        /* Stop TXing */
-        netif_tx_stop_all_queues(cfhsi->ndev);
+        struct cfhsi *cfhsi = netdev_priv(ndev);
+        u8 *tx_buf, *rx_buf, *flip_buf;
 
         /* going to shutdown driver */
         set_bit(CFHSI_SHUTDOWN, &cfhsi->bits);
@@ -1222,8 +1340,9 @@ static void cfhsi_shutdown(struct cfhsi *cfhsi)
         flush_workqueue(cfhsi->wq);
 
         /* Delete timers if pending */
-        del_timer_sync(&cfhsi->timer);
+        del_timer_sync(&cfhsi->inactivity_timer);
         del_timer_sync(&cfhsi->rx_slowpath_timer);
+        del_timer_sync(&cfhsi->aggregation_timer);
 
         /* Cancel pending RX request (if any) */
         cfhsi->dev->cfhsi_rx_cancel(cfhsi->dev);
@@ -1234,21 +1353,26 @@ static void cfhsi_shutdown(struct cfhsi *cfhsi)
         /* Store bufferes: will be freed later. */
         tx_buf = cfhsi->tx_buf;
         rx_buf = cfhsi->rx_buf;
-
+        flip_buf = cfhsi->rx_flip_buf;
         /* Flush transmit queues. */
         cfhsi_abort_tx(cfhsi);
 
         /* Deactivate interface */
         cfhsi->dev->cfhsi_down(cfhsi->dev);
 
-        /* Finally unregister the network device. */
-        unregister_netdev(cfhsi->ndev);
-
         /* Free buffers. */
         kfree(tx_buf);
         kfree(rx_buf);
+        kfree(flip_buf);
+        return 0;
 }
 
+static const struct net_device_ops cfhsi_ops = {
+        .ndo_open = cfhsi_open,
+        .ndo_stop = cfhsi_close,
+        .ndo_start_xmit = cfhsi_xmit
+};
+
 int cfhsi_remove(struct platform_device *pdev)
 {
         struct list_head *list_node;
@@ -1265,10 +1389,6 @@ int cfhsi_remove(struct platform_device *pdev)
                         /* Remove from list. */
                         list_del(list_node);
                         spin_unlock(&cfhsi_list_lock);
-
-                        /* Shutdown driver. */
-                        cfhsi_shutdown(cfhsi);
-
                         return 0;
                 }
         }
@@ -1299,8 +1419,7 @@ static void __exit cfhsi_exit_module(void)
                 list_del(list_node);
                 spin_unlock(&cfhsi_list_lock);
 
-                /* Shutdown driver. */
-                cfhsi_shutdown(cfhsi);
+                unregister_netdevice(cfhsi->ndev);
 
                 spin_lock(&cfhsi_list_lock);
         }
@@ -1325,8 +1444,6 @@ static int __init cfhsi_init_module(void)
                 goto err_dev_register;
         }
 
-        return result;
-
  err_dev_register:
         return result;
 }
diff --git a/drivers/net/caif/caif_shmcore.c b/drivers/net/caif/caif_shmcore.c
index 5b2041319a32..bc497d718858 100644
--- a/drivers/net/caif/caif_shmcore.c
+++ b/drivers/net/caif/caif_shmcore.c
@@ -13,6 +13,7 @@
 #include <linux/list.h>
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
+#include <linux/io.h>
 
 #include <net/caif/caif_device.h>
 #include <net/caif/caif_shm.h>
@@ -647,6 +648,9 @@ int caif_shmcore_probe(struct shmdev_layer *pshm_dev)
                 if (pshm_dev->shm_loopback)
                         tx_buf->desc_vptr = (unsigned char *)tx_buf->phy_addr;
                 else
+                        /*
+                         * FIXME: the result of ioremap is not a pointer - arnd
+                         */
                         tx_buf->desc_vptr =
                                         ioremap(tx_buf->phy_addr, TX_BUF_SZ);
 
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index c5fe3a3db8c9..f03d7a481a80 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -687,18 +687,19 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)
 
         if (priv->do_get_state)
                 priv->do_get_state(dev, &state);
-        NLA_PUT_U32(skb, IFLA_CAN_STATE, state);
-        NLA_PUT(skb, IFLA_CAN_CTRLMODE, sizeof(cm), &cm);
-        NLA_PUT_U32(skb, IFLA_CAN_RESTART_MS, priv->restart_ms);
-        NLA_PUT(skb, IFLA_CAN_BITTIMING,
-                sizeof(priv->bittiming), &priv->bittiming);
-        NLA_PUT(skb, IFLA_CAN_CLOCK, sizeof(cm), &priv->clock);
-        if (priv->do_get_berr_counter && !priv->do_get_berr_counter(dev, &bec))
-                NLA_PUT(skb, IFLA_CAN_BERR_COUNTER, sizeof(bec), &bec);
-        if (priv->bittiming_const)
-                NLA_PUT(skb, IFLA_CAN_BITTIMING_CONST,
-                        sizeof(*priv->bittiming_const), priv->bittiming_const);
-
+        if (nla_put_u32(skb, IFLA_CAN_STATE, state) ||
+            nla_put(skb, IFLA_CAN_CTRLMODE, sizeof(cm), &cm) ||
+            nla_put_u32(skb, IFLA_CAN_RESTART_MS, priv->restart_ms) ||
+            nla_put(skb, IFLA_CAN_BITTIMING,
+                    sizeof(priv->bittiming), &priv->bittiming) ||
+            nla_put(skb, IFLA_CAN_CLOCK, sizeof(cm), &priv->clock) ||
+            (priv->do_get_berr_counter &&
+             !priv->do_get_berr_counter(dev, &bec) &&
+             nla_put(skb, IFLA_CAN_BERR_COUNTER, sizeof(bec), &bec)) ||
+            (priv->bittiming_const &&
+             nla_put(skb, IFLA_CAN_BITTIMING_CONST,
+                     sizeof(*priv->bittiming_const), priv->bittiming_const)))
+                goto nla_put_failure;
         return 0;
 
 nla_put_failure:
@@ -714,9 +715,9 @@ static int can_fill_xstats(struct sk_buff *skb, const struct net_device *dev)
 {
         struct can_priv *priv = netdev_priv(dev);
 
-        NLA_PUT(skb, IFLA_INFO_XSTATS,
-                sizeof(priv->can_stats), &priv->can_stats);
-
+        if (nla_put(skb, IFLA_INFO_XSTATS,
+                    sizeof(priv->can_stats), &priv->can_stats))
+                goto nla_put_failure;
         return 0;
 
 nla_put_failure:
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 2bb215e00eb1..1226297e7676 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -1274,17 +1274,7 @@ static struct pci_driver pch_can_pci_driver = {
         .resume = pch_can_resume,
 };
 
-static int __init pch_can_pci_init(void)
-{
-        return pci_register_driver(&pch_can_pci_driver);
-}
-module_init(pch_can_pci_init);
-
-static void __exit pch_can_pci_exit(void)
-{
-        pci_unregister_driver(&pch_can_pci_driver);
-}
-module_exit(pch_can_pci_exit);
+module_pci_driver(pch_can_pci_driver);
 
 MODULE_DESCRIPTION("Intel EG20T PCH CAN(Controller Area Network) Driver");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c
index 36f4f9780c30..5c6d412bafb5 100644
--- a/drivers/net/can/sja1000/ems_pci.c
+++ b/drivers/net/can/sja1000/ems_pci.c
@@ -371,16 +371,4 @@ static struct pci_driver ems_pci_driver = {
         .remove = ems_pci_del_card,
 };
 
-static int __init ems_pci_init(void)
-{
-        return pci_register_driver(&ems_pci_driver);
-}
-
-static void __exit ems_pci_exit(void)
-{
-        pci_unregister_driver(&ems_pci_driver);
-}
-
-module_init(ems_pci_init);
-module_exit(ems_pci_exit);
-
+module_pci_driver(ems_pci_driver);
diff --git a/drivers/net/can/sja1000/kvaser_pci.c b/drivers/net/can/sja1000/kvaser_pci.c
index ed004cebd31f..23ed6ea4c7c3 100644
--- a/drivers/net/can/sja1000/kvaser_pci.c
+++ b/drivers/net/can/sja1000/kvaser_pci.c
@@ -397,15 +397,4 @@ static struct pci_driver kvaser_pci_driver = {
         .remove = __devexit_p(kvaser_pci_remove_one),
 };
 
-static int __init kvaser_pci_init(void)
-{
-        return pci_register_driver(&kvaser_pci_driver);
-}
-
-static void __exit kvaser_pci_exit(void)
-{
-        pci_unregister_driver(&kvaser_pci_driver);
-}
-
-module_init(kvaser_pci_init);
-module_exit(kvaser_pci_exit);
+module_pci_driver(kvaser_pci_driver);
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c
index 5f92b865f64b..f0a12962f7b6 100644
--- a/drivers/net/can/sja1000/peak_pci.c
+++ b/drivers/net/can/sja1000/peak_pci.c
@@ -749,14 +749,4 @@ static struct pci_driver peak_pci_driver = {
         .remove = __devexit_p(peak_pci_remove),
 };
 
-static int __init peak_pci_init(void)
-{
-        return pci_register_driver(&peak_pci_driver);
-}
-module_init(peak_pci_init);
-
-static void __exit peak_pci_exit(void)
-{
-        pci_unregister_driver(&peak_pci_driver);
-}
-module_exit(peak_pci_exit);
+module_pci_driver(peak_pci_driver);
diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c
index a227586ddd52..8bc95982840f 100644
--- a/drivers/net/can/sja1000/plx_pci.c
+++ b/drivers/net/can/sja1000/plx_pci.c
@@ -609,15 +609,4 @@ static struct pci_driver plx_pci_driver = {
         .remove = plx_pci_del_card,
 };
 
-static int __init plx_pci_init(void)
-{
-        return pci_register_driver(&plx_pci_driver);
-}
-
-static void __exit plx_pci_exit(void)
-{
-        pci_unregister_driver(&plx_pci_driver);
-}
-
-module_init(plx_pci_init);
-module_exit(plx_pci_exit);
+module_pci_driver(plx_pci_driver);
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_pro.c b/drivers/net/can/usb/peak_usb/pcan_usb_pro.c
index 5234586dff15..629c4ba5d49d 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb_pro.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_pro.c
@@ -875,6 +875,7 @@ static int pcan_usb_pro_init(struct peak_usb_device *dev)
                                             PCAN_USBPRO_INFO_FW,
                                             &fi, sizeof(fi));
                 if (err) {
+                        kfree(usb_if);
                         dev_err(dev->netdev->dev.parent,
                                 "unable to read %s firmware info (err %d)\n",
                                 pcan_usb_pro.name, err);
@@ -885,6 +886,7 @@ static int pcan_usb_pro_init(struct peak_usb_device *dev)
                                             PCAN_USBPRO_INFO_BL,
                                             &bi, sizeof(bi));
                 if (err) {
+                        kfree(usb_if);
                         dev_err(dev->netdev->dev.parent,
                                 "unable to read %s bootloader info (err %d)\n",
                                 pcan_usb_pro.name, err);
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
index d5c6d92f1ee7..442d91a2747b 100644
--- a/drivers/net/dummy.c
+++ b/drivers/net/dummy.c
@@ -107,14 +107,14 @@ static int dummy_dev_init(struct net_device *dev)
         return 0;
 }
 
-static void dummy_dev_free(struct net_device *dev)
+static void dummy_dev_uninit(struct net_device *dev)
 {
         free_percpu(dev->dstats);
-        free_netdev(dev);
 }
 
 static const struct net_device_ops dummy_netdev_ops = {
         .ndo_init               = dummy_dev_init,
+        .ndo_uninit             = dummy_dev_uninit,
         .ndo_start_xmit         = dummy_xmit,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_set_rx_mode        = set_multicast_list,
@@ -128,7 +128,7 @@ static void dummy_setup(struct net_device *dev)
 
         /* Initialize the device structure. */
         dev->netdev_ops = &dummy_netdev_ops;
-        dev->destructor = dummy_dev_free;
+        dev->destructor = free_netdev;
 
         /* Fill in device structure with ethernet-generic values. */
         dev->tx_queue_len = 0;
diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c
index 41719da2e178..1a8eef2c3d58 100644
--- a/drivers/net/ethernet/3com/3c509.c
+++ b/drivers/net/ethernet/3com/3c509.c
@@ -69,7 +69,6 @@
 #define TX_TIMEOUT  (400*HZ/1000)
 
 #include <linux/module.h>
-#include <linux/mca.h>
 #include <linux/isa.h>
 #include <linux/pnp.h>
 #include <linux/string.h>
@@ -102,7 +101,7 @@ static int el3_debug = 2;
 #endif
 
 /* Used to do a global count of all the cards in the system.  Must be
- * a global variable so that the mca/eisa probe routines can increment
+ * a global variable so that the eisa probe routines can increment
  * it */
 static int el3_cards = 0;
 #define EL3_MAX_CARDS 8
@@ -163,7 +162,7 @@ enum RxFilter {
  */
 #define SKB_QUEUE_SIZE  64
 
-enum el3_cardtype { EL3_ISA, EL3_PNP, EL3_MCA, EL3_EISA };
+enum el3_cardtype { EL3_ISA, EL3_PNP, EL3_EISA };
 
 struct el3_private {
         spinlock_t lock;
@@ -505,41 +504,6 @@ static struct eisa_driver el3_eisa_driver = {
 static int eisa_registered;
 #endif
 
-#ifdef CONFIG_MCA
-static int el3_mca_probe(struct device *dev);
-
-static short el3_mca_adapter_ids[] __initdata = {
-                0x627c,
-                0x627d,
-                0x62db,
-                0x62f6,
-                0x62f7,
-                0x0000
-};
-
-static char *el3_mca_adapter_names[] __initdata = {
-                "3Com 3c529 EtherLink III (10base2)",
-                "3Com 3c529 EtherLink III (10baseT)",
-                "3Com 3c529 EtherLink III (test mode)",
-                "3Com 3c529 EtherLink III (TP or coax)",
-                "3Com 3c529 EtherLink III (TP)",
-                NULL
-};
-
-static struct mca_driver el3_mca_driver = {
-                .id_table = el3_mca_adapter_ids,
-                .driver = {
-                                .name = "3c529",
-                                .bus = &mca_bus_type,
-                                .probe = el3_mca_probe,
-                                .remove = __devexit_p(el3_device_remove),
-                                .suspend = el3_suspend,
-                                .resume  = el3_resume,
-                },
-};
-static int mca_registered;
-#endif /* CONFIG_MCA */
-
 static const struct net_device_ops netdev_ops = {
         .ndo_open               = el3_open,
         .ndo_stop               = el3_close,
@@ -600,76 +564,6 @@ static void el3_common_remove (struct net_device *dev)
         free_netdev (dev);
 }
 
-#ifdef CONFIG_MCA
-static int __init el3_mca_probe(struct device *device)
-{
-        /* Based on Erik Nygren's (nygren@mit.edu) 3c529 patch,
-         * heavily modified by Chris Beauregard
-         * (cpbeaure@csclub.uwaterloo.ca) to support standard MCA
-         * probing.
-         *
-         * redone for multi-card detection by ZP Gu (zpg@castle.net)
-         * now works as a module */
-
-        short i;
-        int ioaddr, irq, if_port;
-        __be16 phys_addr[3];
-        struct net_device *dev = NULL;
-        u_char pos4, pos5;
-        struct mca_device *mdev = to_mca_device(device);
-        int slot = mdev->slot;
-        int err;
-
-        pos4 = mca_device_read_stored_pos(mdev, 4);
-        pos5 = mca_device_read_stored_pos(mdev, 5);
-
-        ioaddr = ((short)((pos4&0xfc)|0x02)) << 8;
-        irq = pos5 & 0x0f;
-
-
-        pr_info("3c529: found %s at slot %d\n",
-                el3_mca_adapter_names[mdev->index], slot + 1);
-
-        /* claim the slot */
-        strncpy(mdev->name, el3_mca_adapter_names[mdev->index],
-                        sizeof(mdev->name));
-        mca_device_set_claim(mdev, 1);
-
-        if_port = pos4 & 0x03;
-
-        irq = mca_device_transform_irq(mdev, irq);
-        ioaddr = mca_device_transform_ioport(mdev, ioaddr);
-        if (el3_debug > 2) {
-                pr_debug("3c529: irq %d  ioaddr 0x%x  ifport %d\n", irq, ioaddr, if_port);
-        }
-        EL3WINDOW(0);
-        for (i = 0; i < 3; i++)
-                phys_addr[i] = htons(read_eeprom(ioaddr, i));
-
-        dev = alloc_etherdev(sizeof (struct el3_private));
-        if (dev == NULL) {
-                release_region(ioaddr, EL3_IO_EXTENT);
-                return -ENOMEM;
-        }
-
-        netdev_boot_setup_check(dev);
-
-        el3_dev_fill(dev, phys_addr, ioaddr, irq, if_port, EL3_MCA);
-        dev_set_drvdata(device, dev);
-        err = el3_common_init(dev);
-
-        if (err) {
-                dev_set_drvdata(device, NULL);
-                free_netdev(dev);
-                return -ENOMEM;
-        }
-
-        el3_devs[el3_cards++] = dev;
-        return 0;
-}
-
-#endif /* CONFIG_MCA */
-
 #ifdef CONFIG_EISA
 static int __init el3_eisa_probe (struct device *device)
 {
@@ -1547,11 +1441,6 @@ static int __init el3_init_module(void)
         if (!ret)
                 eisa_registered = 1;
 #endif
-#ifdef CONFIG_MCA
-        ret = mca_register_driver(&el3_mca_driver);
-        if (!ret)
-                mca_registered = 1;
-#endif
 
 #ifdef CONFIG_PNP
         if (pnp_registered)
@@ -1563,10 +1452,6 @@ static int __init el3_init_module(void)
         if (eisa_registered)
                 ret = 0;
 #endif
-#ifdef CONFIG_MCA
-        if (mca_registered)
-                ret = 0;
-#endif
         return ret;
 }
 
@@ -1584,10 +1469,6 @@ static void __exit el3_cleanup_module(void)
         if (eisa_registered)
                 eisa_driver_unregister(&el3_eisa_driver);
 #endif
-#ifdef CONFIG_MCA
-        if (mca_registered)
-                mca_unregister_driver(&el3_mca_driver);
-#endif
 }
 
 module_init (el3_init_module);
diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig
index e04ade444247..2e538676924d 100644
--- a/drivers/net/ethernet/8390/Kconfig
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -60,6 +60,7 @@ config PCMCIA_AXNET
 config AX88796
         tristate "ASIX AX88796 NE2000 clone support"
         depends on (ARM || MIPS || SUPERH)
+        select CRC32
         select PHYLIB
         select MDIO_BITBANG
         ---help---
@@ -181,18 +182,6 @@ config NE2000
           To compile this driver as a module, choose M here. The module
           will be called ne.
 
-config NE2_MCA
-        tristate "NE/2 (ne2000 MCA version) support"
-        depends on MCA_LEGACY
-        select CRC32
-        ---help---
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-
-          To compile this driver as a module, choose M here. The module
-          will be called ne2.
-
 config NE2K_PCI
         tristate "PCI NE2000 and clones support (see help)"
         depends on PCI
@@ -266,18 +255,6 @@ config STNIC
 
           If unsure, say N.
 
-config ULTRAMCA
-        tristate "SMC Ultra MCA support"
-        depends on MCA
-        select CRC32
-        ---help---
-          If you have a network (Ethernet) card of this type and are running
-          an MCA based system (PS/2), say Y and read the Ethernet-HOWTO,
-          available from <http://www.tldp.org/docs.html#howto>.
-
-          To compile this driver as a module, choose M here. The module
-          will be called smc-mca.
-
 config ULTRA
         tristate "SMC Ultra support"
         depends on ISA
diff --git a/drivers/net/ethernet/8390/Makefile b/drivers/net/ethernet/8390/Makefile
index 3337d7fb4344..d13790b7fd27 100644
--- a/drivers/net/ethernet/8390/Makefile
+++ b/drivers/net/ethernet/8390/Makefile
@@ -24,6 +24,5 @@ obj-$(CONFIG_PCMCIA_PCNET) += pcnet_cs.o 8390.o
 obj-$(CONFIG_STNIC) += stnic.o 8390.o
 obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o
 obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o
-obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o
 obj-$(CONFIG_WD80x3) += wd.o 8390.o
 obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
index 11476ca95e93..203ff9dccadb 100644
--- a/drivers/net/ethernet/8390/ax88796.c
+++ b/drivers/net/ethernet/8390/ax88796.c
@@ -501,6 +501,7 @@ static const struct ethtool_ops ax_ethtool_ops = {
         .get_settings           = ax_get_settings,
         .set_settings           = ax_set_settings,
         .get_link               = ethtool_op_get_link,
+        .get_ts_info            = ethtool_op_get_ts_info,
 };
 
 #ifdef CONFIG_AX88796_93CX6
diff --git a/drivers/net/ethernet/8390/etherh.c b/drivers/net/ethernet/8390/etherh.c
index dbefd5658c14..8322c54972f3 100644
--- a/drivers/net/ethernet/8390/etherh.c
+++ b/drivers/net/ethernet/8390/etherh.c
@@ -635,6 +635,7 @@ static const struct ethtool_ops etherh_ethtool_ops = {
         .get_settings   = etherh_get_settings,
         .set_settings   = etherh_set_settings,
         .get_drvinfo    = etherh_get_drvinfo,
+        .get_ts_info    = ethtool_op_get_ts_info,
 };
 
 static const struct net_device_ops etherh_netdev_ops = {
diff --git a/drivers/net/ethernet/8390/ne2.c b/drivers/net/ethernet/8390/ne2.c
deleted file mode 100644
index ef85839f43d8..000000000000
--- a/drivers/net/ethernet/8390/ne2.c
+++ /dev/null
@@ -1,798 +0,0 @@
-/* ne2.c: A NE/2 Ethernet Driver for Linux. */
-/*
-   Based on the NE2000 driver written by Donald Becker (1992-94).
-   modified by Wim Dumon (Apr 1996)
-
-   This software may be used and distributed according to the terms
-   of the GNU General Public License, incorporated herein by reference.
-
-   The author may be reached as wimpie@linux.cc.kuleuven.ac.be
-
-   Currently supported: NE/2
-   This patch was never tested on other MCA-ethernet adapters, but it
-   might work. Just give it a try and let me know if you have problems.
-   Also mail me if it really works, please!
-
-   Changelog:
-   Mon Feb  3 16:26:02 MET 1997
-   - adapted the driver to work with the 2.1.25 kernel
-   - multiple ne2 support (untested)
-   - module support (untested)
-
-   Fri Aug 28 00:18:36 CET 1998 (David Weinehall)
-   - fixed a few minor typos
-   - made the MODULE_PARM conditional (it only works with the v2.1.x kernels)
-   - fixed the module support (Now it's working...)
-
-   Mon Sep  7 19:01:44 CET 1998 (David Weinehall)
-   - added support for Arco Electronics AE/2-card (experimental)
-
-   Mon Sep 14 09:53:42 CET 1998 (David Weinehall)
-   - added support for Compex ENET-16MC/P (experimental)
-
-   Tue Sep 15 16:21:12 CET 1998 (David Weinehall, Magnus Jonsson, Tomas Ogren)
-   - Miscellaneous bugfixes
-
-   Tue Sep 19 16:21:12 CET 1998 (Magnus Jonsson)
-   - Cleanup
-
-   Wed Sep 23 14:33:34 CET 1998 (David Weinehall)
-   - Restructuring and rewriting for v2.1.x compliance
-
-   Wed Oct 14 17:19:21 CET 1998 (David Weinehall)
-   - Added code that unregisters irq and proc-info
-   - Version# bump
-
-   Mon Nov 16 15:28:23 CET 1998 (Wim Dumon)
-   - pass 'dev' as last parameter of request_irq in stead of 'NULL'
-
-   Wed Feb  7 21:24:00 CET 2001 (Alfred Arnold)
-   - added support for the D-Link DE-320CT
-
-   *    WARNING
-        -------
-        This is alpha-test software.  It is not guaranteed to work. As a
-        matter of fact, I'm quite sure there are *LOTS* of bugs in here. I
-        would like to hear from you if you use this driver, even if it works.
-        If it doesn't work, be sure to send me a mail with the problems !
-*/
-
-static const char *version = "ne2.c:v0.91 Nov 16 1998 Wim Dumon <wimpie@kotnet.org>\n";
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/fcntl.h>
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/in.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/mca-legacy.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/bitops.h>
-#include <linux/jiffies.h>
-
-#include <asm/io.h>
-#include <asm/dma.h>
-
-#include "8390.h"
-
-#define DRV_NAME "ne2"
-
-/* Some defines that people can play with if so inclined. */
-
-/* Do we perform extra sanity checks on stuff ? */
-/* #define NE_SANITY_CHECK */
-
-/* Do we implement the read before write bugfix ? */
-/* #define NE_RW_BUGFIX */
-
-/* Do we have a non std. amount of memory? (in units of 256 byte pages) */
-/* #define PACKETBUF_MEMSIZE    0x40 */
-
-
-/* ---- No user-serviceable parts below ---- */
-
-#define NE_BASE  (dev->base_addr)
-#define NE_CMD          0x00
-#define NE_DATAPORT     0x10    /* NatSemi-defined port window offset. */
-#define NE_RESET        0x20    /* Issue a read to reset, a write to clear. */
-#define NE_IO_EXTENT    0x30
-
-#define NE1SM_START_PG  0x20    /* First page of TX buffer */
-#define NE1SM_STOP_PG   0x40    /* Last page +1 of RX ring */
-#define NESM_START_PG   0x40    /* First page of TX buffer */
-#define NESM_STOP_PG    0x80    /* Last page +1 of RX ring */
-
-/* From the .ADF file: */
-static unsigned int addresses[7] __initdata =
-                {0x1000, 0x2020, 0x8020, 0xa0a0, 0xb0b0, 0xc0c0, 0xc3d0};
-static int irqs[4] __initdata = {3, 4, 5, 9};
-
-/* From the D-Link ADF file: */
-static unsigned int dlink_addresses[4] __initdata =
-                {0x300, 0x320, 0x340, 0x360};
-static int dlink_irqs[8] __initdata = {3, 4, 5, 9, 10, 11, 14, 15};
-
-struct ne2_adapters_t {
-        unsigned int    id;
-        char            *name;
-};
-
-static struct ne2_adapters_t ne2_adapters[] __initdata = {
-        { 0x6354, "Arco Ethernet Adapter AE/2" },
-        { 0x70DE, "Compex ENET-16 MC/P" },
-        { 0x7154, "Novell Ethernet Adapter NE/2" },
-        { 0x56ea, "D-Link DE-320CT" },
-        { 0x0000, NULL }
-};
-
-extern int netcard_probe(struct net_device *dev);
-
-static int ne2_probe1(struct net_device *dev, int slot);
-
-static void ne_reset_8390(struct net_device *dev);
-static void ne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
-                int ring_page);
-static void ne_block_input(struct net_device *dev, int count,
-                struct sk_buff *skb, int ring_offset);
-static void ne_block_output(struct net_device *dev, const int count,
-                const unsigned char *buf, const int start_page);
-
-
-/*
- * special code to read the DE-320's MAC address EEPROM.  In contrast to a
- * standard NE design, this is a serial EEPROM (93C46) that has to be read
- * bit by bit.  The EEPROM cotrol port at base + 0x1e has the following
- * layout:
- *
- * Bit 0 = Data out (read from EEPROM)
- * Bit 1 = Data in  (write to EEPROM)
- * Bit 2 = Clock
- * Bit 3 = Chip Select
- * Bit 7 = ~50 kHz clock for defined delays
- *
- */
-
-static void __init dlink_put_eeprom(unsigned char value, unsigned int addr)
-{
-        int z;
-        unsigned char v1, v2;
-
-        /* write the value to the NIC EEPROM register */
-
-        outb(value, addr + 0x1e);
-
-        /* now wait the clock line to toggle twice.  Effectively, we are
-           waiting (at least) for one clock cycle */
-
-        for (z = 0; z < 2; z++) {
-                do {
-                        v1 = inb(addr + 0x1e);
-                        v2 = inb(addr + 0x1e);
-                }
-                while (!((v1 ^ v2) & 0x80));
-        }
-}
-
-static void __init dlink_send_eeprom_bit(unsigned int bit, unsigned int addr)
-{
-        /* shift data bit into correct position */
-
-        bit = bit << 1;
-
-        /* write value, keep clock line high for two cycles */
-
-        dlink_put_eeprom(0x09 | bit, addr);
-        dlink_put_eeprom(0x0d | bit, addr);
-        dlink_put_eeprom(0x0d | bit, addr);
-        dlink_put_eeprom(0x09 | bit, addr);
-}
-
-static void __init dlink_send_eeprom_word(unsigned int value, unsigned int len, unsigned int addr)
-{
-        int z;
-
-        /* adjust bits so that they are left-aligned in a 16-bit-word */
-
-        value = value << (16 - len);
-
-        /* shift bits out to the EEPROM */
-
-        for (z = 0; z < len; z++) {
-                dlink_send_eeprom_bit((value & 0x8000) >> 15, addr);
-                value = value << 1;
-        }
-}
-
-static unsigned int __init dlink_get_eeprom(unsigned int eeaddr, unsigned int addr)
-{
-        int z;
-        unsigned int value = 0;
-
-        /* pull the CS line low for a moment.  This resets the EEPROM-
-           internal logic, and makes it ready for a new command. */
-
-        dlink_put_eeprom(0x01, addr);
-        dlink_put_eeprom(0x09, addr);
-
-        /* send one start bit, read command (1 - 0), plus the address to
-           the EEPROM */
-
-        dlink_send_eeprom_word(0x0180 | (eeaddr & 0x3f), 9, addr);
-
-        /* get the data word.  We clock by sending 0s to the EEPROM, which
-           get ignored during the read process */
-
-        for (z = 0; z < 16; z++) {
-                dlink_send_eeprom_bit(0, addr);
-                value = (value << 1) | (inb(addr + 0x1e) & 0x01);
-        }
-
-        return value;
-}
-
-/*
- * Note that at boot, this probe only picks up one card at a time.
- */
-
-static int __init do_ne2_probe(struct net_device *dev)
-{
-        static int current_mca_slot = -1;
-        int i;
-        int adapter_found = 0;
-
-        /* Do not check any supplied i/o locations.
-           POS registers usually don't fail :) */
-
-        /* MCA cards have POS registers.
-           Autodetecting MCA cards is extremely simple.
-           Just search for the card. */
-
-        for(i = 0; (ne2_adapters[i].name != NULL) && !adapter_found; i++) {
-                current_mca_slot =
-                        mca_find_unused_adapter(ne2_adapters[i].id, 0);
-
-                if((current_mca_slot != MCA_NOTFOUND) && !adapter_found) {
-                        int res;
-                        mca_set_adapter_name(current_mca_slot,
-                                        ne2_adapters[i].name);
-                        mca_mark_as_used(current_mca_slot);
-
-                        res = ne2_probe1(dev, current_mca_slot);
-                        if (res)
-                                mca_mark_as_unused(current_mca_slot);
-                        return res;
-                }
-        }
-        return -ENODEV;
-}
-
-#ifndef MODULE
-struct net_device * __init ne2_probe(int unit)
-{
-        struct net_device *dev = alloc_eip_netdev();
-        int err;
-
-        if (!dev)
-                return ERR_PTR(-ENOMEM);
-
-        sprintf(dev->name, "eth%d", unit);
-        netdev_boot_setup_check(dev);
-
-        err = do_ne2_probe(dev);
-        if (err)
-                goto out;
-        return dev;
-out:
-        free_netdev(dev);
-        return ERR_PTR(err);
-}
-#endif
-
-static int ne2_procinfo(char *buf, int slot, struct net_device *dev)
-{
-        int len=0;
-
-        len += sprintf(buf+len, "The NE/2 Ethernet Adapter\n" );
-        len += sprintf(buf+len, "Driver written by Wim Dumon ");
-        len += sprintf(buf+len, "<wimpie@kotnet.org>\n");
-        len += sprintf(buf+len, "Modified by ");
-        len += sprintf(buf+len, "David Weinehall <tao@acc.umu.se>\n");
-        len += sprintf(buf+len, "and by Magnus Jonsson <bigfoot@acc.umu.se>\n");
-        len += sprintf(buf+len, "Based on the original NE2000 drivers\n" );
-        len += sprintf(buf+len, "Base IO: %#x\n", (unsigned int)dev->base_addr);
-        len += sprintf(buf+len, "IRQ    : %d\n", dev->irq);
-        len += sprintf(buf+len, "HW addr : %pM\n", dev->dev_addr);
-
-        return len;
-}
-
-static int __init ne2_probe1(struct net_device *dev, int slot)
-{
-        int i, base_addr, irq, retval;
-        unsigned char POS;
-        unsigned char SA_prom[32];
-        const char *name = "NE/2";
-        int start_page, stop_page;
-        static unsigned version_printed;
-
-        if (ei_debug && version_printed++ == 0)
-                printk(version);
-
-        printk("NE/2 ethercard found in slot %d:", slot);
-
-        /* Read base IO and IRQ from the POS-registers */
-        POS = mca_read_stored_pos(slot, 2);
-        if(!(POS % 2)) {
-                printk(" disabled.\n");
-                return -ENODEV;
-        }
-
-        /* handle different POS register structure for D-Link card */
-
-        if (mca_read_stored_pos(slot, 0) == 0xea) {
-                base_addr = dlink_addresses[(POS >> 5) & 0x03];
-                irq = dlink_irqs[(POS >> 2) & 0x07];
-        }
-        else {
-                i = (POS & 0xE)>>1;
-                /* printk("Halleluja sdog, als er na de pijl een 1 staat is 1 - 1 == 0"
-                " en zou het moeten werken -> %d\n", i);
-                The above line was for remote testing, thanx to sdog ... */
-                base_addr = addresses[i - 1];
-                irq = irqs[(POS & 0x60)>>5];
-        }
-
-        if (!request_region(base_addr, NE_IO_EXTENT, DRV_NAME))
-                return -EBUSY;
-
-#ifdef DEBUG
-        printk("POS info : pos 2 = %#x ; base = %#x ; irq = %ld\n", POS,
-                        base_addr, irq);
-#endif
-
-#ifndef CRYNWR_WAY
-        /* Reset the card the way they do it in the Crynwr packet driver */
-        for (i=0; i<8; i++)
-                outb(0x0, base_addr + NE_RESET);
-        inb(base_addr + NE_RESET);
-        outb(0x21, base_addr + NE_CMD);
-        if (inb(base_addr + NE_CMD) != 0x21) {
-                printk("NE/2 adapter not responding\n");
-                retval = -ENODEV;
-                goto out;
-        }
-
-        /* In the crynwr sources they do a RAM-test here. I skip it. I suppose
-           my RAM is okay.  Suppose your memory is broken.  Then this test
-           should fail and you won't be able to use your card.  But if I do not
-           test, you won't be able to use your card, neither.  So this test
-           won't help you. */
-
-#else  /* _I_ never tested it this way .. Go ahead and try ...*/
-        /* Reset card. Who knows what dain-bramaged state it was left in. */
-        {
-                unsigned long reset_start_time = jiffies;
-
-                /* DON'T change these to inb_p/outb_p or reset will fail on
-                   clones.. */
-                outb(inb(base_addr + NE_RESET), base_addr + NE_RESET);
-
-                while ((inb_p(base_addr + EN0_ISR) & ENISR_RESET) == 0)
-                        if (time_after(jiffies, reset_start_time + 2*HZ/100)) {
-                                printk(" not found (no reset ack).\n");
-                                retval = -ENODEV;
-                                goto out;
-                        }
-
-                outb_p(0xff, base_addr + EN0_ISR);         /* Ack all intr. */
-        }
-#endif
-
-
-        /* Read the 16 bytes of station address PROM.
-           We must first initialize registers, similar to
-           NS8390p_init(eifdev, 0).
-           We can't reliably read the SAPROM address without this.
-           (I learned the hard way!). */
-        {
-                struct {
-                        unsigned char value, offset;
-                } program_seq[] = {
-                                                /* Select page 0 */
-                        {E8390_NODMA+E8390_PAGE0+E8390_STOP, E8390_CMD},
-                        {0x49,  EN0_DCFG},  /* Set WORD-wide (0x49) access. */
-                        {0x00,  EN0_RCNTLO},  /* Clear the count regs. */
-                        {0x00,  EN0_RCNTHI},
-                        {0x00,  EN0_IMR},  /* Mask completion irq. */
-                        {0xFF,  EN0_ISR},
-                        {E8390_RXOFF, EN0_RXCR},  /* 0x20  Set to monitor */
-                        {E8390_TXOFF, EN0_TXCR},  /* 0x02  and loopback mode. */
-                        {32,    EN0_RCNTLO},
-                        {0x00,  EN0_RCNTHI},
-                        {0x00,  EN0_RSARLO},  /* DMA starting at 0x0000. */
-                        {0x00,  EN0_RSARHI},
-                        {E8390_RREAD+E8390_START, E8390_CMD},
-                };
-
-                for (i = 0; i < ARRAY_SIZE(program_seq); i++)
-                        outb_p(program_seq[i].value, base_addr +
-                                program_seq[i].offset);
-
-        }
-        for(i = 0; i < 6 /*sizeof(SA_prom)*/; i+=1) {
-                SA_prom[i] = inb(base_addr + NE_DATAPORT);
-        }
-
-        /* I don't know whether the previous sequence includes the general
-           board reset procedure, so better don't omit it and just overwrite
-           the garbage read from a DE-320 with correct stuff. */
-
-        if (mca_read_stored_pos(slot, 0) == 0xea) {
-                unsigned int v;
-
-                for (i = 0; i < 3; i++) {
-                        v = dlink_get_eeprom(i, base_addr);
-                        SA_prom[(i << 1)    ] = v & 0xff;
-                        SA_prom[(i << 1) + 1] = (v >> 8) & 0xff;
-                }
-        }
-
-        start_page = NESM_START_PG;
-        stop_page = NESM_STOP_PG;
-
-        dev->irq=irq;
-
-        /* Snarf the interrupt now.  There's no point in waiting since we cannot
-           share and the board will usually be enabled. */
-        retval = request_irq(dev->irq, eip_interrupt, 0, DRV_NAME, dev);
-        if (retval) {
-                printk (" unable to get IRQ %d (irqval=%d).\n",
-                                dev->irq, retval);
-                goto out;
-        }
-
-        dev->base_addr = base_addr;
-
-        for (i = 0; i < ETH_ALEN; i++)
-                dev->dev_addr[i] = SA_prom[i];
-
-        printk(" %pM\n", dev->dev_addr);
-
-        printk("%s: %s found at %#x, using IRQ %d.\n",
-                        dev->name, name, base_addr, dev->irq);
-
-        mca_set_adapter_procfn(slot, (MCA_ProcFn) ne2_procinfo, dev);
-
-        ei_status.name = name;
-        ei_status.tx_start_page = start_page;
-        ei_status.stop_page = stop_page;
-        ei_status.word16 = (2 == 2);
-
-        ei_status.rx_start_page = start_page + TX_PAGES;
-#ifdef PACKETBUF_MEMSIZE
-        /* Allow the packet buffer size to be overridden by know-it-alls. */
-        ei_status.stop_page = ei_status.tx_start_page + PACKETBUF_MEMSIZE;
-#endif
-
-        ei_status.reset_8390 = &ne_reset_8390;
-        ei_status.block_input = &ne_block_input;
-        ei_status.block_output = &ne_block_output;
-        ei_status.get_8390_hdr = &ne_get_8390_hdr;
-
-        ei_status.priv = slot;
-
-        dev->netdev_ops = &eip_netdev_ops;
-        NS8390p_init(dev, 0);
-
-        retval = register_netdev(dev);
-        if (retval)
-                goto out1;
-        return 0;
-out1:
-        mca_set_adapter_procfn( ei_status.priv, NULL, NULL);
-        free_irq(dev->irq, dev);
-out:
-        release_region(base_addr, NE_IO_EXTENT);
-        return retval;
-}
-
-/* Hard reset the card.  This used to pause for the same period that a
-   8390 reset command required, but that shouldn't be necessary. */
-static void ne_reset_8390(struct net_device *dev)
-{
-        unsigned long reset_start_time = jiffies;
-
-        if (ei_debug > 1)
-                printk("resetting the 8390 t=%ld...", jiffies);
-
-        /* DON'T change these to inb_p/outb_p or reset will fail on clones. */
-        outb(inb(NE_BASE + NE_RESET), NE_BASE + NE_RESET);
-
-        ei_status.txing = 0;
-        ei_status.dmaing = 0;
-
-        /* This check _should_not_ be necessary, omit eventually. */
-        while ((inb_p(NE_BASE+EN0_ISR) & ENISR_RESET) == 0)
-                if (time_after(jiffies, reset_start_time + 2*HZ/100)) {
-                        printk("%s: ne_reset_8390() did not complete.\n",
-                                        dev->name);
-                        break;
-                }
-        outb_p(ENISR_RESET, NE_BASE + EN0_ISR); /* Ack intr. */
-}
-
-/* Grab the 8390 specific header. Similar to the block_input routine, but
-   we don't need to be concerned with ring wrap as the header will be at
-   the start of a page, so we optimize accordingly. */
-
-static void ne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
-                int ring_page)
-{
-
-        int nic_base = dev->base_addr;
-
-        /* This *shouldn't* happen.
-           If it does, it's the last thing you'll see */
-        if (ei_status.dmaing) {
-                printk("%s: DMAing conflict in ne_get_8390_hdr "
-                                "[DMAstat:%d][irqlock:%d].\n",
-                                dev->name, ei_status.dmaing, ei_status.irqlock);
-                return;
-        }
-
-        ei_status.dmaing |= 0x01;
-        outb_p(E8390_NODMA+E8390_PAGE0+E8390_START, nic_base+ NE_CMD);
-        outb_p(sizeof(struct e8390_pkt_hdr), nic_base + EN0_RCNTLO);
-        outb_p(0, nic_base + EN0_RCNTHI);
-        outb_p(0, nic_base + EN0_RSARLO);               /* On page boundary */
-        outb_p(ring_page, nic_base + EN0_RSARHI);
-        outb_p(E8390_RREAD+E8390_START, nic_base + NE_CMD);
-
-        if (ei_status.word16)
-                insw(NE_BASE + NE_DATAPORT, hdr,
-                                sizeof(struct e8390_pkt_hdr)>>1);
-        else
-                insb(NE_BASE + NE_DATAPORT, hdr,
-                                sizeof(struct e8390_pkt_hdr));
-
-        outb_p(ENISR_RDC, nic_base + EN0_ISR);  /* Ack intr. */
-        ei_status.dmaing &= ~0x01;
-}
-
-/* Block input and output, similar to the Crynwr packet driver.  If you
-   are porting to a new ethercard, look at the packet driver source for
-   hints. The NEx000 doesn't share the on-board packet memory -- you have
-   to put the packet out through the "remote DMA" dataport using outb. */
-
-static void ne_block_input(struct net_device *dev, int count, struct sk_buff *skb,
-                int ring_offset)
-{
-#ifdef NE_SANITY_CHECK
-        int xfer_count = count;
-#endif
-        int nic_base = dev->base_addr;
-        char *buf = skb->data;
-
-        /* This *shouldn't* happen.
-           If it does, it's the last thing you'll see */
-        if (ei_status.dmaing) {
-                printk("%s: DMAing conflict in ne_block_input "
-                                "[DMAstat:%d][irqlock:%d].\n",
-                                dev->name, ei_status.dmaing, ei_status.irqlock);
-                return;
-        }
-        ei_status.dmaing |= 0x01;
-        outb_p(E8390_NODMA+E8390_PAGE0+E8390_START, nic_base+ NE_CMD);
-        outb_p(count & 0xff, nic_base + EN0_RCNTLO);
-        outb_p(count >> 8, nic_base + EN0_RCNTHI);
-        outb_p(ring_offset & 0xff, nic_base + EN0_RSARLO);
-        outb_p(ring_offset >> 8, nic_base + EN0_RSARHI);
-        outb_p(E8390_RREAD+E8390_START, nic_base + NE_CMD);
-        if (ei_status.word16) {
-                insw(NE_BASE + NE_DATAPORT,buf,count>>1);
-                if (count & 0x01) {
-                        buf[count-1] = inb(NE_BASE + NE_DATAPORT);
-#ifdef NE_SANITY_CHECK
-                        xfer_count++;
-#endif
-                }
-        } else {
-                insb(NE_BASE + NE_DATAPORT, buf, count);
-        }
-
-#ifdef NE_SANITY_CHECK
-        /* This was for the ALPHA version only, but enough people have
-           been encountering problems so it is still here.  If you see
-           this message you either 1) have a slightly incompatible clone
-           or 2) have noise/speed problems with your bus. */
-        if (ei_debug > 1) {     /* DMA termination address check... */
-                int addr, tries = 20;
-                do {
-                        /* DON'T check for 'inb_p(EN0_ISR) & ENISR_RDC' here
-                           -- it's broken for Rx on some cards! */
-                        int high = inb_p(nic_base + EN0_RSARHI);
-                        int low = inb_p(nic_base + EN0_RSARLO);
-                        addr = (high << 8) + low;
-                        if (((ring_offset + xfer_count) & 0xff) == low)
-                                break;
-                } while (--tries > 0);
-                if (tries <= 0)
-                        printk("%s: RX transfer address mismatch,"
-                                "%#4.4x (expected) vs. %#4.4x (actual).\n",
-                                dev->name, ring_offset + xfer_count, addr);
-        }
-#endif
-        outb_p(ENISR_RDC, nic_base + EN0_ISR);  /* Ack intr. */
-        ei_status.dmaing &= ~0x01;
-}
-
-static void ne_block_output(struct net_device *dev, int count,
-                const unsigned char *buf, const int start_page)
-{
-        int nic_base = NE_BASE;
-        unsigned long dma_start;
-#ifdef NE_SANITY_CHECK
-        int retries = 0;
-#endif
-
-        /* Round the count up for word writes. Do we need to do this?
-           What effect will an odd byte count have on the 8390?
-           I should check someday. */
-        if (ei_status.word16 && (count & 0x01))
-                count++;
-
-        /* This *shouldn't* happen.
-           If it does, it's the last thing you'll see */
-        if (ei_status.dmaing) {
-                printk("%s: DMAing conflict in ne_block_output."
-                                "[DMAstat:%d][irqlock:%d]\n",
-                                dev->name, ei_status.dmaing, ei_status.irqlock);
-                return;
-        }
-        ei_status.dmaing |= 0x01;
-        /* We should already be in page 0, but to be safe... */
-        outb_p(E8390_PAGE0+E8390_START+E8390_NODMA, nic_base + NE_CMD);
-
-#ifdef NE_SANITY_CHECK
-retry:
-#endif
-
-#ifdef NE8390_RW_BUGFIX
-        /* Handle the read-before-write bug the same way as the
-           Crynwr packet driver -- the NatSemi method doesn't work.
-           Actually this doesn't always work either, but if you have
-           problems with your NEx000 this is better than nothing! */
-        outb_p(0x42, nic_base + EN0_RCNTLO);
-        outb_p(0x00, nic_base + EN0_RCNTHI);
-        outb_p(0x42, nic_base + EN0_RSARLO);
-        outb_p(0x00, nic_base + EN0_RSARHI);
-        outb_p(E8390_RREAD+E8390_START, nic_base + NE_CMD);
-        /* Make certain that the dummy read has occurred. */
-        SLOW_DOWN_IO;
-        SLOW_DOWN_IO;
-        SLOW_DOWN_IO;
-#endif
-
-        outb_p(ENISR_RDC, nic_base + EN0_ISR);
-
-        /* Now the normal output. */
-        outb_p(count & 0xff, nic_base + EN0_RCNTLO);
-        outb_p(count >> 8,   nic_base + EN0_RCNTHI);
-        outb_p(0x00, nic_base + EN0_RSARLO);
-        outb_p(start_page, nic_base + EN0_RSARHI);
-
-        outb_p(E8390_RWRITE+E8390_START, nic_base + NE_CMD);
-        if (ei_status.word16) {
-                outsw(NE_BASE + NE_DATAPORT, buf, count>>1);
-        } else {
-                outsb(NE_BASE + NE_DATAPORT, buf, count);
-        }
-
-        dma_start = jiffies;
-
-#ifdef NE_SANITY_CHECK
-        /* This was for the ALPHA version only, but enough people have
-           been encountering problems so it is still here. */
-
-        if (ei_debug > 1) {             /* DMA termination address check... */
-                int addr, tries = 20;
-                do {
-                        int high = inb_p(nic_base + EN0_RSARHI);
-                        int low = inb_p(nic_base + EN0_RSARLO);
-                        addr = (high << 8) + low;
-                        if ((start_page << 8) + count == addr)
-                                break;
-                } while (--tries > 0);
-                if (tries <= 0) {
-                        printk("%s: Tx packet transfer address mismatch,"
-                                        "%#4.4x (expected) vs. %#4.4x (actual).\n",
-                                        dev->name, (start_page << 8) + count, addr);
-                        if (retries++ == 0)
-                                goto retry;
-                }
-        }
-#endif
-
-        while ((inb_p(nic_base + EN0_ISR) & ENISR_RDC) == 0)
-                if (time_after(jiffies, dma_start + 2*HZ/100)) {                /* 20ms */
-                        printk("%s: timeout waiting for Tx RDC.\n", dev->name);
-                        ne_reset_8390(dev);
-                        NS8390p_init(dev, 1);
-                        break;
-                }
-
-        outb_p(ENISR_RDC, nic_base + EN0_ISR);  /* Ack intr. */
-        ei_status.dmaing &= ~0x01;
-}
-
-
-#ifdef MODULE
-#define MAX_NE_CARDS    4       /* Max number of NE cards per module */
-static struct net_device *dev_ne[MAX_NE_CARDS];
-static int io[MAX_NE_CARDS];
-static int irq[MAX_NE_CARDS];
-static int bad[MAX_NE_CARDS];   /* 0xbad = bad sig or no reset ack */
-MODULE_LICENSE("GPL");
-
-module_param_array(io, int, NULL, 0);
-module_param_array(irq, int, NULL, 0);
-module_param_array(bad, int, NULL, 0);
-MODULE_PARM_DESC(io, "(ignored)");
-MODULE_PARM_DESC(irq, "(ignored)");
-MODULE_PARM_DESC(bad, "(ignored)");
-
-/* Module code fixed by David Weinehall */
-
-int __init init_module(void)
-{
-        struct net_device *dev;
-        int this_dev, found = 0;
-
-        for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
-                dev = alloc_eip_netdev();
-                if (!dev)
-                        break;
-                dev->irq = irq[this_dev];
-                dev->mem_end = bad[this_dev];
-                dev->base_addr = io[this_dev];
-                if (do_ne2_probe(dev) == 0) {
-                        dev_ne[found++] = dev;
-                        continue;
-                }
-                free_netdev(dev);
-                break;
-        }
-        if (found)
-                return 0;
-        printk(KERN_WARNING "ne2.c: No NE/2 card found\n");
-        return -ENXIO;
-}
-
-static void cleanup_card(struct net_device *dev)
-{
-        mca_mark_as_unused(ei_status.priv);
-        mca_set_adapter_procfn( ei_status.priv, NULL, NULL);
-        free_irq(dev->irq, dev);
-        release_region(dev->base_addr, NE_IO_EXTENT);
-}
-
-void __exit cleanup_module(void)
-{
-        int this_dev;
-
-        for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
-                struct net_device *dev = dev_ne[this_dev];
-                if (dev) {
-                        unregister_netdev(dev);
-                        cleanup_card(dev);
-                        free_netdev(dev);
-                }
-        }
-}
-#endif /* MODULE */
diff --git a/drivers/net/ethernet/8390/smc-mca.c b/drivers/net/ethernet/8390/smc-mca.c
deleted file mode 100644
index 7a68590f2804..000000000000
--- a/drivers/net/ethernet/8390/smc-mca.c
+++ /dev/null
@@ -1,575 +0,0 @@
-/* smc-mca.c: A SMC Ultra ethernet driver for linux. */
-/*
-    Most of this driver, except for ultramca_probe is nearly
-    verbatim from smc-ultra.c by Donald Becker. The rest is
-    written and copyright 1996 by David Weis, weisd3458@uni.edu
-
-    This is a driver for the SMC Ultra and SMC EtherEZ ethercards.
-
-    This driver uses the cards in the 8390-compatible, shared memory mode.
-    Most of the run-time complexity is handled by the generic code in
-    8390.c.
-
-    This driver enables the shared memory only when doing the actual data
-    transfers to avoid a bug in early version of the card that corrupted
-    data transferred by a AHA1542.
-
-    This driver does not support the programmed-I/O data transfer mode of
-    the EtherEZ.  That support (if available) is smc-ez.c.  Nor does it
-    use the non-8390-compatible "Altego" mode. (No support currently planned.)
-
-    Changelog:
-
-    Paul Gortmaker       : multiple card support for module users.
-    David Weis           : Micro Channel-ized it.
-    Tom Sightler         : Added support for IBM PS/2 Ethernet Adapter/A
-    Christopher Turcksin : Changed MCA-probe so that multiple adapters are
-                           found correctly (Jul 16, 1997)
-    Chris Beauregard     : Tried to merge the two changes above (Dec 15, 1997)
-    Tom Sightler         : Fixed minor detection bug caused by above merge
-    Tom Sightler         : Added support for three more Western Digital
-                           MCA-adapters
-    Tom Sightler         : Added support for 2.2.x mca_find_unused_adapter
-    Hartmut Schmidt      : - Modified parameter detection to handle each
-                             card differently depending on a switch-list
-                           - 'card_ver' removed from the adapter list
-                           - Some minor bug fixes
-*/
-
-#include <linux/mca.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-
-#include <asm/io.h>
-
-#include "8390.h"
-
-#define DRV_NAME "smc-mca"
-
-static int ultramca_open(struct net_device *dev);
-static void ultramca_reset_8390(struct net_device *dev);
-static void ultramca_get_8390_hdr(struct net_device *dev,
-                                  struct e8390_pkt_hdr *hdr,
-                                  int ring_page);
-static void ultramca_block_input(struct net_device *dev, int count,
-                                 struct sk_buff *skb,
-                                 int ring_offset);
-static void ultramca_block_output(struct net_device *dev, int count,
-                                  const unsigned char *buf,
-                                  const int start_page);
-static int ultramca_close_card(struct net_device *dev);
-
-#define START_PG        0x00    /* First page of TX buffer */
-
-#define ULTRA_CMDREG 0      /* Offset to ASIC command register. */
-#define ULTRA_RESET  0x80   /* Board reset, in ULTRA_CMDREG. */
-#define ULTRA_MEMENB 0x40   /* Enable the shared memory. */
-#define ULTRA_NIC_OFFSET 16 /* NIC register offset from the base_addr. */
-#define ULTRA_IO_EXTENT 32
-#define EN0_ERWCNT      0x08  /* Early receive warning count. */
-
-#define _61c8_SMC_Ethercard_PLUS_Elite_A_BNC_AUI_WD8013EP_A            0
-#define _61c9_SMC_Ethercard_PLUS_Elite_A_UTP_AUI_WD8013EP_A            1
-#define _6fc0_WD_Ethercard_PLUS_A_WD8003E_A_OR_WD8003ET_A              2
-#define _6fc1_WD_Starcard_PLUS_A_WD8003ST_A                            3
-#define _6fc2_WD_Ethercard_PLUS_10T_A_WD8003W_A                        4
-#define _efd4_IBM_PS2_Adapter_A_for_Ethernet_UTP_AUI_WD8013WP_A        5
-#define _efd5_IBM_PS2_Adapter_A_for_Ethernet_BNC_AUI_WD8013WP_A        6
-#define _efe5_IBM_PS2_Adapter_A_for_Ethernet                           7
-
-struct smc_mca_adapters_t {
-        unsigned int id;
-        char *name;
-};
-
-#define MAX_ULTRAMCA_CARDS 4    /* Max number of Ultra cards per module */
-
-static int ultra_io[MAX_ULTRAMCA_CARDS];
-static int ultra_irq[MAX_ULTRAMCA_CARDS];
-MODULE_LICENSE("GPL");
-
-module_param_array(ultra_io, int, NULL, 0);
-module_param_array(ultra_irq, int, NULL, 0);
-MODULE_PARM_DESC(ultra_io, "SMC Ultra/EtherEZ MCA I/O base address(es)");
-MODULE_PARM_DESC(ultra_irq, "SMC Ultra/EtherEZ MCA IRQ number(s)");
-
-static const struct {
-  unsigned int base_addr;
-} addr_table[] = {
-    { 0x0800 },
-    { 0x1800 },
-    { 0x2800 },
-    { 0x3800 },
-    { 0x4800 },
-    { 0x5800 },
-    { 0x6800 },
-    { 0x7800 },
-    { 0x8800 },
-    { 0x9800 },
-    { 0xa800 },
-    { 0xb800 },
-    { 0xc800 },
-    { 0xd800 },
-    { 0xe800 },
-    { 0xf800 }
-};
-
-#define MEM_MASK 64
-
-static const struct {
-  unsigned char mem_index;
-  unsigned long mem_start;
-  unsigned char num_pages;
-} mem_table[] = {
-    { 16, 0x0c0000, 40 },
-    { 18, 0x0c4000, 40 },
-    { 20, 0x0c8000, 40 },
-    { 22, 0x0cc000, 40 },
-    { 24, 0x0d0000, 40 },
-    { 26, 0x0d4000, 40 },
-    { 28, 0x0d8000, 40 },
-    { 30, 0x0dc000, 40 },
-    {144, 0xfc0000, 40 },
-    {148, 0xfc8000, 40 },
-    {154, 0xfd0000, 40 },
-    {156, 0xfd8000, 40 },
-    {  0, 0x0c0000, 20 },
-    {  1, 0x0c2000, 20 },
-    {  2, 0x0c4000, 20 },
-    {  3, 0x0c6000, 20 }
-};
-
-#define IRQ_MASK 243
-static const struct {
-   unsigned char new_irq;
-   unsigned char old_irq;
-} irq_table[] = {
-   {  3,  3 },
-   {  4,  4 },
-   { 10, 10 },
-   { 14, 15 }
-};
-
-static short smc_mca_adapter_ids[] __initdata = {
-        0x61c8,
-        0x61c9,
-        0x6fc0,
-        0x6fc1,
-        0x6fc2,
-        0xefd4,
-        0xefd5,
-        0xefe5,
-        0x0000
-};
-
-static char *smc_mca_adapter_names[] __initdata = {
-        "SMC Ethercard PLUS Elite/A BNC/AUI (WD8013EP/A)",
-        "SMC Ethercard PLUS Elite/A UTP/AUI (WD8013WP/A)",
-        "WD Ethercard PLUS/A (WD8003E/A or WD8003ET/A)",
-        "WD Starcard PLUS/A (WD8003ST/A)",
-        "WD Ethercard PLUS 10T/A (WD8003W/A)",
-        "IBM PS/2 Adapter/A for Ethernet UTP/AUI (WD8013WP/A)",
-        "IBM PS/2 Adapter/A for Ethernet BNC/AUI (WD8013EP/A)",
-        "IBM PS/2 Adapter/A for Ethernet",
-        NULL
-};
-
-static int ultra_found = 0;
-
-
-static const struct net_device_ops ultramca_netdev_ops = {
-        .ndo_open               = ultramca_open,
-        .ndo_stop               = ultramca_close_card,
-
-        .ndo_start_xmit         = ei_start_xmit,
-        .ndo_tx_timeout         = ei_tx_timeout,
-        .ndo_get_stats          = ei_get_stats,
-        .ndo_set_rx_mode        = ei_set_multicast_list,
-        .ndo_validate_addr      = eth_validate_addr,
-        .ndo_set_mac_address    = eth_mac_addr,
-        .ndo_change_mtu         = eth_change_mtu,
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        .ndo_poll_controller    = ei_poll,
-#endif
-};
-
-static int __init ultramca_probe(struct device *gen_dev)
-{
-        unsigned short ioaddr;
-        struct net_device *dev;
-        unsigned char reg4, num_pages;
-        struct mca_device *mca_dev = to_mca_device(gen_dev);
-        char slot = mca_dev->slot;
-        unsigned char pos2 = 0xff, pos3 = 0xff, pos4 = 0xff, pos5 = 0xff;
-        int i, rc;
-        int adapter = mca_dev->index;
-        int tbase = 0;
-        int tirq = 0;
-        int base_addr = ultra_io[ultra_found];
-        int irq = ultra_irq[ultra_found];
-
-        if (base_addr || irq) {
-                printk(KERN_INFO "Probing for SMC MCA adapter");
-                if (base_addr) {
-                        printk(KERN_INFO " at I/O address 0x%04x%c",
-                               base_addr, irq ? ' ' : '\n');
-                }
-                if (irq) {
-                        printk(KERN_INFO "using irq %d\n", irq);
-                }
-        }
-
-        tirq = 0;
-        tbase = 0;
-
-        /* If we're trying to match a specificied irq or io address,
-         * we'll reject the adapter found unless it's the one we're
-         * looking for */
-
-        pos2 = mca_device_read_stored_pos(mca_dev, 2); /* io_addr */
-        pos3 = mca_device_read_stored_pos(mca_dev, 3); /* shared mem */
-        pos4 = mca_device_read_stored_pos(mca_dev, 4); /* ROM bios addr range */
-        pos5 = mca_device_read_stored_pos(mca_dev, 5); /* irq, media and RIPL */
-
-        /* Test the following conditions:
-         * - If an irq parameter is supplied, compare it
-         *   with the irq of the adapter we found
-         * - If a base_addr paramater is given, compare it
-         *   with the base_addr of the adapter we found
-         * - Check that the irq and the base_addr of the
-         *   adapter we found is not already in use by
-         *   this driver
-         */
-
-        switch (mca_dev->index) {
-        case _61c8_SMC_Ethercard_PLUS_Elite_A_BNC_AUI_WD8013EP_A:
-        case _61c9_SMC_Ethercard_PLUS_Elite_A_UTP_AUI_WD8013EP_A:
-        case _efd4_IBM_PS2_Adapter_A_for_Ethernet_UTP_AUI_WD8013WP_A:
-        case _efd5_IBM_PS2_Adapter_A_for_Ethernet_BNC_AUI_WD8013WP_A:
-                {
-                        tbase = addr_table[(pos2 & 0xf0) >> 4].base_addr;
-                        tirq  = irq_table[(pos5 & 0xc) >> 2].new_irq;
-                        break;
-                }
-        case _6fc0_WD_Ethercard_PLUS_A_WD8003E_A_OR_WD8003ET_A:
-        case _6fc1_WD_Starcard_PLUS_A_WD8003ST_A:
-        case _6fc2_WD_Ethercard_PLUS_10T_A_WD8003W_A:
-        case _efe5_IBM_PS2_Adapter_A_for_Ethernet:
-                {
-                        tbase = ((pos2 & 0x0fe) * 0x10);
-                        tirq  = irq_table[(pos5 & 3)].old_irq;
-                        break;
-                }
-        }
-
-        if(!tirq || !tbase ||
-           (irq && irq != tirq) ||
-           (base_addr && tbase != base_addr))
-                /* FIXME: we're trying to force the ordering of the
-                 * devices here, there should be a way of getting this
-                 * to happen */
-                return -ENXIO;
-
-        /* Adapter found. */
-        dev  = alloc_ei_netdev();
-        if(!dev)
-                return -ENODEV;
-
-        SET_NETDEV_DEV(dev, gen_dev);
-        mca_device_set_name(mca_dev, smc_mca_adapter_names[adapter]);
-        mca_device_set_claim(mca_dev, 1);
-
-        printk(KERN_INFO "smc_mca: %s found in slot %d\n",
-                       smc_mca_adapter_names[adapter], slot + 1);
-
-        ultra_found++;
-
-        dev->base_addr = ioaddr = mca_device_transform_ioport(mca_dev, tbase);
-        dev->irq       = mca_device_transform_irq(mca_dev, tirq);
-        dev->mem_start = 0;
-        num_pages      = 40;
-
-        switch (adapter) {      /* card-# in const array above [hs] */
-                case _61c8_SMC_Ethercard_PLUS_Elite_A_BNC_AUI_WD8013EP_A:
-                case _61c9_SMC_Ethercard_PLUS_Elite_A_UTP_AUI_WD8013EP_A:
-                {
-                        for (i = 0; i < 16; i++) { /* taking 16 counts
-                                                    * up to 15 [hs] */
-                                if (mem_table[i].mem_index == (pos3 & ~MEM_MASK)) {
-                                        dev->mem_start = (unsigned long)
-                                          mca_device_transform_memory(mca_dev, (void *)mem_table[i].mem_start);
-                                        num_pages = mem_table[i].num_pages;
-                                }
-                        }
-                        break;
-                }
-                case _6fc0_WD_Ethercard_PLUS_A_WD8003E_A_OR_WD8003ET_A:
-                case _6fc1_WD_Starcard_PLUS_A_WD8003ST_A:
-                case _6fc2_WD_Ethercard_PLUS_10T_A_WD8003W_A:
-                case _efe5_IBM_PS2_Adapter_A_for_Ethernet:
-                {
-                        dev->mem_start = (unsigned long)
-                          mca_device_transform_memory(mca_dev, (void *)((pos3 & 0xfc) * 0x1000));
-                        num_pages = 0x40;
-                        break;
-                }
-                case _efd4_IBM_PS2_Adapter_A_for_Ethernet_UTP_AUI_WD8013WP_A:
-                case _efd5_IBM_PS2_Adapter_A_for_Ethernet_BNC_AUI_WD8013WP_A:
-                {
-                        /* courtesy of gamera@quartz.ocn.ne.jp, pos3 indicates
-                         * the index of the 0x2000 step.
-                         * beware different number of pages [hs]
-                         */
-                        dev->mem_start = (unsigned long)
-                          mca_device_transform_memory(mca_dev, (void *)(0xc0000 + (0x2000 * (pos3 & 0xf))));
-                        num_pages = 0x20 + (2 * (pos3 & 0x10));
-                        break;
-                }
-        }
-
-        /* sanity check, shouldn't happen */
-        if (dev->mem_start == 0) {
-                rc = -ENODEV;
-                goto err_unclaim;
-        }
-
-        if (!request_region(ioaddr, ULTRA_IO_EXTENT, DRV_NAME)) {
-                rc = -ENODEV;
-                goto err_unclaim;
-        }
-
-        reg4 = inb(ioaddr + 4) & 0x7f;
-        outb(reg4, ioaddr + 4);
-
-        for (i = 0; i < 6; i++)
-                dev->dev_addr[i] = inb(ioaddr + 8 + i);
-
-        printk(KERN_INFO "smc_mca[%d]: Parameters: %#3x, %pM",
-               slot + 1, ioaddr, dev->dev_addr);
-
-        /* Switch from the station address to the alternate register set
-         * and read the useful registers there.
-         */
-
-        outb(0x80 | reg4, ioaddr + 4);
-
-        /* Enable FINE16 mode to avoid BIOS ROM width mismatches @ reboot.
-         */
-
-        outb(0x80 | inb(ioaddr + 0x0c), ioaddr + 0x0c);
-
-        /* Switch back to the station address register set so that
-         * the MS-DOS driver can find the card after a warm boot.
-         */
-
-        outb(reg4, ioaddr + 4);
-
-        dev_set_drvdata(gen_dev, dev);
-
-        /* The 8390 isn't at the base address, so fake the offset
-         */
-
-        dev->base_addr = ioaddr + ULTRA_NIC_OFFSET;
-
-        ei_status.name = "SMC Ultra MCA";
-        ei_status.word16 = 1;
-        ei_status.tx_start_page = START_PG;
-        ei_status.rx_start_page = START_PG + TX_PAGES;
-        ei_status.stop_page = num_pages;
-
-        ei_status.mem = ioremap(dev->mem_start, (ei_status.stop_page - START_PG) * 256);
-        if (!ei_status.mem) {
-                rc = -ENOMEM;
-                goto err_release_region;
-        }
-
-        dev->mem_end = dev->mem_start + (ei_status.stop_page - START_PG) * 256;
-
-        printk(", IRQ %d memory %#lx-%#lx.\n",
-        dev->irq, dev->mem_start, dev->mem_end - 1);
-
-        ei_status.reset_8390 = &ultramca_reset_8390;
-        ei_status.block_input = &ultramca_block_input;
-        ei_status.block_output = &ultramca_block_output;
-        ei_status.get_8390_hdr = &ultramca_get_8390_hdr;
-
-        ei_status.priv = slot;
-
-        dev->netdev_ops = &ultramca_netdev_ops;
-
-        NS8390_init(dev, 0);
-
-        rc = register_netdev(dev);
-        if (rc)
-                goto err_unmap;
-
-        return 0;
-
-err_unmap:
-        iounmap(ei_status.mem);
-err_release_region:
-        release_region(ioaddr, ULTRA_IO_EXTENT);
-err_unclaim:
-        mca_device_set_claim(mca_dev, 0);
-        free_netdev(dev);
-        return rc;
-}
-
-static int ultramca_open(struct net_device *dev)
-{
-        int ioaddr = dev->base_addr - ULTRA_NIC_OFFSET; /* ASIC addr */
-        int retval;
-
-        if ((retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev)))
-                return retval;
-
-        outb(ULTRA_MEMENB, ioaddr); /* Enable memory */
-        outb(0x80, ioaddr + 5);     /* ??? */
-        outb(0x01, ioaddr + 6);     /* Enable interrupts and memory. */
-        outb(0x04, ioaddr + 5);     /* ??? */
-
-        /* Set the early receive warning level in window 0 high enough not
-         * to receive ERW interrupts.
-         */
-
-        /* outb_p(E8390_NODMA + E8390_PAGE0, dev->base_addr);
-         * outb(0xff, dev->base_addr + EN0_ERWCNT);
-         */
-
-        ei_open(dev);
-        return 0;
-}
-
-static void ultramca_reset_8390(struct net_device *dev)
-{
-        int ioaddr = dev->base_addr - ULTRA_NIC_OFFSET; /* ASIC addr */
-
-        outb(ULTRA_RESET, ioaddr);
-        if (ei_debug > 1)
-                printk("resetting Ultra, t=%ld...", jiffies);
-        ei_status.txing = 0;
-
-        outb(0x80, ioaddr + 5);     /* ??? */
-        outb(0x01, ioaddr + 6);     /* Enable interrupts and memory. */
-
-        if (ei_debug > 1)
-                printk("reset done\n");
-}
-
-/* Grab the 8390 specific header. Similar to the block_input routine, but
- * we don't need to be concerned with ring wrap as the header will be at
- * the start of a page, so we optimize accordingly.
- */
-
-static void ultramca_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page)
-{
-        void __iomem *hdr_start = ei_status.mem + ((ring_page - START_PG) << 8);
-
-#ifdef notdef
-        /* Officially this is what we are doing, but the readl() is faster */
-        memcpy_fromio(hdr, hdr_start, sizeof(struct e8390_pkt_hdr));
-#else
-        ((unsigned int*)hdr)[0] = readl(hdr_start);
-#endif
-}
-
-/* Block input and output are easy on shared memory ethercards, the only
- * complication is when the ring buffer wraps.
- */
-
-static void ultramca_block_input(struct net_device *dev, int count, struct sk_buff *skb, int ring_offset)
-{
-        void __iomem *xfer_start = ei_status.mem + ring_offset - START_PG * 256;
-
-        if (ring_offset + count > ei_status.stop_page * 256) {
-                /* We must wrap the input move. */
-                int semi_count = ei_status.stop_page * 256 - ring_offset;
-                memcpy_fromio(skb->data, xfer_start, semi_count);
-                count -= semi_count;
-                memcpy_fromio(skb->data + semi_count, ei_status.mem + TX_PAGES * 256, count);
-        } else {
-                memcpy_fromio(skb->data, xfer_start, count);
-        }
-
-}
-
-static void ultramca_block_output(struct net_device *dev, int count, const unsigned char *buf,
-                int start_page)
-{
-        void __iomem *shmem = ei_status.mem + ((start_page - START_PG) << 8);
-
-        memcpy_toio(shmem, buf, count);
-}
-
-static int ultramca_close_card(struct net_device *dev)
-{
-        int ioaddr = dev->base_addr - ULTRA_NIC_OFFSET; /* ASIC addr */
-
-        netif_stop_queue(dev);
-
-        if (ei_debug > 1)
-                printk("%s: Shutting down ethercard.\n", dev->name);
-
-        outb(0x00, ioaddr + 6);     /* Disable interrupts. */
-        free_irq(dev->irq, dev);
-
-        NS8390_init(dev, 0);
-        /* We should someday disable shared memory and change to 8-bit mode
-         * "just in case"...
-         */
-
-        return 0;
-}
-
-static int ultramca_remove(struct device *gen_dev)
-{
-        struct mca_device *mca_dev = to_mca_device(gen_dev);
-        struct net_device *dev = dev_get_drvdata(gen_dev);
-
-        if (dev) {
-                /* NB: ultra_close_card() does free_irq */
-                int ioaddr = dev->base_addr - ULTRA_NIC_OFFSET;
-
-                unregister_netdev(dev);
-                mca_device_set_claim(mca_dev, 0);
-                release_region(ioaddr, ULTRA_IO_EXTENT);
-                iounmap(ei_status.mem);
-                free_netdev(dev);
-        }
-        return 0;
-}
-
-
-static struct mca_driver ultra_driver = {
-        .id_table = smc_mca_adapter_ids,
-        .driver = {
-                .name = "smc-mca",
-                .bus = &mca_bus_type,
-                .probe = ultramca_probe,
-                .remove = ultramca_remove,
-        }
-};
-
-static int __init ultramca_init_module(void)
-{
-        if(!MCA_bus)
-                return -ENXIO;
-
-        mca_register_driver(&ultra_driver);
-
-        return ultra_found ? 0 : -ENXIO;
-}
-
-static void __exit ultramca_cleanup_module(void)
-{
-        mca_unregister_driver(&ultra_driver);
-}
-module_init(ultramca_init_module);
-module_exit(ultramca_cleanup_module);
-
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index c63a64cb6085..a11af5cc4844 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -174,6 +174,7 @@ source "drivers/net/ethernet/tile/Kconfig"
 source "drivers/net/ethernet/toshiba/Kconfig"
 source "drivers/net/ethernet/tundra/Kconfig"
 source "drivers/net/ethernet/via/Kconfig"
+source "drivers/net/ethernet/wiznet/Kconfig"
 source "drivers/net/ethernet/xilinx/Kconfig"
 source "drivers/net/ethernet/xircom/Kconfig"
 
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 9676a5109d94..878ad32b93f2 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -73,5 +73,6 @@ obj-$(CONFIG_TILE_NET) += tile/
 obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/
 obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/
 obj-$(CONFIG_NET_VENDOR_VIA) += via/
+obj-$(CONFIG_NET_VENDOR_WIZNET) += wiznet/
 obj-$(CONFIG_NET_VENDOR_XILINX) += xilinx/
 obj-$(CONFIG_NET_VENDOR_XIRCOM) += xircom/
diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
index d896816512ca..d920a529ba22 100644
--- a/drivers/net/ethernet/adaptec/starfire.c
+++ b/drivers/net/ethernet/adaptec/starfire.c
@@ -114,15 +114,6 @@ static int rx_copybreak /* = 0 */;
 #define DMA_BURST_SIZE 128
 #endif
 
-/* Used to pass the media type, etc.
-   Both 'options[]' and 'full_duplex[]' exist for driver interoperability.
-   The media type is usually passed in 'options[]'.
-   These variables are deprecated, use ethtool instead. -Ion
-*/
-#define MAX_UNITS 8             /* More are supported, limit only on options */
-static int options[MAX_UNITS] = {0, };
-static int full_duplex[MAX_UNITS] = {0, };
-
 /* Operational parameters that are set at compile time. */
 
 /* The "native" ring sizes are either 256 or 2048.
@@ -192,8 +183,6 @@ module_param(debug, int, 0);
 module_param(rx_copybreak, int, 0);
 module_param(intr_latency, int, 0);
 module_param(small_frames, int, 0);
-module_param_array(options, int, NULL, 0);
-module_param_array(full_duplex, int, NULL, 0);
 module_param(enable_hw_cksum, int, 0);
 MODULE_PARM_DESC(max_interrupt_work, "Maximum events handled per interrupt");
 MODULE_PARM_DESC(mtu, "MTU (all boards)");
@@ -201,8 +190,6 @@ MODULE_PARM_DESC(debug, "Debug level (0-6)");
 MODULE_PARM_DESC(rx_copybreak, "Copy breakpoint for copy-only-tiny-frames");
 MODULE_PARM_DESC(intr_latency, "Maximum interrupt latency, in microseconds");
 MODULE_PARM_DESC(small_frames, "Maximum size of receive frames that bypass interrupt latency (0,64,128,256,512)");
-MODULE_PARM_DESC(options, "Deprecated: Bits 0-3: media type, bit 17: full duplex");
-MODULE_PARM_DESC(full_duplex, "Deprecated: Forced full-duplex setting (0/1)");
 MODULE_PARM_DESC(enable_hw_cksum, "Enable/disable hardware cksum support (0/1)");
 
 /*
@@ -657,10 +644,10 @@ static const struct net_device_ops netdev_ops = {
 static int __devinit starfire_init_one(struct pci_dev *pdev,
                                        const struct pci_device_id *ent)
 {
+        struct device *d = &pdev->dev;
         struct netdev_private *np;
-        int i, irq, option, chip_idx = ent->driver_data;
+        int i, irq, chip_idx = ent->driver_data;
         struct net_device *dev;
-        static int card_idx = -1;
         long ioaddr;
         void __iomem *base;
         int drv_flags, io_size;
@@ -673,15 +660,13 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
                 printk(version);
 #endif
 
-        card_idx++;
-
         if (pci_enable_device (pdev))
                 return -EIO;
 
         ioaddr = pci_resource_start(pdev, 0);
         io_size = pci_resource_len(pdev, 0);
         if (!ioaddr || ((pci_resource_flags(pdev, 0) & IORESOURCE_MEM) == 0)) {
-                printk(KERN_ERR DRV_NAME " %d: no PCI MEM resources, aborting\n", card_idx);
+                dev_err(d, "no PCI MEM resources, aborting\n");
                 return -ENODEV;
         }
 
@@ -694,14 +679,14 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
         irq = pdev->irq;
 
         if (pci_request_regions (pdev, DRV_NAME)) {
-                printk(KERN_ERR DRV_NAME " %d: cannot reserve PCI resources, aborting\n", card_idx);
+                dev_err(d, "cannot reserve PCI resources, aborting\n");
                 goto err_out_free_netdev;
         }
 
         base = ioremap(ioaddr, io_size);
         if (!base) {
-                printk(KERN_ERR DRV_NAME " %d: cannot remap %#x @ %#lx, aborting\n",
-                        card_idx, io_size, ioaddr);
+                dev_err(d, "cannot remap %#x @ %#lx, aborting\n",
+                        io_size, ioaddr);
                 goto err_out_free_res;
         }
 
@@ -753,9 +738,6 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
         /* wait a little longer */
         udelay(1000);
 
-        dev->base_addr = (unsigned long)base;
-        dev->irq = irq;
-
         np = netdev_priv(dev);
         np->dev = dev;
         np->base = base;
@@ -772,21 +754,6 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
 
         drv_flags = netdrv_tbl[chip_idx].drv_flags;
 
-        option = card_idx < MAX_UNITS ? options[card_idx] : 0;
-        if (dev->mem_start)
-                option = dev->mem_start;
-
-        /* The lower four bits are the media type. */
-        if (option & 0x200)
-                np->mii_if.full_duplex = 1;
-
-        if (card_idx < MAX_UNITS && full_duplex[card_idx] > 0)
-                np->mii_if.full_duplex = 1;
-
-        if (np->mii_if.full_duplex)
-                np->mii_if.force_media = 1;
-        else
-                np->mii_if.force_media = 0;
         np->speed100 = 1;
 
         /* timer resolution is 128 * 0.8us */
@@ -909,13 +876,14 @@ static int netdev_open(struct net_device *dev)
         const __be32 *fw_rx_data, *fw_tx_data;
         struct netdev_private *np = netdev_priv(dev);
         void __iomem *ioaddr = np->base;
+        const int irq = np->pci_dev->irq;
         int i, retval;
         size_t tx_size, rx_size;
         size_t tx_done_q_size, rx_done_q_size, tx_ring_size, rx_ring_size;
 
         /* Do we ever need to reset the chip??? */
 
-        retval = request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev);
+        retval = request_irq(irq, intr_handler, IRQF_SHARED, dev->name, dev);
         if (retval)
                 return retval;
 
@@ -924,7 +892,7 @@ static int netdev_open(struct net_device *dev)
         writel(1, ioaddr + PCIDeviceConfig);
         if (debug > 1)
                 printk(KERN_DEBUG "%s: netdev_open() irq %d.\n",
-                       dev->name, dev->irq);
+                       dev->name, irq);
 
         /* Allocate the various queues. */
         if (!np->queue_mem) {
@@ -935,7 +903,7 @@ static int netdev_open(struct net_device *dev)
                 np->queue_mem_size = tx_done_q_size + rx_done_q_size + tx_ring_size + rx_ring_size;
                 np->queue_mem = pci_alloc_consistent(np->pci_dev, np->queue_mem_size, &np->queue_mem_dma);
                 if (np->queue_mem == NULL) {
-                        free_irq(dev->irq, dev);
+                        free_irq(irq, dev);
                         return -ENOMEM;
                 }
 
@@ -1962,7 +1930,7 @@ static int netdev_close(struct net_device *dev)
                 }
         }
 
-        free_irq(dev->irq, dev);
+        free_irq(np->pci_dev->irq, dev);
 
         /* Free all the skbuffs in the Rx queue. */
         for (i = 0; i < RX_RING_SIZE; i++) {
diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
index ab4daeccdf98..f816426e1085 100644
--- a/drivers/net/ethernet/adi/bfin_mac.c
+++ b/drivers/net/ethernet/adi/bfin_mac.c
@@ -548,6 +548,25 @@ static int bfin_mac_ethtool_setwol(struct net_device *dev,
         return 0;
 }
 
+static int bfin_mac_ethtool_get_ts_info(struct net_device *dev,
+        struct ethtool_ts_info *info)
+{
+        info->so_timestamping =
+                SOF_TIMESTAMPING_TX_HARDWARE |
+                SOF_TIMESTAMPING_RX_HARDWARE |
+                SOF_TIMESTAMPING_SYS_HARDWARE;
+        info->phc_index = -1;
+        info->tx_types =
+                (1 << HWTSTAMP_TX_OFF) |
+                (1 << HWTSTAMP_TX_ON);
+        info->rx_filters =
+                (1 << HWTSTAMP_FILTER_NONE) |
+                (1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |
+                (1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |
+                (1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT);
+        return 0;
+}
+
 static const struct ethtool_ops bfin_mac_ethtool_ops = {
         .get_settings = bfin_mac_ethtool_getsettings,
         .set_settings = bfin_mac_ethtool_setsettings,
@@ -555,6 +574,7 @@ static const struct ethtool_ops bfin_mac_ethtool_ops = {
         .get_drvinfo = bfin_mac_ethtool_getdrvinfo,
         .get_wol = bfin_mac_ethtool_getwol,
         .set_wol = bfin_mac_ethtool_setwol,
+        .get_ts_info = bfin_mac_ethtool_get_ts_info,
 };
 
 /**************************************************************************/
diff --git a/drivers/net/ethernet/amd/ariadne.c b/drivers/net/ethernet/amd/ariadne.c
index f4c228e4d76c..f2958df9a1e4 100644
--- a/drivers/net/ethernet/amd/ariadne.c
+++ b/drivers/net/ethernet/amd/ariadne.c
@@ -213,10 +213,10 @@ static int ariadne_rx(struct net_device *dev)
                                                 (const void *)priv->rx_buff[entry],
                                                 pkt_len);
                         skb->protocol = eth_type_trans(skb, dev);
-                        netdev_dbg(dev, "RX pkt type 0x%04x from %pM to %pM data 0x%08x len %d\n",
+                        netdev_dbg(dev, "RX pkt type 0x%04x from %pM to %pM data %p len %u\n",
                                    ((u_short *)skb->data)[6],
                                    skb->data + 6, skb->data,
-                                   (int)skb->data, (int)skb->len);
+                                   skb->data, skb->len);
 
                         netif_rx(skb);
                         dev->stats.rx_packets++;
@@ -566,10 +566,10 @@ static netdev_tx_t ariadne_start_xmit(struct sk_buff *skb,
 
         /* Fill in a Tx ring entry */
 
-        netdev_dbg(dev, "TX pkt type 0x%04x from %pM to %pM data 0x%08x len %d\n",
+        netdev_dbg(dev, "TX pkt type 0x%04x from %pM to %pM data %p len %u\n",
                    ((u_short *)skb->data)[6],
                    skb->data + 6, skb->data,
-                   (int)skb->data, (int)skb->len);
+                   skb->data, skb->len);
 
         local_irq_save(flags);
 
diff --git a/drivers/net/ethernet/amd/atarilance.c b/drivers/net/ethernet/amd/atarilance.c
index 70ed79c46245..84219df72f51 100644
--- a/drivers/net/ethernet/amd/atarilance.c
+++ b/drivers/net/ethernet/amd/atarilance.c
@@ -558,21 +558,18 @@ static unsigned long __init lance_probe1( struct net_device *dev,
                         printk( "Lance: request for irq %d failed\n", IRQ_AUTO_5 );
                         return 0;
                 }
-                dev->irq = (unsigned short)IRQ_AUTO_5;
+                dev->irq = IRQ_AUTO_5;
         }
         else {
-                /* For VME-RieblCards, request a free VME int;
-                 * (This must be unsigned long, since dev->irq is short and the
-                 * IRQ_MACHSPEC bit would be cut off...)
-                 */
-                unsigned long irq = atari_register_vme_int();
+                /* For VME-RieblCards, request a free VME int */
+                unsigned int irq = atari_register_vme_int();
                 if (!irq) {
                         printk( "Lance: request for VME interrupt failed\n" );
                         return 0;
                 }
                 if (request_irq(irq, lance_interrupt, IRQ_TYPE_PRIO,
                             "Riebl-VME Ethernet", dev)) {
-                        printk( "Lance: request for irq %ld failed\n", irq );
+                        printk( "Lance: request for irq %u failed\n", irq );
                         return 0;
                 }
                 dev->irq = irq;
diff --git a/drivers/net/ethernet/amd/depca.c b/drivers/net/ethernet/amd/depca.c
index 86dd95766a64..c771de71612a 100644
--- a/drivers/net/ethernet/amd/depca.c
+++ b/drivers/net/ethernet/amd/depca.c
@@ -155,23 +155,10 @@
     2 depca's in a PC).
 
     ************************************************************************
-    Support for MCA EtherWORKS cards added 11-3-98.
+    Support for MCA EtherWORKS cards added 11-3-98. (MCA since deleted)
     Verified to work with up to 2 DE212 cards in a system (although not
       fully stress-tested).
 
-    Currently known bugs/limitations:
-
-    Note:  with the MCA stuff as a module, it trusts the MCA configuration,
-           not the command line for IRQ and memory address.  You can
-           specify them if you want, but it will throw your values out.
-           You still have to pass the IO address it was configured as
-           though.
-
-    ************************************************************************
-    TO DO:
-    ------
-
-
     Revision History
     ----------------
 
@@ -261,10 +248,6 @@
 #include <asm/io.h>
 #include <asm/dma.h>
 
-#ifdef CONFIG_MCA
-#include <linux/mca.h>
-#endif
-
 #ifdef CONFIG_EISA
 #include <linux/eisa.h>
 #endif
@@ -360,44 +343,6 @@ static struct eisa_driver depca_eisa_driver = {
 };
 #endif
 
-#ifdef CONFIG_MCA
-/*
-** Adapter ID for the MCA EtherWORKS DE210/212 adapter
-*/
-#define DE210_ID 0x628d
-#define DE212_ID 0x6def
-
-static short depca_mca_adapter_ids[] = {
-        DE210_ID,
-        DE212_ID,
-        0x0000
-};
-
-static char *depca_mca_adapter_name[] = {
-        "DEC EtherWORKS MC Adapter (DE210)",
-        "DEC EtherWORKS MC Adapter (DE212)",
-        NULL
-};
-
-static enum depca_type depca_mca_adapter_type[] = {
-        de210,
-        de212,
-        0
-};
-
-static int depca_mca_probe (struct device *);
-
-static struct mca_driver depca_mca_driver = {
-        .id_table = depca_mca_adapter_ids,
-        .driver   = {
-                .name   = depca_string,
-                .bus    = &mca_bus_type,
-                .probe  = depca_mca_probe,
-                .remove = __devexit_p(depca_device_remove),
-        },
-};
-#endif
-
 static int depca_isa_probe (struct platform_device *);
 
 static int __devexit depca_isa_remove(struct platform_device *pdev)
@@ -464,8 +409,7 @@ struct depca_private {
         char adapter_name[DEPCA_STRLEN];        /* /proc/ioports string                  */
         enum depca_type adapter;                /* Adapter type */
         enum {
-                DEPCA_BUS_MCA = 1,
-                DEPCA_BUS_ISA,
+                DEPCA_BUS_ISA = 1,
                 DEPCA_BUS_EISA,
         } depca_bus;            /* type of bus */
         struct depca_init init_block;   /* Shadow Initialization block            */
@@ -624,12 +568,6 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device)
                dev_name(device), depca_signature[lp->adapter], ioaddr);
 
         switch (lp->depca_bus) {
-#ifdef CONFIG_MCA
-        case DEPCA_BUS_MCA:
-                printk(" (MCA slot %d)", to_mca_device(device)->slot + 1);
-                break;
-#endif
-
 #ifdef CONFIG_EISA
         case DEPCA_BUS_EISA:
                 printk(" (EISA slot %d)", to_eisa_device(device)->slot);
@@ -661,10 +599,7 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device)
         if (nicsr & BUF) {
                 nicsr &= ~BS;   /* DEPCA RAM in top 32k */
                 netRAM -= 32;
-
-                /* Only EISA/ISA needs start address to be re-computed */
-                if (lp->depca_bus != DEPCA_BUS_MCA)
-                        mem_start += 0x8000;
+                mem_start += 0x8000;
         }
 
         if ((mem_len = (NUM_RX_DESC * (sizeof(struct depca_rx_desc) + RX_BUFF_SZ) + NUM_TX_DESC * (sizeof(struct depca_tx_desc) + TX_BUFF_SZ) + sizeof(struct depca_init)))
@@ -1079,7 +1014,8 @@ static int depca_rx(struct net_device *dev)
                                                 } else {
                                                         lp->pktStats.multicast++;
                                                 }
-                                        } else if (compare_ether_addr(buf, dev->dev_addr) == 0) {
+                                        } else if (ether_addr_equal(buf,
+                                                                    dev->dev_addr)) {
                                                 lp->pktStats.unicast++;
                                         }
 
@@ -1324,130 +1260,6 @@ static int __init depca_common_init (u_long ioaddr, struct net_device **devp)
         return status;
 }
 
-#ifdef CONFIG_MCA
-/*
-** Microchannel bus I/O device probe
-*/
-static int __init depca_mca_probe(struct device *device)
-{
-        unsigned char pos[2];
-        unsigned char where;
-        unsigned long iobase, mem_start;
-        int irq, err;
-        struct mca_device *mdev = to_mca_device (device);
-        struct net_device *dev;
-        struct depca_private *lp;
-
-        /*
-        ** Search for the adapter.  If an address has been given, search
-        ** specifically for the card at that address.  Otherwise find the
-        ** first card in the system.
-        */
-
-        pos[0] = mca_device_read_stored_pos(mdev, 2);
-        pos[1] = mca_device_read_stored_pos(mdev, 3);
-
-        /*
-        ** IO of card is handled by bits 1 and 2 of pos0.
-        **
-        **    bit2 bit1    IO
-        **       0    0    0x2c00
-        **       0    1    0x2c10
-        **       1    0    0x2c20
-        **       1    1    0x2c30
-        */
-        where = (pos[0] & 6) >> 1;
-        iobase = 0x2c00 + (0x10 * where);
-
-        /*
-        ** Found the adapter we were looking for. Now start setting it up.
-        **
-        ** First work on decoding the IRQ.  It's stored in the lower 4 bits
-        ** of pos1.  Bits are as follows (from the ADF file):
-        **
-        **      Bits
-        **   3   2   1   0    IRQ
-        **   --------------------
-        **   0   0   1   0     5
-        **   0   0   0   1     9
-        **   0   1   0   0    10
-        **   1   0   0   0    11
-        */
-        where = pos[1] & 0x0f;
-        switch (where) {
-        case 1:
-                irq = 9;
-                break;
-        case 2:
-                irq = 5;
-                break;
-        case 4:
-                irq = 10;
-                break;
-        case 8:
-                irq = 11;
-                break;
-        default:
-                printk("%s: mca_probe IRQ error.  You should never get here (%d).\n", mdev->name, where);
-                return -EINVAL;
-        }
-
-        /*
-        ** Shared memory address of adapter is stored in bits 3-5 of pos0.
-        ** They are mapped as follows:
-        **
-        **    Bit
-        **   5  4  3       Memory Addresses
-        **   0  0  0       C0000-CFFFF (64K)
-        **   1  0  0       C8000-CFFFF (32K)
-        **   0  0  1       D0000-DFFFF (64K)
-        **   1  0  1       D8000-DFFFF (32K)
-        **   0  1  0       E0000-EFFFF (64K)
-        **   1  1  0       E8000-EFFFF (32K)
-        */
-        where = (pos[0] & 0x18) >> 3;
-        mem_start = 0xc0000 + (where * 0x10000);
-        if (pos[0] & 0x20) {
-                mem_start += 0x8000;
-        }
-
-        /* claim the slot */
-        strncpy(mdev->name, depca_mca_adapter_name[mdev->index],
-                sizeof(mdev->name));
-        mca_device_set_claim(mdev, 1);
-
-        /*
-        ** Get everything allocated and initialized...  (almost just
-        ** like the ISA and EISA probes)
-        */
-        irq = mca_device_transform_irq(mdev, irq);
-        iobase = mca_device_transform_ioport(mdev, iobase);
-
-        if ((err = depca_common_init (iobase, &dev)))
-                goto out_unclaim;
-
-        dev->irq = irq;
-        dev->base_addr = iobase;
-        lp = netdev_priv(dev);
-        lp->depca_bus = DEPCA_BUS_MCA;
-        lp->adapter = depca_mca_adapter_type[mdev->index];
-        lp->mem_start = mem_start;
-
-        if ((err = depca_hw_init(dev, device)))
-                goto out_free;
-
-        return 0;
-
- out_free:
-        free_netdev (dev);
-        release_region (iobase, DEPCA_TOTAL_SIZE);
- out_unclaim:
-        mca_device_set_claim(mdev, 0);
-
-        return err;
-}
-#endif
-
 /*
 ** ISA bus I/O device probe
 */
@@ -2058,15 +1870,10 @@ static int __init depca_module_init (void)
 {
         int err = 0;
 
-#ifdef CONFIG_MCA
-        err = mca_register_driver(&depca_mca_driver);
-        if (err)
-                goto err;
-#endif
 #ifdef CONFIG_EISA
         err = eisa_driver_register(&depca_eisa_driver);
         if (err)
-                goto err_mca;
+                goto err_eisa;
 #endif
         err = platform_driver_register(&depca_isa_driver);
         if (err)
@@ -2078,11 +1885,6 @@ static int __init depca_module_init (void)
 err_eisa:
 #ifdef CONFIG_EISA
         eisa_driver_unregister(&depca_eisa_driver);
-err_mca:
-#endif
-#ifdef CONFIG_MCA
-        mca_unregister_driver(&depca_mca_driver);
-err:
 #endif
         return err;
 }
@@ -2090,9 +1892,6 @@ err:
 static void __exit depca_module_exit (void)
 {
         int i;
-#ifdef CONFIG_MCA
-        mca_unregister_driver (&depca_mca_driver);
-#endif
 #ifdef CONFIG_EISA
         eisa_driver_unregister (&depca_eisa_driver);
 #endif
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c.h b/drivers/net/ethernet/atheros/atl1c/atl1c.h
index ca70e16b6e2c..b2bf324631dc 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c.h
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c.h
@@ -74,8 +74,6 @@
 
 #define AT_RX_BUF_SIZE          (ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN)
 #define MAX_JUMBO_FRAME_SIZE    (6*1024)
-#define MAX_TSO_FRAME_SIZE      (7*1024)
-#define MAX_TX_OFFLOAD_THRESH   (9*1024)
 
 #define AT_MAX_RECEIVE_QUEUE    4
 #define AT_DEF_RECEIVE_QUEUE    1
@@ -100,7 +98,7 @@
 #define ATL1C_ASPM_L0s_ENABLE           0x0001
 #define ATL1C_ASPM_L1_ENABLE            0x0002
 
-#define AT_REGS_LEN     (75 * sizeof(u32))
+#define AT_REGS_LEN     (74 * sizeof(u32))
 #define AT_EEPROM_LEN   512
 
 #define ATL1C_GET_DESC(R, i, type)      (&(((type *)((R)->desc))[i]))
@@ -297,20 +295,6 @@ enum atl1c_dma_req_block {
         atl1c_dma_req_4096 = 5
 };
 
-enum atl1c_rss_mode {
-        atl1c_rss_mode_disable = 0,
-        atl1c_rss_sig_que = 1,
-        atl1c_rss_mul_que_sig_int = 2,
-        atl1c_rss_mul_que_mul_int = 4,
-};
-
-enum atl1c_rss_type {
-        atl1c_rss_disable = 0,
-        atl1c_rss_ipv4 = 1,
-        atl1c_rss_ipv4_tcp = 2,
-        atl1c_rss_ipv6 = 4,
-        atl1c_rss_ipv6_tcp = 8
-};
 
 enum atl1c_nic_type {
         athr_l1c = 0,
@@ -388,7 +372,6 @@ struct atl1c_hw {
         enum atl1c_dma_order dma_order;
         enum atl1c_dma_rcb   rcb_value;
         enum atl1c_dma_req_block dmar_block;
-        enum atl1c_dma_req_block dmaw_block;
 
         u16 device_id;
         u16 vendor_id;
@@ -399,8 +382,6 @@ struct atl1c_hw {
         u16 phy_id2;
 
         u32 intr_mask;
-        u8 dmaw_dly_cnt;
-        u8 dmar_dly_cnt;
 
         u8 preamble_len;
         u16 max_frame_size;
@@ -440,10 +421,6 @@ struct atl1c_hw {
 #define ATL1C_FPGA_VERSION              0x8000
         u16 link_cap_flags;
 #define ATL1C_LINK_CAP_1000M            0x0001
-        u16 cmb_tpd;
-        u16 cmb_rrd;
-        u16 cmb_rx_timer; /* 2us resolution */
-        u16 cmb_tx_timer;
         u32 smb_timer;
 
         u16 rrd_thresh; /* Threshold of number of RRD produced to trigger
@@ -451,9 +428,6 @@ struct atl1c_hw {
         u16 tpd_thresh;
         u8 tpd_burst;   /* Number of TPD to prefetch in cache-aligned burst. */
         u8 rfd_burst;
-        enum atl1c_rss_type rss_type;
-        enum atl1c_rss_mode rss_mode;
-        u8 rss_hash_bits;
         u32 base_cpu;
         u32 indirect_tab;
         u8 mac_addr[ETH_ALEN];
@@ -462,12 +436,12 @@ struct atl1c_hw {
         bool phy_configured;
         bool re_autoneg;
         bool emi_ca;
+        bool msi_lnkpatch;      /* link patch for specific platforms */
 };
 
 /*
  * atl1c_ring_header represents a single, contiguous block of DMA space
- * mapped for the three descriptor rings (tpd, rfd, rrd) and the two
- * message blocks (cmb, smb) described below
+ * mapped for the three descriptor rings (tpd, rfd, rrd) described below
  */
 struct atl1c_ring_header {
         void *desc;             /* virtual address */
@@ -541,16 +515,6 @@ struct atl1c_rrd_ring {
         u16 next_to_clean;
 };
 
-struct atl1c_cmb {
-        void *cmb;
-        dma_addr_t dma;
-};
-
-struct atl1c_smb {
-        void *smb;
-        dma_addr_t dma;
-};
-
 /* board specific private data structure */
 struct atl1c_adapter {
         struct net_device   *netdev;
@@ -586,11 +550,8 @@ struct atl1c_adapter {
         /* All Descriptor memory */
         struct atl1c_ring_header ring_header;
         struct atl1c_tpd_ring tpd_ring[AT_MAX_TRANSMIT_QUEUE];
-        struct atl1c_rfd_ring rfd_ring[AT_MAX_RECEIVE_QUEUE];
-        struct atl1c_rrd_ring rrd_ring[AT_MAX_RECEIVE_QUEUE];
-        struct atl1c_cmb cmb;
-        struct atl1c_smb smb;
-        int num_rx_queues;
+        struct atl1c_rfd_ring rfd_ring;
+        struct atl1c_rrd_ring rrd_ring;
         u32 bd_number;     /* board number;*/
 };
 
@@ -618,8 +579,14 @@ struct atl1c_adapter {
 #define AT_WRITE_REGW(a, reg, value) (\
                 writew((value), ((a)->hw_addr + reg)))
 
-#define AT_READ_REGW(a, reg) (\
-                readw((a)->hw_addr + reg))
+#define AT_READ_REGW(a, reg, pdata) do {                                \
+                if (unlikely((a)->hibernate)) {                         \
+                        readw((a)->hw_addr + reg);                      \
+                        *(u16 *)pdata = readw((a)->hw_addr + reg);      \
+                } else {                                                \
+                        *(u16 *)pdata = readw((a)->hw_addr + reg);      \
+                }                                                       \
+        } while (0)
 
 #define AT_WRITE_REG_ARRAY(a, reg, offset, value) ( \
                 writel((value), (((a)->hw_addr + reg) + ((offset) << 2))))
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c b/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c
index 0a9326aa58b5..859ea844ba0f 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c
@@ -141,8 +141,7 @@ static void atl1c_get_regs(struct net_device *netdev,
 
         memset(p, 0, AT_REGS_LEN);
 
-        regs->version = 0;
-        AT_READ_REG(hw, REG_VPD_CAP,              p++);
+        regs->version = 1;
         AT_READ_REG(hw, REG_PM_CTRL,              p++);
         AT_READ_REG(hw, REG_MAC_HALF_DUPLX_CTRL,  p++);
         AT_READ_REG(hw, REG_TWSI_CTRL,            p++);
@@ -154,7 +153,7 @@ static void atl1c_get_regs(struct net_device *netdev,
         AT_READ_REG(hw, REG_LINK_CTRL,            p++);
         AT_READ_REG(hw, REG_IDLE_STATUS,          p++);
         AT_READ_REG(hw, REG_MDIO_CTRL,            p++);
-        AT_READ_REG(hw, REG_SERDES_LOCK,          p++);
+        AT_READ_REG(hw, REG_SERDES,               p++);
         AT_READ_REG(hw, REG_MAC_CTRL,             p++);
         AT_READ_REG(hw, REG_MAC_IPG_IFG,          p++);
         AT_READ_REG(hw, REG_MAC_STA_ADDR,         p++);
@@ -167,9 +166,9 @@ static void atl1c_get_regs(struct net_device *netdev,
         AT_READ_REG(hw, REG_WOL_CTRL,             p++);
 
         atl1c_read_phy_reg(hw, MII_BMCR, &phy_data);
-        regs_buff[73] = (u32) phy_data;
+        regs_buff[AT_REGS_LEN/sizeof(u32) - 2] = (u32) phy_data;
         atl1c_read_phy_reg(hw, MII_BMSR, &phy_data);
-        regs_buff[74] = (u32) phy_data;
+        regs_buff[AT_REGS_LEN/sizeof(u32) - 1] = (u32) phy_data;
 }
 
 static int atl1c_get_eeprom_len(struct net_device *netdev)
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
index bd1667cbffa6..ff9c73859d45 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
@@ -43,7 +43,7 @@ int atl1c_check_eeprom_exist(struct atl1c_hw *hw)
         return 0;
 }
 
-void atl1c_hw_set_mac_addr(struct atl1c_hw *hw)
+void atl1c_hw_set_mac_addr(struct atl1c_hw *hw, u8 *mac_addr)
 {
         u32 value;
         /*
@@ -51,35 +51,48 @@ void atl1c_hw_set_mac_addr(struct atl1c_hw *hw)
          * 0:  6AF600DC 1: 000B
          * low dword
          */
-        value = (((u32)hw->mac_addr[2]) << 24) |
-                (((u32)hw->mac_addr[3]) << 16) |
-                (((u32)hw->mac_addr[4]) << 8)  |
-                (((u32)hw->mac_addr[5])) ;
+        value = mac_addr[2] << 24 |
+                mac_addr[3] << 16 |
+                mac_addr[4] << 8  |
+                mac_addr[5];
         AT_WRITE_REG_ARRAY(hw, REG_MAC_STA_ADDR, 0, value);
         /* hight dword */
-        value = (((u32)hw->mac_addr[0]) << 8) |
-                (((u32)hw->mac_addr[1])) ;
+        value = mac_addr[0] << 8 |
+                mac_addr[1];
         AT_WRITE_REG_ARRAY(hw, REG_MAC_STA_ADDR, 1, value);
 }
 
+/* read mac address from hardware register */
+static bool atl1c_read_current_addr(struct atl1c_hw *hw, u8 *eth_addr)
+{
+        u32 addr[2];
+
+        AT_READ_REG(hw, REG_MAC_STA_ADDR, &addr[0]);
+        AT_READ_REG(hw, REG_MAC_STA_ADDR + 4, &addr[1]);
+
+        *(u32 *) &eth_addr[2] = htonl(addr[0]);
+        *(u16 *) &eth_addr[0] = htons((u16)addr[1]);
+
+        return is_valid_ether_addr(eth_addr);
+}
+
 /*
  * atl1c_get_permanent_address
  * return 0 if get valid mac address,
  */
 static int atl1c_get_permanent_address(struct atl1c_hw *hw)
 {
-        u32 addr[2];
         u32 i;
         u32 otp_ctrl_data;
         u32 twsi_ctrl_data;
-        u32 ltssm_ctrl_data;
-        u32 wol_data;
-        u8  eth_addr[ETH_ALEN];
         u16 phy_data;
         bool raise_vol = false;
 
+        /* MAC-address from BIOS is the 1st priority */
+        if (atl1c_read_current_addr(hw, hw->perm_mac_addr))
+                return 0;
+
         /* init */
-        addr[0] = addr[1] = 0;
         AT_READ_REG(hw, REG_OTP_CTRL, &otp_ctrl_data);
         if (atl1c_check_eeprom_exist(hw)) {
                 if (hw->nic_type == athr_l1c || hw->nic_type == athr_l2c) {
@@ -91,33 +104,17 @@ static int atl1c_get_permanent_address(struct atl1c_hw *hw)
                                 msleep(1);
                         }
                 }
-
-                if (hw->nic_type == athr_l2c_b ||
-                    hw->nic_type == athr_l2c_b2 ||
-                    hw->nic_type == athr_l1d) {
-                        atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x00);
-                        if (atl1c_read_phy_reg(hw, MII_DBG_DATA, &phy_data))
-                                goto out;
-                        phy_data &= 0xFF7F;
-                        atl1c_write_phy_reg(hw, MII_DBG_DATA, phy_data);
-
-                        atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x3B);
-                        if (atl1c_read_phy_reg(hw, MII_DBG_DATA, &phy_data))
-                                goto out;
-                        phy_data |= 0x8;
-                        atl1c_write_phy_reg(hw, MII_DBG_DATA, phy_data);
+                /* raise voltage temporally for l2cb */
+                if (hw->nic_type == athr_l2c_b || hw->nic_type == athr_l2c_b2) {
+                        atl1c_read_phy_dbg(hw, MIIDBG_ANACTRL, &phy_data);
+                        phy_data &= ~ANACTRL_HB_EN;
+                        atl1c_write_phy_dbg(hw, MIIDBG_ANACTRL, phy_data);
+                        atl1c_read_phy_dbg(hw, MIIDBG_VOLT_CTRL, &phy_data);
+                        phy_data |= VOLT_CTRL_SWLOWEST;
+                        atl1c_write_phy_dbg(hw, MIIDBG_VOLT_CTRL, phy_data);
                         udelay(20);
                         raise_vol = true;
                 }
-                /* close open bit of ReadOnly*/
-                AT_READ_REG(hw, REG_LTSSM_ID_CTRL, &ltssm_ctrl_data);
-                ltssm_ctrl_data &= ~LTSSM_ID_EN_WRO;
-                AT_WRITE_REG(hw, REG_LTSSM_ID_CTRL, ltssm_ctrl_data);
-
-                /* clear any WOL settings */
-                AT_WRITE_REG(hw, REG_WOL_CTRL, 0);
-                AT_READ_REG(hw, REG_WOL_CTRL, &wol_data);
-
 
                 AT_READ_REG(hw, REG_TWSI_CTRL, &twsi_ctrl_data);
                 twsi_ctrl_data |= TWSI_CTRL_SW_LDSTART;
@@ -138,37 +135,18 @@ static int atl1c_get_permanent_address(struct atl1c_hw *hw)
                 msleep(1);
         }
         if (raise_vol) {
-                if (hw->nic_type == athr_l2c_b ||
-                    hw->nic_type == athr_l2c_b2 ||
-                    hw->nic_type == athr_l1d ||
-                    hw->nic_type == athr_l1d_2) {
-                        atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x00);
-                        if (atl1c_read_phy_reg(hw, MII_DBG_DATA, &phy_data))
-                                goto out;
-                        phy_data |= 0x80;
-                        atl1c_write_phy_reg(hw, MII_DBG_DATA, phy_data);
-
-                        atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x3B);
-                        if (atl1c_read_phy_reg(hw, MII_DBG_DATA, &phy_data))
-                                goto out;
-                        phy_data &= 0xFFF7;
-                        atl1c_write_phy_reg(hw, MII_DBG_DATA, phy_data);
-                        udelay(20);
-                }
+                atl1c_read_phy_dbg(hw, MIIDBG_ANACTRL, &phy_data);
+                phy_data |= ANACTRL_HB_EN;
+                atl1c_write_phy_dbg(hw, MIIDBG_ANACTRL, phy_data);
+                atl1c_read_phy_dbg(hw, MIIDBG_VOLT_CTRL, &phy_data);
+                phy_data &= ~VOLT_CTRL_SWLOWEST;
+                atl1c_write_phy_dbg(hw, MIIDBG_VOLT_CTRL, phy_data);
+                udelay(20);
         }
 
-        /* maybe MAC-address is from BIOS */
-        AT_READ_REG(hw, REG_MAC_STA_ADDR, &addr[0]);
-        AT_READ_REG(hw, REG_MAC_STA_ADDR + 4, &addr[1]);
-        *(u32 *) &eth_addr[2] = swab32(addr[0]);
-        *(u16 *) &eth_addr[0] = swab16(*(u16 *)&addr[1]);
-
-        if (is_valid_ether_addr(eth_addr)) {
-                memcpy(hw->perm_mac_addr, eth_addr, ETH_ALEN);
+        if (atl1c_read_current_addr(hw, hw->perm_mac_addr))
                 return 0;
-        }
 
-out:
         return -1;
 }
 
@@ -278,33 +256,158 @@ void atl1c_hash_set(struct atl1c_hw *hw, u32 hash_value)
 }
 
 /*
- * Reads the value from a PHY register
- * hw - Struct containing variables accessed by shared code
- * reg_addr - address of the PHY register to read
+ * wait mdio module be idle
+ * return true: idle
+ *        false: still busy
  */
-int atl1c_read_phy_reg(struct atl1c_hw *hw, u16 reg_addr, u16 *phy_data)
+bool atl1c_wait_mdio_idle(struct atl1c_hw *hw)
 {
         u32 val;
         int i;
 
-        val = ((u32)(reg_addr & MDIO_REG_ADDR_MASK)) << MDIO_REG_ADDR_SHIFT |
-                MDIO_START | MDIO_SUP_PREAMBLE | MDIO_RW |
-                MDIO_CLK_25_4 << MDIO_CLK_SEL_SHIFT;
+        for (i = 0; i < MDIO_MAX_AC_TO; i++) {
+                AT_READ_REG(hw, REG_MDIO_CTRL, &val);
+                if (!(val & (MDIO_CTRL_BUSY | MDIO_CTRL_START)))
+                        break;
+                udelay(10);
+        }
+
+        return i != MDIO_MAX_AC_TO;
+}
+
+void atl1c_stop_phy_polling(struct atl1c_hw *hw)
+{
+        if (!(hw->ctrl_flags & ATL1C_FPGA_VERSION))
+                return;
+
+        AT_WRITE_REG(hw, REG_MDIO_CTRL, 0);
+        atl1c_wait_mdio_idle(hw);
+}
+
+void atl1c_start_phy_polling(struct atl1c_hw *hw, u16 clk_sel)
+{
+        u32 val;
+
+        if (!(hw->ctrl_flags & ATL1C_FPGA_VERSION))
+                return;
 
+        val = MDIO_CTRL_SPRES_PRMBL |
+                FIELDX(MDIO_CTRL_CLK_SEL, clk_sel) |
+                FIELDX(MDIO_CTRL_REG, 1) |
+                MDIO_CTRL_START |
+                MDIO_CTRL_OP_READ;
+        AT_WRITE_REG(hw, REG_MDIO_CTRL, val);
+        atl1c_wait_mdio_idle(hw);
+        val |= MDIO_CTRL_AP_EN;
+        val &= ~MDIO_CTRL_START;
         AT_WRITE_REG(hw, REG_MDIO_CTRL, val);
+        udelay(30);
+}
 
-        for (i = 0; i < MDIO_WAIT_TIMES; i++) {
-                udelay(2);
-                AT_READ_REG(hw, REG_MDIO_CTRL, &val);
-                if (!(val & (MDIO_START | MDIO_BUSY)))
-                        break;
+
+/*
+ * atl1c_read_phy_core
+ * core funtion to read register in PHY via MDIO control regsiter.
+ * ext: extension register (see IEEE 802.3)
+ * dev: device address (see IEEE 802.3 DEVAD, PRTAD is fixed to 0)
+ * reg: reg to read
+ */
+int atl1c_read_phy_core(struct atl1c_hw *hw, bool ext, u8 dev,
+                        u16 reg, u16 *phy_data)
+{
+        u32 val;
+        u16 clk_sel = MDIO_CTRL_CLK_25_4;
+
+        atl1c_stop_phy_polling(hw);
+
+        *phy_data = 0;
+
+        /* only l2c_b2 & l1d_2 could use slow clock */
+        if ((hw->nic_type == athr_l2c_b2 || hw->nic_type == athr_l1d_2) &&
+                hw->hibernate)
+                clk_sel = MDIO_CTRL_CLK_25_128;
+        if (ext) {
+                val = FIELDX(MDIO_EXTN_DEVAD, dev) | FIELDX(MDIO_EXTN_REG, reg);
+                AT_WRITE_REG(hw, REG_MDIO_EXTN, val);
+                val = MDIO_CTRL_SPRES_PRMBL |
+                        FIELDX(MDIO_CTRL_CLK_SEL, clk_sel) |
+                        MDIO_CTRL_START |
+                        MDIO_CTRL_MODE_EXT |
+                        MDIO_CTRL_OP_READ;
+        } else {
+                val = MDIO_CTRL_SPRES_PRMBL |
+                        FIELDX(MDIO_CTRL_CLK_SEL, clk_sel) |
+                        FIELDX(MDIO_CTRL_REG, reg) |
+                        MDIO_CTRL_START |
+                        MDIO_CTRL_OP_READ;
         }
-        if (!(val & (MDIO_START | MDIO_BUSY))) {
-                *phy_data = (u16)val;
-                return 0;
+        AT_WRITE_REG(hw, REG_MDIO_CTRL, val);
+
+        if (!atl1c_wait_mdio_idle(hw))
+                return -1;
+
+        AT_READ_REG(hw, REG_MDIO_CTRL, &val);
+        *phy_data = (u16)FIELD_GETX(val, MDIO_CTRL_DATA);
+
+        atl1c_start_phy_polling(hw, clk_sel);
+
+        return 0;
+}
+
+/*
+ * atl1c_write_phy_core
+ * core funtion to write to register in PHY via MDIO control regsiter.
+ * ext: extension register (see IEEE 802.3)
+ * dev: device address (see IEEE 802.3 DEVAD, PRTAD is fixed to 0)
+ * reg: reg to write
+ */
+int atl1c_write_phy_core(struct atl1c_hw *hw, bool ext, u8 dev,
+                        u16 reg, u16 phy_data)
+{
+        u32 val;
+        u16 clk_sel = MDIO_CTRL_CLK_25_4;
+
+        atl1c_stop_phy_polling(hw);
+
+
+        /* only l2c_b2 & l1d_2 could use slow clock */
+        if ((hw->nic_type == athr_l2c_b2 || hw->nic_type == athr_l1d_2) &&
+                hw->hibernate)
+                clk_sel = MDIO_CTRL_CLK_25_128;
+
+        if (ext) {
+                val = FIELDX(MDIO_EXTN_DEVAD, dev) | FIELDX(MDIO_EXTN_REG, reg);
+                AT_WRITE_REG(hw, REG_MDIO_EXTN, val);
+                val = MDIO_CTRL_SPRES_PRMBL |
+                        FIELDX(MDIO_CTRL_CLK_SEL, clk_sel) |
+                        FIELDX(MDIO_CTRL_DATA, phy_data) |
+                        MDIO_CTRL_START |
+                        MDIO_CTRL_MODE_EXT;
+        } else {
+                val = MDIO_CTRL_SPRES_PRMBL |
+                        FIELDX(MDIO_CTRL_CLK_SEL, clk_sel) |
+                        FIELDX(MDIO_CTRL_DATA, phy_data) |
+                        FIELDX(MDIO_CTRL_REG, reg) |
+                        MDIO_CTRL_START;
         }
+        AT_WRITE_REG(hw, REG_MDIO_CTRL, val);
 
-        return -1;
+        if (!atl1c_wait_mdio_idle(hw))
+                return -1;
+
+        atl1c_start_phy_polling(hw, clk_sel);
+
+        return 0;
+}
+
+/*
+ * Reads the value from a PHY register
+ * hw - Struct containing variables accessed by shared code
+ * reg_addr - address of the PHY register to read
+ */
+int atl1c_read_phy_reg(struct atl1c_hw *hw, u16 reg_addr, u16 *phy_data)
+{
+        return atl1c_read_phy_core(hw, false, 0, reg_addr, phy_data);
 }
 
 /*
@@ -315,27 +418,47 @@ int atl1c_read_phy_reg(struct atl1c_hw *hw, u16 reg_addr, u16 *phy_data)
  */
 int atl1c_write_phy_reg(struct atl1c_hw *hw, u32 reg_addr, u16 phy_data)
 {
-        int i;
-        u32 val;
+        return atl1c_write_phy_core(hw, false, 0, reg_addr, phy_data);
+}
 
-        val = ((u32)(phy_data & MDIO_DATA_MASK)) << MDIO_DATA_SHIFT   |
-               (reg_addr & MDIO_REG_ADDR_MASK) << MDIO_REG_ADDR_SHIFT |
-               MDIO_SUP_PREAMBLE | MDIO_START |
-               MDIO_CLK_25_4 << MDIO_CLK_SEL_SHIFT;
+/* read from PHY extension register */
+int atl1c_read_phy_ext(struct atl1c_hw *hw, u8 dev_addr,
+                        u16 reg_addr, u16 *phy_data)
+{
+        return atl1c_read_phy_core(hw, true, dev_addr, reg_addr, phy_data);
+}
 
-        AT_WRITE_REG(hw, REG_MDIO_CTRL, val);
+/* write to PHY extension register */
+int atl1c_write_phy_ext(struct atl1c_hw *hw, u8 dev_addr,
+                        u16 reg_addr, u16 phy_data)
+{
+        return atl1c_write_phy_core(hw, true, dev_addr, reg_addr, phy_data);
+}
 
-        for (i = 0; i < MDIO_WAIT_TIMES; i++) {
-                udelay(2);
-                AT_READ_REG(hw, REG_MDIO_CTRL, &val);
-                if (!(val & (MDIO_START | MDIO_BUSY)))
-                        break;
-        }
+int atl1c_read_phy_dbg(struct atl1c_hw *hw, u16 reg_addr, u16 *phy_data)
+{
+        int err;
 
-        if (!(val & (MDIO_START | MDIO_BUSY)))
-                return 0;
+        err = atl1c_write_phy_reg(hw, MII_DBG_ADDR, reg_addr);
+        if (unlikely(err))
+                return err;
+        else
+                err = atl1c_read_phy_reg(hw, MII_DBG_DATA, phy_data);
 
-        return -1;
+        return err;
+}
+
+int atl1c_write_phy_dbg(struct atl1c_hw *hw, u16 reg_addr, u16 phy_data)
+{
+        int err;
+
+        err = atl1c_write_phy_reg(hw, MII_DBG_ADDR, reg_addr);
+        if (unlikely(err))
+                return err;
+        else
+                err = atl1c_write_phy_reg(hw, MII_DBG_DATA, phy_data);
+
+        return err;
 }
 
 /*
@@ -380,119 +503,100 @@ static int atl1c_phy_setup_adv(struct atl1c_hw *hw)
 
 void atl1c_phy_disable(struct atl1c_hw *hw)
 {
-        AT_WRITE_REGW(hw, REG_GPHY_CTRL,
-                        GPHY_CTRL_PW_WOL_DIS | GPHY_CTRL_EXT_RESET);
+        atl1c_power_saving(hw, 0);
 }
 
-static void atl1c_phy_magic_data(struct atl1c_hw *hw)
-{
-        u16 data;
-
-        data = ANA_LOOP_SEL_10BT | ANA_EN_MASK_TB | ANA_EN_10BT_IDLE |
-                ((1 & ANA_INTERVAL_SEL_TIMER_MASK) <<
-                ANA_INTERVAL_SEL_TIMER_SHIFT);
-
-        atl1c_write_phy_reg(hw, MII_DBG_ADDR, MII_ANA_CTRL_18);
-        atl1c_write_phy_reg(hw, MII_DBG_DATA, data);
-
-        data = (2 & ANA_SERDES_CDR_BW_MASK) | ANA_MS_PAD_DBG |
-                ANA_SERDES_EN_DEEM | ANA_SERDES_SEL_HSP | ANA_SERDES_EN_PLL |
-                ANA_SERDES_EN_LCKDT;
-
-        atl1c_write_phy_reg(hw, MII_DBG_ADDR, MII_ANA_CTRL_5);
-        atl1c_write_phy_reg(hw, MII_DBG_DATA, data);
-
-        data = (44 & ANA_LONG_CABLE_TH_100_MASK) |
-                ((33 & ANA_SHORT_CABLE_TH_100_MASK) <<
-                ANA_SHORT_CABLE_TH_100_SHIFT) | ANA_BP_BAD_LINK_ACCUM |
-                ANA_BP_SMALL_BW;
-
-        atl1c_write_phy_reg(hw, MII_DBG_ADDR, MII_ANA_CTRL_54);
-        atl1c_write_phy_reg(hw, MII_DBG_DATA, data);
-
-        data = (11 & ANA_IECHO_ADJ_MASK) | ((11 & ANA_IECHO_ADJ_MASK) <<
-                ANA_IECHO_ADJ_2_SHIFT) | ((8 & ANA_IECHO_ADJ_MASK) <<
-                ANA_IECHO_ADJ_1_SHIFT) | ((8 & ANA_IECHO_ADJ_MASK) <<
-                ANA_IECHO_ADJ_0_SHIFT);
-
-        atl1c_write_phy_reg(hw, MII_DBG_ADDR, MII_ANA_CTRL_4);
-        atl1c_write_phy_reg(hw, MII_DBG_DATA, data);
-
-        data = ANA_RESTART_CAL | ((7 & ANA_MANUL_SWICH_ON_MASK) <<
-                ANA_MANUL_SWICH_ON_SHIFT) | ANA_MAN_ENABLE |
-                ANA_SEL_HSP | ANA_EN_HB | ANA_OEN_125M;
-
-        atl1c_write_phy_reg(hw, MII_DBG_ADDR, MII_ANA_CTRL_0);
-        atl1c_write_phy_reg(hw, MII_DBG_DATA, data);
-
-        if (hw->ctrl_flags & ATL1C_HIB_DISABLE) {
-                atl1c_write_phy_reg(hw, MII_DBG_ADDR, MII_ANA_CTRL_41);
-                if (atl1c_read_phy_reg(hw, MII_DBG_DATA, &data) != 0)
-                        return;
-                data &= ~ANA_TOP_PS_EN;
-                atl1c_write_phy_reg(hw, MII_DBG_DATA, data);
-
-                atl1c_write_phy_reg(hw, MII_DBG_ADDR, MII_ANA_CTRL_11);
-                if (atl1c_read_phy_reg(hw, MII_DBG_DATA, &data) != 0)
-                        return;
-                data &= ~ANA_PS_HIB_EN;
-                atl1c_write_phy_reg(hw, MII_DBG_DATA, data);
-        }
-}
 
 int atl1c_phy_reset(struct atl1c_hw *hw)
 {
         struct atl1c_adapter *adapter = hw->adapter;
         struct pci_dev *pdev = adapter->pdev;
         u16 phy_data;
-        u32 phy_ctrl_data = GPHY_CTRL_DEFAULT;
-        u32 mii_ier_data = IER_LINK_UP | IER_LINK_DOWN;
+        u32 phy_ctrl_data, lpi_ctrl;
         int err;
 
-        if (hw->ctrl_flags & ATL1C_HIB_DISABLE)
-                phy_ctrl_data &= ~GPHY_CTRL_HIB_EN;
-
+        /* reset PHY core */
+        AT_READ_REG(hw, REG_GPHY_CTRL, &phy_ctrl_data);
+        phy_ctrl_data &= ~(GPHY_CTRL_EXT_RESET | GPHY_CTRL_PHY_IDDQ |
+                GPHY_CTRL_GATE_25M_EN | GPHY_CTRL_PWDOWN_HW | GPHY_CTRL_CLS);
+        phy_ctrl_data |= GPHY_CTRL_SEL_ANA_RST;
+        if (!(hw->ctrl_flags & ATL1C_HIB_DISABLE))
+                phy_ctrl_data |= (GPHY_CTRL_HIB_EN | GPHY_CTRL_HIB_PULSE);
+        else
+                phy_ctrl_data &= ~(GPHY_CTRL_HIB_EN | GPHY_CTRL_HIB_PULSE);
         AT_WRITE_REG(hw, REG_GPHY_CTRL, phy_ctrl_data);
         AT_WRITE_FLUSH(hw);
-        msleep(40);
-        phy_ctrl_data |= GPHY_CTRL_EXT_RESET;
-        AT_WRITE_REG(hw, REG_GPHY_CTRL, phy_ctrl_data);
+        udelay(10);
+        AT_WRITE_REG(hw, REG_GPHY_CTRL, phy_ctrl_data | GPHY_CTRL_EXT_RESET);
         AT_WRITE_FLUSH(hw);
-        msleep(10);
+        udelay(10 * GPHY_CTRL_EXT_RST_TO);      /* delay 800us */
 
+        /* switch clock */
         if (hw->nic_type == athr_l2c_b) {
-                atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x0A);
-                atl1c_read_phy_reg(hw, MII_DBG_DATA, &phy_data);
-                atl1c_write_phy_reg(hw, MII_DBG_DATA, phy_data & 0xDFFF);
+                atl1c_read_phy_dbg(hw, MIIDBG_CFGLPSPD, &phy_data);
+                atl1c_write_phy_dbg(hw, MIIDBG_CFGLPSPD,
+                        phy_data & ~CFGLPSPD_RSTCNT_CLK125SW);
         }
 
-        if (hw->nic_type == athr_l2c_b ||
-            hw->nic_type == athr_l2c_b2 ||
-            hw->nic_type == athr_l1d ||
-            hw->nic_type == athr_l1d_2) {
-                atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x3B);
-                atl1c_read_phy_reg(hw, MII_DBG_DATA, &phy_data);
-                atl1c_write_phy_reg(hw, MII_DBG_DATA, phy_data & 0xFFF7);
-                msleep(20);
+        /* tx-half amplitude issue fix */
+        if (hw->nic_type == athr_l2c_b || hw->nic_type == athr_l2c_b2) {
+                atl1c_read_phy_dbg(hw, MIIDBG_CABLE1TH_DET, &phy_data);
+                phy_data |= CABLE1TH_DET_EN;
+                atl1c_write_phy_dbg(hw, MIIDBG_CABLE1TH_DET, phy_data);
         }
-        if (hw->nic_type == athr_l1d) {
-                atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x29);
-                atl1c_write_phy_reg(hw, MII_DBG_DATA, 0x929D);
+
+        /* clear bit3 of dbgport 3B to lower voltage */
+        if (!(hw->ctrl_flags & ATL1C_HIB_DISABLE)) {
+                if (hw->nic_type == athr_l2c_b || hw->nic_type == athr_l2c_b2) {
+                        atl1c_read_phy_dbg(hw, MIIDBG_VOLT_CTRL, &phy_data);
+                        phy_data &= ~VOLT_CTRL_SWLOWEST;
+                        atl1c_write_phy_dbg(hw, MIIDBG_VOLT_CTRL, phy_data);
+                }
+                /* power saving config */
+                phy_data =
+                        hw->nic_type == athr_l1d || hw->nic_type == athr_l1d_2 ?
+                        L1D_LEGCYPS_DEF : L1C_LEGCYPS_DEF;
+                atl1c_write_phy_dbg(hw, MIIDBG_LEGCYPS, phy_data);
+                /* hib */
+                atl1c_write_phy_dbg(hw, MIIDBG_SYSMODCTRL,
+                        SYSMODCTRL_IECHOADJ_DEF);
+        } else {
+                /* disable pws */
+                atl1c_read_phy_dbg(hw, MIIDBG_LEGCYPS, &phy_data);
+                atl1c_write_phy_dbg(hw, MIIDBG_LEGCYPS,
+                        phy_data & ~LEGCYPS_EN);
+                /* disable hibernate */
+                atl1c_read_phy_dbg(hw, MIIDBG_HIBNEG, &phy_data);
+                atl1c_write_phy_dbg(hw, MIIDBG_HIBNEG,
+                        phy_data & HIBNEG_PSHIB_EN);
         }
-        if (hw->nic_type == athr_l1c || hw->nic_type == athr_l2c_b2
-                || hw->nic_type == athr_l2c) {
-                atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x29);
-                atl1c_write_phy_reg(hw, MII_DBG_DATA, 0xB6DD);
+        /* disable AZ(EEE) by default */
+        if (hw->nic_type == athr_l1d || hw->nic_type == athr_l1d_2 ||
+            hw->nic_type == athr_l2c_b2) {
+                AT_READ_REG(hw, REG_LPI_CTRL, &lpi_ctrl);
+                AT_WRITE_REG(hw, REG_LPI_CTRL, lpi_ctrl & ~LPI_CTRL_EN);
+                atl1c_write_phy_ext(hw, MIIEXT_ANEG, MIIEXT_LOCAL_EEEADV, 0);
+                atl1c_write_phy_ext(hw, MIIEXT_PCS, MIIEXT_CLDCTRL3,
+                        L2CB_CLDCTRL3);
         }
-        err = atl1c_write_phy_reg(hw, MII_IER, mii_ier_data);
+
+        /* other debug port to set */
+        atl1c_write_phy_dbg(hw, MIIDBG_ANACTRL, ANACTRL_DEF);
+        atl1c_write_phy_dbg(hw, MIIDBG_SRDSYSMOD, SRDSYSMOD_DEF);
+        atl1c_write_phy_dbg(hw, MIIDBG_TST10BTCFG, TST10BTCFG_DEF);
+        /* UNH-IOL test issue, set bit7 */
+        atl1c_write_phy_dbg(hw, MIIDBG_TST100BTCFG,
+                TST100BTCFG_DEF | TST100BTCFG_LITCH_EN);
+
+        /* set phy interrupt mask */
+        phy_data = IER_LINK_UP | IER_LINK_DOWN;
+        err = atl1c_write_phy_reg(hw, MII_IER, phy_data);
         if (err) {
                 if (netif_msg_hw(adapter))
                         dev_err(&pdev->dev,
                                 "Error enable PHY linkChange Interrupt\n");
                 return err;
         }
-        if (!(hw->ctrl_flags & ATL1C_FPGA_VERSION))
-                atl1c_phy_magic_data(hw);
         return 0;
 }
 
@@ -589,7 +693,8 @@ int atl1c_get_speed_and_duplex(struct atl1c_hw *hw, u16 *speed, u16 *duplex)
         return 0;
 }
 
-int atl1c_phy_power_saving(struct atl1c_hw *hw)
+/* select one link mode to get lower power consumption */
+int atl1c_phy_to_ps_link(struct atl1c_hw *hw)
 {
         struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter;
         struct pci_dev *pdev = adapter->pdev;
@@ -660,3 +765,101 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw)
 
         return atl1c_write_phy_reg(hw, MII_BMCR, mii_bmcr_data);
 }
+
+int atl1c_power_saving(struct atl1c_hw *hw, u32 wufc)
+{
+        struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter;
+        struct pci_dev *pdev = adapter->pdev;
+        u32 master_ctrl, mac_ctrl, phy_ctrl;
+        u32 wol_ctrl, speed;
+        u16 phy_data;
+
+        wol_ctrl = 0;
+        speed = adapter->link_speed == SPEED_1000 ?
+                MAC_CTRL_SPEED_1000 : MAC_CTRL_SPEED_10_100;
+
+        AT_READ_REG(hw, REG_MASTER_CTRL, &master_ctrl);
+        AT_READ_REG(hw, REG_MAC_CTRL, &mac_ctrl);
+        AT_READ_REG(hw, REG_GPHY_CTRL, &phy_ctrl);
+
+        master_ctrl &= ~MASTER_CTRL_CLK_SEL_DIS;
+        mac_ctrl = FIELD_SETX(mac_ctrl, MAC_CTRL_SPEED, speed);
+        mac_ctrl &= ~(MAC_CTRL_DUPLX | MAC_CTRL_RX_EN | MAC_CTRL_TX_EN);
+        if (adapter->link_duplex == FULL_DUPLEX)
+                mac_ctrl |= MAC_CTRL_DUPLX;
+        phy_ctrl &= ~(GPHY_CTRL_EXT_RESET | GPHY_CTRL_CLS);
+        phy_ctrl |= GPHY_CTRL_SEL_ANA_RST | GPHY_CTRL_HIB_PULSE |
+                GPHY_CTRL_HIB_EN;
+        if (!wufc) { /* without WoL */
+                master_ctrl |= MASTER_CTRL_CLK_SEL_DIS;
+                phy_ctrl |= GPHY_CTRL_PHY_IDDQ | GPHY_CTRL_PWDOWN_HW;
+                AT_WRITE_REG(hw, REG_MASTER_CTRL, master_ctrl);
+                AT_WRITE_REG(hw, REG_MAC_CTRL, mac_ctrl);
+                AT_WRITE_REG(hw, REG_GPHY_CTRL, phy_ctrl);
+                AT_WRITE_REG(hw, REG_WOL_CTRL, 0);
+                hw->phy_configured = false; /* re-init PHY when resume */
+                return 0;
+        }
+        phy_ctrl |= GPHY_CTRL_EXT_RESET;
+        if (wufc & AT_WUFC_MAG) {
+                mac_ctrl |= MAC_CTRL_RX_EN | MAC_CTRL_BC_EN;
+                wol_ctrl |= WOL_MAGIC_EN | WOL_MAGIC_PME_EN;
+                if (hw->nic_type == athr_l2c_b && hw->revision_id == L2CB_V11)
+                        wol_ctrl |= WOL_PATTERN_EN | WOL_PATTERN_PME_EN;
+        }
+        if (wufc & AT_WUFC_LNKC) {
+                wol_ctrl |= WOL_LINK_CHG_EN | WOL_LINK_CHG_PME_EN;
+                if (atl1c_write_phy_reg(hw, MII_IER, IER_LINK_UP) != 0) {
+                        dev_dbg(&pdev->dev, "%s: write phy MII_IER faild.\n",
+                                atl1c_driver_name);
+                }
+        }
+        /* clear PHY interrupt */
+        atl1c_read_phy_reg(hw, MII_ISR, &phy_data);
+
+        dev_dbg(&pdev->dev, "%s: suspend MAC=%x,MASTER=%x,PHY=0x%x,WOL=%x\n",
+                atl1c_driver_name, mac_ctrl, master_ctrl, phy_ctrl, wol_ctrl);
+        AT_WRITE_REG(hw, REG_MASTER_CTRL, master_ctrl);
+        AT_WRITE_REG(hw, REG_MAC_CTRL, mac_ctrl);
+        AT_WRITE_REG(hw, REG_GPHY_CTRL, phy_ctrl);
+        AT_WRITE_REG(hw, REG_WOL_CTRL, wol_ctrl);
+
+        return 0;
+}
+
+
+/* configure phy after Link change Event */
+void atl1c_post_phy_linkchg(struct atl1c_hw *hw, u16 link_speed)
+{
+        u16 phy_val;
+        bool adj_thresh = false;
+
+        if (hw->nic_type == athr_l2c_b || hw->nic_type == athr_l2c_b2 ||
+            hw->nic_type == athr_l1d || hw->nic_type == athr_l1d_2)
+                adj_thresh = true;
+
+        if (link_speed != SPEED_0) { /* link up */
+                /* az with brcm, half-amp */
+                if (hw->nic_type == athr_l1d_2) {
+                        atl1c_read_phy_ext(hw, MIIEXT_PCS, MIIEXT_CLDCTRL6,
+                                &phy_val);
+                        phy_val = FIELD_GETX(phy_val, CLDCTRL6_CAB_LEN);
+                        phy_val = phy_val > CLDCTRL6_CAB_LEN_SHORT ?
+                                AZ_ANADECT_LONG : AZ_ANADECT_DEF;
+                        atl1c_write_phy_dbg(hw, MIIDBG_AZ_ANADECT, phy_val);
+                }
+                /* threshold adjust */
+                if (adj_thresh && link_speed == SPEED_100 && hw->msi_lnkpatch) {
+                        atl1c_write_phy_dbg(hw, MIIDBG_MSE16DB, L1D_MSE16DB_UP);
+                        atl1c_write_phy_dbg(hw, MIIDBG_SYSMODCTRL,
+                                L1D_SYSMODCTRL_IECHOADJ_DEF);
+                }
+        } else { /* link down */
+                if (adj_thresh && hw->msi_lnkpatch) {
+                        atl1c_write_phy_dbg(hw, MIIDBG_SYSMODCTRL,
+                                SYSMODCTRL_IECHOADJ_DEF);
+                        atl1c_write_phy_dbg(hw, MIIDBG_MSE16DB,
+                                L1D_MSE16DB_DOWN);
+                }
+        }
+}
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
index 655fc6c4a8a4..17d935bdde0a 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
@@ -25,12 +25,18 @@
 #include <linux/types.h>
 #include <linux/mii.h>
 
+#define FIELD_GETX(_x, _name)   ((_x) >> (_name##_SHIFT) & (_name##_MASK))
+#define FIELD_SETX(_x, _name, _v) \
+(((_x) & ~((_name##_MASK) << (_name##_SHIFT))) |\
+(((_v) & (_name##_MASK)) << (_name##_SHIFT)))
+#define FIELDX(_name, _v) (((_v) & (_name##_MASK)) << (_name##_SHIFT))
+
 struct atl1c_adapter;
 struct atl1c_hw;
 
 /* function prototype */
 void atl1c_phy_disable(struct atl1c_hw *hw);
-void atl1c_hw_set_mac_addr(struct atl1c_hw *hw);
+void atl1c_hw_set_mac_addr(struct atl1c_hw *hw, u8 *mac_addr);
 int atl1c_phy_reset(struct atl1c_hw *hw);
 int atl1c_read_mac_addr(struct atl1c_hw *hw);
 int atl1c_get_speed_and_duplex(struct atl1c_hw *hw, u16 *speed, u16 *duplex);
@@ -42,47 +48,45 @@ bool atl1c_read_eeprom(struct atl1c_hw *hw, u32 offset, u32 *p_value);
 int atl1c_phy_init(struct atl1c_hw *hw);
 int atl1c_check_eeprom_exist(struct atl1c_hw *hw);
 int atl1c_restart_autoneg(struct atl1c_hw *hw);
-int atl1c_phy_power_saving(struct atl1c_hw *hw);
+int atl1c_phy_to_ps_link(struct atl1c_hw *hw);
+int atl1c_power_saving(struct atl1c_hw *hw, u32 wufc);
+bool atl1c_wait_mdio_idle(struct atl1c_hw *hw);
+void atl1c_stop_phy_polling(struct atl1c_hw *hw);
+void atl1c_start_phy_polling(struct atl1c_hw *hw, u16 clk_sel);
+int atl1c_read_phy_core(struct atl1c_hw *hw, bool ext, u8 dev,
+                        u16 reg, u16 *phy_data);
+int atl1c_write_phy_core(struct atl1c_hw *hw, bool ext, u8 dev,
+                        u16 reg, u16 phy_data);
+int atl1c_read_phy_ext(struct atl1c_hw *hw, u8 dev_addr,
+                        u16 reg_addr, u16 *phy_data);
+int atl1c_write_phy_ext(struct atl1c_hw *hw, u8 dev_addr,
+                        u16 reg_addr, u16 phy_data);
+int atl1c_read_phy_dbg(struct atl1c_hw *hw, u16 reg_addr, u16 *phy_data);
+int atl1c_write_phy_dbg(struct atl1c_hw *hw, u16 reg_addr, u16 phy_data);
+void atl1c_post_phy_linkchg(struct atl1c_hw *hw, u16 link_speed);
+
+/* hw-ids */
+#define PCI_DEVICE_ID_ATTANSIC_L2C      0x1062
+#define PCI_DEVICE_ID_ATTANSIC_L1C      0x1063
+#define PCI_DEVICE_ID_ATHEROS_L2C_B     0x2060 /* AR8152 v1.1 Fast 10/100 */
+#define PCI_DEVICE_ID_ATHEROS_L2C_B2    0x2062 /* AR8152 v2.0 Fast 10/100 */
+#define PCI_DEVICE_ID_ATHEROS_L1D       0x1073 /* AR8151 v1.0 Gigabit 1000 */
+#define PCI_DEVICE_ID_ATHEROS_L1D_2_0   0x1083 /* AR8151 v2.0 Gigabit 1000 */
+#define L2CB_V10                        0xc0
+#define L2CB_V11                        0xc1
+
 /* register definition */
 #define REG_DEVICE_CAP                  0x5C
 #define DEVICE_CAP_MAX_PAYLOAD_MASK     0x7
 #define DEVICE_CAP_MAX_PAYLOAD_SHIFT    0
 
-#define REG_DEVICE_CTRL                 0x60
-#define DEVICE_CTRL_MAX_PAYLOAD_MASK    0x7
-#define DEVICE_CTRL_MAX_PAYLOAD_SHIFT   5
-#define DEVICE_CTRL_MAX_RREQ_SZ_MASK    0x7
-#define DEVICE_CTRL_MAX_RREQ_SZ_SHIFT   12
+#define DEVICE_CTRL_MAXRRS_MIN          2
 
 #define REG_LINK_CTRL                   0x68
 #define LINK_CTRL_L0S_EN                0x01
 #define LINK_CTRL_L1_EN                 0x02
 #define LINK_CTRL_EXT_SYNC              0x80
 
-#define REG_VPD_CAP                     0x6C
-#define VPD_CAP_ID_MASK                 0xff
-#define VPD_CAP_ID_SHIFT                0
-#define VPD_CAP_NEXT_PTR_MASK           0xFF
-#define VPD_CAP_NEXT_PTR_SHIFT          8
-#define VPD_CAP_VPD_ADDR_MASK           0x7FFF
-#define VPD_CAP_VPD_ADDR_SHIFT          16
-#define VPD_CAP_VPD_FLAG                0x80000000
-
-#define REG_VPD_DATA                    0x70
-
-#define REG_PCIE_UC_SEVERITY            0x10C
-#define PCIE_UC_SERVRITY_TRN            0x00000001
-#define PCIE_UC_SERVRITY_DLP            0x00000010
-#define PCIE_UC_SERVRITY_PSN_TLP        0x00001000
-#define PCIE_UC_SERVRITY_FCP            0x00002000
-#define PCIE_UC_SERVRITY_CPL_TO         0x00004000
-#define PCIE_UC_SERVRITY_CA             0x00008000
-#define PCIE_UC_SERVRITY_UC             0x00010000
-#define PCIE_UC_SERVRITY_ROV            0x00020000
-#define PCIE_UC_SERVRITY_MLFP           0x00040000
-#define PCIE_UC_SERVRITY_ECRC           0x00080000
-#define PCIE_UC_SERVRITY_UR             0x00100000
-
 #define REG_DEV_SERIALNUM_CTRL          0x200
 #define REG_DEV_MAC_SEL_MASK            0x0 /* 0:EUI; 1:MAC */
 #define REG_DEV_MAC_SEL_SHIFT           0
@@ -90,25 +94,17 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
 #define REG_DEV_SERIAL_NUM_EN_SHIFT     1
 
 #define REG_TWSI_CTRL                   0x218
+#define TWSI_CTLR_FREQ_MASK             0x3UL
+#define TWSI_CTRL_FREQ_SHIFT            24
+#define TWSI_CTRL_FREQ_100K             0
+#define TWSI_CTRL_FREQ_200K             1
+#define TWSI_CTRL_FREQ_300K             2
+#define TWSI_CTRL_FREQ_400K             3
+#define TWSI_CTRL_LD_EXIST              BIT(23)
+#define TWSI_CTRL_HW_LDSTAT             BIT(12) /* 0:finish,1:in progress */
+#define TWSI_CTRL_SW_LDSTART            BIT(11)
 #define TWSI_CTRL_LD_OFFSET_MASK        0xFF
 #define TWSI_CTRL_LD_OFFSET_SHIFT       0
-#define TWSI_CTRL_LD_SLV_ADDR_MASK      0x7
-#define TWSI_CTRL_LD_SLV_ADDR_SHIFT     8
-#define TWSI_CTRL_SW_LDSTART            0x800
-#define TWSI_CTRL_HW_LDSTART            0x1000
-#define TWSI_CTRL_SMB_SLV_ADDR_MASK     0x7F
-#define TWSI_CTRL_SMB_SLV_ADDR_SHIFT    15
-#define TWSI_CTRL_LD_EXIST              0x400000
-#define TWSI_CTRL_READ_FREQ_SEL_MASK    0x3
-#define TWSI_CTRL_READ_FREQ_SEL_SHIFT   23
-#define TWSI_CTRL_FREQ_SEL_100K         0
-#define TWSI_CTRL_FREQ_SEL_200K         1
-#define TWSI_CTRL_FREQ_SEL_300K         2
-#define TWSI_CTRL_FREQ_SEL_400K         3
-#define TWSI_CTRL_SMB_SLV_ADDR
-#define TWSI_CTRL_WRITE_FREQ_SEL_MASK   0x3
-#define TWSI_CTRL_WRITE_FREQ_SEL_SHIFT  24
-
 
 #define REG_PCIE_DEV_MISC_CTRL          0x21C
 #define PCIE_DEV_MISC_EXT_PIPE          0x2
@@ -118,16 +114,23 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
 #define PCIE_DEV_MISC_SERDES_SEL_DIN    0x10
 
 #define REG_PCIE_PHYMISC                0x1000
-#define PCIE_PHYMISC_FORCE_RCV_DET      0x4
+#define PCIE_PHYMISC_FORCE_RCV_DET      BIT(2)
+#define PCIE_PHYMISC_NFTS_MASK          0xFFUL
+#define PCIE_PHYMISC_NFTS_SHIFT         16
 
 #define REG_PCIE_PHYMISC2               0x1004
-#define PCIE_PHYMISC2_SERDES_CDR_MASK   0x3
-#define PCIE_PHYMISC2_SERDES_CDR_SHIFT  16
-#define PCIE_PHYMISC2_SERDES_TH_MASK    0x3
-#define PCIE_PHYMISC2_SERDES_TH_SHIFT   18
+#define PCIE_PHYMISC2_L0S_TH_MASK       0x3UL
+#define PCIE_PHYMISC2_L0S_TH_SHIFT      18
+#define L2CB1_PCIE_PHYMISC2_L0S_TH      3
+#define PCIE_PHYMISC2_CDR_BW_MASK       0x3UL
+#define PCIE_PHYMISC2_CDR_BW_SHIFT      16
+#define L2CB1_PCIE_PHYMISC2_CDR_BW      3
 
 #define REG_TWSI_DEBUG                  0x1108
-#define TWSI_DEBUG_DEV_EXIST            0x20000000
+#define TWSI_DEBUG_DEV_EXIST            BIT(29)
+
+#define REG_DMA_DBG                     0x1114
+#define DMA_DBG_VENDOR_MSG              BIT(0)
 
 #define REG_EEPROM_CTRL                 0x12C0
 #define EEPROM_CTRL_DATA_HI_MASK        0xFFFF
@@ -140,56 +143,81 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
 #define REG_EEPROM_DATA_LO              0x12C4
 
 #define REG_OTP_CTRL                    0x12F0
-#define OTP_CTRL_CLK_EN                 0x0002
+#define OTP_CTRL_CLK_EN                 BIT(1)
 
 #define REG_PM_CTRL                     0x12F8
-#define PM_CTRL_SDES_EN                 0x00000001
-#define PM_CTRL_RBER_EN                 0x00000002
-#define PM_CTRL_CLK_REQ_EN              0x00000004
-#define PM_CTRL_ASPM_L1_EN              0x00000008
-#define PM_CTRL_SERDES_L1_EN            0x00000010
-#define PM_CTRL_SERDES_PLL_L1_EN        0x00000020
-#define PM_CTRL_SERDES_PD_EX_L1         0x00000040
-#define PM_CTRL_SERDES_BUDS_RX_L1_EN    0x00000080
-#define PM_CTRL_L0S_ENTRY_TIMER_MASK    0xF
-#define PM_CTRL_L0S_ENTRY_TIMER_SHIFT   8
-#define PM_CTRL_ASPM_L0S_EN             0x00001000
-#define PM_CTRL_CLK_SWH_L1              0x00002000
-#define PM_CTRL_CLK_PWM_VER1_1          0x00004000
-#define PM_CTRL_RCVR_WT_TIMER           0x00008000
-#define PM_CTRL_L1_ENTRY_TIMER_MASK     0xF
-#define PM_CTRL_L1_ENTRY_TIMER_SHIFT    16
-#define PM_CTRL_PM_REQ_TIMER_MASK       0xF
-#define PM_CTRL_PM_REQ_TIMER_SHIFT      20
-#define PM_CTRL_LCKDET_TIMER_MASK       0xF
+#define PM_CTRL_HOTRST                  BIT(31)
+#define PM_CTRL_MAC_ASPM_CHK            BIT(30) /* L0s/L1 dis by MAC based on
+                                                 * thrghput(setting in 15A0) */
+#define PM_CTRL_SA_DLY_EN               BIT(29)
+#define PM_CTRL_L0S_BUFSRX_EN           BIT(28)
+#define PM_CTRL_LCKDET_TIMER_MASK       0xFUL
 #define PM_CTRL_LCKDET_TIMER_SHIFT      24
-#define PM_CTRL_EN_BUFS_RX_L0S          0x10000000
-#define PM_CTRL_SA_DLY_EN               0x20000000
-#define PM_CTRL_MAC_ASPM_CHK            0x40000000
-#define PM_CTRL_HOTRST                  0x80000000
+#define PM_CTRL_LCKDET_TIMER_DEF        0xC
+#define PM_CTRL_PM_REQ_TIMER_MASK       0xFUL
+#define PM_CTRL_PM_REQ_TIMER_SHIFT      20      /* pm_request_l1 time > @
+                                                 * ->L0s not L1 */
+#define PM_CTRL_PM_REQ_TO_DEF           0xF
+#define PMCTRL_TXL1_AFTER_L0S           BIT(19) /* l1dv2.0+ */
+#define L1D_PMCTRL_L1_ENTRY_TM_MASK     7UL     /* l1dv2.0+, 3bits */
+#define L1D_PMCTRL_L1_ENTRY_TM_SHIFT    16
+#define L1D_PMCTRL_L1_ENTRY_TM_DIS      0
+#define L1D_PMCTRL_L1_ENTRY_TM_2US      1
+#define L1D_PMCTRL_L1_ENTRY_TM_4US      2
+#define L1D_PMCTRL_L1_ENTRY_TM_8US      3
+#define L1D_PMCTRL_L1_ENTRY_TM_16US     4
+#define L1D_PMCTRL_L1_ENTRY_TM_24US     5
+#define L1D_PMCTRL_L1_ENTRY_TM_32US     6
+#define L1D_PMCTRL_L1_ENTRY_TM_63US     7
+#define PM_CTRL_L1_ENTRY_TIMER_MASK     0xFUL  /* l1C 4bits */
+#define PM_CTRL_L1_ENTRY_TIMER_SHIFT    16
+#define L2CB1_PM_CTRL_L1_ENTRY_TM       7
+#define L1C_PM_CTRL_L1_ENTRY_TM         0xF
+#define PM_CTRL_RCVR_WT_TIMER           BIT(15) /* 1:1us, 0:2ms */
+#define PM_CTRL_CLK_PWM_VER1_1          BIT(14) /* 0:1.0a,1:1.1 */
+#define PM_CTRL_CLK_SWH_L1              BIT(13) /* en pcie clk sw in L1 */
+#define PM_CTRL_ASPM_L0S_EN             BIT(12)
+#define PM_CTRL_RXL1_AFTER_L0S          BIT(11) /* l1dv2.0+ */
+#define L1D_PMCTRL_L0S_TIMER_MASK       7UL     /* l1d2.0+, 3bits*/
+#define L1D_PMCTRL_L0S_TIMER_SHIFT      8
+#define PM_CTRL_L0S_ENTRY_TIMER_MASK    0xFUL   /* l1c, 4bits */
+#define PM_CTRL_L0S_ENTRY_TIMER_SHIFT   8
+#define PM_CTRL_SERDES_BUFS_RX_L1_EN    BIT(7)
+#define PM_CTRL_SERDES_PD_EX_L1         BIT(6)  /* power down serdes rx */
+#define PM_CTRL_SERDES_PLL_L1_EN        BIT(5)
+#define PM_CTRL_SERDES_L1_EN            BIT(4)
+#define PM_CTRL_ASPM_L1_EN              BIT(3)
+#define PM_CTRL_CLK_REQ_EN              BIT(2)
+#define PM_CTRL_RBER_EN                 BIT(1)
+#define PM_CTRL_SPRSDWER_EN             BIT(0)
 
 #define REG_LTSSM_ID_CTRL               0x12FC
 #define LTSSM_ID_EN_WRO                 0x1000
+
+
 /* Selene Master Control Register */
 #define REG_MASTER_CTRL                 0x1400
-#define MASTER_CTRL_SOFT_RST            0x1
-#define MASTER_CTRL_TEST_MODE_MASK      0x3
-#define MASTER_CTRL_TEST_MODE_SHIFT     2
-#define MASTER_CTRL_BERT_START          0x10
-#define MASTER_CTRL_OOB_DIS_OFF         0x40
-#define MASTER_CTRL_SA_TIMER_EN         0x80
-#define MASTER_CTRL_MTIMER_EN           0x100
-#define MASTER_CTRL_MANUAL_INT          0x200
-#define MASTER_CTRL_TX_ITIMER_EN        0x400
-#define MASTER_CTRL_RX_ITIMER_EN        0x800
-#define MASTER_CTRL_CLK_SEL_DIS         0x1000
-#define MASTER_CTRL_CLK_SWH_MODE        0x2000
-#define MASTER_CTRL_INT_RDCLR           0x4000
-#define MASTER_CTRL_REV_NUM_SHIFT       16
-#define MASTER_CTRL_REV_NUM_MASK        0xff
-#define MASTER_CTRL_DEV_ID_SHIFT        24
-#define MASTER_CTRL_DEV_ID_MASK         0x7f
-#define MASTER_CTRL_OTP_SEL             0x80000000
+#define MASTER_CTRL_OTP_SEL             BIT(31)
+#define MASTER_DEV_NUM_MASK             0x7FUL
+#define MASTER_DEV_NUM_SHIFT            24
+#define MASTER_REV_NUM_MASK             0xFFUL
+#define MASTER_REV_NUM_SHIFT            16
+#define MASTER_CTRL_INT_RDCLR           BIT(14)
+#define MASTER_CTRL_CLK_SEL_DIS         BIT(12) /* 1:alwys sel pclk from
+                                                 * serdes, not sw to 25M */
+#define MASTER_CTRL_RX_ITIMER_EN        BIT(11) /* IRQ MODURATION FOR RX */
+#define MASTER_CTRL_TX_ITIMER_EN        BIT(10) /* MODURATION FOR TX/RX */
+#define MASTER_CTRL_MANU_INT            BIT(9)  /* SOFT MANUAL INT */
+#define MASTER_CTRL_MANUTIMER_EN        BIT(8)
+#define MASTER_CTRL_SA_TIMER_EN         BIT(7)  /* SYS ALIVE TIMER EN */
+#define MASTER_CTRL_OOB_DIS             BIT(6)  /* OUT OF BOX DIS */
+#define MASTER_CTRL_WAKEN_25M           BIT(5)  /* WAKE WO. PCIE CLK */
+#define MASTER_CTRL_BERT_START          BIT(4)
+#define MASTER_PCIE_TSTMOD_MASK         3UL
+#define MASTER_PCIE_TSTMOD_SHIFT        2
+#define MASTER_PCIE_RST                 BIT(1)
+#define MASTER_CTRL_SOFT_RST            BIT(0)  /* RST MAC & DMA */
+#define DMA_MAC_RST_TO                  50
 
 /* Timer Initial Value Register */
 #define REG_MANUAL_TIMER_INIT           0x1404
@@ -201,87 +229,85 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
 #define IRQ_MODRT_RX_TIMER_SHIFT        16
 
 #define REG_GPHY_CTRL                   0x140C
-#define GPHY_CTRL_EXT_RESET             0x1
-#define GPHY_CTRL_RTL_MODE              0x2
-#define GPHY_CTRL_LED_MODE              0x4
-#define GPHY_CTRL_ANEG_NOW              0x8
-#define GPHY_CTRL_REV_ANEG              0x10
-#define GPHY_CTRL_GATE_25M_EN           0x20
-#define GPHY_CTRL_LPW_EXIT              0x40
-#define GPHY_CTRL_PHY_IDDQ              0x80
-#define GPHY_CTRL_PHY_IDDQ_DIS          0x100
-#define GPHY_CTRL_GIGA_DIS              0x200
-#define GPHY_CTRL_HIB_EN                0x400
-#define GPHY_CTRL_HIB_PULSE             0x800
-#define GPHY_CTRL_SEL_ANA_RST           0x1000
-#define GPHY_CTRL_PHY_PLL_ON            0x2000
-#define GPHY_CTRL_PWDOWN_HW             0x4000
-#define GPHY_CTRL_PHY_PLL_BYPASS        0x8000
-
-#define GPHY_CTRL_DEFAULT (              \
-                GPHY_CTRL_SEL_ANA_RST   |\
-                GPHY_CTRL_HIB_PULSE     |\
-                GPHY_CTRL_HIB_EN)
-
-#define GPHY_CTRL_PW_WOL_DIS (           \
-                GPHY_CTRL_SEL_ANA_RST   |\
-                GPHY_CTRL_HIB_PULSE     |\
-                GPHY_CTRL_HIB_EN        |\
-                GPHY_CTRL_PWDOWN_HW     |\
-                GPHY_CTRL_PHY_IDDQ)
-
-#define GPHY_CTRL_POWER_SAVING (        \
-                GPHY_CTRL_SEL_ANA_RST   |\
-                GPHY_CTRL_HIB_EN        |\
-                GPHY_CTRL_HIB_PULSE     |\
-                GPHY_CTRL_PWDOWN_HW     |\
-                GPHY_CTRL_PHY_IDDQ)
+#define GPHY_CTRL_ADDR_MASK             0x1FUL
+#define GPHY_CTRL_ADDR_SHIFT            19
+#define GPHY_CTRL_BP_VLTGSW             BIT(18)
+#define GPHY_CTRL_100AB_EN              BIT(17)
+#define GPHY_CTRL_10AB_EN               BIT(16)
+#define GPHY_CTRL_PHY_PLL_BYPASS        BIT(15)
+#define GPHY_CTRL_PWDOWN_HW             BIT(14) /* affect MAC&PHY, to low pw */
+#define GPHY_CTRL_PHY_PLL_ON            BIT(13) /* 1:pll always on, 0:can sw */
+#define GPHY_CTRL_SEL_ANA_RST           BIT(12)
+#define GPHY_CTRL_HIB_PULSE             BIT(11)
+#define GPHY_CTRL_HIB_EN                BIT(10)
+#define GPHY_CTRL_GIGA_DIS              BIT(9)
+#define GPHY_CTRL_PHY_IDDQ_DIS          BIT(8)  /* pw on RST */
+#define GPHY_CTRL_PHY_IDDQ              BIT(7)  /* bit8 affect bit7 while rb */
+#define GPHY_CTRL_LPW_EXIT              BIT(6)
+#define GPHY_CTRL_GATE_25M_EN           BIT(5)
+#define GPHY_CTRL_REV_ANEG              BIT(4)
+#define GPHY_CTRL_ANEG_NOW              BIT(3)
+#define GPHY_CTRL_LED_MODE              BIT(2)
+#define GPHY_CTRL_RTL_MODE              BIT(1)
+#define GPHY_CTRL_EXT_RESET             BIT(0)  /* 1:out of DSP RST status */
+#define GPHY_CTRL_EXT_RST_TO            80      /* 800us atmost */
+#define GPHY_CTRL_CLS                   (\
+        GPHY_CTRL_LED_MODE              |\
+        GPHY_CTRL_100AB_EN              |\
+        GPHY_CTRL_PHY_PLL_ON)
+
 /* Block IDLE Status Register */
-#define REG_IDLE_STATUS                 0x1410
-#define IDLE_STATUS_MASK                0x00FF
-#define IDLE_STATUS_RXMAC_NO_IDLE       0x1
-#define IDLE_STATUS_TXMAC_NO_IDLE       0x2
-#define IDLE_STATUS_RXQ_NO_IDLE         0x4
-#define IDLE_STATUS_TXQ_NO_IDLE         0x8
-#define IDLE_STATUS_DMAR_NO_IDLE        0x10
-#define IDLE_STATUS_DMAW_NO_IDLE        0x20
-#define IDLE_STATUS_SMB_NO_IDLE         0x40
-#define IDLE_STATUS_CMB_NO_IDLE         0x80
+#define REG_IDLE_STATUS                 0x1410
+#define IDLE_STATUS_SFORCE_MASK         0xFUL
+#define IDLE_STATUS_SFORCE_SHIFT        14
+#define IDLE_STATUS_CALIB_DONE          BIT(13)
+#define IDLE_STATUS_CALIB_RES_MASK      0x1FUL
+#define IDLE_STATUS_CALIB_RES_SHIFT     8
+#define IDLE_STATUS_CALIBERR_MASK       0xFUL
+#define IDLE_STATUS_CALIBERR_SHIFT      4
+#define IDLE_STATUS_TXQ_BUSY            BIT(3)
+#define IDLE_STATUS_RXQ_BUSY            BIT(2)
+#define IDLE_STATUS_TXMAC_BUSY          BIT(1)
+#define IDLE_STATUS_RXMAC_BUSY          BIT(0)
+#define IDLE_STATUS_MASK                (\
+        IDLE_STATUS_TXQ_BUSY            |\
+        IDLE_STATUS_RXQ_BUSY            |\
+        IDLE_STATUS_TXMAC_BUSY          |\
+        IDLE_STATUS_RXMAC_BUSY)
 
 /* MDIO Control Register */
 #define REG_MDIO_CTRL                   0x1414
-#define MDIO_DATA_MASK                  0xffff  /* On MDIO write, the 16-bit
-                                                 * control data to write to PHY
-                                                 * MII management register */
-#define MDIO_DATA_SHIFT                 0       /* On MDIO read, the 16-bit
-                                                 * status data that was read
-                                                 * from the PHY MII management register */
-#define MDIO_REG_ADDR_MASK              0x1f    /* MDIO register address */
-#define MDIO_REG_ADDR_SHIFT             16
-#define MDIO_RW                         0x200000  /* 1: read, 0: write */
-#define MDIO_SUP_PREAMBLE               0x400000  /* Suppress preamble */
-#define MDIO_START                      0x800000  /* Write 1 to initiate the MDIO
-                                                   * master. And this bit is self
-                                                   * cleared after one cycle */
-#define MDIO_CLK_SEL_SHIFT              24
-#define MDIO_CLK_25_4                   0
-#define MDIO_CLK_25_6                   2
-#define MDIO_CLK_25_8                   3
-#define MDIO_CLK_25_10                  4
-#define MDIO_CLK_25_14                  5
-#define MDIO_CLK_25_20                  6
-#define MDIO_CLK_25_28                  7
-#define MDIO_BUSY                       0x8000000
-#define MDIO_AP_EN                      0x10000000
-#define MDIO_WAIT_TIMES                 10
-
-/* MII PHY Status Register */
-#define REG_PHY_STATUS                  0x1418
-#define PHY_GENERAL_STATUS_MASK         0xFFFF
-#define PHY_STATUS_RECV_ENABLE          0x0001
-#define PHY_OE_PWSP_STATUS_MASK         0x07FF
-#define PHY_OE_PWSP_STATUS_SHIFT        16
-#define PHY_STATUS_LPW_STATE            0x80000000
+#define MDIO_CTRL_MODE_EXT              BIT(30)
+#define MDIO_CTRL_POST_READ             BIT(29)
+#define MDIO_CTRL_AP_EN                 BIT(28)
+#define MDIO_CTRL_BUSY                  BIT(27)
+#define MDIO_CTRL_CLK_SEL_MASK          0x7UL
+#define MDIO_CTRL_CLK_SEL_SHIFT         24
+#define MDIO_CTRL_CLK_25_4              0       /* 25MHz divide 4 */
+#define MDIO_CTRL_CLK_25_6              2
+#define MDIO_CTRL_CLK_25_8              3
+#define MDIO_CTRL_CLK_25_10             4
+#define MDIO_CTRL_CLK_25_32             5
+#define MDIO_CTRL_CLK_25_64             6
+#define MDIO_CTRL_CLK_25_128            7
+#define MDIO_CTRL_START                 BIT(23)
+#define MDIO_CTRL_SPRES_PRMBL           BIT(22)
+#define MDIO_CTRL_OP_READ               BIT(21) /* 1:read, 0:write */
+#define MDIO_CTRL_REG_MASK              0x1FUL
+#define MDIO_CTRL_REG_SHIFT             16
+#define MDIO_CTRL_DATA_MASK             0xFFFFUL
+#define MDIO_CTRL_DATA_SHIFT            0
+#define MDIO_MAX_AC_TO                  120     /* 1.2ms timeout for slow clk */
+
+/* for extension reg access */
+#define REG_MDIO_EXTN                   0x1448
+#define MDIO_EXTN_PORTAD_MASK           0x1FUL
+#define MDIO_EXTN_PORTAD_SHIFT          21
+#define MDIO_EXTN_DEVAD_MASK            0x1FUL
+#define MDIO_EXTN_DEVAD_SHIFT           16
+#define MDIO_EXTN_REG_MASK              0xFFFFUL
+#define MDIO_EXTN_REG_SHIFT             0
+
 /* BIST Control and Status Register0 (for the Packet Memory) */
 #define REG_BIST0_CTRL                  0x141c
 #define BIST0_NOW                       0x1
@@ -299,50 +325,81 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
 #define BIST1_FUSE_FLAG                 0x4
 
 /* SerDes Lock Detect Control and Status Register */
-#define REG_SERDES_LOCK                 0x1424
-#define SERDES_LOCK_DETECT              0x1  /* SerDes lock detected. This signal
-                                              * comes from Analog SerDes */
-#define SERDES_LOCK_DETECT_EN           0x2  /* 1: Enable SerDes Lock detect function */
-#define SERDES_LOCK_STS_SELFB_PLL_SHIFT 0xE
-#define SERDES_LOCK_STS_SELFB_PLL_MASK  0x3
-#define SERDES_OVCLK_18_25              0x0
-#define SERDES_OVCLK_12_18              0x1
-#define SERDES_OVCLK_0_4                0x2
-#define SERDES_OVCLK_4_12               0x3
-#define SERDES_MAC_CLK_SLOWDOWN         0x20000
-#define SERDES_PYH_CLK_SLOWDOWN         0x40000
+#define REG_SERDES                      0x1424
+#define SERDES_PHY_CLK_SLOWDOWN         BIT(18)
+#define SERDES_MAC_CLK_SLOWDOWN         BIT(17)
+#define SERDES_SELFB_PLL_MASK           0x3UL
+#define SERDES_SELFB_PLL_SHIFT          14
+#define SERDES_PHYCLK_SEL_GTX           BIT(13) /* 1:gtx_clk, 0:25M */
+#define SERDES_PCIECLK_SEL_SRDS         BIT(12) /* 1:serdes,0:25M */
+#define SERDES_BUFS_RX_EN               BIT(11)
+#define SERDES_PD_RX                    BIT(10)
+#define SERDES_PLL_EN                   BIT(9)
+#define SERDES_EN                       BIT(8)
+#define SERDES_SELFB_PLL_SEL_CSR        BIT(6)  /* 0:state-machine,1:csr */
+#define SERDES_SELFB_PLL_CSR_MASK       0x3UL
+#define SERDES_SELFB_PLL_CSR_SHIFT      4
+#define SERDES_SELFB_PLL_CSR_4          3       /* 4-12% OV-CLK */
+#define SERDES_SELFB_PLL_CSR_0          2       /* 0-4% OV-CLK */
+#define SERDES_SELFB_PLL_CSR_12         1       /* 12-18% OV-CLK */
+#define SERDES_SELFB_PLL_CSR_18         0       /* 18-25% OV-CLK */
+#define SERDES_VCO_SLOW                 BIT(3)
+#define SERDES_VCO_FAST                 BIT(2)
+#define SERDES_LOCK_DETECT_EN           BIT(1)
+#define SERDES_LOCK_DETECT              BIT(0)
+
+#define REG_LPI_DECISN_TIMER            0x143C
+#define L2CB_LPI_DESISN_TIMER           0x7D00
+
+#define REG_LPI_CTRL                    0x1440
+#define LPI_CTRL_CHK_DA                 BIT(31)
+#define LPI_CTRL_ENH_TO_MASK            0x1FFFUL
+#define LPI_CTRL_ENH_TO_SHIFT           12
+#define LPI_CTRL_ENH_TH_MASK            0x1FUL
+#define LPI_CTRL_ENH_TH_SHIFT           6
+#define LPI_CTRL_ENH_EN                 BIT(5)
+#define LPI_CTRL_CHK_RX                 BIT(4)
+#define LPI_CTRL_CHK_STATE              BIT(3)
+#define LPI_CTRL_GMII                   BIT(2)
+#define LPI_CTRL_TO_PHY                 BIT(1)
+#define LPI_CTRL_EN                     BIT(0)
+
+#define REG_LPI_WAIT                    0x1444
+#define LPI_WAIT_TIMER_MASK             0xFFFFUL
+#define LPI_WAIT_TIMER_SHIFT            0
 
 /* MAC Control Register  */
 #define REG_MAC_CTRL                    0x1480
-#define MAC_CTRL_TX_EN                  0x1
-#define MAC_CTRL_RX_EN                  0x2
-#define MAC_CTRL_TX_FLOW                0x4
-#define MAC_CTRL_RX_FLOW                0x8
-#define MAC_CTRL_LOOPBACK               0x10
-#define MAC_CTRL_DUPLX                  0x20
-#define MAC_CTRL_ADD_CRC                0x40
-#define MAC_CTRL_PAD                    0x80
-#define MAC_CTRL_LENCHK                 0x100
-#define MAC_CTRL_HUGE_EN                0x200
-#define MAC_CTRL_PRMLEN_SHIFT           10
-#define MAC_CTRL_PRMLEN_MASK            0xf
-#define MAC_CTRL_RMV_VLAN               0x4000
-#define MAC_CTRL_PROMIS_EN              0x8000
-#define MAC_CTRL_TX_PAUSE               0x10000
-#define MAC_CTRL_SCNT                   0x20000
-#define MAC_CTRL_SRST_TX                0x40000
-#define MAC_CTRL_TX_SIMURST             0x80000
-#define MAC_CTRL_SPEED_SHIFT            20
-#define MAC_CTRL_SPEED_MASK             0x3
-#define MAC_CTRL_DBG_TX_BKPRESURE       0x400000
-#define MAC_CTRL_TX_HUGE                0x800000
-#define MAC_CTRL_RX_CHKSUM_EN           0x1000000
-#define MAC_CTRL_MC_ALL_EN              0x2000000
-#define MAC_CTRL_BC_EN                  0x4000000
-#define MAC_CTRL_DBG                    0x8000000
-#define MAC_CTRL_SINGLE_PAUSE_EN        0x10000000
-#define MAC_CTRL_HASH_ALG_CRC32         0x20000000
-#define MAC_CTRL_SPEED_MODE_SW          0x40000000
+#define MAC_CTRL_SPEED_MODE_SW          BIT(30) /* 0:phy,1:sw */
+#define MAC_CTRL_HASH_ALG_CRC32         BIT(29) /* 1:legacy,0:lw_5b */
+#define MAC_CTRL_SINGLE_PAUSE_EN        BIT(28)
+#define MAC_CTRL_DBG                    BIT(27)
+#define MAC_CTRL_BC_EN                  BIT(26)
+#define MAC_CTRL_MC_ALL_EN              BIT(25)
+#define MAC_CTRL_RX_CHKSUM_EN           BIT(24)
+#define MAC_CTRL_TX_HUGE                BIT(23)
+#define MAC_CTRL_DBG_TX_BKPRESURE       BIT(22)
+#define MAC_CTRL_SPEED_MASK             3UL
+#define MAC_CTRL_SPEED_SHIFT            20
+#define MAC_CTRL_SPEED_10_100           1
+#define MAC_CTRL_SPEED_1000             2
+#define MAC_CTRL_TX_SIMURST             BIT(19)
+#define MAC_CTRL_SCNT                   BIT(17)
+#define MAC_CTRL_TX_PAUSE               BIT(16)
+#define MAC_CTRL_PROMIS_EN              BIT(15)
+#define MAC_CTRL_RMV_VLAN               BIT(14)
+#define MAC_CTRL_PRMLEN_MASK            0xFUL
+#define MAC_CTRL_PRMLEN_SHIFT           10
+#define MAC_CTRL_HUGE_EN                BIT(9)
+#define MAC_CTRL_LENCHK                 BIT(8)
+#define MAC_CTRL_PAD                    BIT(7)
+#define MAC_CTRL_ADD_CRC                BIT(6)
+#define MAC_CTRL_DUPLX                  BIT(5)
+#define MAC_CTRL_LOOPBACK               BIT(4)
+#define MAC_CTRL_RX_FLOW                BIT(3)
+#define MAC_CTRL_TX_FLOW                BIT(2)
+#define MAC_CTRL_RX_EN                  BIT(1)
+#define MAC_CTRL_TX_EN                  BIT(0)
 
 /* MAC IPG/IFG Control Register  */
 #define REG_MAC_IPG_IFG                 0x1484
@@ -386,34 +443,53 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
 
 /* Wake-On-Lan control register */
 #define REG_WOL_CTRL                    0x14a0
-#define WOL_PATTERN_EN                  0x00000001
-#define WOL_PATTERN_PME_EN              0x00000002
-#define WOL_MAGIC_EN                    0x00000004
-#define WOL_MAGIC_PME_EN                0x00000008
-#define WOL_LINK_CHG_EN                 0x00000010
-#define WOL_LINK_CHG_PME_EN             0x00000020
-#define WOL_PATTERN_ST                  0x00000100
-#define WOL_MAGIC_ST                    0x00000200
-#define WOL_LINKCHG_ST                  0x00000400
-#define WOL_CLK_SWITCH_EN               0x00008000
-#define WOL_PT0_EN                      0x00010000
-#define WOL_PT1_EN                      0x00020000
-#define WOL_PT2_EN                      0x00040000
-#define WOL_PT3_EN                      0x00080000
-#define WOL_PT4_EN                      0x00100000
-#define WOL_PT5_EN                      0x00200000
-#define WOL_PT6_EN                      0x00400000
+#define WOL_PT7_MATCH                   BIT(31)
+#define WOL_PT6_MATCH                   BIT(30)
+#define WOL_PT5_MATCH                   BIT(29)
+#define WOL_PT4_MATCH                   BIT(28)
+#define WOL_PT3_MATCH                   BIT(27)
+#define WOL_PT2_MATCH                   BIT(26)
+#define WOL_PT1_MATCH                   BIT(25)
+#define WOL_PT0_MATCH                   BIT(24)
+#define WOL_PT7_EN                      BIT(23)
+#define WOL_PT6_EN                      BIT(22)
+#define WOL_PT5_EN                      BIT(21)
+#define WOL_PT4_EN                      BIT(20)
+#define WOL_PT3_EN                      BIT(19)
+#define WOL_PT2_EN                      BIT(18)
+#define WOL_PT1_EN                      BIT(17)
+#define WOL_PT0_EN                      BIT(16)
+#define WOL_LNKCHG_ST                   BIT(10)
+#define WOL_MAGIC_ST                    BIT(9)
+#define WOL_PATTERN_ST                  BIT(8)
+#define WOL_OOB_EN                      BIT(6)
+#define WOL_LINK_CHG_PME_EN             BIT(5)
+#define WOL_LINK_CHG_EN                 BIT(4)
+#define WOL_MAGIC_PME_EN                BIT(3)
+#define WOL_MAGIC_EN                    BIT(2)
+#define WOL_PATTERN_PME_EN              BIT(1)
+#define WOL_PATTERN_EN                  BIT(0)
 
 /* WOL Length ( 2 DWORD ) */
-#define REG_WOL_PATTERN_LEN             0x14a4
-#define WOL_PT_LEN_MASK                 0x7f
-#define WOL_PT0_LEN_SHIFT               0
-#define WOL_PT1_LEN_SHIFT               8
-#define WOL_PT2_LEN_SHIFT               16
-#define WOL_PT3_LEN_SHIFT               24
-#define WOL_PT4_LEN_SHIFT               0
-#define WOL_PT5_LEN_SHIFT               8
-#define WOL_PT6_LEN_SHIFT               16
+#define REG_WOL_PTLEN1                  0x14A4
+#define WOL_PTLEN1_3_MASK               0xFFUL
+#define WOL_PTLEN1_3_SHIFT              24
+#define WOL_PTLEN1_2_MASK               0xFFUL
+#define WOL_PTLEN1_2_SHIFT              16
+#define WOL_PTLEN1_1_MASK               0xFFUL
+#define WOL_PTLEN1_1_SHIFT              8
+#define WOL_PTLEN1_0_MASK               0xFFUL
+#define WOL_PTLEN1_0_SHIFT              0
+
+#define REG_WOL_PTLEN2                  0x14A8
+#define WOL_PTLEN2_7_MASK               0xFFUL
+#define WOL_PTLEN2_7_SHIFT              24
+#define WOL_PTLEN2_6_MASK               0xFFUL
+#define WOL_PTLEN2_6_SHIFT              16
+#define WOL_PTLEN2_5_MASK               0xFFUL
+#define WOL_PTLEN2_5_SHIFT              8
+#define WOL_PTLEN2_4_MASK               0xFFUL
+#define WOL_PTLEN2_4_SHIFT              0
 
 /* Internal SRAM Partition Register */
 #define RFDX_HEAD_ADDR_MASK             0x03FF
@@ -458,66 +534,50 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
  */
 #define REG_RX_BASE_ADDR_HI             0x1540
 #define REG_TX_BASE_ADDR_HI             0x1544
-#define REG_SMB_BASE_ADDR_HI            0x1548
-#define REG_SMB_BASE_ADDR_LO            0x154C
 #define REG_RFD0_HEAD_ADDR_LO           0x1550
-#define REG_RFD1_HEAD_ADDR_LO           0x1554
-#define REG_RFD2_HEAD_ADDR_LO           0x1558
-#define REG_RFD3_HEAD_ADDR_LO           0x155C
 #define REG_RFD_RING_SIZE               0x1560
 #define RFD_RING_SIZE_MASK              0x0FFF
 #define REG_RX_BUF_SIZE                 0x1564
 #define RX_BUF_SIZE_MASK                0xFFFF
 #define REG_RRD0_HEAD_ADDR_LO           0x1568
-#define REG_RRD1_HEAD_ADDR_LO           0x156C
-#define REG_RRD2_HEAD_ADDR_LO           0x1570
-#define REG_RRD3_HEAD_ADDR_LO           0x1574
 #define REG_RRD_RING_SIZE               0x1578
 #define RRD_RING_SIZE_MASK              0x0FFF
-#define REG_HTPD_HEAD_ADDR_LO           0x157C
-#define REG_NTPD_HEAD_ADDR_LO           0x1580
+#define REG_TPD_PRI1_ADDR_LO            0x157C
+#define REG_TPD_PRI0_ADDR_LO            0x1580
 #define REG_TPD_RING_SIZE               0x1584
 #define TPD_RING_SIZE_MASK              0xFFFF
-#define REG_CMB_BASE_ADDR_LO            0x1588
-
-/* RSS about */
-#define REG_RSS_KEY0                    0x14B0
-#define REG_RSS_KEY1                    0x14B4
-#define REG_RSS_KEY2                    0x14B8
-#define REG_RSS_KEY3                    0x14BC
-#define REG_RSS_KEY4                    0x14C0
-#define REG_RSS_KEY5                    0x14C4
-#define REG_RSS_KEY6                    0x14C8
-#define REG_RSS_KEY7                    0x14CC
-#define REG_RSS_KEY8                    0x14D0
-#define REG_RSS_KEY9                    0x14D4
-#define REG_IDT_TABLE0                  0x14E0
-#define REG_IDT_TABLE1                  0x14E4
-#define REG_IDT_TABLE2                  0x14E8
-#define REG_IDT_TABLE3                  0x14EC
-#define REG_IDT_TABLE4                  0x14F0
-#define REG_IDT_TABLE5                  0x14F4
-#define REG_IDT_TABLE6                  0x14F8
-#define REG_IDT_TABLE7                  0x14FC
-#define REG_IDT_TABLE                   REG_IDT_TABLE0
-#define REG_RSS_HASH_VALUE              0x15B0
-#define REG_RSS_HASH_FLAG               0x15B4
-#define REG_BASE_CPU_NUMBER             0x15B8
 
 /* TXQ Control Register */
-#define REG_TXQ_CTRL                    0x1590
-#define TXQ_NUM_TPD_BURST_MASK          0xF
-#define TXQ_NUM_TPD_BURST_SHIFT         0
-#define TXQ_CTRL_IP_OPTION_EN           0x10
-#define TXQ_CTRL_EN                     0x20
-#define TXQ_CTRL_ENH_MODE               0x40
-#define TXQ_CTRL_LS_8023_EN             0x80
-#define TXQ_TXF_BURST_NUM_SHIFT         16
-#define TXQ_TXF_BURST_NUM_MASK          0xFFFF
+#define REG_TXQ_CTRL                    0x1590
+#define TXQ_TXF_BURST_NUM_MASK          0xFFFFUL
+#define TXQ_TXF_BURST_NUM_SHIFT         16
+#define L1C_TXQ_TXF_BURST_PREF          0x200
+#define L2CB_TXQ_TXF_BURST_PREF         0x40
+#define TXQ_CTRL_PEDING_CLR             BIT(8)
+#define TXQ_CTRL_LS_8023_EN             BIT(7)
+#define TXQ_CTRL_ENH_MODE               BIT(6)
+#define TXQ_CTRL_EN                     BIT(5)
+#define TXQ_CTRL_IP_OPTION_EN           BIT(4)
+#define TXQ_NUM_TPD_BURST_MASK          0xFUL
+#define TXQ_NUM_TPD_BURST_SHIFT         0
+#define TXQ_NUM_TPD_BURST_DEF           5
+#define TXQ_CFGV                        (\
+        FIELDX(TXQ_NUM_TPD_BURST, TXQ_NUM_TPD_BURST_DEF) |\
+        TXQ_CTRL_ENH_MODE |\
+        TXQ_CTRL_LS_8023_EN |\
+        TXQ_CTRL_IP_OPTION_EN)
+#define L1C_TXQ_CFGV                    (\
+        TXQ_CFGV |\
+        FIELDX(TXQ_TXF_BURST_NUM, L1C_TXQ_TXF_BURST_PREF))
+#define L2CB_TXQ_CFGV                   (\
+        TXQ_CFGV |\
+        FIELDX(TXQ_TXF_BURST_NUM, L2CB_TXQ_TXF_BURST_PREF))
+
 
 /* Jumbo packet Threshold for task offload */
 #define REG_TX_TSO_OFFLOAD_THRESH       0x1594 /* In 8-bytes */
 #define TX_TSO_OFFLOAD_THRESH_MASK      0x07FF
+#define MAX_TSO_FRAME_SIZE              (7*1024)
 
 #define REG_TXF_WATER_MARK              0x1598 /* In 8-bytes */
 #define TXF_WATER_MARK_MASK             0x0FFF
@@ -537,26 +597,21 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
 #define ASPM_THRUPUT_LIMIT_NO           0x00
 #define ASPM_THRUPUT_LIMIT_1M           0x01
 #define ASPM_THRUPUT_LIMIT_10M          0x02
-#define ASPM_THRUPUT_LIMIT_100M         0x04
-#define RXQ1_CTRL_EN                    0x10
-#define RXQ2_CTRL_EN                    0x20
-#define RXQ3_CTRL_EN                    0x40
-#define IPV6_CHKSUM_CTRL_EN             0x80
-#define RSS_HASH_BITS_MASK              0x00FF
-#define RSS_HASH_BITS_SHIFT             8
-#define RSS_HASH_IPV4                   0x10000
-#define RSS_HASH_IPV4_TCP               0x20000
-#define RSS_HASH_IPV6                   0x40000
-#define RSS_HASH_IPV6_TCP               0x80000
+#define ASPM_THRUPUT_LIMIT_100M         0x03
+#define IPV6_CHKSUM_CTRL_EN             BIT(7)
 #define RXQ_RFD_BURST_NUM_MASK          0x003F
 #define RXQ_RFD_BURST_NUM_SHIFT         20
-#define RSS_MODE_MASK                   0x0003
+#define RXQ_NUM_RFD_PREF_DEF            8
+#define RSS_MODE_MASK                   3UL
 #define RSS_MODE_SHIFT                  26
-#define RSS_NIP_QUEUE_SEL_MASK          0x1
-#define RSS_NIP_QUEUE_SEL_SHIFT         28
-#define RRS_HASH_CTRL_EN                0x20000000
-#define RX_CUT_THRU_EN                  0x40000000
-#define RXQ_CTRL_EN                     0x80000000
+#define RSS_MODE_DIS                    0
+#define RSS_MODE_SQSI                   1
+#define RSS_MODE_MQSI                   2
+#define RSS_MODE_MQMI                   3
+#define RSS_NIP_QUEUE_SEL               BIT(28) /* 0:q0, 1:table */
+#define RRS_HASH_CTRL_EN                BIT(29)
+#define RX_CUT_THRU_EN                  BIT(30)
+#define RXQ_CTRL_EN                     BIT(31)
 
 #define REG_RFD_FREE_THRESH             0x15A4
 #define RFD_FREE_THRESH_MASK            0x003F
@@ -577,57 +632,45 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
 #define RXD_DMA_DOWN_TIMER_SHIFT        16
 
 /* DMA Engine Control Register */
-#define REG_DMA_CTRL                    0x15C0
-#define DMA_CTRL_DMAR_IN_ORDER          0x1
-#define DMA_CTRL_DMAR_ENH_ORDER         0x2
-#define DMA_CTRL_DMAR_OUT_ORDER         0x4
-#define DMA_CTRL_RCB_VALUE              0x8
-#define DMA_CTRL_DMAR_BURST_LEN_MASK    0x0007
-#define DMA_CTRL_DMAR_BURST_LEN_SHIFT   4
-#define DMA_CTRL_DMAW_BURST_LEN_MASK    0x0007
-#define DMA_CTRL_DMAW_BURST_LEN_SHIFT   7
-#define DMA_CTRL_DMAR_REQ_PRI           0x400
-#define DMA_CTRL_DMAR_DLY_CNT_MASK      0x001F
-#define DMA_CTRL_DMAR_DLY_CNT_SHIFT     11
-#define DMA_CTRL_DMAW_DLY_CNT_MASK      0x000F
-#define DMA_CTRL_DMAW_DLY_CNT_SHIFT     16
-#define DMA_CTRL_CMB_EN                 0x100000
-#define DMA_CTRL_SMB_EN                 0x200000
-#define DMA_CTRL_CMB_NOW                0x400000
-#define MAC_CTRL_SMB_DIS                0x1000000
-#define DMA_CTRL_SMB_NOW                0x80000000
-
-/* CMB/SMB Control Register */
+#define REG_DMA_CTRL                    0x15C0
+#define DMA_CTRL_SMB_NOW                BIT(31)
+#define DMA_CTRL_WPEND_CLR              BIT(30)
+#define DMA_CTRL_RPEND_CLR              BIT(29)
+#define DMA_CTRL_WDLY_CNT_MASK          0xFUL
+#define DMA_CTRL_WDLY_CNT_SHIFT         16
+#define DMA_CTRL_WDLY_CNT_DEF           4
+#define DMA_CTRL_RDLY_CNT_MASK          0x1FUL
+#define DMA_CTRL_RDLY_CNT_SHIFT         11
+#define DMA_CTRL_RDLY_CNT_DEF           15
+#define DMA_CTRL_RREQ_PRI_DATA          BIT(10)      /* 0:tpd, 1:data */
+#define DMA_CTRL_WREQ_BLEN_MASK         7UL
+#define DMA_CTRL_WREQ_BLEN_SHIFT        7
+#define DMA_CTRL_RREQ_BLEN_MASK         7UL
+#define DMA_CTRL_RREQ_BLEN_SHIFT        4
+#define L1C_CTRL_DMA_RCB_LEN128         BIT(3)   /* 0:64bytes,1:128bytes */
+#define DMA_CTRL_RORDER_MODE_MASK       7UL
+#define DMA_CTRL_RORDER_MODE_SHIFT      0
+#define DMA_CTRL_RORDER_MODE_OUT        4
+#define DMA_CTRL_RORDER_MODE_ENHANCE    2
+#define DMA_CTRL_RORDER_MODE_IN         1
+
+/* INT-triggle/SMB Control Register */
 #define REG_SMB_STAT_TIMER              0x15C4  /* 2us resolution */
 #define SMB_STAT_TIMER_MASK             0xFFFFFF
-#define REG_CMB_TPD_THRESH              0x15C8
-#define CMB_TPD_THRESH_MASK             0xFFFF
-#define REG_CMB_TX_TIMER                0x15CC  /* 2us resolution */
-#define CMB_TX_TIMER_MASK               0xFFFF
+#define REG_TINT_TPD_THRESH             0x15C8 /* tpd th to trig intrrupt */
 
 /* Mail box */
 #define MB_RFDX_PROD_IDX_MASK           0xFFFF
 #define REG_MB_RFD0_PROD_IDX            0x15E0
-#define REG_MB_RFD1_PROD_IDX            0x15E4
-#define REG_MB_RFD2_PROD_IDX            0x15E8
-#define REG_MB_RFD3_PROD_IDX            0x15EC
 
-#define MB_PRIO_PROD_IDX_MASK           0xFFFF
-#define REG_MB_PRIO_PROD_IDX            0x15F0
-#define MB_HTPD_PROD_IDX_SHIFT          0
-#define MB_NTPD_PROD_IDX_SHIFT          16
-
-#define MB_PRIO_CONS_IDX_MASK           0xFFFF
-#define REG_MB_PRIO_CONS_IDX            0x15F4
-#define MB_HTPD_CONS_IDX_SHIFT          0
-#define MB_NTPD_CONS_IDX_SHIFT          16
+#define REG_TPD_PRI1_PIDX               0x15F0  /* 16bit,hi-tpd producer idx */
+#define REG_TPD_PRI0_PIDX               0x15F2  /* 16bit,lo-tpd producer idx */
+#define REG_TPD_PRI1_CIDX               0x15F4  /* 16bit,hi-tpd consumer idx */
+#define REG_TPD_PRI0_CIDX               0x15F6  /* 16bit,lo-tpd consumer idx */
 
 #define REG_MB_RFD01_CONS_IDX           0x15F8
 #define MB_RFD0_CONS_IDX_MASK           0x0000FFFF
 #define MB_RFD1_CONS_IDX_MASK           0xFFFF0000
-#define REG_MB_RFD23_CONS_IDX           0x15FC
-#define MB_RFD2_CONS_IDX_MASK           0x0000FFFF
-#define MB_RFD3_CONS_IDX_MASK           0xFFFF0000
 
 /* Interrupt Status Register */
 #define REG_ISR                         0x1600
@@ -705,13 +748,6 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
 #define REG_INT_RETRIG_TIMER            0x1608
 #define INT_RETRIG_TIMER_MASK           0xFFFF
 
-#define REG_HDS_CTRL                    0x160C
-#define HDS_CTRL_EN                     0x0001
-#define HDS_CTRL_BACKFILLSIZE_SHIFT     8
-#define HDS_CTRL_BACKFILLSIZE_MASK      0x0FFF
-#define HDS_CTRL_MAX_HDRSIZE_SHIFT      20
-#define HDS_CTRL_MAC_HDRSIZE_MASK       0x0FFF
-
 #define REG_MAC_RX_STATUS_BIN           0x1700
 #define REG_MAC_RX_STATUS_END           0x175c
 #define REG_MAC_TX_STATUS_BIN           0x1760
@@ -796,73 +832,188 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
 #define MII_DBG_ADDR                    0x1D
 #define MII_DBG_DATA                    0x1E
 
-#define MII_ANA_CTRL_0                  0x0
-#define ANA_RESTART_CAL                 0x0001
-#define ANA_MANUL_SWICH_ON_SHIFT        0x1
-#define ANA_MANUL_SWICH_ON_MASK         0xF
-#define ANA_MAN_ENABLE                  0x0020
-#define ANA_SEL_HSP                     0x0040
-#define ANA_EN_HB                       0x0080
-#define ANA_EN_HBIAS                    0x0100
-#define ANA_OEN_125M                    0x0200
-#define ANA_EN_LCKDT                    0x0400
-#define ANA_LCKDT_PHY                   0x0800
-#define ANA_AFE_MODE                    0x1000
-#define ANA_VCO_SLOW                    0x2000
-#define ANA_VCO_FAST                    0x4000
-#define ANA_SEL_CLK125M_DSP             0x8000
-
-#define MII_ANA_CTRL_4                  0x4
-#define ANA_IECHO_ADJ_MASK              0xF
-#define ANA_IECHO_ADJ_3_SHIFT           0
-#define ANA_IECHO_ADJ_2_SHIFT           4
-#define ANA_IECHO_ADJ_1_SHIFT           8
-#define ANA_IECHO_ADJ_0_SHIFT           12
-
-#define MII_ANA_CTRL_5                  0x5
-#define ANA_SERDES_CDR_BW_SHIFT         0
-#define ANA_SERDES_CDR_BW_MASK          0x3
-#define ANA_MS_PAD_DBG                  0x0004
-#define ANA_SPEEDUP_DBG                 0x0008
-#define ANA_SERDES_TH_LOS_SHIFT         4
-#define ANA_SERDES_TH_LOS_MASK          0x3
-#define ANA_SERDES_EN_DEEM              0x0040
-#define ANA_SERDES_TXELECIDLE           0x0080
-#define ANA_SERDES_BEACON               0x0100
-#define ANA_SERDES_HALFTXDR             0x0200
-#define ANA_SERDES_SEL_HSP              0x0400
-#define ANA_SERDES_EN_PLL               0x0800
-#define ANA_SERDES_EN                   0x1000
-#define ANA_SERDES_EN_LCKDT             0x2000
-
-#define MII_ANA_CTRL_11                 0xB
-#define ANA_PS_HIB_EN                   0x8000
-
-#define MII_ANA_CTRL_18                 0x12
-#define ANA_TEST_MODE_10BT_01SHIFT      0
-#define ANA_TEST_MODE_10BT_01MASK       0x3
-#define ANA_LOOP_SEL_10BT               0x0004
-#define ANA_RGMII_MODE_SW               0x0008
-#define ANA_EN_LONGECABLE               0x0010
-#define ANA_TEST_MODE_10BT_2            0x0020
-#define ANA_EN_10BT_IDLE                0x0400
-#define ANA_EN_MASK_TB                  0x0800
-#define ANA_TRIGGER_SEL_TIMER_SHIFT     12
-#define ANA_TRIGGER_SEL_TIMER_MASK      0x3
-#define ANA_INTERVAL_SEL_TIMER_SHIFT    14
-#define ANA_INTERVAL_SEL_TIMER_MASK     0x3
-
-#define MII_ANA_CTRL_41                 0x29
-#define ANA_TOP_PS_EN                   0x8000
-
-#define MII_ANA_CTRL_54                 0x36
-#define ANA_LONG_CABLE_TH_100_SHIFT     0
-#define ANA_LONG_CABLE_TH_100_MASK      0x3F
-#define ANA_DESERVED                    0x0040
-#define ANA_EN_LIT_CH                   0x0080
-#define ANA_SHORT_CABLE_TH_100_SHIFT    8
-#define ANA_SHORT_CABLE_TH_100_MASK     0x3F
-#define ANA_BP_BAD_LINK_ACCUM           0x4000
-#define ANA_BP_SMALL_BW                 0x8000
+/***************************** debug port *************************************/
+
+#define MIIDBG_ANACTRL                  0x00
+#define ANACTRL_CLK125M_DELAY_EN        0x8000
+#define ANACTRL_VCO_FAST                0x4000
+#define ANACTRL_VCO_SLOW                0x2000
+#define ANACTRL_AFE_MODE_EN             0x1000
+#define ANACTRL_LCKDET_PHY              0x800
+#define ANACTRL_LCKDET_EN               0x400
+#define ANACTRL_OEN_125M                0x200
+#define ANACTRL_HBIAS_EN                0x100
+#define ANACTRL_HB_EN                   0x80
+#define ANACTRL_SEL_HSP                 0x40
+#define ANACTRL_CLASSA_EN               0x20
+#define ANACTRL_MANUSWON_SWR_MASK       3U
+#define ANACTRL_MANUSWON_SWR_SHIFT      2
+#define ANACTRL_MANUSWON_SWR_2V         0
+#define ANACTRL_MANUSWON_SWR_1P9V       1
+#define ANACTRL_MANUSWON_SWR_1P8V       2
+#define ANACTRL_MANUSWON_SWR_1P7V       3
+#define ANACTRL_MANUSWON_BW3_4M         0x2
+#define ANACTRL_RESTART_CAL             0x1
+#define ANACTRL_DEF                     0x02EF
+
+#define MIIDBG_SYSMODCTRL               0x04
+#define SYSMODCTRL_IECHOADJ_PFMH_PHY    0x8000
+#define SYSMODCTRL_IECHOADJ_BIASGEN     0x4000
+#define SYSMODCTRL_IECHOADJ_PFML_PHY    0x2000
+#define SYSMODCTRL_IECHOADJ_PS_MASK     3U
+#define SYSMODCTRL_IECHOADJ_PS_SHIFT    10
+#define SYSMODCTRL_IECHOADJ_PS_40       3
+#define SYSMODCTRL_IECHOADJ_PS_20       2
+#define SYSMODCTRL_IECHOADJ_PS_0        1
+#define SYSMODCTRL_IECHOADJ_10BT_100MV  0x40 /* 1:100mv, 0:200mv */
+#define SYSMODCTRL_IECHOADJ_HLFAP_MASK  3U
+#define SYSMODCTRL_IECHOADJ_HLFAP_SHIFT 4
+#define SYSMODCTRL_IECHOADJ_VDFULBW     0x8
+#define SYSMODCTRL_IECHOADJ_VDBIASHLF   0x4
+#define SYSMODCTRL_IECHOADJ_VDAMPHLF    0x2
+#define SYSMODCTRL_IECHOADJ_VDLANSW     0x1
+#define SYSMODCTRL_IECHOADJ_DEF         0x88BB /* ???? */
+
+/* for l1d & l2cb */
+#define SYSMODCTRL_IECHOADJ_CUR_ADD     0x8000
+#define SYSMODCTRL_IECHOADJ_CUR_MASK    7U
+#define SYSMODCTRL_IECHOADJ_CUR_SHIFT   12
+#define SYSMODCTRL_IECHOADJ_VOL_MASK    0xFU
+#define SYSMODCTRL_IECHOADJ_VOL_SHIFT   8
+#define SYSMODCTRL_IECHOADJ_VOL_17ALL   3
+#define SYSMODCTRL_IECHOADJ_VOL_100M15  1
+#define SYSMODCTRL_IECHOADJ_VOL_10M17   0
+#define SYSMODCTRL_IECHOADJ_BIAS1_MASK  0xFU
+#define SYSMODCTRL_IECHOADJ_BIAS1_SHIFT 4
+#define SYSMODCTRL_IECHOADJ_BIAS2_MASK  0xFU
+#define SYSMODCTRL_IECHOADJ_BIAS2_SHIFT 0
+#define L1D_SYSMODCTRL_IECHOADJ_DEF     0x4FBB
+
+#define MIIDBG_SRDSYSMOD                0x05
+#define SRDSYSMOD_LCKDET_EN             0x2000
+#define SRDSYSMOD_PLL_EN                0x800
+#define SRDSYSMOD_SEL_HSP               0x400
+#define SRDSYSMOD_HLFTXDR               0x200
+#define SRDSYSMOD_TXCLK_DELAY_EN        0x100
+#define SRDSYSMOD_TXELECIDLE            0x80
+#define SRDSYSMOD_DEEMP_EN              0x40
+#define SRDSYSMOD_MS_PAD                0x4
+#define SRDSYSMOD_CDR_ADC_VLTG          0x2
+#define SRDSYSMOD_CDR_DAC_1MA           0x1
+#define SRDSYSMOD_DEF                   0x2C46
+
+#define MIIDBG_CFGLPSPD                 0x0A
+#define CFGLPSPD_RSTCNT_MASK            3U
+#define CFGLPSPD_RSTCNT_SHIFT           14
+#define CFGLPSPD_RSTCNT_CLK125SW        0x2000
+
+#define MIIDBG_HIBNEG                   0x0B
+#define HIBNEG_PSHIB_EN                 0x8000
+#define HIBNEG_WAKE_BOTH                0x4000
+#define HIBNEG_ONOFF_ANACHG_SUDEN       0x2000
+#define HIBNEG_HIB_PULSE                0x1000
+#define HIBNEG_GATE_25M_EN              0x800
+#define HIBNEG_RST_80U                  0x400
+#define HIBNEG_RST_TIMER_MASK           3U
+#define HIBNEG_RST_TIMER_SHIFT          8
+#define HIBNEG_GTX_CLK_DELAY_MASK       3U
+#define HIBNEG_GTX_CLK_DELAY_SHIFT      5
+#define HIBNEG_BYPSS_BRKTIMER           0x10
+#define HIBNEG_DEF                      0xBC40
+
+#define MIIDBG_TST10BTCFG               0x12
+#define TST10BTCFG_INTV_TIMER_MASK      3U
+#define TST10BTCFG_INTV_TIMER_SHIFT     14
+#define TST10BTCFG_TRIGER_TIMER_MASK    3U
+#define TST10BTCFG_TRIGER_TIMER_SHIFT   12
+#define TST10BTCFG_DIV_MAN_MLT3_EN      0x800
+#define TST10BTCFG_OFF_DAC_IDLE         0x400
+#define TST10BTCFG_LPBK_DEEP            0x4 /* 1:deep,0:shallow */
+#define TST10BTCFG_DEF                  0x4C04
+
+#define MIIDBG_AZ_ANADECT               0x15
+#define AZ_ANADECT_10BTRX_TH            0x8000
+#define AZ_ANADECT_BOTH_01CHNL          0x4000
+#define AZ_ANADECT_INTV_MASK            0x3FU
+#define AZ_ANADECT_INTV_SHIFT           8
+#define AZ_ANADECT_THRESH_MASK          0xFU
+#define AZ_ANADECT_THRESH_SHIFT         4
+#define AZ_ANADECT_CHNL_MASK            0xFU
+#define AZ_ANADECT_CHNL_SHIFT           0
+#define AZ_ANADECT_DEF                  0x3220
+#define AZ_ANADECT_LONG                 0xb210
+
+#define MIIDBG_MSE16DB                  0x18    /* l1d */
+#define L1D_MSE16DB_UP                  0x05EA
+#define L1D_MSE16DB_DOWN                0x02EA
+
+#define MIIDBG_LEGCYPS                  0x29
+#define LEGCYPS_EN                      0x8000
+#define LEGCYPS_DAC_AMP1000_MASK        7U
+#define LEGCYPS_DAC_AMP1000_SHIFT       12
+#define LEGCYPS_DAC_AMP100_MASK         7U
+#define LEGCYPS_DAC_AMP100_SHIFT        9
+#define LEGCYPS_DAC_AMP10_MASK          7U
+#define LEGCYPS_DAC_AMP10_SHIFT         6
+#define LEGCYPS_UNPLUG_TIMER_MASK       7U
+#define LEGCYPS_UNPLUG_TIMER_SHIFT      3
+#define LEGCYPS_UNPLUG_DECT_EN          0x4
+#define LEGCYPS_ECNC_PS_EN              0x1
+#define L1D_LEGCYPS_DEF                 0x129D
+#define L1C_LEGCYPS_DEF                 0x36DD
+
+#define MIIDBG_TST100BTCFG              0x36
+#define TST100BTCFG_NORMAL_BW_EN        0x8000
+#define TST100BTCFG_BADLNK_BYPASS       0x4000
+#define TST100BTCFG_SHORTCABL_TH_MASK   0x3FU
+#define TST100BTCFG_SHORTCABL_TH_SHIFT  8
+#define TST100BTCFG_LITCH_EN            0x80
+#define TST100BTCFG_VLT_SW              0x40
+#define TST100BTCFG_LONGCABL_TH_MASK    0x3FU
+#define TST100BTCFG_LONGCABL_TH_SHIFT   0
+#define TST100BTCFG_DEF                 0xE12C
+
+#define MIIDBG_VOLT_CTRL                0x3B    /* only for l2cb 1 & 2 */
+#define VOLT_CTRL_CABLE1TH_MASK         0x1FFU
+#define VOLT_CTRL_CABLE1TH_SHIFT        7
+#define VOLT_CTRL_AMPCTRL_MASK          3U
+#define VOLT_CTRL_AMPCTRL_SHIFT         5
+#define VOLT_CTRL_SW_BYPASS             0x10
+#define VOLT_CTRL_SWLOWEST              0x8
+#define VOLT_CTRL_DACAMP10_MASK         7U
+#define VOLT_CTRL_DACAMP10_SHIFT        0
+
+#define MIIDBG_CABLE1TH_DET             0x3E
+#define CABLE1TH_DET_EN                 0x8000
+
+
+/******* dev 3 *********/
+#define MIIEXT_PCS                      3
+
+#define MIIEXT_CLDCTRL3                 0x8003
+#define CLDCTRL3_BP_CABLE1TH_DET_GT     0x8000
+#define CLDCTRL3_AZ_DISAMP              0x1000
+#define L2CB_CLDCTRL3                   0x4D19
+#define L1D_CLDCTRL3                    0xDD19
+
+#define MIIEXT_CLDCTRL6                 0x8006
+#define CLDCTRL6_CAB_LEN_MASK           0x1FFU
+#define CLDCTRL6_CAB_LEN_SHIFT          0
+#define CLDCTRL6_CAB_LEN_SHORT          0x50
+
+/********* dev 7 **********/
+#define MIIEXT_ANEG                     7
+
+#define MIIEXT_LOCAL_EEEADV             0x3C
+#define LOCAL_EEEADV_1000BT             0x4
+#define LOCAL_EEEADV_100BT              0x2
+
+#define MIIEXT_REMOTE_EEEADV            0x3D
+#define REMOTE_EEEADV_1000BT            0x4
+#define REMOTE_EEEADV_100BT             0x2
+
+#define MIIEXT_EEE_ANEG                 0x8000
+#define EEE_ANEG_1000M                  0x4
+#define EEE_ANEG_100M                   0x2
 
 #endif /*_ATL1C_HW_H_*/
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 1ef0c9275dee..9cc15701101b 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -24,14 +24,6 @@
 #define ATL1C_DRV_VERSION "1.0.1.0-NAPI"
 char atl1c_driver_name[] = "atl1c";
 char atl1c_driver_version[] = ATL1C_DRV_VERSION;
-#define PCI_DEVICE_ID_ATTANSIC_L2C      0x1062
-#define PCI_DEVICE_ID_ATTANSIC_L1C      0x1063
-#define PCI_DEVICE_ID_ATHEROS_L2C_B     0x2060 /* AR8152 v1.1 Fast 10/100 */
-#define PCI_DEVICE_ID_ATHEROS_L2C_B2    0x2062 /* AR8152 v2.0 Fast 10/100 */
-#define PCI_DEVICE_ID_ATHEROS_L1D       0x1073 /* AR8151 v1.0 Gigabit 1000 */
-#define PCI_DEVICE_ID_ATHEROS_L1D_2_0   0x1083 /* AR8151 v2.0 Gigabit 1000 */
-#define L2CB_V10                        0xc0
-#define L2CB_V11                        0xc1
 
 /*
  * atl1c_pci_tbl - PCI Device ID Table
@@ -54,70 +46,72 @@ static DEFINE_PCI_DEVICE_TABLE(atl1c_pci_tbl) = {
 };
 MODULE_DEVICE_TABLE(pci, atl1c_pci_tbl);
 
-MODULE_AUTHOR("Jie Yang <jie.yang@atheros.com>");
-MODULE_DESCRIPTION("Atheros 1000M Ethernet Network Driver");
+MODULE_AUTHOR("Jie Yang");
+MODULE_AUTHOR("Qualcomm Atheros Inc., <nic-devel@qualcomm.com>");
+MODULE_DESCRIPTION("Qualcom Atheros 100/1000M Ethernet Network Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(ATL1C_DRV_VERSION);
 
 static int atl1c_stop_mac(struct atl1c_hw *hw);
-static void atl1c_enable_rx_ctrl(struct atl1c_hw *hw);
-static void atl1c_enable_tx_ctrl(struct atl1c_hw *hw);
 static void atl1c_disable_l0s_l1(struct atl1c_hw *hw);
-static void atl1c_set_aspm(struct atl1c_hw *hw, bool linkup);
-static void atl1c_setup_mac_ctrl(struct atl1c_adapter *adapter);
-static void atl1c_clean_rx_irq(struct atl1c_adapter *adapter, u8 que,
+static void atl1c_set_aspm(struct atl1c_hw *hw, u16 link_speed);
+static void atl1c_start_mac(struct atl1c_adapter *adapter);
+static void atl1c_clean_rx_irq(struct atl1c_adapter *adapter,
                    int *work_done, int work_to_do);
 static int atl1c_up(struct atl1c_adapter *adapter);
 static void atl1c_down(struct atl1c_adapter *adapter);
+static int atl1c_reset_mac(struct atl1c_hw *hw);
+static void atl1c_reset_dma_ring(struct atl1c_adapter *adapter);
+static int atl1c_configure(struct atl1c_adapter *adapter);
+static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter);
 
 static const u16 atl1c_pay_load_size[] = {
         128, 256, 512, 1024, 2048, 4096,
 };
 
-static const u16 atl1c_rfd_prod_idx_regs[AT_MAX_RECEIVE_QUEUE] =
-{
-        REG_MB_RFD0_PROD_IDX,
-        REG_MB_RFD1_PROD_IDX,
-        REG_MB_RFD2_PROD_IDX,
-        REG_MB_RFD3_PROD_IDX
-};
-
-static const u16 atl1c_rfd_addr_lo_regs[AT_MAX_RECEIVE_QUEUE] =
-{
-        REG_RFD0_HEAD_ADDR_LO,
-        REG_RFD1_HEAD_ADDR_LO,
-        REG_RFD2_HEAD_ADDR_LO,
-        REG_RFD3_HEAD_ADDR_LO
-};
-
-static const u16 atl1c_rrd_addr_lo_regs[AT_MAX_RECEIVE_QUEUE] =
-{
-        REG_RRD0_HEAD_ADDR_LO,
-        REG_RRD1_HEAD_ADDR_LO,
-        REG_RRD2_HEAD_ADDR_LO,
-        REG_RRD3_HEAD_ADDR_LO
-};
 
 static const u32 atl1c_default_msg = NETIF_MSG_DRV | NETIF_MSG_PROBE |
         NETIF_MSG_LINK | NETIF_MSG_TIMER | NETIF_MSG_IFDOWN | NETIF_MSG_IFUP;
 static void atl1c_pcie_patch(struct atl1c_hw *hw)
 {
-        u32 data;
+        u32 mst_data, data;
 
-        AT_READ_REG(hw, REG_PCIE_PHYMISC, &data);
-        data |= PCIE_PHYMISC_FORCE_RCV_DET;
-        AT_WRITE_REG(hw, REG_PCIE_PHYMISC, data);
+        /* pclk sel could switch to 25M */
+        AT_READ_REG(hw, REG_MASTER_CTRL, &mst_data);
+        mst_data &= ~MASTER_CTRL_CLK_SEL_DIS;
+        AT_WRITE_REG(hw, REG_MASTER_CTRL, mst_data);
 
+        /* WoL/PCIE related settings */
+        if (hw->nic_type == athr_l1c || hw->nic_type == athr_l2c) {
+                AT_READ_REG(hw, REG_PCIE_PHYMISC, &data);
+                data |= PCIE_PHYMISC_FORCE_RCV_DET;
+                AT_WRITE_REG(hw, REG_PCIE_PHYMISC, data);
+        } else { /* new dev set bit5 of MASTER */
+                if (!(mst_data & MASTER_CTRL_WAKEN_25M))
+                        AT_WRITE_REG(hw, REG_MASTER_CTRL,
+                                mst_data | MASTER_CTRL_WAKEN_25M);
+        }
+        /* aspm/PCIE setting only for l2cb 1.0 */
         if (hw->nic_type == athr_l2c_b && hw->revision_id == L2CB_V10) {
                 AT_READ_REG(hw, REG_PCIE_PHYMISC2, &data);
-
-                data &= ~(PCIE_PHYMISC2_SERDES_CDR_MASK <<
-                        PCIE_PHYMISC2_SERDES_CDR_SHIFT);
-                data |= 3 << PCIE_PHYMISC2_SERDES_CDR_SHIFT;
-                data &= ~(PCIE_PHYMISC2_SERDES_TH_MASK <<
-                        PCIE_PHYMISC2_SERDES_TH_SHIFT);
-                data |= 3 << PCIE_PHYMISC2_SERDES_TH_SHIFT;
+                data = FIELD_SETX(data, PCIE_PHYMISC2_CDR_BW,
+                        L2CB1_PCIE_PHYMISC2_CDR_BW);
+                data = FIELD_SETX(data, PCIE_PHYMISC2_L0S_TH,
+                        L2CB1_PCIE_PHYMISC2_L0S_TH);
                 AT_WRITE_REG(hw, REG_PCIE_PHYMISC2, data);
+                /* extend L1 sync timer */
+                AT_READ_REG(hw, REG_LINK_CTRL, &data);
+                data |= LINK_CTRL_EXT_SYNC;
+                AT_WRITE_REG(hw, REG_LINK_CTRL, data);
+        }
+        /* l2cb 1.x & l1d 1.x */
+        if (hw->nic_type == athr_l2c_b || hw->nic_type == athr_l1d) {
+                AT_READ_REG(hw, REG_PM_CTRL, &data);
+                data |= PM_CTRL_L0S_BUFSRX_EN;
+                AT_WRITE_REG(hw, REG_PM_CTRL, data);
+                /* clear vendor msg */
+                AT_READ_REG(hw, REG_DMA_DBG, &data);
+                AT_WRITE_REG(hw, REG_DMA_DBG, data & ~DMA_DBG_VENDOR_MSG);
         }
 }
 
@@ -130,6 +124,7 @@ static void atl1c_reset_pcie(struct atl1c_hw *hw, u32 flag)
         u32 data;
         u32 pci_cmd;
         struct pci_dev *pdev = hw->adapter->pdev;
+        int pos;
 
         AT_READ_REG(hw, PCI_COMMAND, &pci_cmd);
         pci_cmd &= ~PCI_COMMAND_INTX_DISABLE;
@@ -142,14 +137,23 @@ static void atl1c_reset_pcie(struct atl1c_hw *hw, u32 flag)
          */
         pci_enable_wake(pdev, PCI_D3hot, 0);
         pci_enable_wake(pdev, PCI_D3cold, 0);
+        /* wol sts read-clear */
+        AT_READ_REG(hw, REG_WOL_CTRL, &data);
+        AT_WRITE_REG(hw, REG_WOL_CTRL, 0);
 
         /*
          * Mask some pcie error bits
          */
-        AT_READ_REG(hw, REG_PCIE_UC_SEVERITY, &data);
-        data &= ~PCIE_UC_SERVRITY_DLP;
-        data &= ~PCIE_UC_SERVRITY_FCP;
-        AT_WRITE_REG(hw, REG_PCIE_UC_SEVERITY, data);
+        pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ERR);
+        pci_read_config_dword(pdev, pos + PCI_ERR_UNCOR_SEVER, &data);
+        data &= ~(PCI_ERR_UNC_DLP | PCI_ERR_UNC_FCP);
+        pci_write_config_dword(pdev, pos + PCI_ERR_UNCOR_SEVER, data);
+        /* clear error status */
+        pci_write_config_word(pdev, pci_pcie_cap(pdev) + PCI_EXP_DEVSTA,
+                        PCI_EXP_DEVSTA_NFED |
+                        PCI_EXP_DEVSTA_FED |
+                        PCI_EXP_DEVSTA_CED |
+                        PCI_EXP_DEVSTA_URD);
 
         AT_READ_REG(hw, REG_LTSSM_ID_CTRL, &data);
         data &= ~LTSSM_ID_EN_WRO;
@@ -158,11 +162,6 @@ static void atl1c_reset_pcie(struct atl1c_hw *hw, u32 flag)
         atl1c_pcie_patch(hw);
         if (flag & ATL1C_PCIE_L0S_L1_DISABLE)
                 atl1c_disable_l0s_l1(hw);
-        if (flag & ATL1C_PCIE_PHY_RESET)
-                AT_WRITE_REG(hw, REG_GPHY_CTRL, GPHY_CTRL_DEFAULT);
-        else
-                AT_WRITE_REG(hw, REG_GPHY_CTRL,
-                        GPHY_CTRL_DEFAULT | GPHY_CTRL_EXT_RESET);
 
         msleep(5);
 }
@@ -207,14 +206,14 @@ static inline void atl1c_irq_reset(struct atl1c_adapter *adapter)
  * atl1c_wait_until_idle - wait up to AT_HW_MAX_IDLE_DELAY reads
  * of the idle status register until the device is actually idle
  */
-static u32 atl1c_wait_until_idle(struct atl1c_hw *hw)
+static u32 atl1c_wait_until_idle(struct atl1c_hw *hw, u32 modu_ctrl)
 {
         int timeout;
         u32 data;
 
         for (timeout = 0; timeout < AT_HW_MAX_IDLE_DELAY; timeout++) {
                 AT_READ_REG(hw, REG_IDLE_STATUS, &data);
-                if ((data & IDLE_STATUS_MASK) == 0)
+                if ((data & modu_ctrl) == 0)
                         return 0;
                 msleep(1);
         }
@@ -261,15 +260,16 @@ static void atl1c_check_link_status(struct atl1c_adapter *adapter)
 
         if ((phy_data & BMSR_LSTATUS) == 0) {
                 /* link down */
-                hw->hibernate = true;
-                if (atl1c_stop_mac(hw) != 0)
-                        if (netif_msg_hw(adapter))
-                                dev_warn(&pdev->dev, "stop mac failed\n");
-                atl1c_set_aspm(hw, false);
                 netif_carrier_off(netdev);
                 netif_stop_queue(netdev);
-                atl1c_phy_reset(hw);
-                atl1c_phy_init(&adapter->hw);
+                hw->hibernate = true;
+                if (atl1c_reset_mac(hw) != 0)
+                        if (netif_msg_hw(adapter))
+                                dev_warn(&pdev->dev, "reset mac failed\n");
+                atl1c_set_aspm(hw, SPEED_0);
+                atl1c_post_phy_linkchg(hw, SPEED_0);
+                atl1c_reset_dma_ring(adapter);
+                atl1c_configure(adapter);
         } else {
                 /* Link Up */
                 hw->hibernate = false;
@@ -283,10 +283,9 @@ static void atl1c_check_link_status(struct atl1c_adapter *adapter)
                     adapter->link_duplex != duplex) {
                         adapter->link_speed  = speed;
                         adapter->link_duplex = duplex;
-                        atl1c_set_aspm(hw, true);
-                        atl1c_enable_tx_ctrl(hw);
-                        atl1c_enable_rx_ctrl(hw);
-                        atl1c_setup_mac_ctrl(adapter);
+                        atl1c_set_aspm(hw, speed);
+                        atl1c_post_phy_linkchg(hw, speed);
+                        atl1c_start_mac(adapter);
                         if (netif_msg_link(adapter))
                                 dev_info(&pdev->dev,
                                         "%s: %s NIC Link is Up<%d Mbps %s>\n",
@@ -337,6 +336,9 @@ static void atl1c_common_task(struct work_struct *work)
         adapter = container_of(work, struct atl1c_adapter, common_task);
         netdev = adapter->netdev;
 
+        if (test_bit(__AT_DOWN, &adapter->flags))
+                return;
+
         if (test_and_clear_bit(ATL1C_WORK_EVENT_RESET, &adapter->work_event)) {
                 netif_device_detach(netdev);
                 atl1c_down(adapter);
@@ -345,8 +347,11 @@ static void atl1c_common_task(struct work_struct *work)
         }
 
         if (test_and_clear_bit(ATL1C_WORK_EVENT_LINK_CHANGE,
-                &adapter->work_event))
+                &adapter->work_event)) {
+                atl1c_irq_disable(adapter);
                 atl1c_check_link_status(adapter);
+                atl1c_irq_enable(adapter);
+        }
 }
 
 
@@ -470,7 +475,7 @@ static int atl1c_set_mac_addr(struct net_device *netdev, void *p)
         memcpy(adapter->hw.mac_addr, addr->sa_data, netdev->addr_len);
         netdev->addr_assign_type &= ~NET_ADDR_RANDOM;
 
-        atl1c_hw_set_mac_addr(&adapter->hw);
+        atl1c_hw_set_mac_addr(&adapter->hw, adapter->hw.mac_addr);
 
         return 0;
 }
@@ -523,11 +528,16 @@ static int atl1c_set_features(struct net_device *netdev,
 static int atl1c_change_mtu(struct net_device *netdev, int new_mtu)
 {
         struct atl1c_adapter *adapter = netdev_priv(netdev);
+        struct atl1c_hw *hw = &adapter->hw;
         int old_mtu   = netdev->mtu;
         int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;
 
-        if ((max_frame < ETH_ZLEN + ETH_FCS_LEN) ||
-                        (max_frame > MAX_JUMBO_FRAME_SIZE)) {
+        /* Fast Ethernet controller doesn't support jumbo packet */
+        if (((hw->nic_type == athr_l2c ||
+              hw->nic_type == athr_l2c_b ||
+              hw->nic_type == athr_l2c_b2) && new_mtu > ETH_DATA_LEN) ||
+              max_frame < ETH_ZLEN + ETH_FCS_LEN ||
+              max_frame > MAX_JUMBO_FRAME_SIZE) {
                 if (netif_msg_link(adapter))
                         dev_warn(&adapter->pdev->dev, "invalid MTU setting\n");
                 return -EINVAL;
@@ -543,14 +553,6 @@ static int atl1c_change_mtu(struct net_device *netdev, int new_mtu)
                 netdev_update_features(netdev);
                 atl1c_up(adapter);
                 clear_bit(__AT_RESETTING, &adapter->flags);
-                if (adapter->hw.ctrl_flags & ATL1C_FPGA_VERSION) {
-                        u32 phy_data;
-
-                        AT_READ_REG(&adapter->hw, 0x1414, &phy_data);
-                        phy_data |= 0x10000000;
-                        AT_WRITE_REG(&adapter->hw, 0x1414, phy_data);
-                }
-
         }
         return 0;
 }
@@ -563,7 +565,7 @@ static int atl1c_mdio_read(struct net_device *netdev, int phy_id, int reg_num)
         struct atl1c_adapter *adapter = netdev_priv(netdev);
         u16 result;
 
-        atl1c_read_phy_reg(&adapter->hw, reg_num & MDIO_REG_ADDR_MASK, &result);
+        atl1c_read_phy_reg(&adapter->hw, reg_num, &result);
         return result;
 }
 
@@ -572,7 +574,7 @@ static void atl1c_mdio_write(struct net_device *netdev, int phy_id,
 {
         struct atl1c_adapter *adapter = netdev_priv(netdev);
 
-        atl1c_write_phy_reg(&adapter->hw, reg_num & MDIO_REG_ADDR_MASK, val);
+        atl1c_write_phy_reg(&adapter->hw, reg_num, val);
 }
 
 /*
@@ -687,21 +689,15 @@ static void atl1c_set_mac_type(struct atl1c_hw *hw)
 
 static int atl1c_setup_mac_funcs(struct atl1c_hw *hw)
 {
-        u32 phy_status_data;
         u32 link_ctrl_data;
 
         atl1c_set_mac_type(hw);
-        AT_READ_REG(hw, REG_PHY_STATUS, &phy_status_data);
         AT_READ_REG(hw, REG_LINK_CTRL, &link_ctrl_data);
 
         hw->ctrl_flags = ATL1C_INTR_MODRT_ENABLE  |
                          ATL1C_TXQ_MODE_ENHANCE;
-        if (link_ctrl_data & LINK_CTRL_L0S_EN)
-                hw->ctrl_flags |= ATL1C_ASPM_L0S_SUPPORT;
-        if (link_ctrl_data & LINK_CTRL_L1_EN)
-                hw->ctrl_flags |= ATL1C_ASPM_L1_SUPPORT;
-        if (link_ctrl_data & LINK_CTRL_EXT_SYNC)
-                hw->ctrl_flags |= ATL1C_LINK_EXT_SYNC;
+        hw->ctrl_flags |= ATL1C_ASPM_L0S_SUPPORT |
+                          ATL1C_ASPM_L1_SUPPORT;
         hw->ctrl_flags |= ATL1C_ASPM_CTRL_MON;
 
         if (hw->nic_type == athr_l1c ||
@@ -710,6 +706,55 @@ static int atl1c_setup_mac_funcs(struct atl1c_hw *hw)
                 hw->link_cap_flags |= ATL1C_LINK_CAP_1000M;
         return 0;
 }
+
+struct atl1c_platform_patch {
+        u16 pci_did;
+        u8  pci_revid;
+        u16 subsystem_vid;
+        u16 subsystem_did;
+        u32 patch_flag;
+#define ATL1C_LINK_PATCH        0x1
+};
+static const struct atl1c_platform_patch plats[] __devinitdata = {
+{0x2060, 0xC1, 0x1019, 0x8152, 0x1},
+{0x2060, 0xC1, 0x1019, 0x2060, 0x1},
+{0x2060, 0xC1, 0x1019, 0xE000, 0x1},
+{0x2062, 0xC0, 0x1019, 0x8152, 0x1},
+{0x2062, 0xC0, 0x1019, 0x2062, 0x1},
+{0x2062, 0xC0, 0x1458, 0xE000, 0x1},
+{0x2062, 0xC1, 0x1019, 0x8152, 0x1},
+{0x2062, 0xC1, 0x1019, 0x2062, 0x1},
+{0x2062, 0xC1, 0x1458, 0xE000, 0x1},
+{0x2062, 0xC1, 0x1565, 0x2802, 0x1},
+{0x2062, 0xC1, 0x1565, 0x2801, 0x1},
+{0x1073, 0xC0, 0x1019, 0x8151, 0x1},
+{0x1073, 0xC0, 0x1019, 0x1073, 0x1},
+{0x1073, 0xC0, 0x1458, 0xE000, 0x1},
+{0x1083, 0xC0, 0x1458, 0xE000, 0x1},
+{0x1083, 0xC0, 0x1019, 0x8151, 0x1},
+{0x1083, 0xC0, 0x1019, 0x1083, 0x1},
+{0x1083, 0xC0, 0x1462, 0x7680, 0x1},
+{0x1083, 0xC0, 0x1565, 0x2803, 0x1},
+{0},
+};
+
+static void __devinit atl1c_patch_assign(struct atl1c_hw *hw)
+{
+        int i = 0;
+
+        hw->msi_lnkpatch = false;
+
+        while (plats[i].pci_did != 0) {
+                if (plats[i].pci_did == hw->device_id &&
+                    plats[i].pci_revid == hw->revision_id &&
+                    plats[i].subsystem_vid == hw->subsystem_vendor_id &&
+                    plats[i].subsystem_did == hw->subsystem_id) {
+                        if (plats[i].patch_flag & ATL1C_LINK_PATCH)
+                                hw->msi_lnkpatch = true;
+                }
+                i++;
+        }
+}
 /*
  * atl1c_sw_init - Initialize general software structures (struct atl1c_adapter)
  * @adapter: board private structure to initialize
@@ -729,9 +774,8 @@ static int __devinit atl1c_sw_init(struct atl1c_adapter *adapter)
         device_set_wakeup_enable(&pdev->dev, false);
         adapter->link_speed = SPEED_0;
         adapter->link_duplex = FULL_DUPLEX;
-        adapter->num_rx_queues = AT_DEF_RECEIVE_QUEUE;
         adapter->tpd_ring[0].count = 1024;
-        adapter->rfd_ring[0].count = 512;
+        adapter->rfd_ring.count = 512;
 
         hw->vendor_id = pdev->vendor;
         hw->device_id = pdev->device;
@@ -746,26 +790,18 @@ static int __devinit atl1c_sw_init(struct atl1c_adapter *adapter)
                 dev_err(&pdev->dev, "set mac function pointers failed\n");
                 return -1;
         }
+        atl1c_patch_assign(hw);
+
         hw->intr_mask = IMR_NORMAL_MASK;
         hw->phy_configured = false;
         hw->preamble_len = 7;
         hw->max_frame_size = adapter->netdev->mtu;
-        if (adapter->num_rx_queues < 2) {
-                hw->rss_type = atl1c_rss_disable;
-                hw->rss_mode = atl1c_rss_mode_disable;
-        } else {
-                hw->rss_type = atl1c_rss_ipv4;
-                hw->rss_mode = atl1c_rss_mul_que_mul_int;
-                hw->rss_hash_bits = 16;
-        }
         hw->autoneg_advertised = ADVERTISED_Autoneg;
         hw->indirect_tab = 0xE4E4E4E4;
         hw->base_cpu = 0;
 
         hw->ict = 50000;                /* 100ms */
         hw->smb_timer = 200000;         /* 400ms */
-        hw->cmb_tpd = 4;
-        hw->cmb_tx_timer = 1;           /* 2 us  */
         hw->rx_imt = 200;
         hw->tx_imt = 1000;
 
@@ -773,9 +809,6 @@ static int __devinit atl1c_sw_init(struct atl1c_adapter *adapter)
         hw->rfd_burst = 8;
         hw->dma_order = atl1c_dma_ord_out;
         hw->dmar_block = atl1c_dma_req_1024;
-        hw->dmaw_block = atl1c_dma_req_1024;
-        hw->dmar_dly_cnt = 15;
-        hw->dmaw_dly_cnt = 4;
 
         if (atl1c_alloc_queues(adapter)) {
                 dev_err(&pdev->dev, "Unable to allocate memory for queues\n");
@@ -851,24 +884,22 @@ static void atl1c_clean_tx_ring(struct atl1c_adapter *adapter,
  */
 static void atl1c_clean_rx_ring(struct atl1c_adapter *adapter)
 {
-        struct atl1c_rfd_ring *rfd_ring = adapter->rfd_ring;
-        struct atl1c_rrd_ring *rrd_ring = adapter->rrd_ring;
+        struct atl1c_rfd_ring *rfd_ring = &adapter->rfd_ring;
+        struct atl1c_rrd_ring *rrd_ring = &adapter->rrd_ring;
         struct atl1c_buffer *buffer_info;
         struct pci_dev *pdev = adapter->pdev;
-        int i, j;
+        int j;
 
-        for (i = 0; i < adapter->num_rx_queues; i++) {
-                for (j = 0; j < rfd_ring[i].count; j++) {
-                        buffer_info = &rfd_ring[i].buffer_info[j];
-                        atl1c_clean_buffer(pdev, buffer_info, 0);
-                }
-                /* zero out the descriptor ring */
-                memset(rfd_ring[i].desc, 0, rfd_ring[i].size);
-                rfd_ring[i].next_to_clean = 0;
-                rfd_ring[i].next_to_use = 0;
-                rrd_ring[i].next_to_use = 0;
-                rrd_ring[i].next_to_clean = 0;
+        for (j = 0; j < rfd_ring->count; j++) {
+                buffer_info = &rfd_ring->buffer_info[j];
+                atl1c_clean_buffer(pdev, buffer_info, 0);
         }
+        /* zero out the descriptor ring */
+        memset(rfd_ring->desc, 0, rfd_ring->size);
+        rfd_ring->next_to_clean = 0;
+        rfd_ring->next_to_use = 0;
+        rrd_ring->next_to_use = 0;
+        rrd_ring->next_to_clean = 0;
 }
 
 /*
@@ -877,8 +908,8 @@ static void atl1c_clean_rx_ring(struct atl1c_adapter *adapter)
 static void atl1c_init_ring_ptrs(struct atl1c_adapter *adapter)
 {
         struct atl1c_tpd_ring *tpd_ring = adapter->tpd_ring;
-        struct atl1c_rfd_ring *rfd_ring = adapter->rfd_ring;
-        struct atl1c_rrd_ring *rrd_ring = adapter->rrd_ring;
+        struct atl1c_rfd_ring *rfd_ring = &adapter->rfd_ring;
+        struct atl1c_rrd_ring *rrd_ring = &adapter->rrd_ring;
         struct atl1c_buffer *buffer_info;
         int i, j;
 
@@ -890,15 +921,13 @@ static void atl1c_init_ring_ptrs(struct atl1c_adapter *adapter)
                         ATL1C_SET_BUFFER_STATE(&buffer_info[i],
                                         ATL1C_BUFFER_FREE);
         }
-        for (i = 0; i < adapter->num_rx_queues; i++) {
-                rfd_ring[i].next_to_use = 0;
-                rfd_ring[i].next_to_clean = 0;
-                rrd_ring[i].next_to_use = 0;
-                rrd_ring[i].next_to_clean = 0;
-                for (j = 0; j < rfd_ring[i].count; j++) {
-                        buffer_info = &rfd_ring[i].buffer_info[j];
-                        ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_FREE);
-                }
+        rfd_ring->next_to_use = 0;
+        rfd_ring->next_to_clean = 0;
+        rrd_ring->next_to_use = 0;
+        rrd_ring->next_to_clean = 0;
+        for (j = 0; j < rfd_ring->count; j++) {
+                buffer_info = &rfd_ring->buffer_info[j];
+                ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_FREE);
         }
 }
 
@@ -935,27 +964,23 @@ static int atl1c_setup_ring_resources(struct atl1c_adapter *adapter)
 {
         struct pci_dev *pdev = adapter->pdev;
         struct atl1c_tpd_ring *tpd_ring = adapter->tpd_ring;
-        struct atl1c_rfd_ring *rfd_ring = adapter->rfd_ring;
-        struct atl1c_rrd_ring *rrd_ring = adapter->rrd_ring;
+        struct atl1c_rfd_ring *rfd_ring = &adapter->rfd_ring;
+        struct atl1c_rrd_ring *rrd_ring = &adapter->rrd_ring;
         struct atl1c_ring_header *ring_header = &adapter->ring_header;
-        int num_rx_queues = adapter->num_rx_queues;
         int size;
         int i;
         int count = 0;
         int rx_desc_count = 0;
         u32 offset = 0;
 
-        rrd_ring[0].count = rfd_ring[0].count;
+        rrd_ring->count = rfd_ring->count;
         for (i = 1; i < AT_MAX_TRANSMIT_QUEUE; i++)
                 tpd_ring[i].count = tpd_ring[0].count;
 
-        for (i = 1; i < adapter->num_rx_queues; i++)
-                rfd_ring[i].count = rrd_ring[i].count = rfd_ring[0].count;
-
         /* 2 tpd queue, one high priority queue,
          * another normal priority queue */
         size = sizeof(struct atl1c_buffer) * (tpd_ring->count * 2 +
-                rfd_ring->count * num_rx_queues);
+                rfd_ring->count);
         tpd_ring->buffer_info = kzalloc(size, GFP_KERNEL);
         if (unlikely(!tpd_ring->buffer_info)) {
                 dev_err(&pdev->dev, "kzalloc failed, size = %d\n",
@@ -968,12 +993,11 @@ static int atl1c_setup_ring_resources(struct atl1c_adapter *adapter)
                 count += tpd_ring[i].count;
         }
 
-        for (i = 0; i < num_rx_queues; i++) {
-                rfd_ring[i].buffer_info =
-                        (struct atl1c_buffer *) (tpd_ring->buffer_info + count);
-                count += rfd_ring[i].count;
-                rx_desc_count += rfd_ring[i].count;
-        }
+        rfd_ring->buffer_info =
+                (struct atl1c_buffer *) (tpd_ring->buffer_info + count);
+        count += rfd_ring->count;
+        rx_desc_count += rfd_ring->count;
+
         /*
          * real ring DMA buffer
          * each ring/block may need up to 8 bytes for alignment, hence the
@@ -983,8 +1007,7 @@ static int atl1c_setup_ring_resources(struct atl1c_adapter *adapter)
                 sizeof(struct atl1c_tpd_desc) * tpd_ring->count * 2 +
                 sizeof(struct atl1c_rx_free_desc) * rx_desc_count +
                 sizeof(struct atl1c_recv_ret_status) * rx_desc_count +
-                sizeof(struct atl1c_hw_stats) +
-                8 * 4 + 8 * 2 * num_rx_queues;
+                8 * 4;
 
         ring_header->desc = pci_alloc_consistent(pdev, ring_header->size,
                                 &ring_header->dma);
@@ -1005,25 +1028,18 @@ static int atl1c_setup_ring_resources(struct atl1c_adapter *adapter)
                 offset += roundup(tpd_ring[i].size, 8);
         }
         /* init RFD ring */
-        for (i = 0; i < num_rx_queues; i++) {
-                rfd_ring[i].dma = ring_header->dma + offset;
-                rfd_ring[i].desc = (u8 *) ring_header->desc + offset;
-                rfd_ring[i].size = sizeof(struct atl1c_rx_free_desc) *
-                                rfd_ring[i].count;
-                offset += roundup(rfd_ring[i].size, 8);
-        }
+        rfd_ring->dma = ring_header->dma + offset;
+        rfd_ring->desc = (u8 *) ring_header->desc + offset;
+        rfd_ring->size = sizeof(struct atl1c_rx_free_desc) * rfd_ring->count;
+        offset += roundup(rfd_ring->size, 8);
 
         /* init RRD ring */
-        for (i = 0; i < num_rx_queues; i++) {
-                rrd_ring[i].dma = ring_header->dma + offset;
-                rrd_ring[i].desc = (u8 *) ring_header->desc + offset;
-                rrd_ring[i].size = sizeof(struct atl1c_recv_ret_status) *
-                                rrd_ring[i].count;
-                offset += roundup(rrd_ring[i].size, 8);
-        }
+        rrd_ring->dma = ring_header->dma + offset;
+        rrd_ring->desc = (u8 *) ring_header->desc + offset;
+        rrd_ring->size = sizeof(struct atl1c_recv_ret_status) *
+                rrd_ring->count;
+        offset += roundup(rrd_ring->size, 8);
 
-        adapter->smb.dma = ring_header->dma + offset;
-        adapter->smb.smb = (u8 *)ring_header->desc + offset;
         return 0;
 
 err_nomem:
@@ -1034,26 +1050,20 @@ err_nomem:
 static void atl1c_configure_des_ring(struct atl1c_adapter *adapter)
 {
         struct atl1c_hw *hw = &adapter->hw;
-        struct atl1c_rfd_ring *rfd_ring = (struct atl1c_rfd_ring *)
-                                adapter->rfd_ring;
-        struct atl1c_rrd_ring *rrd_ring = (struct atl1c_rrd_ring *)
-                                adapter->rrd_ring;
+        struct atl1c_rfd_ring *rfd_ring = &adapter->rfd_ring;
+        struct atl1c_rrd_ring *rrd_ring = &adapter->rrd_ring;
         struct atl1c_tpd_ring *tpd_ring = (struct atl1c_tpd_ring *)
                                 adapter->tpd_ring;
-        struct atl1c_cmb *cmb = (struct atl1c_cmb *) &adapter->cmb;
-        struct atl1c_smb *smb = (struct atl1c_smb *) &adapter->smb;
-        int i;
-        u32 data;
 
         /* TPD */
         AT_WRITE_REG(hw, REG_TX_BASE_ADDR_HI,
                         (u32)((tpd_ring[atl1c_trans_normal].dma &
                                 AT_DMA_HI_ADDR_MASK) >> 32));
         /* just enable normal priority TX queue */
-        AT_WRITE_REG(hw, REG_NTPD_HEAD_ADDR_LO,
+        AT_WRITE_REG(hw, REG_TPD_PRI0_ADDR_LO,
                         (u32)(tpd_ring[atl1c_trans_normal].dma &
                                 AT_DMA_LO_ADDR_MASK));
-        AT_WRITE_REG(hw, REG_HTPD_HEAD_ADDR_LO,
+        AT_WRITE_REG(hw, REG_TPD_PRI1_ADDR_LO,
                         (u32)(tpd_ring[atl1c_trans_high].dma &
                                 AT_DMA_LO_ADDR_MASK));
         AT_WRITE_REG(hw, REG_TPD_RING_SIZE,
@@ -1062,31 +1072,21 @@ static void atl1c_configure_des_ring(struct atl1c_adapter *adapter)
 
         /* RFD */
         AT_WRITE_REG(hw, REG_RX_BASE_ADDR_HI,
-                        (u32)((rfd_ring[0].dma & AT_DMA_HI_ADDR_MASK) >> 32));
-        for (i = 0; i < adapter->num_rx_queues; i++)
-                AT_WRITE_REG(hw, atl1c_rfd_addr_lo_regs[i],
-                        (u32)(rfd_ring[i].dma & AT_DMA_LO_ADDR_MASK));
+                        (u32)((rfd_ring->dma & AT_DMA_HI_ADDR_MASK) >> 32));
+        AT_WRITE_REG(hw, REG_RFD0_HEAD_ADDR_LO,
+                        (u32)(rfd_ring->dma & AT_DMA_LO_ADDR_MASK));
 
         AT_WRITE_REG(hw, REG_RFD_RING_SIZE,
-                        rfd_ring[0].count & RFD_RING_SIZE_MASK);
+                        rfd_ring->count & RFD_RING_SIZE_MASK);
         AT_WRITE_REG(hw, REG_RX_BUF_SIZE,
                         adapter->rx_buffer_len & RX_BUF_SIZE_MASK);
 
         /* RRD */
-        for (i = 0; i < adapter->num_rx_queues; i++)
-                AT_WRITE_REG(hw, atl1c_rrd_addr_lo_regs[i],
-                        (u32)(rrd_ring[i].dma & AT_DMA_LO_ADDR_MASK));
+        AT_WRITE_REG(hw, REG_RRD0_HEAD_ADDR_LO,
+                        (u32)(rrd_ring->dma & AT_DMA_LO_ADDR_MASK));
         AT_WRITE_REG(hw, REG_RRD_RING_SIZE,
-                        (rrd_ring[0].count & RRD_RING_SIZE_MASK));
+                        (rrd_ring->count & RRD_RING_SIZE_MASK));
 
-        /* CMB */
-        AT_WRITE_REG(hw, REG_CMB_BASE_ADDR_LO, cmb->dma & AT_DMA_LO_ADDR_MASK);
-
-        /* SMB */
-        AT_WRITE_REG(hw, REG_SMB_BASE_ADDR_HI,
-                        (u32)((smb->dma & AT_DMA_HI_ADDR_MASK) >> 32));
-        AT_WRITE_REG(hw, REG_SMB_BASE_ADDR_LO,
-                        (u32)(smb->dma & AT_DMA_LO_ADDR_MASK));
         if (hw->nic_type == athr_l2c_b) {
                 AT_WRITE_REG(hw, REG_SRAM_RXF_LEN, 0x02a0L);
                 AT_WRITE_REG(hw, REG_SRAM_TXF_LEN, 0x0100L);
@@ -1097,13 +1097,6 @@ static void atl1c_configure_des_ring(struct atl1c_adapter *adapter)
                 AT_WRITE_REG(hw, REG_TXF_WATER_MARK, 0);        /* TX watermark, to enter l1 state.*/
                 AT_WRITE_REG(hw, REG_RXD_DMA_CTRL, 0);          /* RXD threshold.*/
         }
-        if (hw->nic_type == athr_l2c_b || hw->nic_type == athr_l1d_2) {
-                        /* Power Saving for L2c_B */
-                AT_READ_REG(hw, REG_SERDES_LOCK, &data);
-                data |= SERDES_MAC_CLK_SLOWDOWN;
-                data |= SERDES_PYH_CLK_SLOWDOWN;
-                AT_WRITE_REG(hw, REG_SERDES_LOCK, data);
-        }
         /* Load all of base address above */
         AT_WRITE_REG(hw, REG_LOAD_PTR, 1);
 }
@@ -1111,32 +1104,26 @@ static void atl1c_configure_des_ring(struct atl1c_adapter *adapter)
 static void atl1c_configure_tx(struct atl1c_adapter *adapter)
 {
         struct atl1c_hw *hw = &adapter->hw;
-        u32 dev_ctrl_data;
-        u32 max_pay_load;
+        int max_pay_load;
         u16 tx_offload_thresh;
         u32 txq_ctrl_data;
-        u32 max_pay_load_data;
 
-        tx_offload_thresh = MAX_TX_OFFLOAD_THRESH;
+        tx_offload_thresh = MAX_TSO_FRAME_SIZE;
         AT_WRITE_REG(hw, REG_TX_TSO_OFFLOAD_THRESH,
                 (tx_offload_thresh >> 3) & TX_TSO_OFFLOAD_THRESH_MASK);
-        AT_READ_REG(hw, REG_DEVICE_CTRL, &dev_ctrl_data);
-        max_pay_load  = (dev_ctrl_data >> DEVICE_CTRL_MAX_PAYLOAD_SHIFT) &
-                        DEVICE_CTRL_MAX_PAYLOAD_MASK;
-        hw->dmaw_block = min_t(u32, max_pay_load, hw->dmaw_block);
-        max_pay_load  = (dev_ctrl_data >> DEVICE_CTRL_MAX_RREQ_SZ_SHIFT) &
-                        DEVICE_CTRL_MAX_RREQ_SZ_MASK;
+        max_pay_load = pcie_get_readrq(adapter->pdev) >> 8;
         hw->dmar_block = min_t(u32, max_pay_load, hw->dmar_block);
-
-        txq_ctrl_data = (hw->tpd_burst & TXQ_NUM_TPD_BURST_MASK) <<
-                        TXQ_NUM_TPD_BURST_SHIFT;
-        if (hw->ctrl_flags & ATL1C_TXQ_MODE_ENHANCE)
-                txq_ctrl_data |= TXQ_CTRL_ENH_MODE;
-        max_pay_load_data = (atl1c_pay_load_size[hw->dmar_block] &
-                        TXQ_TXF_BURST_NUM_MASK) << TXQ_TXF_BURST_NUM_SHIFT;
-        if (hw->nic_type == athr_l2c_b || hw->nic_type == athr_l2c_b2)
-                max_pay_load_data >>= 1;
-        txq_ctrl_data |= max_pay_load_data;
+        /*
+         * if BIOS had changed the dam-read-max-length to an invalid value,
+         * restore it to default value
+         */
+        if (hw->dmar_block < DEVICE_CTRL_MAXRRS_MIN) {
+                pcie_set_readrq(adapter->pdev, 128 << DEVICE_CTRL_MAXRRS_MIN);
+                hw->dmar_block = DEVICE_CTRL_MAXRRS_MIN;
+        }
+        txq_ctrl_data =
+                hw->nic_type == athr_l2c_b || hw->nic_type == athr_l2c_b2 ?
+                L2CB_TXQ_CFGV : L1C_TXQ_CFGV;
 
         AT_WRITE_REG(hw, REG_TXQ_CTRL, txq_ctrl_data);
 }
@@ -1151,34 +1138,13 @@ static void atl1c_configure_rx(struct atl1c_adapter *adapter)
 
         if (hw->ctrl_flags & ATL1C_RX_IPV6_CHKSUM)
                 rxq_ctrl_data |= IPV6_CHKSUM_CTRL_EN;
-        if (hw->rss_type == atl1c_rss_ipv4)
-                rxq_ctrl_data |= RSS_HASH_IPV4;
-        if (hw->rss_type == atl1c_rss_ipv4_tcp)
-                rxq_ctrl_data |= RSS_HASH_IPV4_TCP;
-        if (hw->rss_type == atl1c_rss_ipv6)
-                rxq_ctrl_data |= RSS_HASH_IPV6;
-        if (hw->rss_type == atl1c_rss_ipv6_tcp)
-                rxq_ctrl_data |= RSS_HASH_IPV6_TCP;
-        if (hw->rss_type != atl1c_rss_disable)
-                rxq_ctrl_data |= RRS_HASH_CTRL_EN;
-
-        rxq_ctrl_data |= (hw->rss_mode & RSS_MODE_MASK) <<
-                        RSS_MODE_SHIFT;
-        rxq_ctrl_data |= (hw->rss_hash_bits & RSS_HASH_BITS_MASK) <<
-                        RSS_HASH_BITS_SHIFT;
-        if (hw->ctrl_flags & ATL1C_ASPM_CTRL_MON)
-                rxq_ctrl_data |= (ASPM_THRUPUT_LIMIT_1M &
-                        ASPM_THRUPUT_LIMIT_MASK) << ASPM_THRUPUT_LIMIT_SHIFT;
 
-        AT_WRITE_REG(hw, REG_RXQ_CTRL, rxq_ctrl_data);
-}
-
-static void atl1c_configure_rss(struct atl1c_adapter *adapter)
-{
-        struct atl1c_hw *hw = &adapter->hw;
+        /* aspm for gigabit */
+        if (hw->nic_type != athr_l1d_2 && (hw->device_id & 1) != 0)
+                rxq_ctrl_data = FIELD_SETX(rxq_ctrl_data, ASPM_THRUPUT_LIMIT,
+                        ASPM_THRUPUT_LIMIT_100M);
 
-        AT_WRITE_REG(hw, REG_IDT_TABLE, hw->indirect_tab);
-        AT_WRITE_REG(hw, REG_BASE_CPU_NUMBER, hw->base_cpu);
+        AT_WRITE_REG(hw, REG_RXQ_CTRL, rxq_ctrl_data);
 }
 
 static void atl1c_configure_dma(struct atl1c_adapter *adapter)
@@ -1186,36 +1152,11 @@ static void atl1c_configure_dma(struct atl1c_adapter *adapter)
         struct atl1c_hw *hw = &adapter->hw;
         u32 dma_ctrl_data;
 
-        dma_ctrl_data = DMA_CTRL_DMAR_REQ_PRI;
-        if (hw->ctrl_flags & ATL1C_CMB_ENABLE)
-                dma_ctrl_data |= DMA_CTRL_CMB_EN;
-        if (hw->ctrl_flags & ATL1C_SMB_ENABLE)
-                dma_ctrl_data |= DMA_CTRL_SMB_EN;
-        else
-                dma_ctrl_data |= MAC_CTRL_SMB_DIS;
-
-        switch (hw->dma_order) {
-        case atl1c_dma_ord_in:
-                dma_ctrl_data |= DMA_CTRL_DMAR_IN_ORDER;
-                break;
-        case atl1c_dma_ord_enh:
-                dma_ctrl_data |= DMA_CTRL_DMAR_ENH_ORDER;
-                break;
-        case atl1c_dma_ord_out:
-                dma_ctrl_data |= DMA_CTRL_DMAR_OUT_ORDER;
-                break;
-        default:
-                break;
-        }
-
-        dma_ctrl_data |= (((u32)hw->dmar_block) & DMA_CTRL_DMAR_BURST_LEN_MASK)
-                << DMA_CTRL_DMAR_BURST_LEN_SHIFT;
-        dma_ctrl_data |= (((u32)hw->dmaw_block) & DMA_CTRL_DMAW_BURST_LEN_MASK)
-                << DMA_CTRL_DMAW_BURST_LEN_SHIFT;
-        dma_ctrl_data |= (((u32)hw->dmar_dly_cnt) & DMA_CTRL_DMAR_DLY_CNT_MASK)
-                << DMA_CTRL_DMAR_DLY_CNT_SHIFT;
-        dma_ctrl_data |= (((u32)hw->dmaw_dly_cnt) & DMA_CTRL_DMAW_DLY_CNT_MASK)
-                << DMA_CTRL_DMAW_DLY_CNT_SHIFT;
+        dma_ctrl_data = FIELDX(DMA_CTRL_RORDER_MODE, DMA_CTRL_RORDER_MODE_OUT) |
+                DMA_CTRL_RREQ_PRI_DATA |
+                FIELDX(DMA_CTRL_RREQ_BLEN, hw->dmar_block) |
+                FIELDX(DMA_CTRL_WDLY_CNT, DMA_CTRL_WDLY_CNT_DEF) |
+                FIELDX(DMA_CTRL_RDLY_CNT, DMA_CTRL_RDLY_CNT_DEF);
 
         AT_WRITE_REG(hw, REG_DMA_CTRL, dma_ctrl_data);
 }
@@ -1230,52 +1171,53 @@ static int atl1c_stop_mac(struct atl1c_hw *hw)
         u32 data;
 
         AT_READ_REG(hw, REG_RXQ_CTRL, &data);
-        data &= ~(RXQ1_CTRL_EN | RXQ2_CTRL_EN |
-                  RXQ3_CTRL_EN | RXQ_CTRL_EN);
+        data &= ~RXQ_CTRL_EN;
         AT_WRITE_REG(hw, REG_RXQ_CTRL, data);
 
         AT_READ_REG(hw, REG_TXQ_CTRL, &data);
         data &= ~TXQ_CTRL_EN;
-        AT_WRITE_REG(hw, REG_TWSI_CTRL, data);
+        AT_WRITE_REG(hw, REG_TXQ_CTRL, data);
 
-        atl1c_wait_until_idle(hw);
+        atl1c_wait_until_idle(hw, IDLE_STATUS_RXQ_BUSY | IDLE_STATUS_TXQ_BUSY);
 
         AT_READ_REG(hw, REG_MAC_CTRL, &data);
         data &= ~(MAC_CTRL_TX_EN | MAC_CTRL_RX_EN);
         AT_WRITE_REG(hw, REG_MAC_CTRL, data);
 
-        return (int)atl1c_wait_until_idle(hw);
-}
-
-static void atl1c_enable_rx_ctrl(struct atl1c_hw *hw)
-{
-        u32 data;
-
-        AT_READ_REG(hw, REG_RXQ_CTRL, &data);
-        switch (hw->adapter->num_rx_queues) {
-        case 4:
-                data |= (RXQ3_CTRL_EN | RXQ2_CTRL_EN | RXQ1_CTRL_EN);
-                break;
-        case 3:
-                data |= (RXQ2_CTRL_EN | RXQ1_CTRL_EN);
-                break;
-        case 2:
-                data |= RXQ1_CTRL_EN;
-                break;
-        default:
-                break;
-        }
-        data |= RXQ_CTRL_EN;
-        AT_WRITE_REG(hw, REG_RXQ_CTRL, data);
+        return (int)atl1c_wait_until_idle(hw,
+                IDLE_STATUS_TXMAC_BUSY | IDLE_STATUS_RXMAC_BUSY);
 }
 
-static void atl1c_enable_tx_ctrl(struct atl1c_hw *hw)
+static void atl1c_start_mac(struct atl1c_adapter *adapter)
 {
-        u32 data;
+        struct atl1c_hw *hw = &adapter->hw;
+        u32 mac, txq, rxq;
+
+        hw->mac_duplex = adapter->link_duplex == FULL_DUPLEX ? true : false;
+        hw->mac_speed = adapter->link_speed == SPEED_1000 ?
+                atl1c_mac_speed_1000 : atl1c_mac_speed_10_100;
+
+        AT_READ_REG(hw, REG_TXQ_CTRL, &txq);
+        AT_READ_REG(hw, REG_RXQ_CTRL, &rxq);
+        AT_READ_REG(hw, REG_MAC_CTRL, &mac);
+
+        txq |= TXQ_CTRL_EN;
+        rxq |= RXQ_CTRL_EN;
+        mac |= MAC_CTRL_TX_EN | MAC_CTRL_TX_FLOW |
+               MAC_CTRL_RX_EN | MAC_CTRL_RX_FLOW |
+               MAC_CTRL_ADD_CRC | MAC_CTRL_PAD |
+               MAC_CTRL_BC_EN | MAC_CTRL_SINGLE_PAUSE_EN |
+               MAC_CTRL_HASH_ALG_CRC32;
+        if (hw->mac_duplex)
+                mac |= MAC_CTRL_DUPLX;
+        else
+                mac &= ~MAC_CTRL_DUPLX;
+        mac = FIELD_SETX(mac, MAC_CTRL_SPEED, hw->mac_speed);
+        mac = FIELD_SETX(mac, MAC_CTRL_PRMLEN, hw->preamble_len);
 
-        AT_READ_REG(hw, REG_TXQ_CTRL, &data);
-        data |= TXQ_CTRL_EN;
-        AT_WRITE_REG(hw, REG_TXQ_CTRL, data);
+        AT_WRITE_REG(hw, REG_TXQ_CTRL, txq);
+        AT_WRITE_REG(hw, REG_RXQ_CTRL, rxq);
+        AT_WRITE_REG(hw, REG_MAC_CTRL, mac);
 }
 
 /*
@@ -1287,10 +1229,7 @@ static int atl1c_reset_mac(struct atl1c_hw *hw)
 {
         struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter;
         struct pci_dev *pdev = adapter->pdev;
-        u32 master_ctrl_data = 0;
-
-        AT_WRITE_REG(hw, REG_IMR, 0);
-        AT_WRITE_REG(hw, REG_ISR, ISR_DIS_INT);
+        u32 ctrl_data = 0;
 
         atl1c_stop_mac(hw);
         /*
@@ -1299,194 +1238,148 @@ static int atl1c_reset_mac(struct atl1c_hw *hw)
          * the current PCI configuration.  The global reset bit is self-
          * clearing, and should clear within a microsecond.
          */
-        AT_READ_REG(hw, REG_MASTER_CTRL, &master_ctrl_data);
-        master_ctrl_data |= MASTER_CTRL_OOB_DIS_OFF;
-        AT_WRITE_REGW(hw, REG_MASTER_CTRL, ((master_ctrl_data | MASTER_CTRL_SOFT_RST)
-                        & 0xFFFF));
+        AT_READ_REG(hw, REG_MASTER_CTRL, &ctrl_data);
+        ctrl_data |= MASTER_CTRL_OOB_DIS;
+        AT_WRITE_REG(hw, REG_MASTER_CTRL, ctrl_data | MASTER_CTRL_SOFT_RST);
 
         AT_WRITE_FLUSH(hw);
         msleep(10);
         /* Wait at least 10ms for All module to be Idle */
 
-        if (atl1c_wait_until_idle(hw)) {
+        if (atl1c_wait_until_idle(hw, IDLE_STATUS_MASK)) {
                 dev_err(&pdev->dev,
                         "MAC state machine can't be idle since"
                         " disabled for 10ms second\n");
                 return -1;
         }
+        AT_WRITE_REG(hw, REG_MASTER_CTRL, ctrl_data);
+
+        /* driver control speed/duplex */
+        AT_READ_REG(hw, REG_MAC_CTRL, &ctrl_data);
+        AT_WRITE_REG(hw, REG_MAC_CTRL, ctrl_data | MAC_CTRL_SPEED_MODE_SW);
+
+        /* clk switch setting */
+        AT_READ_REG(hw, REG_SERDES, &ctrl_data);
+        switch (hw->nic_type) {
+        case athr_l2c_b:
+                ctrl_data &= ~(SERDES_PHY_CLK_SLOWDOWN |
+                                SERDES_MAC_CLK_SLOWDOWN);
+                AT_WRITE_REG(hw, REG_SERDES, ctrl_data);
+                break;
+        case athr_l2c_b2:
+        case athr_l1d_2:
+                ctrl_data |= SERDES_PHY_CLK_SLOWDOWN | SERDES_MAC_CLK_SLOWDOWN;
+                AT_WRITE_REG(hw, REG_SERDES, ctrl_data);
+                break;
+        default:
+                break;
+        }
+
         return 0;
 }
 
 static void atl1c_disable_l0s_l1(struct atl1c_hw *hw)
 {
-        u32 pm_ctrl_data;
+        u16 ctrl_flags = hw->ctrl_flags;
 
-        AT_READ_REG(hw, REG_PM_CTRL, &pm_ctrl_data);
-        pm_ctrl_data &= ~(PM_CTRL_L1_ENTRY_TIMER_MASK <<
-                        PM_CTRL_L1_ENTRY_TIMER_SHIFT);
-        pm_ctrl_data &= ~PM_CTRL_CLK_SWH_L1;
-        pm_ctrl_data &= ~PM_CTRL_ASPM_L0S_EN;
-        pm_ctrl_data &= ~PM_CTRL_ASPM_L1_EN;
-        pm_ctrl_data &= ~PM_CTRL_MAC_ASPM_CHK;
-        pm_ctrl_data &= ~PM_CTRL_SERDES_PD_EX_L1;
-
-        pm_ctrl_data |= PM_CTRL_SERDES_BUDS_RX_L1_EN;
-        pm_ctrl_data |= PM_CTRL_SERDES_PLL_L1_EN;
-        pm_ctrl_data |= PM_CTRL_SERDES_L1_EN;
-        AT_WRITE_REG(hw, REG_PM_CTRL, pm_ctrl_data);
+        hw->ctrl_flags &= ~(ATL1C_ASPM_L0S_SUPPORT | ATL1C_ASPM_L1_SUPPORT);
+        atl1c_set_aspm(hw, SPEED_0);
+        hw->ctrl_flags = ctrl_flags;
 }
 
 /*
  * Set ASPM state.
  * Enable/disable L0s/L1 depend on link state.
  */
-static void atl1c_set_aspm(struct atl1c_hw *hw, bool linkup)
+static void atl1c_set_aspm(struct atl1c_hw *hw, u16 link_speed)
 {
         u32 pm_ctrl_data;
-        u32 link_ctrl_data;
-        u32 link_l1_timer = 0xF;
+        u32 link_l1_timer;
 
         AT_READ_REG(hw, REG_PM_CTRL, &pm_ctrl_data);
-        AT_READ_REG(hw, REG_LINK_CTRL, &link_ctrl_data);
+        pm_ctrl_data &= ~(PM_CTRL_ASPM_L1_EN |
+                          PM_CTRL_ASPM_L0S_EN |
+                          PM_CTRL_MAC_ASPM_CHK);
+        /* L1 timer */
+        if (hw->nic_type == athr_l2c_b2 || hw->nic_type == athr_l1d_2) {
+                pm_ctrl_data &= ~PMCTRL_TXL1_AFTER_L0S;
+                link_l1_timer =
+                        link_speed == SPEED_1000 || link_speed == SPEED_100 ?
+                        L1D_PMCTRL_L1_ENTRY_TM_16US : 1;
+                pm_ctrl_data = FIELD_SETX(pm_ctrl_data,
+                        L1D_PMCTRL_L1_ENTRY_TM, link_l1_timer);
+        } else {
+                link_l1_timer = hw->nic_type == athr_l2c_b ?
+                        L2CB1_PM_CTRL_L1_ENTRY_TM : L1C_PM_CTRL_L1_ENTRY_TM;
+                if (link_speed != SPEED_1000 && link_speed != SPEED_100)
+                        link_l1_timer = 1;
+                pm_ctrl_data = FIELD_SETX(pm_ctrl_data,
+                        PM_CTRL_L1_ENTRY_TIMER, link_l1_timer);
+        }
 
-        pm_ctrl_data &= ~PM_CTRL_SERDES_PD_EX_L1;
-        pm_ctrl_data &=  ~(PM_CTRL_L1_ENTRY_TIMER_MASK <<
-                        PM_CTRL_L1_ENTRY_TIMER_SHIFT);
-        pm_ctrl_data &= ~(PM_CTRL_LCKDET_TIMER_MASK <<
-                        PM_CTRL_LCKDET_TIMER_SHIFT);
-        pm_ctrl_data |= AT_LCKDET_TIMER << PM_CTRL_LCKDET_TIMER_SHIFT;
+        /* L0S/L1 enable */
+        if ((hw->ctrl_flags & ATL1C_ASPM_L0S_SUPPORT) && link_speed != SPEED_0)
+                pm_ctrl_data |= PM_CTRL_ASPM_L0S_EN | PM_CTRL_MAC_ASPM_CHK;
+        if (hw->ctrl_flags & ATL1C_ASPM_L1_SUPPORT)
+                pm_ctrl_data |= PM_CTRL_ASPM_L1_EN | PM_CTRL_MAC_ASPM_CHK;
 
+        /* l2cb & l1d & l2cb2 & l1d2 */
         if (hw->nic_type == athr_l2c_b || hw->nic_type == athr_l1d ||
-                hw->nic_type == athr_l2c_b2 || hw->nic_type == athr_l1d_2) {
-                link_ctrl_data &= ~LINK_CTRL_EXT_SYNC;
-                if (!(hw->ctrl_flags & ATL1C_APS_MODE_ENABLE)) {
-                        if (hw->nic_type == athr_l2c_b && hw->revision_id == L2CB_V10)
-                                link_ctrl_data |= LINK_CTRL_EXT_SYNC;
-                }
-
-                AT_WRITE_REG(hw, REG_LINK_CTRL, link_ctrl_data);
-
-                pm_ctrl_data |= PM_CTRL_RCVR_WT_TIMER;
-                pm_ctrl_data &= ~(PM_CTRL_PM_REQ_TIMER_MASK <<
-                        PM_CTRL_PM_REQ_TIMER_SHIFT);
-                pm_ctrl_data |= AT_ASPM_L1_TIMER <<
-                        PM_CTRL_PM_REQ_TIMER_SHIFT;
-                pm_ctrl_data &= ~PM_CTRL_SA_DLY_EN;
-                pm_ctrl_data &= ~PM_CTRL_HOTRST;
-                pm_ctrl_data |= 1 << PM_CTRL_L1_ENTRY_TIMER_SHIFT;
-                pm_ctrl_data |= PM_CTRL_SERDES_PD_EX_L1;
-        }
-        pm_ctrl_data |= PM_CTRL_MAC_ASPM_CHK;
-        if (linkup) {
-                pm_ctrl_data &= ~PM_CTRL_ASPM_L1_EN;
-                pm_ctrl_data &= ~PM_CTRL_ASPM_L0S_EN;
-                if (hw->ctrl_flags & ATL1C_ASPM_L1_SUPPORT)
-                        pm_ctrl_data |= PM_CTRL_ASPM_L1_EN;
-                if (hw->ctrl_flags & ATL1C_ASPM_L0S_SUPPORT)
-                        pm_ctrl_data |= PM_CTRL_ASPM_L0S_EN;
-
-                if (hw->nic_type == athr_l2c_b || hw->nic_type == athr_l1d ||
-                        hw->nic_type == athr_l2c_b2 || hw->nic_type == athr_l1d_2) {
-                        if (hw->nic_type == athr_l2c_b)
-                                if (!(hw->ctrl_flags & ATL1C_APS_MODE_ENABLE))
-                                        pm_ctrl_data &= ~PM_CTRL_ASPM_L0S_EN;
-                        pm_ctrl_data &= ~PM_CTRL_SERDES_L1_EN;
-                        pm_ctrl_data &= ~PM_CTRL_SERDES_PLL_L1_EN;
-                        pm_ctrl_data &= ~PM_CTRL_SERDES_BUDS_RX_L1_EN;
-                        pm_ctrl_data |= PM_CTRL_CLK_SWH_L1;
-                if (hw->adapter->link_speed == SPEED_100 ||
-                                hw->adapter->link_speed == SPEED_1000) {
-                                pm_ctrl_data &=  ~(PM_CTRL_L1_ENTRY_TIMER_MASK <<
-                                        PM_CTRL_L1_ENTRY_TIMER_SHIFT);
-                                if (hw->nic_type == athr_l2c_b)
-                                        link_l1_timer = 7;
-                                else if (hw->nic_type == athr_l2c_b2 ||
-                                        hw->nic_type == athr_l1d_2)
-                                        link_l1_timer = 4;
-                                pm_ctrl_data |= link_l1_timer <<
-                                        PM_CTRL_L1_ENTRY_TIMER_SHIFT;
-                        }
-                } else {
-                        pm_ctrl_data |= PM_CTRL_SERDES_L1_EN;
-                        pm_ctrl_data |= PM_CTRL_SERDES_PLL_L1_EN;
-                        pm_ctrl_data |= PM_CTRL_SERDES_BUDS_RX_L1_EN;
-                        pm_ctrl_data &= ~PM_CTRL_CLK_SWH_L1;
+            hw->nic_type == athr_l2c_b2 || hw->nic_type == athr_l1d_2) {
+                pm_ctrl_data = FIELD_SETX(pm_ctrl_data,
+                        PM_CTRL_PM_REQ_TIMER, PM_CTRL_PM_REQ_TO_DEF);
+                pm_ctrl_data |= PM_CTRL_RCVR_WT_TIMER |
+                                PM_CTRL_SERDES_PD_EX_L1 |
+                                PM_CTRL_CLK_SWH_L1;
+                pm_ctrl_data &= ~(PM_CTRL_SERDES_L1_EN |
+                                  PM_CTRL_SERDES_PLL_L1_EN |
+                                  PM_CTRL_SERDES_BUFS_RX_L1_EN |
+                                  PM_CTRL_SA_DLY_EN |
+                                  PM_CTRL_HOTRST);
+                /* disable l0s if link down or l2cb */
+                if (link_speed == SPEED_0 || hw->nic_type == athr_l2c_b)
                         pm_ctrl_data &= ~PM_CTRL_ASPM_L0S_EN;
-                        pm_ctrl_data &= ~PM_CTRL_ASPM_L1_EN;
-
+        } else { /* l1c */
+                pm_ctrl_data =
+                        FIELD_SETX(pm_ctrl_data, PM_CTRL_L1_ENTRY_TIMER, 0);
+                if (link_speed != SPEED_0) {
+                        pm_ctrl_data |= PM_CTRL_SERDES_L1_EN |
+                                        PM_CTRL_SERDES_PLL_L1_EN |
+                                        PM_CTRL_SERDES_BUFS_RX_L1_EN;
+                        pm_ctrl_data &= ~(PM_CTRL_SERDES_PD_EX_L1 |
+                                          PM_CTRL_CLK_SWH_L1 |
+                                          PM_CTRL_ASPM_L0S_EN |
+                                          PM_CTRL_ASPM_L1_EN);
+                } else { /* link down */
+                        pm_ctrl_data |= PM_CTRL_CLK_SWH_L1;
+                        pm_ctrl_data &= ~(PM_CTRL_SERDES_L1_EN |
+                                          PM_CTRL_SERDES_PLL_L1_EN |
+                                          PM_CTRL_SERDES_BUFS_RX_L1_EN |
+                                          PM_CTRL_ASPM_L0S_EN);
                 }
-        } else {
-                pm_ctrl_data &= ~PM_CTRL_SERDES_L1_EN;
-                pm_ctrl_data &= ~PM_CTRL_ASPM_L0S_EN;
-                pm_ctrl_data &= ~PM_CTRL_SERDES_PLL_L1_EN;
-                pm_ctrl_data |= PM_CTRL_CLK_SWH_L1;
-
-                if (hw->ctrl_flags & ATL1C_ASPM_L1_SUPPORT)
-                        pm_ctrl_data |= PM_CTRL_ASPM_L1_EN;
-                else
-                        pm_ctrl_data &= ~PM_CTRL_ASPM_L1_EN;
         }
         AT_WRITE_REG(hw, REG_PM_CTRL, pm_ctrl_data);
 
         return;
 }
 
-static void atl1c_setup_mac_ctrl(struct atl1c_adapter *adapter)
-{
-        struct atl1c_hw *hw = &adapter->hw;
-        struct net_device *netdev = adapter->netdev;
-        u32 mac_ctrl_data;
-
-        mac_ctrl_data = MAC_CTRL_TX_EN | MAC_CTRL_RX_EN;
-        mac_ctrl_data |= (MAC_CTRL_TX_FLOW | MAC_CTRL_RX_FLOW);
-
-        if (adapter->link_duplex == FULL_DUPLEX) {
-                hw->mac_duplex = true;
-                mac_ctrl_data |= MAC_CTRL_DUPLX;
-        }
-
-        if (adapter->link_speed == SPEED_1000)
-                hw->mac_speed = atl1c_mac_speed_1000;
-        else
-                hw->mac_speed = atl1c_mac_speed_10_100;
-
-        mac_ctrl_data |= (hw->mac_speed & MAC_CTRL_SPEED_MASK) <<
-                        MAC_CTRL_SPEED_SHIFT;
-
-        mac_ctrl_data |= (MAC_CTRL_ADD_CRC | MAC_CTRL_PAD);
-        mac_ctrl_data |= ((hw->preamble_len & MAC_CTRL_PRMLEN_MASK) <<
-                        MAC_CTRL_PRMLEN_SHIFT);
-
-        __atl1c_vlan_mode(netdev->features, &mac_ctrl_data);
-
-        mac_ctrl_data |= MAC_CTRL_BC_EN;
-        if (netdev->flags & IFF_PROMISC)
-                mac_ctrl_data |= MAC_CTRL_PROMIS_EN;
-        if (netdev->flags & IFF_ALLMULTI)
-                mac_ctrl_data |= MAC_CTRL_MC_ALL_EN;
-
-        mac_ctrl_data |= MAC_CTRL_SINGLE_PAUSE_EN;
-        if (hw->nic_type == athr_l1d || hw->nic_type == athr_l2c_b2 ||
-            hw->nic_type == athr_l1d_2) {
-                mac_ctrl_data |= MAC_CTRL_SPEED_MODE_SW;
-                mac_ctrl_data |= MAC_CTRL_HASH_ALG_CRC32;
-        }
-        AT_WRITE_REG(hw, REG_MAC_CTRL, mac_ctrl_data);
-}
-
 /*
  * atl1c_configure - Configure Transmit&Receive Unit after Reset
  * @adapter: board private structure
  *
  * Configure the Tx /Rx unit of the MAC after a reset.
  */
-static int atl1c_configure(struct atl1c_adapter *adapter)
+static int atl1c_configure_mac(struct atl1c_adapter *adapter)
 {
         struct atl1c_hw *hw = &adapter->hw;
         u32 master_ctrl_data = 0;
         u32 intr_modrt_data;
         u32 data;
 
+        AT_READ_REG(hw, REG_MASTER_CTRL, &master_ctrl_data);
+        master_ctrl_data &= ~(MASTER_CTRL_TX_ITIMER_EN |
+                              MASTER_CTRL_RX_ITIMER_EN |
+                              MASTER_CTRL_INT_RDCLR);
         /* clear interrupt status */
         AT_WRITE_REG(hw, REG_ISR, 0xFFFFFFFF);
         /*  Clear any WOL status */
@@ -1525,30 +1418,39 @@ static int atl1c_configure(struct atl1c_adapter *adapter)
         master_ctrl_data |= MASTER_CTRL_SA_TIMER_EN;
         AT_WRITE_REG(hw, REG_MASTER_CTRL, master_ctrl_data);
 
-        if (hw->ctrl_flags & ATL1C_CMB_ENABLE) {
-                AT_WRITE_REG(hw, REG_CMB_TPD_THRESH,
-                        hw->cmb_tpd & CMB_TPD_THRESH_MASK);
-                AT_WRITE_REG(hw, REG_CMB_TX_TIMER,
-                        hw->cmb_tx_timer & CMB_TX_TIMER_MASK);
-        }
+        AT_WRITE_REG(hw, REG_SMB_STAT_TIMER,
+                hw->smb_timer & SMB_STAT_TIMER_MASK);
 
-        if (hw->ctrl_flags & ATL1C_SMB_ENABLE)
-                AT_WRITE_REG(hw, REG_SMB_STAT_TIMER,
-                        hw->smb_timer & SMB_STAT_TIMER_MASK);
         /* set MTU */
         AT_WRITE_REG(hw, REG_MTU, hw->max_frame_size + ETH_HLEN +
                         VLAN_HLEN + ETH_FCS_LEN);
-        /* HDS, disable */
-        AT_WRITE_REG(hw, REG_HDS_CTRL, 0);
 
         atl1c_configure_tx(adapter);
         atl1c_configure_rx(adapter);
-        atl1c_configure_rss(adapter);
         atl1c_configure_dma(adapter);
 
         return 0;
 }
 
+static int atl1c_configure(struct atl1c_adapter *adapter)
+{
+        struct net_device *netdev = adapter->netdev;
+        int num;
+
+        atl1c_init_ring_ptrs(adapter);
+        atl1c_set_multi(netdev);
+        atl1c_restore_vlan(adapter);
+
+        num = atl1c_alloc_rx_buffer(adapter);
+        if (unlikely(num == 0))
+                return -ENOMEM;
+
+        if (atl1c_configure_mac(adapter))
+                return -EIO;
+
+        return 0;
+}
+
 static void atl1c_update_hw_stats(struct atl1c_adapter *adapter)
 {
         u16 hw_reg_addr = 0;
@@ -1635,16 +1537,11 @@ static bool atl1c_clean_tx_irq(struct atl1c_adapter *adapter,
         struct pci_dev *pdev = adapter->pdev;
         u16 next_to_clean = atomic_read(&tpd_ring->next_to_clean);
         u16 hw_next_to_clean;
-        u16 shift;
-        u32 data;
+        u16 reg;
 
-        if (type == atl1c_trans_high)
-                shift = MB_HTPD_CONS_IDX_SHIFT;
-        else
-                shift = MB_NTPD_CONS_IDX_SHIFT;
+        reg = type == atl1c_trans_high ? REG_TPD_PRI1_CIDX : REG_TPD_PRI0_CIDX;
 
-        AT_READ_REG(&adapter->hw, REG_MB_PRIO_CONS_IDX, &data);
-        hw_next_to_clean = (data >> shift) & MB_PRIO_PROD_IDX_MASK;
+        AT_READ_REGW(&adapter->hw, reg, &hw_next_to_clean);
 
         while (next_to_clean != hw_next_to_clean) {
                 buffer_info = &tpd_ring->buffer_info[next_to_clean];
@@ -1746,9 +1643,9 @@ static inline void atl1c_rx_checksum(struct atl1c_adapter *adapter,
         skb_checksum_none_assert(skb);
 }
 
-static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter, const int ringid)
+static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter)
 {
-        struct atl1c_rfd_ring *rfd_ring = &adapter->rfd_ring[ringid];
+        struct atl1c_rfd_ring *rfd_ring = &adapter->rfd_ring;
         struct pci_dev *pdev = adapter->pdev;
         struct atl1c_buffer *buffer_info, *next_info;
         struct sk_buff *skb;
@@ -1800,7 +1697,7 @@ static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter, const int ringid
                 /* TODO: update mailbox here */
                 wmb();
                 rfd_ring->next_to_use = rfd_next_to_use;
-                AT_WRITE_REG(&adapter->hw, atl1c_rfd_prod_idx_regs[ringid],
+                AT_WRITE_REG(&adapter->hw, REG_MB_RFD0_PROD_IDX,
                         rfd_ring->next_to_use & MB_RFDX_PROD_IDX_MASK);
         }
 
@@ -1839,7 +1736,7 @@ static void atl1c_clean_rfd(struct atl1c_rfd_ring *rfd_ring,
         rfd_ring->next_to_clean = rfd_index;
 }
 
-static void atl1c_clean_rx_irq(struct atl1c_adapter *adapter, u8 que,
+static void atl1c_clean_rx_irq(struct atl1c_adapter *adapter,
                    int *work_done, int work_to_do)
 {
         u16 rfd_num, rfd_index;
@@ -1847,8 +1744,8 @@ static void atl1c_clean_rx_irq(struct atl1c_adapter *adapter, u8 que,
         u16 length;
         struct pci_dev *pdev = adapter->pdev;
         struct net_device *netdev  = adapter->netdev;
-        struct atl1c_rfd_ring *rfd_ring = &adapter->rfd_ring[que];
-        struct atl1c_rrd_ring *rrd_ring = &adapter->rrd_ring[que];
+        struct atl1c_rfd_ring *rfd_ring = &adapter->rfd_ring;
+        struct atl1c_rrd_ring *rrd_ring = &adapter->rrd_ring;
         struct sk_buff *skb;
         struct atl1c_recv_ret_status *rrs;
         struct atl1c_buffer *buffer_info;
@@ -1914,7 +1811,7 @@ rrs_checked:
                 count++;
         }
         if (count)
-                atl1c_alloc_rx_buffer(adapter, que);
+                atl1c_alloc_rx_buffer(adapter);
 }
 
 /*
@@ -1931,7 +1828,7 @@ static int atl1c_clean(struct napi_struct *napi, int budget)
         if (!netif_carrier_ok(adapter->netdev))
                 goto quit_polling;
         /* just enable one RXQ */
-        atl1c_clean_rx_irq(adapter, 0, &work_done, budget);
+        atl1c_clean_rx_irq(adapter, &work_done, budget);
 
         if (work_done < budget) {
 quit_polling:
@@ -2206,23 +2103,10 @@ static void atl1c_tx_queue(struct atl1c_adapter *adapter, struct sk_buff *skb,
                            struct atl1c_tpd_desc *tpd, enum atl1c_trans_queue type)
 {
         struct atl1c_tpd_ring *tpd_ring = &adapter->tpd_ring[type];
-        u32 prod_data;
+        u16 reg;
 
-        AT_READ_REG(&adapter->hw, REG_MB_PRIO_PROD_IDX, &prod_data);
-        switch (type) {
-        case atl1c_trans_high:
-                prod_data &= 0xFFFF0000;
-                prod_data |= tpd_ring->next_to_use & 0xFFFF;
-                break;
-        case atl1c_trans_normal:
-                prod_data &= 0x0000FFFF;
-                prod_data |= (tpd_ring->next_to_use & 0xFFFF) << 16;
-                break;
-        default:
-                break;
-        }
-        wmb();
-        AT_WRITE_REG(&adapter->hw, REG_MB_PRIO_PROD_IDX, prod_data);
+        reg = type == atl1c_trans_high ? REG_TPD_PRI1_PIDX : REG_TPD_PRI0_PIDX;
+        AT_WRITE_REGW(&adapter->hw, reg, tpd_ring->next_to_use);
 }
 
 static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb,
@@ -2307,8 +2191,7 @@ static int atl1c_request_irq(struct atl1c_adapter *adapter)
                                 "Unable to allocate MSI interrupt Error: %d\n",
                                 err);
                 adapter->have_msi = false;
-        } else
-                netdev->irq = pdev->irq;
+        }
 
         if (!adapter->have_msi)
                 flags |= IRQF_SHARED;
@@ -2328,44 +2211,38 @@ static int atl1c_request_irq(struct atl1c_adapter *adapter)
         return err;
 }
 
+
+static void atl1c_reset_dma_ring(struct atl1c_adapter *adapter)
+{
+        /* release tx-pending skbs and reset tx/rx ring index */
+        atl1c_clean_tx_ring(adapter, atl1c_trans_normal);
+        atl1c_clean_tx_ring(adapter, atl1c_trans_high);
+        atl1c_clean_rx_ring(adapter);
+}
+
 static int atl1c_up(struct atl1c_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
-        int num;
         int err;
-        int i;
 
         netif_carrier_off(netdev);
-        atl1c_init_ring_ptrs(adapter);
-        atl1c_set_multi(netdev);
-        atl1c_restore_vlan(adapter);
 
-        for (i = 0; i < adapter->num_rx_queues; i++) {
-                num = atl1c_alloc_rx_buffer(adapter, i);
-                if (unlikely(num == 0)) {
-                        err = -ENOMEM;
-                        goto err_alloc_rx;
-                }
-        }
-
-        if (atl1c_configure(adapter)) {
-                err = -EIO;
+        err = atl1c_configure(adapter);
+        if (unlikely(err))
                 goto err_up;
-        }
 
         err = atl1c_request_irq(adapter);
         if (unlikely(err))
                 goto err_up;
 
+        atl1c_check_link_status(adapter);
         clear_bit(__AT_DOWN, &adapter->flags);
         napi_enable(&adapter->napi);
         atl1c_irq_enable(adapter);
-        atl1c_check_link_status(adapter);
         netif_start_queue(netdev);
         return err;
 
 err_up:
-err_alloc_rx:
         atl1c_clean_rx_ring(adapter);
         return err;
 }
@@ -2383,15 +2260,15 @@ static void atl1c_down(struct atl1c_adapter *adapter)
         napi_disable(&adapter->napi);
         atl1c_irq_disable(adapter);
         atl1c_free_irq(adapter);
+        /* disable ASPM if device inactive */
+        atl1c_disable_l0s_l1(&adapter->hw);
         /* reset MAC to disable all RX/TX */
         atl1c_reset_mac(&adapter->hw);
         msleep(1);
 
         adapter->link_speed = SPEED_0;
         adapter->link_duplex = -1;
-        atl1c_clean_tx_ring(adapter, atl1c_trans_normal);
-        atl1c_clean_tx_ring(adapter, atl1c_trans_high);
-        atl1c_clean_rx_ring(adapter);
+        atl1c_reset_dma_ring(adapter);
 }
 
 /*
@@ -2424,13 +2301,6 @@ static int atl1c_open(struct net_device *netdev)
         if (unlikely(err))
                 goto err_up;
 
-        if (adapter->hw.ctrl_flags & ATL1C_FPGA_VERSION) {
-                u32 phy_data;
-
-                AT_READ_REG(&adapter->hw, REG_MDIO_CTRL, &phy_data);
-                phy_data |= MDIO_AP_EN;
-                AT_WRITE_REG(&adapter->hw, REG_MDIO_CTRL, phy_data);
-        }
         return 0;
 
 err_up:
@@ -2456,6 +2326,8 @@ static int atl1c_close(struct net_device *netdev)
         struct atl1c_adapter *adapter = netdev_priv(netdev);
 
         WARN_ON(test_bit(__AT_RESETTING, &adapter->flags));
+        set_bit(__AT_DOWN, &adapter->flags);
+        cancel_work_sync(&adapter->common_task);
         atl1c_down(adapter);
         atl1c_free_ring_resources(adapter);
         return 0;
@@ -2467,10 +2339,6 @@ static int atl1c_suspend(struct device *dev)
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct atl1c_adapter *adapter = netdev_priv(netdev);
         struct atl1c_hw *hw = &adapter->hw;
-        u32 mac_ctrl_data = 0;
-        u32 master_ctrl_data = 0;
-        u32 wol_ctrl_data = 0;
-        u16 mii_intr_status_data = 0;
         u32 wufc = adapter->wol;
 
         atl1c_disable_l0s_l1(hw);
@@ -2481,75 +2349,10 @@ static int atl1c_suspend(struct device *dev)
         netif_device_detach(netdev);
 
         if (wufc)
-                if (atl1c_phy_power_saving(hw) != 0)
+                if (atl1c_phy_to_ps_link(hw) != 0)
                         dev_dbg(&pdev->dev, "phy power saving failed");
 
-        AT_READ_REG(hw, REG_MASTER_CTRL, &master_ctrl_data);
-        AT_READ_REG(hw, REG_MAC_CTRL, &mac_ctrl_data);
-
-        master_ctrl_data &= ~MASTER_CTRL_CLK_SEL_DIS;
-        mac_ctrl_data &= ~(MAC_CTRL_PRMLEN_MASK << MAC_CTRL_PRMLEN_SHIFT);
-        mac_ctrl_data |= (((u32)adapter->hw.preamble_len &
-                        MAC_CTRL_PRMLEN_MASK) <<
-                        MAC_CTRL_PRMLEN_SHIFT);
-        mac_ctrl_data &= ~(MAC_CTRL_SPEED_MASK << MAC_CTRL_SPEED_SHIFT);
-        mac_ctrl_data &= ~MAC_CTRL_DUPLX;
-
-        if (wufc) {
-                mac_ctrl_data |= MAC_CTRL_RX_EN;
-                if (adapter->link_speed == SPEED_1000 ||
-                        adapter->link_speed == SPEED_0) {
-                        mac_ctrl_data |= atl1c_mac_speed_1000 <<
-                                        MAC_CTRL_SPEED_SHIFT;
-                        mac_ctrl_data |= MAC_CTRL_DUPLX;
-                } else
-                        mac_ctrl_data |= atl1c_mac_speed_10_100 <<
-                                        MAC_CTRL_SPEED_SHIFT;
-
-                if (adapter->link_duplex == DUPLEX_FULL)
-                        mac_ctrl_data |= MAC_CTRL_DUPLX;
-
-                /* turn on magic packet wol */
-                if (wufc & AT_WUFC_MAG)
-                        wol_ctrl_data |= WOL_MAGIC_EN | WOL_MAGIC_PME_EN;
-
-                if (wufc & AT_WUFC_LNKC) {
-                        wol_ctrl_data |=  WOL_LINK_CHG_EN | WOL_LINK_CHG_PME_EN;
-                        /* only link up can wake up */
-                        if (atl1c_write_phy_reg(hw, MII_IER, IER_LINK_UP) != 0) {
-                                dev_dbg(&pdev->dev, "%s: read write phy "
-                                                  "register failed.\n",
-                                                  atl1c_driver_name);
-                        }
-                }
-                /* clear phy interrupt */
-                atl1c_read_phy_reg(hw, MII_ISR, &mii_intr_status_data);
-                /* Config MAC Ctrl register */
-                __atl1c_vlan_mode(netdev->features, &mac_ctrl_data);
-
-                /* magic packet maybe Broadcast&multicast&Unicast frame */
-                if (wufc & AT_WUFC_MAG)
-                        mac_ctrl_data |= MAC_CTRL_BC_EN;
-
-                dev_dbg(&pdev->dev,
-                        "%s: suspend MAC=0x%x\n",
-                        atl1c_driver_name, mac_ctrl_data);
-                AT_WRITE_REG(hw, REG_MASTER_CTRL, master_ctrl_data);
-                AT_WRITE_REG(hw, REG_WOL_CTRL, wol_ctrl_data);
-                AT_WRITE_REG(hw, REG_MAC_CTRL, mac_ctrl_data);
-
-                AT_WRITE_REG(hw, REG_GPHY_CTRL, GPHY_CTRL_DEFAULT |
-                        GPHY_CTRL_EXT_RESET);
-        } else {
-                AT_WRITE_REG(hw, REG_GPHY_CTRL, GPHY_CTRL_POWER_SAVING);
-                master_ctrl_data |= MASTER_CTRL_CLK_SEL_DIS;
-                mac_ctrl_data |= atl1c_mac_speed_10_100 << MAC_CTRL_SPEED_SHIFT;
-                mac_ctrl_data |= MAC_CTRL_DUPLX;
-                AT_WRITE_REG(hw, REG_MASTER_CTRL, master_ctrl_data);
-                AT_WRITE_REG(hw, REG_MAC_CTRL, mac_ctrl_data);
-                AT_WRITE_REG(hw, REG_WOL_CTRL, 0);
-                hw->phy_configured = false; /* re-init PHY when resume */
-        }
+        atl1c_power_saving(hw, wufc);
 
         return 0;
 }
@@ -2562,8 +2365,7 @@ static int atl1c_resume(struct device *dev)
         struct atl1c_adapter *adapter = netdev_priv(netdev);
 
         AT_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0);
-        atl1c_reset_pcie(&adapter->hw, ATL1C_PCIE_L0S_L1_DISABLE |
-                        ATL1C_PCIE_PHY_RESET);
+        atl1c_reset_pcie(&adapter->hw, ATL1C_PCIE_L0S_L1_DISABLE);
 
         atl1c_phy_reset(&adapter->hw);
         atl1c_reset_mac(&adapter->hw);
@@ -2616,7 +2418,6 @@ static int atl1c_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
         SET_NETDEV_DEV(netdev, &pdev->dev);
         pci_set_drvdata(pdev, netdev);
 
-        netdev->irq  = pdev->irq;
         netdev->netdev_ops = &atl1c_netdev_ops;
         netdev->watchdog_timeo = AT_TX_WATCHDOG;
         atl1c_set_ethtool_ops(netdev);
@@ -2706,14 +2507,13 @@ static int __devinit atl1c_probe(struct pci_dev *pdev,
                 dev_err(&pdev->dev, "cannot map device registers\n");
                 goto err_ioremap;
         }
-        netdev->base_addr = (unsigned long)adapter->hw.hw_addr;
 
         /* init mii data */
         adapter->mii.dev = netdev;
         adapter->mii.mdio_read  = atl1c_mdio_read;
         adapter->mii.mdio_write = atl1c_mdio_write;
         adapter->mii.phy_id_mask = 0x1f;
-        adapter->mii.reg_num_mask = MDIO_REG_ADDR_MASK;
+        adapter->mii.reg_num_mask = MDIO_CTRL_REG_MASK;
         netif_napi_add(netdev, &adapter->napi, atl1c_clean, 64);
         setup_timer(&adapter->phy_config_timer, atl1c_phy_config,
                         (unsigned long)adapter);
@@ -2723,8 +2523,7 @@ static int __devinit atl1c_probe(struct pci_dev *pdev,
                 dev_err(&pdev->dev, "net device private data init failed\n");
                 goto err_sw_init;
         }
-        atl1c_reset_pcie(&adapter->hw, ATL1C_PCIE_L0S_L1_DISABLE |
-                        ATL1C_PCIE_PHY_RESET);
+        atl1c_reset_pcie(&adapter->hw, ATL1C_PCIE_L0S_L1_DISABLE);
 
         /* Init GPHY as early as possible due to power saving issue  */
         atl1c_phy_reset(&adapter->hw);
@@ -2752,7 +2551,7 @@ static int __devinit atl1c_probe(struct pci_dev *pdev,
                 dev_dbg(&pdev->dev, "mac address : %pM\n",
                         adapter->hw.mac_addr);
 
-        atl1c_hw_set_mac_addr(&adapter->hw);
+        atl1c_hw_set_mac_addr(&adapter->hw, adapter->hw.mac_addr);
         INIT_WORK(&adapter->common_task, atl1c_common_task);
         adapter->work_event = 0;
         err = register_netdev(netdev);
@@ -2796,6 +2595,8 @@ static void __devexit atl1c_remove(struct pci_dev *pdev)
         struct atl1c_adapter *adapter = netdev_priv(netdev);
 
         unregister_netdev(netdev);
+        /* restore permanent address */
+        atl1c_hw_set_mac_addr(&adapter->hw, adapter->hw.perm_mac_addr);
         atl1c_phy_disable(&adapter->hw);
 
         iounmap(adapter->hw.hw_addr);
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
index 93ff2b231284..1220e511ced6 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
@@ -1883,27 +1883,24 @@ static int atl1e_request_irq(struct atl1e_adapter *adapter)
         int err = 0;
 
         adapter->have_msi = true;
-        err = pci_enable_msi(adapter->pdev);
+        err = pci_enable_msi(pdev);
         if (err) {
-                netdev_dbg(adapter->netdev,
+                netdev_dbg(netdev,
                            "Unable to allocate MSI interrupt Error: %d\n", err);
                 adapter->have_msi = false;
-        } else
-                netdev->irq = pdev->irq;
-
+        }
 
         if (!adapter->have_msi)
                 flags |= IRQF_SHARED;
-        err = request_irq(adapter->pdev->irq, atl1e_intr, flags,
-                        netdev->name, netdev);
+        err = request_irq(pdev->irq, atl1e_intr, flags, netdev->name, netdev);
         if (err) {
                 netdev_dbg(adapter->netdev,
                            "Unable to allocate interrupt Error: %d\n", err);
                 if (adapter->have_msi)
-                        pci_disable_msi(adapter->pdev);
+                        pci_disable_msi(pdev);
                 return err;
         }
-        netdev_dbg(adapter->netdev, "atl1e_request_irq OK\n");
+        netdev_dbg(netdev, "atl1e_request_irq OK\n");
         return err;
 }
 
@@ -2233,7 +2230,6 @@ static int atl1e_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
         SET_NETDEV_DEV(netdev, &pdev->dev);
         pci_set_drvdata(pdev, netdev);
 
-        netdev->irq  = pdev->irq;
         netdev->netdev_ops = &atl1e_netdev_ops;
 
         netdev->watchdog_timeo = AT_TX_WATCHDOG;
@@ -2319,7 +2315,6 @@ static int __devinit atl1e_probe(struct pci_dev *pdev,
                 netdev_err(netdev, "cannot map device registers\n");
                 goto err_ioremap;
         }
-        netdev->base_addr = (unsigned long)adapter->hw.hw_addr;
 
         /* init mii data */
         adapter->mii.dev = netdev;
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index 40ac41436549..5d10884e5080 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -266,7 +266,7 @@ static s32 atl1_reset_hw(struct atl1_hw *hw)
          * interrupts & Clear any pending interrupt events
          */
         /*
-         * iowrite32(0, hw->hw_addr + REG_IMR);
+         * atlx_irq_disable(adapter);
          * iowrite32(0xffffffff, hw->hw_addr + REG_ISR);
          */
 
@@ -1917,7 +1917,7 @@ next:
         return num_alloc;
 }
 
-static void atl1_intr_rx(struct atl1_adapter *adapter)
+static int atl1_intr_rx(struct atl1_adapter *adapter, int budget)
 {
         int i, count;
         u16 length;
@@ -1933,7 +1933,7 @@ static void atl1_intr_rx(struct atl1_adapter *adapter)
 
         rrd_next_to_clean = atomic_read(&rrd_ring->next_to_clean);
 
-        while (1) {
+        while (count < budget) {
                 rrd = ATL1_RRD_DESC(rrd_ring, rrd_next_to_clean);
                 i = 1;
                 if (likely(rrd->xsz.valid)) {   /* packet valid */
@@ -2032,7 +2032,7 @@ rrd_ok:
 
                         __vlan_hwaccel_put_tag(skb, vlan_tag);
                 }
-                netif_rx(skb);
+                netif_receive_skb(skb);
 
                 /* let protocol layer free skb */
                 buffer_info->skb = NULL;
@@ -2065,14 +2065,17 @@ rrd_ok:
                 iowrite32(value, adapter->hw.hw_addr + REG_MAILBOX);
                 spin_unlock(&adapter->mb_lock);
         }
+
+        return count;
 }
 
-static void atl1_intr_tx(struct atl1_adapter *adapter)
+static int atl1_intr_tx(struct atl1_adapter *adapter)
 {
         struct atl1_tpd_ring *tpd_ring = &adapter->tpd_ring;
         struct atl1_buffer *buffer_info;
         u16 sw_tpd_next_to_clean;
         u16 cmb_tpd_next_to_clean;
+        int count = 0;
 
         sw_tpd_next_to_clean = atomic_read(&tpd_ring->next_to_clean);
         cmb_tpd_next_to_clean = le16_to_cpu(adapter->cmb.cmb->tpd_cons_idx);
@@ -2092,12 +2095,16 @@ static void atl1_intr_tx(struct atl1_adapter *adapter)
 
                 if (++sw_tpd_next_to_clean == tpd_ring->count)
                         sw_tpd_next_to_clean = 0;
+
+                count++;
         }
         atomic_set(&tpd_ring->next_to_clean, sw_tpd_next_to_clean);
 
         if (netif_queue_stopped(adapter->netdev) &&
             netif_carrier_ok(adapter->netdev))
                 netif_wake_queue(adapter->netdev);
+
+        return count;
 }
 
 static u16 atl1_tpd_avail(struct atl1_tpd_ring *tpd_ring)
@@ -2439,6 +2446,49 @@ static netdev_tx_t atl1_xmit_frame(struct sk_buff *skb,
         return NETDEV_TX_OK;
 }
 
+static int atl1_rings_clean(struct napi_struct *napi, int budget)
+{
+        struct atl1_adapter *adapter = container_of(napi, struct atl1_adapter, napi);
+        int work_done = atl1_intr_rx(adapter, budget);
+
+        if (atl1_intr_tx(adapter))
+                work_done = budget;
+
+        /* Let's come again to process some more packets */
+        if (work_done >= budget)
+                return work_done;
+
+        napi_complete(napi);
+        /* re-enable Interrupt */
+        if (likely(adapter->int_enabled))
+                atlx_imr_set(adapter, IMR_NORMAL_MASK);
+        return work_done;
+}
+
+static inline int atl1_sched_rings_clean(struct atl1_adapter* adapter)
+{
+        if (!napi_schedule_prep(&adapter->napi))
+                /* It is possible in case even the RX/TX ints are disabled via IMR
+                 * register the ISR bits are set anyway (but do not produce IRQ).
+                 * To handle such situation the napi functions used to check is
+                 * something scheduled or not.
+                 */
+                return 0;
+
+        __napi_schedule(&adapter->napi);
+
+        /*
+         * Disable RX/TX ints via IMR register if it is
+         * allowed. NAPI handler must reenable them in same
+         * way.
+         */
+        if (!adapter->int_enabled)
+                return 1;
+
+        atlx_imr_set(adapter, IMR_NORXTX_MASK);
+        return 1;
+}
+
 /*
  * atl1_intr - Interrupt Handler
  * @irq: interrupt number
@@ -2449,78 +2499,74 @@ static irqreturn_t atl1_intr(int irq, void *data)
 {
         struct atl1_adapter *adapter = netdev_priv(data);
         u32 status;
-        int max_ints = 10;
 
         status = adapter->cmb.cmb->int_stats;
         if (!status)
                 return IRQ_NONE;
 
-        do {
-                /* clear CMB interrupt status at once */
-                adapter->cmb.cmb->int_stats = 0;
-
-                if (status & ISR_GPHY)  /* clear phy status */
-                        atlx_clear_phy_int(adapter);
+        /* clear CMB interrupt status at once,
+         * but leave rx/tx interrupt status in case it should be dropped
+         * only if rx/tx processing queued. In other case interrupt
+         * can be lost.
+         */
+        adapter->cmb.cmb->int_stats = status & (ISR_CMB_TX | ISR_CMB_RX);
 
-                /* clear ISR status, and Enable CMB DMA/Disable Interrupt */
-                iowrite32(status | ISR_DIS_INT, adapter->hw.hw_addr + REG_ISR);
+        if (status & ISR_GPHY)  /* clear phy status */
+                atlx_clear_phy_int(adapter);
 
-                /* check if SMB intr */
-                if (status & ISR_SMB)
-                        atl1_inc_smb(adapter);
+        /* clear ISR status, and Enable CMB DMA/Disable Interrupt */
+        iowrite32(status | ISR_DIS_INT, adapter->hw.hw_addr + REG_ISR);
 
-                /* check if PCIE PHY Link down */
-                if (status & ISR_PHY_LINKDOWN) {
-                        if (netif_msg_intr(adapter))
-                                dev_printk(KERN_DEBUG, &adapter->pdev->dev,
-                                        "pcie phy link down %x\n", status);
-                        if (netif_running(adapter->netdev)) {   /* reset MAC */
-                                iowrite32(0, adapter->hw.hw_addr + REG_IMR);
-                                schedule_work(&adapter->pcie_dma_to_rst_task);
-                                return IRQ_HANDLED;
-                        }
-                }
+        /* check if SMB intr */
+        if (status & ISR_SMB)
+                atl1_inc_smb(adapter);
 
-                /* check if DMA read/write error ? */
-                if (status & (ISR_DMAR_TO_RST | ISR_DMAW_TO_RST)) {
-                        if (netif_msg_intr(adapter))
-                                dev_printk(KERN_DEBUG, &adapter->pdev->dev,
-                                        "pcie DMA r/w error (status = 0x%x)\n",
-                                        status);
-                        iowrite32(0, adapter->hw.hw_addr + REG_IMR);
-                        schedule_work(&adapter->pcie_dma_to_rst_task);
+        /* check if PCIE PHY Link down */
+        if (status & ISR_PHY_LINKDOWN) {
+                if (netif_msg_intr(adapter))
+                        dev_printk(KERN_DEBUG, &adapter->pdev->dev,
+                                "pcie phy link down %x\n", status);
+                if (netif_running(adapter->netdev)) {   /* reset MAC */
+                        atlx_irq_disable(adapter);
+                        schedule_work(&adapter->reset_dev_task);
                         return IRQ_HANDLED;
                 }
+        }
 
-                /* link event */
-                if (status & ISR_GPHY) {
-                        adapter->soft_stats.tx_carrier_errors++;
-                        atl1_check_for_link(adapter);
-                }
+        /* check if DMA read/write error ? */
+        if (status & (ISR_DMAR_TO_RST | ISR_DMAW_TO_RST)) {
+                if (netif_msg_intr(adapter))
+                        dev_printk(KERN_DEBUG, &adapter->pdev->dev,
+                                "pcie DMA r/w error (status = 0x%x)\n",
+                                status);
+                atlx_irq_disable(adapter);
+                schedule_work(&adapter->reset_dev_task);
+                return IRQ_HANDLED;
+        }
 
-                /* transmit event */
-                if (status & ISR_CMB_TX)
-                        atl1_intr_tx(adapter);
-
-                /* rx exception */
-                if (unlikely(status & (ISR_RXF_OV | ISR_RFD_UNRUN |
-                        ISR_RRD_OV | ISR_HOST_RFD_UNRUN |
-                        ISR_HOST_RRD_OV | ISR_CMB_RX))) {
-                        if (status & (ISR_RXF_OV | ISR_RFD_UNRUN |
-                                ISR_RRD_OV | ISR_HOST_RFD_UNRUN |
-                                ISR_HOST_RRD_OV))
-                                if (netif_msg_intr(adapter))
-                                        dev_printk(KERN_DEBUG,
-                                                &adapter->pdev->dev,
-                                                "rx exception, ISR = 0x%x\n",
-                                                status);
-                        atl1_intr_rx(adapter);
-                }
+        /* link event */
+        if (status & ISR_GPHY) {
+                adapter->soft_stats.tx_carrier_errors++;
+                atl1_check_for_link(adapter);
+        }
 
-                if (--max_ints < 0)
-                        break;
+        /* transmit or receive event */
+        if (status & (ISR_CMB_TX | ISR_CMB_RX) &&
+            atl1_sched_rings_clean(adapter))
+                adapter->cmb.cmb->int_stats = adapter->cmb.cmb->int_stats &
+                                              ~(ISR_CMB_TX | ISR_CMB_RX);
 
-        } while ((status = adapter->cmb.cmb->int_stats));
+        /* rx exception */
+        if (unlikely(status & (ISR_RXF_OV | ISR_RFD_UNRUN |
+                ISR_RRD_OV | ISR_HOST_RFD_UNRUN |
+                ISR_HOST_RRD_OV))) {
+                if (netif_msg_intr(adapter))
+                        dev_printk(KERN_DEBUG,
+                                &adapter->pdev->dev,
+                                "rx exception, ISR = 0x%x\n",
+                                status);
+                atl1_sched_rings_clean(adapter);
+        }
 
         /* re-enable Interrupt */
         iowrite32(ISR_DIS_SMB | ISR_DIS_DMA, adapter->hw.hw_addr + REG_ISR);
@@ -2599,6 +2645,7 @@ static s32 atl1_up(struct atl1_adapter *adapter)
         if (unlikely(err))
                 goto err_up;
 
+        napi_enable(&adapter->napi);
         atlx_irq_enable(adapter);
         atl1_check_link(adapter);
         netif_start_queue(netdev);
@@ -2615,6 +2662,7 @@ static void atl1_down(struct atl1_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
 
+        napi_disable(&adapter->napi);
         netif_stop_queue(netdev);
         del_timer_sync(&adapter->phy_config_timer);
         adapter->phy_timer_pending = false;
@@ -2633,10 +2681,10 @@ static void atl1_down(struct atl1_adapter *adapter)
         atl1_clean_rx_ring(adapter);
 }
 
-static void atl1_tx_timeout_task(struct work_struct *work)
+static void atl1_reset_dev_task(struct work_struct *work)
 {
         struct atl1_adapter *adapter =
-                container_of(work, struct atl1_adapter, tx_timeout_task);
+                container_of(work, struct atl1_adapter, reset_dev_task);
         struct net_device *netdev = adapter->netdev;
 
         netif_device_detach(netdev);
@@ -2971,6 +3019,7 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
 
         netdev->netdev_ops = &atl1_netdev_ops;
         netdev->watchdog_timeo = 5 * HZ;
+        netif_napi_add(netdev, &adapter->napi, atl1_rings_clean, 64);
 
         netdev->ethtool_ops = &atl1_ethtool_ops;
         adapter->bd_number = cards_found;
@@ -3038,12 +3087,10 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
                     (unsigned long)adapter);
         adapter->phy_timer_pending = false;
 
-        INIT_WORK(&adapter->tx_timeout_task, atl1_tx_timeout_task);
+        INIT_WORK(&adapter->reset_dev_task, atl1_reset_dev_task);
 
         INIT_WORK(&adapter->link_chg_task, atlx_link_chg_task);
 
-        INIT_WORK(&adapter->pcie_dma_to_rst_task, atl1_tx_timeout_task);
-
         err = register_netdev(netdev);
         if (err)
                 goto err_common;
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.h b/drivers/net/ethernet/atheros/atlx/atl1.h
index 109d6da8be97..3bf79a56220d 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.h
+++ b/drivers/net/ethernet/atheros/atlx/atl1.h
@@ -275,13 +275,17 @@ static u32 atl1_check_link(struct atl1_adapter *adapter);
 #define ISR_DIS_SMB                             0x20000000
 #define ISR_DIS_DMA                             0x40000000
 
-/* Normal Interrupt mask  */
-#define IMR_NORMAL_MASK (\
+/* Normal Interrupt mask without RX/TX enabled */
+#define IMR_NORXTX_MASK (\
         ISR_SMB         |\
         ISR_GPHY        |\
         ISR_PHY_LINKDOWN|\
         ISR_DMAR_TO_RST |\
-        ISR_DMAW_TO_RST |\
+        ISR_DMAW_TO_RST)
+
+/* Normal Interrupt mask  */
+#define IMR_NORMAL_MASK (\
+        IMR_NORXTX_MASK |\
         ISR_CMB_TX      |\
         ISR_CMB_RX)
 
@@ -758,9 +762,9 @@ struct atl1_adapter {
         u16 link_speed;
         u16 link_duplex;
         spinlock_t lock;
-        struct work_struct tx_timeout_task;
+        struct napi_struct napi;
+        struct work_struct reset_dev_task;
         struct work_struct link_chg_task;
-        struct work_struct pcie_dma_to_rst_task;
 
         struct timer_list phy_config_timer;
         bool phy_timer_pending;
@@ -782,6 +786,12 @@ struct atl1_adapter {
         u16 ict;                /* interrupt clear timer (2us resolution */
         struct mii_if_info mii; /* MII interface info */
 
+        /*
+         * Use this value to check is napi handler allowed to
+         * enable ints or not
+         */
+        bool int_enabled;
+
         u32 bd_number;          /* board number */
         bool pci_using_64;
         struct atl1_hw hw;
diff --git a/drivers/net/ethernet/atheros/atlx/atlx.c b/drivers/net/ethernet/atheros/atlx/atlx.c
index 3cd8837236dc..b4f3aa49a7fc 100644
--- a/drivers/net/ethernet/atheros/atlx/atlx.c
+++ b/drivers/net/ethernet/atheros/atlx/atlx.c
@@ -155,14 +155,21 @@ static void atlx_set_multi(struct net_device *netdev)
         }
 }
 
+static inline void atlx_imr_set(struct atlx_adapter *adapter,
+                                unsigned int imr)
+{
+        iowrite32(imr, adapter->hw.hw_addr + REG_IMR);
+        ioread32(adapter->hw.hw_addr + REG_IMR);
+}
+
 /*
  * atlx_irq_enable - Enable default interrupt generation settings
  * @adapter: board private structure
  */
 static void atlx_irq_enable(struct atlx_adapter *adapter)
 {
-        iowrite32(IMR_NORMAL_MASK, adapter->hw.hw_addr + REG_IMR);
-        ioread32(adapter->hw.hw_addr + REG_IMR);
+        atlx_imr_set(adapter, IMR_NORMAL_MASK);
+        adapter->int_enabled = true;
 }
 
 /*
@@ -171,8 +178,8 @@ static void atlx_irq_enable(struct atlx_adapter *adapter)
  */
 static void atlx_irq_disable(struct atlx_adapter *adapter)
 {
-        iowrite32(0, adapter->hw.hw_addr + REG_IMR);
-        ioread32(adapter->hw.hw_addr + REG_IMR);
+        adapter->int_enabled = false;
+        atlx_imr_set(adapter, 0);
         synchronize_irq(adapter->pdev->irq);
 }
 
@@ -194,7 +201,7 @@ static void atlx_tx_timeout(struct net_device *netdev)
 {
         struct atlx_adapter *adapter = netdev_priv(netdev);
         /* Do the reset outside of interrupt context */
-        schedule_work(&adapter->tx_timeout_task);
+        schedule_work(&adapter->reset_dev_task);
 }
 
 /*
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 8297e2868736..ac7b74488531 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -3006,7 +3006,7 @@ error:
 
         dma_unmap_single(&bp->pdev->dev, dma_addr, bp->rx_buf_use_size,
                          PCI_DMA_FROMDEVICE);
-        skb = build_skb(data);
+        skb = build_skb(data, 0);
         if (!skb) {
                 kfree(data);
                 goto error;
@@ -7343,8 +7343,7 @@ static struct {
         { "rx_fw_discards" },
 };
 
-#define BNX2_NUM_STATS (sizeof(bnx2_stats_str_arr)/\
-                        sizeof(bnx2_stats_str_arr[0]))
+#define BNX2_NUM_STATS ARRAY_SIZE(bnx2_stats_str_arr)
 
 #define STATS_OFFSET32(offset_name) (offsetof(struct statistics_block, offset_name) / 4)
 
@@ -7976,7 +7975,6 @@ static int __devinit
 bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 {
         struct bnx2 *bp;
-        unsigned long mem_len;
         int rc, i, j;
         u32 reg;
         u64 dma_mask, persist_dma_mask;
@@ -8036,13 +8034,8 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 #endif
         INIT_WORK(&bp->reset_task, bnx2_reset_task);
 
-        dev->base_addr = dev->mem_start = pci_resource_start(pdev, 0);
-        mem_len = MB_GET_CID_ADDR(TX_TSS_CID + TX_MAX_TSS_RINGS + 1);
-        dev->mem_end = dev->mem_start + mem_len;
-        dev->irq = pdev->irq;
-
-        bp->regview = ioremap_nocache(dev->base_addr, mem_len);
-
+        bp->regview = pci_iomap(pdev, 0, MB_GET_CID_ADDR(TX_TSS_CID +
+                                                         TX_MAX_TSS_RINGS + 1));
         if (!bp->regview) {
                 dev_err(&pdev->dev, "Cannot map register space, aborting\n");
                 rc = -ENOMEM;
@@ -8346,10 +8339,8 @@ err_out_unmap:
                 bp->flags &= ~BNX2_FLAG_AER_ENABLED;
         }
 
-        if (bp->regview) {
-                iounmap(bp->regview);
-                bp->regview = NULL;
-        }
+        pci_iounmap(pdev, bp->regview);
+        bp->regview = NULL;
 
 err_out_release:
         pci_release_regions(pdev);
@@ -8432,7 +8423,7 @@ static int __devinit
 bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         static int version_printed = 0;
-        struct net_device *dev = NULL;
+        struct net_device *dev;
         struct bnx2 *bp;
         int rc;
         char str[40];
@@ -8442,15 +8433,12 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         /* dev zeroed in init_etherdev */
         dev = alloc_etherdev_mq(sizeof(*bp), TX_MAX_RINGS);
-
         if (!dev)
                 return -ENOMEM;
 
         rc = bnx2_init_board(pdev, dev);
-        if (rc < 0) {
-                free_netdev(dev);
-                return rc;
-        }
+        if (rc < 0)
+                goto err_free;
 
         dev->netdev_ops = &bnx2_netdev_ops;
         dev->watchdog_timeo = TX_TIMEOUT;
@@ -8480,22 +8468,21 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto error;
         }
 
-        netdev_info(dev, "%s (%c%d) %s found at mem %lx, IRQ %d, node addr %pM\n",
-                    board_info[ent->driver_data].name,
+        netdev_info(dev, "%s (%c%d) %s found at mem %lx, IRQ %d, "
+                    "node addr %pM\n", board_info[ent->driver_data].name,
                     ((CHIP_ID(bp) & 0xf000) >> 12) + 'A',
                     ((CHIP_ID(bp) & 0x0ff0) >> 4),
-                    bnx2_bus_string(bp, str),
-                    dev->base_addr,
-                    bp->pdev->irq, dev->dev_addr);
+                    bnx2_bus_string(bp, str), (long)pci_resource_start(pdev, 0),
+                    pdev->irq, dev->dev_addr);
 
         return 0;
 
 error:
-        if (bp->regview)
-                iounmap(bp->regview);
+        iounmap(bp->regview);
         pci_release_regions(pdev);
         pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
+err_free:
         free_netdev(dev);
         return rc;
 }
@@ -8511,8 +8498,7 @@ bnx2_remove_one(struct pci_dev *pdev)
         del_timer_sync(&bp->timer);
         cancel_work_sync(&bp->reset_task);
 
-        if (bp->regview)
-                iounmap(bp->regview);
+        pci_iounmap(bp->pdev, bp->regview);
 
         kfree(bp->temp_stats_blk);
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 2c9ee552dffc..e30e2a2f354c 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -23,13 +23,17 @@
  * (you will need to reboot afterwards) */
 /* #define BNX2X_STOP_ON_ERROR */
 
-#define DRV_MODULE_VERSION      "1.72.10-0"
-#define DRV_MODULE_RELDATE      "2012/02/20"
+#define DRV_MODULE_VERSION      "1.72.50-0"
+#define DRV_MODULE_RELDATE      "2012/04/23"
 #define BNX2X_BC_VER            0x040200
 
 #if defined(CONFIG_DCB)
 #define BCM_DCBNL
 #endif
+
+
+#include "bnx2x_hsi.h"
+
 #if defined(CONFIG_CNIC) || defined(CONFIG_CNIC_MODULE)
 #define BCM_CNIC 1
 #include "../cnic_if.h"
@@ -345,7 +349,6 @@ union db_prod {
 #define SGE_PAGE_SIZE           PAGE_SIZE
 #define SGE_PAGE_SHIFT          PAGE_SHIFT
 #define SGE_PAGE_ALIGN(addr)    PAGE_ALIGN((typeof(PAGE_SIZE))(addr))
-#define SGE_PAGES               (SGE_PAGE_SIZE * PAGES_PER_SGE)
 
 /* SGE ring related macros */
 #define NUM_RX_SGE_PAGES        2
@@ -815,6 +818,8 @@ struct bnx2x_common {
 #define CHIP_NUM_57800_MF               0x16a5
 #define CHIP_NUM_57810                  0x168e
 #define CHIP_NUM_57810_MF               0x16ae
+#define CHIP_NUM_57811                  0x163d
+#define CHIP_NUM_57811_MF               0x163e
 #define CHIP_NUM_57840                  0x168d
 #define CHIP_NUM_57840_MF               0x16ab
 #define CHIP_IS_E1(bp)                  (CHIP_NUM(bp) == CHIP_NUM_57710)
@@ -826,6 +831,8 @@ struct bnx2x_common {
 #define CHIP_IS_57800_MF(bp)            (CHIP_NUM(bp) == CHIP_NUM_57800_MF)
 #define CHIP_IS_57810(bp)               (CHIP_NUM(bp) == CHIP_NUM_57810)
 #define CHIP_IS_57810_MF(bp)            (CHIP_NUM(bp) == CHIP_NUM_57810_MF)
+#define CHIP_IS_57811(bp)               (CHIP_NUM(bp) == CHIP_NUM_57811)
+#define CHIP_IS_57811_MF(bp)            (CHIP_NUM(bp) == CHIP_NUM_57811_MF)
 #define CHIP_IS_57840(bp)               (CHIP_NUM(bp) == CHIP_NUM_57840)
 #define CHIP_IS_57840_MF(bp)            (CHIP_NUM(bp) == CHIP_NUM_57840_MF)
 #define CHIP_IS_E1H(bp)                 (CHIP_IS_57711(bp) || \
@@ -836,6 +843,8 @@ struct bnx2x_common {
                                          CHIP_IS_57800_MF(bp) || \
                                          CHIP_IS_57810(bp) || \
                                          CHIP_IS_57810_MF(bp) || \
+                                         CHIP_IS_57811(bp) || \
+                                         CHIP_IS_57811_MF(bp) || \
                                          CHIP_IS_57840(bp) || \
                                          CHIP_IS_57840_MF(bp))
 #define CHIP_IS_E1x(bp)                 (CHIP_IS_E1((bp)) || CHIP_IS_E1H((bp)))
@@ -1053,6 +1062,13 @@ struct bnx2x_slowpath {
                 struct flow_control_configuration pfc_config;
         } func_rdata;
 
+        /* afex ramrod can not be a part of func_rdata union because these
+         * events might arrive in parallel to other events from func_rdata.
+         * Therefore, if they would have been defined in the same union,
+         * data can get corrupted.
+         */
+        struct afex_vif_list_ramrod_data func_afex_rdata;
+
         /* used by dmae command executer */
         struct dmae_command             dmae[MAX_DMAE_C];
 
@@ -1169,6 +1185,7 @@ struct bnx2x_fw_stats_data {
 enum {
         BNX2X_SP_RTNL_SETUP_TC,
         BNX2X_SP_RTNL_TX_TIMEOUT,
+        BNX2X_SP_RTNL_AFEX_F_UPDATE,
         BNX2X_SP_RTNL_FAN_FAILURE,
 };
 
@@ -1222,7 +1239,6 @@ struct bnx2x {
 #define ETH_MAX_JUMBO_PACKET_SIZE       9600
 /* TCP with Timestamp Option (32) + IPv6 (40) */
 #define ETH_MAX_TPA_HEADER_SIZE         72
-#define ETH_MIN_TPA_HEADER_SIZE         40
 
         /* Max supported alignment is 256 (8 shift) */
 #define BNX2X_RX_ALIGN_SHIFT            min(8, L1_CACHE_SHIFT)
@@ -1300,6 +1316,7 @@ struct bnx2x {
 #define NO_ISCSI_FLAG                   (1 << 14)
 #define NO_FCOE_FLAG                    (1 << 15)
 #define BC_SUPPORTS_PFC_STATS           (1 << 17)
+#define USING_SINGLE_MSIX_FLAG          (1 << 20)
 
 #define NO_ISCSI(bp)            ((bp)->flags & NO_ISCSI_FLAG)
 #define NO_ISCSI_OOO(bp)        ((bp)->flags & NO_ISCSI_OOO_FLAG)
@@ -1329,21 +1346,20 @@ struct bnx2x {
         struct bnx2x_common     common;
         struct bnx2x_port       port;
 
-        struct cmng_struct_per_port cmng;
-        u32                     vn_weight_sum;
+        struct cmng_init        cmng;
+
         u32                     mf_config[E1HVN_MAX];
-        u32                     mf2_config[E2_FUNC_MAX];
+        u32                     mf_ext_config;
         u32                     path_has_ovlan; /* E3 */
         u16                     mf_ov;
         u8                      mf_mode;
 #define IS_MF(bp)               (bp->mf_mode != 0)
 #define IS_MF_SI(bp)            (bp->mf_mode == MULTI_FUNCTION_SI)
 #define IS_MF_SD(bp)            (bp->mf_mode == MULTI_FUNCTION_SD)
+#define IS_MF_AFEX(bp)          (bp->mf_mode == MULTI_FUNCTION_AFEX)
 
         u8                      wol;
 
-        bool                    gro_check;
-
         int                     rx_ring_size;
 
         u16                     tx_quick_cons_trip_int;
@@ -1371,7 +1387,6 @@ struct bnx2x {
 #define BNX2X_STATE_DIAG                0xe000
 #define BNX2X_STATE_ERROR               0xf000
 
-        int                     multi_mode;
 #define BNX2X_MAX_PRIORITY              8
 #define BNX2X_MAX_ENTRIES_PER_PRI       16
 #define BNX2X_MAX_COS                   3
@@ -1582,6 +1597,9 @@ struct bnx2x {
         struct dcbx_features                    dcbx_remote_feat;
         u32                                     dcbx_remote_flags;
 #endif
+        /* AFEX: store default vlan used */
+        int                                     afex_def_vlan_tag;
+        enum mf_cfg_afex_vlan_mode              afex_vlan_mode;
         u32                                     pending_max;
 
         /* multiple tx classes of service */
@@ -2138,9 +2156,16 @@ void bnx2x_notify_link_changed(struct bnx2x *bp);
 #define IS_MF_ISCSI_SD(bp) (IS_MF_SD(bp) && BNX2X_IS_MF_SD_PROTOCOL_ISCSI(bp))
 #define IS_MF_FCOE_SD(bp) (IS_MF_SD(bp) && BNX2X_IS_MF_SD_PROTOCOL_FCOE(bp))
 
+#define BNX2X_MF_EXT_PROTOCOL_FCOE(bp)  ((bp)->mf_ext_config & \
+                                         MACP_FUNC_CFG_FLAGS_FCOE_OFFLOAD)
+
+#define IS_MF_FCOE_AFEX(bp) (IS_MF_AFEX(bp) && BNX2X_MF_EXT_PROTOCOL_FCOE(bp))
 #define IS_MF_STORAGE_SD(bp) (IS_MF_SD(bp) && \
                                 (BNX2X_IS_MF_SD_PROTOCOL_ISCSI(bp) || \
                                  BNX2X_IS_MF_SD_PROTOCOL_FCOE(bp)))
+#else
+#define IS_MF_FCOE_AFEX(bp)     false
 #endif
 
+
 #endif /* bnx2x.h */
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 4b054812713a..ad0743bf4bde 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -23,7 +23,6 @@
 #include <linux/ip.h>
 #include <net/ipv6.h>
 #include <net/ip6_checksum.h>
-#include <linux/firmware.h>
 #include <linux/prefetch.h>
 #include "bnx2x_cmn.h"
 #include "bnx2x_init.h"
@@ -329,16 +328,6 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,
                 u16 gro_size = le16_to_cpu(cqe->pkt_len_or_gro_seg_len);
                 tpa_info->full_page =
                         SGE_PAGE_SIZE * PAGES_PER_SGE / gro_size * gro_size;
-                /*
-                 * FW 7.2.16 BUG workaround:
-                 * if SGE size is (exactly) multiple gro_size
-                 * fw will place one less frag on SGE.
-                 * the calculation is done only for potentially
-                 * dangerous MTUs.
-                 */
-                if (unlikely(bp->gro_check))
-                        if (!(SGE_PAGE_SIZE * PAGES_PER_SGE % gro_size))
-                                tpa_info->full_page -= gro_size;
                 tpa_info->gro_size = gro_size;
         }
 
@@ -369,8 +358,8 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,
  * Approximate value of the MSS for this aggregation calculated using
  * the first packet of it.
  */
-static inline u16 bnx2x_set_lro_mss(struct bnx2x *bp, u16 parsing_flags,
-                                    u16 len_on_bd)
+static u16 bnx2x_set_lro_mss(struct bnx2x *bp, u16 parsing_flags,
+                             u16 len_on_bd)
 {
         /*
          * TPA arrgregation won't have either IP options or TCP options
@@ -396,6 +385,36 @@ static inline u16 bnx2x_set_lro_mss(struct bnx2x *bp, u16 parsing_flags,
         return len_on_bd - hdrs_len;
 }
 
+static int bnx2x_alloc_rx_sge(struct bnx2x *bp,
+                              struct bnx2x_fastpath *fp, u16 index)
+{
+        struct page *page = alloc_pages(GFP_ATOMIC, PAGES_PER_SGE_SHIFT);
+        struct sw_rx_page *sw_buf = &fp->rx_page_ring[index];
+        struct eth_rx_sge *sge = &fp->rx_sge_ring[index];
+        dma_addr_t mapping;
+
+        if (unlikely(page == NULL)) {
+                BNX2X_ERR("Can't alloc sge\n");
+                return -ENOMEM;
+        }
+
+        mapping = dma_map_page(&bp->pdev->dev, page, 0,
+                               SGE_PAGE_SIZE*PAGES_PER_SGE, DMA_FROM_DEVICE);
+        if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
+                __free_pages(page, PAGES_PER_SGE_SHIFT);
+                BNX2X_ERR("Can't map sge\n");
+                return -ENOMEM;
+        }
+
+        sw_buf->page = page;
+        dma_unmap_addr_set(sw_buf, mapping, mapping);
+
+        sge->addr_hi = cpu_to_le32(U64_HI(mapping));
+        sge->addr_lo = cpu_to_le32(U64_LO(mapping));
+
+        return 0;
+}
+
 static int bnx2x_fill_frag_skb(struct bnx2x *bp, struct bnx2x_fastpath *fp,
                                struct bnx2x_agg_info *tpa_info,
                                u16 pages,
@@ -494,11 +513,11 @@ static int bnx2x_fill_frag_skb(struct bnx2x *bp, struct bnx2x_fastpath *fp,
         return 0;
 }
 
-static inline void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
-                                  struct bnx2x_agg_info *tpa_info,
-                                  u16 pages,
-                                  struct eth_end_agg_rx_cqe *cqe,
-                                  u16 cqe_idx)
+static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
+                           struct bnx2x_agg_info *tpa_info,
+                           u16 pages,
+                           struct eth_end_agg_rx_cqe *cqe,
+                           u16 cqe_idx)
 {
         struct sw_rx_bd *rx_buf = &tpa_info->first_buf;
         u8 pad = tpa_info->placement_offset;
@@ -524,7 +543,7 @@ static inline void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
         dma_unmap_single(&bp->pdev->dev, dma_unmap_addr(rx_buf, mapping),
                          fp->rx_buf_size, DMA_FROM_DEVICE);
         if (likely(new_data))
-                skb = build_skb(data);
+                skb = build_skb(data, 0);
 
         if (likely(skb)) {
 #ifdef BNX2X_STOP_ON_ERROR
@@ -568,6 +587,36 @@ drop:
         fp->eth_q_stats.rx_skb_alloc_failed++;
 }
 
+static int bnx2x_alloc_rx_data(struct bnx2x *bp,
+                               struct bnx2x_fastpath *fp, u16 index)
+{
+        u8 *data;
+        struct sw_rx_bd *rx_buf = &fp->rx_buf_ring[index];
+        struct eth_rx_bd *rx_bd = &fp->rx_desc_ring[index];
+        dma_addr_t mapping;
+
+        data = kmalloc(fp->rx_buf_size + NET_SKB_PAD, GFP_ATOMIC);
+        if (unlikely(data == NULL))
+                return -ENOMEM;
+
+        mapping = dma_map_single(&bp->pdev->dev, data + NET_SKB_PAD,
+                                 fp->rx_buf_size,
+                                 DMA_FROM_DEVICE);
+        if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
+                kfree(data);
+                BNX2X_ERR("Can't map rx data\n");
+                return -ENOMEM;
+        }
+
+        rx_buf->data = data;
+        dma_unmap_addr_set(rx_buf, mapping, mapping);
+
+        rx_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
+        rx_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
+
+        return 0;
+}
+
 
 int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
 {
@@ -732,7 +781,7 @@ int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
                                                  dma_unmap_addr(rx_buf, mapping),
                                                  fp->rx_buf_size,
                                                  DMA_FROM_DEVICE);
-                                skb = build_skb(data);
+                                skb = build_skb(data, 0);
                                 if (unlikely(!skb)) {
                                         kfree(data);
                                         fp->eth_q_stats.rx_skb_alloc_failed++;
@@ -881,8 +930,8 @@ u16 bnx2x_get_mf_speed(struct bnx2x *bp)
  *
  * It uses a none-atomic bit operations because is called under the mutex.
  */
-static inline void bnx2x_fill_report_data(struct bnx2x *bp,
-                                          struct bnx2x_link_report_data *data)
+static void bnx2x_fill_report_data(struct bnx2x *bp,
+                                   struct bnx2x_link_report_data *data)
 {
         u16 line_speed = bnx2x_get_mf_speed(bp);
 
@@ -1000,6 +1049,47 @@ void __bnx2x_link_report(struct bnx2x *bp)
         }
 }
 
+static void bnx2x_set_next_page_sgl(struct bnx2x_fastpath *fp)
+{
+        int i;
+
+        for (i = 1; i <= NUM_RX_SGE_PAGES; i++) {
+                struct eth_rx_sge *sge;
+
+                sge = &fp->rx_sge_ring[RX_SGE_CNT * i - 2];
+                sge->addr_hi =
+                        cpu_to_le32(U64_HI(fp->rx_sge_mapping +
+                        BCM_PAGE_SIZE*(i % NUM_RX_SGE_PAGES)));
+
+                sge->addr_lo =
+                        cpu_to_le32(U64_LO(fp->rx_sge_mapping +
+                        BCM_PAGE_SIZE*(i % NUM_RX_SGE_PAGES)));
+        }
+}
+
+static void bnx2x_free_tpa_pool(struct bnx2x *bp,
+                                struct bnx2x_fastpath *fp, int last)
+{
+        int i;
+
+        for (i = 0; i < last; i++) {
+                struct bnx2x_agg_info *tpa_info = &fp->tpa_info[i];
+                struct sw_rx_bd *first_buf = &tpa_info->first_buf;
+                u8 *data = first_buf->data;
+
+                if (data == NULL) {
+                        DP(NETIF_MSG_IFDOWN, "tpa bin %d empty on free\n", i);
+                        continue;
+                }
+                if (tpa_info->tpa_state == BNX2X_TPA_START)
+                        dma_unmap_single(&bp->pdev->dev,
+                                         dma_unmap_addr(first_buf, mapping),
+                                         fp->rx_buf_size, DMA_FROM_DEVICE);
+                kfree(data);
+                first_buf->data = NULL;
+        }
+}
+
 void bnx2x_init_rx_rings(struct bnx2x *bp)
 {
         int func = BP_FUNC(bp);
@@ -1212,16 +1302,15 @@ static void bnx2x_free_msix_irqs(struct bnx2x *bp, int nvecs)
 
 void bnx2x_free_irq(struct bnx2x *bp)
 {
-        if (bp->flags & USING_MSIX_FLAG)
+        if (bp->flags & USING_MSIX_FLAG &&
+            !(bp->flags & USING_SINGLE_MSIX_FLAG))
                 bnx2x_free_msix_irqs(bp, BNX2X_NUM_ETH_QUEUES(bp) +
                                      CNIC_PRESENT + 1);
-        else if (bp->flags & USING_MSI_FLAG)
-                free_irq(bp->pdev->irq, bp->dev);
         else
-                free_irq(bp->pdev->irq, bp->dev);
+                free_irq(bp->dev->irq, bp->dev);
 }
 
-int bnx2x_enable_msix(struct bnx2x *bp)
+int __devinit bnx2x_enable_msix(struct bnx2x *bp)
 {
         int msix_vec = 0, i, rc, req_cnt;
 
@@ -1261,8 +1350,8 @@ int bnx2x_enable_msix(struct bnx2x *bp)
                 rc = pci_enable_msix(bp->pdev, &bp->msix_table[0], rc);
 
                 if (rc) {
-                        BNX2X_DEV_INFO("MSI-X is not attainable  rc %d\n", rc);
-                        return rc;
+                        BNX2X_DEV_INFO("MSI-X is not attainable rc %d\n", rc);
+                        goto no_msix;
                 }
                 /*
                  * decrease number of queues by number of unallocated entries
@@ -1270,18 +1359,34 @@ int bnx2x_enable_msix(struct bnx2x *bp)
                 bp->num_queues -= diff;
 
                 BNX2X_DEV_INFO("New queue configuration set: %d\n",
-                                  bp->num_queues);
-        } else if (rc) {
-                /* fall to INTx if not enough memory */
-                if (rc == -ENOMEM)
-                        bp->flags |= DISABLE_MSI_FLAG;
+                               bp->num_queues);
+        } else if (rc > 0) {
+                /* Get by with single vector */
+                rc = pci_enable_msix(bp->pdev, &bp->msix_table[0], 1);
+                if (rc) {
+                        BNX2X_DEV_INFO("Single MSI-X is not attainable rc %d\n",
+                                       rc);
+                        goto no_msix;
+                }
+
+                BNX2X_DEV_INFO("Using single MSI-X vector\n");
+                bp->flags |= USING_SINGLE_MSIX_FLAG;
+
+        } else if (rc < 0) {
                 BNX2X_DEV_INFO("MSI-X is not attainable  rc %d\n", rc);
-                return rc;
+                goto no_msix;
         }
 
         bp->flags |= USING_MSIX_FLAG;
 
         return 0;
+
+no_msix:
+        /* fall to INTx if not enough memory */
+        if (rc == -ENOMEM)
+                bp->flags |= DISABLE_MSI_FLAG;
+
+        return rc;
 }
 
 static int bnx2x_req_msix_irqs(struct bnx2x *bp)
@@ -1343,22 +1448,26 @@ int bnx2x_enable_msi(struct bnx2x *bp)
 static int bnx2x_req_irq(struct bnx2x *bp)
 {
         unsigned long flags;
-        int rc;
+        unsigned int irq;
 
-        if (bp->flags & USING_MSI_FLAG)
+        if (bp->flags & (USING_MSI_FLAG | USING_MSIX_FLAG))
                 flags = 0;
         else
                 flags = IRQF_SHARED;
 
-        rc = request_irq(bp->pdev->irq, bnx2x_interrupt, flags,
-                         bp->dev->name, bp->dev);
-        return rc;
+        if (bp->flags & USING_MSIX_FLAG)
+                irq = bp->msix_table[0].vector;
+        else
+                irq = bp->pdev->irq;
+
+        return request_irq(irq, bnx2x_interrupt, flags, bp->dev->name, bp->dev);
 }
 
-static inline int bnx2x_setup_irqs(struct bnx2x *bp)
+static int bnx2x_setup_irqs(struct bnx2x *bp)
 {
         int rc = 0;
-        if (bp->flags & USING_MSIX_FLAG) {
+        if (bp->flags & USING_MSIX_FLAG &&
+            !(bp->flags & USING_SINGLE_MSIX_FLAG)) {
                 rc = bnx2x_req_msix_irqs(bp);
                 if (rc)
                         return rc;
@@ -1371,15 +1480,20 @@ static inline int bnx2x_setup_irqs(struct bnx2x *bp)
                 }
                 if (bp->flags & USING_MSI_FLAG) {
                         bp->dev->irq = bp->pdev->irq;
-                        netdev_info(bp->dev, "using MSI  IRQ %d\n",
-                               bp->pdev->irq);
+                        netdev_info(bp->dev, "using MSI IRQ %d\n",
+                                    bp->dev->irq);
+                }
+                if (bp->flags & USING_MSIX_FLAG) {
+                        bp->dev->irq = bp->msix_table[0].vector;
+                        netdev_info(bp->dev, "using MSIX IRQ %d\n",
+                                    bp->dev->irq);
                 }
         }
 
         return 0;
 }
 
-static inline void bnx2x_napi_enable(struct bnx2x *bp)
+static void bnx2x_napi_enable(struct bnx2x *bp)
 {
         int i;
 
@@ -1387,7 +1501,7 @@ static inline void bnx2x_napi_enable(struct bnx2x *bp)
                 napi_enable(&bnx2x_fp(bp, i, napi));
 }
 
-static inline void bnx2x_napi_disable(struct bnx2x *bp)
+static void bnx2x_napi_disable(struct bnx2x *bp)
 {
         int i;
 
@@ -1437,24 +1551,15 @@ u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb)
         return __skb_tx_hash(dev, skb, BNX2X_NUM_ETH_QUEUES(bp));
 }
 
+
 void bnx2x_set_num_queues(struct bnx2x *bp)
 {
-        switch (bp->multi_mode) {
-        case ETH_RSS_MODE_DISABLED:
-                bp->num_queues = 1;
-                break;
-        case ETH_RSS_MODE_REGULAR:
-                bp->num_queues = bnx2x_calc_num_queues(bp);
-                break;
-
-        default:
-                bp->num_queues = 1;
-                break;
-        }
+        /* RSS queues */
+        bp->num_queues = bnx2x_calc_num_queues(bp);
 
 #ifdef BCM_CNIC
-        /* override in STORAGE SD mode */
-        if (IS_MF_STORAGE_SD(bp))
+        /* override in STORAGE SD modes */
+        if (IS_MF_STORAGE_SD(bp) || IS_MF_FCOE_AFEX(bp))
                 bp->num_queues = 1;
 #endif
         /* Add special queues */
@@ -1483,7 +1588,7 @@ void bnx2x_set_num_queues(struct bnx2x *bp)
  * bnx2x_setup_tc() takes care of the proper TC mappings so that __skb_tx_hash()
  * will return a proper Tx index if TC is enabled (netdev->num_tc > 0).
  */
-static inline int bnx2x_set_real_num_queues(struct bnx2x *bp)
+static int bnx2x_set_real_num_queues(struct bnx2x *bp)
 {
         int rc, tx, rx;
 
@@ -1515,7 +1620,7 @@ static inline int bnx2x_set_real_num_queues(struct bnx2x *bp)
         return rc;
 }
 
-static inline void bnx2x_set_rx_buf_size(struct bnx2x *bp)
+static void bnx2x_set_rx_buf_size(struct bnx2x *bp)
 {
         int i;
 
@@ -1543,22 +1648,19 @@ static inline void bnx2x_set_rx_buf_size(struct bnx2x *bp)
         }
 }
 
-static inline int bnx2x_init_rss_pf(struct bnx2x *bp)
+static int bnx2x_init_rss_pf(struct bnx2x *bp)
 {
         int i;
         u8 ind_table[T_ETH_INDIRECTION_TABLE_SIZE] = {0};
         u8 num_eth_queues = BNX2X_NUM_ETH_QUEUES(bp);
 
-        /*
-         * Prepare the inital contents fo the indirection table if RSS is
+        /* Prepare the initial contents fo the indirection table if RSS is
          * enabled
          */
-        if (bp->multi_mode != ETH_RSS_MODE_DISABLED) {
-                for (i = 0; i < sizeof(ind_table); i++)
-                        ind_table[i] =
-                                bp->fp->cl_id +
-                                ethtool_rxfh_indir_default(i, num_eth_queues);
-        }
+        for (i = 0; i < sizeof(ind_table); i++)
+                ind_table[i] =
+                        bp->fp->cl_id +
+                        ethtool_rxfh_indir_default(i, num_eth_queues);
 
         /*
          * For 57710 and 57711 SEARCHER configuration (rss_keys) is
@@ -1568,11 +1670,12 @@ static inline int bnx2x_init_rss_pf(struct bnx2x *bp)
          * For 57712 and newer on the other hand it's a per-function
          * configuration.
          */
-        return bnx2x_config_rss_pf(bp, ind_table,
-                                   bp->port.pmf || !CHIP_IS_E1x(bp));
+        return bnx2x_config_rss_eth(bp, ind_table,
+                                    bp->port.pmf || !CHIP_IS_E1x(bp));
 }
 
-int bnx2x_config_rss_pf(struct bnx2x *bp, u8 *ind_table, bool config_hash)
+int bnx2x_config_rss_pf(struct bnx2x *bp, struct bnx2x_rss_config_obj *rss_obj,
+                        u8 *ind_table, bool config_hash)
 {
         struct bnx2x_config_rss_params params = {NULL};
         int i;
@@ -1584,58 +1687,35 @@ int bnx2x_config_rss_pf(struct bnx2x *bp, u8 *ind_table, bool config_hash)
          *      bp->multi_mode = ETH_RSS_MODE_DISABLED;
          */
 
-        params.rss_obj = &bp->rss_conf_obj;
+        params.rss_obj = rss_obj;
 
         __set_bit(RAMROD_COMP_WAIT, &params.ramrod_flags);
 
-        /* RSS mode */
-        switch (bp->multi_mode) {
-        case ETH_RSS_MODE_DISABLED:
-                __set_bit(BNX2X_RSS_MODE_DISABLED, &params.rss_flags);
-                break;
-        case ETH_RSS_MODE_REGULAR:
-                __set_bit(BNX2X_RSS_MODE_REGULAR, &params.rss_flags);
-                break;
-        case ETH_RSS_MODE_VLAN_PRI:
-                __set_bit(BNX2X_RSS_MODE_VLAN_PRI, &params.rss_flags);
-                break;
-        case ETH_RSS_MODE_E1HOV_PRI:
-                __set_bit(BNX2X_RSS_MODE_E1HOV_PRI, &params.rss_flags);
-                break;
-        case ETH_RSS_MODE_IP_DSCP:
-                __set_bit(BNX2X_RSS_MODE_IP_DSCP, &params.rss_flags);
-                break;
-        default:
-                BNX2X_ERR("Unknown multi_mode: %d\n", bp->multi_mode);
-                return -EINVAL;
-        }
+        __set_bit(BNX2X_RSS_MODE_REGULAR, &params.rss_flags);
 
-        /* If RSS is enabled */
-        if (bp->multi_mode != ETH_RSS_MODE_DISABLED) {
-                /* RSS configuration */
-                __set_bit(BNX2X_RSS_IPV4, &params.rss_flags);
-                __set_bit(BNX2X_RSS_IPV4_TCP, &params.rss_flags);
-                __set_bit(BNX2X_RSS_IPV6, &params.rss_flags);
-                __set_bit(BNX2X_RSS_IPV6_TCP, &params.rss_flags);
+        /* RSS configuration */
+        __set_bit(BNX2X_RSS_IPV4, &params.rss_flags);
+        __set_bit(BNX2X_RSS_IPV4_TCP, &params.rss_flags);
+        __set_bit(BNX2X_RSS_IPV6, &params.rss_flags);
+        __set_bit(BNX2X_RSS_IPV6_TCP, &params.rss_flags);
 
-                /* Hash bits */
-                params.rss_result_mask = MULTI_MASK;
+        /* Hash bits */
+        params.rss_result_mask = MULTI_MASK;
 
-                memcpy(params.ind_table, ind_table, sizeof(params.ind_table));
+        memcpy(params.ind_table, ind_table, sizeof(params.ind_table));
 
-                if (config_hash) {
-                        /* RSS keys */
-                        for (i = 0; i < sizeof(params.rss_key) / 4; i++)
-                                params.rss_key[i] = random32();
+        if (config_hash) {
+                /* RSS keys */
+                for (i = 0; i < sizeof(params.rss_key) / 4; i++)
+                        params.rss_key[i] = random32();
 
-                        __set_bit(BNX2X_RSS_SET_SRCH, &params.rss_flags);
-                }
+                __set_bit(BNX2X_RSS_SET_SRCH, &params.rss_flags);
         }
 
         return bnx2x_config_rss(bp, &params);
 }
 
-static inline int bnx2x_init_hw(struct bnx2x *bp, u32 load_code)
+static int bnx2x_init_hw(struct bnx2x *bp, u32 load_code)
 {
         struct bnx2x_func_state_params func_params = {NULL};
 
@@ -1744,6 +1824,87 @@ bool bnx2x_test_firmware_version(struct bnx2x *bp, bool is_err)
         return true;
 }
 
+/**
+ * bnx2x_bz_fp - zero content of the fastpath structure.
+ *
+ * @bp:         driver handle
+ * @index:      fastpath index to be zeroed
+ *
+ * Makes sure the contents of the bp->fp[index].napi is kept
+ * intact.
+ */
+static void bnx2x_bz_fp(struct bnx2x *bp, int index)
+{
+        struct bnx2x_fastpath *fp = &bp->fp[index];
+        struct napi_struct orig_napi = fp->napi;
+        /* bzero bnx2x_fastpath contents */
+        if (bp->stats_init)
+                memset(fp, 0, sizeof(*fp));
+        else {
+                /* Keep Queue statistics */
+                struct bnx2x_eth_q_stats *tmp_eth_q_stats;
+                struct bnx2x_eth_q_stats_old *tmp_eth_q_stats_old;
+
+                tmp_eth_q_stats = kzalloc(sizeof(struct bnx2x_eth_q_stats),
+                                          GFP_KERNEL);
+                if (tmp_eth_q_stats)
+                        memcpy(tmp_eth_q_stats, &fp->eth_q_stats,
+                               sizeof(struct bnx2x_eth_q_stats));
+
+                tmp_eth_q_stats_old =
+                        kzalloc(sizeof(struct bnx2x_eth_q_stats_old),
+                                GFP_KERNEL);
+                if (tmp_eth_q_stats_old)
+                        memcpy(tmp_eth_q_stats_old, &fp->eth_q_stats_old,
+                               sizeof(struct bnx2x_eth_q_stats_old));
+
+                memset(fp, 0, sizeof(*fp));
+
+                if (tmp_eth_q_stats) {
+                        memcpy(&fp->eth_q_stats, tmp_eth_q_stats,
+                                   sizeof(struct bnx2x_eth_q_stats));
+                        kfree(tmp_eth_q_stats);
+                }
+
+                if (tmp_eth_q_stats_old) {
+                        memcpy(&fp->eth_q_stats_old, tmp_eth_q_stats_old,
+                               sizeof(struct bnx2x_eth_q_stats_old));
+                        kfree(tmp_eth_q_stats_old);
+                }
+
+        }
+
+        /* Restore the NAPI object as it has been already initialized */
+        fp->napi = orig_napi;
+
+        fp->bp = bp;
+        fp->index = index;
+        if (IS_ETH_FP(fp))
+                fp->max_cos = bp->max_cos;
+        else
+                /* Special queues support only one CoS */
+                fp->max_cos = 1;
+
+        /*
+         * set the tpa flag for each queue. The tpa flag determines the queue
+         * minimal size so it must be set prior to queue memory allocation
+         */
+        fp->disable_tpa = !(bp->flags & TPA_ENABLE_FLAG ||
+                                  (bp->flags & GRO_ENABLE_FLAG &&
+                                   bnx2x_mtu_allows_gro(bp->dev->mtu)));
+        if (bp->flags & TPA_ENABLE_FLAG)
+                fp->mode = TPA_MODE_LRO;
+        else if (bp->flags & GRO_ENABLE_FLAG)
+                fp->mode = TPA_MODE_GRO;
+
+#ifdef BCM_CNIC
+        /* We don't want TPA on an FCoE L2 ring */
+        if (IS_FCOE_FP(fp))
+                fp->disable_tpa = 1;
+#endif
+}
+
+
 /* must be called with rtnl_lock */
 int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
 {
@@ -1911,8 +2072,14 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                         SHMEM2_WR(bp, dcc_support,
                                   (SHMEM_DCC_SUPPORT_DISABLE_ENABLE_PF_TLV |
                                    SHMEM_DCC_SUPPORT_BANDWIDTH_ALLOCATION_TLV));
+                if (SHMEM2_HAS(bp, afex_driver_support))
+                        SHMEM2_WR(bp, afex_driver_support,
+                                  SHMEM_AFEX_SUPPORTED_VERSION_ONE);
         }
 
+        /* Set AFEX default VLAN tag to an invalid value */
+        bp->afex_def_vlan_tag = -1;
+
         bp->state = BNX2X_STATE_OPENING_WAIT4_PORT;
         rc = bnx2x_func_start(bp);
         if (rc) {
@@ -2968,6 +3135,8 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         netdev_tx_sent_queue(txq, skb->len);
 
+        skb_tx_timestamp(skb);
+
         txdata->tx_pkt_prod++;
         /*
          * Make sure that the BD data is updated before updating the producer
@@ -3084,7 +3253,8 @@ int bnx2x_change_mac_addr(struct net_device *dev, void *p)
         }
 
 #ifdef BCM_CNIC
-        if (IS_MF_STORAGE_SD(bp) && !is_zero_ether_addr(addr->sa_data)) {
+        if ((IS_MF_STORAGE_SD(bp) || IS_MF_FCOE_AFEX(bp)) &&
+            !is_zero_ether_addr(addr->sa_data)) {
                 BNX2X_ERR("Can't configure non-zero address on iSCSI or FCoE functions in MF-SD mode\n");
                 return -EINVAL;
         }
@@ -3181,7 +3351,7 @@ void bnx2x_free_fp_mem(struct bnx2x *bp)
                 bnx2x_free_fp_mem_at(bp, i);
 }
 
-static inline void set_sb_shortcuts(struct bnx2x *bp, int index)
+static void set_sb_shortcuts(struct bnx2x *bp, int index)
 {
         union host_hc_status_block status_blk = bnx2x_fp(bp, index, status_blk);
         if (!CHIP_IS_E1x(bp)) {
@@ -3197,6 +3367,63 @@ static inline void set_sb_shortcuts(struct bnx2x *bp, int index)
         }
 }
 
+/* Returns the number of actually allocated BDs */
+static int bnx2x_alloc_rx_bds(struct bnx2x_fastpath *fp,
+                              int rx_ring_size)
+{
+        struct bnx2x *bp = fp->bp;
+        u16 ring_prod, cqe_ring_prod;
+        int i, failure_cnt = 0;
+
+        fp->rx_comp_cons = 0;
+        cqe_ring_prod = ring_prod = 0;
+
+        /* This routine is called only during fo init so
+         * fp->eth_q_stats.rx_skb_alloc_failed = 0
+         */
+        for (i = 0; i < rx_ring_size; i++) {
+                if (bnx2x_alloc_rx_data(bp, fp, ring_prod) < 0) {
+                        failure_cnt++;
+                        continue;
+                }
+                ring_prod = NEXT_RX_IDX(ring_prod);
+                cqe_ring_prod = NEXT_RCQ_IDX(cqe_ring_prod);
+                WARN_ON(ring_prod <= (i - failure_cnt));
+        }
+
+        if (failure_cnt)
+                BNX2X_ERR("was only able to allocate %d rx skbs on queue[%d]\n",
+                          i - failure_cnt, fp->index);
+
+        fp->rx_bd_prod = ring_prod;
+        /* Limit the CQE producer by the CQE ring size */
+        fp->rx_comp_prod = min_t(u16, NUM_RCQ_RINGS*RCQ_DESC_CNT,
+                               cqe_ring_prod);
+        fp->rx_pkt = fp->rx_calls = 0;
+
+        fp->eth_q_stats.rx_skb_alloc_failed += failure_cnt;
+
+        return i - failure_cnt;
+}
+
+static void bnx2x_set_next_page_rx_cq(struct bnx2x_fastpath *fp)
+{
+        int i;
+
+        for (i = 1; i <= NUM_RCQ_RINGS; i++) {
+                struct eth_rx_cqe_next_page *nextpg;
+
+                nextpg = (struct eth_rx_cqe_next_page *)
+                        &fp->rx_comp_ring[RCQ_DESC_CNT * i - 1];
+                nextpg->addr_hi =
+                        cpu_to_le32(U64_HI(fp->rx_comp_mapping +
+                                   BCM_PAGE_SIZE*(i % NUM_RCQ_RINGS)));
+                nextpg->addr_lo =
+                        cpu_to_le32(U64_LO(fp->rx_comp_mapping +
+                                   BCM_PAGE_SIZE*(i % NUM_RCQ_RINGS)));
+        }
+}
+
 static int bnx2x_alloc_fp_mem_at(struct bnx2x *bp, int index)
 {
         union host_hc_status_block *sb;
@@ -3206,7 +3433,8 @@ static int bnx2x_alloc_fp_mem_at(struct bnx2x *bp, int index)
         int rx_ring_size = 0;
 
 #ifdef BCM_CNIC
-        if (!bp->rx_ring_size && IS_MF_STORAGE_SD(bp)) {
+        if (!bp->rx_ring_size &&
+            (IS_MF_STORAGE_SD(bp) || IS_MF_FCOE_AFEX(bp))) {
                 rx_ring_size = MIN_RX_SIZE_NONTPA;
                 bp->rx_ring_size = rx_ring_size;
         } else
@@ -3528,8 +3756,6 @@ int bnx2x_change_mtu(struct net_device *dev, int new_mtu)
          */
         dev->mtu = new_mtu;
 
-        bp->gro_check = bnx2x_need_gro_check(new_mtu);
-
         return bnx2x_reload_if_running(dev);
 }
 
@@ -3687,9 +3913,9 @@ void bnx2x_set_ctx_validation(struct bnx2x *bp, struct eth_context *cxt,
                         CDU_REGION_NUMBER_XCM_AG, ETH_CONNECTION_TYPE);
 }
 
-static inline void storm_memset_hc_timeout(struct bnx2x *bp, u8 port,
-                                             u8 fw_sb_id, u8 sb_index,
-                                             u8 ticks)
+static void storm_memset_hc_timeout(struct bnx2x *bp, u8 port,
+                                    u8 fw_sb_id, u8 sb_index,
+                                    u8 ticks)
 {
 
         u32 addr = BAR_CSTRORM_INTMEM +
@@ -3700,9 +3926,9 @@ static inline void storm_memset_hc_timeout(struct bnx2x *bp, u8 port,
            port, fw_sb_id, sb_index, ticks);
 }
 
-static inline void storm_memset_hc_disable(struct bnx2x *bp, u8 port,
-                                             u16 fw_sb_id, u8 sb_index,
-                                             u8 disable)
+static void storm_memset_hc_disable(struct bnx2x *bp, u8 port,
+                                    u16 fw_sb_id, u8 sb_index,
+                                    u8 disable)
 {
         u32 enable_flag = disable ? 0 : (1 << HC_INDEX_DATA_HC_ENABLED_SHIFT);
         u32 addr = BAR_CSTRORM_INTMEM +
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
index 5c27454d2ec2..7cd99b75347a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
@@ -86,13 +86,15 @@ u32 bnx2x_send_unload_req(struct bnx2x *bp, int unload_mode);
 void bnx2x_send_unload_done(struct bnx2x *bp);
 
 /**
- * bnx2x_config_rss_pf - configure RSS parameters.
+ * bnx2x_config_rss_pf - configure RSS parameters in a PF.
  *
  * @bp:                 driver handle
+ * @rss_obj             RSS object to use
  * @ind_table:          indirection table to configure
  * @config_hash:        re-configure RSS hash keys configuration
  */
-int bnx2x_config_rss_pf(struct bnx2x *bp, u8 *ind_table, bool config_hash);
+int bnx2x_config_rss_pf(struct bnx2x *bp, struct bnx2x_rss_config_obj *rss_obj,
+                        u8 *ind_table, bool config_hash);
 
 /**
  * bnx2x__init_func_obj - init function object
@@ -485,7 +487,7 @@ void bnx2x_netif_start(struct bnx2x *bp);
  * fills msix_table, requests vectors, updates num_queues
  * according to number of available vectors.
  */
-int bnx2x_enable_msix(struct bnx2x *bp);
+int __devinit bnx2x_enable_msix(struct bnx2x *bp);
 
 /**
  * bnx2x_enable_msi - request msi mode from OS, updated internals accordingly
@@ -610,53 +612,6 @@ static inline void bnx2x_igu_ack_sb_gen(struct bnx2x *bp, u8 igu_sb_id,
         barrier();
 }
 
-static inline void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func,
-                                          u8 idu_sb_id, bool is_Pf)
-{
-        u32 data, ctl, cnt = 100;
-        u32 igu_addr_data = IGU_REG_COMMAND_REG_32LSB_DATA;
-        u32 igu_addr_ctl = IGU_REG_COMMAND_REG_CTRL;
-        u32 igu_addr_ack = IGU_REG_CSTORM_TYPE_0_SB_CLEANUP + (idu_sb_id/32)*4;
-        u32 sb_bit =  1 << (idu_sb_id%32);
-        u32 func_encode = func | (is_Pf ? 1 : 0) << IGU_FID_ENCODE_IS_PF_SHIFT;
-        u32 addr_encode = IGU_CMD_E2_PROD_UPD_BASE + idu_sb_id;
-
-        /* Not supported in BC mode */
-        if (CHIP_INT_MODE_IS_BC(bp))
-                return;
-
-        data = (IGU_USE_REGISTER_cstorm_type_0_sb_cleanup
-                        << IGU_REGULAR_CLEANUP_TYPE_SHIFT)      |
-                IGU_REGULAR_CLEANUP_SET                         |
-                IGU_REGULAR_BCLEANUP;
-
-        ctl = addr_encode << IGU_CTRL_REG_ADDRESS_SHIFT         |
-              func_encode << IGU_CTRL_REG_FID_SHIFT             |
-              IGU_CTRL_CMD_TYPE_WR << IGU_CTRL_REG_TYPE_SHIFT;
-
-        DP(NETIF_MSG_HW, "write 0x%08x to IGU(via GRC) addr 0x%x\n",
-                         data, igu_addr_data);
-        REG_WR(bp, igu_addr_data, data);
-        mmiowb();
-        barrier();
-        DP(NETIF_MSG_HW, "write 0x%08x to IGU(via GRC) addr 0x%x\n",
-                          ctl, igu_addr_ctl);
-        REG_WR(bp, igu_addr_ctl, ctl);
-        mmiowb();
-        barrier();
-
-        /* wait for clean up to finish */
-        while (!(REG_RD(bp, igu_addr_ack) & sb_bit) && --cnt)
-                msleep(20);
-
-
-        if (!(REG_RD(bp, igu_addr_ack) & sb_bit)) {
-                DP(NETIF_MSG_HW,
-                   "Unable to finish IGU cleanup: idu_sb_id %d offset %d bit %d (cnt %d)\n",
-                          idu_sb_id, idu_sb_id/32, idu_sb_id%32, cnt);
-        }
-}
-
 static inline void bnx2x_hc_ack_sb(struct bnx2x *bp, u8 sb_id,
                                    u8 storm, u16 index, u8 op, u8 update)
 {
@@ -843,7 +798,7 @@ static inline void bnx2x_disable_msi(struct bnx2x *bp)
 {
         if (bp->flags & USING_MSIX_FLAG) {
                 pci_disable_msix(bp->pdev);
-                bp->flags &= ~USING_MSIX_FLAG;
+                bp->flags &= ~(USING_MSIX_FLAG | USING_SINGLE_MSIX_FLAG);
         } else if (bp->flags & USING_MSI_FLAG) {
                 pci_disable_msi(bp->pdev);
                 bp->flags &= ~USING_MSI_FLAG;
@@ -883,66 +838,6 @@ static inline void bnx2x_init_sge_ring_bit_mask(struct bnx2x_fastpath *fp)
         bnx2x_clear_sge_mask_next_elems(fp);
 }
 
-static inline int bnx2x_alloc_rx_sge(struct bnx2x *bp,
-                                     struct bnx2x_fastpath *fp, u16 index)
-{
-        struct page *page = alloc_pages(GFP_ATOMIC, PAGES_PER_SGE_SHIFT);
-        struct sw_rx_page *sw_buf = &fp->rx_page_ring[index];
-        struct eth_rx_sge *sge = &fp->rx_sge_ring[index];
-        dma_addr_t mapping;
-
-        if (unlikely(page == NULL)) {
-                BNX2X_ERR("Can't alloc sge\n");
-                return -ENOMEM;
-        }
-
-        mapping = dma_map_page(&bp->pdev->dev, page, 0,
-                               SGE_PAGE_SIZE*PAGES_PER_SGE, DMA_FROM_DEVICE);
-        if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
-                __free_pages(page, PAGES_PER_SGE_SHIFT);
-                BNX2X_ERR("Can't map sge\n");
-                return -ENOMEM;
-        }
-
-        sw_buf->page = page;
-        dma_unmap_addr_set(sw_buf, mapping, mapping);
-
-        sge->addr_hi = cpu_to_le32(U64_HI(mapping));
-        sge->addr_lo = cpu_to_le32(U64_LO(mapping));
-
-        return 0;
-}
-
-static inline int bnx2x_alloc_rx_data(struct bnx2x *bp,
-                                      struct bnx2x_fastpath *fp, u16 index)
-{
-        u8 *data;
-        struct sw_rx_bd *rx_buf = &fp->rx_buf_ring[index];
-        struct eth_rx_bd *rx_bd = &fp->rx_desc_ring[index];
-        dma_addr_t mapping;
-
-        data = kmalloc(fp->rx_buf_size + NET_SKB_PAD, GFP_ATOMIC);
-        if (unlikely(data == NULL))
-                return -ENOMEM;
-
-        mapping = dma_map_single(&bp->pdev->dev, data + NET_SKB_PAD,
-                                 fp->rx_buf_size,
-                                 DMA_FROM_DEVICE);
-        if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
-                kfree(data);
-                BNX2X_ERR("Can't map rx data\n");
-                return -ENOMEM;
-        }
-
-        rx_buf->data = data;
-        dma_unmap_addr_set(rx_buf, mapping, mapping);
-
-        rx_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
-        rx_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
-
-        return 0;
-}
-
 /* note that we are not allocating a new buffer,
  * we are just moving one from cons to prod
  * we are not creating a new mapping,
@@ -964,6 +859,19 @@ static inline void bnx2x_reuse_rx_data(struct bnx2x_fastpath *fp,
 
 /************************* Init ******************************************/
 
+/* returns func by VN for current port */
+static inline int func_by_vn(struct bnx2x *bp, int vn)
+{
+        return 2 * vn + BP_PORT(bp);
+}
+
+static inline int bnx2x_config_rss_eth(struct bnx2x *bp, u8 *ind_table,
+                                       bool config_hash)
+{
+        return bnx2x_config_rss_pf(bp, &bp->rss_conf_obj, ind_table,
+                                   config_hash);
+}
+
 /**
  * bnx2x_func_start - init function
  *
@@ -1027,66 +935,6 @@ static inline void bnx2x_free_rx_sge_range(struct bnx2x *bp,
                 bnx2x_free_rx_sge(bp, fp, i);
 }
 
-static inline void bnx2x_free_tpa_pool(struct bnx2x *bp,
-                                       struct bnx2x_fastpath *fp, int last)
-{
-        int i;
-
-        for (i = 0; i < last; i++) {
-                struct bnx2x_agg_info *tpa_info = &fp->tpa_info[i];
-                struct sw_rx_bd *first_buf = &tpa_info->first_buf;
-                u8 *data = first_buf->data;
-
-                if (data == NULL) {
-                        DP(NETIF_MSG_IFDOWN, "tpa bin %d empty on free\n", i);
-                        continue;
-                }
-                if (tpa_info->tpa_state == BNX2X_TPA_START)
-                        dma_unmap_single(&bp->pdev->dev,
-                                         dma_unmap_addr(first_buf, mapping),
-                                         fp->rx_buf_size, DMA_FROM_DEVICE);
-                kfree(data);
-                first_buf->data = NULL;
-        }
-}
-
-static inline void bnx2x_init_tx_ring_one(struct bnx2x_fp_txdata *txdata)
-{
-        int i;
-
-        for (i = 1; i <= NUM_TX_RINGS; i++) {
-                struct eth_tx_next_bd *tx_next_bd =
-                        &txdata->tx_desc_ring[TX_DESC_CNT * i - 1].next_bd;
-
-                tx_next_bd->addr_hi =
-                        cpu_to_le32(U64_HI(txdata->tx_desc_mapping +
-                                    BCM_PAGE_SIZE*(i % NUM_TX_RINGS)));
-                tx_next_bd->addr_lo =
-                        cpu_to_le32(U64_LO(txdata->tx_desc_mapping +
-                                    BCM_PAGE_SIZE*(i % NUM_TX_RINGS)));
-        }
-
-        SET_FLAG(txdata->tx_db.data.header.header, DOORBELL_HDR_DB_TYPE, 1);
-        txdata->tx_db.data.zero_fill1 = 0;
-        txdata->tx_db.data.prod = 0;
-
-        txdata->tx_pkt_prod = 0;
-        txdata->tx_pkt_cons = 0;
-        txdata->tx_bd_prod = 0;
-        txdata->tx_bd_cons = 0;
-        txdata->tx_pkt = 0;
-}
-
-static inline void bnx2x_init_tx_rings(struct bnx2x *bp)
-{
-        int i;
-        u8 cos;
-
-        for_each_tx_queue(bp, i)
-                for_each_cos_in_tx_queue(&bp->fp[i], cos)
-                        bnx2x_init_tx_ring_one(&bp->fp[i].txdata[cos]);
-}
-
 static inline void bnx2x_set_next_page_rx_bd(struct bnx2x_fastpath *fp)
 {
         int i;
@@ -1104,80 +952,6 @@ static inline void bnx2x_set_next_page_rx_bd(struct bnx2x_fastpath *fp)
         }
 }
 
-static inline void bnx2x_set_next_page_sgl(struct bnx2x_fastpath *fp)
-{
-        int i;
-
-        for (i = 1; i <= NUM_RX_SGE_PAGES; i++) {
-                struct eth_rx_sge *sge;
-
-                sge = &fp->rx_sge_ring[RX_SGE_CNT * i - 2];
-                sge->addr_hi =
-                        cpu_to_le32(U64_HI(fp->rx_sge_mapping +
-                        BCM_PAGE_SIZE*(i % NUM_RX_SGE_PAGES)));
-
-                sge->addr_lo =
-                        cpu_to_le32(U64_LO(fp->rx_sge_mapping +
-                        BCM_PAGE_SIZE*(i % NUM_RX_SGE_PAGES)));
-        }
-}
-
-static inline void bnx2x_set_next_page_rx_cq(struct bnx2x_fastpath *fp)
-{
-        int i;
-        for (i = 1; i <= NUM_RCQ_RINGS; i++) {
-                struct eth_rx_cqe_next_page *nextpg;
-
-                nextpg = (struct eth_rx_cqe_next_page *)
-                        &fp->rx_comp_ring[RCQ_DESC_CNT * i - 1];
-                nextpg->addr_hi =
-                        cpu_to_le32(U64_HI(fp->rx_comp_mapping +
-                                   BCM_PAGE_SIZE*(i % NUM_RCQ_RINGS)));
-                nextpg->addr_lo =
-                        cpu_to_le32(U64_LO(fp->rx_comp_mapping +
-                                   BCM_PAGE_SIZE*(i % NUM_RCQ_RINGS)));
-        }
-}
-
-/* Returns the number of actually allocated BDs */
-static inline int bnx2x_alloc_rx_bds(struct bnx2x_fastpath *fp,
-                                      int rx_ring_size)
-{
-        struct bnx2x *bp = fp->bp;
-        u16 ring_prod, cqe_ring_prod;
-        int i, failure_cnt = 0;
-
-        fp->rx_comp_cons = 0;
-        cqe_ring_prod = ring_prod = 0;
-
-        /* This routine is called only during fo init so
-         * fp->eth_q_stats.rx_skb_alloc_failed = 0
-         */
-        for (i = 0; i < rx_ring_size; i++) {
-                if (bnx2x_alloc_rx_data(bp, fp, ring_prod) < 0) {
-                        failure_cnt++;
-                        continue;
-                }
-                ring_prod = NEXT_RX_IDX(ring_prod);
-                cqe_ring_prod = NEXT_RCQ_IDX(cqe_ring_prod);
-                WARN_ON(ring_prod <= (i - failure_cnt));
-        }
-
-        if (failure_cnt)
-                BNX2X_ERR("was only able to allocate %d rx skbs on queue[%d]\n",
-                          i - failure_cnt, fp->index);
-
-        fp->rx_bd_prod = ring_prod;
-        /* Limit the CQE producer by the CQE ring size */
-        fp->rx_comp_prod = min_t(u16, NUM_RCQ_RINGS*RCQ_DESC_CNT,
-                               cqe_ring_prod);
-        fp->rx_pkt = fp->rx_calls = 0;
-
-        fp->eth_q_stats.rx_skb_alloc_failed += failure_cnt;
-
-        return i - failure_cnt;
-}
-
 /* Statistics ID are global per chip/path, while Client IDs for E1x are per
  * port.
  */
@@ -1406,30 +1180,6 @@ static inline void __storm_memset_struct(struct bnx2x *bp,
                 REG_WR(bp, addr + (i * 4), data[i]);
 }
 
-static inline void storm_memset_func_cfg(struct bnx2x *bp,
-                                struct tstorm_eth_function_common_config *tcfg,
-                                u16 abs_fid)
-{
-        size_t size = sizeof(struct tstorm_eth_function_common_config);
-
-        u32 addr = BAR_TSTRORM_INTMEM +
-                        TSTORM_FUNCTION_COMMON_CONFIG_OFFSET(abs_fid);
-
-        __storm_memset_struct(bp, addr, size, (u32 *)tcfg);
-}
-
-static inline void storm_memset_cmng(struct bnx2x *bp,
-                                struct cmng_struct_per_port *cmng,
-                                u8 port)
-{
-        size_t size = sizeof(struct cmng_struct_per_port);
-
-        u32 addr = BAR_XSTRORM_INTMEM +
-                        XSTORM_CMNG_PER_PORT_VARS_OFFSET(port);
-
-        __storm_memset_struct(bp, addr, size, (u32 *)cmng);
-}
-
 /**
  * bnx2x_wait_sp_comp - wait for the outstanding SP commands.
  *
@@ -1512,93 +1262,6 @@ static inline bool bnx2x_mtu_allows_gro(int mtu)
          */
         return mtu <= SGE_PAGE_SIZE && (U_ETH_SGL_SIZE * fpp) <= MAX_SKB_FRAGS;
 }
-
-static inline bool bnx2x_need_gro_check(int mtu)
-{
-        return (SGE_PAGES / (mtu - ETH_MAX_TPA_HEADER_SIZE - 1)) !=
-                (SGE_PAGES / (mtu - ETH_MIN_TPA_HEADER_SIZE + 1));
-}
-
-/**
- * bnx2x_bz_fp - zero content of the fastpath structure.
- *
- * @bp:         driver handle
- * @index:      fastpath index to be zeroed
- *
- * Makes sure the contents of the bp->fp[index].napi is kept
- * intact.
- */
-static inline void bnx2x_bz_fp(struct bnx2x *bp, int index)
-{
-        struct bnx2x_fastpath *fp = &bp->fp[index];
-        struct napi_struct orig_napi = fp->napi;
-        /* bzero bnx2x_fastpath contents */
-        if (bp->stats_init)
-                memset(fp, 0, sizeof(*fp));
-        else {
-                /* Keep Queue statistics */
-                struct bnx2x_eth_q_stats *tmp_eth_q_stats;
-                struct bnx2x_eth_q_stats_old *tmp_eth_q_stats_old;
-
-                tmp_eth_q_stats = kzalloc(sizeof(struct bnx2x_eth_q_stats),
-                                          GFP_KERNEL);
-                if (tmp_eth_q_stats)
-                        memcpy(tmp_eth_q_stats, &fp->eth_q_stats,
-                               sizeof(struct bnx2x_eth_q_stats));
-
-                tmp_eth_q_stats_old =
-                        kzalloc(sizeof(struct bnx2x_eth_q_stats_old),
-                                GFP_KERNEL);
-                if (tmp_eth_q_stats_old)
-                        memcpy(tmp_eth_q_stats_old, &fp->eth_q_stats_old,
-                               sizeof(struct bnx2x_eth_q_stats_old));
-
-                memset(fp, 0, sizeof(*fp));
-
-                if (tmp_eth_q_stats) {
-                        memcpy(&fp->eth_q_stats, tmp_eth_q_stats,
-                                   sizeof(struct bnx2x_eth_q_stats));
-                        kfree(tmp_eth_q_stats);
-                }
-
-                if (tmp_eth_q_stats_old) {
-                        memcpy(&fp->eth_q_stats_old, tmp_eth_q_stats_old,
-                               sizeof(struct bnx2x_eth_q_stats_old));
-                        kfree(tmp_eth_q_stats_old);
-                }
-
-        }
-
-        /* Restore the NAPI object as it has been already initialized */
-        fp->napi = orig_napi;
-
-        fp->bp = bp;
-        fp->index = index;
-        if (IS_ETH_FP(fp))
-                fp->max_cos = bp->max_cos;
-        else
-                /* Special queues support only one CoS */
-                fp->max_cos = 1;
-
-        /*
-         * set the tpa flag for each queue. The tpa flag determines the queue
-         * minimal size so it must be set prior to queue memory allocation
-         */
-        fp->disable_tpa = !(bp->flags & TPA_ENABLE_FLAG ||
-                                  (bp->flags & GRO_ENABLE_FLAG &&
-                                   bnx2x_mtu_allows_gro(bp->dev->mtu)));
-        if (bp->flags & TPA_ENABLE_FLAG)
-                fp->mode = TPA_MODE_LRO;
-        else if (bp->flags & GRO_ENABLE_FLAG)
-                fp->mode = TPA_MODE_GRO;
-
-#ifdef BCM_CNIC
-        /* We don't want TPA on an FCoE L2 ring */
-        if (IS_FCOE_FP(fp))
-                fp->disable_tpa = 1;
-#endif
-}
-
 #ifdef BCM_CNIC
 /**
  * bnx2x_get_iscsi_info - update iSCSI params according to licensing info.
@@ -1608,11 +1271,6 @@ static inline void bnx2x_bz_fp(struct bnx2x *bp, int index)
  */
 void bnx2x_get_iscsi_info(struct bnx2x *bp);
 #endif
-/* returns func by VN for current port */
-static inline int func_by_vn(struct bnx2x *bp, int vn)
-{
-        return 2 * vn + BP_PORT(bp);
-}
 
 /**
  * bnx2x_link_sync_notify - send notification to other functions.
@@ -1667,7 +1325,8 @@ static inline bool bnx2x_is_valid_ether_addr(struct bnx2x *bp, u8 *addr)
         if (is_valid_ether_addr(addr))
                 return true;
 #ifdef BCM_CNIC
-        if (is_zero_ether_addr(addr) && IS_MF_STORAGE_SD(bp))
+        if (is_zero_ether_addr(addr) &&
+            (IS_MF_STORAGE_SD(bp) || IS_MF_FCOE_AFEX(bp)))
                 return true;
 #endif
         return false;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 2cc0a1703970..ddc18ee5c5ae 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -22,13 +22,10 @@
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/crc32.h>
-
-
 #include "bnx2x.h"
 #include "bnx2x_cmn.h"
 #include "bnx2x_dump.h"
 #include "bnx2x_init.h"
-#include "bnx2x_sp.h"
 
 /* Note: in the format strings below %s is replaced by the queue-name which is
  * either its index or 'fcoe' for the fcoe queue. Make sure the format string
@@ -595,8 +592,8 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 #define IS_E3_ONLINE(info)      (((info) & RI_E3_ONLINE) == RI_E3_ONLINE)
 #define IS_E3B0_ONLINE(info)    (((info) & RI_E3B0_ONLINE) == RI_E3B0_ONLINE)
 
-static inline bool bnx2x_is_reg_online(struct bnx2x *bp,
-                                       const struct reg_addr *reg_info)
+static bool bnx2x_is_reg_online(struct bnx2x *bp,
+                                const struct reg_addr *reg_info)
 {
         if (CHIP_IS_E1(bp))
                 return IS_E1_ONLINE(reg_info->info);
@@ -613,7 +610,7 @@ static inline bool bnx2x_is_reg_online(struct bnx2x *bp,
 }
 
 /******* Paged registers info selectors ********/
-static inline const u32 *__bnx2x_get_page_addr_ar(struct bnx2x *bp)
+static const u32 *__bnx2x_get_page_addr_ar(struct bnx2x *bp)
 {
         if (CHIP_IS_E2(bp))
                 return page_vals_e2;
@@ -623,7 +620,7 @@ static inline const u32 *__bnx2x_get_page_addr_ar(struct bnx2x *bp)
                 return NULL;
 }
 
-static inline u32 __bnx2x_get_page_reg_num(struct bnx2x *bp)
+static u32 __bnx2x_get_page_reg_num(struct bnx2x *bp)
 {
         if (CHIP_IS_E2(bp))
                 return PAGE_MODE_VALUES_E2;
@@ -633,7 +630,7 @@ static inline u32 __bnx2x_get_page_reg_num(struct bnx2x *bp)
                 return 0;
 }
 
-static inline const u32 *__bnx2x_get_page_write_ar(struct bnx2x *bp)
+static const u32 *__bnx2x_get_page_write_ar(struct bnx2x *bp)
 {
         if (CHIP_IS_E2(bp))
                 return page_write_regs_e2;
@@ -643,7 +640,7 @@ static inline const u32 *__bnx2x_get_page_write_ar(struct bnx2x *bp)
                 return NULL;
 }
 
-static inline u32 __bnx2x_get_page_write_num(struct bnx2x *bp)
+static u32 __bnx2x_get_page_write_num(struct bnx2x *bp)
 {
         if (CHIP_IS_E2(bp))
                 return PAGE_WRITE_REGS_E2;
@@ -653,7 +650,7 @@ static inline u32 __bnx2x_get_page_write_num(struct bnx2x *bp)
                 return 0;
 }
 
-static inline const struct reg_addr *__bnx2x_get_page_read_ar(struct bnx2x *bp)
+static const struct reg_addr *__bnx2x_get_page_read_ar(struct bnx2x *bp)
 {
         if (CHIP_IS_E2(bp))
                 return page_read_regs_e2;
@@ -663,7 +660,7 @@ static inline const struct reg_addr *__bnx2x_get_page_read_ar(struct bnx2x *bp)
                 return NULL;
 }
 
-static inline u32 __bnx2x_get_page_read_num(struct bnx2x *bp)
+static u32 __bnx2x_get_page_read_num(struct bnx2x *bp)
 {
         if (CHIP_IS_E2(bp))
                 return PAGE_READ_REGS_E2;
@@ -673,7 +670,7 @@ static inline u32 __bnx2x_get_page_read_num(struct bnx2x *bp)
                 return 0;
 }
 
-static inline int __bnx2x_get_regs_len(struct bnx2x *bp)
+static int __bnx2x_get_regs_len(struct bnx2x *bp)
 {
         int num_pages = __bnx2x_get_page_reg_num(bp);
         int page_write_num = __bnx2x_get_page_write_num(bp);
@@ -718,7 +715,7 @@ static int bnx2x_get_regs_len(struct net_device *dev)
  * ("read address"). There may be more than one write address per "page" and
  * more than one read address per write address.
  */
-static inline void bnx2x_read_pages_regs(struct bnx2x *bp, u32 *p)
+static void bnx2x_read_pages_regs(struct bnx2x *bp, u32 *p)
 {
         u32 i, j, k, n;
         /* addresses of the paged registers */
@@ -747,7 +744,7 @@ static inline void bnx2x_read_pages_regs(struct bnx2x *bp, u32 *p)
         }
 }
 
-static inline void __bnx2x_get_regs(struct bnx2x *bp, u32 *p)
+static void __bnx2x_get_regs(struct bnx2x *bp, u32 *p)
 {
         u32 i, j;
 
@@ -1433,7 +1430,7 @@ static void bnx2x_get_ringparam(struct net_device *dev,
         else
                 ering->rx_pending = MAX_RX_AVAIL;
 
-        ering->tx_max_pending = MAX_TX_AVAIL;
+        ering->tx_max_pending = IS_MF_FCOE_AFEX(bp) ? 0 : MAX_TX_AVAIL;
         ering->tx_pending = bp->tx_ring_size;
 }
 
@@ -1451,7 +1448,7 @@ static int bnx2x_set_ringparam(struct net_device *dev,
         if ((ering->rx_pending > MAX_RX_AVAIL) ||
             (ering->rx_pending < (bp->disable_tpa ? MIN_RX_SIZE_NONTPA :
                                                     MIN_RX_SIZE_TPA)) ||
-            (ering->tx_pending > MAX_TX_AVAIL) ||
+            (ering->tx_pending > (IS_MF_FCOE_AFEX(bp) ? 0 : MAX_TX_AVAIL)) ||
             (ering->tx_pending <= MAX_SKB_FRAGS + 4)) {
                 DP(BNX2X_MSG_ETHTOOL, "Command parameters not supported\n");
                 return -EINVAL;
@@ -2212,7 +2209,7 @@ static void bnx2x_self_test(struct net_device *dev,
 /* ethtool statistics are displayed for all regular ethernet queues and the
  * fcoe L2 queue if not disabled
  */
-static inline int bnx2x_num_stat_queues(struct bnx2x *bp)
+static int bnx2x_num_stat_queues(struct bnx2x *bp)
 {
         return BNX2X_NUM_ETH_QUEUES(bp);
 }
@@ -2396,10 +2393,7 @@ static int bnx2x_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,
 
 static u32 bnx2x_get_rxfh_indir_size(struct net_device *dev)
 {
-        struct bnx2x *bp = netdev_priv(dev);
-
-        return (bp->multi_mode == ETH_RSS_MODE_DISABLED ?
-                0 : T_ETH_INDIRECTION_TABLE_SIZE);
+        return T_ETH_INDIRECTION_TABLE_SIZE;
 }
 
 static int bnx2x_get_rxfh_indir(struct net_device *dev, u32 *indir)
@@ -2445,7 +2439,7 @@ static int bnx2x_set_rxfh_indir(struct net_device *dev, const u32 *indir)
                 ind_table[i] = indir[i] + bp->fp->cl_id;
         }
 
-        return bnx2x_config_rss_pf(bp, ind_table, false);
+        return bnx2x_config_rss_eth(bp, ind_table, false);
 }
 
 static const struct ethtool_ops bnx2x_ethtool_ops = {
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
index b9b263323436..426f77aa721a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
@@ -387,7 +387,7 @@
 
 #define STATS_QUERY_CMD_COUNT 16
 
-#define NIV_LIST_TABLE_SIZE 4096
+#define AFEX_LIST_TABLE_SIZE 4096
 
 #define INVALID_VNIC_ID 0xFF
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
index dbff5915b81a..a440a8ba85f2 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
@@ -833,6 +833,7 @@ struct shared_feat_cfg {		 /* NVRAM Offset */
                 #define SHARED_FEAT_CFG_FORCE_SF_MODE_FORCED_SF      0x00000100
                 #define SHARED_FEAT_CFG_FORCE_SF_MODE_SPIO4          0x00000200
                 #define SHARED_FEAT_CFG_FORCE_SF_MODE_SWITCH_INDEPT  0x00000300
+                #define SHARED_FEAT_CFG_FORCE_SF_MODE_AFEX_MODE      0x00000400
 
         /* The interval in seconds between sending LLDP packets. Set to zero
            to disable the feature */
@@ -1235,6 +1236,8 @@ struct drv_func_mb {
         #define REQ_BC_VER_4_VRFY_FIRST_PHY_OPT_MDL     0x00050006
         #define DRV_MSG_CODE_VRFY_SPECIFIC_PHY_OPT_MDL  0xa1000000
         #define REQ_BC_VER_4_VRFY_SPECIFIC_PHY_OPT_MDL  0x00050234
+        #define DRV_MSG_CODE_VRFY_AFEX_SUPPORTED        0xa2000000
+        #define REQ_BC_VER_4_VRFY_AFEX_SUPPORTED        0x00070002
         #define REQ_BC_VER_4_SFP_TX_DISABLE_SUPPORTED   0x00070014
         #define REQ_BC_VER_4_PFC_STATS_SUPPORTED        0x00070201
 
@@ -1242,6 +1245,13 @@ struct drv_func_mb {
         #define DRV_MSG_CODE_DCBX_PMF_DRV_OK            0xb2000000
 
         #define DRV_MSG_CODE_VF_DISABLED_DONE           0xc0000000
+
+        #define DRV_MSG_CODE_AFEX_DRIVER_SETMAC         0xd0000000
+        #define DRV_MSG_CODE_AFEX_LISTGET_ACK           0xd1000000
+        #define DRV_MSG_CODE_AFEX_LISTSET_ACK           0xd2000000
+        #define DRV_MSG_CODE_AFEX_STATSGET_ACK          0xd3000000
+        #define DRV_MSG_CODE_AFEX_VIFSET_ACK            0xd4000000
+
         #define DRV_MSG_CODE_DRV_INFO_ACK               0xd8000000
         #define DRV_MSG_CODE_DRV_INFO_NACK              0xd9000000
 
@@ -1299,6 +1309,14 @@ struct drv_func_mb {
         #define FW_MSG_CODE_VRFY_OPT_MDL_INVLD_IMG      0xa0200000
         #define FW_MSG_CODE_VRFY_OPT_MDL_UNAPPROVED     0xa0300000
         #define FW_MSG_CODE_VF_DISABLED_DONE            0xb0000000
+        #define FW_MSG_CODE_HW_SET_INVALID_IMAGE        0xb0100000
+
+        #define FW_MSG_CODE_AFEX_DRIVER_SETMAC_DONE     0xd0100000
+        #define FW_MSG_CODE_AFEX_LISTGET_ACK            0xd1100000
+        #define FW_MSG_CODE_AFEX_LISTSET_ACK            0xd2100000
+        #define FW_MSG_CODE_AFEX_STATSGET_ACK           0xd3100000
+        #define FW_MSG_CODE_AFEX_VIFSET_ACK             0xd4100000
+
         #define FW_MSG_CODE_DRV_INFO_ACK                0xd8100000
         #define FW_MSG_CODE_DRV_INFO_NACK               0xd9100000
 
@@ -1357,6 +1375,12 @@ struct drv_func_mb {
 
         #define DRV_STATUS_DCBX_EVENT_MASK              0x000f0000
         #define DRV_STATUS_DCBX_NEGOTIATION_RESULTS     0x00010000
+        #define DRV_STATUS_AFEX_EVENT_MASK              0x03f00000
+        #define DRV_STATUS_AFEX_LISTGET_REQ             0x00100000
+        #define DRV_STATUS_AFEX_LISTSET_REQ             0x00200000
+        #define DRV_STATUS_AFEX_STATSGET_REQ            0x00400000
+        #define DRV_STATUS_AFEX_VIFSET_REQ              0x00800000
+
         #define DRV_STATUS_DRV_INFO_REQ                 0x04000000
 
         u32 virt_mac_upper;
@@ -1448,7 +1472,26 @@ struct func_mf_cfg {
         #define FUNC_MF_CFG_E1HOV_TAG_SHIFT             0
         #define FUNC_MF_CFG_E1HOV_TAG_DEFAULT         FUNC_MF_CFG_E1HOV_TAG_MASK
 
-        u32 reserved[2];
+        /* afex default VLAN ID - 12 bits */
+        #define FUNC_MF_CFG_AFEX_VLAN_MASK              0x0fff0000
+        #define FUNC_MF_CFG_AFEX_VLAN_SHIFT             16
+
+        u32 afex_config;
+        #define FUNC_MF_CFG_AFEX_COS_FILTER_MASK                     0x000000ff
+        #define FUNC_MF_CFG_AFEX_COS_FILTER_SHIFT                    0
+        #define FUNC_MF_CFG_AFEX_MBA_ENABLED_MASK                    0x0000ff00
+        #define FUNC_MF_CFG_AFEX_MBA_ENABLED_SHIFT                   8
+        #define FUNC_MF_CFG_AFEX_MBA_ENABLED_VAL                     0x00000100
+        #define FUNC_MF_CFG_AFEX_VLAN_MODE_MASK                      0x000f0000
+        #define FUNC_MF_CFG_AFEX_VLAN_MODE_SHIFT                     16
+
+        u32 reserved;
+};
+
+enum mf_cfg_afex_vlan_mode {
+        FUNC_MF_CFG_AFEX_VLAN_TRUNK_MODE = 0,
+        FUNC_MF_CFG_AFEX_VLAN_ACCESS_MODE,
+        FUNC_MF_CFG_AFEX_VLAN_TRUNK_TAG_NATIVE_MODE
 };
 
 /* This structure is not applicable and should not be accessed on 57711 */
@@ -1945,18 +1988,29 @@ struct shmem2_region {
 
         u32 nvm_retain_bitmap_addr;                     /* 0x0070 */
 
-        u32     reserved1;      /* 0x0074 */
+        /* afex support of that driver */
+        u32 afex_driver_support;                        /* 0x0074 */
+        #define SHMEM_AFEX_VERSION_MASK                  0x100f
+        #define SHMEM_AFEX_SUPPORTED_VERSION_ONE         0x1001
+        #define SHMEM_AFEX_REDUCED_DRV_LOADED            0x8000
 
-        u32     reserved2[E2_FUNC_MAX];
+        /* driver receives addr in scratchpad to which it should respond */
+        u32 afex_scratchpad_addr_to_write[E2_FUNC_MAX];
 
-        u32     reserved3[E2_FUNC_MAX];/* 0x0088 */
-        u32     reserved4[E2_FUNC_MAX];/* 0x0098 */
+        /* generic params from MCP to driver (value depends on the msg sent
+         * to driver
+         */
+        u32 afex_param1_to_driver[E2_FUNC_MAX];         /* 0x0088 */
+        u32 afex_param2_to_driver[E2_FUNC_MAX];         /* 0x0098 */
 
         u32 swim_base_addr;                             /* 0x0108 */
         u32 swim_funcs;
         u32 swim_main_cb;
 
-        u32     reserved5[2];
+        /* bitmap notifying which VIF profiles stored in nvram are enabled by
+         * switch
+         */
+        u32 afex_profiles_enabled[2];
 
         /* generic flags controlled by the driver */
         u32 drv_flags;
@@ -2696,10 +2750,51 @@ union drv_info_to_mcp {
         struct fcoe_stats_info  fcoe_stat;
         struct iscsi_stats_info iscsi_stat;
 };
+
+/* stats collected for afex.
+ * NOTE: structure is exactly as expected to be received by the switch.
+ *       order must remain exactly as is unless protocol changes !
+ */
+struct afex_stats {
+        u32 tx_unicast_frames_hi;
+        u32 tx_unicast_frames_lo;
+        u32 tx_unicast_bytes_hi;
+        u32 tx_unicast_bytes_lo;
+        u32 tx_multicast_frames_hi;
+        u32 tx_multicast_frames_lo;
+        u32 tx_multicast_bytes_hi;
+        u32 tx_multicast_bytes_lo;
+        u32 tx_broadcast_frames_hi;
+        u32 tx_broadcast_frames_lo;
+        u32 tx_broadcast_bytes_hi;
+        u32 tx_broadcast_bytes_lo;
+        u32 tx_frames_discarded_hi;
+        u32 tx_frames_discarded_lo;
+        u32 tx_frames_dropped_hi;
+        u32 tx_frames_dropped_lo;
+
+        u32 rx_unicast_frames_hi;
+        u32 rx_unicast_frames_lo;
+        u32 rx_unicast_bytes_hi;
+        u32 rx_unicast_bytes_lo;
+        u32 rx_multicast_frames_hi;
+        u32 rx_multicast_frames_lo;
+        u32 rx_multicast_bytes_hi;
+        u32 rx_multicast_bytes_lo;
+        u32 rx_broadcast_frames_hi;
+        u32 rx_broadcast_frames_lo;
+        u32 rx_broadcast_bytes_hi;
+        u32 rx_broadcast_bytes_lo;
+        u32 rx_frames_discarded_hi;
+        u32 rx_frames_discarded_lo;
+        u32 rx_frames_dropped_hi;
+        u32 rx_frames_dropped_lo;
+};
+
 #define BCM_5710_FW_MAJOR_VERSION                       7
 #define BCM_5710_FW_MINOR_VERSION                       2
-#define BCM_5710_FW_REVISION_VERSION            16
-#define BCM_5710_FW_ENGINEERING_VERSION         0
+#define BCM_5710_FW_REVISION_VERSION                    51
+#define BCM_5710_FW_ENGINEERING_VERSION                 0
 #define BCM_5710_FW_COMPILE_FLAGS                       1
 
 
@@ -3389,7 +3484,7 @@ struct client_init_tx_data {
 #define CLIENT_INIT_TX_DATA_RESERVED1 (0xFFF<<4)
 #define CLIENT_INIT_TX_DATA_RESERVED1_SHIFT 4
         u8 default_vlan_flg;
-        u8 reserved2;
+        u8 force_default_pri_flg;
         __le32 reserved3;
 };
 
@@ -4375,8 +4470,21 @@ struct fcoe_statistics_params {
 
 
 /*
+ * The data afex vif list ramrod need
+ */
+struct afex_vif_list_ramrod_data {
+        u8 afex_vif_list_command;
+        u8 func_bit_map;
+        __le16 vif_list_index;
+        u8 func_to_clear;
+        u8 echo;
+        __le16 reserved1;
+};
+
+
+/*
  * cfc delete event data
-*/
+ */
 struct cfc_del_event_data {
         u32 cid;
         u32 reserved0;
@@ -4448,6 +4556,65 @@ struct cmng_struct_per_port {
         struct cmng_flags_per_port flags;
 };
 
+/*
+ * a single rate shaping counter. can be used as protocol or vnic counter
+ */
+struct rate_shaping_counter {
+        u32 quota;
+#if defined(__BIG_ENDIAN)
+        u16 __reserved0;
+        u16 rate;
+#elif defined(__LITTLE_ENDIAN)
+        u16 rate;
+        u16 __reserved0;
+#endif
+};
+
+/*
+ * per-vnic rate shaping variables
+ */
+struct rate_shaping_vars_per_vn {
+        struct rate_shaping_counter vn_counter;
+};
+
+/*
+ * per-vnic fairness variables
+ */
+struct fairness_vars_per_vn {
+        u32 cos_credit_delta[MAX_COS_NUMBER];
+        u32 vn_credit_delta;
+        u32 __reserved0;
+};
+
+/*
+ * cmng port init state
+ */
+struct cmng_vnic {
+        struct rate_shaping_vars_per_vn vnic_max_rate[4];
+        struct fairness_vars_per_vn vnic_min_rate[4];
+};
+
+/*
+ * cmng port init state
+ */
+struct cmng_init {
+        struct cmng_struct_per_port port;
+        struct cmng_vnic vnic;
+};
+
+
+/*
+ * driver parameters for congestion management init, all rates are in Mbps
+ */
+struct cmng_init_input {
+        u32 port_rate;
+        u16 vnic_min_rate[4];
+        u16 vnic_max_rate[4];
+        u16 cos_min_rate[MAX_COS_NUMBER];
+        u16 cos_to_pause_mask[MAX_COS_NUMBER];
+        struct cmng_flags_per_port flags;
+};
+
 
 /*
  * Protocol-common command ID for slow path elements
@@ -4462,7 +4629,7 @@ enum common_spqe_cmd_id {
         RAMROD_CMD_ID_COMMON_STAT_QUERY,
         RAMROD_CMD_ID_COMMON_STOP_TRAFFIC,
         RAMROD_CMD_ID_COMMON_START_TRAFFIC,
-        RAMROD_CMD_ID_COMMON_RESERVED1,
+        RAMROD_CMD_ID_COMMON_AFEX_VIF_LISTS,
         MAX_COMMON_SPQE_CMD_ID
 };
 
@@ -4670,6 +4837,17 @@ struct malicious_vf_event_data {
 };
 
 /*
+ * vif list event data
+ */
+struct vif_list_event_data {
+        u8 func_bit_map;
+        u8 echo;
+        __le16 reserved0;
+        __le32 reserved1;
+        __le32 reserved2;
+};
+
+/*
  * union for all event ring message types
  */
 union event_data {
@@ -4678,6 +4856,7 @@ union event_data {
         struct cfc_del_event_data cfc_del_event;
         struct vf_flr_event_data vf_flr_event;
         struct malicious_vf_event_data malicious_vf_event;
+        struct vif_list_event_data vif_list_event;
 };
 
 
@@ -4743,7 +4922,7 @@ enum event_ring_opcode {
         EVENT_RING_OPCODE_FORWARD_SETUP,
         EVENT_RING_OPCODE_RSS_UPDATE_RULES,
         EVENT_RING_OPCODE_FUNCTION_UPDATE,
-        EVENT_RING_OPCODE_RESERVED1,
+        EVENT_RING_OPCODE_AFEX_VIF_LISTS,
         EVENT_RING_OPCODE_SET_MAC,
         EVENT_RING_OPCODE_CLASSIFICATION_RULES,
         EVENT_RING_OPCODE_FILTERS_RULES,
@@ -4763,16 +4942,6 @@ enum fairness_mode {
 
 
 /*
- * per-vnic fairness variables
- */
-struct fairness_vars_per_vn {
-        u32 cos_credit_delta[MAX_COS_NUMBER];
-        u32 vn_credit_delta;
-        u32 __reserved0;
-};
-
-
-/*
  * Priority and cos
  */
 struct priority_cos {
@@ -4800,12 +4969,27 @@ struct flow_control_configuration {
 struct function_start_data {
         __le16 function_mode;
         __le16 sd_vlan_tag;
-        u16 reserved;
+        __le16 vif_id;
         u8 path_id;
         u8 network_cos_mode;
 };
 
 
+struct function_update_data {
+        u8 vif_id_change_flg;
+        u8 afex_default_vlan_change_flg;
+        u8 allowed_priorities_change_flg;
+        u8 network_cos_mode_change_flg;
+        __le16 vif_id;
+        __le16 afex_default_vlan;
+        u8 allowed_priorities;
+        u8 network_cos_mode;
+        u8 lb_mode_en;
+        u8 reserved0;
+        __le32 reserved1;
+};
+
+
 /*
  * FW version stored in the Xstorm RAM
  */
@@ -5003,7 +5187,7 @@ enum mf_mode {
         SINGLE_FUNCTION,
         MULTI_FUNCTION_SD,
         MULTI_FUNCTION_SI,
-        MULTI_FUNCTION_RESERVED,
+        MULTI_FUNCTION_AFEX,
         MAX_MF_MODE
 };
 
@@ -5128,6 +5312,7 @@ union protocol_common_specific_data {
         u8 protocol_data[8];
         struct regpair phy_address;
         struct regpair mac_config_addr;
+        struct afex_vif_list_ramrod_data afex_vif_list_data;
 };
 
 /*
@@ -5140,29 +5325,6 @@ struct protocol_common_spe {
 
 
 /*
- * a single rate shaping counter. can be used as protocol or vnic counter
- */
-struct rate_shaping_counter {
-        u32 quota;
-#if defined(__BIG_ENDIAN)
-        u16 __reserved0;
-        u16 rate;
-#elif defined(__LITTLE_ENDIAN)
-        u16 rate;
-        u16 __reserved0;
-#endif
-};
-
-
-/*
- * per-vnic rate shaping variables
- */
-struct rate_shaping_vars_per_vn {
-        struct rate_shaping_counter vn_counter;
-};
-
-
-/*
  * The send queue element
  */
 struct slow_path_element {
@@ -5330,6 +5492,18 @@ enum vf_pf_channel_state {
 
 
 /*
+ * vif_list_rule_kind
+ */
+enum vif_list_rule_kind {
+        VIF_LIST_RULE_SET,
+        VIF_LIST_RULE_GET,
+        VIF_LIST_RULE_CLEAR_ALL,
+        VIF_LIST_RULE_CLEAR_FUNC,
+        MAX_VIF_LIST_RULE_KIND
+};
+
+
+/*
  * zone A per-queue data
  */
 struct xstorm_queue_zone_data {
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h
index 29f5c3cca31a..559c396d45cc 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h
@@ -125,7 +125,7 @@ enum {
         MODE_MF                        = 0x00000100,
         MODE_MF_SD                     = 0x00000200,
         MODE_MF_SI                     = 0x00000400,
-        MODE_MF_NIV                    = 0x00000800,
+        MODE_MF_AFEX                   = 0x00000800,
         MODE_E3_A0                     = 0x00001000,
         MODE_E3_B0                     = 0x00002000,
         MODE_COS3                      = 0x00004000,
@@ -241,7 +241,8 @@ static inline void bnx2x_map_q_cos(struct bnx2x *bp, u32 q_num, u32 new_cos)
                         REG_WR(bp, reg_addr, reg_bit_map | q_bit_map);
 
                         /* set/clear queue bit in command-queue bit map
-                        (E2/E3A0 only, valid COS values are 0/1) */
+                         * (E2/E3A0 only, valid COS values are 0/1)
+                         */
                         if (!(INIT_MODE_FLAGS(bp) & MODE_E3_B0)) {
                                 reg_addr = BNX2X_Q_CMDQ_REG_ADDR(pf_q_num);
                                 reg_bit_map = REG_RD(bp, reg_addr);
@@ -277,7 +278,215 @@ static inline void bnx2x_dcb_config_qm(struct bnx2x *bp, enum cos_mode mode,
 }
 
 
-/* Returns the index of start or end of a specific block stage in ops array*/
+/* congestion managment port init api description
+ * the api works as follows:
+ * the driver should pass the cmng_init_input struct, the port_init function
+ * will prepare the required internal ram structure which will be passed back
+ * to the driver (cmng_init) that will write it into the internal ram.
+ *
+ * IMPORTANT REMARKS:
+ * 1. the cmng_init struct does not represent the contiguous internal ram
+ *    structure. the driver should use the XSTORM_CMNG_PERPORT_VARS_OFFSET
+ *    offset in order to write the port sub struct and the
+ *    PFID_FROM_PORT_AND_VNIC offset for writing the vnic sub struct (in other
+ *    words - don't use memcpy!).
+ * 2. although the cmng_init struct is filled for the maximal vnic number
+ *    possible, the driver should only write the valid vnics into the internal
+ *    ram according to the appropriate port mode.
+ */
+#define BITS_TO_BYTES(x) ((x)/8)
+
+/* CMNG constants, as derived from system spec calculations */
+
+/* default MIN rate in case VNIC min rate is configured to zero- 100Mbps */
+#define DEF_MIN_RATE 100
+
+/* resolution of the rate shaping timer - 400 usec */
+#define RS_PERIODIC_TIMEOUT_USEC 400
+
+/* number of bytes in single QM arbitration cycle -
+ * coefficient for calculating the fairness timer
+ */
+#define QM_ARB_BYTES 160000
+
+/* resolution of Min algorithm 1:100 */
+#define MIN_RES 100
+
+/* how many bytes above threshold for
+ * the minimal credit of Min algorithm
+ */
+#define MIN_ABOVE_THRESH 32768
+
+/* Fairness algorithm integration time coefficient -
+ * for calculating the actual Tfair
+ */
+#define T_FAIR_COEF ((MIN_ABOVE_THRESH + QM_ARB_BYTES) * 8 * MIN_RES)
+
+/* Memory of fairness algorithm - 2 cycles */
+#define FAIR_MEM 2
+#define SAFC_TIMEOUT_USEC 52
+
+#define SDM_TICKS 4
+
+
+static inline void bnx2x_init_max(const struct cmng_init_input *input_data,
+                                  u32 r_param, struct cmng_init *ram_data)
+{
+        u32 vnic;
+        struct cmng_vnic *vdata = &ram_data->vnic;
+        struct cmng_struct_per_port *pdata = &ram_data->port;
+        /* rate shaping per-port variables
+         * 100 micro seconds in SDM ticks = 25
+         * since each tick is 4 microSeconds
+         */
+
+        pdata->rs_vars.rs_periodic_timeout =
+        RS_PERIODIC_TIMEOUT_USEC / SDM_TICKS;
+
+        /* this is the threshold below which no timer arming will occur.
+         * 1.25 coefficient is for the threshold to be a little bigger
+         * then the real time to compensate for timer in-accuracy
+         */
+        pdata->rs_vars.rs_threshold =
+        (5 * RS_PERIODIC_TIMEOUT_USEC * r_param)/4;
+
+        /* rate shaping per-vnic variables */
+        for (vnic = 0; vnic < BNX2X_PORT2_MODE_NUM_VNICS; vnic++) {
+                /* global vnic counter */
+                vdata->vnic_max_rate[vnic].vn_counter.rate =
+                input_data->vnic_max_rate[vnic];
+                /* maximal Mbps for this vnic
+                 * the quota in each timer period - number of bytes
+                 * transmitted in this period
+                 */
+                vdata->vnic_max_rate[vnic].vn_counter.quota =
+                        RS_PERIODIC_TIMEOUT_USEC *
+                        (u32)vdata->vnic_max_rate[vnic].vn_counter.rate / 8;
+        }
+
+}
+
+static inline void bnx2x_init_min(const struct cmng_init_input *input_data,
+                                  u32 r_param, struct cmng_init *ram_data)
+{
+        u32 vnic, fair_periodic_timeout_usec, vnicWeightSum, tFair;
+        struct cmng_vnic *vdata = &ram_data->vnic;
+        struct cmng_struct_per_port *pdata = &ram_data->port;
+
+        /* this is the resolution of the fairness timer */
+        fair_periodic_timeout_usec = QM_ARB_BYTES / r_param;
+
+        /* fairness per-port variables
+         * for 10G it is 1000usec. for 1G it is 10000usec.
+         */
+        tFair = T_FAIR_COEF / input_data->port_rate;
+
+        /* this is the threshold below which we won't arm the timer anymore */
+        pdata->fair_vars.fair_threshold = QM_ARB_BYTES;
+
+        /* we multiply by 1e3/8 to get bytes/msec. We don't want the credits
+         * to pass a credit of the T_FAIR*FAIR_MEM (algorithm resolution)
+         */
+        pdata->fair_vars.upper_bound = r_param * tFair * FAIR_MEM;
+
+        /* since each tick is 4 microSeconds */
+        pdata->fair_vars.fairness_timeout =
+                                fair_periodic_timeout_usec / SDM_TICKS;
+
+        /* calculate sum of weights */
+        vnicWeightSum = 0;
+
+        for (vnic = 0; vnic < BNX2X_PORT2_MODE_NUM_VNICS; vnic++)
+                vnicWeightSum += input_data->vnic_min_rate[vnic];
+
+        /* global vnic counter */
+        if (vnicWeightSum > 0) {
+                /* fairness per-vnic variables */
+                for (vnic = 0; vnic < BNX2X_PORT2_MODE_NUM_VNICS; vnic++) {
+                        /* this is the credit for each period of the fairness
+                         * algorithm - number of bytes in T_FAIR (this vnic
+                         * share of the port rate)
+                         */
+                        vdata->vnic_min_rate[vnic].vn_credit_delta =
+                                (u32)input_data->vnic_min_rate[vnic] * 100 *
+                                (T_FAIR_COEF / (8 * 100 * vnicWeightSum));
+                        if (vdata->vnic_min_rate[vnic].vn_credit_delta <
+                            pdata->fair_vars.fair_threshold +
+                            MIN_ABOVE_THRESH) {
+                                vdata->vnic_min_rate[vnic].vn_credit_delta =
+                                        pdata->fair_vars.fair_threshold +
+                                        MIN_ABOVE_THRESH;
+                        }
+                }
+        }
+}
+
+static inline void bnx2x_init_fw_wrr(const struct cmng_init_input *input_data,
+                                     u32 r_param, struct cmng_init *ram_data)
+{
+        u32 vnic, cos;
+        u32 cosWeightSum = 0;
+        struct cmng_vnic *vdata = &ram_data->vnic;
+        struct cmng_struct_per_port *pdata = &ram_data->port;
+
+        for (cos = 0; cos < MAX_COS_NUMBER; cos++)
+                cosWeightSum += input_data->cos_min_rate[cos];
+
+        if (cosWeightSum > 0) {
+
+                for (vnic = 0; vnic < BNX2X_PORT2_MODE_NUM_VNICS; vnic++) {
+                        /* Since cos and vnic shouldn't work together the rate
+                         * to divide between the coses is the port rate.
+                         */
+                        u32 *ccd = vdata->vnic_min_rate[vnic].cos_credit_delta;
+                        for (cos = 0; cos < MAX_COS_NUMBER; cos++) {
+                                /* this is the credit for each period of
+                                 * the fairness algorithm - number of bytes
+                                 * in T_FAIR (this cos share of the vnic rate)
+                                 */
+                                ccd[cos] =
+                                    (u32)input_data->cos_min_rate[cos] * 100 *
+                                    (T_FAIR_COEF / (8 * 100 * cosWeightSum));
+                                 if (ccd[cos] < pdata->fair_vars.fair_threshold
+                                                + MIN_ABOVE_THRESH) {
+                                        ccd[cos] =
+                                            pdata->fair_vars.fair_threshold +
+                                            MIN_ABOVE_THRESH;
+                                }
+                        }
+                }
+        }
+}
+
+static inline void bnx2x_init_safc(const struct cmng_init_input *input_data,
+                                   struct cmng_init *ram_data)
+{
+        /* in microSeconds */
+        ram_data->port.safc_vars.safc_timeout_usec = SAFC_TIMEOUT_USEC;
+}
+
+/* Congestion management port init */
+static inline void bnx2x_init_cmng(const struct cmng_init_input *input_data,
+                                   struct cmng_init *ram_data)
+{
+        u32 r_param;
+        memset(ram_data, 0, sizeof(struct cmng_init));
+
+        ram_data->port.flags = input_data->flags;
+
+        /* number of bytes transmitted in a rate of 10Gbps
+         * in one usec = 1.25KB.
+         */
+        r_param = BITS_TO_BYTES(input_data->port_rate);
+        bnx2x_init_max(input_data, r_param, ram_data);
+        bnx2x_init_min(input_data, r_param, ram_data);
+        bnx2x_init_fw_wrr(input_data, r_param, ram_data);
+        bnx2x_init_safc(input_data, ram_data);
+}
+
+
+
+/* Returns the index of start or end of a specific block stage in ops array */
 #define BLOCK_OPS_IDX(block, stage, end) \
                         (2*(((block)*NUM_OF_INIT_PHASES) + (stage)) + (end))
 
@@ -499,9 +708,7 @@ static inline void bnx2x_disable_blocks_parity(struct bnx2x *bp)
         bnx2x_set_mcp_parity(bp, false);
 }
 
-/**
- * Clear the parity error status registers.
- */
+/* Clear the parity error status registers. */
 static inline void bnx2x_clear_blocks_parity(struct bnx2x *bp)
 {
         int i;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index ad95324dc042..a3fb7215cd89 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -138,7 +138,6 @@
 
 
 
-/* */
 #define SFP_EEPROM_CON_TYPE_ADDR                0x2
         #define SFP_EEPROM_CON_TYPE_VAL_LC      0x7
         #define SFP_EEPROM_CON_TYPE_VAL_COPPER  0x21
@@ -404,8 +403,7 @@ static void bnx2x_ets_e2e3a0_disabled(struct link_params *params)
 
         DP(NETIF_MSG_LINK, "ETS E2E3 disabled configuration\n");
 
-        /*
-         * mapping between entry  priority to client number (0,1,2 -debug and
+        /* mapping between entry  priority to client number (0,1,2 -debug and
          * management clients, 3 - COS0 client, 4 - COS client)(HIGHEST)
          * 3bits client num.
          *   PRI4    |    PRI3    |    PRI2    |    PRI1    |    PRI0
@@ -413,8 +411,7 @@ static void bnx2x_ets_e2e3a0_disabled(struct link_params *params)
          */
 
         REG_WR(bp, NIG_REG_P0_TX_ARB_PRIORITY_CLIENT, 0x4688);
-        /*
-         * Bitmap of 5bits length. Each bit specifies whether the entry behaves
+        /* Bitmap of 5bits length. Each bit specifies whether the entry behaves
          * as strict.  Bits 0,1,2 - debug and management entries, 3 -
          * COS0 entry, 4 - COS1 entry.
          * COS1 | COS0 | DEBUG1 | DEBUG0 | MGMT
@@ -425,13 +422,11 @@ static void bnx2x_ets_e2e3a0_disabled(struct link_params *params)
         REG_WR(bp, NIG_REG_P0_TX_ARB_CLIENT_IS_STRICT, 0x7);
         /* defines which entries (clients) are subjected to WFQ arbitration */
         REG_WR(bp, NIG_REG_P0_TX_ARB_CLIENT_IS_SUBJECT2WFQ, 0);
-        /*
-         * For strict priority entries defines the number of consecutive
+        /* For strict priority entries defines the number of consecutive
          * slots for the highest priority.
          */
         REG_WR(bp, NIG_REG_P0_TX_ARB_NUM_STRICT_ARB_SLOTS, 0x100);
-        /*
-         * mapping between the CREDIT_WEIGHT registers and actual client
+        /* mapping between the CREDIT_WEIGHT registers and actual client
          * numbers
          */
         REG_WR(bp, NIG_REG_P0_TX_ARB_CLIENT_CREDIT_MAP, 0);
@@ -443,8 +438,7 @@ static void bnx2x_ets_e2e3a0_disabled(struct link_params *params)
         REG_WR(bp, PBF_REG_HIGH_PRIORITY_COS_NUM, 0);
         /* ETS mode disable */
         REG_WR(bp, PBF_REG_ETS_ENABLED, 0);
-        /*
-         * If ETS mode is enabled (there is no strict priority) defines a WFQ
+        /* If ETS mode is enabled (there is no strict priority) defines a WFQ
          * weight for COS0/COS1.
          */
         REG_WR(bp, PBF_REG_COS0_WEIGHT, 0x2710);
@@ -471,10 +465,9 @@ static u32 bnx2x_ets_get_min_w_val_nig(const struct link_vars *vars)
                         min_w_val = ETS_E3B0_NIG_MIN_W_VAL_UP_TO_10GBPS;
         } else
                 min_w_val = ETS_E3B0_NIG_MIN_W_VAL_20GBPS;
-        /**
-         *  If the link isn't up (static configuration for example ) The
-         *  link will be according to 20GBPS.
-        */
+        /* If the link isn't up (static configuration for example ) The
+         * link will be according to 20GBPS.
+         */
         return min_w_val;
 }
 /******************************************************************************
@@ -538,8 +531,7 @@ static void bnx2x_ets_e3b0_nig_disabled(const struct link_params *params,
         struct bnx2x *bp = params->bp;
         const u8 port = params->port;
         const u32 min_w_val = bnx2x_ets_get_min_w_val_nig(vars);
-        /**
-         * mapping between entry  priority to client number (0,1,2 -debug and
+        /* Mapping between entry  priority to client number (0,1,2 -debug and
          * management clients, 3 - COS0 client, 4 - COS1, ... 8 -
          * COS5)(HIGHEST) 4bits client num.TODO_ETS - Should be done by
          * reset value or init tool
@@ -551,18 +543,14 @@ static void bnx2x_ets_e3b0_nig_disabled(const struct link_params *params,
                 REG_WR(bp, NIG_REG_P0_TX_ARB_PRIORITY_CLIENT2_LSB, 0x76543210);
                 REG_WR(bp, NIG_REG_P0_TX_ARB_PRIORITY_CLIENT2_MSB, 0x8);
         }
-        /**
-        * For strict priority entries defines the number of consecutive
-        * slots for the highest priority.
-        */
-        /* TODO_ETS - Should be done by reset value or init tool */
+        /* For strict priority entries defines the number of consecutive
+         * slots for the highest priority.
+         */
         REG_WR(bp, (port) ? NIG_REG_P1_TX_ARB_NUM_STRICT_ARB_SLOTS :
                    NIG_REG_P1_TX_ARB_NUM_STRICT_ARB_SLOTS, 0x100);
-        /**
-         * mapping between the CREDIT_WEIGHT registers and actual client
+        /* Mapping between the CREDIT_WEIGHT registers and actual client
          * numbers
          */
-        /* TODO_ETS - Should be done by reset value or init tool */
         if (port) {
                 /*Port 1 has 6 COS*/
                 REG_WR(bp, NIG_REG_P1_TX_ARB_CLIENT_CREDIT_MAP2_LSB, 0x210543);
@@ -574,8 +562,7 @@ static void bnx2x_ets_e3b0_nig_disabled(const struct link_params *params,
                 REG_WR(bp, NIG_REG_P0_TX_ARB_CLIENT_CREDIT_MAP2_MSB, 0x5);
         }
 
-        /**
-         * Bitmap of 5bits length. Each bit specifies whether the entry behaves
+        /* Bitmap of 5bits length. Each bit specifies whether the entry behaves
          * as strict.  Bits 0,1,2 - debug and management entries, 3 -
          * COS0 entry, 4 - COS1 entry.
          * COS1 | COS0 | DEBUG1 | DEBUG0 | MGMT
@@ -590,13 +577,12 @@ static void bnx2x_ets_e3b0_nig_disabled(const struct link_params *params,
         REG_WR(bp, (port) ? NIG_REG_P1_TX_ARB_CLIENT_IS_SUBJECT2WFQ :
                    NIG_REG_P0_TX_ARB_CLIENT_IS_SUBJECT2WFQ, 0);
 
-        /**
-        * Please notice the register address are note continuous and a
-        * for here is note appropriate.In 2 port mode port0 only COS0-5
-        * can be used. DEBUG1,DEBUG1,MGMT are never used for WFQ* In 4
-        * port mode port1 only COS0-2 can be used. DEBUG1,DEBUG1,MGMT
-        * are never used for WFQ
-        */
+        /* Please notice the register address are note continuous and a
+         * for here is note appropriate.In 2 port mode port0 only COS0-5
+         * can be used. DEBUG1,DEBUG1,MGMT are never used for WFQ* In 4
+         * port mode port1 only COS0-2 can be used. DEBUG1,DEBUG1,MGMT
+         * are never used for WFQ
+         */
         REG_WR(bp, (port) ? NIG_REG_P1_TX_ARB_CREDIT_WEIGHT_0 :
                    NIG_REG_P0_TX_ARB_CREDIT_WEIGHT_0, 0x0);
         REG_WR(bp, (port) ? NIG_REG_P1_TX_ARB_CREDIT_WEIGHT_1 :
@@ -633,10 +619,9 @@ static void bnx2x_ets_e3b0_set_credit_upper_bound_pbf(
         u32 base_upper_bound = 0;
         u8 max_cos = 0;
         u8 i = 0;
-        /**
-        * In 2 port mode port0 has COS0-5 that can be used for WFQ.In 4
-        * port mode port1 has COS0-2 that can be used for WFQ.
-        */
+        /* In 2 port mode port0 has COS0-5 that can be used for WFQ.In 4
+         * port mode port1 has COS0-2 that can be used for WFQ.
+         */
         if (!port) {
                 base_upper_bound = PBF_REG_COS0_UPPER_BOUND_P0;
                 max_cos = DCBX_E3B0_MAX_NUM_COS_PORT0;
@@ -666,8 +651,7 @@ static void bnx2x_ets_e3b0_pbf_disabled(const struct link_params *params)
         u32 base_weight = 0;
         u8 max_cos = 0;
 
-        /**
-         * mapping between entry  priority to client number 0 - COS0
+        /* Mapping between entry  priority to client number 0 - COS0
          * client, 2 - COS1, ... 5 - COS5)(HIGHEST) 4bits client num.
          * TODO_ETS - Should be done by reset value or init tool
          */
@@ -695,10 +679,9 @@ static void bnx2x_ets_e3b0_pbf_disabled(const struct link_params *params)
 
         REG_WR(bp, (port) ? PBF_REG_ETS_ARB_CLIENT_IS_SUBJECT2WFQ_P1 :
                    PBF_REG_ETS_ARB_CLIENT_IS_SUBJECT2WFQ_P0 , 0);
-        /**
-        * In 2 port mode port0 has COS0-5 that can be used for WFQ.
-        * In 4 port mode port1 has COS0-2 that can be used for WFQ.
-        */
+        /* In 2 port mode port0 has COS0-5 that can be used for WFQ.
+         * In 4 port mode port1 has COS0-2 that can be used for WFQ.
+         */
         if (!port) {
                 base_weight = PBF_REG_COS0_WEIGHT_P0;
                 max_cos = DCBX_E3B0_MAX_NUM_COS_PORT0;
@@ -738,7 +721,7 @@ static int bnx2x_ets_e3b0_disabled(const struct link_params *params,
 /******************************************************************************
 * Description:
 *       Disable will return basicly the values to init values.
-*.
+*
 ******************************************************************************/
 int bnx2x_ets_disabled(struct link_params *params,
                       struct link_vars *vars)
@@ -867,7 +850,7 @@ static int bnx2x_ets_e3b0_set_cos_bw(struct bnx2x *bp,
 /******************************************************************************
 * Description:
 *       Calculate the total BW.A value of 0 isn't legal.
-*.
+*
 ******************************************************************************/
 static int bnx2x_ets_e3b0_get_total_bw(
         const struct link_params *params,
@@ -879,7 +862,6 @@ static int bnx2x_ets_e3b0_get_total_bw(
         u8 is_bw_cos_exist = 0;
 
         *total_bw = 0 ;
-
         /* Calculate total BW requested */
         for (cos_idx = 0; cos_idx < ets_params->num_of_cos; cos_idx++) {
                 if (ets_params->cos[cos_idx].state == bnx2x_cos_state_bw) {
@@ -887,10 +869,9 @@ static int bnx2x_ets_e3b0_get_total_bw(
                         if (!ets_params->cos[cos_idx].params.bw_params.bw) {
                                 DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config BW"
                                                    "was set to 0\n");
-                                /*
-                                 * This is to prevent a state when ramrods
+                                /* This is to prevent a state when ramrods
                                  * can't be sent
-                                */
+                                 */
                                 ets_params->cos[cos_idx].params.bw_params.bw
                                          = 1;
                         }
@@ -908,8 +889,7 @@ static int bnx2x_ets_e3b0_get_total_bw(
                 }
                 DP(NETIF_MSG_LINK,
                    "bnx2x_ets_E3B0_config total BW should be 100\n");
-                /*
-                 * We can handle a case whre the BW isn't 100 this can happen
+                /* We can handle a case whre the BW isn't 100 this can happen
                  * if the TC are joined.
                  */
         }
@@ -919,7 +899,7 @@ static int bnx2x_ets_e3b0_get_total_bw(
 /******************************************************************************
 * Description:
 *       Invalidate all the sp_pri_to_cos.
-*.
+*
 ******************************************************************************/
 static void bnx2x_ets_e3b0_sp_pri_to_cos_init(u8 *sp_pri_to_cos)
 {
@@ -931,7 +911,7 @@ static void bnx2x_ets_e3b0_sp_pri_to_cos_init(u8 *sp_pri_to_cos)
 * Description:
 *       Calculate and set the SP (ARB_PRIORITY_CLIENT) NIG and PBF registers
 *       according to sp_pri_to_cos.
-*.
+*
 ******************************************************************************/
 static int bnx2x_ets_e3b0_sp_pri_to_cos_set(const struct link_params *params,
                                             u8 *sp_pri_to_cos, const u8 pri,
@@ -942,6 +922,12 @@ static int bnx2x_ets_e3b0_sp_pri_to_cos_set(const struct link_params *params,
         const u8 max_num_of_cos = (port) ? DCBX_E3B0_MAX_NUM_COS_PORT1 :
                 DCBX_E3B0_MAX_NUM_COS_PORT0;
 
+        if (pri >= max_num_of_cos) {
+                DP(NETIF_MSG_LINK, "bnx2x_ets_e3b0_sp_pri_to_cos_set invalid "
+                   "parameter Illegal strict priority\n");
+            return -EINVAL;
+        }
+
         if (sp_pri_to_cos[pri] != DCBX_INVALID_COS) {
                 DP(NETIF_MSG_LINK, "bnx2x_ets_e3b0_sp_pri_to_cos_set invalid "
                                    "parameter There can't be two COS's with "
@@ -949,12 +935,6 @@ static int bnx2x_ets_e3b0_sp_pri_to_cos_set(const struct link_params *params,
                 return -EINVAL;
         }
 
-        if (pri > max_num_of_cos) {
-                DP(NETIF_MSG_LINK, "bnx2x_ets_e3b0_sp_pri_to_cos_set invalid "
-                   "parameter Illegal strict priority\n");
-            return -EINVAL;
-        }
-
         sp_pri_to_cos[pri] = cos_entry;
         return 0;
 
@@ -964,7 +944,7 @@ static int bnx2x_ets_e3b0_sp_pri_to_cos_set(const struct link_params *params,
 * Description:
 *       Returns the correct value according to COS and priority in
 *       the sp_pri_cli register.
-*.
+*
 ******************************************************************************/
 static u64 bnx2x_e3b0_sp_get_pri_cli_reg(const u8 cos, const u8 cos_offset,
                                          const u8 pri_set,
@@ -981,7 +961,7 @@ static u64 bnx2x_e3b0_sp_get_pri_cli_reg(const u8 cos, const u8 cos_offset,
 * Description:
 *       Returns the correct value according to COS and priority in the
 *       sp_pri_cli register for NIG.
-*.
+*
 ******************************************************************************/
 static u64 bnx2x_e3b0_sp_get_pri_cli_reg_nig(const u8 cos, const u8 pri_set)
 {
@@ -997,7 +977,7 @@ static u64 bnx2x_e3b0_sp_get_pri_cli_reg_nig(const u8 cos, const u8 pri_set)
 * Description:
 *       Returns the correct value according to COS and priority in the
 *       sp_pri_cli register for PBF.
-*.
+*
 ******************************************************************************/
 static u64 bnx2x_e3b0_sp_get_pri_cli_reg_pbf(const u8 cos, const u8 pri_set)
 {
@@ -1013,7 +993,7 @@ static u64 bnx2x_e3b0_sp_get_pri_cli_reg_pbf(const u8 cos, const u8 pri_set)
 * Description:
 *       Calculate and set the SP (ARB_PRIORITY_CLIENT) NIG and PBF registers
 *       according to sp_pri_to_cos.(which COS has higher priority)
-*.
+*
 ******************************************************************************/
 static int bnx2x_ets_e3b0_sp_set_pri_cli_reg(const struct link_params *params,
                                              u8 *sp_pri_to_cos)
@@ -1149,8 +1129,7 @@ int bnx2x_ets_e3b0_config(const struct link_params *params,
                 return -EINVAL;
         }
 
-        /*
-         * Upper bound is set according to current link speed (min_w_val
+        /* Upper bound is set according to current link speed (min_w_val
          * should be the same for upper bound and COS credit val).
          */
         bnx2x_ets_e3b0_set_credit_upper_bound_nig(params, min_w_val_nig);
@@ -1160,8 +1139,7 @@ int bnx2x_ets_e3b0_config(const struct link_params *params,
         for (cos_entry = 0; cos_entry < ets_params->num_of_cos; cos_entry++) {
                 if (bnx2x_cos_state_bw == ets_params->cos[cos_entry].state) {
                         cos_bw_bitmap |= (1 << cos_entry);
-                        /*
-                         * The function also sets the BW in HW(not the mappin
+                        /* The function also sets the BW in HW(not the mappin
                          * yet)
                          */
                         bnx2x_status = bnx2x_ets_e3b0_set_cos_bw(
@@ -1217,14 +1195,12 @@ static void bnx2x_ets_bw_limit_common(const struct link_params *params)
         /* ETS disabled configuration */
         struct bnx2x *bp = params->bp;
         DP(NETIF_MSG_LINK, "ETS enabled BW limit configuration\n");
-        /*
-         * defines which entries (clients) are subjected to WFQ arbitration
+        /* Defines which entries (clients) are subjected to WFQ arbitration
          * COS0 0x8
          * COS1 0x10
          */
         REG_WR(bp, NIG_REG_P0_TX_ARB_CLIENT_IS_SUBJECT2WFQ, 0x18);
-        /*
-         * mapping between the ARB_CREDIT_WEIGHT registers and actual
+        /* Mapping between the ARB_CREDIT_WEIGHT registers and actual
          * client numbers (WEIGHT_0 does not actually have to represent
          * client 0)
          *    PRI4    |    PRI3    |    PRI2    |    PRI1    |    PRI0
@@ -1242,8 +1218,7 @@ static void bnx2x_ets_bw_limit_common(const struct link_params *params)
 
         /* Defines the number of consecutive slots for the strict priority */
         REG_WR(bp, PBF_REG_NUM_STRICT_ARB_SLOTS, 0);
-        /*
-         * Bitmap of 5bits length. Each bit specifies whether the entry behaves
+        /* Bitmap of 5bits length. Each bit specifies whether the entry behaves
          * as strict.  Bits 0,1,2 - debug and management entries, 3 - COS0
          * entry, 4 - COS1 entry.
          * COS1 | COS0 | DEBUG21 | DEBUG0 | MGMT
@@ -1298,8 +1273,7 @@ int bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos)
         u32 val = 0;
 
         DP(NETIF_MSG_LINK, "ETS enabled strict configuration\n");
-        /*
-         * Bitmap of 5bits length. Each bit specifies whether the entry behaves
+        /* Bitmap of 5bits length. Each bit specifies whether the entry behaves
          * as strict.  Bits 0,1,2 - debug and management entries,
          * 3 - COS0 entry, 4 - COS1 entry.
          *  COS1 | COS0 | DEBUG21 | DEBUG0 | MGMT
@@ -1307,8 +1281,7 @@ int bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos)
          * MCP and debug are strict
          */
         REG_WR(bp, NIG_REG_P0_TX_ARB_CLIENT_IS_STRICT, 0x1F);
-        /*
-         * For strict priority entries defines the number of consecutive slots
+        /* For strict priority entries defines the number of consecutive slots
          * for the highest priority.
          */
         REG_WR(bp, NIG_REG_P0_TX_ARB_NUM_STRICT_ARB_SLOTS, 0x100);
@@ -1320,8 +1293,7 @@ int bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos)
         /* Defines the number of consecutive slots for the strict priority */
         REG_WR(bp, PBF_REG_HIGH_PRIORITY_COS_NUM, strict_cos);
 
-        /*
-         * mapping between entry  priority to client number (0,1,2 -debug and
+        /* Mapping between entry  priority to client number (0,1,2 -debug and
          * management clients, 3 - COS0 client, 4 - COS client)(HIGHEST)
          * 3bits client num.
          *   PRI4    |    PRI3    |    PRI2    |    PRI1    |    PRI0
@@ -1356,15 +1328,12 @@ static void bnx2x_update_pfc_xmac(struct link_params *params,
         if (!(params->feature_config_flags &
               FEATURE_CONFIG_PFC_ENABLED)) {
 
-                /*
-                 * RX flow control - Process pause frame in receive direction
+                /* RX flow control - Process pause frame in receive direction
                  */
                 if (vars->flow_ctrl & BNX2X_FLOW_CTRL_RX)
                         pause_val |= XMAC_PAUSE_CTRL_REG_RX_PAUSE_EN;
 
-                /*
-                 * TX flow control - Send pause packet when buffer is full
-                 */
+                /* TX flow control - Send pause packet when buffer is full */
                 if (vars->flow_ctrl & BNX2X_FLOW_CTRL_TX)
                         pause_val |= XMAC_PAUSE_CTRL_REG_TX_PAUSE_EN;
         } else {/* PFC support */
@@ -1457,8 +1426,7 @@ void bnx2x_pfc_statistic(struct link_params *params, struct link_vars *vars,
 static void bnx2x_set_mdio_clk(struct bnx2x *bp, u32 chip_id, u8 port)
 {
         u32 mode, emac_base;
-        /**
-         * Set clause 45 mode, slow down the MDIO clock to 2.5MHz
+        /* Set clause 45 mode, slow down the MDIO clock to 2.5MHz
          * (a value of 49==0x31) and make sure that the AUTO poll is off
          */
 
@@ -1578,15 +1546,6 @@ static void bnx2x_umac_enable(struct link_params *params,
 
         DP(NETIF_MSG_LINK, "enabling UMAC\n");
 
-        /**
-         * This register determines on which events the MAC will assert
-         * error on the i/f to the NIG along w/ EOP.
-         */
-
-        /**
-         * BD REG_WR(bp, NIG_REG_P0_MAC_RSV_ERR_MASK +
-         * params->port*0x14,      0xfffff.
-         */
         /* This register opens the gate for the UMAC despite its name */
         REG_WR(bp, NIG_REG_EGRESS_EMAC0_PORT + params->port*4, 1);
 
@@ -1649,8 +1608,7 @@ static void bnx2x_umac_enable(struct link_params *params,
                 val |= UMAC_COMMAND_CONFIG_REG_LOOP_ENA;
         REG_WR(bp, umac_base + UMAC_REG_COMMAND_CONFIG, val);
 
-        /*
-         * Maximum Frame Length (RW). Defines a 14-Bit maximum frame
+        /* Maximum Frame Length (RW). Defines a 14-Bit maximum frame
          * length used by the MAC receive logic to check frames.
          */
         REG_WR(bp, umac_base + UMAC_REG_MAXFR, 0x2710);
@@ -1666,8 +1624,7 @@ static void bnx2x_xmac_init(struct link_params *params, u32 max_speed)
         struct bnx2x *bp = params->bp;
         u32 is_port4mode = bnx2x_is_4_port_mode(bp);
 
-        /*
-         * In 4-port mode, need to set the mode only once, so if XMAC is
+        /* In 4-port mode, need to set the mode only once, so if XMAC is
          * already out of reset, it means the mode has already been set,
          * and it must not* reset the XMAC again, since it controls both
          * ports of the path
@@ -1691,13 +1648,13 @@ static void bnx2x_xmac_init(struct link_params *params, u32 max_speed)
         if (is_port4mode) {
                 DP(NETIF_MSG_LINK, "Init XMAC to 2 ports x 10G per path\n");
 
-                /*  Set the number of ports on the system side to up to 2 */
+                /* Set the number of ports on the system side to up to 2 */
                 REG_WR(bp, MISC_REG_XMAC_CORE_PORT_MODE, 1);
 
                 /* Set the number of ports on the Warp Core to 10G */
                 REG_WR(bp, MISC_REG_XMAC_PHY_PORT_MODE, 3);
         } else {
-                /*  Set the number of ports on the system side to 1 */
+                /* Set the number of ports on the system side to 1 */
                 REG_WR(bp, MISC_REG_XMAC_CORE_PORT_MODE, 0);
                 if (max_speed == SPEED_10000) {
                         DP(NETIF_MSG_LINK,
@@ -1729,8 +1686,7 @@ static void bnx2x_xmac_disable(struct link_params *params)
 
         if (REG_RD(bp, MISC_REG_RESET_REG_2) &
             MISC_REGISTERS_RESET_REG_2_XMAC) {
-                /*
-                 * Send an indication to change the state in the NIG back to XON
+                /* Send an indication to change the state in the NIG back to XON
                  * Clearing this bit enables the next set of this bit to get
                  * rising edge
                  */
@@ -1755,13 +1711,11 @@ static int bnx2x_xmac_enable(struct link_params *params,
 
         bnx2x_xmac_init(params, vars->line_speed);
 
-        /*
-         * This register determines on which events the MAC will assert
+        /* This register determines on which events the MAC will assert
          * error on the i/f to the NIG along w/ EOP.
          */
 
-        /*
-         * This register tells the NIG whether to send traffic to UMAC
+        /* This register tells the NIG whether to send traffic to UMAC
          * or XMAC
          */
         REG_WR(bp, NIG_REG_EGRESS_EMAC0_PORT + params->port*4, 0);
@@ -1863,8 +1817,7 @@ static int bnx2x_emac_enable(struct link_params *params,
         val = REG_RD(bp, emac_base + EMAC_REG_EMAC_RX_MODE);
         val |= EMAC_RX_MODE_KEEP_VLAN_TAG | EMAC_RX_MODE_PROMISCUOUS;
 
-        /*
-         * Setting this bit causes MAC control frames (except for pause
+        /* Setting this bit causes MAC control frames (except for pause
          * frames) to be passed on for processing. This setting has no
          * affect on the operation of the pause frames. This bit effects
          * all packets regardless of RX Parser packet sorting logic.
@@ -1963,8 +1916,7 @@ static void bnx2x_update_pfc_bmac2(struct link_params *params,
                                    struct link_vars *vars,
                                    u8 is_lb)
 {
-        /*
-         * Set rx control: Strip CRC and enable BigMAC to relay
+        /* Set rx control: Strip CRC and enable BigMAC to relay
          * control packets to the system as well
          */
         u32 wb_data[2];
@@ -2016,8 +1968,7 @@ static void bnx2x_update_pfc_bmac2(struct link_params *params,
 
         REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_PFC_CONTROL, wb_data, 2);
 
-        /*
-         * Set Time (based unit is 512 bit time) between automatic
+        /* Set Time (based unit is 512 bit time) between automatic
          * re-sending of PP packets amd enable automatic re-send of
          * Per-Priroity Packet as long as pp_gen is asserted and
          * pp_disable is low.
@@ -2086,7 +2037,7 @@ static int bnx2x_pfc_brb_get_config_params(
         config_val->default_class1.full_xon = 0;
 
         if (CHIP_IS_E2(bp)) {
-                /*  class0 defaults */
+                /* Class0 defaults */
                 config_val->default_class0.pause_xoff =
                         DEFAULT0_E2_BRB_MAC_PAUSE_XOFF_THR;
                 config_val->default_class0.pause_xon =
@@ -2095,7 +2046,7 @@ static int bnx2x_pfc_brb_get_config_params(
                         DEFAULT0_E2_BRB_MAC_FULL_XOFF_THR;
                 config_val->default_class0.full_xon =
                         DEFAULT0_E2_BRB_MAC_FULL_XON_THR;
-                /*  pause able*/
+                /* Pause able*/
                 config_val->pauseable_th.pause_xoff =
                         PFC_E2_BRB_MAC_PAUSE_XOFF_THR_PAUSE;
                 config_val->pauseable_th.pause_xon =
@@ -2114,7 +2065,7 @@ static int bnx2x_pfc_brb_get_config_params(
                 config_val->non_pauseable_th.full_xon =
                         PFC_E2_BRB_MAC_FULL_XON_THR_NON_PAUSE;
         } else if (CHIP_IS_E3A0(bp)) {
-                /*  class0 defaults */
+                /* Class0 defaults */
                 config_val->default_class0.pause_xoff =
                         DEFAULT0_E3A0_BRB_MAC_PAUSE_XOFF_THR;
                 config_val->default_class0.pause_xon =
@@ -2123,7 +2074,7 @@ static int bnx2x_pfc_brb_get_config_params(
                         DEFAULT0_E3A0_BRB_MAC_FULL_XOFF_THR;
                 config_val->default_class0.full_xon =
                         DEFAULT0_E3A0_BRB_MAC_FULL_XON_THR;
-                /*  pause able */
+                /* Pause able */
                 config_val->pauseable_th.pause_xoff =
                         PFC_E3A0_BRB_MAC_PAUSE_XOFF_THR_PAUSE;
                 config_val->pauseable_th.pause_xon =
@@ -2142,7 +2093,7 @@ static int bnx2x_pfc_brb_get_config_params(
                 config_val->non_pauseable_th.full_xon =
                         PFC_E3A0_BRB_MAC_FULL_XON_THR_NON_PAUSE;
         } else if (CHIP_IS_E3B0(bp)) {
-                /*  class0 defaults */
+                /* Class0 defaults */
                 config_val->default_class0.pause_xoff =
                         DEFAULT0_E3B0_BRB_MAC_PAUSE_XOFF_THR;
                 config_val->default_class0.pause_xon =
@@ -2305,27 +2256,23 @@ static int bnx2x_update_pfc_brb(struct link_params *params,
                         reg_th_config = &config_val.non_pauseable_th;
         } else
                 reg_th_config = &config_val.default_class0;
-        /*
-         * The number of free blocks below which the pause signal to class 0
+        /* The number of free blocks below which the pause signal to class 0
          * of MAC #n is asserted. n=0,1
          */
         REG_WR(bp, (port) ? BRB1_REG_PAUSE_0_XOFF_THRESHOLD_1 :
                BRB1_REG_PAUSE_0_XOFF_THRESHOLD_0 ,
                reg_th_config->pause_xoff);
-        /*
-         * The number of free blocks above which the pause signal to class 0
+        /* The number of free blocks above which the pause signal to class 0
          * of MAC #n is de-asserted. n=0,1
          */
         REG_WR(bp, (port) ? BRB1_REG_PAUSE_0_XON_THRESHOLD_1 :
                BRB1_REG_PAUSE_0_XON_THRESHOLD_0 , reg_th_config->pause_xon);
-        /*
-         * The number of free blocks below which the full signal to class 0
+        /* The number of free blocks below which the full signal to class 0
          * of MAC #n is asserted. n=0,1
          */
         REG_WR(bp, (port) ? BRB1_REG_FULL_0_XOFF_THRESHOLD_1 :
                BRB1_REG_FULL_0_XOFF_THRESHOLD_0 , reg_th_config->full_xoff);
-        /*
-         * The number of free blocks above which the full signal to class 0
+        /* The number of free blocks above which the full signal to class 0
          * of MAC #n is de-asserted. n=0,1
          */
         REG_WR(bp, (port) ? BRB1_REG_FULL_0_XON_THRESHOLD_1 :
@@ -2339,30 +2286,26 @@ static int bnx2x_update_pfc_brb(struct link_params *params,
                         reg_th_config = &config_val.non_pauseable_th;
         } else
                 reg_th_config = &config_val.default_class1;
-        /*
-         * The number of free blocks below which the pause signal to
+        /* The number of free blocks below which the pause signal to
          * class 1 of MAC #n is asserted. n=0,1
          */
         REG_WR(bp, (port) ? BRB1_REG_PAUSE_1_XOFF_THRESHOLD_1 :
                BRB1_REG_PAUSE_1_XOFF_THRESHOLD_0,
                reg_th_config->pause_xoff);
 
-        /*
-         * The number of free blocks above which the pause signal to
+        /* The number of free blocks above which the pause signal to
          * class 1 of MAC #n is de-asserted. n=0,1
          */
         REG_WR(bp, (port) ? BRB1_REG_PAUSE_1_XON_THRESHOLD_1 :
                BRB1_REG_PAUSE_1_XON_THRESHOLD_0,
                reg_th_config->pause_xon);
-        /*
-         * The number of free blocks below which the full signal to
+        /* The number of free blocks below which the full signal to
          * class 1 of MAC #n is asserted. n=0,1
          */
         REG_WR(bp, (port) ? BRB1_REG_FULL_1_XOFF_THRESHOLD_1 :
                BRB1_REG_FULL_1_XOFF_THRESHOLD_0,
                reg_th_config->full_xoff);
-        /*
-         * The number of free blocks above which the full signal to
+        /* The number of free blocks above which the full signal to
          * class 1 of MAC #n is de-asserted. n=0,1
          */
         REG_WR(bp, (port) ? BRB1_REG_FULL_1_XON_THRESHOLD_1 :
@@ -2379,49 +2322,41 @@ static int bnx2x_update_pfc_brb(struct link_params *params,
                 REG_WR(bp, BRB1_REG_PER_CLASS_GUARANTY_MODE,
                            e3b0_val.per_class_guaranty_mode);
 
-                /*
-                 * The hysteresis on the guarantied buffer space for the Lb
+                /* The hysteresis on the guarantied buffer space for the Lb
                  * port before signaling XON.
                  */
                 REG_WR(bp, BRB1_REG_LB_GUARANTIED_HYST,
                            e3b0_val.lb_guarantied_hyst);
 
-                /*
-                 * The number of free blocks below which the full signal to the
+                /* The number of free blocks below which the full signal to the
                  * LB port is asserted.
                  */
                 REG_WR(bp, BRB1_REG_FULL_LB_XOFF_THRESHOLD,
                        e3b0_val.full_lb_xoff_th);
-                /*
-                 * The number of free blocks above which the full signal to the
+                /* The number of free blocks above which the full signal to the
                  * LB port is de-asserted.
                  */
                 REG_WR(bp, BRB1_REG_FULL_LB_XON_THRESHOLD,
                        e3b0_val.full_lb_xon_threshold);
-                /*
-                 * The number of blocks guarantied for the MAC #n port. n=0,1
+                /* The number of blocks guarantied for the MAC #n port. n=0,1
                  */
 
-                /* The number of blocks guarantied for the LB port.*/
+                /* The number of blocks guarantied for the LB port. */
                 REG_WR(bp, BRB1_REG_LB_GUARANTIED,
                        e3b0_val.lb_guarantied);
 
-                /*
-                 * The number of blocks guarantied for the MAC #n port.
-                 */
+                /* The number of blocks guarantied for the MAC #n port. */
                 REG_WR(bp, BRB1_REG_MAC_GUARANTIED_0,
                        2 * e3b0_val.mac_0_class_t_guarantied);
                 REG_WR(bp, BRB1_REG_MAC_GUARANTIED_1,
                        2 * e3b0_val.mac_1_class_t_guarantied);
-                /*
-                 * The number of blocks guarantied for class #t in MAC0. t=0,1
+                /* The number of blocks guarantied for class #t in MAC0. t=0,1
                  */
                 REG_WR(bp, BRB1_REG_MAC_0_CLASS_0_GUARANTIED,
                        e3b0_val.mac_0_class_t_guarantied);
                 REG_WR(bp, BRB1_REG_MAC_0_CLASS_1_GUARANTIED,
                        e3b0_val.mac_0_class_t_guarantied);
-                /*
-                 * The hysteresis on the guarantied buffer space for class in
+                /* The hysteresis on the guarantied buffer space for class in
                  * MAC0.  t=0,1
                  */
                 REG_WR(bp, BRB1_REG_MAC_0_CLASS_0_GUARANTIED_HYST,
@@ -2429,15 +2364,13 @@ static int bnx2x_update_pfc_brb(struct link_params *params,
                 REG_WR(bp, BRB1_REG_MAC_0_CLASS_1_GUARANTIED_HYST,
                        e3b0_val.mac_0_class_t_guarantied_hyst);
 
-                /*
-                 * The number of blocks guarantied for class #t in MAC1.t=0,1
+                /* The number of blocks guarantied for class #t in MAC1.t=0,1
                  */
                 REG_WR(bp, BRB1_REG_MAC_1_CLASS_0_GUARANTIED,
                        e3b0_val.mac_1_class_t_guarantied);
                 REG_WR(bp, BRB1_REG_MAC_1_CLASS_1_GUARANTIED,
                        e3b0_val.mac_1_class_t_guarantied);
-                /*
-                 * The hysteresis on the guarantied buffer space for class #t
+                /* The hysteresis on the guarantied buffer space for class #t
                  * in MAC1.  t=0,1
                  */
                 REG_WR(bp, BRB1_REG_MAC_1_CLASS_0_GUARANTIED_HYST,
@@ -2520,15 +2453,13 @@ static void bnx2x_update_pfc_nig(struct link_params *params,
                 FEATURE_CONFIG_PFC_ENABLED;
         DP(NETIF_MSG_LINK, "updating pfc nig parameters\n");
 
-        /*
-         * When NIG_LLH0_XCM_MASK_REG_LLHX_XCM_MASK_BCN bit is set
+        /* When NIG_LLH0_XCM_MASK_REG_LLHX_XCM_MASK_BCN bit is set
          * MAC control frames (that are not pause packets)
          * will be forwarded to the XCM.
          */
         xcm_mask = REG_RD(bp, port ? NIG_REG_LLH1_XCM_MASK :
                           NIG_REG_LLH0_XCM_MASK);
-        /*
-         * nig params will override non PFC params, since it's possible to
+        /* NIG params will override non PFC params, since it's possible to
          * do transition from PFC to SAFC
          */
         if (set_pfc) {
@@ -2548,7 +2479,7 @@ static void bnx2x_update_pfc_nig(struct link_params *params,
                         llfc_out_en = nig_params->llfc_out_en;
                         llfc_enable = nig_params->llfc_enable;
                         pause_enable = nig_params->pause_enable;
-                } else  /*defaul non PFC mode - PAUSE */
+                } else  /* Default non PFC mode - PAUSE */
                         pause_enable = 1;
 
                 xcm_mask |= (port ? NIG_LLH1_XCM_MASK_REG_LLH1_XCM_MASK_BCN :
@@ -2608,8 +2539,7 @@ int bnx2x_update_pfc(struct link_params *params,
                       struct link_vars *vars,
                       struct bnx2x_nig_brb_pfc_port_params *pfc_params)
 {
-        /*
-         * The PFC and pause are orthogonal to one another, meaning when
+        /* The PFC and pause are orthogonal to one another, meaning when
          * PFC is enabled, the pause are disabled, and when PFC is
          * disabled, pause are set according to the pause result.
          */
@@ -3148,7 +3078,6 @@ static int bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
                               EMAC_MDIO_STATUS_10MB);
 
         /* address */
-
         tmp = ((phy->addr << 21) | (devad << 16) | reg |
                EMAC_MDIO_COMM_COMMAND_ADDRESS |
                EMAC_MDIO_COMM_START_BUSY);
@@ -3337,8 +3266,7 @@ int bnx2x_phy_read(struct link_params *params, u8 phy_addr,
                    u8 devad, u16 reg, u16 *ret_val)
 {
         u8 phy_index;
-        /*
-         * Probe for the phy according to the given phy_addr, and execute
+        /* Probe for the phy according to the given phy_addr, and execute
          * the read request on it
          */
         for (phy_index = 0; phy_index < params->num_phys; phy_index++) {
@@ -3355,8 +3283,7 @@ int bnx2x_phy_write(struct link_params *params, u8 phy_addr,
                     u8 devad, u16 reg, u16 val)
 {
         u8 phy_index;
-        /*
-         * Probe for the phy according to the given phy_addr, and execute
+        /* Probe for the phy according to the given phy_addr, and execute
          * the write request on it
          */
         for (phy_index = 0; phy_index < params->num_phys; phy_index++) {
@@ -3382,7 +3309,7 @@ static u8 bnx2x_get_warpcore_lane(struct bnx2x_phy *phy,
         if (bnx2x_is_4_port_mode(bp)) {
                 u32 port_swap, port_swap_ovr;
 
-                /*figure out path swap value */
+                /* Figure out path swap value */
                 path_swap_ovr = REG_RD(bp, MISC_REG_FOUR_PORT_PATH_SWAP_OVWR);
                 if (path_swap_ovr & 0x1)
                         path_swap = (path_swap_ovr & 0x2);
@@ -3392,7 +3319,7 @@ static u8 bnx2x_get_warpcore_lane(struct bnx2x_phy *phy,
                 if (path_swap)
                         path = path ^ 1;
 
-                /*figure out port swap value */
+                /* Figure out port swap value */
                 port_swap_ovr = REG_RD(bp, MISC_REG_FOUR_PORT_PORT_SWAP_OVWR);
                 if (port_swap_ovr & 0x1)
                         port_swap = (port_swap_ovr & 0x2);
@@ -3405,7 +3332,7 @@ static u8 bnx2x_get_warpcore_lane(struct bnx2x_phy *phy,
                 lane = (port<<1) + path;
         } else { /* two port mode - no port swap */
 
-                /*figure out path swap value */
+                /* Figure out path swap value */
                 path_swap_ovr =
                         REG_RD(bp, MISC_REG_TWO_PORT_PATH_SWAP_OVWR);
                 if (path_swap_ovr & 0x1) {
@@ -3437,8 +3364,7 @@ static void bnx2x_set_aer_mmd(struct link_params *params,
 
         if (USES_WARPCORE(bp)) {
                 aer_val = bnx2x_get_warpcore_lane(phy, params);
-                /*
-                 * In Dual-lane mode, two lanes are joined together,
+                /* In Dual-lane mode, two lanes are joined together,
                  * so in order to configure them, the AER broadcast method is
                  * used here.
                  * 0x200 is the broadcast address for lanes 0,1
@@ -3518,8 +3444,7 @@ static void bnx2x_calc_ieee_aneg_adv(struct bnx2x_phy *phy,
 {
         struct bnx2x *bp = params->bp;
         *ieee_fc = MDIO_COMBO_IEEE0_AUTO_NEG_ADV_FULL_DUPLEX;
-        /**
-         * resolve pause mode and advertisement Please refer to Table
+        /* Resolve pause mode and advertisement Please refer to Table
          * 28B-3 of the 802.3ab-1999 spec
          */
 
@@ -3642,6 +3567,7 @@ static void bnx2x_pause_resolve(struct link_vars *vars, u32 pause_result)
                 vars->link_status |= LINK_STATUS_LINK_PARTNER_SYMMETRIC_PAUSE;
         if (pause_result & (1<<1))
                 vars->link_status |= LINK_STATUS_LINK_PARTNER_ASYMMETRIC_PAUSE;
+
 }
 
 static void bnx2x_ext_phy_update_adv_fc(struct bnx2x_phy *phy,
@@ -3698,6 +3624,7 @@ static void bnx2x_ext_phy_update_adv_fc(struct bnx2x_phy *phy,
         bnx2x_pause_resolve(vars, pause_result);
 
 }
+
 static u8 bnx2x_ext_phy_resolve_fc(struct bnx2x_phy *phy,
                                    struct link_params *params,
                                    struct link_vars *vars)
@@ -3819,9 +3746,7 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy,
 
         /* Advertise pause */
         bnx2x_ext_phy_set_pause(params, phy, vars);
-
-        /*
-         * Set KR Autoneg Work-Around flag for Warpcore version older than D108
+        /* Set KR Autoneg Work-Around flag for Warpcore version older than D108
          */
         bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
                         MDIO_WC_REG_UC_INFO_B1_VERSION, &val16);
@@ -3829,7 +3754,6 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy,
                 DP(NETIF_MSG_LINK, "Enable AN KR work-around\n");
                 vars->rx_tx_asic_rst = MAX_KR_LINK_RETRY;
         }
-
         bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
                         MDIO_WC_REG_DIGITAL5_MISC7, &val16);
 
@@ -3903,7 +3827,7 @@ static void bnx2x_warpcore_set_10G_KR(struct bnx2x_phy *phy,
         bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD,
                          MDIO_WC_REG_IEEE0BLK_AUTONEGNP, 0xB);
 
-        /*Enable encoded forced speed */
+        /* Enable encoded forced speed */
         bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
                          MDIO_WC_REG_SERDESDIGITAL_MISC2, 0x30);
 
@@ -4265,8 +4189,7 @@ static int bnx2x_get_mod_abs_int_cfg(struct bnx2x *bp,
                                 PORT_HW_CFG_E3_MOD_ABS_MASK) >>
                                 PORT_HW_CFG_E3_MOD_ABS_SHIFT;
 
-                /*
-                 * Should not happen. This function called upon interrupt
+                /* Should not happen. This function called upon interrupt
                  * triggered by GPIO ( since EPIO can only generate interrupts
                  * to MCP).
                  * So if this function was called and none of the GPIOs was set,
@@ -4366,7 +4289,7 @@ static void bnx2x_warpcore_config_runtime(struct bnx2x_phy *phy,
                                         "link up, rx_tx_asic_rst 0x%x\n",
                                         vars->rx_tx_asic_rst);
                         } else {
-                                /*reset the lane to see if link comes up.*/
+                                /* Reset the lane to see if link comes up.*/
                                 bnx2x_warpcore_reset_lane(bp, phy, 1);
                                 bnx2x_warpcore_reset_lane(bp, phy, 0);
 
@@ -4387,7 +4310,6 @@ static void bnx2x_warpcore_config_runtime(struct bnx2x_phy *phy,
         } /*params->rx_tx_asic_rst*/
 
 }
-
 static void bnx2x_warpcore_config_init(struct bnx2x_phy *phy,
                                        struct link_params *params,
                                        struct link_vars *vars)
@@ -4545,7 +4467,7 @@ static void bnx2x_warpcore_link_reset(struct bnx2x_phy *phy,
         /* Update those 1-copy registers */
         CL22_WR_OVER_CL45(bp, phy, MDIO_REG_BANK_AER_BLOCK,
                           MDIO_AER_BLOCK_AER_REG, 0);
-                /* Enable 1G MDIO (1-copy) */
+        /* Enable 1G MDIO (1-copy) */
         bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
                         MDIO_WC_REG_XGXSBLK0_XGXSCONTROL,
                         &val16);
@@ -4624,43 +4546,43 @@ void bnx2x_sync_link(struct link_params *params,
                 vars->duplex = DUPLEX_FULL;
                 switch (vars->link_status &
                         LINK_STATUS_SPEED_AND_DUPLEX_MASK) {
-                        case LINK_10THD:
-                                vars->duplex = DUPLEX_HALF;
-                                /* fall thru */
-                        case LINK_10TFD:
-                                vars->line_speed = SPEED_10;
-                                break;
+                case LINK_10THD:
+                        vars->duplex = DUPLEX_HALF;
+                        /* Fall thru */
+                case LINK_10TFD:
+                        vars->line_speed = SPEED_10;
+                        break;
 
-                        case LINK_100TXHD:
-                                vars->duplex = DUPLEX_HALF;
-                                /* fall thru */
-                        case LINK_100T4:
-                        case LINK_100TXFD:
-                                vars->line_speed = SPEED_100;
-                                break;
+                case LINK_100TXHD:
+                        vars->duplex = DUPLEX_HALF;
+                        /* Fall thru */
+                case LINK_100T4:
+                case LINK_100TXFD:
+                        vars->line_speed = SPEED_100;
+                        break;
 
-                        case LINK_1000THD:
-                                vars->duplex = DUPLEX_HALF;
-                                /* fall thru */
-                        case LINK_1000TFD:
-                                vars->line_speed = SPEED_1000;
-                                break;
+                case LINK_1000THD:
+                        vars->duplex = DUPLEX_HALF;
+                        /* Fall thru */
+                case LINK_1000TFD:
+                        vars->line_speed = SPEED_1000;
+                        break;
 
-                        case LINK_2500THD:
-                                vars->duplex = DUPLEX_HALF;
-                                /* fall thru */
-                        case LINK_2500TFD:
-                                vars->line_speed = SPEED_2500;
-                                break;
+                case LINK_2500THD:
+                        vars->duplex = DUPLEX_HALF;
+                        /* Fall thru */
+                case LINK_2500TFD:
+                        vars->line_speed = SPEED_2500;
+                        break;
 
-                        case LINK_10GTFD:
-                                vars->line_speed = SPEED_10000;
-                                break;
-                        case LINK_20GTFD:
-                                vars->line_speed = SPEED_20000;
-                                break;
-                        default:
-                                break;
+                case LINK_10GTFD:
+                        vars->line_speed = SPEED_10000;
+                        break;
+                case LINK_20GTFD:
+                        vars->line_speed = SPEED_20000;
+                        break;
+                default:
+                        break;
                 }
                 vars->flow_ctrl = 0;
                 if (vars->link_status & LINK_STATUS_TX_FLOW_CONTROL_ENABLED)
@@ -4835,9 +4757,8 @@ static void bnx2x_set_swap_lanes(struct link_params *params,
                                  struct bnx2x_phy *phy)
 {
         struct bnx2x *bp = params->bp;
-        /*
-         *  Each two bits represents a lane number:
-         *  No swap is 0123 => 0x1b no need to enable the swap
+        /* Each two bits represents a lane number:
+         * No swap is 0123 => 0x1b no need to enable the swap
          */
         u16 rx_lane_swap, tx_lane_swap;
 
@@ -5051,8 +4972,7 @@ static void bnx2x_program_serdes(struct bnx2x_phy *phy,
                           MDIO_REG_BANK_COMBO_IEEE0,
                           MDIO_COMBO_IEEE0_MII_CONTROL, reg_val);
 
-        /*
-         * program speed
+        /* Program speed
          *  - needed only if the speed is greater than 1G (2.5G or 10G)
          */
         CL22_RD_OVER_CL45(bp, phy,
@@ -5087,8 +5007,6 @@ static void bnx2x_set_brcm_cl37_advertisement(struct bnx2x_phy *phy,
         struct bnx2x *bp = params->bp;
         u16 val = 0;
 
-        /* configure the 48 bits for BAM AN */
-
         /* set extended capabilities */
         if (phy->speed_cap_mask & PORT_HW_CFG_SPEED_CAPABILITY_D0_2_5G)
                 val |= MDIO_OVER_1G_UP1_2_5G;
@@ -5234,11 +5152,8 @@ static void bnx2x_initialize_sgmii_process(struct bnx2x_phy *phy,
         }
 }
 
-
-/*
- * link management
+/* Link management
  */
-
 static int bnx2x_direct_parallel_detect_used(struct bnx2x_phy *phy,
                                              struct link_params *params)
 {
@@ -5383,8 +5298,7 @@ static void bnx2x_check_fallback_to_cl37(struct bnx2x_phy *phy,
                              "ustat_val(0x8371) = 0x%x\n", ustat_val);
                 return;
         }
-        /*
-         * Step 3: Check CL37 Message Pages received to indicate LP
+        /* Step 3: Check CL37 Message Pages received to indicate LP
          * supports only CL37
          */
         CL22_RD_OVER_CL45(bp, phy,
@@ -5401,8 +5315,7 @@ static void bnx2x_check_fallback_to_cl37(struct bnx2x_phy *phy,
                          cl37_fsm_received);
                 return;
         }
-        /*
-         * The combined cl37/cl73 fsm state information indicating that
+        /* The combined cl37/cl73 fsm state information indicating that
          * we are connected to a device which does not support cl73, but
          * does support cl37 BAM. In this case we disable cl73 and
          * restart cl37 auto-neg
@@ -5973,8 +5886,7 @@ static void bnx2x_rearm_latch_signal(struct bnx2x *bp, u8 port,
 {
         u32 latch_status = 0;
 
-        /*
-         * Disable the MI INT ( external phy int ) by writing 1 to the
+        /* Disable the MI INT ( external phy int ) by writing 1 to the
          * status register. Link down indication is high-active-signal,
          * so in this case we need to write the status to clear the XOR
          */
@@ -6009,8 +5921,7 @@ static void bnx2x_link_int_ack(struct link_params *params,
         struct bnx2x *bp = params->bp;
         u8 port = params->port;
         u32 mask;
-        /*
-         * First reset all status we assume only one line will be
+        /* First reset all status we assume only one line will be
          * change at a time
          */
         bnx2x_bits_dis(bp, NIG_REG_STATUS_INTERRUPT_PORT0 + port*4,
@@ -6024,8 +5935,7 @@ static void bnx2x_link_int_ack(struct link_params *params,
                         if (is_10g_plus)
                                 mask = NIG_STATUS_XGXS0_LINK10G;
                         else if (params->switch_cfg == SWITCH_CFG_10G) {
-                                /*
-                                 * Disable the link interrupt by writing 1 to
+                                /* Disable the link interrupt by writing 1 to
                                  * the relevant lane in the status register
                                  */
                                 u32 ser_lane =
@@ -6227,8 +6137,7 @@ int bnx2x_set_led(struct link_params *params,
                 break;
 
         case LED_MODE_OPER:
-                /*
-                 * For all other phys, OPER mode is same as ON, so in case
+                /* For all other phys, OPER mode is same as ON, so in case
                  * link is down, do nothing
                  */
                 if (!vars->link_up)
@@ -6239,9 +6148,7 @@ int bnx2x_set_led(struct link_params *params,
                          (params->phy[EXT_PHY1].type ==
                           PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8722)) &&
                     CHIP_IS_E2(bp) && params->num_phys == 2) {
-                        /*
-                         * This is a work-around for E2+8727 Configurations
-                         */
+                        /* This is a work-around for E2+8727 Configurations */
                         if (mode == LED_MODE_ON ||
                                 speed == SPEED_10000){
                                 REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4, 0);
@@ -6250,8 +6157,7 @@ int bnx2x_set_led(struct link_params *params,
                                 tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
                                 EMAC_WR(bp, EMAC_REG_EMAC_LED,
                                         (tmp | EMAC_LED_OVERRIDE));
-                                /*
-                                 * return here without enabling traffic
+                                /* Return here without enabling traffic
                                  * LED blink and setting rate in ON mode.
                                  * In oper mode, enabling LED blink
                                  * and setting rate is needed.
@@ -6260,8 +6166,7 @@ int bnx2x_set_led(struct link_params *params,
                                         return rc;
                         }
                 } else if (SINGLE_MEDIA_DIRECT(params)) {
-                        /*
-                         * This is a work-around for HW issue found when link
+                        /* This is a work-around for HW issue found when link
                          * is up in CL73
                          */
                         if ((!CHIP_IS_E3(bp)) ||
@@ -6310,10 +6215,7 @@ int bnx2x_set_led(struct link_params *params,
                      (speed == SPEED_1000) ||
                      (speed == SPEED_100) ||
                      (speed == SPEED_10))) {
-                        /*
-                         * On Everest 1 Ax chip versions for speeds less than
-                         * 10G LED scheme is different
-                         */
+                        /* For speeds less than 10G LED scheme is different */
                         REG_WR(bp, NIG_REG_LED_CONTROL_OVERRIDE_TRAFFIC_P0
                                + port*4, 1);
                         REG_WR(bp, NIG_REG_LED_CONTROL_TRAFFIC_P0 +
@@ -6333,8 +6235,7 @@ int bnx2x_set_led(struct link_params *params,
 
 }
 
-/*
- * This function comes to reflect the actual link state read DIRECTLY from the
+/* This function comes to reflect the actual link state read DIRECTLY from the
  * HW
  */
 int bnx2x_test_link(struct link_params *params, struct link_vars *vars,
@@ -6422,16 +6323,14 @@ static int bnx2x_link_initialize(struct link_params *params,
         int rc = 0;
         u8 phy_index, non_ext_phy;
         struct bnx2x *bp = params->bp;
-        /*
-         * In case of external phy existence, the line speed would be the
+        /* In case of external phy existence, the line speed would be the
          * line speed linked up by the external phy. In case it is direct
          * only, then the line_speed during initialization will be
          * equal to the req_line_speed
          */
         vars->line_speed = params->phy[INT_PHY].req_line_speed;
 
-        /*
-         * Initialize the internal phy in case this is a direct board
+        /* Initialize the internal phy in case this is a direct board
          * (no external phys), or this board has external phy which requires
          * to first.
          */
@@ -6463,8 +6362,7 @@ static int bnx2x_link_initialize(struct link_params *params,
         } else {
                 for (phy_index = EXT_PHY1; phy_index < params->num_phys;
                       phy_index++) {
-                        /*
-                         * No need to initialize second phy in case of first
+                        /* No need to initialize second phy in case of first
                          * phy only selection. In case of second phy, we do
                          * need to initialize the first phy, since they are
                          * connected.
@@ -6492,7 +6390,6 @@ static int bnx2x_link_initialize(struct link_params *params,
                         NIG_STATUS_XGXS0_LINK_STATUS |
                         NIG_STATUS_SERDES0_LINK_STATUS |
                         NIG_MASK_MI_INT));
-        bnx2x_update_mng(params, vars->link_status);
         return rc;
 }
 
@@ -6577,7 +6474,7 @@ static int bnx2x_update_link_up(struct link_params *params,
                                 u8 link_10g)
 {
         struct bnx2x *bp = params->bp;
-        u8 port = params->port;
+        u8 phy_idx, port = params->port;
         int rc = 0;
 
         vars->link_status |= (LINK_STATUS_LINK_UP |
@@ -6641,11 +6538,18 @@ static int bnx2x_update_link_up(struct link_params *params,
 
         /* update shared memory */
         bnx2x_update_mng(params, vars->link_status);
+
+        /* Check remote fault */
+        for (phy_idx = INT_PHY; phy_idx < MAX_PHYS; phy_idx++) {
+                if (params->phy[phy_idx].flags & FLAGS_TX_ERROR_CHECK) {
+                        bnx2x_check_half_open_conn(params, vars, 0);
+                        break;
+                }
+        }
         msleep(20);
         return rc;
 }
-/*
- * The bnx2x_link_update function should be called upon link
+/* The bnx2x_link_update function should be called upon link
  * interrupt.
  * Link is considered up as follows:
  * - DIRECT_SINGLE_MEDIA - Only XGXS link (internal link) needs
@@ -6702,8 +6606,7 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)
         if (!CHIP_IS_E3(bp))
                 REG_WR(bp, NIG_REG_NIG_EMAC0_EN + port*4, 0);
 
-        /*
-         * Step 1:
+        /* Step 1:
          * Check external link change only for external phys, and apply
          * priority selection between them in case the link on both phys
          * is up. Note that instead of the common vars, a temporary
@@ -6734,23 +6637,20 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                         switch (bnx2x_phy_selection(params)) {
                         case PORT_HW_CFG_PHY_SELECTION_HARDWARE_DEFAULT:
                         case PORT_HW_CFG_PHY_SELECTION_FIRST_PHY_PRIORITY:
-                        /*
-                         * In this option, the first PHY makes sure to pass the
+                        /* In this option, the first PHY makes sure to pass the
                          * traffic through itself only.
                          * Its not clear how to reset the link on the second phy
                          */
                                 active_external_phy = EXT_PHY1;
                                 break;
                         case PORT_HW_CFG_PHY_SELECTION_SECOND_PHY_PRIORITY:
-                        /*
-                         * In this option, the first PHY makes sure to pass the
+                        /* In this option, the first PHY makes sure to pass the
                          * traffic through the second PHY.
                          */
                                 active_external_phy = EXT_PHY2;
                                 break;
                         default:
-                        /*
-                         * Link indication on both PHYs with the following cases
+                        /* Link indication on both PHYs with the following cases
                          * is invalid:
                          * - FIRST_PHY means that second phy wasn't initialized,
                          * hence its link is expected to be down
@@ -6767,8 +6667,7 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                 }
         }
         prev_line_speed = vars->line_speed;
-        /*
-         * Step 2:
+        /* Step 2:
          * Read the status of the internal phy. In case of
          * DIRECT_SINGLE_MEDIA board, this link is the external link,
          * otherwise this is the link between the 577xx and the first
@@ -6778,8 +6677,7 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                 params->phy[INT_PHY].read_status(
                         &params->phy[INT_PHY],
                         params, vars);
-        /*
-         * The INT_PHY flow control reside in the vars. This include the
+        /* The INT_PHY flow control reside in the vars. This include the
          * case where the speed or flow control are not set to AUTO.
          * Otherwise, the active external phy flow control result is set
          * to the vars. The ext_phy_line_speed is needed to check if the
@@ -6788,14 +6686,12 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)
          */
         if (active_external_phy > INT_PHY) {
                 vars->flow_ctrl = phy_vars[active_external_phy].flow_ctrl;
-                /*
-                 * Link speed is taken from the XGXS. AN and FC result from
+                /* Link speed is taken from the XGXS. AN and FC result from
                  * the external phy.
                  */
                 vars->link_status |= phy_vars[active_external_phy].link_status;
 
-                /*
-                 * if active_external_phy is first PHY and link is up - disable
+                /* if active_external_phy is first PHY and link is up - disable
                  * disable TX on second external PHY
                  */
                 if (active_external_phy == EXT_PHY1) {
@@ -6832,8 +6728,7 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)
         DP(NETIF_MSG_LINK, "vars->flow_ctrl = 0x%x, vars->link_status = 0x%x,"
                    " ext_phy_line_speed = %d\n", vars->flow_ctrl,
                    vars->link_status, ext_phy_line_speed);
-        /*
-         * Upon link speed change set the NIG into drain mode. Comes to
+        /* Upon link speed change set the NIG into drain mode. Comes to
          * deals with possible FIFO glitch due to clk change when speed
          * is decreased without link down indicator
          */
@@ -6858,8 +6753,7 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)
 
         bnx2x_link_int_ack(params, vars, link_10g_plus);
 
-        /*
-         * In case external phy link is up, and internal link is down
+        /* In case external phy link is up, and internal link is down
          * (not initialized yet probably after link initialization, it
          * needs to be initialized.
          * Note that after link down-up as result of cable plug, the xgxs
@@ -6887,8 +6781,7 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                                                 vars);
                 }
         }
-        /*
-         * Link is up only if both local phy and external phy (in case of
+        /* Link is up only if both local phy and external phy (in case of
          * non-direct board) are up and no fault detected on active PHY.
          */
         vars->link_up = (vars->phy_link_up &&
@@ -6907,6 +6800,10 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)
         else
                 rc = bnx2x_update_link_down(params, vars);
 
+        /* Update MCP link status was changed */
+        if (params->feature_config_flags & FEATURE_CONFIG_BC_SUPPORTS_AFEX)
+                bnx2x_fw_command(bp, DRV_MSG_CODE_LINK_STATUS_CHANGED, 0);
+
         return rc;
 }
 
@@ -7120,8 +7017,7 @@ static int bnx2x_8073_xaui_wa(struct bnx2x *bp, struct bnx2x_phy *phy)
         }
         /* XAUI workaround in 8073 A0: */
 
-        /*
-         * After loading the boot ROM and restarting Autoneg, poll
+        /* After loading the boot ROM and restarting Autoneg, poll
          * Dev1, Reg $C820:
          */
 
@@ -7130,8 +7026,7 @@ static int bnx2x_8073_xaui_wa(struct bnx2x *bp, struct bnx2x_phy *phy)
                                 MDIO_PMA_DEVAD,
                                 MDIO_PMA_REG_8073_SPEED_LINK_STATUS,
                                 &val);
-                  /*
-                   * If bit [14] = 0 or bit [13] = 0, continue on with
+                  /* If bit [14] = 0 or bit [13] = 0, continue on with
                    * system initialization (XAUI work-around not required, as
                    * these bits indicate 2.5G or 1G link up).
                    */
@@ -7140,8 +7035,7 @@ static int bnx2x_8073_xaui_wa(struct bnx2x *bp, struct bnx2x_phy *phy)
                         return 0;
                 } else if (!(val & (1<<15))) {
                         DP(NETIF_MSG_LINK, "bit 15 went off\n");
-                        /*
-                         * If bit 15 is 0, then poll Dev1, Reg $C841 until it's
+                        /* If bit 15 is 0, then poll Dev1, Reg $C841 until it's
                          * MSB (bit15) goes to 1 (indicating that the XAUI
                          * workaround has completed), then continue on with
                          * system initialization.
@@ -7291,8 +7185,7 @@ static int bnx2x_8073_config_init(struct bnx2x_phy *phy,
                         val = (1<<7);
                 } else if (phy->req_line_speed ==  SPEED_2500) {
                         val = (1<<5);
-                        /*
-                         * Note that 2.5G works only when used with 1G
+                        /* Note that 2.5G works only when used with 1G
                          * advertisement
                          */
                 } else
@@ -7343,8 +7236,7 @@ static int bnx2x_8073_config_init(struct bnx2x_phy *phy,
         /* Add support for CL37 (passive mode) III */
         bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD, MDIO_AN_REG_CL37_AN, 0x1000);
 
-        /*
-         * The SNR will improve about 2db by changing BW and FEE main
+        /* The SNR will improve about 2db by changing BW and FEE main
          * tap. Rest commands are executed after link is up
          * Change FFE main cursor to 5 in EDC register
          */
@@ -7431,8 +7323,7 @@ static u8 bnx2x_8073_read_status(struct bnx2x_phy *phy,
 
         link_up = (((val1 & 4) == 4) || (an1000_status & (1<<1)));
         if (link_up && bnx2x_8073_is_snr_needed(bp, phy)) {
-                /*
-                 * The SNR will improve about 2dbby changing the BW and FEE main
+                /* The SNR will improve about 2dbby changing the BW and FEE main
                  * tap. The 1st write to change FFE main tap is set before
                  * restart AN. Change PLL Bandwidth in EDC register
                  */
@@ -7479,8 +7370,7 @@ static u8 bnx2x_8073_read_status(struct bnx2x_phy *phy,
                         bnx2x_cl45_read(bp, phy,
                                         MDIO_XS_DEVAD,
                                         MDIO_XS_REG_8073_RX_CTRL_PCIE, &val1);
-                        /*
-                         * Set bit 3 to invert Rx in 1G mode and clear this bit
+                        /* Set bit 3 to invert Rx in 1G mode and clear this bit
                          * when it`s in 10G mode.
                          */
                         if (vars->line_speed == SPEED_1000) {
@@ -7602,8 +7492,7 @@ static void bnx2x_set_disable_pmd_transmit(struct link_params *params,
                                            u8 pmd_dis)
 {
         struct bnx2x *bp = params->bp;
-        /*
-         * Disable transmitter only for bootcodes which can enable it afterwards
+        /* Disable transmitter only for bootcodes which can enable it afterwards
          * (for D3 link)
          */
         if (pmd_dis) {
@@ -7780,9 +7669,6 @@ static int bnx2x_warpcore_read_sfp_module_eeprom(struct bnx2x_phy *phy,
         u32 data_array[4];
         u16 addr32;
         struct bnx2x *bp = params->bp;
-        /*DP(NETIF_MSG_LINK, "bnx2x_direct_read_sfp_module_eeprom:"
-                                        " addr %d, cnt %d\n",
-                                        addr, byte_cnt);*/
         if (byte_cnt > 16) {
                 DP(NETIF_MSG_LINK,
                    "Reading from eeprom is limited to 16 bytes\n");
@@ -7847,8 +7733,7 @@ static int bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy,
                          MDIO_PMA_DEVAD,
                          MDIO_PMA_REG_SFP_TWO_WIRE_CTRL,
                          0x8002);
-        /*
-         * Wait appropriate time for two-wire command to finish before
+        /* Wait appropriate time for two-wire command to finish before
          * polling the status register
          */
         msleep(1);
@@ -7941,8 +7826,7 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
         {
                 u8 copper_module_type;
                 phy->media_type = ETH_PHY_DA_TWINAX;
-                /*
-                 * Check if its active cable (includes SFP+ module)
+                /* Check if its active cable (includes SFP+ module)
                  * of passive cable
                  */
                 if (bnx2x_read_sfp_module_eeprom(phy,
@@ -8019,8 +7903,7 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
         DP(NETIF_MSG_LINK, "EDC mode is set to 0x%x\n", *edc_mode);
         return 0;
 }
-/*
- * This function read the relevant field from the module (SFP+), and verify it
+/* This function read the relevant field from the module (SFP+), and verify it
  * is compliant with this board
  */
 static int bnx2x_verify_sfp_module(struct bnx2x_phy *phy,
@@ -8102,8 +7985,7 @@ static int bnx2x_wait_for_sfp_module_initialized(struct bnx2x_phy *phy,
         u8 val;
         struct bnx2x *bp = params->bp;
         u16 timeout;
-        /*
-         * Initialization time after hot-plug may take up to 300ms for
+        /* Initialization time after hot-plug may take up to 300ms for
          * some phys type ( e.g. JDSU )
          */
 
@@ -8125,8 +8007,7 @@ static void bnx2x_8727_power_module(struct bnx2x *bp,
                                     u8 is_power_up) {
         /* Make sure GPIOs are not using for LED mode */
         u16 val;
-        /*
-         * In the GPIO register, bit 4 is use to determine if the GPIOs are
+        /* In the GPIO register, bit 4 is use to determine if the GPIOs are
          * operating as INPUT or as OUTPUT. Bit 1 is for input, and 0 for
          * output
          * Bits 0-1 determine the GPIOs value for OUTPUT in case bit 4 val is 0
@@ -8142,8 +8023,7 @@ static void bnx2x_8727_power_module(struct bnx2x *bp,
         if (is_power_up)
                 val = (1<<4);
         else
-                /*
-                 * Set GPIO control to OUTPUT, and set the power bit
+                /* Set GPIO control to OUTPUT, and set the power bit
                  * to according to the is_power_up
                  */
                 val = (1<<1);
@@ -8177,8 +8057,7 @@ static int bnx2x_8726_set_limiting_mode(struct bnx2x *bp,
 
                 DP(NETIF_MSG_LINK, "Setting LRM MODE\n");
 
-                /*
-                 * Changing to LRM mode takes quite few seconds. So do it only
+                /* Changing to LRM mode takes quite few seconds. So do it only
                  * if current mode is limiting (default is LRM)
                  */
                 if (cur_limiting_mode != EDC_MODE_LIMITING)
@@ -8313,8 +8192,7 @@ static void bnx2x_set_sfp_module_fault_led(struct link_params *params,
         struct bnx2x *bp = params->bp;
         DP(NETIF_MSG_LINK, "Setting SFP+ module fault LED to %d\n", gpio_mode);
         if (CHIP_IS_E3(bp)) {
-                /*
-                 * Low ==> if SFP+ module is supported otherwise
+                /* Low ==> if SFP+ module is supported otherwise
                  * High ==> if SFP+ module is not on the approved vendor list
                  */
                 bnx2x_set_e3_module_fault_led(params, gpio_mode);
@@ -8339,8 +8217,7 @@ static void bnx2x_warpcore_power_module(struct link_params *params,
                 return;
         DP(NETIF_MSG_LINK, "Setting SFP+ module power to %d using pin cfg %d\n",
                        power, pin_cfg);
-        /*
-         * Low ==> corresponding SFP+ module is powered
+        /* Low ==> corresponding SFP+ module is powered
          * high ==> the SFP+ module is powered down
          */
         bnx2x_set_cfg_pin(bp, pin_cfg, power ^ 1);
@@ -8474,14 +8351,12 @@ int bnx2x_sfp_module_detection(struct bnx2x_phy *phy,
                 bnx2x_set_sfp_module_fault_led(params, MISC_REGISTERS_GPIO_LOW);
         }
 
-        /*
-         * Check and set limiting mode / LRM mode on 8726. On 8727 it
+        /* Check and set limiting mode / LRM mode on 8726. On 8727 it
          * is done automatically
          */
         bnx2x_set_limiting_mode(params, phy, edc_mode);
 
-        /*
-         * Enable transmit for this module if the module is approved, or
+        /* Enable transmit for this module if the module is approved, or
          * if unapproved modules should also enable the Tx laser
          */
         if (rc == 0 ||
@@ -8536,8 +8411,7 @@ void bnx2x_handle_module_detect_int(struct link_params *params)
                 bnx2x_set_gpio_int(bp, gpio_num,
                                    MISC_REGISTERS_GPIO_INT_OUTPUT_SET,
                                    gpio_port);
-                /*
-                 * Module was plugged out.
+                /* Module was plugged out.
                  * Disable transmit for this module
                  */
                 phy->media_type = ETH_PHY_NOT_PRESENT;
@@ -8607,8 +8481,7 @@ static u8 bnx2x_8706_8726_read_status(struct bnx2x_phy *phy,
 
         DP(NETIF_MSG_LINK, "8706/8726 rx_sd 0x%x pcs_status 0x%x 1Gbps"
                         " link_status 0x%x\n", rx_sd, pcs_status, val2);
-        /*
-         * link is up if both bit 0 of pmd_rx_sd and bit 0 of pcs_status
+        /* Link is up if both bit 0 of pmd_rx_sd and bit 0 of pcs_status
          * are set, or if the autoneg bit 1 is set
          */
         link_up = ((rx_sd & pcs_status & 0x1) || (val2 & (1<<1)));
@@ -8722,8 +8595,7 @@ static u8 bnx2x_8706_config_init(struct bnx2x_phy *phy,
         }
         bnx2x_save_bcm_spirom_ver(bp, phy, params->port);
 
-        /*
-         * If TX Laser is controlled by GPIO_0, do not let PHY go into low
+        /* If TX Laser is controlled by GPIO_0, do not let PHY go into low
          * power mode, if TX Laser is disabled
          */
 
@@ -8833,8 +8705,7 @@ static int bnx2x_8726_config_init(struct bnx2x_phy *phy,
 
         bnx2x_8726_external_rom_boot(phy, params);
 
-        /*
-         * Need to call module detected on initialization since the module
+        /* Need to call module detected on initialization since the module
          * detection triggered by actual module insertion might occur before
          * driver is loaded, and when driver is loaded, it reset all
          * registers, including the transmitter
@@ -8871,8 +8742,7 @@ static int bnx2x_8726_config_init(struct bnx2x_phy *phy,
                                  MDIO_AN_DEVAD, MDIO_AN_REG_CL37_AN, 0x1000);
                 bnx2x_cl45_write(bp, phy,
                                 MDIO_AN_DEVAD, MDIO_AN_REG_CTRL, 0x1200);
-                /*
-                 * Enable RX-ALARM control to receive interrupt for 1G speed
+                /* Enable RX-ALARM control to receive interrupt for 1G speed
                  * change
                  */
                 bnx2x_cl45_write(bp, phy,
@@ -8973,8 +8843,7 @@ static void bnx2x_8727_hw_reset(struct bnx2x_phy *phy,
                                 struct link_params *params) {
         u32 swap_val, swap_override;
         u8 port;
-        /*
-         * The PHY reset is controlled by GPIO 1. Fake the port number
+        /* The PHY reset is controlled by GPIO 1. Fake the port number
          * to cancel the swap done in set_gpio()
          */
         struct bnx2x *bp = params->bp;
@@ -9012,14 +8881,12 @@ static int bnx2x_8727_config_init(struct bnx2x_phy *phy,
         bnx2x_cl45_write(bp, phy,
                          MDIO_PMA_DEVAD, MDIO_PMA_LASI_CTRL, lasi_ctrl_val);
 
-        /*
-         * Initially configure MOD_ABS to interrupt when module is
+        /* Initially configure MOD_ABS to interrupt when module is
          * presence( bit 8)
          */
         bnx2x_cl45_read(bp, phy,
                         MDIO_PMA_DEVAD, MDIO_PMA_REG_PHY_IDENTIFIER, &mod_abs);
-        /*
-         * Set EDC off by setting OPTXLOS signal input to low (bit 9).
+        /* Set EDC off by setting OPTXLOS signal input to low (bit 9).
          * When the EDC is off it locks onto a reference clock and avoids
          * becoming 'lost'
          */
@@ -9040,8 +8907,7 @@ static int bnx2x_8727_config_init(struct bnx2x_phy *phy,
         if (phy->flags & FLAGS_NOC)
                 val |= (3<<5);
 
-        /*
-         * Set 8727 GPIOs to input to allow reading from the 8727 GPIO0
+        /* Set 8727 GPIOs to input to allow reading from the 8727 GPIO0
          * status which reflect SFP+ module over-current
          */
         if (!(phy->flags & FLAGS_NOC))
@@ -9067,8 +8933,7 @@ static int bnx2x_8727_config_init(struct bnx2x_phy *phy,
                 bnx2x_cl45_read(bp, phy,
                                 MDIO_PMA_DEVAD, MDIO_PMA_REG_10G_CTRL2, &tmp1);
                 DP(NETIF_MSG_LINK, "1.7 = 0x%x\n", tmp1);
-                /*
-                 * Power down the XAUI until link is up in case of dual-media
+                /* Power down the XAUI until link is up in case of dual-media
                  * and 1G
                  */
                 if (DUAL_MEDIA(params)) {
@@ -9093,8 +8958,7 @@ static int bnx2x_8727_config_init(struct bnx2x_phy *phy,
                 bnx2x_cl45_write(bp, phy,
                                  MDIO_AN_DEVAD, MDIO_AN_REG_CL37_AN, 0x1300);
         } else {
-                /*
-                 * Since the 8727 has only single reset pin, need to set the 10G
+                /* Since the 8727 has only single reset pin, need to set the 10G
                  * registers although it is default
                  */
                 bnx2x_cl45_write(bp, phy,
@@ -9109,8 +8973,7 @@ static int bnx2x_8727_config_init(struct bnx2x_phy *phy,
                                  0x0008);
         }
 
-        /*
-         * Set 2-wire transfer rate of SFP+ module EEPROM
+        /* Set 2-wire transfer rate of SFP+ module EEPROM
          * to 100Khz since some DACs(direct attached cables) do
          * not work at 400Khz.
          */
@@ -9133,8 +8996,7 @@ static int bnx2x_8727_config_init(struct bnx2x_phy *phy,
                                  phy->tx_preemphasis[1]);
         }
 
-        /*
-         * If TX Laser is controlled by GPIO_0, do not let PHY go into low
+        /* If TX Laser is controlled by GPIO_0, do not let PHY go into low
          * power mode, if TX Laser is disabled
          */
         tx_en_mode = REG_RD(bp, params->shmem_base +
@@ -9180,8 +9042,7 @@ static void bnx2x_8727_handle_mod_abs(struct bnx2x_phy *phy,
                 DP(NETIF_MSG_LINK,
                    "MOD_ABS indication show module is absent\n");
                 phy->media_type = ETH_PHY_NOT_PRESENT;
-                /*
-                 * 1. Set mod_abs to detect next module
+                /* 1. Set mod_abs to detect next module
                  *    presence event
                  * 2. Set EDC off by setting OPTXLOS signal input to low
                  *    (bit 9).
@@ -9195,8 +9056,7 @@ static void bnx2x_8727_handle_mod_abs(struct bnx2x_phy *phy,
                                  MDIO_PMA_DEVAD,
                                  MDIO_PMA_REG_PHY_IDENTIFIER, mod_abs);
 
-                /*
-                 * Clear RX alarm since it stays up as long as
+                /* Clear RX alarm since it stays up as long as
                  * the mod_abs wasn't changed
                  */
                 bnx2x_cl45_read(bp, phy,
@@ -9207,8 +9067,7 @@ static void bnx2x_8727_handle_mod_abs(struct bnx2x_phy *phy,
                 /* Module is present */
                 DP(NETIF_MSG_LINK,
                    "MOD_ABS indication show module is present\n");
-                /*
-                 * First disable transmitter, and if the module is ok, the
+                /* First disable transmitter, and if the module is ok, the
                  * module_detection will enable it
                  * 1. Set mod_abs to detect next module absent event ( bit 8)
                  * 2. Restore the default polarity of the OPRXLOS signal and
@@ -9222,8 +9081,7 @@ static void bnx2x_8727_handle_mod_abs(struct bnx2x_phy *phy,
                                  MDIO_PMA_DEVAD,
                                  MDIO_PMA_REG_PHY_IDENTIFIER, mod_abs);
 
-                /*
-                 * Clear RX alarm since it stays up as long as the mod_abs
+                /* Clear RX alarm since it stays up as long as the mod_abs
                  * wasn't changed. This is need to be done before calling the
                  * module detection, otherwise it will clear* the link update
                  * alarm
@@ -9284,8 +9142,7 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
         bnx2x_cl45_read(bp, phy,
                         MDIO_PMA_DEVAD, MDIO_PMA_REG_M8051_MSGOUT_REG, &val1);
 
-        /*
-         * If a module is present and there is need to check
+        /* If a module is present and there is need to check
          * for over current
          */
         if (!(phy->flags & FLAGS_NOC) && !(rx_alarm_status & (1<<5))) {
@@ -9350,8 +9207,7 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
                         MDIO_PMA_DEVAD,
                         MDIO_PMA_REG_8073_SPEED_LINK_STATUS, &link_status);
 
-        /*
-         * Bits 0..2 --> speed detected,
+        /* Bits 0..2 --> speed detected,
          * Bits 13..15--> link is down
          */
         if ((link_status & (1<<2)) && (!(link_status & (1<<15)))) {
@@ -9394,8 +9250,7 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
                 bnx2x_cl45_read(bp, phy,
                                 MDIO_PMA_DEVAD,
                                 MDIO_PMA_REG_8727_PCS_GP, &val1);
-                /*
-                 * In case of dual-media board and 1G, power up the XAUI side,
+                /* In case of dual-media board and 1G, power up the XAUI side,
                  * otherwise power it down. For 10G it is done automatically
                  */
                 if (link_up)
@@ -9561,8 +9416,7 @@ static int bnx2x_848xx_cmn_config_init(struct bnx2x_phy *phy,
                 /* Save spirom version */
                 bnx2x_save_848xx_spirom_version(phy, bp, params->port);
         }
-        /*
-         * This phy uses the NIG latch mechanism since link indication
+        /* This phy uses the NIG latch mechanism since link indication
          * arrives through its LED4 and not via its LASI signal, so we
          * get steady signal instead of clear on read
          */
@@ -9667,8 +9521,7 @@ static int bnx2x_848xx_cmn_config_init(struct bnx2x_phy *phy,
         if (phy->req_duplex == DUPLEX_FULL)
                 autoneg_val |= (1<<8);
 
-        /*
-         * Always write this if this is not 84833.
+        /* Always write this if this is not 84833.
          * For 84833, write it only when it's a forced speed.
          */
         if ((phy->type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) ||
@@ -9916,8 +9769,7 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,
         /* Wait for GPHY to come out of reset */
         msleep(50);
         if (phy->type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {
-                /*
-                 * BCM84823 requires that XGXS links up first @ 10G for normal
+                /* BCM84823 requires that XGXS links up first @ 10G for normal
                  * behavior.
                  */
                 u16 temp;
@@ -10393,8 +10245,7 @@ static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy,
                 break;
         }
 
-        /*
-         * This is a workaround for E3+84833 until autoneg
+        /* This is a workaround for E3+84833 until autoneg
          * restart is fixed in f/w
          */
         if (CHIP_IS_E3(bp)) {
@@ -10418,8 +10269,7 @@ static int bnx2x_54618se_config_init(struct bnx2x_phy *phy,
         DP(NETIF_MSG_LINK, "54618SE cfg init\n");
         usleep_range(1000, 1000);
 
-        /*
-         * This works with E3 only, no need to check the chip
+        /* This works with E3 only, no need to check the chip
          * before determining the port.
          */
         port = params->port;
@@ -10441,7 +10291,7 @@ static int bnx2x_54618se_config_init(struct bnx2x_phy *phy,
                          MDIO_PMA_REG_CTRL, 0x8000);
         bnx2x_wait_reset_complete(bp, phy, params);
 
-        /*wait for GPHY to reset */
+        /* Wait for GPHY to reset */
         msleep(50);
 
         /* Configure LED4: set to INTR (0x6). */
@@ -10647,13 +10497,11 @@ static void bnx2x_54618se_link_reset(struct bnx2x_phy *phy,
         u32 cfg_pin;
         u8 port;
 
-        /*
-         * In case of no EPIO routed to reset the GPHY, put it
+        /* In case of no EPIO routed to reset the GPHY, put it
          * in low power mode.
          */
         bnx2x_cl22_write(bp, phy, MDIO_PMA_REG_CTRL, 0x800);
-        /*
-         * This works with E3 only, no need to check the chip
+        /* This works with E3 only, no need to check the chip
          * before determining the port.
          */
         port = params->port;
@@ -10762,7 +10610,7 @@ static u8 bnx2x_54618se_read_status(struct bnx2x_phy *phy,
                 bnx2x_ext_phy_resolve_fc(phy, params, vars);
 
                 if (vars->link_status & LINK_STATUS_AUTO_NEGOTIATE_COMPLETE) {
-                        /* report LP advertised speeds */
+                        /* Report LP advertised speeds */
                         bnx2x_cl22_read(bp, phy, 0x5, &val);
 
                         if (val & (1<<5))
@@ -10827,8 +10675,7 @@ static void bnx2x_54618se_config_loopback(struct bnx2x_phy *phy,
         /* This register opens the gate for the UMAC despite its name */
         REG_WR(bp, NIG_REG_EGRESS_EMAC0_PORT + params->port*4, 1);
 
-        /*
-         * Maximum Frame Length (RW). Defines a 14-Bit maximum frame
+        /* Maximum Frame Length (RW). Defines a 14-Bit maximum frame
          * length used by the MAC receive logic to check frames.
          */
         REG_WR(bp, umac_base + UMAC_REG_MAXFR, 0x2710);
@@ -11101,22 +10948,23 @@ static struct bnx2x_phy phy_warpcore = {
         .type           = PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT,
         .addr           = 0xff,
         .def_md_devad   = 0,
-        .flags          = FLAGS_HW_LOCK_REQUIRED,
+        .flags          = (FLAGS_HW_LOCK_REQUIRED |
+                           FLAGS_TX_ERROR_CHECK),
         .rx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff},
         .tx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff},
         .mdio_ctrl      = 0,
         .supported      = (SUPPORTED_10baseT_Half |
-                             SUPPORTED_10baseT_Full |
-                             SUPPORTED_100baseT_Half |
-                             SUPPORTED_100baseT_Full |
-                             SUPPORTED_1000baseT_Full |
-                             SUPPORTED_10000baseT_Full |
-                             SUPPORTED_20000baseKR2_Full |
-                             SUPPORTED_20000baseMLD2_Full |
-                             SUPPORTED_FIBRE |
-                             SUPPORTED_Autoneg |
-                             SUPPORTED_Pause |
-                             SUPPORTED_Asym_Pause),
+                           SUPPORTED_10baseT_Full |
+                           SUPPORTED_100baseT_Half |
+                           SUPPORTED_100baseT_Full |
+                           SUPPORTED_1000baseT_Full |
+                           SUPPORTED_10000baseT_Full |
+                           SUPPORTED_20000baseKR2_Full |
+                           SUPPORTED_20000baseMLD2_Full |
+                           SUPPORTED_FIBRE |
+                           SUPPORTED_Autoneg |
+                           SUPPORTED_Pause |
+                           SUPPORTED_Asym_Pause),
         .media_type     = ETH_PHY_UNSPECIFIED,
         .ver_addr       = 0,
         .req_flow_ctrl  = 0,
@@ -11258,7 +11106,8 @@ static struct bnx2x_phy phy_8726 = {
         .addr           = 0xff,
         .def_md_devad   = 0,
         .flags          = (FLAGS_HW_LOCK_REQUIRED |
-                           FLAGS_INIT_XGXS_FIRST),
+                           FLAGS_INIT_XGXS_FIRST |
+                           FLAGS_TX_ERROR_CHECK),
         .rx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff},
         .tx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff},
         .mdio_ctrl      = 0,
@@ -11289,7 +11138,8 @@ static struct bnx2x_phy phy_8727 = {
         .type           = PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727,
         .addr           = 0xff,
         .def_md_devad   = 0,
-        .flags          = FLAGS_FAN_FAILURE_DET_REQ,
+        .flags          = (FLAGS_FAN_FAILURE_DET_REQ |
+                           FLAGS_TX_ERROR_CHECK),
         .rx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff},
         .tx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff},
         .mdio_ctrl      = 0,
@@ -11354,8 +11204,9 @@ static struct bnx2x_phy phy_84823 = {
         .type           = PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84823,
         .addr           = 0xff,
         .def_md_devad   = 0,
-        .flags          = FLAGS_FAN_FAILURE_DET_REQ |
-                          FLAGS_REARM_LATCH_SIGNAL,
+        .flags          = (FLAGS_FAN_FAILURE_DET_REQ |
+                           FLAGS_REARM_LATCH_SIGNAL |
+                           FLAGS_TX_ERROR_CHECK),
         .rx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff},
         .tx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff},
         .mdio_ctrl      = 0,
@@ -11390,8 +11241,9 @@ static struct bnx2x_phy phy_84833 = {
         .type           = PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833,
         .addr           = 0xff,
         .def_md_devad   = 0,
-        .flags          = FLAGS_FAN_FAILURE_DET_REQ |
-                            FLAGS_REARM_LATCH_SIGNAL,
+        .flags          = (FLAGS_FAN_FAILURE_DET_REQ |
+                           FLAGS_REARM_LATCH_SIGNAL |
+                           FLAGS_TX_ERROR_CHECK),
         .rx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff},
         .tx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff},
         .mdio_ctrl      = 0,
@@ -11466,9 +11318,8 @@ static void bnx2x_populate_preemphasis(struct bnx2x *bp, u32 shmem_base,
         /* Get the 4 lanes xgxs config rx and tx */
         u32 rx = 0, tx = 0, i;
         for (i = 0; i < 2; i++) {
-                /*
-                 * INT_PHY and EXT_PHY1 share the same value location in the
-                 * shmem. When num_phys is greater than 1, than this value
+                /* INT_PHY and EXT_PHY1 share the same value location in
+                 * the shmem. When num_phys is greater than 1, than this value
                  * applies only to EXT_PHY1
                  */
                 if (phy_index == INT_PHY || phy_index == EXT_PHY1) {
@@ -11546,8 +11397,7 @@ static int bnx2x_populate_int_phy(struct bnx2x *bp, u32 shmem_base, u8 port,
                                         offsetof(struct shmem_region, dev_info.
                                         port_hw_config[port].default_cfg)) &
                                  PORT_HW_CFG_NET_SERDES_IF_MASK);
-                /*
-                 * Set the appropriate supported and flags indications per
+                /* Set the appropriate supported and flags indications per
                  * interface type of the chip
                  */
                 switch (serdes_net_if) {
@@ -11605,8 +11455,7 @@ static int bnx2x_populate_int_phy(struct bnx2x *bp, u32 shmem_base, u8 port,
                         break;
                 }
 
-                /*
-                 * Enable MDC/MDIO work-around for E3 A0 since free running MDC
+                /* Enable MDC/MDIO work-around for E3 A0 since free running MDC
                  * was not set as expected. For B0, ECO will be enabled so there
                  * won't be an issue there
                  */
@@ -11719,8 +11568,7 @@ static int bnx2x_populate_ext_phy(struct bnx2x *bp,
         phy->addr = XGXS_EXT_PHY_ADDR(ext_phy_config);
         bnx2x_populate_preemphasis(bp, shmem_base, phy, port, phy_index);
 
-        /*
-         * The shmem address of the phy version is located on different
+        /* The shmem address of the phy version is located on different
          * structures. In case this structure is too old, do not set
          * the address
          */
@@ -11754,8 +11602,7 @@ static int bnx2x_populate_ext_phy(struct bnx2x *bp,
 
         if ((phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) &&
             (phy->ver_addr)) {
-                /*
-                 * Remove 100Mb link supported for BCM84833 when phy fw
+                /* Remove 100Mb link supported for BCM84833 when phy fw
                  * version lower than or equal to 1.39
                  */
                 u32 raw_ver = REG_RD(bp, phy->ver_addr);
@@ -11765,8 +11612,7 @@ static int bnx2x_populate_ext_phy(struct bnx2x *bp,
                                             SUPPORTED_100baseT_Full);
         }
 
-        /*
-         * In case mdc/mdio_access of the external phy is different than the
+        /* In case mdc/mdio_access of the external phy is different than the
          * mdc/mdio access of the XGXS, a HW lock must be taken in each access
          * to prevent one port interfere with another port's CL45 operations.
          */
@@ -11936,13 +11782,16 @@ int bnx2x_phy_probe(struct link_params *params)
                 if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN)
                         break;
 
+                if (params->feature_config_flags &
+                    FEATURE_CONFIG_DISABLE_REMOTE_FAULT_DET)
+                        phy->flags &= ~FLAGS_TX_ERROR_CHECK;
+
                 sync_offset = params->shmem_base +
                         offsetof(struct shmem_region,
                         dev_info.port_hw_config[params->port].media_type);
                 media_types = REG_RD(bp, sync_offset);
 
-                /*
-                 * Update media type for non-PMF sync only for the first time
+                /* Update media type for non-PMF sync only for the first time
                  * In case the media type changes afterwards, it will be updated
                  * using the update_status function
                  */
@@ -12016,8 +11865,7 @@ void bnx2x_init_xmac_loopback(struct link_params *params,
         vars->flow_ctrl = BNX2X_FLOW_CTRL_NONE;
         vars->mac_type = MAC_TYPE_XMAC;
         vars->phy_flags = PHY_XGXS_FLAG;
-        /*
-         * Set WC to loopback mode since link is required to provide clock
+        /* Set WC to loopback mode since link is required to provide clock
          * to the XMAC in 20G mode
          */
         bnx2x_set_aer_mmd(params, &params->phy[0]);
@@ -12162,6 +12010,7 @@ int bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
                 bnx2x_link_int_enable(params);
                 break;
         }
+        bnx2x_update_mng(params, vars->link_status);
         return 0;
 }
 
@@ -12302,7 +12151,8 @@ static int bnx2x_8073_common_init_phy(struct bnx2x *bp,
                                 NIG_MASK_MI_INT));
 
                 /* Need to take the phy out of low power mode in order
-                        to write to access its registers */
+                 * to write to access its registers
+                 */
                 bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
                                MISC_REGISTERS_GPIO_OUTPUT_HIGH,
                                port);
@@ -12350,8 +12200,7 @@ static int bnx2x_8073_common_init_phy(struct bnx2x *bp,
                                  (val | 1<<10));
         }
 
-        /*
-         * Toggle Transmitter: Power down and then up with 600ms delay
+        /* Toggle Transmitter: Power down and then up with 600ms delay
          * between
          */
         msleep(600);
@@ -12494,8 +12343,7 @@ static int bnx2x_8727_common_init_phy(struct bnx2x *bp,
         reset_gpio = MISC_REGISTERS_GPIO_1;
         port = 1;
 
-        /*
-         * Retrieve the reset gpio/port which control the reset.
+        /* Retrieve the reset gpio/port which control the reset.
          * Default is GPIO1, PORT1
          */
         bnx2x_get_ext_phy_reset_gpio(bp, shmem_base_path[0],
@@ -12670,8 +12518,7 @@ static int bnx2x_ext_phy_common_init(struct bnx2x *bp, u32 shmem_base_path[],
                 break;
 
         case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8726:
-                /*
-                 * GPIO1 affects both ports, so there's need to pull
+                /* GPIO1 affects both ports, so there's need to pull
                  * it for single port alone
                  */
                 rc = bnx2x_8726_common_init_phy(bp, shmem_base_path,
@@ -12679,8 +12526,7 @@ static int bnx2x_ext_phy_common_init(struct bnx2x *bp, u32 shmem_base_path[],
                                                 phy_index, chip_id);
                 break;
         case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833:
-                /*
-                 * GPIO3's are linked, and so both need to be toggled
+                /* GPIO3's are linked, and so both need to be toggled
                  * to obtain required 2us pulse.
                  */
                 rc = bnx2x_84833_common_init_phy(bp, shmem_base_path,
@@ -12779,7 +12625,8 @@ static void bnx2x_check_over_curr(struct link_params *params,
 }
 
 static void bnx2x_analyze_link_error(struct link_params *params,
-                                     struct link_vars *vars, u32 lss_status)
+                                     struct link_vars *vars, u32 lss_status,
+                                     u8 notify)
 {
         struct bnx2x *bp = params->bp;
         /* Compare new value with previous value */
@@ -12793,8 +12640,7 @@ static void bnx2x_analyze_link_error(struct link_params *params,
         DP(NETIF_MSG_LINK, "Link changed:%x %x->%x\n", vars->link_up,
                        half_open_conn, lss_status);
 
-        /*
-         * a. Update shmem->link_status accordingly
+        /* a. Update shmem->link_status accordingly
          * b. Update link_vars->link_up
          */
         if (lss_status) {
@@ -12802,8 +12648,10 @@ static void bnx2x_analyze_link_error(struct link_params *params,
                 vars->link_status &= ~LINK_STATUS_LINK_UP;
                 vars->link_up = 0;
                 vars->phy_flags |= PHY_HALF_OPEN_CONN_FLAG;
-                /*
-                 * Set LED mode to off since the PHY doesn't know about these
+
+                /* activate nig drain */
+                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4, 1);
+                /* Set LED mode to off since the PHY doesn't know about these
                  * errors
                  */
                 led_mode = LED_MODE_OFF;
@@ -12813,7 +12661,11 @@ static void bnx2x_analyze_link_error(struct link_params *params,
                 vars->link_up = 1;
                 vars->phy_flags &= ~PHY_HALF_OPEN_CONN_FLAG;
                 led_mode = LED_MODE_OPER;
+
+                /* Clear nig drain */
+                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4, 0);
         }
+        bnx2x_sync_link(params, vars);
         /* Update the LED according to the link state */
         bnx2x_set_led(params, vars, led_mode, SPEED_10000);
 
@@ -12822,7 +12674,8 @@ static void bnx2x_analyze_link_error(struct link_params *params,
 
         /* C. Trigger General Attention */
         vars->periodic_flags |= PERIODIC_FLAGS_LINK_EVENT;
-        bnx2x_notify_link_changed(bp);
+        if (notify)
+                bnx2x_notify_link_changed(bp);
 }
 
 /******************************************************************************
@@ -12834,22 +12687,23 @@ static void bnx2x_analyze_link_error(struct link_params *params,
 *       a fault, for example, due to break in the TX side of fiber.
 *
 ******************************************************************************/
-static void bnx2x_check_half_open_conn(struct link_params *params,
-                                       struct link_vars *vars)
+int bnx2x_check_half_open_conn(struct link_params *params,
+                                struct link_vars *vars,
+                                u8 notify)
 {
         struct bnx2x *bp = params->bp;
         u32 lss_status = 0;
         u32 mac_base;
         /* In case link status is physically up @ 10G do */
-        if ((vars->phy_flags & PHY_PHYSICAL_LINK_FLAG) == 0)
-                return;
+        if (((vars->phy_flags & PHY_PHYSICAL_LINK_FLAG) == 0) ||
+            (REG_RD(bp, NIG_REG_EGRESS_EMAC0_PORT + params->port*4)))
+                return 0;
 
         if (CHIP_IS_E3(bp) &&
             (REG_RD(bp, MISC_REG_RESET_REG_2) &
               (MISC_REGISTERS_RESET_REG_2_XMAC))) {
                 /* Check E3 XMAC */
-                /*
-                 * Note that link speed cannot be queried here, since it may be
+                /* Note that link speed cannot be queried here, since it may be
                  * zero while link is down. In case UMAC is active, LSS will
                  * simply not be set
                  */
@@ -12863,7 +12717,7 @@ static void bnx2x_check_half_open_conn(struct link_params *params,
                 if (REG_RD(bp, mac_base + XMAC_REG_RX_LSS_STATUS))
                         lss_status = 1;
 
-                bnx2x_analyze_link_error(params, vars, lss_status);
+                bnx2x_analyze_link_error(params, vars, lss_status, notify);
         } else if (REG_RD(bp, MISC_REG_RESET_REG_2) &
                    (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << params->port)) {
                 /* Check E1X / E2 BMAC */
@@ -12880,18 +12734,21 @@ static void bnx2x_check_half_open_conn(struct link_params *params,
                 REG_RD_DMAE(bp, mac_base + lss_status_reg, wb_data, 2);
                 lss_status = (wb_data[0] > 0);
 
-                bnx2x_analyze_link_error(params, vars, lss_status);
+                bnx2x_analyze_link_error(params, vars, lss_status, notify);
         }
+        return 0;
 }
 
 void bnx2x_period_func(struct link_params *params, struct link_vars *vars)
 {
-        struct bnx2x *bp = params->bp;
         u16 phy_idx;
+        struct bnx2x *bp = params->bp;
         for (phy_idx = INT_PHY; phy_idx < MAX_PHYS; phy_idx++) {
                 if (params->phy[phy_idx].flags & FLAGS_TX_ERROR_CHECK) {
                         bnx2x_set_aer_mmd(params, &params->phy[phy_idx]);
-                        bnx2x_check_half_open_conn(params, vars);
+                        if (bnx2x_check_half_open_conn(params, vars, 1) !=
+                            0)
+                                DP(NETIF_MSG_LINK, "Fault detection failed\n");
                         break;
                 }
         }
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
index 763535ee4832..ea4371f4335f 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
@@ -254,8 +254,10 @@ struct link_params {
 #define FEATURE_CONFIG_PFC_ENABLED                      (1<<1)
 #define FEATURE_CONFIG_BC_SUPPORTS_OPT_MDL_VRFY         (1<<2)
 #define FEATURE_CONFIG_BC_SUPPORTS_DUAL_PHY_OPT_MDL_VRFY        (1<<3)
+#define FEATURE_CONFIG_BC_SUPPORTS_AFEX                 (1<<8)
 #define FEATURE_CONFIG_AUTOGREEEN_ENABLED                       (1<<9)
 #define FEATURE_CONFIG_BC_SUPPORTS_SFP_TX_DISABLED              (1<<10)
+#define FEATURE_CONFIG_DISABLE_REMOTE_FAULT_DET         (1<<11)
         /* Will be populated during common init */
         struct bnx2x_phy phy[MAX_PHYS];
 
@@ -495,4 +497,6 @@ int bnx2x_sfp_module_detection(struct bnx2x_phy *phy,
 
 void bnx2x_period_func(struct link_params *params, struct link_vars *vars);
 
+int bnx2x_check_half_open_conn(struct link_params *params,
+                               struct link_vars *vars, u8 notify);
 #endif /* BNX2X_LINK_H */
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index e077d2508727..f755a665dab3 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -39,7 +39,6 @@
 #include <linux/time.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
-#include <linux/if.h>
 #include <linux/if_vlan.h>
 #include <net/ip.h>
 #include <net/ipv6.h>
@@ -93,15 +92,11 @@ MODULE_FIRMWARE(FW_FILE_NAME_E1);
 MODULE_FIRMWARE(FW_FILE_NAME_E1H);
 MODULE_FIRMWARE(FW_FILE_NAME_E2);
 
-static int multi_mode = 1;
-module_param(multi_mode, int, 0);
-MODULE_PARM_DESC(multi_mode, " Multi queue mode "
-                             "(0 Disable; 1 Enable (default))");
 
 int num_queues;
 module_param(num_queues, int, 0);
-MODULE_PARM_DESC(num_queues, " Number of queues for multi_mode=1"
-                                " (default is as a number of CPUs)");
+MODULE_PARM_DESC(num_queues,
+                 " Set number of queues (default is as a number of CPUs)");
 
 static int disable_tpa;
 module_param(disable_tpa, int, 0);
@@ -141,7 +136,9 @@ enum bnx2x_board_type {
         BCM57810,
         BCM57810_MF,
         BCM57840,
-        BCM57840_MF
+        BCM57840_MF,
+        BCM57811,
+        BCM57811_MF
 };
 
 /* indexed by board_type, above */
@@ -158,8 +155,9 @@ static struct {
         { "Broadcom NetXtreme II BCM57810 10 Gigabit Ethernet" },
         { "Broadcom NetXtreme II BCM57810 10 Gigabit Ethernet Multi Function" },
         { "Broadcom NetXtreme II BCM57840 10/20 Gigabit Ethernet" },
-        { "Broadcom NetXtreme II BCM57840 10/20 Gigabit "
-                                                "Ethernet Multi Function"}
+        { "Broadcom NetXtreme II BCM57840 10/20 Gigabit Ethernet Multi Function"},
+        { "Broadcom NetXtreme II BCM57811 10 Gigabit Ethernet"},
+        { "Broadcom NetXtreme II BCM57811 10 Gigabit Ethernet Multi Function"},
 };
 
 #ifndef PCI_DEVICE_ID_NX2_57710
@@ -195,6 +193,12 @@ static struct {
 #ifndef PCI_DEVICE_ID_NX2_57840_MF
 #define PCI_DEVICE_ID_NX2_57840_MF      CHIP_NUM_57840_MF
 #endif
+#ifndef PCI_DEVICE_ID_NX2_57811
+#define PCI_DEVICE_ID_NX2_57811         CHIP_NUM_57811
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57811_MF
+#define PCI_DEVICE_ID_NX2_57811_MF      CHIP_NUM_57811_MF
+#endif
 static DEFINE_PCI_DEVICE_TABLE(bnx2x_pci_tbl) = {
         { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57710), BCM57710 },
         { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57711), BCM57711 },
@@ -207,6 +211,8 @@ static DEFINE_PCI_DEVICE_TABLE(bnx2x_pci_tbl) = {
         { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57810_MF), BCM57810_MF },
         { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57840), BCM57840 },
         { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57840_MF), BCM57840_MF },
+        { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57811), BCM57811 },
+        { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57811_MF), BCM57811_MF },
         { 0 }
 };
 
@@ -220,15 +226,15 @@ static LIST_HEAD(bnx2x_prev_list);
 * General service functions
 ****************************************************************************/
 
-static inline void __storm_memset_dma_mapping(struct bnx2x *bp,
+static void __storm_memset_dma_mapping(struct bnx2x *bp,
                                        u32 addr, dma_addr_t mapping)
 {
         REG_WR(bp,  addr, U64_LO(mapping));
         REG_WR(bp,  addr + 4, U64_HI(mapping));
 }
 
-static inline void storm_memset_spq_addr(struct bnx2x *bp,
-                                         dma_addr_t mapping, u16 abs_fid)
+static void storm_memset_spq_addr(struct bnx2x *bp,
+                                  dma_addr_t mapping, u16 abs_fid)
 {
         u32 addr = XSEM_REG_FAST_MEMORY +
                         XSTORM_SPQ_PAGE_BASE_OFFSET(abs_fid);
@@ -236,8 +242,8 @@ static inline void storm_memset_spq_addr(struct bnx2x *bp,
         __storm_memset_dma_mapping(bp, addr, mapping);
 }
 
-static inline void storm_memset_vf_to_pf(struct bnx2x *bp, u16 abs_fid,
-                                         u16 pf_id)
+static void storm_memset_vf_to_pf(struct bnx2x *bp, u16 abs_fid,
+                                  u16 pf_id)
 {
         REG_WR8(bp, BAR_XSTRORM_INTMEM + XSTORM_VF_TO_PF_OFFSET(abs_fid),
                 pf_id);
@@ -249,8 +255,8 @@ static inline void storm_memset_vf_to_pf(struct bnx2x *bp, u16 abs_fid,
                 pf_id);
 }
 
-static inline void storm_memset_func_en(struct bnx2x *bp, u16 abs_fid,
-                                        u8 enable)
+static void storm_memset_func_en(struct bnx2x *bp, u16 abs_fid,
+                                 u8 enable)
 {
         REG_WR8(bp, BAR_XSTRORM_INTMEM + XSTORM_FUNC_EN_OFFSET(abs_fid),
                 enable);
@@ -262,8 +268,8 @@ static inline void storm_memset_func_en(struct bnx2x *bp, u16 abs_fid,
                 enable);
 }
 
-static inline void storm_memset_eq_data(struct bnx2x *bp,
-                                struct event_ring_data *eq_data,
+static void storm_memset_eq_data(struct bnx2x *bp,
+                                 struct event_ring_data *eq_data,
                                 u16 pfid)
 {
         size_t size = sizeof(struct event_ring_data);
@@ -273,8 +279,8 @@ static inline void storm_memset_eq_data(struct bnx2x *bp,
         __storm_memset_struct(bp, addr, size, (u32 *)eq_data);
 }
 
-static inline void storm_memset_eq_prod(struct bnx2x *bp, u16 eq_prod,
-                                        u16 pfid)
+static void storm_memset_eq_prod(struct bnx2x *bp, u16 eq_prod,
+                                 u16 pfid)
 {
         u32 addr = BAR_CSTRORM_INTMEM + CSTORM_EVENT_RING_PROD_OFFSET(pfid);
         REG_WR16(bp, addr, eq_prod);
@@ -309,67 +315,6 @@ static u32 bnx2x_reg_rd_ind(struct bnx2x *bp, u32 addr)
 #define DMAE_DP_DST_PCI         "pci dst_addr [%x:%08x]"
 #define DMAE_DP_DST_NONE        "dst_addr [none]"
 
-static void bnx2x_dp_dmae(struct bnx2x *bp, struct dmae_command *dmae,
-                          int msglvl)
-{
-        u32 src_type = dmae->opcode & DMAE_COMMAND_SRC;
-
-        switch (dmae->opcode & DMAE_COMMAND_DST) {
-        case DMAE_CMD_DST_PCI:
-                if (src_type == DMAE_CMD_SRC_PCI)
-                        DP(msglvl, "DMAE: opcode 0x%08x\n"
-                           "src [%x:%08x], len [%d*4], dst [%x:%08x]\n"
-                           "comp_addr [%x:%08x], comp_val 0x%08x\n",
-                           dmae->opcode, dmae->src_addr_hi, dmae->src_addr_lo,
-                           dmae->len, dmae->dst_addr_hi, dmae->dst_addr_lo,
-                           dmae->comp_addr_hi, dmae->comp_addr_lo,
-                           dmae->comp_val);
-                else
-                        DP(msglvl, "DMAE: opcode 0x%08x\n"
-                           "src [%08x], len [%d*4], dst [%x:%08x]\n"
-                           "comp_addr [%x:%08x], comp_val 0x%08x\n",
-                           dmae->opcode, dmae->src_addr_lo >> 2,
-                           dmae->len, dmae->dst_addr_hi, dmae->dst_addr_lo,
-                           dmae->comp_addr_hi, dmae->comp_addr_lo,
-                           dmae->comp_val);
-                break;
-        case DMAE_CMD_DST_GRC:
-                if (src_type == DMAE_CMD_SRC_PCI)
-                        DP(msglvl, "DMAE: opcode 0x%08x\n"
-                           "src [%x:%08x], len [%d*4], dst_addr [%08x]\n"
-                           "comp_addr [%x:%08x], comp_val 0x%08x\n",
-                           dmae->opcode, dmae->src_addr_hi, dmae->src_addr_lo,
-                           dmae->len, dmae->dst_addr_lo >> 2,
-                           dmae->comp_addr_hi, dmae->comp_addr_lo,
-                           dmae->comp_val);
-                else
-                        DP(msglvl, "DMAE: opcode 0x%08x\n"
-                           "src [%08x], len [%d*4], dst [%08x]\n"
-                           "comp_addr [%x:%08x], comp_val 0x%08x\n",
-                           dmae->opcode, dmae->src_addr_lo >> 2,
-                           dmae->len, dmae->dst_addr_lo >> 2,
-                           dmae->comp_addr_hi, dmae->comp_addr_lo,
-                           dmae->comp_val);
-                break;
-        default:
-                if (src_type == DMAE_CMD_SRC_PCI)
-                        DP(msglvl, "DMAE: opcode 0x%08x\n"
-                           "src_addr [%x:%08x]  len [%d * 4]  dst_addr [none]\n"
-                           "comp_addr [%x:%08x]  comp_val 0x%08x\n",
-                           dmae->opcode, dmae->src_addr_hi, dmae->src_addr_lo,
-                           dmae->len, dmae->comp_addr_hi, dmae->comp_addr_lo,
-                           dmae->comp_val);
-                else
-                        DP(msglvl, "DMAE: opcode 0x%08x\n"
-                           "src_addr [%08x]  len [%d * 4]  dst_addr [none]\n"
-                           "comp_addr [%x:%08x]  comp_val 0x%08x\n",
-                           dmae->opcode, dmae->src_addr_lo >> 2,
-                           dmae->len, dmae->comp_addr_hi, dmae->comp_addr_lo,
-                           dmae->comp_val);
-                break;
-        }
-
-}
 
 /* copy command into DMAE command memory and set DMAE command go */
 void bnx2x_post_dmae(struct bnx2x *bp, struct dmae_command *dmae, int idx)
@@ -506,8 +451,6 @@ void bnx2x_write_dmae(struct bnx2x *bp, dma_addr_t dma_addr, u32 dst_addr,
         dmae.dst_addr_hi = 0;
         dmae.len = len32;
 
-        bnx2x_dp_dmae(bp, &dmae, BNX2X_MSG_OFF);
-
         /* issue the command and wait for completion */
         bnx2x_issue_dmae_with_comp(bp, &dmae);
 }
@@ -540,8 +483,6 @@ void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32)
         dmae.dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, wb_data));
         dmae.len = len32;
 
-        bnx2x_dp_dmae(bp, &dmae, BNX2X_MSG_OFF);
-
         /* issue the command and wait for completion */
         bnx2x_issue_dmae_with_comp(bp, &dmae);
 }
@@ -562,27 +503,6 @@ static void bnx2x_write_dmae_phys_len(struct bnx2x *bp, dma_addr_t phys_addr,
         bnx2x_write_dmae(bp, phys_addr + offset, addr + offset, len);
 }
 
-/* used only for slowpath so not inlined */
-static void bnx2x_wb_wr(struct bnx2x *bp, int reg, u32 val_hi, u32 val_lo)
-{
-        u32 wb_write[2];
-
-        wb_write[0] = val_hi;
-        wb_write[1] = val_lo;
-        REG_WR_DMAE(bp, reg, wb_write, 2);
-}
-
-#ifdef USE_WB_RD
-static u64 bnx2x_wb_rd(struct bnx2x *bp, int reg)
-{
-        u32 wb_data[2];
-
-        REG_RD_DMAE(bp, reg, wb_data, 2);
-
-        return HILO_U64(wb_data[0], wb_data[1]);
-}
-#endif
-
 static int bnx2x_mc_assert(struct bnx2x *bp)
 {
         char last_idx;
@@ -756,7 +676,7 @@ void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl)
         printk("%s" "end of fw dump\n", lvl);
 }
 
-static inline void bnx2x_fw_dump(struct bnx2x *bp)
+static void bnx2x_fw_dump(struct bnx2x *bp)
 {
         bnx2x_fw_dump_lvl(bp, KERN_ERR);
 }
@@ -1076,8 +996,8 @@ static void bnx2x_pbf_pN_cmd_flushed(struct bnx2x *bp,
            poll_count-cur_cnt, FLR_WAIT_INTERVAL, regs->pN);
 }
 
-static inline u32 bnx2x_flr_clnup_reg_poll(struct bnx2x *bp, u32 reg,
-                                     u32 expected, u32 poll_count)
+static u32 bnx2x_flr_clnup_reg_poll(struct bnx2x *bp, u32 reg,
+                                    u32 expected, u32 poll_count)
 {
         u32 cur_cnt = poll_count;
         u32 val;
@@ -1088,8 +1008,8 @@ static inline u32 bnx2x_flr_clnup_reg_poll(struct bnx2x *bp, u32 reg,
         return val;
 }
 
-static inline int bnx2x_flr_clnup_poll_hw_counter(struct bnx2x *bp, u32 reg,
-                                                  char *msg, u32 poll_cnt)
+static int bnx2x_flr_clnup_poll_hw_counter(struct bnx2x *bp, u32 reg,
+                                           char *msg, u32 poll_cnt)
 {
         u32 val = bnx2x_flr_clnup_reg_poll(bp, reg, 0, poll_cnt);
         if (val != 0) {
@@ -1186,7 +1106,7 @@ static void bnx2x_tx_hw_flushed(struct bnx2x *bp, u32 poll_count)
         (((index) << SDM_OP_GEN_AGG_VECT_IDX_SHIFT) & SDM_OP_GEN_AGG_VECT_IDX)
 
 
-static inline int bnx2x_send_final_clnup(struct bnx2x *bp, u8 clnup_func,
+static int bnx2x_send_final_clnup(struct bnx2x *bp, u8 clnup_func,
                                          u32 poll_cnt)
 {
         struct sdm_op_gen op_gen = {0};
@@ -1220,7 +1140,7 @@ static inline int bnx2x_send_final_clnup(struct bnx2x *bp, u8 clnup_func,
         return ret;
 }
 
-static inline u8 bnx2x_is_pcie_pending(struct pci_dev *dev)
+static u8 bnx2x_is_pcie_pending(struct pci_dev *dev)
 {
         int pos;
         u16 status;
@@ -1361,14 +1281,17 @@ static void bnx2x_hc_int_enable(struct bnx2x *bp)
         int port = BP_PORT(bp);
         u32 addr = port ? HC_REG_CONFIG_1 : HC_REG_CONFIG_0;
         u32 val = REG_RD(bp, addr);
-        int msix = (bp->flags & USING_MSIX_FLAG) ? 1 : 0;
-        int msi = (bp->flags & USING_MSI_FLAG) ? 1 : 0;
+        bool msix = (bp->flags & USING_MSIX_FLAG) ? true : false;
+        bool single_msix = (bp->flags & USING_SINGLE_MSIX_FLAG) ? true : false;
+        bool msi = (bp->flags & USING_MSI_FLAG) ? true : false;
 
         if (msix) {
                 val &= ~(HC_CONFIG_0_REG_SINGLE_ISR_EN_0 |
                          HC_CONFIG_0_REG_INT_LINE_EN_0);
                 val |= (HC_CONFIG_0_REG_MSI_MSIX_INT_EN_0 |
                         HC_CONFIG_0_REG_ATTN_BIT_EN_0);
+                if (single_msix)
+                        val |= HC_CONFIG_0_REG_SINGLE_ISR_EN_0;
         } else if (msi) {
                 val &= ~HC_CONFIG_0_REG_INT_LINE_EN_0;
                 val |= (HC_CONFIG_0_REG_SINGLE_ISR_EN_0 |
@@ -1425,8 +1348,9 @@ static void bnx2x_hc_int_enable(struct bnx2x *bp)
 static void bnx2x_igu_int_enable(struct bnx2x *bp)
 {
         u32 val;
-        int msix = (bp->flags & USING_MSIX_FLAG) ? 1 : 0;
-        int msi = (bp->flags & USING_MSI_FLAG) ? 1 : 0;
+        bool msix = (bp->flags & USING_MSIX_FLAG) ? true : false;
+        bool single_msix = (bp->flags & USING_SINGLE_MSIX_FLAG) ? true : false;
+        bool msi = (bp->flags & USING_MSI_FLAG) ? true : false;
 
         val = REG_RD(bp, IGU_REG_PF_CONFIGURATION);
 
@@ -1436,6 +1360,9 @@ static void bnx2x_igu_int_enable(struct bnx2x *bp)
                 val |= (IGU_PF_CONF_FUNC_EN |
                         IGU_PF_CONF_MSI_MSIX_EN |
                         IGU_PF_CONF_ATTN_BIT_EN);
+
+                if (single_msix)
+                        val |= IGU_PF_CONF_SINGLE_ISR_EN;
         } else if (msi) {
                 val &= ~IGU_PF_CONF_INT_LINE_EN;
                 val |= (IGU_PF_CONF_FUNC_EN |
@@ -1455,6 +1382,9 @@ static void bnx2x_igu_int_enable(struct bnx2x *bp)
 
         REG_WR(bp, IGU_REG_PF_CONFIGURATION, val);
 
+        if (val & IGU_PF_CONF_INT_LINE_EN)
+                pci_intx(bp->pdev, true);
+
         barrier();
 
         /* init leading/trailing edge */
@@ -1623,7 +1553,7 @@ static bool bnx2x_trylock_hw_lock(struct bnx2x *bp, u32 resource)
  * Returns the recovery leader resource id according to the engine this function
  * belongs to. Currently only only 2 engines is supported.
  */
-static inline int bnx2x_get_leader_lock_resource(struct bnx2x *bp)
+static int bnx2x_get_leader_lock_resource(struct bnx2x *bp)
 {
         if (BP_PATH(bp))
                 return HW_LOCK_RESOURCE_RECOVERY_LEADER_1;
@@ -1636,9 +1566,9 @@ static inline int bnx2x_get_leader_lock_resource(struct bnx2x *bp)
  *
  * @bp: driver handle
  *
- * Tries to aquire a leader lock for cuurent engine.
+ * Tries to aquire a leader lock for current engine.
  */
-static inline bool bnx2x_trylock_leader_lock(struct bnx2x *bp)
+static bool bnx2x_trylock_leader_lock(struct bnx2x *bp)
 {
         return bnx2x_trylock_hw_lock(bp, bnx2x_get_leader_lock_resource(bp));
 }
@@ -1719,6 +1649,27 @@ void bnx2x_sp_event(struct bnx2x_fastpath *fp, union eth_rx_cqe *rr_cqe)
 
         DP(BNX2X_MSG_SP, "bp->cq_spq_left %x\n", atomic_read(&bp->cq_spq_left));
 
+        if ((drv_cmd == BNX2X_Q_CMD_UPDATE) && (IS_FCOE_FP(fp)) &&
+            (!!test_bit(BNX2X_AFEX_FCOE_Q_UPDATE_PENDING, &bp->sp_state))) {
+                /* if Q update ramrod is completed for last Q in AFEX vif set
+                 * flow, then ACK MCP at the end
+                 *
+                 * mark pending ACK to MCP bit.
+                 * prevent case that both bits are cleared.
+                 * At the end of load/unload driver checks that
+                 * sp_state is cleaerd, and this order prevents
+                 * races
+                 */
+                smp_mb__before_clear_bit();
+                set_bit(BNX2X_AFEX_PENDING_VIFSET_MCP_ACK, &bp->sp_state);
+                wmb();
+                clear_bit(BNX2X_AFEX_FCOE_Q_UPDATE_PENDING, &bp->sp_state);
+                smp_mb__after_clear_bit();
+
+                /* schedule workqueue to send ack to MCP */
+                queue_delayed_work(bnx2x_wq, &bp->sp_task, 0);
+        }
+
         return;
 }
 
@@ -2229,40 +2180,6 @@ u8 bnx2x_link_test(struct bnx2x *bp, u8 is_serdes)
         return rc;
 }
 
-static void bnx2x_init_port_minmax(struct bnx2x *bp)
-{
-        u32 r_param = bp->link_vars.line_speed / 8;
-        u32 fair_periodic_timeout_usec;
-        u32 t_fair;
-
-        memset(&(bp->cmng.rs_vars), 0,
-               sizeof(struct rate_shaping_vars_per_port));
-        memset(&(bp->cmng.fair_vars), 0, sizeof(struct fairness_vars_per_port));
-
-        /* 100 usec in SDM ticks = 25 since each tick is 4 usec */
-        bp->cmng.rs_vars.rs_periodic_timeout = RS_PERIODIC_TIMEOUT_USEC / 4;
-
-        /* this is the threshold below which no timer arming will occur
-           1.25 coefficient is for the threshold to be a little bigger
-           than the real time, to compensate for timer in-accuracy */
-        bp->cmng.rs_vars.rs_threshold =
-                                (RS_PERIODIC_TIMEOUT_USEC * r_param * 5) / 4;
-
-        /* resolution of fairness timer */
-        fair_periodic_timeout_usec = QM_ARB_BYTES / r_param;
-        /* for 10G it is 1000usec. for 1G it is 10000usec. */
-        t_fair = T_FAIR_COEF / bp->link_vars.line_speed;
-
-        /* this is the threshold below which we won't arm the timer anymore */
-        bp->cmng.fair_vars.fair_threshold = QM_ARB_BYTES;
-
-        /* we multiply by 1e3/8 to get bytes/msec.
-           We don't want the credits to pass a credit
-           of the t_fair*FAIR_MEM (algorithm resolution) */
-        bp->cmng.fair_vars.upper_bound = r_param * t_fair * FAIR_MEM;
-        /* since each tick is 4 usec */
-        bp->cmng.fair_vars.fairness_timeout = fair_periodic_timeout_usec / 4;
-}
 
 /* Calculates the sum of vn_min_rates.
    It's needed for further normalizing of the min_rates.
@@ -2273,12 +2190,12 @@ static void bnx2x_init_port_minmax(struct bnx2x *bp)
      In the later case fainess algorithm should be deactivated.
      If not all min_rates are zero then those that are zeroes will be set to 1.
  */
-static void bnx2x_calc_vn_weight_sum(struct bnx2x *bp)
+static void bnx2x_calc_vn_min(struct bnx2x *bp,
+                                      struct cmng_init_input *input)
 {
         int all_zero = 1;
         int vn;
 
-        bp->vn_weight_sum = 0;
         for (vn = VN_0; vn < BP_MAX_VN_NUM(bp); vn++) {
                 u32 vn_cfg = bp->mf_config[vn];
                 u32 vn_min_rate = ((vn_cfg & FUNC_MF_CFG_MIN_BW_MASK) >>
@@ -2286,106 +2203,56 @@ static void bnx2x_calc_vn_weight_sum(struct bnx2x *bp)
 
                 /* Skip hidden vns */
                 if (vn_cfg & FUNC_MF_CFG_FUNC_HIDE)
-                        continue;
-
+                        vn_min_rate = 0;
                 /* If min rate is zero - set it to 1 */
-                if (!vn_min_rate)
+                else if (!vn_min_rate)
                         vn_min_rate = DEF_MIN_RATE;
                 else
                         all_zero = 0;
 
-                bp->vn_weight_sum += vn_min_rate;
+                input->vnic_min_rate[vn] = vn_min_rate;
         }
 
         /* if ETS or all min rates are zeros - disable fairness */
         if (BNX2X_IS_ETS_ENABLED(bp)) {
-                bp->cmng.flags.cmng_enables &=
+                input->flags.cmng_enables &=
                                         ~CMNG_FLAGS_PER_PORT_FAIRNESS_VN;
                 DP(NETIF_MSG_IFUP, "Fairness will be disabled due to ETS\n");
         } else if (all_zero) {
-                bp->cmng.flags.cmng_enables &=
+                input->flags.cmng_enables &=
                                         ~CMNG_FLAGS_PER_PORT_FAIRNESS_VN;
-                DP(NETIF_MSG_IFUP, "All MIN values are zeroes"
-                   "  fairness will be disabled\n");
+                DP(NETIF_MSG_IFUP,
+                   "All MIN values are zeroes fairness will be disabled\n");
         } else
-                bp->cmng.flags.cmng_enables |=
+                input->flags.cmng_enables |=
                                         CMNG_FLAGS_PER_PORT_FAIRNESS_VN;
 }
 
-static void bnx2x_init_vn_minmax(struct bnx2x *bp, int vn)
+static void bnx2x_calc_vn_max(struct bnx2x *bp, int vn,
+                                    struct cmng_init_input *input)
 {
-        struct rate_shaping_vars_per_vn m_rs_vn;
-        struct fairness_vars_per_vn m_fair_vn;
+        u16 vn_max_rate;
         u32 vn_cfg = bp->mf_config[vn];
-        int func = func_by_vn(bp, vn);
-        u16 vn_min_rate, vn_max_rate;
-        int i;
 
-        /* If function is hidden - set min and max to zeroes */
-        if (vn_cfg & FUNC_MF_CFG_FUNC_HIDE) {
-                vn_min_rate = 0;
+        if (vn_cfg & FUNC_MF_CFG_FUNC_HIDE)
                 vn_max_rate = 0;
-
-        } else {
+        else {
                 u32 maxCfg = bnx2x_extract_max_cfg(bp, vn_cfg);
 
-                vn_min_rate = ((vn_cfg & FUNC_MF_CFG_MIN_BW_MASK) >>
-                                FUNC_MF_CFG_MIN_BW_SHIFT) * 100;
-                /* If fairness is enabled (not all min rates are zeroes) and
-                   if current min rate is zero - set it to 1.
-                   This is a requirement of the algorithm. */
-                if (bp->vn_weight_sum && (vn_min_rate == 0))
-                        vn_min_rate = DEF_MIN_RATE;
-
-                if (IS_MF_SI(bp))
+                if (IS_MF_SI(bp)) {
                         /* maxCfg in percents of linkspeed */
                         vn_max_rate = (bp->link_vars.line_speed * maxCfg) / 100;
-                else
+                } else /* SD modes */
                         /* maxCfg is absolute in 100Mb units */
                         vn_max_rate = maxCfg * 100;
         }
 
-        DP(NETIF_MSG_IFUP,
-           "func %d: vn_min_rate %d  vn_max_rate %d  vn_weight_sum %d\n",
-           func, vn_min_rate, vn_max_rate, bp->vn_weight_sum);
-
-        memset(&m_rs_vn, 0, sizeof(struct rate_shaping_vars_per_vn));
-        memset(&m_fair_vn, 0, sizeof(struct fairness_vars_per_vn));
-
-        /* global vn counter - maximal Mbps for this vn */
-        m_rs_vn.vn_counter.rate = vn_max_rate;
-
-        /* quota - number of bytes transmitted in this period */
-        m_rs_vn.vn_counter.quota =
-                                (vn_max_rate * RS_PERIODIC_TIMEOUT_USEC) / 8;
-
-        if (bp->vn_weight_sum) {
-                /* credit for each period of the fairness algorithm:
-                   number of bytes in T_FAIR (the vn share the port rate).
-                   vn_weight_sum should not be larger than 10000, thus
-                   T_FAIR_COEF / (8 * vn_weight_sum) will always be greater
-                   than zero */
-                m_fair_vn.vn_credit_delta =
-                        max_t(u32, (vn_min_rate * (T_FAIR_COEF /
-                                                   (8 * bp->vn_weight_sum))),
-                              (bp->cmng.fair_vars.fair_threshold +
-                                                        MIN_ABOVE_THRESH));
-                DP(NETIF_MSG_IFUP, "m_fair_vn.vn_credit_delta %d\n",
-                   m_fair_vn.vn_credit_delta);
-        }
-
-        /* Store it to internal memory */
-        for (i = 0; i < sizeof(struct rate_shaping_vars_per_vn)/4; i++)
-                REG_WR(bp, BAR_XSTRORM_INTMEM +
-                       XSTORM_RATE_SHAPING_PER_VN_VARS_OFFSET(func) + i * 4,
-                       ((u32 *)(&m_rs_vn))[i]);
-
-        for (i = 0; i < sizeof(struct fairness_vars_per_vn)/4; i++)
-                REG_WR(bp, BAR_XSTRORM_INTMEM +
-                       XSTORM_FAIRNESS_PER_VN_VARS_OFFSET(func) + i * 4,
-                       ((u32 *)(&m_fair_vn))[i]);
+        DP(NETIF_MSG_IFUP, "vn %d: vn_max_rate %d\n", vn, vn_max_rate);
+
+        input->vnic_max_rate[vn] = vn_max_rate;
 }
 
+
 static int bnx2x_get_cmng_fns_mode(struct bnx2x *bp)
 {
         if (CHIP_REV_IS_SLOW(bp))
@@ -2423,38 +2290,42 @@ void bnx2x_read_mf_cfg(struct bnx2x *bp)
                 bp->mf_config[vn] =
                         MF_CFG_RD(bp, func_mf_config[func].config);
         }
+        if (bp->mf_config[BP_VN(bp)] & FUNC_MF_CFG_FUNC_DISABLED) {
+                DP(NETIF_MSG_IFUP, "mf_cfg function disabled\n");
+                bp->flags |= MF_FUNC_DIS;
+        } else {
+                DP(NETIF_MSG_IFUP, "mf_cfg function enabled\n");
+                bp->flags &= ~MF_FUNC_DIS;
+        }
 }
 
 static void bnx2x_cmng_fns_init(struct bnx2x *bp, u8 read_cfg, u8 cmng_type)
 {
+        struct cmng_init_input input;
+        memset(&input, 0, sizeof(struct cmng_init_input));
+
+        input.port_rate = bp->link_vars.line_speed;
 
         if (cmng_type == CMNG_FNS_MINMAX) {
                 int vn;
 
-                /* clear cmng_enables */
-                bp->cmng.flags.cmng_enables = 0;
-
                 /* read mf conf from shmem */
                 if (read_cfg)
                         bnx2x_read_mf_cfg(bp);
 
-                /* Init rate shaping and fairness contexts */
-                bnx2x_init_port_minmax(bp);
-
                 /* vn_weight_sum and enable fairness if not 0 */
-                bnx2x_calc_vn_weight_sum(bp);
+                bnx2x_calc_vn_min(bp, &input);
 
                 /* calculate and set min-max rate for each vn */
                 if (bp->port.pmf)
                         for (vn = VN_0; vn < BP_MAX_VN_NUM(bp); vn++)
-                                bnx2x_init_vn_minmax(bp, vn);
+                                bnx2x_calc_vn_max(bp, vn, &input);
 
                 /* always enable rate shaping and fairness */
-                bp->cmng.flags.cmng_enables |=
+                input.flags.cmng_enables |=
                                         CMNG_FLAGS_PER_PORT_RATE_SHAPING_VN;
-                if (!bp->vn_weight_sum)
-                        DP(NETIF_MSG_IFUP, "All MIN values are zeroes"
-                                   "  fairness will be disabled\n");
+
+                bnx2x_init_cmng(&input, &bp->cmng);
                 return;
         }
 
@@ -2463,6 +2334,35 @@ static void bnx2x_cmng_fns_init(struct bnx2x *bp, u8 read_cfg, u8 cmng_type)
            "rate shaping and fairness are disabled\n");
 }
 
+static void storm_memset_cmng(struct bnx2x *bp,
+                              struct cmng_init *cmng,
+                              u8 port)
+{
+        int vn;
+        size_t size = sizeof(struct cmng_struct_per_port);
+
+        u32 addr = BAR_XSTRORM_INTMEM +
+                        XSTORM_CMNG_PER_PORT_VARS_OFFSET(port);
+
+        __storm_memset_struct(bp, addr, size, (u32 *)&cmng->port);
+
+        for (vn = VN_0; vn < BP_MAX_VN_NUM(bp); vn++) {
+                int func = func_by_vn(bp, vn);
+
+                addr = BAR_XSTRORM_INTMEM +
+                       XSTORM_RATE_SHAPING_PER_VN_VARS_OFFSET(func);
+                size = sizeof(struct rate_shaping_vars_per_vn);
+                __storm_memset_struct(bp, addr, size,
+                                      (u32 *)&cmng->vnic.vnic_max_rate[vn]);
+
+                addr = BAR_XSTRORM_INTMEM +
+                       XSTORM_FAIRNESS_PER_VN_VARS_OFFSET(func);
+                size = sizeof(struct fairness_vars_per_vn);
+                __storm_memset_struct(bp, addr, size,
+                                      (u32 *)&cmng->vnic.vnic_min_rate[vn]);
+        }
+}
+
 /* This function is called upon link interrupt */
 static void bnx2x_link_attn(struct bnx2x *bp)
 {
@@ -2535,6 +2435,190 @@ void bnx2x__link_status_update(struct bnx2x *bp)
         bnx2x_link_report(bp);
 }
 
+static int bnx2x_afex_func_update(struct bnx2x *bp, u16 vifid,
+                                  u16 vlan_val, u8 allowed_prio)
+{
+        struct bnx2x_func_state_params func_params = {0};
+        struct bnx2x_func_afex_update_params *f_update_params =
+                &func_params.params.afex_update;
+
+        func_params.f_obj = &bp->func_obj;
+        func_params.cmd = BNX2X_F_CMD_AFEX_UPDATE;
+
+        /* no need to wait for RAMROD completion, so don't
+         * set RAMROD_COMP_WAIT flag
+         */
+
+        f_update_params->vif_id = vifid;
+        f_update_params->afex_default_vlan = vlan_val;
+        f_update_params->allowed_priorities = allowed_prio;
+
+        /* if ramrod can not be sent, response to MCP immediately */
+        if (bnx2x_func_state_change(bp, &func_params) < 0)
+                bnx2x_fw_command(bp, DRV_MSG_CODE_AFEX_VIFSET_ACK, 0);
+
+        return 0;
+}
+
+static int bnx2x_afex_handle_vif_list_cmd(struct bnx2x *bp, u8 cmd_type,
+                                          u16 vif_index, u8 func_bit_map)
+{
+        struct bnx2x_func_state_params func_params = {0};
+        struct bnx2x_func_afex_viflists_params *update_params =
+                &func_params.params.afex_viflists;
+        int rc;
+        u32 drv_msg_code;
+
+        /* validate only LIST_SET and LIST_GET are received from switch */
+        if ((cmd_type != VIF_LIST_RULE_GET) && (cmd_type != VIF_LIST_RULE_SET))
+                BNX2X_ERR("BUG! afex_handle_vif_list_cmd invalid type 0x%x\n",
+                          cmd_type);
+
+        func_params.f_obj = &bp->func_obj;
+        func_params.cmd = BNX2X_F_CMD_AFEX_VIFLISTS;
+
+        /* set parameters according to cmd_type */
+        update_params->afex_vif_list_command = cmd_type;
+        update_params->vif_list_index = cpu_to_le16(vif_index);
+        update_params->func_bit_map =
+                (cmd_type == VIF_LIST_RULE_GET) ? 0 : func_bit_map;
+        update_params->func_to_clear = 0;
+        drv_msg_code =
+                (cmd_type == VIF_LIST_RULE_GET) ?
+                DRV_MSG_CODE_AFEX_LISTGET_ACK :
+                DRV_MSG_CODE_AFEX_LISTSET_ACK;
+
+        /* if ramrod can not be sent, respond to MCP immediately for
+         * SET and GET requests (other are not triggered from MCP)
+         */
+        rc = bnx2x_func_state_change(bp, &func_params);
+        if (rc < 0)
+                bnx2x_fw_command(bp, drv_msg_code, 0);
+
+        return 0;
+}
+
+static void bnx2x_handle_afex_cmd(struct bnx2x *bp, u32 cmd)
+{
+        struct afex_stats afex_stats;
+        u32 func = BP_ABS_FUNC(bp);
+        u32 mf_config;
+        u16 vlan_val;
+        u32 vlan_prio;
+        u16 vif_id;
+        u8 allowed_prio;
+        u8 vlan_mode;
+        u32 addr_to_write, vifid, addrs, stats_type, i;
+
+        if (cmd & DRV_STATUS_AFEX_LISTGET_REQ) {
+                vifid = SHMEM2_RD(bp, afex_param1_to_driver[BP_FW_MB_IDX(bp)]);
+                DP(BNX2X_MSG_MCP,
+                   "afex: got MCP req LISTGET_REQ for vifid 0x%x\n", vifid);
+                bnx2x_afex_handle_vif_list_cmd(bp, VIF_LIST_RULE_GET, vifid, 0);
+        }
+
+        if (cmd & DRV_STATUS_AFEX_LISTSET_REQ) {
+                vifid = SHMEM2_RD(bp, afex_param1_to_driver[BP_FW_MB_IDX(bp)]);
+                addrs = SHMEM2_RD(bp, afex_param2_to_driver[BP_FW_MB_IDX(bp)]);
+                DP(BNX2X_MSG_MCP,
+                   "afex: got MCP req LISTSET_REQ for vifid 0x%x addrs 0x%x\n",
+                   vifid, addrs);
+                bnx2x_afex_handle_vif_list_cmd(bp, VIF_LIST_RULE_SET, vifid,
+                                               addrs);
+        }
+
+        if (cmd & DRV_STATUS_AFEX_STATSGET_REQ) {
+                addr_to_write = SHMEM2_RD(bp,
+                        afex_scratchpad_addr_to_write[BP_FW_MB_IDX(bp)]);
+                stats_type = SHMEM2_RD(bp,
+                        afex_param1_to_driver[BP_FW_MB_IDX(bp)]);
+
+                DP(BNX2X_MSG_MCP,
+                   "afex: got MCP req STATSGET_REQ, write to addr 0x%x\n",
+                   addr_to_write);
+
+                bnx2x_afex_collect_stats(bp, (void *)&afex_stats, stats_type);
+
+                /* write response to scratchpad, for MCP */
+                for (i = 0; i < (sizeof(struct afex_stats)/sizeof(u32)); i++)
+                        REG_WR(bp, addr_to_write + i*sizeof(u32),
+                               *(((u32 *)(&afex_stats))+i));
+
+                /* send ack message to MCP */
+                bnx2x_fw_command(bp, DRV_MSG_CODE_AFEX_STATSGET_ACK, 0);
+        }
+
+        if (cmd & DRV_STATUS_AFEX_VIFSET_REQ) {
+                mf_config = MF_CFG_RD(bp, func_mf_config[func].config);
+                bp->mf_config[BP_VN(bp)] = mf_config;
+                DP(BNX2X_MSG_MCP,
+                   "afex: got MCP req VIFSET_REQ, mf_config 0x%x\n",
+                   mf_config);
+
+                /* if VIF_SET is "enabled" */
+                if (!(mf_config & FUNC_MF_CFG_FUNC_DISABLED)) {
+                        /* set rate limit directly to internal RAM */
+                        struct cmng_init_input cmng_input;
+                        struct rate_shaping_vars_per_vn m_rs_vn;
+                        size_t size = sizeof(struct rate_shaping_vars_per_vn);
+                        u32 addr = BAR_XSTRORM_INTMEM +
+                            XSTORM_RATE_SHAPING_PER_VN_VARS_OFFSET(BP_FUNC(bp));
+
+                        bp->mf_config[BP_VN(bp)] = mf_config;
+
+                        bnx2x_calc_vn_max(bp, BP_VN(bp), &cmng_input);
+                        m_rs_vn.vn_counter.rate =
+                                cmng_input.vnic_max_rate[BP_VN(bp)];
+                        m_rs_vn.vn_counter.quota =
+                                (m_rs_vn.vn_counter.rate *
+                                 RS_PERIODIC_TIMEOUT_USEC) / 8;
+
+                        __storm_memset_struct(bp, addr, size, (u32 *)&m_rs_vn);
+
+                        /* read relevant values from mf_cfg struct in shmem */
+                        vif_id =
+                                (MF_CFG_RD(bp, func_mf_config[func].e1hov_tag) &
+                                 FUNC_MF_CFG_E1HOV_TAG_MASK) >>
+                                FUNC_MF_CFG_E1HOV_TAG_SHIFT;
+                        vlan_val =
+                                (MF_CFG_RD(bp, func_mf_config[func].e1hov_tag) &
+                                 FUNC_MF_CFG_AFEX_VLAN_MASK) >>
+                                FUNC_MF_CFG_AFEX_VLAN_SHIFT;
+                        vlan_prio = (mf_config &
+                                     FUNC_MF_CFG_TRANSMIT_PRIORITY_MASK) >>
+                                    FUNC_MF_CFG_TRANSMIT_PRIORITY_SHIFT;
+                        vlan_val |= (vlan_prio << VLAN_PRIO_SHIFT);
+                        vlan_mode =
+                                (MF_CFG_RD(bp,
+                                           func_mf_config[func].afex_config) &
+                                 FUNC_MF_CFG_AFEX_VLAN_MODE_MASK) >>
+                                FUNC_MF_CFG_AFEX_VLAN_MODE_SHIFT;
+                        allowed_prio =
+                                (MF_CFG_RD(bp,
+                                           func_mf_config[func].afex_config) &
+                                 FUNC_MF_CFG_AFEX_COS_FILTER_MASK) >>
+                                FUNC_MF_CFG_AFEX_COS_FILTER_SHIFT;
+
+                        /* send ramrod to FW, return in case of failure */
+                        if (bnx2x_afex_func_update(bp, vif_id, vlan_val,
+                                                   allowed_prio))
+                                return;
+
+                        bp->afex_def_vlan_tag = vlan_val;
+                        bp->afex_vlan_mode = vlan_mode;
+                } else {
+                        /* notify link down because BP->flags is disabled */
+                        bnx2x_link_report(bp);
+
+                        /* send INVALID VIF ramrod to FW */
+                        bnx2x_afex_func_update(bp, 0xFFFF, 0, 0);
+
+                        /* Reset the default afex VLAN */
+                        bp->afex_def_vlan_tag = -1;
+                }
+        }
+}
+
 static void bnx2x_pmf_update(struct bnx2x *bp)
 {
         int port = BP_PORT(bp);
@@ -2619,6 +2703,18 @@ u32 bnx2x_fw_command(struct bnx2x *bp, u32 command, u32 param)
 }
 
 
+static void storm_memset_func_cfg(struct bnx2x *bp,
+                                 struct tstorm_eth_function_common_config *tcfg,
+                                 u16 abs_fid)
+{
+        size_t size = sizeof(struct tstorm_eth_function_common_config);
+
+        u32 addr = BAR_TSTRORM_INTMEM +
+                        TSTORM_FUNCTION_COMMON_CONFIG_OFFSET(abs_fid);
+
+        __storm_memset_struct(bp, addr, size, (u32 *)tcfg);
+}
+
 void bnx2x_func_init(struct bnx2x *bp, struct bnx2x_func_init_params *p)
 {
         if (CHIP_IS_E1x(bp)) {
@@ -2648,9 +2744,9 @@ void bnx2x_func_init(struct bnx2x *bp, struct bnx2x_func_init_params *p)
  *
  * Return the flags that are common for the Tx-only and not normal connections.
  */
-static inline unsigned long bnx2x_get_common_flags(struct bnx2x *bp,
-                                                   struct bnx2x_fastpath *fp,
-                                                   bool zero_stats)
+static unsigned long bnx2x_get_common_flags(struct bnx2x *bp,
+                                            struct bnx2x_fastpath *fp,
+                                            bool zero_stats)
 {
         unsigned long flags = 0;
 
@@ -2670,9 +2766,9 @@ static inline unsigned long bnx2x_get_common_flags(struct bnx2x *bp,
         return flags;
 }
 
-static inline unsigned long bnx2x_get_q_flags(struct bnx2x *bp,
-                                              struct bnx2x_fastpath *fp,
-                                              bool leading)
+static unsigned long bnx2x_get_q_flags(struct bnx2x *bp,
+                                       struct bnx2x_fastpath *fp,
+                                       bool leading)
 {
         unsigned long flags = 0;
 
@@ -2680,8 +2776,11 @@ static inline unsigned long bnx2x_get_q_flags(struct bnx2x *bp,
         if (IS_MF_SD(bp))
                 __set_bit(BNX2X_Q_FLG_OV, &flags);
 
-        if (IS_FCOE_FP(fp))
+        if (IS_FCOE_FP(fp)) {
                 __set_bit(BNX2X_Q_FLG_FCOE, &flags);
+                /* For FCoE - force usage of default priority (for afex) */
+                __set_bit(BNX2X_Q_FLG_FORCE_DEFAULT_PRI, &flags);
+        }
 
         if (!fp->disable_tpa) {
                 __set_bit(BNX2X_Q_FLG_TPA, &flags);
@@ -2698,6 +2797,10 @@ static inline unsigned long bnx2x_get_q_flags(struct bnx2x *bp,
         /* Always set HW VLAN stripping */
         __set_bit(BNX2X_Q_FLG_VLAN, &flags);
 
+        /* configure silent vlan removal */
+        if (IS_MF_AFEX(bp))
+                __set_bit(BNX2X_Q_FLG_SILENT_VLAN_REM, &flags);
+
 
         return flags | bnx2x_get_common_flags(bp, fp, true);
 }
@@ -2800,6 +2903,13 @@ static void bnx2x_pf_rx_q_prep(struct bnx2x *bp,
                 rxq_init->sb_cq_index = HC_SP_INDEX_ETH_FCOE_RX_CQ_CONS;
         else
                 rxq_init->sb_cq_index = HC_INDEX_ETH_RX_CQ_CONS;
+        /* configure silent vlan removal
+         * if multi function mode is afex, then mask default vlan
+         */
+        if (IS_MF_AFEX(bp)) {
+                rxq_init->silent_removal_value = bp->afex_def_vlan_tag;
+                rxq_init->silent_removal_mask = VLAN_VID_MASK;
+        }
 }
 
 static void bnx2x_pf_tx_q_prep(struct bnx2x *bp,
@@ -3051,7 +3161,7 @@ static void bnx2x_drv_info_iscsi_stat(struct bnx2x *bp)
  *      configure FW
  *      notify others function about the change
  */
-static inline void bnx2x_config_mf_bw(struct bnx2x *bp)
+static void bnx2x_config_mf_bw(struct bnx2x *bp)
 {
         if (bp->link_vars.link_up) {
                 bnx2x_cmng_fns_init(bp, true, CMNG_FNS_MINMAX);
@@ -3060,7 +3170,7 @@ static inline void bnx2x_config_mf_bw(struct bnx2x *bp)
         storm_memset_cmng(bp, &bp->cmng, BP_PORT(bp));
 }
 
-static inline void bnx2x_set_mf_bw(struct bnx2x *bp)
+static void bnx2x_set_mf_bw(struct bnx2x *bp)
 {
         bnx2x_config_mf_bw(bp);
         bnx2x_fw_command(bp, DRV_MSG_CODE_SET_MF_BW_ACK, 0);
@@ -3147,7 +3257,7 @@ static void bnx2x_dcc_event(struct bnx2x *bp, u32 dcc_event)
 }
 
 /* must be called under the spq lock */
-static inline struct eth_spe *bnx2x_sp_get_next(struct bnx2x *bp)
+static struct eth_spe *bnx2x_sp_get_next(struct bnx2x *bp)
 {
         struct eth_spe *next_spe = bp->spq_prod_bd;
 
@@ -3163,7 +3273,7 @@ static inline struct eth_spe *bnx2x_sp_get_next(struct bnx2x *bp)
 }
 
 /* must be called under the spq lock */
-static inline void bnx2x_sp_prod_update(struct bnx2x *bp)
+static void bnx2x_sp_prod_update(struct bnx2x *bp)
 {
         int func = BP_FUNC(bp);
 
@@ -3185,7 +3295,7 @@ static inline void bnx2x_sp_prod_update(struct bnx2x *bp)
  * @cmd:        command to check
  * @cmd_type:   command type
  */
-static inline bool bnx2x_is_contextless_ramrod(int cmd, int cmd_type)
+static bool bnx2x_is_contextless_ramrod(int cmd, int cmd_type)
 {
         if ((cmd_type == NONE_CONNECTION_TYPE) ||
             (cmd == RAMROD_CMD_ID_ETH_FORWARD_SETUP) ||
@@ -3319,7 +3429,7 @@ static void bnx2x_release_alr(struct bnx2x *bp)
 #define BNX2X_DEF_SB_ATT_IDX    0x0001
 #define BNX2X_DEF_SB_IDX        0x0002
 
-static inline u16 bnx2x_update_dsb_idx(struct bnx2x *bp)
+static u16 bnx2x_update_dsb_idx(struct bnx2x *bp)
 {
         struct host_sp_status_block *def_sb = bp->def_status_blk;
         u16 rc = 0;
@@ -3451,7 +3561,7 @@ static void bnx2x_attn_int_asserted(struct bnx2x *bp, u32 asserted)
         }
 }
 
-static inline void bnx2x_fan_failure(struct bnx2x *bp)
+static void bnx2x_fan_failure(struct bnx2x *bp)
 {
         int port = BP_PORT(bp);
         u32 ext_phy_config;
@@ -3481,7 +3591,7 @@ static inline void bnx2x_fan_failure(struct bnx2x *bp)
 
 }
 
-static inline void bnx2x_attn_int_deasserted0(struct bnx2x *bp, u32 attn)
+static void bnx2x_attn_int_deasserted0(struct bnx2x *bp, u32 attn)
 {
         int port = BP_PORT(bp);
         int reg_offset;
@@ -3521,7 +3631,7 @@ static inline void bnx2x_attn_int_deasserted0(struct bnx2x *bp, u32 attn)
         }
 }
 
-static inline void bnx2x_attn_int_deasserted1(struct bnx2x *bp, u32 attn)
+static void bnx2x_attn_int_deasserted1(struct bnx2x *bp, u32 attn)
 {
         u32 val;
 
@@ -3552,7 +3662,7 @@ static inline void bnx2x_attn_int_deasserted1(struct bnx2x *bp, u32 attn)
         }
 }
 
-static inline void bnx2x_attn_int_deasserted2(struct bnx2x *bp, u32 attn)
+static void bnx2x_attn_int_deasserted2(struct bnx2x *bp, u32 attn)
 {
         u32 val;
 
@@ -3596,7 +3706,7 @@ static inline void bnx2x_attn_int_deasserted2(struct bnx2x *bp, u32 attn)
         }
 }
 
-static inline void bnx2x_attn_int_deasserted3(struct bnx2x *bp, u32 attn)
+static void bnx2x_attn_int_deasserted3(struct bnx2x *bp, u32 attn)
 {
         u32 val;
 
@@ -3606,6 +3716,7 @@ static inline void bnx2x_attn_int_deasserted3(struct bnx2x *bp, u32 attn)
                         int func = BP_FUNC(bp);
 
                         REG_WR(bp, MISC_REG_AEU_GENERAL_ATTN_12 + func*4, 0);
+                        bnx2x_read_mf_cfg(bp);
                         bp->mf_config[BP_VN(bp)] = MF_CFG_RD(bp,
                                         func_mf_config[BP_ABS_FUNC(bp)].config);
                         val = SHMEM_RD(bp,
@@ -3628,6 +3739,9 @@ static inline void bnx2x_attn_int_deasserted3(struct bnx2x *bp, u32 attn)
                                 /* start dcbx state machine */
                                 bnx2x_dcbx_set_params(bp,
                                         BNX2X_DCBX_STATE_NEG_RECEIVED);
+                        if (val & DRV_STATUS_AFEX_EVENT_MASK)
+                                bnx2x_handle_afex_cmd(bp,
+                                        val & DRV_STATUS_AFEX_EVENT_MASK);
                         if (bp->link_vars.periodic_flags &
                             PERIODIC_FLAGS_LINK_EVENT) {
                                 /*  sync with link */
@@ -3722,7 +3836,7 @@ void bnx2x_set_reset_global(struct bnx2x *bp)
  *
  * Should be run under rtnl lock
  */
-static inline void bnx2x_clear_reset_global(struct bnx2x *bp)
+static void bnx2x_clear_reset_global(struct bnx2x *bp)
 {
         u32 val;
         bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_RECOVERY_REG);
@@ -3736,7 +3850,7 @@ static inline void bnx2x_clear_reset_global(struct bnx2x *bp)
  *
  * should be run under rtnl lock
  */
-static inline bool bnx2x_reset_is_global(struct bnx2x *bp)
+static bool bnx2x_reset_is_global(struct bnx2x *bp)
 {
         u32 val = REG_RD(bp, BNX2X_RECOVERY_GLOB_REG);
 
@@ -3749,7 +3863,7 @@ static inline bool bnx2x_reset_is_global(struct bnx2x *bp)
  *
  * Should be run under rtnl lock
  */
-static inline void bnx2x_set_reset_done(struct bnx2x *bp)
+static void bnx2x_set_reset_done(struct bnx2x *bp)
 {
         u32 val;
         u32 bit = BP_PATH(bp) ?
@@ -3874,7 +3988,7 @@ bool bnx2x_clear_pf_load(struct bnx2x *bp)
  *
  * should be run under rtnl lock
  */
-static inline bool bnx2x_get_load_status(struct bnx2x *bp, int engine)
+static bool bnx2x_get_load_status(struct bnx2x *bp, int engine)
 {
         u32 mask = (engine ? BNX2X_PATH1_LOAD_CNT_MASK :
                              BNX2X_PATH0_LOAD_CNT_MASK);
@@ -3895,7 +4009,7 @@ static inline bool bnx2x_get_load_status(struct bnx2x *bp, int engine)
 /*
  * Reset the load status for the current engine.
  */
-static inline void bnx2x_clear_load_status(struct bnx2x *bp)
+static void bnx2x_clear_load_status(struct bnx2x *bp)
 {
         u32 val;
         u32 mask = (BP_PATH(bp) ? BNX2X_PATH1_LOAD_CNT_MASK :
@@ -3906,13 +4020,13 @@ static inline void bnx2x_clear_load_status(struct bnx2x *bp)
         bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_RECOVERY_REG);
 }
 
-static inline void _print_next_block(int idx, const char *blk)
+static void _print_next_block(int idx, const char *blk)
 {
         pr_cont("%s%s", idx ? ", " : "", blk);
 }
 
-static inline int bnx2x_check_blocks_with_parity0(u32 sig, int par_num,
-                                                  bool print)
+static int bnx2x_check_blocks_with_parity0(u32 sig, int par_num,
+                                           bool print)
 {
         int i = 0;
         u32 cur_bit = 0;
@@ -3959,8 +4073,8 @@ static inline int bnx2x_check_blocks_with_parity0(u32 sig, int par_num,
         return par_num;
 }
 
-static inline int bnx2x_check_blocks_with_parity1(u32 sig, int par_num,
-                                                  bool *global, bool print)
+static int bnx2x_check_blocks_with_parity1(u32 sig, int par_num,
+                                           bool *global, bool print)
 {
         int i = 0;
         u32 cur_bit = 0;
@@ -4045,8 +4159,8 @@ static inline int bnx2x_check_blocks_with_parity1(u32 sig, int par_num,
         return par_num;
 }
 
-static inline int bnx2x_check_blocks_with_parity2(u32 sig, int par_num,
-                                                  bool print)
+static int bnx2x_check_blocks_with_parity2(u32 sig, int par_num,
+                                           bool print)
 {
         int i = 0;
         u32 cur_bit = 0;
@@ -4097,8 +4211,8 @@ static inline int bnx2x_check_blocks_with_parity2(u32 sig, int par_num,
         return par_num;
 }
 
-static inline int bnx2x_check_blocks_with_parity3(u32 sig, int par_num,
-                                                  bool *global, bool print)
+static int bnx2x_check_blocks_with_parity3(u32 sig, int par_num,
+                                           bool *global, bool print)
 {
         int i = 0;
         u32 cur_bit = 0;
@@ -4139,8 +4253,8 @@ static inline int bnx2x_check_blocks_with_parity3(u32 sig, int par_num,
         return par_num;
 }
 
-static inline int bnx2x_check_blocks_with_parity4(u32 sig, int par_num,
-                                                  bool print)
+static int bnx2x_check_blocks_with_parity4(u32 sig, int par_num,
+                                           bool print)
 {
         int i = 0;
         u32 cur_bit = 0;
@@ -4166,8 +4280,8 @@ static inline int bnx2x_check_blocks_with_parity4(u32 sig, int par_num,
         return par_num;
 }
 
-static inline bool bnx2x_parity_attn(struct bnx2x *bp, bool *global, bool print,
-                                     u32 *sig)
+static bool bnx2x_parity_attn(struct bnx2x *bp, bool *global, bool print,
+                              u32 *sig)
 {
         if ((sig[0] & HW_PRTY_ASSERT_SET_0) ||
             (sig[1] & HW_PRTY_ASSERT_SET_1) ||
@@ -4238,7 +4352,7 @@ bool bnx2x_chk_parity_attn(struct bnx2x *bp, bool *global, bool print)
 }
 
 
-static inline void bnx2x_attn_int_deasserted4(struct bnx2x *bp, u32 attn)
+static void bnx2x_attn_int_deasserted4(struct bnx2x *bp, u32 attn)
 {
         u32 val;
         if (attn & AEU_INPUTS_ATTN_BITS_PGLUE_HW_INTERRUPT) {
@@ -4430,7 +4544,7 @@ void bnx2x_igu_ack_sb(struct bnx2x *bp, u8 igu_sb_id, u8 segment,
                              igu_addr);
 }
 
-static inline void bnx2x_update_eq_prod(struct bnx2x *bp, u16 prod)
+static void bnx2x_update_eq_prod(struct bnx2x *bp, u16 prod)
 {
         /* No memory barriers */
         storm_memset_eq_prod(bp, prod, BP_FUNC(bp));
@@ -4461,7 +4575,7 @@ static int  bnx2x_cnic_handle_cfc_del(struct bnx2x *bp, u32 cid,
 }
 #endif
 
-static inline void bnx2x_handle_mcast_eqe(struct bnx2x *bp)
+static void bnx2x_handle_mcast_eqe(struct bnx2x *bp)
 {
         struct bnx2x_mcast_ramrod_params rparam;
         int rc;
@@ -4486,8 +4600,8 @@ static inline void bnx2x_handle_mcast_eqe(struct bnx2x *bp)
         netif_addr_unlock_bh(bp->dev);
 }
 
-static inline void bnx2x_handle_classification_eqe(struct bnx2x *bp,
-                                                   union event_ring_elem *elem)
+static void bnx2x_handle_classification_eqe(struct bnx2x *bp,
+                                            union event_ring_elem *elem)
 {
         unsigned long ramrod_flags = 0;
         int rc = 0;
@@ -4534,7 +4648,7 @@ static inline void bnx2x_handle_classification_eqe(struct bnx2x *bp,
 static void bnx2x_set_iscsi_eth_rx_mode(struct bnx2x *bp, bool start);
 #endif
 
-static inline void bnx2x_handle_rx_mode_eqe(struct bnx2x *bp)
+static void bnx2x_handle_rx_mode_eqe(struct bnx2x *bp)
 {
         netif_addr_lock_bh(bp->dev);
 
@@ -4555,7 +4669,94 @@ static inline void bnx2x_handle_rx_mode_eqe(struct bnx2x *bp)
         netif_addr_unlock_bh(bp->dev);
 }
 
-static inline struct bnx2x_queue_sp_obj *bnx2x_cid_to_q_obj(
+static void bnx2x_after_afex_vif_lists(struct bnx2x *bp,
+                                              union event_ring_elem *elem)
+{
+        if (elem->message.data.vif_list_event.echo == VIF_LIST_RULE_GET) {
+                DP(BNX2X_MSG_SP,
+                   "afex: ramrod completed VIF LIST_GET, addrs 0x%x\n",
+                   elem->message.data.vif_list_event.func_bit_map);
+                bnx2x_fw_command(bp, DRV_MSG_CODE_AFEX_LISTGET_ACK,
+                        elem->message.data.vif_list_event.func_bit_map);
+        } else if (elem->message.data.vif_list_event.echo ==
+                   VIF_LIST_RULE_SET) {
+                DP(BNX2X_MSG_SP, "afex: ramrod completed VIF LIST_SET\n");
+                bnx2x_fw_command(bp, DRV_MSG_CODE_AFEX_LISTSET_ACK, 0);
+        }
+}
+
+/* called with rtnl_lock */
+static void bnx2x_after_function_update(struct bnx2x *bp)
+{
+        int q, rc;
+        struct bnx2x_fastpath *fp;
+        struct bnx2x_queue_state_params queue_params = {NULL};
+        struct bnx2x_queue_update_params *q_update_params =
+                &queue_params.params.update;
+
+        /* Send Q update command with afex vlan removal values  for all Qs */
+        queue_params.cmd = BNX2X_Q_CMD_UPDATE;
+
+        /* set silent vlan removal values according to vlan mode */
+        __set_bit(BNX2X_Q_UPDATE_SILENT_VLAN_REM_CHNG,
+                  &q_update_params->update_flags);
+        __set_bit(BNX2X_Q_UPDATE_SILENT_VLAN_REM,
+                  &q_update_params->update_flags);
+        __set_bit(RAMROD_COMP_WAIT, &queue_params.ramrod_flags);
+
+        /* in access mode mark mask and value are 0 to strip all vlans */
+        if (bp->afex_vlan_mode == FUNC_MF_CFG_AFEX_VLAN_ACCESS_MODE) {
+                q_update_params->silent_removal_value = 0;
+                q_update_params->silent_removal_mask = 0;
+        } else {
+                q_update_params->silent_removal_value =
+                        (bp->afex_def_vlan_tag & VLAN_VID_MASK);
+                q_update_params->silent_removal_mask = VLAN_VID_MASK;
+        }
+
+        for_each_eth_queue(bp, q) {
+                /* Set the appropriate Queue object */
+                fp = &bp->fp[q];
+                queue_params.q_obj = &fp->q_obj;
+
+                /* send the ramrod */
+                rc = bnx2x_queue_state_change(bp, &queue_params);
+                if (rc < 0)
+                        BNX2X_ERR("Failed to config silent vlan rem for Q %d\n",
+                                  q);
+        }
+
+#ifdef BCM_CNIC
+        if (!NO_FCOE(bp)) {
+                fp = &bp->fp[FCOE_IDX];
+                queue_params.q_obj = &fp->q_obj;
+
+                /* clear pending completion bit */
+                __clear_bit(RAMROD_COMP_WAIT, &queue_params.ramrod_flags);
+
+                /* mark latest Q bit */
+                smp_mb__before_clear_bit();
+                set_bit(BNX2X_AFEX_FCOE_Q_UPDATE_PENDING, &bp->sp_state);
+                smp_mb__after_clear_bit();
+
+                /* send Q update ramrod for FCoE Q */
+                rc = bnx2x_queue_state_change(bp, &queue_params);
+                if (rc < 0)
+                        BNX2X_ERR("Failed to config silent vlan rem for Q %d\n",
+                                  q);
+        } else {
+                /* If no FCoE ring - ACK MCP now */
+                bnx2x_link_report(bp);
+                bnx2x_fw_command(bp, DRV_MSG_CODE_AFEX_VIFSET_ACK, 0);
+        }
+#else
+        /* If no FCoE ring - ACK MCP now */
+        bnx2x_link_report(bp);
+        bnx2x_fw_command(bp, DRV_MSG_CODE_AFEX_VIFSET_ACK, 0);
+#endif /* BCM_CNIC */
+}
+
+static struct bnx2x_queue_sp_obj *bnx2x_cid_to_q_obj(
         struct bnx2x *bp, u32 cid)
 {
         DP(BNX2X_MSG_SP, "retrieving fp from cid %d\n", cid);
@@ -4653,6 +4854,28 @@ static void bnx2x_eq_int(struct bnx2x *bp)
                                 break;
                         bnx2x_dcbx_set_params(bp, BNX2X_DCBX_STATE_TX_RELEASED);
                         goto next_spqe;
+                case EVENT_RING_OPCODE_FUNCTION_UPDATE:
+                        DP(BNX2X_MSG_SP | BNX2X_MSG_MCP,
+                           "AFEX: ramrod completed FUNCTION_UPDATE\n");
+                        f_obj->complete_cmd(bp, f_obj, BNX2X_F_CMD_AFEX_UPDATE);
+
+                        /* We will perform the Queues update from sp_rtnl task
+                         * as all Queue SP operations should run under
+                         * rtnl_lock.
+                         */
+                        smp_mb__before_clear_bit();
+                        set_bit(BNX2X_SP_RTNL_AFEX_F_UPDATE,
+                                &bp->sp_rtnl_state);
+                        smp_mb__after_clear_bit();
+
+                        schedule_delayed_work(&bp->sp_rtnl_task, 0);
+                        goto next_spqe;
+
+                case EVENT_RING_OPCODE_AFEX_VIF_LISTS:
+                        f_obj->complete_cmd(bp, f_obj,
+                                            BNX2X_F_CMD_AFEX_VIFLISTS);
+                        bnx2x_after_afex_vif_lists(bp, elem);
+                        goto next_spqe;
                 case EVENT_RING_OPCODE_FUNCTION_START:
                         DP(BNX2X_MSG_SP | NETIF_MSG_IFUP,
                            "got FUNC_START ramrod\n");
@@ -4784,6 +5007,13 @@ static void bnx2x_sp_task(struct work_struct *work)
 
         bnx2x_ack_sb(bp, bp->igu_dsb_id, ATTENTION_ID,
              le16_to_cpu(bp->def_att_idx), IGU_INT_ENABLE, 1);
+
+        /* afex - poll to check if VIFSET_ACK should be sent to MFW */
+        if (test_and_clear_bit(BNX2X_AFEX_PENDING_VIFSET_MCP_ACK,
+                               &bp->sp_state)) {
+                bnx2x_link_report(bp);
+                bnx2x_fw_command(bp, DRV_MSG_CODE_AFEX_VIFSET_ACK, 0);
+        }
 }
 
 irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance)
@@ -4870,7 +5100,7 @@ static void bnx2x_timer(unsigned long data)
  * nic init service functions
  */
 
-static inline void bnx2x_fill(struct bnx2x *bp, u32 addr, int fill, u32 len)
+static void bnx2x_fill(struct bnx2x *bp, u32 addr, int fill, u32 len)
 {
         u32 i;
         if (!(len%4) && !(addr%4))
@@ -4883,10 +5113,10 @@ static inline void bnx2x_fill(struct bnx2x *bp, u32 addr, int fill, u32 len)
 }
 
 /* helper: writes FP SP data to FW - data_size in dwords */
-static inline void bnx2x_wr_fp_sb_data(struct bnx2x *bp,
-                                       int fw_sb_id,
-                                       u32 *sb_data_p,
-                                       u32 data_size)
+static void bnx2x_wr_fp_sb_data(struct bnx2x *bp,
+                                int fw_sb_id,
+                                u32 *sb_data_p,
+                                u32 data_size)
 {
         int index;
         for (index = 0; index < data_size; index++)
@@ -4896,7 +5126,7 @@ static inline void bnx2x_wr_fp_sb_data(struct bnx2x *bp,
                         *(sb_data_p + index));
 }
 
-static inline void bnx2x_zero_fp_sb(struct bnx2x *bp, int fw_sb_id)
+static void bnx2x_zero_fp_sb(struct bnx2x *bp, int fw_sb_id)
 {
         u32 *sb_data_p;
         u32 data_size = 0;
@@ -4929,7 +5159,7 @@ static inline void bnx2x_zero_fp_sb(struct bnx2x *bp, int fw_sb_id)
 }
 
 /* helper:  writes SP SB data to FW */
-static inline void bnx2x_wr_sp_sb_data(struct bnx2x *bp,
+static void bnx2x_wr_sp_sb_data(struct bnx2x *bp,
                 struct hc_sp_status_block_data *sp_sb_data)
 {
         int func = BP_FUNC(bp);
@@ -4941,7 +5171,7 @@ static inline void bnx2x_wr_sp_sb_data(struct bnx2x *bp,
                         *((u32 *)sp_sb_data + i));
 }
 
-static inline void bnx2x_zero_sp_sb(struct bnx2x *bp)
+static void bnx2x_zero_sp_sb(struct bnx2x *bp)
 {
         int func = BP_FUNC(bp);
         struct hc_sp_status_block_data sp_sb_data;
@@ -4962,8 +5192,7 @@ static inline void bnx2x_zero_sp_sb(struct bnx2x *bp)
 }
 
 
-static inline
-void bnx2x_setup_ndsb_state_machine(struct hc_status_block_sm *hc_sm,
+static void bnx2x_setup_ndsb_state_machine(struct hc_status_block_sm *hc_sm,
                                            int igu_sb_id, int igu_seg_id)
 {
         hc_sm->igu_sb_id = igu_sb_id;
@@ -4974,8 +5203,7 @@ void bnx2x_setup_ndsb_state_machine(struct hc_status_block_sm *hc_sm,
 
 
 /* allocates state machine ids. */
-static inline
-void bnx2x_map_sb_state_machines(struct hc_index_data *index_data)
+static void bnx2x_map_sb_state_machines(struct hc_index_data *index_data)
 {
         /* zero out state machine indices */
         /* rx indices */
@@ -5383,7 +5611,7 @@ static inline u8 bnx2x_fp_fw_sb_id(struct bnx2x_fastpath *fp)
         return fp->bp->base_fw_ndsb + fp->index + CNIC_PRESENT;
 }
 
-static inline u8 bnx2x_fp_cl_id(struct bnx2x_fastpath *fp)
+static u8 bnx2x_fp_cl_id(struct bnx2x_fastpath *fp)
 {
         if (CHIP_IS_E1x(fp->bp))
                 return BP_L_ID(fp->bp) + fp->index;
@@ -5444,6 +5672,43 @@ static void bnx2x_init_eth_fp(struct bnx2x *bp, int fp_idx)
         bnx2x_update_fpsb_idx(fp);
 }
 
+static void bnx2x_init_tx_ring_one(struct bnx2x_fp_txdata *txdata)
+{
+        int i;
+
+        for (i = 1; i <= NUM_TX_RINGS; i++) {
+                struct eth_tx_next_bd *tx_next_bd =
+                        &txdata->tx_desc_ring[TX_DESC_CNT * i - 1].next_bd;
+
+                tx_next_bd->addr_hi =
+                        cpu_to_le32(U64_HI(txdata->tx_desc_mapping +
+                                    BCM_PAGE_SIZE*(i % NUM_TX_RINGS)));
+                tx_next_bd->addr_lo =
+                        cpu_to_le32(U64_LO(txdata->tx_desc_mapping +
+                                    BCM_PAGE_SIZE*(i % NUM_TX_RINGS)));
+        }
+
+        SET_FLAG(txdata->tx_db.data.header.header, DOORBELL_HDR_DB_TYPE, 1);
+        txdata->tx_db.data.zero_fill1 = 0;
+        txdata->tx_db.data.prod = 0;
+
+        txdata->tx_pkt_prod = 0;
+        txdata->tx_pkt_cons = 0;
+        txdata->tx_bd_prod = 0;
+        txdata->tx_bd_cons = 0;
+        txdata->tx_pkt = 0;
+}
+
+static void bnx2x_init_tx_rings(struct bnx2x *bp)
+{
+        int i;
+        u8 cos;
+
+        for_each_tx_queue(bp, i)
+                for_each_cos_in_tx_queue(&bp->fp[i], cos)
+                        bnx2x_init_tx_ring_one(&bp->fp[i].txdata[cos]);
+}
+
 void bnx2x_nic_init(struct bnx2x *bp, u32 load_code)
 {
         int i;
@@ -5968,7 +6233,7 @@ void bnx2x_pf_disable(struct bnx2x *bp)
         REG_WR(bp, CFC_REG_WEAK_ENABLE_PF, 0);
 }
 
-static inline void bnx2x__common_init_phy(struct bnx2x *bp)
+static void bnx2x__common_init_phy(struct bnx2x *bp)
 {
         u32 shmem_base[2], shmem2_base[2];
         shmem_base[0] =  bp->common.shmem_base;
@@ -6255,12 +6520,24 @@ static int bnx2x_init_hw_common(struct bnx2x *bp)
         if (!CHIP_IS_E1(bp))
                 REG_WR(bp, PRS_REG_E1HOV_MODE, bp->path_has_ovlan);
 
-        if (!CHIP_IS_E1x(bp) && !CHIP_IS_E3B0(bp))
-                /* Bit-map indicating which L2 hdrs may appear
-                 * after the basic Ethernet header
-                 */
-                REG_WR(bp, PRS_REG_HDRS_AFTER_BASIC,
-                       bp->path_has_ovlan ? 7 : 6);
+        if (!CHIP_IS_E1x(bp) && !CHIP_IS_E3B0(bp)) {
+                if (IS_MF_AFEX(bp)) {
+                        /* configure that VNTag and VLAN headers must be
+                         * received in afex mode
+                         */
+                        REG_WR(bp, PRS_REG_HDRS_AFTER_BASIC, 0xE);
+                        REG_WR(bp, PRS_REG_MUST_HAVE_HDRS, 0xA);
+                        REG_WR(bp, PRS_REG_HDRS_AFTER_TAG_0, 0x6);
+                        REG_WR(bp, PRS_REG_TAG_ETHERTYPE_0, 0x8926);
+                        REG_WR(bp, PRS_REG_TAG_LEN_0, 0x4);
+                } else {
+                        /* Bit-map indicating which L2 hdrs may appear
+                         * after the basic Ethernet header
+                         */
+                        REG_WR(bp, PRS_REG_HDRS_AFTER_BASIC,
+                               bp->path_has_ovlan ? 7 : 6);
+                }
+        }
 
         bnx2x_init_block(bp, BLOCK_TSDM, PHASE_COMMON);
         bnx2x_init_block(bp, BLOCK_CSDM, PHASE_COMMON);
@@ -6294,9 +6571,21 @@ static int bnx2x_init_hw_common(struct bnx2x *bp)
         bnx2x_init_block(bp, BLOCK_XPB, PHASE_COMMON);
         bnx2x_init_block(bp, BLOCK_PBF, PHASE_COMMON);
 
-        if (!CHIP_IS_E1x(bp))
-                REG_WR(bp, PBF_REG_HDRS_AFTER_BASIC,
-                       bp->path_has_ovlan ? 7 : 6);
+        if (!CHIP_IS_E1x(bp)) {
+                if (IS_MF_AFEX(bp)) {
+                        /* configure that VNTag and VLAN headers must be
+                         * sent in afex mode
+                         */
+                        REG_WR(bp, PBF_REG_HDRS_AFTER_BASIC, 0xE);
+                        REG_WR(bp, PBF_REG_MUST_HAVE_HDRS, 0xA);
+                        REG_WR(bp, PBF_REG_HDRS_AFTER_TAG_0, 0x6);
+                        REG_WR(bp, PBF_REG_TAG_ETHERTYPE_0, 0x8926);
+                        REG_WR(bp, PBF_REG_TAG_LEN_0, 0x4);
+                } else {
+                        REG_WR(bp, PBF_REG_HDRS_AFTER_BASIC,
+                               bp->path_has_ovlan ? 7 : 6);
+                }
+        }
 
         REG_WR(bp, SRC_REG_SOFT_RST, 1);
 
@@ -6514,15 +6803,29 @@ static int bnx2x_init_hw_port(struct bnx2x *bp)
 
 
         bnx2x_init_block(bp, BLOCK_PRS, init_phase);
-        if (CHIP_IS_E3B0(bp))
-                /* Ovlan exists only if we are in multi-function +
-                 * switch-dependent mode, in switch-independent there
-                 * is no ovlan headers
-                 */
-                REG_WR(bp, BP_PORT(bp) ?
-                       PRS_REG_HDRS_AFTER_BASIC_PORT_1 :
-                       PRS_REG_HDRS_AFTER_BASIC_PORT_0,
-                       (bp->path_has_ovlan ? 7 : 6));
+        if (CHIP_IS_E3B0(bp)) {
+                if (IS_MF_AFEX(bp)) {
+                        /* configure headers for AFEX mode */
+                        REG_WR(bp, BP_PORT(bp) ?
+                               PRS_REG_HDRS_AFTER_BASIC_PORT_1 :
+                               PRS_REG_HDRS_AFTER_BASIC_PORT_0, 0xE);
+                        REG_WR(bp, BP_PORT(bp) ?
+                               PRS_REG_HDRS_AFTER_TAG_0_PORT_1 :
+                               PRS_REG_HDRS_AFTER_TAG_0_PORT_0, 0x6);
+                        REG_WR(bp, BP_PORT(bp) ?
+                               PRS_REG_MUST_HAVE_HDRS_PORT_1 :
+                               PRS_REG_MUST_HAVE_HDRS_PORT_0, 0xA);
+                } else {
+                        /* Ovlan exists only if we are in multi-function +
+                         * switch-dependent mode, in switch-independent there
+                         * is no ovlan headers
+                         */
+                        REG_WR(bp, BP_PORT(bp) ?
+                               PRS_REG_HDRS_AFTER_BASIC_PORT_1 :
+                               PRS_REG_HDRS_AFTER_BASIC_PORT_0,
+                               (bp->path_has_ovlan ? 7 : 6));
+                }
+        }
 
         bnx2x_init_block(bp, BLOCK_TSDM, init_phase);
         bnx2x_init_block(bp, BLOCK_CSDM, init_phase);
@@ -6584,10 +6887,15 @@ static int bnx2x_init_hw_port(struct bnx2x *bp)
                 /* Bit-map indicating which L2 hdrs may appear after the
                  * basic Ethernet header
                  */
-                REG_WR(bp, BP_PORT(bp) ?
-                           NIG_REG_P1_HDRS_AFTER_BASIC :
-                           NIG_REG_P0_HDRS_AFTER_BASIC,
-                           IS_MF_SD(bp) ? 7 : 6);
+                if (IS_MF_AFEX(bp))
+                        REG_WR(bp, BP_PORT(bp) ?
+                               NIG_REG_P1_HDRS_AFTER_BASIC :
+                               NIG_REG_P0_HDRS_AFTER_BASIC, 0xE);
+                else
+                        REG_WR(bp, BP_PORT(bp) ?
+                               NIG_REG_P1_HDRS_AFTER_BASIC :
+                               NIG_REG_P0_HDRS_AFTER_BASIC,
+                               IS_MF_SD(bp) ? 7 : 6);
 
                 if (CHIP_IS_E3(bp))
                         REG_WR(bp, BP_PORT(bp) ?
@@ -6609,6 +6917,7 @@ static int bnx2x_init_hw_port(struct bnx2x *bp)
                                 val = 1;
                                 break;
                         case MULTI_FUNCTION_SI:
+                        case MULTI_FUNCTION_AFEX:
                                 val = 2;
                                 break;
                         }
@@ -6640,21 +6949,71 @@ static int bnx2x_init_hw_port(struct bnx2x *bp)
 static void bnx2x_ilt_wr(struct bnx2x *bp, u32 index, dma_addr_t addr)
 {
         int reg;
+        u32 wb_write[2];
 
         if (CHIP_IS_E1(bp))
                 reg = PXP2_REG_RQ_ONCHIP_AT + index*8;
         else
                 reg = PXP2_REG_RQ_ONCHIP_AT_B0 + index*8;
 
-        bnx2x_wb_wr(bp, reg, ONCHIP_ADDR1(addr), ONCHIP_ADDR2(addr));
+        wb_write[0] = ONCHIP_ADDR1(addr);
+        wb_write[1] = ONCHIP_ADDR2(addr);
+        REG_WR_DMAE(bp, reg, wb_write, 2);
 }
 
-static inline void bnx2x_igu_clear_sb(struct bnx2x *bp, u8 idu_sb_id)
+static void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func,
+                                   u8 idu_sb_id, bool is_Pf)
+{
+        u32 data, ctl, cnt = 100;
+        u32 igu_addr_data = IGU_REG_COMMAND_REG_32LSB_DATA;
+        u32 igu_addr_ctl = IGU_REG_COMMAND_REG_CTRL;
+        u32 igu_addr_ack = IGU_REG_CSTORM_TYPE_0_SB_CLEANUP + (idu_sb_id/32)*4;
+        u32 sb_bit =  1 << (idu_sb_id%32);
+        u32 func_encode = func | (is_Pf ? 1 : 0) << IGU_FID_ENCODE_IS_PF_SHIFT;
+        u32 addr_encode = IGU_CMD_E2_PROD_UPD_BASE + idu_sb_id;
+
+        /* Not supported in BC mode */
+        if (CHIP_INT_MODE_IS_BC(bp))
+                return;
+
+        data = (IGU_USE_REGISTER_cstorm_type_0_sb_cleanup
+                        << IGU_REGULAR_CLEANUP_TYPE_SHIFT)      |
+                IGU_REGULAR_CLEANUP_SET                         |
+                IGU_REGULAR_BCLEANUP;
+
+        ctl = addr_encode << IGU_CTRL_REG_ADDRESS_SHIFT         |
+              func_encode << IGU_CTRL_REG_FID_SHIFT             |
+              IGU_CTRL_CMD_TYPE_WR << IGU_CTRL_REG_TYPE_SHIFT;
+
+        DP(NETIF_MSG_HW, "write 0x%08x to IGU(via GRC) addr 0x%x\n",
+                         data, igu_addr_data);
+        REG_WR(bp, igu_addr_data, data);
+        mmiowb();
+        barrier();
+        DP(NETIF_MSG_HW, "write 0x%08x to IGU(via GRC) addr 0x%x\n",
+                          ctl, igu_addr_ctl);
+        REG_WR(bp, igu_addr_ctl, ctl);
+        mmiowb();
+        barrier();
+
+        /* wait for clean up to finish */
+        while (!(REG_RD(bp, igu_addr_ack) & sb_bit) && --cnt)
+                msleep(20);
+
+
+        if (!(REG_RD(bp, igu_addr_ack) & sb_bit)) {
+                DP(NETIF_MSG_HW,
+                   "Unable to finish IGU cleanup: idu_sb_id %d offset %d bit %d (cnt %d)\n",
+                          idu_sb_id, idu_sb_id/32, idu_sb_id%32, cnt);
+        }
+}
+
+static void bnx2x_igu_clear_sb(struct bnx2x *bp, u8 idu_sb_id)
 {
         bnx2x_igu_clear_sb_gen(bp, BP_FUNC(bp), idu_sb_id, true /*PF*/);
 }
 
-static inline void bnx2x_clear_func_ilt(struct bnx2x *bp, u32 func)
+static void bnx2x_clear_func_ilt(struct bnx2x *bp, u32 func)
 {
         u32 i, base = FUNC_ILT_BASE(func);
         for (i = base; i < base + ILT_PER_FUNC; i++)
@@ -7005,7 +7364,7 @@ void bnx2x_free_mem(struct bnx2x *bp)
                        BCM_PAGE_SIZE * NUM_EQ_PAGES);
 }
 
-static inline int bnx2x_alloc_fw_stats_mem(struct bnx2x *bp)
+static int bnx2x_alloc_fw_stats_mem(struct bnx2x *bp)
 {
         int num_groups;
         int is_fcoe_stats = NO_FCOE(bp) ? 0 : 1;
@@ -7192,7 +7551,8 @@ int bnx2x_set_eth_mac(struct bnx2x *bp, bool set)
         unsigned long ramrod_flags = 0;
 
 #ifdef BCM_CNIC
-        if (is_zero_ether_addr(bp->dev->dev_addr) && IS_MF_STORAGE_SD(bp)) {
+        if (is_zero_ether_addr(bp->dev->dev_addr) &&
+            (IS_MF_STORAGE_SD(bp) || IS_MF_FCOE_AFEX(bp))) {
                 DP(NETIF_MSG_IFUP | NETIF_MSG_IFDOWN,
                    "Ignoring Zero MAC for STORAGE SD mode\n");
                 return 0;
@@ -7230,7 +7590,7 @@ static void __devinit bnx2x_set_int_mode(struct bnx2x *bp)
                 BNX2X_DEV_INFO("set number of queues to 1\n");
                 break;
         default:
-                /* Set number of queues according to bp->multi_mode value */
+                /* Set number of queues for MSI-X mode */
                 bnx2x_set_num_queues(bp);
 
                 BNX2X_DEV_INFO("set number of queues to %d\n", bp->num_queues);
@@ -7239,15 +7599,17 @@ static void __devinit bnx2x_set_int_mode(struct bnx2x *bp)
                  * so try to enable MSI-X with the requested number of fp's
                  * and fallback to MSI or legacy INTx with one fp
                  */
-                if (bnx2x_enable_msix(bp)) {
-                        /* failed to enable MSI-X */
-                        BNX2X_DEV_INFO("Failed to enable MSI-X (%d), set number of queues to %d\n",
+                if (bnx2x_enable_msix(bp) ||
+                    bp->flags & USING_SINGLE_MSIX_FLAG) {
+                        /* failed to enable multiple MSI-X */
+                        BNX2X_DEV_INFO("Failed to enable multiple MSI-X (%d), set number of queues to %d\n",
                                        bp->num_queues, 1 + NON_ETH_CONTEXT_USE);
 
                         bp->num_queues = 1 + NON_ETH_CONTEXT_USE;
 
                         /* Try to enable MSI */
-                        if (!(bp->flags & DISABLE_MSI_FLAG))
+                        if (!(bp->flags & USING_SINGLE_MSIX_FLAG) &&
+                            !(bp->flags & DISABLE_MSI_FLAG))
                                 bnx2x_enable_msi(bp);
                 }
                 break;
@@ -7368,7 +7730,7 @@ void bnx2x_ilt_set_info(struct bnx2x *bp)
  *      - HC configuration
  *      - Queue's CDU context
  */
-static inline void bnx2x_pf_q_prep_init(struct bnx2x *bp,
+static void bnx2x_pf_q_prep_init(struct bnx2x *bp,
         struct bnx2x_fastpath *fp, struct bnx2x_queue_init_params *init_params)
 {
 
@@ -7718,7 +8080,7 @@ static void bnx2x_reset_port(struct bnx2x *bp)
         /* TODO: Close Doorbell port? */
 }
 
-static inline int bnx2x_reset_hw(struct bnx2x *bp, u32 load_code)
+static int bnx2x_reset_hw(struct bnx2x *bp, u32 load_code)
 {
         struct bnx2x_func_state_params func_params = {NULL};
 
@@ -7733,7 +8095,7 @@ static inline int bnx2x_reset_hw(struct bnx2x *bp, u32 load_code)
         return bnx2x_func_state_change(bp, &func_params);
 }
 
-static inline int bnx2x_func_stop(struct bnx2x *bp)
+static int bnx2x_func_stop(struct bnx2x *bp)
 {
         struct bnx2x_func_state_params func_params = {NULL};
         int rc;
@@ -7848,7 +8210,7 @@ void bnx2x_send_unload_done(struct bnx2x *bp)
                 bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE, 0);
 }
 
-static inline int bnx2x_func_wait_started(struct bnx2x *bp)
+static int bnx2x_func_wait_started(struct bnx2x *bp)
 {
         int tout = 50;
         int msix = (bp->flags & USING_MSIX_FLAG) ? 1 : 0;
@@ -8158,7 +8520,7 @@ static void bnx2x_reset_mcp_prep(struct bnx2x *bp, u32 *magic_val)
  *
  * @bp: driver handle
  */
-static inline void bnx2x_mcp_wait_one(struct bnx2x *bp)
+static void bnx2x_mcp_wait_one(struct bnx2x *bp)
 {
         /* special handling for emulation and FPGA,
            wait 10 times longer */
@@ -8494,7 +8856,7 @@ exit_leader_reset:
         return rc;
 }
 
-static inline void bnx2x_recovery_failed(struct bnx2x *bp)
+static void bnx2x_recovery_failed(struct bnx2x *bp)
 {
         netdev_err(bp->dev, "Recovery has failed. Power cycle is needed.\n");
 
@@ -8727,7 +9089,8 @@ sp_rtnl_not_reset:
 #endif
         if (test_and_clear_bit(BNX2X_SP_RTNL_SETUP_TC, &bp->sp_rtnl_state))
                 bnx2x_setup_tc(bp->dev, bp->dcbx_port_params.ets.num_of_cos);
-
+        if (test_and_clear_bit(BNX2X_SP_RTNL_AFEX_F_UPDATE, &bp->sp_rtnl_state))
+                bnx2x_after_function_update(bp);
         /*
          * in case of fan failure we need to reset id if the "stop on error"
          * debug flag is set, since we trying to prevent permanent overheating
@@ -9122,13 +9485,34 @@ static int __devinit bnx2x_prev_unload_common(struct bnx2x *bp)
         return bnx2x_prev_mcp_done(bp);
 }
 
+/* previous driver DMAE transaction may have occurred when pre-boot stage ended
+ * and boot began, or when kdump kernel was loaded. Either case would invalidate
+ * the addresses of the transaction, resulting in was-error bit set in the pci
+ * causing all hw-to-host pcie transactions to timeout. If this happened we want
+ * to clear the interrupt which detected this from the pglueb and the was done
+ * bit
+ */
+static void __devinit bnx2x_prev_interrupted_dmae(struct bnx2x *bp)
+{
+        u32 val = REG_RD(bp, PGLUE_B_REG_PGLUE_B_INT_STS);
+        if (val & PGLUE_B_PGLUE_B_INT_STS_REG_WAS_ERROR_ATTN) {
+                BNX2X_ERR("was error bit was found to be set in pglueb upon startup. Clearing");
+                REG_WR(bp, PGLUE_B_REG_WAS_ERROR_PF_7_0_CLR, 1 << BP_FUNC(bp));
+        }
+}
+
 static int __devinit bnx2x_prev_unload(struct bnx2x *bp)
 {
         int time_counter = 10;
         u32 rc, fw, hw_lock_reg, hw_lock_val;
         BNX2X_DEV_INFO("Entering Previous Unload Flow\n");
 
-       /* Release previously held locks */
+        /* clear hw from errors which may have resulted from an interrupted
+         * dmae transaction.
+         */
+        bnx2x_prev_interrupted_dmae(bp);
+
+        /* Release previously held locks */
         hw_lock_reg = (BP_FUNC(bp) <= 5) ?
                       (MISC_REG_DRIVER_CONTROL_1 + BP_FUNC(bp) * 8) :
                       (MISC_REG_DRIVER_CONTROL_7 + (BP_FUNC(bp) - 6) * 8);
@@ -9201,6 +9585,17 @@ static void __devinit bnx2x_get_common_hwinfo(struct bnx2x *bp)
         id |= (val & 0xf);
         bp->common.chip_id = id;
 
+        /* force 57811 according to MISC register */
+        if (REG_RD(bp, MISC_REG_CHIP_TYPE) & MISC_REG_CHIP_TYPE_57811_MASK) {
+                if (CHIP_IS_57810(bp))
+                        bp->common.chip_id = (CHIP_NUM_57811 << 16) |
+                                (bp->common.chip_id & 0x0000FFFF);
+                else if (CHIP_IS_57810_MF(bp))
+                        bp->common.chip_id = (CHIP_NUM_57811_MF << 16) |
+                                (bp->common.chip_id & 0x0000FFFF);
+                bp->common.chip_id |= 0x1;
+        }
+
         /* Set doorbell size */
         bp->db_size = (1 << BNX2X_DB_SHIFT);
 
@@ -9293,7 +9688,9 @@ static void __devinit bnx2x_get_common_hwinfo(struct bnx2x *bp)
         bp->link_params.feature_config_flags |=
                 (val >= REQ_BC_VER_4_VRFY_SPECIFIC_PHY_OPT_MDL) ?
                 FEATURE_CONFIG_BC_SUPPORTS_DUAL_PHY_OPT_MDL_VRFY : 0;
-
+        bp->link_params.feature_config_flags |=
+                (val >= REQ_BC_VER_4_VRFY_AFEX_SUPPORTED) ?
+                FEATURE_CONFIG_BC_SUPPORTS_AFEX : 0;
         bp->link_params.feature_config_flags |=
                 (val >= REQ_BC_VER_4_SFP_TX_DISABLE_SUPPORTED) ?
                 FEATURE_CONFIG_BC_SUPPORTS_SFP_TX_DISABLED : 0;
@@ -9925,6 +10322,9 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)
 
                         } else
                                 bp->flags |= NO_FCOE_FLAG;
+
+                        bp->mf_ext_config = cfg;
+
                 } else { /* SD MODE */
                         if (IS_MF_STORAGE_SD(bp)) {
                                 if (BNX2X_IS_MF_SD_PROTOCOL_ISCSI(bp)) {
@@ -9946,6 +10346,11 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)
                                 memset(bp->dev->dev_addr, 0, ETH_ALEN);
                         }
                 }
+
+                if (IS_MF_FCOE_AFEX(bp))
+                        /* use FIP MAC as primary MAC */
+                        memcpy(bp->dev->dev_addr, fip_mac, ETH_ALEN);
+
 #endif
         } else {
                 /* in SF read MACs from port configuration */
@@ -10118,6 +10523,19 @@ static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp)
                                 } else
                                         BNX2X_DEV_INFO("illegal MAC address for SI\n");
                                 break;
+                        case SHARED_FEAT_CFG_FORCE_SF_MODE_AFEX_MODE:
+                                if ((!CHIP_IS_E1x(bp)) &&
+                                    (MF_CFG_RD(bp, func_mf_config[func].
+                                               mac_upper) != 0xffff) &&
+                                    (SHMEM2_HAS(bp,
+                                                afex_driver_support))) {
+                                        bp->mf_mode = MULTI_FUNCTION_AFEX;
+                                        bp->mf_config[vn] = MF_CFG_RD(bp,
+                                                func_mf_config[func].config);
+                                } else {
+                                        BNX2X_DEV_INFO("can not configure afex mode\n");
+                                }
+                                break;
                         case SHARED_FEAT_CFG_FORCE_SF_MODE_MF_ALLOWED:
                                 /* get OV configuration */
                                 val = MF_CFG_RD(bp,
@@ -10158,6 +10576,9 @@ static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp)
                                 return -EPERM;
                         }
                         break;
+                case MULTI_FUNCTION_AFEX:
+                        BNX2X_DEV_INFO("func %d is in MF afex mode\n", func);
+                        break;
                 case MULTI_FUNCTION_SI:
                         BNX2X_DEV_INFO("func %d is in MF switch-independent mode\n",
                                        func);
@@ -10325,6 +10746,9 @@ static void __devinit bnx2x_set_modes_bitmap(struct bnx2x *bp)
                 case MULTI_FUNCTION_SI:
                         SET_FLAGS(flags, MODE_MF_SI);
                         break;
+                case MULTI_FUNCTION_AFEX:
+                        SET_FLAGS(flags, MODE_MF_AFEX);
+                        break;
                 }
         } else
                 SET_FLAGS(flags, MODE_SF);
@@ -10384,12 +10808,10 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp)
         if (BP_NOMCP(bp) && (func == 0))
                 dev_err(&bp->pdev->dev, "MCP disabled, must load devices in order!\n");
 
-        bp->multi_mode = multi_mode;
-
         bp->disable_tpa = disable_tpa;
 
 #ifdef BCM_CNIC
-        bp->disable_tpa |= IS_MF_STORAGE_SD(bp);
+        bp->disable_tpa |= IS_MF_STORAGE_SD(bp) || IS_MF_FCOE_AFEX(bp);
 #endif
 
         /* Set TPA flags */
@@ -10408,7 +10830,7 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp)
 
         bp->mrrs = mrrs;
 
-        bp->tx_ring_size = MAX_TX_AVAIL;
+        bp->tx_ring_size = IS_MF_FCOE_AFEX(bp) ? 0 : MAX_TX_AVAIL;
 
         /* make sure that the numbers are in the right granularity */
         bp->tx_ticks = (50 / BNX2X_BTR) * BNX2X_BTR;
@@ -10439,8 +10861,6 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp)
         if (CHIP_IS_E3B0(bp))
                 bp->max_cos = BNX2X_MULTI_TX_COS_E3B0;
 
-        bp->gro_check = bnx2x_need_gro_check(bp->dev->mtu);
-
         return rc;
 }
 
@@ -10530,8 +10950,8 @@ static int bnx2x_close(struct net_device *dev)
         return 0;
 }
 
-static inline int bnx2x_init_mcast_macs_list(struct bnx2x *bp,
-                                         struct bnx2x_mcast_ramrod_params *p)
+static int bnx2x_init_mcast_macs_list(struct bnx2x *bp,
+                                      struct bnx2x_mcast_ramrod_params *p)
 {
         int mc_count = netdev_mc_count(bp->dev);
         struct bnx2x_mcast_list_elem *mc_mac =
@@ -10554,7 +10974,7 @@ static inline int bnx2x_init_mcast_macs_list(struct bnx2x *bp,
         return 0;
 }
 
-static inline void bnx2x_free_mcast_macs_list(
+static void bnx2x_free_mcast_macs_list(
         struct bnx2x_mcast_ramrod_params *p)
 {
         struct bnx2x_mcast_list_elem *mc_mac =
@@ -10572,7 +10992,7 @@ static inline void bnx2x_free_mcast_macs_list(
  *
  * We will use zero (0) as a MAC type for these MACs.
  */
-static inline int bnx2x_set_uc_list(struct bnx2x *bp)
+static int bnx2x_set_uc_list(struct bnx2x *bp)
 {
         int rc;
         struct net_device *dev = bp->dev;
@@ -10603,7 +11023,7 @@ static inline int bnx2x_set_uc_list(struct bnx2x *bp)
                                  BNX2X_UC_LIST_MAC, &ramrod_flags);
 }
 
-static inline int bnx2x_set_mc_list(struct bnx2x *bp)
+static int bnx2x_set_mc_list(struct bnx2x *bp)
 {
         struct net_device *dev = bp->dev;
         struct bnx2x_mcast_ramrod_params rparam = {NULL};
@@ -10789,7 +11209,7 @@ static const struct net_device_ops bnx2x_netdev_ops = {
 #endif
 };
 
-static inline int bnx2x_set_coherency_mask(struct bnx2x *bp)
+static int bnx2x_set_coherency_mask(struct bnx2x *bp)
 {
         struct device *dev = &bp->pdev->dev;
 
@@ -11055,7 +11475,7 @@ static int bnx2x_check_firmware(struct bnx2x *bp)
         return 0;
 }
 
-static inline void be32_to_cpu_n(const u8 *_source, u8 *_target, u32 n)
+static void be32_to_cpu_n(const u8 *_source, u8 *_target, u32 n)
 {
         const __be32 *source = (const __be32 *)_source;
         u32 *target = (u32 *)_target;
@@ -11069,7 +11489,7 @@ static inline void be32_to_cpu_n(const u8 *_source, u8 *_target, u32 n)
    Ops array is stored in the following format:
    {op(8bit), offset(24bit, big endian), data(32bit, big endian)}
  */
-static inline void bnx2x_prep_ops(const u8 *_source, u8 *_target, u32 n)
+static void bnx2x_prep_ops(const u8 *_source, u8 *_target, u32 n)
 {
         const __be32 *source = (const __be32 *)_source;
         struct raw_op *target = (struct raw_op *)_target;
@@ -11087,7 +11507,7 @@ static inline void bnx2x_prep_ops(const u8 *_source, u8 *_target, u32 n)
  * IRO array is stored in the following format:
  * {base(24bit), m1(16bit), m2(16bit), m3(16bit), size(16bit) }
  */
-static inline void bnx2x_prep_iro(const u8 *_source, u8 *_target, u32 n)
+static void bnx2x_prep_iro(const u8 *_source, u8 *_target, u32 n)
 {
         const __be32 *source = (const __be32 *)_source;
         struct iro *target = (struct iro *)_target;
@@ -11107,7 +11527,7 @@ static inline void bnx2x_prep_iro(const u8 *_source, u8 *_target, u32 n)
         }
 }
 
-static inline void be16_to_cpu_n(const u8 *_source, u8 *_target, u32 n)
+static void be16_to_cpu_n(const u8 *_source, u8 *_target, u32 n)
 {
         const __be16 *source = (const __be16 *)_source;
         u16 *target = (u16 *)_target;
@@ -11244,11 +11664,13 @@ void bnx2x__init_func_obj(struct bnx2x *bp)
         bnx2x_init_func_obj(bp, &bp->func_obj,
                             bnx2x_sp(bp, func_rdata),
                             bnx2x_sp_mapping(bp, func_rdata),
+                            bnx2x_sp(bp, func_afex_rdata),
+                            bnx2x_sp_mapping(bp, func_afex_rdata),
                             &bnx2x_func_sp_drv);
 }
 
 /* must be called after sriov-enable */
-static inline int bnx2x_set_qm_cid_count(struct bnx2x *bp)
+static int bnx2x_set_qm_cid_count(struct bnx2x *bp)
 {
         int cid_count = BNX2X_L2_CID_COUNT(bp);
 
@@ -11264,7 +11686,7 @@ static inline int bnx2x_set_qm_cid_count(struct bnx2x *bp)
  * @dev:        pci device
  *
  */
-static inline int bnx2x_get_num_non_def_sbs(struct pci_dev *pdev)
+static int bnx2x_get_num_non_def_sbs(struct pci_dev *pdev)
 {
         int pos;
         u16 control;
@@ -11325,6 +11747,8 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
         case BCM57810_MF:
         case BCM57840:
         case BCM57840_MF:
+        case BCM57811:
+        case BCM57811_MF:
                 max_cos_est = BNX2X_MULTI_TX_COS_E3B0;
                 break;
 
@@ -11738,7 +12162,7 @@ module_exit(bnx2x_cleanup);
  * This function will wait until the ramdord completion returns.
  * Return 0 if success, -ENODEV if ramrod doesn't return.
  */
-static inline int bnx2x_set_iscsi_eth_mac_addr(struct bnx2x *bp)
+static int bnx2x_set_iscsi_eth_mac_addr(struct bnx2x *bp)
 {
         unsigned long ramrod_flags = 0;
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
index c25803b9c0ca..bbd387492a80 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
@@ -1483,6 +1483,11 @@
    starts at 0x0 for the A0 tape-out and increments by one for each
    all-layer tape-out. */
 #define MISC_REG_CHIP_REV                                        0xa40c
+/* [R 14] otp_misc_do[100:0] spare bits collection: 13:11-
+ * otp_misc_do[100:98]; 10:7 - otp_misc_do[87:84]; 6:3 - otp_misc_do[75:72];
+ * 2:1 - otp_misc_do[51:50]; 0 - otp_misc_do[1]. */
+#define MISC_REG_CHIP_TYPE                                       0xac60
+#define MISC_REG_CHIP_TYPE_57811_MASK                            (1<<1)
 /* [RW 32] The following driver registers(1...16) represent 16 drivers and
    32 clients. Each client can be controlled by one driver only. One in each
    bit represent that this driver control the appropriate client (Ex: bit 5
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
index 513573321625..6c14b4a4e82c 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
@@ -633,14 +633,17 @@ static inline u8 bnx2x_vlan_mac_get_rx_tx_flag(struct bnx2x_vlan_mac_obj *o)
 }
 
 
-static inline void bnx2x_set_mac_in_nig(struct bnx2x *bp,
-                                 bool add, unsigned char *dev_addr, int index)
+void bnx2x_set_mac_in_nig(struct bnx2x *bp,
+                          bool add, unsigned char *dev_addr, int index)
 {
         u32 wb_data[2];
         u32 reg_offset = BP_PORT(bp) ? NIG_REG_LLH1_FUNC_MEM :
                          NIG_REG_LLH0_FUNC_MEM;
 
-        if (!IS_MF_SI(bp) || index > BNX2X_LLH_CAM_MAX_PF_LINE)
+        if (!IS_MF_SI(bp) && !IS_MF_AFEX(bp))
+                return;
+
+        if (index > BNX2X_LLH_CAM_MAX_PF_LINE)
                 return;
 
         DP(BNX2X_MSG_SP, "Going to %s LLH configuration at entry %d\n",
@@ -4090,12 +4093,6 @@ static int bnx2x_setup_rss(struct bnx2x *bp,
                 rss_mode = ETH_RSS_MODE_DISABLED;
         else if (test_bit(BNX2X_RSS_MODE_REGULAR, &p->rss_flags))
                 rss_mode = ETH_RSS_MODE_REGULAR;
-        else if (test_bit(BNX2X_RSS_MODE_VLAN_PRI, &p->rss_flags))
-                rss_mode = ETH_RSS_MODE_VLAN_PRI;
-        else if (test_bit(BNX2X_RSS_MODE_E1HOV_PRI, &p->rss_flags))
-                rss_mode = ETH_RSS_MODE_E1HOV_PRI;
-        else if (test_bit(BNX2X_RSS_MODE_IP_DSCP, &p->rss_flags))
-                rss_mode = ETH_RSS_MODE_IP_DSCP;
 
         data->rss_mode = rss_mode;
 
@@ -4404,6 +4401,9 @@ static void bnx2x_q_fill_init_tx_data(struct bnx2x_queue_sp_obj *o,
                 test_bit(BNX2X_Q_FLG_TX_SWITCH, flags);
         tx_data->anti_spoofing_flg =
                 test_bit(BNX2X_Q_FLG_ANTI_SPOOF, flags);
+        tx_data->force_default_pri_flg =
+                test_bit(BNX2X_Q_FLG_FORCE_DEFAULT_PRI, flags);
+
         tx_data->tx_status_block_id = params->fw_sb_id;
         tx_data->tx_sb_index_number = params->sb_cq_index;
         tx_data->tss_leading_client_id = params->tss_leading_cl_id;
@@ -5331,6 +5331,17 @@ static int bnx2x_func_chk_transition(struct bnx2x *bp,
         case BNX2X_F_STATE_STARTED:
                 if (cmd == BNX2X_F_CMD_STOP)
                         next_state = BNX2X_F_STATE_INITIALIZED;
+                /* afex ramrods can be sent only in started mode, and only
+                 * if not pending for function_stop ramrod completion
+                 * for these events - next state remained STARTED.
+                 */
+                else if ((cmd == BNX2X_F_CMD_AFEX_UPDATE) &&
+                         (!test_bit(BNX2X_F_CMD_STOP, &o->pending)))
+                        next_state = BNX2X_F_STATE_STARTED;
+
+                else if ((cmd == BNX2X_F_CMD_AFEX_VIFLISTS) &&
+                         (!test_bit(BNX2X_F_CMD_STOP, &o->pending)))
+                        next_state = BNX2X_F_STATE_STARTED;
                 else if (cmd == BNX2X_F_CMD_TX_STOP)
                         next_state = BNX2X_F_STATE_TX_STOPPED;
 
@@ -5618,6 +5629,83 @@ static inline int bnx2x_func_send_start(struct bnx2x *bp,
                              U64_LO(data_mapping), NONE_CONNECTION_TYPE);
 }
 
+static inline int bnx2x_func_send_afex_update(struct bnx2x *bp,
+                                         struct bnx2x_func_state_params *params)
+{
+        struct bnx2x_func_sp_obj *o = params->f_obj;
+        struct function_update_data *rdata =
+                (struct function_update_data *)o->afex_rdata;
+        dma_addr_t data_mapping = o->afex_rdata_mapping;
+        struct bnx2x_func_afex_update_params *afex_update_params =
+                &params->params.afex_update;
+
+        memset(rdata, 0, sizeof(*rdata));
+
+        /* Fill the ramrod data with provided parameters */
+        rdata->vif_id_change_flg = 1;
+        rdata->vif_id = cpu_to_le16(afex_update_params->vif_id);
+        rdata->afex_default_vlan_change_flg = 1;
+        rdata->afex_default_vlan =
+                cpu_to_le16(afex_update_params->afex_default_vlan);
+        rdata->allowed_priorities_change_flg = 1;
+        rdata->allowed_priorities = afex_update_params->allowed_priorities;
+
+        /*  No need for an explicit memory barrier here as long we would
+         *  need to ensure the ordering of writing to the SPQ element
+         *  and updating of the SPQ producer which involves a memory
+         *  read and we will have to put a full memory barrier there
+         *  (inside bnx2x_sp_post()).
+         */
+        DP(BNX2X_MSG_SP,
+           "afex: sending func_update vif_id 0x%x dvlan 0x%x prio 0x%x\n",
+           rdata->vif_id,
+           rdata->afex_default_vlan, rdata->allowed_priorities);
+
+        return bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_FUNCTION_UPDATE, 0,
+                             U64_HI(data_mapping),
+                             U64_LO(data_mapping), NONE_CONNECTION_TYPE);
+}
+
+static
+inline int bnx2x_func_send_afex_viflists(struct bnx2x *bp,
+                                         struct bnx2x_func_state_params *params)
+{
+        struct bnx2x_func_sp_obj *o = params->f_obj;
+        struct afex_vif_list_ramrod_data *rdata =
+                (struct afex_vif_list_ramrod_data *)o->afex_rdata;
+        struct bnx2x_func_afex_viflists_params *afex_viflist_params =
+                &params->params.afex_viflists;
+        u64 *p_rdata = (u64 *)rdata;
+
+        memset(rdata, 0, sizeof(*rdata));
+
+        /* Fill the ramrod data with provided parameters */
+        rdata->vif_list_index = afex_viflist_params->vif_list_index;
+        rdata->func_bit_map = afex_viflist_params->func_bit_map;
+        rdata->afex_vif_list_command =
+                afex_viflist_params->afex_vif_list_command;
+        rdata->func_to_clear = afex_viflist_params->func_to_clear;
+
+        /* send in echo type of sub command */
+        rdata->echo = afex_viflist_params->afex_vif_list_command;
+
+        /*  No need for an explicit memory barrier here as long we would
+         *  need to ensure the ordering of writing to the SPQ element
+         *  and updating of the SPQ producer which involves a memory
+         *  read and we will have to put a full memory barrier there
+         *  (inside bnx2x_sp_post()).
+         */
+
+        DP(BNX2X_MSG_SP, "afex: ramrod lists, cmd 0x%x index 0x%x func_bit_map 0x%x func_to_clr 0x%x\n",
+           rdata->afex_vif_list_command, rdata->vif_list_index,
+           rdata->func_bit_map, rdata->func_to_clear);
+
+        /* this ramrod sends data directly and not through DMA mapping */
+        return bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_AFEX_VIF_LISTS, 0,
+                             U64_HI(*p_rdata), U64_LO(*p_rdata),
+                             NONE_CONNECTION_TYPE);
+}
+
 static inline int bnx2x_func_send_stop(struct bnx2x *bp,
                                        struct bnx2x_func_state_params *params)
 {
@@ -5669,6 +5757,10 @@ static int bnx2x_func_send_cmd(struct bnx2x *bp,
                 return bnx2x_func_send_stop(bp, params);
         case BNX2X_F_CMD_HW_RESET:
                 return bnx2x_func_hw_reset(bp, params);
+        case BNX2X_F_CMD_AFEX_UPDATE:
+                return bnx2x_func_send_afex_update(bp, params);
+        case BNX2X_F_CMD_AFEX_VIFLISTS:
+                return bnx2x_func_send_afex_viflists(bp, params);
         case BNX2X_F_CMD_TX_STOP:
                 return bnx2x_func_send_tx_stop(bp, params);
         case BNX2X_F_CMD_TX_START:
@@ -5682,6 +5774,7 @@ static int bnx2x_func_send_cmd(struct bnx2x *bp,
 void bnx2x_init_func_obj(struct bnx2x *bp,
                          struct bnx2x_func_sp_obj *obj,
                          void *rdata, dma_addr_t rdata_mapping,
+                         void *afex_rdata, dma_addr_t afex_rdata_mapping,
                          struct bnx2x_func_sp_drv_ops *drv_iface)
 {
         memset(obj, 0, sizeof(*obj));
@@ -5690,7 +5783,8 @@ void bnx2x_init_func_obj(struct bnx2x *bp,
 
         obj->rdata = rdata;
         obj->rdata_mapping = rdata_mapping;
-
+        obj->afex_rdata = afex_rdata;
+        obj->afex_rdata_mapping = afex_rdata_mapping;
         obj->send_cmd = bnx2x_func_send_cmd;
         obj->check_transition = bnx2x_func_chk_transition;
         obj->complete_cmd = bnx2x_func_comp_cmd;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
index 61a7670adfcd..efd80bdd0dfe 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
@@ -62,6 +62,8 @@ enum {
         BNX2X_FILTER_MCAST_PENDING,
         BNX2X_FILTER_MCAST_SCHED,
         BNX2X_FILTER_RSS_CONF_PENDING,
+        BNX2X_AFEX_FCOE_Q_UPDATE_PENDING,
+        BNX2X_AFEX_PENDING_VIFSET_MCP_ACK
 };
 
 struct bnx2x_raw_obj {
@@ -432,6 +434,8 @@ enum {
         BNX2X_LLH_CAM_MAX_PF_LINE = NIG_REG_LLH1_FUNC_MEM_SIZE / 2
 };
 
+void bnx2x_set_mac_in_nig(struct bnx2x *bp,
+                          bool add, unsigned char *dev_addr, int index);
 
 /** RX_MODE verbs:DROP_ALL/ACCEPT_ALL/ACCEPT_ALL_MULTI/ACCEPT_ALL_VLAN/NORMAL */
 
@@ -685,9 +689,6 @@ enum {
         /* RSS_MODE bits are mutually exclusive */
         BNX2X_RSS_MODE_DISABLED,
         BNX2X_RSS_MODE_REGULAR,
-        BNX2X_RSS_MODE_VLAN_PRI,
-        BNX2X_RSS_MODE_E1HOV_PRI,
-        BNX2X_RSS_MODE_IP_DSCP,
 
         BNX2X_RSS_SET_SRCH, /* Setup searcher, E1x specific flag */
 
@@ -801,7 +802,8 @@ enum {
         BNX2X_Q_FLG_TX_SWITCH,
         BNX2X_Q_FLG_TX_SEC,
         BNX2X_Q_FLG_ANTI_SPOOF,
-        BNX2X_Q_FLG_SILENT_VLAN_REM
+        BNX2X_Q_FLG_SILENT_VLAN_REM,
+        BNX2X_Q_FLG_FORCE_DEFAULT_PRI
 };
 
 /* Queue type options: queue type may be a compination of below. */
@@ -963,6 +965,11 @@ struct bnx2x_queue_state_params {
         } params;
 };
 
+struct bnx2x_viflist_params {
+        u8 echo_res;
+        u8 func_bit_map_res;
+};
+
 struct bnx2x_queue_sp_obj {
         u32             cids[BNX2X_MULTI_TX_COS];
         u8              cl_id;
@@ -1045,6 +1052,8 @@ enum bnx2x_func_cmd {
         BNX2X_F_CMD_START,
         BNX2X_F_CMD_STOP,
         BNX2X_F_CMD_HW_RESET,
+        BNX2X_F_CMD_AFEX_UPDATE,
+        BNX2X_F_CMD_AFEX_VIFLISTS,
         BNX2X_F_CMD_TX_STOP,
         BNX2X_F_CMD_TX_START,
         BNX2X_F_CMD_MAX,
@@ -1089,6 +1098,18 @@ struct bnx2x_func_start_params {
         u8 network_cos_mode;
 };
 
+struct bnx2x_func_afex_update_params {
+        u16 vif_id;
+        u16 afex_default_vlan;
+        u8 allowed_priorities;
+};
+
+struct bnx2x_func_afex_viflists_params {
+        u16 vif_list_index;
+        u8 func_bit_map;
+        u8 afex_vif_list_command;
+        u8 func_to_clear;
+};
 struct bnx2x_func_tx_start_params {
         struct priority_cos traffic_type_to_priority_cos[MAX_TRAFFIC_TYPES];
         u8 dcb_enabled;
@@ -1110,6 +1131,8 @@ struct bnx2x_func_state_params {
                 struct bnx2x_func_hw_init_params hw_init;
                 struct bnx2x_func_hw_reset_params hw_reset;
                 struct bnx2x_func_start_params start;
+                struct bnx2x_func_afex_update_params afex_update;
+                struct bnx2x_func_afex_viflists_params afex_viflists;
                 struct bnx2x_func_tx_start_params tx_start;
         } params;
 };
@@ -1154,6 +1177,13 @@ struct bnx2x_func_sp_obj {
         void                    *rdata;
         dma_addr_t              rdata_mapping;
 
+        /* Buffer to use as a afex ramrod data and its mapping.
+         * This can't be same rdata as above because afex ramrod requests
+         * can arrive to the object in parallel to other ramrod requests.
+         */
+        void                    *afex_rdata;
+        dma_addr_t              afex_rdata_mapping;
+
         /* this mutex validates that when pending flag is taken, the next
          * ramrod to be sent will be the one set the pending bit
          */
@@ -1197,6 +1227,7 @@ union bnx2x_qable_obj {
 void bnx2x_init_func_obj(struct bnx2x *bp,
                          struct bnx2x_func_sp_obj *obj,
                          void *rdata, dma_addr_t rdata_mapping,
+                         void *afex_rdata, dma_addr_t afex_rdata_mapping,
                          struct bnx2x_func_sp_drv_ops *drv_iface);
 
 int bnx2x_func_state_change(struct bnx2x *bp,
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
index e1c9310fb07c..1e2785cd11d0 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
@@ -1316,7 +1316,7 @@ static void bnx2x_port_stats_base_init(struct bnx2x *bp)
  *
  * @param bp
  */
-static inline void bnx2x_prep_fw_stats_req(struct bnx2x *bp)
+static void bnx2x_prep_fw_stats_req(struct bnx2x *bp)
 {
         int i;
         int first_queue_query_index;
@@ -1561,3 +1561,274 @@ void bnx2x_save_statistics(struct bnx2x *bp)
                 UPDATE_FW_STAT_OLD(mac_discard);
         }
 }
+
+void bnx2x_afex_collect_stats(struct bnx2x *bp, void *void_afex_stats,
+                              u32 stats_type)
+{
+        int i;
+        struct afex_stats *afex_stats = (struct afex_stats *)void_afex_stats;
+        struct bnx2x_eth_stats *estats = &bp->eth_stats;
+        struct per_queue_stats *fcoe_q_stats =
+                &bp->fw_stats_data->queue_stats[FCOE_IDX];
+
+        struct tstorm_per_queue_stats *fcoe_q_tstorm_stats =
+                &fcoe_q_stats->tstorm_queue_statistics;
+
+        struct ustorm_per_queue_stats *fcoe_q_ustorm_stats =
+                &fcoe_q_stats->ustorm_queue_statistics;
+
+        struct xstorm_per_queue_stats *fcoe_q_xstorm_stats =
+                &fcoe_q_stats->xstorm_queue_statistics;
+
+        struct fcoe_statistics_params *fw_fcoe_stat =
+                &bp->fw_stats_data->fcoe;
+
+        memset(afex_stats, 0, sizeof(struct afex_stats));
+
+        for_each_eth_queue(bp, i) {
+                struct bnx2x_fastpath *fp = &bp->fp[i];
+                struct bnx2x_eth_q_stats *qstats = &fp->eth_q_stats;
+
+                ADD_64(afex_stats->rx_unicast_bytes_hi,
+                       qstats->total_unicast_bytes_received_hi,
+                       afex_stats->rx_unicast_bytes_lo,
+                       qstats->total_unicast_bytes_received_lo);
+
+                ADD_64(afex_stats->rx_broadcast_bytes_hi,
+                       qstats->total_broadcast_bytes_received_hi,
+                       afex_stats->rx_broadcast_bytes_lo,
+                       qstats->total_broadcast_bytes_received_lo);
+
+                ADD_64(afex_stats->rx_multicast_bytes_hi,
+                       qstats->total_multicast_bytes_received_hi,
+                       afex_stats->rx_multicast_bytes_lo,
+                       qstats->total_multicast_bytes_received_lo);
+
+                ADD_64(afex_stats->rx_unicast_frames_hi,
+                       qstats->total_unicast_packets_received_hi,
+                       afex_stats->rx_unicast_frames_lo,
+                       qstats->total_unicast_packets_received_lo);
+
+                ADD_64(afex_stats->rx_broadcast_frames_hi,
+                       qstats->total_broadcast_packets_received_hi,
+                       afex_stats->rx_broadcast_frames_lo,
+                       qstats->total_broadcast_packets_received_lo);
+
+                ADD_64(afex_stats->rx_multicast_frames_hi,
+                       qstats->total_multicast_packets_received_hi,
+                       afex_stats->rx_multicast_frames_lo,
+                       qstats->total_multicast_packets_received_lo);
+
+                /* sum to rx_frames_discarded all discraded
+                 * packets due to size, ttl0 and checksum
+                 */
+                ADD_64(afex_stats->rx_frames_discarded_hi,
+                       qstats->total_packets_received_checksum_discarded_hi,
+                       afex_stats->rx_frames_discarded_lo,
+                       qstats->total_packets_received_checksum_discarded_lo);
+
+                ADD_64(afex_stats->rx_frames_discarded_hi,
+                       qstats->total_packets_received_ttl0_discarded_hi,
+                       afex_stats->rx_frames_discarded_lo,
+                       qstats->total_packets_received_ttl0_discarded_lo);
+
+                ADD_64(afex_stats->rx_frames_discarded_hi,
+                       qstats->etherstatsoverrsizepkts_hi,
+                       afex_stats->rx_frames_discarded_lo,
+                       qstats->etherstatsoverrsizepkts_lo);
+
+                ADD_64(afex_stats->rx_frames_dropped_hi,
+                       qstats->no_buff_discard_hi,
+                       afex_stats->rx_frames_dropped_lo,
+                       qstats->no_buff_discard_lo);
+
+                ADD_64(afex_stats->tx_unicast_bytes_hi,
+                       qstats->total_unicast_bytes_transmitted_hi,
+                       afex_stats->tx_unicast_bytes_lo,
+                       qstats->total_unicast_bytes_transmitted_lo);
+
+                ADD_64(afex_stats->tx_broadcast_bytes_hi,
+                       qstats->total_broadcast_bytes_transmitted_hi,
+                       afex_stats->tx_broadcast_bytes_lo,
+                       qstats->total_broadcast_bytes_transmitted_lo);
+
+                ADD_64(afex_stats->tx_multicast_bytes_hi,
+                       qstats->total_multicast_bytes_transmitted_hi,
+                       afex_stats->tx_multicast_bytes_lo,
+                       qstats->total_multicast_bytes_transmitted_lo);
+
+                ADD_64(afex_stats->tx_unicast_frames_hi,
+                       qstats->total_unicast_packets_transmitted_hi,
+                       afex_stats->tx_unicast_frames_lo,
+                       qstats->total_unicast_packets_transmitted_lo);
+
+                ADD_64(afex_stats->tx_broadcast_frames_hi,
+                       qstats->total_broadcast_packets_transmitted_hi,
+                       afex_stats->tx_broadcast_frames_lo,
+                       qstats->total_broadcast_packets_transmitted_lo);
+
+                ADD_64(afex_stats->tx_multicast_frames_hi,
+                       qstats->total_multicast_packets_transmitted_hi,
+                       afex_stats->tx_multicast_frames_lo,
+                       qstats->total_multicast_packets_transmitted_lo);
+
+                ADD_64(afex_stats->tx_frames_dropped_hi,
+                       qstats->total_transmitted_dropped_packets_error_hi,
+                       afex_stats->tx_frames_dropped_lo,
+                       qstats->total_transmitted_dropped_packets_error_lo);
+        }
+
+        /* now add FCoE statistics which are collected separately
+         * (both offloaded and non offloaded)
+         */
+        if (!NO_FCOE(bp)) {
+                ADD_64_LE(afex_stats->rx_unicast_bytes_hi,
+                          LE32_0,
+                          afex_stats->rx_unicast_bytes_lo,
+                          fw_fcoe_stat->rx_stat0.fcoe_rx_byte_cnt);
+
+                ADD_64_LE(afex_stats->rx_unicast_bytes_hi,
+                          fcoe_q_tstorm_stats->rcv_ucast_bytes.hi,
+                          afex_stats->rx_unicast_bytes_lo,
+                          fcoe_q_tstorm_stats->rcv_ucast_bytes.lo);
+
+                ADD_64_LE(afex_stats->rx_broadcast_bytes_hi,
+                          fcoe_q_tstorm_stats->rcv_bcast_bytes.hi,
+                          afex_stats->rx_broadcast_bytes_lo,
+                          fcoe_q_tstorm_stats->rcv_bcast_bytes.lo);
+
+                ADD_64_LE(afex_stats->rx_multicast_bytes_hi,
+                          fcoe_q_tstorm_stats->rcv_mcast_bytes.hi,
+                          afex_stats->rx_multicast_bytes_lo,
+                          fcoe_q_tstorm_stats->rcv_mcast_bytes.lo);
+
+                ADD_64_LE(afex_stats->rx_unicast_frames_hi,
+                          LE32_0,
+                          afex_stats->rx_unicast_frames_lo,
+                          fw_fcoe_stat->rx_stat0.fcoe_rx_pkt_cnt);
+
+                ADD_64_LE(afex_stats->rx_unicast_frames_hi,
+                          LE32_0,
+                          afex_stats->rx_unicast_frames_lo,
+                          fcoe_q_tstorm_stats->rcv_ucast_pkts);
+
+                ADD_64_LE(afex_stats->rx_broadcast_frames_hi,
+                          LE32_0,
+                          afex_stats->rx_broadcast_frames_lo,
+                          fcoe_q_tstorm_stats->rcv_bcast_pkts);
+
+                ADD_64_LE(afex_stats->rx_multicast_frames_hi,
+                          LE32_0,
+                          afex_stats->rx_multicast_frames_lo,
+                          fcoe_q_tstorm_stats->rcv_ucast_pkts);
+
+                ADD_64_LE(afex_stats->rx_frames_discarded_hi,
+                          LE32_0,
+                          afex_stats->rx_frames_discarded_lo,
+                          fcoe_q_tstorm_stats->checksum_discard);
+
+                ADD_64_LE(afex_stats->rx_frames_discarded_hi,
+                          LE32_0,
+                          afex_stats->rx_frames_discarded_lo,
+                          fcoe_q_tstorm_stats->pkts_too_big_discard);
+
+                ADD_64_LE(afex_stats->rx_frames_discarded_hi,
+                          LE32_0,
+                          afex_stats->rx_frames_discarded_lo,
+                          fcoe_q_tstorm_stats->ttl0_discard);
+
+                ADD_64_LE16(afex_stats->rx_frames_dropped_hi,
+                            LE16_0,
+                            afex_stats->rx_frames_dropped_lo,
+                            fcoe_q_tstorm_stats->no_buff_discard);
+
+                ADD_64_LE(afex_stats->rx_frames_dropped_hi,
+                          LE32_0,
+                          afex_stats->rx_frames_dropped_lo,
+                          fcoe_q_ustorm_stats->ucast_no_buff_pkts);
+
+                ADD_64_LE(afex_stats->rx_frames_dropped_hi,
+                          LE32_0,
+                          afex_stats->rx_frames_dropped_lo,
+                          fcoe_q_ustorm_stats->mcast_no_buff_pkts);
+
+                ADD_64_LE(afex_stats->rx_frames_dropped_hi,
+                          LE32_0,
+                          afex_stats->rx_frames_dropped_lo,
+                          fcoe_q_ustorm_stats->bcast_no_buff_pkts);
+
+                ADD_64_LE(afex_stats->rx_frames_dropped_hi,
+                          LE32_0,
+                          afex_stats->rx_frames_dropped_lo,
+                          fw_fcoe_stat->rx_stat1.fcoe_rx_drop_pkt_cnt);
+
+                ADD_64_LE(afex_stats->rx_frames_dropped_hi,
+                          LE32_0,
+                          afex_stats->rx_frames_dropped_lo,
+                          fw_fcoe_stat->rx_stat2.fcoe_rx_drop_pkt_cnt);
+
+                ADD_64_LE(afex_stats->tx_unicast_bytes_hi,
+                          LE32_0,
+                          afex_stats->tx_unicast_bytes_lo,
+                          fw_fcoe_stat->tx_stat.fcoe_tx_byte_cnt);
+
+                ADD_64_LE(afex_stats->tx_unicast_bytes_hi,
+                          fcoe_q_xstorm_stats->ucast_bytes_sent.hi,
+                          afex_stats->tx_unicast_bytes_lo,
+                          fcoe_q_xstorm_stats->ucast_bytes_sent.lo);
+
+                ADD_64_LE(afex_stats->tx_broadcast_bytes_hi,
+                          fcoe_q_xstorm_stats->bcast_bytes_sent.hi,
+                          afex_stats->tx_broadcast_bytes_lo,
+                          fcoe_q_xstorm_stats->bcast_bytes_sent.lo);
+
+                ADD_64_LE(afex_stats->tx_multicast_bytes_hi,
+                          fcoe_q_xstorm_stats->mcast_bytes_sent.hi,
+                          afex_stats->tx_multicast_bytes_lo,
+                          fcoe_q_xstorm_stats->mcast_bytes_sent.lo);
+
+                ADD_64_LE(afex_stats->tx_unicast_frames_hi,
+                          LE32_0,
+                          afex_stats->tx_unicast_frames_lo,
+                          fw_fcoe_stat->tx_stat.fcoe_tx_pkt_cnt);
+
+                ADD_64_LE(afex_stats->tx_unicast_frames_hi,
+                          LE32_0,
+                          afex_stats->tx_unicast_frames_lo,
+                          fcoe_q_xstorm_stats->ucast_pkts_sent);
+
+                ADD_64_LE(afex_stats->tx_broadcast_frames_hi,
+                          LE32_0,
+                          afex_stats->tx_broadcast_frames_lo,
+                          fcoe_q_xstorm_stats->bcast_pkts_sent);
+
+                ADD_64_LE(afex_stats->tx_multicast_frames_hi,
+                          LE32_0,
+                          afex_stats->tx_multicast_frames_lo,
+                          fcoe_q_xstorm_stats->mcast_pkts_sent);
+
+                ADD_64_LE(afex_stats->tx_frames_dropped_hi,
+                          LE32_0,
+                          afex_stats->tx_frames_dropped_lo,
+                          fcoe_q_xstorm_stats->error_drop_pkts);
+        }
+
+        /* if port stats are requested, add them to the PMF
+         * stats, as anyway they will be accumulated by the
+         * MCP before sent to the switch
+         */
+        if ((bp->port.pmf) && (stats_type == VICSTATST_UIF_INDEX)) {
+                ADD_64(afex_stats->rx_frames_dropped_hi,
+                       0,
+                       afex_stats->rx_frames_dropped_lo,
+                       estats->mac_filter_discard);
+                ADD_64(afex_stats->rx_frames_dropped_hi,
+                       0,
+                       afex_stats->rx_frames_dropped_lo,
+                       estats->brb_truncate_discard);
+                ADD_64(afex_stats->rx_frames_discarded_hi,
+                       0,
+                       afex_stats->rx_frames_discarded_lo,
+                       estats->mac_discard);
+        }
+}
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
index 2b46e1eb7fd1..93e689fdfeda 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
@@ -338,6 +338,18 @@ struct bnx2x_fw_port_stats_old {
                 s_hi += a_hi + ((s_lo < a_lo) ? 1 : 0); \
         } while (0)
 
+#define LE32_0 ((__force __le32) 0)
+#define LE16_0 ((__force __le16) 0)
+
+/* The _force is for cases where high value is 0 */
+#define ADD_64_LE(s_hi, a_hi_le, s_lo, a_lo_le) \
+                ADD_64(s_hi, le32_to_cpu(a_hi_le), \
+                       s_lo, le32_to_cpu(a_lo_le))
+
+#define ADD_64_LE16(s_hi, a_hi_le, s_lo, a_lo_le) \
+                ADD_64(s_hi, le16_to_cpu(a_hi_le), \
+                       s_lo, le16_to_cpu(a_lo_le))
+
 /* difference = minuend - subtrahend */
 #define DIFF_64(d_hi, m_hi, s_hi, d_lo, m_lo, s_lo) \
         do { \
@@ -529,4 +541,7 @@ void bnx2x_stats_handle(struct bnx2x *bp, enum bnx2x_stats_event event);
  * @bp:         driver handle
  */
 void bnx2x_save_statistics(struct bnx2x *bp);
+
+void bnx2x_afex_collect_stats(struct bnx2x *bp, void *void_afex_stats,
+                              u32 stats_type);
 #endif /* BNX2X_STATS_H */
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 062ac333fde6..d55df3290174 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -879,8 +879,13 @@ static inline unsigned int tg3_has_work(struct tg3_napi *tnapi)
                 if (sblk->status & SD_STATUS_LINK_CHG)
                         work_exists = 1;
         }
-        /* check for RX/TX work to do */
-        if (sblk->idx[0].tx_consumer != tnapi->tx_cons ||
+
+        /* check for TX work to do */
+        if (sblk->idx[0].tx_consumer != tnapi->tx_cons)
+                work_exists = 1;
+
+        /* check for RX work to do */
+        if (tnapi->rx_rcb_prod_idx &&
             *(tnapi->rx_rcb_prod_idx) != tnapi->rx_rcb_ptr)
                 work_exists = 1;
 
@@ -5617,17 +5622,29 @@ static void tg3_tx(struct tg3_napi *tnapi)
         }
 }
 
+static void tg3_frag_free(bool is_frag, void *data)
+{
+        if (is_frag)
+                put_page(virt_to_head_page(data));
+        else
+                kfree(data);
+}
+
 static void tg3_rx_data_free(struct tg3 *tp, struct ring_info *ri, u32 map_sz)
 {
+        unsigned int skb_size = SKB_DATA_ALIGN(map_sz + TG3_RX_OFFSET(tp)) +
+                   SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
+
         if (!ri->data)
                 return;
 
         pci_unmap_single(tp->pdev, dma_unmap_addr(ri, mapping),
                          map_sz, PCI_DMA_FROMDEVICE);
-        kfree(ri->data);
+        tg3_frag_free(skb_size <= PAGE_SIZE, ri->data);
         ri->data = NULL;
 }
 
+
 /* Returns size of skb allocated or < 0 on error.
  *
  * We only need to fill in the address because the other members
@@ -5640,7 +5657,8 @@ static void tg3_rx_data_free(struct tg3 *tp, struct ring_info *ri, u32 map_sz)
  * (to fetch the error flags, vlan tag, checksum, and opaque cookie).
  */
 static int tg3_alloc_rx_data(struct tg3 *tp, struct tg3_rx_prodring_set *tpr,
-                            u32 opaque_key, u32 dest_idx_unmasked)
+                             u32 opaque_key, u32 dest_idx_unmasked,
+                             unsigned int *frag_size)
 {
         struct tg3_rx_buffer_desc *desc;
         struct ring_info *map;
@@ -5675,7 +5693,13 @@ static int tg3_alloc_rx_data(struct tg3 *tp, struct tg3_rx_prodring_set *tpr,
          */
         skb_size = SKB_DATA_ALIGN(data_size + TG3_RX_OFFSET(tp)) +
                    SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
-        data = kmalloc(skb_size, GFP_ATOMIC);
+        if (skb_size <= PAGE_SIZE) {
+                data = netdev_alloc_frag(skb_size);
+                *frag_size = skb_size;
+        } else {
+                data = kmalloc(skb_size, GFP_ATOMIC);
+                *frag_size = 0;
+        }
         if (!data)
                 return -ENOMEM;
 
@@ -5683,8 +5707,8 @@ static int tg3_alloc_rx_data(struct tg3 *tp, struct tg3_rx_prodring_set *tpr,
                                  data + TG3_RX_OFFSET(tp),
                                  data_size,
                                  PCI_DMA_FROMDEVICE);
-        if (pci_dma_mapping_error(tp->pdev, mapping)) {
-                kfree(data);
+        if (unlikely(pci_dma_mapping_error(tp->pdev, mapping))) {
+                tg3_frag_free(skb_size <= PAGE_SIZE, data);
                 return -EIO;
         }
 
@@ -5835,18 +5859,19 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
 
                 if (len > TG3_RX_COPY_THRESH(tp)) {
                         int skb_size;
+                        unsigned int frag_size;
 
                         skb_size = tg3_alloc_rx_data(tp, tpr, opaque_key,
-                                                    *post_ptr);
+                                                    *post_ptr, &frag_size);
                         if (skb_size < 0)
                                 goto drop_it;
 
                         pci_unmap_single(tp->pdev, dma_addr, skb_size,
                                          PCI_DMA_FROMDEVICE);
 
-                        skb = build_skb(data);
+                        skb = build_skb(data, frag_size);
                         if (!skb) {
-                                kfree(data);
+                                tg3_frag_free(frag_size != 0, data);
                                 goto drop_it_no_recycle;
                         }
                         skb_reserve(skb, TG3_RX_OFFSET(tp));
@@ -6124,6 +6149,9 @@ static int tg3_poll_work(struct tg3_napi *tnapi, int work_done, int budget)
                         return work_done;
         }
 
+        if (!tnapi->rx_rcb_prod_idx)
+                return work_done;
+
         /* run RX thread, within the bounds set by NAPI.
          * All RX "locking" is done by ensuring outside
          * code synchronizes with tg3->napi.poll()
@@ -7279,7 +7307,10 @@ static int tg3_rx_prodring_alloc(struct tg3 *tp,
 
         /* Now allocate fresh SKBs for each rx ring. */
         for (i = 0; i < tp->rx_pending; i++) {
-                if (tg3_alloc_rx_data(tp, tpr, RXD_OPAQUE_RING_STD, i) < 0) {
+                unsigned int frag_size;
+
+                if (tg3_alloc_rx_data(tp, tpr, RXD_OPAQUE_RING_STD, i,
+                                      &frag_size) < 0) {
                         netdev_warn(tp->dev,
                                     "Using a smaller RX standard ring. Only "
                                     "%d out of %d buffers were allocated "
@@ -7311,7 +7342,10 @@ static int tg3_rx_prodring_alloc(struct tg3 *tp,
         }
 
         for (i = 0; i < tp->rx_jumbo_pending; i++) {
-                if (tg3_alloc_rx_data(tp, tpr, RXD_OPAQUE_RING_JUMBO, i) < 0) {
+                unsigned int frag_size;
+
+                if (tg3_alloc_rx_data(tp, tpr, RXD_OPAQUE_RING_JUMBO, i,
+                                      &frag_size) < 0) {
                         netdev_warn(tp->dev,
                                     "Using a smaller RX jumbo ring. Only %d "
                                     "out of %d buffers were allocated "
@@ -7567,6 +7601,12 @@ static int tg3_alloc_consistent(struct tg3 *tp)
                  */
                 switch (i) {
                 default:
+                        if (tg3_flag(tp, ENABLE_RSS)) {
+                                tnapi->rx_rcb_prod_idx = NULL;
+                                break;
+                        }
+                        /* Fall through */
+                case 1:
                         tnapi->rx_rcb_prod_idx = &sblk->idx[0].rx_producer;
                         break;
                 case 2:
@@ -12234,6 +12274,7 @@ static const struct ethtool_ops tg3_ethtool_ops = {
         .get_rxfh_indir_size    = tg3_get_rxfh_indir_size,
         .get_rxfh_indir         = tg3_get_rxfh_indir,
         .set_rxfh_indir         = tg3_set_rxfh_indir,
+        .get_ts_info            = ethtool_op_get_ts_info,
 };
 
 static struct rtnl_link_stats64 *tg3_get_stats64(struct net_device *dev,
diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c
index 77977d735dd7..0b640fafbda3 100644
--- a/drivers/net/ethernet/brocade/bna/bfa_ioc.c
+++ b/drivers/net/ethernet/brocade/bna/bfa_ioc.c
@@ -70,7 +70,6 @@ static void bfa_ioc_reset(struct bfa_ioc *ioc, bool force);
 static void bfa_ioc_mbox_poll(struct bfa_ioc *ioc);
 static void bfa_ioc_mbox_flush(struct bfa_ioc *ioc);
 static void bfa_ioc_recover(struct bfa_ioc *ioc);
-static void bfa_ioc_check_attr_wwns(struct bfa_ioc *ioc);
 static void bfa_ioc_event_notify(struct bfa_ioc *, enum bfa_ioc_event);
 static void bfa_ioc_disable_comp(struct bfa_ioc *ioc);
 static void bfa_ioc_lpu_stop(struct bfa_ioc *ioc);
@@ -346,8 +345,6 @@ bfa_ioc_sm_getattr(struct bfa_ioc *ioc, enum ioc_event event)
         switch (event) {
         case IOC_E_FWRSP_GETATTR:
                 del_timer(&ioc->ioc_timer);
-                bfa_ioc_check_attr_wwns(ioc);
-                bfa_ioc_hb_monitor(ioc);
                 bfa_fsm_set_state(ioc, bfa_ioc_sm_op);
                 break;
 
@@ -380,6 +377,7 @@ bfa_ioc_sm_op_entry(struct bfa_ioc *ioc)
 {
         ioc->cbfn->enable_cbfn(ioc->bfa, BFA_STATUS_OK);
         bfa_ioc_event_notify(ioc, BFA_IOC_E_ENABLED);
+        bfa_ioc_hb_monitor(ioc);
 }
 
 static void
@@ -1207,27 +1205,62 @@ bfa_nw_ioc_sem_release(void __iomem *sem_reg)
         writel(1, sem_reg);
 }
 
+/* Clear fwver hdr */
+static void
+bfa_ioc_fwver_clear(struct bfa_ioc *ioc)
+{
+        u32 pgnum, pgoff, loff = 0;
+        int i;
+
+        pgnum = PSS_SMEM_PGNUM(ioc->ioc_regs.smem_pg0, loff);
+        pgoff = PSS_SMEM_PGOFF(loff);
+        writel(pgnum, ioc->ioc_regs.host_page_num_fn);
+
+        for (i = 0; i < (sizeof(struct bfi_ioc_image_hdr) / sizeof(u32)); i++) {
+                writel(0, ioc->ioc_regs.smem_page_start + loff);
+                loff += sizeof(u32);
+        }
+}
+
+
 static void
 bfa_ioc_hw_sem_init(struct bfa_ioc *ioc)
 {
         struct bfi_ioc_image_hdr fwhdr;
-        u32 fwstate = readl(ioc->ioc_regs.ioc_fwstate);
+        u32 fwstate, r32;
 
-        if (fwstate == BFI_IOC_UNINIT)
+        /* Spin on init semaphore to serialize. */
+        r32 = readl(ioc->ioc_regs.ioc_init_sem_reg);
+        while (r32 & 0x1) {
+                udelay(20);
+                r32 = readl(ioc->ioc_regs.ioc_init_sem_reg);
+        }
+
+        fwstate = readl(ioc->ioc_regs.ioc_fwstate);
+        if (fwstate == BFI_IOC_UNINIT) {
+                writel(1, ioc->ioc_regs.ioc_init_sem_reg);
                 return;
+        }
 
         bfa_nw_ioc_fwver_get(ioc, &fwhdr);
 
-        if (swab32(fwhdr.exec) == BFI_FWBOOT_TYPE_NORMAL)
+        if (swab32(fwhdr.exec) == BFI_FWBOOT_TYPE_NORMAL) {
+                writel(1, ioc->ioc_regs.ioc_init_sem_reg);
                 return;
+        }
 
+        bfa_ioc_fwver_clear(ioc);
         writel(BFI_IOC_UNINIT, ioc->ioc_regs.ioc_fwstate);
+        writel(BFI_IOC_UNINIT, ioc->ioc_regs.alt_ioc_fwstate);
 
         /*
          * Try to lock and then unlock the semaphore.
          */
         readl(ioc->ioc_regs.ioc_sem_reg);
         writel(1, ioc->ioc_regs.ioc_sem_reg);
+
+        /* Unlock init semaphore */
+        writel(1, ioc->ioc_regs.ioc_init_sem_reg);
 }
 
 static void
@@ -1585,11 +1618,6 @@ bfa_ioc_download_fw(struct bfa_ioc *ioc, u32 boot_type,
         u32 i;
         u32 asicmode;
 
-        /**
-         * Initialize LMEM first before code download
-         */
-        bfa_ioc_lmem_init(ioc);
-
         fwimg = bfa_cb_image_get_chunk(bfa_ioc_asic_gen(ioc), chunkno);
 
         pgnum = bfa_ioc_smem_pgnum(ioc, loff);
@@ -1914,6 +1942,10 @@ bfa_ioc_pll_init(struct bfa_ioc *ioc)
         bfa_ioc_pll_init_asic(ioc);
 
         ioc->pllinit = true;
+
+        /* Initialize LMEM */
+        bfa_ioc_lmem_init(ioc);
+
         /*
          *  release semaphore.
          */
@@ -2513,13 +2545,6 @@ bfa_ioc_recover(struct bfa_ioc *ioc)
         bfa_fsm_send_event(ioc, IOC_E_HBFAIL);
 }
 
-static void
-bfa_ioc_check_attr_wwns(struct bfa_ioc *ioc)
-{
-        if (bfa_ioc_get_type(ioc) == BFA_IOC_TYPE_LL)
-                return;
-}
-
 /**
  * @dg hal_iocpf_pvt BFA IOC PF private functions
  * @{
diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c b/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
index 348479bbfa3a..b6b036a143ae 100644
--- a/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
+++ b/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
@@ -199,9 +199,9 @@ bfa_ioc_ct_notify_fail(struct bfa_ioc *ioc)
  * Host to LPU mailbox message addresses
  */
 static const struct {
-        u32     hfn_mbox;
-        u32     lpu_mbox;
-        u32     hfn_pgn;
+        u32     hfn_mbox;
+        u32     lpu_mbox;
+        u32     hfn_pgn;
 } ct_fnreg[] = {
         { HOSTFN0_LPU_MBOX0_0, LPU_HOSTFN0_MBOX0_0, HOST_PAGE_NUM_FN0 },
         { HOSTFN1_LPU_MBOX0_8, LPU_HOSTFN1_MBOX0_8, HOST_PAGE_NUM_FN1 },
@@ -803,17 +803,72 @@ bfa_ioc_ct2_mac_reset(void __iomem *rb)
 }
 
 #define CT2_NFC_MAX_DELAY       1000
+#define CT2_NFC_VER_VALID       0x143
+#define BFA_IOC_PLL_POLL        1000000
+
+static bool
+bfa_ioc_ct2_nfc_halted(void __iomem *rb)
+{
+        volatile u32 r32;
+
+        r32 = readl(rb + CT2_NFC_CSR_SET_REG);
+        if (r32 & __NFC_CONTROLLER_HALTED)
+                return true;
+
+        return false;
+}
+
+static void
+bfa_ioc_ct2_nfc_resume(void __iomem *rb)
+{
+        volatile u32 r32;
+        int i;
+
+        writel(__HALT_NFC_CONTROLLER, rb + CT2_NFC_CSR_CLR_REG);
+        for (i = 0; i < CT2_NFC_MAX_DELAY; i++) {
+                r32 = readl(rb + CT2_NFC_CSR_SET_REG);
+                if (!(r32 & __NFC_CONTROLLER_HALTED))
+                        return;
+                udelay(1000);
+        }
+        BUG_ON(1);
+}
+
 static enum bfa_status
 bfa_ioc_ct2_pll_init(void __iomem *rb, enum bfi_asic_mode asic_mode)
 {
         volatile u32 wgn, r32;
-        int i;
+        u32 nfc_ver, i;
 
-        /*
-         * Initialize PLL if not already done by NFC
-         */
         wgn = readl(rb + CT2_WGN_STATUS);
-        if (!(wgn & __GLBL_PF_VF_CFG_RDY)) {
+
+        nfc_ver = readl(rb + CT2_RSC_GPR15_REG);
+
+        if ((wgn == (__A2T_AHB_LOAD | __WGN_READY)) &&
+                (nfc_ver >= CT2_NFC_VER_VALID)) {
+                if (bfa_ioc_ct2_nfc_halted(rb))
+                        bfa_ioc_ct2_nfc_resume(rb);
+                writel(__RESET_AND_START_SCLK_LCLK_PLLS,
+                                rb + CT2_CSI_FW_CTL_SET_REG);
+
+                for (i = 0; i < BFA_IOC_PLL_POLL; i++) {
+                        r32 = readl(rb + CT2_APP_PLL_LCLK_CTL_REG);
+                        if (r32 & __RESET_AND_START_SCLK_LCLK_PLLS)
+                                break;
+                }
+                BUG_ON(!(r32 & __RESET_AND_START_SCLK_LCLK_PLLS));
+
+                for (i = 0; i < BFA_IOC_PLL_POLL; i++) {
+                        r32 = readl(rb + CT2_APP_PLL_LCLK_CTL_REG);
+                        if (!(r32 & __RESET_AND_START_SCLK_LCLK_PLLS))
+                                break;
+                }
+                BUG_ON(r32 & __RESET_AND_START_SCLK_LCLK_PLLS);
+                udelay(1000);
+
+                r32 = readl(rb + CT2_CSI_FW_CTL_REG);
+                BUG_ON(r32 & __RESET_AND_START_SCLK_LCLK_PLLS);
+        } else {
                 writel(__HALT_NFC_CONTROLLER, (rb + CT2_NFC_CSR_SET_REG));
                 for (i = 0; i < CT2_NFC_MAX_DELAY; i++) {
                         r32 = readl(rb + CT2_NFC_CSR_SET_REG);
@@ -821,53 +876,48 @@ bfa_ioc_ct2_pll_init(void __iomem *rb, enum bfi_asic_mode asic_mode)
                                 break;
                         udelay(1000);
                 }
+
+                bfa_ioc_ct2_mac_reset(rb);
+                bfa_ioc_ct2_sclk_init(rb);
+                bfa_ioc_ct2_lclk_init(rb);
+
+                /* release soft reset on s_clk & l_clk */
+                r32 = readl((rb + CT2_APP_PLL_SCLK_CTL_REG));
+                writel(r32 & ~__APP_PLL_SCLK_LOGIC_SOFT_RESET,
+                                rb + CT2_APP_PLL_SCLK_CTL_REG);
+                r32 = readl((rb + CT2_APP_PLL_LCLK_CTL_REG));
+                writel(r32 & ~__APP_PLL_LCLK_LOGIC_SOFT_RESET,
+                                rb + CT2_APP_PLL_LCLK_CTL_REG);
+        }
+
+        /* Announce flash device presence, if flash was corrupted. */
+        if (wgn == (__WGN_READY | __GLBL_PF_VF_CFG_RDY)) {
+                r32 = readl((rb + PSS_GPIO_OUT_REG));
+                writel(r32 & ~1, rb + PSS_GPIO_OUT_REG);
+                r32 = readl((rb + PSS_GPIO_OE_REG));
+                writel(r32 | 1, rb + PSS_GPIO_OE_REG);
         }
 
         /*
          * Mask the interrupts and clear any
          * pending interrupts left by BIOS/EFI
          */
-
         writel(1, (rb + CT2_LPU0_HOSTFN_MBOX0_MSK));
         writel(1, (rb + CT2_LPU1_HOSTFN_MBOX0_MSK));
 
-        r32 = readl((rb + CT2_LPU0_HOSTFN_CMD_STAT));
-        if (r32 == 1) {
-                writel(1, (rb + CT2_LPU0_HOSTFN_CMD_STAT));
-                readl((rb + CT2_LPU0_HOSTFN_CMD_STAT));
-        }
-        r32 = readl((rb + CT2_LPU1_HOSTFN_CMD_STAT));
-        if (r32 == 1) {
-                writel(1, (rb + CT2_LPU1_HOSTFN_CMD_STAT));
-                readl((rb + CT2_LPU1_HOSTFN_CMD_STAT));
-        }
-
-        bfa_ioc_ct2_mac_reset(rb);
-        bfa_ioc_ct2_sclk_init(rb);
-        bfa_ioc_ct2_lclk_init(rb);
-
-        /*
-         * release soft reset on s_clk & l_clk
-         */
-        r32 = readl((rb + CT2_APP_PLL_SCLK_CTL_REG));
-        writel((r32 & ~__APP_PLL_SCLK_LOGIC_SOFT_RESET),
-                        (rb + CT2_APP_PLL_SCLK_CTL_REG));
-
-        /*
-         * release soft reset on s_clk & l_clk
-         */
-        r32 = readl((rb + CT2_APP_PLL_LCLK_CTL_REG));
-        writel(r32 & ~__APP_PLL_LCLK_LOGIC_SOFT_RESET,
-                      (rb + CT2_APP_PLL_LCLK_CTL_REG));
-
-        /*
-         * Announce flash device presence, if flash was corrupted.
-         */
-        if (wgn == (__WGN_READY | __GLBL_PF_VF_CFG_RDY)) {
-                r32 = readl((rb + PSS_GPIO_OUT_REG));
-                writel((r32 & ~1), (rb + PSS_GPIO_OUT_REG));
-                r32 = readl((rb + PSS_GPIO_OE_REG));
-                writel((r32 | 1), (rb + PSS_GPIO_OE_REG));
+        /* For first time initialization, no need to clear interrupts */
+        r32 = readl(rb + HOST_SEM5_REG);
+        if (r32 & 0x1) {
+                r32 = readl((rb + CT2_LPU0_HOSTFN_CMD_STAT));
+                if (r32 == 1) {
+                        writel(1, (rb + CT2_LPU0_HOSTFN_CMD_STAT));
+                        readl((rb + CT2_LPU0_HOSTFN_CMD_STAT));
+                }
+                r32 = readl((rb + CT2_LPU1_HOSTFN_CMD_STAT));
+                if (r32 == 1) {
+                        writel(1, (rb + CT2_LPU1_HOSTFN_CMD_STAT));
+                        readl((rb + CT2_LPU1_HOSTFN_CMD_STAT));
+                }
         }
 
         bfa_ioc_ct2_mem_init(rb);
diff --git a/drivers/net/ethernet/brocade/bna/bfi_reg.h b/drivers/net/ethernet/brocade/bna/bfi_reg.h
index efacff3ab51d..0e094fe46dfd 100644
--- a/drivers/net/ethernet/brocade/bna/bfi_reg.h
+++ b/drivers/net/ethernet/brocade/bna/bfi_reg.h
@@ -339,10 +339,16 @@ enum {
 #define __A2T_AHB_LOAD                  0x00000800
 #define __WGN_READY                     0x00000400
 #define __GLBL_PF_VF_CFG_RDY            0x00000200
+#define CT2_NFC_CSR_CLR_REG             0x00027420
 #define CT2_NFC_CSR_SET_REG             0x00027424
 #define __HALT_NFC_CONTROLLER           0x00000002
 #define __NFC_CONTROLLER_HALTED         0x00001000
 
+#define CT2_RSC_GPR15_REG               0x0002765c
+#define CT2_CSI_FW_CTL_REG              0x00027080
+#define __RESET_AND_START_SCLK_LCLK_PLLS 0x00010000
+#define CT2_CSI_FW_CTL_SET_REG          0x00027088
+
 #define CT2_CSI_MAC0_CONTROL_REG        0x000270d0
 #define __CSI_MAC_RESET                 0x00000010
 #define __CSI_MAC_AHB_RESET             0x00000008
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index ff78f770dec9..25c4e7f2a099 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -80,8 +80,6 @@ do {								\
         (sizeof(struct bnad_skb_unmap) * ((_depth) - 1));       \
 } while (0)
 
-#define BNAD_TXRX_SYNC_MDELAY   250     /* 250 msecs */
-
 static void
 bnad_add_to_list(struct bnad *bnad)
 {
@@ -103,7 +101,7 @@ bnad_remove_from_list(struct bnad *bnad)
  * Reinitialize completions in CQ, once Rx is taken down
  */
 static void
-bnad_cq_cmpl_init(struct bnad *bnad, struct bna_ccb *ccb)
+bnad_cq_cleanup(struct bnad *bnad, struct bna_ccb *ccb)
 {
         struct bna_cq_entry *cmpl, *next_cmpl;
         unsigned int wi_range, wis = 0, ccb_prod = 0;
@@ -141,7 +139,8 @@ bnad_pci_unmap_skb(struct device *pdev, struct bnad_skb_unmap *array,
 
         for (j = 0; j < frag; j++) {
                 dma_unmap_page(pdev, dma_unmap_addr(&array[index], dma_addr),
-                          skb_frag_size(&skb_shinfo(skb)->frags[j]), DMA_TO_DEVICE);
+                          skb_frag_size(&skb_shinfo(skb)->frags[j]),
+                                                DMA_TO_DEVICE);
                 dma_unmap_addr_set(&array[index], dma_addr, 0);
                 BNA_QE_INDX_ADD(index, 1, depth);
         }
@@ -155,7 +154,7 @@ bnad_pci_unmap_skb(struct device *pdev, struct bnad_skb_unmap *array,
  * so DMA unmap & freeing is fine.
  */
 static void
-bnad_free_all_txbufs(struct bnad *bnad,
+bnad_txq_cleanup(struct bnad *bnad,
                  struct bna_tcb *tcb)
 {
         u32             unmap_cons;
@@ -183,13 +182,12 @@ bnad_free_all_txbufs(struct bnad *bnad,
 /* Data Path Handlers */
 
 /*
- * bnad_free_txbufs : Frees the Tx bufs on Tx completion
+ * bnad_txcmpl_process : Frees the Tx bufs on Tx completion
  * Can be called in a) Interrupt context
  *                  b) Sending context
- *                  c) Tasklet context
  */
 static u32
-bnad_free_txbufs(struct bnad *bnad,
+bnad_txcmpl_process(struct bnad *bnad,
                  struct bna_tcb *tcb)
 {
         u32             unmap_cons, sent_packets = 0, sent_bytes = 0;
@@ -198,13 +196,7 @@ bnad_free_txbufs(struct bnad *bnad,
         struct bnad_skb_unmap *unmap_array;
         struct sk_buff          *skb;
 
-        /*
-         * Just return if TX is stopped. This check is useful
-         * when bnad_free_txbufs() runs out of a tasklet scheduled
-         * before bnad_cb_tx_cleanup() cleared BNAD_TXQ_TX_STARTED bit
-         * but this routine runs actually after the cleanup has been
-         * executed.
-         */
+        /* Just return if TX is stopped */
         if (!test_bit(BNAD_TXQ_TX_STARTED, &tcb->flags))
                 return 0;
 
@@ -243,57 +235,8 @@ bnad_free_txbufs(struct bnad *bnad,
         return sent_packets;
 }
 
-/* Tx Free Tasklet function */
-/* Frees for all the tcb's in all the Tx's */
-/*
- * Scheduled from sending context, so that
- * the fat Tx lock is not held for too long
- * in the sending context.
- */
-static void
-bnad_tx_free_tasklet(unsigned long bnad_ptr)
-{
-        struct bnad *bnad = (struct bnad *)bnad_ptr;
-        struct bna_tcb *tcb;
-        u32             acked = 0;
-        int                     i, j;
-
-        for (i = 0; i < bnad->num_tx; i++) {
-                for (j = 0; j < bnad->num_txq_per_tx; j++) {
-                        tcb = bnad->tx_info[i].tcb[j];
-                        if (!tcb)
-                                continue;
-                        if (((u16) (*tcb->hw_consumer_index) !=
-                                tcb->consumer_index) &&
-                                (!test_and_set_bit(BNAD_TXQ_FREE_SENT,
-                                                  &tcb->flags))) {
-                                acked = bnad_free_txbufs(bnad, tcb);
-                                if (likely(test_bit(BNAD_TXQ_TX_STARTED,
-                                        &tcb->flags)))
-                                        bna_ib_ack(tcb->i_dbell, acked);
-                                smp_mb__before_clear_bit();
-                                clear_bit(BNAD_TXQ_FREE_SENT, &tcb->flags);
-                        }
-                        if (unlikely(!test_bit(BNAD_TXQ_TX_STARTED,
-                                                &tcb->flags)))
-                                continue;
-                        if (netif_queue_stopped(bnad->netdev)) {
-                                if (acked && netif_carrier_ok(bnad->netdev) &&
-                                        BNA_QE_FREE_CNT(tcb, tcb->q_depth) >=
-                                                BNAD_NETIF_WAKE_THRESHOLD) {
-                                        netif_wake_queue(bnad->netdev);
-                                        /* TODO */
-                                        /* Counters for individual TxQs? */
-                                        BNAD_UPDATE_CTR(bnad,
-                                                netif_queue_wakeup);
-                                }
-                        }
-                }
-        }
-}
-
 static u32
-bnad_tx(struct bnad *bnad, struct bna_tcb *tcb)
+bnad_tx_complete(struct bnad *bnad, struct bna_tcb *tcb)
 {
         struct net_device *netdev = bnad->netdev;
         u32 sent = 0;
@@ -301,7 +244,7 @@ bnad_tx(struct bnad *bnad, struct bna_tcb *tcb)
         if (test_and_set_bit(BNAD_TXQ_FREE_SENT, &tcb->flags))
                 return 0;
 
-        sent = bnad_free_txbufs(bnad, tcb);
+        sent = bnad_txcmpl_process(bnad, tcb);
         if (sent) {
                 if (netif_queue_stopped(netdev) &&
                     netif_carrier_ok(netdev) &&
@@ -330,13 +273,13 @@ bnad_msix_tx(int irq, void *data)
         struct bna_tcb *tcb = (struct bna_tcb *)data;
         struct bnad *bnad = tcb->bnad;
 
-        bnad_tx(bnad, tcb);
+        bnad_tx_complete(bnad, tcb);
 
         return IRQ_HANDLED;
 }
 
 static void
-bnad_reset_rcb(struct bnad *bnad, struct bna_rcb *rcb)
+bnad_rcb_cleanup(struct bnad *bnad, struct bna_rcb *rcb)
 {
         struct bnad_unmap_q *unmap_q = rcb->unmap_q;
 
@@ -348,7 +291,7 @@ bnad_reset_rcb(struct bnad *bnad, struct bna_rcb *rcb)
 }
 
 static void
-bnad_free_all_rxbufs(struct bnad *bnad, struct bna_rcb *rcb)
+bnad_rxq_cleanup(struct bnad *bnad, struct bna_rcb *rcb)
 {
         struct bnad_unmap_q *unmap_q;
         struct bnad_skb_unmap *unmap_array;
@@ -369,11 +312,11 @@ bnad_free_all_rxbufs(struct bnad *bnad, struct bna_rcb *rcb)
                                  DMA_FROM_DEVICE);
                 dev_kfree_skb(skb);
         }
-        bnad_reset_rcb(bnad, rcb);
+        bnad_rcb_cleanup(bnad, rcb);
 }
 
 static void
-bnad_alloc_n_post_rxbufs(struct bnad *bnad, struct bna_rcb *rcb)
+bnad_rxq_post(struct bnad *bnad, struct bna_rcb *rcb)
 {
         u16 to_alloc, alloced, unmap_prod, wi_range;
         struct bnad_unmap_q *unmap_q = rcb->unmap_q;
@@ -434,14 +377,14 @@ bnad_refill_rxq(struct bnad *bnad, struct bna_rcb *rcb)
         if (!test_and_set_bit(BNAD_RXQ_REFILL, &rcb->flags)) {
                 if (BNA_QE_FREE_CNT(unmap_q, unmap_q->q_depth)
                          >> BNAD_RXQ_REFILL_THRESHOLD_SHIFT)
-                        bnad_alloc_n_post_rxbufs(bnad, rcb);
+                        bnad_rxq_post(bnad, rcb);
                 smp_mb__before_clear_bit();
                 clear_bit(BNAD_RXQ_REFILL, &rcb->flags);
         }
 }
 
 static u32
-bnad_poll_cq(struct bnad *bnad, struct bna_ccb *ccb, int budget)
+bnad_cq_process(struct bnad *bnad, struct bna_ccb *ccb, int budget)
 {
         struct bna_cq_entry *cmpl, *next_cmpl;
         struct bna_rcb *rcb = NULL;
@@ -453,12 +396,8 @@ bnad_poll_cq(struct bnad *bnad, struct bna_ccb *ccb, int budget)
         struct bna_pkt_rate *pkt_rt = &ccb->pkt_rate;
         struct bnad_rx_ctrl *rx_ctrl = (struct bnad_rx_ctrl *)(ccb->ctrl);
 
-        set_bit(BNAD_FP_IN_RX_PATH, &rx_ctrl->flags);
-
-        if (!test_bit(BNAD_RXQ_STARTED, &ccb->rcb[0]->flags)) {
-                clear_bit(BNAD_FP_IN_RX_PATH, &rx_ctrl->flags);
+        if (!test_bit(BNAD_RXQ_STARTED, &ccb->rcb[0]->flags))
                 return 0;
-        }
 
         prefetch(bnad->netdev);
         BNA_CQ_QPGE_PTR_GET(ccb->producer_index, ccb->sw_qpt, cmpl,
@@ -533,9 +472,8 @@ bnad_poll_cq(struct bnad *bnad, struct bna_ccb *ccb, int budget)
 
                 if (skb->ip_summed == CHECKSUM_UNNECESSARY)
                         napi_gro_receive(&rx_ctrl->napi, skb);
-                else {
+                else
                         netif_receive_skb(skb);
-                }
 
 next:
                 cmpl->valid = 0;
@@ -646,7 +584,7 @@ bnad_isr(int irq, void *data)
                 for (j = 0; j < bnad->num_txq_per_tx; j++) {
                         tcb = bnad->tx_info[i].tcb[j];
                         if (tcb && test_bit(BNAD_TXQ_TX_STARTED, &tcb->flags))
-                                bnad_tx(bnad, bnad->tx_info[i].tcb[j]);
+                                bnad_tx_complete(bnad, bnad->tx_info[i].tcb[j]);
                 }
         }
         /* Rx processing */
@@ -839,20 +777,9 @@ bnad_cb_tcb_destroy(struct bnad *bnad, struct bna_tcb *tcb)
 {
         struct bnad_tx_info *tx_info =
                         (struct bnad_tx_info *)tcb->txq->tx->priv;
-        struct bnad_unmap_q *unmap_q = tcb->unmap_q;
-
-        while (test_and_set_bit(BNAD_TXQ_FREE_SENT, &tcb->flags))
-                cpu_relax();
-
-        bnad_free_all_txbufs(bnad, tcb);
-
-        unmap_q->producer_index = 0;
-        unmap_q->consumer_index = 0;
-
-        smp_mb__before_clear_bit();
-        clear_bit(BNAD_TXQ_FREE_SENT, &tcb->flags);
 
         tx_info->tcb[tcb->id] = NULL;
+        tcb->priv = NULL;
 }
 
 static void
@@ -866,12 +793,6 @@ bnad_cb_rcb_setup(struct bnad *bnad, struct bna_rcb *rcb)
 }
 
 static void
-bnad_cb_rcb_destroy(struct bnad *bnad, struct bna_rcb *rcb)
-{
-        bnad_free_all_rxbufs(bnad, rcb);
-}
-
-static void
 bnad_cb_ccb_setup(struct bnad *bnad, struct bna_ccb *ccb)
 {
         struct bnad_rx_info *rx_info =
@@ -916,7 +837,6 @@ bnad_cb_tx_resume(struct bnad *bnad, struct bna_tx *tx)
 {
         struct bnad_tx_info *tx_info = (struct bnad_tx_info *)tx->priv;
         struct bna_tcb *tcb;
-        struct bnad_unmap_q *unmap_q;
         u32 txq_id;
         int i;
 
@@ -926,23 +846,9 @@ bnad_cb_tx_resume(struct bnad *bnad, struct bna_tx *tx)
                         continue;
                 txq_id = tcb->id;
 
-                unmap_q = tcb->unmap_q;
-
-                if (test_bit(BNAD_TXQ_TX_STARTED, &tcb->flags))
-                        continue;
-
-                while (test_and_set_bit(BNAD_TXQ_FREE_SENT, &tcb->flags))
-                        cpu_relax();
-
-                bnad_free_all_txbufs(bnad, tcb);
-
-                unmap_q->producer_index = 0;
-                unmap_q->consumer_index = 0;
-
-                smp_mb__before_clear_bit();
-                clear_bit(BNAD_TXQ_FREE_SENT, &tcb->flags);
-
+                BUG_ON(test_bit(BNAD_TXQ_TX_STARTED, &tcb->flags));
                 set_bit(BNAD_TXQ_TX_STARTED, &tcb->flags);
+                BUG_ON(*(tcb->hw_consumer_index) != 0);
 
                 if (netif_carrier_ok(bnad->netdev)) {
                         printk(KERN_INFO "bna: %s %d TXQ_STARTED\n",
@@ -963,6 +869,54 @@ bnad_cb_tx_resume(struct bnad *bnad, struct bna_tx *tx)
         }
 }
 
+/*
+ * Free all TxQs buffers and then notify TX_E_CLEANUP_DONE to Tx fsm.
+ */
+static void
+bnad_tx_cleanup(struct delayed_work *work)
+{
+        struct bnad_tx_info *tx_info =
+                container_of(work, struct bnad_tx_info, tx_cleanup_work);
+        struct bnad *bnad = NULL;
+        struct bnad_unmap_q *unmap_q;
+        struct bna_tcb *tcb;
+        unsigned long flags;
+        uint32_t i, pending = 0;
+
+        for (i = 0; i < BNAD_MAX_TXQ_PER_TX; i++) {
+                tcb = tx_info->tcb[i];
+                if (!tcb)
+                        continue;
+
+                bnad = tcb->bnad;
+
+                if (test_and_set_bit(BNAD_TXQ_FREE_SENT, &tcb->flags)) {
+                        pending++;
+                        continue;
+                }
+
+                bnad_txq_cleanup(bnad, tcb);
+
+                unmap_q = tcb->unmap_q;
+                unmap_q->producer_index = 0;
+                unmap_q->consumer_index = 0;
+
+                smp_mb__before_clear_bit();
+                clear_bit(BNAD_TXQ_FREE_SENT, &tcb->flags);
+        }
+
+        if (pending) {
+                queue_delayed_work(bnad->work_q, &tx_info->tx_cleanup_work,
+                        msecs_to_jiffies(1));
+                return;
+        }
+
+        spin_lock_irqsave(&bnad->bna_lock, flags);
+        bna_tx_cleanup_complete(tx_info->tx);
+        spin_unlock_irqrestore(&bnad->bna_lock, flags);
+}
+
+
 static void
 bnad_cb_tx_cleanup(struct bnad *bnad, struct bna_tx *tx)
 {
@@ -976,8 +930,7 @@ bnad_cb_tx_cleanup(struct bnad *bnad, struct bna_tx *tx)
                         continue;
         }
 
-        mdelay(BNAD_TXRX_SYNC_MDELAY);
-        bna_tx_cleanup_complete(tx);
+        queue_delayed_work(bnad->work_q, &tx_info->tx_cleanup_work, 0);
 }
 
 static void
@@ -1001,6 +954,44 @@ bnad_cb_rx_stall(struct bnad *bnad, struct bna_rx *rx)
         }
 }
 
+/*
+ * Free all RxQs buffers and then notify RX_E_CLEANUP_DONE to Rx fsm.
+ */
+static void
+bnad_rx_cleanup(void *work)
+{
+        struct bnad_rx_info *rx_info =
+                container_of(work, struct bnad_rx_info, rx_cleanup_work);
+        struct bnad_rx_ctrl *rx_ctrl;
+        struct bnad *bnad = NULL;
+        unsigned long flags;
+        uint32_t i;
+
+        for (i = 0; i < BNAD_MAX_RXP_PER_RX; i++) {
+                rx_ctrl = &rx_info->rx_ctrl[i];
+
+                if (!rx_ctrl->ccb)
+                        continue;
+
+                bnad = rx_ctrl->ccb->bnad;
+
+                /*
+                 * Wait till the poll handler has exited
+                 * and nothing can be scheduled anymore
+                 */
+                napi_disable(&rx_ctrl->napi);
+
+                bnad_cq_cleanup(bnad, rx_ctrl->ccb);
+                bnad_rxq_cleanup(bnad, rx_ctrl->ccb->rcb[0]);
+                if (rx_ctrl->ccb->rcb[1])
+                        bnad_rxq_cleanup(bnad, rx_ctrl->ccb->rcb[1]);
+        }
+
+        spin_lock_irqsave(&bnad->bna_lock, flags);
+        bna_rx_cleanup_complete(rx_info->rx);
+        spin_unlock_irqrestore(&bnad->bna_lock, flags);
+}
+
 static void
 bnad_cb_rx_cleanup(struct bnad *bnad, struct bna_rx *rx)
 {
@@ -1009,8 +1000,6 @@ bnad_cb_rx_cleanup(struct bnad *bnad, struct bna_rx *rx)
         struct bnad_rx_ctrl *rx_ctrl;
         int i;
 
-        mdelay(BNAD_TXRX_SYNC_MDELAY);
-
         for (i = 0; i < BNAD_MAX_RXP_PER_RX; i++) {
                 rx_ctrl = &rx_info->rx_ctrl[i];
                 ccb = rx_ctrl->ccb;
@@ -1021,12 +1010,9 @@ bnad_cb_rx_cleanup(struct bnad *bnad, struct bna_rx *rx)
 
                 if (ccb->rcb[1])
                         clear_bit(BNAD_RXQ_STARTED, &ccb->rcb[1]->flags);
-
-                while (test_bit(BNAD_FP_IN_RX_PATH, &rx_ctrl->flags))
-                        cpu_relax();
         }
 
-        bna_rx_cleanup_complete(rx);
+        queue_work(bnad->work_q, &rx_info->rx_cleanup_work);
 }
 
 static void
@@ -1046,13 +1032,12 @@ bnad_cb_rx_post(struct bnad *bnad, struct bna_rx *rx)
                 if (!ccb)
                         continue;
 
-                bnad_cq_cmpl_init(bnad, ccb);
+                napi_enable(&rx_ctrl->napi);
 
                 for (j = 0; j < BNAD_MAX_RXQ_PER_RXP; j++) {
                         rcb = ccb->rcb[j];
                         if (!rcb)
                                 continue;
-                        bnad_free_all_rxbufs(bnad, rcb);
 
                         set_bit(BNAD_RXQ_STARTED, &rcb->flags);
                         set_bit(BNAD_RXQ_POST_OK, &rcb->flags);
@@ -1063,7 +1048,7 @@ bnad_cb_rx_post(struct bnad *bnad, struct bna_rx *rx)
                         if (!test_and_set_bit(BNAD_RXQ_REFILL, &rcb->flags)) {
                                 if (BNA_QE_FREE_CNT(unmap_q, unmap_q->q_depth)
                                         >> BNAD_RXQ_REFILL_THRESHOLD_SHIFT)
-                                        bnad_alloc_n_post_rxbufs(bnad, rcb);
+                                        bnad_rxq_post(bnad, rcb);
                                         smp_mb__before_clear_bit();
                                 clear_bit(BNAD_RXQ_REFILL, &rcb->flags);
                         }
@@ -1687,7 +1672,7 @@ bnad_napi_poll_rx(struct napi_struct *napi, int budget)
         if (!netif_carrier_ok(bnad->netdev))
                 goto poll_exit;
 
-        rcvd = bnad_poll_cq(bnad, rx_ctrl->ccb, budget);
+        rcvd = bnad_cq_process(bnad, rx_ctrl->ccb, budget);
         if (rcvd >= budget)
                 return rcvd;
 
@@ -1704,7 +1689,7 @@ poll_exit:
 
 #define BNAD_NAPI_POLL_QUOTA            64
 static void
-bnad_napi_init(struct bnad *bnad, u32 rx_id)
+bnad_napi_add(struct bnad *bnad, u32 rx_id)
 {
         struct bnad_rx_ctrl *rx_ctrl;
         int i;
@@ -1718,34 +1703,18 @@ bnad_napi_init(struct bnad *bnad, u32 rx_id)
 }
 
 static void
-bnad_napi_enable(struct bnad *bnad, u32 rx_id)
-{
-        struct bnad_rx_ctrl *rx_ctrl;
-        int i;
-
-        /* Initialize & enable NAPI */
-        for (i = 0; i < bnad->num_rxp_per_rx; i++) {
-                rx_ctrl = &bnad->rx_info[rx_id].rx_ctrl[i];
-
-                napi_enable(&rx_ctrl->napi);
-        }
-}
-
-static void
-bnad_napi_disable(struct bnad *bnad, u32 rx_id)
+bnad_napi_delete(struct bnad *bnad, u32 rx_id)
 {
         int i;
 
         /* First disable and then clean up */
-        for (i = 0; i < bnad->num_rxp_per_rx; i++) {
-                napi_disable(&bnad->rx_info[rx_id].rx_ctrl[i].napi);
+        for (i = 0; i < bnad->num_rxp_per_rx; i++)
                 netif_napi_del(&bnad->rx_info[rx_id].rx_ctrl[i].napi);
-        }
 }
 
 /* Should be held with conf_lock held */
 void
-bnad_cleanup_tx(struct bnad *bnad, u32 tx_id)
+bnad_destroy_tx(struct bnad *bnad, u32 tx_id)
 {
         struct bnad_tx_info *tx_info = &bnad->tx_info[tx_id];
         struct bna_res_info *res_info = &bnad->tx_res_info[tx_id].res_info[0];
@@ -1764,9 +1733,6 @@ bnad_cleanup_tx(struct bnad *bnad, u32 tx_id)
                 bnad_tx_msix_unregister(bnad, tx_info,
                         bnad->num_txq_per_tx);
 
-        if (0 == tx_id)
-                tasklet_kill(&bnad->tx_free_tasklet);
-
         spin_lock_irqsave(&bnad->bna_lock, flags);
         bna_tx_destroy(tx_info->tx);
         spin_unlock_irqrestore(&bnad->bna_lock, flags);
@@ -1832,6 +1798,9 @@ bnad_setup_tx(struct bnad *bnad, u32 tx_id)
                 goto err_return;
         tx_info->tx = tx;
 
+        INIT_DELAYED_WORK(&tx_info->tx_cleanup_work,
+                        (work_func_t)bnad_tx_cleanup);
+
         /* Register ISR for the Tx object */
         if (intr_info->intr_type == BNA_INTR_T_MSIX) {
                 err = bnad_tx_msix_register(bnad, tx_info,
@@ -1896,7 +1865,7 @@ bnad_rx_ctrl_init(struct bnad *bnad, u32 rx_id)
 
 /* Called with mutex_lock(&bnad->conf_mutex) held */
 void
-bnad_cleanup_rx(struct bnad *bnad, u32 rx_id)
+bnad_destroy_rx(struct bnad *bnad, u32 rx_id)
 {
         struct bnad_rx_info *rx_info = &bnad->rx_info[rx_id];
         struct bna_rx_config *rx_config = &bnad->rx_config[rx_id];
@@ -1928,7 +1897,7 @@ bnad_cleanup_rx(struct bnad *bnad, u32 rx_id)
         if (rx_info->rx_ctrl[0].ccb->intr_type == BNA_INTR_T_MSIX)
                 bnad_rx_msix_unregister(bnad, rx_info, rx_config->num_paths);
 
-        bnad_napi_disable(bnad, rx_id);
+        bnad_napi_delete(bnad, rx_id);
 
         spin_lock_irqsave(&bnad->bna_lock, flags);
         bna_rx_destroy(rx_info->rx);
@@ -1952,7 +1921,7 @@ bnad_setup_rx(struct bnad *bnad, u32 rx_id)
         struct bna_rx_config *rx_config = &bnad->rx_config[rx_id];
         static const struct bna_rx_event_cbfn rx_cbfn = {
                 .rcb_setup_cbfn = bnad_cb_rcb_setup,
-                .rcb_destroy_cbfn = bnad_cb_rcb_destroy,
+                .rcb_destroy_cbfn = NULL,
                 .ccb_setup_cbfn = bnad_cb_ccb_setup,
                 .ccb_destroy_cbfn = bnad_cb_ccb_destroy,
                 .rx_stall_cbfn = bnad_cb_rx_stall,
@@ -1998,11 +1967,14 @@ bnad_setup_rx(struct bnad *bnad, u32 rx_id)
         rx_info->rx = rx;
         spin_unlock_irqrestore(&bnad->bna_lock, flags);
 
+        INIT_WORK(&rx_info->rx_cleanup_work,
+                        (work_func_t)(bnad_rx_cleanup));
+
         /*
          * Init NAPI, so that state is set to NAPI_STATE_SCHED,
          * so that IRQ handler cannot schedule NAPI at this point.
          */
-        bnad_napi_init(bnad, rx_id);
+        bnad_napi_add(bnad, rx_id);
 
         /* Register ISR for the Rx object */
         if (intr_info->intr_type == BNA_INTR_T_MSIX) {
@@ -2028,13 +2000,10 @@ bnad_setup_rx(struct bnad *bnad, u32 rx_id)
         bna_rx_enable(rx);
         spin_unlock_irqrestore(&bnad->bna_lock, flags);
 
-        /* Enable scheduling of NAPI */
-        bnad_napi_enable(bnad, rx_id);
-
         return 0;
 
 err_return:
-        bnad_cleanup_rx(bnad, rx_id);
+        bnad_destroy_rx(bnad, rx_id);
         return err;
 }
 
@@ -2519,7 +2488,7 @@ bnad_open(struct net_device *netdev)
         return 0;
 
 cleanup_tx:
-        bnad_cleanup_tx(bnad, 0);
+        bnad_destroy_tx(bnad, 0);
 
 err_return:
         mutex_unlock(&bnad->conf_mutex);
@@ -2546,8 +2515,8 @@ bnad_stop(struct net_device *netdev)
 
         wait_for_completion(&bnad->bnad_completions.enet_comp);
 
-        bnad_cleanup_tx(bnad, 0);
-        bnad_cleanup_rx(bnad, 0);
+        bnad_destroy_tx(bnad, 0);
+        bnad_destroy_rx(bnad, 0);
 
         /* Synchronize mailbox IRQ */
         bnad_mbox_irq_sync(bnad);
@@ -2620,7 +2589,7 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
                 if ((u16) (*tcb->hw_consumer_index) !=
                     tcb->consumer_index &&
                     !test_and_set_bit(BNAD_TXQ_FREE_SENT, &tcb->flags)) {
-                        acked = bnad_free_txbufs(bnad, tcb);
+                        acked = bnad_txcmpl_process(bnad, tcb);
                         if (likely(test_bit(BNAD_TXQ_TX_STARTED, &tcb->flags)))
                                 bna_ib_ack(tcb->i_dbell, acked);
                         smp_mb__before_clear_bit();
@@ -2843,9 +2812,6 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
         bna_txq_prod_indx_doorbell(tcb);
         smp_mb();
 
-        if ((u16) (*tcb->hw_consumer_index) != tcb->consumer_index)
-                tasklet_schedule(&bnad->tx_free_tasklet);
-
         return NETDEV_TX_OK;
 }
 
@@ -3127,8 +3093,8 @@ bnad_netdev_init(struct bnad *bnad, bool using_dac)
 /*
  * 1. Initialize the bnad structure
  * 2. Setup netdev pointer in pci_dev
- * 3. Initialze Tx free tasklet
- * 4. Initialize no. of TxQ & CQs & MSIX vectors
+ * 3. Initialize no. of TxQ & CQs & MSIX vectors
+ * 4. Initialize work queue.
  */
 static int
 bnad_init(struct bnad *bnad,
@@ -3171,8 +3137,11 @@ bnad_init(struct bnad *bnad,
         bnad->tx_coalescing_timeo = BFI_TX_COALESCING_TIMEO;
         bnad->rx_coalescing_timeo = BFI_RX_COALESCING_TIMEO;
 
-        tasklet_init(&bnad->tx_free_tasklet, bnad_tx_free_tasklet,
-                     (unsigned long)bnad);
+        sprintf(bnad->wq_name, "%s_wq_%d", BNAD_NAME, bnad->id);
+        bnad->work_q = create_singlethread_workqueue(bnad->wq_name);
+
+        if (!bnad->work_q)
+                return -ENOMEM;
 
         return 0;
 }
@@ -3185,6 +3154,12 @@ bnad_init(struct bnad *bnad,
 static void
 bnad_uninit(struct bnad *bnad)
 {
+        if (bnad->work_q) {
+                flush_workqueue(bnad->work_q);
+                destroy_workqueue(bnad->work_q);
+                bnad->work_q = NULL;
+        }
+
         if (bnad->bar0)
                 iounmap(bnad->bar0);
         pci_set_drvdata(bnad->pcidev, NULL);
@@ -3304,7 +3279,6 @@ bnad_pci_probe(struct pci_dev *pdev,
         /*
          * Initialize bnad structure
          * Setup relation between pci_dev & netdev
-         * Init Tx free tasklet
          */
         err = bnad_init(bnad, pdev, netdev);
         if (err)
diff --git a/drivers/net/ethernet/brocade/bna/bnad.h b/drivers/net/ethernet/brocade/bna/bnad.h
index 55824d92699f..72742be11277 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.h
+++ b/drivers/net/ethernet/brocade/bna/bnad.h
@@ -71,7 +71,7 @@ struct bnad_rx_ctrl {
 #define BNAD_NAME                       "bna"
 #define BNAD_NAME_LEN                   64
 
-#define BNAD_VERSION                    "3.0.2.2"
+#define BNAD_VERSION                    "3.0.23.0"
 
 #define BNAD_MAILBOX_MSIX_INDEX         0
 #define BNAD_MAILBOX_MSIX_VECTORS       1
@@ -210,6 +210,7 @@ struct bnad_tx_info {
         struct bna_tx *tx; /* 1:1 between tx_info & tx */
         struct bna_tcb *tcb[BNAD_MAX_TXQ_PER_TX];
         u32 tx_id;
+        struct delayed_work tx_cleanup_work;
 } ____cacheline_aligned;
 
 struct bnad_rx_info {
@@ -217,6 +218,7 @@ struct bnad_rx_info {
 
         struct bnad_rx_ctrl rx_ctrl[BNAD_MAX_RXP_PER_RX];
         u32 rx_id;
+        struct work_struct rx_cleanup_work;
 } ____cacheline_aligned;
 
 /* Unmap queues for Tx / Rx cleanup */
@@ -318,7 +320,7 @@ struct bnad {
         /* Burnt in MAC address */
         mac_t                   perm_addr;
 
-        struct tasklet_struct   tx_free_tasklet;
+        struct workqueue_struct *work_q;
 
         /* Statistics */
         struct bnad_stats stats;
@@ -328,6 +330,7 @@ struct bnad {
         char                    adapter_name[BNAD_NAME_LEN];
         char                    port_name[BNAD_NAME_LEN];
         char                    mbox_irq_name[BNAD_NAME_LEN];
+        char                    wq_name[BNAD_NAME_LEN];
 
         /* debugfs specific data */
         char    *regdata;
@@ -370,8 +373,8 @@ extern void bnad_rx_coalescing_timeo_set(struct bnad *bnad);
 
 extern int bnad_setup_rx(struct bnad *bnad, u32 rx_id);
 extern int bnad_setup_tx(struct bnad *bnad, u32 tx_id);
-extern void bnad_cleanup_tx(struct bnad *bnad, u32 tx_id);
-extern void bnad_cleanup_rx(struct bnad *bnad, u32 rx_id);
+extern void bnad_destroy_tx(struct bnad *bnad, u32 tx_id);
+extern void bnad_destroy_rx(struct bnad *bnad, u32 rx_id);
 
 /* Timer start/stop protos */
 extern void bnad_dim_timer_start(struct bnad *bnad);
diff --git a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
index ab753d7334a6..40e1e84f4984 100644
--- a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
+++ b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
@@ -464,7 +464,7 @@ bnad_set_ringparam(struct net_device *netdev,
                 for (i = 0; i < bnad->num_rx; i++) {
                         if (!bnad->rx_info[i].rx)
                                 continue;
-                        bnad_cleanup_rx(bnad, i);
+                        bnad_destroy_rx(bnad, i);
                         current_err = bnad_setup_rx(bnad, i);
                         if (current_err && !err)
                                 err = current_err;
@@ -492,7 +492,7 @@ bnad_set_ringparam(struct net_device *netdev,
                 for (i = 0; i < bnad->num_tx; i++) {
                         if (!bnad->tx_info[i].tx)
                                 continue;
-                        bnad_cleanup_tx(bnad, i);
+                        bnad_destroy_tx(bnad, i);
                         current_err = bnad_setup_tx(bnad, i);
                         if (current_err && !err)
                                 err = current_err;
@@ -539,7 +539,7 @@ bnad_set_pauseparam(struct net_device *netdev,
 }
 
 static void
-bnad_get_strings(struct net_device *netdev, u32 stringset, u8 * string)
+bnad_get_strings(struct net_device *netdev, u32 stringset, u8 *string)
 {
         struct bnad *bnad = netdev_priv(netdev);
         int i, j, q_num;
diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c
index 906117016fc4..77884191a8c6 100644
--- a/drivers/net/ethernet/cadence/at91_ether.c
+++ b/drivers/net/ethernet/cadence/at91_ether.c
@@ -30,6 +30,7 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/gfp.h>
+#include <linux/phy.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -51,21 +52,17 @@
 /*
  * Read from a EMAC register.
  */
-static inline unsigned long at91_emac_read(unsigned int reg)
+static inline unsigned long at91_emac_read(struct at91_private *lp, unsigned int reg)
 {
-        void __iomem *emac_base = (void __iomem *)AT91_VA_BASE_EMAC;
-
-        return __raw_readl(emac_base + reg);
+        return __raw_readl(lp->emac_base + reg);
 }
 
 /*
  * Write to a EMAC register.
  */
-static inline void at91_emac_write(unsigned int reg, unsigned long value)
+static inline void at91_emac_write(struct at91_private *lp, unsigned int reg, unsigned long value)
 {
-        void __iomem *emac_base = (void __iomem *)AT91_VA_BASE_EMAC;
-
-        __raw_writel(value, emac_base + reg);
+        __raw_writel(value, lp->emac_base + reg);
 }
 
 /* ........................... PHY INTERFACE ........................... */
@@ -75,32 +72,33 @@ static inline void at91_emac_write(unsigned int reg, unsigned long value)
  * When not called from an interrupt-handler, access to the PHY must be
  *  protected by a spinlock.
  */
-static void enable_mdi(void)
+static void enable_mdi(struct at91_private *lp)
 {
         unsigned long ctl;
 
-        ctl = at91_emac_read(AT91_EMAC_CTL);
-        at91_emac_write(AT91_EMAC_CTL, ctl | AT91_EMAC_MPE);    /* enable management port */
+        ctl = at91_emac_read(lp, AT91_EMAC_CTL);
+        at91_emac_write(lp, AT91_EMAC_CTL, ctl | AT91_EMAC_MPE);        /* enable management port */
 }
 
 /*
  * Disable the MDIO bit in the MAC control register
  */
-static void disable_mdi(void)
+static void disable_mdi(struct at91_private *lp)
 {
         unsigned long ctl;
 
-        ctl = at91_emac_read(AT91_EMAC_CTL);
-        at91_emac_write(AT91_EMAC_CTL, ctl & ~AT91_EMAC_MPE);   /* disable management port */
+        ctl = at91_emac_read(lp, AT91_EMAC_CTL);
+        at91_emac_write(lp, AT91_EMAC_CTL, ctl & ~AT91_EMAC_MPE);       /* disable management port */
 }
 
 /*
  * Wait until the PHY operation is complete.
  */
-static inline void at91_phy_wait(void) {
+static inline void at91_phy_wait(struct at91_private *lp)
+{
         unsigned long timeout = jiffies + 2;
 
-        while (!(at91_emac_read(AT91_EMAC_SR) & AT91_EMAC_SR_IDLE)) {
+        while (!(at91_emac_read(lp, AT91_EMAC_SR) & AT91_EMAC_SR_IDLE)) {
                 if (time_after(jiffies, timeout)) {
                         printk("at91_ether: MIO timeout\n");
                         break;
@@ -113,28 +111,28 @@ static inline void at91_phy_wait(void) {
  * Write value to the a PHY register
  * Note: MDI interface is assumed to already have been enabled.
  */
-static void write_phy(unsigned char phy_addr, unsigned char address, unsigned int value)
+static void write_phy(struct at91_private *lp, unsigned char phy_addr, unsigned char address, unsigned int value)
 {
-        at91_emac_write(AT91_EMAC_MAN, AT91_EMAC_MAN_802_3 | AT91_EMAC_RW_W
+        at91_emac_write(lp, AT91_EMAC_MAN, AT91_EMAC_MAN_802_3 | AT91_EMAC_RW_W
                 | ((phy_addr & 0x1f) << 23) | (address << 18) | (value & AT91_EMAC_DATA));
 
         /* Wait until IDLE bit in Network Status register is cleared */
-        at91_phy_wait();
+        at91_phy_wait(lp);
 }
 
 /*
  * Read value stored in a PHY register.
  * Note: MDI interface is assumed to already have been enabled.
  */
-static void read_phy(unsigned char phy_addr, unsigned char address, unsigned int *value)
+static void read_phy(struct at91_private *lp, unsigned char phy_addr, unsigned char address, unsigned int *value)
 {
-        at91_emac_write(AT91_EMAC_MAN, AT91_EMAC_MAN_802_3 | AT91_EMAC_RW_R
+        at91_emac_write(lp, AT91_EMAC_MAN, AT91_EMAC_MAN_802_3 | AT91_EMAC_RW_R
                 | ((phy_addr & 0x1f) << 23) | (address << 18));
 
         /* Wait until IDLE bit in Network Status register is cleared */
-        at91_phy_wait();
+        at91_phy_wait(lp);
 
-        *value = at91_emac_read(AT91_EMAC_MAN) & AT91_EMAC_DATA;
+        *value = at91_emac_read(lp, AT91_EMAC_MAN) & AT91_EMAC_DATA;
 }
 
 /* ........................... PHY MANAGEMENT .......................... */
@@ -158,13 +156,13 @@ static void update_linkspeed(struct net_device *dev, int silent)
         }
 
         /* Link up, or auto-negotiation still in progress */
-        read_phy(lp->phy_address, MII_BMSR, &bmsr);
-        read_phy(lp->phy_address, MII_BMCR, &bmcr);
+        read_phy(lp, lp->phy_address, MII_BMSR, &bmsr);
+        read_phy(lp, lp->phy_address, MII_BMCR, &bmcr);
         if (bmcr & BMCR_ANENABLE) {                             /* AutoNegotiation is enabled */
                 if (!(bmsr & BMSR_ANEGCOMPLETE))
                         return;                 /* Do nothing - another interrupt generated when negotiation complete */
 
-                read_phy(lp->phy_address, MII_LPA, &lpa);
+                read_phy(lp, lp->phy_address, MII_LPA, &lpa);
                 if ((lpa & LPA_100FULL) || (lpa & LPA_100HALF)) speed = SPEED_100;
                 else speed = SPEED_10;
                 if ((lpa & LPA_100FULL) || (lpa & LPA_10FULL)) duplex = DUPLEX_FULL;
@@ -175,7 +173,7 @@ static void update_linkspeed(struct net_device *dev, int silent)
         }
 
         /* Update the MAC */
-        mac_cfg = at91_emac_read(AT91_EMAC_CFG) & ~(AT91_EMAC_SPD | AT91_EMAC_FD);
+        mac_cfg = at91_emac_read(lp, AT91_EMAC_CFG) & ~(AT91_EMAC_SPD | AT91_EMAC_FD);
         if (speed == SPEED_100) {
                 if (duplex == DUPLEX_FULL)              /* 100 Full Duplex */
                         mac_cfg |= AT91_EMAC_SPD | AT91_EMAC_FD;
@@ -186,7 +184,7 @@ static void update_linkspeed(struct net_device *dev, int silent)
                         mac_cfg |= AT91_EMAC_FD;
                 else {}                                 /* 10 Half Duplex */
         }
-        at91_emac_write(AT91_EMAC_CFG, mac_cfg);
+        at91_emac_write(lp, AT91_EMAC_CFG, mac_cfg);
 
         if (!silent)
                 printk(KERN_INFO "%s: Link now %i-%s\n", dev->name, speed, (duplex == DUPLEX_FULL) ? "FullDuplex" : "HalfDuplex");
@@ -207,34 +205,34 @@ static irqreturn_t at91ether_phy_interrupt(int irq, void *dev_id)
          * level-triggering.  We therefore have to check if the PHY actually has
          * an IRQ pending.
          */
-        enable_mdi();
+        enable_mdi(lp);
         if ((lp->phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID)) {
-                read_phy(lp->phy_address, MII_DSINTR_REG, &phy);        /* ack interrupt in Davicom PHY */
+                read_phy(lp, lp->phy_address, MII_DSINTR_REG, &phy);    /* ack interrupt in Davicom PHY */
                 if (!(phy & (1 << 0)))
                         goto done;
         }
         else if (lp->phy_type == MII_LXT971A_ID) {
-                read_phy(lp->phy_address, MII_ISINTS_REG, &phy);        /* ack interrupt in Intel PHY */
+                read_phy(lp, lp->phy_address, MII_ISINTS_REG, &phy);    /* ack interrupt in Intel PHY */
                 if (!(phy & (1 << 2)))
                         goto done;
         }
         else if (lp->phy_type == MII_BCM5221_ID) {
-                read_phy(lp->phy_address, MII_BCMINTR_REG, &phy);       /* ack interrupt in Broadcom PHY */
+                read_phy(lp, lp->phy_address, MII_BCMINTR_REG, &phy);   /* ack interrupt in Broadcom PHY */
                 if (!(phy & (1 << 0)))
                         goto done;
         }
         else if (lp->phy_type == MII_KS8721_ID) {
-                read_phy(lp->phy_address, MII_TPISTATUS, &phy);         /* ack interrupt in Micrel PHY */
+                read_phy(lp, lp->phy_address, MII_TPISTATUS, &phy);             /* ack interrupt in Micrel PHY */
                 if (!(phy & ((1 << 2) | 1)))
                         goto done;
         }
-        else if (lp->phy_type == MII_T78Q21x3_ID) {                     /* ack interrupt in Teridian PHY */
-                read_phy(lp->phy_address, MII_T78Q21INT_REG, &phy);
+        else if (lp->phy_type == MII_T78Q21x3_ID) {                                     /* ack interrupt in Teridian PHY */
+                read_phy(lp, lp->phy_address, MII_T78Q21INT_REG, &phy);
                 if (!(phy & ((1 << 2) | 1)))
                         goto done;
         }
         else if (lp->phy_type == MII_DP83848_ID) {
-                read_phy(lp->phy_address, MII_DPPHYSTS_REG, &phy);      /* ack interrupt in DP83848 PHY */
+                read_phy(lp, lp->phy_address, MII_DPPHYSTS_REG, &phy);  /* ack interrupt in DP83848 PHY */
                 if (!(phy & (1 << 7)))
                         goto done;
         }
@@ -242,7 +240,7 @@ static irqreturn_t at91ether_phy_interrupt(int irq, void *dev_id)
         update_linkspeed(dev, 0);
 
 done:
-        disable_mdi();
+        disable_mdi(lp);
 
         return IRQ_HANDLED;
 }
@@ -265,7 +263,7 @@ static void enable_phyirq(struct net_device *dev)
                 return;
         }
 
-        irq_number = lp->board_data.phy_irq_pin;
+        irq_number = gpio_to_irq(lp->board_data.phy_irq_pin);
         status = request_irq(irq_number, at91ether_phy_interrupt, 0, dev->name, dev);
         if (status) {
                 printk(KERN_ERR "at91_ether: PHY IRQ %d request failed - status %d!\n", irq_number, status);
@@ -273,41 +271,41 @@ static void enable_phyirq(struct net_device *dev)
         }
 
         spin_lock_irq(&lp->lock);
-        enable_mdi();
+        enable_mdi(lp);
 
         if ((lp->phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID)) {      /* for Davicom PHY */
-                read_phy(lp->phy_address, MII_DSINTR_REG, &dsintr);
+                read_phy(lp, lp->phy_address, MII_DSINTR_REG, &dsintr);
                 dsintr = dsintr & ~0xf00;               /* clear bits 8..11 */
-                write_phy(lp->phy_address, MII_DSINTR_REG, dsintr);
+                write_phy(lp, lp->phy_address, MII_DSINTR_REG, dsintr);
         }
         else if (lp->phy_type == MII_LXT971A_ID) {      /* for Intel PHY */
-                read_phy(lp->phy_address, MII_ISINTE_REG, &dsintr);
+                read_phy(lp, lp->phy_address, MII_ISINTE_REG, &dsintr);
                 dsintr = dsintr | 0xf2;                 /* set bits 1, 4..7 */
-                write_phy(lp->phy_address, MII_ISINTE_REG, dsintr);
+                write_phy(lp, lp->phy_address, MII_ISINTE_REG, dsintr);
         }
         else if (lp->phy_type == MII_BCM5221_ID) {      /* for Broadcom PHY */
                 dsintr = (1 << 15) | ( 1 << 14);
-                write_phy(lp->phy_address, MII_BCMINTR_REG, dsintr);
+                write_phy(lp, lp->phy_address, MII_BCMINTR_REG, dsintr);
         }
         else if (lp->phy_type == MII_KS8721_ID) {       /* for Micrel PHY */
                 dsintr = (1 << 10) | ( 1 << 8);
-                write_phy(lp->phy_address, MII_TPISTATUS, dsintr);
+                write_phy(lp, lp->phy_address, MII_TPISTATUS, dsintr);
         }
         else if (lp->phy_type == MII_T78Q21x3_ID) {     /* for Teridian PHY */
-                read_phy(lp->phy_address, MII_T78Q21INT_REG, &dsintr);
+                read_phy(lp, lp->phy_address, MII_T78Q21INT_REG, &dsintr);
                 dsintr = dsintr | 0x500;                /* set bits 8, 10 */
-                write_phy(lp->phy_address, MII_T78Q21INT_REG, dsintr);
+                write_phy(lp, lp->phy_address, MII_T78Q21INT_REG, dsintr);
         }
         else if (lp->phy_type == MII_DP83848_ID) {      /* National Semiconductor DP83848 PHY */
-                read_phy(lp->phy_address, MII_DPMISR_REG, &dsintr);
+                read_phy(lp, lp->phy_address, MII_DPMISR_REG, &dsintr);
                 dsintr = dsintr | 0x3c;                 /* set bits 2..5 */
-                write_phy(lp->phy_address, MII_DPMISR_REG, dsintr);
-                read_phy(lp->phy_address, MII_DPMICR_REG, &dsintr);
+                write_phy(lp, lp->phy_address, MII_DPMISR_REG, dsintr);
+                read_phy(lp, lp->phy_address, MII_DPMICR_REG, &dsintr);
                 dsintr = dsintr | 0x3;                  /* set bits 0,1 */
-                write_phy(lp->phy_address, MII_DPMICR_REG, dsintr);
+                write_phy(lp, lp->phy_address, MII_DPMICR_REG, dsintr);
         }
 
-        disable_mdi();
+        disable_mdi(lp);
         spin_unlock_irq(&lp->lock);
 }
 
@@ -326,46 +324,46 @@ static void disable_phyirq(struct net_device *dev)
         }
 
         spin_lock_irq(&lp->lock);
-        enable_mdi();
+        enable_mdi(lp);
 
         if ((lp->phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID)) {      /* for Davicom PHY */
-                read_phy(lp->phy_address, MII_DSINTR_REG, &dsintr);
+                read_phy(lp, lp->phy_address, MII_DSINTR_REG, &dsintr);
                 dsintr = dsintr | 0xf00;                        /* set bits 8..11 */
-                write_phy(lp->phy_address, MII_DSINTR_REG, dsintr);
+                write_phy(lp, lp->phy_address, MII_DSINTR_REG, dsintr);
         }
         else if (lp->phy_type == MII_LXT971A_ID) {      /* for Intel PHY */
-                read_phy(lp->phy_address, MII_ISINTE_REG, &dsintr);
+                read_phy(lp, lp->phy_address, MII_ISINTE_REG, &dsintr);
                 dsintr = dsintr & ~0xf2;                        /* clear bits 1, 4..7 */
-                write_phy(lp->phy_address, MII_ISINTE_REG, dsintr);
+                write_phy(lp, lp->phy_address, MII_ISINTE_REG, dsintr);
         }
         else if (lp->phy_type == MII_BCM5221_ID) {      /* for Broadcom PHY */
-                read_phy(lp->phy_address, MII_BCMINTR_REG, &dsintr);
+                read_phy(lp, lp->phy_address, MII_BCMINTR_REG, &dsintr);
                 dsintr = ~(1 << 14);
-                write_phy(lp->phy_address, MII_BCMINTR_REG, dsintr);
+                write_phy(lp, lp->phy_address, MII_BCMINTR_REG, dsintr);
         }
         else if (lp->phy_type == MII_KS8721_ID) {       /* for Micrel PHY */
-                read_phy(lp->phy_address, MII_TPISTATUS, &dsintr);
+                read_phy(lp, lp->phy_address, MII_TPISTATUS, &dsintr);
                 dsintr = ~((1 << 10) | (1 << 8));
-                write_phy(lp->phy_address, MII_TPISTATUS, dsintr);
+                write_phy(lp, lp->phy_address, MII_TPISTATUS, dsintr);
         }
         else if (lp->phy_type == MII_T78Q21x3_ID) {     /* for Teridian PHY */
-                read_phy(lp->phy_address, MII_T78Q21INT_REG, &dsintr);
+                read_phy(lp, lp->phy_address, MII_T78Q21INT_REG, &dsintr);
                 dsintr = dsintr & ~0x500;                       /* clear bits 8, 10 */
-                write_phy(lp->phy_address, MII_T78Q21INT_REG, dsintr);
+                write_phy(lp, lp->phy_address, MII_T78Q21INT_REG, dsintr);
         }
         else if (lp->phy_type == MII_DP83848_ID) {      /* National Semiconductor DP83848 PHY */
-                read_phy(lp->phy_address, MII_DPMICR_REG, &dsintr);
+                read_phy(lp, lp->phy_address, MII_DPMICR_REG, &dsintr);
                 dsintr = dsintr & ~0x3;                         /* clear bits 0, 1 */
-                write_phy(lp->phy_address, MII_DPMICR_REG, dsintr);
-                read_phy(lp->phy_address, MII_DPMISR_REG, &dsintr);
+                write_phy(lp, lp->phy_address, MII_DPMICR_REG, dsintr);
+                read_phy(lp, lp->phy_address, MII_DPMISR_REG, &dsintr);
                 dsintr = dsintr & ~0x3c;                        /* clear bits 2..5 */
-                write_phy(lp->phy_address, MII_DPMISR_REG, dsintr);
+                write_phy(lp, lp->phy_address, MII_DPMISR_REG, dsintr);
         }
 
-        disable_mdi();
+        disable_mdi(lp);
         spin_unlock_irq(&lp->lock);
 
-        irq_number = lp->board_data.phy_irq_pin;
+        irq_number = gpio_to_irq(lp->board_data.phy_irq_pin);
         free_irq(irq_number, dev);                      /* Free interrupt handler */
 }
 
@@ -379,17 +377,17 @@ static void reset_phy(struct net_device *dev)
         unsigned int bmcr;
 
         spin_lock_irq(&lp->lock);
-        enable_mdi();
+        enable_mdi(lp);
 
         /* Perform PHY reset */
-        write_phy(lp->phy_address, MII_BMCR, BMCR_RESET);
+        write_phy(lp, lp->phy_address, MII_BMCR, BMCR_RESET);
 
         /* Wait until PHY reset is complete */
         do {
-                read_phy(lp->phy_address, MII_BMCR, &bmcr);
+                read_phy(lp, lp->phy_address, MII_BMCR, &bmcr);
         } while (!(bmcr & BMCR_RESET));
 
-        disable_mdi();
+        disable_mdi(lp);
         spin_unlock_irq(&lp->lock);
 }
 #endif
@@ -399,13 +397,37 @@ static void at91ether_check_link(unsigned long dev_id)
         struct net_device *dev = (struct net_device *) dev_id;
         struct at91_private *lp = netdev_priv(dev);
 
-        enable_mdi();
+        enable_mdi(lp);
         update_linkspeed(dev, 1);
-        disable_mdi();
+        disable_mdi(lp);
 
         mod_timer(&lp->check_timer, jiffies + LINK_POLL_INTERVAL);
 }
 
+/*
+ * Perform any PHY-specific initialization.
+ */
+static void __init initialize_phy(struct at91_private *lp)
+{
+        unsigned int val;
+
+        spin_lock_irq(&lp->lock);
+        enable_mdi(lp);
+
+        if ((lp->phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID)) {
+                read_phy(lp, lp->phy_address, MII_DSCR_REG, &val);
+                if ((val & (1 << 10)) == 0)                     /* DSCR bit 10 is 0 -- fiber mode */
+                        lp->phy_media = PORT_FIBRE;
+        } else if (machine_is_csb337()) {
+                /* mix link activity status into LED2 link state */
+                write_phy(lp, lp->phy_address, MII_LEDCTRL_REG, 0x0d22);
+        } else if (machine_is_ecbat91())
+                write_phy(lp, lp->phy_address, MII_LEDCTRL_REG, 0x156A);
+
+        disable_mdi(lp);
+        spin_unlock_irq(&lp->lock);
+}
+
 /* ......................... ADDRESS MANAGEMENT ........................ */
 
 /*
@@ -454,17 +476,19 @@ static short __init unpack_mac_address(struct net_device *dev, unsigned int hi,
  */
 static void __init get_mac_address(struct net_device *dev)
 {
+        struct at91_private *lp = netdev_priv(dev);
+
         /* Check Specific-Address 1 */
-        if (unpack_mac_address(dev, at91_emac_read(AT91_EMAC_SA1H), at91_emac_read(AT91_EMAC_SA1L)))
+        if (unpack_mac_address(dev, at91_emac_read(lp, AT91_EMAC_SA1H), at91_emac_read(lp, AT91_EMAC_SA1L)))
                 return;
         /* Check Specific-Address 2 */
-        if (unpack_mac_address(dev, at91_emac_read(AT91_EMAC_SA2H), at91_emac_read(AT91_EMAC_SA2L)))
+        if (unpack_mac_address(dev, at91_emac_read(lp, AT91_EMAC_SA2H), at91_emac_read(lp, AT91_EMAC_SA2L)))
                 return;
         /* Check Specific-Address 3 */
-        if (unpack_mac_address(dev, at91_emac_read(AT91_EMAC_SA3H), at91_emac_read(AT91_EMAC_SA3L)))
+        if (unpack_mac_address(dev, at91_emac_read(lp, AT91_EMAC_SA3H), at91_emac_read(lp, AT91_EMAC_SA3L)))
                 return;
         /* Check Specific-Address 4 */
-        if (unpack_mac_address(dev, at91_emac_read(AT91_EMAC_SA4H), at91_emac_read(AT91_EMAC_SA4L)))
+        if (unpack_mac_address(dev, at91_emac_read(lp, AT91_EMAC_SA4H), at91_emac_read(lp, AT91_EMAC_SA4L)))
                 return;
 
         printk(KERN_ERR "at91_ether: Your bootloader did not configure a MAC address.\n");
@@ -475,11 +499,13 @@ static void __init get_mac_address(struct net_device *dev)
  */
 static void update_mac_address(struct net_device *dev)
 {
-        at91_emac_write(AT91_EMAC_SA1L, (dev->dev_addr[3] << 24) | (dev->dev_addr[2] << 16) | (dev->dev_addr[1] << 8) | (dev->dev_addr[0]));
-        at91_emac_write(AT91_EMAC_SA1H, (dev->dev_addr[5] << 8) | (dev->dev_addr[4]));
+        struct at91_private *lp = netdev_priv(dev);
 
-        at91_emac_write(AT91_EMAC_SA2L, 0);
-        at91_emac_write(AT91_EMAC_SA2H, 0);
+        at91_emac_write(lp, AT91_EMAC_SA1L, (dev->dev_addr[3] << 24) | (dev->dev_addr[2] << 16) | (dev->dev_addr[1] << 8) | (dev->dev_addr[0]));
+        at91_emac_write(lp, AT91_EMAC_SA1H, (dev->dev_addr[5] << 8) | (dev->dev_addr[4]));
+
+        at91_emac_write(lp, AT91_EMAC_SA2L, 0);
+        at91_emac_write(lp, AT91_EMAC_SA2H, 0);
 }
 
 /*
@@ -559,6 +585,7 @@ static int hash_get_index(__u8 *addr)
  */
 static void at91ether_sethashtable(struct net_device *dev)
 {
+        struct at91_private *lp = netdev_priv(dev);
         struct netdev_hw_addr *ha;
         unsigned long mc_filter[2];
         unsigned int bitnr;
@@ -570,8 +597,8 @@ static void at91ether_sethashtable(struct net_device *dev)
                 mc_filter[bitnr >> 5] |= 1 << (bitnr & 31);
         }
 
-        at91_emac_write(AT91_EMAC_HSL, mc_filter[0]);
-        at91_emac_write(AT91_EMAC_HSH, mc_filter[1]);
+        at91_emac_write(lp, AT91_EMAC_HSL, mc_filter[0]);
+        at91_emac_write(lp, AT91_EMAC_HSH, mc_filter[1]);
 }
 
 /*
@@ -579,9 +606,10 @@ static void at91ether_sethashtable(struct net_device *dev)
  */
 static void at91ether_set_multicast_list(struct net_device *dev)
 {
+        struct at91_private *lp = netdev_priv(dev);
         unsigned long cfg;
 
-        cfg = at91_emac_read(AT91_EMAC_CFG);
+        cfg = at91_emac_read(lp, AT91_EMAC_CFG);
 
         if (dev->flags & IFF_PROMISC)                   /* Enable promiscuous mode */
                 cfg |= AT91_EMAC_CAF;
@@ -589,34 +617,37 @@ static void at91ether_set_multicast_list(struct net_device *dev)
                 cfg &= ~AT91_EMAC_CAF;
 
         if (dev->flags & IFF_ALLMULTI) {                /* Enable all multicast mode */
-                at91_emac_write(AT91_EMAC_HSH, -1);
-                at91_emac_write(AT91_EMAC_HSL, -1);
+                at91_emac_write(lp, AT91_EMAC_HSH, -1);
+                at91_emac_write(lp, AT91_EMAC_HSL, -1);
                 cfg |= AT91_EMAC_MTI;
         } else if (!netdev_mc_empty(dev)) { /* Enable specific multicasts */
                 at91ether_sethashtable(dev);
                 cfg |= AT91_EMAC_MTI;
         } else if (dev->flags & (~IFF_ALLMULTI)) {      /* Disable all multicast mode */
-                at91_emac_write(AT91_EMAC_HSH, 0);
-                at91_emac_write(AT91_EMAC_HSL, 0);
+                at91_emac_write(lp, AT91_EMAC_HSH, 0);
+                at91_emac_write(lp, AT91_EMAC_HSL, 0);
                 cfg &= ~AT91_EMAC_MTI;
         }
 
-        at91_emac_write(AT91_EMAC_CFG, cfg);
+        at91_emac_write(lp, AT91_EMAC_CFG, cfg);
 }
 
 /* ......................... ETHTOOL SUPPORT ........................... */
 
 static int mdio_read(struct net_device *dev, int phy_id, int location)
 {
+        struct at91_private *lp = netdev_priv(dev);
         unsigned int value;
 
-        read_phy(phy_id, location, &value);
+        read_phy(lp, phy_id, location, &value);
         return value;
 }
 
 static void mdio_write(struct net_device *dev, int phy_id, int location, int value)
 {
-        write_phy(phy_id, location, value);
+        struct at91_private *lp = netdev_priv(dev);
+
+        write_phy(lp, phy_id, location, value);
 }
 
 static int at91ether_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
@@ -625,11 +656,11 @@ static int at91ether_get_settings(struct net_device *dev, struct ethtool_cmd *cm
         int ret;
 
         spin_lock_irq(&lp->lock);
-        enable_mdi();
+        enable_mdi(lp);
 
         ret = mii_ethtool_gset(&lp->mii, cmd);
 
-        disable_mdi();
+        disable_mdi(lp);
         spin_unlock_irq(&lp->lock);
 
         if (lp->phy_media == PORT_FIBRE) {              /* override media type since mii.c doesn't know */
@@ -646,11 +677,11 @@ static int at91ether_set_settings(struct net_device *dev, struct ethtool_cmd *cm
         int ret;
 
         spin_lock_irq(&lp->lock);
-        enable_mdi();
+        enable_mdi(lp);
 
         ret = mii_ethtool_sset(&lp->mii, cmd);
 
-        disable_mdi();
+        disable_mdi(lp);
         spin_unlock_irq(&lp->lock);
 
         return ret;
@@ -662,11 +693,11 @@ static int at91ether_nwayreset(struct net_device *dev)
         int ret;
 
         spin_lock_irq(&lp->lock);
-        enable_mdi();
+        enable_mdi(lp);
 
         ret = mii_nway_restart(&lp->mii);
 
-        disable_mdi();
+        disable_mdi(lp);
         spin_unlock_irq(&lp->lock);
 
         return ret;
@@ -696,9 +727,9 @@ static int at91ether_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                 return -EINVAL;
 
         spin_lock_irq(&lp->lock);
-        enable_mdi();
+        enable_mdi(lp);
         res = generic_mii_ioctl(&lp->mii, if_mii(rq), cmd, NULL);
-        disable_mdi();
+        disable_mdi(lp);
         spin_unlock_irq(&lp->lock);
 
         return res;
@@ -731,11 +762,11 @@ static void at91ether_start(struct net_device *dev)
         lp->rxBuffIndex = 0;
 
         /* Program address of descriptor list in Rx Buffer Queue register */
-        at91_emac_write(AT91_EMAC_RBQP, (unsigned long) dlist_phys);
+        at91_emac_write(lp, AT91_EMAC_RBQP, (unsigned long) dlist_phys);
 
         /* Enable Receive and Transmit */
-        ctl = at91_emac_read(AT91_EMAC_CTL);
-        at91_emac_write(AT91_EMAC_CTL, ctl | AT91_EMAC_RE | AT91_EMAC_TE);
+        ctl = at91_emac_read(lp, AT91_EMAC_CTL);
+        at91_emac_write(lp, AT91_EMAC_CTL, ctl | AT91_EMAC_RE | AT91_EMAC_TE);
 }
 
 /*
@@ -752,8 +783,8 @@ static int at91ether_open(struct net_device *dev)
         clk_enable(lp->ether_clk);              /* Re-enable Peripheral clock */
 
         /* Clear internal statistics */
-        ctl = at91_emac_read(AT91_EMAC_CTL);
-        at91_emac_write(AT91_EMAC_CTL, ctl | AT91_EMAC_CSR);
+        ctl = at91_emac_read(lp, AT91_EMAC_CTL);
+        at91_emac_write(lp, AT91_EMAC_CTL, ctl | AT91_EMAC_CSR);
 
         /* Update the MAC address (incase user has changed it) */
         update_mac_address(dev);
@@ -762,15 +793,15 @@ static int at91ether_open(struct net_device *dev)
         enable_phyirq(dev);
 
         /* Enable MAC interrupts */
-        at91_emac_write(AT91_EMAC_IER, AT91_EMAC_RCOM | AT91_EMAC_RBNA
+        at91_emac_write(lp, AT91_EMAC_IER, AT91_EMAC_RCOM | AT91_EMAC_RBNA
                                 | AT91_EMAC_TUND | AT91_EMAC_RTRY | AT91_EMAC_TCOM
                                 | AT91_EMAC_ROVR | AT91_EMAC_ABT);
 
         /* Determine current link speed */
         spin_lock_irq(&lp->lock);
-        enable_mdi();
+        enable_mdi(lp);
         update_linkspeed(dev, 0);
-        disable_mdi();
+        disable_mdi(lp);
         spin_unlock_irq(&lp->lock);
 
         at91ether_start(dev);
@@ -787,14 +818,14 @@ static int at91ether_close(struct net_device *dev)
         unsigned long ctl;
 
         /* Disable Receiver and Transmitter */
-        ctl = at91_emac_read(AT91_EMAC_CTL);
-        at91_emac_write(AT91_EMAC_CTL, ctl & ~(AT91_EMAC_TE | AT91_EMAC_RE));
+        ctl = at91_emac_read(lp, AT91_EMAC_CTL);
+        at91_emac_write(lp, AT91_EMAC_CTL, ctl & ~(AT91_EMAC_TE | AT91_EMAC_RE));
 
         /* Disable PHY interrupt */
         disable_phyirq(dev);
 
         /* Disable MAC interrupts */
-        at91_emac_write(AT91_EMAC_IDR, AT91_EMAC_RCOM | AT91_EMAC_RBNA
+        at91_emac_write(lp, AT91_EMAC_IDR, AT91_EMAC_RCOM | AT91_EMAC_RBNA
                                 | AT91_EMAC_TUND | AT91_EMAC_RTRY | AT91_EMAC_TCOM
                                 | AT91_EMAC_ROVR | AT91_EMAC_ABT);
 
@@ -812,7 +843,7 @@ static int at91ether_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct at91_private *lp = netdev_priv(dev);
 
-        if (at91_emac_read(AT91_EMAC_TSR) & AT91_EMAC_TSR_BNQ) {
+        if (at91_emac_read(lp, AT91_EMAC_TSR) & AT91_EMAC_TSR_BNQ) {
                 netif_stop_queue(dev);
 
                 /* Store packet information (to free when Tx completed) */
@@ -822,9 +853,9 @@ static int at91ether_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 dev->stats.tx_bytes += skb->len;
 
                 /* Set address of the data in the Transmit Address register */
-                at91_emac_write(AT91_EMAC_TAR, lp->skb_physaddr);
+                at91_emac_write(lp, AT91_EMAC_TAR, lp->skb_physaddr);
                 /* Set length of the packet in the Transmit Control register */
-                at91_emac_write(AT91_EMAC_TCR, skb->len);
+                at91_emac_write(lp, AT91_EMAC_TCR, skb->len);
 
         } else {
                 printk(KERN_ERR "at91_ether.c: at91ether_start_xmit() called, but device is busy!\n");
@@ -841,31 +872,32 @@ static int at91ether_start_xmit(struct sk_buff *skb, struct net_device *dev)
  */
 static struct net_device_stats *at91ether_stats(struct net_device *dev)
 {
+        struct at91_private *lp = netdev_priv(dev);
         int ale, lenerr, seqe, lcol, ecol;
 
         if (netif_running(dev)) {
-                dev->stats.rx_packets += at91_emac_read(AT91_EMAC_OK);          /* Good frames received */
-                ale = at91_emac_read(AT91_EMAC_ALE);
+                dev->stats.rx_packets += at91_emac_read(lp, AT91_EMAC_OK);      /* Good frames received */
+                ale = at91_emac_read(lp, AT91_EMAC_ALE);
                 dev->stats.rx_frame_errors += ale;                              /* Alignment errors */
-                lenerr = at91_emac_read(AT91_EMAC_ELR) + at91_emac_read(AT91_EMAC_USF);
+                lenerr = at91_emac_read(lp, AT91_EMAC_ELR) + at91_emac_read(lp, AT91_EMAC_USF);
                 dev->stats.rx_length_errors += lenerr;                          /* Excessive Length or Undersize Frame error */
-                seqe = at91_emac_read(AT91_EMAC_SEQE);
+                seqe = at91_emac_read(lp, AT91_EMAC_SEQE);
                 dev->stats.rx_crc_errors += seqe;                               /* CRC error */
-                dev->stats.rx_fifo_errors += at91_emac_read(AT91_EMAC_DRFC);    /* Receive buffer not available */
+                dev->stats.rx_fifo_errors += at91_emac_read(lp, AT91_EMAC_DRFC);/* Receive buffer not available */
                 dev->stats.rx_errors += (ale + lenerr + seqe
-                        + at91_emac_read(AT91_EMAC_CDE) + at91_emac_read(AT91_EMAC_RJB));
+                        + at91_emac_read(lp, AT91_EMAC_CDE) + at91_emac_read(lp, AT91_EMAC_RJB));
 
-                dev->stats.tx_packets += at91_emac_read(AT91_EMAC_FRA);         /* Frames successfully transmitted */
-                dev->stats.tx_fifo_errors += at91_emac_read(AT91_EMAC_TUE);     /* Transmit FIFO underruns */
-                dev->stats.tx_carrier_errors += at91_emac_read(AT91_EMAC_CSE);  /* Carrier Sense errors */
-                dev->stats.tx_heartbeat_errors += at91_emac_read(AT91_EMAC_SQEE);/* Heartbeat error */
+                dev->stats.tx_packets += at91_emac_read(lp, AT91_EMAC_FRA);     /* Frames successfully transmitted */
+                dev->stats.tx_fifo_errors += at91_emac_read(lp, AT91_EMAC_TUE); /* Transmit FIFO underruns */
+                dev->stats.tx_carrier_errors += at91_emac_read(lp, AT91_EMAC_CSE);      /* Carrier Sense errors */
+                dev->stats.tx_heartbeat_errors += at91_emac_read(lp, AT91_EMAC_SQEE);/* Heartbeat error */
 
-                lcol = at91_emac_read(AT91_EMAC_LCOL);
-                ecol = at91_emac_read(AT91_EMAC_ECOL);
+                lcol = at91_emac_read(lp, AT91_EMAC_LCOL);
+                ecol = at91_emac_read(lp, AT91_EMAC_ECOL);
                 dev->stats.tx_window_errors += lcol;                    /* Late collisions */
                 dev->stats.tx_aborted_errors += ecol;                   /* 16 collisions */
 
-                dev->stats.collisions += (at91_emac_read(AT91_EMAC_SCOL) + at91_emac_read(AT91_EMAC_MCOL) + lcol + ecol);
+                dev->stats.collisions += (at91_emac_read(lp, AT91_EMAC_SCOL) + at91_emac_read(lp, AT91_EMAC_MCOL) + lcol + ecol);
         }
         return &dev->stats;
 }
@@ -922,7 +954,7 @@ static irqreturn_t at91ether_interrupt(int irq, void *dev_id)
 
         /* MAC Interrupt Status register indicates what interrupts are pending.
            It is automatically cleared once read. */
-        intstatus = at91_emac_read(AT91_EMAC_ISR);
+        intstatus = at91_emac_read(lp, AT91_EMAC_ISR);
 
         if (intstatus & AT91_EMAC_RCOM)         /* Receive complete */
                 at91ether_rx(dev);
@@ -942,9 +974,9 @@ static irqreturn_t at91ether_interrupt(int irq, void *dev_id)
 
         /* Work-around for Errata #11 */
         if (intstatus & AT91_EMAC_RBNA) {
-                ctl = at91_emac_read(AT91_EMAC_CTL);
-                at91_emac_write(AT91_EMAC_CTL, ctl & ~AT91_EMAC_RE);
-                at91_emac_write(AT91_EMAC_CTL, ctl | AT91_EMAC_RE);
+                ctl = at91_emac_read(lp, AT91_EMAC_CTL);
+                at91_emac_write(lp, AT91_EMAC_CTL, ctl & ~AT91_EMAC_RE);
+                at91_emac_write(lp, AT91_EMAC_CTL, ctl | AT91_EMAC_RE);
         }
 
         if (intstatus & AT91_EMAC_ROVR)
@@ -980,189 +1012,199 @@ static const struct net_device_ops at91ether_netdev_ops = {
 };
 
 /*
- * Initialize the ethernet interface
+ * Detect the PHY type, and its address.
  */
-static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_address,
-                        struct platform_device *pdev, struct clk *ether_clk)
+static int __init at91ether_phy_detect(struct at91_private *lp)
+{
+        unsigned int phyid1, phyid2;
+        unsigned long phy_id;
+        unsigned short phy_address = 0;
+
+        while (phy_address < PHY_MAX_ADDR) {
+                /* Read the PHY ID registers */
+                enable_mdi(lp);
+                read_phy(lp, phy_address, MII_PHYSID1, &phyid1);
+                read_phy(lp, phy_address, MII_PHYSID2, &phyid2);
+                disable_mdi(lp);
+
+                phy_id = (phyid1 << 16) | (phyid2 & 0xfff0);
+                switch (phy_id) {
+                        case MII_DM9161_ID:             /* Davicom 9161: PHY_ID1 = 0x181, PHY_ID2 = B881 */
+                        case MII_DM9161A_ID:            /* Davicom 9161A: PHY_ID1 = 0x181, PHY_ID2 = B8A0 */
+                        case MII_LXT971A_ID:            /* Intel LXT971A: PHY_ID1 = 0x13, PHY_ID2 = 78E0 */
+                        case MII_RTL8201_ID:            /* Realtek RTL8201: PHY_ID1 = 0, PHY_ID2 = 0x8201 */
+                        case MII_BCM5221_ID:            /* Broadcom BCM5221: PHY_ID1 = 0x40, PHY_ID2 = 0x61e0 */
+                        case MII_DP83847_ID:            /* National Semiconductor DP83847:  */
+                        case MII_DP83848_ID:            /* National Semiconductor DP83848:  */
+                        case MII_AC101L_ID:             /* Altima AC101L: PHY_ID1 = 0x22, PHY_ID2 = 0x5520 */
+                        case MII_KS8721_ID:             /* Micrel KS8721: PHY_ID1 = 0x22, PHY_ID2 = 0x1610 */
+                        case MII_T78Q21x3_ID:           /* Teridian 78Q21x3: PHY_ID1 = 0x0E, PHY_ID2 = 7237 */
+                        case MII_LAN83C185_ID:          /* SMSC LAN83C185: PHY_ID1 = 0x0007, PHY_ID2 = 0xC0A1 */
+                                /* store detected values */
+                                lp->phy_type = phy_id;          /* Type of PHY connected */
+                                lp->phy_address = phy_address;  /* MDI address of PHY */
+                                return 1;
+                }
+
+                phy_address++;
+        }
+
+        return 0;               /* not detected */
+}
+
+
+/*
+ * Detect MAC & PHY and perform ethernet interface initialization
+ */
+static int __init at91ether_probe(struct platform_device *pdev)
 {
         struct macb_platform_data *board_data = pdev->dev.platform_data;
+        struct resource *regs;
         struct net_device *dev;
         struct at91_private *lp;
-        unsigned int val;
         int res;
 
+        regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!regs)
+                return -ENOENT;
+
         dev = alloc_etherdev(sizeof(struct at91_private));
         if (!dev)
                 return -ENOMEM;
 
-        dev->base_addr = AT91_VA_BASE_EMAC;
-        dev->irq = AT91RM9200_ID_EMAC;
+        lp = netdev_priv(dev);
+        lp->board_data = *board_data;
+        spin_lock_init(&lp->lock);
+
+        dev->base_addr = regs->start;           /* physical base address */
+        lp->emac_base = ioremap(regs->start, regs->end - regs->start + 1);
+        if (!lp->emac_base) {
+                res = -ENOMEM;
+                goto err_free_dev;
+        }
+
+        /* Clock */
+        lp->ether_clk = clk_get(&pdev->dev, "ether_clk");
+        if (IS_ERR(lp->ether_clk)) {
+                res = -ENODEV;
+                goto err_ioumap;
+        }
+        clk_enable(lp->ether_clk);
 
         /* Install the interrupt handler */
+        dev->irq = platform_get_irq(pdev, 0);
         if (request_irq(dev->irq, at91ether_interrupt, 0, dev->name, dev)) {
-                free_netdev(dev);
-                return -EBUSY;
+                res = -EBUSY;
+                goto err_disable_clock;
         }
 
         /* Allocate memory for DMA Receive descriptors */
-        lp = netdev_priv(dev);
         lp->dlist = (struct recv_desc_bufs *) dma_alloc_coherent(NULL, sizeof(struct recv_desc_bufs), (dma_addr_t *) &lp->dlist_phys, GFP_KERNEL);
         if (lp->dlist == NULL) {
-                free_irq(dev->irq, dev);
-                free_netdev(dev);
-                return -ENOMEM;
+                res = -ENOMEM;
+                goto err_free_irq;
         }
-        lp->board_data = *board_data;
-        lp->ether_clk = ether_clk;
-        platform_set_drvdata(pdev, dev);
-
-        spin_lock_init(&lp->lock);
 
         ether_setup(dev);
         dev->netdev_ops = &at91ether_netdev_ops;
         dev->ethtool_ops = &at91ether_ethtool_ops;
-
+        platform_set_drvdata(pdev, dev);
         SET_NETDEV_DEV(dev, &pdev->dev);
 
         get_mac_address(dev);           /* Get ethernet address and store it in dev->dev_addr */
         update_mac_address(dev);        /* Program ethernet address into MAC */
 
-        at91_emac_write(AT91_EMAC_CTL, 0);
+        at91_emac_write(lp, AT91_EMAC_CTL, 0);
 
-        if (lp->board_data.is_rmii)
-                at91_emac_write(AT91_EMAC_CFG, AT91_EMAC_CLK_DIV32 | AT91_EMAC_BIG | AT91_EMAC_RMII);
+        if (board_data->is_rmii)
+                at91_emac_write(lp, AT91_EMAC_CFG, AT91_EMAC_CLK_DIV32 | AT91_EMAC_BIG | AT91_EMAC_RMII);
         else
-                at91_emac_write(AT91_EMAC_CFG, AT91_EMAC_CLK_DIV32 | AT91_EMAC_BIG);
+                at91_emac_write(lp, AT91_EMAC_CFG, AT91_EMAC_CLK_DIV32 | AT91_EMAC_BIG);
 
-        /* Perform PHY-specific initialization */
-        spin_lock_irq(&lp->lock);
-        enable_mdi();
-        if ((phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID)) {
-                read_phy(phy_address, MII_DSCR_REG, &val);
-                if ((val & (1 << 10)) == 0)                     /* DSCR bit 10 is 0 -- fiber mode */
-                        lp->phy_media = PORT_FIBRE;
-        } else if (machine_is_csb337()) {
-                /* mix link activity status into LED2 link state */
-                write_phy(phy_address, MII_LEDCTRL_REG, 0x0d22);
-        } else if (machine_is_ecbat91())
-                write_phy(phy_address, MII_LEDCTRL_REG, 0x156A);
+        /* Detect PHY */
+        if (!at91ether_phy_detect(lp)) {
+                printk(KERN_ERR "at91_ether: Could not detect ethernet PHY\n");
+                res = -ENODEV;
+                goto err_free_dmamem;
+        }
 
-        disable_mdi();
-        spin_unlock_irq(&lp->lock);
+        initialize_phy(lp);
 
         lp->mii.dev = dev;              /* Support for ethtool */
         lp->mii.mdio_read = mdio_read;
         lp->mii.mdio_write = mdio_write;
-        lp->mii.phy_id = phy_address;
+        lp->mii.phy_id = lp->phy_address;
         lp->mii.phy_id_mask = 0x1f;
         lp->mii.reg_num_mask = 0x1f;
 
-        lp->phy_type = phy_type;        /* Type of PHY connected */
-        lp->phy_address = phy_address;  /* MDI address of PHY */
-
         /* Register the network interface */
         res = register_netdev(dev);
-        if (res) {
-                free_irq(dev->irq, dev);
-                free_netdev(dev);
-                dma_free_coherent(NULL, sizeof(struct recv_desc_bufs), lp->dlist, (dma_addr_t)lp->dlist_phys);
-                return res;
-        }
+        if (res)
+                goto err_free_dmamem;
 
         /* Determine current link speed */
         spin_lock_irq(&lp->lock);
-        enable_mdi();
+        enable_mdi(lp);
         update_linkspeed(dev, 0);
-        disable_mdi();
+        disable_mdi(lp);
         spin_unlock_irq(&lp->lock);
         netif_carrier_off(dev);         /* will be enabled in open() */
 
         /* If board has no PHY IRQ, use a timer to poll the PHY */
-        if (!gpio_is_valid(lp->board_data.phy_irq_pin)) {
+        if (gpio_is_valid(lp->board_data.phy_irq_pin)) {
+                gpio_request(board_data->phy_irq_pin, "ethernet_phy");
+        } else {
+                /* If board has no PHY IRQ, use a timer to poll the PHY */
                 init_timer(&lp->check_timer);
                 lp->check_timer.data = (unsigned long)dev;
                 lp->check_timer.function = at91ether_check_link;
-        } else if (lp->board_data.phy_irq_pin >= 32)
-                gpio_request(lp->board_data.phy_irq_pin, "ethernet_phy");
+        }
 
         /* Display ethernet banner */
         printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%pM)\n",
                dev->name, (uint) dev->base_addr, dev->irq,
-               at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_SPD ? "100-" : "10-",
-               at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_FD ? "FullDuplex" : "HalfDuplex",
+               at91_emac_read(lp, AT91_EMAC_CFG) & AT91_EMAC_SPD ? "100-" : "10-",
+               at91_emac_read(lp, AT91_EMAC_CFG) & AT91_EMAC_FD ? "FullDuplex" : "HalfDuplex",
                dev->dev_addr);
-        if ((phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID))
+        if ((lp->phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID))
                 printk(KERN_INFO "%s: Davicom 9161 PHY %s\n", dev->name, (lp->phy_media == PORT_FIBRE) ? "(Fiber)" : "(Copper)");
-        else if (phy_type == MII_LXT971A_ID)
+        else if (lp->phy_type == MII_LXT971A_ID)
                 printk(KERN_INFO "%s: Intel LXT971A PHY\n", dev->name);
-        else if (phy_type == MII_RTL8201_ID)
+        else if (lp->phy_type == MII_RTL8201_ID)
                 printk(KERN_INFO "%s: Realtek RTL8201(B)L PHY\n", dev->name);
-        else if (phy_type == MII_BCM5221_ID)
+        else if (lp->phy_type == MII_BCM5221_ID)
                 printk(KERN_INFO "%s: Broadcom BCM5221 PHY\n", dev->name);
-        else if (phy_type == MII_DP83847_ID)
+        else if (lp->phy_type == MII_DP83847_ID)
                 printk(KERN_INFO "%s: National Semiconductor DP83847 PHY\n", dev->name);
-        else if (phy_type == MII_DP83848_ID)
+        else if (lp->phy_type == MII_DP83848_ID)
                 printk(KERN_INFO "%s: National Semiconductor DP83848 PHY\n", dev->name);
-        else if (phy_type == MII_AC101L_ID)
+        else if (lp->phy_type == MII_AC101L_ID)
                 printk(KERN_INFO "%s: Altima AC101L PHY\n", dev->name);
-        else if (phy_type == MII_KS8721_ID)
+        else if (lp->phy_type == MII_KS8721_ID)
                 printk(KERN_INFO "%s: Micrel KS8721 PHY\n", dev->name);
-        else if (phy_type == MII_T78Q21x3_ID)
+        else if (lp->phy_type == MII_T78Q21x3_ID)
                 printk(KERN_INFO "%s: Teridian 78Q21x3 PHY\n", dev->name);
-        else if (phy_type == MII_LAN83C185_ID)
+        else if (lp->phy_type == MII_LAN83C185_ID)
                 printk(KERN_INFO "%s: SMSC LAN83C185 PHY\n", dev->name);
 
-        return 0;
-}
-
-/*
- * Detect MAC and PHY and perform initialization
- */
-static int __init at91ether_probe(struct platform_device *pdev)
-{
-        unsigned int phyid1, phyid2;
-        int detected = -1;
-        unsigned long phy_id;
-        unsigned short phy_address = 0;
-        struct clk *ether_clk;
-
-        ether_clk = clk_get(&pdev->dev, "ether_clk");
-        if (IS_ERR(ether_clk)) {
-                printk(KERN_ERR "at91_ether: no clock defined\n");
-                return -ENODEV;
-        }
-        clk_enable(ether_clk);                                  /* Enable Peripheral clock */
-
-        while ((detected != 0) && (phy_address < 32)) {
-                /* Read the PHY ID registers */
-                enable_mdi();
-                read_phy(phy_address, MII_PHYSID1, &phyid1);
-                read_phy(phy_address, MII_PHYSID2, &phyid2);
-                disable_mdi();
-
-                phy_id = (phyid1 << 16) | (phyid2 & 0xfff0);
-                switch (phy_id) {
-                        case MII_DM9161_ID:             /* Davicom 9161: PHY_ID1 = 0x181, PHY_ID2 = B881 */
-                        case MII_DM9161A_ID:            /* Davicom 9161A: PHY_ID1 = 0x181, PHY_ID2 = B8A0 */
-                        case MII_LXT971A_ID:            /* Intel LXT971A: PHY_ID1 = 0x13, PHY_ID2 = 78E0 */
-                        case MII_RTL8201_ID:            /* Realtek RTL8201: PHY_ID1 = 0, PHY_ID2 = 0x8201 */
-                        case MII_BCM5221_ID:            /* Broadcom BCM5221: PHY_ID1 = 0x40, PHY_ID2 = 0x61e0 */
-                        case MII_DP83847_ID:            /* National Semiconductor DP83847:  */
-                        case MII_DP83848_ID:            /* National Semiconductor DP83848:  */
-                        case MII_AC101L_ID:             /* Altima AC101L: PHY_ID1 = 0x22, PHY_ID2 = 0x5520 */
-                        case MII_KS8721_ID:             /* Micrel KS8721: PHY_ID1 = 0x22, PHY_ID2 = 0x1610 */
-                        case MII_T78Q21x3_ID:           /* Teridian 78Q21x3: PHY_ID1 = 0x0E, PHY_ID2 = 7237 */
-                        case MII_LAN83C185_ID:          /* SMSC LAN83C185: PHY_ID1 = 0x0007, PHY_ID2 = 0xC0A1 */
-                                detected = at91ether_setup(phy_id, phy_address, pdev, ether_clk);
-                                break;
-                }
+        clk_disable(lp->ether_clk);                                     /* Disable Peripheral clock */
 
-                phy_address++;
-        }
+        return 0;
 
-        clk_disable(ether_clk);                                 /* Disable Peripheral clock */
 
-        return detected;
+err_free_dmamem:
+        platform_set_drvdata(pdev, NULL);
+        dma_free_coherent(NULL, sizeof(struct recv_desc_bufs), lp->dlist, (dma_addr_t)lp->dlist_phys);
+err_free_irq:
+        free_irq(dev->irq, dev);
+err_disable_clock:
+        clk_disable(lp->ether_clk);
+        clk_put(lp->ether_clk);
+err_ioumap:
+        iounmap(lp->emac_base);
+err_free_dev:
+        free_netdev(dev);
+        return res;
 }
 
 static int __devexit at91ether_remove(struct platform_device *pdev)
@@ -1170,8 +1212,7 @@ static int __devexit at91ether_remove(struct platform_device *pdev)
         struct net_device *dev = platform_get_drvdata(pdev);
         struct at91_private *lp = netdev_priv(dev);
 
-        if (gpio_is_valid(lp->board_data.phy_irq_pin) &&
-            lp->board_data.phy_irq_pin >= 32)
+        if (gpio_is_valid(lp->board_data.phy_irq_pin))
                 gpio_free(lp->board_data.phy_irq_pin);
 
         unregister_netdev(dev);
@@ -1193,7 +1234,7 @@ static int at91ether_suspend(struct platform_device *pdev, pm_message_t mesg)
 
         if (netif_running(net_dev)) {
                 if (gpio_is_valid(lp->board_data.phy_irq_pin)) {
-                        int phy_irq = lp->board_data.phy_irq_pin;
+                        int phy_irq = gpio_to_irq(lp->board_data.phy_irq_pin);
                         disable_irq(phy_irq);
                 }
 
@@ -1217,7 +1258,7 @@ static int at91ether_resume(struct platform_device *pdev)
                 netif_start_queue(net_dev);
 
                 if (gpio_is_valid(lp->board_data.phy_irq_pin)) {
-                        int phy_irq = lp->board_data.phy_irq_pin;
+                        int phy_irq = gpio_to_irq(lp->board_data.phy_irq_pin);
                         enable_irq(phy_irq);
                 }
         }
diff --git a/drivers/net/ethernet/cadence/at91_ether.h b/drivers/net/ethernet/cadence/at91_ether.h
index 3725fbb0defe..0ef6328fa7f8 100644
--- a/drivers/net/ethernet/cadence/at91_ether.h
+++ b/drivers/net/ethernet/cadence/at91_ether.h
@@ -88,6 +88,7 @@ struct at91_private
         struct macb_platform_data board_data;   /* board-specific
                                                  * configuration (shared with
                                                  * macb for common data */
+        void __iomem *emac_base;                /* base register address */
         struct clk *ether_clk;                  /* clock */
 
         /* PHY */
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index c4834c23be35..1466bc4e3dda 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -1213,6 +1213,7 @@ static const struct ethtool_ops macb_ethtool_ops = {
         .set_settings           = macb_set_settings,
         .get_drvinfo            = macb_get_drvinfo,
         .get_link               = ethtool_op_get_link,
+        .get_ts_info            = ethtool_op_get_ts_info,
 };
 
 static int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
index 63bfdd10bd6d..abb6ce7c1b7e 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
@@ -1150,6 +1150,48 @@ release_tpsram:
 }
 
 /**
+ * t3_synchronize_rx - wait for current Rx processing on a port to complete
+ * @adap: the adapter
+ * @p: the port
+ *
+ * Ensures that current Rx processing on any of the queues associated with
+ * the given port completes before returning.  We do this by acquiring and
+ * releasing the locks of the response queues associated with the port.
+ */
+static void t3_synchronize_rx(struct adapter *adap, const struct port_info *p)
+{
+        int i;
+
+        for (i = p->first_qset; i < p->first_qset + p->nqsets; i++) {
+                struct sge_rspq *q = &adap->sge.qs[i].rspq;
+
+                spin_lock_irq(&q->lock);
+                spin_unlock_irq(&q->lock);
+        }
+}
+
+static void cxgb_vlan_mode(struct net_device *dev, netdev_features_t features)
+{
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+
+        if (adapter->params.rev > 0) {
+                t3_set_vlan_accel(adapter, 1 << pi->port_id,
+                                  features & NETIF_F_HW_VLAN_RX);
+        } else {
+                /* single control for all ports */
+                unsigned int i, have_vlans = features & NETIF_F_HW_VLAN_RX;
+
+                for_each_port(adapter, i)
+                        have_vlans |=
+                                adapter->port[i]->features & NETIF_F_HW_VLAN_RX;
+
+                t3_set_vlan_accel(adapter, 1, have_vlans);
+        }
+        t3_synchronize_rx(adapter, pi);
+}
+
+/**
  *      cxgb_up - enable the adapter
  *      @adapter: adapter being enabled
  *
@@ -1161,7 +1203,7 @@ release_tpsram:
  */
 static int cxgb_up(struct adapter *adap)
 {
-        int err;
+        int i, err;
 
         if (!(adap->flags & FULL_INIT_DONE)) {
                 err = t3_check_fw_version(adap);
@@ -1198,6 +1240,9 @@ static int cxgb_up(struct adapter *adap)
                 if (err)
                         goto out;
 
+                for_each_port(adap, i)
+                        cxgb_vlan_mode(adap->port[i], adap->port[i]->features);
+
                 setup_rss(adap);
                 if (!(adap->flags & NAPI_INIT))
                         init_napi(adap);
@@ -2508,48 +2553,6 @@ static int cxgb_set_mac_addr(struct net_device *dev, void *p)
         return 0;
 }
 
-/**
- * t3_synchronize_rx - wait for current Rx processing on a port to complete
- * @adap: the adapter
- * @p: the port
- *
- * Ensures that current Rx processing on any of the queues associated with
- * the given port completes before returning.  We do this by acquiring and
- * releasing the locks of the response queues associated with the port.
- */
-static void t3_synchronize_rx(struct adapter *adap, const struct port_info *p)
-{
-        int i;
-
-        for (i = p->first_qset; i < p->first_qset + p->nqsets; i++) {
-                struct sge_rspq *q = &adap->sge.qs[i].rspq;
-
-                spin_lock_irq(&q->lock);
-                spin_unlock_irq(&q->lock);
-        }
-}
-
-static void cxgb_vlan_mode(struct net_device *dev, netdev_features_t features)
-{
-        struct port_info *pi = netdev_priv(dev);
-        struct adapter *adapter = pi->adapter;
-
-        if (adapter->params.rev > 0) {
-                t3_set_vlan_accel(adapter, 1 << pi->port_id,
-                                  features & NETIF_F_HW_VLAN_RX);
-        } else {
-                /* single control for all ports */
-                unsigned int i, have_vlans = features & NETIF_F_HW_VLAN_RX;
-
-                for_each_port(adapter, i)
-                        have_vlans |=
-                                adapter->port[i]->features & NETIF_F_HW_VLAN_RX;
-
-                t3_set_vlan_accel(adapter, 1, have_vlans);
-        }
-        t3_synchronize_rx(adapter, pi);
-}
-
 static netdev_features_t cxgb_fix_features(struct net_device *dev,
         netdev_features_t features)
 {
@@ -3353,9 +3356,6 @@ static int __devinit init_one(struct pci_dev *pdev,
         err = sysfs_create_group(&adapter->port[0]->dev.kobj,
                                  &cxgb3_attr_group);
 
-        for_each_port(adapter, i)
-                cxgb_vlan_mode(adapter->port[i], adapter->port[i]->features);
-
         print_port_info(adapter, ai);
         return 0;
 
diff --git a/drivers/net/ethernet/cirrus/cs89x0.c b/drivers/net/ethernet/cirrus/cs89x0.c
index b9406cbfc180..845b2020f291 100644
--- a/drivers/net/ethernet/cirrus/cs89x0.c
+++ b/drivers/net/ethernet/cirrus/cs89x0.c
@@ -1,105 +1,27 @@
 /* cs89x0.c: A Crystal Semiconductor (Now Cirrus Logic) CS89[02]0
- *  driver for linux.
+ *           driver for linux.
+ * Written 1996 by Russell Nelson, with reference to skeleton.c
+ * written 1993-1994 by Donald Becker.
+ *
+ * This software may be used and distributed according to the terms
+ * of the GNU General Public License, incorporated herein by reference.
+ *
+ * The author may be reached at nelson@crynwr.com, Crynwr
+ * Software, 521 Pleasant Valley Rd., Potsdam, NY 13676
+ *
+ * Other contributors:
+ * Mike Cruse        : mcruse@cti-ltd.com
+ * Russ Nelson
+ * Melody Lee        : ethernet@crystal.cirrus.com
+ * Alan Cox
+ * Andrew Morton
+ * Oskar Schirmer    : oskar@scara.com
+ * Deepak Saxena     : dsaxena@plexity.net
+ * Dmitry Pervushin  : dpervushin@ru.mvista.com
+ * Deepak Saxena     : dsaxena@plexity.net
+ * Domenico Andreoli : cavokz@gmail.com
  */
 
-/*
-        Written 1996 by Russell Nelson, with reference to skeleton.c
-        written 1993-1994 by Donald Becker.
-
-        This software may be used and distributed according to the terms
-        of the GNU General Public License, incorporated herein by reference.
-
-        The author may be reached at nelson@crynwr.com, Crynwr
-        Software, 521 Pleasant Valley Rd., Potsdam, NY 13676
-
-  Changelog:
-
-  Mike Cruse        : mcruse@cti-ltd.com
-                    : Changes for Linux 2.0 compatibility.
-                    : Added dev_id parameter in net_interrupt(),
-                    : request_irq() and free_irq(). Just NULL for now.
-
-  Mike Cruse        : Added MOD_INC_USE_COUNT and MOD_DEC_USE_COUNT macros
-                    : in net_open() and net_close() so kerneld would know
-                    : that the module is in use and wouldn't eject the
-                    : driver prematurely.
-
-  Mike Cruse        : Rewrote init_module() and cleanup_module using 8390.c
-                    : as an example. Disabled autoprobing in init_module(),
-                    : not a good thing to do to other devices while Linux
-                    : is running from all accounts.
-
-  Russ Nelson       : Jul 13 1998.  Added RxOnly DMA support.
-
-  Melody Lee        : Aug 10 1999.  Changes for Linux 2.2.5 compatibility.
-                    : email: ethernet@crystal.cirrus.com
-
-  Alan Cox          : Removed 1.2 support, added 2.1 extra counters.
-
-  Andrew Morton     : Kernel 2.3.48
-                    : Handle kmalloc() failures
-                    : Other resource allocation fixes
-                    : Add SMP locks
-                    : Integrate Russ Nelson's ALLOW_DMA functionality back in.
-                    : If ALLOW_DMA is true, make DMA runtime selectable
-                    : Folded in changes from Cirrus (Melody Lee
-                    : <klee@crystal.cirrus.com>)
-                    : Don't call netif_wake_queue() in net_send_packet()
-                    : Fixed an out-of-mem bug in dma_rx()
-                    : Updated Documentation/networking/cs89x0.txt
-
-  Andrew Morton     : Kernel 2.3.99-pre1
-                    : Use skb_reserve to longword align IP header (two places)
-                    : Remove a delay loop from dma_rx()
-                    : Replace '100' with HZ
-                    : Clean up a couple of skb API abuses
-                    : Added 'cs89x0_dma=N' kernel boot option
-                    : Correctly initialise lp->lock in non-module compile
-
-  Andrew Morton     : Kernel 2.3.99-pre4-1
-                    : MOD_INC/DEC race fix (see
-                    : http://www.uwsg.indiana.edu/hypermail/linux/kernel/0003.3/1532.html)
-
-  Andrew Morton     : Kernel 2.4.0-test7-pre2
-                    : Enhanced EEPROM support to cover more devices,
-                    :   abstracted IRQ mapping to support CONFIG_ARCH_CLPS7500 arch
-                    :   (Jason Gunthorpe <jgg@ualberta.ca>)
-
-  Andrew Morton     : Kernel 2.4.0-test11-pre4
-                    : Use dev->name in request_*() (Andrey Panin)
-                    : Fix an error-path memleak in init_module()
-                    : Preserve return value from request_irq()
-                    : Fix type of `media' module parm (Keith Owens)
-                    : Use SET_MODULE_OWNER()
-                    : Tidied up strange request_irq() abuse in net_open().
-
-  Andrew Morton     : Kernel 2.4.3-pre1
-                    : Request correct number of pages for DMA (Hugh Dickens)
-                    : Select PP_ChipID _after_ unregister_netdev in cleanup_module()
-                    :  because unregister_netdev() calls get_stats.
-                    : Make `version[]' __initdata
-                    : Uninlined the read/write reg/word functions.
-
-  Oskar Schirmer    : oskar@scara.com
-                    : HiCO.SH4 (superh) support added (irq#1, cs89x0_media=)
-
-  Deepak Saxena     : dsaxena@plexity.net
-                    : Intel IXDP2x01 (XScale ixp2x00 NPU) platform support
-
-  Dmitry Pervushin  : dpervushin@ru.mvista.com
-                    : PNX010X platform support
-
-  Deepak Saxena     : dsaxena@plexity.net
-                    : Intel IXDP2351 platform support
-
-  Dmitry Pervushin  : dpervushin@ru.mvista.com
-                    : PNX010X platform support
-
-  Domenico Andreoli : cavokz@gmail.com
-                    : QQ2440 platform support
-
-*/
-
 
 /*
  * Set this to zero to disable DMA code
@@ -119,14 +41,12 @@
  */
 #define DEBUGGING       1
 
-/*
-  Sources:
-
-        Crynwr packet driver epktisa.
-
-        Crystal Semiconductor data sheets.
+/* Sources:
+ *      Crynwr packet driver epktisa.
+ *      Crystal Semiconductor data sheets.
+ */
 
-*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/module.h>
 #include <linux/printk.h>
@@ -147,8 +67,8 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/gfp.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/irq.h>
 #include <linux/atomic.h>
 #if ALLOW_DMA
@@ -157,35 +77,55 @@
 
 #include "cs89x0.h"
 
+#define cs89_dbg(val, level, fmt, ...)                          \
+do {                                                            \
+        if (val <= net_debug)                                   \
+                pr_##level(fmt, ##__VA_ARGS__);                 \
+} while (0)
+
 static char version[] __initdata =
-"cs89x0.c: v2.4.3-pre1 Russell Nelson <nelson@crynwr.com>, Andrew Morton\n";
+        "v2.4.3-pre1 Russell Nelson <nelson@crynwr.com>, Andrew Morton";
 
 #define DRV_NAME "cs89x0"
 
 /* First, a few definitions that the brave might change.
-   A zero-terminated list of I/O addresses to be probed. Some special flags..
-      Addr & 1 = Read back the address port, look for signature and reset
-                 the page window before probing
-      Addr & 3 = Reset the page window and probe
-   The CLPS eval board has the Cirrus chip at 0x80090300, in ARM IO space,
-   but it is possible that a Cirrus board could be plugged into the ISA
-   slots. */
+ * A zero-terminated list of I/O addresses to be probed. Some special flags..
+ * Addr & 1 = Read back the address port, look for signature and reset
+ * the page window before probing
+ * Addr & 3 = Reset the page window and probe
+ * The CLPS eval board has the Cirrus chip at 0x80090300, in ARM IO space,
+ * but it is possible that a Cirrus board could be plugged into the ISA
+ * slots.
+ */
 /* The cs8900 has 4 IRQ pins, software selectable. cs8900_irq_map maps
-   them to system IRQ numbers. This mapping is card specific and is set to
-   the configuration of the Cirrus Eval board for this chip. */
+ * them to system IRQ numbers. This mapping is card specific and is set to
+ * the configuration of the Cirrus Eval board for this chip.
+ */
 #if defined(CONFIG_MACH_IXDP2351)
 #define CS89x0_NONISA_IRQ
-static unsigned int netcard_portlist[] __used __initdata = {IXDP2351_VIRT_CS8900_BASE, 0};
-static unsigned int cs8900_irq_map[] = {IRQ_IXDP2351_CS8900, 0, 0, 0};
+static unsigned int netcard_portlist[] __used __initdata = {
+        IXDP2351_VIRT_CS8900_BASE, 0
+};
+static unsigned int cs8900_irq_map[] = {
+        IRQ_IXDP2351_CS8900, 0, 0, 0
+};
 #elif defined(CONFIG_ARCH_IXDP2X01)
 #define CS89x0_NONISA_IRQ
-static unsigned int netcard_portlist[] __used __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0};
-static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0};
+static unsigned int netcard_portlist[] __used __initdata = {
+        IXDP2X01_CS8900_VIRT_BASE, 0
+};
+static unsigned int cs8900_irq_map[] = {
+        IRQ_IXDP2X01_CS8900, 0, 0, 0
+};
 #else
 #ifndef CONFIG_CS89x0_PLATFORM
-static unsigned int netcard_portlist[] __used __initdata =
-   { 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0};
-static unsigned int cs8900_irq_map[] = {10,11,12,5};
+static unsigned int netcard_portlist[] __used __initdata = {
+        0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240,
+        0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0
+};
+static unsigned int cs8900_irq_map[] = {
+        10, 11, 12, 5
+};
 #endif
 #endif
 
@@ -222,6 +162,8 @@ struct net_local {
         int send_underrun;      /* keep track of how many underruns in a row we get */
         int force;              /* force various values; see FORCE* above. */
         spinlock_t lock;
+        void __iomem *virt_addr;/* CS89x0 virtual address. */
+        unsigned long size;     /* Length of CS89x0 memory region. */
 #if ALLOW_DMA
         int use_dma;            /* Flag: we're using dma */
         int dma;                /* DMA channel */
@@ -230,119 +172,42 @@ struct net_local {
         unsigned char *end_dma_buff;    /* points to the end of the buffer */
         unsigned char *rx_dma_ptr;      /* points to the next packet  */
 #endif
-#ifdef CONFIG_CS89x0_PLATFORM
-        void __iomem *virt_addr;/* Virtual address for accessing the CS89x0. */
-        unsigned long phys_addr;/* Physical address for accessing the CS89x0. */
-        unsigned long size;     /* Length of CS89x0 memory region. */
-#endif
 };
 
-/* Index to functions, as function prototypes. */
-
-static int cs89x0_probe1(struct net_device *dev, unsigned long ioaddr, int modular);
-static int net_open(struct net_device *dev);
-static netdev_tx_t net_send_packet(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t net_interrupt(int irq, void *dev_id);
-static void set_multicast_list(struct net_device *dev);
-static void net_timeout(struct net_device *dev);
-static void net_rx(struct net_device *dev);
-static int net_close(struct net_device *dev);
-static struct net_device_stats *net_get_stats(struct net_device *dev);
-static void reset_chip(struct net_device *dev);
-static int get_eeprom_data(struct net_device *dev, int off, int len, int *buffer);
-static int get_eeprom_cksum(int off, int len, int *buffer);
-static int set_mac_address(struct net_device *dev, void *addr);
-static void count_rx_errors(int status, struct net_device *dev);
-#ifdef CONFIG_NET_POLL_CONTROLLER
-static void net_poll_controller(struct net_device *dev);
-#endif
-#if ALLOW_DMA
-static void get_dma_channel(struct net_device *dev);
-static void release_dma_buff(struct net_local *lp);
-#endif
-
 /* Example routines you must write ;->. */
 #define tx_done(dev) 1
 
 /*
  * Permit 'cs89x0_dma=N' in the kernel boot environment
  */
-#if !defined(MODULE) && (ALLOW_DMA != 0)
+#if !defined(MODULE)
+#if ALLOW_DMA
 static int g_cs89x0_dma;
 
 static int __init dma_fn(char *str)
 {
-        g_cs89x0_dma = simple_strtol(str,NULL,0);
+        g_cs89x0_dma = simple_strtol(str, NULL, 0);
         return 1;
 }
 
 __setup("cs89x0_dma=", dma_fn);
-#endif  /* !defined(MODULE) && (ALLOW_DMA != 0) */
+#endif  /* ALLOW_DMA */
 
-#ifndef MODULE
 static int g_cs89x0_media__force;
 
 static int __init media_fn(char *str)
 {
-        if (!strcmp(str, "rj45")) g_cs89x0_media__force = FORCE_RJ45;
-        else if (!strcmp(str, "aui")) g_cs89x0_media__force = FORCE_AUI;
-        else if (!strcmp(str, "bnc")) g_cs89x0_media__force = FORCE_BNC;
+        if (!strcmp(str, "rj45"))
+                g_cs89x0_media__force = FORCE_RJ45;
+        else if (!strcmp(str, "aui"))
+                g_cs89x0_media__force = FORCE_AUI;
+        else if (!strcmp(str, "bnc"))
+                g_cs89x0_media__force = FORCE_BNC;
+
         return 1;
 }
 
 __setup("cs89x0_media=", media_fn);
-
-
-#ifndef CONFIG_CS89x0_PLATFORM
-/* Check for a network adaptor of this type, and return '0' iff one exists.
-   If dev->base_addr == 0, probe all likely locations.
-   If dev->base_addr == 1, always return failure.
-   If dev->base_addr == 2, allocate space for the device and return success
-   (detachable devices only).
-   Return 0 on success.
-   */
-
-struct net_device * __init cs89x0_probe(int unit)
-{
-        struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
-        unsigned *port;
-        int err = 0;
-        int irq;
-        int io;
-
-        if (!dev)
-                return ERR_PTR(-ENODEV);
-
-        sprintf(dev->name, "eth%d", unit);
-        netdev_boot_setup_check(dev);
-        io = dev->base_addr;
-        irq = dev->irq;
-
-        if (net_debug)
-                printk("cs89x0:cs89x0_probe(0x%x)\n", io);
-
-        if (io > 0x1ff) {       /* Check a single specified location. */
-                err = cs89x0_probe1(dev, io, 0);
-        } else if (io != 0) {   /* Don't probe at all. */
-                err = -ENXIO;
-        } else {
-                for (port = netcard_portlist; *port; port++) {
-                        if (cs89x0_probe1(dev, *port, 0) == 0)
-                                break;
-                        dev->irq = irq;
-                }
-                if (!*port)
-                        err = -ENODEV;
-        }
-        if (err)
-                goto out;
-        return dev;
-out:
-        free_netdev(dev);
-        printk(KERN_WARNING "cs89x0: no cs8900 or cs8920 detected.  Be sure to disable PnP with SETUP\n");
-        return ERR_PTR(err);
-}
-#endif
 #endif
 
 #if defined(CONFIG_MACH_IXDP2351)
@@ -369,36 +234,22 @@ writeword(unsigned long base_addr, int portno, u16 value)
 {
         __raw_writel(value, base_addr + (portno << 1));
 }
-#else
-static u16
-readword(unsigned long base_addr, int portno)
-{
-        return inw(base_addr + portno);
-}
-
-static void
-writeword(unsigned long base_addr, int portno, u16 value)
-{
-        outw(value, base_addr + portno);
-}
 #endif
 
-static void
-readwords(unsigned long base_addr, int portno, void *buf, int length)
+static void readwords(struct net_local *lp, int portno, void *buf, int length)
 {
         u8 *buf8 = (u8 *)buf;
 
         do {
                 u16 tmp16;
 
-                tmp16 = readword(base_addr, portno);
+                tmp16 = ioread16(lp->virt_addr + portno);
                 *buf8++ = (u8)tmp16;
                 *buf8++ = (u8)(tmp16 >> 8);
         } while (--length);
 }
 
-static void
-writewords(unsigned long base_addr, int portno, void *buf, int length)
+static void writewords(struct net_local *lp, int portno, void *buf, int length)
 {
         u8 *buf8 = (u8 *)buf;
 
@@ -407,32 +258,37 @@ writewords(unsigned long base_addr, int portno, void *buf, int length)
 
                 tmp16 = *buf8++;
                 tmp16 |= (*buf8++) << 8;
-                writeword(base_addr, portno, tmp16);
+                iowrite16(tmp16, lp->virt_addr + portno);
         } while (--length);
 }
 
 static u16
 readreg(struct net_device *dev, u16 regno)
 {
-        writeword(dev->base_addr, ADD_PORT, regno);
-        return readword(dev->base_addr, DATA_PORT);
+        struct net_local *lp = netdev_priv(dev);
+
+        iowrite16(regno, lp->virt_addr + ADD_PORT);
+        return ioread16(lp->virt_addr + DATA_PORT);
 }
 
 static void
 writereg(struct net_device *dev, u16 regno, u16 value)
 {
-        writeword(dev->base_addr, ADD_PORT, regno);
-        writeword(dev->base_addr, DATA_PORT, value);
+        struct net_local *lp = netdev_priv(dev);
+
+        iowrite16(regno, lp->virt_addr + ADD_PORT);
+        iowrite16(value, lp->virt_addr + DATA_PORT);
 }
 
 static int __init
 wait_eeprom_ready(struct net_device *dev)
 {
         int timeout = jiffies;
-        /* check to see if the EEPROM is ready, a timeout is used -
-           just in case EEPROM is ready when SI_BUSY in the
-           PP_SelfST is clear */
-        while(readreg(dev, PP_SelfST) & SI_BUSY)
+        /* check to see if the EEPROM is ready,
+         * a timeout is used just in case EEPROM is ready when
+         * SI_BUSY in the PP_SelfST is clear
+         */
+        while (readreg(dev, PP_SelfST) & SI_BUSY)
                 if (jiffies - timeout >= 40)
                         return -1;
         return 0;
@@ -443,17 +299,19 @@ get_eeprom_data(struct net_device *dev, int off, int len, int *buffer)
 {
         int i;
 
-        if (net_debug > 3) printk("EEPROM data from %x for %x:\n",off,len);
+        cs89_dbg(3, info, "EEPROM data from %x for %x:", off, len);
         for (i = 0; i < len; i++) {
-                if (wait_eeprom_ready(dev) < 0) return -1;
+                if (wait_eeprom_ready(dev) < 0)
+                        return -1;
                 /* Now send the EEPROM read command and EEPROM location to read */
                 writereg(dev, PP_EECMD, (off + i) | EEPROM_READ_CMD);
-                if (wait_eeprom_ready(dev) < 0) return -1;
+                if (wait_eeprom_ready(dev) < 0)
+                        return -1;
                 buffer[i] = readreg(dev, PP_EEData);
-                if (net_debug > 3) printk("%04x ", buffer[i]);
+                cs89_dbg(3, cont, " %04x", buffer[i]);
         }
-        if (net_debug > 3) printk("\n");
-        return 0;
+        cs89_dbg(3, cont, "\n");
+        return 0;
 }
 
 static int  __init
@@ -470,341 +328,52 @@ get_eeprom_cksum(int off, int len, int *buffer)
         return -1;
 }
 
-#ifdef CONFIG_NET_POLL_CONTROLLER
-/*
- * Polling receive - used by netconsole and other diagnostic tools
- * to allow network i/o with interrupts disabled.
- */
-static void net_poll_controller(struct net_device *dev)
-{
-        disable_irq(dev->irq);
-        net_interrupt(dev->irq, dev);
-        enable_irq(dev->irq);
-}
-#endif
-
-static const struct net_device_ops net_ops = {
-        .ndo_open               = net_open,
-        .ndo_stop               = net_close,
-        .ndo_tx_timeout         = net_timeout,
-        .ndo_start_xmit         = net_send_packet,
-        .ndo_get_stats          = net_get_stats,
-        .ndo_set_rx_mode        = set_multicast_list,
-        .ndo_set_mac_address    = set_mac_address,
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        .ndo_poll_controller    = net_poll_controller,
-#endif
-        .ndo_change_mtu         = eth_change_mtu,
-        .ndo_validate_addr      = eth_validate_addr,
-};
-
-/* This is the real probe routine.  Linux has a history of friendly device
-   probes on the ISA bus.  A good device probes avoids doing writes, and
-   verifies that the correct device exists and functions.
-   Return 0 on success.
- */
-
-static int __init
-cs89x0_probe1(struct net_device *dev, unsigned long ioaddr, int modular)
+static void
+write_irq(struct net_device *dev, int chip_type, int irq)
 {
-        struct net_local *lp = netdev_priv(dev);
-        static unsigned version_printed;
         int i;
-        int tmp;
-        unsigned rev_type = 0;
-        int eeprom_buff[CHKSUM_LEN];
-        int retval;
-
-        /* Initialize the device structure. */
-        if (!modular) {
-                memset(lp, 0, sizeof(*lp));
-                spin_lock_init(&lp->lock);
-#ifndef MODULE
-#if ALLOW_DMA
-                if (g_cs89x0_dma) {
-                        lp->use_dma = 1;
-                        lp->dma = g_cs89x0_dma;
-                        lp->dmasize = 16;       /* Could make this an option... */
-                }
-#endif
-                lp->force = g_cs89x0_media__force;
-#endif
-
-        }
-
-        /* Grab the region so we can find another board if autoIRQ fails. */
-        /* WTF is going on here? */
-        if (!request_region(ioaddr & ~3, NETCARD_IO_EXTENT, DRV_NAME)) {
-                printk(KERN_ERR "%s: request_region(0x%lx, 0x%x) failed\n",
-                                DRV_NAME, ioaddr, NETCARD_IO_EXTENT);
-                retval = -EBUSY;
-                goto out1;
-        }
-
-        /* if they give us an odd I/O address, then do ONE write to
-           the address port, to get it back to address zero, where we
-           expect to find the EISA signature word. An IO with a base of 0x3
-           will skip the test for the ADD_PORT. */
-        if (ioaddr & 1) {
-                if (net_debug > 1)
-                        printk(KERN_INFO "%s: odd ioaddr 0x%lx\n", dev->name, ioaddr);
-                if ((ioaddr & 2) != 2)
-                        if ((readword(ioaddr & ~3, ADD_PORT) & ADD_MASK) != ADD_SIG) {
-                                printk(KERN_ERR "%s: bad signature 0x%x\n",
-                                        dev->name, readword(ioaddr & ~3, ADD_PORT));
-                                retval = -ENODEV;
-                                goto out2;
-                        }
-        }
-
-        ioaddr &= ~3;
-        printk(KERN_DEBUG "PP_addr at %lx[%x]: 0x%x\n",
-                        ioaddr, ADD_PORT, readword(ioaddr, ADD_PORT));
-        writeword(ioaddr, ADD_PORT, PP_ChipID);
-
-        tmp = readword(ioaddr, DATA_PORT);
-        if (tmp != CHIP_EISA_ID_SIG) {
-                printk(KERN_DEBUG "%s: incorrect signature at %lx[%x]: 0x%x!="
-                        CHIP_EISA_ID_SIG_STR "\n",
-                        dev->name, ioaddr, DATA_PORT, tmp);
-                retval = -ENODEV;
-                goto out2;
-        }
-
-        /* Fill in the 'dev' fields. */
-        dev->base_addr = ioaddr;
-
-        /* get the chip type */
-        rev_type = readreg(dev, PRODUCT_ID_ADD);
-        lp->chip_type = rev_type &~ REVISON_BITS;
-        lp->chip_revision = ((rev_type & REVISON_BITS) >> 8) + 'A';
-
-        /* Check the chip type and revision in order to set the correct send command
-        CS8920 revision C and CS8900 revision F can use the faster send. */
-        lp->send_cmd = TX_AFTER_381;
-        if (lp->chip_type == CS8900 && lp->chip_revision >= 'F')
-                lp->send_cmd = TX_NOW;
-        if (lp->chip_type != CS8900 && lp->chip_revision >= 'C')
-                lp->send_cmd = TX_NOW;
-
-        if (net_debug  &&  version_printed++ == 0)
-                printk(version);
-
-        printk(KERN_INFO "%s: cs89%c0%s rev %c found at %#3lx ",
-               dev->name,
-               lp->chip_type==CS8900?'0':'2',
-               lp->chip_type==CS8920M?"M":"",
-               lp->chip_revision,
-               dev->base_addr);
-
-        reset_chip(dev);
-
-        /* Here we read the current configuration of the chip. If there
-           is no Extended EEPROM then the idea is to not disturb the chip
-           configuration, it should have been correctly setup by automatic
-           EEPROM read on reset. So, if the chip says it read the EEPROM
-           the driver will always do *something* instead of complain that
-           adapter_cnf is 0. */
-
-
-        if ((readreg(dev, PP_SelfST) & (EEPROM_OK | EEPROM_PRESENT)) ==
-              (EEPROM_OK|EEPROM_PRESENT)) {
-                /* Load the MAC. */
-                for (i=0; i < ETH_ALEN/2; i++) {
-                        unsigned int Addr;
-                        Addr = readreg(dev, PP_IA+i*2);
-                        dev->dev_addr[i*2] = Addr & 0xFF;
-                        dev->dev_addr[i*2+1] = Addr >> 8;
-                }
-
-                /* Load the Adapter Configuration.
-                   Note:  Barring any more specific information from some
-                   other source (ie EEPROM+Schematics), we would not know
-                   how to operate a 10Base2 interface on the AUI port.
-                   However, since we  do read the status of HCB1 and use
-                   settings that always result in calls to control_dc_dc(dev,0)
-                   a BNC interface should work if the enable pin
-                   (dc/dc converter) is on HCB1. It will be called AUI
-                   however. */
-
-                lp->adapter_cnf = 0;
-                i = readreg(dev, PP_LineCTL);
-                /* Preserve the setting of the HCB1 pin. */
-                if ((i & (HCB1 | HCB1_ENBL)) ==  (HCB1 | HCB1_ENBL))
-                        lp->adapter_cnf |= A_CNF_DC_DC_POLARITY;
-                /* Save the sqelch bit */
-                if ((i & LOW_RX_SQUELCH) == LOW_RX_SQUELCH)
-                        lp->adapter_cnf |= A_CNF_EXTND_10B_2 | A_CNF_LOW_RX_SQUELCH;
-                /* Check if the card is in 10Base-t only mode */
-                if ((i & (AUI_ONLY | AUTO_AUI_10BASET)) == 0)
-                        lp->adapter_cnf |=  A_CNF_10B_T | A_CNF_MEDIA_10B_T;
-                /* Check if the card is in AUI only mode */
-                if ((i & (AUI_ONLY | AUTO_AUI_10BASET)) == AUI_ONLY)
-                        lp->adapter_cnf |=  A_CNF_AUI | A_CNF_MEDIA_AUI;
-                /* Check if the card is in Auto mode. */
-                if ((i & (AUI_ONLY | AUTO_AUI_10BASET)) == AUTO_AUI_10BASET)
-                        lp->adapter_cnf |=  A_CNF_AUI | A_CNF_10B_T |
-                        A_CNF_MEDIA_AUI | A_CNF_MEDIA_10B_T | A_CNF_MEDIA_AUTO;
-
-                if (net_debug > 1)
-                        printk(KERN_INFO "%s: PP_LineCTL=0x%x, adapter_cnf=0x%x\n",
-                                        dev->name, i, lp->adapter_cnf);
-
-                /* IRQ. Other chips already probe, see below. */
-                if (lp->chip_type == CS8900)
-                        lp->isa_config = readreg(dev, PP_CS8900_ISAINT) & INT_NO_MASK;
-
-                printk( "[Cirrus EEPROM] ");
-        }
-
-        printk("\n");
-
-        /* First check to see if an EEPROM is attached. */
-
-        if ((readreg(dev, PP_SelfST) & EEPROM_PRESENT) == 0)
-                printk(KERN_WARNING "cs89x0: No EEPROM, relying on command line....\n");
-        else if (get_eeprom_data(dev, START_EEPROM_DATA,CHKSUM_LEN,eeprom_buff) < 0) {
-                printk(KERN_WARNING "\ncs89x0: EEPROM read failed, relying on command line.\n");
-        } else if (get_eeprom_cksum(START_EEPROM_DATA,CHKSUM_LEN,eeprom_buff) < 0) {
-                /* Check if the chip was able to read its own configuration starting
-                   at 0 in the EEPROM*/
-                if ((readreg(dev, PP_SelfST) & (EEPROM_OK | EEPROM_PRESENT)) !=
-                    (EEPROM_OK|EEPROM_PRESENT))
-                        printk(KERN_WARNING "cs89x0: Extended EEPROM checksum bad and no Cirrus EEPROM, relying on command line\n");
-
-        } else {
-                /* This reads an extended EEPROM that is not documented
-                   in the CS8900 datasheet. */
-
-                /* get transmission control word  but keep the autonegotiation bits */
-                if (!lp->auto_neg_cnf) lp->auto_neg_cnf = eeprom_buff[AUTO_NEG_CNF_OFFSET/2];
-                /* Store adapter configuration */
-                if (!lp->adapter_cnf) lp->adapter_cnf = eeprom_buff[ADAPTER_CNF_OFFSET/2];
-                /* Store ISA configuration */
-                lp->isa_config = eeprom_buff[ISA_CNF_OFFSET/2];
-                dev->mem_start = eeprom_buff[PACKET_PAGE_OFFSET/2] << 8;
-
-                /* eeprom_buff has 32-bit ints, so we can't just memcpy it */
-                /* store the initial memory base address */
-                for (i = 0; i < ETH_ALEN/2; i++) {
-                        dev->dev_addr[i*2] = eeprom_buff[i];
-                        dev->dev_addr[i*2+1] = eeprom_buff[i] >> 8;
-                }
-                if (net_debug > 1)
-                        printk(KERN_DEBUG "%s: new adapter_cnf: 0x%x\n",
-                                dev->name, lp->adapter_cnf);
-        }
-
-        /* allow them to force multiple transceivers.  If they force multiple, autosense */
-        {
-                int count = 0;
-                if (lp->force & FORCE_RJ45)     {lp->adapter_cnf |= A_CNF_10B_T; count++; }
-                if (lp->force & FORCE_AUI)      {lp->adapter_cnf |= A_CNF_AUI; count++; }
-                if (lp->force & FORCE_BNC)      {lp->adapter_cnf |= A_CNF_10B_2; count++; }
-                if (count > 1)                  {lp->adapter_cnf |= A_CNF_MEDIA_AUTO; }
-                else if (lp->force & FORCE_RJ45){lp->adapter_cnf |= A_CNF_MEDIA_10B_T; }
-                else if (lp->force & FORCE_AUI) {lp->adapter_cnf |= A_CNF_MEDIA_AUI; }
-                else if (lp->force & FORCE_BNC) {lp->adapter_cnf |= A_CNF_MEDIA_10B_2; }
-        }
-
-        if (net_debug > 1)
-                printk(KERN_DEBUG "%s: after force 0x%x, adapter_cnf=0x%x\n",
-                        dev->name, lp->force, lp->adapter_cnf);
-
-        /* FIXME: We don't let you set dc-dc polarity or low RX squelch from the command line: add it here */
-
-        /* FIXME: We don't let you set the IMM bit from the command line: add it to lp->auto_neg_cnf here */
-
-        /* FIXME: we don't set the Ethernet address on the command line.  Use
-           ifconfig IFACE hw ether AABBCCDDEEFF */
-
-        printk(KERN_INFO "cs89x0 media %s%s%s",
-               (lp->adapter_cnf & A_CNF_10B_T)?"RJ-45,":"",
-               (lp->adapter_cnf & A_CNF_AUI)?"AUI,":"",
-               (lp->adapter_cnf & A_CNF_10B_2)?"BNC,":"");
-
-        lp->irq_map = 0xffff;
 
-        /* If this is a CS8900 then no pnp soft */
-        if (lp->chip_type != CS8900 &&
-            /* Check if the ISA IRQ has been set  */
-                (i = readreg(dev, PP_CS8920_ISAINT) & 0xff,
-                 (i != 0 && i < CS8920_NO_INTS))) {
-                if (!dev->irq)
-                        dev->irq = i;
-        } else {
-                i = lp->isa_config & INT_NO_MASK;
+        if (chip_type == CS8900) {
 #ifndef CONFIG_CS89x0_PLATFORM
-                if (lp->chip_type == CS8900) {
-#ifdef CS89x0_NONISA_IRQ
-                        i = cs8900_irq_map[0];
+                /* Search the mapping table for the corresponding IRQ pin. */
+                for (i = 0; i != ARRAY_SIZE(cs8900_irq_map); i++)
+                        if (cs8900_irq_map[i] == irq)
+                                break;
+                /* Not found */
+                if (i == ARRAY_SIZE(cs8900_irq_map))
+                        i = 3;
 #else
-                        /* Translate the IRQ using the IRQ mapping table. */
-                        if (i >= ARRAY_SIZE(cs8900_irq_map))
-                                printk("\ncs89x0: invalid ISA interrupt number %d\n", i);
-                        else
-                                i = cs8900_irq_map[i];
-
-                        lp->irq_map = CS8900_IRQ_MAP; /* fixed IRQ map for CS8900 */
-                } else {
-                        int irq_map_buff[IRQ_MAP_LEN/2];
-
-                        if (get_eeprom_data(dev, IRQ_MAP_EEPROM_DATA,
-                                            IRQ_MAP_LEN/2,
-                                            irq_map_buff) >= 0) {
-                                if ((irq_map_buff[0] & 0xff) == PNP_IRQ_FRMT)
-                                        lp->irq_map = (irq_map_buff[0]>>8) | (irq_map_buff[1] << 8);
-                        }
-#endif
-                }
-#endif
-                if (!dev->irq)
-                        dev->irq = i;
-        }
-
-        printk(" IRQ %d", dev->irq);
-
-#if ALLOW_DMA
-        if (lp->use_dma) {
-                get_dma_channel(dev);
-                printk(", DMA %d", dev->dma);
-        }
-        else
+                /* INTRQ0 pin is used for interrupt generation. */
+                i = 0;
 #endif
-        {
-                printk(", programmed I/O");
+                writereg(dev, PP_CS8900_ISAINT, i);
+        } else {
+                writereg(dev, PP_CS8920_ISAINT, irq);
         }
-
-        /* print the ethernet address. */
-        printk(", MAC %pM", dev->dev_addr);
-
-        dev->netdev_ops = &net_ops;
-        dev->watchdog_timeo = HZ;
-
-        printk("\n");
-        if (net_debug)
-                printk("cs89x0_probe1() successful\n");
-
-        retval = register_netdev(dev);
-        if (retval)
-                goto out3;
-        return 0;
-out3:
-        writeword(dev->base_addr, ADD_PORT, PP_ChipID);
-out2:
-        release_region(ioaddr & ~3, NETCARD_IO_EXTENT);
-out1:
-        return retval;
 }
 
+static void
+count_rx_errors(int status, struct net_device *dev)
+{
+        dev->stats.rx_errors++;
+        if (status & RX_RUNT)
+                dev->stats.rx_length_errors++;
+        if (status & RX_EXTRA_DATA)
+                dev->stats.rx_length_errors++;
+        if ((status & RX_CRC_ERROR) && !(status & (RX_EXTRA_DATA | RX_RUNT)))
+                /* per str 172 */
+                dev->stats.rx_crc_errors++;
+        if (status & RX_DRIBBLE)
+                dev->stats.rx_frame_errors++;
+}
 
 /*********************************
  * This page contains DMA routines
-**********************************/
+ *********************************/
 
 #if ALLOW_DMA
 
-#define dma_page_eq(ptr1, ptr2) ((long)(ptr1)>>17 == (long)(ptr2)>>17)
+#define dma_page_eq(ptr1, ptr2) ((long)(ptr1) >> 17 == (long)(ptr2) >> 17)
 
 static void
 get_dma_channel(struct net_device *dev)
@@ -833,11 +402,10 @@ write_dma(struct net_device *dev, int chip_type, int dma)
         struct net_local *lp = netdev_priv(dev);
         if ((lp->isa_config & ANY_ISA_DMA) == 0)
                 return;
-        if (chip_type == CS8900) {
-                writereg(dev, PP_CS8900_ISADMA, dma-5);
-        } else {
+        if (chip_type == CS8900)
+                writereg(dev, PP_CS8900_ISADMA, dma - 5);
+        else
                 writereg(dev, PP_CS8920_ISADMA, dma);
-        }
 }
 
 static void
@@ -847,18 +415,15 @@ set_dma_cfg(struct net_device *dev)
 
         if (lp->use_dma) {
                 if ((lp->isa_config & ANY_ISA_DMA) == 0) {
-                        if (net_debug > 3)
-                                printk("set_dma_cfg(): no DMA\n");
+                        cs89_dbg(3, err, "set_dma_cfg(): no DMA\n");
                         return;
                 }
                 if (lp->isa_config & ISA_RxDMA) {
                         lp->curr_rx_cfg |= RX_DMA_ONLY;
-                        if (net_debug > 3)
-                                printk("set_dma_cfg(): RX_DMA_ONLY\n");
+                        cs89_dbg(3, info, "set_dma_cfg(): RX_DMA_ONLY\n");
                 } else {
                         lp->curr_rx_cfg |= AUTO_RX_DMA; /* not that we support it... */
-                        if (net_debug > 3)
-                                printk("set_dma_cfg(): AUTO_RX_DMA\n");
+                        cs89_dbg(3, info, "set_dma_cfg(): AUTO_RX_DMA\n");
                 }
         }
 }
@@ -868,7 +433,7 @@ dma_bufcfg(struct net_device *dev)
 {
         struct net_local *lp = netdev_priv(dev);
         if (lp->use_dma)
-                return (lp->isa_config & ANY_ISA_DMA)? RX_DMA_ENBL : 0;
+                return (lp->isa_config & ANY_ISA_DMA) ? RX_DMA_ENBL : 0;
         else
                 return 0;
 }
@@ -898,13 +463,13 @@ dma_rx(struct net_device *dev)
         int status, length;
         unsigned char *bp = lp->rx_dma_ptr;
 
-        status = bp[0] + (bp[1]<<8);
-        length = bp[2] + (bp[3]<<8);
+        status = bp[0] + (bp[1] << 8);
+        length = bp[2] + (bp[3] << 8);
         bp += 4;
-        if (net_debug > 5) {
-                printk( "%s: receiving DMA packet at %lx, status %x, length %x\n",
-                        dev->name, (unsigned long)bp, status, length);
-        }
+
+        cs89_dbg(5, debug, "%s: receiving DMA packet at %lx, status %x, length %x\n",
+                 dev->name, (unsigned long)bp, status, length);
+
         if ((status & RX_OK) == 0) {
                 count_rx_errors(status, dev);
                 goto skip_this_frame;
@@ -913,14 +478,16 @@ dma_rx(struct net_device *dev)
         /* Malloc up new buffer. */
         skb = netdev_alloc_skb(dev, length + 2);
         if (skb == NULL) {
-                if (net_debug)  /* I don't think we want to do this to a stressed system */
-                        printk("%s: Memory squeeze, dropping packet.\n", dev->name);
+                /* I don't think we want to do this to a stressed system */
+                cs89_dbg(0, err, "%s: Memory squeeze, dropping packet\n",
+                         dev->name);
                 dev->stats.rx_dropped++;
 
                 /* AKPM: advance bp to the next frame */
 skip_this_frame:
                 bp += (length + 3) & ~3;
-                if (bp >= lp->end_dma_buff) bp -= lp->dmasize*1024;
+                if (bp >= lp->end_dma_buff)
+                        bp -= lp->dmasize * 1024;
                 lp->rx_dma_ptr = bp;
                 return;
         }
@@ -928,63 +495,38 @@ skip_this_frame:
 
         if (bp + length > lp->end_dma_buff) {
                 int semi_cnt = lp->end_dma_buff - bp;
-                memcpy(skb_put(skb,semi_cnt), bp, semi_cnt);
-                memcpy(skb_put(skb,length - semi_cnt), lp->dma_buff,
+                memcpy(skb_put(skb, semi_cnt), bp, semi_cnt);
+                memcpy(skb_put(skb, length - semi_cnt), lp->dma_buff,
                        length - semi_cnt);
         } else {
-                memcpy(skb_put(skb,length), bp, length);
+                memcpy(skb_put(skb, length), bp, length);
         }
         bp += (length + 3) & ~3;
-        if (bp >= lp->end_dma_buff) bp -= lp->dmasize*1024;
+        if (bp >= lp->end_dma_buff)
+                bp -= lp->dmasize*1024;
         lp->rx_dma_ptr = bp;
 
-        if (net_debug > 3) {
-                printk( "%s: received %d byte DMA packet of type %x\n",
-                        dev->name, length,
-                        (skb->data[ETH_ALEN+ETH_ALEN] << 8) | skb->data[ETH_ALEN+ETH_ALEN+1]);
-        }
-        skb->protocol=eth_type_trans(skb,dev);
+        cs89_dbg(3, info, "%s: received %d byte DMA packet of type %x\n",
+                 dev->name, length,
+                 ((skb->data[ETH_ALEN + ETH_ALEN] << 8) |
+                  skb->data[ETH_ALEN + ETH_ALEN + 1]));
+
+        skb->protocol = eth_type_trans(skb, dev);
         netif_rx(skb);
         dev->stats.rx_packets++;
         dev->stats.rx_bytes += length;
 }
 
-#endif  /* ALLOW_DMA */
-
-static void __init reset_chip(struct net_device *dev)
+static void release_dma_buff(struct net_local *lp)
 {
-#if !defined(CONFIG_MACH_MX31ADS)
-#if !defined(CS89x0_NONISA_IRQ)
-        struct net_local *lp = netdev_priv(dev);
-        int ioaddr = dev->base_addr;
-#endif /* CS89x0_NONISA_IRQ */
-        int reset_start_time;
-
-        writereg(dev, PP_SelfCTL, readreg(dev, PP_SelfCTL) | POWER_ON_RESET);
-
-        /* wait 30 ms */
-        msleep(30);
-
-#if !defined(CS89x0_NONISA_IRQ)
-        if (lp->chip_type != CS8900) {
-                /* Hardware problem requires PNP registers to be reconfigured after a reset */
-                writeword(ioaddr, ADD_PORT, PP_CS8920_ISAINT);
-                outb(dev->irq, ioaddr + DATA_PORT);
-                outb(0,      ioaddr + DATA_PORT + 1);
-
-                writeword(ioaddr, ADD_PORT, PP_CS8920_ISAMemB);
-                outb((dev->mem_start >> 16) & 0xff, ioaddr + DATA_PORT);
-                outb((dev->mem_start >> 8) & 0xff,   ioaddr + DATA_PORT + 1);
+        if (lp->dma_buff) {
+                free_pages((unsigned long)(lp->dma_buff),
+                           get_order(lp->dmasize * 1024));
+                lp->dma_buff = NULL;
         }
-#endif /* CS89x0_NONISA_IRQ */
-
-        /* Wait until the chip is reset */
-        reset_start_time = jiffies;
-        while( (readreg(dev, PP_SelfST) & INIT_DONE) == 0 && jiffies - reset_start_time < 2)
-                ;
-#endif /* !CONFIG_MACH_MX31ADS */
 }
 
+#endif  /* ALLOW_DMA */
 
 static void
 control_dc_dc(struct net_device *dev, int on_not_off)
@@ -993,8 +535,9 @@ control_dc_dc(struct net_device *dev, int on_not_off)
         unsigned int selfcontrol;
         int timenow = jiffies;
         /* control the DC to DC convertor in the SelfControl register.
-           Note: This is hooked up to a general purpose pin, might not
-           always be a DC to DC convertor. */
+         * Note: This is hooked up to a general purpose pin, might not
+         * always be a DC to DC convertor.
+         */
 
         selfcontrol = HCB1_ENBL; /* Enable the HCB1 bit as an output */
         if (((lp->adapter_cnf & A_CNF_DC_DC_POLARITY) != 0) ^ on_not_off)
@@ -1008,6 +551,49 @@ control_dc_dc(struct net_device *dev, int on_not_off)
                 ;
 }
 
+/* send a test packet - return true if carrier bits are ok */
+static int
+send_test_pkt(struct net_device *dev)
+{
+        struct net_local *lp = netdev_priv(dev);
+        char test_packet[] = {
+                0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0,
+                0, 46,          /* A 46 in network order */
+                0, 0,           /* DSAP=0 & SSAP=0 fields */
+                0xf3, 0         /* Control (Test Req + P bit set) */
+        };
+        long timenow = jiffies;
+
+        writereg(dev, PP_LineCTL, readreg(dev, PP_LineCTL) | SERIAL_TX_ON);
+
+        memcpy(test_packet,            dev->dev_addr, ETH_ALEN);
+        memcpy(test_packet + ETH_ALEN, dev->dev_addr, ETH_ALEN);
+
+        iowrite16(TX_AFTER_ALL, lp->virt_addr + TX_CMD_PORT);
+        iowrite16(ETH_ZLEN, lp->virt_addr + TX_LEN_PORT);
+
+        /* Test to see if the chip has allocated memory for the packet */
+        while (jiffies - timenow < 5)
+                if (readreg(dev, PP_BusST) & READY_FOR_TX_NOW)
+                        break;
+        if (jiffies - timenow >= 5)
+                return 0;       /* this shouldn't happen */
+
+        /* Write the contents of the packet */
+        writewords(lp, TX_FRAME_PORT, test_packet, (ETH_ZLEN + 1) >> 1);
+
+        cs89_dbg(1, debug, "Sending test packet ");
+        /* wait a couple of jiffies for packet to be received */
+        for (timenow = jiffies; jiffies - timenow < 3;)
+                ;
+        if ((readreg(dev, PP_TxEvent) & TX_SEND_OK_BITS) == TX_OK) {
+                cs89_dbg(1, cont, "succeeded\n");
+                return 1;
+        }
+        cs89_dbg(1, cont, "failed\n");
+        return 0;
+}
+
 #define DETECTED_NONE  0
 #define DETECTED_RJ45H 1
 #define DETECTED_RJ45F 2
@@ -1021,40 +607,46 @@ detect_tp(struct net_device *dev)
         int timenow = jiffies;
         int fdx;
 
-        if (net_debug > 1) printk("%s: Attempting TP\n", dev->name);
+        cs89_dbg(1, debug, "%s: Attempting TP\n", dev->name);
 
-        /* If connected to another full duplex capable 10-Base-T card the link pulses
-           seem to be lost when the auto detect bit in the LineCTL is set.
-           To overcome this the auto detect bit will be cleared whilst testing the
-           10-Base-T interface.  This would not be necessary for the sparrow chip but
-           is simpler to do it anyway. */
-        writereg(dev, PP_LineCTL, lp->linectl &~ AUI_ONLY);
+        /* If connected to another full duplex capable 10-Base-T card
+         * the link pulses seem to be lost when the auto detect bit in
+         * the LineCTL is set.  To overcome this the auto detect bit will
+         * be cleared whilst testing the 10-Base-T interface.  This would
+         * not be necessary for the sparrow chip but is simpler to do it
+         * anyway.
+         */
+        writereg(dev, PP_LineCTL, lp->linectl & ~AUI_ONLY);
         control_dc_dc(dev, 0);
 
-        /* Delay for the hardware to work out if the TP cable is present - 150ms */
-        for (timenow = jiffies; jiffies - timenow < 15; )
-                ;
+        /* Delay for the hardware to work out if the TP cable is present
+         * - 150ms
+         */
+        for (timenow = jiffies; jiffies - timenow < 15;)
+                ;
         if ((readreg(dev, PP_LineST) & LINK_OK) == 0)
                 return DETECTED_NONE;
 
         if (lp->chip_type == CS8900) {
-                switch (lp->force & 0xf0) {
+                switch (lp->force & 0xf0) {
 #if 0
-                case FORCE_AUTO:
-                        printk("%s: cs8900 doesn't autonegotiate\n",dev->name);
-                        return DETECTED_NONE;
+                case FORCE_AUTO:
+                        pr_info("%s: cs8900 doesn't autonegotiate\n",
+                                dev->name);
+                        return DETECTED_NONE;
 #endif
-                /* CS8900 doesn't support AUTO, change to HALF*/
-                case FORCE_AUTO:
+                        /* CS8900 doesn't support AUTO, change to HALF*/
+                case FORCE_AUTO:
                         lp->force &= ~FORCE_AUTO;
-                        lp->force |= FORCE_HALF;
+                        lp->force |= FORCE_HALF;
                         break;
                 case FORCE_HALF:
                         break;
-                case FORCE_FULL:
-                        writereg(dev, PP_TestCTL, readreg(dev, PP_TestCTL) | FDX_8900);
+                case FORCE_FULL:
+                        writereg(dev, PP_TestCTL,
+                                 readreg(dev, PP_TestCTL) | FDX_8900);
                         break;
-                }
+                }
                 fdx = readreg(dev, PP_TestCTL) & FDX_8900;
         } else {
                 switch (lp->force & 0xf0) {
@@ -1067,15 +659,15 @@ detect_tp(struct net_device *dev)
                 case FORCE_FULL:
                         lp->auto_neg_cnf = RE_NEG_NOW | ALLOW_FDX;
                         break;
-                }
+                }
 
                 writereg(dev, PP_AutoNegCTL, lp->auto_neg_cnf & AUTO_NEG_MASK);
 
                 if ((lp->auto_neg_cnf & AUTO_NEG_BITS) == AUTO_NEG_ENABLE) {
-                        printk(KERN_INFO "%s: negotiating duplex...\n",dev->name);
+                        pr_info("%s: negotiating duplex...\n", dev->name);
                         while (readreg(dev, PP_AutoNegST) & AUTO_NEG_BUSY) {
                                 if (jiffies - timenow > 4000) {
-                                        printk(KERN_ERR "**** Full / half duplex auto-negotiation timed out ****\n");
+                                        pr_err("**** Full / half duplex auto-negotiation timed out ****\n");
                                         break;
                                 }
                         }
@@ -1088,56 +680,31 @@ detect_tp(struct net_device *dev)
                 return DETECTED_RJ45H;
 }
 
-/* send a test packet - return true if carrier bits are ok */
 static int
-send_test_pkt(struct net_device *dev)
+detect_bnc(struct net_device *dev)
 {
-        char test_packet[] = { 0,0,0,0,0,0, 0,0,0,0,0,0,
-                                 0, 46, /* A 46 in network order */
-                                 0, 0, /* DSAP=0 & SSAP=0 fields */
-                                 0xf3, 0 /* Control (Test Req + P bit set) */ };
-        long timenow = jiffies;
-
-        writereg(dev, PP_LineCTL, readreg(dev, PP_LineCTL) | SERIAL_TX_ON);
-
-        memcpy(test_packet,          dev->dev_addr, ETH_ALEN);
-        memcpy(test_packet+ETH_ALEN, dev->dev_addr, ETH_ALEN);
-
-        writeword(dev->base_addr, TX_CMD_PORT, TX_AFTER_ALL);
-        writeword(dev->base_addr, TX_LEN_PORT, ETH_ZLEN);
+        struct net_local *lp = netdev_priv(dev);
 
-        /* Test to see if the chip has allocated memory for the packet */
-        while (jiffies - timenow < 5)
-                if (readreg(dev, PP_BusST) & READY_FOR_TX_NOW)
-                        break;
-        if (jiffies - timenow >= 5)
-                return 0;       /* this shouldn't happen */
+        cs89_dbg(1, debug, "%s: Attempting BNC\n", dev->name);
+        control_dc_dc(dev, 1);
 
-        /* Write the contents of the packet */
-        writewords(dev->base_addr, TX_FRAME_PORT,test_packet,(ETH_ZLEN+1) >>1);
+        writereg(dev, PP_LineCTL, (lp->linectl & ~AUTO_AUI_10BASET) | AUI_ONLY);
 
-        if (net_debug > 1) printk("Sending test packet ");
-        /* wait a couple of jiffies for packet to be received */
-        for (timenow = jiffies; jiffies - timenow < 3; )
-                ;
-        if ((readreg(dev, PP_TxEvent) & TX_SEND_OK_BITS) == TX_OK) {
-                if (net_debug > 1) printk("succeeded\n");
-                return 1;
-        }
-        if (net_debug > 1) printk("failed\n");
-        return 0;
+        if (send_test_pkt(dev))
+                return DETECTED_BNC;
+        else
+                return DETECTED_NONE;
 }
 
-
 static int
 detect_aui(struct net_device *dev)
 {
         struct net_local *lp = netdev_priv(dev);
 
-        if (net_debug > 1) printk("%s: Attempting AUI\n", dev->name);
+        cs89_dbg(1, debug, "%s: Attempting AUI\n", dev->name);
         control_dc_dc(dev, 0);
 
-        writereg(dev, PP_LineCTL, (lp->linectl &~ AUTO_AUI_10BASET) | AUI_ONLY);
+        writereg(dev, PP_LineCTL, (lp->linectl & ~AUTO_AUI_10BASET) | AUI_ONLY);
 
         if (send_test_pkt(dev))
                 return DETECTED_AUI;
@@ -1145,45 +712,154 @@ detect_aui(struct net_device *dev)
                 return DETECTED_NONE;
 }
 
-static int
-detect_bnc(struct net_device *dev)
+/* We have a good packet(s), get it/them out of the buffers. */
+static void
+net_rx(struct net_device *dev)
 {
         struct net_local *lp = netdev_priv(dev);
+        struct sk_buff *skb;
+        int status, length;
 
-        if (net_debug > 1) printk("%s: Attempting BNC\n", dev->name);
-        control_dc_dc(dev, 1);
+        status = ioread16(lp->virt_addr + RX_FRAME_PORT);
+        length = ioread16(lp->virt_addr + RX_FRAME_PORT);
 
-        writereg(dev, PP_LineCTL, (lp->linectl &~ AUTO_AUI_10BASET) | AUI_ONLY);
+        if ((status & RX_OK) == 0) {
+                count_rx_errors(status, dev);
+                return;
+        }
 
-        if (send_test_pkt(dev))
-                return DETECTED_BNC;
-        else
-                return DETECTED_NONE;
+        /* Malloc up new buffer. */
+        skb = netdev_alloc_skb(dev, length + 2);
+        if (skb == NULL) {
+#if 0           /* Again, this seems a cruel thing to do */
+                pr_warn("%s: Memory squeeze, dropping packet\n", dev->name);
+#endif
+                dev->stats.rx_dropped++;
+                return;
+        }
+        skb_reserve(skb, 2);    /* longword align L3 header */
+
+        readwords(lp, RX_FRAME_PORT, skb_put(skb, length), length >> 1);
+        if (length & 1)
+                skb->data[length-1] = ioread16(lp->virt_addr + RX_FRAME_PORT);
+
+        cs89_dbg(3, debug, "%s: received %d byte packet of type %x\n",
+                 dev->name, length,
+                 (skb->data[ETH_ALEN + ETH_ALEN] << 8) |
+                 skb->data[ETH_ALEN + ETH_ALEN + 1]);
+
+        skb->protocol = eth_type_trans(skb, dev);
+        netif_rx(skb);
+        dev->stats.rx_packets++;
+        dev->stats.rx_bytes += length;
 }
 
+/* The typical workload of the driver:
+ * Handle the network interface interrupts.
+ */
 
-static void
-write_irq(struct net_device *dev, int chip_type, int irq)
+static irqreturn_t net_interrupt(int irq, void *dev_id)
 {
-        int i;
+        struct net_device *dev = dev_id;
+        struct net_local *lp;
+        int status;
+        int handled = 0;
 
-        if (chip_type == CS8900) {
-#ifndef CONFIG_CS89x0_PLATFORM
-                /* Search the mapping table for the corresponding IRQ pin. */
-                for (i = 0; i != ARRAY_SIZE(cs8900_irq_map); i++)
-                        if (cs8900_irq_map[i] == irq)
-                                break;
-                /* Not found */
-                if (i == ARRAY_SIZE(cs8900_irq_map))
-                        i = 3;
-#else
-                /* INTRQ0 pin is used for interrupt generation. */
-                i = 0;
+        lp = netdev_priv(dev);
+
+        /* we MUST read all the events out of the ISQ, otherwise we'll never
+         * get interrupted again.  As a consequence, we can't have any limit
+         * on the number of times we loop in the interrupt handler.  The
+         * hardware guarantees that eventually we'll run out of events.  Of
+         * course, if you're on a slow machine, and packets are arriving
+         * faster than you can read them off, you're screwed.  Hasta la
+         * vista, baby!
+         */
+        while ((status = ioread16(lp->virt_addr + ISQ_PORT))) {
+                cs89_dbg(4, debug, "%s: event=%04x\n", dev->name, status);
+                handled = 1;
+                switch (status & ISQ_EVENT_MASK) {
+                case ISQ_RECEIVER_EVENT:
+                        /* Got a packet(s). */
+                        net_rx(dev);
+                        break;
+                case ISQ_TRANSMITTER_EVENT:
+                        dev->stats.tx_packets++;
+                        netif_wake_queue(dev);  /* Inform upper layers. */
+                        if ((status & (TX_OK |
+                                       TX_LOST_CRS |
+                                       TX_SQE_ERROR |
+                                       TX_LATE_COL |
+                                       TX_16_COL)) != TX_OK) {
+                                if ((status & TX_OK) == 0)
+                                        dev->stats.tx_errors++;
+                                if (status & TX_LOST_CRS)
+                                        dev->stats.tx_carrier_errors++;
+                                if (status & TX_SQE_ERROR)
+                                        dev->stats.tx_heartbeat_errors++;
+                                if (status & TX_LATE_COL)
+                                        dev->stats.tx_window_errors++;
+                                if (status & TX_16_COL)
+                                        dev->stats.tx_aborted_errors++;
+                        }
+                        break;
+                case ISQ_BUFFER_EVENT:
+                        if (status & READY_FOR_TX) {
+                                /* we tried to transmit a packet earlier,
+                                 * but inexplicably ran out of buffers.
+                                 * That shouldn't happen since we only ever
+                                 * load one packet.  Shrug.  Do the right
+                                 * thing anyway.
+                                 */
+                                netif_wake_queue(dev);  /* Inform upper layers. */
+                        }
+                        if (status & TX_UNDERRUN) {
+                                cs89_dbg(0, err, "%s: transmit underrun\n",
+                                         dev->name);
+                                lp->send_underrun++;
+                                if (lp->send_underrun == 3)
+                                        lp->send_cmd = TX_AFTER_381;
+                                else if (lp->send_underrun == 6)
+                                        lp->send_cmd = TX_AFTER_ALL;
+                                /* transmit cycle is done, although
+                                 * frame wasn't transmitted - this
+                                 * avoids having to wait for the upper
+                                 * layers to timeout on us, in the
+                                 * event of a tx underrun
+                                 */
+                                netif_wake_queue(dev);  /* Inform upper layers. */
+                        }
+#if ALLOW_DMA
+                        if (lp->use_dma && (status & RX_DMA)) {
+                                int count = readreg(dev, PP_DmaFrameCnt);
+                                while (count) {
+                                        cs89_dbg(5, debug,
+                                                 "%s: receiving %d DMA frames\n",
+                                                 dev->name, count);
+                                        if (count > 1)
+                                                cs89_dbg(2, debug,
+                                                         "%s: receiving %d DMA frames\n",
+                                                         dev->name, count);
+                                        dma_rx(dev);
+                                        if (--count == 0)
+                                                count = readreg(dev, PP_DmaFrameCnt);
+                                        if (count > 0)
+                                                cs89_dbg(2, debug,
+                                                         "%s: continuing with %d DMA frames\n",
+                                                         dev->name, count);
+                                }
+                        }
 #endif
-                writereg(dev, PP_CS8900_ISAINT, i);
-        } else {
-                writereg(dev, PP_CS8920_ISAINT, irq);
+                        break;
+                case ISQ_RX_MISS_EVENT:
+                        dev->stats.rx_missed_errors += (status >> 6);
+                        break;
+                case ISQ_TX_COL_EVENT:
+                        dev->stats.collisions += (status >> 6);
+                        break;
+                }
         }
+        return IRQ_RETVAL(handled);
 }
 
 /* Open/initialize the board.  This is called (in the current kernel)
@@ -1192,7 +868,7 @@ write_irq(struct net_device *dev, int chip_type, int irq)
    This routine should set everything up anew at each open, even
    registers that "should" only need to be set once at boot, so that
    there is non-reboot way to recover if something goes wrong.
-   */
+*/
 
 /* AKPM: do we need to do any locking here? */
 
@@ -1208,14 +884,15 @@ net_open(struct net_device *dev)
                 /* Allow interrupts to be generated by the chip */
 /* Cirrus' release had this: */
 #if 0
-                writereg(dev, PP_BusCTL, readreg(dev, PP_BusCTL)|ENABLE_IRQ );
+                writereg(dev, PP_BusCTL, readreg(dev, PP_BusCTL) | ENABLE_IRQ);
 #endif
 /* And 2.3.47 had this: */
                 writereg(dev, PP_BusCTL, ENABLE_IRQ | MEMORY_ON);
 
                 for (i = 2; i < CS8920_NO_INTS; i++) {
                         if ((1 << i) & lp->irq_map) {
-                                if (request_irq(i, net_interrupt, 0, dev->name, dev) == 0) {
+                                if (request_irq(i, net_interrupt, 0, dev->name,
+                                                dev) == 0) {
                                         dev->irq = i;
                                         write_irq(dev, lp->chip_type, i);
                                         /* writereg(dev, PP_BufCFG, GENERATE_SW_INTERRUPT); */
@@ -1226,23 +903,21 @@ net_open(struct net_device *dev)
 
                 if (i >= CS8920_NO_INTS) {
                         writereg(dev, PP_BusCTL, 0);    /* disable interrupts. */
-                        printk(KERN_ERR "cs89x0: can't get an interrupt\n");
+                        pr_err("can't get an interrupt\n");
                         ret = -EAGAIN;
                         goto bad_out;
                 }
-        }
-        else
-        {
+        } else {
 #if !defined(CS89x0_NONISA_IRQ) && !defined(CONFIG_CS89x0_PLATFORM)
                 if (((1 << dev->irq) & lp->irq_map) == 0) {
-                        printk(KERN_ERR "%s: IRQ %d is not in our map of allowable IRQs, which is %x\n",
-                               dev->name, dev->irq, lp->irq_map);
+                        pr_err("%s: IRQ %d is not in our map of allowable IRQs, which is %x\n",
+                               dev->name, dev->irq, lp->irq_map);
                         ret = -EAGAIN;
                         goto bad_out;
                 }
 #endif
 /* FIXME: Cirrus' release had this: */
-                writereg(dev, PP_BusCTL, readreg(dev, PP_BusCTL)|ENABLE_IRQ );
+                writereg(dev, PP_BusCTL, readreg(dev, PP_BusCTL)|ENABLE_IRQ);
 /* And 2.3.47 had this: */
 #if 0
                 writereg(dev, PP_BusCTL, ENABLE_IRQ | MEMORY_ON);
@@ -1250,147 +925,168 @@ net_open(struct net_device *dev)
                 write_irq(dev, lp->chip_type, dev->irq);
                 ret = request_irq(dev->irq, net_interrupt, 0, dev->name, dev);
                 if (ret) {
-                        printk(KERN_ERR "cs89x0: request_irq(%d) failed\n", dev->irq);
+                        pr_err("request_irq(%d) failed\n", dev->irq);
                         goto bad_out;
                 }
         }
 
 #if ALLOW_DMA
-        if (lp->use_dma) {
-                if (lp->isa_config & ANY_ISA_DMA) {
-                        unsigned long flags;
-                        lp->dma_buff = (unsigned char *)__get_dma_pages(GFP_KERNEL,
-                                                        get_order(lp->dmasize * 1024));
-
-                        if (!lp->dma_buff) {
-                                printk(KERN_ERR "%s: cannot get %dK memory for DMA\n", dev->name, lp->dmasize);
-                                goto release_irq;
-                        }
-                        if (net_debug > 1) {
-                                printk( "%s: dma %lx %lx\n",
-                                        dev->name,
-                                        (unsigned long)lp->dma_buff,
-                                        (unsigned long)isa_virt_to_bus(lp->dma_buff));
-                        }
-                        if ((unsigned long) lp->dma_buff >= MAX_DMA_ADDRESS ||
-                            !dma_page_eq(lp->dma_buff, lp->dma_buff+lp->dmasize*1024-1)) {
-                                printk(KERN_ERR "%s: not usable as DMA buffer\n", dev->name);
-                                goto release_irq;
-                        }
-                        memset(lp->dma_buff, 0, lp->dmasize * 1024);    /* Why? */
-                        if (request_dma(dev->dma, dev->name)) {
-                                printk(KERN_ERR "%s: cannot get dma channel %d\n", dev->name, dev->dma);
-                                goto release_irq;
-                        }
-                        write_dma(dev, lp->chip_type, dev->dma);
-                        lp->rx_dma_ptr = lp->dma_buff;
-                        lp->end_dma_buff = lp->dma_buff + lp->dmasize*1024;
-                        spin_lock_irqsave(&lp->lock, flags);
-                        disable_dma(dev->dma);
-                        clear_dma_ff(dev->dma);
-                        set_dma_mode(dev->dma, DMA_RX_MODE); /* auto_init as well */
-                        set_dma_addr(dev->dma, isa_virt_to_bus(lp->dma_buff));
-                        set_dma_count(dev->dma, lp->dmasize*1024);
-                        enable_dma(dev->dma);
-                        spin_unlock_irqrestore(&lp->lock, flags);
+        if (lp->use_dma && (lp->isa_config & ANY_ISA_DMA)) {
+                unsigned long flags;
+                lp->dma_buff = (unsigned char *)__get_dma_pages(GFP_KERNEL,
+                                                                get_order(lp->dmasize * 1024));
+                if (!lp->dma_buff) {
+                        pr_err("%s: cannot get %dK memory for DMA\n",
+                               dev->name, lp->dmasize);
+                        goto release_irq;
+                }
+                cs89_dbg(1, debug, "%s: dma %lx %lx\n",
+                         dev->name,
+                         (unsigned long)lp->dma_buff,
+                         (unsigned long)isa_virt_to_bus(lp->dma_buff));
+                if ((unsigned long)lp->dma_buff >= MAX_DMA_ADDRESS ||
+                    !dma_page_eq(lp->dma_buff,
+                                 lp->dma_buff + lp->dmasize * 1024 - 1)) {
+                        pr_err("%s: not usable as DMA buffer\n", dev->name);
+                        goto release_irq;
                 }
+                memset(lp->dma_buff, 0, lp->dmasize * 1024);    /* Why? */
+                if (request_dma(dev->dma, dev->name)) {
+                        pr_err("%s: cannot get dma channel %d\n",
+                               dev->name, dev->dma);
+                        goto release_irq;
+                }
+                write_dma(dev, lp->chip_type, dev->dma);
+                lp->rx_dma_ptr = lp->dma_buff;
+                lp->end_dma_buff = lp->dma_buff + lp->dmasize * 1024;
+                spin_lock_irqsave(&lp->lock, flags);
+                disable_dma(dev->dma);
+                clear_dma_ff(dev->dma);
+                set_dma_mode(dev->dma, DMA_RX_MODE); /* auto_init as well */
+                set_dma_addr(dev->dma, isa_virt_to_bus(lp->dma_buff));
+                set_dma_count(dev->dma, lp->dmasize * 1024);
+                enable_dma(dev->dma);
+                spin_unlock_irqrestore(&lp->lock, flags);
         }
 #endif  /* ALLOW_DMA */
 
         /* set the Ethernet address */
-        for (i=0; i < ETH_ALEN/2; i++)
-                writereg(dev, PP_IA+i*2, dev->dev_addr[i*2] | (dev->dev_addr[i*2+1] << 8));
+        for (i = 0; i < ETH_ALEN / 2; i++)
+                writereg(dev, PP_IA + i * 2,
+                         (dev->dev_addr[i * 2] |
+                          (dev->dev_addr[i * 2 + 1] << 8)));
 
         /* while we're testing the interface, leave interrupts disabled */
         writereg(dev, PP_BusCTL, MEMORY_ON);
 
         /* Set the LineCTL quintuplet based on adapter configuration read from EEPROM */
-        if ((lp->adapter_cnf & A_CNF_EXTND_10B_2) && (lp->adapter_cnf & A_CNF_LOW_RX_SQUELCH))
-                lp->linectl = LOW_RX_SQUELCH;
+        if ((lp->adapter_cnf & A_CNF_EXTND_10B_2) &&
+            (lp->adapter_cnf & A_CNF_LOW_RX_SQUELCH))
+                lp->linectl = LOW_RX_SQUELCH;
         else
-                lp->linectl = 0;
-
-        /* check to make sure that they have the "right" hardware available */
-        switch(lp->adapter_cnf & A_CNF_MEDIA_TYPE) {
-        case A_CNF_MEDIA_10B_T: result = lp->adapter_cnf & A_CNF_10B_T; break;
-        case A_CNF_MEDIA_AUI:   result = lp->adapter_cnf & A_CNF_AUI; break;
-        case A_CNF_MEDIA_10B_2: result = lp->adapter_cnf & A_CNF_10B_2; break;
-        default: result = lp->adapter_cnf & (A_CNF_10B_T | A_CNF_AUI | A_CNF_10B_2);
-        }
-        if (!result) {
-                printk(KERN_ERR "%s: EEPROM is configured for unavailable media\n", dev->name);
+                lp->linectl = 0;
+
+        /* check to make sure that they have the "right" hardware available */
+        switch (lp->adapter_cnf & A_CNF_MEDIA_TYPE) {
+        case A_CNF_MEDIA_10B_T:
+                result = lp->adapter_cnf & A_CNF_10B_T;
+                break;
+        case A_CNF_MEDIA_AUI:
+                result = lp->adapter_cnf & A_CNF_AUI;
+                break;
+        case A_CNF_MEDIA_10B_2:
+                result = lp->adapter_cnf & A_CNF_10B_2;
+                break;
+        default:
+                result = lp->adapter_cnf & (A_CNF_10B_T |
+                                            A_CNF_AUI |
+                                            A_CNF_10B_2);
+        }
+        if (!result) {
+                pr_err("%s: EEPROM is configured for unavailable media\n",
+                       dev->name);
 release_dma:
 #if ALLOW_DMA
                 free_dma(dev->dma);
 release_irq:
                 release_dma_buff(lp);
 #endif
-                writereg(dev, PP_LineCTL, readreg(dev, PP_LineCTL) & ~(SERIAL_TX_ON | SERIAL_RX_ON));
-                free_irq(dev->irq, dev);
+                writereg(dev, PP_LineCTL,
+                         readreg(dev, PP_LineCTL) & ~(SERIAL_TX_ON | SERIAL_RX_ON));
+                free_irq(dev->irq, dev);
                 ret = -EAGAIN;
                 goto bad_out;
         }
 
-        /* set the hardware to the configured choice */
-        switch(lp->adapter_cnf & A_CNF_MEDIA_TYPE) {
+        /* set the hardware to the configured choice */
+        switch (lp->adapter_cnf & A_CNF_MEDIA_TYPE) {
         case A_CNF_MEDIA_10B_T:
-                result = detect_tp(dev);
-                if (result==DETECTED_NONE) {
-                        printk(KERN_WARNING "%s: 10Base-T (RJ-45) has no cable\n", dev->name);
-                        if (lp->auto_neg_cnf & IMM_BIT) /* check "ignore missing media" bit */
-                                result = DETECTED_RJ45H; /* Yes! I don't care if I see a link pulse */
-                }
+                result = detect_tp(dev);
+                if (result == DETECTED_NONE) {
+                        pr_warn("%s: 10Base-T (RJ-45) has no cable\n",
+                                dev->name);
+                        if (lp->auto_neg_cnf & IMM_BIT) /* check "ignore missing media" bit */
+                                result = DETECTED_RJ45H; /* Yes! I don't care if I see a link pulse */
+                }
                 break;
         case A_CNF_MEDIA_AUI:
-                result = detect_aui(dev);
-                if (result==DETECTED_NONE) {
-                        printk(KERN_WARNING "%s: 10Base-5 (AUI) has no cable\n", dev->name);
-                        if (lp->auto_neg_cnf & IMM_BIT) /* check "ignore missing media" bit */
-                                result = DETECTED_AUI; /* Yes! I don't care if I see a carrrier */
-                }
+                result = detect_aui(dev);
+                if (result == DETECTED_NONE) {
+                        pr_warn("%s: 10Base-5 (AUI) has no cable\n", dev->name);
+                        if (lp->auto_neg_cnf & IMM_BIT) /* check "ignore missing media" bit */
+                                result = DETECTED_AUI; /* Yes! I don't care if I see a carrrier */
+                }
                 break;
         case A_CNF_MEDIA_10B_2:
-                result = detect_bnc(dev);
-                if (result==DETECTED_NONE) {
-                        printk(KERN_WARNING "%s: 10Base-2 (BNC) has no cable\n", dev->name);
-                        if (lp->auto_neg_cnf & IMM_BIT) /* check "ignore missing media" bit */
-                                result = DETECTED_BNC; /* Yes! I don't care if I can xmit a packet */
-                }
+                result = detect_bnc(dev);
+                if (result == DETECTED_NONE) {
+                        pr_warn("%s: 10Base-2 (BNC) has no cable\n", dev->name);
+                        if (lp->auto_neg_cnf & IMM_BIT) /* check "ignore missing media" bit */
+                                result = DETECTED_BNC; /* Yes! I don't care if I can xmit a packet */
+                }
                 break;
         case A_CNF_MEDIA_AUTO:
                 writereg(dev, PP_LineCTL, lp->linectl | AUTO_AUI_10BASET);
-                if (lp->adapter_cnf & A_CNF_10B_T)
-                        if ((result = detect_tp(dev)) != DETECTED_NONE)
+                if (lp->adapter_cnf & A_CNF_10B_T) {
+                        result = detect_tp(dev);
+                        if (result != DETECTED_NONE)
                                 break;
-                if (lp->adapter_cnf & A_CNF_AUI)
-                        if ((result = detect_aui(dev)) != DETECTED_NONE)
+                }
+                if (lp->adapter_cnf & A_CNF_AUI) {
+                        result = detect_aui(dev);
+                        if (result != DETECTED_NONE)
                                 break;
-                if (lp->adapter_cnf & A_CNF_10B_2)
-                        if ((result = detect_bnc(dev)) != DETECTED_NONE)
+                }
+                if (lp->adapter_cnf & A_CNF_10B_2) {
+                        result = detect_bnc(dev);
+                        if (result != DETECTED_NONE)
                                 break;
-                printk(KERN_ERR "%s: no media detected\n", dev->name);
+                }
+                pr_err("%s: no media detected\n", dev->name);
                 goto release_dma;
         }
-        switch(result) {
+        switch (result) {
         case DETECTED_NONE:
-                printk(KERN_ERR "%s: no network cable attached to configured media\n", dev->name);
+                pr_err("%s: no network cable attached to configured media\n",
+                       dev->name);
                 goto release_dma;
         case DETECTED_RJ45H:
-                printk(KERN_INFO "%s: using half-duplex 10Base-T (RJ-45)\n", dev->name);
+                pr_info("%s: using half-duplex 10Base-T (RJ-45)\n", dev->name);
                 break;
         case DETECTED_RJ45F:
-                printk(KERN_INFO "%s: using full-duplex 10Base-T (RJ-45)\n", dev->name);
+                pr_info("%s: using full-duplex 10Base-T (RJ-45)\n", dev->name);
                 break;
         case DETECTED_AUI:
-                printk(KERN_INFO "%s: using 10Base-5 (AUI)\n", dev->name);
+                pr_info("%s: using 10Base-5 (AUI)\n", dev->name);
                 break;
         case DETECTED_BNC:
-                printk(KERN_INFO "%s: using 10Base-2 (BNC)\n", dev->name);
+                pr_info("%s: using 10Base-2 (BNC)\n", dev->name);
                 break;
         }
 
         /* Turn on both receive and transmit operations */
-        writereg(dev, PP_LineCTL, readreg(dev, PP_LineCTL) | SERIAL_RX_ON | SERIAL_TX_ON);
+        writereg(dev, PP_LineCTL,
+                 readreg(dev, PP_LineCTL) | SERIAL_RX_ON | SERIAL_TX_ON);
 
         /* Receive only error free packets addressed to this card */
         lp->rx_mode = 0;
@@ -1405,358 +1101,653 @@ release_irq:
 #endif
         writereg(dev, PP_RxCFG, lp->curr_rx_cfg);
 
-        writereg(dev, PP_TxCFG, TX_LOST_CRS_ENBL | TX_SQE_ERROR_ENBL | TX_OK_ENBL |
-                TX_LATE_COL_ENBL | TX_JBR_ENBL | TX_ANY_COL_ENBL | TX_16_COL_ENBL);
+        writereg(dev, PP_TxCFG, (TX_LOST_CRS_ENBL |
+                                 TX_SQE_ERROR_ENBL |
+                                 TX_OK_ENBL |
+                                 TX_LATE_COL_ENBL |
+                                 TX_JBR_ENBL |
+                                 TX_ANY_COL_ENBL |
+                                 TX_16_COL_ENBL));
 
-        writereg(dev, PP_BufCFG, READY_FOR_TX_ENBL | RX_MISS_COUNT_OVRFLOW_ENBL |
+        writereg(dev, PP_BufCFG, (READY_FOR_TX_ENBL |
+                                  RX_MISS_COUNT_OVRFLOW_ENBL |
 #if ALLOW_DMA
-                dma_bufcfg(dev) |
+                                  dma_bufcfg(dev) |
 #endif
-                TX_COL_COUNT_OVRFLOW_ENBL | TX_UNDERRUN_ENBL);
+                                  TX_COL_COUNT_OVRFLOW_ENBL |
+                                  TX_UNDERRUN_ENBL));
 
         /* now that we've got our act together, enable everything */
-        writereg(dev, PP_BusCTL, ENABLE_IRQ
-                 | (dev->mem_start?MEMORY_ON : 0) /* turn memory on */
+        writereg(dev, PP_BusCTL, (ENABLE_IRQ
+                                  | (dev->mem_start ? MEMORY_ON : 0) /* turn memory on */
 #if ALLOW_DMA
-                 | dma_busctl(dev)
+                                  | dma_busctl(dev)
 #endif
-                 );
-        netif_start_queue(dev);
-        if (net_debug > 1)
-                printk("cs89x0: net_open() succeeded\n");
+                         ));
+        netif_start_queue(dev);
+        cs89_dbg(1, debug, "net_open() succeeded\n");
         return 0;
 bad_out:
         return ret;
 }
 
+/* The inverse routine to net_open(). */
+static int
+net_close(struct net_device *dev)
+{
+#if ALLOW_DMA
+        struct net_local *lp = netdev_priv(dev);
+#endif
+
+        netif_stop_queue(dev);
+
+        writereg(dev, PP_RxCFG, 0);
+        writereg(dev, PP_TxCFG, 0);
+        writereg(dev, PP_BufCFG, 0);
+        writereg(dev, PP_BusCTL, 0);
+
+        free_irq(dev->irq, dev);
+
+#if ALLOW_DMA
+        if (lp->use_dma && lp->dma) {
+                free_dma(dev->dma);
+                release_dma_buff(lp);
+        }
+#endif
+
+        /* Update the statistics here. */
+        return 0;
+}
+
+/* Get the current statistics.
+ * This may be called with the card open or closed.
+ */
+static struct net_device_stats *
+net_get_stats(struct net_device *dev)
+{
+        struct net_local *lp = netdev_priv(dev);
+        unsigned long flags;
+
+        spin_lock_irqsave(&lp->lock, flags);
+        /* Update the statistics from the device registers. */
+        dev->stats.rx_missed_errors += (readreg(dev, PP_RxMiss) >> 6);
+        dev->stats.collisions += (readreg(dev, PP_TxCol) >> 6);
+        spin_unlock_irqrestore(&lp->lock, flags);
+
+        return &dev->stats;
+}
+
 static void net_timeout(struct net_device *dev)
 {
         /* If we get here, some higher level has decided we are broken.
            There should really be a "kick me" function call instead. */
-        if (net_debug > 0) printk("%s: transmit timed out, %s?\n", dev->name,
-                   tx_done(dev) ? "IRQ conflict ?" : "network cable problem");
+        cs89_dbg(0, err, "%s: transmit timed out, %s?\n",
+                 dev->name,
+                 tx_done(dev) ? "IRQ conflict" : "network cable problem");
         /* Try to restart the adaptor. */
         netif_wake_queue(dev);
 }
 
-static netdev_tx_t net_send_packet(struct sk_buff *skb,struct net_device *dev)
+static netdev_tx_t net_send_packet(struct sk_buff *skb, struct net_device *dev)
 {
         struct net_local *lp = netdev_priv(dev);
         unsigned long flags;
 
-        if (net_debug > 3) {
-                printk("%s: sent %d byte packet of type %x\n",
-                        dev->name, skb->len,
-                        (skb->data[ETH_ALEN+ETH_ALEN] << 8) | skb->data[ETH_ALEN+ETH_ALEN+1]);
-        }
+        cs89_dbg(3, debug, "%s: sent %d byte packet of type %x\n",
+                 dev->name, skb->len,
+                 ((skb->data[ETH_ALEN + ETH_ALEN] << 8) |
+                  skb->data[ETH_ALEN + ETH_ALEN + 1]));
 
         /* keep the upload from being interrupted, since we
-                  ask the chip to start transmitting before the
-                  whole packet has been completely uploaded. */
+         * ask the chip to start transmitting before the
+         * whole packet has been completely uploaded.
+         */
 
         spin_lock_irqsave(&lp->lock, flags);
         netif_stop_queue(dev);
 
         /* initiate a transmit sequence */
-        writeword(dev->base_addr, TX_CMD_PORT, lp->send_cmd);
-        writeword(dev->base_addr, TX_LEN_PORT, skb->len);
+        iowrite16(lp->send_cmd, lp->virt_addr + TX_CMD_PORT);
+        iowrite16(skb->len, lp->virt_addr + TX_LEN_PORT);
 
         /* Test to see if the chip has allocated memory for the packet */
         if ((readreg(dev, PP_BusST) & READY_FOR_TX_NOW) == 0) {
-                /*
-                 * Gasp!  It hasn't.  But that shouldn't happen since
+                /* Gasp!  It hasn't.  But that shouldn't happen since
                  * we're waiting for TxOk, so return 1 and requeue this packet.
                  */
 
                 spin_unlock_irqrestore(&lp->lock, flags);
-                if (net_debug) printk("cs89x0: Tx buffer not free!\n");
+                cs89_dbg(0, err, "Tx buffer not free!\n");
                 return NETDEV_TX_BUSY;
         }
         /* Write the contents of the packet */
-        writewords(dev->base_addr, TX_FRAME_PORT,skb->data,(skb->len+1) >>1);
+        writewords(lp, TX_FRAME_PORT, skb->data, (skb->len + 1) >> 1);
         spin_unlock_irqrestore(&lp->lock, flags);
         dev->stats.tx_bytes += skb->len;
-        dev_kfree_skb (skb);
+        dev_kfree_skb(skb);
 
-        /*
-         * We DO NOT call netif_wake_queue() here.
+        /* We DO NOT call netif_wake_queue() here.
          * We also DO NOT call netif_start_queue().
          *
          * Either of these would cause another bottom half run through
-         * net_send_packet() before this packet has fully gone out.  That causes
-         * us to hit the "Gasp!" above and the send is rescheduled.  it runs like
-         * a dog.  We just return and wait for the Tx completion interrupt handler
-         * to restart the netdevice layer
+         * net_send_packet() before this packet has fully gone out.
+         * That causes us to hit the "Gasp!" above and the send is rescheduled.
+         * it runs like a dog.  We just return and wait for the Tx completion
+         * interrupt handler to restart the netdevice layer
          */
 
         return NETDEV_TX_OK;
 }
 
-/* The typical workload of the driver:
-   Handle the network interface interrupts. */
+static void set_multicast_list(struct net_device *dev)
+{
+        struct net_local *lp = netdev_priv(dev);
+        unsigned long flags;
 
-static irqreturn_t net_interrupt(int irq, void *dev_id)
+        spin_lock_irqsave(&lp->lock, flags);
+        if (dev->flags & IFF_PROMISC)
+                lp->rx_mode = RX_ALL_ACCEPT;
+        else if ((dev->flags & IFF_ALLMULTI) || !netdev_mc_empty(dev))
+                /* The multicast-accept list is initialized to accept-all,
+                 * and we rely on higher-level filtering for now.
+                 */
+                lp->rx_mode = RX_MULTCAST_ACCEPT;
+        else
+                lp->rx_mode = 0;
+
+        writereg(dev, PP_RxCTL, DEF_RX_ACCEPT | lp->rx_mode);
+
+        /* in promiscuous mode, we accept errored packets,
+         * so we have to enable interrupts on them also
+         */
+        writereg(dev, PP_RxCFG,
+                 (lp->curr_rx_cfg |
+                  (lp->rx_mode == RX_ALL_ACCEPT)
+                  ? (RX_CRC_ERROR_ENBL | RX_RUNT_ENBL | RX_EXTRA_DATA_ENBL)
+                  : 0));
+        spin_unlock_irqrestore(&lp->lock, flags);
+}
+
+static int set_mac_address(struct net_device *dev, void *p)
 {
-        struct net_device *dev = dev_id;
-        struct net_local *lp;
-        int ioaddr, status;
-        int handled = 0;
+        int i;
+        struct sockaddr *addr = p;
 
-        ioaddr = dev->base_addr;
-        lp = netdev_priv(dev);
+        if (netif_running(dev))
+                return -EBUSY;
 
-        /* we MUST read all the events out of the ISQ, otherwise we'll never
-           get interrupted again.  As a consequence, we can't have any limit
-           on the number of times we loop in the interrupt handler.  The
-           hardware guarantees that eventually we'll run out of events.  Of
-           course, if you're on a slow machine, and packets are arriving
-           faster than you can read them off, you're screwed.  Hasta la
-           vista, baby!  */
-        while ((status = readword(dev->base_addr, ISQ_PORT))) {
-                if (net_debug > 4)printk("%s: event=%04x\n", dev->name, status);
-                handled = 1;
-                switch(status & ISQ_EVENT_MASK) {
-                case ISQ_RECEIVER_EVENT:
-                        /* Got a packet(s). */
-                        net_rx(dev);
-                        break;
-                case ISQ_TRANSMITTER_EVENT:
-                        dev->stats.tx_packets++;
-                        netif_wake_queue(dev);  /* Inform upper layers. */
-                        if ((status & ( TX_OK |
-                                        TX_LOST_CRS |
-                                        TX_SQE_ERROR |
-                                        TX_LATE_COL |
-                                        TX_16_COL)) != TX_OK) {
-                                if ((status & TX_OK) == 0)
-                                        dev->stats.tx_errors++;
-                                if (status & TX_LOST_CRS)
-                                        dev->stats.tx_carrier_errors++;
-                                if (status & TX_SQE_ERROR)
-                                        dev->stats.tx_heartbeat_errors++;
-                                if (status & TX_LATE_COL)
-                                        dev->stats.tx_window_errors++;
-                                if (status & TX_16_COL)
-                                        dev->stats.tx_aborted_errors++;
-                        }
-                        break;
-                case ISQ_BUFFER_EVENT:
-                        if (status & READY_FOR_TX) {
-                                /* we tried to transmit a packet earlier,
-                                   but inexplicably ran out of buffers.
-                                   That shouldn't happen since we only ever
-                                   load one packet.  Shrug.  Do the right
-                                   thing anyway. */
-                                netif_wake_queue(dev);  /* Inform upper layers. */
-                        }
-                        if (status & TX_UNDERRUN) {
-                                if (net_debug > 0) printk("%s: transmit underrun\n", dev->name);
-                                lp->send_underrun++;
-                                if (lp->send_underrun == 3) lp->send_cmd = TX_AFTER_381;
-                                else if (lp->send_underrun == 6) lp->send_cmd = TX_AFTER_ALL;
-                                /* transmit cycle is done, although
-                                   frame wasn't transmitted - this
-                                   avoids having to wait for the upper
-                                   layers to timeout on us, in the
-                                   event of a tx underrun */
-                                netif_wake_queue(dev);  /* Inform upper layers. */
-                        }
-#if ALLOW_DMA
-                        if (lp->use_dma && (status & RX_DMA)) {
-                                int count = readreg(dev, PP_DmaFrameCnt);
-                                while(count) {
-                                        if (net_debug > 5)
-                                                printk("%s: receiving %d DMA frames\n", dev->name, count);
-                                        if (net_debug > 2 && count >1)
-                                                printk("%s: receiving %d DMA frames\n", dev->name, count);
-                                        dma_rx(dev);
-                                        if (--count == 0)
-                                                count = readreg(dev, PP_DmaFrameCnt);
-                                        if (net_debug > 2 && count > 0)
-                                                printk("%s: continuing with %d DMA frames\n", dev->name, count);
-                                }
-                        }
-#endif
-                        break;
-                case ISQ_RX_MISS_EVENT:
-                        dev->stats.rx_missed_errors += (status >> 6);
-                        break;
-                case ISQ_TX_COL_EVENT:
-                        dev->stats.collisions += (status >> 6);
-                        break;
-                }
-        }
-        return IRQ_RETVAL(handled);
+        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+
+        cs89_dbg(0, debug, "%s: Setting MAC address to %pM\n",
+                 dev->name, dev->dev_addr);
+
+        /* set the Ethernet address */
+        for (i = 0; i < ETH_ALEN / 2; i++)
+                writereg(dev, PP_IA + i * 2,
+                         (dev->dev_addr[i * 2] |
+                          (dev->dev_addr[i * 2 + 1] << 8)));
+
+        return 0;
 }
 
-static void
-count_rx_errors(int status, struct net_device *dev)
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*
+ * Polling receive - used by netconsole and other diagnostic tools
+ * to allow network i/o with interrupts disabled.
+ */
+static void net_poll_controller(struct net_device *dev)
 {
-        dev->stats.rx_errors++;
-        if (status & RX_RUNT)
-                dev->stats.rx_length_errors++;
-        if (status & RX_EXTRA_DATA)
-                dev->stats.rx_length_errors++;
-        if ((status & RX_CRC_ERROR) && !(status & (RX_EXTRA_DATA|RX_RUNT)))
-                /* per str 172 */
-                dev->stats.rx_crc_errors++;
-        if (status & RX_DRIBBLE)
-                dev->stats.rx_frame_errors++;
+        disable_irq(dev->irq);
+        net_interrupt(dev->irq, dev);
+        enable_irq(dev->irq);
 }
+#endif
 
-/* We have a good packet(s), get it/them out of the buffers. */
-static void
-net_rx(struct net_device *dev)
+static const struct net_device_ops net_ops = {
+        .ndo_open               = net_open,
+        .ndo_stop               = net_close,
+        .ndo_tx_timeout         = net_timeout,
+        .ndo_start_xmit         = net_send_packet,
+        .ndo_get_stats          = net_get_stats,
+        .ndo_set_rx_mode        = set_multicast_list,
+        .ndo_set_mac_address    = set_mac_address,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        .ndo_poll_controller    = net_poll_controller,
+#endif
+        .ndo_change_mtu         = eth_change_mtu,
+        .ndo_validate_addr      = eth_validate_addr,
+};
+
+static void __init reset_chip(struct net_device *dev)
 {
-        struct sk_buff *skb;
-        int status, length;
+#if !defined(CONFIG_MACH_MX31ADS)
+#if !defined(CS89x0_NONISA_IRQ)
+        struct net_local *lp = netdev_priv(dev);
+#endif /* CS89x0_NONISA_IRQ */
+        int reset_start_time;
 
-        int ioaddr = dev->base_addr;
-        status = readword(ioaddr, RX_FRAME_PORT);
-        length = readword(ioaddr, RX_FRAME_PORT);
+        writereg(dev, PP_SelfCTL, readreg(dev, PP_SelfCTL) | POWER_ON_RESET);
 
-        if ((status & RX_OK) == 0) {
-                count_rx_errors(status, dev);
-                return;
+        /* wait 30 ms */
+        msleep(30);
+
+#if !defined(CS89x0_NONISA_IRQ)
+        if (lp->chip_type != CS8900) {
+                /* Hardware problem requires PNP registers to be reconfigured after a reset */
+                iowrite16(PP_CS8920_ISAINT, lp->virt_addr + ADD_PORT);
+                iowrite8(dev->irq, lp->virt_addr + DATA_PORT);
+                iowrite8(0, lp->virt_addr + DATA_PORT + 1);
+
+                iowrite16(PP_CS8920_ISAMemB, lp->virt_addr + ADD_PORT);
+                iowrite8((dev->mem_start >> 16) & 0xff,
+                         lp->virt_addr + DATA_PORT);
+                iowrite8((dev->mem_start >> 8) & 0xff,
+                         lp->virt_addr + DATA_PORT + 1);
         }
+#endif /* CS89x0_NONISA_IRQ */
 
-        /* Malloc up new buffer. */
-        skb = netdev_alloc_skb(dev, length + 2);
-        if (skb == NULL) {
-#if 0           /* Again, this seems a cruel thing to do */
-                printk(KERN_WARNING "%s: Memory squeeze, dropping packet.\n", dev->name);
+        /* Wait until the chip is reset */
+        reset_start_time = jiffies;
+        while ((readreg(dev, PP_SelfST) & INIT_DONE) == 0 &&
+               jiffies - reset_start_time < 2)
+                ;
+#endif /* !CONFIG_MACH_MX31ADS */
+}
+
+/* This is the real probe routine.
+ * Linux has a history of friendly device probes on the ISA bus.
+ * A good device probes avoids doing writes, and
+ * verifies that the correct device exists and functions.
+ * Return 0 on success.
+ */
+static int __init
+cs89x0_probe1(struct net_device *dev, void __iomem *ioaddr, int modular)
+{
+        struct net_local *lp = netdev_priv(dev);
+        int i;
+        int tmp;
+        unsigned rev_type = 0;
+        int eeprom_buff[CHKSUM_LEN];
+        int retval;
+
+        /* Initialize the device structure. */
+        if (!modular) {
+                memset(lp, 0, sizeof(*lp));
+                spin_lock_init(&lp->lock);
+#ifndef MODULE
+#if ALLOW_DMA
+                if (g_cs89x0_dma) {
+                        lp->use_dma = 1;
+                        lp->dma = g_cs89x0_dma;
+                        lp->dmasize = 16;       /* Could make this an option... */
+                }
+#endif
+                lp->force = g_cs89x0_media__force;
 #endif
-                dev->stats.rx_dropped++;
-                return;
         }
-        skb_reserve(skb, 2);    /* longword align L3 header */
 
-        readwords(ioaddr, RX_FRAME_PORT, skb_put(skb, length), length >> 1);
-        if (length & 1)
-                skb->data[length-1] = readword(ioaddr, RX_FRAME_PORT);
+        pr_debug("PP_addr at %p[%x]: 0x%x\n",
+                 ioaddr, ADD_PORT, ioread16(ioaddr + ADD_PORT));
+        iowrite16(PP_ChipID, ioaddr + ADD_PORT);
 
-        if (net_debug > 3) {
-                printk( "%s: received %d byte packet of type %x\n",
-                        dev->name, length,
-                        (skb->data[ETH_ALEN+ETH_ALEN] << 8) | skb->data[ETH_ALEN+ETH_ALEN+1]);
+        tmp = ioread16(ioaddr + DATA_PORT);
+        if (tmp != CHIP_EISA_ID_SIG) {
+                pr_debug("%s: incorrect signature at %p[%x]: 0x%x!="
+                         CHIP_EISA_ID_SIG_STR "\n",
+                         dev->name, ioaddr, DATA_PORT, tmp);
+                retval = -ENODEV;
+                goto out1;
         }
 
-        skb->protocol=eth_type_trans(skb,dev);
-        netif_rx(skb);
-        dev->stats.rx_packets++;
-        dev->stats.rx_bytes += length;
-}
+        lp->virt_addr = ioaddr;
 
-#if ALLOW_DMA
-static void release_dma_buff(struct net_local *lp)
-{
-        if (lp->dma_buff) {
-                free_pages((unsigned long)(lp->dma_buff), get_order(lp->dmasize * 1024));
-                lp->dma_buff = NULL;
+        /* get the chip type */
+        rev_type = readreg(dev, PRODUCT_ID_ADD);
+        lp->chip_type = rev_type & ~REVISON_BITS;
+        lp->chip_revision = ((rev_type & REVISON_BITS) >> 8) + 'A';
+
+        /* Check the chip type and revision in order to set the correct
+         * send command.  CS8920 revision C and CS8900 revision F can use
+         * the faster send.
+         */
+        lp->send_cmd = TX_AFTER_381;
+        if (lp->chip_type == CS8900 && lp->chip_revision >= 'F')
+                lp->send_cmd = TX_NOW;
+        if (lp->chip_type != CS8900 && lp->chip_revision >= 'C')
+                lp->send_cmd = TX_NOW;
+
+        pr_info_once("%s\n", version);
+
+        pr_info("%s: cs89%c0%s rev %c found at %p ",
+                dev->name,
+                lp->chip_type == CS8900  ? '0' : '2',
+                lp->chip_type == CS8920M ? "M" : "",
+                lp->chip_revision,
+                lp->virt_addr);
+
+        reset_chip(dev);
+
+        /* Here we read the current configuration of the chip.
+         * If there is no Extended EEPROM then the idea is to not disturb
+         * the chip configuration, it should have been correctly setup by
+         * automatic EEPROM read on reset. So, if the chip says it read
+         * the EEPROM the driver will always do *something* instead of
+         * complain that adapter_cnf is 0.
+         */
+
+        if ((readreg(dev, PP_SelfST) & (EEPROM_OK | EEPROM_PRESENT)) ==
+            (EEPROM_OK | EEPROM_PRESENT)) {
+                /* Load the MAC. */
+                for (i = 0; i < ETH_ALEN / 2; i++) {
+                        unsigned int Addr;
+                        Addr = readreg(dev, PP_IA + i * 2);
+                        dev->dev_addr[i * 2] = Addr & 0xFF;
+                        dev->dev_addr[i * 2 + 1] = Addr >> 8;
+                }
+
+                /* Load the Adapter Configuration.
+                 * Note:  Barring any more specific information from some
+                 * other source (ie EEPROM+Schematics), we would not know
+                 * how to operate a 10Base2 interface on the AUI port.
+                 * However, since we  do read the status of HCB1 and use
+                 * settings that always result in calls to control_dc_dc(dev,0)
+                 * a BNC interface should work if the enable pin
+                 * (dc/dc converter) is on HCB1.
+                 * It will be called AUI however.
+                 */
+
+                lp->adapter_cnf = 0;
+                i = readreg(dev, PP_LineCTL);
+                /* Preserve the setting of the HCB1 pin. */
+                if ((i & (HCB1 | HCB1_ENBL)) == (HCB1 | HCB1_ENBL))
+                        lp->adapter_cnf |= A_CNF_DC_DC_POLARITY;
+                /* Save the sqelch bit */
+                if ((i & LOW_RX_SQUELCH) == LOW_RX_SQUELCH)
+                        lp->adapter_cnf |= A_CNF_EXTND_10B_2 | A_CNF_LOW_RX_SQUELCH;
+                /* Check if the card is in 10Base-t only mode */
+                if ((i & (AUI_ONLY | AUTO_AUI_10BASET)) == 0)
+                        lp->adapter_cnf |=  A_CNF_10B_T | A_CNF_MEDIA_10B_T;
+                /* Check if the card is in AUI only mode */
+                if ((i & (AUI_ONLY | AUTO_AUI_10BASET)) == AUI_ONLY)
+                        lp->adapter_cnf |=  A_CNF_AUI | A_CNF_MEDIA_AUI;
+                /* Check if the card is in Auto mode. */
+                if ((i & (AUI_ONLY | AUTO_AUI_10BASET)) == AUTO_AUI_10BASET)
+                        lp->adapter_cnf |=  A_CNF_AUI | A_CNF_10B_T |
+                                A_CNF_MEDIA_AUI | A_CNF_MEDIA_10B_T | A_CNF_MEDIA_AUTO;
+
+                cs89_dbg(1, info, "%s: PP_LineCTL=0x%x, adapter_cnf=0x%x\n",
+                         dev->name, i, lp->adapter_cnf);
+
+                /* IRQ. Other chips already probe, see below. */
+                if (lp->chip_type == CS8900)
+                        lp->isa_config = readreg(dev, PP_CS8900_ISAINT) & INT_NO_MASK;
+
+                pr_cont("[Cirrus EEPROM] ");
         }
-}
-#endif
 
-/* The inverse routine to net_open(). */
-static int
-net_close(struct net_device *dev)
-{
-#if ALLOW_DMA
-        struct net_local *lp = netdev_priv(dev);
-#endif
+        pr_cont("\n");
 
-        netif_stop_queue(dev);
+        /* First check to see if an EEPROM is attached. */
 
-        writereg(dev, PP_RxCFG, 0);
-        writereg(dev, PP_TxCFG, 0);
-        writereg(dev, PP_BufCFG, 0);
-        writereg(dev, PP_BusCTL, 0);
+        if ((readreg(dev, PP_SelfST) & EEPROM_PRESENT) == 0)
+                pr_warn("No EEPROM, relying on command line....\n");
+        else if (get_eeprom_data(dev, START_EEPROM_DATA, CHKSUM_LEN, eeprom_buff) < 0) {
+                pr_warn("EEPROM read failed, relying on command line\n");
+        } else if (get_eeprom_cksum(START_EEPROM_DATA, CHKSUM_LEN, eeprom_buff) < 0) {
+                /* Check if the chip was able to read its own configuration starting
+                   at 0 in the EEPROM*/
+                if ((readreg(dev, PP_SelfST) & (EEPROM_OK | EEPROM_PRESENT)) !=
+                    (EEPROM_OK | EEPROM_PRESENT))
+                        pr_warn("Extended EEPROM checksum bad and no Cirrus EEPROM, relying on command line\n");
 
-        free_irq(dev->irq, dev);
+        } else {
+                /* This reads an extended EEPROM that is not documented
+                 * in the CS8900 datasheet.
+                 */
 
-#if ALLOW_DMA
-        if (lp->use_dma && lp->dma) {
-                free_dma(dev->dma);
-                release_dma_buff(lp);
+                /* get transmission control word  but keep the autonegotiation bits */
+                if (!lp->auto_neg_cnf)
+                        lp->auto_neg_cnf = eeprom_buff[AUTO_NEG_CNF_OFFSET / 2];
+                /* Store adapter configuration */
+                if (!lp->adapter_cnf)
+                        lp->adapter_cnf = eeprom_buff[ADAPTER_CNF_OFFSET / 2];
+                /* Store ISA configuration */
+                lp->isa_config = eeprom_buff[ISA_CNF_OFFSET / 2];
+                dev->mem_start = eeprom_buff[PACKET_PAGE_OFFSET / 2] << 8;
+
+                /* eeprom_buff has 32-bit ints, so we can't just memcpy it */
+                /* store the initial memory base address */
+                for (i = 0; i < ETH_ALEN / 2; i++) {
+                        dev->dev_addr[i * 2] = eeprom_buff[i];
+                        dev->dev_addr[i * 2 + 1] = eeprom_buff[i] >> 8;
+                }
+                cs89_dbg(1, debug, "%s: new adapter_cnf: 0x%x\n",
+                         dev->name, lp->adapter_cnf);
         }
+
+        /* allow them to force multiple transceivers.  If they force multiple, autosense */
+        {
+                int count = 0;
+                if (lp->force & FORCE_RJ45) {
+                        lp->adapter_cnf |= A_CNF_10B_T;
+                        count++;
+                }
+                if (lp->force & FORCE_AUI) {
+                        lp->adapter_cnf |= A_CNF_AUI;
+                        count++;
+                }
+                if (lp->force & FORCE_BNC) {
+                        lp->adapter_cnf |= A_CNF_10B_2;
+                        count++;
+                }
+                if (count > 1)
+                        lp->adapter_cnf |= A_CNF_MEDIA_AUTO;
+                else if (lp->force & FORCE_RJ45)
+                        lp->adapter_cnf |= A_CNF_MEDIA_10B_T;
+                else if (lp->force & FORCE_AUI)
+                        lp->adapter_cnf |= A_CNF_MEDIA_AUI;
+                else if (lp->force & FORCE_BNC)
+                        lp->adapter_cnf |= A_CNF_MEDIA_10B_2;
+        }
+
+        cs89_dbg(1, debug, "%s: after force 0x%x, adapter_cnf=0x%x\n",
+                 dev->name, lp->force, lp->adapter_cnf);
+
+        /* FIXME: We don't let you set dc-dc polarity or low RX squelch from the command line: add it here */
+
+        /* FIXME: We don't let you set the IMM bit from the command line: add it to lp->auto_neg_cnf here */
+
+        /* FIXME: we don't set the Ethernet address on the command line.  Use
+         * ifconfig IFACE hw ether AABBCCDDEEFF
+         */
+
+        pr_info("media %s%s%s",
+                (lp->adapter_cnf & A_CNF_10B_T) ? "RJ-45," : "",
+                (lp->adapter_cnf & A_CNF_AUI) ? "AUI," : "",
+                (lp->adapter_cnf & A_CNF_10B_2) ? "BNC," : "");
+
+        lp->irq_map = 0xffff;
+
+        /* If this is a CS8900 then no pnp soft */
+        if (lp->chip_type != CS8900 &&
+            /* Check if the ISA IRQ has been set  */
+            (i = readreg(dev, PP_CS8920_ISAINT) & 0xff,
+             (i != 0 && i < CS8920_NO_INTS))) {
+                if (!dev->irq)
+                        dev->irq = i;
+        } else {
+                i = lp->isa_config & INT_NO_MASK;
+#ifndef CONFIG_CS89x0_PLATFORM
+                if (lp->chip_type == CS8900) {
+#ifdef CS89x0_NONISA_IRQ
+                        i = cs8900_irq_map[0];
+#else
+                        /* Translate the IRQ using the IRQ mapping table. */
+                        if (i >= ARRAY_SIZE(cs8900_irq_map))
+                                pr_err("invalid ISA interrupt number %d\n", i);
+                        else
+                                i = cs8900_irq_map[i];
+
+                        lp->irq_map = CS8900_IRQ_MAP; /* fixed IRQ map for CS8900 */
+                } else {
+                        int irq_map_buff[IRQ_MAP_LEN/2];
+
+                        if (get_eeprom_data(dev, IRQ_MAP_EEPROM_DATA,
+                                            IRQ_MAP_LEN / 2,
+                                            irq_map_buff) >= 0) {
+                                if ((irq_map_buff[0] & 0xff) == PNP_IRQ_FRMT)
+                                        lp->irq_map = ((irq_map_buff[0] >> 8) |
+                                                       (irq_map_buff[1] << 8));
+                        }
 #endif
+                }
+#endif
+                if (!dev->irq)
+                        dev->irq = i;
+        }
 
-        /* Update the statistics here. */
-        return 0;
-}
+        pr_cont(" IRQ %d", dev->irq);
 
-/* Get the current statistics.  This may be called with the card open or
-   closed. */
-static struct net_device_stats *
-net_get_stats(struct net_device *dev)
-{
-        struct net_local *lp = netdev_priv(dev);
-        unsigned long flags;
+#if ALLOW_DMA
+        if (lp->use_dma) {
+                get_dma_channel(dev);
+                pr_cont(", DMA %d", dev->dma);
+        } else
+#endif
+                pr_cont(", programmed I/O");
 
-        spin_lock_irqsave(&lp->lock, flags);
-        /* Update the statistics from the device registers. */
-        dev->stats.rx_missed_errors += (readreg(dev, PP_RxMiss) >> 6);
-        dev->stats.collisions += (readreg(dev, PP_TxCol) >> 6);
-        spin_unlock_irqrestore(&lp->lock, flags);
+        /* print the ethernet address. */
+        pr_cont(", MAC %pM\n", dev->dev_addr);
 
-        return &dev->stats;
+        dev->netdev_ops = &net_ops;
+        dev->watchdog_timeo = HZ;
+
+        cs89_dbg(0, info, "cs89x0_probe1() successful\n");
+
+        retval = register_netdev(dev);
+        if (retval)
+                goto out2;
+        return 0;
+out2:
+        iowrite16(PP_ChipID, lp->virt_addr + ADD_PORT);
+out1:
+        return retval;
 }
 
-static void set_multicast_list(struct net_device *dev)
+#ifndef CONFIG_CS89x0_PLATFORM
+/*
+ * This function converts the I/O port addres used by the cs89x0_probe() and
+ * init_module() functions to the I/O memory address used by the
+ * cs89x0_probe1() function.
+ */
+static int __init
+cs89x0_ioport_probe(struct net_device *dev, unsigned long ioport, int modular)
 {
         struct net_local *lp = netdev_priv(dev);
-        unsigned long flags;
+        int ret;
+        void __iomem *io_mem;
 
-        spin_lock_irqsave(&lp->lock, flags);
-        if(dev->flags&IFF_PROMISC)
-        {
-                lp->rx_mode = RX_ALL_ACCEPT;
+        if (!lp)
+                return -ENOMEM;
+
+        dev->base_addr = ioport;
+
+        if (!request_region(ioport, NETCARD_IO_EXTENT, DRV_NAME)) {
+                ret = -EBUSY;
+                goto out;
         }
-        else if ((dev->flags & IFF_ALLMULTI) || !netdev_mc_empty(dev))
-        {
-                /* The multicast-accept list is initialized to accept-all, and we
-                   rely on higher-level filtering for now. */
-                lp->rx_mode = RX_MULTCAST_ACCEPT;
+
+        io_mem = ioport_map(ioport & ~3, NETCARD_IO_EXTENT);
+        if (!io_mem) {
+                ret = -ENOMEM;
+                goto release;
         }
-        else
-                lp->rx_mode = 0;
 
-        writereg(dev, PP_RxCTL, DEF_RX_ACCEPT | lp->rx_mode);
+        /* if they give us an odd I/O address, then do ONE write to
+         * the address port, to get it back to address zero, where we
+         * expect to find the EISA signature word. An IO with a base of 0x3
+         * will skip the test for the ADD_PORT.
+         */
+        if (ioport & 1) {
+                cs89_dbg(1, info, "%s: odd ioaddr 0x%lx\n", dev->name, ioport);
+                if ((ioport & 2) != 2) {
+                        if ((ioread16(io_mem + ADD_PORT) & ADD_MASK) !=
+                            ADD_SIG) {
+                                pr_err("%s: bad signature 0x%x\n",
+                                       dev->name, ioread16(io_mem + ADD_PORT));
+                                ret = -ENODEV;
+                                goto unmap;
+                        }
+                }
+        }
 
-        /* in promiscuous mode, we accept errored packets, so we have to enable interrupts on them also */
-        writereg(dev, PP_RxCFG, lp->curr_rx_cfg |
-             (lp->rx_mode == RX_ALL_ACCEPT? (RX_CRC_ERROR_ENBL|RX_RUNT_ENBL|RX_EXTRA_DATA_ENBL) : 0));
-        spin_unlock_irqrestore(&lp->lock, flags);
+        ret = cs89x0_probe1(dev, io_mem, modular);
+        if (!ret)
+                goto out;
+unmap:
+        ioport_unmap(io_mem);
+release:
+        release_region(ioport, NETCARD_IO_EXTENT);
+out:
+        return ret;
 }
 
+#ifndef MODULE
+/* Check for a network adaptor of this type, and return '0' iff one exists.
+ * If dev->base_addr == 0, probe all likely locations.
+ * If dev->base_addr == 1, always return failure.
+ * If dev->base_addr == 2, allocate space for the device and return success
+ * (detachable devices only).
+ * Return 0 on success.
+ */
 
-static int set_mac_address(struct net_device *dev, void *p)
+struct net_device * __init cs89x0_probe(int unit)
 {
-        int i;
-        struct sockaddr *addr = p;
-
-        if (netif_running(dev))
-                return -EBUSY;
+        struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
+        unsigned *port;
+        int err = 0;
+        int irq;
+        int io;
 
-        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+        if (!dev)
+                return ERR_PTR(-ENODEV);
 
-        if (net_debug)
-                printk("%s: Setting MAC address to %pM.\n",
-                       dev->name, dev->dev_addr);
+        sprintf(dev->name, "eth%d", unit);
+        netdev_boot_setup_check(dev);
+        io = dev->base_addr;
+        irq = dev->irq;
 
-        /* set the Ethernet address */
-        for (i=0; i < ETH_ALEN/2; i++)
-                writereg(dev, PP_IA+i*2, dev->dev_addr[i*2] | (dev->dev_addr[i*2+1] << 8));
+        cs89_dbg(0, info, "cs89x0_probe(0x%x)\n", io);
 
-        return 0;
+        if (io > 0x1ff) {       /* Check a single specified location. */
+                err = cs89x0_ioport_probe(dev, io, 0);
+        } else if (io != 0) {   /* Don't probe at all. */
+                err = -ENXIO;
+        } else {
+                for (port = netcard_portlist; *port; port++) {
+                        if (cs89x0_ioport_probe(dev, *port, 0) == 0)
+                                break;
+                        dev->irq = irq;
+                }
+                if (!*port)
+                        err = -ENODEV;
+        }
+        if (err)
+                goto out;
+        return dev;
+out:
+        free_netdev(dev);
+        pr_warn("no cs8900 or cs8920 detected.  Be sure to disable PnP with SETUP\n");
+        return ERR_PTR(err);
 }
+#endif
+#endif
 
 #if defined(MODULE) && !defined(CONFIG_CS89x0_PLATFORM)
 
 static struct net_device *dev_cs89x0;
 
-/*
- * Support the 'debug' module parm even if we're compiled for non-debug to
+/* Support the 'debug' module parm even if we're compiled for non-debug to
  * avoid breaking someone's startup scripts
  */
 
@@ -1764,11 +1755,11 @@ static int io;
 static int irq;
 static int debug;
 static char media[8];
-static int duplex=-1;
+static int duplex = -1;
 
 static int use_dma;                     /* These generate unused var warnings if ALLOW_DMA = 0 */
 static int dma;
-static int dmasize=16;                  /* or 64 */
+static int dmasize = 16;                /* or 64 */
 
 module_param(io, int, 0);
 module_param(irq, int, 0);
@@ -1801,32 +1792,28 @@ MODULE_PARM_DESC(use_dma , "(ignored)");
 MODULE_AUTHOR("Mike Cruse, Russwll Nelson <nelson@crynwr.com>, Andrew Morton");
 MODULE_LICENSE("GPL");
 
-
 /*
-* media=t             - specify media type
-   or media=2
-   or media=aui
-   or medai=auto
-* duplex=0            - specify forced half/full/autonegotiate duplex
-* debug=#             - debug level
-
-
-* Default Chip Configuration:
-  * DMA Burst = enabled
-  * IOCHRDY Enabled = enabled
-    * UseSA = enabled
-    * CS8900 defaults to half-duplex if not specified on command-line
-    * CS8920 defaults to autoneg if not specified on command-line
-    * Use reset defaults for other config parameters
-
-* Assumptions:
-  * media type specified is supported (circuitry is present)
-  * if memory address is > 1MB, then required mem decode hw is present
-  * if 10B-2, then agent other than driver will enable DC/DC converter
-    (hw or software util)
-
-
-*/
+ * media=t             - specify media type
+ * or media=2
+ * or media=aui
+ * or medai=auto
+ * duplex=0            - specify forced half/full/autonegotiate duplex
+ * debug=#             - debug level
+ *
+ * Default Chip Configuration:
+ * DMA Burst = enabled
+ * IOCHRDY Enabled = enabled
+ * UseSA = enabled
+ * CS8900 defaults to half-duplex if not specified on command-line
+ * CS8920 defaults to autoneg if not specified on command-line
+ * Use reset defaults for other config parameters
+ *
+ * Assumptions:
+ * media type specified is supported (circuitry is present)
+ * if memory address is > 1MB, then required mem decode hw is present
+ * if 10B-2, then agent other than driver will enable DC/DC converter
+ * (hw or software util)
+ */
 
 int __init init_module(void)
 {
@@ -1856,8 +1843,8 @@ int __init init_module(void)
 
         spin_lock_init(&lp->lock);
 
-        /* boy, they'd better get these right */
-        if (!strcmp(media, "rj45"))
+        /* boy, they'd better get these right */
+        if (!strcmp(media, "rj45"))
                 lp->adapter_cnf = A_CNF_MEDIA_10B_T | A_CNF_10B_T;
         else if (!strcmp(media, "aui"))
                 lp->adapter_cnf = A_CNF_MEDIA_AUI   | A_CNF_AUI;
@@ -1866,27 +1853,28 @@ int __init init_module(void)
         else
                 lp->adapter_cnf = A_CNF_MEDIA_10B_T | A_CNF_10B_T;
 
-        if (duplex==-1)
+        if (duplex == -1)
                 lp->auto_neg_cnf = AUTO_NEG_ENABLE;
 
-        if (io == 0) {
-                printk(KERN_ERR "cs89x0.c: Module autoprobing not allowed.\n");
-                printk(KERN_ERR "cs89x0.c: Append io=0xNNN\n");
-                ret = -EPERM;
+        if (io == 0) {
+                pr_err("Module autoprobing not allowed\n");
+                pr_err("Append io=0xNNN\n");
+                ret = -EPERM;
                 goto out;
-        } else if (io <= 0x1ff) {
+        } else if (io <= 0x1ff) {
                 ret = -ENXIO;
                 goto out;
         }
 
 #if ALLOW_DMA
         if (use_dma && dmasize != 16 && dmasize != 64) {
-                printk(KERN_ERR "cs89x0.c: dma size must be either 16K or 64K, not %dK\n", dmasize);
+                pr_err("dma size must be either 16K or 64K, not %dK\n",
+                       dmasize);
                 ret = -EPERM;
                 goto out;
         }
 #endif
-        ret = cs89x0_probe1(dev, io, 1);
+        ret = cs89x0_ioport_probe(dev, io, 1);
         if (ret)
                 goto out;
 
@@ -1900,8 +1888,11 @@ out:
 void __exit
 cleanup_module(void)
 {
+        struct net_local *lp = netdev_priv(dev_cs89x0);
+
         unregister_netdev(dev_cs89x0);
-        writeword(dev_cs89x0->base_addr, ADD_PORT, PP_ChipID);
+        iowrite16(PP_ChipID, lp->virt_addr + ADD_PORT);
+        ioport_unmap(lp->virt_addr);
         release_region(dev_cs89x0->base_addr, NETCARD_IO_EXTENT);
         free_netdev(dev_cs89x0);
 }
@@ -1913,6 +1904,7 @@ static int __init cs89x0_platform_probe(struct platform_device *pdev)
         struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
         struct net_local *lp;
         struct resource *mem_res;
+        void __iomem *virt_addr;
         int err;
 
         if (!dev)
@@ -1923,29 +1915,28 @@ static int __init cs89x0_platform_probe(struct platform_device *pdev)
         mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         dev->irq = platform_get_irq(pdev, 0);
         if (mem_res == NULL || dev->irq <= 0) {
-                dev_warn(&dev->dev, "memory/interrupt resource missing.\n");
+                dev_warn(&dev->dev, "memory/interrupt resource missing\n");
                 err = -ENXIO;
                 goto free;
         }
 
-        lp->phys_addr = mem_res->start;
         lp->size = resource_size(mem_res);
-        if (!request_mem_region(lp->phys_addr, lp->size, DRV_NAME)) {
-                dev_warn(&dev->dev, "request_mem_region() failed.\n");
+        if (!request_mem_region(mem_res->start, lp->size, DRV_NAME)) {
+                dev_warn(&dev->dev, "request_mem_region() failed\n");
                 err = -EBUSY;
                 goto free;
         }
 
-        lp->virt_addr = ioremap(lp->phys_addr, lp->size);
-        if (!lp->virt_addr) {
-                dev_warn(&dev->dev, "ioremap() failed.\n");
+        virt_addr = ioremap(mem_res->start, lp->size);
+        if (!virt_addr) {
+                dev_warn(&dev->dev, "ioremap() failed\n");
                 err = -ENOMEM;
                 goto release;
         }
 
-        err = cs89x0_probe1(dev, (unsigned long)lp->virt_addr, 0);
+        err = cs89x0_probe1(dev, virt_addr, 0);
         if (err) {
-                dev_warn(&dev->dev, "no cs8900 or cs8920 detected.\n");
+                dev_warn(&dev->dev, "no cs8900 or cs8920 detected\n");
                 goto unmap;
         }
 
@@ -1953,9 +1944,9 @@ static int __init cs89x0_platform_probe(struct platform_device *pdev)
         return 0;
 
 unmap:
-        iounmap(lp->virt_addr);
+        iounmap(virt_addr);
 release:
-        release_mem_region(lp->phys_addr, lp->size);
+        release_mem_region(mem_res->start, lp->size);
 free:
         free_netdev(dev);
         return err;
@@ -1965,10 +1956,16 @@ static int cs89x0_platform_remove(struct platform_device *pdev)
 {
         struct net_device *dev = platform_get_drvdata(pdev);
         struct net_local *lp = netdev_priv(dev);
+        struct resource *mem_res;
 
+        /* This platform_get_resource() call will not return NULL, because
+         * the same call in cs89x0_platform_probe() has returned a non NULL
+         * value.
+         */
+        mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         unregister_netdev(dev);
         iounmap(lp->virt_addr);
-        release_mem_region(lp->phys_addr, lp->size);
+        release_mem_region(mem_res->start, lp->size);
         free_netdev(dev);
         return 0;
 }
@@ -1996,13 +1993,3 @@ static void __exit cs89x0_cleanup(void)
 module_exit(cs89x0_cleanup);
 
 #endif /* CONFIG_CS89x0_PLATFORM */
-
-/*
- * Local variables:
- *  version-control: t
- *  kept-new-versions: 5
- *  c-indent-level: 8
- *  tab-width: 8
- * End:
- *
- */
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 77b4e873f91c..8132c785cea8 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -944,8 +944,7 @@ static void enic_update_multicast_addr_list(struct enic *enic)
 
         for (i = 0; i < enic->mc_count; i++) {
                 for (j = 0; j < mc_count; j++)
-                        if (compare_ether_addr(enic->mc_addr[i],
-                                mc_addr[j]) == 0)
+                        if (ether_addr_equal(enic->mc_addr[i], mc_addr[j]))
                                 break;
                 if (j == mc_count)
                         enic_dev_del_addr(enic, enic->mc_addr[i]);
@@ -953,8 +952,7 @@ static void enic_update_multicast_addr_list(struct enic *enic)
 
         for (i = 0; i < mc_count; i++) {
                 for (j = 0; j < enic->mc_count; j++)
-                        if (compare_ether_addr(mc_addr[i],
-                                enic->mc_addr[j]) == 0)
+                        if (ether_addr_equal(mc_addr[i], enic->mc_addr[j]))
                                 break;
                 if (j == enic->mc_count)
                         enic_dev_add_addr(enic, mc_addr[i]);
@@ -999,8 +997,7 @@ static void enic_update_unicast_addr_list(struct enic *enic)
 
         for (i = 0; i < enic->uc_count; i++) {
                 for (j = 0; j < uc_count; j++)
-                        if (compare_ether_addr(enic->uc_addr[i],
-                                uc_addr[j]) == 0)
+                        if (ether_addr_equal(enic->uc_addr[i], uc_addr[j]))
                                 break;
                 if (j == uc_count)
                         enic_dev_del_addr(enic, enic->uc_addr[i]);
@@ -1008,8 +1005,7 @@ static void enic_update_unicast_addr_list(struct enic *enic)
 
         for (i = 0; i < uc_count; i++) {
                 for (j = 0; j < enic->uc_count; j++)
-                        if (compare_ether_addr(uc_addr[i],
-                                enic->uc_addr[j]) == 0)
+                        if (ether_addr_equal(uc_addr[i], enic->uc_addr[j]))
                                 break;
                 if (j == enic->uc_count)
                         enic_dev_add_addr(enic, uc_addr[i]);
@@ -1193,18 +1189,16 @@ static int enic_get_vf_port(struct net_device *netdev, int vf,
         if (err)
                 return err;
 
-        NLA_PUT_U16(skb, IFLA_PORT_REQUEST, pp->request);
-        NLA_PUT_U16(skb, IFLA_PORT_RESPONSE, response);
-        if (pp->set & ENIC_SET_NAME)
-                NLA_PUT(skb, IFLA_PORT_PROFILE, PORT_PROFILE_MAX,
-                        pp->name);
-        if (pp->set & ENIC_SET_INSTANCE)
-                NLA_PUT(skb, IFLA_PORT_INSTANCE_UUID, PORT_UUID_MAX,
-                        pp->instance_uuid);
-        if (pp->set & ENIC_SET_HOST)
-                NLA_PUT(skb, IFLA_PORT_HOST_UUID, PORT_UUID_MAX,
-                        pp->host_uuid);
-
+        if (nla_put_u16(skb, IFLA_PORT_REQUEST, pp->request) ||
+            nla_put_u16(skb, IFLA_PORT_RESPONSE, response) ||
+            ((pp->set & ENIC_SET_NAME) &&
+             nla_put(skb, IFLA_PORT_PROFILE, PORT_PROFILE_MAX, pp->name)) ||
+            ((pp->set & ENIC_SET_INSTANCE) &&
+             nla_put(skb, IFLA_PORT_INSTANCE_UUID, PORT_UUID_MAX,
+                     pp->instance_uuid)) ||
+            ((pp->set & ENIC_SET_HOST) &&
+             nla_put(skb, IFLA_PORT_HOST_UUID, PORT_UUID_MAX, pp->host_uuid)))
+                goto nla_put_failure;
         return 0;
 
 nla_put_failure:
diff --git a/drivers/net/ethernet/cisco/enic/enic_pp.c b/drivers/net/ethernet/cisco/enic/enic_pp.c
index dafea1ecb7b1..43464f0a4f99 100644
--- a/drivers/net/ethernet/cisco/enic/enic_pp.c
+++ b/drivers/net/ethernet/cisco/enic/enic_pp.c
@@ -184,7 +184,7 @@ static int (*enic_pp_handlers[])(struct enic *enic, int vf,
 };
 
 static const int enic_pp_handlers_count =
-                        sizeof(enic_pp_handlers)/sizeof(*enic_pp_handlers);
+                        ARRAY_SIZE(enic_pp_handlers);
 
 static int enic_pp_preassociate(struct enic *enic, int vf,
         struct enic_port_profile *prev_pp, int *restore_pp)
diff --git a/drivers/net/ethernet/davicom/Kconfig b/drivers/net/ethernet/davicom/Kconfig
index 972b62b31837..9745fe5e8039 100644
--- a/drivers/net/ethernet/davicom/Kconfig
+++ b/drivers/net/ethernet/davicom/Kconfig
@@ -4,7 +4,7 @@
 
 config DM9000
         tristate "DM9000 support"
-        depends on ARM || BLACKFIN || MIPS
+        depends on ARM || BLACKFIN || MIPS || COLDFIRE
         select CRC32
         select NET_CORE
         select MII
diff --git a/drivers/net/ethernet/dec/ewrk3.c b/drivers/net/ethernet/dec/ewrk3.c
index 1879f84a25a3..17ae8c619680 100644
--- a/drivers/net/ethernet/dec/ewrk3.c
+++ b/drivers/net/ethernet/dec/ewrk3.c
@@ -1016,7 +1016,8 @@ static int ewrk3_rx(struct net_device *dev)
                                                         } else {
                                                                 lp->pktStats.multicast++;
                                                         }
-                                                } else if (compare_ether_addr(p, dev->dev_addr) == 0) {
+                                                } else if (ether_addr_equal(p,
+                                                                            dev->dev_addr)) {
                                                         lp->pktStats.unicast++;
                                                 }
                                                 lp->pktStats.bins[0]++;         /* Duplicates stats.rx_packets */
diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c
index 68f1c39184df..61cc09342865 100644
--- a/drivers/net/ethernet/dec/tulip/de2104x.c
+++ b/drivers/net/ethernet/dec/tulip/de2104x.c
@@ -1380,6 +1380,7 @@ static void de_free_rings (struct de_private *de)
 static int de_open (struct net_device *dev)
 {
         struct de_private *de = netdev_priv(dev);
+        const int irq = de->pdev->irq;
         int rc;
 
         netif_dbg(de, ifup, dev, "enabling interface\n");
@@ -1394,10 +1395,9 @@ static int de_open (struct net_device *dev)
 
         dw32(IntrMask, 0);
 
-        rc = request_irq(dev->irq, de_interrupt, IRQF_SHARED, dev->name, dev);
+        rc = request_irq(irq, de_interrupt, IRQF_SHARED, dev->name, dev);
         if (rc) {
-                netdev_err(dev, "IRQ %d request failure, err=%d\n",
-                           dev->irq, rc);
+                netdev_err(dev, "IRQ %d request failure, err=%d\n", irq, rc);
                 goto err_out_free;
         }
 
@@ -1413,7 +1413,7 @@ static int de_open (struct net_device *dev)
         return 0;
 
 err_out_free_irq:
-        free_irq(dev->irq, dev);
+        free_irq(irq, dev);
 err_out_free:
         de_free_rings(de);
         return rc;
@@ -1434,7 +1434,7 @@ static int de_close (struct net_device *dev)
         netif_carrier_off(dev);
         spin_unlock_irqrestore(&de->lock, flags);
 
-        free_irq(dev->irq, dev);
+        free_irq(de->pdev->irq, dev);
 
         de_free_rings(de);
         de_adapter_sleep(de);
@@ -1444,6 +1444,7 @@ static int de_close (struct net_device *dev)
 static void de_tx_timeout (struct net_device *dev)
 {
         struct de_private *de = netdev_priv(dev);
+        const int irq = de->pdev->irq;
 
         netdev_dbg(dev, "NIC status %08x mode %08x sia %08x desc %u/%u/%u\n",
                    dr32(MacStatus), dr32(MacMode), dr32(SIAStatus),
@@ -1451,7 +1452,7 @@ static void de_tx_timeout (struct net_device *dev)
 
         del_timer_sync(&de->media_timer);
 
-        disable_irq(dev->irq);
+        disable_irq(irq);
         spin_lock_irq(&de->lock);
 
         de_stop_hw(de);
@@ -1459,12 +1460,12 @@ static void de_tx_timeout (struct net_device *dev)
         netif_carrier_off(dev);
 
         spin_unlock_irq(&de->lock);
-        enable_irq(dev->irq);
+        enable_irq(irq);
 
         /* Update the error counts. */
         __de_get_stats(de);
 
-        synchronize_irq(dev->irq);
+        synchronize_irq(irq);
         de_clean_rings(de);
 
         de_init_rings(de);
@@ -2024,8 +2025,6 @@ static int __devinit de_init_one (struct pci_dev *pdev,
                 goto err_out_res;
         }
 
-        dev->irq = pdev->irq;
-
         /* obtain and check validity of PCI I/O address */
         pciaddr = pci_resource_start(pdev, 1);
         if (!pciaddr) {
@@ -2050,7 +2049,6 @@ static int __devinit de_init_one (struct pci_dev *pdev,
                        pciaddr, pci_name(pdev));
                 goto err_out_res;
         }
-        dev->base_addr = (unsigned long) regs;
         de->regs = regs;
 
         de_adapter_wake(de);
@@ -2078,11 +2076,9 @@ static int __devinit de_init_one (struct pci_dev *pdev,
                 goto err_out_iomap;
 
         /* print info about board and interface just registered */
-        netdev_info(dev, "%s at 0x%lx, %pM, IRQ %d\n",
+        netdev_info(dev, "%s at %p, %pM, IRQ %d\n",
                     de->de21040 ? "21040" : "21041",
-                    dev->base_addr,
-                    dev->dev_addr,
-                    dev->irq);
+                    regs, dev->dev_addr, pdev->irq);
 
         pci_set_drvdata(pdev, dev);
 
@@ -2130,9 +2126,11 @@ static int de_suspend (struct pci_dev *pdev, pm_message_t state)
 
         rtnl_lock();
         if (netif_running (dev)) {
+                const int irq = pdev->irq;
+
                 del_timer_sync(&de->media_timer);
 
-                disable_irq(dev->irq);
+                disable_irq(irq);
                 spin_lock_irq(&de->lock);
 
                 de_stop_hw(de);
@@ -2141,12 +2139,12 @@ static int de_suspend (struct pci_dev *pdev, pm_message_t state)
                 netif_carrier_off(dev);
 
                 spin_unlock_irq(&de->lock);
-                enable_irq(dev->irq);
+                enable_irq(irq);
 
                 /* Update the error counts. */
                 __de_get_stats(de);
 
-                synchronize_irq(dev->irq);
+                synchronize_irq(irq);
                 de_clean_rings(de);
 
                 de_adapter_sleep(de);
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
index 18b106cc6d2b..d3cd489d11a2 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
@@ -1874,7 +1874,7 @@ de4x5_local_stats(struct net_device *dev, char *buf, int pkt_len)
         } else {
             lp->pktStats.multicast++;
         }
-    } else if (compare_ether_addr(buf, dev->dev_addr) == 0) {
+    } else if (ether_addr_equal(buf, dev->dev_addr)) {
         lp->pktStats.unicast++;
     }
 
diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c
index 1eccf4945485..4d6fe604fa64 100644
--- a/drivers/net/ethernet/dec/tulip/dmfe.c
+++ b/drivers/net/ethernet/dec/tulip/dmfe.c
@@ -150,6 +150,12 @@
 #define DMFE_TX_TIMEOUT ((3*HZ)/2)      /* tx packet time-out time 1.5 s" */
 #define DMFE_TX_KICK    (HZ/2)  /* tx packet Kick-out time 0.5 s" */
 
+#define dw32(reg, val)  iowrite32(val, ioaddr + (reg))
+#define dw16(reg, val)  iowrite16(val, ioaddr + (reg))
+#define dr32(reg)       ioread32(ioaddr + (reg))
+#define dr16(reg)       ioread16(ioaddr + (reg))
+#define dr8(reg)        ioread8(ioaddr + (reg))
+
 #define DMFE_DBUG(dbug_now, msg, value)                 \
         do {                                            \
                 if (dmfe_debug || (dbug_now))           \
@@ -178,14 +184,6 @@
 
 #define SROM_V41_CODE   0x14
 
-#define SROM_CLK_WRITE(data, ioaddr) \
-        outl(data|CR9_SROM_READ|CR9_SRCS,ioaddr); \
-        udelay(5); \
-        outl(data|CR9_SROM_READ|CR9_SRCS|CR9_SRCLK,ioaddr); \
-        udelay(5); \
-        outl(data|CR9_SROM_READ|CR9_SRCS,ioaddr); \
-        udelay(5);
-
 #define __CHK_IO_SIZE(pci_id, dev_rev) \
  (( ((pci_id)==PCI_DM9132_ID) || ((dev_rev) >= 0x30) ) ? \
         DM9102A_IO_SIZE: DM9102_IO_SIZE)
@@ -213,11 +211,11 @@ struct rx_desc {
 struct dmfe_board_info {
         u32 chip_id;                    /* Chip vendor/Device ID */
         u8 chip_revision;               /* Chip revision */
-        struct DEVICE *next_dev;        /* next device */
+        struct net_device *next_dev;    /* next device */
         struct pci_dev *pdev;           /* PCI device */
         spinlock_t lock;
 
-        long ioaddr;                    /* I/O base address */
+        void __iomem *ioaddr;           /* I/O base address */
         u32 cr0_data;
         u32 cr5_data;
         u32 cr6_data;
@@ -320,20 +318,20 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *, struct DEVICE *);
 static int dmfe_stop(struct DEVICE *);
 static void dmfe_set_filter_mode(struct DEVICE *);
 static const struct ethtool_ops netdev_ethtool_ops;
-static u16 read_srom_word(long ,int);
+static u16 read_srom_word(void __iomem *, int);
 static irqreturn_t dmfe_interrupt(int , void *);
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void poll_dmfe (struct net_device *dev);
 #endif
-static void dmfe_descriptor_init(struct net_device *, unsigned long);
+static void dmfe_descriptor_init(struct net_device *);
 static void allocate_rx_buffer(struct net_device *);
-static void update_cr6(u32, unsigned long);
+static void update_cr6(u32, void __iomem *);
 static void send_filter_frame(struct DEVICE *);
 static void dm9132_id_table(struct DEVICE *);
-static u16 phy_read(unsigned long, u8, u8, u32);
-static void phy_write(unsigned long, u8, u8, u16, u32);
-static void phy_write_1bit(unsigned long, u32);
-static u16 phy_read_1bit(unsigned long);
+static u16 phy_read(void __iomem *, u8, u8, u32);
+static void phy_write(void __iomem *, u8, u8, u16, u32);
+static void phy_write_1bit(void __iomem *, u32);
+static u16 phy_read_1bit(void __iomem *);
 static u8 dmfe_sense_speed(struct dmfe_board_info *);
 static void dmfe_process_mode(struct dmfe_board_info *);
 static void dmfe_timer(unsigned long);
@@ -462,14 +460,16 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
         db->buf_pool_dma_start = db->buf_pool_dma_ptr;
 
         db->chip_id = ent->driver_data;
-        db->ioaddr = pci_resource_start(pdev, 0);
+        /* IO type range. */
+        db->ioaddr = pci_iomap(pdev, 0, 0);
+        if (!db->ioaddr)
+                goto err_out_free_buf;
+
         db->chip_revision = pdev->revision;
         db->wol_mode = 0;
 
         db->pdev = pdev;
 
-        dev->base_addr = db->ioaddr;
-        dev->irq = pdev->irq;
         pci_set_drvdata(pdev, dev);
         dev->netdev_ops = &netdev_ops;
         dev->ethtool_ops = &netdev_ethtool_ops;
@@ -484,9 +484,10 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
                 db->chip_type = 0;
 
         /* read 64 word srom data */
-        for (i = 0; i < 64; i++)
+        for (i = 0; i < 64; i++) {
                 ((__le16 *) db->srom)[i] =
                         cpu_to_le16(read_srom_word(db->ioaddr, i));
+        }
 
         /* Set Node address */
         for (i = 0; i < 6; i++)
@@ -494,16 +495,18 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
 
         err = register_netdev (dev);
         if (err)
-                goto err_out_free_buf;
+                goto err_out_unmap;
 
         dev_info(&dev->dev, "Davicom DM%04lx at pci%s, %pM, irq %d\n",
                  ent->driver_data >> 16,
-                 pci_name(pdev), dev->dev_addr, dev->irq);
+                 pci_name(pdev), dev->dev_addr, pdev->irq);
 
         pci_set_master(pdev);
 
         return 0;
 
+err_out_unmap:
+        pci_iounmap(pdev, db->ioaddr);
 err_out_free_buf:
         pci_free_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,
                             db->buf_pool_ptr, db->buf_pool_dma_ptr);
@@ -532,7 +535,7 @@ static void __devexit dmfe_remove_one (struct pci_dev *pdev)
         if (dev) {
 
                 unregister_netdev(dev);
-
+                pci_iounmap(db->pdev, db->ioaddr);
                 pci_free_consistent(db->pdev, sizeof(struct tx_desc) *
                                         DESC_ALL_CNT + 0x20, db->desc_pool_ptr,
                                         db->desc_pool_dma_ptr);
@@ -555,13 +558,13 @@ static void __devexit dmfe_remove_one (struct pci_dev *pdev)
 
 static int dmfe_open(struct DEVICE *dev)
 {
-        int ret;
         struct dmfe_board_info *db = netdev_priv(dev);
+        const int irq = db->pdev->irq;
+        int ret;
 
         DMFE_DBUG(0, "dmfe_open", 0);
 
-        ret = request_irq(dev->irq, dmfe_interrupt,
-                          IRQF_SHARED, dev->name, dev);
+        ret = request_irq(irq, dmfe_interrupt, IRQF_SHARED, dev->name, dev);
         if (ret)
                 return ret;
 
@@ -615,14 +618,14 @@ static int dmfe_open(struct DEVICE *dev)
 static void dmfe_init_dm910x(struct DEVICE *dev)
 {
         struct dmfe_board_info *db = netdev_priv(dev);
-        unsigned long ioaddr = db->ioaddr;
+        void __iomem *ioaddr = db->ioaddr;
 
         DMFE_DBUG(0, "dmfe_init_dm910x()", 0);
 
         /* Reset DM910x MAC controller */
-        outl(DM910X_RESET, ioaddr + DCR0);      /* RESET MAC */
+        dw32(DCR0, DM910X_RESET);       /* RESET MAC */
         udelay(100);
-        outl(db->cr0_data, ioaddr + DCR0);
+        dw32(DCR0, db->cr0_data);
         udelay(5);
 
         /* Phy addr : DM910(A)2/DM9132/9801, phy address = 1 */
@@ -633,12 +636,12 @@ static void dmfe_init_dm910x(struct DEVICE *dev)
         db->media_mode = dmfe_media_mode;
 
         /* RESET Phyxcer Chip by GPR port bit 7 */
-        outl(0x180, ioaddr + DCR12);            /* Let bit 7 output port */
+        dw32(DCR12, 0x180);             /* Let bit 7 output port */
         if (db->chip_id == PCI_DM9009_ID) {
-                outl(0x80, ioaddr + DCR12);     /* Issue RESET signal */
+                dw32(DCR12, 0x80);      /* Issue RESET signal */
                 mdelay(300);                    /* Delay 300 ms */
         }
-        outl(0x0, ioaddr + DCR12);      /* Clear RESET signal */
+        dw32(DCR12, 0x0);       /* Clear RESET signal */
 
         /* Process Phyxcer Media Mode */
         if ( !(db->media_mode & 0x10) ) /* Force 1M mode */
@@ -649,7 +652,7 @@ static void dmfe_init_dm910x(struct DEVICE *dev)
                 db->op_mode = db->media_mode;   /* Force Mode */
 
         /* Initialize Transmit/Receive decriptor and CR3/4 */
-        dmfe_descriptor_init(dev, ioaddr);
+        dmfe_descriptor_init(dev);
 
         /* Init CR6 to program DM910x operation */
         update_cr6(db->cr6_data, ioaddr);
@@ -662,10 +665,10 @@ static void dmfe_init_dm910x(struct DEVICE *dev)
 
         /* Init CR7, interrupt active bit */
         db->cr7_data = CR7_DEFAULT;
-        outl(db->cr7_data, ioaddr + DCR7);
+        dw32(DCR7, db->cr7_data);
 
         /* Init CR15, Tx jabber and Rx watchdog timer */
-        outl(db->cr15_data, ioaddr + DCR15);
+        dw32(DCR15, db->cr15_data);
 
         /* Enable DM910X Tx/Rx function */
         db->cr6_data |= CR6_RXSC | CR6_TXSC | 0x40000;
@@ -682,6 +685,7 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb,
                                          struct DEVICE *dev)
 {
         struct dmfe_board_info *db = netdev_priv(dev);
+        void __iomem *ioaddr = db->ioaddr;
         struct tx_desc *txptr;
         unsigned long flags;
 
@@ -707,7 +711,7 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb,
         }
 
         /* Disable NIC interrupt */
-        outl(0, dev->base_addr + DCR7);
+        dw32(DCR7, 0);
 
         /* transmit this packet */
         txptr = db->tx_insert_ptr;
@@ -721,11 +725,11 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb,
         if ( (!db->tx_queue_cnt) && (db->tx_packet_cnt < TX_MAX_SEND_CNT) ) {
                 txptr->tdes0 = cpu_to_le32(0x80000000); /* Set owner bit */
                 db->tx_packet_cnt++;                    /* Ready to send */
-                outl(0x1, dev->base_addr + DCR1);       /* Issue Tx polling */
+                dw32(DCR1, 0x1);                        /* Issue Tx polling */
                 dev->trans_start = jiffies;             /* saved time stamp */
         } else {
                 db->tx_queue_cnt++;                     /* queue TX packet */
-                outl(0x1, dev->base_addr + DCR1);       /* Issue Tx polling */
+                dw32(DCR1, 0x1);                        /* Issue Tx polling */
         }
 
         /* Tx resource check */
@@ -734,7 +738,7 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb,
 
         /* Restore CR7 to enable interrupt */
         spin_unlock_irqrestore(&db->lock, flags);
-        outl(db->cr7_data, dev->base_addr + DCR7);
+        dw32(DCR7, db->cr7_data);
 
         /* free this SKB */
         dev_kfree_skb(skb);
@@ -751,7 +755,7 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb,
 static int dmfe_stop(struct DEVICE *dev)
 {
         struct dmfe_board_info *db = netdev_priv(dev);
-        unsigned long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = db->ioaddr;
 
         DMFE_DBUG(0, "dmfe_stop", 0);
 
@@ -762,12 +766,12 @@ static int dmfe_stop(struct DEVICE *dev)
         del_timer_sync(&db->timer);
 
         /* Reset & stop DM910X board */
-        outl(DM910X_RESET, ioaddr + DCR0);
-        udelay(5);
-        phy_write(db->ioaddr, db->phy_addr, 0, 0x8000, db->chip_id);
+        dw32(DCR0, DM910X_RESET);
+        udelay(100);
+        phy_write(ioaddr, db->phy_addr, 0, 0x8000, db->chip_id);
 
         /* free interrupt */
-        free_irq(dev->irq, dev);
+        free_irq(db->pdev->irq, dev);
 
         /* free allocated rx buffer */
         dmfe_free_rxbuffer(db);
@@ -794,7 +798,7 @@ static irqreturn_t dmfe_interrupt(int irq, void *dev_id)
 {
         struct DEVICE *dev = dev_id;
         struct dmfe_board_info *db = netdev_priv(dev);
-        unsigned long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = db->ioaddr;
         unsigned long flags;
 
         DMFE_DBUG(0, "dmfe_interrupt()", 0);
@@ -802,15 +806,15 @@ static irqreturn_t dmfe_interrupt(int irq, void *dev_id)
         spin_lock_irqsave(&db->lock, flags);
 
         /* Got DM910X status */
-        db->cr5_data = inl(ioaddr + DCR5);
-        outl(db->cr5_data, ioaddr + DCR5);
+        db->cr5_data = dr32(DCR5);
+        dw32(DCR5, db->cr5_data);
         if ( !(db->cr5_data & 0xc1) ) {
                 spin_unlock_irqrestore(&db->lock, flags);
                 return IRQ_HANDLED;
         }
 
         /* Disable all interrupt in CR7 to solve the interrupt edge problem */
-        outl(0, ioaddr + DCR7);
+        dw32(DCR7, 0);
 
         /* Check system status */
         if (db->cr5_data & 0x2000) {
@@ -838,11 +842,11 @@ static irqreturn_t dmfe_interrupt(int irq, void *dev_id)
         if (db->dm910x_chk_mode & 0x2) {
                 db->dm910x_chk_mode = 0x4;
                 db->cr6_data |= 0x100;
-                update_cr6(db->cr6_data, db->ioaddr);
+                update_cr6(db->cr6_data, ioaddr);
         }
 
         /* Restore CR7 to enable interrupt mask */
-        outl(db->cr7_data, ioaddr + DCR7);
+        dw32(DCR7, db->cr7_data);
 
         spin_unlock_irqrestore(&db->lock, flags);
         return IRQ_HANDLED;
@@ -858,11 +862,14 @@ static irqreturn_t dmfe_interrupt(int irq, void *dev_id)
 
 static void poll_dmfe (struct net_device *dev)
 {
+        struct dmfe_board_info *db = netdev_priv(dev);
+        const int irq = db->pdev->irq;
+
         /* disable_irq here is not very nice, but with the lockless
            interrupt handler we have no other choice. */
-        disable_irq(dev->irq);
-        dmfe_interrupt (dev->irq, dev);
-        enable_irq(dev->irq);
+        disable_irq(irq);
+        dmfe_interrupt (irq, dev);
+        enable_irq(irq);
 }
 #endif
 
@@ -873,7 +880,7 @@ static void poll_dmfe (struct net_device *dev)
 static void dmfe_free_tx_pkt(struct DEVICE *dev, struct dmfe_board_info * db)
 {
         struct tx_desc *txptr;
-        unsigned long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = db->ioaddr;
         u32 tdes0;
 
         txptr = db->tx_remove_ptr;
@@ -897,7 +904,7 @@ static void dmfe_free_tx_pkt(struct DEVICE *dev, struct dmfe_board_info * db)
                                         db->tx_fifo_underrun++;
                                         if ( !(db->cr6_data & CR6_SFT) ) {
                                                 db->cr6_data = db->cr6_data | CR6_SFT;
-                                                update_cr6(db->cr6_data, db->ioaddr);
+                                                update_cr6(db->cr6_data, ioaddr);
                                         }
                                 }
                                 if (tdes0 & 0x0100)
@@ -924,7 +931,7 @@ static void dmfe_free_tx_pkt(struct DEVICE *dev, struct dmfe_board_info * db)
                 txptr->tdes0 = cpu_to_le32(0x80000000); /* Set owner bit */
                 db->tx_packet_cnt++;                    /* Ready to send */
                 db->tx_queue_cnt--;
-                outl(0x1, ioaddr + DCR1);               /* Issue Tx polling */
+                dw32(DCR1, 0x1);                        /* Issue Tx polling */
                 dev->trans_start = jiffies;             /* saved time stamp */
         }
 
@@ -1087,12 +1094,7 @@ static void dmfe_ethtool_get_drvinfo(struct net_device *dev,
 
         strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
         strlcpy(info->version, DRV_VERSION, sizeof(info->version));
-        if (np->pdev)
-                strlcpy(info->bus_info, pci_name(np->pdev),
-                        sizeof(info->bus_info));
-        else
-                sprintf(info->bus_info, "EISA 0x%lx %d",
-                        dev->base_addr, dev->irq);
+        strlcpy(info->bus_info, pci_name(np->pdev), sizeof(info->bus_info));
 }
 
 static int dmfe_ethtool_set_wol(struct net_device *dev,
@@ -1132,10 +1134,11 @@ static const struct ethtool_ops netdev_ethtool_ops = {
 
 static void dmfe_timer(unsigned long data)
 {
+        struct net_device *dev = (struct net_device *)data;
+        struct dmfe_board_info *db = netdev_priv(dev);
+        void __iomem *ioaddr = db->ioaddr;
         u32 tmp_cr8;
         unsigned char tmp_cr12;
-        struct DEVICE *dev = (struct DEVICE *) data;
-        struct dmfe_board_info *db = netdev_priv(dev);
         unsigned long flags;
 
         int link_ok, link_ok_phy;
@@ -1148,11 +1151,10 @@ static void dmfe_timer(unsigned long data)
                 db->first_in_callback = 1;
                 if (db->chip_type && (db->chip_id==PCI_DM9102_ID)) {
                         db->cr6_data &= ~0x40000;
-                        update_cr6(db->cr6_data, db->ioaddr);
-                        phy_write(db->ioaddr,
-                                  db->phy_addr, 0, 0x1000, db->chip_id);
+                        update_cr6(db->cr6_data, ioaddr);
+                        phy_write(ioaddr, db->phy_addr, 0, 0x1000, db->chip_id);
                         db->cr6_data |= 0x40000;
-                        update_cr6(db->cr6_data, db->ioaddr);
+                        update_cr6(db->cr6_data, ioaddr);
                         db->timer.expires = DMFE_TIMER_WUT + HZ * 2;
                         add_timer(&db->timer);
                         spin_unlock_irqrestore(&db->lock, flags);
@@ -1167,7 +1169,7 @@ static void dmfe_timer(unsigned long data)
                 db->dm910x_chk_mode = 0x4;
 
         /* Dynamic reset DM910X : system error or transmit time-out */
-        tmp_cr8 = inl(db->ioaddr + DCR8);
+        tmp_cr8 = dr32(DCR8);
         if ( (db->interval_rx_cnt==0) && (tmp_cr8) ) {
                 db->reset_cr8++;
                 db->wait_reset = 1;
@@ -1177,7 +1179,7 @@ static void dmfe_timer(unsigned long data)
         /* TX polling kick monitor */
         if ( db->tx_packet_cnt &&
              time_after(jiffies, dev_trans_start(dev) + DMFE_TX_KICK) ) {
-                outl(0x1, dev->base_addr + DCR1);   /* Tx polling again */
+                dw32(DCR1, 0x1);   /* Tx polling again */
 
                 /* TX Timeout */
                 if (time_after(jiffies, dev_trans_start(dev) + DMFE_TX_TIMEOUT) ) {
@@ -1200,9 +1202,9 @@ static void dmfe_timer(unsigned long data)
 
         /* Link status check, Dynamic media type change */
         if (db->chip_id == PCI_DM9132_ID)
-                tmp_cr12 = inb(db->ioaddr + DCR9 + 3);  /* DM9132 */
+                tmp_cr12 = dr8(DCR9 + 3);       /* DM9132 */
         else
-                tmp_cr12 = inb(db->ioaddr + DCR12);     /* DM9102/DM9102A */
+                tmp_cr12 = dr8(DCR12);          /* DM9102/DM9102A */
 
         if ( ((db->chip_id == PCI_DM9102_ID) &&
                 (db->chip_revision == 0x30)) ||
@@ -1251,7 +1253,7 @@ static void dmfe_timer(unsigned long data)
                         /* 10/100M link failed, used 1M Home-Net */
                         db->cr6_data|=0x00040000;       /* bit18=1, MII */
                         db->cr6_data&=~0x00000200;      /* bit9=0, HD mode */
-                        update_cr6(db->cr6_data, db->ioaddr);
+                        update_cr6(db->cr6_data, ioaddr);
                 }
         } else if (!netif_carrier_ok(dev)) {
 
@@ -1288,17 +1290,18 @@ static void dmfe_timer(unsigned long data)
  *      Re-initialize DM910X board
  */
 
-static void dmfe_dynamic_reset(struct DEVICE *dev)
+static void dmfe_dynamic_reset(struct net_device *dev)
 {
         struct dmfe_board_info *db = netdev_priv(dev);
+        void __iomem *ioaddr = db->ioaddr;
 
         DMFE_DBUG(0, "dmfe_dynamic_reset()", 0);
 
         /* Sopt MAC controller */
         db->cr6_data &= ~(CR6_RXSC | CR6_TXSC); /* Disable Tx/Rx */
-        update_cr6(db->cr6_data, dev->base_addr);
-        outl(0, dev->base_addr + DCR7);         /* Disable Interrupt */
-        outl(inl(dev->base_addr + DCR5), dev->base_addr + DCR5);
+        update_cr6(db->cr6_data, ioaddr);
+        dw32(DCR7, 0);                          /* Disable Interrupt */
+        dw32(DCR5, dr32(DCR5));
 
         /* Disable upper layer interface */
         netif_stop_queue(dev);
@@ -1364,9 +1367,10 @@ static void dmfe_reuse_skb(struct dmfe_board_info *db, struct sk_buff * skb)
  *      Using Chain structure, and allocate Tx/Rx buffer
  */
 
-static void dmfe_descriptor_init(struct net_device *dev, unsigned long ioaddr)
+static void dmfe_descriptor_init(struct net_device *dev)
 {
         struct dmfe_board_info *db = netdev_priv(dev);
+        void __iomem *ioaddr = db->ioaddr;
         struct tx_desc *tmp_tx;
         struct rx_desc *tmp_rx;
         unsigned char *tmp_buf;
@@ -1379,7 +1383,7 @@ static void dmfe_descriptor_init(struct net_device *dev, unsigned long ioaddr)
         /* tx descriptor start pointer */
         db->tx_insert_ptr = db->first_tx_desc;
         db->tx_remove_ptr = db->first_tx_desc;
-        outl(db->first_tx_desc_dma, ioaddr + DCR4);     /* TX DESC address */
+        dw32(DCR4, db->first_tx_desc_dma);     /* TX DESC address */
 
         /* rx descriptor start pointer */
         db->first_rx_desc = (void *)db->first_tx_desc +
@@ -1389,7 +1393,7 @@ static void dmfe_descriptor_init(struct net_device *dev, unsigned long ioaddr)
                         sizeof(struct tx_desc) * TX_DESC_CNT;
         db->rx_insert_ptr = db->first_rx_desc;
         db->rx_ready_ptr = db->first_rx_desc;
-        outl(db->first_rx_desc_dma, ioaddr + DCR3);     /* RX DESC address */
+        dw32(DCR3, db->first_rx_desc_dma);              /* RX DESC address */
 
         /* Init Transmit chain */
         tmp_buf = db->buf_pool_start;
@@ -1431,14 +1435,14 @@ static void dmfe_descriptor_init(struct net_device *dev, unsigned long ioaddr)
  *      Firstly stop DM910X , then written value and start
  */
 
-static void update_cr6(u32 cr6_data, unsigned long ioaddr)
+static void update_cr6(u32 cr6_data, void __iomem *ioaddr)
 {
         u32 cr6_tmp;
 
         cr6_tmp = cr6_data & ~0x2002;           /* stop Tx/Rx */
-        outl(cr6_tmp, ioaddr + DCR6);
+        dw32(DCR6, cr6_tmp);
         udelay(5);
-        outl(cr6_data, ioaddr + DCR6);
+        dw32(DCR6, cr6_data);
         udelay(5);
 }
 
@@ -1448,24 +1452,19 @@ static void update_cr6(u32 cr6_data, unsigned long ioaddr)
  *      This setup frame initialize DM910X address filter mode
 */
 
-static void dm9132_id_table(struct DEVICE *dev)
+static void dm9132_id_table(struct net_device *dev)
 {
+        struct dmfe_board_info *db = netdev_priv(dev);
+        void __iomem *ioaddr = db->ioaddr + 0xc0;
+        u16 *addrptr = (u16 *)dev->dev_addr;
         struct netdev_hw_addr *ha;
-        u16 * addrptr;
-        unsigned long ioaddr = dev->base_addr+0xc0;             /* ID Table */
-        u32 hash_val;
         u16 i, hash_table[4];
 
-        DMFE_DBUG(0, "dm9132_id_table()", 0);
-
         /* Node address */
-        addrptr = (u16 *) dev->dev_addr;
-        outw(addrptr[0], ioaddr);
-        ioaddr += 4;
-        outw(addrptr[1], ioaddr);
-        ioaddr += 4;
-        outw(addrptr[2], ioaddr);
-        ioaddr += 4;
+        for (i = 0; i < 3; i++) {
+                dw16(0, addrptr[i]);
+                ioaddr += 4;
+        }
 
         /* Clear Hash Table */
         memset(hash_table, 0, sizeof(hash_table));
@@ -1475,13 +1474,14 @@ static void dm9132_id_table(struct DEVICE *dev)
 
         /* the multicast address in Hash Table : 64 bits */
         netdev_for_each_mc_addr(ha, dev) {
-                hash_val = cal_CRC((char *) ha->addr, 6, 0) & 0x3f;
+                u32 hash_val = cal_CRC((char *)ha->addr, 6, 0) & 0x3f;
+
                 hash_table[hash_val / 16] |= (u16) 1 << (hash_val % 16);
         }
 
         /* Write the hash table to MAC MD table */
         for (i = 0; i < 4; i++, ioaddr += 4)
-                outw(hash_table[i], ioaddr);
+                dw16(0, hash_table[i]);
 }
 
 
@@ -1490,7 +1490,7 @@ static void dm9132_id_table(struct DEVICE *dev)
  *      This setup frame initialize DM910X address filter mode
  */
 
-static void send_filter_frame(struct DEVICE *dev)
+static void send_filter_frame(struct net_device *dev)
 {
         struct dmfe_board_info *db = netdev_priv(dev);
         struct netdev_hw_addr *ha;
@@ -1535,12 +1535,14 @@ static void send_filter_frame(struct DEVICE *dev)
 
         /* Resource Check and Send the setup packet */
         if (!db->tx_packet_cnt) {
+                void __iomem *ioaddr = db->ioaddr;
+
                 /* Resource Empty */
                 db->tx_packet_cnt++;
                 txptr->tdes0 = cpu_to_le32(0x80000000);
-                update_cr6(db->cr6_data | 0x2000, dev->base_addr);
-                outl(0x1, dev->base_addr + DCR1);       /* Issue Tx polling */
-                update_cr6(db->cr6_data, dev->base_addr);
+                update_cr6(db->cr6_data | 0x2000, ioaddr);
+                dw32(DCR1, 0x1);        /* Issue Tx polling */
+                update_cr6(db->cr6_data, ioaddr);
                 dev->trans_start = jiffies;
         } else
                 db->tx_queue_cnt++;     /* Put in TX queue */
@@ -1575,43 +1577,59 @@ static void allocate_rx_buffer(struct net_device *dev)
         db->rx_insert_ptr = rxptr;
 }
 
+static void srom_clk_write(void __iomem *ioaddr, u32 data)
+{
+        static const u32 cmd[] = {
+                CR9_SROM_READ | CR9_SRCS,
+                CR9_SROM_READ | CR9_SRCS | CR9_SRCLK,
+                CR9_SROM_READ | CR9_SRCS
+        };
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(cmd); i++) {
+                dw32(DCR9, data | cmd[i]);
+                udelay(5);
+        }
+}
 
 /*
  *      Read one word data from the serial ROM
  */
-
-static u16 read_srom_word(long ioaddr, int offset)
+static u16 read_srom_word(void __iomem *ioaddr, int offset)
 {
+        u16 srom_data;
         int i;
-        u16 srom_data = 0;
-        long cr9_ioaddr = ioaddr + DCR9;
 
-        outl(CR9_SROM_READ, cr9_ioaddr);
-        outl(CR9_SROM_READ | CR9_SRCS, cr9_ioaddr);
+        dw32(DCR9, CR9_SROM_READ);
+        udelay(5);
+        dw32(DCR9, CR9_SROM_READ | CR9_SRCS);
+        udelay(5);
 
         /* Send the Read Command 110b */
-        SROM_CLK_WRITE(SROM_DATA_1, cr9_ioaddr);
-        SROM_CLK_WRITE(SROM_DATA_1, cr9_ioaddr);
-        SROM_CLK_WRITE(SROM_DATA_0, cr9_ioaddr);
+        srom_clk_write(ioaddr, SROM_DATA_1);
+        srom_clk_write(ioaddr, SROM_DATA_1);
+        srom_clk_write(ioaddr, SROM_DATA_0);
 
         /* Send the offset */
         for (i = 5; i >= 0; i--) {
                 srom_data = (offset & (1 << i)) ? SROM_DATA_1 : SROM_DATA_0;
-                SROM_CLK_WRITE(srom_data, cr9_ioaddr);
+                srom_clk_write(ioaddr, srom_data);
         }
 
-        outl(CR9_SROM_READ | CR9_SRCS, cr9_ioaddr);
+        dw32(DCR9, CR9_SROM_READ | CR9_SRCS);
+        udelay(5);
 
         for (i = 16; i > 0; i--) {
-                outl(CR9_SROM_READ | CR9_SRCS | CR9_SRCLK, cr9_ioaddr);
+                dw32(DCR9, CR9_SROM_READ | CR9_SRCS | CR9_SRCLK);
                 udelay(5);
                 srom_data = (srom_data << 1) |
-                                ((inl(cr9_ioaddr) & CR9_CRDOUT) ? 1 : 0);
-                outl(CR9_SROM_READ | CR9_SRCS, cr9_ioaddr);
+                                ((dr32(DCR9) & CR9_CRDOUT) ? 1 : 0);
+                dw32(DCR9, CR9_SROM_READ | CR9_SRCS);
                 udelay(5);
         }
 
-        outl(CR9_SROM_READ, cr9_ioaddr);
+        dw32(DCR9, CR9_SROM_READ);
+        udelay(5);
         return srom_data;
 }
 
@@ -1620,13 +1638,14 @@ static u16 read_srom_word(long ioaddr, int offset)
  *      Auto sense the media mode
  */
 
-static u8 dmfe_sense_speed(struct dmfe_board_info * db)
+static u8 dmfe_sense_speed(struct dmfe_board_info *db)
 {
+        void __iomem *ioaddr = db->ioaddr;
         u8 ErrFlag = 0;
         u16 phy_mode;
 
         /* CR6 bit18=0, select 10/100M */
-        update_cr6( (db->cr6_data & ~0x40000), db->ioaddr);
+        update_cr6(db->cr6_data & ~0x40000, ioaddr);
 
         phy_mode = phy_read(db->ioaddr, db->phy_addr, 1, db->chip_id);
         phy_mode = phy_read(db->ioaddr, db->phy_addr, 1, db->chip_id);
@@ -1665,11 +1684,12 @@ static u8 dmfe_sense_speed(struct dmfe_board_info * db)
 
 static void dmfe_set_phyxcer(struct dmfe_board_info *db)
 {
+        void __iomem *ioaddr = db->ioaddr;
         u16 phy_reg;
 
         /* Select 10/100M phyxcer */
         db->cr6_data &= ~0x40000;
-        update_cr6(db->cr6_data, db->ioaddr);
+        update_cr6(db->cr6_data, ioaddr);
 
         /* DM9009 Chip: Phyxcer reg18 bit12=0 */
         if (db->chip_id == PCI_DM9009_ID) {
@@ -1765,18 +1785,15 @@ static void dmfe_process_mode(struct dmfe_board_info *db)
  *      Write a word to Phy register
  */
 
-static void phy_write(unsigned long iobase, u8 phy_addr, u8 offset,
+static void phy_write(void __iomem *ioaddr, u8 phy_addr, u8 offset,
                       u16 phy_data, u32 chip_id)
 {
         u16 i;
-        unsigned long ioaddr;
 
         if (chip_id == PCI_DM9132_ID) {
-                ioaddr = iobase + 0x80 + offset * 4;
-                outw(phy_data, ioaddr);
+                dw16(0x80 + offset * 4, phy_data);
         } else {
                 /* DM9102/DM9102A Chip */
-                ioaddr = iobase + DCR9;
 
                 /* Send 33 synchronization clock to Phy controller */
                 for (i = 0; i < 35; i++)
@@ -1816,19 +1833,16 @@ static void phy_write(unsigned long iobase, u8 phy_addr, u8 offset,
  *      Read a word data from phy register
  */
 
-static u16 phy_read(unsigned long iobase, u8 phy_addr, u8 offset, u32 chip_id)
+static u16 phy_read(void __iomem *ioaddr, u8 phy_addr, u8 offset, u32 chip_id)
 {
         int i;
         u16 phy_data;
-        unsigned long ioaddr;
 
         if (chip_id == PCI_DM9132_ID) {
                 /* DM9132 Chip */
-                ioaddr = iobase + 0x80 + offset * 4;
-                phy_data = inw(ioaddr);
+                phy_data = dr16(0x80 + offset * 4);
         } else {
                 /* DM9102/DM9102A Chip */
-                ioaddr = iobase + DCR9;
 
                 /* Send 33 synchronization clock to Phy controller */
                 for (i = 0; i < 35; i++)
@@ -1870,13 +1884,13 @@ static u16 phy_read(unsigned long iobase, u8 phy_addr, u8 offset, u32 chip_id)
  *      Write one bit data to Phy Controller
  */
 
-static void phy_write_1bit(unsigned long ioaddr, u32 phy_data)
+static void phy_write_1bit(void __iomem *ioaddr, u32 phy_data)
 {
-        outl(phy_data, ioaddr);                 /* MII Clock Low */
+        dw32(DCR9, phy_data);           /* MII Clock Low */
         udelay(1);
-        outl(phy_data | MDCLKH, ioaddr);        /* MII Clock High */
+        dw32(DCR9, phy_data | MDCLKH);  /* MII Clock High */
         udelay(1);
-        outl(phy_data, ioaddr);                 /* MII Clock Low */
+        dw32(DCR9, phy_data);           /* MII Clock Low */
         udelay(1);
 }
 
@@ -1885,14 +1899,14 @@ static void phy_write_1bit(unsigned long ioaddr, u32 phy_data)
  *      Read one bit phy data from PHY controller
  */
 
-static u16 phy_read_1bit(unsigned long ioaddr)
+static u16 phy_read_1bit(void __iomem *ioaddr)
 {
         u16 phy_data;
 
-        outl(0x50000, ioaddr);
+        dw32(DCR9, 0x50000);
         udelay(1);
-        phy_data = ( inl(ioaddr) >> 19 ) & 0x1;
-        outl(0x40000, ioaddr);
+        phy_data = (dr32(DCR9) >> 19) & 0x1;
+        dw32(DCR9, 0x40000);
         udelay(1);
 
         return phy_data;
@@ -1978,7 +1992,7 @@ static void dmfe_parse_srom(struct dmfe_board_info * db)
 
         /* Check DM9801 or DM9802 present or not */
         db->HPNA_present = 0;
-        update_cr6(db->cr6_data|0x40000, db->ioaddr);
+        update_cr6(db->cr6_data | 0x40000, db->ioaddr);
         tmp_reg = phy_read(db->ioaddr, db->phy_addr, 3, db->chip_id);
         if ( ( tmp_reg & 0xfff0 ) == 0xb900 ) {
                 /* DM9801 or DM9802 present */
@@ -2095,6 +2109,7 @@ static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state)
 {
         struct net_device *dev = pci_get_drvdata(pci_dev);
         struct dmfe_board_info *db = netdev_priv(dev);
+        void __iomem *ioaddr = db->ioaddr;
         u32 tmp;
 
         /* Disable upper layer interface */
@@ -2102,11 +2117,11 @@ static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state)
 
         /* Disable Tx/Rx */
         db->cr6_data &= ~(CR6_RXSC | CR6_TXSC);
-        update_cr6(db->cr6_data, dev->base_addr);
+        update_cr6(db->cr6_data, ioaddr);
 
         /* Disable Interrupt */
-        outl(0, dev->base_addr + DCR7);
-        outl(inl (dev->base_addr + DCR5), dev->base_addr + DCR5);
+        dw32(DCR7, 0);
+        dw32(DCR5, dr32(DCR5));
 
         /* Fre RX buffers */
         dmfe_free_rxbuffer(db);
diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c
index fea3641d9398..c4f37aca2269 100644
--- a/drivers/net/ethernet/dec/tulip/tulip_core.c
+++ b/drivers/net/ethernet/dec/tulip/tulip_core.c
@@ -328,7 +328,7 @@ static void tulip_up(struct net_device *dev)
         udelay(100);
 
         if (tulip_debug > 1)
-                netdev_dbg(dev, "tulip_up(), irq==%d\n", dev->irq);
+                netdev_dbg(dev, "tulip_up(), irq==%d\n", tp->pdev->irq);
 
         iowrite32(tp->rx_ring_dma, ioaddr + CSR3);
         iowrite32(tp->tx_ring_dma, ioaddr + CSR4);
@@ -515,11 +515,13 @@ media_picked:
 static int
 tulip_open(struct net_device *dev)
 {
+        struct tulip_private *tp = netdev_priv(dev);
         int retval;
 
         tulip_init_ring (dev);
 
-        retval = request_irq(dev->irq, tulip_interrupt, IRQF_SHARED, dev->name, dev);
+        retval = request_irq(tp->pdev->irq, tulip_interrupt, IRQF_SHARED,
+                             dev->name, dev);
         if (retval)
                 goto free_ring;
 
@@ -841,7 +843,7 @@ static int tulip_close (struct net_device *dev)
                 netdev_dbg(dev, "Shutting down ethercard, status was %02x\n",
                            ioread32 (ioaddr + CSR5));
 
-        free_irq (dev->irq, dev);
+        free_irq (tp->pdev->irq, dev);
 
         tulip_free_ring (dev);
 
@@ -1489,8 +1491,6 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
 
         INIT_WORK(&tp->media_work, tulip_tbl[tp->chip_id].media_task);
 
-        dev->base_addr = (unsigned long)ioaddr;
-
 #ifdef CONFIG_TULIP_MWI
         if (!force_csr0 && (tp->flags & HAS_PCI_MWI))
                 tulip_mwi_config (pdev, dev);
@@ -1650,7 +1650,6 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
         for (i = 0; i < 6; i++)
                 last_phys_addr[i] = dev->dev_addr[i];
         last_irq = irq;
-        dev->irq = irq;
 
         /* The lower four bits are the media type. */
         if (board_idx >= 0  &&  board_idx < MAX_UNITS) {
@@ -1858,7 +1857,8 @@ static int tulip_suspend (struct pci_dev *pdev, pm_message_t state)
         tulip_down(dev);
 
         netif_device_detach(dev);
-        free_irq(dev->irq, dev);
+        /* FIXME: it needlessly adds an error path. */
+        free_irq(tp->pdev->irq, dev);
 
 save_state:
         pci_save_state(pdev);
@@ -1900,7 +1900,9 @@ static int tulip_resume(struct pci_dev *pdev)
                 return retval;
         }
 
-        if ((retval = request_irq(dev->irq, tulip_interrupt, IRQF_SHARED, dev->name, dev))) {
+        retval = request_irq(pdev->irq, tulip_interrupt, IRQF_SHARED,
+                             dev->name, dev);
+        if (retval) {
                 pr_err("request_irq failed in resume\n");
                 return retval;
         }
@@ -1960,11 +1962,14 @@ static void __devexit tulip_remove_one (struct pci_dev *pdev)
 
 static void poll_tulip (struct net_device *dev)
 {
+        struct tulip_private *tp = netdev_priv(dev);
+        const int irq = tp->pdev->irq;
+
         /* disable_irq here is not very nice, but with the lockless
            interrupt handler we have no other choice. */
-        disable_irq(dev->irq);
-        tulip_interrupt (dev->irq, dev);
-        enable_irq(dev->irq);
+        disable_irq(irq);
+        tulip_interrupt (irq, dev);
+        enable_irq(irq);
 }
 #endif
 
diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c
index fc4001f6a5e4..75d45f8a37dc 100644
--- a/drivers/net/ethernet/dec/tulip/uli526x.c
+++ b/drivers/net/ethernet/dec/tulip/uli526x.c
@@ -42,6 +42,8 @@
 #include <asm/dma.h>
 #include <asm/uaccess.h>
 
+#define uw32(reg, val)  iowrite32(val, ioaddr + (reg))
+#define ur32(reg)       ioread32(ioaddr + (reg))
 
 /* Board/System/Debug information/definition ---------------- */
 #define PCI_ULI5261_ID  0x526110B9      /* ULi M5261 ID*/
@@ -110,14 +112,6 @@ do {								\
 
 #define SROM_V41_CODE   0x14
 
-#define SROM_CLK_WRITE(data, ioaddr)                                    \
-                outl(data|CR9_SROM_READ|CR9_SRCS,ioaddr);               \
-                udelay(5);                                              \
-                outl(data|CR9_SROM_READ|CR9_SRCS|CR9_SRCLK,ioaddr);     \
-                udelay(5);                                              \
-                outl(data|CR9_SROM_READ|CR9_SRCS,ioaddr);               \
-                udelay(5);
-
 /* Structure/enum declaration ------------------------------- */
 struct tx_desc {
         __le32 tdes0, tdes1, tdes2, tdes3; /* Data for the card */
@@ -132,12 +126,15 @@ struct rx_desc {
 } __attribute__(( aligned(32) ));
 
 struct uli526x_board_info {
-        u32 chip_id;                    /* Chip vendor/Device ID */
+        struct uli_phy_ops {
+                void (*write)(struct uli526x_board_info *, u8, u8, u16);
+                u16 (*read)(struct uli526x_board_info *, u8, u8);
+        } phy;
         struct net_device *next_dev;    /* next device */
         struct pci_dev *pdev;           /* PCI device */
         spinlock_t lock;
 
-        long ioaddr;                    /* I/O base address */
+        void __iomem *ioaddr;           /* I/O base address */
         u32 cr0_data;
         u32 cr5_data;
         u32 cr6_data;
@@ -227,21 +224,21 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *,
 static int uli526x_stop(struct net_device *);
 static void uli526x_set_filter_mode(struct net_device *);
 static const struct ethtool_ops netdev_ethtool_ops;
-static u16 read_srom_word(long, int);
+static u16 read_srom_word(struct uli526x_board_info *, int);
 static irqreturn_t uli526x_interrupt(int, void *);
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void uli526x_poll(struct net_device *dev);
 #endif
-static void uli526x_descriptor_init(struct net_device *, unsigned long);
+static void uli526x_descriptor_init(struct net_device *, void __iomem *);
 static void allocate_rx_buffer(struct net_device *);
-static void update_cr6(u32, unsigned long);
+static void update_cr6(u32, void __iomem *);
 static void send_filter_frame(struct net_device *, int);
-static u16 phy_read(unsigned long, u8, u8, u32);
-static u16 phy_readby_cr10(unsigned long, u8, u8);
-static void phy_write(unsigned long, u8, u8, u16, u32);
-static void phy_writeby_cr10(unsigned long, u8, u8, u16);
-static void phy_write_1bit(unsigned long, u32, u32);
-static u16 phy_read_1bit(unsigned long, u32);
+static u16 phy_readby_cr9(struct uli526x_board_info *, u8, u8);
+static u16 phy_readby_cr10(struct uli526x_board_info *, u8, u8);
+static void phy_writeby_cr9(struct uli526x_board_info *, u8, u8, u16);
+static void phy_writeby_cr10(struct uli526x_board_info *, u8, u8, u16);
+static void phy_write_1bit(struct uli526x_board_info *db, u32);
+static u16 phy_read_1bit(struct uli526x_board_info *db);
 static u8 uli526x_sense_speed(struct uli526x_board_info *);
 static void uli526x_process_mode(struct uli526x_board_info *);
 static void uli526x_timer(unsigned long);
@@ -253,6 +250,18 @@ static void uli526x_free_rxbuffer(struct uli526x_board_info *);
 static void uli526x_init(struct net_device *);
 static void uli526x_set_phyxcer(struct uli526x_board_info *);
 
+static void srom_clk_write(struct uli526x_board_info *db, u32 data)
+{
+        void __iomem *ioaddr = db->ioaddr;
+
+        uw32(DCR9, data | CR9_SROM_READ | CR9_SRCS);
+        udelay(5);
+        uw32(DCR9, data | CR9_SROM_READ | CR9_SRCS | CR9_SRCLK);
+        udelay(5);
+        uw32(DCR9, data | CR9_SROM_READ | CR9_SRCS);
+        udelay(5);
+}
+
 /* ULI526X network board routine ---------------------------- */
 
 static const struct net_device_ops netdev_ops = {
@@ -277,6 +286,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
 {
         struct uli526x_board_info *db;  /* board information structure */
         struct net_device *dev;
+        void __iomem *ioaddr;
         int i, err;
 
         ULI526X_DBUG(0, "uli526x_init_one()", 0);
@@ -313,9 +323,9 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
                 goto err_out_disable;
         }
 
-        if (pci_request_regions(pdev, DRV_NAME)) {
+        err = pci_request_regions(pdev, DRV_NAME);
+        if (err < 0) {
                 pr_err("Failed to request PCI regions\n");
-                err = -ENODEV;
                 goto err_out_disable;
         }
 
@@ -323,32 +333,41 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
         db = netdev_priv(dev);
 
         /* Allocate Tx/Rx descriptor memory */
+        err = -ENOMEM;
+
         db->desc_pool_ptr = pci_alloc_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20, &db->desc_pool_dma_ptr);
-        if(db->desc_pool_ptr == NULL)
-        {
-                err = -ENOMEM;
-                goto err_out_nomem;
-        }
+        if (!db->desc_pool_ptr)
+                goto err_out_release;
+
         db->buf_pool_ptr = pci_alloc_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4, &db->buf_pool_dma_ptr);
-        if(db->buf_pool_ptr == NULL)
-        {
-                err = -ENOMEM;
-                goto err_out_nomem;
-        }
+        if (!db->buf_pool_ptr)
+                goto err_out_free_tx_desc;
 
         db->first_tx_desc = (struct tx_desc *) db->desc_pool_ptr;
         db->first_tx_desc_dma = db->desc_pool_dma_ptr;
         db->buf_pool_start = db->buf_pool_ptr;
         db->buf_pool_dma_start = db->buf_pool_dma_ptr;
 
-        db->chip_id = ent->driver_data;
-        db->ioaddr = pci_resource_start(pdev, 0);
+        switch (ent->driver_data) {
+        case PCI_ULI5263_ID:
+                db->phy.write   = phy_writeby_cr10;
+                db->phy.read    = phy_readby_cr10;
+                break;
+        default:
+                db->phy.write   = phy_writeby_cr9;
+                db->phy.read    = phy_readby_cr9;
+                break;
+        }
+
+        /* IO region. */
+        ioaddr = pci_iomap(pdev, 0, 0);
+        if (!ioaddr)
+                goto err_out_free_tx_buf;
 
+        db->ioaddr = ioaddr;
         db->pdev = pdev;
         db->init = 1;
 
-        dev->base_addr = db->ioaddr;
-        dev->irq = pdev->irq;
         pci_set_drvdata(pdev, dev);
 
         /* Register some necessary functions */
@@ -360,24 +379,24 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
 
         /* read 64 word srom data */
         for (i = 0; i < 64; i++)
-                ((__le16 *) db->srom)[i] = cpu_to_le16(read_srom_word(db->ioaddr, i));
+                ((__le16 *) db->srom)[i] = cpu_to_le16(read_srom_word(db, i));
 
         /* Set Node address */
         if(((u16 *) db->srom)[0] == 0xffff || ((u16 *) db->srom)[0] == 0)               /* SROM absent, so read MAC address from ID Table */
         {
-                outl(0x10000, db->ioaddr + DCR0);       //Diagnosis mode
-                outl(0x1c0, db->ioaddr + DCR13);        //Reset dianostic pointer port
-                outl(0, db->ioaddr + DCR14);            //Clear reset port
-                outl(0x10, db->ioaddr + DCR14);         //Reset ID Table pointer
-                outl(0, db->ioaddr + DCR14);            //Clear reset port
-                outl(0, db->ioaddr + DCR13);            //Clear CR13
-                outl(0x1b0, db->ioaddr + DCR13);        //Select ID Table access port
+                uw32(DCR0, 0x10000);    //Diagnosis mode
+                uw32(DCR13, 0x1c0);     //Reset dianostic pointer port
+                uw32(DCR14, 0);         //Clear reset port
+                uw32(DCR14, 0x10);      //Reset ID Table pointer
+                uw32(DCR14, 0);         //Clear reset port
+                uw32(DCR13, 0);         //Clear CR13
+                uw32(DCR13, 0x1b0);     //Select ID Table access port
                 //Read MAC address from CR14
                 for (i = 0; i < 6; i++)
-                        dev->dev_addr[i] = inl(db->ioaddr + DCR14);
+                        dev->dev_addr[i] = ur32(DCR14);
                 //Read end
-                outl(0, db->ioaddr + DCR13);    //Clear CR13
-                outl(0, db->ioaddr + DCR0);             //Clear CR0
+                uw32(DCR13, 0);         //Clear CR13
+                uw32(DCR0, 0);          //Clear CR0
                 udelay(10);
         }
         else            /*Exist SROM*/
@@ -387,26 +406,26 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
         }
         err = register_netdev (dev);
         if (err)
-                goto err_out_res;
+                goto err_out_unmap;
 
         netdev_info(dev, "ULi M%04lx at pci%s, %pM, irq %d\n",
                     ent->driver_data >> 16, pci_name(pdev),
-                    dev->dev_addr, dev->irq);
+                    dev->dev_addr, pdev->irq);
 
         pci_set_master(pdev);
 
         return 0;
 
-err_out_res:
+err_out_unmap:
+        pci_iounmap(pdev, db->ioaddr);
+err_out_free_tx_buf:
+        pci_free_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,
+                            db->buf_pool_ptr, db->buf_pool_dma_ptr);
+err_out_free_tx_desc:
+        pci_free_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,
+                            db->desc_pool_ptr, db->desc_pool_dma_ptr);
+err_out_release:
         pci_release_regions(pdev);
-err_out_nomem:
-        if(db->desc_pool_ptr)
-                pci_free_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,
-                        db->desc_pool_ptr, db->desc_pool_dma_ptr);
-
-        if(db->buf_pool_ptr != NULL)
-                pci_free_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,
-                        db->buf_pool_ptr, db->buf_pool_dma_ptr);
 err_out_disable:
         pci_disable_device(pdev);
 err_out_free:
@@ -422,19 +441,17 @@ static void __devexit uli526x_remove_one (struct pci_dev *pdev)
         struct net_device *dev = pci_get_drvdata(pdev);
         struct uli526x_board_info *db = netdev_priv(dev);
 
-        ULI526X_DBUG(0, "uli526x_remove_one()", 0);
-
+        unregister_netdev(dev);
+        pci_iounmap(pdev, db->ioaddr);
         pci_free_consistent(db->pdev, sizeof(struct tx_desc) *
                                 DESC_ALL_CNT + 0x20, db->desc_pool_ptr,
                                 db->desc_pool_dma_ptr);
         pci_free_consistent(db->pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,
                                 db->buf_pool_ptr, db->buf_pool_dma_ptr);
-        unregister_netdev(dev);
         pci_release_regions(pdev);
-        free_netdev(dev);       /* free board information */
-        pci_set_drvdata(pdev, NULL);
         pci_disable_device(pdev);
-        ULI526X_DBUG(0, "uli526x_remove_one() exit", 0);
+        pci_set_drvdata(pdev, NULL);
+        free_netdev(dev);
 }
 
 
@@ -468,7 +485,8 @@ static int uli526x_open(struct net_device *dev)
         /* Initialize ULI526X board */
         uli526x_init(dev);
 
-        ret = request_irq(dev->irq, uli526x_interrupt, IRQF_SHARED, dev->name, dev);
+        ret = request_irq(db->pdev->irq, uli526x_interrupt, IRQF_SHARED,
+                          dev->name, dev);
         if (ret)
                 return ret;
 
@@ -496,57 +514,57 @@ static int uli526x_open(struct net_device *dev)
 static void uli526x_init(struct net_device *dev)
 {
         struct uli526x_board_info *db = netdev_priv(dev);
-        unsigned long ioaddr = db->ioaddr;
+        struct uli_phy_ops *phy = &db->phy;
+        void __iomem *ioaddr = db->ioaddr;
         u8      phy_tmp;
         u8      timeout;
-        u16     phy_value;
         u16 phy_reg_reset;
 
 
         ULI526X_DBUG(0, "uli526x_init()", 0);
 
         /* Reset M526x MAC controller */
-        outl(ULI526X_RESET, ioaddr + DCR0);     /* RESET MAC */
+        uw32(DCR0, ULI526X_RESET);      /* RESET MAC */
         udelay(100);
-        outl(db->cr0_data, ioaddr + DCR0);
+        uw32(DCR0, db->cr0_data);
         udelay(5);
 
         /* Phy addr : In some boards,M5261/M5263 phy address != 1 */
         db->phy_addr = 1;
-        for(phy_tmp=0;phy_tmp<32;phy_tmp++)
-        {
-                phy_value=phy_read(db->ioaddr,phy_tmp,3,db->chip_id);//peer add
-                if(phy_value != 0xffff&&phy_value!=0)
-                {
+        for (phy_tmp = 0; phy_tmp < 32; phy_tmp++) {
+                u16 phy_value;
+
+                phy_value = phy->read(db, phy_tmp, 3);  //peer add
+                if (phy_value != 0xffff && phy_value != 0) {
                         db->phy_addr = phy_tmp;
                         break;
                 }
         }
-        if(phy_tmp == 32)
+
+        if (phy_tmp == 32)
                 pr_warn("Can not find the phy address!!!\n");
         /* Parser SROM and media mode */
         db->media_mode = uli526x_media_mode;
 
         /* phyxcer capability setting */
-        phy_reg_reset = phy_read(db->ioaddr, db->phy_addr, 0, db->chip_id);
+        phy_reg_reset = phy->read(db, db->phy_addr, 0);
         phy_reg_reset = (phy_reg_reset | 0x8000);
-        phy_write(db->ioaddr, db->phy_addr, 0, phy_reg_reset, db->chip_id);
+        phy->write(db, db->phy_addr, 0, phy_reg_reset);
 
         /* See IEEE 802.3-2002.pdf (Section 2, Chapter "22.2.4 Management
          * functions") or phy data sheet for details on phy reset
          */
         udelay(500);
         timeout = 10;
-        while (timeout-- &&
-                phy_read(db->ioaddr, db->phy_addr, 0, db->chip_id) & 0x8000)
-                        udelay(100);
+        while (timeout-- && phy->read(db, db->phy_addr, 0) & 0x8000)
+                udelay(100);
 
         /* Process Phyxcer Media Mode */
         uli526x_set_phyxcer(db);
 
         /* Media Mode Process */
         if ( !(db->media_mode & ULI526X_AUTO) )
-                db->op_mode = db->media_mode;   /* Force Mode */
+                db->op_mode = db->media_mode;           /* Force Mode */
 
         /* Initialize Transmit/Receive decriptor and CR3/4 */
         uli526x_descriptor_init(dev, ioaddr);
@@ -559,10 +577,10 @@ static void uli526x_init(struct net_device *dev)
 
         /* Init CR7, interrupt active bit */
         db->cr7_data = CR7_DEFAULT;
-        outl(db->cr7_data, ioaddr + DCR7);
+        uw32(DCR7, db->cr7_data);
 
         /* Init CR15, Tx jabber and Rx watchdog timer */
-        outl(db->cr15_data, ioaddr + DCR15);
+        uw32(DCR15, db->cr15_data);
 
         /* Enable ULI526X Tx/Rx function */
         db->cr6_data |= CR6_RXSC | CR6_TXSC;
@@ -579,6 +597,7 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,
                                             struct net_device *dev)
 {
         struct uli526x_board_info *db = netdev_priv(dev);
+        void __iomem *ioaddr = db->ioaddr;
         struct tx_desc *txptr;
         unsigned long flags;
 
@@ -604,7 +623,7 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,
         }
 
         /* Disable NIC interrupt */
-        outl(0, dev->base_addr + DCR7);
+        uw32(DCR7, 0);
 
         /* transmit this packet */
         txptr = db->tx_insert_ptr;
@@ -615,10 +634,10 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,
         db->tx_insert_ptr = txptr->next_tx_desc;
 
         /* Transmit Packet Process */
-        if ( (db->tx_packet_cnt < TX_DESC_CNT) ) {
+        if (db->tx_packet_cnt < TX_DESC_CNT) {
                 txptr->tdes0 = cpu_to_le32(0x80000000); /* Set owner bit */
                 db->tx_packet_cnt++;                    /* Ready to send */
-                outl(0x1, dev->base_addr + DCR1);       /* Issue Tx polling */
+                uw32(DCR1, 0x1);                        /* Issue Tx polling */
                 dev->trans_start = jiffies;             /* saved time stamp */
         }
 
@@ -628,7 +647,7 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,
 
         /* Restore CR7 to enable interrupt */
         spin_unlock_irqrestore(&db->lock, flags);
-        outl(db->cr7_data, dev->base_addr + DCR7);
+        uw32(DCR7, db->cr7_data);
 
         /* free this SKB */
         dev_kfree_skb(skb);
@@ -645,9 +664,7 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,
 static int uli526x_stop(struct net_device *dev)
 {
         struct uli526x_board_info *db = netdev_priv(dev);
-        unsigned long ioaddr = dev->base_addr;
-
-        ULI526X_DBUG(0, "uli526x_stop", 0);
+        void __iomem *ioaddr = db->ioaddr;
 
         /* disable system */
         netif_stop_queue(dev);
@@ -656,12 +673,12 @@ static int uli526x_stop(struct net_device *dev)
         del_timer_sync(&db->timer);
 
         /* Reset & stop ULI526X board */
-        outl(ULI526X_RESET, ioaddr + DCR0);
+        uw32(DCR0, ULI526X_RESET);
         udelay(5);
-        phy_write(db->ioaddr, db->phy_addr, 0, 0x8000, db->chip_id);
+        db->phy.write(db, db->phy_addr, 0, 0x8000);
 
         /* free interrupt */
-        free_irq(dev->irq, dev);
+        free_irq(db->pdev->irq, dev);
 
         /* free allocated rx buffer */
         uli526x_free_rxbuffer(db);
@@ -679,18 +696,18 @@ static irqreturn_t uli526x_interrupt(int irq, void *dev_id)
 {
         struct net_device *dev = dev_id;
         struct uli526x_board_info *db = netdev_priv(dev);
-        unsigned long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = db->ioaddr;
         unsigned long flags;
 
         spin_lock_irqsave(&db->lock, flags);
-        outl(0, ioaddr + DCR7);
+        uw32(DCR7, 0);
 
         /* Got ULI526X status */
-        db->cr5_data = inl(ioaddr + DCR5);
-        outl(db->cr5_data, ioaddr + DCR5);
+        db->cr5_data = ur32(DCR5);
+        uw32(DCR5, db->cr5_data);
         if ( !(db->cr5_data & 0x180c1) ) {
                 /* Restore CR7 to enable interrupt mask */
-                outl(db->cr7_data, ioaddr + DCR7);
+                uw32(DCR7, db->cr7_data);
                 spin_unlock_irqrestore(&db->lock, flags);
                 return IRQ_HANDLED;
         }
@@ -718,7 +735,7 @@ static irqreturn_t uli526x_interrupt(int irq, void *dev_id)
                 uli526x_free_tx_pkt(dev, db);
 
         /* Restore CR7 to enable interrupt mask */
-        outl(db->cr7_data, ioaddr + DCR7);
+        uw32(DCR7, db->cr7_data);
 
         spin_unlock_irqrestore(&db->lock, flags);
         return IRQ_HANDLED;
@@ -727,8 +744,10 @@ static irqreturn_t uli526x_interrupt(int irq, void *dev_id)
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void uli526x_poll(struct net_device *dev)
 {
+        struct uli526x_board_info *db = netdev_priv(dev);
+
         /* ISR grabs the irqsave lock, so this should be safe */
-        uli526x_interrupt(dev->irq, dev);
+        uli526x_interrupt(db->pdev->irq, dev);
 }
 #endif
 
@@ -962,12 +981,7 @@ static void netdev_get_drvinfo(struct net_device *dev,
 
         strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
         strlcpy(info->version, DRV_VERSION, sizeof(info->version));
-        if (np->pdev)
-                strlcpy(info->bus_info, pci_name(np->pdev),
-                        sizeof(info->bus_info));
-        else
-                sprintf(info->bus_info, "EISA 0x%lx %d",
-                        dev->base_addr, dev->irq);
+        strlcpy(info->bus_info, pci_name(np->pdev), sizeof(info->bus_info));
 }
 
 static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) {
@@ -1007,18 +1021,20 @@ static const struct ethtool_ops netdev_ethtool_ops = {
 
 static void uli526x_timer(unsigned long data)
 {
-        u32 tmp_cr8;
-        unsigned char tmp_cr12=0;
         struct net_device *dev = (struct net_device *) data;
         struct uli526x_board_info *db = netdev_priv(dev);
+        struct uli_phy_ops *phy = &db->phy;
+        void __iomem *ioaddr = db->ioaddr;
         unsigned long flags;
+        u8 tmp_cr12 = 0;
+        u32 tmp_cr8;
 
         //ULI526X_DBUG(0, "uli526x_timer()", 0);
         spin_lock_irqsave(&db->lock, flags);
 
 
         /* Dynamic reset ULI526X : system error or transmit time-out */
-        tmp_cr8 = inl(db->ioaddr + DCR8);
+        tmp_cr8 = ur32(DCR8);
         if ( (db->interval_rx_cnt==0) && (tmp_cr8) ) {
                 db->reset_cr8++;
                 db->wait_reset = 1;
@@ -1028,7 +1044,7 @@ static void uli526x_timer(unsigned long data)
         /* TX polling kick monitor */
         if ( db->tx_packet_cnt &&
              time_after(jiffies, dev_trans_start(dev) + ULI526X_TX_KICK) ) {
-                outl(0x1, dev->base_addr + DCR1);   // Tx polling again
+                uw32(DCR1, 0x1);   // Tx polling again
 
                 // TX Timeout
                 if ( time_after(jiffies, dev_trans_start(dev) + ULI526X_TX_TIMEOUT) ) {
@@ -1049,7 +1065,7 @@ static void uli526x_timer(unsigned long data)
         }
 
         /* Link status check, Dynamic media type change */
-        if((phy_read(db->ioaddr, db->phy_addr, 5, db->chip_id) & 0x01e0)!=0)
+        if ((phy->read(db, db->phy_addr, 5) & 0x01e0)!=0)
                 tmp_cr12 = 3;
 
         if ( !(tmp_cr12 & 0x3) && !db->link_failed ) {
@@ -1062,7 +1078,7 @@ static void uli526x_timer(unsigned long data)
                 /* For Force 10/100M Half/Full mode: Enable Auto-Nego mode */
                 /* AUTO don't need */
                 if ( !(db->media_mode & 0x8) )
-                        phy_write(db->ioaddr, db->phy_addr, 0, 0x1000, db->chip_id);
+                        phy->write(db, db->phy_addr, 0, 0x1000);
 
                 /* AUTO mode, if INT phyxcer link failed, select EXT device */
                 if (db->media_mode & ULI526X_AUTO) {
@@ -1119,12 +1135,13 @@ static void uli526x_timer(unsigned long data)
 static void uli526x_reset_prepare(struct net_device *dev)
 {
         struct uli526x_board_info *db = netdev_priv(dev);
+        void __iomem *ioaddr = db->ioaddr;
 
         /* Sopt MAC controller */
         db->cr6_data &= ~(CR6_RXSC | CR6_TXSC); /* Disable Tx/Rx */
-        update_cr6(db->cr6_data, dev->base_addr);
-        outl(0, dev->base_addr + DCR7);         /* Disable Interrupt */
-        outl(inl(dev->base_addr + DCR5), dev->base_addr + DCR5);
+        update_cr6(db->cr6_data, ioaddr);
+        uw32(DCR7, 0);                          /* Disable Interrupt */
+        uw32(DCR5, ur32(DCR5));
 
         /* Disable upper layer interface */
         netif_stop_queue(dev);
@@ -1289,7 +1306,7 @@ static void uli526x_reuse_skb(struct uli526x_board_info *db, struct sk_buff * sk
  *      Using Chain structure, and allocate Tx/Rx buffer
  */
 
-static void uli526x_descriptor_init(struct net_device *dev, unsigned long ioaddr)
+static void uli526x_descriptor_init(struct net_device *dev, void __iomem *ioaddr)
 {
         struct uli526x_board_info *db = netdev_priv(dev);
         struct tx_desc *tmp_tx;
@@ -1304,14 +1321,14 @@ static void uli526x_descriptor_init(struct net_device *dev, unsigned long ioaddr
         /* tx descriptor start pointer */
         db->tx_insert_ptr = db->first_tx_desc;
         db->tx_remove_ptr = db->first_tx_desc;
-        outl(db->first_tx_desc_dma, ioaddr + DCR4);     /* TX DESC address */
+        uw32(DCR4, db->first_tx_desc_dma);      /* TX DESC address */
 
         /* rx descriptor start pointer */
         db->first_rx_desc = (void *)db->first_tx_desc + sizeof(struct tx_desc) * TX_DESC_CNT;
         db->first_rx_desc_dma =  db->first_tx_desc_dma + sizeof(struct tx_desc) * TX_DESC_CNT;
         db->rx_insert_ptr = db->first_rx_desc;
         db->rx_ready_ptr = db->first_rx_desc;
-        outl(db->first_rx_desc_dma, ioaddr + DCR3);     /* RX DESC address */
+        uw32(DCR3, db->first_rx_desc_dma);      /* RX DESC address */
 
         /* Init Transmit chain */
         tmp_buf = db->buf_pool_start;
@@ -1352,11 +1369,9 @@ static void uli526x_descriptor_init(struct net_device *dev, unsigned long ioaddr
  *      Update CR6 value
  *      Firstly stop ULI526X, then written value and start
  */
-
-static void update_cr6(u32 cr6_data, unsigned long ioaddr)
+static void update_cr6(u32 cr6_data, void __iomem *ioaddr)
 {
-
-        outl(cr6_data, ioaddr + DCR6);
+        uw32(DCR6, cr6_data);
         udelay(5);
 }
 
@@ -1375,6 +1390,7 @@ static void update_cr6(u32 cr6_data, unsigned long ioaddr)
 static void send_filter_frame(struct net_device *dev, int mc_cnt)
 {
         struct uli526x_board_info *db = netdev_priv(dev);
+        void __iomem *ioaddr = db->ioaddr;
         struct netdev_hw_addr *ha;
         struct tx_desc *txptr;
         u16 * addrptr;
@@ -1420,9 +1436,9 @@ static void send_filter_frame(struct net_device *dev, int mc_cnt)
                 /* Resource Empty */
                 db->tx_packet_cnt++;
                 txptr->tdes0 = cpu_to_le32(0x80000000);
-                update_cr6(db->cr6_data | 0x2000, dev->base_addr);
-                outl(0x1, dev->base_addr + DCR1);       /* Issue Tx polling */
-                update_cr6(db->cr6_data, dev->base_addr);
+                update_cr6(db->cr6_data | 0x2000, ioaddr);
+                uw32(DCR1, 0x1);        /* Issue Tx polling */
+                update_cr6(db->cr6_data, ioaddr);
                 dev->trans_start = jiffies;
         } else
                 netdev_err(dev, "No Tx resource - Send_filter_frame!\n");
@@ -1465,37 +1481,38 @@ static void allocate_rx_buffer(struct net_device *dev)
  *      Read one word data from the serial ROM
  */
 
-static u16 read_srom_word(long ioaddr, int offset)
+static u16 read_srom_word(struct uli526x_board_info *db, int offset)
 {
-        int i;
+        void __iomem *ioaddr = db->ioaddr;
         u16 srom_data = 0;
-        long cr9_ioaddr = ioaddr + DCR9;
+        int i;
 
-        outl(CR9_SROM_READ, cr9_ioaddr);
-        outl(CR9_SROM_READ | CR9_SRCS, cr9_ioaddr);
+        uw32(DCR9, CR9_SROM_READ);
+        uw32(DCR9, CR9_SROM_READ | CR9_SRCS);
 
         /* Send the Read Command 110b */
-        SROM_CLK_WRITE(SROM_DATA_1, cr9_ioaddr);
-        SROM_CLK_WRITE(SROM_DATA_1, cr9_ioaddr);
-        SROM_CLK_WRITE(SROM_DATA_0, cr9_ioaddr);
+        srom_clk_write(db, SROM_DATA_1);
+        srom_clk_write(db, SROM_DATA_1);
+        srom_clk_write(db, SROM_DATA_0);
 
         /* Send the offset */
         for (i = 5; i >= 0; i--) {
                 srom_data = (offset & (1 << i)) ? SROM_DATA_1 : SROM_DATA_0;
-                SROM_CLK_WRITE(srom_data, cr9_ioaddr);
+                srom_clk_write(db, srom_data);
         }
 
-        outl(CR9_SROM_READ | CR9_SRCS, cr9_ioaddr);
+        uw32(DCR9, CR9_SROM_READ | CR9_SRCS);
 
         for (i = 16; i > 0; i--) {
-                outl(CR9_SROM_READ | CR9_SRCS | CR9_SRCLK, cr9_ioaddr);
+                uw32(DCR9, CR9_SROM_READ | CR9_SRCS | CR9_SRCLK);
                 udelay(5);
-                srom_data = (srom_data << 1) | ((inl(cr9_ioaddr) & CR9_CRDOUT) ? 1 : 0);
-                outl(CR9_SROM_READ | CR9_SRCS, cr9_ioaddr);
+                srom_data = (srom_data << 1) |
+                            ((ur32(DCR9) & CR9_CRDOUT) ? 1 : 0);
+                uw32(DCR9, CR9_SROM_READ | CR9_SRCS);
                 udelay(5);
         }
 
-        outl(CR9_SROM_READ, cr9_ioaddr);
+        uw32(DCR9, CR9_SROM_READ);
         return srom_data;
 }
 
@@ -1506,15 +1523,16 @@ static u16 read_srom_word(long ioaddr, int offset)
 
 static u8 uli526x_sense_speed(struct uli526x_board_info * db)
 {
+        struct uli_phy_ops *phy = &db->phy;
         u8 ErrFlag = 0;
         u16 phy_mode;
 
-        phy_mode = phy_read(db->ioaddr, db->phy_addr, 1, db->chip_id);
-        phy_mode = phy_read(db->ioaddr, db->phy_addr, 1, db->chip_id);
+        phy_mode = phy->read(db, db->phy_addr, 1);
+        phy_mode = phy->read(db, db->phy_addr, 1);
 
         if ( (phy_mode & 0x24) == 0x24 ) {
 
-                phy_mode = ((phy_read(db->ioaddr, db->phy_addr, 5, db->chip_id) & 0x01e0)<<7);
+                phy_mode = ((phy->read(db, db->phy_addr, 5) & 0x01e0)<<7);
                 if(phy_mode&0x8000)
                         phy_mode = 0x8000;
                 else if(phy_mode&0x4000)
@@ -1549,10 +1567,11 @@ static u8 uli526x_sense_speed(struct uli526x_board_info * db)
 
 static void uli526x_set_phyxcer(struct uli526x_board_info *db)
 {
+        struct uli_phy_ops *phy = &db->phy;
         u16 phy_reg;
 
         /* Phyxcer capability setting */
-        phy_reg = phy_read(db->ioaddr, db->phy_addr, 4, db->chip_id) & ~0x01e0;
+        phy_reg = phy->read(db, db->phy_addr, 4) & ~0x01e0;
 
         if (db->media_mode & ULI526X_AUTO) {
                 /* AUTO Mode */
@@ -1573,10 +1592,10 @@ static void uli526x_set_phyxcer(struct uli526x_board_info *db)
                 phy_reg|=db->PHY_reg4;
                 db->media_mode|=ULI526X_AUTO;
         }
-        phy_write(db->ioaddr, db->phy_addr, 4, phy_reg, db->chip_id);
+        phy->write(db, db->phy_addr, 4, phy_reg);
 
         /* Restart Auto-Negotiation */
-        phy_write(db->ioaddr, db->phy_addr, 0, 0x1200, db->chip_id);
+        phy->write(db, db->phy_addr, 0, 0x1200);
         udelay(50);
 }
 
@@ -1590,6 +1609,7 @@ static void uli526x_set_phyxcer(struct uli526x_board_info *db)
 
 static void uli526x_process_mode(struct uli526x_board_info *db)
 {
+        struct uli_phy_ops *phy = &db->phy;
         u16 phy_reg;
 
         /* Full Duplex Mode Check */
@@ -1601,10 +1621,10 @@ static void uli526x_process_mode(struct uli526x_board_info *db)
         update_cr6(db->cr6_data, db->ioaddr);
 
         /* 10/100M phyxcer force mode need */
-        if ( !(db->media_mode & 0x8)) {
+        if (!(db->media_mode & 0x8)) {
                 /* Forece Mode */
-                phy_reg = phy_read(db->ioaddr, db->phy_addr, 6, db->chip_id);
-                if ( !(phy_reg & 0x1) ) {
+                phy_reg = phy->read(db, db->phy_addr, 6);
+                if (!(phy_reg & 0x1)) {
                         /* parter without N-Way capability */
                         phy_reg = 0x0;
                         switch(db->op_mode) {
@@ -1613,148 +1633,126 @@ static void uli526x_process_mode(struct uli526x_board_info *db)
                         case ULI526X_100MHF: phy_reg = 0x2000; break;
                         case ULI526X_100MFD: phy_reg = 0x2100; break;
                         }
-                        phy_write(db->ioaddr, db->phy_addr, 0, phy_reg, db->chip_id);
+                        phy->write(db, db->phy_addr, 0, phy_reg);
                 }
         }
 }
 
 
-/*
- *      Write a word to Phy register
- */
-
-static void phy_write(unsigned long iobase, u8 phy_addr, u8 offset, u16 phy_data, u32 chip_id)
+/* M5261/M5263 Chip */
+static void phy_writeby_cr9(struct uli526x_board_info *db, u8 phy_addr,
+                            u8 offset, u16 phy_data)
 {
         u16 i;
-        unsigned long ioaddr;
-
-        if(chip_id == PCI_ULI5263_ID)
-        {
-                phy_writeby_cr10(iobase, phy_addr, offset, phy_data);
-                return;
-        }
-        /* M5261/M5263 Chip */
-        ioaddr = iobase + DCR9;
 
         /* Send 33 synchronization clock to Phy controller */
         for (i = 0; i < 35; i++)
-                phy_write_1bit(ioaddr, PHY_DATA_1, chip_id);
+                phy_write_1bit(db, PHY_DATA_1);
 
         /* Send start command(01) to Phy */
-        phy_write_1bit(ioaddr, PHY_DATA_0, chip_id);
-        phy_write_1bit(ioaddr, PHY_DATA_1, chip_id);
+        phy_write_1bit(db, PHY_DATA_0);
+        phy_write_1bit(db, PHY_DATA_1);
 
         /* Send write command(01) to Phy */
-        phy_write_1bit(ioaddr, PHY_DATA_0, chip_id);
-        phy_write_1bit(ioaddr, PHY_DATA_1, chip_id);
+        phy_write_1bit(db, PHY_DATA_0);
+        phy_write_1bit(db, PHY_DATA_1);
 
         /* Send Phy address */
         for (i = 0x10; i > 0; i = i >> 1)
-                phy_write_1bit(ioaddr, phy_addr & i ? PHY_DATA_1 : PHY_DATA_0, chip_id);
+                phy_write_1bit(db, phy_addr & i ? PHY_DATA_1 : PHY_DATA_0);
 
         /* Send register address */
         for (i = 0x10; i > 0; i = i >> 1)
-                phy_write_1bit(ioaddr, offset & i ? PHY_DATA_1 : PHY_DATA_0, chip_id);
+                phy_write_1bit(db, offset & i ? PHY_DATA_1 : PHY_DATA_0);
 
         /* written trasnition */
-        phy_write_1bit(ioaddr, PHY_DATA_1, chip_id);
-        phy_write_1bit(ioaddr, PHY_DATA_0, chip_id);
+        phy_write_1bit(db, PHY_DATA_1);
+        phy_write_1bit(db, PHY_DATA_0);
 
         /* Write a word data to PHY controller */
-        for ( i = 0x8000; i > 0; i >>= 1)
-                phy_write_1bit(ioaddr, phy_data & i ? PHY_DATA_1 : PHY_DATA_0, chip_id);
-
+        for (i = 0x8000; i > 0; i >>= 1)
+                phy_write_1bit(db, phy_data & i ? PHY_DATA_1 : PHY_DATA_0);
 }
 
-
-/*
- *      Read a word data from phy register
- */
-
-static u16 phy_read(unsigned long iobase, u8 phy_addr, u8 offset, u32 chip_id)
+static u16 phy_readby_cr9(struct uli526x_board_info *db, u8 phy_addr, u8 offset)
 {
-        int i;
         u16 phy_data;
-        unsigned long ioaddr;
-
-        if(chip_id == PCI_ULI5263_ID)
-                return phy_readby_cr10(iobase, phy_addr, offset);
-        /* M5261/M5263 Chip */
-        ioaddr = iobase + DCR9;
+        int i;
 
         /* Send 33 synchronization clock to Phy controller */
         for (i = 0; i < 35; i++)
-                phy_write_1bit(ioaddr, PHY_DATA_1, chip_id);
+                phy_write_1bit(db, PHY_DATA_1);
 
         /* Send start command(01) to Phy */
-        phy_write_1bit(ioaddr, PHY_DATA_0, chip_id);
-        phy_write_1bit(ioaddr, PHY_DATA_1, chip_id);
+        phy_write_1bit(db, PHY_DATA_0);
+        phy_write_1bit(db, PHY_DATA_1);
 
         /* Send read command(10) to Phy */
-        phy_write_1bit(ioaddr, PHY_DATA_1, chip_id);
-        phy_write_1bit(ioaddr, PHY_DATA_0, chip_id);
+        phy_write_1bit(db, PHY_DATA_1);
+        phy_write_1bit(db, PHY_DATA_0);
 
         /* Send Phy address */
         for (i = 0x10; i > 0; i = i >> 1)
-                phy_write_1bit(ioaddr, phy_addr & i ? PHY_DATA_1 : PHY_DATA_0, chip_id);
+                phy_write_1bit(db, phy_addr & i ? PHY_DATA_1 : PHY_DATA_0);
 
         /* Send register address */
         for (i = 0x10; i > 0; i = i >> 1)
-                phy_write_1bit(ioaddr, offset & i ? PHY_DATA_1 : PHY_DATA_0, chip_id);
+                phy_write_1bit(db, offset & i ? PHY_DATA_1 : PHY_DATA_0);
 
         /* Skip transition state */
-        phy_read_1bit(ioaddr, chip_id);
+        phy_read_1bit(db);
 
         /* read 16bit data */
         for (phy_data = 0, i = 0; i < 16; i++) {
                 phy_data <<= 1;
-                phy_data |= phy_read_1bit(ioaddr, chip_id);
+                phy_data |= phy_read_1bit(db);
         }
 
         return phy_data;
 }
 
-static u16 phy_readby_cr10(unsigned long iobase, u8 phy_addr, u8 offset)
+static u16 phy_readby_cr10(struct uli526x_board_info *db, u8 phy_addr,
+                           u8 offset)
 {
-        unsigned long ioaddr,cr10_value;
+        void __iomem *ioaddr = db->ioaddr;
+        u32 cr10_value = phy_addr;
 
-        ioaddr = iobase + DCR10;
-        cr10_value = phy_addr;
-        cr10_value = (cr10_value<<5) + offset;
-        cr10_value = (cr10_value<<16) + 0x08000000;
-        outl(cr10_value,ioaddr);
+        cr10_value = (cr10_value <<  5) + offset;
+        cr10_value = (cr10_value << 16) + 0x08000000;
+        uw32(DCR10, cr10_value);
         udelay(1);
-        while(1)
-        {
-                cr10_value = inl(ioaddr);
-                if(cr10_value&0x10000000)
+        while (1) {
+                cr10_value = ur32(DCR10);
+                if (cr10_value & 0x10000000)
                         break;
         }
         return cr10_value & 0x0ffff;
 }
 
-static void phy_writeby_cr10(unsigned long iobase, u8 phy_addr, u8 offset, u16 phy_data)
+static void phy_writeby_cr10(struct uli526x_board_info *db, u8 phy_addr,
+                             u8 offset, u16 phy_data)
 {
-        unsigned long ioaddr,cr10_value;
+        void __iomem *ioaddr = db->ioaddr;
+        u32 cr10_value = phy_addr;
 
-        ioaddr = iobase + DCR10;
-        cr10_value = phy_addr;
-        cr10_value = (cr10_value<<5) + offset;
-        cr10_value = (cr10_value<<16) + 0x04000000 + phy_data;
-        outl(cr10_value,ioaddr);
+        cr10_value = (cr10_value <<  5) + offset;
+        cr10_value = (cr10_value << 16) + 0x04000000 + phy_data;
+        uw32(DCR10, cr10_value);
         udelay(1);
 }
 /*
  *      Write one bit data to Phy Controller
  */
 
-static void phy_write_1bit(unsigned long ioaddr, u32 phy_data, u32 chip_id)
+static void phy_write_1bit(struct uli526x_board_info *db, u32 data)
 {
-        outl(phy_data , ioaddr);                        /* MII Clock Low */
+        void __iomem *ioaddr = db->ioaddr;
+
+        uw32(DCR9, data);               /* MII Clock Low */
         udelay(1);
-        outl(phy_data  | MDCLKH, ioaddr);       /* MII Clock High */
+        uw32(DCR9, data | MDCLKH);      /* MII Clock High */
         udelay(1);
-        outl(phy_data , ioaddr);                        /* MII Clock Low */
+        uw32(DCR9, data);               /* MII Clock Low */
         udelay(1);
 }
 
@@ -1763,14 +1761,15 @@ static void phy_write_1bit(unsigned long ioaddr, u32 phy_data, u32 chip_id)
  *      Read one bit phy data from PHY controller
  */
 
-static u16 phy_read_1bit(unsigned long ioaddr, u32 chip_id)
+static u16 phy_read_1bit(struct uli526x_board_info *db)
 {
+        void __iomem *ioaddr = db->ioaddr;
         u16 phy_data;
 
-        outl(0x50000 , ioaddr);
+        uw32(DCR9, 0x50000);
         udelay(1);
-        phy_data = ( inl(ioaddr) >> 19 ) & 0x1;
-        outl(0x40000 , ioaddr);
+        phy_data = (ur32(DCR9) >> 19) & 0x1;
+        uw32(DCR9, 0x40000);
         udelay(1);
 
         return phy_data;
diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
index 2ac6fff0363a..4d1ffca83c82 100644
--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
@@ -400,9 +400,6 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,
            No hold time required! */
         iowrite32(0x00000001, ioaddr + PCIBusCfg);
 
-        dev->base_addr = (unsigned long)ioaddr;
-        dev->irq = irq;
-
         np = netdev_priv(dev);
         np->pci_dev = pdev;
         np->chip_id = chip_idx;
@@ -635,17 +632,18 @@ static int netdev_open(struct net_device *dev)
 {
         struct netdev_private *np = netdev_priv(dev);
         void __iomem *ioaddr = np->base_addr;
+        const int irq = np->pci_dev->irq;
         int i;
 
         iowrite32(0x00000001, ioaddr + PCIBusCfg);              /* Reset */
 
         netif_device_detach(dev);
-        i = request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev);
+        i = request_irq(irq, intr_handler, IRQF_SHARED, dev->name, dev);
         if (i)
                 goto out_err;
 
         if (debug > 1)
-                netdev_dbg(dev, "w89c840_open() irq %d\n", dev->irq);
+                netdev_dbg(dev, "w89c840_open() irq %d\n", irq);
 
         if((i=alloc_ringdesc(dev)))
                 goto out_err;
@@ -932,6 +930,7 @@ static void tx_timeout(struct net_device *dev)
 {
         struct netdev_private *np = netdev_priv(dev);
         void __iomem *ioaddr = np->base_addr;
+        const int irq = np->pci_dev->irq;
 
         dev_warn(&dev->dev, "Transmit timed out, status %08x, resetting...\n",
                  ioread32(ioaddr + IntrStatus));
@@ -951,7 +950,7 @@ static void tx_timeout(struct net_device *dev)
                np->cur_tx, np->dirty_tx, np->tx_full, np->tx_q_bytes);
         printk(KERN_DEBUG "Tx Descriptor addr %xh\n", ioread32(ioaddr+0x4C));
 
-        disable_irq(dev->irq);
+        disable_irq(irq);
         spin_lock_irq(&np->lock);
         /*
          * Under high load dirty_tx and the internal tx descriptor pointer
@@ -966,7 +965,7 @@ static void tx_timeout(struct net_device *dev)
         init_rxtx_rings(dev);
         init_registers(dev);
         spin_unlock_irq(&np->lock);
-        enable_irq(dev->irq);
+        enable_irq(irq);
 
         netif_wake_queue(dev);
         dev->trans_start = jiffies; /* prevent tx timeout */
@@ -1500,7 +1499,7 @@ static int netdev_close(struct net_device *dev)
         iowrite32(0x0000, ioaddr + IntrEnable);
         spin_unlock_irq(&np->lock);
 
-        free_irq(dev->irq, dev);
+        free_irq(np->pci_dev->irq, dev);
         wmb();
         netif_device_attach(dev);
 
@@ -1589,7 +1588,7 @@ static int w840_suspend (struct pci_dev *pdev, pm_message_t state)
                 iowrite32(0, ioaddr + IntrEnable);
                 spin_unlock_irq(&np->lock);
 
-                synchronize_irq(dev->irq);
+                synchronize_irq(np->pci_dev->irq);
                 netif_tx_disable(dev);
 
                 np->stats.rx_missed_errors += ioread32(ioaddr + RxMissed) & 0xffff;
diff --git a/drivers/net/ethernet/dec/tulip/xircom_cb.c b/drivers/net/ethernet/dec/tulip/xircom_cb.c
index fdb329fe6e8e..138bf83bc98e 100644
--- a/drivers/net/ethernet/dec/tulip/xircom_cb.c
+++ b/drivers/net/ethernet/dec/tulip/xircom_cb.c
@@ -41,7 +41,9 @@ MODULE_DESCRIPTION("Xircom Cardbus ethernet driver");
 MODULE_AUTHOR("Arjan van de Ven <arjanv@redhat.com>");
 MODULE_LICENSE("GPL");
 
-
+#define xw32(reg, val)  iowrite32(val, ioaddr + (reg))
+#define xr32(reg)       ioread32(ioaddr + (reg))
+#define xr8(reg)        ioread8(ioaddr + (reg))
 
 /* IO registers on the card, offsets */
 #define CSR0    0x00
@@ -83,7 +85,7 @@ struct xircom_private {
 
         struct sk_buff *tx_skb[4];
 
-        unsigned long io_port;
+        void __iomem *ioaddr;
         int open;
 
         /* transmit_used is the rotating counter that indicates which transmit
@@ -137,7 +139,7 @@ static int link_status(struct xircom_private *card);
 
 
 static DEFINE_PCI_DEVICE_TABLE(xircom_pci_table) = {
-        {0x115D, 0x0003, PCI_ANY_ID, PCI_ANY_ID,},
+        { PCI_VDEVICE(XIRCOM, 0x0003), },
         {0,},
 };
 MODULE_DEVICE_TABLE(pci, xircom_pci_table);
@@ -146,9 +148,7 @@ static struct pci_driver xircom_ops = {
         .name           = "xircom_cb",
         .id_table       = xircom_pci_table,
         .probe          = xircom_probe,
-        .remove         = xircom_remove,
-        .suspend =NULL,
-        .resume =NULL
+        .remove         = __devexit_p(xircom_remove),
 };
 
 
@@ -192,15 +192,18 @@ static const struct net_device_ops netdev_ops = {
  */
 static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
+        struct device *d = &pdev->dev;
         struct net_device *dev = NULL;
         struct xircom_private *private;
         unsigned long flags;
         unsigned short tmp16;
+        int rc;
 
         /* First do the PCI initialisation */
 
-        if (pci_enable_device(pdev))
-                return -ENODEV;
+        rc = pci_enable_device(pdev);
+        if (rc < 0)
+                goto out;
 
         /* disable all powermanagement */
         pci_write_config_dword(pdev, PCI_POWERMGMT, 0x0000);
@@ -211,11 +214,13 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
         pci_read_config_word (pdev,PCI_STATUS, &tmp16);
         pci_write_config_word (pdev, PCI_STATUS,tmp16);
 
-        if (!request_region(pci_resource_start(pdev, 0), 128, "xircom_cb")) {
+        rc = pci_request_regions(pdev, "xircom_cb");
+        if (rc < 0) {
                 pr_err("%s: failed to allocate io-region\n", __func__);
-                return -ENODEV;
+                goto err_disable;
         }
 
+        rc = -ENOMEM;
         /*
            Before changing the hardware, allocate the memory.
            This way, we can fail gracefully if not enough memory
@@ -223,17 +228,21 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
          */
         dev = alloc_etherdev(sizeof(struct xircom_private));
         if (!dev)
-                goto device_fail;
+                goto err_release;
 
         private = netdev_priv(dev);
 
         /* Allocate the send/receive buffers */
-        private->rx_buffer = pci_alloc_consistent(pdev,8192,&private->rx_dma_handle);
+        private->rx_buffer = dma_alloc_coherent(d, 8192,
+                                                &private->rx_dma_handle,
+                                                GFP_KERNEL);
         if (private->rx_buffer == NULL) {
                 pr_err("%s: no memory for rx buffer\n", __func__);
                 goto rx_buf_fail;
         }
-        private->tx_buffer = pci_alloc_consistent(pdev,8192,&private->tx_dma_handle);
+        private->tx_buffer = dma_alloc_coherent(d, 8192,
+                                                &private->tx_dma_handle,
+                                                GFP_KERNEL);
         if (private->tx_buffer == NULL) {
                 pr_err("%s: no memory for tx buffer\n", __func__);
                 goto tx_buf_fail;
@@ -244,10 +253,13 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
 
         private->dev = dev;
         private->pdev = pdev;
-        private->io_port = pci_resource_start(pdev, 0);
+
+        /* IO range. */
+        private->ioaddr = pci_iomap(pdev, 0, 0);
+        if (!private->ioaddr)
+                goto reg_fail;
+
         spin_lock_init(&private->lock);
-        dev->irq = pdev->irq;
-        dev->base_addr = private->io_port;
 
         initialize_card(private);
         read_mac_address(private);
@@ -256,9 +268,10 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
         dev->netdev_ops = &netdev_ops;
         pci_set_drvdata(pdev, dev);
 
-        if (register_netdev(dev)) {
+        rc = register_netdev(dev);
+        if (rc < 0) {
                 pr_err("%s: netdevice registration failed\n", __func__);
-                goto reg_fail;
+                goto err_unmap;
         }
 
         netdev_info(dev, "Xircom cardbus revision %i at irq %i\n",
@@ -273,17 +286,23 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
         spin_unlock_irqrestore(&private->lock,flags);
 
         trigger_receive(private);
+out:
+        return rc;
 
-        return 0;
-
+err_unmap:
+        pci_iounmap(pdev, private->ioaddr);
 reg_fail:
-        kfree(private->tx_buffer);
+        pci_set_drvdata(pdev, NULL);
+        dma_free_coherent(d, 8192, private->tx_buffer, private->tx_dma_handle);
 tx_buf_fail:
-        kfree(private->rx_buffer);
+        dma_free_coherent(d, 8192, private->rx_buffer, private->rx_dma_handle);
 rx_buf_fail:
         free_netdev(dev);
-device_fail:
-        return -ENODEV;
+err_release:
+        pci_release_regions(pdev);
+err_disable:
+        pci_disable_device(pdev);
+        goto out;
 }
 
 
@@ -297,25 +316,28 @@ static void __devexit xircom_remove(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
         struct xircom_private *card = netdev_priv(dev);
+        struct device *d = &pdev->dev;
 
-        pci_free_consistent(pdev,8192,card->rx_buffer,card->rx_dma_handle);
-        pci_free_consistent(pdev,8192,card->tx_buffer,card->tx_dma_handle);
-
-        release_region(dev->base_addr, 128);
         unregister_netdev(dev);
-        free_netdev(dev);
+        pci_iounmap(pdev, card->ioaddr);
         pci_set_drvdata(pdev, NULL);
+        dma_free_coherent(d, 8192, card->tx_buffer, card->tx_dma_handle);
+        dma_free_coherent(d, 8192, card->rx_buffer, card->rx_dma_handle);
+        free_netdev(dev);
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
 }
 
 static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
 {
         struct net_device *dev = (struct net_device *) dev_instance;
         struct xircom_private *card = netdev_priv(dev);
+        void __iomem *ioaddr = card->ioaddr;
         unsigned int status;
         int i;
 
         spin_lock(&card->lock);
-        status = inl(card->io_port+CSR5);
+        status = xr32(CSR5);
 
 #if defined DEBUG && DEBUG > 1
         print_binary(status);
@@ -345,7 +367,7 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
         /* Clear all remaining interrupts */
         status |= 0xffffffff; /* FIXME: make this clear only the
                                         real existing bits */
-        outl(status,card->io_port+CSR5);
+        xw32(CSR5, status);
 
 
         for (i=0;i<NUMDESCRIPTORS;i++)
@@ -423,11 +445,11 @@ static netdev_tx_t xircom_start_xmit(struct sk_buff *skb,
 static int xircom_open(struct net_device *dev)
 {
         struct xircom_private *xp = netdev_priv(dev);
+        const int irq = xp->pdev->irq;
         int retval;
 
-        netdev_info(dev, "xircom cardbus adaptor found, using irq %i\n",
-                    dev->irq);
-        retval = request_irq(dev->irq, xircom_interrupt, IRQF_SHARED, dev->name, dev);
+        netdev_info(dev, "xircom cardbus adaptor found, using irq %i\n", irq);
+        retval = request_irq(irq, xircom_interrupt, IRQF_SHARED, dev->name, dev);
         if (retval)
                 return retval;
 
@@ -459,7 +481,7 @@ static int xircom_close(struct net_device *dev)
         spin_unlock_irqrestore(&card->lock,flags);
 
         card->open = 0;
-        free_irq(dev->irq,dev);
+        free_irq(card->pdev->irq, dev);
 
         return 0;
 
@@ -469,35 +491,39 @@ static int xircom_close(struct net_device *dev)
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void xircom_poll_controller(struct net_device *dev)
 {
-        disable_irq(dev->irq);
-        xircom_interrupt(dev->irq, dev);
-        enable_irq(dev->irq);
+        struct xircom_private *xp = netdev_priv(dev);
+        const int irq = xp->pdev->irq;
+
+        disable_irq(irq);
+        xircom_interrupt(irq, dev);
+        enable_irq(irq);
 }
 #endif
 
 
 static void initialize_card(struct xircom_private *card)
 {
-        unsigned int val;
+        void __iomem *ioaddr = card->ioaddr;
         unsigned long flags;
+        u32 val;
 
         spin_lock_irqsave(&card->lock, flags);
 
         /* First: reset the card */
-        val = inl(card->io_port + CSR0);
+        val = xr32(CSR0);
         val |= 0x01;            /* Software reset */
-        outl(val, card->io_port + CSR0);
+        xw32(CSR0, val);
 
         udelay(100);            /* give the card some time to reset */
 
-        val = inl(card->io_port + CSR0);
+        val = xr32(CSR0);
         val &= ~0x01;           /* disable Software reset */
-        outl(val, card->io_port + CSR0);
+        xw32(CSR0, val);
 
 
         val = 0;                /* Value 0x00 is a safe and conservative value
                                    for the PCI configuration settings */
-        outl(val, card->io_port + CSR0);
+        xw32(CSR0, val);
 
 
         disable_all_interrupts(card);
@@ -515,10 +541,9 @@ ignored; I chose zero.
 */
 static void trigger_transmit(struct xircom_private *card)
 {
-        unsigned int val;
+        void __iomem *ioaddr = card->ioaddr;
 
-        val = 0;
-        outl(val, card->io_port + CSR1);
+        xw32(CSR1, 0);
 }
 
 /*
@@ -530,10 +555,9 @@ ignored; I chose zero.
 */
 static void trigger_receive(struct xircom_private *card)
 {
-        unsigned int val;
+        void __iomem *ioaddr = card->ioaddr;
 
-        val = 0;
-        outl(val, card->io_port + CSR2);
+        xw32(CSR2, 0);
 }
 
 /*
@@ -542,6 +566,7 @@ descriptors and programs the addresses into the card.
 */
 static void setup_descriptors(struct xircom_private *card)
 {
+        void __iomem *ioaddr = card->ioaddr;
         u32 address;
         int i;
 
@@ -571,7 +596,7 @@ static void setup_descriptors(struct xircom_private *card)
         wmb();
         /* Write the receive descriptor ring address to the card */
         address = card->rx_dma_handle;
-        outl(address, card->io_port + CSR3);    /* Receive descr list address */
+        xw32(CSR3, address);    /* Receive descr list address */
 
 
         /* transmit descriptors */
@@ -596,7 +621,7 @@ static void setup_descriptors(struct xircom_private *card)
         wmb();
         /* wite the transmit descriptor ring to the card */
         address = card->tx_dma_handle;
-        outl(address, card->io_port + CSR4);    /* xmit descr list address */
+        xw32(CSR4, address);    /* xmit descr list address */
 }
 
 /*
@@ -605,11 +630,12 @@ valid by setting the address in the card to 0x00.
 */
 static void remove_descriptors(struct xircom_private *card)
 {
+        void __iomem *ioaddr = card->ioaddr;
         unsigned int val;
 
         val = 0;
-        outl(val, card->io_port + CSR3);        /* Receive descriptor address */
-        outl(val, card->io_port + CSR4);        /* Send descriptor address */
+        xw32(CSR3, val);        /* Receive descriptor address */
+        xw32(CSR4, val);        /* Send descriptor address */
 }
 
 /*
@@ -620,17 +646,17 @@ This function also clears the status-bit.
 */
 static int link_status_changed(struct xircom_private *card)
 {
+        void __iomem *ioaddr = card->ioaddr;
         unsigned int val;
 
-        val = inl(card->io_port + CSR5);        /* Status register */
-
-        if ((val & (1 << 27)) == 0)             /* no change */
+        val = xr32(CSR5);       /* Status register */
+        if (!(val & (1 << 27))) /* no change */
                 return 0;
 
         /* clear the event by writing a 1 to the bit in the
            status register. */
         val = (1 << 27);
-        outl(val, card->io_port + CSR5);
+        xw32(CSR5, val);
 
         return 1;
 }
@@ -642,11 +668,9 @@ in a non-stopped state.
 */
 static int transmit_active(struct xircom_private *card)
 {
-        unsigned int val;
-
-        val = inl(card->io_port + CSR5);        /* Status register */
+        void __iomem *ioaddr = card->ioaddr;
 
-        if ((val & (7 << 20)) == 0)             /* transmitter disabled */
+        if (!(xr32(CSR5) & (7 << 20)))  /* transmitter disabled */
                 return 0;
 
         return 1;
@@ -658,11 +682,9 @@ in a non-stopped state.
 */
 static int receive_active(struct xircom_private *card)
 {
-        unsigned int val;
-
-        val = inl(card->io_port + CSR5);        /* Status register */
+        void __iomem *ioaddr = card->ioaddr;
 
-        if ((val & (7 << 17)) == 0)             /* receiver disabled */
+        if (!(xr32(CSR5) & (7 << 17)))  /* receiver disabled */
                 return 0;
 
         return 1;
@@ -680,10 +702,11 @@ must be called with the lock held and interrupts disabled.
 */
 static void activate_receiver(struct xircom_private *card)
 {
+        void __iomem *ioaddr = card->ioaddr;
         unsigned int val;
         int counter;
 
-        val = inl(card->io_port + CSR6);        /* Operation mode */
+        val = xr32(CSR6);       /* Operation mode */
 
         /* If the "active" bit is set and the receiver is already
            active, no need to do the expensive thing */
@@ -692,7 +715,7 @@ static void activate_receiver(struct xircom_private *card)
 
 
         val = val & ~2;         /* disable the receiver */
-        outl(val, card->io_port + CSR6);
+        xw32(CSR6, val);
 
         counter = 10;
         while (counter > 0) {
@@ -706,9 +729,9 @@ static void activate_receiver(struct xircom_private *card)
         }
 
         /* enable the receiver */
-        val = inl(card->io_port + CSR6);        /* Operation mode */
-        val = val | 2;                          /* enable the receiver */
-        outl(val, card->io_port + CSR6);
+        val = xr32(CSR6);       /* Operation mode */
+        val = val | 2;          /* enable the receiver */
+        xw32(CSR6, val);
 
         /* now wait for the card to activate again */
         counter = 10;
@@ -733,12 +756,13 @@ must be called with the lock held and interrupts disabled.
 */
 static void deactivate_receiver(struct xircom_private *card)
 {
+        void __iomem *ioaddr = card->ioaddr;
         unsigned int val;
         int counter;
 
-        val = inl(card->io_port + CSR6);        /* Operation mode */
-        val = val & ~2;                         /* disable the receiver */
-        outl(val, card->io_port + CSR6);
+        val = xr32(CSR6);       /* Operation mode */
+        val = val & ~2;         /* disable the receiver */
+        xw32(CSR6, val);
 
         counter = 10;
         while (counter > 0) {
@@ -765,10 +789,11 @@ must be called with the lock held and interrupts disabled.
 */
 static void activate_transmitter(struct xircom_private *card)
 {
+        void __iomem *ioaddr = card->ioaddr;
         unsigned int val;
         int counter;
 
-        val = inl(card->io_port + CSR6);        /* Operation mode */
+        val = xr32(CSR6);       /* Operation mode */
 
         /* If the "active" bit is set and the receiver is already
            active, no need to do the expensive thing */
@@ -776,7 +801,7 @@ static void activate_transmitter(struct xircom_private *card)
                 return;
 
         val = val & ~(1 << 13); /* disable the transmitter */
-        outl(val, card->io_port + CSR6);
+        xw32(CSR6, val);
 
         counter = 10;
         while (counter > 0) {
@@ -791,9 +816,9 @@ static void activate_transmitter(struct xircom_private *card)
         }
 
         /* enable the transmitter */
-        val = inl(card->io_port + CSR6);        /* Operation mode */
+        val = xr32(CSR6);       /* Operation mode */
         val = val | (1 << 13);  /* enable the transmitter */
-        outl(val, card->io_port + CSR6);
+        xw32(CSR6, val);
 
         /* now wait for the card to activate again */
         counter = 10;
@@ -818,12 +843,13 @@ must be called with the lock held and interrupts disabled.
 */
 static void deactivate_transmitter(struct xircom_private *card)
 {
+        void __iomem *ioaddr = card->ioaddr;
         unsigned int val;
         int counter;
 
-        val = inl(card->io_port + CSR6);        /* Operation mode */
+        val = xr32(CSR6);       /* Operation mode */
         val = val & ~2;         /* disable the transmitter */
-        outl(val, card->io_port + CSR6);
+        xw32(CSR6, val);
 
         counter = 20;
         while (counter > 0) {
@@ -846,11 +872,12 @@ must be called with the lock held and interrupts disabled.
 */
 static void enable_transmit_interrupt(struct xircom_private *card)
 {
+        void __iomem *ioaddr = card->ioaddr;
         unsigned int val;
 
-        val = inl(card->io_port + CSR7);        /* Interrupt enable register */
-        val |= 1;                               /* enable the transmit interrupt */
-        outl(val, card->io_port + CSR7);
+        val = xr32(CSR7);       /* Interrupt enable register */
+        val |= 1;               /* enable the transmit interrupt */
+        xw32(CSR7, val);
 }
 
 
@@ -861,11 +888,12 @@ must be called with the lock held and interrupts disabled.
 */
 static void enable_receive_interrupt(struct xircom_private *card)
 {
+        void __iomem *ioaddr = card->ioaddr;
         unsigned int val;
 
-        val = inl(card->io_port + CSR7);        /* Interrupt enable register */
-        val = val | (1 << 6);                   /* enable the receive interrupt */
-        outl(val, card->io_port + CSR7);
+        val = xr32(CSR7);       /* Interrupt enable register */
+        val = val | (1 << 6);   /* enable the receive interrupt */
+        xw32(CSR7, val);
 }
 
 /*
@@ -875,11 +903,12 @@ must be called with the lock held and interrupts disabled.
 */
 static void enable_link_interrupt(struct xircom_private *card)
 {
+        void __iomem *ioaddr = card->ioaddr;
         unsigned int val;
 
-        val = inl(card->io_port + CSR7);        /* Interrupt enable register */
-        val = val | (1 << 27);                  /* enable the link status chage interrupt */
-        outl(val, card->io_port + CSR7);
+        val = xr32(CSR7);       /* Interrupt enable register */
+        val = val | (1 << 27);  /* enable the link status chage interrupt */
+        xw32(CSR7, val);
 }
 
 
@@ -891,10 +920,9 @@ must be called with the lock held and interrupts disabled.
 */
 static void disable_all_interrupts(struct xircom_private *card)
 {
-        unsigned int val;
+        void __iomem *ioaddr = card->ioaddr;
 
-        val = 0;                                /* disable all interrupts */
-        outl(val, card->io_port + CSR7);
+        xw32(CSR7, 0);
 }
 
 /*
@@ -904,9 +932,10 @@ must be called with the lock held and interrupts disabled.
 */
 static void enable_common_interrupts(struct xircom_private *card)
 {
+        void __iomem *ioaddr = card->ioaddr;
         unsigned int val;
 
-        val = inl(card->io_port + CSR7);        /* Interrupt enable register */
+        val = xr32(CSR7);       /* Interrupt enable register */
         val |= (1<<16); /* Normal Interrupt Summary */
         val |= (1<<15); /* Abnormal Interrupt Summary */
         val |= (1<<13); /* Fatal bus error */
@@ -915,7 +944,7 @@ static void enable_common_interrupts(struct xircom_private *card)
         val |= (1<<5);  /* Transmit Underflow */
         val |= (1<<2);  /* Transmit Buffer Unavailable */
         val |= (1<<1);  /* Transmit Process Stopped */
-        outl(val, card->io_port + CSR7);
+        xw32(CSR7, val);
 }
 
 /*
@@ -925,11 +954,12 @@ must be called with the lock held and interrupts disabled.
 */
 static int enable_promisc(struct xircom_private *card)
 {
+        void __iomem *ioaddr = card->ioaddr;
         unsigned int val;
 
-        val = inl(card->io_port + CSR6);
+        val = xr32(CSR6);
         val = val | (1 << 6);
-        outl(val, card->io_port + CSR6);
+        xw32(CSR6, val);
 
         return 1;
 }
@@ -944,13 +974,16 @@ Must be called in locked state with interrupts disabled
 */
 static int link_status(struct xircom_private *card)
 {
-        unsigned int val;
+        void __iomem *ioaddr = card->ioaddr;
+        u8 val;
 
-        val = inb(card->io_port + CSR12);
+        val = xr8(CSR12);
 
-        if (!(val&(1<<2)))  /* bit 2 is 0 for 10mbit link, 1 for not an 10mbit link */
+        /* bit 2 is 0 for 10mbit link, 1 for not an 10mbit link */
+        if (!(val & (1 << 2)))
                 return 10;
-        if (!(val&(1<<1)))  /* bit 1 is 0 for 100mbit link, 1 for not an 100mbit link */
+        /* bit 1 is 0 for 100mbit link, 1 for not an 100mbit link */
+        if (!(val & (1 << 1)))
                 return 100;
 
         /* If we get here -> no link at all */
@@ -969,29 +1002,31 @@ static int link_status(struct xircom_private *card)
  */
 static void read_mac_address(struct xircom_private *card)
 {
-        unsigned char j, tuple, link, data_id, data_count;
+        void __iomem *ioaddr = card->ioaddr;
         unsigned long flags;
+        u8 link;
         int i;
 
         spin_lock_irqsave(&card->lock, flags);
 
-        outl(1 << 12, card->io_port + CSR9);    /* enable boot rom access */
+        xw32(CSR9, 1 << 12);    /* enable boot rom access */
         for (i = 0x100; i < 0x1f7; i += link + 2) {
-                outl(i, card->io_port + CSR10);
-                tuple = inl(card->io_port + CSR9) & 0xff;
-                outl(i + 1, card->io_port + CSR10);
-                link = inl(card->io_port + CSR9) & 0xff;
-                outl(i + 2, card->io_port + CSR10);
-                data_id = inl(card->io_port + CSR9) & 0xff;
-                outl(i + 3, card->io_port + CSR10);
-                data_count = inl(card->io_port + CSR9) & 0xff;
+                u8 tuple, data_id, data_count;
+
+                xw32(CSR10, i);
+                tuple = xr32(CSR9);
+                xw32(CSR10, i + 1);
+                link = xr32(CSR9);
+                xw32(CSR10, i + 2);
+                data_id = xr32(CSR9);
+                xw32(CSR10, i + 3);
+                data_count = xr32(CSR9);
                 if ((tuple == 0x22) && (data_id == 0x04) && (data_count == 0x06)) {
-                        /*
-                         * This is it.  We have the data we want.
-                         */
+                        int j;
+
                         for (j = 0; j < 6; j++) {
-                                outl(i + j + 4, card->io_port + CSR10);
-                                card->dev->dev_addr[j] = inl(card->io_port + CSR9) & 0xff;
+                                xw32(CSR10, i + j + 4);
+                                card->dev->dev_addr[j] = xr32(CSR9) & 0xff;
                         }
                         break;
                 } else if (link == 0) {
@@ -1010,6 +1045,7 @@ static void read_mac_address(struct xircom_private *card)
  */
 static void transceiver_voodoo(struct xircom_private *card)
 {
+        void __iomem *ioaddr = card->ioaddr;
         unsigned long flags;
 
         /* disable all powermanagement */
@@ -1019,14 +1055,14 @@ static void transceiver_voodoo(struct xircom_private *card)
 
         spin_lock_irqsave(&card->lock, flags);
 
-        outl(0x0008, card->io_port + CSR15);
-        udelay(25);
-        outl(0xa8050000, card->io_port + CSR15);
-        udelay(25);
-        outl(0xa00f0000, card->io_port + CSR15);
-        udelay(25);
+        xw32(CSR15, 0x0008);
+        udelay(25);
+        xw32(CSR15, 0xa8050000);
+        udelay(25);
+        xw32(CSR15, 0xa00f0000);
+        udelay(25);
 
-        spin_unlock_irqrestore(&card->lock, flags);
+        spin_unlock_irqrestore(&card->lock, flags);
 
         netif_start_queue(card->dev);
 }
diff --git a/drivers/net/ethernet/dlink/dl2k.c b/drivers/net/ethernet/dlink/dl2k.c
index b2dc2c81a147..a059f0c27e28 100644
--- a/drivers/net/ethernet/dlink/dl2k.c
+++ b/drivers/net/ethernet/dlink/dl2k.c
@@ -16,6 +16,13 @@
 #include "dl2k.h"
 #include <linux/dma-mapping.h>
 
+#define dw32(reg, val)  iowrite32(val, ioaddr + (reg))
+#define dw16(reg, val)  iowrite16(val, ioaddr + (reg))
+#define dw8(reg, val)   iowrite8(val, ioaddr + (reg))
+#define dr32(reg)       ioread32(ioaddr + (reg))
+#define dr16(reg)       ioread16(ioaddr + (reg))
+#define dr8(reg)        ioread8(ioaddr + (reg))
+
 static char version[] __devinitdata =
       KERN_INFO DRV_NAME " " DRV_VERSION " " DRV_RELDATE "\n";
 #define MAX_UNITS 8
@@ -49,8 +56,13 @@ module_param(tx_coalesce, int, 0); /* HW xmit count each TxDMAComplete */
 /* Enable the default interrupts */
 #define DEFAULT_INTR (RxDMAComplete | HostError | IntRequested | TxDMAComplete| \
        UpdateStats | LinkEvent)
-#define EnableInt() \
-writew(DEFAULT_INTR, ioaddr + IntEnable)
+
+static void dl2k_enable_int(struct netdev_private *np)
+{
+        void __iomem *ioaddr = np->ioaddr;
+
+        dw16(IntEnable, DEFAULT_INTR);
+}
 
 static const int max_intrloop = 50;
 static const int multicast_filter_limit = 0x40;
@@ -73,7 +85,7 @@ static int rio_ioctl (struct net_device *dev, struct ifreq *rq, int cmd);
 static int rio_close (struct net_device *dev);
 static int find_miiphy (struct net_device *dev);
 static int parse_eeprom (struct net_device *dev);
-static int read_eeprom (long ioaddr, int eep_addr);
+static int read_eeprom (struct netdev_private *, int eep_addr);
 static int mii_wait_link (struct net_device *dev, int wait);
 static int mii_set_media (struct net_device *dev);
 static int mii_get_media (struct net_device *dev);
@@ -106,7 +118,7 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
         static int card_idx;
         int chip_idx = ent->driver_data;
         int err, irq;
-        long ioaddr;
+        void __iomem *ioaddr;
         static int version_printed;
         void *ring_space;
         dma_addr_t ring_dma;
@@ -124,26 +136,29 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err_out_disable;
 
         pci_set_master (pdev);
+
+        err = -ENOMEM;
+
         dev = alloc_etherdev (sizeof (*np));
-        if (!dev) {
-                err = -ENOMEM;
+        if (!dev)
                 goto err_out_res;
-        }
         SET_NETDEV_DEV(dev, &pdev->dev);
 
-#ifdef MEM_MAPPING
-        ioaddr = pci_resource_start (pdev, 1);
-        ioaddr = (long) ioremap (ioaddr, RIO_IO_SIZE);
-        if (!ioaddr) {
-                err = -ENOMEM;
+        np = netdev_priv(dev);
+
+        /* IO registers range. */
+        ioaddr = pci_iomap(pdev, 0, 0);
+        if (!ioaddr)
                 goto err_out_dev;
-        }
-#else
-        ioaddr = pci_resource_start (pdev, 0);
+        np->eeprom_addr = ioaddr;
+
+#ifdef MEM_MAPPING
+        /* MM registers range. */
+        ioaddr = pci_iomap(pdev, 1, 0);
+        if (!ioaddr)
+                goto err_out_iounmap;
 #endif
-        dev->base_addr = ioaddr;
-        dev->irq = irq;
-        np = netdev_priv(dev);
+        np->ioaddr = ioaddr;
         np->chip_id = chip_idx;
         np->pdev = pdev;
         spin_lock_init (&np->tx_lock);
@@ -239,7 +254,7 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err_out_unmap_rx;
 
         /* Fiber device? */
-        np->phy_media = (readw(ioaddr + ASICCtrl) & PhyMedia) ? 1 : 0;
+        np->phy_media = (dr16(ASICCtrl) & PhyMedia) ? 1 : 0;
         np->link_status = 0;
         /* Set media and reset PHY */
         if (np->phy_media) {
@@ -276,22 +291,20 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
                 printk(KERN_INFO "vlan(id):\t%d\n", np->vlan);
         return 0;
 
-      err_out_unmap_rx:
+err_out_unmap_rx:
         pci_free_consistent (pdev, RX_TOTAL_SIZE, np->rx_ring, np->rx_ring_dma);
-      err_out_unmap_tx:
+err_out_unmap_tx:
         pci_free_consistent (pdev, TX_TOTAL_SIZE, np->tx_ring, np->tx_ring_dma);
-      err_out_iounmap:
+err_out_iounmap:
 #ifdef MEM_MAPPING
-        iounmap ((void *) ioaddr);
-
-      err_out_dev:
+        pci_iounmap(pdev, np->ioaddr);
 #endif
+        pci_iounmap(pdev, np->eeprom_addr);
+err_out_dev:
         free_netdev (dev);
-
-      err_out_res:
+err_out_res:
         pci_release_regions (pdev);
-
-      err_out_disable:
+err_out_disable:
         pci_disable_device (pdev);
         return err;
 }
@@ -299,11 +312,9 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
 static int
 find_miiphy (struct net_device *dev)
 {
+        struct netdev_private *np = netdev_priv(dev);
         int i, phy_found = 0;
-        struct netdev_private *np;
-        long ioaddr;
         np = netdev_priv(dev);
-        ioaddr = dev->base_addr;
         np->phy_addr = 1;
 
         for (i = 31; i >= 0; i--) {
@@ -323,26 +334,19 @@ find_miiphy (struct net_device *dev)
 static int
 parse_eeprom (struct net_device *dev)
 {
+        struct netdev_private *np = netdev_priv(dev);
+        void __iomem *ioaddr = np->ioaddr;
         int i, j;
-        long ioaddr = dev->base_addr;
         u8 sromdata[256];
         u8 *psib;
         u32 crc;
         PSROM_t psrom = (PSROM_t) sromdata;
-        struct netdev_private *np = netdev_priv(dev);
 
         int cid, next;
 
-#ifdef  MEM_MAPPING
-        ioaddr = pci_resource_start (np->pdev, 0);
-#endif
-        /* Read eeprom */
-        for (i = 0; i < 128; i++) {
-                ((__le16 *) sromdata)[i] = cpu_to_le16(read_eeprom (ioaddr, i));
-        }
-#ifdef  MEM_MAPPING
-        ioaddr = dev->base_addr;
-#endif
+        for (i = 0; i < 128; i++)
+                ((__le16 *) sromdata)[i] = cpu_to_le16(read_eeprom(np, i));
+
         if (np->pdev->vendor == PCI_VENDOR_ID_DLINK) {  /* D-Link Only */
                 /* Check CRC */
                 crc = ~ether_crc_le (256 - 4, sromdata);
@@ -378,8 +382,7 @@ parse_eeprom (struct net_device *dev)
                         return 0;
                 case 2: /* Duplex Polarity */
                         np->duplex_polarity = psib[i];
-                        writeb (readb (ioaddr + PhyCtrl) | psib[i],
-                                ioaddr + PhyCtrl);
+                        dw8(PhyCtrl, dr8(PhyCtrl) | psib[i]);
                         break;
                 case 3: /* Wake Polarity */
                         np->wake_polarity = psib[i];
@@ -407,59 +410,57 @@ static int
 rio_open (struct net_device *dev)
 {
         struct netdev_private *np = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = np->ioaddr;
+        const int irq = np->pdev->irq;
         int i;
         u16 macctrl;
 
-        i = request_irq (dev->irq, rio_interrupt, IRQF_SHARED, dev->name, dev);
+        i = request_irq(irq, rio_interrupt, IRQF_SHARED, dev->name, dev);
         if (i)
                 return i;
 
         /* Reset all logic functions */
-        writew (GlobalReset | DMAReset | FIFOReset | NetworkReset | HostReset,
-                ioaddr + ASICCtrl + 2);
+        dw16(ASICCtrl + 2,
+             GlobalReset | DMAReset | FIFOReset | NetworkReset | HostReset);
         mdelay(10);
 
         /* DebugCtrl bit 4, 5, 9 must set */
-        writel (readl (ioaddr + DebugCtrl) | 0x0230, ioaddr + DebugCtrl);
+        dw32(DebugCtrl, dr32(DebugCtrl) | 0x0230);
 
         /* Jumbo frame */
         if (np->jumbo != 0)
-                writew (MAX_JUMBO+14, ioaddr + MaxFrameSize);
+                dw16(MaxFrameSize, MAX_JUMBO+14);
 
         alloc_list (dev);
 
         /* Get station address */
         for (i = 0; i < 6; i++)
-                writeb (dev->dev_addr[i], ioaddr + StationAddr0 + i);
+                dw8(StationAddr0 + i, dev->dev_addr[i]);
 
         set_multicast (dev);
         if (np->coalesce) {
-                writel (np->rx_coalesce | np->rx_timeout << 16,
-                        ioaddr + RxDMAIntCtrl);
+                dw32(RxDMAIntCtrl, np->rx_coalesce | np->rx_timeout << 16);
         }
         /* Set RIO to poll every N*320nsec. */
-        writeb (0x20, ioaddr + RxDMAPollPeriod);
-        writeb (0xff, ioaddr + TxDMAPollPeriod);
-        writeb (0x30, ioaddr + RxDMABurstThresh);
-        writeb (0x30, ioaddr + RxDMAUrgentThresh);
-        writel (0x0007ffff, ioaddr + RmonStatMask);
+        dw8(RxDMAPollPeriod, 0x20);
+        dw8(TxDMAPollPeriod, 0xff);
+        dw8(RxDMABurstThresh, 0x30);
+        dw8(RxDMAUrgentThresh, 0x30);
+        dw32(RmonStatMask, 0x0007ffff);
         /* clear statistics */
         clear_stats (dev);
 
         /* VLAN supported */
         if (np->vlan) {
                 /* priority field in RxDMAIntCtrl  */
-                writel (readl(ioaddr + RxDMAIntCtrl) | 0x7 << 10,
-                        ioaddr + RxDMAIntCtrl);
+                dw32(RxDMAIntCtrl, dr32(RxDMAIntCtrl) | 0x7 << 10);
                 /* VLANId */
-                writew (np->vlan, ioaddr + VLANId);
+                dw16(VLANId, np->vlan);
                 /* Length/Type should be 0x8100 */
-                writel (0x8100 << 16 | np->vlan, ioaddr + VLANTag);
+                dw32(VLANTag, 0x8100 << 16 | np->vlan);
                 /* Enable AutoVLANuntagging, but disable AutoVLANtagging.
                    VLAN information tagged by TFC' VID, CFI fields. */
-                writel (readl (ioaddr + MACCtrl) | AutoVLANuntagging,
-                        ioaddr + MACCtrl);
+                dw32(MACCtrl, dr32(MACCtrl) | AutoVLANuntagging);
         }
 
         init_timer (&np->timer);
@@ -469,20 +470,18 @@ rio_open (struct net_device *dev)
         add_timer (&np->timer);
 
         /* Start Tx/Rx */
-        writel (readl (ioaddr + MACCtrl) | StatsEnable | RxEnable | TxEnable,
-                        ioaddr + MACCtrl);
+        dw32(MACCtrl, dr32(MACCtrl) | StatsEnable | RxEnable | TxEnable);
 
         macctrl = 0;
         macctrl |= (np->vlan) ? AutoVLANuntagging : 0;
         macctrl |= (np->full_duplex) ? DuplexSelect : 0;
         macctrl |= (np->tx_flow) ? TxFlowControlEnable : 0;
         macctrl |= (np->rx_flow) ? RxFlowControlEnable : 0;
-        writew(macctrl, ioaddr + MACCtrl);
+        dw16(MACCtrl, macctrl);
 
         netif_start_queue (dev);
 
-        /* Enable default interrupts */
-        EnableInt ();
+        dl2k_enable_int(np);
         return 0;
 }
 
@@ -533,10 +532,11 @@ rio_timer (unsigned long data)
 static void
 rio_tx_timeout (struct net_device *dev)
 {
-        long ioaddr = dev->base_addr;
+        struct netdev_private *np = netdev_priv(dev);
+        void __iomem *ioaddr = np->ioaddr;
 
         printk (KERN_INFO "%s: Tx timed out (%4.4x), is buffer full?\n",
-                dev->name, readl (ioaddr + TxStatus));
+                dev->name, dr32(TxStatus));
         rio_free_tx(dev, 0);
         dev->if_port = 0;
         dev->trans_start = jiffies; /* prevent tx timeout */
@@ -547,6 +547,7 @@ static void
 alloc_list (struct net_device *dev)
 {
         struct netdev_private *np = netdev_priv(dev);
+        void __iomem *ioaddr = np->ioaddr;
         int i;
 
         np->cur_rx = np->cur_tx = 0;
@@ -594,24 +595,23 @@ alloc_list (struct net_device *dev)
         }
 
         /* Set RFDListPtr */
-        writel (np->rx_ring_dma, dev->base_addr + RFDListPtr0);
-        writel (0, dev->base_addr + RFDListPtr1);
+        dw32(RFDListPtr0, np->rx_ring_dma);
+        dw32(RFDListPtr1, 0);
 }
 
 static netdev_tx_t
 start_xmit (struct sk_buff *skb, struct net_device *dev)
 {
         struct netdev_private *np = netdev_priv(dev);
+        void __iomem *ioaddr = np->ioaddr;
         struct netdev_desc *txdesc;
         unsigned entry;
-        u32 ioaddr;
         u64 tfc_vlan_tag = 0;
 
         if (np->link_status == 0) {     /* Link Down */
                 dev_kfree_skb(skb);
                 return NETDEV_TX_OK;
         }
-        ioaddr = dev->base_addr;
         entry = np->cur_tx % TX_RING_SIZE;
         np->tx_skbuff[entry] = skb;
         txdesc = &np->tx_ring[entry];
@@ -646,9 +646,9 @@ start_xmit (struct sk_buff *skb, struct net_device *dev)
                                               (1 << FragCountShift));
 
         /* TxDMAPollNow */
-        writel (readl (ioaddr + DMACtrl) | 0x00001000, ioaddr + DMACtrl);
+        dw32(DMACtrl, dr32(DMACtrl) | 0x00001000);
         /* Schedule ISR */
-        writel(10000, ioaddr + CountDown);
+        dw32(CountDown, 10000);
         np->cur_tx = (np->cur_tx + 1) % TX_RING_SIZE;
         if ((np->cur_tx - np->old_tx + TX_RING_SIZE) % TX_RING_SIZE
                         < TX_QUEUE_LEN - 1 && np->speed != 10) {
@@ -658,10 +658,10 @@ start_xmit (struct sk_buff *skb, struct net_device *dev)
         }
 
         /* The first TFDListPtr */
-        if (readl (dev->base_addr + TFDListPtr0) == 0) {
-                writel (np->tx_ring_dma + entry * sizeof (struct netdev_desc),
-                        dev->base_addr + TFDListPtr0);
-                writel (0, dev->base_addr + TFDListPtr1);
+        if (!dr32(TFDListPtr0)) {
+                dw32(TFDListPtr0, np->tx_ring_dma +
+                     entry * sizeof (struct netdev_desc));
+                dw32(TFDListPtr1, 0);
         }
 
         return NETDEV_TX_OK;
@@ -671,17 +671,15 @@ static irqreturn_t
 rio_interrupt (int irq, void *dev_instance)
 {
         struct net_device *dev = dev_instance;
-        struct netdev_private *np;
+        struct netdev_private *np = netdev_priv(dev);
+        void __iomem *ioaddr = np->ioaddr;
         unsigned int_status;
-        long ioaddr;
         int cnt = max_intrloop;
         int handled = 0;
 
-        ioaddr = dev->base_addr;
-        np = netdev_priv(dev);
         while (1) {
-                int_status = readw (ioaddr + IntStatus);
-                writew (int_status, ioaddr + IntStatus);
+                int_status = dr16(IntStatus);
+                dw16(IntStatus, int_status);
                 int_status &= DEFAULT_INTR;
                 if (int_status == 0 || --cnt < 0)
                         break;
@@ -692,7 +690,7 @@ rio_interrupt (int irq, void *dev_instance)
                 /* TxDMAComplete interrupt */
                 if ((int_status & (TxDMAComplete|IntRequested))) {
                         int tx_status;
-                        tx_status = readl (ioaddr + TxStatus);
+                        tx_status = dr32(TxStatus);
                         if (tx_status & 0x01)
                                 tx_error (dev, tx_status);
                         /* Free used tx skbuffs */
@@ -705,7 +703,7 @@ rio_interrupt (int irq, void *dev_instance)
                         rio_error (dev, int_status);
         }
         if (np->cur_tx != np->old_tx)
-                writel (100, ioaddr + CountDown);
+                dw32(CountDown, 100);
         return IRQ_RETVAL(handled);
 }
 
@@ -765,13 +763,11 @@ rio_free_tx (struct net_device *dev, int irq)
 static void
 tx_error (struct net_device *dev, int tx_status)
 {
-        struct netdev_private *np;
-        long ioaddr = dev->base_addr;
+        struct netdev_private *np = netdev_priv(dev);
+        void __iomem *ioaddr = np->ioaddr;
         int frame_id;
         int i;
 
-        np = netdev_priv(dev);
-
         frame_id = (tx_status & 0xffff0000);
         printk (KERN_ERR "%s: Transmit error, TxStatus %4.4x, FrameId %d.\n",
                 dev->name, tx_status, frame_id);
@@ -779,23 +775,21 @@ tx_error (struct net_device *dev, int tx_status)
         /* Ttransmit Underrun */
         if (tx_status & 0x10) {
                 np->stats.tx_fifo_errors++;
-                writew (readw (ioaddr + TxStartThresh) + 0x10,
-                        ioaddr + TxStartThresh);
+                dw16(TxStartThresh, dr16(TxStartThresh) + 0x10);
                 /* Transmit Underrun need to set TxReset, DMARest, FIFOReset */
-                writew (TxReset | DMAReset | FIFOReset | NetworkReset,
-                        ioaddr + ASICCtrl + 2);
+                dw16(ASICCtrl + 2,
+                     TxReset | DMAReset | FIFOReset | NetworkReset);
                 /* Wait for ResetBusy bit clear */
                 for (i = 50; i > 0; i--) {
-                        if ((readw (ioaddr + ASICCtrl + 2) & ResetBusy) == 0)
+                        if (!(dr16(ASICCtrl + 2) & ResetBusy))
                                 break;
                         mdelay (1);
                 }
                 rio_free_tx (dev, 1);
                 /* Reset TFDListPtr */
-                writel (np->tx_ring_dma +
-                        np->old_tx * sizeof (struct netdev_desc),
-                        dev->base_addr + TFDListPtr0);
-                writel (0, dev->base_addr + TFDListPtr1);
+                dw32(TFDListPtr0, np->tx_ring_dma +
+                     np->old_tx * sizeof (struct netdev_desc));
+                dw32(TFDListPtr1, 0);
 
                 /* Let TxStartThresh stay default value */
         }
@@ -803,10 +797,10 @@ tx_error (struct net_device *dev, int tx_status)
         if (tx_status & 0x04) {
                 np->stats.tx_fifo_errors++;
                 /* TxReset and clear FIFO */
-                writew (TxReset | FIFOReset, ioaddr + ASICCtrl + 2);
+                dw16(ASICCtrl + 2, TxReset | FIFOReset);
                 /* Wait reset done */
                 for (i = 50; i > 0; i--) {
-                        if ((readw (ioaddr + ASICCtrl + 2) & ResetBusy) == 0)
+                        if (!(dr16(ASICCtrl + 2) & ResetBusy))
                                 break;
                         mdelay (1);
                 }
@@ -821,7 +815,7 @@ tx_error (struct net_device *dev, int tx_status)
                 np->stats.collisions++;
 #endif
         /* Restart the Tx */
-        writel (readw (dev->base_addr + MACCtrl) | TxEnable, ioaddr + MACCtrl);
+        dw32(MACCtrl, dr16(MACCtrl) | TxEnable);
 }
 
 static int
@@ -931,8 +925,8 @@ receive_packet (struct net_device *dev)
 static void
 rio_error (struct net_device *dev, int int_status)
 {
-        long ioaddr = dev->base_addr;
         struct netdev_private *np = netdev_priv(dev);
+        void __iomem *ioaddr = np->ioaddr;
         u16 macctrl;
 
         /* Link change event */
@@ -954,7 +948,7 @@ rio_error (struct net_device *dev, int int_status)
                                 TxFlowControlEnable : 0;
                         macctrl |= (np->rx_flow) ?
                                 RxFlowControlEnable : 0;
-                        writew(macctrl, ioaddr + MACCtrl);
+                        dw16(MACCtrl, macctrl);
                         np->link_status = 1;
                         netif_carrier_on(dev);
                 } else {
@@ -974,7 +968,7 @@ rio_error (struct net_device *dev, int int_status)
         if (int_status & HostError) {
                 printk (KERN_ERR "%s: HostError! IntStatus %4.4x.\n",
                         dev->name, int_status);
-                writew (GlobalReset | HostReset, ioaddr + ASICCtrl + 2);
+                dw16(ASICCtrl + 2, GlobalReset | HostReset);
                 mdelay (500);
         }
 }
@@ -982,8 +976,8 @@ rio_error (struct net_device *dev, int int_status)
 static struct net_device_stats *
 get_stats (struct net_device *dev)
 {
-        long ioaddr = dev->base_addr;
         struct netdev_private *np = netdev_priv(dev);
+        void __iomem *ioaddr = np->ioaddr;
 #ifdef MEM_MAPPING
         int i;
 #endif
@@ -992,106 +986,107 @@ get_stats (struct net_device *dev)
         /* All statistics registers need to be acknowledged,
            else statistic overflow could cause problems */
 
-        np->stats.rx_packets += readl (ioaddr + FramesRcvOk);
-        np->stats.tx_packets += readl (ioaddr + FramesXmtOk);
-        np->stats.rx_bytes += readl (ioaddr + OctetRcvOk);
-        np->stats.tx_bytes += readl (ioaddr + OctetXmtOk);
+        np->stats.rx_packets += dr32(FramesRcvOk);
+        np->stats.tx_packets += dr32(FramesXmtOk);
+        np->stats.rx_bytes += dr32(OctetRcvOk);
+        np->stats.tx_bytes += dr32(OctetXmtOk);
 
-        np->stats.multicast = readl (ioaddr + McstFramesRcvdOk);
-        np->stats.collisions += readl (ioaddr + SingleColFrames)
-                             +  readl (ioaddr + MultiColFrames);
+        np->stats.multicast = dr32(McstFramesRcvdOk);
+        np->stats.collisions += dr32(SingleColFrames)
+                             +  dr32(MultiColFrames);
 
         /* detailed tx errors */
-        stat_reg = readw (ioaddr + FramesAbortXSColls);
+        stat_reg = dr16(FramesAbortXSColls);
         np->stats.tx_aborted_errors += stat_reg;
         np->stats.tx_errors += stat_reg;
 
-        stat_reg = readw (ioaddr + CarrierSenseErrors);
+        stat_reg = dr16(CarrierSenseErrors);
         np->stats.tx_carrier_errors += stat_reg;
         np->stats.tx_errors += stat_reg;
 
         /* Clear all other statistic register. */
-        readl (ioaddr + McstOctetXmtOk);
-        readw (ioaddr + BcstFramesXmtdOk);
-        readl (ioaddr + McstFramesXmtdOk);
-        readw (ioaddr + BcstFramesRcvdOk);
-        readw (ioaddr + MacControlFramesRcvd);
-        readw (ioaddr + FrameTooLongErrors);
-        readw (ioaddr + InRangeLengthErrors);
-        readw (ioaddr + FramesCheckSeqErrors);
-        readw (ioaddr + FramesLostRxErrors);
-        readl (ioaddr + McstOctetXmtOk);
-        readl (ioaddr + BcstOctetXmtOk);
-        readl (ioaddr + McstFramesXmtdOk);
-        readl (ioaddr + FramesWDeferredXmt);
-        readl (ioaddr + LateCollisions);
-        readw (ioaddr + BcstFramesXmtdOk);
-        readw (ioaddr + MacControlFramesXmtd);
-        readw (ioaddr + FramesWEXDeferal);
+        dr32(McstOctetXmtOk);
+        dr16(BcstFramesXmtdOk);
+        dr32(McstFramesXmtdOk);
+        dr16(BcstFramesRcvdOk);
+        dr16(MacControlFramesRcvd);
+        dr16(FrameTooLongErrors);
+        dr16(InRangeLengthErrors);
+        dr16(FramesCheckSeqErrors);
+        dr16(FramesLostRxErrors);
+        dr32(McstOctetXmtOk);
+        dr32(BcstOctetXmtOk);
+        dr32(McstFramesXmtdOk);
+        dr32(FramesWDeferredXmt);
+        dr32(LateCollisions);
+        dr16(BcstFramesXmtdOk);
+        dr16(MacControlFramesXmtd);
+        dr16(FramesWEXDeferal);
 
 #ifdef MEM_MAPPING
         for (i = 0x100; i <= 0x150; i += 4)
-                readl (ioaddr + i);
+                dr32(i);
 #endif
-        readw (ioaddr + TxJumboFrames);
-        readw (ioaddr + RxJumboFrames);
-        readw (ioaddr + TCPCheckSumErrors);
-        readw (ioaddr + UDPCheckSumErrors);
-        readw (ioaddr + IPCheckSumErrors);
+        dr16(TxJumboFrames);
+        dr16(RxJumboFrames);
+        dr16(TCPCheckSumErrors);
+        dr16(UDPCheckSumErrors);
+        dr16(IPCheckSumErrors);
         return &np->stats;
 }
 
 static int
 clear_stats (struct net_device *dev)
 {
-        long ioaddr = dev->base_addr;
+        struct netdev_private *np = netdev_priv(dev);
+        void __iomem *ioaddr = np->ioaddr;
 #ifdef MEM_MAPPING
         int i;
 #endif
 
         /* All statistics registers need to be acknowledged,
            else statistic overflow could cause problems */
-        readl (ioaddr + FramesRcvOk);
-        readl (ioaddr + FramesXmtOk);
-        readl (ioaddr + OctetRcvOk);
-        readl (ioaddr + OctetXmtOk);
-
-        readl (ioaddr + McstFramesRcvdOk);
-        readl (ioaddr + SingleColFrames);
-        readl (ioaddr + MultiColFrames);
-        readl (ioaddr + LateCollisions);
+        dr32(FramesRcvOk);
+        dr32(FramesXmtOk);
+        dr32(OctetRcvOk);
+        dr32(OctetXmtOk);
+
+        dr32(McstFramesRcvdOk);
+        dr32(SingleColFrames);
+        dr32(MultiColFrames);
+        dr32(LateCollisions);
         /* detailed rx errors */
-        readw (ioaddr + FrameTooLongErrors);
-        readw (ioaddr + InRangeLengthErrors);
-        readw (ioaddr + FramesCheckSeqErrors);
-        readw (ioaddr + FramesLostRxErrors);
+        dr16(FrameTooLongErrors);
+        dr16(InRangeLengthErrors);
+        dr16(FramesCheckSeqErrors);
+        dr16(FramesLostRxErrors);
 
         /* detailed tx errors */
-        readw (ioaddr + FramesAbortXSColls);
-        readw (ioaddr + CarrierSenseErrors);
+        dr16(FramesAbortXSColls);
+        dr16(CarrierSenseErrors);
 
         /* Clear all other statistic register. */
-        readl (ioaddr + McstOctetXmtOk);
-        readw (ioaddr + BcstFramesXmtdOk);
-        readl (ioaddr + McstFramesXmtdOk);
-        readw (ioaddr + BcstFramesRcvdOk);
-        readw (ioaddr + MacControlFramesRcvd);
-        readl (ioaddr + McstOctetXmtOk);
-        readl (ioaddr + BcstOctetXmtOk);
-        readl (ioaddr + McstFramesXmtdOk);
-        readl (ioaddr + FramesWDeferredXmt);
-        readw (ioaddr + BcstFramesXmtdOk);
-        readw (ioaddr + MacControlFramesXmtd);
-        readw (ioaddr + FramesWEXDeferal);
+        dr32(McstOctetXmtOk);
+        dr16(BcstFramesXmtdOk);
+        dr32(McstFramesXmtdOk);
+        dr16(BcstFramesRcvdOk);
+        dr16(MacControlFramesRcvd);
+        dr32(McstOctetXmtOk);
+        dr32(BcstOctetXmtOk);
+        dr32(McstFramesXmtdOk);
+        dr32(FramesWDeferredXmt);
+        dr16(BcstFramesXmtdOk);
+        dr16(MacControlFramesXmtd);
+        dr16(FramesWEXDeferal);
 #ifdef MEM_MAPPING
         for (i = 0x100; i <= 0x150; i += 4)
-                readl (ioaddr + i);
+                dr32(i);
 #endif
-        readw (ioaddr + TxJumboFrames);
-        readw (ioaddr + RxJumboFrames);
-        readw (ioaddr + TCPCheckSumErrors);
-        readw (ioaddr + UDPCheckSumErrors);
-        readw (ioaddr + IPCheckSumErrors);
+        dr16(TxJumboFrames);
+        dr16(RxJumboFrames);
+        dr16(TCPCheckSumErrors);
+        dr16(UDPCheckSumErrors);
+        dr16(IPCheckSumErrors);
         return 0;
 }
 
@@ -1114,10 +1109,10 @@ change_mtu (struct net_device *dev, int new_mtu)
 static void
 set_multicast (struct net_device *dev)
 {
-        long ioaddr = dev->base_addr;
+        struct netdev_private *np = netdev_priv(dev);
+        void __iomem *ioaddr = np->ioaddr;
         u32 hash_table[2];
         u16 rx_mode = 0;
-        struct netdev_private *np = netdev_priv(dev);
 
         hash_table[0] = hash_table[1] = 0;
         /* RxFlowcontrol DA: 01-80-C2-00-00-01. Hash index=0x39 */
@@ -1153,9 +1148,9 @@ set_multicast (struct net_device *dev)
                 rx_mode |= ReceiveVLANMatch;
         }
 
-        writel (hash_table[0], ioaddr + HashTable0);
-        writel (hash_table[1], ioaddr + HashTable1);
-        writew (rx_mode, ioaddr + ReceiveMode);
+        dw32(HashTable0, hash_table[0]);
+        dw32(HashTable1, hash_table[1]);
+        dw16(ReceiveMode, rx_mode);
 }
 
 static void rio_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
@@ -1259,55 +1254,21 @@ rio_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
 {
         int phy_addr;
         struct netdev_private *np = netdev_priv(dev);
-        struct mii_data *miidata = (struct mii_data *) &rq->ifr_ifru;
-
-        struct netdev_desc *desc;
-        int i;
+        struct mii_ioctl_data *miidata = if_mii(rq);
 
         phy_addr = np->phy_addr;
         switch (cmd) {
-        case SIOCDEVPRIVATE:
-                break;
-
-        case SIOCDEVPRIVATE + 1:
-                miidata->out_value = mii_read (dev, phy_addr, miidata->reg_num);
-                break;
-        case SIOCDEVPRIVATE + 2:
-                mii_write (dev, phy_addr, miidata->reg_num, miidata->in_value);
-                break;
-        case SIOCDEVPRIVATE + 3:
+        case SIOCGMIIPHY:
+                miidata->phy_id = phy_addr;
                 break;
-        case SIOCDEVPRIVATE + 4:
+        case SIOCGMIIREG:
+                miidata->val_out = mii_read (dev, phy_addr, miidata->reg_num);
                 break;
-        case SIOCDEVPRIVATE + 5:
-                netif_stop_queue (dev);
-                break;
-        case SIOCDEVPRIVATE + 6:
-                netif_wake_queue (dev);
-                break;
-        case SIOCDEVPRIVATE + 7:
-                printk
-                    ("tx_full=%x cur_tx=%lx old_tx=%lx cur_rx=%lx old_rx=%lx\n",
-                     netif_queue_stopped(dev), np->cur_tx, np->old_tx, np->cur_rx,
-                     np->old_rx);
+        case SIOCSMIIREG:
+                if (!capable(CAP_NET_ADMIN))
+                        return -EPERM;
+                mii_write (dev, phy_addr, miidata->reg_num, miidata->val_in);
                 break;
-        case SIOCDEVPRIVATE + 8:
-                printk("TX ring:\n");
-                for (i = 0; i < TX_RING_SIZE; i++) {
-                        desc = &np->tx_ring[i];
-                        printk
-                            ("%02x:cur:%08x next:%08x status:%08x frag1:%08x frag0:%08x",
-                             i,
-                             (u32) (np->tx_ring_dma + i * sizeof (*desc)),
-                             (u32)le64_to_cpu(desc->next_desc),
-                             (u32)le64_to_cpu(desc->status),
-                             (u32)(le64_to_cpu(desc->fraginfo) >> 32),
-                             (u32)le64_to_cpu(desc->fraginfo));
-                        printk ("\n");
-                }
-                printk ("\n");
-                break;
-
         default:
                 return -EOPNOTSUPP;
         }
@@ -1318,15 +1279,15 @@ rio_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
 #define EEP_BUSY 0x8000
 /* Read the EEPROM word */
 /* We use I/O instruction to read/write eeprom to avoid fail on some machines */
-static int
-read_eeprom (long ioaddr, int eep_addr)
+static int read_eeprom(struct netdev_private *np, int eep_addr)
 {
+        void __iomem *ioaddr = np->eeprom_addr;
         int i = 1000;
-        outw (EEP_READ | (eep_addr & 0xff), ioaddr + EepromCtrl);
+
+        dw16(EepromCtrl, EEP_READ | (eep_addr & 0xff));
         while (i-- > 0) {
-                if (!(inw (ioaddr + EepromCtrl) & EEP_BUSY)) {
-                        return inw (ioaddr + EepromData);
-                }
+                if (!(dr16(EepromCtrl) & EEP_BUSY))
+                        return dr16(EepromData);
         }
         return 0;
 }
@@ -1336,38 +1297,40 @@ enum phy_ctrl_bits {
         MII_DUPLEX = 0x08,
 };
 
-#define mii_delay() readb(ioaddr)
+#define mii_delay() dr8(PhyCtrl)
 static void
 mii_sendbit (struct net_device *dev, u32 data)
 {
-        long ioaddr = dev->base_addr + PhyCtrl;
-        data = (data) ? MII_DATA1 : 0;
-        data |= MII_WRITE;
-        data |= (readb (ioaddr) & 0xf8) | MII_WRITE;
-        writeb (data, ioaddr);
+        struct netdev_private *np = netdev_priv(dev);
+        void __iomem *ioaddr = np->ioaddr;
+
+        data = ((data) ? MII_DATA1 : 0) | (dr8(PhyCtrl) & 0xf8) | MII_WRITE;
+        dw8(PhyCtrl, data);
         mii_delay ();
-        writeb (data | MII_CLK, ioaddr);
+        dw8(PhyCtrl, data | MII_CLK);
         mii_delay ();
 }
 
 static int
 mii_getbit (struct net_device *dev)
 {
-        long ioaddr = dev->base_addr + PhyCtrl;
+        struct netdev_private *np = netdev_priv(dev);
+        void __iomem *ioaddr = np->ioaddr;
         u8 data;
 
-        data = (readb (ioaddr) & 0xf8) | MII_READ;
-        writeb (data, ioaddr);
+        data = (dr8(PhyCtrl) & 0xf8) | MII_READ;
+        dw8(PhyCtrl, data);
         mii_delay ();
-        writeb (data | MII_CLK, ioaddr);
+        dw8(PhyCtrl, data | MII_CLK);
         mii_delay ();
-        return ((readb (ioaddr) >> 1) & 1);
+        return (dr8(PhyCtrl) >> 1) & 1;
 }
 
 static void
 mii_send_bits (struct net_device *dev, u32 data, int len)
 {
         int i;
+
         for (i = len - 1; i >= 0; i--) {
                 mii_sendbit (dev, data & (1 << i));
         }
@@ -1721,28 +1684,29 @@ mii_set_media_pcs (struct net_device *dev)
 static int
 rio_close (struct net_device *dev)
 {
-        long ioaddr = dev->base_addr;
         struct netdev_private *np = netdev_priv(dev);
+        void __iomem *ioaddr = np->ioaddr;
+
+        struct pci_dev *pdev = np->pdev;
         struct sk_buff *skb;
         int i;
 
         netif_stop_queue (dev);
 
         /* Disable interrupts */
-        writew (0, ioaddr + IntEnable);
+        dw16(IntEnable, 0);
 
         /* Stop Tx and Rx logics */
-        writel (TxDisable | RxDisable | StatsDisable, ioaddr + MACCtrl);
+        dw32(MACCtrl, TxDisable | RxDisable | StatsDisable);
 
-        free_irq (dev->irq, dev);
+        free_irq(pdev->irq, dev);
         del_timer_sync (&np->timer);
 
         /* Free all the skbuffs in the queue. */
         for (i = 0; i < RX_RING_SIZE; i++) {
                 skb = np->rx_skbuff[i];
                 if (skb) {
-                        pci_unmap_single(np->pdev,
-                                         desc_to_dma(&np->rx_ring[i]),
+                        pci_unmap_single(pdev, desc_to_dma(&np->rx_ring[i]),
                                          skb->len, PCI_DMA_FROMDEVICE);
                         dev_kfree_skb (skb);
                         np->rx_skbuff[i] = NULL;
@@ -1753,8 +1717,7 @@ rio_close (struct net_device *dev)
         for (i = 0; i < TX_RING_SIZE; i++) {
                 skb = np->tx_skbuff[i];
                 if (skb) {
-                        pci_unmap_single(np->pdev,
-                                         desc_to_dma(&np->tx_ring[i]),
+                        pci_unmap_single(pdev, desc_to_dma(&np->tx_ring[i]),
                                          skb->len, PCI_DMA_TODEVICE);
                         dev_kfree_skb (skb);
                         np->tx_skbuff[i] = NULL;
@@ -1778,8 +1741,9 @@ rio_remove1 (struct pci_dev *pdev)
                 pci_free_consistent (pdev, TX_TOTAL_SIZE, np->tx_ring,
                                      np->tx_ring_dma);
 #ifdef MEM_MAPPING
-                iounmap ((char *) (dev->base_addr));
+                pci_iounmap(pdev, np->ioaddr);
 #endif
+                pci_iounmap(pdev, np->eeprom_addr);
                 free_netdev (dev);
                 pci_release_regions (pdev);
                 pci_disable_device (pdev);
diff --git a/drivers/net/ethernet/dlink/dl2k.h b/drivers/net/ethernet/dlink/dl2k.h
index ba0adcafa55a..3699565704c7 100644
--- a/drivers/net/ethernet/dlink/dl2k.h
+++ b/drivers/net/ethernet/dlink/dl2k.h
@@ -42,23 +42,6 @@
 #define TX_TOTAL_SIZE   TX_RING_SIZE*sizeof(struct netdev_desc)
 #define RX_TOTAL_SIZE   RX_RING_SIZE*sizeof(struct netdev_desc)
 
-/* This driver was written to use PCI memory space, however x86-oriented
-   hardware often uses I/O space accesses. */
-#ifndef MEM_MAPPING
-#undef readb
-#undef readw
-#undef readl
-#undef writeb
-#undef writew
-#undef writel
-#define readb inb
-#define readw inw
-#define readl inl
-#define writeb outb
-#define writew outw
-#define writel outl
-#endif
-
 /* Offsets to the device registers.
    Unlike software-only systems, device drivers interact with complex hardware.
    It's not useful to define symbolic names for every register bit in the
@@ -365,13 +348,6 @@ struct ioctl_data {
         char *data;
 };
 
-struct mii_data {
-        __u16 reserved;
-        __u16 reg_num;
-        __u16 in_value;
-        __u16 out_value;
-};
-
 /* The Rx and Tx buffer descriptors. */
 struct netdev_desc {
         __le64 next_desc;
@@ -391,6 +367,8 @@ struct netdev_private {
         dma_addr_t tx_ring_dma;
         dma_addr_t rx_ring_dma;
         struct pci_dev *pdev;
+        void __iomem *ioaddr;
+        void __iomem *eeprom_addr;
         spinlock_t tx_lock;
         spinlock_t rx_lock;
         struct net_device_stats stats;
diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
index d783f4f96ec0..d7bb52a7bda1 100644
--- a/drivers/net/ethernet/dlink/sundance.c
+++ b/drivers/net/ethernet/dlink/sundance.c
@@ -522,9 +522,6 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
                         cpu_to_le16(eeprom_read(ioaddr, i + EEPROM_SA_OFFSET));
         memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 
-        dev->base_addr = (unsigned long)ioaddr;
-        dev->irq = irq;
-
         np = netdev_priv(dev);
         np->base = ioaddr;
         np->pci_dev = pdev;
@@ -828,18 +825,19 @@ static int netdev_open(struct net_device *dev)
 {
         struct netdev_private *np = netdev_priv(dev);
         void __iomem *ioaddr = np->base;
+        const int irq = np->pci_dev->irq;
         unsigned long flags;
         int i;
 
         /* Do we need to reset the chip??? */
 
-        i = request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev);
+        i = request_irq(irq, intr_handler, IRQF_SHARED, dev->name, dev);
         if (i)
                 return i;
 
         if (netif_msg_ifup(np))
-                printk(KERN_DEBUG "%s: netdev_open() irq %d.\n",
-                           dev->name, dev->irq);
+                printk(KERN_DEBUG "%s: netdev_open() irq %d\n", dev->name, irq);
+
         init_ring(dev);
 
         iowrite32(np->rx_ring_dma, ioaddr + RxListPtr);
@@ -1814,7 +1812,7 @@ static int netdev_close(struct net_device *dev)
         }
 #endif /* __i386__ debugging only */
 
-        free_irq(dev->irq, dev);
+        free_irq(np->pci_dev->irq, dev);
 
         del_timer_sync(&np->timer);
 
diff --git a/drivers/net/ethernet/dnet.c b/drivers/net/ethernet/dnet.c
index b276469f74e9..290b26f868c9 100644
--- a/drivers/net/ethernet/dnet.c
+++ b/drivers/net/ethernet/dnet.c
@@ -815,6 +815,7 @@ static const struct ethtool_ops dnet_ethtool_ops = {
         .set_settings           = dnet_set_settings,
         .get_drvinfo            = dnet_get_drvinfo,
         .get_link               = ethtool_op_get_link,
+        .get_ts_info            = ethtool_op_get_ts_info,
 };
 
 static const struct net_device_ops dnet_netdev_ops = {
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index 9576ac002c23..ff4eb8fe25d5 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -33,7 +33,7 @@
 
 #include "be_hw.h"
 
-#define DRV_VER                 "4.2.116u"
+#define DRV_VER                 "4.2.220u"
 #define DRV_NAME                "be2net"
 #define BE_NAME                 "ServerEngines BladeEngine2 10Gbps NIC"
 #define BE3_NAME                "ServerEngines BladeEngine3 10Gbps NIC"
@@ -162,6 +162,11 @@ static inline void queue_head_inc(struct be_queue_info *q)
         index_inc(&q->head, q->len);
 }
 
+static inline void index_dec(u16 *index, u16 limit)
+{
+        *index = MODULO((*index - 1), limit);
+}
+
 static inline void queue_tail_inc(struct be_queue_info *q)
 {
         index_inc(&q->tail, q->len);
@@ -308,11 +313,33 @@ struct be_vf_cfg {
         u32 tx_rate;
 };
 
+enum vf_state {
+        ENABLED = 0,
+        ASSIGNED = 1
+};
+
 #define BE_FLAGS_LINK_STATUS_INIT               1
 #define BE_FLAGS_WORKER_SCHEDULED               (1 << 3)
 #define BE_UC_PMAC_COUNT                30
 #define BE_VF_UC_PMAC_COUNT             2
 
+struct phy_info {
+        u8 transceiver;
+        u8 autoneg;
+        u8 fc_autoneg;
+        u8 port_type;
+        u16 phy_type;
+        u16 interface_type;
+        u32 misc_params;
+        u16 auto_speeds_supported;
+        u16 fixed_speeds_supported;
+        int link_speed;
+        int forced_port_speed;
+        u32 dac_cable_len;
+        u32 advertising;
+        u32 supported;
+};
+
 struct be_adapter {
         struct pci_dev *pdev;
         struct net_device *netdev;
@@ -377,29 +404,30 @@ struct be_adapter {
         u32 rx_fc;              /* Rx flow control */
         u32 tx_fc;              /* Tx flow control */
         bool stats_cmd_sent;
-        int link_speed;
-        u8 port_type;
-        u8 transceiver;
-        u8 autoneg;
         u8 generation;          /* BladeEngine ASIC generation */
         u32 flash_status;
         struct completion flash_compl;
 
-        u32 num_vfs;
-        u8 is_virtfn;
+        u32 num_vfs;            /* Number of VFs provisioned by PF driver */
+        u32 dev_num_vfs;        /* Number of VFs supported by HW */
+        u8 virtfn;
         struct be_vf_cfg *vf_cfg;
         bool be3_native;
         u32 sli_family;
         u8 hba_port_num;
         u16 pvid;
+        struct phy_info phy;
         u8 wol_cap;
         bool wol;
         u32 max_pmac_cnt;       /* Max secondary UC MACs programmable */
         u32 uc_macs;            /* Count of secondary UC MAC programmed */
+        u32 msg_enable;
 };
 
-#define be_physfn(adapter) (!adapter->is_virtfn)
+#define be_physfn(adapter)              (!adapter->virtfn)
 #define sriov_enabled(adapter)          (adapter->num_vfs > 0)
+#define sriov_want(adapter)             (adapter->dev_num_vfs && num_vfs && \
+                                         be_physfn(adapter))
 #define for_all_vfs(adapter, vf_cfg, i)                                 \
         for (i = 0, vf_cfg = &adapter->vf_cfg[i]; i < adapter->num_vfs; \
                 i++, vf_cfg++)
@@ -528,14 +556,6 @@ static inline u8 is_udp_pkt(struct sk_buff *skb)
         return val;
 }
 
-static inline void be_check_sriov_fn_type(struct be_adapter *adapter)
-{
-        u32 sli_intf;
-
-        pci_read_config_dword(adapter->pdev, SLI_INTF_REG_OFFSET, &sli_intf);
-        adapter->is_virtfn = (sli_intf & SLI_INTF_FT_MASK) ? 1 : 0;
-}
-
 static inline void be_vf_eth_addr_generate(struct be_adapter *adapter, u8 *mac)
 {
         u32 addr;
@@ -583,4 +603,7 @@ extern void be_link_status_update(struct be_adapter *adapter, u8 link_status);
 extern void be_parse_stats(struct be_adapter *adapter);
 extern int be_load_fw(struct be_adapter *adapter, u8 *func);
 extern bool be_is_wol_supported(struct be_adapter *adapter);
+extern bool be_pause_supported(struct be_adapter *adapter);
+extern u32 be_get_fw_log_level(struct be_adapter *adapter);
+
 #endif                          /* BE_H */
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 67b030d72df1..b24623cce07b 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -61,10 +61,21 @@ static inline void be_mcc_compl_use(struct be_mcc_compl *compl)
         compl->flags = 0;
 }
 
+static struct be_cmd_resp_hdr *be_decode_resp_hdr(u32 tag0, u32 tag1)
+{
+        unsigned long addr;
+
+        addr = tag1;
+        addr = ((addr << 16) << 16) | tag0;
+        return (void *)addr;
+}
+
 static int be_mcc_compl_process(struct be_adapter *adapter,
-        struct be_mcc_compl *compl)
+                                struct be_mcc_compl *compl)
 {
         u16 compl_status, extd_status;
+        struct be_cmd_resp_hdr *resp_hdr;
+        u8 opcode = 0, subsystem = 0;
 
         /* Just swap the status to host endian; mcc tag is opaquely copied
          * from mcc_wrb */
@@ -73,32 +84,36 @@ static int be_mcc_compl_process(struct be_adapter *adapter,
         compl_status = (compl->status >> CQE_STATUS_COMPL_SHIFT) &
                                 CQE_STATUS_COMPL_MASK;
 
-        if (((compl->tag0 == OPCODE_COMMON_WRITE_FLASHROM) ||
-                (compl->tag0 == OPCODE_COMMON_WRITE_OBJECT)) &&
-                (compl->tag1 == CMD_SUBSYSTEM_COMMON)) {
+        resp_hdr = be_decode_resp_hdr(compl->tag0, compl->tag1);
+
+        if (resp_hdr) {
+                opcode = resp_hdr->opcode;
+                subsystem = resp_hdr->subsystem;
+        }
+
+        if (((opcode == OPCODE_COMMON_WRITE_FLASHROM) ||
+             (opcode == OPCODE_COMMON_WRITE_OBJECT)) &&
+            (subsystem == CMD_SUBSYSTEM_COMMON)) {
                 adapter->flash_status = compl_status;
                 complete(&adapter->flash_compl);
         }
 
         if (compl_status == MCC_STATUS_SUCCESS) {
-                if (((compl->tag0 == OPCODE_ETH_GET_STATISTICS) ||
-                         (compl->tag0 == OPCODE_ETH_GET_PPORT_STATS)) &&
-                        (compl->tag1 == CMD_SUBSYSTEM_ETH)) {
+                if (((opcode == OPCODE_ETH_GET_STATISTICS) ||
+                     (opcode == OPCODE_ETH_GET_PPORT_STATS)) &&
+                    (subsystem == CMD_SUBSYSTEM_ETH)) {
                         be_parse_stats(adapter);
                         adapter->stats_cmd_sent = false;
                 }
-                if (compl->tag0 ==
-                                OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES) {
-                        struct be_mcc_wrb *mcc_wrb =
-                                queue_index_node(&adapter->mcc_obj.q,
-                                                compl->tag1);
+                if (opcode == OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES &&
+                    subsystem == CMD_SUBSYSTEM_COMMON) {
                         struct be_cmd_resp_get_cntl_addnl_attribs *resp =
-                                embedded_payload(mcc_wrb);
+                                (void *)resp_hdr;
                         adapter->drv_stats.be_on_die_temperature =
                                 resp->on_die_temperature;
                 }
         } else {
-                if (compl->tag0 == OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES)
+                if (opcode == OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES)
                         be_get_temp_freq = 0;
 
                 if (compl_status == MCC_STATUS_NOT_SUPPORTED ||
@@ -108,13 +123,13 @@ static int be_mcc_compl_process(struct be_adapter *adapter,
                 if (compl_status == MCC_STATUS_UNAUTHORIZED_REQUEST) {
                         dev_warn(&adapter->pdev->dev, "This domain(VM) is not "
                                 "permitted to execute this cmd (opcode %d)\n",
-                                compl->tag0);
+                                opcode);
                 } else {
                         extd_status = (compl->status >> CQE_STATUS_EXTD_SHIFT) &
                                         CQE_STATUS_EXTD_MASK;
                         dev_err(&adapter->pdev->dev, "Cmd (opcode %d) failed:"
                                 "status %d, extd-status %d\n",
-                                compl->tag0, compl_status, extd_status);
+                                opcode, compl_status, extd_status);
                 }
         }
 done:
@@ -126,7 +141,7 @@ static void be_async_link_state_process(struct be_adapter *adapter,
                 struct be_async_event_link_state *evt)
 {
         /* When link status changes, link speed must be re-queried from FW */
-        adapter->link_speed = -1;
+        adapter->phy.link_speed = -1;
 
         /* For the initial link status do not rely on the ASYNC event as
          * it may not be received in some cases.
@@ -153,7 +168,7 @@ static void be_async_grp5_qos_speed_process(struct be_adapter *adapter,
 {
         if (evt->physical_port == adapter->port_num) {
                 /* qos_link_speed is in units of 10 Mbps */
-                adapter->link_speed = evt->qos_link_speed * 10;
+                adapter->phy.link_speed = evt->qos_link_speed * 10;
         }
 }
 
@@ -286,7 +301,7 @@ static int be_mcc_wait_compl(struct be_adapter *adapter)
         if (i == mcc_timeout) {
                 dev_err(&adapter->pdev->dev, "FW not responding\n");
                 adapter->fw_timeout = true;
-                return -1;
+                return -EIO;
         }
         return status;
 }
@@ -294,8 +309,26 @@ static int be_mcc_wait_compl(struct be_adapter *adapter)
 /* Notify MCC requests and wait for completion */
 static int be_mcc_notify_wait(struct be_adapter *adapter)
 {
+        int status;
+        struct be_mcc_wrb *wrb;
+        struct be_mcc_obj *mcc_obj = &adapter->mcc_obj;
+        u16 index = mcc_obj->q.head;
+        struct be_cmd_resp_hdr *resp;
+
+        index_dec(&index, mcc_obj->q.len);
+        wrb = queue_index_node(&mcc_obj->q, index);
+
+        resp = be_decode_resp_hdr(wrb->tag0, wrb->tag1);
+
         be_mcc_notify(adapter);
-        return be_mcc_wait_compl(adapter);
+
+        status = be_mcc_wait_compl(adapter);
+        if (status == -EIO)
+                goto out;
+
+        status = resp->status;
+out:
+        return status;
 }
 
 static int be_mbox_db_ready_wait(struct be_adapter *adapter, void __iomem *db)
@@ -435,14 +468,17 @@ static void be_wrb_cmd_hdr_prepare(struct be_cmd_req_hdr *req_hdr,
                                 struct be_mcc_wrb *wrb, struct be_dma_mem *mem)
 {
         struct be_sge *sge;
+        unsigned long addr = (unsigned long)req_hdr;
+        u64 req_addr = addr;
 
         req_hdr->opcode = opcode;
         req_hdr->subsystem = subsystem;
         req_hdr->request_length = cpu_to_le32(cmd_len - sizeof(*req_hdr));
         req_hdr->version = 0;
 
-        wrb->tag0 = opcode;
-        wrb->tag1 = subsystem;
+        wrb->tag0 = req_addr & 0xFFFFFFFF;
+        wrb->tag1 = upper_32_bits(req_addr);
+
         wrb->payload_length = cmd_len;
         if (mem) {
                 wrb->embedded |= (1 & MCC_WRB_SGE_CNT_MASK) <<
@@ -1221,7 +1257,7 @@ int lancer_cmd_get_pport_stats(struct be_adapter *adapter,
                         OPCODE_ETH_GET_PPORT_STATS, nonemb_cmd->size, wrb,
                         nonemb_cmd);
 
-        req->cmd_params.params.pport_num = cpu_to_le16(adapter->port_num);
+        req->cmd_params.params.pport_num = cpu_to_le16(adapter->hba_port_num);
         req->cmd_params.params.reset_stats = 0;
 
         be_mcc_notify(adapter);
@@ -1283,13 +1319,10 @@ int be_cmd_get_die_temperature(struct be_adapter *adapter)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_get_cntl_addnl_attribs *req;
-        u16 mccq_index;
         int status;
 
         spin_lock_bh(&adapter->mcc_lock);
 
-        mccq_index = adapter->mcc_obj.q.head;
-
         wrb = wrb_from_mccq(adapter);
         if (!wrb) {
                 status = -EBUSY;
@@ -1301,8 +1334,6 @@ int be_cmd_get_die_temperature(struct be_adapter *adapter)
                 OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES, sizeof(*req),
                 wrb, NULL);
 
-        wrb->tag1 = mccq_index;
-
         be_mcc_notify(adapter);
 
 err:
@@ -1824,18 +1855,16 @@ int lancer_cmd_write_object(struct be_adapter *adapter, struct be_dma_mem *cmd,
         spin_unlock_bh(&adapter->mcc_lock);
 
         if (!wait_for_completion_timeout(&adapter->flash_compl,
-                        msecs_to_jiffies(12000)))
+                                         msecs_to_jiffies(30000)))
                 status = -1;
         else
                 status = adapter->flash_status;
 
         resp = embedded_payload(wrb);
-        if (!status) {
+        if (!status)
                 *data_written = le32_to_cpu(resp->actual_write_len);
-        } else {
+        else
                 *addn_status = resp->additional_status;
-                status = resp->status;
-        }
 
         return status;
 
@@ -1950,7 +1979,7 @@ int be_cmd_get_flash_crc(struct be_adapter *adapter, u8 *flashed_crc,
         be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
                 OPCODE_COMMON_READ_FLASHROM, sizeof(*req)+4, wrb, NULL);
 
-        req->params.op_type = cpu_to_le32(IMG_TYPE_REDBOOT);
+        req->params.op_type = cpu_to_le32(OPTYPE_REDBOOT);
         req->params.op_code = cpu_to_le32(FLASHROM_OPER_REPORT);
         req->params.offset = cpu_to_le32(offset);
         req->params.data_buf_size = cpu_to_le32(0x4);
@@ -2136,8 +2165,7 @@ err:
         return status;
 }
 
-int be_cmd_get_phy_info(struct be_adapter *adapter,
-                                struct be_phy_info *phy_info)
+int be_cmd_get_phy_info(struct be_adapter *adapter)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_get_phy_info *req;
@@ -2170,9 +2198,15 @@ int be_cmd_get_phy_info(struct be_adapter *adapter,
         if (!status) {
                 struct be_phy_info *resp_phy_info =
                                 cmd.va + sizeof(struct be_cmd_req_hdr);
-                phy_info->phy_type = le16_to_cpu(resp_phy_info->phy_type);
-                phy_info->interface_type =
+                adapter->phy.phy_type = le16_to_cpu(resp_phy_info->phy_type);
+                adapter->phy.interface_type =
                         le16_to_cpu(resp_phy_info->interface_type);
+                adapter->phy.auto_speeds_supported =
+                        le16_to_cpu(resp_phy_info->auto_speeds_supported);
+                adapter->phy.fixed_speeds_supported =
+                        le16_to_cpu(resp_phy_info->fixed_speeds_supported);
+                adapter->phy.misc_params =
+                        le32_to_cpu(resp_phy_info->misc_params);
         }
         pci_free_consistent(adapter->pdev, cmd.size,
                                 cmd.va, cmd.dma);
@@ -2555,4 +2589,60 @@ err:
         mutex_unlock(&adapter->mbox_lock);
         pci_free_consistent(adapter->pdev, cmd.size, cmd.va, cmd.dma);
         return status;
+
+}
+int be_cmd_get_ext_fat_capabilites(struct be_adapter *adapter,
+                                   struct be_dma_mem *cmd)
+{
+        struct be_mcc_wrb *wrb;
+        struct be_cmd_req_get_ext_fat_caps *req;
+        int status;
+
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
+
+        wrb = wrb_from_mbox(adapter);
+        if (!wrb) {
+                status = -EBUSY;
+                goto err;
+        }
+
+        req = cmd->va;
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                               OPCODE_COMMON_GET_EXT_FAT_CAPABILITES,
+                               cmd->size, wrb, cmd);
+        req->parameter_type = cpu_to_le32(1);
+
+        status = be_mbox_notify_wait(adapter);
+err:
+        mutex_unlock(&adapter->mbox_lock);
+        return status;
+}
+
+int be_cmd_set_ext_fat_capabilites(struct be_adapter *adapter,
+                                   struct be_dma_mem *cmd,
+                                   struct be_fat_conf_params *configs)
+{
+        struct be_mcc_wrb *wrb;
+        struct be_cmd_req_set_ext_fat_caps *req;
+        int status;
+
+        spin_lock_bh(&adapter->mcc_lock);
+
+        wrb = wrb_from_mccq(adapter);
+        if (!wrb) {
+                status = -EBUSY;
+                goto err;
+        }
+
+        req = cmd->va;
+        memcpy(&req->set_params, configs, sizeof(struct be_fat_conf_params));
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                               OPCODE_COMMON_SET_EXT_FAT_CAPABILITES,
+                               cmd->size, wrb, cmd);
+
+        status = be_mcc_notify_wait(adapter);
+err:
+        spin_unlock_bh(&adapter->mcc_lock);
+        return status;
 }
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h
index d5b680c56af0..0b1029b60f69 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.h
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.h
@@ -189,6 +189,8 @@ struct be_mcc_mailbox {
 #define OPCODE_COMMON_GET_PHY_DETAILS                   102
 #define OPCODE_COMMON_SET_DRIVER_FUNCTION_CAP           103
 #define OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES    121
+#define OPCODE_COMMON_GET_EXT_FAT_CAPABILITES           125
+#define OPCODE_COMMON_SET_EXT_FAT_CAPABILITES           126
 #define OPCODE_COMMON_GET_MAC_LIST                      147
 #define OPCODE_COMMON_SET_MAC_LIST                      148
 #define OPCODE_COMMON_GET_HSW_CONFIG                    152
@@ -225,8 +227,12 @@ struct be_cmd_req_hdr {
 #define RESP_HDR_INFO_OPCODE_SHIFT      0       /* bits 0 - 7 */
 #define RESP_HDR_INFO_SUBSYS_SHIFT      8       /* bits 8 - 15 */
 struct be_cmd_resp_hdr {
-        u32 info;               /* dword 0 */
-        u32 status;             /* dword 1 */
+        u8 opcode;              /* dword 0 */
+        u8 subsystem;           /* dword 0 */
+        u8 rsvd[2];             /* dword 0 */
+        u8 status;              /* dword 1 */
+        u8 add_status;          /* dword 1 */
+        u8 rsvd1[2];            /* dword 1 */
         u32 response_length;    /* dword 2 */
         u32 actual_resp_len;    /* dword 3 */
 };
@@ -1309,9 +1315,36 @@ enum {
         PHY_TYPE_KX4_10GB,
         PHY_TYPE_BASET_10GB,
         PHY_TYPE_BASET_1GB,
+        PHY_TYPE_BASEX_1GB,
+        PHY_TYPE_SGMII,
         PHY_TYPE_DISABLED = 255
 };
 
+#define BE_SUPPORTED_SPEED_NONE         0
+#define BE_SUPPORTED_SPEED_10MBPS       1
+#define BE_SUPPORTED_SPEED_100MBPS      2
+#define BE_SUPPORTED_SPEED_1GBPS        4
+#define BE_SUPPORTED_SPEED_10GBPS       8
+
+#define BE_AN_EN                        0x2
+#define BE_PAUSE_SYM_EN                 0x80
+
+/* MAC speed valid values */
+#define SPEED_DEFAULT  0x0
+#define SPEED_FORCED_10GB  0x1
+#define SPEED_FORCED_1GB  0x2
+#define SPEED_AUTONEG_10GB  0x3
+#define SPEED_AUTONEG_1GB  0x4
+#define SPEED_AUTONEG_100MB  0x5
+#define SPEED_AUTONEG_10GB_1GB 0x6
+#define SPEED_AUTONEG_10GB_1GB_100MB 0x7
+#define SPEED_AUTONEG_1GB_100MB  0x8
+#define SPEED_AUTONEG_10MB  0x9
+#define SPEED_AUTONEG_1GB_100MB_10MB 0xa
+#define SPEED_AUTONEG_100MB_10MB 0xb
+#define SPEED_FORCED_100MB  0xc
+#define SPEED_FORCED_10MB  0xd
+
 struct be_cmd_req_get_phy_info {
         struct be_cmd_req_hdr hdr;
         u8 rsvd0[24];
@@ -1321,7 +1354,11 @@ struct be_phy_info {
         u16 phy_type;
         u16 interface_type;
         u32 misc_params;
-        u32 future_use[4];
+        u16 ext_phy_details;
+        u16 rsvd;
+        u16 auto_speeds_supported;
+        u16 fixed_speeds_supported;
+        u32 future_use[2];
 };
 
 struct be_cmd_resp_get_phy_info {
@@ -1567,6 +1604,56 @@ static inline void *be_erx_stats_from_cmd(struct be_adapter *adapter)
         }
 }
 
+
+/************** get fat capabilites *******************/
+#define MAX_MODULES 27
+#define MAX_MODES 4
+#define MODE_UART 0
+#define FW_LOG_LEVEL_DEFAULT 48
+#define FW_LOG_LEVEL_FATAL 64
+
+struct ext_fat_mode {
+        u8 mode;
+        u8 rsvd0;
+        u16 port_mask;
+        u32 dbg_lvl;
+        u64 fun_mask;
+} __packed;
+
+struct ext_fat_modules {
+        u8 modules_str[32];
+        u32 modules_id;
+        u32 num_modes;
+        struct ext_fat_mode trace_lvl[MAX_MODES];
+} __packed;
+
+struct be_fat_conf_params {
+        u32 max_log_entries;
+        u32 log_entry_size;
+        u8 log_type;
+        u8 max_log_funs;
+        u8 max_log_ports;
+        u8 rsvd0;
+        u32 supp_modes;
+        u32 num_modules;
+        struct ext_fat_modules module[MAX_MODULES];
+} __packed;
+
+struct be_cmd_req_get_ext_fat_caps {
+        struct be_cmd_req_hdr hdr;
+        u32 parameter_type;
+};
+
+struct be_cmd_resp_get_ext_fat_caps {
+        struct be_cmd_resp_hdr hdr;
+        struct be_fat_conf_params get_params;
+};
+
+struct be_cmd_req_set_ext_fat_caps {
+        struct be_cmd_req_hdr hdr;
+        struct be_fat_conf_params set_params;
+};
+
 extern int be_pci_fnum_get(struct be_adapter *adapter);
 extern int be_cmd_POST(struct be_adapter *adapter);
 extern int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,
@@ -1655,8 +1742,7 @@ extern int be_cmd_get_seeprom_data(struct be_adapter *adapter,
                                 struct be_dma_mem *nonemb_cmd);
 extern int be_cmd_set_loopback(struct be_adapter *adapter, u8 port_num,
                                 u8 loopback_type, u8 enable);
-extern int be_cmd_get_phy_info(struct be_adapter *adapter,
-                                struct be_phy_info *phy_info);
+extern int be_cmd_get_phy_info(struct be_adapter *adapter);
 extern int be_cmd_set_qos(struct be_adapter *adapter, u32 bps, u32 domain);
 extern void be_detect_dump_ue(struct be_adapter *adapter);
 extern int be_cmd_get_die_temperature(struct be_adapter *adapter);
@@ -1673,4 +1759,9 @@ extern int be_cmd_set_hsw_config(struct be_adapter *adapter, u16 pvid,
 extern int be_cmd_get_hsw_config(struct be_adapter *adapter, u16 *pvid,
                         u32 domain, u16 intf_id);
 extern int be_cmd_get_acpi_wol_cap(struct be_adapter *adapter);
+extern int be_cmd_get_ext_fat_capabilites(struct be_adapter *adapter,
+                                          struct be_dma_mem *cmd);
+extern int be_cmd_set_ext_fat_capabilites(struct be_adapter *adapter,
+                                          struct be_dma_mem *cmd,
+                                          struct be_fat_conf_params *cfgs);
 
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index c1ff73cb0e62..63e51d476900 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -433,102 +433,193 @@ static int be_get_sset_count(struct net_device *netdev, int stringset)
         }
 }
 
+static u32 be_get_port_type(u32 phy_type, u32 dac_cable_len)
+{
+        u32 port;
+
+        switch (phy_type) {
+        case PHY_TYPE_BASET_1GB:
+        case PHY_TYPE_BASEX_1GB:
+        case PHY_TYPE_SGMII:
+                port = PORT_TP;
+                break;
+        case PHY_TYPE_SFP_PLUS_10GB:
+                port = dac_cable_len ? PORT_DA : PORT_FIBRE;
+                break;
+        case PHY_TYPE_XFP_10GB:
+        case PHY_TYPE_SFP_1GB:
+                port = PORT_FIBRE;
+                break;
+        case PHY_TYPE_BASET_10GB:
+                port = PORT_TP;
+                break;
+        default:
+                port = PORT_OTHER;
+        }
+
+        return port;
+}
+
+static u32 convert_to_et_setting(u32 if_type, u32 if_speeds)
+{
+        u32 val = 0;
+
+        switch (if_type) {
+        case PHY_TYPE_BASET_1GB:
+        case PHY_TYPE_BASEX_1GB:
+        case PHY_TYPE_SGMII:
+                val |= SUPPORTED_TP;
+                if (if_speeds & BE_SUPPORTED_SPEED_1GBPS)
+                        val |= SUPPORTED_1000baseT_Full;
+                if (if_speeds & BE_SUPPORTED_SPEED_100MBPS)
+                        val |= SUPPORTED_100baseT_Full;
+                if (if_speeds & BE_SUPPORTED_SPEED_10MBPS)
+                        val |= SUPPORTED_10baseT_Full;
+                break;
+        case PHY_TYPE_KX4_10GB:
+                val |= SUPPORTED_Backplane;
+                if (if_speeds & BE_SUPPORTED_SPEED_1GBPS)
+                        val |= SUPPORTED_1000baseKX_Full;
+                if (if_speeds & BE_SUPPORTED_SPEED_10GBPS)
+                        val |= SUPPORTED_10000baseKX4_Full;
+                break;
+        case PHY_TYPE_KR_10GB:
+                val |= SUPPORTED_Backplane |
+                                SUPPORTED_10000baseKR_Full;
+                break;
+        case PHY_TYPE_SFP_PLUS_10GB:
+        case PHY_TYPE_XFP_10GB:
+        case PHY_TYPE_SFP_1GB:
+                val |= SUPPORTED_FIBRE;
+                if (if_speeds & BE_SUPPORTED_SPEED_10GBPS)
+                        val |= SUPPORTED_10000baseT_Full;
+                if (if_speeds & BE_SUPPORTED_SPEED_1GBPS)
+                        val |= SUPPORTED_1000baseT_Full;
+                break;
+        case PHY_TYPE_BASET_10GB:
+                val |= SUPPORTED_TP;
+                if (if_speeds & BE_SUPPORTED_SPEED_10GBPS)
+                        val |= SUPPORTED_10000baseT_Full;
+                if (if_speeds & BE_SUPPORTED_SPEED_1GBPS)
+                        val |= SUPPORTED_1000baseT_Full;
+                if (if_speeds & BE_SUPPORTED_SPEED_100MBPS)
+                        val |= SUPPORTED_100baseT_Full;
+                break;
+        default:
+                val |= SUPPORTED_TP;
+        }
+
+        return val;
+}
+
+static int convert_to_et_speed(u32 be_speed)
+{
+        int et_speed = SPEED_10000;
+
+        switch (be_speed) {
+        case PHY_LINK_SPEED_10MBPS:
+                et_speed = SPEED_10;
+                break;
+        case PHY_LINK_SPEED_100MBPS:
+                et_speed = SPEED_100;
+                break;
+        case PHY_LINK_SPEED_1GBPS:
+                et_speed = SPEED_1000;
+                break;
+        case PHY_LINK_SPEED_10GBPS:
+                et_speed = SPEED_10000;
+                break;
+        }
+
+        return et_speed;
+}
+
+bool be_pause_supported(struct be_adapter *adapter)
+{
+        return (adapter->phy.interface_type == PHY_TYPE_SFP_PLUS_10GB ||
+                adapter->phy.interface_type == PHY_TYPE_XFP_10GB) ?
+                false : true;
+}
+
 static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
 {
         struct be_adapter *adapter = netdev_priv(netdev);
-        struct be_phy_info phy_info;
-        u8 mac_speed = 0;
+        u8 port_speed = 0;
         u16 link_speed = 0;
         u8 link_status;
+        u32 et_speed = 0;
         int status;
 
-        if ((adapter->link_speed < 0) || (!(netdev->flags & IFF_UP))) {
-                status = be_cmd_link_status_query(adapter, &mac_speed,
-                                                  &link_speed, &link_status, 0);
-                if (!status)
-                        be_link_status_update(adapter, link_status);
-
-                /* link_speed is in units of 10 Mbps */
-                if (link_speed) {
-                        ethtool_cmd_speed_set(ecmd, link_speed*10);
+        if (adapter->phy.link_speed < 0 || !(netdev->flags & IFF_UP)) {
+                if (adapter->phy.forced_port_speed < 0) {
+                        status = be_cmd_link_status_query(adapter, &port_speed,
+                                                &link_speed, &link_status, 0);
+                        if (!status)
+                                be_link_status_update(adapter, link_status);
+                        if (link_speed)
+                                et_speed = link_speed * 10;
+                        else if (link_status)
+                                et_speed = convert_to_et_speed(port_speed);
                 } else {
-                        switch (mac_speed) {
-                        case PHY_LINK_SPEED_10MBPS:
-                                ethtool_cmd_speed_set(ecmd, SPEED_10);
-                                break;
-                        case PHY_LINK_SPEED_100MBPS:
-                                ethtool_cmd_speed_set(ecmd, SPEED_100);
-                                break;
-                        case PHY_LINK_SPEED_1GBPS:
-                                ethtool_cmd_speed_set(ecmd, SPEED_1000);
-                                break;
-                        case PHY_LINK_SPEED_10GBPS:
-                                ethtool_cmd_speed_set(ecmd, SPEED_10000);
-                                break;
-                        case PHY_LINK_SPEED_ZERO:
-                                ethtool_cmd_speed_set(ecmd, 0);
-                                break;
-                        }
+                        et_speed = adapter->phy.forced_port_speed;
                 }
 
-                status = be_cmd_get_phy_info(adapter, &phy_info);
-                if (!status) {
-                        switch (phy_info.interface_type) {
-                        case PHY_TYPE_XFP_10GB:
-                        case PHY_TYPE_SFP_1GB:
-                        case PHY_TYPE_SFP_PLUS_10GB:
-                                ecmd->port = PORT_FIBRE;
-                                break;
-                        default:
-                                ecmd->port = PORT_TP;
-                                break;
-                        }
+                ethtool_cmd_speed_set(ecmd, et_speed);
+
+                status = be_cmd_get_phy_info(adapter);
+                if (status)
+                        return status;
+
+                ecmd->supported =
+                        convert_to_et_setting(adapter->phy.interface_type,
+                                        adapter->phy.auto_speeds_supported |
+                                        adapter->phy.fixed_speeds_supported);
+                ecmd->advertising =
+                        convert_to_et_setting(adapter->phy.interface_type,
+                                        adapter->phy.auto_speeds_supported);
+
+                ecmd->port = be_get_port_type(adapter->phy.interface_type,
+                                              adapter->phy.dac_cable_len);
+
+                if (adapter->phy.auto_speeds_supported) {
+                        ecmd->supported |= SUPPORTED_Autoneg;
+                        ecmd->autoneg = AUTONEG_ENABLE;
+                        ecmd->advertising |= ADVERTISED_Autoneg;
+                }
 
-                        switch (phy_info.interface_type) {
-                        case PHY_TYPE_KR_10GB:
-                        case PHY_TYPE_KX4_10GB:
-                                ecmd->autoneg = AUTONEG_ENABLE;
+                if (be_pause_supported(adapter)) {
+                        ecmd->supported |= SUPPORTED_Pause;
+                        ecmd->advertising |= ADVERTISED_Pause;
+                }
+
+                switch (adapter->phy.interface_type) {
+                case PHY_TYPE_KR_10GB:
+                case PHY_TYPE_KX4_10GB:
                         ecmd->transceiver = XCVR_INTERNAL;
-                                break;
-                        default:
-                                ecmd->autoneg = AUTONEG_DISABLE;
-                                ecmd->transceiver = XCVR_EXTERNAL;
-                                break;
-                        }
+                        break;
+                default:
+                        ecmd->transceiver = XCVR_EXTERNAL;
+                        break;
                 }
 
                 /* Save for future use */
-                adapter->link_speed = ethtool_cmd_speed(ecmd);
-                adapter->port_type = ecmd->port;
-                adapter->transceiver = ecmd->transceiver;
-                adapter->autoneg = ecmd->autoneg;
+                adapter->phy.link_speed = ethtool_cmd_speed(ecmd);
+                adapter->phy.port_type = ecmd->port;
+                adapter->phy.transceiver = ecmd->transceiver;
+                adapter->phy.autoneg = ecmd->autoneg;
+                adapter->phy.advertising = ecmd->advertising;
+                adapter->phy.supported = ecmd->supported;
         } else {
-                ethtool_cmd_speed_set(ecmd, adapter->link_speed);
-                ecmd->port = adapter->port_type;
-                ecmd->transceiver = adapter->transceiver;
-                ecmd->autoneg = adapter->autoneg;
+                ethtool_cmd_speed_set(ecmd, adapter->phy.link_speed);
+                ecmd->port = adapter->phy.port_type;
+                ecmd->transceiver = adapter->phy.transceiver;
+                ecmd->autoneg = adapter->phy.autoneg;
+                ecmd->advertising = adapter->phy.advertising;
+                ecmd->supported = adapter->phy.supported;
         }
 
-        ecmd->duplex = DUPLEX_FULL;
+        ecmd->duplex = netif_carrier_ok(netdev) ? DUPLEX_FULL : DUPLEX_UNKNOWN;
         ecmd->phy_address = adapter->port_num;
-        switch (ecmd->port) {
-        case PORT_FIBRE:
-                ecmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE);
-                break;
-        case PORT_TP:
-                ecmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_TP);
-                break;
-        case PORT_AUI:
-                ecmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_AUI);
-                break;
-        }
-
-        if (ecmd->autoneg) {
-                ecmd->supported |= SUPPORTED_1000baseT_Full;
-                ecmd->supported |= SUPPORTED_Autoneg;
-                ecmd->advertising |= (ADVERTISED_10000baseT_Full |
-                                ADVERTISED_1000baseT_Full);
-        }
 
         return 0;
 }
@@ -548,7 +639,7 @@ be_get_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *ecmd)
         struct be_adapter *adapter = netdev_priv(netdev);
 
         be_cmd_get_flow_control(adapter, &ecmd->tx_pause, &ecmd->rx_pause);
-        ecmd->autoneg = 0;
+        ecmd->autoneg = adapter->phy.fc_autoneg;
 }
 
 static int
@@ -702,7 +793,7 @@ be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data)
                 }
         }
 
-        if (be_test_ddr_dma(adapter) != 0) {
+        if (!lancer_chip(adapter) && be_test_ddr_dma(adapter) != 0) {
                 data[3] = 1;
                 test->flags |= ETH_TEST_FL_FAILED;
         }
@@ -787,6 +878,81 @@ be_read_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,
         return status;
 }
 
+static u32 be_get_msg_level(struct net_device *netdev)
+{
+        struct be_adapter *adapter = netdev_priv(netdev);
+
+        if (lancer_chip(adapter)) {
+                dev_err(&adapter->pdev->dev, "Operation not supported\n");
+                return -EOPNOTSUPP;
+        }
+
+        return adapter->msg_enable;
+}
+
+static void be_set_fw_log_level(struct be_adapter *adapter, u32 level)
+{
+        struct be_dma_mem extfat_cmd;
+        struct be_fat_conf_params *cfgs;
+        int status;
+        int i, j;
+
+        memset(&extfat_cmd, 0, sizeof(struct be_dma_mem));
+        extfat_cmd.size = sizeof(struct be_cmd_resp_get_ext_fat_caps);
+        extfat_cmd.va = pci_alloc_consistent(adapter->pdev, extfat_cmd.size,
+                                             &extfat_cmd.dma);
+        if (!extfat_cmd.va) {
+                dev_err(&adapter->pdev->dev, "%s: Memory allocation failure\n",
+                        __func__);
+                goto err;
+        }
+        status = be_cmd_get_ext_fat_capabilites(adapter, &extfat_cmd);
+        if (!status) {
+                cfgs = (struct be_fat_conf_params *)(extfat_cmd.va +
+                                        sizeof(struct be_cmd_resp_hdr));
+                for (i = 0; i < cfgs->num_modules; i++) {
+                        for (j = 0; j < cfgs->module[i].num_modes; j++) {
+                                if (cfgs->module[i].trace_lvl[j].mode ==
+                                                                MODE_UART)
+                                        cfgs->module[i].trace_lvl[j].dbg_lvl =
+                                                        cpu_to_le32(level);
+                        }
+                }
+                status = be_cmd_set_ext_fat_capabilites(adapter, &extfat_cmd,
+                                                        cfgs);
+                if (status)
+                        dev_err(&adapter->pdev->dev,
+                                "Message level set failed\n");
+        } else {
+                dev_err(&adapter->pdev->dev, "Message level get failed\n");
+        }
+
+        pci_free_consistent(adapter->pdev, extfat_cmd.size, extfat_cmd.va,
+                            extfat_cmd.dma);
+err:
+        return;
+}
+
+static void be_set_msg_level(struct net_device *netdev, u32 level)
+{
+        struct be_adapter *adapter = netdev_priv(netdev);
+
+        if (lancer_chip(adapter)) {
+                dev_err(&adapter->pdev->dev, "Operation not supported\n");
+                return;
+        }
+
+        if (adapter->msg_enable == level)
+                return;
+
+        if ((level & NETIF_MSG_HW) != (adapter->msg_enable & NETIF_MSG_HW))
+                be_set_fw_log_level(adapter, level & NETIF_MSG_HW ?
+                                    FW_LOG_LEVEL_DEFAULT : FW_LOG_LEVEL_FATAL);
+        adapter->msg_enable = level;
+
+        return;
+}
+
 const struct ethtool_ops be_ethtool_ops = {
         .get_settings = be_get_settings,
         .get_drvinfo = be_get_drvinfo,
@@ -802,6 +968,8 @@ const struct ethtool_ops be_ethtool_ops = {
         .set_pauseparam = be_set_pauseparam,
         .get_strings = be_get_stat_strings,
         .set_phys_id = be_set_phys_id,
+        .get_msglevel = be_get_msg_level,
+        .set_msglevel = be_set_msg_level,
         .get_sset_count = be_get_sset_count,
         .get_ethtool_stats = be_get_ethtool_stats,
         .get_regs_len = be_get_reg_len,
diff --git a/drivers/net/ethernet/emulex/benet/be_hw.h b/drivers/net/ethernet/emulex/benet/be_hw.h
index f2c89e3ccabd..f38b58c8dbba 100644
--- a/drivers/net/ethernet/emulex/benet/be_hw.h
+++ b/drivers/net/ethernet/emulex/benet/be_hw.h
@@ -58,6 +58,8 @@
 
 #define SLI_PORT_CONTROL_IP_MASK        0x08000000
 
+#define PCICFG_CUST_SCRATCHPAD_CSR      0x1EC
+
 /********* Memory BAR register ************/
 #define PCICFG_MEMBAR_CTRL_INT_CTRL_OFFSET      0xfc
 /* Host Interrupt Enable, if set interrupts are enabled although "PCI Interrupt
@@ -162,22 +164,23 @@
 #define QUERY_FAT       1
 
 /* Flashrom related descriptors */
+#define MAX_FLASH_COMP                  32
 #define IMAGE_TYPE_FIRMWARE             160
 #define IMAGE_TYPE_BOOTCODE             224
 #define IMAGE_TYPE_OPTIONROM            32
 
 #define NUM_FLASHDIR_ENTRIES            32
 
-#define IMG_TYPE_ISCSI_ACTIVE           0
-#define IMG_TYPE_REDBOOT                1
-#define IMG_TYPE_BIOS                   2
-#define IMG_TYPE_PXE_BIOS               3
-#define IMG_TYPE_FCOE_BIOS              8
-#define IMG_TYPE_ISCSI_BACKUP           9
-#define IMG_TYPE_FCOE_FW_ACTIVE         10
-#define IMG_TYPE_FCOE_FW_BACKUP         11
-#define IMG_TYPE_NCSI_FW                13
-#define IMG_TYPE_PHY_FW                 99
+#define OPTYPE_ISCSI_ACTIVE             0
+#define OPTYPE_REDBOOT                  1
+#define OPTYPE_BIOS                     2
+#define OPTYPE_PXE_BIOS                 3
+#define OPTYPE_FCOE_BIOS                8
+#define OPTYPE_ISCSI_BACKUP             9
+#define OPTYPE_FCOE_FW_ACTIVE           10
+#define OPTYPE_FCOE_FW_BACKUP           11
+#define OPTYPE_NCSI_FW                  13
+#define OPTYPE_PHY_FW                   99
 #define TN_8022                         13
 
 #define ILLEGAL_IOCTL_REQ               2
@@ -223,6 +226,24 @@
 #define FLASH_REDBOOT_START_g3             (262144)
 #define FLASH_PHY_FW_START_g3              1310720
 
+#define IMAGE_NCSI                      16
+#define IMAGE_OPTION_ROM_PXE            32
+#define IMAGE_OPTION_ROM_FCoE           33
+#define IMAGE_OPTION_ROM_ISCSI          34
+#define IMAGE_FLASHISM_JUMPVECTOR       48
+#define IMAGE_FLASH_ISM                 49
+#define IMAGE_JUMP_VECTOR               50
+#define IMAGE_FIRMWARE_iSCSI            160
+#define IMAGE_FIRMWARE_COMP_iSCSI       161
+#define IMAGE_FIRMWARE_FCoE             162
+#define IMAGE_FIRMWARE_COMP_FCoE        163
+#define IMAGE_FIRMWARE_BACKUP_iSCSI     176
+#define IMAGE_FIRMWARE_BACKUP_COMP_iSCSI 177
+#define IMAGE_FIRMWARE_BACKUP_FCoE      178
+#define IMAGE_FIRMWARE_BACKUP_COMP_FCoE 179
+#define IMAGE_FIRMWARE_PHY              192
+#define IMAGE_BOOT_CODE                 224
+
 /************* Rx Packet Type Encoding **************/
 #define BE_UNICAST_PACKET               0
 #define BE_MULTICAST_PACKET             1
@@ -445,6 +466,7 @@ struct flash_comp {
         unsigned long offset;
         int optype;
         int size;
+        int img_type;
 };
 
 struct image_hdr {
@@ -481,17 +503,19 @@ struct flash_section_hdr {
         u32 format_rev;
         u32 cksum;
         u32 antidote;
-        u32 build_no;
-        u8 id_string[64];
-        u32 active_entry_mask;
-        u32 valid_entry_mask;
-        u32 org_content_mask;
-        u32 rsvd0;
-        u32 rsvd1;
-        u32 rsvd2;
-        u32 rsvd3;
-        u32 rsvd4;
-};
+        u32 num_images;
+        u8 id_string[128];
+        u32 rsvd[4];
+} __packed;
+
+struct flash_section_hdr_g2 {
+        u32 format_rev;
+        u32 cksum;
+        u32 antidote;
+        u32 build_num;
+        u8 id_string[128];
+        u32 rsvd[8];
+} __packed;
 
 struct flash_section_entry {
         u32 type;
@@ -503,10 +527,16 @@ struct flash_section_entry {
         u32 rsvd0;
         u32 rsvd1;
         u8 ver_data[32];
-};
+} __packed;
 
 struct flash_section_info {
         u8 cookie[32];
         struct flash_section_hdr fsec_hdr;
         struct flash_section_entry fsec_entry[32];
-};
+} __packed;
+
+struct flash_section_info_g2 {
+        u8 cookie[32];
+        struct flash_section_hdr_g2 fsec_hdr;
+        struct flash_section_entry fsec_entry[32];
+} __packed;
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 528a886bc2cd..081c77701168 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -421,6 +421,9 @@ void be_parse_stats(struct be_adapter *adapter)
                 populate_be2_stats(adapter);
         }
 
+        if (lancer_chip(adapter))
+                goto done;
+
         /* as erx_v1 is longer than v0, ok to use v1 defn for v0 access */
         for_all_rx_queues(adapter, rxo, i) {
                 /* below erx HW counter can actually wrap around after
@@ -429,6 +432,8 @@ void be_parse_stats(struct be_adapter *adapter)
                 accumulate_16bit_val(&rx_stats(rxo)->rx_drops_no_frags,
                                 (u16)erx->rx_drops_no_fragments[rxo->q.id]);
         }
+done:
+        return;
 }
 
 static struct rtnl_link_stats64 *be_get_stats64(struct net_device *netdev,
@@ -797,22 +802,30 @@ static int be_vid_config(struct be_adapter *adapter, bool vf, u32 vf_num)
         if (adapter->promiscuous)
                 return 0;
 
-        if (adapter->vlans_added <= adapter->max_vlans)  {
-                /* Construct VLAN Table to give to HW */
-                for (i = 0; i < VLAN_N_VID; i++) {
-                        if (adapter->vlan_tag[i]) {
-                                vtag[ntags] = cpu_to_le16(i);
-                                ntags++;
-                        }
-                }
-                status = be_cmd_vlan_config(adapter, adapter->if_handle,
-                                        vtag, ntags, 1, 0);
-        } else {
-                status = be_cmd_vlan_config(adapter, adapter->if_handle,
-                                        NULL, 0, 1, 1);
+        if (adapter->vlans_added > adapter->max_vlans)
+                goto set_vlan_promisc;
+
+        /* Construct VLAN Table to give to HW */
+        for (i = 0; i < VLAN_N_VID; i++)
+                if (adapter->vlan_tag[i])
+                        vtag[ntags++] = cpu_to_le16(i);
+
+        status = be_cmd_vlan_config(adapter, adapter->if_handle,
+                                    vtag, ntags, 1, 0);
+
+        /* Set to VLAN promisc mode as setting VLAN filter failed */
+        if (status) {
+                dev_info(&adapter->pdev->dev, "Exhausted VLAN HW filters.\n");
+                dev_info(&adapter->pdev->dev, "Disabling HW VLAN filtering.\n");
+                goto set_vlan_promisc;
         }
 
         return status;
+
+set_vlan_promisc:
+        status = be_cmd_vlan_config(adapter, adapter->if_handle,
+                                    NULL, 0, 1, 1);
+        return status;
 }
 
 static int be_vlan_add_vid(struct net_device *netdev, u16 vid)
@@ -862,6 +875,7 @@ ret:
 static void be_set_rx_mode(struct net_device *netdev)
 {
         struct be_adapter *adapter = netdev_priv(netdev);
+        int status;
 
         if (netdev->flags & IFF_PROMISC) {
                 be_cmd_rx_filter(adapter, IFF_PROMISC, ON);
@@ -908,7 +922,14 @@ static void be_set_rx_mode(struct net_device *netdev)
                 }
         }
 
-        be_cmd_rx_filter(adapter, IFF_MULTICAST, ON);
+        status = be_cmd_rx_filter(adapter, IFF_MULTICAST, ON);
+
+        /* Set to MCAST promisc mode if setting MULTICAST address fails */
+        if (status) {
+                dev_info(&adapter->pdev->dev, "Exhausted multicast HW filters.\n");
+                dev_info(&adapter->pdev->dev, "Disabling HW multicast filtering.\n");
+                be_cmd_rx_filter(adapter, IFF_ALLMULTI, ON);
+        }
 done:
         return;
 }
@@ -1028,6 +1049,29 @@ static int be_set_vf_tx_rate(struct net_device *netdev,
         return status;
 }
 
+static int be_find_vfs(struct be_adapter *adapter, int vf_state)
+{
+        struct pci_dev *dev, *pdev = adapter->pdev;
+        int vfs = 0, assigned_vfs = 0, pos, vf_fn;
+        u16 offset, stride;
+
+        pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_SRIOV);
+        pci_read_config_word(pdev, pos + PCI_SRIOV_VF_OFFSET, &offset);
+        pci_read_config_word(pdev, pos + PCI_SRIOV_VF_STRIDE, &stride);
+
+        dev = pci_get_device(pdev->vendor, PCI_ANY_ID, NULL);
+        while (dev) {
+                vf_fn = (pdev->devfn + offset + stride * vfs) & 0xFFFF;
+                if (dev->is_virtfn && dev->devfn == vf_fn) {
+                        vfs++;
+                        if (dev->dev_flags & PCI_DEV_FLAGS_ASSIGNED)
+                                assigned_vfs++;
+                }
+                dev = pci_get_device(pdev->vendor, PCI_ANY_ID, dev);
+        }
+        return (vf_state == ASSIGNED) ? assigned_vfs : vfs;
+}
+
 static void be_eqd_update(struct be_adapter *adapter, struct be_eq_obj *eqo)
 {
         struct be_rx_stats *stats = rx_stats(&adapter->rx_obj[eqo->idx]);
@@ -1238,6 +1282,7 @@ static void be_rx_compl_process(struct be_rx_obj *rxo,
                 skb_checksum_none_assert(skb);
 
         skb->protocol = eth_type_trans(skb, netdev);
+        skb_record_rx_queue(skb, rxo - &adapter->rx_obj[0]);
         if (netdev->features & NETIF_F_RXHASH)
                 skb->rxhash = rxcp->rss_hash;
 
@@ -1294,6 +1339,7 @@ void be_rx_compl_process_gro(struct be_rx_obj *rxo, struct napi_struct *napi,
         skb->len = rxcp->pkt_size;
         skb->data_len = rxcp->pkt_size;
         skb->ip_summed = CHECKSUM_UNNECESSARY;
+        skb_record_rx_queue(skb, rxo - &adapter->rx_obj[0]);
         if (adapter->netdev->features & NETIF_F_RXHASH)
                 skb->rxhash = rxcp->rss_hash;
 
@@ -1555,7 +1601,9 @@ static int event_handle(struct be_eq_obj *eqo)
         if (!num)
                 rearm = true;
 
-        be_eq_notify(eqo->adapter, eqo->q.id, rearm, true, num);
+        if (num || msix_enabled(eqo->adapter))
+                be_eq_notify(eqo->adapter, eqo->q.id, rearm, true, num);
+
         if (num)
                 napi_schedule(&eqo->napi);
 
@@ -1764,9 +1812,9 @@ static void be_tx_queues_destroy(struct be_adapter *adapter)
 
 static int be_num_txqs_want(struct be_adapter *adapter)
 {
-        if (sriov_enabled(adapter) || be_is_mc(adapter) ||
-                lancer_chip(adapter) || !be_physfn(adapter) ||
-                adapter->generation == BE_GEN2)
+        if (sriov_want(adapter) || be_is_mc(adapter) ||
+            lancer_chip(adapter) || !be_physfn(adapter) ||
+            adapter->generation == BE_GEN2)
                 return 1;
         else
                 return MAX_TX_QS;
@@ -2093,7 +2141,7 @@ static void be_msix_disable(struct be_adapter *adapter)
 static uint be_num_rss_want(struct be_adapter *adapter)
 {
         if ((adapter->function_caps & BE_FUNCTION_CAPS_RSS) &&
-             adapter->num_vfs == 0 && be_physfn(adapter) &&
+             !sriov_want(adapter) && be_physfn(adapter) &&
              !be_is_mc(adapter))
                 return (adapter->be3_native) ? BE3_MAX_RSS_QS : BE2_MAX_RSS_QS;
         else
@@ -2127,53 +2175,6 @@ done:
         return;
 }
 
-static int be_sriov_enable(struct be_adapter *adapter)
-{
-        be_check_sriov_fn_type(adapter);
-
-#ifdef CONFIG_PCI_IOV
-        if (be_physfn(adapter) && num_vfs) {
-                int status, pos;
-                u16 dev_vfs;
-
-                pos = pci_find_ext_capability(adapter->pdev,
-                                                PCI_EXT_CAP_ID_SRIOV);
-                pci_read_config_word(adapter->pdev,
-                                     pos + PCI_SRIOV_TOTAL_VF, &dev_vfs);
-
-                adapter->num_vfs = min_t(u16, num_vfs, dev_vfs);
-                if (adapter->num_vfs != num_vfs)
-                        dev_info(&adapter->pdev->dev,
-                                 "Device supports %d VFs and not %d\n",
-                                 adapter->num_vfs, num_vfs);
-
-                status = pci_enable_sriov(adapter->pdev, adapter->num_vfs);
-                if (status)
-                        adapter->num_vfs = 0;
-
-                if (adapter->num_vfs) {
-                        adapter->vf_cfg = kcalloc(num_vfs,
-                                                sizeof(struct be_vf_cfg),
-                                                GFP_KERNEL);
-                        if (!adapter->vf_cfg)
-                                return -ENOMEM;
-                }
-        }
-#endif
-        return 0;
-}
-
-static void be_sriov_disable(struct be_adapter *adapter)
-{
-#ifdef CONFIG_PCI_IOV
-        if (sriov_enabled(adapter)) {
-                pci_disable_sriov(adapter->pdev);
-                kfree(adapter->vf_cfg);
-                adapter->num_vfs = 0;
-        }
-#endif
-}
-
 static inline int be_msix_vec_get(struct be_adapter *adapter,
                                 struct be_eq_obj *eqo)
 {
@@ -2475,6 +2476,11 @@ static void be_vf_clear(struct be_adapter *adapter)
         struct be_vf_cfg *vf_cfg;
         u32 vf;
 
+        if (be_find_vfs(adapter, ASSIGNED)) {
+                dev_warn(&adapter->pdev->dev, "VFs are assigned to VMs\n");
+                goto done;
+        }
+
         for_all_vfs(adapter, vf_cfg, vf) {
                 if (lancer_chip(adapter))
                         be_cmd_set_mac_list(adapter, NULL, 0, vf + 1);
@@ -2484,6 +2490,10 @@ static void be_vf_clear(struct be_adapter *adapter)
 
                 be_cmd_if_destroy(adapter, vf_cfg->if_handle, vf + 1);
         }
+        pci_disable_sriov(adapter->pdev);
+done:
+        kfree(adapter->vf_cfg);
+        adapter->num_vfs = 0;
 }
 
 static int be_clear(struct be_adapter *adapter)
@@ -2513,29 +2523,60 @@ static int be_clear(struct be_adapter *adapter)
         be_cmd_fw_clean(adapter);
 
         be_msix_disable(adapter);
-        kfree(adapter->pmac_id);
+        pci_write_config_dword(adapter->pdev, PCICFG_CUST_SCRATCHPAD_CSR, 0);
         return 0;
 }
 
-static void be_vf_setup_init(struct be_adapter *adapter)
+static int be_vf_setup_init(struct be_adapter *adapter)
 {
         struct be_vf_cfg *vf_cfg;
         int vf;
 
+        adapter->vf_cfg = kcalloc(adapter->num_vfs, sizeof(*vf_cfg),
+                                  GFP_KERNEL);
+        if (!adapter->vf_cfg)
+                return -ENOMEM;
+
         for_all_vfs(adapter, vf_cfg, vf) {
                 vf_cfg->if_handle = -1;
                 vf_cfg->pmac_id = -1;
         }
+        return 0;
 }
 
 static int be_vf_setup(struct be_adapter *adapter)
 {
         struct be_vf_cfg *vf_cfg;
+        struct device *dev = &adapter->pdev->dev;
         u32 cap_flags, en_flags, vf;
         u16 def_vlan, lnk_speed;
-        int status;
+        int status, enabled_vfs;
 
-        be_vf_setup_init(adapter);
+        enabled_vfs = be_find_vfs(adapter, ENABLED);
+        if (enabled_vfs) {
+                dev_warn(dev, "%d VFs are already enabled\n", enabled_vfs);
+                dev_warn(dev, "Ignoring num_vfs=%d setting\n", num_vfs);
+                return 0;
+        }
+
+        if (num_vfs > adapter->dev_num_vfs) {
+                dev_warn(dev, "Device supports %d VFs and not %d\n",
+                         adapter->dev_num_vfs, num_vfs);
+                num_vfs = adapter->dev_num_vfs;
+        }
+
+        status = pci_enable_sriov(adapter->pdev, num_vfs);
+        if (!status) {
+                adapter->num_vfs = num_vfs;
+        } else {
+                /* Platform doesn't support SRIOV though device supports it */
+                dev_warn(dev, "SRIOV enable failed\n");
+                return 0;
+        }
+
+        status = be_vf_setup_init(adapter);
+        if (status)
+                goto err;
 
         cap_flags = en_flags = BE_IF_FLAGS_UNTAGGED | BE_IF_FLAGS_BROADCAST |
                                 BE_IF_FLAGS_MULTICAST;
@@ -2546,9 +2587,11 @@ static int be_vf_setup(struct be_adapter *adapter)
                         goto err;
         }
 
-        status = be_vf_eth_addr_config(adapter);
-        if (status)
-                goto err;
+        if (!enabled_vfs) {
+                status = be_vf_eth_addr_config(adapter);
+                if (status)
+                        goto err;
+        }
 
         for_all_vfs(adapter, vf_cfg, vf) {
                 status = be_cmd_link_status_query(adapter, NULL, &lnk_speed,
@@ -2571,11 +2614,12 @@ err:
 static void be_setup_init(struct be_adapter *adapter)
 {
         adapter->vlan_prio_bmap = 0xff;
-        adapter->link_speed = -1;
+        adapter->phy.link_speed = -1;
         adapter->if_handle = -1;
         adapter->be3_native = false;
         adapter->promiscuous = false;
         adapter->eq_next_idx = 0;
+        adapter->phy.forced_port_speed = -1;
 }
 
 static int be_add_mac_from_list(struct be_adapter *adapter, u8 *mac)
@@ -2604,9 +2648,25 @@ do_none:
         return status;
 }
 
+/* Routine to query per function resource limits */
+static int be_get_config(struct be_adapter *adapter)
+{
+        int pos;
+        u16 dev_num_vfs;
+
+        pos = pci_find_ext_capability(adapter->pdev, PCI_EXT_CAP_ID_SRIOV);
+        if (pos) {
+                pci_read_config_word(adapter->pdev, pos + PCI_SRIOV_TOTAL_VF,
+                                     &dev_num_vfs);
+                adapter->dev_num_vfs = dev_num_vfs;
+        }
+        return 0;
+}
+
 static int be_setup(struct be_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
+        struct device *dev = &adapter->pdev->dev;
         u32 cap_flags, en_flags;
         u32 tx_fc, rx_fc;
         int status;
@@ -2614,6 +2674,8 @@ static int be_setup(struct be_adapter *adapter)
 
         be_setup_init(adapter);
 
+        be_get_config(adapter);
+
         be_cmd_req_native_mode(adapter);
 
         be_msix_enable(adapter);
@@ -2680,36 +2742,33 @@ static int be_setup(struct be_adapter *adapter)
 
         be_cmd_get_fw_ver(adapter, adapter->fw_ver, NULL);
 
-        status = be_vid_config(adapter, false, 0);
-        if (status)
-                goto err;
+        be_vid_config(adapter, false, 0);
 
         be_set_rx_mode(adapter->netdev);
 
-        status = be_cmd_get_flow_control(adapter, &tx_fc, &rx_fc);
-        /* For Lancer: It is legal for this cmd to fail on VF */
-        if (status && (be_physfn(adapter) || !lancer_chip(adapter)))
-                goto err;
+        be_cmd_get_flow_control(adapter, &tx_fc, &rx_fc);
 
-        if (rx_fc != adapter->rx_fc || tx_fc != adapter->tx_fc) {
-                status = be_cmd_set_flow_control(adapter, adapter->tx_fc,
+        if (rx_fc != adapter->rx_fc || tx_fc != adapter->tx_fc)
+                be_cmd_set_flow_control(adapter, adapter->tx_fc,
                                         adapter->rx_fc);
-                /* For Lancer: It is legal for this cmd to fail on VF */
-                if (status && (be_physfn(adapter) || !lancer_chip(adapter)))
-                        goto err;
-        }
 
         pcie_set_readrq(adapter->pdev, 4096);
 
-        if (sriov_enabled(adapter)) {
-                status = be_vf_setup(adapter);
-                if (status)
-                        goto err;
+        if (be_physfn(adapter) && num_vfs) {
+                if (adapter->dev_num_vfs)
+                        be_vf_setup(adapter);
+                else
+                        dev_warn(dev, "device doesn't support SRIOV\n");
         }
 
+        be_cmd_get_phy_info(adapter);
+        if (be_pause_supported(adapter))
+                adapter->phy.fc_autoneg = 1;
+
         schedule_delayed_work(&adapter->work, msecs_to_jiffies(1000));
         adapter->flags |= BE_FLAGS_WORKER_SCHEDULED;
 
+        pci_write_config_dword(adapter->pdev, PCICFG_CUST_SCRATCHPAD_CSR, 1);
         return 0;
 err:
         be_clear(adapter);
@@ -2731,6 +2790,8 @@ static void be_netpoll(struct net_device *netdev)
 #endif
 
 #define FW_FILE_HDR_SIGN        "ServerEngines Corp. "
+char flash_cookie[2][16] =      {"*** SE FLAS", "H DIRECTORY *** "};
+
 static bool be_flash_redboot(struct be_adapter *adapter,
                         const u8 *p, u32 img_start, int image_size,
                         int hdr_size)
@@ -2760,71 +2821,105 @@ static bool be_flash_redboot(struct be_adapter *adapter,
 
 static bool phy_flashing_required(struct be_adapter *adapter)
 {
-        int status = 0;
-        struct be_phy_info phy_info;
+        return (adapter->phy.phy_type == TN_8022 &&
+                adapter->phy.interface_type == PHY_TYPE_BASET_10GB);
+}
 
-        status = be_cmd_get_phy_info(adapter, &phy_info);
-        if (status)
-                return false;
-        if ((phy_info.phy_type == TN_8022) &&
-                (phy_info.interface_type == PHY_TYPE_BASET_10GB)) {
-                return true;
+static bool is_comp_in_ufi(struct be_adapter *adapter,
+                           struct flash_section_info *fsec, int type)
+{
+        int i = 0, img_type = 0;
+        struct flash_section_info_g2 *fsec_g2 = NULL;
+
+        if (adapter->generation != BE_GEN3)
+                fsec_g2 = (struct flash_section_info_g2 *)fsec;
+
+        for (i = 0; i < MAX_FLASH_COMP; i++) {
+                if (fsec_g2)
+                        img_type = le32_to_cpu(fsec_g2->fsec_entry[i].type);
+                else
+                        img_type = le32_to_cpu(fsec->fsec_entry[i].type);
+
+                if (img_type == type)
+                        return true;
         }
         return false;
+
+}
+
+struct flash_section_info *get_fsec_info(struct be_adapter *adapter,
+                                         int header_size,
+                                         const struct firmware *fw)
+{
+        struct flash_section_info *fsec = NULL;
+        const u8 *p = fw->data;
+
+        p += header_size;
+        while (p < (fw->data + fw->size)) {
+                fsec = (struct flash_section_info *)p;
+                if (!memcmp(flash_cookie, fsec->cookie, sizeof(flash_cookie)))
+                        return fsec;
+                p += 32;
+        }
+        return NULL;
 }
 
 static int be_flash_data(struct be_adapter *adapter,
-                        const struct firmware *fw,
-                        struct be_dma_mem *flash_cmd, int num_of_images)
+                         const struct firmware *fw,
+                         struct be_dma_mem *flash_cmd,
+                         int num_of_images)
 
 {
         int status = 0, i, filehdr_size = 0;
+        int img_hdrs_size = (num_of_images * sizeof(struct image_hdr));
         u32 total_bytes = 0, flash_op;
         int num_bytes;
         const u8 *p = fw->data;
         struct be_cmd_write_flashrom *req = flash_cmd->va;
         const struct flash_comp *pflashcomp;
-        int num_comp;
-
-        static const struct flash_comp gen3_flash_types[10] = {
-                { FLASH_iSCSI_PRIMARY_IMAGE_START_g3, IMG_TYPE_ISCSI_ACTIVE,
-                        FLASH_IMAGE_MAX_SIZE_g3},
-                { FLASH_REDBOOT_START_g3, IMG_TYPE_REDBOOT,
-                        FLASH_REDBOOT_IMAGE_MAX_SIZE_g3},
-                { FLASH_iSCSI_BIOS_START_g3, IMG_TYPE_BIOS,
-                        FLASH_BIOS_IMAGE_MAX_SIZE_g3},
-                { FLASH_PXE_BIOS_START_g3, IMG_TYPE_PXE_BIOS,
-                        FLASH_BIOS_IMAGE_MAX_SIZE_g3},
-                { FLASH_FCoE_BIOS_START_g3, IMG_TYPE_FCOE_BIOS,
-                        FLASH_BIOS_IMAGE_MAX_SIZE_g3},
-                { FLASH_iSCSI_BACKUP_IMAGE_START_g3, IMG_TYPE_ISCSI_BACKUP,
-                        FLASH_IMAGE_MAX_SIZE_g3},
-                { FLASH_FCoE_PRIMARY_IMAGE_START_g3, IMG_TYPE_FCOE_FW_ACTIVE,
-                        FLASH_IMAGE_MAX_SIZE_g3},
-                { FLASH_FCoE_BACKUP_IMAGE_START_g3, IMG_TYPE_FCOE_FW_BACKUP,
-                        FLASH_IMAGE_MAX_SIZE_g3},
-                { FLASH_NCSI_START_g3, IMG_TYPE_NCSI_FW,
-                        FLASH_NCSI_IMAGE_MAX_SIZE_g3},
-                { FLASH_PHY_FW_START_g3, IMG_TYPE_PHY_FW,
-                        FLASH_PHY_FW_IMAGE_MAX_SIZE_g3}
+        int num_comp, hdr_size;
+        struct flash_section_info *fsec = NULL;
+
+        struct flash_comp gen3_flash_types[] = {
+                { FLASH_iSCSI_PRIMARY_IMAGE_START_g3, OPTYPE_ISCSI_ACTIVE,
+                        FLASH_IMAGE_MAX_SIZE_g3, IMAGE_FIRMWARE_iSCSI},
+                { FLASH_REDBOOT_START_g3, OPTYPE_REDBOOT,
+                        FLASH_REDBOOT_IMAGE_MAX_SIZE_g3, IMAGE_BOOT_CODE},
+                { FLASH_iSCSI_BIOS_START_g3, OPTYPE_BIOS,
+                        FLASH_BIOS_IMAGE_MAX_SIZE_g3, IMAGE_OPTION_ROM_ISCSI},
+                { FLASH_PXE_BIOS_START_g3, OPTYPE_PXE_BIOS,
+                        FLASH_BIOS_IMAGE_MAX_SIZE_g3, IMAGE_OPTION_ROM_PXE},
+                { FLASH_FCoE_BIOS_START_g3, OPTYPE_FCOE_BIOS,
+                        FLASH_BIOS_IMAGE_MAX_SIZE_g3, IMAGE_OPTION_ROM_FCoE},
+                { FLASH_iSCSI_BACKUP_IMAGE_START_g3, OPTYPE_ISCSI_BACKUP,
+                        FLASH_IMAGE_MAX_SIZE_g3, IMAGE_FIRMWARE_BACKUP_iSCSI},
+                { FLASH_FCoE_PRIMARY_IMAGE_START_g3, OPTYPE_FCOE_FW_ACTIVE,
+                        FLASH_IMAGE_MAX_SIZE_g3, IMAGE_FIRMWARE_FCoE},
+                { FLASH_FCoE_BACKUP_IMAGE_START_g3, OPTYPE_FCOE_FW_BACKUP,
+                        FLASH_IMAGE_MAX_SIZE_g3, IMAGE_FIRMWARE_BACKUP_FCoE},
+                { FLASH_NCSI_START_g3, OPTYPE_NCSI_FW,
+                        FLASH_NCSI_IMAGE_MAX_SIZE_g3, IMAGE_NCSI},
+                { FLASH_PHY_FW_START_g3, OPTYPE_PHY_FW,
+                        FLASH_PHY_FW_IMAGE_MAX_SIZE_g3, IMAGE_FIRMWARE_PHY}
         };
-        static const struct flash_comp gen2_flash_types[8] = {
-                { FLASH_iSCSI_PRIMARY_IMAGE_START_g2, IMG_TYPE_ISCSI_ACTIVE,
-                        FLASH_IMAGE_MAX_SIZE_g2},
-                { FLASH_REDBOOT_START_g2, IMG_TYPE_REDBOOT,
-                        FLASH_REDBOOT_IMAGE_MAX_SIZE_g2},
-                { FLASH_iSCSI_BIOS_START_g2, IMG_TYPE_BIOS,
-                        FLASH_BIOS_IMAGE_MAX_SIZE_g2},
-                { FLASH_PXE_BIOS_START_g2, IMG_TYPE_PXE_BIOS,
-                        FLASH_BIOS_IMAGE_MAX_SIZE_g2},
-                { FLASH_FCoE_BIOS_START_g2, IMG_TYPE_FCOE_BIOS,
-                        FLASH_BIOS_IMAGE_MAX_SIZE_g2},
-                { FLASH_iSCSI_BACKUP_IMAGE_START_g2, IMG_TYPE_ISCSI_BACKUP,
-                        FLASH_IMAGE_MAX_SIZE_g2},
-                { FLASH_FCoE_PRIMARY_IMAGE_START_g2, IMG_TYPE_FCOE_FW_ACTIVE,
-                        FLASH_IMAGE_MAX_SIZE_g2},
-                { FLASH_FCoE_BACKUP_IMAGE_START_g2, IMG_TYPE_FCOE_FW_BACKUP,
-                         FLASH_IMAGE_MAX_SIZE_g2}
+
+        struct flash_comp gen2_flash_types[] = {
+                { FLASH_iSCSI_PRIMARY_IMAGE_START_g2, OPTYPE_ISCSI_ACTIVE,
+                        FLASH_IMAGE_MAX_SIZE_g2, IMAGE_FIRMWARE_iSCSI},
+                { FLASH_REDBOOT_START_g2, OPTYPE_REDBOOT,
+                        FLASH_REDBOOT_IMAGE_MAX_SIZE_g2, IMAGE_BOOT_CODE},
+                { FLASH_iSCSI_BIOS_START_g2, OPTYPE_BIOS,
+                        FLASH_BIOS_IMAGE_MAX_SIZE_g2, IMAGE_OPTION_ROM_ISCSI},
+                { FLASH_PXE_BIOS_START_g2, OPTYPE_PXE_BIOS,
+                        FLASH_BIOS_IMAGE_MAX_SIZE_g2, IMAGE_OPTION_ROM_PXE},
+                { FLASH_FCoE_BIOS_START_g2, OPTYPE_FCOE_BIOS,
+                        FLASH_BIOS_IMAGE_MAX_SIZE_g2, IMAGE_OPTION_ROM_FCoE},
+                { FLASH_iSCSI_BACKUP_IMAGE_START_g2, OPTYPE_ISCSI_BACKUP,
+                        FLASH_IMAGE_MAX_SIZE_g2, IMAGE_FIRMWARE_BACKUP_iSCSI},
+                { FLASH_FCoE_PRIMARY_IMAGE_START_g2, OPTYPE_FCOE_FW_ACTIVE,
+                        FLASH_IMAGE_MAX_SIZE_g2, IMAGE_FIRMWARE_FCoE},
+                { FLASH_FCoE_BACKUP_IMAGE_START_g2, OPTYPE_FCOE_FW_BACKUP,
+                         FLASH_IMAGE_MAX_SIZE_g2, IMAGE_FIRMWARE_BACKUP_FCoE}
         };
 
         if (adapter->generation == BE_GEN3) {
@@ -2836,22 +2931,37 @@ static int be_flash_data(struct be_adapter *adapter,
                 filehdr_size = sizeof(struct flash_file_hdr_g2);
                 num_comp = ARRAY_SIZE(gen2_flash_types);
         }
+        /* Get flash section info*/
+        fsec = get_fsec_info(adapter, filehdr_size + img_hdrs_size, fw);
+        if (!fsec) {
+                dev_err(&adapter->pdev->dev,
+                        "Invalid Cookie. UFI corrupted ?\n");
+                return -1;
+        }
         for (i = 0; i < num_comp; i++) {
-                if ((pflashcomp[i].optype == IMG_TYPE_NCSI_FW) &&
-                                memcmp(adapter->fw_ver, "3.102.148.0", 11) < 0)
+                if (!is_comp_in_ufi(adapter, fsec, pflashcomp[i].img_type))
+                        continue;
+
+                if ((pflashcomp[i].optype == OPTYPE_NCSI_FW) &&
+                    memcmp(adapter->fw_ver, "3.102.148.0", 11) < 0)
                         continue;
-                if (pflashcomp[i].optype == IMG_TYPE_PHY_FW) {
+
+                if (pflashcomp[i].optype == OPTYPE_PHY_FW) {
                         if (!phy_flashing_required(adapter))
                                 continue;
                 }
-                if ((pflashcomp[i].optype == IMG_TYPE_REDBOOT) &&
-                        (!be_flash_redboot(adapter, fw->data,
-                        pflashcomp[i].offset, pflashcomp[i].size, filehdr_size +
-                        (num_of_images * sizeof(struct image_hdr)))))
+
+                hdr_size = filehdr_size +
+                           (num_of_images * sizeof(struct image_hdr));
+
+                if ((pflashcomp[i].optype == OPTYPE_REDBOOT) &&
+                    (!be_flash_redboot(adapter, fw->data, pflashcomp[i].offset,
+                                       pflashcomp[i].size, hdr_size)))
                         continue;
+
+                /* Flash the component */
                 p = fw->data;
-                p += filehdr_size + pflashcomp[i].offset
-                        + (num_of_images * sizeof(struct image_hdr));
+                p += filehdr_size + pflashcomp[i].offset + img_hdrs_size;
                 if (p + pflashcomp[i].size > fw->data + fw->size)
                         return -1;
                 total_bytes = pflashcomp[i].size;
@@ -2862,12 +2972,12 @@ static int be_flash_data(struct be_adapter *adapter,
                                 num_bytes = total_bytes;
                         total_bytes -= num_bytes;
                         if (!total_bytes) {
-                                if (pflashcomp[i].optype == IMG_TYPE_PHY_FW)
+                                if (pflashcomp[i].optype == OPTYPE_PHY_FW)
                                         flash_op = FLASHROM_OPER_PHY_FLASH;
                                 else
                                         flash_op = FLASHROM_OPER_FLASH;
                         } else {
-                                if (pflashcomp[i].optype == IMG_TYPE_PHY_FW)
+                                if (pflashcomp[i].optype == OPTYPE_PHY_FW)
                                         flash_op = FLASHROM_OPER_PHY_SAVE;
                                 else
                                         flash_op = FLASHROM_OPER_SAVE;
@@ -2879,7 +2989,7 @@ static int be_flash_data(struct be_adapter *adapter,
                         if (status) {
                                 if ((status == ILLEGAL_IOCTL_REQ) &&
                                         (pflashcomp[i].optype ==
-                                                IMG_TYPE_PHY_FW))
+                                                OPTYPE_PHY_FW))
                                         break;
                                 dev_err(&adapter->pdev->dev,
                                         "cmd to write to flash rom failed.\n");
@@ -3280,8 +3390,6 @@ static void __devexit be_remove(struct pci_dev *pdev)
 
         be_ctrl_cleanup(adapter);
 
-        be_sriov_disable(adapter);
-
         pci_set_drvdata(pdev, NULL);
         pci_release_regions(pdev);
         pci_disable_device(pdev);
@@ -3295,9 +3403,43 @@ bool be_is_wol_supported(struct be_adapter *adapter)
                 !be_is_wol_excluded(adapter)) ? true : false;
 }
 
-static int be_get_config(struct be_adapter *adapter)
+u32 be_get_fw_log_level(struct be_adapter *adapter)
 {
+        struct be_dma_mem extfat_cmd;
+        struct be_fat_conf_params *cfgs;
         int status;
+        u32 level = 0;
+        int j;
+
+        memset(&extfat_cmd, 0, sizeof(struct be_dma_mem));
+        extfat_cmd.size = sizeof(struct be_cmd_resp_get_ext_fat_caps);
+        extfat_cmd.va = pci_alloc_consistent(adapter->pdev, extfat_cmd.size,
+                                             &extfat_cmd.dma);
+
+        if (!extfat_cmd.va) {
+                dev_err(&adapter->pdev->dev, "%s: Memory allocation failure\n",
+                        __func__);
+                goto err;
+        }
+
+        status = be_cmd_get_ext_fat_capabilites(adapter, &extfat_cmd);
+        if (!status) {
+                cfgs = (struct be_fat_conf_params *)(extfat_cmd.va +
+                                                sizeof(struct be_cmd_resp_hdr));
+                for (j = 0; j < cfgs->module[0].num_modes; j++) {
+                        if (cfgs->module[0].trace_lvl[j].mode == MODE_UART)
+                                level = cfgs->module[0].trace_lvl[j].dbg_lvl;
+                }
+        }
+        pci_free_consistent(adapter->pdev, extfat_cmd.size, extfat_cmd.va,
+                            extfat_cmd.dma);
+err:
+        return level;
+}
+static int be_get_initial_config(struct be_adapter *adapter)
+{
+        int status;
+        u32 level;
 
         status = be_cmd_query_fw_cfg(adapter, &adapter->port_num,
                         &adapter->function_mode, &adapter->function_caps);
@@ -3335,10 +3477,13 @@ static int be_get_config(struct be_adapter *adapter)
         if (be_is_wol_supported(adapter))
                 adapter->wol = true;
 
+        level = be_get_fw_log_level(adapter);
+        adapter->msg_enable = level <= FW_LOG_LEVEL_DEFAULT ? NETIF_MSG_HW : 0;
+
         return 0;
 }
 
-static int be_dev_family_check(struct be_adapter *adapter)
+static int be_dev_type_check(struct be_adapter *adapter)
 {
         struct pci_dev *pdev = adapter->pdev;
         u32 sli_intf = 0, if_type;
@@ -3371,6 +3516,9 @@ static int be_dev_family_check(struct be_adapter *adapter)
         default:
                 adapter->generation = 0;
         }
+
+        pci_read_config_dword(adapter->pdev, SLI_INTF_REG_OFFSET, &sli_intf);
+        adapter->virtfn = (sli_intf & SLI_INTF_FT_MASK) ? 1 : 0;
         return 0;
 }
 
@@ -3514,6 +3662,14 @@ reschedule:
         schedule_delayed_work(&adapter->work, msecs_to_jiffies(1000));
 }
 
+static bool be_reset_required(struct be_adapter *adapter)
+{
+        u32 reg;
+
+        pci_read_config_dword(adapter->pdev, PCICFG_CUST_SCRATCHPAD_CSR, &reg);
+        return reg;
+}
+
 static int __devinit be_probe(struct pci_dev *pdev,
                         const struct pci_device_id *pdev_id)
 {
@@ -3539,7 +3695,7 @@ static int __devinit be_probe(struct pci_dev *pdev,
         adapter->pdev = pdev;
         pci_set_drvdata(pdev, adapter);
 
-        status = be_dev_family_check(adapter);
+        status = be_dev_type_check(adapter);
         if (status)
                 goto free_netdev;
 
@@ -3557,13 +3713,9 @@ static int __devinit be_probe(struct pci_dev *pdev,
                 }
         }
 
-        status = be_sriov_enable(adapter);
-        if (status)
-                goto free_netdev;
-
         status = be_ctrl_init(adapter);
         if (status)
-                goto disable_sriov;
+                goto free_netdev;
 
         if (lancer_chip(adapter)) {
                 status = lancer_wait_ready(adapter);
@@ -3590,9 +3742,11 @@ static int __devinit be_probe(struct pci_dev *pdev,
         if (status)
                 goto ctrl_clean;
 
-        status = be_cmd_reset_function(adapter);
-        if (status)
-                goto ctrl_clean;
+        if (be_reset_required(adapter)) {
+                status = be_cmd_reset_function(adapter);
+                if (status)
+                        goto ctrl_clean;
+        }
 
         /* The INTR bit may be set in the card when probed by a kdump kernel
          * after a crash.
@@ -3604,7 +3758,7 @@ static int __devinit be_probe(struct pci_dev *pdev,
         if (status)
                 goto ctrl_clean;
 
-        status = be_get_config(adapter);
+        status = be_get_initial_config(adapter);
         if (status)
                 goto stats_clean;
 
@@ -3633,8 +3787,6 @@ stats_clean:
         be_stats_cleanup(adapter);
 ctrl_clean:
         be_ctrl_cleanup(adapter);
-disable_sriov:
-        be_sriov_disable(adapter);
 free_netdev:
         free_netdev(netdev);
         pci_set_drvdata(pdev, NULL);
@@ -3749,6 +3901,11 @@ static pci_ers_result_t be_eeh_err_detected(struct pci_dev *pdev,
 
         pci_disable_device(pdev);
 
+        /* The error could cause the FW to trigger a flash debug dump.
+         * Resetting the card while flash dump is in progress
+         * can cause it not to recover; wait for it to finish
+         */
+        ssleep(30);
         return PCI_ERS_RESULT_NEED_RESET;
 }
 
diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
index 1637b9862292..9d71c9cc300b 100644
--- a/drivers/net/ethernet/fealnx.c
+++ b/drivers/net/ethernet/fealnx.c
@@ -545,9 +545,6 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev,
         /* Reset the chip to erase previous misconfiguration. */
         iowrite32(0x00000001, ioaddr + BCR);
 
-        dev->base_addr = (unsigned long)ioaddr;
-        dev->irq = irq;
-
         /* Make certain the descriptor lists are aligned. */
         np = netdev_priv(dev);
         np->mem = ioaddr;
@@ -832,11 +829,13 @@ static int netdev_open(struct net_device *dev)
 {
         struct netdev_private *np = netdev_priv(dev);
         void __iomem *ioaddr = np->mem;
-        int i;
+        const int irq = np->pci_dev->irq;
+        int rc, i;
 
         iowrite32(0x00000001, ioaddr + BCR);    /* Reset */
 
-        if (request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev))
+        rc = request_irq(irq, intr_handler, IRQF_SHARED, dev->name, dev);
+        if (rc)
                 return -EAGAIN;
 
         for (i = 0; i < 3; i++)
@@ -924,8 +923,7 @@ static int netdev_open(struct net_device *dev)
         np->reset_timer.data = (unsigned long) dev;
         np->reset_timer.function = reset_timer;
         np->reset_timer_armed = 0;
-
-        return 0;
+        return rc;
 }
 
 
@@ -1910,7 +1908,7 @@ static int netdev_close(struct net_device *dev)
         del_timer_sync(&np->timer);
         del_timer_sync(&np->reset_timer);
 
-        free_irq(dev->irq, dev);
+        free_irq(np->pci_dev->irq, dev);
 
         /* Free all the skbuffs in the Rx queue. */
         for (i = 0; i < RX_RING_SIZE; i++) {
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index a12b3f5bc025..7fa0227c9c02 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -1161,6 +1161,7 @@ static const struct ethtool_ops fec_enet_ethtool_ops = {
         .set_settings           = fec_enet_set_settings,
         .get_drvinfo            = fec_enet_get_drvinfo,
         .get_link               = ethtool_op_get_link,
+        .get_ts_info            = ethtool_op_get_ts_info,
 };
 
 static int fec_enet_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c
index 7b34d8c698da..97f947b3d94a 100644
--- a/drivers/net/ethernet/freescale/fec_mpc52xx.c
+++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c
@@ -811,6 +811,7 @@ static const struct ethtool_ops mpc52xx_fec_ethtool_ops = {
         .get_link = ethtool_op_get_link,
         .get_msglevel = mpc52xx_fec_get_msglevel,
         .set_msglevel = mpc52xx_fec_set_msglevel,
+        .get_ts_info = ethtool_op_get_ts_info,
 };
 
 
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index e4e6cd2c5f82..2b7633f766d9 100644
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -963,6 +963,7 @@ static const struct ethtool_ops fs_ethtool_ops = {
         .get_msglevel = fs_get_msglevel,
         .set_msglevel = fs_set_msglevel,
         .get_regs = fs_get_regs,
+        .get_ts_info = ethtool_op_get_ts_info,
 };
 
 static int fs_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index e7bed5303997..1adb0245b9dd 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -136,7 +136,7 @@ static void gfar_netpoll(struct net_device *dev);
 int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit);
 static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue);
 static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
-                              int amount_pull);
+                              int amount_pull, struct napi_struct *napi);
 void gfar_halt(struct net_device *dev);
 static void gfar_halt_nodisable(struct net_device *dev);
 void gfar_start(struct net_device *dev);
@@ -2675,12 +2675,12 @@ static inline void gfar_rx_checksum(struct sk_buff *skb, struct rxfcb *fcb)
 /* gfar_process_frame() -- handle one incoming packet if skb
  * isn't NULL.  */
 static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
-                              int amount_pull)
+                              int amount_pull, struct napi_struct *napi)
 {
         struct gfar_private *priv = netdev_priv(dev);
         struct rxfcb *fcb = NULL;
 
-        int ret;
+        gro_result_t ret;
 
         /* fcb is at the beginning if exists */
         fcb = (struct rxfcb *)skb->data;
@@ -2719,9 +2719,9 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
                 __vlan_hwaccel_put_tag(skb, fcb->vlctl);
 
         /* Send the packet up the stack */
-        ret = netif_receive_skb(skb);
+        ret = napi_gro_receive(napi, skb);
 
-        if (NET_RX_DROP == ret)
+        if (GRO_DROP == ret)
                 priv->extra_stats.kernel_dropped++;
 
         return 0;
@@ -2783,7 +2783,8 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
                                 skb_put(skb, pkt_len);
                                 rx_queue->stats.rx_bytes += pkt_len;
                                 skb_record_rx_queue(skb, rx_queue->qindex);
-                                gfar_process_frame(dev, skb, amount_pull);
+                                gfar_process_frame(dev, skb, amount_pull,
+                                                &rx_queue->grp->napi);
 
                         } else {
                                 netif_warn(priv, rx_err, dev, "Missing skb!\n");
diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h
index 4c9f8d487dbb..2136c7ff5e6d 100644
--- a/drivers/net/ethernet/freescale/gianfar.h
+++ b/drivers/net/ethernet/freescale/gianfar.h
@@ -1210,4 +1210,7 @@ struct filer_table {
         struct gfar_filer_entry fe[MAX_FILER_CACHE_IDX + 20];
 };
 
+/* The gianfar_ptp module will set this variable */
+extern int gfar_phc_index;
+
 #endif /* __GIANFAR_H */
diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
index 8d74efd04bb9..8a025570d97e 100644
--- a/drivers/net/ethernet/freescale/gianfar_ethtool.c
+++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
+#include <linux/net_tstamp.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/mm.h>
@@ -1739,6 +1740,34 @@ static int gfar_get_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
         return ret;
 }
 
+int gfar_phc_index = -1;
+
+static int gfar_get_ts_info(struct net_device *dev,
+                            struct ethtool_ts_info *info)
+{
+        struct gfar_private *priv = netdev_priv(dev);
+
+        if (!(priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER)) {
+                info->so_timestamping =
+                        SOF_TIMESTAMPING_RX_SOFTWARE |
+                        SOF_TIMESTAMPING_SOFTWARE;
+                info->phc_index = -1;
+                return 0;
+        }
+        info->so_timestamping =
+                SOF_TIMESTAMPING_TX_HARDWARE |
+                SOF_TIMESTAMPING_RX_HARDWARE |
+                SOF_TIMESTAMPING_RAW_HARDWARE;
+        info->phc_index = gfar_phc_index;
+        info->tx_types =
+                (1 << HWTSTAMP_TX_OFF) |
+                (1 << HWTSTAMP_TX_ON);
+        info->rx_filters =
+                (1 << HWTSTAMP_FILTER_NONE) |
+                (1 << HWTSTAMP_FILTER_ALL);
+        return 0;
+}
+
 const struct ethtool_ops gfar_ethtool_ops = {
         .get_settings = gfar_gsettings,
         .set_settings = gfar_ssettings,
@@ -1761,4 +1790,5 @@ const struct ethtool_ops gfar_ethtool_ops = {
 #endif
         .set_rxnfc = gfar_set_nfc,
         .get_rxnfc = gfar_get_nfc,
+        .get_ts_info = gfar_get_ts_info,
 };
diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c
index 5fd620bec15c..c08e5d40fecb 100644
--- a/drivers/net/ethernet/freescale/gianfar_ptp.c
+++ b/drivers/net/ethernet/freescale/gianfar_ptp.c
@@ -515,6 +515,7 @@ static int gianfar_ptp_probe(struct platform_device *dev)
                 err = PTR_ERR(etsects->clock);
                 goto no_clock;
         }
+        gfar_phc_clock = ptp_clock_index(etsects->clock);
 
         dev_set_drvdata(&dev->dev, etsects);
 
@@ -538,6 +539,7 @@ static int gianfar_ptp_remove(struct platform_device *dev)
         gfar_write(&etsects->regs->tmr_temask, 0);
         gfar_write(&etsects->regs->tmr_ctrl,   0);
 
+        gfar_phc_clock = -1;
         ptp_clock_unregister(etsects->clock);
         iounmap(etsects->regs);
         release_resource(etsects->rsrc);
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 17a46e76123f..9ac14f804851 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -116,10 +116,10 @@ static struct ucc_geth_info ugeth_primary_info = {
         .maxGroupAddrInHash = 4,
         .maxIndAddrInHash = 4,
         .prel = 7,
-        .maxFrameLength = 1518,
+        .maxFrameLength = 1518+16, /* Add extra bytes for VLANs etc. */
         .minFrameLength = 64,
-        .maxD1Length = 1520,
-        .maxD2Length = 1520,
+        .maxD1Length = 1520+16, /* Add extra bytes for VLANs etc. */
+        .maxD2Length = 1520+16, /* Add extra bytes for VLANs etc. */
         .vlantype = 0x8100,
         .ecamptr = ((uint32_t) NULL),
         .eventRegMask = UCCE_OTHER,
diff --git a/drivers/net/ethernet/freescale/ucc_geth.h b/drivers/net/ethernet/freescale/ucc_geth.h
index 2e395a2566b8..f71b3e7b12de 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.h
+++ b/drivers/net/ethernet/freescale/ucc_geth.h
@@ -877,7 +877,7 @@ struct ucc_geth_hardware_statistics {
 
 /* Driver definitions */
 #define TX_BD_RING_LEN                          0x10
-#define RX_BD_RING_LEN                          0x10
+#define RX_BD_RING_LEN                          0x20
 
 #define TX_RING_MOD_MASK(size)                  (size-1)
 #define RX_RING_MOD_MASK(size)                  (size-1)
diff --git a/drivers/net/ethernet/freescale/ucc_geth_ethtool.c b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
index a97257f91a3d..37b035306013 100644
--- a/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
+++ b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
@@ -415,6 +415,7 @@ static const struct ethtool_ops uec_ethtool_ops = {
         .get_ethtool_stats      = uec_get_ethtool_stats,
         .get_wol                = uec_get_wol,
         .set_wol                = uec_set_wol,
+        .get_ts_info            = ethtool_op_get_ts_info,
 };
 
 void uec_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/ethernet/fujitsu/at1700.c b/drivers/net/ethernet/fujitsu/at1700.c
index 3d94797c8f9b..4b80dc4531ad 100644
--- a/drivers/net/ethernet/fujitsu/at1700.c
+++ b/drivers/net/ethernet/fujitsu/at1700.c
@@ -27,7 +27,7 @@
         ATI provided their EEPROM configuration code header file.
     Thanks to NIIBE Yutaka <gniibe@mri.co.jp> for bug fixes.
 
-    MCA bus (AT1720) support by Rene Schmit <rene@bss.lu>
+    MCA bus (AT1720) support (now deleted) by Rene Schmit <rene@bss.lu>
 
   Bugs:
         The MB86965 has a design flaw that makes all probes unreliable.  Not
@@ -38,7 +38,6 @@
 #include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/mca-legacy.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -79,24 +78,6 @@ static unsigned at1700_probe_list[] __initdata = {
         0x260, 0x280, 0x2a0, 0x240, 0x340, 0x320, 0x380, 0x300, 0
 };
 
-/*
- *      MCA
- */
-#ifdef CONFIG_MCA_LEGACY
-static int at1700_ioaddr_pattern[] __initdata = {
-        0x00, 0x04, 0x01, 0x05, 0x02, 0x06, 0x03, 0x07
-};
-
-static int at1700_mca_probe_list[] __initdata = {
-        0x400, 0x1400, 0x2400, 0x3400, 0x4400, 0x5400, 0x6400, 0x7400, 0
-};
-
-static int at1700_irq_pattern[] __initdata = {
-        0x00, 0x00, 0x00, 0x30, 0x70, 0xb0, 0x00, 0x00,
-        0x00, 0xf0, 0x34, 0x74, 0xb4, 0x00, 0x00, 0xf4, 0x00
-};
-#endif
-
 /* use 0 for production, 1 for verification, >2 for debug */
 #ifndef NET_DEBUG
 #define NET_DEBUG 1
@@ -114,7 +95,6 @@ struct net_local {
         uint tx_queue_ready:1;                  /* Tx queue is ready to be sent. */
         uint rx_started:1;                      /* Packets are Rxing. */
         uchar tx_queue;                         /* Number of packet on the Tx queue. */
-        char mca_slot;                          /* -1 means ISA */
         ushort tx_queue_len;                    /* Current length of the Tx queue. */
 };
 
@@ -166,21 +146,6 @@ static void set_rx_mode(struct net_device *dev);
 static void net_tx_timeout (struct net_device *dev);
 
 
-#ifdef CONFIG_MCA_LEGACY
-struct at1720_mca_adapters_struct {
-        char* name;
-        int id;
-};
-/* rEnE : maybe there are others I don't know off... */
-
-static struct at1720_mca_adapters_struct at1720_mca_adapters[] __initdata = {
-        { "Allied Telesys AT1720AT",    0x6410 },
-        { "Allied Telesys AT1720BT",    0x6413 },
-        { "Allied Telesys AT1720T",     0x6416 },
-        { NULL, 0 },
-};
-#endif
-
 /* Check for a network adaptor of this type, and return '0' iff one exists.
    If dev->base_addr == 0, probe all likely locations.
    If dev->base_addr == 1, always return failure.
@@ -194,11 +159,6 @@ static int irq;
 
 static void cleanup_card(struct net_device *dev)
 {
-#ifdef CONFIG_MCA_LEGACY
-        struct net_local *lp = netdev_priv(dev);
-        if (lp->mca_slot >= 0)
-                mca_mark_as_unused(lp->mca_slot);
-#endif
         free_irq(dev->irq, NULL);
         release_region(dev->base_addr, AT1700_IO_EXTENT);
 }
@@ -273,7 +233,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
         static const char fmv_irqmap_pnp[8] = {3, 4, 5, 7, 9, 10, 11, 15};
         static const char at1700_irqmap[8] = {3, 4, 5, 9, 10, 11, 14, 15};
         unsigned int i, irq, is_fmv18x = 0, is_at1700 = 0;
-        int slot, ret = -ENODEV;
+        int ret = -ENODEV;
         struct net_local *lp = netdev_priv(dev);
 
         if (!request_region(ioaddr, AT1700_IO_EXTENT, DRV_NAME))
@@ -288,64 +248,6 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
                    ioaddr, read_eeprom(ioaddr, 4), read_eeprom(ioaddr, 5),
                    read_eeprom(ioaddr, 6), inw(ioaddr + EEPROM_Ctrl));
 #endif
-
-#ifdef CONFIG_MCA_LEGACY
-        /* rEnE (rene@bss.lu): got this from 3c509 driver source , adapted for AT1720 */
-
-    /* Based on Erik Nygren's (nygren@mit.edu) 3c529 patch, heavily
-        modified by Chris Beauregard (cpbeaure@csclub.uwaterloo.ca)
-        to support standard MCA probing. */
-
-        /* redone for multi-card detection by ZP Gu (zpg@castle.net) */
-        /* now works as a module */
-
-        if (MCA_bus) {
-                int j;
-                int l_i;
-                u_char pos3, pos4;
-
-                for (j = 0; at1720_mca_adapters[j].name != NULL; j ++) {
-                        slot = 0;
-                        while (slot != MCA_NOTFOUND) {
-
-                                slot = mca_find_unused_adapter( at1720_mca_adapters[j].id, slot );
-                                if (slot == MCA_NOTFOUND) break;
-
-                                /* if we get this far, an adapter has been detected and is
-                                enabled */
-
-                                pos3 = mca_read_stored_pos( slot, 3 );
-                                pos4 = mca_read_stored_pos( slot, 4 );
-
-                                for (l_i = 0; l_i < 8; l_i++)
-                                        if (( pos3 & 0x07) == at1700_ioaddr_pattern[l_i])
-                                                break;
-                                ioaddr = at1700_mca_probe_list[l_i];
-
-                                for (irq = 0; irq < 0x10; irq++)
-                                        if (((((pos4>>4) & 0x0f) | (pos3 & 0xf0)) & 0xff) == at1700_irq_pattern[irq])
-                                                break;
-
-                                        /* probing for a card at a particular IO/IRQ */
-                                if ((dev->irq && dev->irq != irq) ||
-                                    (dev->base_addr && dev->base_addr != ioaddr)) {
-                                        slot++;         /* probing next slot */
-                                        continue;
-                                }
-
-                                dev->irq = irq;
-
-                                /* claim the slot */
-                                mca_set_adapter_name( slot, at1720_mca_adapters[j].name );
-                                mca_mark_as_used(slot);
-
-                                goto found;
-                        }
-                }
-                /* if we get here, we didn't find an MCA adapter - try ISA */
-        }
-#endif
-        slot = -1;
         /* We must check for the EEPROM-config boards first, else accessing
            IOCONFIG0 will move the board! */
         if (at1700_probe_list[inb(ioaddr + IOCONFIG1) & 0x07] == ioaddr &&
@@ -360,11 +262,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
                 goto err_out;
         }
 
-#ifdef CONFIG_MCA_LEGACY
-found:
-#endif
-
-                /* Reset the internal state machines. */
+        /* Reset the internal state machines. */
         outb(0, ioaddr + RESET);
 
         if (is_at1700) {
@@ -380,11 +278,11 @@ found:
                                         break;
                         }
                         if (i == 8) {
-                                goto err_mca;
+                                goto err_out;
                         }
                 } else {
                         if (fmv18x_probe_list[inb(ioaddr + IOCONFIG) & 0x07] != ioaddr)
-                                goto err_mca;
+                                goto err_out;
                         irq = fmv_irqmap[(inb(ioaddr + IOCONFIG)>>6) & 0x03];
                 }
         }
@@ -464,23 +362,17 @@ found:
         spin_lock_init(&lp->lock);
 
         lp->jumpered = is_fmv18x;
-        lp->mca_slot = slot;
         /* Snarf the interrupt vector now. */
         ret = request_irq(irq, net_interrupt, 0, DRV_NAME, dev);
         if (ret) {
                 printk(KERN_ERR "AT1700 at %#3x is unusable due to a "
                        "conflict on IRQ %d.\n",
                        ioaddr, irq);
-                goto err_mca;
+                goto err_out;
         }
 
         return 0;
 
-err_mca:
-#ifdef CONFIG_MCA_LEGACY
-        if (slot >= 0)
-                mca_mark_as_unused(slot);
-#endif
 err_out:
         release_region(ioaddr, AT1700_IO_EXTENT);
         return ret;
diff --git a/drivers/net/ethernet/i825xx/3c523.c b/drivers/net/ethernet/i825xx/3c523.c
deleted file mode 100644
index 8451ecd4c1ec..000000000000
--- a/drivers/net/ethernet/i825xx/3c523.c
+++ /dev/null
@@ -1,1312 +0,0 @@
-/*
-   net-3-driver for the 3c523 Etherlink/MC card (i82586 Ethernet chip)
-
-
-   This is an extension to the Linux operating system, and is covered by the
-   same GNU General Public License that covers that work.
-
-   Copyright 1995, 1996 by Chris Beauregard (cpbeaure@undergrad.math.uwaterloo.ca)
-
-   This is basically Michael Hipp's ni52 driver, with a new probing
-   algorithm and some minor changes to the 82586 CA and reset routines.
-   Thanks a lot Michael for a really clean i82586 implementation!  Unless
-   otherwise documented in ni52.c, any bugs are mine.
-
-   Contrary to the Ethernet-HOWTO, this isn't based on the 3c507 driver in
-   any way.  The ni52 is a lot easier to modify.
-
-   sources:
-   ni52.c
-
-   Crynwr packet driver collection was a great reference for my first
-   attempt at this sucker.  The 3c507 driver also helped, until I noticed
-   that ni52.c was a lot nicer.
-
-   EtherLink/MC: Micro Channel Ethernet Adapter Technical Reference
-   Manual, courtesy of 3Com CardFacts, documents the 3c523-specific
-   stuff.  Information on CardFacts is found in the Ethernet HOWTO.
-   Also see <a href="http://www.3com.com/">
-
-   Microprocessor Communications Support Chips, T.J. Byers, ISBN
-   0-444-01224-9, has a section on the i82586.  It tells you just enough
-   to know that you really don't want to learn how to program the chip.
-
-   The original device probe code was stolen from ps2esdi.c
-
-   Known Problems:
-   Since most of the code was stolen from ni52.c, you'll run across the
-   same bugs in the 0.62 version of ni52.c, plus maybe a few because of
-   the 3c523 idiosynchacies.  The 3c523 has 16K of RAM though, so there
-   shouldn't be the overrun problem that the 8K ni52 has.
-
-   This driver is for a 16K adapter.  It should work fine on the 64K
-   adapters, but it will only use one of the 4 banks of RAM.  Modifying
-   this for the 64K version would require a lot of heinous bank
-   switching, which I'm sure not interested in doing.  If you try to
-   implement a bank switching version, you'll basically have to remember
-   what bank is enabled and do a switch every time you access a memory
-   location that's not current.  You'll also have to remap pointers on
-   the driver side, because it only knows about 16K of the memory.
-   Anyone desperate or masochistic enough to try?
-
-   It seems to be stable now when multiple transmit buffers are used.  I
-   can't see any performance difference, but then I'm working on a 386SX.
-
-   Multicast doesn't work.  It doesn't even pretend to work.  Don't use
-   it.  Don't compile your kernel with multicast support.  I don't know
-   why.
-
-   Features:
-   This driver is useable as a loadable module.  If you try to specify an
-   IRQ or a IO address (via insmod 3c523.o irq=xx io=0xyyy), it will
-   search the MCA slots until it finds a 3c523 with the specified
-   parameters.
-
-   This driver does support multiple ethernet cards when used as a module
-   (up to MAX_3C523_CARDS, the default being 4)
-
-   This has been tested with both BNC and TP versions, internal and
-   external transceivers.  Haven't tested with the 64K version (that I
-   know of).
-
-   History:
-   Jan 1st, 1996
-   first public release
-   Feb 4th, 1996
-   update to 1.3.59, incorporated multicast diffs from ni52.c
-   Feb 15th, 1996
-   added shared irq support
-   Apr 1999
-   added support for multiple cards when used as a module
-   added option to disable multicast as is causes problems
-       Ganesh Sittampalam <ganesh.sittampalam@magdalen.oxford.ac.uk>
-       Stuart Adamson <stuart.adamson@compsoc.net>
-   Nov 2001
-   added support for ethtool (jgarzik)
-
-   $Header: /fsys2/home/chrisb/linux-1.3.59-MCA/drivers/net/RCS/3c523.c,v 1.1 1996/02/05 01:53:46 chrisb Exp chrisb $
- */
-
-#define DRV_NAME                "3c523"
-#define DRV_VERSION             "17-Nov-2001"
-
-#include <linux/init.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/skbuff.h>
-#include <linux/interrupt.h>
-#include <linux/delay.h>
-#include <linux/mca-legacy.h>
-#include <linux/ethtool.h>
-#include <linux/bitops.h>
-#include <linux/jiffies.h>
-
-#include <asm/uaccess.h>
-#include <asm/processor.h>
-#include <asm/io.h>
-
-#include "3c523.h"
-
-/*************************************************************************/
-#define DEBUG                   /* debug on */
-#define SYSBUSVAL 0             /* 1 = 8 Bit, 0 = 16 bit - 3c523 only does 16 bit */
-#undef ELMC_MULTICAST           /* Disable multicast support as it is somewhat seriously broken at the moment */
-
-#define make32(ptr16) (p->memtop + (short) (ptr16) )
-#define make24(ptr32) ((char *) (ptr32) - p->base)
-#define make16(ptr32) ((unsigned short) ((unsigned long) (ptr32) - (unsigned long) p->memtop ))
-
-/*************************************************************************/
-/*
-   Tables to which we can map values in the configuration registers.
- */
-static int irq_table[] __initdata = {
-        12, 7, 3, 9
-};
-
-static int csr_table[] __initdata = {
-        0x300, 0x1300, 0x2300, 0x3300
-};
-
-static int shm_table[] __initdata = {
-        0x0c0000, 0x0c8000, 0x0d0000, 0x0d8000
-};
-
-/******************* how to calculate the buffers *****************************
-
-
-  * IMPORTANT NOTE: if you configure only one NUM_XMIT_BUFFS, the driver works
-  * --------------- in a different (more stable?) mode. Only in this mode it's
-  *                 possible to configure the driver with 'NO_NOPCOMMANDS'
-
-sizeof(scp)=12; sizeof(scb)=16; sizeof(iscp)=8;
-sizeof(scp)+sizeof(iscp)+sizeof(scb) = 36 = INIT
-sizeof(rfd) = 24; sizeof(rbd) = 12;
-sizeof(tbd) = 8; sizeof(transmit_cmd) = 16;
-sizeof(nop_cmd) = 8;
-
-  * if you don't know the driver, better do not change this values: */
-
-#define RECV_BUFF_SIZE 1524     /* slightly oversized */
-#define XMIT_BUFF_SIZE 1524     /* slightly oversized */
-#define NUM_XMIT_BUFFS 1        /* config for both, 8K and 16K shmem */
-#define NUM_RECV_BUFFS_8  4     /* config for 8K shared mem */
-#define NUM_RECV_BUFFS_16 9     /* config for 16K shared mem */
-
-#if (NUM_XMIT_BUFFS == 1)
-#define NO_NOPCOMMANDS          /* only possible with NUM_XMIT_BUFFS=1 */
-#endif
-
-/**************************************************************************/
-
-#define DELAY(x) { mdelay(32 * x); }
-
-/* a much shorter delay: */
-#define DELAY_16(); { udelay(16) ; }
-
-/* wait for command with timeout: */
-#define WAIT_4_SCB_CMD() { int i; \
-  for(i=0;i<1024;i++) { \
-    if(!p->scb->cmd) break; \
-    DELAY_16(); \
-    if(i == 1023) { \
-      pr_warning("%s:%d: scb_cmd timed out .. resetting i82586\n",\
-        dev->name,__LINE__); \
-      elmc_id_reset586(); } } }
-
-static irqreturn_t elmc_interrupt(int irq, void *dev_id);
-static int elmc_open(struct net_device *dev);
-static int elmc_close(struct net_device *dev);
-static netdev_tx_t elmc_send_packet(struct sk_buff *, struct net_device *);
-static struct net_device_stats *elmc_get_stats(struct net_device *dev);
-static void elmc_timeout(struct net_device *dev);
-#ifdef ELMC_MULTICAST
-static void set_multicast_list(struct net_device *dev);
-#endif
-static const struct ethtool_ops netdev_ethtool_ops;
-
-/* helper-functions */
-static int init586(struct net_device *dev);
-static int check586(struct net_device *dev, unsigned long where, unsigned size);
-static void alloc586(struct net_device *dev);
-static void startrecv586(struct net_device *dev);
-static void *alloc_rfa(struct net_device *dev, void *ptr);
-static void elmc_rcv_int(struct net_device *dev);
-static void elmc_xmt_int(struct net_device *dev);
-static void elmc_rnr_int(struct net_device *dev);
-
-struct priv {
-        unsigned long base;
-        char *memtop;
-        unsigned long mapped_start;             /* Start of ioremap */
-        volatile struct rfd_struct *rfd_last, *rfd_top, *rfd_first;
-        volatile struct scp_struct *scp;        /* volatile is important */
-        volatile struct iscp_struct *iscp;      /* volatile is important */
-        volatile struct scb_struct *scb;        /* volatile is important */
-        volatile struct tbd_struct *xmit_buffs[NUM_XMIT_BUFFS];
-#if (NUM_XMIT_BUFFS == 1)
-        volatile struct transmit_cmd_struct *xmit_cmds[2];
-        volatile struct nop_cmd_struct *nop_cmds[2];
-#else
-        volatile struct transmit_cmd_struct *xmit_cmds[NUM_XMIT_BUFFS];
-        volatile struct nop_cmd_struct *nop_cmds[NUM_XMIT_BUFFS];
-#endif
-        volatile int nop_point, num_recv_buffs;
-        volatile char *xmit_cbuffs[NUM_XMIT_BUFFS];
-        volatile int xmit_count, xmit_last;
-        volatile int slot;
-};
-
-#define elmc_attn586()  {elmc_do_attn586(dev->base_addr,ELMC_CTRL_INTE);}
-#define elmc_reset586() {elmc_do_reset586(dev->base_addr,ELMC_CTRL_INTE);}
-
-/* with interrupts disabled - this will clear the interrupt bit in the
-   3c523 control register, and won't put it back.  This effectively
-   disables interrupts on the card. */
-#define elmc_id_attn586()  {elmc_do_attn586(dev->base_addr,0);}
-#define elmc_id_reset586() {elmc_do_reset586(dev->base_addr,0);}
-
-/*************************************************************************/
-/*
-   Do a Channel Attention on the 3c523.  This is extremely board dependent.
- */
-static void elmc_do_attn586(int ioaddr, int ints)
-{
-        /* the 3c523 requires a minimum of 500 ns.  The delays here might be
-           a little too large, and hence they may cut the performance of the
-           card slightly.  If someone who knows a little more about Linux
-           timing would care to play with these, I'd appreciate it. */
-
-        /* this bit masking stuff is crap.  I'd rather have separate
-           registers with strobe triggers for each of these functions.  <sigh>
-           Ya take what ya got. */
-
-        outb(ELMC_CTRL_RST | 0x3 | ELMC_CTRL_CA | ints, ioaddr + ELMC_CTRL);
-        DELAY_16();             /* > 500 ns */
-        outb(ELMC_CTRL_RST | 0x3 | ints, ioaddr + ELMC_CTRL);
-}
-
-/*************************************************************************/
-/*
-   Reset the 82586 on the 3c523.  Also very board dependent.
- */
-static void elmc_do_reset586(int ioaddr, int ints)
-{
-        /* toggle the RST bit low then high */
-        outb(0x3 | ELMC_CTRL_LBK, ioaddr + ELMC_CTRL);
-        DELAY_16();             /* > 500 ns */
-        outb(ELMC_CTRL_RST | ELMC_CTRL_LBK | 0x3, ioaddr + ELMC_CTRL);
-
-        elmc_do_attn586(ioaddr, ints);
-}
-
-/**********************************************
- * close device
- */
-
-static int elmc_close(struct net_device *dev)
-{
-        netif_stop_queue(dev);
-        elmc_id_reset586();     /* the hard way to stop the receiver */
-        free_irq(dev->irq, dev);
-        return 0;
-}
-
-/**********************************************
- * open device
- */
-
-static int elmc_open(struct net_device *dev)
-{
-        int ret;
-
-        elmc_id_attn586();      /* disable interrupts */
-
-        ret = request_irq(dev->irq, elmc_interrupt, IRQF_SHARED,
-                          dev->name, dev);
-        if (ret) {
-                pr_err("%s: couldn't get irq %d\n", dev->name, dev->irq);
-                elmc_id_reset586();
-                return ret;
-        }
-        alloc586(dev);
-        init586(dev);
-        startrecv586(dev);
-        netif_start_queue(dev);
-        return 0;               /* most done by init */
-}
-
-/**********************************************
- * Check to see if there's an 82586 out there.
- */
-
-static int __init check586(struct net_device *dev, unsigned long where, unsigned size)
-{
-        struct priv *p = netdev_priv(dev);
-        char *iscp_addrs[2];
-        int i = 0;
-
-        p->base = (unsigned long) isa_bus_to_virt((unsigned long)where) + size - 0x01000000;
-        p->memtop = isa_bus_to_virt((unsigned long)where) + size;
-        p->scp = (struct scp_struct *)(p->base + SCP_DEFAULT_ADDRESS);
-        memset((char *) p->scp, 0, sizeof(struct scp_struct));
-        p->scp->sysbus = SYSBUSVAL;     /* 1 = 8Bit-Bus, 0 = 16 Bit */
-
-        iscp_addrs[0] = isa_bus_to_virt((unsigned long)where);
-        iscp_addrs[1] = (char *) p->scp - sizeof(struct iscp_struct);
-
-        for (i = 0; i < 2; i++) {
-                p->iscp = (struct iscp_struct *) iscp_addrs[i];
-                memset((char *) p->iscp, 0, sizeof(struct iscp_struct));
-
-                p->scp->iscp = make24(p->iscp);
-                p->iscp->busy = 1;
-
-                elmc_id_reset586();
-
-                /* reset586 does an implicit CA */
-
-                /* apparently, you sometimes have to kick the 82586 twice... */
-                elmc_id_attn586();
-                DELAY(1);
-
-                if (p->iscp->busy) {    /* i82586 clears 'busy' after successful init */
-                        return 0;
-                }
-        }
-        return 1;
-}
-
-/******************************************************************
- * set iscp at the right place, called by elmc_probe and open586.
- */
-
-static void alloc586(struct net_device *dev)
-{
-        struct priv *p = netdev_priv(dev);
-
-        elmc_id_reset586();
-        DELAY(2);
-
-        p->scp = (struct scp_struct *) (p->base + SCP_DEFAULT_ADDRESS);
-        p->scb = (struct scb_struct *) isa_bus_to_virt(dev->mem_start);
-        p->iscp = (struct iscp_struct *) ((char *) p->scp - sizeof(struct iscp_struct));
-
-        memset((char *) p->iscp, 0, sizeof(struct iscp_struct));
-        memset((char *) p->scp, 0, sizeof(struct scp_struct));
-
-        p->scp->iscp = make24(p->iscp);
-        p->scp->sysbus = SYSBUSVAL;
-        p->iscp->scb_offset = make16(p->scb);
-
-        p->iscp->busy = 1;
-        elmc_id_reset586();
-        elmc_id_attn586();
-
-        DELAY(2);
-
-        if (p->iscp->busy)
-                pr_err("%s: Init-Problems (alloc).\n", dev->name);
-
-        memset((char *) p->scb, 0, sizeof(struct scb_struct));
-}
-
-/*****************************************************************/
-
-static int elmc_getinfo(char *buf, int slot, void *d)
-{
-        int len = 0;
-        struct net_device *dev = d;
-
-        if (dev == NULL)
-                return len;
-
-        len += sprintf(buf + len, "Revision: 0x%x\n",
-                       inb(dev->base_addr + ELMC_REVISION) & 0xf);
-        len += sprintf(buf + len, "IRQ: %d\n", dev->irq);
-        len += sprintf(buf + len, "IO Address: %#lx-%#lx\n", dev->base_addr,
-                       dev->base_addr + ELMC_IO_EXTENT);
-        len += sprintf(buf + len, "Memory: %#lx-%#lx\n", dev->mem_start,
-                       dev->mem_end - 1);
-        len += sprintf(buf + len, "Transceiver: %s\n", dev->if_port ?
-                       "External" : "Internal");
-        len += sprintf(buf + len, "Device: %s\n", dev->name);
-        len += sprintf(buf + len, "Hardware Address: %pM\n",
-                       dev->dev_addr);
-
-        return len;
-}                               /* elmc_getinfo() */
-
-static const struct net_device_ops netdev_ops = {
-        .ndo_open               = elmc_open,
-        .ndo_stop               = elmc_close,
-        .ndo_get_stats          = elmc_get_stats,
-        .ndo_start_xmit         = elmc_send_packet,
-        .ndo_tx_timeout         = elmc_timeout,
-#ifdef ELMC_MULTICAST
-        .ndo_set_rx_mode        = set_multicast_list,
-#endif
-        .ndo_change_mtu         = eth_change_mtu,
-        .ndo_set_mac_address    = eth_mac_addr,
-        .ndo_validate_addr      = eth_validate_addr,
-};
-
-/*****************************************************************/
-
-static int __init do_elmc_probe(struct net_device *dev)
-{
-        static int slot;
-        int base_addr = dev->base_addr;
-        int irq = dev->irq;
-        u_char status = 0;
-        u_char revision = 0;
-        int i = 0;
-        unsigned int size = 0;
-        int retval;
-        struct priv *pr = netdev_priv(dev);
-
-        if (MCA_bus == 0) {
-                return -ENODEV;
-        }
-        /* search through the slots for the 3c523. */
-        slot = mca_find_adapter(ELMC_MCA_ID, 0);
-        while (slot != -1) {
-                status = mca_read_stored_pos(slot, 2);
-
-                dev->irq=irq_table[(status & ELMC_STATUS_IRQ_SELECT) >> 6];
-                dev->base_addr=csr_table[(status & ELMC_STATUS_CSR_SELECT) >> 1];
-
-                /*
-                   If we're trying to match a specified irq or IO address,
-                   we'll reject a match unless it's what we're looking for.
-                   Also reject it if the card is already in use.
-                 */
-
-                if ((irq && irq != dev->irq) ||
-                    (base_addr && base_addr != dev->base_addr)) {
-                        slot = mca_find_adapter(ELMC_MCA_ID, slot + 1);
-                        continue;
-                }
-                if (!request_region(dev->base_addr, ELMC_IO_EXTENT, DRV_NAME)) {
-                        slot = mca_find_adapter(ELMC_MCA_ID, slot + 1);
-                        continue;
-                }
-
-                /* found what we're looking for... */
-                break;
-        }
-
-        /* we didn't find any 3c523 in the slots we checked for */
-        if (slot == MCA_NOTFOUND)
-                return (base_addr || irq) ? -ENXIO : -ENODEV;
-
-        mca_set_adapter_name(slot, "3Com 3c523 Etherlink/MC");
-        mca_set_adapter_procfn(slot, (MCA_ProcFn) elmc_getinfo, dev);
-
-        /* if we get this far, adapter has been found - carry on */
-        pr_info("%s: 3c523 adapter found in slot %d\n", dev->name, slot + 1);
-
-        /* Now we extract configuration info from the card.
-           The 3c523 provides information in two of the POS registers, but
-           the second one is only needed if we want to tell the card what IRQ
-           to use.  I suspect that whoever sets the thing up initially would
-           prefer we don't screw with those things.
-
-           Note that we read the status info when we found the card...
-
-           See 3c523.h for more details.
-         */
-
-        /* revision is stored in the first 4 bits of the revision register */
-        revision = inb(dev->base_addr + ELMC_REVISION) & 0xf;
-
-        /* according to docs, we read the interrupt and write it back to
-           the IRQ select register, since the POST might not configure the IRQ
-           properly. */
-        switch (dev->irq) {
-        case 3:
-                mca_write_pos(slot, 3, 0x04);
-                break;
-        case 7:
-                mca_write_pos(slot, 3, 0x02);
-                break;
-        case 9:
-                mca_write_pos(slot, 3, 0x08);
-                break;
-        case 12:
-                mca_write_pos(slot, 3, 0x01);
-                break;
-        }
-
-        pr->slot = slot;
-
-        pr_info("%s: 3Com 3c523 Rev 0x%x at %#lx\n", dev->name, (int) revision,
-               dev->base_addr);
-
-        /* Determine if we're using the on-board transceiver (i.e. coax) or
-           an external one.  The information is pretty much useless, but I
-           guess it's worth brownie points. */
-        dev->if_port = (status & ELMC_STATUS_DISABLE_THIN);
-
-        /* The 3c523 has a 24K chunk of memory.  The first 16K is the
-           shared memory, while the last 8K is for the EtherStart BIOS ROM.
-           Which we don't care much about here.  We'll just tell Linux that
-           we're using 16K.  MCA won't permit address space conflicts caused
-           by not mapping the other 8K. */
-        dev->mem_start = shm_table[(status & ELMC_STATUS_MEMORY_SELECT) >> 3];
-
-        /* We're using MCA, so it's a given that the information about memory
-           size is correct.  The Crynwr drivers do something like this. */
-
-        elmc_id_reset586();     /* seems like a good idea before checking it... */
-
-        size = 0x4000;          /* check for 16K mem */
-        if (!check586(dev, dev->mem_start, size)) {
-                pr_err("%s: memprobe, Can't find memory at 0x%lx!\n", dev->name,
-                       dev->mem_start);
-                retval = -ENODEV;
-                goto err_out;
-        }
-        dev->mem_end = dev->mem_start + size;   /* set mem_end showed by 'ifconfig' */
-
-        pr->memtop = isa_bus_to_virt(dev->mem_start) + size;
-        pr->base = (unsigned long) isa_bus_to_virt(dev->mem_start) + size - 0x01000000;
-        alloc586(dev);
-
-        elmc_id_reset586();     /* make sure it doesn't generate spurious ints */
-
-        /* set number of receive-buffs according to memsize */
-        pr->num_recv_buffs = NUM_RECV_BUFFS_16;
-
-        /* dump all the assorted information */
-        pr_info("%s: IRQ %d, %sternal xcvr, memory %#lx-%#lx.\n", dev->name,
-               dev->irq, dev->if_port ? "ex" : "in",
-               dev->mem_start, dev->mem_end - 1);
-
-        /* The hardware address for the 3c523 is stored in the first six
-           bytes of the IO address. */
-        for (i = 0; i < 6; i++)
-                dev->dev_addr[i] = inb(dev->base_addr + i);
-
-        pr_info("%s: hardware address %pM\n",
-               dev->name, dev->dev_addr);
-
-        dev->netdev_ops = &netdev_ops;
-        dev->watchdog_timeo = HZ;
-        dev->ethtool_ops = &netdev_ethtool_ops;
-
-        /* note that we haven't actually requested the IRQ from the kernel.
-           That gets done in elmc_open().  I'm not sure that's such a good idea,
-           but it works, so I'll go with it. */
-
-#ifndef ELMC_MULTICAST
-        dev->flags&=~IFF_MULTICAST;     /* Multicast doesn't work */
-#endif
-
-        retval = register_netdev(dev);
-        if (retval)
-                goto err_out;
-
-        return 0;
-err_out:
-        mca_set_adapter_procfn(slot, NULL, NULL);
-        release_region(dev->base_addr, ELMC_IO_EXTENT);
-        return retval;
-}
-
-#ifdef MODULE
-static void cleanup_card(struct net_device *dev)
-{
-        mca_set_adapter_procfn(((struct priv *)netdev_priv(dev))->slot,
-                                NULL, NULL);
-        release_region(dev->base_addr, ELMC_IO_EXTENT);
-}
-#else
-struct net_device * __init elmc_probe(int unit)
-{
-        struct net_device *dev = alloc_etherdev(sizeof(struct priv));
-        int err;
-
-        if (!dev)
-                return ERR_PTR(-ENOMEM);
-
-        sprintf(dev->name, "eth%d", unit);
-        netdev_boot_setup_check(dev);
-
-        err = do_elmc_probe(dev);
-        if (err)
-                goto out;
-        return dev;
-out:
-        free_netdev(dev);
-        return ERR_PTR(err);
-}
-#endif
-
-/**********************************************
- * init the chip (elmc-interrupt should be disabled?!)
- * needs a correct 'allocated' memory
- */
-
-static int init586(struct net_device *dev)
-{
-        void *ptr;
-        unsigned long s;
-        int i, result = 0;
-        struct priv *p = netdev_priv(dev);
-        volatile struct configure_cmd_struct *cfg_cmd;
-        volatile struct iasetup_cmd_struct *ias_cmd;
-        volatile struct tdr_cmd_struct *tdr_cmd;
-        volatile struct mcsetup_cmd_struct *mc_cmd;
-        struct netdev_hw_addr *ha;
-        int num_addrs = netdev_mc_count(dev);
-
-        ptr = (void *) ((char *) p->scb + sizeof(struct scb_struct));
-
-        cfg_cmd = (struct configure_cmd_struct *) ptr;  /* configure-command */
-        cfg_cmd->cmd_status = 0;
-        cfg_cmd->cmd_cmd = CMD_CONFIGURE | CMD_LAST;
-        cfg_cmd->cmd_link = 0xffff;
-
-        cfg_cmd->byte_cnt = 0x0a;       /* number of cfg bytes */
-        cfg_cmd->fifo = 0x08;   /* fifo-limit (8=tx:32/rx:64) */
-        cfg_cmd->sav_bf = 0x40; /* hold or discard bad recv frames (bit 7) */
-        cfg_cmd->adr_len = 0x2e;        /* addr_len |!src_insert |pre-len |loopback */
-        cfg_cmd->priority = 0x00;
-        cfg_cmd->ifs = 0x60;
-        cfg_cmd->time_low = 0x00;
-        cfg_cmd->time_high = 0xf2;
-        cfg_cmd->promisc = 0;
-        if (dev->flags & (IFF_ALLMULTI | IFF_PROMISC))
-                cfg_cmd->promisc = 1;
-        cfg_cmd->carr_coll = 0x00;
-
-        p->scb->cbl_offset = make16(cfg_cmd);
-
-        p->scb->cmd = CUC_START;        /* cmd.-unit start */
-        elmc_id_attn586();
-
-        s = jiffies;            /* warning: only active with interrupts on !! */
-        while (!(cfg_cmd->cmd_status & STAT_COMPL)) {
-                if (time_after(jiffies, s + 30*HZ/100))
-                        break;
-        }
-
-        if ((cfg_cmd->cmd_status & (STAT_OK | STAT_COMPL)) != (STAT_COMPL | STAT_OK)) {
-                pr_warning("%s (elmc): configure command failed: %x\n", dev->name, cfg_cmd->cmd_status);
-                return 1;
-        }
-        /*
-         * individual address setup
-         */
-        ias_cmd = (struct iasetup_cmd_struct *) ptr;
-
-        ias_cmd->cmd_status = 0;
-        ias_cmd->cmd_cmd = CMD_IASETUP | CMD_LAST;
-        ias_cmd->cmd_link = 0xffff;
-
-        memcpy((char *) &ias_cmd->iaddr, (char *) dev->dev_addr, ETH_ALEN);
-
-        p->scb->cbl_offset = make16(ias_cmd);
-
-        p->scb->cmd = CUC_START;        /* cmd.-unit start */
-        elmc_id_attn586();
-
-        s = jiffies;
-        while (!(ias_cmd->cmd_status & STAT_COMPL)) {
-                if (time_after(jiffies, s + 30*HZ/100))
-                        break;
-        }
-
-        if ((ias_cmd->cmd_status & (STAT_OK | STAT_COMPL)) != (STAT_OK | STAT_COMPL)) {
-                pr_warning("%s (elmc): individual address setup command failed: %04x\n",
-                        dev->name, ias_cmd->cmd_status);
-                return 1;
-        }
-        /*
-         * TDR, wire check .. e.g. no resistor e.t.c
-         */
-        tdr_cmd = (struct tdr_cmd_struct *) ptr;
-
-        tdr_cmd->cmd_status = 0;
-        tdr_cmd->cmd_cmd = CMD_TDR | CMD_LAST;
-        tdr_cmd->cmd_link = 0xffff;
-        tdr_cmd->status = 0;
-
-        p->scb->cbl_offset = make16(tdr_cmd);
-
-        p->scb->cmd = CUC_START;        /* cmd.-unit start */
-        elmc_attn586();
-
-        s = jiffies;
-        while (!(tdr_cmd->cmd_status & STAT_COMPL)) {
-                if (time_after(jiffies, s + 30*HZ/100)) {
-                        pr_warning("%s: %d Problems while running the TDR.\n", dev->name, __LINE__);
-                        result = 1;
-                        break;
-                }
-        }
-
-        if (!result) {
-                DELAY(2);       /* wait for result */
-                result = tdr_cmd->status;
-
-                p->scb->cmd = p->scb->status & STAT_MASK;
-                elmc_id_attn586();      /* ack the interrupts */
-
-                if (result & TDR_LNK_OK) {
-                        /* empty */
-                } else if (result & TDR_XCVR_PRB) {
-                        pr_warning("%s: TDR: Transceiver problem!\n", dev->name);
-                } else if (result & TDR_ET_OPN) {
-                        pr_warning("%s: TDR: No correct termination %d clocks away.\n", dev->name, result & TDR_TIMEMASK);
-                } else if (result & TDR_ET_SRT) {
-                        if (result & TDR_TIMEMASK)      /* time == 0 -> strange :-) */
-                                pr_warning("%s: TDR: Detected a short circuit %d clocks away.\n", dev->name, result & TDR_TIMEMASK);
-                } else {
-                        pr_warning("%s: TDR: Unknown status %04x\n", dev->name, result);
-                }
-        }
-        /*
-         * ack interrupts
-         */
-        p->scb->cmd = p->scb->status & STAT_MASK;
-        elmc_id_attn586();
-
-        /*
-         * alloc nop/xmit-cmds
-         */
-#if (NUM_XMIT_BUFFS == 1)
-        for (i = 0; i < 2; i++) {
-                p->nop_cmds[i] = (struct nop_cmd_struct *) ptr;
-                p->nop_cmds[i]->cmd_cmd = CMD_NOP;
-                p->nop_cmds[i]->cmd_status = 0;
-                p->nop_cmds[i]->cmd_link = make16((p->nop_cmds[i]));
-                ptr = (char *) ptr + sizeof(struct nop_cmd_struct);
-        }
-        p->xmit_cmds[0] = (struct transmit_cmd_struct *) ptr;   /* transmit cmd/buff 0 */
-        ptr = (char *) ptr + sizeof(struct transmit_cmd_struct);
-#else
-        for (i = 0; i < NUM_XMIT_BUFFS; i++) {
-                p->nop_cmds[i] = (struct nop_cmd_struct *) ptr;
-                p->nop_cmds[i]->cmd_cmd = CMD_NOP;
-                p->nop_cmds[i]->cmd_status = 0;
-                p->nop_cmds[i]->cmd_link = make16((p->nop_cmds[i]));
-                ptr = (char *) ptr + sizeof(struct nop_cmd_struct);
-                p->xmit_cmds[i] = (struct transmit_cmd_struct *) ptr;   /*transmit cmd/buff 0 */
-                ptr = (char *) ptr + sizeof(struct transmit_cmd_struct);
-        }
-#endif
-
-        ptr = alloc_rfa(dev, (void *) ptr);     /* init receive-frame-area */
-
-        /*
-         * Multicast setup
-         */
-
-        if (num_addrs) {
-                /* I don't understand this: do we really need memory after the init? */
-                int len = ((char *) p->iscp - (char *) ptr - 8) / 6;
-                if (len <= 0) {
-                        pr_err("%s: Ooooops, no memory for MC-Setup!\n", dev->name);
-                } else {
-                        if (len < num_addrs) {
-                                num_addrs = len;
-                                pr_warning("%s: Sorry, can only apply %d MC-Address(es).\n",
-                                       dev->name, num_addrs);
-                        }
-                        mc_cmd = (struct mcsetup_cmd_struct *) ptr;
-                        mc_cmd->cmd_status = 0;
-                        mc_cmd->cmd_cmd = CMD_MCSETUP | CMD_LAST;
-                        mc_cmd->cmd_link = 0xffff;
-                        mc_cmd->mc_cnt = num_addrs * 6;
-                        i = 0;
-                        netdev_for_each_mc_addr(ha, dev)
-                                memcpy((char *) mc_cmd->mc_list[i++],
-                                       ha->addr, 6);
-                        p->scb->cbl_offset = make16(mc_cmd);
-                        p->scb->cmd = CUC_START;
-                        elmc_id_attn586();
-                        s = jiffies;
-                        while (!(mc_cmd->cmd_status & STAT_COMPL)) {
-                                if (time_after(jiffies, s + 30*HZ/100))
-                                        break;
-                        }
-                        if (!(mc_cmd->cmd_status & STAT_COMPL)) {
-                                pr_warning("%s: Can't apply multicast-address-list.\n", dev->name);
-                        }
-                }
-        }
-        /*
-         * alloc xmit-buffs / init xmit_cmds
-         */
-        for (i = 0; i < NUM_XMIT_BUFFS; i++) {
-                p->xmit_cbuffs[i] = (char *) ptr;       /* char-buffs */
-                ptr = (char *) ptr + XMIT_BUFF_SIZE;
-                p->xmit_buffs[i] = (struct tbd_struct *) ptr;   /* TBD */
-                ptr = (char *) ptr + sizeof(struct tbd_struct);
-                if ((void *) ptr > (void *) p->iscp) {
-                        pr_err("%s: not enough shared-mem for your configuration!\n", dev->name);
-                        return 1;
-                }
-                memset((char *) (p->xmit_cmds[i]), 0, sizeof(struct transmit_cmd_struct));
-                memset((char *) (p->xmit_buffs[i]), 0, sizeof(struct tbd_struct));
-                p->xmit_cmds[i]->cmd_status = STAT_COMPL;
-                p->xmit_cmds[i]->cmd_cmd = CMD_XMIT | CMD_INT;
-                p->xmit_cmds[i]->tbd_offset = make16((p->xmit_buffs[i]));
-                p->xmit_buffs[i]->next = 0xffff;
-                p->xmit_buffs[i]->buffer = make24((p->xmit_cbuffs[i]));
-        }
-
-        p->xmit_count = 0;
-        p->xmit_last = 0;
-#ifndef NO_NOPCOMMANDS
-        p->nop_point = 0;
-#endif
-
-        /*
-         * 'start transmitter' (nop-loop)
-         */
-#ifndef NO_NOPCOMMANDS
-        p->scb->cbl_offset = make16(p->nop_cmds[0]);
-        p->scb->cmd = CUC_START;
-        elmc_id_attn586();
-        WAIT_4_SCB_CMD();
-#else
-        p->xmit_cmds[0]->cmd_link = 0xffff;
-        p->xmit_cmds[0]->cmd_cmd = CMD_XMIT | CMD_LAST | CMD_INT;
-#endif
-
-        return 0;
-}
-
-/******************************************************
- * This is a helper routine for elmc_rnr_int() and init586().
- * It sets up the Receive Frame Area (RFA).
- */
-
-static void *alloc_rfa(struct net_device *dev, void *ptr)
-{
-        volatile struct rfd_struct *rfd = (struct rfd_struct *) ptr;
-        volatile struct rbd_struct *rbd;
-        int i;
-        struct priv *p = netdev_priv(dev);
-
-        memset((char *) rfd, 0, sizeof(struct rfd_struct) * p->num_recv_buffs);
-        p->rfd_first = rfd;
-
-        for (i = 0; i < p->num_recv_buffs; i++) {
-                rfd[i].next = make16(rfd + (i + 1) % p->num_recv_buffs);
-        }
-        rfd[p->num_recv_buffs - 1].last = RFD_SUSP;     /* RU suspend */
-
-        ptr = (void *) (rfd + p->num_recv_buffs);
-
-        rbd = (struct rbd_struct *) ptr;
-        ptr = (void *) (rbd + p->num_recv_buffs);
-
-        /* clr descriptors */
-        memset((char *) rbd, 0, sizeof(struct rbd_struct) * p->num_recv_buffs);
-
-        for (i = 0; i < p->num_recv_buffs; i++) {
-                rbd[i].next = make16((rbd + (i + 1) % p->num_recv_buffs));
-                rbd[i].size = RECV_BUFF_SIZE;
-                rbd[i].buffer = make24(ptr);
-                ptr = (char *) ptr + RECV_BUFF_SIZE;
-        }
-
-        p->rfd_top = p->rfd_first;
-        p->rfd_last = p->rfd_first + p->num_recv_buffs - 1;
-
-        p->scb->rfa_offset = make16(p->rfd_first);
-        p->rfd_first->rbd_offset = make16(rbd);
-
-        return ptr;
-}
-
-
-/**************************************************
- * Interrupt Handler ...
- */
-
-static irqreturn_t
-elmc_interrupt(int irq, void *dev_id)
-{
-        struct net_device *dev = dev_id;
-        unsigned short stat;
-        struct priv *p;
-
-        if (!netif_running(dev)) {
-                /* The 3c523 has this habit of generating interrupts during the
-                   reset.  I'm not sure if the ni52 has this same problem, but it's
-                   really annoying if we haven't finished initializing it.  I was
-                   hoping all the elmc_id_* commands would disable this, but I
-                   might have missed a few. */
-
-                elmc_id_attn586();      /* ack inter. and disable any more */
-                return IRQ_HANDLED;
-        } else if (!(ELMC_CTRL_INT & inb(dev->base_addr + ELMC_CTRL))) {
-                /* wasn't this device */
-                return IRQ_NONE;
-        }
-        /* reading ELMC_CTRL also clears the INT bit. */
-
-        p = netdev_priv(dev);
-
-        while ((stat = p->scb->status & STAT_MASK))
-        {
-                p->scb->cmd = stat;
-                elmc_attn586(); /* ack inter. */
-
-                if (stat & STAT_CX) {
-                        /* command with I-bit set complete */
-                        elmc_xmt_int(dev);
-                }
-                if (stat & STAT_FR) {
-                        /* received a frame */
-                        elmc_rcv_int(dev);
-                }
-#ifndef NO_NOPCOMMANDS
-                if (stat & STAT_CNA) {
-                        /* CU went 'not ready' */
-                        if (netif_running(dev)) {
-                                pr_warning("%s: oops! CU has left active state. stat: %04x/%04x.\n",
-                                        dev->name, (int) stat, (int) p->scb->status);
-                        }
-                }
-#endif
-
-                if (stat & STAT_RNR) {
-                        /* RU went 'not ready' */
-
-                        if (p->scb->status & RU_SUSPEND) {
-                                /* special case: RU_SUSPEND */
-
-                                WAIT_4_SCB_CMD();
-                                p->scb->cmd = RUC_RESUME;
-                                elmc_attn586();
-                        } else {
-                                pr_warning("%s: Receiver-Unit went 'NOT READY': %04x/%04x.\n",
-                                        dev->name, (int) stat, (int) p->scb->status);
-                                elmc_rnr_int(dev);
-                        }
-                }
-                WAIT_4_SCB_CMD();       /* wait for ack. (elmc_xmt_int can be faster than ack!!) */
-                if (p->scb->cmd) {      /* timed out? */
-                        break;
-                }
-        }
-        return IRQ_HANDLED;
-}
-
-/*******************************************************
- * receive-interrupt
- */
-
-static void elmc_rcv_int(struct net_device *dev)
-{
-        int status;
-        unsigned short totlen;
-        struct sk_buff *skb;
-        struct rbd_struct *rbd;
-        struct priv *p = netdev_priv(dev);
-
-        for (; (status = p->rfd_top->status) & STAT_COMPL;) {
-                rbd = (struct rbd_struct *) make32(p->rfd_top->rbd_offset);
-
-                if (status & STAT_OK) {         /* frame received without error? */
-                        if ((totlen = rbd->status) & RBD_LAST) {        /* the first and the last buffer? */
-                                totlen &= RBD_MASK;     /* length of this frame */
-                                rbd->status = 0;
-                                skb = netdev_alloc_skb(dev, totlen + 2);
-                                if (skb != NULL) {
-                                        skb_reserve(skb, 2);    /* 16 byte alignment */
-                                        skb_put(skb,totlen);
-                                        skb_copy_to_linear_data(skb, (char *) p->base+(unsigned long) rbd->buffer,totlen);
-                                        skb->protocol = eth_type_trans(skb, dev);
-                                        netif_rx(skb);
-                                        dev->stats.rx_packets++;
-                                        dev->stats.rx_bytes += totlen;
-                                } else {
-                                        dev->stats.rx_dropped++;
-                                }
-                        } else {
-                                pr_warning("%s: received oversized frame.\n", dev->name);
-                                dev->stats.rx_dropped++;
-                        }
-                } else {        /* frame !(ok), only with 'save-bad-frames' */
-                        pr_warning("%s: oops! rfd-error-status: %04x\n", dev->name, status);
-                        dev->stats.rx_errors++;
-                }
-                p->rfd_top->status = 0;
-                p->rfd_top->last = RFD_SUSP;
-                p->rfd_last->last = 0;  /* delete RU_SUSP  */
-                p->rfd_last = p->rfd_top;
-                p->rfd_top = (struct rfd_struct *) make32(p->rfd_top->next);    /* step to next RFD */
-        }
-}
-
-/**********************************************************
- * handle 'Receiver went not ready'.
- */
-
-static void elmc_rnr_int(struct net_device *dev)
-{
-        struct priv *p = netdev_priv(dev);
-
-        dev->stats.rx_errors++;
-
-        WAIT_4_SCB_CMD();       /* wait for the last cmd */
-        p->scb->cmd = RUC_ABORT;        /* usually the RU is in the 'no resource'-state .. abort it now. */
-        elmc_attn586();
-        WAIT_4_SCB_CMD();       /* wait for accept cmd. */
-
-        alloc_rfa(dev, (char *) p->rfd_first);
-        startrecv586(dev);      /* restart RU */
-
-        pr_warning("%s: Receive-Unit restarted. Status: %04x\n", dev->name, p->scb->status);
-
-}
-
-/**********************************************************
- * handle xmit - interrupt
- */
-
-static void elmc_xmt_int(struct net_device *dev)
-{
-        int status;
-        struct priv *p = netdev_priv(dev);
-
-        status = p->xmit_cmds[p->xmit_last]->cmd_status;
-        if (!(status & STAT_COMPL)) {
-                pr_warning("%s: strange .. xmit-int without a 'COMPLETE'\n", dev->name);
-        }
-        if (status & STAT_OK) {
-                dev->stats.tx_packets++;
-                dev->stats.collisions += (status & TCMD_MAXCOLLMASK);
-        } else {
-                dev->stats.tx_errors++;
-                if (status & TCMD_LATECOLL) {
-                        pr_warning("%s: late collision detected.\n", dev->name);
-                        dev->stats.collisions++;
-                } else if (status & TCMD_NOCARRIER) {
-                        dev->stats.tx_carrier_errors++;
-                        pr_warning("%s: no carrier detected.\n", dev->name);
-                } else if (status & TCMD_LOSTCTS) {
-                        pr_warning("%s: loss of CTS detected.\n", dev->name);
-                } else if (status & TCMD_UNDERRUN) {
-                        dev->stats.tx_fifo_errors++;
-                        pr_warning("%s: DMA underrun detected.\n", dev->name);
-                } else if (status & TCMD_MAXCOLL) {
-                        pr_warning("%s: Max. collisions exceeded.\n", dev->name);
-                        dev->stats.collisions += 16;
-                }
-        }
-
-#if (NUM_XMIT_BUFFS != 1)
-        if ((++p->xmit_last) == NUM_XMIT_BUFFS) {
-                p->xmit_last = 0;
-        }
-#endif
-
-        netif_wake_queue(dev);
-}
-
-/***********************************************************
- * (re)start the receiver
- */
-
-static void startrecv586(struct net_device *dev)
-{
-        struct priv *p = netdev_priv(dev);
-
-        p->scb->rfa_offset = make16(p->rfd_first);
-        p->scb->cmd = RUC_START;
-        elmc_attn586();         /* start cmd. */
-        WAIT_4_SCB_CMD();       /* wait for accept cmd. (no timeout!!) */
-}
-
-/******************************************************
- * timeout
- */
-
-static void elmc_timeout(struct net_device *dev)
-{
-        struct priv *p = netdev_priv(dev);
-        /* COMMAND-UNIT active? */
-        if (p->scb->status & CU_ACTIVE) {
-                pr_debug("%s: strange ... timeout with CU active?!?\n", dev->name);
-                pr_debug("%s: X0: %04x N0: %04x N1: %04x %d\n", dev->name,
-                        (int)p->xmit_cmds[0]->cmd_status,
-                        (int)p->nop_cmds[0]->cmd_status,
-                        (int)p->nop_cmds[1]->cmd_status, (int)p->nop_point);
-                p->scb->cmd = CUC_ABORT;
-                elmc_attn586();
-                WAIT_4_SCB_CMD();
-                p->scb->cbl_offset = make16(p->nop_cmds[p->nop_point]);
-                p->scb->cmd = CUC_START;
-                elmc_attn586();
-                WAIT_4_SCB_CMD();
-                netif_wake_queue(dev);
-        } else {
-                pr_debug("%s: xmitter timed out, try to restart! stat: %04x\n",
-                        dev->name, p->scb->status);
-                pr_debug("%s: command-stats: %04x %04x\n", dev->name,
-                        p->xmit_cmds[0]->cmd_status, p->xmit_cmds[1]->cmd_status);
-                elmc_close(dev);
-                elmc_open(dev);
-        }
-}
-
-/******************************************************
- * send frame
- */
-
-static netdev_tx_t elmc_send_packet(struct sk_buff *skb, struct net_device *dev)
-{
-        int len;
-        int i;
-#ifndef NO_NOPCOMMANDS
-        int next_nop;
-#endif
-        struct priv *p = netdev_priv(dev);
-
-        netif_stop_queue(dev);
-
-        len = (ETH_ZLEN < skb->len) ? skb->len : ETH_ZLEN;
-
-        if (len != skb->len)
-                memset((char *) p->xmit_cbuffs[p->xmit_count], 0, ETH_ZLEN);
-        skb_copy_from_linear_data(skb, (char *) p->xmit_cbuffs[p->xmit_count], skb->len);
-
-#if (NUM_XMIT_BUFFS == 1)
-#ifdef NO_NOPCOMMANDS
-        p->xmit_buffs[0]->size = TBD_LAST | len;
-        for (i = 0; i < 16; i++) {
-                p->scb->cbl_offset = make16(p->xmit_cmds[0]);
-                p->scb->cmd = CUC_START;
-                p->xmit_cmds[0]->cmd_status = 0;
-                        elmc_attn586();
-                if (!i) {
-                        dev_kfree_skb(skb);
-                }
-                WAIT_4_SCB_CMD();
-                if ((p->scb->status & CU_ACTIVE)) {     /* test it, because CU sometimes doesn't start immediately */
-                        break;
-                }
-                if (p->xmit_cmds[0]->cmd_status) {
-                        break;
-                }
-                if (i == 15) {
-                        pr_warning("%s: Can't start transmit-command.\n", dev->name);
-                }
-        }
-#else
-        next_nop = (p->nop_point + 1) & 0x1;
-        p->xmit_buffs[0]->size = TBD_LAST | len;
-
-        p->xmit_cmds[0]->cmd_link = p->nop_cmds[next_nop]->cmd_link
-            = make16((p->nop_cmds[next_nop]));
-        p->xmit_cmds[0]->cmd_status = p->nop_cmds[next_nop]->cmd_status = 0;
-
-        p->nop_cmds[p->nop_point]->cmd_link = make16((p->xmit_cmds[0]));
-        p->nop_point = next_nop;
-        dev_kfree_skb(skb);
-#endif
-#else
-        p->xmit_buffs[p->xmit_count]->size = TBD_LAST | len;
-        if ((next_nop = p->xmit_count + 1) == NUM_XMIT_BUFFS) {
-                next_nop = 0;
-        }
-        p->xmit_cmds[p->xmit_count]->cmd_status = 0;
-        p->xmit_cmds[p->xmit_count]->cmd_link = p->nop_cmds[next_nop]->cmd_link
-            = make16((p->nop_cmds[next_nop]));
-        p->nop_cmds[next_nop]->cmd_status = 0;
-                p->nop_cmds[p->xmit_count]->cmd_link = make16((p->xmit_cmds[p->xmit_count]));
-        p->xmit_count = next_nop;
-        if (p->xmit_count != p->xmit_last)
-                netif_wake_queue(dev);
-        dev_kfree_skb(skb);
-#endif
-        return NETDEV_TX_OK;
-}
-
-/*******************************************
- * Someone wanna have the statistics
- */
-
-static struct net_device_stats *elmc_get_stats(struct net_device *dev)
-{
-        struct priv *p = netdev_priv(dev);
-        unsigned short crc, aln, rsc, ovrn;
-
-        crc = p->scb->crc_errs; /* get error-statistic from the ni82586 */
-        p->scb->crc_errs -= crc;
-        aln = p->scb->aln_errs;
-        p->scb->aln_errs -= aln;
-        rsc = p->scb->rsc_errs;
-        p->scb->rsc_errs -= rsc;
-        ovrn = p->scb->ovrn_errs;
-        p->scb->ovrn_errs -= ovrn;
-
-        dev->stats.rx_crc_errors += crc;
-        dev->stats.rx_fifo_errors += ovrn;
-        dev->stats.rx_frame_errors += aln;
-        dev->stats.rx_dropped += rsc;
-
-        return &dev->stats;
-}
-
-/********************************************************
- * Set MC list ..
- */
-
-#ifdef ELMC_MULTICAST
-static void set_multicast_list(struct net_device *dev)
-{
-        if (!dev->start) {
-                /* without a running interface, promiscuous doesn't work */
-                return;
-        }
-        dev->start = 0;
-        alloc586(dev);
-        init586(dev);
-        startrecv586(dev);
-        dev->start = 1;
-}
-#endif
-
-static void netdev_get_drvinfo(struct net_device *dev,
-                               struct ethtool_drvinfo *info)
-{
-        strcpy(info->driver, DRV_NAME);
-        strcpy(info->version, DRV_VERSION);
-        sprintf(info->bus_info, "MCA 0x%lx", dev->base_addr);
-}
-
-static const struct ethtool_ops netdev_ethtool_ops = {
-        .get_drvinfo            = netdev_get_drvinfo,
-};
-
-#ifdef MODULE
-
-/* Increase if needed ;) */
-#define MAX_3C523_CARDS 4
-
-static struct net_device *dev_elmc[MAX_3C523_CARDS];
-static int irq[MAX_3C523_CARDS];
-static int io[MAX_3C523_CARDS];
-module_param_array(irq, int, NULL, 0);
-module_param_array(io, int, NULL, 0);
-MODULE_PARM_DESC(io, "EtherLink/MC I/O base address(es)");
-MODULE_PARM_DESC(irq, "EtherLink/MC IRQ number(s)");
-MODULE_LICENSE("GPL");
-
-int __init init_module(void)
-{
-        int this_dev,found = 0;
-
-        /* Loop until we either can't find any more cards, or we have MAX_3C523_CARDS */
-        for(this_dev=0; this_dev<MAX_3C523_CARDS; this_dev++) {
-                struct net_device *dev = alloc_etherdev(sizeof(struct priv));
-                if (!dev)
-                        break;
-                dev->irq=irq[this_dev];
-                dev->base_addr=io[this_dev];
-                if (do_elmc_probe(dev) == 0) {
-                        dev_elmc[this_dev] = dev;
-                        found++;
-                        continue;
-                }
-                free_netdev(dev);
-                if (io[this_dev]==0)
-                        break;
-                pr_warning("3c523.c: No 3c523 card found at io=%#x\n",io[this_dev]);
-        }
-
-        if(found==0) {
-                if (io[0]==0)
-                        pr_notice("3c523.c: No 3c523 cards found\n");
-                return -ENXIO;
-        } else return 0;
-}
-
-void __exit cleanup_module(void)
-{
-        int this_dev;
-        for (this_dev=0; this_dev<MAX_3C523_CARDS; this_dev++) {
-                struct net_device *dev = dev_elmc[this_dev];
-                if (dev) {
-                        unregister_netdev(dev);
-                        cleanup_card(dev);
-                        free_netdev(dev);
-                }
-        }
-}
-
-#endif                          /* MODULE */
diff --git a/drivers/net/ethernet/i825xx/3c523.h b/drivers/net/ethernet/i825xx/3c523.h
deleted file mode 100644
index 6956441687b9..000000000000
--- a/drivers/net/ethernet/i825xx/3c523.h
+++ /dev/null
@@ -1,355 +0,0 @@
-#ifndef _3c523_INCLUDE_
-#define _3c523_INCLUDE_
-/*
-        This is basically a hacked version of ni52.h, for the 3c523
-        Etherlink/MC.
-*/
-
-/*
- * Intel i82586 Ethernet definitions
- *
- * This is an extension to the Linux operating system, and is covered by the
- * same GNU General Public License that covers that work.
- *
- * Copyright 1995 by Chris Beauregard (cpbeaure@undergrad.math.uwaterloo.ca)
- *
- * See 3c523.c for details.
- *
- * $Header: /home/chrisb/linux-1.2.13-3c523/drivers/net/RCS/3c523.h,v 1.6 1996/01/20 05:09:00 chrisb Exp chrisb $
- */
-
-/*
- * where to find the System Configuration Pointer (SCP)
- */
-#define SCP_DEFAULT_ADDRESS 0xfffff4
-
-
-/*
- * System Configuration Pointer Struct
- */
-
-struct scp_struct
-{
-  unsigned short zero_dum0;     /* has to be zero */
-  unsigned char  sysbus;        /* 0=16Bit,1=8Bit */
-  unsigned char  zero_dum1;     /* has to be zero for 586 */
-  unsigned short zero_dum2;
-  unsigned short zero_dum3;
-  char          *iscp;          /* pointer to the iscp-block */
-};
-
-
-/*
- * Intermediate System Configuration Pointer (ISCP)
- */
-struct iscp_struct
-{
-  unsigned char  busy;          /* 586 clears after successful init */
-  unsigned char  zero_dummy;    /* hast to be zero */
-  unsigned short scb_offset;    /* pointeroffset to the scb_base */
-  char          *scb_base;      /* base-address of all 16-bit offsets */
-};
-
-/*
- * System Control Block (SCB)
- */
-struct scb_struct
-{
-  unsigned short status;        /* status word */
-  unsigned short cmd;           /* command word */
-  unsigned short cbl_offset;    /* pointeroffset, command block list */
-  unsigned short rfa_offset;    /* pointeroffset, receive frame area */
-  unsigned short crc_errs;      /* CRC-Error counter */
-  unsigned short aln_errs;      /* alignmenterror counter */
-  unsigned short rsc_errs;      /* Resourceerror counter */
-  unsigned short ovrn_errs;     /* OVerrunerror counter */
-};
-
-/*
- * possible command values for the command word
- */
-#define RUC_MASK        0x0070  /* mask for RU commands */
-#define RUC_NOP         0x0000  /* NOP-command */
-#define RUC_START       0x0010  /* start RU */
-#define RUC_RESUME      0x0020  /* resume RU after suspend */
-#define RUC_SUSPEND     0x0030  /* suspend RU */
-#define RUC_ABORT       0x0040  /* abort receiver operation immediately */
-
-#define CUC_MASK        0x0700  /* mask for CU command */
-#define CUC_NOP         0x0000  /* NOP-command */
-#define CUC_START       0x0100  /* start execution of 1. cmd on the CBL */
-#define CUC_RESUME      0x0200  /* resume after suspend */
-#define CUC_SUSPEND     0x0300  /* Suspend CU */
-#define CUC_ABORT       0x0400  /* abort command operation immediately */
-
-#define ACK_MASK        0xf000  /* mask for ACK command */
-#define ACK_CX          0x8000  /* acknowledges STAT_CX */
-#define ACK_FR          0x4000  /* ack. STAT_FR */
-#define ACK_CNA         0x2000  /* ack. STAT_CNA */
-#define ACK_RNR         0x1000  /* ack. STAT_RNR */
-
-/*
- * possible status values for the status word
- */
-#define STAT_MASK       0xf000  /* mask for cause of interrupt */
-#define STAT_CX         0x8000  /* CU finished cmd with its I bit set */
-#define STAT_FR         0x4000  /* RU finished receiving a frame */
-#define STAT_CNA        0x2000  /* CU left active state */
-#define STAT_RNR        0x1000  /* RU left ready state */
-
-#define CU_STATUS       0x700   /* CU status, 0=idle */
-#define CU_SUSPEND      0x100   /* CU is suspended */
-#define CU_ACTIVE       0x200   /* CU is active */
-
-#define RU_STATUS       0x70    /* RU status, 0=idle */
-#define RU_SUSPEND      0x10    /* RU suspended */
-#define RU_NOSPACE      0x20    /* RU no resources */
-#define RU_READY        0x40    /* RU is ready */
-
-/*
- * Receive Frame Descriptor (RFD)
- */
-struct rfd_struct
-{
-  unsigned short status;        /* status word */
-  unsigned short last;          /* Bit15,Last Frame on List / Bit14,suspend */
-  unsigned short next;          /* linkoffset to next RFD */
-  unsigned short rbd_offset;    /* pointeroffset to RBD-buffer */
-  unsigned char  dest[6];       /* ethernet-address, destination */
-  unsigned char  source[6];     /* ethernet-address, source */
-  unsigned short length;        /* 802.3 frame-length */
-  unsigned short zero_dummy;    /* dummy */
-};
-
-#define RFD_LAST     0x8000     /* last: last rfd in the list */
-#define RFD_SUSP     0x4000     /* last: suspend RU after  */
-#define RFD_ERRMASK  0x0fe1     /* status: errormask */
-#define RFD_MATCHADD 0x0002     /* status: Destinationaddress !matches IA */
-#define RFD_RNR      0x0200     /* status: receiver out of resources */
-
-/*
- * Receive Buffer Descriptor (RBD)
- */
-struct rbd_struct
-{
-  unsigned short status;        /* status word,number of used bytes in buff */
-  unsigned short next;          /* pointeroffset to next RBD */
-  char          *buffer;        /* receive buffer address pointer */
-  unsigned short size;          /* size of this buffer */
-  unsigned short zero_dummy;    /* dummy */
-};
-
-#define RBD_LAST        0x8000  /* last buffer */
-#define RBD_USED        0x4000  /* this buffer has data */
-#define RBD_MASK        0x3fff  /* size-mask for length */
-
-/*
- * Statusvalues for Commands/RFD
- */
-#define STAT_COMPL   0x8000     /* status: frame/command is complete */
-#define STAT_BUSY    0x4000     /* status: frame/command is busy */
-#define STAT_OK      0x2000     /* status: frame/command is ok */
-
-/*
- * Action-Commands
- */
-#define CMD_NOP         0x0000  /* NOP */
-#define CMD_IASETUP     0x0001  /* initial address setup command */
-#define CMD_CONFIGURE   0x0002  /* configure command */
-#define CMD_MCSETUP     0x0003  /* MC setup command */
-#define CMD_XMIT        0x0004  /* transmit command */
-#define CMD_TDR         0x0005  /* time domain reflectometer (TDR) command */
-#define CMD_DUMP        0x0006  /* dump command */
-#define CMD_DIAGNOSE    0x0007  /* diagnose command */
-
-/*
- * Action command bits
- */
-#define CMD_LAST        0x8000  /* indicates last command in the CBL */
-#define CMD_SUSPEND     0x4000  /* suspend CU after this CB */
-#define CMD_INT         0x2000  /* generate interrupt after execution */
-
-/*
- * NOP - command
- */
-struct nop_cmd_struct
-{
-  unsigned short cmd_status;    /* status of this command */
-  unsigned short cmd_cmd;       /* the command itself (+bits) */
-  unsigned short cmd_link;      /* offsetpointer to next command */
-};
-
-/*
- * IA Setup command
- */
-struct iasetup_cmd_struct
-{
-  unsigned short cmd_status;
-  unsigned short cmd_cmd;
-  unsigned short cmd_link;
-  unsigned char  iaddr[6];
-};
-
-/*
- * Configure command
- */
-struct configure_cmd_struct
-{
-  unsigned short cmd_status;
-  unsigned short cmd_cmd;
-  unsigned short cmd_link;
-  unsigned char  byte_cnt;   /* size of the config-cmd */
-  unsigned char  fifo;       /* fifo/recv monitor */
-  unsigned char  sav_bf;     /* save bad frames (bit7=1)*/
-  unsigned char  adr_len;    /* adr_len(0-2),al_loc(3),pream(4-5),loopbak(6-7)*/
-  unsigned char  priority;   /* lin_prio(0-2),exp_prio(4-6),bof_metd(7) */
-  unsigned char  ifs;        /* inter frame spacing */
-  unsigned char  time_low;   /* slot time low */
-  unsigned char  time_high;  /* slot time high(0-2) and max. retries(4-7) */
-  unsigned char  promisc;    /* promisc-mode(0) , et al (1-7) */
-  unsigned char  carr_coll;  /* carrier(0-3)/collision(4-7) stuff */
-  unsigned char  fram_len;   /* minimal frame len */
-  unsigned char  dummy;      /* dummy */
-};
-
-/*
- * Multicast Setup command
- */
-struct mcsetup_cmd_struct
-{
-  unsigned short cmd_status;
-  unsigned short cmd_cmd;
-  unsigned short cmd_link;
-  unsigned short mc_cnt;                /* number of bytes in the MC-List */
-  unsigned char  mc_list[0][6];         /* pointer to 6 bytes entries */
-};
-
-/*
- * transmit command
- */
-struct transmit_cmd_struct
-{
-  unsigned short cmd_status;
-  unsigned short cmd_cmd;
-  unsigned short cmd_link;
-  unsigned short tbd_offset;    /* pointeroffset to TBD */
-  unsigned char  dest[6];       /* destination address of the frame */
-  unsigned short length;        /* user defined: 802.3 length / Ether type */
-};
-
-#define TCMD_ERRMASK     0x0fa0
-#define TCMD_MAXCOLLMASK 0x000f
-#define TCMD_MAXCOLL     0x0020
-#define TCMD_HEARTBEAT   0x0040
-#define TCMD_DEFERRED    0x0080
-#define TCMD_UNDERRUN    0x0100
-#define TCMD_LOSTCTS     0x0200
-#define TCMD_NOCARRIER   0x0400
-#define TCMD_LATECOLL    0x0800
-
-struct tdr_cmd_struct
-{
-  unsigned short cmd_status;
-  unsigned short cmd_cmd;
-  unsigned short cmd_link;
-  unsigned short status;
-};
-
-#define TDR_LNK_OK      0x8000  /* No link problem identified */
-#define TDR_XCVR_PRB    0x4000  /* indicates a transceiver problem */
-#define TDR_ET_OPN      0x2000  /* open, no correct termination */
-#define TDR_ET_SRT      0x1000  /* TDR detected a short circuit */
-#define TDR_TIMEMASK    0x07ff  /* mask for the time field */
-
-/*
- * Transmit Buffer Descriptor (TBD)
- */
-struct tbd_struct
-{
-  unsigned short size;          /* size + EOF-Flag(15) */
-  unsigned short next;          /* pointeroffset to next TBD */
-  char          *buffer;        /* pointer to buffer */
-};
-
-#define TBD_LAST 0x8000         /* EOF-Flag, indicates last buffer in list */
-
-/*************************************************************************/
-/*
-Verbatim from the Crynwyr stuff:
-
-    The 3c523 responds with adapter code 0x6042 at slot
-registers xxx0 and xxx1.  The setup register is at xxx2 and
-contains the following bits:
-
-0: card enable
-2,1: csr address select
-    00 = 0300
-    01 = 1300
-    10 = 2300
-    11 = 3300
-4,3: shared memory address select
-    00 = 0c0000
-    01 = 0c8000
-    10 = 0d0000
-    11 = 0d8000
-5: set to disable on-board thinnet
-7,6: (read-only) shows selected irq
-    00 = 12
-    01 = 7
-    10 = 3
-    11 = 9
-
-The interrupt-select register is at xxx3 and uses one bit per irq.
-
-0: int 12
-1: int 7
-2: int 3
-3: int 9
-
-    Again, the documentation stresses that the setup register
-should never be written.  The interrupt-select register may be
-written with the value corresponding to bits 7.6 in
-the setup register to insure corret setup.
-*/
-
-/* Offsets from the base I/O address. */
-#define ELMC_SA         0       /* first 6 bytes are IEEE network address */
-#define ELMC_CTRL       6       /* control & status register */
-#define ELMC_REVISION   7       /* revision register, first 4 bits only */
-#define ELMC_IO_EXTENT  8
-
-/* these are the bit selects for the port register 2 */
-#define ELMC_STATUS_ENABLED     0x01
-#define ELMC_STATUS_CSR_SELECT  0x06
-#define ELMC_STATUS_MEMORY_SELECT       0x18
-#define ELMC_STATUS_DISABLE_THIN        0x20
-#define ELMC_STATUS_IRQ_SELECT  0xc0
-
-/* this is the card id used in the detection code.  You might recognize
-it from @6042.adf */
-#define ELMC_MCA_ID 0x6042
-
-/*
-   The following define the bits for the control & status register
-
-   The bank select registers can be used if more than 16K of memory is
-   on the card.  For some stupid reason, bank 3 is the one for the
-   bottom 16K, and the card defaults to bank 0.  So we have to set the
-   bank to 3 before the card will even think of operating.  To get bank
-   3, set BS0 and BS1 to high (of course...)
-*/
-#define ELMC_CTRL_BS0   0x01    /* RW bank select */
-#define ELMC_CTRL_BS1   0x02    /* RW bank select */
-#define ELMC_CTRL_INTE  0x04    /* RW interrupt enable, assert high */
-#define ELMC_CTRL_INT   0x08    /* R interrupt active, assert high */
-/*#define ELMC_CTRL_*   0x10*/  /* reserved */
-#define ELMC_CTRL_LBK   0x20    /* RW loopback enable, assert high */
-#define ELMC_CTRL_CA    0x40    /* RW channel attention, assert high */
-#define ELMC_CTRL_RST   0x80    /* RW 82586 reset, assert low */
-
-/* some handy compound bits */
-
-/* normal operation should have bank 3 and RST high, ints enabled */
-#define ELMC_NORMAL (ELMC_CTRL_INTE|ELMC_CTRL_RST|0x3)
-
-#endif /* _3c523_INCLUDE_ */
diff --git a/drivers/net/ethernet/i825xx/3c527.c b/drivers/net/ethernet/i825xx/3c527.c
deleted file mode 100644
index 278e791afe00..000000000000
--- a/drivers/net/ethernet/i825xx/3c527.c
+++ /dev/null
@@ -1,1660 +0,0 @@
-/* 3c527.c: 3Com Etherlink/MC32 driver for Linux 2.4 and 2.6.
- *
- *      (c) Copyright 1998 Red Hat Software Inc
- *      Written by Alan Cox.
- *      Further debugging by Carl Drougge.
- *      Initial SMP support by Felipe W Damasio <felipewd@terra.com.br>
- *      Heavily modified by Richard Procter <rnp@paradise.net.nz>
- *
- *      Based on skeleton.c written 1993-94 by Donald Becker and ne2.c
- *      (for the MCA stuff) written by Wim Dumon.
- *
- *      Thanks to 3Com for making this possible by providing me with the
- *      documentation.
- *
- *      This software may be used and distributed according to the terms
- *      of the GNU General Public License, incorporated herein by reference.
- *
- */
-
-#define DRV_NAME                "3c527"
-#define DRV_VERSION             "0.7-SMP"
-#define DRV_RELDATE             "2003/09/21"
-
-static const char *version =
-DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Richard Procter <rnp@paradise.net.nz>\n";
-
-/**
- * DOC: Traps for the unwary
- *
- *      The diagram (Figure 1-1) and the POS summary disagree with the
- *      "Interrupt Level" section in the manual.
- *
- *      The manual contradicts itself when describing the minimum number
- *      buffers in the 'configure lists' command.
- *      My card accepts a buffer config of 4/4.
- *
- *      Setting the SAV BP bit does not save bad packets, but
- *      only enables RX on-card stats collection.
- *
- *      The documentation in places seems to miss things. In actual fact
- *      I've always eventually found everything is documented, it just
- *      requires careful study.
- *
- * DOC: Theory Of Operation
- *
- *      The 3com 3c527 is a 32bit MCA bus mastering adapter with a large
- *      amount of on board intelligence that housekeeps a somewhat dumber
- *      Intel NIC. For performance we want to keep the transmit queue deep
- *      as the card can transmit packets while fetching others from main
- *      memory by bus master DMA. Transmission and reception are driven by
- *      circular buffer queues.
- *
- *      The mailboxes can be used for controlling how the card traverses
- *      its buffer rings, but are used only for initial setup in this
- *      implementation.  The exec mailbox allows a variety of commands to
- *      be executed. Each command must complete before the next is
- *      executed. Primarily we use the exec mailbox for controlling the
- *      multicast lists.  We have to do a certain amount of interesting
- *      hoop jumping as the multicast list changes can occur in interrupt
- *      state when the card has an exec command pending. We defer such
- *      events until the command completion interrupt.
- *
- *      A copy break scheme (taken from 3c59x.c) is employed whereby
- *      received frames exceeding a configurable length are passed
- *      directly to the higher networking layers without incuring a copy,
- *      in what amounts to a time/space trade-off.
- *
- *      The card also keeps a large amount of statistical information
- *      on-board. In a perfect world, these could be used safely at no
- *      cost. However, lacking information to the contrary, processing
- *      them without races would involve so much extra complexity as to
- *      make it unworthwhile to do so. In the end, a hybrid SW/HW
- *      implementation was made necessary --- see mc32_update_stats().
- *
- * DOC: Notes
- *
- *      It should be possible to use two or more cards, but at this stage
- *      only by loading two copies of the same module.
- *
- *      The on-board 82586 NIC has trouble receiving multiple
- *      back-to-back frames and so is likely to drop packets from fast
- *      senders.
-**/
-
-#include <linux/module.h>
-
-#include <linux/errno.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/if_ether.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/fcntl.h>
-#include <linux/interrupt.h>
-#include <linux/mca-legacy.h>
-#include <linux/ioport.h>
-#include <linux/in.h>
-#include <linux/skbuff.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/wait.h>
-#include <linux/ethtool.h>
-#include <linux/completion.h>
-#include <linux/bitops.h>
-#include <linux/semaphore.h>
-
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include <asm/dma.h>
-
-#include "3c527.h"
-
-MODULE_LICENSE("GPL");
-
-/*
- * The name of the card. Is used for messages and in the requests for
- * io regions, irqs and dma channels
- */
-static const char* cardname = DRV_NAME;
-
-/* use 0 for production, 1 for verification, >2 for debug */
-#ifndef NET_DEBUG
-#define NET_DEBUG 2
-#endif
-
-static unsigned int mc32_debug = NET_DEBUG;
-
-/* The number of low I/O ports used by the ethercard. */
-#define MC32_IO_EXTENT  8
-
-/* As implemented, values must be a power-of-2 -- 4/8/16/32 */
-#define TX_RING_LEN     32       /* Typically the card supports 37  */
-#define RX_RING_LEN     8        /*     "       "        "          */
-
-/* Copy break point, see above for details.
- * Setting to > 1512 effectively disables this feature. */
-#define RX_COPYBREAK    200      /* Value from 3c59x.c */
-
-/* Issue the 82586 workaround command - this is for "busy lans", but
- * basically means for all lans now days - has a performance (latency)
- * cost, but best set. */
-static const int WORKAROUND_82586=1;
-
-/* Pointers to buffers and their on-card records */
-struct mc32_ring_desc
-{
-        volatile struct skb_header *p;
-        struct sk_buff *skb;
-};
-
-/* Information that needs to be kept for each board. */
-struct mc32_local
-{
-        int slot;
-
-        u32 base;
-        volatile struct mc32_mailbox *rx_box;
-        volatile struct mc32_mailbox *tx_box;
-        volatile struct mc32_mailbox *exec_box;
-        volatile struct mc32_stats *stats;    /* Start of on-card statistics */
-        u16 tx_chain;           /* Transmit list start offset */
-        u16 rx_chain;           /* Receive list start offset */
-        u16 tx_len;             /* Transmit list count */
-        u16 rx_len;             /* Receive list count */
-
-        u16 xceiver_desired_state; /* HALTED or RUNNING */
-        u16 cmd_nonblocking;    /* Thread is uninterested in command result */
-        u16 mc_reload_wait;     /* A multicast load request is pending */
-        u32 mc_list_valid;      /* True when the mclist is set */
-
-        struct mc32_ring_desc tx_ring[TX_RING_LEN];     /* Host Transmit ring */
-        struct mc32_ring_desc rx_ring[RX_RING_LEN];     /* Host Receive ring */
-
-        atomic_t tx_count;      /* buffers left */
-        atomic_t tx_ring_head;  /* index to tx en-queue end */
-        u16 tx_ring_tail;       /* index to tx de-queue end */
-
-        u16 rx_ring_tail;       /* index to rx de-queue end */
-
-        struct semaphore cmd_mutex;    /* Serialises issuing of execute commands */
-        struct completion execution_cmd; /* Card has completed an execute command */
-        struct completion xceiver_cmd;   /* Card has completed a tx or rx command */
-};
-
-/* The station (ethernet) address prefix, used for a sanity check. */
-#define SA_ADDR0 0x02
-#define SA_ADDR1 0x60
-#define SA_ADDR2 0xAC
-
-struct mca_adapters_t {
-        unsigned int    id;
-        char            *name;
-};
-
-static const struct mca_adapters_t mc32_adapters[] = {
-        { 0x0041, "3COM EtherLink MC/32" },
-        { 0x8EF5, "IBM High Performance Lan Adapter" },
-        { 0x0000, NULL }
-};
-
-
-/* Macros for ring index manipulations */
-static inline u16 next_rx(u16 rx) { return (rx+1)&(RX_RING_LEN-1); };
-static inline u16 prev_rx(u16 rx) { return (rx-1)&(RX_RING_LEN-1); };
-
-static inline u16 next_tx(u16 tx) { return (tx+1)&(TX_RING_LEN-1); };
-
-
-/* Index to functions, as function prototypes. */
-static int      mc32_probe1(struct net_device *dev, int ioaddr);
-static int      mc32_command(struct net_device *dev, u16 cmd, void *data, int len);
-static int      mc32_open(struct net_device *dev);
-static void     mc32_timeout(struct net_device *dev);
-static netdev_tx_t mc32_send_packet(struct sk_buff *skb,
-                                    struct net_device *dev);
-static irqreturn_t mc32_interrupt(int irq, void *dev_id);
-static int      mc32_close(struct net_device *dev);
-static struct   net_device_stats *mc32_get_stats(struct net_device *dev);
-static void     mc32_set_multicast_list(struct net_device *dev);
-static void     mc32_reset_multicast_list(struct net_device *dev);
-static const struct ethtool_ops netdev_ethtool_ops;
-
-static void cleanup_card(struct net_device *dev)
-{
-        struct mc32_local *lp = netdev_priv(dev);
-        unsigned slot = lp->slot;
-        mca_mark_as_unused(slot);
-        mca_set_adapter_name(slot, NULL);
-        free_irq(dev->irq, dev);
-        release_region(dev->base_addr, MC32_IO_EXTENT);
-}
-
-/**
- * mc32_probe   -       Search for supported boards
- * @unit: interface number to use
- *
- * Because MCA bus is a real bus and we can scan for cards we could do a
- * single scan for all boards here. Right now we use the passed in device
- * structure and scan for only one board. This needs fixing for modules
- * in particular.
- */
-
-struct net_device *__init mc32_probe(int unit)
-{
-        struct net_device *dev = alloc_etherdev(sizeof(struct mc32_local));
-        static int current_mca_slot = -1;
-        int i;
-        int err;
-
-        if (!dev)
-                return ERR_PTR(-ENOMEM);
-
-        if (unit >= 0)
-                sprintf(dev->name, "eth%d", unit);
-
-        /* Do not check any supplied i/o locations.
-           POS registers usually don't fail :) */
-
-        /* MCA cards have POS registers.
-           Autodetecting MCA cards is extremely simple.
-           Just search for the card. */
-
-        for(i = 0; (mc32_adapters[i].name != NULL); i++) {
-                current_mca_slot =
-                        mca_find_unused_adapter(mc32_adapters[i].id, 0);
-
-                if(current_mca_slot != MCA_NOTFOUND) {
-                        if(!mc32_probe1(dev, current_mca_slot))
-                        {
-                                mca_set_adapter_name(current_mca_slot,
-                                                mc32_adapters[i].name);
-                                mca_mark_as_used(current_mca_slot);
-                                err = register_netdev(dev);
-                                if (err) {
-                                        cleanup_card(dev);
-                                        free_netdev(dev);
-                                        dev = ERR_PTR(err);
-                                }
-                                return dev;
-                        }
-
-                }
-        }
-        free_netdev(dev);
-        return ERR_PTR(-ENODEV);
-}
-
-static const struct net_device_ops netdev_ops = {
-        .ndo_open               = mc32_open,
-        .ndo_stop               = mc32_close,
-        .ndo_start_xmit         = mc32_send_packet,
-        .ndo_get_stats          = mc32_get_stats,
-        .ndo_set_rx_mode        = mc32_set_multicast_list,
-        .ndo_tx_timeout         = mc32_timeout,
-        .ndo_change_mtu         = eth_change_mtu,
-        .ndo_set_mac_address    = eth_mac_addr,
-        .ndo_validate_addr      = eth_validate_addr,
-};
-
-/**
- * mc32_probe1  -       Check a given slot for a board and test the card
- * @dev:  Device structure to fill in
- * @slot: The MCA bus slot being used by this card
- *
- * Decode the slot data and configure the card structures. Having done this we
- * can reset the card and configure it. The card does a full self test cycle
- * in firmware so we have to wait for it to return and post us either a
- * failure case or some addresses we use to find the board internals.
- */
-
-static int __init mc32_probe1(struct net_device *dev, int slot)
-{
-        static unsigned version_printed;
-        int i, err;
-        u8 POS;
-        u32 base;
-        struct mc32_local *lp = netdev_priv(dev);
-        static const u16 mca_io_bases[] = {
-                0x7280,0x7290,
-                0x7680,0x7690,
-                0x7A80,0x7A90,
-                0x7E80,0x7E90
-        };
-        static const u32 mca_mem_bases[] = {
-                0x00C0000,
-                0x00C4000,
-                0x00C8000,
-                0x00CC000,
-                0x00D0000,
-                0x00D4000,
-                0x00D8000,
-                0x00DC000
-        };
-        static const char * const failures[] = {
-                "Processor instruction",
-                "Processor data bus",
-                "Processor data bus",
-                "Processor data bus",
-                "Adapter bus",
-                "ROM checksum",
-                "Base RAM",
-                "Extended RAM",
-                "82586 internal loopback",
-                "82586 initialisation failure",
-                "Adapter list configuration error"
-        };
-
-        /* Time to play MCA games */
-
-        if (mc32_debug  &&  version_printed++ == 0)
-                pr_debug("%s", version);
-
-        pr_info("%s: %s found in slot %d: ", dev->name, cardname, slot);
-
-        POS = mca_read_stored_pos(slot, 2);
-
-        if(!(POS&1))
-        {
-                pr_cont("disabled.\n");
-                return -ENODEV;
-        }
-
-        /* Fill in the 'dev' fields. */
-        dev->base_addr = mca_io_bases[(POS>>1)&7];
-        dev->mem_start = mca_mem_bases[(POS>>4)&7];
-
-        POS = mca_read_stored_pos(slot, 4);
-        if(!(POS&1))
-        {
-                pr_cont("memory window disabled.\n");
-                return -ENODEV;
-        }
-
-        POS = mca_read_stored_pos(slot, 5);
-
-        i=(POS>>4)&3;
-        if(i==3)
-        {
-                pr_cont("invalid memory window.\n");
-                return -ENODEV;
-        }
-
-        i*=16384;
-        i+=16384;
-
-        dev->mem_end=dev->mem_start + i;
-
-        dev->irq = ((POS>>2)&3)+9;
-
-        if(!request_region(dev->base_addr, MC32_IO_EXTENT, cardname))
-        {
-                pr_cont("io 0x%3lX, which is busy.\n", dev->base_addr);
-                return -EBUSY;
-        }
-
-        pr_cont("io 0x%3lX irq %d mem 0x%lX (%dK)\n",
-                dev->base_addr, dev->irq, dev->mem_start, i/1024);
-
-
-        /* We ought to set the cache line size here.. */
-
-
-        /*
-         *      Go PROM browsing
-         */
-
-        /* Retrieve and print the ethernet address. */
-        for (i = 0; i < 6; i++)
-        {
-                mca_write_pos(slot, 6, i+12);
-                mca_write_pos(slot, 7, 0);
-
-                dev->dev_addr[i] = mca_read_pos(slot,3);
-        }
-
-        pr_info("%s: Address %pM ", dev->name, dev->dev_addr);
-
-        mca_write_pos(slot, 6, 0);
-        mca_write_pos(slot, 7, 0);
-
-        POS = mca_read_stored_pos(slot, 4);
-
-        if(POS&2)
-                pr_cont(": BNC port selected.\n");
-        else
-                pr_cont(": AUI port selected.\n");
-
-        POS=inb(dev->base_addr+HOST_CTRL);
-        POS|=HOST_CTRL_ATTN|HOST_CTRL_RESET;
-        POS&=~HOST_CTRL_INTE;
-        outb(POS, dev->base_addr+HOST_CTRL);
-        /* Reset adapter */
-        udelay(100);
-        /* Reset off */
-        POS&=~(HOST_CTRL_ATTN|HOST_CTRL_RESET);
-        outb(POS, dev->base_addr+HOST_CTRL);
-
-        udelay(300);
-
-        /*
-         *      Grab the IRQ
-         */
-
-        err = request_irq(dev->irq, mc32_interrupt, IRQF_SHARED, DRV_NAME, dev);
-        if (err) {
-                release_region(dev->base_addr, MC32_IO_EXTENT);
-                pr_err("%s: unable to get IRQ %d.\n", DRV_NAME, dev->irq);
-                goto err_exit_ports;
-        }
-
-        memset(lp, 0, sizeof(struct mc32_local));
-        lp->slot = slot;
-
-        i=0;
-
-        base = inb(dev->base_addr);
-
-        while(base == 0xFF)
-        {
-                i++;
-                if(i == 1000)
-                {
-                        pr_err("%s: failed to boot adapter.\n", dev->name);
-                        err = -ENODEV;
-                        goto err_exit_irq;
-                }
-                udelay(1000);
-                if(inb(dev->base_addr+2)&(1<<5))
-                        base = inb(dev->base_addr);
-        }
-
-        if(base>0)
-        {
-                if(base < 0x0C)
-                        pr_err("%s: %s%s.\n", dev->name, failures[base-1],
-                                base<0x0A?" test failure":"");
-                else
-                        pr_err("%s: unknown failure %d.\n", dev->name, base);
-                err = -ENODEV;
-                goto err_exit_irq;
-        }
-
-        base=0;
-        for(i=0;i<4;i++)
-        {
-                int n=0;
-
-                while(!(inb(dev->base_addr+2)&(1<<5)))
-                {
-                        n++;
-                        udelay(50);
-                        if(n>100)
-                        {
-                                pr_err("%s: mailbox read fail (%d).\n", dev->name, i);
-                                err = -ENODEV;
-                                goto err_exit_irq;
-                        }
-                }
-
-                base|=(inb(dev->base_addr)<<(8*i));
-        }
-
-        lp->exec_box=isa_bus_to_virt(dev->mem_start+base);
-
-        base=lp->exec_box->data[1]<<16|lp->exec_box->data[0];
-
-        lp->base = dev->mem_start+base;
-
-        lp->rx_box=isa_bus_to_virt(lp->base + lp->exec_box->data[2]);
-        lp->tx_box=isa_bus_to_virt(lp->base + lp->exec_box->data[3]);
-
-        lp->stats = isa_bus_to_virt(lp->base + lp->exec_box->data[5]);
-
-        /*
-         *      Descriptor chains (card relative)
-         */
-
-        lp->tx_chain            = lp->exec_box->data[8];   /* Transmit list start offset */
-        lp->rx_chain            = lp->exec_box->data[10];  /* Receive list start offset */
-        lp->tx_len              = lp->exec_box->data[9];   /* Transmit list count */
-        lp->rx_len              = lp->exec_box->data[11];  /* Receive list count */
-
-        sema_init(&lp->cmd_mutex, 0);
-        init_completion(&lp->execution_cmd);
-        init_completion(&lp->xceiver_cmd);
-
-        pr_info("%s: Firmware Rev %d. %d RX buffers, %d TX buffers. Base of 0x%08X.\n",
-                dev->name, lp->exec_box->data[12], lp->rx_len, lp->tx_len, lp->base);
-
-        dev->netdev_ops         = &netdev_ops;
-        dev->watchdog_timeo     = HZ*5; /* Board does all the work */
-        dev->ethtool_ops        = &netdev_ethtool_ops;
-
-        return 0;
-
-err_exit_irq:
-        free_irq(dev->irq, dev);
-err_exit_ports:
-        release_region(dev->base_addr, MC32_IO_EXTENT);
-        return err;
-}
-
-
-/**
- *      mc32_ready_poll         -       wait until we can feed it a command
- *      @dev:   The device to wait for
- *
- *      Wait until the card becomes ready to accept a command via the
- *      command register. This tells us nothing about the completion
- *      status of any pending commands and takes very little time at all.
- */
-
-static inline void mc32_ready_poll(struct net_device *dev)
-{
-        int ioaddr = dev->base_addr;
-        while(!(inb(ioaddr+HOST_STATUS)&HOST_STATUS_CRR));
-}
-
-
-/**
- *      mc32_command_nowait     -       send a command non blocking
- *      @dev: The 3c527 to issue the command to
- *      @cmd: The command word to write to the mailbox
- *      @data: A data block if the command expects one
- *      @len: Length of the data block
- *
- *      Send a command from interrupt state. If there is a command
- *      currently being executed then we return an error of -1. It
- *      simply isn't viable to wait around as commands may be
- *      slow. This can theoretically be starved on SMP, but it's hard
- *      to see a realistic situation.  We do not wait for the command
- *      to complete --- we rely on the interrupt handler to tidy up
- *      after us.
- */
-
-static int mc32_command_nowait(struct net_device *dev, u16 cmd, void *data, int len)
-{
-        struct mc32_local *lp = netdev_priv(dev);
-        int ioaddr = dev->base_addr;
-        int ret = -1;
-
-        if (down_trylock(&lp->cmd_mutex) == 0)
-        {
-                lp->cmd_nonblocking=1;
-                lp->exec_box->mbox=0;
-                lp->exec_box->mbox=cmd;
-                memcpy((void *)lp->exec_box->data, data, len);
-                barrier();      /* the memcpy forgot the volatile so be sure */
-
-                /* Send the command */
-                mc32_ready_poll(dev);
-                outb(1<<6, ioaddr+HOST_CMD);
-
-                ret = 0;
-
-                /* Interrupt handler will signal mutex on completion */
-        }
-
-        return ret;
-}
-
-
-/**
- *      mc32_command    -       send a command and sleep until completion
- *      @dev: The 3c527 card to issue the command to
- *      @cmd: The command word to write to the mailbox
- *      @data: A data block if the command expects one
- *      @len: Length of the data block
- *
- *      Sends exec commands in a user context. This permits us to wait around
- *      for the replies and also to wait for the command buffer to complete
- *      from a previous command before we execute our command. After our
- *      command completes we will attempt any pending multicast reload
- *      we blocked off by hogging the exec buffer.
- *
- *      You feed the card a command, you wait, it interrupts you get a
- *      reply. All well and good. The complication arises because you use
- *      commands for filter list changes which come in at bh level from things
- *      like IPV6 group stuff.
- */
-
-static int mc32_command(struct net_device *dev, u16 cmd, void *data, int len)
-{
-        struct mc32_local *lp = netdev_priv(dev);
-        int ioaddr = dev->base_addr;
-        int ret = 0;
-
-        down(&lp->cmd_mutex);
-
-        /*
-         *     My Turn
-         */
-
-        lp->cmd_nonblocking=0;
-        lp->exec_box->mbox=0;
-        lp->exec_box->mbox=cmd;
-        memcpy((void *)lp->exec_box->data, data, len);
-        barrier();      /* the memcpy forgot the volatile so be sure */
-
-        mc32_ready_poll(dev);
-        outb(1<<6, ioaddr+HOST_CMD);
-
-        wait_for_completion(&lp->execution_cmd);
-
-        if(lp->exec_box->mbox&(1<<13))
-                ret = -1;
-
-        up(&lp->cmd_mutex);
-
-        /*
-         *      A multicast set got blocked - try it now
-         */
-
-        if(lp->mc_reload_wait)
-        {
-                mc32_reset_multicast_list(dev);
-        }
-
-        return ret;
-}
-
-
-/**
- *      mc32_start_transceiver  -       tell board to restart tx/rx
- *      @dev: The 3c527 card to issue the command to
- *
- *      This may be called from the interrupt state, where it is used
- *      to restart the rx ring if the card runs out of rx buffers.
- *
- *      We must first check if it's ok to (re)start the transceiver. See
- *      mc32_close for details.
- */
-
-static void mc32_start_transceiver(struct net_device *dev) {
-
-        struct mc32_local *lp = netdev_priv(dev);
-        int ioaddr = dev->base_addr;
-
-        /* Ignore RX overflow on device closure */
-        if (lp->xceiver_desired_state==HALTED)
-                return;
-
-        /* Give the card the offset to the post-EOL-bit RX descriptor */
-        mc32_ready_poll(dev);
-        lp->rx_box->mbox=0;
-        lp->rx_box->data[0]=lp->rx_ring[prev_rx(lp->rx_ring_tail)].p->next;
-        outb(HOST_CMD_START_RX, ioaddr+HOST_CMD);
-
-        mc32_ready_poll(dev);
-        lp->tx_box->mbox=0;
-        outb(HOST_CMD_RESTRT_TX, ioaddr+HOST_CMD);   /* card ignores this on RX restart */
-
-        /* We are not interrupted on start completion */
-}
-
-
-/**
- *      mc32_halt_transceiver   -       tell board to stop tx/rx
- *      @dev: The 3c527 card to issue the command to
- *
- *      We issue the commands to halt the card's transceiver. In fact,
- *      after some experimenting we now simply tell the card to
- *      suspend. When issuing aborts occasionally odd things happened.
- *
- *      We then sleep until the card has notified us that both rx and
- *      tx have been suspended.
- */
-
-static void mc32_halt_transceiver(struct net_device *dev)
-{
-        struct mc32_local *lp = netdev_priv(dev);
-        int ioaddr = dev->base_addr;
-
-        mc32_ready_poll(dev);
-        lp->rx_box->mbox=0;
-        outb(HOST_CMD_SUSPND_RX, ioaddr+HOST_CMD);
-        wait_for_completion(&lp->xceiver_cmd);
-
-        mc32_ready_poll(dev);
-        lp->tx_box->mbox=0;
-        outb(HOST_CMD_SUSPND_TX, ioaddr+HOST_CMD);
-        wait_for_completion(&lp->xceiver_cmd);
-}
-
-
-/**
- *      mc32_load_rx_ring       -       load the ring of receive buffers
- *      @dev: 3c527 to build the ring for
- *
- *      This initialises the on-card and driver datastructures to
- *      the point where mc32_start_transceiver() can be called.
- *
- *      The card sets up the receive ring for us. We are required to use the
- *      ring it provides, although the size of the ring is configurable.
- *
- *      We allocate an sk_buff for each ring entry in turn and
- *      initialise its house-keeping info. At the same time, we read
- *      each 'next' pointer in our rx_ring array. This reduces slow
- *      shared-memory reads and makes it easy to access predecessor
- *      descriptors.
- *
- *      We then set the end-of-list bit for the last entry so that the
- *      card will know when it has run out of buffers.
- */
-
-static int mc32_load_rx_ring(struct net_device *dev)
-{
-        struct mc32_local *lp = netdev_priv(dev);
-        int i;
-        u16 rx_base;
-        volatile struct skb_header *p;
-
-        rx_base=lp->rx_chain;
-
-        for(i=0; i<RX_RING_LEN; i++) {
-                lp->rx_ring[i].skb=alloc_skb(1532, GFP_KERNEL);
-                if (lp->rx_ring[i].skb==NULL) {
-                        for (;i>=0;i--)
-                                kfree_skb(lp->rx_ring[i].skb);
-                        return -ENOBUFS;
-                }
-                skb_reserve(lp->rx_ring[i].skb, 18);
-
-                p=isa_bus_to_virt(lp->base+rx_base);
-
-                p->control=0;
-                p->data=isa_virt_to_bus(lp->rx_ring[i].skb->data);
-                p->status=0;
-                p->length=1532;
-
-                lp->rx_ring[i].p=p;
-                rx_base=p->next;
-        }
-
-        lp->rx_ring[i-1].p->control |= CONTROL_EOL;
-
-        lp->rx_ring_tail=0;
-
-        return 0;
-}
-
-
-/**
- *      mc32_flush_rx_ring      -       free the ring of receive buffers
- *      @lp: Local data of 3c527 to flush the rx ring of
- *
- *      Free the buffer for each ring slot. This may be called
- *      before mc32_load_rx_ring(), eg. on error in mc32_open().
- *      Requires rx skb pointers to point to a valid skb, or NULL.
- */
-
-static void mc32_flush_rx_ring(struct net_device *dev)
-{
-        struct mc32_local *lp = netdev_priv(dev);
-        int i;
-
-        for(i=0; i < RX_RING_LEN; i++)
-        {
-                if (lp->rx_ring[i].skb) {
-                        dev_kfree_skb(lp->rx_ring[i].skb);
-                        lp->rx_ring[i].skb = NULL;
-                }
-                lp->rx_ring[i].p=NULL;
-        }
-}
-
-
-/**
- *      mc32_load_tx_ring       -       load transmit ring
- *      @dev: The 3c527 card to issue the command to
- *
- *      This sets up the host transmit data-structures.
- *
- *      First, we obtain from the card it's current position in the tx
- *      ring, so that we will know where to begin transmitting
- *      packets.
- *
- *      Then, we read the 'next' pointers from the on-card tx ring into
- *      our tx_ring array to reduce slow shared-mem reads. Finally, we
- *      intitalise the tx house keeping variables.
- *
- */
-
-static void mc32_load_tx_ring(struct net_device *dev)
-{
-        struct mc32_local *lp = netdev_priv(dev);
-        volatile struct skb_header *p;
-        int i;
-        u16 tx_base;
-
-        tx_base=lp->tx_box->data[0];
-
-        for(i=0 ; i<TX_RING_LEN ; i++)
-        {
-                p=isa_bus_to_virt(lp->base+tx_base);
-                lp->tx_ring[i].p=p;
-                lp->tx_ring[i].skb=NULL;
-
-                tx_base=p->next;
-        }
-
-        /* -1 so that tx_ring_head cannot "lap" tx_ring_tail */
-        /* see mc32_tx_ring */
-
-        atomic_set(&lp->tx_count, TX_RING_LEN-1);
-        atomic_set(&lp->tx_ring_head, 0);
-        lp->tx_ring_tail=0;
-}
-
-
-/**
- *      mc32_flush_tx_ring      -       free transmit ring
- *      @lp: Local data of 3c527 to flush the tx ring of
- *
- *      If the ring is non-empty, zip over the it, freeing any
- *      allocated skb_buffs.  The tx ring house-keeping variables are
- *      then reset. Requires rx skb pointers to point to a valid skb,
- *      or NULL.
- */
-
-static void mc32_flush_tx_ring(struct net_device *dev)
-{
-        struct mc32_local *lp = netdev_priv(dev);
-        int i;
-
-        for (i=0; i < TX_RING_LEN; i++)
-        {
-                if (lp->tx_ring[i].skb)
-                {
-                        dev_kfree_skb(lp->tx_ring[i].skb);
-                        lp->tx_ring[i].skb = NULL;
-                }
-        }
-
-        atomic_set(&lp->tx_count, 0);
-        atomic_set(&lp->tx_ring_head, 0);
-        lp->tx_ring_tail=0;
-}
-
-
-/**
- *      mc32_open       -       handle 'up' of card
- *      @dev: device to open
- *
- *      The user is trying to bring the card into ready state. This requires
- *      a brief dialogue with the card. Firstly we enable interrupts and then
- *      'indications'. Without these enabled the card doesn't bother telling
- *      us what it has done. This had me puzzled for a week.
- *
- *      We configure the number of card descriptors, then load the network
- *      address and multicast filters. Turn on the workaround mode. This
- *      works around a bug in the 82586 - it asks the firmware to do
- *      so. It has a performance (latency) hit but is needed on busy
- *      [read most] lans. We load the ring with buffers then we kick it
- *      all off.
- */
-
-static int mc32_open(struct net_device *dev)
-{
-        int ioaddr = dev->base_addr;
-        struct mc32_local *lp = netdev_priv(dev);
-        u8 one=1;
-        u8 regs;
-        u16 descnumbuffs[2] = {TX_RING_LEN, RX_RING_LEN};
-
-        /*
-         *      Interrupts enabled
-         */
-
-        regs=inb(ioaddr+HOST_CTRL);
-        regs|=HOST_CTRL_INTE;
-        outb(regs, ioaddr+HOST_CTRL);
-
-        /*
-         *      Allow ourselves to issue commands
-         */
-
-        up(&lp->cmd_mutex);
-
-
-        /*
-         *      Send the indications on command
-         */
-
-        mc32_command(dev, 4, &one, 2);
-
-        /*
-         *      Poke it to make sure it's really dead.
-         */
-
-        mc32_halt_transceiver(dev);
-        mc32_flush_tx_ring(dev);
-
-        /*
-         *      Ask card to set up on-card descriptors to our spec
-         */
-
-        if(mc32_command(dev, 8, descnumbuffs, 4)) {
-                pr_info("%s: %s rejected our buffer configuration!\n",
-                       dev->name, cardname);
-                mc32_close(dev);
-                return -ENOBUFS;
-        }
-
-        /* Report new configuration */
-        mc32_command(dev, 6, NULL, 0);
-
-        lp->tx_chain            = lp->exec_box->data[8];   /* Transmit list start offset */
-        lp->rx_chain            = lp->exec_box->data[10];  /* Receive list start offset */
-        lp->tx_len              = lp->exec_box->data[9];   /* Transmit list count */
-        lp->rx_len              = lp->exec_box->data[11];  /* Receive list count */
-
-        /* Set Network Address */
-        mc32_command(dev, 1, dev->dev_addr, 6);
-
-        /* Set the filters */
-        mc32_set_multicast_list(dev);
-
-        if (WORKAROUND_82586) {
-                u16 zero_word=0;
-                mc32_command(dev, 0x0D, &zero_word, 2);   /* 82586 bug workaround on  */
-        }
-
-        mc32_load_tx_ring(dev);
-
-        if(mc32_load_rx_ring(dev))
-        {
-                mc32_close(dev);
-                return -ENOBUFS;
-        }
-
-        lp->xceiver_desired_state = RUNNING;
-
-        /* And finally, set the ball rolling... */
-        mc32_start_transceiver(dev);
-
-        netif_start_queue(dev);
-
-        return 0;
-}
-
-
-/**
- *      mc32_timeout    -       handle a timeout from the network layer
- *      @dev: 3c527 that timed out
- *
- *      Handle a timeout on transmit from the 3c527. This normally means
- *      bad things as the hardware handles cable timeouts and mess for
- *      us.
- *
- */
-
-static void mc32_timeout(struct net_device *dev)
-{
-        pr_warning("%s: transmit timed out?\n", dev->name);
-        /* Try to restart the adaptor. */
-        netif_wake_queue(dev);
-}
-
-
-/**
- *      mc32_send_packet        -       queue a frame for transmit
- *      @skb: buffer to transmit
- *      @dev: 3c527 to send it out of
- *
- *      Transmit a buffer. This normally means throwing the buffer onto
- *      the transmit queue as the queue is quite large. If the queue is
- *      full then we set tx_busy and return. Once the interrupt handler
- *      gets messages telling it to reclaim transmit queue entries, we will
- *      clear tx_busy and the kernel will start calling this again.
- *
- *      We do not disable interrupts or acquire any locks; this can
- *      run concurrently with mc32_tx_ring(), and the function itself
- *      is serialised at a higher layer. However, similarly for the
- *      card itself, we must ensure that we update tx_ring_head only
- *      after we've established a valid packet on the tx ring (and
- *      before we let the card "see" it, to prevent it racing with the
- *      irq handler).
- *
- */
-
-static netdev_tx_t mc32_send_packet(struct sk_buff *skb,
-                                    struct net_device *dev)
-{
-        struct mc32_local *lp = netdev_priv(dev);
-        u32 head = atomic_read(&lp->tx_ring_head);
-
-        volatile struct skb_header *p, *np;
-
-        netif_stop_queue(dev);
-
-        if(atomic_read(&lp->tx_count)==0) {
-                return NETDEV_TX_BUSY;
-        }
-
-        if (skb_padto(skb, ETH_ZLEN)) {
-                netif_wake_queue(dev);
-                return NETDEV_TX_OK;
-        }
-
-        atomic_dec(&lp->tx_count);
-
-        /* P is the last sending/sent buffer as a pointer */
-        p=lp->tx_ring[head].p;
-
-        head = next_tx(head);
-
-        /* NP is the buffer we will be loading */
-        np=lp->tx_ring[head].p;
-
-        /* We will need this to flush the buffer out */
-        lp->tx_ring[head].skb=skb;
-
-        np->length      = unlikely(skb->len < ETH_ZLEN) ? ETH_ZLEN : skb->len;
-        np->data        = isa_virt_to_bus(skb->data);
-        np->status      = 0;
-        np->control     = CONTROL_EOP | CONTROL_EOL;
-        wmb();
-
-        /*
-         * The new frame has been setup; we can now
-         * let the interrupt handler and card "see" it
-         */
-
-        atomic_set(&lp->tx_ring_head, head);
-        p->control     &= ~CONTROL_EOL;
-
-        netif_wake_queue(dev);
-        return NETDEV_TX_OK;
-}
-
-
-/**
- *      mc32_update_stats       -       pull off the on board statistics
- *      @dev: 3c527 to service
- *
- *
- *      Query and reset the on-card stats. There's the small possibility
- *      of a race here, which would result in an underestimation of
- *      actual errors. As such, we'd prefer to keep all our stats
- *      collection in software. As a rule, we do. However it can't be
- *      used for rx errors and collisions as, by default, the card discards
- *      bad rx packets.
- *
- *      Setting the SAV BP in the rx filter command supposedly
- *      stops this behaviour. However, testing shows that it only seems to
- *      enable the collation of on-card rx statistics --- the driver
- *      never sees an RX descriptor with an error status set.
- *
- */
-
-static void mc32_update_stats(struct net_device *dev)
-{
-        struct mc32_local *lp = netdev_priv(dev);
-        volatile struct mc32_stats *st = lp->stats;
-
-        u32 rx_errors=0;
-
-        rx_errors+=dev->stats.rx_crc_errors   +=st->rx_crc_errors;
-                                                   st->rx_crc_errors=0;
-        rx_errors+=dev->stats.rx_fifo_errors  +=st->rx_overrun_errors;
-                                                   st->rx_overrun_errors=0;
-        rx_errors+=dev->stats.rx_frame_errors +=st->rx_alignment_errors;
-                                                   st->rx_alignment_errors=0;
-        rx_errors+=dev->stats.rx_length_errors+=st->rx_tooshort_errors;
-                                                   st->rx_tooshort_errors=0;
-        rx_errors+=dev->stats.rx_missed_errors+=st->rx_outofresource_errors;
-                                                   st->rx_outofresource_errors=0;
-        dev->stats.rx_errors=rx_errors;
-
-        /* Number of packets which saw one collision */
-        dev->stats.collisions+=st->dataC[10];
-        st->dataC[10]=0;
-
-        /* Number of packets which saw 2--15 collisions */
-        dev->stats.collisions+=st->dataC[11];
-        st->dataC[11]=0;
-}
-
-
-/**
- *      mc32_rx_ring    -       process the receive ring
- *      @dev: 3c527 that needs its receive ring processing
- *
- *
- *      We have received one or more indications from the card that a
- *      receive has completed. The buffer ring thus contains dirty
- *      entries. We walk the ring by iterating over the circular rx_ring
- *      array, starting at the next dirty buffer (which happens to be the
- *      one we finished up at last time around).
- *
- *      For each completed packet, we will either copy it and pass it up
- *      the stack or, if the packet is near MTU sized, we allocate
- *      another buffer and flip the old one up the stack.
- *
- *      We must succeed in keeping a buffer on the ring. If necessary we
- *      will toss a received packet rather than lose a ring entry. Once
- *      the first uncompleted descriptor is found, we move the
- *      End-Of-List bit to include the buffers just processed.
- *
- */
-
-static void mc32_rx_ring(struct net_device *dev)
-{
-        struct mc32_local *lp = netdev_priv(dev);
-        volatile struct skb_header *p;
-        u16 rx_ring_tail;
-        u16 rx_old_tail;
-        int x=0;
-
-        rx_old_tail = rx_ring_tail = lp->rx_ring_tail;
-
-        do
-        {
-                p=lp->rx_ring[rx_ring_tail].p;
-
-                if(!(p->status & (1<<7))) { /* Not COMPLETED */
-                        break;
-                }
-                if(p->status & (1<<6)) /* COMPLETED_OK */
-                {
-
-                        u16 length=p->length;
-                        struct sk_buff *skb;
-                        struct sk_buff *newskb;
-
-                        /* Try to save time by avoiding a copy on big frames */
-
-                        if ((length > RX_COPYBREAK) &&
-                            ((newskb = netdev_alloc_skb(dev, 1532)) != NULL))
-                        {
-                                skb=lp->rx_ring[rx_ring_tail].skb;
-                                skb_put(skb, length);
-
-                                skb_reserve(newskb,18);
-                                lp->rx_ring[rx_ring_tail].skb=newskb;
-                                p->data=isa_virt_to_bus(newskb->data);
-                        }
-                        else
-                        {
-                                skb = netdev_alloc_skb(dev, length + 2);
-
-                                if(skb==NULL) {
-                                        dev->stats.rx_dropped++;
-                                        goto dropped;
-                                }
-
-                                skb_reserve(skb,2);
-                                memcpy(skb_put(skb, length),
-                                       lp->rx_ring[rx_ring_tail].skb->data, length);
-                        }
-
-                        skb->protocol=eth_type_trans(skb,dev);
-                        dev->stats.rx_packets++;
-                        dev->stats.rx_bytes += length;
-                        netif_rx(skb);
-                }
-
-        dropped:
-                p->length = 1532;
-                p->status = 0;
-
-                rx_ring_tail=next_rx(rx_ring_tail);
-        }
-        while(x++<48);
-
-        /* If there was actually a frame to be processed, place the EOL bit */
-        /* at the descriptor prior to the one to be filled next */
-
-        if (rx_ring_tail != rx_old_tail)
-        {
-                lp->rx_ring[prev_rx(rx_ring_tail)].p->control |=  CONTROL_EOL;
-                lp->rx_ring[prev_rx(rx_old_tail)].p->control  &= ~CONTROL_EOL;
-
-                lp->rx_ring_tail=rx_ring_tail;
-        }
-}
-
-
-/**
- *      mc32_tx_ring    -       process completed transmits
- *      @dev: 3c527 that needs its transmit ring processing
- *
- *
- *      This operates in a similar fashion to mc32_rx_ring. We iterate
- *      over the transmit ring. For each descriptor which has been
- *      processed by the card, we free its associated buffer and note
- *      any errors. This continues until the transmit ring is emptied
- *      or we reach a descriptor that hasn't yet been processed by the
- *      card.
- *
- */
-
-static void mc32_tx_ring(struct net_device *dev)
-{
-        struct mc32_local *lp = netdev_priv(dev);
-        volatile struct skb_header *np;
-
-        /*
-         * We rely on head==tail to mean 'queue empty'.
-         * This is why lp->tx_count=TX_RING_LEN-1: in order to prevent
-         * tx_ring_head wrapping to tail and confusing a 'queue empty'
-         * condition with 'queue full'
-         */
-
-        while (lp->tx_ring_tail != atomic_read(&lp->tx_ring_head))
-        {
-                u16 t;
-
-                t=next_tx(lp->tx_ring_tail);
-                np=lp->tx_ring[t].p;
-
-                if(!(np->status & (1<<7)))
-                {
-                        /* Not COMPLETED */
-                        break;
-                }
-                dev->stats.tx_packets++;
-                if(!(np->status & (1<<6))) /* Not COMPLETED_OK */
-                {
-                        dev->stats.tx_errors++;
-
-                        switch(np->status&0x0F)
-                        {
-                                case 1:
-                                        dev->stats.tx_aborted_errors++;
-                                        break; /* Max collisions */
-                                case 2:
-                                        dev->stats.tx_fifo_errors++;
-                                        break;
-                                case 3:
-                                        dev->stats.tx_carrier_errors++;
-                                        break;
-                                case 4:
-                                        dev->stats.tx_window_errors++;
-                                        break;  /* CTS Lost */
-                                case 5:
-                                        dev->stats.tx_aborted_errors++;
-                                        break; /* Transmit timeout */
-                        }
-                }
-                /* Packets are sent in order - this is
-                    basically a FIFO queue of buffers matching
-                    the card ring */
-                dev->stats.tx_bytes+=lp->tx_ring[t].skb->len;
-                dev_kfree_skb_irq(lp->tx_ring[t].skb);
-                lp->tx_ring[t].skb=NULL;
-                atomic_inc(&lp->tx_count);
-                netif_wake_queue(dev);
-
-                lp->tx_ring_tail=t;
-        }
-
-}
-
-
-/**
- *      mc32_interrupt          -       handle an interrupt from a 3c527
- *      @irq: Interrupt number
- *      @dev_id: 3c527 that requires servicing
- *      @regs: Registers (unused)
- *
- *
- *      An interrupt is raised whenever the 3c527 writes to the command
- *      register. This register contains the message it wishes to send us
- *      packed into a single byte field. We keep reading status entries
- *      until we have processed all the control items, but simply count
- *      transmit and receive reports. When all reports are in we empty the
- *      transceiver rings as appropriate. This saves the overhead of
- *      multiple command requests.
- *
- *      Because MCA is level-triggered, we shouldn't miss indications.
- *      Therefore, we needn't ask the card to suspend interrupts within
- *      this handler. The card receives an implicit acknowledgment of the
- *      current interrupt when we read the command register.
- *
- */
-
-static irqreturn_t mc32_interrupt(int irq, void *dev_id)
-{
-        struct net_device *dev = dev_id;
-        struct mc32_local *lp;
-        int ioaddr, status, boguscount = 0;
-        int rx_event = 0;
-        int tx_event = 0;
-
-        ioaddr = dev->base_addr;
-        lp = netdev_priv(dev);
-
-        /* See whats cooking */
-
-        while((inb(ioaddr+HOST_STATUS)&HOST_STATUS_CWR) && boguscount++<2000)
-        {
-                status=inb(ioaddr+HOST_CMD);
-
-                pr_debug("Status TX%d RX%d EX%d OV%d BC%d\n",
-                        (status&7), (status>>3)&7, (status>>6)&1,
-                        (status>>7)&1, boguscount);
-
-                switch(status&7)
-                {
-                        case 0:
-                                break;
-                        case 6: /* TX fail */
-                        case 2: /* TX ok */
-                                tx_event = 1;
-                                break;
-                        case 3: /* Halt */
-                        case 4: /* Abort */
-                                complete(&lp->xceiver_cmd);
-                                break;
-                        default:
-                                pr_notice("%s: strange tx ack %d\n", dev->name, status&7);
-                }
-                status>>=3;
-                switch(status&7)
-                {
-                        case 0:
-                                break;
-                        case 2: /* RX */
-                                rx_event=1;
-                                break;
-                        case 3: /* Halt */
-                        case 4: /* Abort */
-                                complete(&lp->xceiver_cmd);
-                                break;
-                        case 6:
-                                /* Out of RX buffers stat */
-                                /* Must restart rx */
-                                dev->stats.rx_dropped++;
-                                mc32_rx_ring(dev);
-                                mc32_start_transceiver(dev);
-                                break;
-                        default:
-                                pr_notice("%s: strange rx ack %d\n",
-                                        dev->name, status&7);
-                }
-                status>>=3;
-                if(status&1)
-                {
-                        /*
-                         * No thread is waiting: we need to tidy
-                         * up ourself.
-                         */
-
-                        if (lp->cmd_nonblocking) {
-                                up(&lp->cmd_mutex);
-                                if (lp->mc_reload_wait)
-                                        mc32_reset_multicast_list(dev);
-                        }
-                        else complete(&lp->execution_cmd);
-                }
-                if(status&2)
-                {
-                        /*
-                         *      We get interrupted once per
-                         *      counter that is about to overflow.
-                         */
-
-                        mc32_update_stats(dev);
-                }
-        }
-
-
-        /*
-         *      Process the transmit and receive rings
-         */
-
-        if(tx_event)
-                mc32_tx_ring(dev);
-
-        if(rx_event)
-                mc32_rx_ring(dev);
-
-        return IRQ_HANDLED;
-}
-
-
-/**
- *      mc32_close      -       user configuring the 3c527 down
- *      @dev: 3c527 card to shut down
- *
- *      The 3c527 is a bus mastering device. We must be careful how we
- *      shut it down. It may also be running shared interrupt so we have
- *      to be sure to silence it properly
- *
- *      We indicate that the card is closing to the rest of the
- *      driver.  Otherwise, it is possible that the card may run out
- *      of receive buffers and restart the transceiver while we're
- *      trying to close it.
- *
- *      We abort any receive and transmits going on and then wait until
- *      any pending exec commands have completed in other code threads.
- *      In theory we can't get here while that is true, in practice I am
- *      paranoid
- *
- *      We turn off the interrupt enable for the board to be sure it can't
- *      intefere with other devices.
- */
-
-static int mc32_close(struct net_device *dev)
-{
-        struct mc32_local *lp = netdev_priv(dev);
-        int ioaddr = dev->base_addr;
-
-        u8 regs;
-        u16 one=1;
-
-        lp->xceiver_desired_state = HALTED;
-        netif_stop_queue(dev);
-
-        /*
-         *      Send the indications on command (handy debug check)
-         */
-
-        mc32_command(dev, 4, &one, 2);
-
-        /* Shut down the transceiver */
-
-        mc32_halt_transceiver(dev);
-
-        /* Ensure we issue no more commands beyond this point */
-
-        down(&lp->cmd_mutex);
-
-        /* Ok the card is now stopping */
-
-        regs=inb(ioaddr+HOST_CTRL);
-        regs&=~HOST_CTRL_INTE;
-        outb(regs, ioaddr+HOST_CTRL);
-
-        mc32_flush_rx_ring(dev);
-        mc32_flush_tx_ring(dev);
-
-        mc32_update_stats(dev);
-
-        return 0;
-}
-
-
-/**
- *      mc32_get_stats          -       hand back stats to network layer
- *      @dev: The 3c527 card to handle
- *
- *      We've collected all the stats we can in software already. Now
- *      it's time to update those kept on-card and return the lot.
- *
- */
-
-static struct net_device_stats *mc32_get_stats(struct net_device *dev)
-{
-        mc32_update_stats(dev);
-        return &dev->stats;
-}
-
-
-/**
- *      do_mc32_set_multicast_list      -       attempt to update multicasts
- *      @dev: 3c527 device to load the list on
- *      @retry: indicates this is not the first call.
- *
- *
- *      Actually set or clear the multicast filter for this adaptor. The
- *      locking issues are handled by this routine. We have to track
- *      state as it may take multiple calls to get the command sequence
- *      completed. We just keep trying to schedule the loads until we
- *      manage to process them all.
- *
- *      num_addrs == -1 Promiscuous mode, receive all packets
- *
- *      num_addrs == 0  Normal mode, clear multicast list
- *
- *      num_addrs > 0   Multicast mode, receive normal and MC packets,
- *                      and do best-effort filtering.
- *
- *      See mc32_update_stats() regards setting the SAV BP bit.
- *
- */
-
-static void do_mc32_set_multicast_list(struct net_device *dev, int retry)
-{
-        struct mc32_local *lp = netdev_priv(dev);
-        u16 filt = (1<<2); /* Save Bad Packets, for stats purposes */
-
-        if ((dev->flags&IFF_PROMISC) ||
-            (dev->flags&IFF_ALLMULTI) ||
-            netdev_mc_count(dev) > 10)
-                /* Enable promiscuous mode */
-                filt |= 1;
-        else if (!netdev_mc_empty(dev))
-        {
-                unsigned char block[62];
-                unsigned char *bp;
-                struct netdev_hw_addr *ha;
-
-                if(retry==0)
-                        lp->mc_list_valid = 0;
-                if(!lp->mc_list_valid)
-                {
-                        block[1]=0;
-                        block[0]=netdev_mc_count(dev);
-                        bp=block+2;
-
-                        netdev_for_each_mc_addr(ha, dev) {
-                                memcpy(bp, ha->addr, 6);
-                                bp+=6;
-                        }
-                        if(mc32_command_nowait(dev, 2, block,
-                                               2+6*netdev_mc_count(dev))==-1)
-                        {
-                                lp->mc_reload_wait = 1;
-                                return;
-                        }
-                        lp->mc_list_valid=1;
-                }
-        }
-
-        if(mc32_command_nowait(dev, 0, &filt, 2)==-1)
-        {
-                lp->mc_reload_wait = 1;
-        }
-        else {
-                lp->mc_reload_wait = 0;
-        }
-}
-
-
-/**
- *      mc32_set_multicast_list -       queue multicast list update
- *      @dev: The 3c527 to use
- *
- *      Commence loading the multicast list. This is called when the kernel
- *      changes the lists. It will override any pending list we are trying to
- *      load.
- */
-
-static void mc32_set_multicast_list(struct net_device *dev)
-{
-        do_mc32_set_multicast_list(dev,0);
-}
-
-
-/**
- *      mc32_reset_multicast_list       -       reset multicast list
- *      @dev: The 3c527 to use
- *
- *      Attempt the next step in loading the multicast lists. If this attempt
- *      fails to complete then it will be scheduled and this function called
- *      again later from elsewhere.
- */
-
-static void mc32_reset_multicast_list(struct net_device *dev)
-{
-        do_mc32_set_multicast_list(dev,1);
-}
-
-static void netdev_get_drvinfo(struct net_device *dev,
-                               struct ethtool_drvinfo *info)
-{
-        strcpy(info->driver, DRV_NAME);
-        strcpy(info->version, DRV_VERSION);
-        sprintf(info->bus_info, "MCA 0x%lx", dev->base_addr);
-}
-
-static u32 netdev_get_msglevel(struct net_device *dev)
-{
-        return mc32_debug;
-}
-
-static void netdev_set_msglevel(struct net_device *dev, u32 level)
-{
-        mc32_debug = level;
-}
-
-static const struct ethtool_ops netdev_ethtool_ops = {
-        .get_drvinfo            = netdev_get_drvinfo,
-        .get_msglevel           = netdev_get_msglevel,
-        .set_msglevel           = netdev_set_msglevel,
-};
-
-#ifdef MODULE
-
-static struct net_device *this_device;
-
-/**
- *      init_module             -       entry point
- *
- *      Probe and locate a 3c527 card. This really should probe and locate
- *      all the 3c527 cards in the machine not just one of them. Yes you can
- *      insmod multiple modules for now but it's a hack.
- */
-
-int __init init_module(void)
-{
-        this_device = mc32_probe(-1);
-        if (IS_ERR(this_device))
-                return PTR_ERR(this_device);
-        return 0;
-}
-
-/**
- *      cleanup_module  -       free resources for an unload
- *
- *      Unloading time. We release the MCA bus resources and the interrupt
- *      at which point everything is ready to unload. The card must be stopped
- *      at this point or we would not have been called. When we unload we
- *      leave the card stopped but not totally shut down. When the card is
- *      initialized it must be rebooted or the rings reloaded before any
- *      transmit operations are allowed to start scribbling into memory.
- */
-
-void __exit cleanup_module(void)
-{
-        unregister_netdev(this_device);
-        cleanup_card(this_device);
-        free_netdev(this_device);
-}
-
-#endif /* MODULE */
diff --git a/drivers/net/ethernet/i825xx/3c527.h b/drivers/net/ethernet/i825xx/3c527.h
deleted file mode 100644
index d693b8d15cde..000000000000
--- a/drivers/net/ethernet/i825xx/3c527.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *      3COM "EtherLink MC/32" Descriptions
- */
-
-/*
- *      Registers
- */
-
-#define HOST_CMD                0
-#define         HOST_CMD_START_RX   (1<<3)
-#define         HOST_CMD_SUSPND_RX  (3<<3)
-#define         HOST_CMD_RESTRT_RX  (5<<3)
-
-#define         HOST_CMD_SUSPND_TX  3
-#define         HOST_CMD_RESTRT_TX  5
-
-
-#define HOST_STATUS             2
-#define         HOST_STATUS_CRR (1<<6)
-#define         HOST_STATUS_CWR (1<<5)
-
-
-#define HOST_CTRL               6
-#define         HOST_CTRL_ATTN  (1<<7)
-#define         HOST_CTRL_RESET (1<<6)
-#define         HOST_CTRL_INTE  (1<<2)
-
-#define HOST_RAMPAGE            8
-
-#define HALTED 0
-#define RUNNING 1
-
-struct mc32_mailbox
-{
-        u16 mbox;
-        u16 data[1];
-} __packed;
-
-struct skb_header
-{
-        u8 status;
-        u8 control;
-        u16 next;       /* Do not change! */
-        u16 length;
-        u32 data;
-} __packed;
-
-struct mc32_stats
-{
-        /* RX Errors */
-        u32 rx_crc_errors;
-        u32 rx_alignment_errors;
-        u32 rx_overrun_errors;
-        u32 rx_tooshort_errors;
-        u32 rx_toolong_errors;
-        u32 rx_outofresource_errors;
-
-        u32 rx_discarded;  /* via card pattern match filter */
-
-        /* TX Errors */
-        u32 tx_max_collisions;
-        u32 tx_carrier_errors;
-        u32 tx_underrun_errors;
-        u32 tx_cts_errors;
-        u32 tx_timeout_errors;
-
-        /* various cruft */
-        u32 dataA[6];
-        u16 dataB[5];
-        u32 dataC[14];
-} __packed;
-
-#define STATUS_MASK     0x0F
-#define COMPLETED       (1<<7)
-#define COMPLETED_OK    (1<<6)
-#define BUFFER_BUSY     (1<<5)
-
-#define CONTROL_EOP     (1<<7)  /* End Of Packet */
-#define CONTROL_EOL     (1<<6)  /* End of List */
-
-#define MCA_MC32_ID     0x0041  /* Our MCA ident */
diff --git a/drivers/net/ethernet/i825xx/Kconfig b/drivers/net/ethernet/i825xx/Kconfig
index ca1ae985c6df..fed5080a6b62 100644
--- a/drivers/net/ethernet/i825xx/Kconfig
+++ b/drivers/net/ethernet/i825xx/Kconfig
@@ -43,28 +43,6 @@ config EL16
           To compile this driver as a module, choose M here. The module
           will be called 3c507.
 
-config ELMC
-        tristate "3c523 \"EtherLink/MC\" support"
-        depends on MCA_LEGACY
-        ---help---
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-
-          To compile this driver as a module, choose M here. The module
-          will be called 3c523.
-
-config ELMC_II
-        tristate "3c527 \"EtherLink/MC 32\" support (EXPERIMENTAL)"
-        depends on MCA && MCA_LEGACY
-        ---help---
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-
-          To compile this driver as a module, choose M here. The module
-          will be called 3c527.
-
 config ARM_ETHER1
         tristate "Acorn Ether1 support"
         depends on ARM && ARCH_ACORN
diff --git a/drivers/net/ethernet/i825xx/Makefile b/drivers/net/ethernet/i825xx/Makefile
index f68a3694968a..6adff85e8ecc 100644
--- a/drivers/net/ethernet/i825xx/Makefile
+++ b/drivers/net/ethernet/i825xx/Makefile
@@ -7,8 +7,6 @@ obj-$(CONFIG_EEXPRESS) += eexpress.o
 obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
 obj-$(CONFIG_ELPLUS) += 3c505.o
 obj-$(CONFIG_EL16) += 3c507.o
-obj-$(CONFIG_ELMC) += 3c523.o
-obj-$(CONFIG_ELMC_II) += 3c527.o
 obj-$(CONFIG_LP486E) += lp486e.o
 obj-$(CONFIG_NI52) += ni52.o
 obj-$(CONFIG_SUN3_82586) += sun3_82586.o
diff --git a/drivers/net/ethernet/i825xx/eexpress.c b/drivers/net/ethernet/i825xx/eexpress.c
index cc2e66ad4436..7a6a2f04c5b1 100644
--- a/drivers/net/ethernet/i825xx/eexpress.c
+++ b/drivers/net/ethernet/i825xx/eexpress.c
@@ -9,7 +9,7 @@
  * Many modifications, and currently maintained, by
  *  Philip Blundell <philb@gnu.org>
  * Added the Compaq LTE  Alan Cox <alan@lxorguk.ukuu.org.uk>
- * Added MCA support Adam Fritzler
+ * Added MCA support Adam Fritzler (now deleted)
  *
  * Note - this driver is experimental still - it has problems on faster
  * machines. Someone needs to sit down and go through it line by line with
@@ -111,7 +111,6 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
-#include <linux/mca-legacy.h>
 #include <linux/spinlock.h>
 #include <linux/bitops.h>
 #include <linux/jiffies.h>
@@ -227,16 +226,6 @@ static unsigned short start_code[] = {
 /* maps irq number to EtherExpress magic value */
 static char irqrmap[] = { 0,0,1,2,3,4,0,0,0,1,5,6,0,0,0,0 };
 
-#ifdef CONFIG_MCA_LEGACY
-/* mapping of the first four bits of the second POS register */
-static unsigned short mca_iomap[] = {
-        0x270, 0x260, 0x250, 0x240, 0x230, 0x220, 0x210, 0x200,
-        0x370, 0x360, 0x350, 0x340, 0x330, 0x320, 0x310, 0x300
-};
-/* bits 5-7 of the second POS register */
-static char mca_irqmap[] = { 12, 9, 3, 4, 5, 10, 11, 15 };
-#endif
-
 /*
  * Prototypes for Linux interface
  */
@@ -340,53 +329,6 @@ static int __init do_express_probe(struct net_device *dev)
 
         dev->if_port = 0xff; /* not set */
 
-#ifdef CONFIG_MCA_LEGACY
-        if (MCA_bus) {
-                int slot = 0;
-
-                /*
-                 * Only find one card at a time.  Subsequent calls
-                 * will find others, however, proper multicard MCA
-                 * probing and setup can't be done with the
-                 * old-style Space.c init routines.  -- ASF
-                 */
-                while (slot != MCA_NOTFOUND) {
-                        int pos0, pos1;
-
-                        slot = mca_find_unused_adapter(0x628B, slot);
-                        if (slot == MCA_NOTFOUND)
-                                break;
-
-                        pos0 = mca_read_stored_pos(slot, 2);
-                        pos1 = mca_read_stored_pos(slot, 3);
-                        ioaddr = mca_iomap[pos1&0xf];
-
-                        dev->irq = mca_irqmap[(pos1>>4)&0x7];
-
-                        /*
-                         * XXX: Transceiver selection is done
-                         * differently on the MCA version.
-                         * How to get it to select something
-                         * other than external/AUI is currently
-                         * unknown.  This code is just for looks. -- ASF
-                         */
-                        if ((pos0 & 0x7) == 0x1)
-                                dev->if_port = AUI;
-                        else if ((pos0 & 0x7) == 0x5) {
-                                if (pos1 & 0x80)
-                                        dev->if_port = BNC;
-                                else
-                                        dev->if_port = TPE;
-                        }
-
-                        mca_set_adapter_name(slot, "Intel EtherExpress 16 MCA");
-                        mca_set_adapter_procfn(slot, NULL, dev);
-                        mca_mark_as_used(slot);
-
-                        break;
-                }
-        }
-#endif
         if (ioaddr&0xfe00) {
                 if (!request_region(ioaddr, EEXP_IO_EXTENT, "EtherExpress"))
                         return -EBUSY;
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index 3516e17a399d..f4d2da0db1b1 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -290,16 +290,18 @@ static void ehea_update_bcmc_registrations(void)
 
                                 arr[i].adh = adapter->handle;
                                 arr[i].port_id = port->logical_port_id;
-                                arr[i].reg_type = EHEA_BCMC_SCOPE_ALL |
-                                                  EHEA_BCMC_MULTICAST |
+                                arr[i].reg_type = EHEA_BCMC_MULTICAST |
                                                   EHEA_BCMC_UNTAGGED;
+                                if (mc_entry->macaddr == 0)
+                                        arr[i].reg_type |= EHEA_BCMC_SCOPE_ALL;
                                 arr[i++].macaddr = mc_entry->macaddr;
 
                                 arr[i].adh = adapter->handle;
                                 arr[i].port_id = port->logical_port_id;
-                                arr[i].reg_type = EHEA_BCMC_SCOPE_ALL |
-                                                  EHEA_BCMC_MULTICAST |
+                                arr[i].reg_type = EHEA_BCMC_MULTICAST |
                                                   EHEA_BCMC_VLANID_ALL;
+                                if (mc_entry->macaddr == 0)
+                                        arr[i].reg_type |= EHEA_BCMC_SCOPE_ALL;
                                 arr[i++].macaddr = mc_entry->macaddr;
                                 num_registrations -= 2;
                         }
@@ -1838,8 +1840,9 @@ static u64 ehea_multicast_reg_helper(struct ehea_port *port, u64 mc_mac_addr,
         u64 hret;
         u8 reg_type;
 
-        reg_type = EHEA_BCMC_SCOPE_ALL | EHEA_BCMC_MULTICAST
-                 | EHEA_BCMC_UNTAGGED;
+        reg_type = EHEA_BCMC_MULTICAST | EHEA_BCMC_UNTAGGED;
+        if (mc_mac_addr == 0)
+                reg_type |= EHEA_BCMC_SCOPE_ALL;
 
         hret = ehea_h_reg_dereg_bcmc(port->adapter->handle,
                                      port->logical_port_id,
@@ -1847,8 +1850,9 @@ static u64 ehea_multicast_reg_helper(struct ehea_port *port, u64 mc_mac_addr,
         if (hret)
                 goto out;
 
-        reg_type = EHEA_BCMC_SCOPE_ALL | EHEA_BCMC_MULTICAST
-                 | EHEA_BCMC_VLANID_ALL;
+        reg_type = EHEA_BCMC_MULTICAST | EHEA_BCMC_VLANID_ALL;
+        if (mc_mac_addr == 0)
+                reg_type |= EHEA_BCMC_SCOPE_ALL;
 
         hret = ehea_h_reg_dereg_bcmc(port->adapter->handle,
                                      port->logical_port_id,
@@ -1898,7 +1902,7 @@ static void ehea_allmulti(struct net_device *dev, int enable)
                                 netdev_err(dev,
                                            "failed enabling IFF_ALLMULTI\n");
                 }
-        } else
+        } else {
                 if (!enable) {
                         /* Disable ALLMULTI */
                         hret = ehea_multicast_reg_helper(port, 0, H_DEREG_BCMC);
@@ -1908,6 +1912,7 @@ static void ehea_allmulti(struct net_device *dev, int enable)
                                 netdev_err(dev,
                                            "failed disabling IFF_ALLMULTI\n");
                 }
+        }
 }
 
 static void ehea_add_multicast_entry(struct ehea_port *port, u8 *mc_mac_addr)
@@ -1941,11 +1946,7 @@ static void ehea_set_multicast_list(struct net_device *dev)
         struct netdev_hw_addr *ha;
         int ret;
 
-        if (port->promisc) {
-                ehea_promiscuous(dev, 1);
-                return;
-        }
-        ehea_promiscuous(dev, 0);
+        ehea_promiscuous(dev, !!(dev->flags & IFF_PROMISC));
 
         if (dev->flags & IFF_ALLMULTI) {
                 ehea_allmulti(dev, 1);
@@ -2463,6 +2464,7 @@ static int ehea_down(struct net_device *dev)
                 return 0;
 
         ehea_drop_multicast_list(dev);
+        ehea_allmulti(dev, 0);
         ehea_broadcast_reg_helper(port, H_DEREG_BCMC);
 
         ehea_free_interrupts(dev);
@@ -3261,6 +3263,7 @@ static int __devinit ehea_probe_adapter(struct platform_device *dev,
         struct ehea_adapter *adapter;
         const u64 *adapter_handle;
         int ret;
+        int i;
 
         if (!dev || !dev->dev.of_node) {
                 pr_err("Invalid ibmebus device probed\n");
@@ -3314,17 +3317,9 @@ static int __devinit ehea_probe_adapter(struct platform_device *dev,
         tasklet_init(&adapter->neq_tasklet, ehea_neq_tasklet,
                      (unsigned long)adapter);
 
-        ret = ibmebus_request_irq(adapter->neq->attr.ist1,
-                                  ehea_interrupt_neq, IRQF_DISABLED,
-                                  "ehea_neq", adapter);
-        if (ret) {
-                dev_err(&dev->dev, "requesting NEQ IRQ failed\n");
-                goto out_kill_eq;
-        }
-
         ret = ehea_create_device_sysfs(dev);
         if (ret)
-                goto out_free_irq;
+                goto out_kill_eq;
 
         ret = ehea_setup_ports(adapter);
         if (ret) {
@@ -3332,15 +3327,30 @@ static int __devinit ehea_probe_adapter(struct platform_device *dev,
                 goto out_rem_dev_sysfs;
         }
 
+        ret = ibmebus_request_irq(adapter->neq->attr.ist1,
+                                  ehea_interrupt_neq, IRQF_DISABLED,
+                                  "ehea_neq", adapter);
+        if (ret) {
+                dev_err(&dev->dev, "requesting NEQ IRQ failed\n");
+                goto out_shutdown_ports;
+        }
+
+        /* Handle any events that might be pending. */
+        tasklet_hi_schedule(&adapter->neq_tasklet);
+
         ret = 0;
         goto out;
 
+out_shutdown_ports:
+        for (i = 0; i < EHEA_MAX_PORTS; i++)
+                if (adapter->port[i]) {
+                        ehea_shutdown_single_port(adapter->port[i]);
+                        adapter->port[i] = NULL;
+                }
+
 out_rem_dev_sysfs:
         ehea_remove_device_sysfs(dev);
 
-out_free_irq:
-        ibmebus_free_irq(adapter->neq->attr.ist1, adapter);
-
 out_kill_eq:
         ehea_destroy_eq(adapter->neq);
 
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_phyp.h b/drivers/net/ethernet/ibm/ehea/ehea_phyp.h
index 52c456ec4d6c..8364815c32ff 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_phyp.h
+++ b/drivers/net/ethernet/ibm/ehea/ehea_phyp.h
@@ -450,7 +450,7 @@ u64 ehea_h_modify_ehea_port(const u64 adapter_handle, const u16 port_num,
                             void *cb_addr);
 
 #define H_REGBCMC_PN            EHEA_BMASK_IBM(48, 63)
-#define H_REGBCMC_REGTYPE       EHEA_BMASK_IBM(61, 63)
+#define H_REGBCMC_REGTYPE       EHEA_BMASK_IBM(60, 63)
 #define H_REGBCMC_MACADDR       EHEA_BMASK_IBM(16, 63)
 #define H_REGBCMC_VLANID        EHEA_BMASK_IBM(52, 63)
 
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
index 76213162fbe3..79b07ec6726f 100644
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -7,7 +7,7 @@ config NET_VENDOR_INTEL
         default y
         depends on PCI || PCI_MSI || ISA || ISA_DMA_API || ARM || \
                    ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \
-                   GSC || BVME6000 || MVME16x || ARCH_ENP2611 || \
+                   GSC || BVME6000 || MVME16x || \
                    (ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR) || \
                    EXPERIMENTAL
         ---help---
@@ -120,6 +120,17 @@ config IGB_DCA
           driver.  DCA is a method for warming the CPU cache before data
           is used, with the intent of lessening the impact of cache misses.
 
+config IGB_PTP
+        bool "PTP Hardware Clock (PHC)"
+        default y
+        depends on IGB && PTP_1588_CLOCK
+        ---help---
+          Say Y here if you want to use PTP Hardware Clock (PHC) in the
+          driver.  Only the basic clock operations have been implemented.
+
+          Every timestamp and clock read operations must consult the
+          overflow counter to form a correct time value.
+
 config IGBVF
         tristate "Intel(R) 82576 Virtual Function Ethernet support"
         depends on PCI
@@ -182,6 +193,14 @@ config IXGBE
           To compile this driver as a module, choose M here. The module
           will be called ixgbe.
 
+config IXGBE_HWMON
+        bool "Intel(R) 10GbE PCI Express adapters HWMON support"
+        default y
+        depends on IXGBE && HWMON && !(IXGBE=y && HWMON=m)
+        ---help---
+          Say Y if you want to expose the thermal sensor data on some of
+          our cards, via a hwmon sysfs interface.
+
 config IXGBE_DCA
         bool "Direct Cache Access (DCA) Support"
         default y
@@ -201,6 +220,17 @@ config IXGBE_DCB
 
           If unsure, say N.
 
+config IXGBE_PTP
+        bool "PTP Clock Support"
+        default n
+        depends on IXGBE && PTP_1588_CLOCK
+        ---help---
+          Say Y here if you want support for 1588 Timestamping with a
+          PHC device, using the PTP 1588 Clock support. This is
+          required to enable timestamping support for the device.
+
+          If unsure, say N.
+
 config IXGBEVF
         tristate "Intel(R) 82599 Virtual Function Ethernet support"
         depends on PCI_MSI
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index e498effb85d9..ada720b42ff6 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -1759,6 +1759,7 @@ static void e100_xmit_prepare(struct nic *nic, struct cb *cb,
                 skb->data, skb->len, PCI_DMA_TODEVICE));
         /* check for mapping failure? */
         cb->u.tcb.tbd.size = cpu_to_le16(skb->len);
+        skb_tx_timestamp(skb);
 }
 
 static netdev_tx_t e100_xmit_frame(struct sk_buff *skb,
@@ -2733,6 +2734,7 @@ static const struct ethtool_ops e100_ethtool_ops = {
         .set_phys_id            = e100_set_phys_id,
         .get_ethtool_stats      = e100_get_ethtool_stats,
         .get_sset_count         = e100_get_sset_count,
+        .get_ts_info            = ethtool_op_get_ts_info,
 };
 
 static int e100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 4348b6fd44fa..95731c841044 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -493,7 +493,11 @@ out:
 static void e1000_down_and_stop(struct e1000_adapter *adapter)
 {
         set_bit(__E1000_DOWN, &adapter->flags);
-        cancel_work_sync(&adapter->reset_task);
+
+        /* Only kill reset task if adapter is not resetting */
+        if (!test_bit(__E1000_RESETTING, &adapter->flags))
+                cancel_work_sync(&adapter->reset_task);
+
         cancel_delayed_work_sync(&adapter->watchdog_task);
         cancel_delayed_work_sync(&adapter->phy_info_task);
         cancel_delayed_work_sync(&adapter->fifo_stall_task);
@@ -827,9 +831,10 @@ static int e1000_set_features(struct net_device *netdev,
         if (changed & NETIF_F_HW_VLAN_RX)
                 e1000_vlan_mode(netdev, features);
 
-        if (!(changed & NETIF_F_RXCSUM))
+        if (!(changed & (NETIF_F_RXCSUM | NETIF_F_RXALL)))
                 return 0;
 
+        netdev->features = features;
         adapter->rx_csum = !!(features & NETIF_F_RXCSUM);
 
         if (netif_running(netdev))
@@ -1074,6 +1079,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 
         netdev->features |= netdev->hw_features;
         netdev->hw_features |= NETIF_F_RXCSUM;
+        netdev->hw_features |= NETIF_F_RXALL;
         netdev->hw_features |= NETIF_F_RXFCS;
 
         if (pci_using_dac) {
@@ -1841,6 +1847,22 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
                         break;
         }
 
+        /* This is useful for sniffing bad packets. */
+        if (adapter->netdev->features & NETIF_F_RXALL) {
+                /* UPE and MPE will be handled by normal PROMISC logic
+                 * in e1000e_set_rx_mode */
+                rctl |= (E1000_RCTL_SBP | /* Receive bad packets */
+                         E1000_RCTL_BAM | /* RX All Bcast Pkts */
+                         E1000_RCTL_PMCF); /* RX All MAC Ctrl Pkts */
+
+                rctl &= ~(E1000_RCTL_VFE | /* Disable VLAN filter */
+                          E1000_RCTL_DPF | /* Allow filtered pause */
+                          E1000_RCTL_CFIEN); /* Dis VLAN CFIEN Filter */
+                /* Do not mess with E1000_CTRL_VME, it affects transmit as well,
+                 * and that breaks VLANs.
+                 */
+        }
+
         ew32(RCTL, rctl);
 }
 
@@ -3243,6 +3265,8 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
                              nr_frags, mss);
 
         if (count) {
+                skb_tx_timestamp(skb);
+
                 e1000_tx_queue(adapter, tx_ring, tx_flags, count);
                 /* Make sure there is space in the ring for the next send. */
                 e1000_maybe_stop_tx(netdev, tx_ring, MAX_SKB_FRAGS + 2);
@@ -3380,7 +3404,7 @@ static void e1000_dump(struct e1000_adapter *adapter)
         for (i = 0; tx_ring->desc && (i < tx_ring->count); i++) {
                 struct e1000_tx_desc *tx_desc = E1000_TX_DESC(*tx_ring, i);
                 struct e1000_buffer *buffer_info = &tx_ring->buffer_info[i];
-                struct my_u { u64 a; u64 b; };
+                struct my_u { __le64 a; __le64 b; };
                 struct my_u *u = (struct my_u *)tx_desc;
                 const char *type;
 
@@ -3424,7 +3448,7 @@ rx_ring_summary:
         for (i = 0; rx_ring->desc && (i < rx_ring->count); i++) {
                 struct e1000_rx_desc *rx_desc = E1000_RX_DESC(*rx_ring, i);
                 struct e1000_buffer *buffer_info = &rx_ring->buffer_info[i];
-                struct my_u { u64 a; u64 b; };
+                struct my_u { __le64 a; __le64 b; };
                 struct my_u *u = (struct my_u *)rx_desc;
                 const char *type;
 
@@ -4046,7 +4070,11 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
                 /* errors is only valid for DD + EOP descriptors */
                 if (unlikely((status & E1000_RXD_STAT_EOP) &&
                     (rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK))) {
-                        u8 last_byte = *(skb->data + length - 1);
+                        u8 *mapped;
+                        u8 last_byte;
+
+                        mapped = page_address(buffer_info->page);
+                        last_byte = *(mapped + length - 1);
                         if (TBI_ACCEPT(hw, status, rx_desc->errors, length,
                                        last_byte)) {
                                 spin_lock_irqsave(&adapter->stats_lock,
@@ -4057,6 +4085,8 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
                                                        irq_flags);
                                 length--;
                         } else {
+                                if (netdev->features & NETIF_F_RXALL)
+                                        goto process_skb;
                                 /* recycle both page and skb */
                                 buffer_info->skb = skb;
                                 /* an error means any chain goes out the window
@@ -4069,6 +4099,7 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
                 }
 
 #define rxtop rx_ring->rx_skb_top
+process_skb:
                 if (!(status & E1000_RXD_STAT_EOP)) {
                         /* this descriptor is only the beginning (or middle) */
                         if (!rxtop) {
@@ -4276,12 +4307,15 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
                                                        flags);
                                 length--;
                         } else {
+                                if (netdev->features & NETIF_F_RXALL)
+                                        goto process_skb;
                                 /* recycle */
                                 buffer_info->skb = skb;
                                 goto next_desc;
                         }
                 }
 
+process_skb:
                 total_rx_bytes += (length - 4); /* don't count FCS */
                 total_rx_packets++;
 
@@ -4365,30 +4399,6 @@ e1000_alloc_jumbo_rx_buffers(struct e1000_adapter *adapter,
                         break;
                 }
 
-                /* Fix for errata 23, can't cross 64kB boundary */
-                if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
-                        struct sk_buff *oldskb = skb;
-                        e_err(rx_err, "skb align check failed: %u bytes at "
-                              "%p\n", bufsz, skb->data);
-                        /* Try again, without freeing the previous */
-                        skb = netdev_alloc_skb_ip_align(netdev, bufsz);
-                        /* Failed allocation, critical failure */
-                        if (!skb) {
-                                dev_kfree_skb(oldskb);
-                                adapter->alloc_rx_buff_failed++;
-                                break;
-                        }
-
-                        if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
-                                /* give up */
-                                dev_kfree_skb(skb);
-                                dev_kfree_skb(oldskb);
-                                break; /* while (cleaned_count--) */
-                        }
-
-                        /* Use new allocation */
-                        dev_kfree_skb(oldskb);
-                }
                 buffer_info->skb = skb;
                 buffer_info->length = adapter->rx_buffer_len;
 check_page:
diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
index bac9dda31b6c..4dd18a1f45d2 100644
--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c
+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
@@ -228,9 +228,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_hw *hw)
         /* FWSM register */
         mac->has_fwsm = true;
         /* ARC supported; valid only if manageability features are enabled. */
-        mac->arc_subsystem_valid =
-                (er32(FWSM) & E1000_FWSM_MODE_MASK)
-                        ? true : false;
+        mac->arc_subsystem_valid = !!(er32(FWSM) & E1000_FWSM_MODE_MASK);
         /* Adaptive IFS not supported */
         mac->adaptive_ifs = false;
 
@@ -766,6 +764,7 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw)
 {
         u32 ctrl;
         s32 ret_val;
+        u16 kum_reg_data;
 
         /*
          * Prevent the PCI-E bus from sticking if there is no TLP connection
@@ -791,6 +790,13 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw)
         ew32(CTRL, ctrl | E1000_CTRL_RST);
         e1000_release_phy_80003es2lan(hw);
 
+        /* Disable IBIST slave mode (far-end loopback) */
+        e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
+                                        &kum_reg_data);
+        kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;
+        e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
+                                         kum_reg_data);
+
         ret_val = e1000e_get_auto_rd_done(hw);
         if (ret_val)
                 /* We don't want to continue accessing MAC registers. */
@@ -938,6 +944,14 @@ static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw)
         else
                 reg |= (1 << 28);
         ew32(TARC(1), reg);
+
+        /*
+         * Disable IPv6 extension header parsing because some malformed
+         * IPv6 headers can hang the Rx.
+         */
+        reg = er32(RFCTL);
+        reg |= (E1000_RFCTL_IPV6_EX_DIS | E1000_RFCTL_NEW_IPV6_EXT_DIS);
+        ew32(RFCTL, reg);
 }
 
 /**
@@ -1433,6 +1447,7 @@ static const struct e1000_mac_operations es2_mac_ops = {
         /* setup_physical_interface dependent on media type */
         .setup_led              = e1000e_setup_led_generic,
         .config_collision_dist  = e1000e_config_collision_dist_generic,
+        .rar_set                = e1000e_rar_set_generic,
 };
 
 static const struct e1000_phy_operations es2_phy_ops = {
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index b3fdc6977f2e..36db4df09aed 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -295,9 +295,8 @@ static s32 e1000_init_mac_params_82571(struct e1000_hw *hw)
                  * ARC supported; valid only if manageability features are
                  * enabled.
                  */
-                mac->arc_subsystem_valid =
-                        (er32(FWSM) & E1000_FWSM_MODE_MASK)
-                        ? true : false;
+                mac->arc_subsystem_valid = !!(er32(FWSM) &
+                                              E1000_FWSM_MODE_MASK);
                 break;
         case e1000_82574:
         case e1000_82583:
@@ -798,7 +797,7 @@ static s32 e1000_update_nvm_checksum_82571(struct e1000_hw *hw)
         /* Check for pending operations. */
         for (i = 0; i < E1000_FLASH_UPDATES; i++) {
                 usleep_range(1000, 2000);
-                if ((er32(EECD) & E1000_EECD_FLUPD) == 0)
+                if (!(er32(EECD) & E1000_EECD_FLUPD))
                         break;
         }
 
@@ -822,7 +821,7 @@ static s32 e1000_update_nvm_checksum_82571(struct e1000_hw *hw)
 
         for (i = 0; i < E1000_FLASH_UPDATES; i++) {
                 usleep_range(1000, 2000);
-                if ((er32(EECD) & E1000_EECD_FLUPD) == 0)
+                if (!(er32(EECD) & E1000_EECD_FLUPD))
                         break;
         }
 
@@ -1000,7 +999,7 @@ static s32 e1000_set_d0_lplu_state_82571(struct e1000_hw *hw, bool active)
  **/
 static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
 {
-        u32 ctrl, ctrl_ext;
+        u32 ctrl, ctrl_ext, eecd;
         s32 ret_val;
 
         /*
@@ -1073,6 +1072,16 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
          */
 
         switch (hw->mac.type) {
+        case e1000_82571:
+        case e1000_82572:
+                /*
+                 * REQ and GNT bits need to be cleared when using AUTO_RD
+                 * to access the EEPROM.
+                 */
+                eecd = er32(EECD);
+                eecd &= ~(E1000_EECD_REQ | E1000_EECD_GNT);
+                ew32(EECD, eecd);
+                break;
         case e1000_82573:
         case e1000_82574:
         case e1000_82583:
@@ -1280,6 +1289,16 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
                 ew32(CTRL_EXT, reg);
         }
 
+        /*
+         * Disable IPv6 extension header parsing because some malformed
+         * IPv6 headers can hang the Rx.
+         */
+        if (hw->mac.type <= e1000_82573) {
+                reg = er32(RFCTL);
+                reg |= (E1000_RFCTL_IPV6_EX_DIS | E1000_RFCTL_NEW_IPV6_EXT_DIS);
+                ew32(RFCTL, reg);
+        }
+
         /* PCI-Ex Control Registers */
         switch (hw->mac.type) {
         case e1000_82574:
@@ -1763,7 +1782,8 @@ void e1000e_set_laa_state_82571(struct e1000_hw *hw, bool state)
                  * incoming packets directed to this port are dropped.
                  * Eventually the LAA will be in RAR[0] and RAR[14].
                  */
-                e1000e_rar_set(hw, hw->mac.addr, hw->mac.rar_entry_count - 1);
+                hw->mac.ops.rar_set(hw, hw->mac.addr,
+                                    hw->mac.rar_entry_count - 1);
 }
 
 /**
@@ -1927,6 +1947,7 @@ static const struct e1000_mac_operations e82571_mac_ops = {
         .setup_led              = e1000e_setup_led_generic,
         .config_collision_dist  = e1000e_config_collision_dist_generic,
         .read_mac_addr          = e1000_read_mac_addr_82571,
+        .rar_set                = e1000e_rar_set_generic,
 };
 
 static const struct e1000_phy_operations e82_phy_ops_igp = {
@@ -2061,9 +2082,11 @@ const struct e1000_info e1000_82574_info = {
                                   | FLAG_HAS_SMART_POWER_DOWN
                                   | FLAG_HAS_AMT
                                   | FLAG_HAS_CTRLEXT_ON_LOAD,
-        .flags2                   = FLAG2_CHECK_PHY_HANG
+        .flags2                  = FLAG2_CHECK_PHY_HANG
                                   | FLAG2_DISABLE_ASPM_L0S
-                                  | FLAG2_NO_DISABLE_RX,
+                                  | FLAG2_DISABLE_ASPM_L1
+                                  | FLAG2_NO_DISABLE_RX
+                                  | FLAG2_DMA_BURST,
         .pba                    = 32,
         .max_hw_frame_size      = DEFAULT_JUMBO,
         .get_variants           = e1000_get_variants_82571,
diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h
index 3a5025917163..351a4097b2ba 100644
--- a/drivers/net/ethernet/intel/e1000e/defines.h
+++ b/drivers/net/ethernet/intel/e1000e/defines.h
@@ -74,7 +74,9 @@
 #define E1000_WUS_BC           E1000_WUFC_BC
 
 /* Extended Device Control */
+#define E1000_CTRL_EXT_LPCD  0x00000004     /* LCD Power Cycle Done */
 #define E1000_CTRL_EXT_SDP3_DATA 0x00000080 /* Value of SW Definable Pin 3 */
+#define E1000_CTRL_EXT_FORCE_SMBUS 0x00000800 /* Force SMBus mode */
 #define E1000_CTRL_EXT_EE_RST    0x00002000 /* Reinitialize from EEPROM */
 #define E1000_CTRL_EXT_SPD_BYPS  0x00008000 /* Speed Select Bypass */
 #define E1000_CTRL_EXT_RO_DIS    0x00020000 /* Relaxed Ordering disable */
@@ -573,6 +575,7 @@
 #define NWAY_AR_ASM_DIR          0x0800   /* Asymmetric Pause Direction bit */
 
 /* Link Partner Ability Register (Base Page) */
+#define NWAY_LPAR_100TX_FD_CAPS  0x0100 /* LP 100TX Full Dplx Capable */
 #define NWAY_LPAR_PAUSE          0x0400 /* LP Pause operation desired */
 #define NWAY_LPAR_ASM_DIR        0x0800 /* LP Asymmetric Pause Direction bit */
 
@@ -739,6 +742,7 @@
 #define I82577_E_PHY_ID      0x01540050
 #define I82578_E_PHY_ID      0x004DD040
 #define I82579_E_PHY_ID      0x01540090
+#define I217_E_PHY_ID        0x015400A0
 
 /* M88E1000 Specific Registers */
 #define M88E1000_PHY_SPEC_CTRL     0x10  /* PHY Specific Control Register */
@@ -850,4 +854,8 @@
 /* SerDes Control */
 #define E1000_GEN_POLL_TIMEOUT          640
 
+/* FW Semaphore */
+#define E1000_FWSM_WLOCK_MAC_MASK       0x0380
+#define E1000_FWSM_WLOCK_MAC_SHIFT      7
+
 #endif /* _E1000_DEFINES_H_ */
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index b83897f76ee3..6e6fffb34581 100644
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -206,6 +206,7 @@ enum e1000_boards {
         board_ich10lan,
         board_pchlan,
         board_pch2lan,
+        board_pch_lpt,
 };
 
 struct e1000_ps_page {
@@ -528,6 +529,7 @@ extern const struct e1000_info e1000_ich9_info;
 extern const struct e1000_info e1000_ich10_info;
 extern const struct e1000_info e1000_pch_info;
 extern const struct e1000_info e1000_pch2_info;
+extern const struct e1000_info e1000_pch_lpt_info;
 extern const struct e1000_info e1000_es2_info;
 
 extern s32 e1000_read_pba_string_generic(struct e1000_hw *hw, u8 *pba_num,
@@ -576,7 +578,7 @@ extern void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count);
 extern void e1000e_update_mc_addr_list_generic(struct e1000_hw *hw,
                                                u8 *mc_addr_list,
                                                u32 mc_addr_count);
-extern void e1000e_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);
+extern void e1000e_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index);
 extern s32 e1000e_set_fc_watermarks(struct e1000_hw *hw);
 extern void e1000e_set_pcie_no_snoop(struct e1000_hw *hw, u32 no_snoop);
 extern s32 e1000e_get_hw_semaphore(struct e1000_hw *hw);
@@ -673,11 +675,21 @@ static inline s32 e1e_rphy(struct e1000_hw *hw, u32 offset, u16 *data)
         return hw->phy.ops.read_reg(hw, offset, data);
 }
 
+static inline s32 e1e_rphy_locked(struct e1000_hw *hw, u32 offset, u16 *data)
+{
+        return hw->phy.ops.read_reg_locked(hw, offset, data);
+}
+
 static inline s32 e1e_wphy(struct e1000_hw *hw, u32 offset, u16 data)
 {
         return hw->phy.ops.write_reg(hw, offset, data);
 }
 
+static inline s32 e1e_wphy_locked(struct e1000_hw *hw, u32 offset, u16 data)
+{
+        return hw->phy.ops.write_reg_locked(hw, offset, data);
+}
+
 static inline s32 e1000_get_cable_length(struct e1000_hw *hw)
 {
         return hw->phy.ops.get_cable_length(hw);
@@ -735,9 +747,46 @@ static inline u32 __er32(struct e1000_hw *hw, unsigned long reg)
         return readl(hw->hw_addr + reg);
 }
 
+#define er32(reg)       __er32(hw, E1000_##reg)
+
+/**
+ * __ew32_prepare - prepare to write to MAC CSR register on certain parts
+ * @hw: pointer to the HW structure
+ *
+ * When updating the MAC CSR registers, the Manageability Engine (ME) could
+ * be accessing the registers at the same time.  Normally, this is handled in
+ * h/w by an arbiter but on some parts there is a bug that acknowledges Host
+ * accesses later than it should which could result in the register to have
+ * an incorrect value.  Workaround this by checking the FWSM register which
+ * has bit 24 set while ME is accessing MAC CSR registers, wait if it is set
+ * and try again a number of times.
+ **/
+static inline s32 __ew32_prepare(struct e1000_hw *hw)
+{
+        s32 i = E1000_ICH_FWSM_PCIM2PCI_COUNT;
+
+        while ((er32(FWSM) & E1000_ICH_FWSM_PCIM2PCI) && --i)
+                udelay(50);
+
+        return i;
+}
+
 static inline void __ew32(struct e1000_hw *hw, unsigned long reg, u32 val)
 {
+        if (hw->adapter->flags2 & FLAG2_PCIM2PCI_ARBITER_WA)
+                __ew32_prepare(hw);
+
         writel(val, hw->hw_addr + reg);
 }
 
+#define ew32(reg, val)  __ew32(hw, E1000_##reg, (val))
+
+#define e1e_flush()     er32(STATUS)
+
+#define E1000_WRITE_REG_ARRAY(a, reg, offset, value) \
+        (__ew32((a), (reg + ((offset) << 2)), (value)))
+
+#define E1000_READ_REG_ARRAY(a, reg, offset) \
+        (readl((a)->hw_addr + reg + ((offset) << 2)))
+
 #endif /* _E1000_H_ */
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index db35dd5d96de..d863075df7a4 100644
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -259,8 +259,7 @@ static int e1000_set_settings(struct net_device *netdev,
          * cannot be changed
          */
         if (hw->phy.ops.check_reset_block(hw)) {
-                e_err("Cannot change link characteristics when SoL/IDER is "
-                      "active.\n");
+                e_err("Cannot change link characteristics when SoL/IDER is active.\n");
                 return -EINVAL;
         }
 
@@ -403,15 +402,15 @@ static void e1000_get_regs(struct net_device *netdev,
         regs_buff[1]  = er32(STATUS);
 
         regs_buff[2]  = er32(RCTL);
-        regs_buff[3]  = er32(RDLEN);
-        regs_buff[4]  = er32(RDH);
-        regs_buff[5]  = er32(RDT);
+        regs_buff[3]  = er32(RDLEN(0));
+        regs_buff[4]  = er32(RDH(0));
+        regs_buff[5]  = er32(RDT(0));
         regs_buff[6]  = er32(RDTR);
 
         regs_buff[7]  = er32(TCTL);
-        regs_buff[8]  = er32(TDLEN);
-        regs_buff[9]  = er32(TDH);
-        regs_buff[10] = er32(TDT);
+        regs_buff[8]  = er32(TDLEN(0));
+        regs_buff[9]  = er32(TDH(0));
+        regs_buff[10] = er32(TDT(0));
         regs_buff[11] = er32(TIDV);
 
         regs_buff[12] = adapter->hw.phy.type;  /* PHY type (IGP=1, M88=0) */
@@ -727,9 +726,8 @@ static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data,
                                       (test[pat] & write));
                 val = E1000_READ_REG_ARRAY(&adapter->hw, reg, offset);
                 if (val != (test[pat] & write & mask)) {
-                        e_err("pattern test reg %04X failed: got 0x%08X "
-                              "expected 0x%08X\n", reg + offset, val,
-                              (test[pat] & write & mask));
+                        e_err("pattern test reg %04X failed: got 0x%08X expected 0x%08X\n",
+                              reg + offset, val, (test[pat] & write & mask));
                         *data = reg;
                         return 1;
                 }
@@ -744,8 +742,8 @@ static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data,
         __ew32(&adapter->hw, reg, write & mask);
         val = __er32(&adapter->hw, reg);
         if ((write & mask) != (val & mask)) {
-                e_err("set/check reg %04X test failed: got 0x%08X "
-                      "expected 0x%08X\n", reg, (val & mask), (write & mask));
+                e_err("set/check reg %04X test failed: got 0x%08X expected 0x%08X\n",
+                      reg, (val & mask), (write & mask));
                 *data = reg;
                 return 1;
         }
@@ -775,6 +773,7 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
         u32 i;
         u32 toggle;
         u32 mask;
+        u32 wlock_mac = 0;
 
         /*
          * The status register is Read Only, so a write should fail.
@@ -797,8 +796,8 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
         ew32(STATUS, toggle);
         after = er32(STATUS) & toggle;
         if (value != after) {
-                e_err("failed STATUS register test got: 0x%08X expected: "
-                      "0x%08X\n", after, value);
+                e_err("failed STATUS register test got: 0x%08X expected: 0x%08X\n",
+                      after, value);
                 *data = 1;
                 return 1;
         }
@@ -813,15 +812,15 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
         }
 
         REG_PATTERN_TEST(E1000_RDTR, 0x0000FFFF, 0xFFFFFFFF);
-        REG_PATTERN_TEST(E1000_RDBAH, 0xFFFFFFFF, 0xFFFFFFFF);
-        REG_PATTERN_TEST(E1000_RDLEN, 0x000FFF80, 0x000FFFFF);
-        REG_PATTERN_TEST(E1000_RDH, 0x0000FFFF, 0x0000FFFF);
-        REG_PATTERN_TEST(E1000_RDT, 0x0000FFFF, 0x0000FFFF);
+        REG_PATTERN_TEST(E1000_RDBAH(0), 0xFFFFFFFF, 0xFFFFFFFF);
+        REG_PATTERN_TEST(E1000_RDLEN(0), 0x000FFF80, 0x000FFFFF);
+        REG_PATTERN_TEST(E1000_RDH(0), 0x0000FFFF, 0x0000FFFF);
+        REG_PATTERN_TEST(E1000_RDT(0), 0x0000FFFF, 0x0000FFFF);
         REG_PATTERN_TEST(E1000_FCRTH, 0x0000FFF8, 0x0000FFF8);
         REG_PATTERN_TEST(E1000_FCTTV, 0x0000FFFF, 0x0000FFFF);
         REG_PATTERN_TEST(E1000_TIPG, 0x3FFFFFFF, 0x3FFFFFFF);
-        REG_PATTERN_TEST(E1000_TDBAH, 0xFFFFFFFF, 0xFFFFFFFF);
-        REG_PATTERN_TEST(E1000_TDLEN, 0x000FFF80, 0x000FFFFF);
+        REG_PATTERN_TEST(E1000_TDBAH(0), 0xFFFFFFFF, 0xFFFFFFFF);
+        REG_PATTERN_TEST(E1000_TDLEN(0), 0x000FFF80, 0x000FFFFF);
 
         REG_SET_AND_CHECK(E1000_RCTL, 0xFFFFFFFF, 0x00000000);
 
@@ -830,29 +829,41 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
         REG_SET_AND_CHECK(E1000_TCTL, 0xFFFFFFFF, 0x00000000);
 
         REG_SET_AND_CHECK(E1000_RCTL, before, 0xFFFFFFFF);
-        REG_PATTERN_TEST(E1000_RDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
+        REG_PATTERN_TEST(E1000_RDBAL(0), 0xFFFFFFF0, 0xFFFFFFFF);
         if (!(adapter->flags & FLAG_IS_ICH))
                 REG_PATTERN_TEST(E1000_TXCW, 0xC000FFFF, 0x0000FFFF);
-        REG_PATTERN_TEST(E1000_TDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
+        REG_PATTERN_TEST(E1000_TDBAL(0), 0xFFFFFFF0, 0xFFFFFFFF);
         REG_PATTERN_TEST(E1000_TIDV, 0x0000FFFF, 0x0000FFFF);
         mask = 0x8003FFFF;
         switch (mac->type) {
         case e1000_ich10lan:
         case e1000_pchlan:
         case e1000_pch2lan:
+        case e1000_pch_lpt:
                 mask |= (1 << 18);
                 break;
         default:
                 break;
         }
-        for (i = 0; i < mac->rar_entry_count; i++)
+
+        if (mac->type == e1000_pch_lpt)
+                wlock_mac = (er32(FWSM) & E1000_FWSM_WLOCK_MAC_MASK) >>
+                    E1000_FWSM_WLOCK_MAC_SHIFT;
+
+        for (i = 0; i < mac->rar_entry_count; i++) {
+                /* Cannot test write-protected SHRAL[n] registers */
+                if ((wlock_mac == 1) || (wlock_mac && (i > wlock_mac)))
+                        continue;
+
                 REG_PATTERN_TEST_ARRAY(E1000_RA, ((i << 1) + 1),
-                                       mask, 0xFFFFFFFF);
+                                       mask, 0xFFFFFFFF);
+        }
 
         for (i = 0; i < mac->mta_reg_count; i++)
                 REG_PATTERN_TEST_ARRAY(E1000_MTA, i, 0xFFFFFFFF, 0xFFFFFFFF);
 
         *data = 0;
+
         return 0;
 }
 
@@ -1104,11 +1115,11 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
         tx_ring->next_to_use = 0;
         tx_ring->next_to_clean = 0;
 
-        ew32(TDBAL, ((u64) tx_ring->dma & 0x00000000FFFFFFFF));
-        ew32(TDBAH, ((u64) tx_ring->dma >> 32));
-        ew32(TDLEN, tx_ring->count * sizeof(struct e1000_tx_desc));
-        ew32(TDH, 0);
-        ew32(TDT, 0);
+        ew32(TDBAL(0), ((u64) tx_ring->dma & 0x00000000FFFFFFFF));
+        ew32(TDBAH(0), ((u64) tx_ring->dma >> 32));
+        ew32(TDLEN(0), tx_ring->count * sizeof(struct e1000_tx_desc));
+        ew32(TDH(0), 0);
+        ew32(TDT(0), 0);
         ew32(TCTL, E1000_TCTL_PSP | E1000_TCTL_EN | E1000_TCTL_MULR |
              E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT |
              E1000_COLLISION_DISTANCE << E1000_COLD_SHIFT);
@@ -1168,11 +1179,11 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
         rctl = er32(RCTL);
         if (!(adapter->flags2 & FLAG2_NO_DISABLE_RX))
                 ew32(RCTL, rctl & ~E1000_RCTL_EN);
-        ew32(RDBAL, ((u64) rx_ring->dma & 0xFFFFFFFF));
-        ew32(RDBAH, ((u64) rx_ring->dma >> 32));
-        ew32(RDLEN, rx_ring->size);
-        ew32(RDH, 0);
-        ew32(RDT, 0);
+        ew32(RDBAL(0), ((u64) rx_ring->dma & 0xFFFFFFFF));
+        ew32(RDBAH(0), ((u64) rx_ring->dma >> 32));
+        ew32(RDLEN(0), rx_ring->size);
+        ew32(RDH(0), 0);
+        ew32(RDT(0), 0);
         rctl = E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_SZ_2048 |
                 E1000_RCTL_UPE | E1000_RCTL_MPE | E1000_RCTL_LPE |
                 E1000_RCTL_SBP | E1000_RCTL_SECRC |
@@ -1534,7 +1545,7 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter)
         int ret_val = 0;
         unsigned long time;
 
-        ew32(RDT, rx_ring->count - 1);
+        ew32(RDT(0), rx_ring->count - 1);
 
         /*
          * Calculate the loop count based on the largest descriptor ring
@@ -1561,7 +1572,7 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter)
                         if (k == tx_ring->count)
                                 k = 0;
                 }
-                ew32(TDT, k);
+                ew32(TDT(0), k);
                 e1e_flush();
                 msleep(200);
                 time = jiffies; /* set the start time for the receive */
@@ -1791,8 +1802,7 @@ static void e1000_get_wol(struct net_device *netdev,
                 wol->supported &= ~WAKE_UCAST;
 
                 if (adapter->wol & E1000_WUFC_EX)
-                        e_err("Interface does not support directed (unicast) "
-                              "frame wake-up packets\n");
+                        e_err("Interface does not support directed (unicast) frame wake-up packets\n");
         }
 
         if (adapter->wol & E1000_WUFC_EX)
diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
index f82ecf536c8b..ed5b40985edb 100644
--- a/drivers/net/ethernet/intel/e1000e/hw.h
+++ b/drivers/net/ethernet/intel/e1000e/hw.h
@@ -36,16 +36,6 @@ struct e1000_adapter;
 
 #include "defines.h"
 
-#define er32(reg)       __er32(hw, E1000_##reg)
-#define ew32(reg,val)   __ew32(hw, E1000_##reg, (val))
-#define e1e_flush()     er32(STATUS)
-
-#define E1000_WRITE_REG_ARRAY(a, reg, offset, value) \
-        (writel((value), ((a)->hw_addr + reg + ((offset) << 2))))
-
-#define E1000_READ_REG_ARRAY(a, reg, offset) \
-        (readl((a)->hw_addr + reg + ((offset) << 2)))
-
 enum e1e_registers {
         E1000_CTRL     = 0x00000, /* Device Control - RW */
         E1000_STATUS   = 0x00008, /* Device Status - RO */
@@ -61,6 +51,7 @@ enum e1e_registers {
         E1000_FEXTNVM  = 0x00028, /* Future Extended NVM - RW */
         E1000_FCT      = 0x00030, /* Flow Control Type - RW */
         E1000_VET      = 0x00038, /* VLAN Ether Type - RW */
+        E1000_FEXTNVM3 = 0x0003C, /* Future Extended NVM 3 - RW */
         E1000_ICR      = 0x000C0, /* Interrupt Cause Read - R/clr */
         E1000_ITR      = 0x000C4, /* Interrupt Throttling Rate - RW */
         E1000_ICS      = 0x000C8, /* Interrupt Cause Set - WO */
@@ -94,31 +85,40 @@ enum e1e_registers {
         E1000_FCRTL    = 0x02160, /* Flow Control Receive Threshold Low - RW */
         E1000_FCRTH    = 0x02168, /* Flow Control Receive Threshold High - RW */
         E1000_PSRCTL   = 0x02170, /* Packet Split Receive Control - RW */
-        E1000_RDBAL    = 0x02800, /* Rx Descriptor Base Address Low - RW */
-        E1000_RDBAH    = 0x02804, /* Rx Descriptor Base Address High - RW */
-        E1000_RDLEN    = 0x02808, /* Rx Descriptor Length - RW */
-        E1000_RDH      = 0x02810, /* Rx Descriptor Head - RW */
-        E1000_RDT      = 0x02818, /* Rx Descriptor Tail - RW */
-        E1000_RDTR     = 0x02820, /* Rx Delay Timer - RW */
-        E1000_RXDCTL_BASE = 0x02828, /* Rx Descriptor Control - RW */
-#define E1000_RXDCTL(_n)   (E1000_RXDCTL_BASE + (_n << 8))
-        E1000_RADV     = 0x0282C, /* Rx Interrupt Absolute Delay Timer - RW */
-
-/* Convenience macros
+/*
+ * Convenience macros
  *
  * Note: "_n" is the queue number of the register to be written to.
  *
  * Example usage:
- * E1000_RDBAL_REG(current_rx_queue)
- *
+ * E1000_RDBAL(current_rx_queue)
  */
-#define E1000_RDBAL_REG(_n)   (E1000_RDBAL + (_n << 8))
+        E1000_RDBAL_BASE = 0x02800, /* Rx Descriptor Base Address Low - RW */
+#define E1000_RDBAL(_n) (E1000_RDBAL_BASE + (_n << 8))
+        E1000_RDBAH_BASE = 0x02804, /* Rx Descriptor Base Address High - RW */
+#define E1000_RDBAH(_n) (E1000_RDBAH_BASE + (_n << 8))
+        E1000_RDLEN_BASE = 0x02808, /* Rx Descriptor Length - RW */
+#define E1000_RDLEN(_n) (E1000_RDLEN_BASE + (_n << 8))
+        E1000_RDH_BASE = 0x02810, /* Rx Descriptor Head - RW */
+#define E1000_RDH(_n)   (E1000_RDH_BASE + (_n << 8))
+        E1000_RDT_BASE = 0x02818, /* Rx Descriptor Tail - RW */
+#define E1000_RDT(_n)   (E1000_RDT_BASE + (_n << 8))
+        E1000_RDTR     = 0x02820, /* Rx Delay Timer - RW */
+        E1000_RXDCTL_BASE = 0x02828, /* Rx Descriptor Control - RW */
+#define E1000_RXDCTL(_n)   (E1000_RXDCTL_BASE + (_n << 8))
+        E1000_RADV     = 0x0282C, /* Rx Interrupt Absolute Delay Timer - RW */
+
         E1000_KABGTXD  = 0x03004, /* AFE Band Gap Transmit Ref Data */
-        E1000_TDBAL    = 0x03800, /* Tx Descriptor Base Address Low - RW */
-        E1000_TDBAH    = 0x03804, /* Tx Descriptor Base Address High - RW */
-        E1000_TDLEN    = 0x03808, /* Tx Descriptor Length - RW */
-        E1000_TDH      = 0x03810, /* Tx Descriptor Head - RW */
-        E1000_TDT      = 0x03818, /* Tx Descriptor Tail - RW */
+        E1000_TDBAL_BASE = 0x03800, /* Tx Descriptor Base Address Low - RW */
+#define E1000_TDBAL(_n) (E1000_TDBAL_BASE + (_n << 8))
+        E1000_TDBAH_BASE = 0x03804, /* Tx Descriptor Base Address High - RW */
+#define E1000_TDBAH(_n) (E1000_TDBAH_BASE + (_n << 8))
+        E1000_TDLEN_BASE = 0x03808, /* Tx Descriptor Length - RW */
+#define E1000_TDLEN(_n) (E1000_TDLEN_BASE + (_n << 8))
+        E1000_TDH_BASE = 0x03810, /* Tx Descriptor Head - RW */
+#define E1000_TDH(_n)   (E1000_TDH_BASE + (_n << 8))
+        E1000_TDT_BASE = 0x03818, /* Tx Descriptor Tail - RW */
+#define E1000_TDT(_n)   (E1000_TDT_BASE + (_n << 8))
         E1000_TIDV     = 0x03820, /* Tx Interrupt Delay Value - RW */
         E1000_TXDCTL_BASE = 0x03828, /* Tx Descriptor Control - RW */
 #define E1000_TXDCTL(_n)   (E1000_TXDCTL_BASE + (_n << 8))
@@ -200,6 +200,14 @@ enum e1e_registers {
 #define E1000_RA        (E1000_RAL(0))
         E1000_RAH_BASE = 0x05404, /* Receive Address High - RW */
 #define E1000_RAH(_n)   (E1000_RAH_BASE + ((_n) * 8))
+        E1000_SHRAL_PCH_LPT_BASE = 0x05408,
+#define E1000_SHRAL_PCH_LPT(_n)   (E1000_SHRAL_PCH_LPT_BASE + ((_n) * 8))
+        E1000_SHRAH_PCH_LTP_BASE = 0x0540C,
+#define E1000_SHRAH_PCH_LPT(_n)   (E1000_SHRAH_PCH_LTP_BASE + ((_n) * 8))
+        E1000_SHRAL_BASE = 0x05438, /* Shared Receive Address Low - RW */
+#define E1000_SHRAL(_n)   (E1000_SHRAL_BASE + ((_n) * 8))
+        E1000_SHRAH_BASE = 0x0543C, /* Shared Receive Address High - RW */
+#define E1000_SHRAH(_n)   (E1000_SHRAH_BASE + ((_n) * 8))
         E1000_VFTA     = 0x05600, /* VLAN Filter Table Array - RW Array */
         E1000_WUC      = 0x05800, /* Wakeup Control - RW */
         E1000_WUFC     = 0x05808, /* Wakeup Filter Control - RW */
@@ -402,6 +410,8 @@ enum e1e_registers {
 #define E1000_DEV_ID_PCH_D_HV_DC                0x10F0
 #define E1000_DEV_ID_PCH2_LV_LM                 0x1502
 #define E1000_DEV_ID_PCH2_LV_V                  0x1503
+#define E1000_DEV_ID_PCH_LPT_I217_LM            0x153A
+#define E1000_DEV_ID_PCH_LPT_I217_V             0x153B
 
 #define E1000_REVISION_4 4
 
@@ -422,6 +432,7 @@ enum e1000_mac_type {
         e1000_ich10lan,
         e1000_pchlan,
         e1000_pch2lan,
+        e1000_pch_lpt,
 };
 
 enum e1000_media_type {
@@ -459,6 +470,7 @@ enum e1000_phy_type {
         e1000_phy_82578,
         e1000_phy_82577,
         e1000_phy_82579,
+        e1000_phy_i217,
 };
 
 enum e1000_bus_width {
@@ -782,6 +794,7 @@ struct e1000_mac_operations {
         s32  (*setup_led)(struct e1000_hw *);
         void (*write_vfta)(struct e1000_hw *, u32, u32);
         void (*config_collision_dist)(struct e1000_hw *);
+        void (*rar_set)(struct e1000_hw *, u8 *, u32);
         s32  (*read_mac_addr)(struct e1000_hw *);
 };
 
@@ -966,6 +979,7 @@ struct e1000_dev_spec_ich8lan {
         struct e1000_shadow_ram shadow_ram[E1000_ICH8_SHADOW_RAM_WORDS];
         bool nvm_k1_enabled;
         bool eee_disable;
+        u16 eee_lp_ability;
 };
 
 struct e1000_hw {
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 64c76443a7aa..bbf70ba367da 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -105,6 +105,9 @@
 #define E1000_FEXTNVM_SW_CONFIG         1
 #define E1000_FEXTNVM_SW_CONFIG_ICH8M (1 << 27) /* Bit redefined for ICH8M :/ */
 
+#define E1000_FEXTNVM3_PHY_CFG_COUNTER_MASK    0x0C000000
+#define E1000_FEXTNVM3_PHY_CFG_COUNTER_50MSEC  0x08000000
+
 #define E1000_FEXTNVM4_BEACON_DURATION_MASK    0x7
 #define E1000_FEXTNVM4_BEACON_DURATION_8USEC   0x7
 #define E1000_FEXTNVM4_BEACON_DURATION_16USEC  0x3
@@ -112,6 +115,8 @@
 #define PCIE_ICH8_SNOOP_ALL             PCIE_NO_SNOOP_ALL
 
 #define E1000_ICH_RAR_ENTRIES           7
+#define E1000_PCH2_RAR_ENTRIES          5 /* RAR[0], SHRA[0-3] */
+#define E1000_PCH_LPT_RAR_ENTRIES       12 /* RAR[0], SHRA[0-10] */
 
 #define PHY_PAGE_SHIFT 5
 #define PHY_REG(page, reg) (((page) << PHY_PAGE_SHIFT) | \
@@ -127,14 +132,22 @@
 
 #define SW_FLAG_TIMEOUT    1000 /* SW Semaphore flag timeout in milliseconds */
 
+/* SMBus Control Phy Register */
+#define CV_SMB_CTRL             PHY_REG(769, 23)
+#define CV_SMB_CTRL_FORCE_SMBUS 0x0001
+
 /* SMBus Address Phy Register */
 #define HV_SMB_ADDR            PHY_REG(768, 26)
 #define HV_SMB_ADDR_MASK       0x007F
 #define HV_SMB_ADDR_PEC_EN     0x0200
 #define HV_SMB_ADDR_VALID      0x0080
+#define HV_SMB_ADDR_FREQ_MASK           0x1100
+#define HV_SMB_ADDR_FREQ_LOW_SHIFT      8
+#define HV_SMB_ADDR_FREQ_HIGH_SHIFT     12
 
 /* PHY Power Management Control */
 #define HV_PM_CTRL              PHY_REG(770, 17)
+#define HV_PM_CTRL_PLL_STOP_IN_K1_GIGA  0x100
 
 /* PHY Low Power Idle Control */
 #define I82579_LPI_CTRL                         PHY_REG(772, 20)
@@ -147,11 +160,26 @@
 #define I82579_LPI_UPDATE_TIMER 0x4805  /* in 40ns units + 40 ns base value */
 #define I82579_MSE_THRESHOLD    0x084F  /* Mean Square Error Threshold */
 #define I82579_MSE_LINK_DOWN    0x2411  /* MSE count before dropping link */
+#define I217_EEE_ADVERTISEMENT  0x8001  /* IEEE MMD Register 7.60 */
+#define I217_EEE_LP_ABILITY     0x8002  /* IEEE MMD Register 7.61 */
+#define I217_EEE_100_SUPPORTED  (1 << 1)        /* 100BaseTx EEE supported */
+
+/* Intel Rapid Start Technology Support */
+#define I217_PROXY_CTRL                 PHY_REG(BM_WUC_PAGE, 70)
+#define I217_PROXY_CTRL_AUTO_DISABLE    0x0080
+#define I217_SxCTRL                     PHY_REG(BM_PORT_CTRL_PAGE, 28)
+#define I217_SxCTRL_MASK                0x1000
+#define I217_CGFREG                     PHY_REG(772, 29)
+#define I217_CGFREG_MASK                0x0002
+#define I217_MEMPWR                     PHY_REG(772, 26)
+#define I217_MEMPWR_MASK                0x0010
 
 /* Strapping Option Register - RO */
 #define E1000_STRAP                     0x0000C
 #define E1000_STRAP_SMBUS_ADDRESS_MASK  0x00FE0000
 #define E1000_STRAP_SMBUS_ADDRESS_SHIFT 17
+#define E1000_STRAP_SMT_FREQ_MASK       0x00003000
+#define E1000_STRAP_SMT_FREQ_SHIFT      12
 
 /* OEM Bits Phy Register */
 #define HV_OEM_BITS            PHY_REG(768, 25)
@@ -255,6 +283,8 @@ static s32  e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link);
 static s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw);
 static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw);
 static bool e1000_check_mng_mode_pchlan(struct e1000_hw *hw);
+static void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index);
+static void e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index);
 static s32 e1000_k1_workaround_lv(struct e1000_hw *hw);
 static void e1000_gate_hw_phy_config_ich8lan(struct e1000_hw *hw, bool gate);
 
@@ -283,18 +313,161 @@ static inline void __ew32flash(struct e1000_hw *hw, unsigned long reg, u32 val)
 #define ew16flash(reg, val)     __ew16flash(hw, (reg), (val))
 #define ew32flash(reg, val)     __ew32flash(hw, (reg), (val))
 
-static void e1000_toggle_lanphypc_value_ich8lan(struct e1000_hw *hw)
+/**
+ *  e1000_phy_is_accessible_pchlan - Check if able to access PHY registers
+ *  @hw: pointer to the HW structure
+ *
+ *  Test access to the PHY registers by reading the PHY ID registers.  If
+ *  the PHY ID is already known (e.g. resume path) compare it with known ID,
+ *  otherwise assume the read PHY ID is correct if it is valid.
+ *
+ *  Assumes the sw/fw/hw semaphore is already acquired.
+ **/
+static bool e1000_phy_is_accessible_pchlan(struct e1000_hw *hw)
 {
-        u32 ctrl;
+        u16 phy_reg;
+        u32 phy_id;
 
-        ctrl = er32(CTRL);
-        ctrl |= E1000_CTRL_LANPHYPC_OVERRIDE;
-        ctrl &= ~E1000_CTRL_LANPHYPC_VALUE;
-        ew32(CTRL, ctrl);
-        e1e_flush();
-        udelay(10);
-        ctrl &= ~E1000_CTRL_LANPHYPC_OVERRIDE;
-        ew32(CTRL, ctrl);
+        e1e_rphy_locked(hw, PHY_ID1, &phy_reg);
+        phy_id = (u32)(phy_reg << 16);
+        e1e_rphy_locked(hw, PHY_ID2, &phy_reg);
+        phy_id |= (u32)(phy_reg & PHY_REVISION_MASK);
+
+        if (hw->phy.id) {
+                if (hw->phy.id == phy_id)
+                        return true;
+        } else {
+                if ((phy_id != 0) && (phy_id != PHY_REVISION_MASK))
+                        hw->phy.id = phy_id;
+                return true;
+        }
+
+        return false;
+}
+
+/**
+ *  e1000_init_phy_workarounds_pchlan - PHY initialization workarounds
+ *  @hw: pointer to the HW structure
+ *
+ *  Workarounds/flow necessary for PHY initialization during driver load
+ *  and resume paths.
+ **/
+static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw)
+{
+        u32 mac_reg, fwsm = er32(FWSM);
+        s32 ret_val;
+        u16 phy_reg;
+
+        ret_val = hw->phy.ops.acquire(hw);
+        if (ret_val) {
+                e_dbg("Failed to initialize PHY flow\n");
+                return ret_val;
+        }
+
+        /*
+         * The MAC-PHY interconnect may be in SMBus mode.  If the PHY is
+         * inaccessible and resetting the PHY is not blocked, toggle the
+         * LANPHYPC Value bit to force the interconnect to PCIe mode.
+         */
+        switch (hw->mac.type) {
+        case e1000_pch_lpt:
+                if (e1000_phy_is_accessible_pchlan(hw))
+                        break;
+
+                /*
+                 * Before toggling LANPHYPC, see if PHY is accessible by
+                 * forcing MAC to SMBus mode first.
+                 */
+                mac_reg = er32(CTRL_EXT);
+                mac_reg |= E1000_CTRL_EXT_FORCE_SMBUS;
+                ew32(CTRL_EXT, mac_reg);
+
+                /* fall-through */
+        case e1000_pch2lan:
+                /*
+                 * Gate automatic PHY configuration by hardware on
+                 * non-managed 82579
+                 */
+                if ((hw->mac.type == e1000_pch2lan) &&
+                    !(fwsm & E1000_ICH_FWSM_FW_VALID))
+                        e1000_gate_hw_phy_config_ich8lan(hw, true);
+
+                if (e1000_phy_is_accessible_pchlan(hw)) {
+                        if (hw->mac.type == e1000_pch_lpt) {
+                                /* Unforce SMBus mode in PHY */
+                                e1e_rphy_locked(hw, CV_SMB_CTRL, &phy_reg);
+                                phy_reg &= ~CV_SMB_CTRL_FORCE_SMBUS;
+                                e1e_wphy_locked(hw, CV_SMB_CTRL, phy_reg);
+
+                                /* Unforce SMBus mode in MAC */
+                                mac_reg = er32(CTRL_EXT);
+                                mac_reg &= ~E1000_CTRL_EXT_FORCE_SMBUS;
+                                ew32(CTRL_EXT, mac_reg);
+                        }
+                        break;
+                }
+
+                /* fall-through */
+        case e1000_pchlan:
+                if ((hw->mac.type == e1000_pchlan) &&
+                    (fwsm & E1000_ICH_FWSM_FW_VALID))
+                        break;
+
+                if (hw->phy.ops.check_reset_block(hw)) {
+                        e_dbg("Required LANPHYPC toggle blocked by ME\n");
+                        break;
+                }
+
+                e_dbg("Toggling LANPHYPC\n");
+
+                /* Set Phy Config Counter to 50msec */
+                mac_reg = er32(FEXTNVM3);
+                mac_reg &= ~E1000_FEXTNVM3_PHY_CFG_COUNTER_MASK;
+                mac_reg |= E1000_FEXTNVM3_PHY_CFG_COUNTER_50MSEC;
+                ew32(FEXTNVM3, mac_reg);
+
+                /* Toggle LANPHYPC Value bit */
+                mac_reg = er32(CTRL);
+                mac_reg |= E1000_CTRL_LANPHYPC_OVERRIDE;
+                mac_reg &= ~E1000_CTRL_LANPHYPC_VALUE;
+                ew32(CTRL, mac_reg);
+                e1e_flush();
+                udelay(10);
+                mac_reg &= ~E1000_CTRL_LANPHYPC_OVERRIDE;
+                ew32(CTRL, mac_reg);
+                e1e_flush();
+                if (hw->mac.type < e1000_pch_lpt) {
+                        msleep(50);
+                } else {
+                        u16 count = 20;
+                        do {
+                                usleep_range(5000, 10000);
+                        } while (!(er32(CTRL_EXT) &
+                                   E1000_CTRL_EXT_LPCD) && count--);
+                }
+                break;
+        default:
+                break;
+        }
+
+        hw->phy.ops.release(hw);
+
+        /*
+         * Reset the PHY before any access to it.  Doing so, ensures
+         * that the PHY is in a known good state before we read/write
+         * PHY registers.  The generic reset is sufficient here,
+         * because we haven't determined the PHY type yet.
+         */
+        ret_val = e1000e_phy_hw_reset_generic(hw);
+
+        /* Ungate automatic PHY configuration on non-managed 82579 */
+        if ((hw->mac.type == e1000_pch2lan) &&
+            !(fwsm & E1000_ICH_FWSM_FW_VALID)) {
+                usleep_range(10000, 20000);
+                e1000_gate_hw_phy_config_ich8lan(hw, false);
+        }
+
+        return ret_val;
 }
 
 /**
@@ -324,70 +497,41 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
         phy->ops.power_down           = e1000_power_down_phy_copper_ich8lan;
         phy->autoneg_mask             = AUTONEG_ADVERTISE_SPEED_DEFAULT;
 
-        if (!hw->phy.ops.check_reset_block(hw)) {
-                u32 fwsm = er32(FWSM);
-
-                /*
-                 * The MAC-PHY interconnect may still be in SMBus mode after
-                 * Sx->S0.  If resetting the PHY is not blocked, toggle the
-                 * LANPHYPC Value bit to force the interconnect to PCIe mode.
-                 */
-                e1000_toggle_lanphypc_value_ich8lan(hw);
-                msleep(50);
-
-                /*
-                 * Gate automatic PHY configuration by hardware on
-                 * non-managed 82579
-                 */
-                if ((hw->mac.type == e1000_pch2lan) &&
-                    !(fwsm & E1000_ICH_FWSM_FW_VALID))
-                        e1000_gate_hw_phy_config_ich8lan(hw, true);
-
-                /*
-                 * Reset the PHY before any access to it.  Doing so, ensures
-                 * that the PHY is in a known good state before we read/write
-                 * PHY registers.  The generic reset is sufficient here,
-                 * because we haven't determined the PHY type yet.
-                 */
-                ret_val = e1000e_phy_hw_reset_generic(hw);
-                if (ret_val)
-                        return ret_val;
+        phy->id = e1000_phy_unknown;
 
-                /* Ungate automatic PHY configuration on non-managed 82579 */
-                if ((hw->mac.type == e1000_pch2lan) &&
-                    !(fwsm & E1000_ICH_FWSM_FW_VALID)) {
-                        usleep_range(10000, 20000);
-                        e1000_gate_hw_phy_config_ich8lan(hw, false);
-                }
-        }
+        ret_val = e1000_init_phy_workarounds_pchlan(hw);
+        if (ret_val)
+                return ret_val;
 
-        phy->id = e1000_phy_unknown;
-        switch (hw->mac.type) {
-        default:
-                ret_val = e1000e_get_phy_id(hw);
-                if (ret_val)
-                        return ret_val;
-                if ((phy->id != 0) && (phy->id != PHY_REVISION_MASK))
+        if (phy->id == e1000_phy_unknown)
+                switch (hw->mac.type) {
+                default:
+                        ret_val = e1000e_get_phy_id(hw);
+                        if (ret_val)
+                                return ret_val;
+                        if ((phy->id != 0) && (phy->id != PHY_REVISION_MASK))
+                                break;
+                        /* fall-through */
+                case e1000_pch2lan:
+                case e1000_pch_lpt:
+                        /*
+                         * In case the PHY needs to be in mdio slow mode,
+                         * set slow mode and try to get the PHY id again.
+                         */
+                        ret_val = e1000_set_mdio_slow_mode_hv(hw);
+                        if (ret_val)
+                                return ret_val;
+                        ret_val = e1000e_get_phy_id(hw);
+                        if (ret_val)
+                                return ret_val;
                         break;
-                /* fall-through */
-        case e1000_pch2lan:
-                /*
-                 * In case the PHY needs to be in mdio slow mode,
-                 * set slow mode and try to get the PHY id again.
-                 */
-                ret_val = e1000_set_mdio_slow_mode_hv(hw);
-                if (ret_val)
-                        return ret_val;
-                ret_val = e1000e_get_phy_id(hw);
-                if (ret_val)
-                        return ret_val;
-                break;
-        }
+                }
         phy->type = e1000e_get_phy_type_from_id(phy->id);
 
         switch (phy->type) {
         case e1000_phy_82577:
         case e1000_phy_82579:
+        case e1000_phy_i217:
                 phy->ops.check_polarity = e1000_check_polarity_82577;
                 phy->ops.force_speed_duplex =
                     e1000_phy_force_speed_duplex_82577;
@@ -572,7 +716,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
         /* Adaptive IFS supported */
         mac->adaptive_ifs = true;
 
-        /* LED operations */
+        /* LED and other operations */
         switch (mac->type) {
         case e1000_ich8lan:
         case e1000_ich9lan:
@@ -591,8 +735,12 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
                 mac->ops.led_on = e1000_led_on_ich8lan;
                 mac->ops.led_off = e1000_led_off_ich8lan;
                 break;
-        case e1000_pchlan:
         case e1000_pch2lan:
+                mac->rar_entry_count = E1000_PCH2_RAR_ENTRIES;
+                mac->ops.rar_set = e1000_rar_set_pch2lan;
+                /* fall-through */
+        case e1000_pch_lpt:
+        case e1000_pchlan:
                 /* check management mode */
                 mac->ops.check_mng_mode = e1000_check_mng_mode_pchlan;
                 /* ID LED init */
@@ -609,12 +757,20 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
                 break;
         }
 
+        if (mac->type == e1000_pch_lpt) {
+                mac->rar_entry_count = E1000_PCH_LPT_RAR_ENTRIES;
+                mac->ops.rar_set = e1000_rar_set_pch_lpt;
+        }
+
         /* Enable PCS Lock-loss workaround for ICH8 */
         if (mac->type == e1000_ich8lan)
                 e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw, true);
 
-        /* Gate automatic PHY configuration by hardware on managed 82579 */
-        if ((mac->type == e1000_pch2lan) &&
+        /*
+         * Gate automatic PHY configuration by hardware on managed
+         * 82579 and i217
+         */
+        if ((mac->type == e1000_pch2lan || mac->type == e1000_pch_lpt) &&
             (er32(FWSM) & E1000_ICH_FWSM_FW_VALID))
                 e1000_gate_hw_phy_config_ich8lan(hw, true);
 
@@ -630,22 +786,50 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
  **/
 static s32 e1000_set_eee_pchlan(struct e1000_hw *hw)
 {
+        struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
         s32 ret_val = 0;
         u16 phy_reg;
 
-        if (hw->phy.type != e1000_phy_82579)
+        if ((hw->phy.type != e1000_phy_82579) &&
+            (hw->phy.type != e1000_phy_i217))
                 return 0;
 
         ret_val = e1e_rphy(hw, I82579_LPI_CTRL, &phy_reg);
         if (ret_val)
                 return ret_val;
 
-        if (hw->dev_spec.ich8lan.eee_disable)
+        if (dev_spec->eee_disable)
                 phy_reg &= ~I82579_LPI_CTRL_ENABLE_MASK;
         else
                 phy_reg |= I82579_LPI_CTRL_ENABLE_MASK;
 
-        return e1e_wphy(hw, I82579_LPI_CTRL, phy_reg);
+        ret_val = e1e_wphy(hw, I82579_LPI_CTRL, phy_reg);
+        if (ret_val)
+                return ret_val;
+
+        if ((hw->phy.type == e1000_phy_i217) && !dev_spec->eee_disable) {
+                /* Save off link partner's EEE ability */
+                ret_val = hw->phy.ops.acquire(hw);
+                if (ret_val)
+                        return ret_val;
+                ret_val = e1e_wphy_locked(hw, I82579_EMI_ADDR,
+                                          I217_EEE_LP_ABILITY);
+                if (ret_val)
+                        goto release;
+                e1e_rphy_locked(hw, I82579_EMI_DATA, &dev_spec->eee_lp_ability);
+
+                /*
+                 * EEE is not supported in 100Half, so ignore partner's EEE
+                 * in 100 ability if full-duplex is not advertised.
+                 */
+                e1e_rphy_locked(hw, PHY_LP_ABILITY, &phy_reg);
+                if (!(phy_reg & NWAY_LPAR_100TX_FD_CAPS))
+                        dev_spec->eee_lp_ability &= ~I217_EEE_100_SUPPORTED;
+release:
+                hw->phy.ops.release(hw);
+        }
+
+        return 0;
 }
 
 /**
@@ -687,6 +871,9 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
                         return ret_val;
         }
 
+        /* Clear link partner's EEE ability */
+        hw->dev_spec.ich8lan.eee_lp_ability = 0;
+
         if (!link)
                 return 0; /* No link detected */
 
@@ -782,6 +969,7 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
                 break;
         case e1000_pchlan:
         case e1000_pch2lan:
+        case e1000_pch_lpt:
                 rc = e1000_init_phy_params_pchlan(hw);
                 break;
         default:
@@ -967,6 +1155,145 @@ static bool e1000_check_mng_mode_pchlan(struct e1000_hw *hw)
 }
 
 /**
+ *  e1000_rar_set_pch2lan - Set receive address register
+ *  @hw: pointer to the HW structure
+ *  @addr: pointer to the receive address
+ *  @index: receive address array register
+ *
+ *  Sets the receive address array register at index to the address passed
+ *  in by addr.  For 82579, RAR[0] is the base address register that is to
+ *  contain the MAC address but RAR[1-6] are reserved for manageability (ME).
+ *  Use SHRA[0-3] in place of those reserved for ME.
+ **/
+static void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index)
+{
+        u32 rar_low, rar_high;
+
+        /*
+         * HW expects these in little endian so we reverse the byte order
+         * from network order (big endian) to little endian
+         */
+        rar_low = ((u32)addr[0] |
+                   ((u32)addr[1] << 8) |
+                   ((u32)addr[2] << 16) | ((u32)addr[3] << 24));
+
+        rar_high = ((u32)addr[4] | ((u32)addr[5] << 8));
+
+        /* If MAC address zero, no need to set the AV bit */
+        if (rar_low || rar_high)
+                rar_high |= E1000_RAH_AV;
+
+        if (index == 0) {
+                ew32(RAL(index), rar_low);
+                e1e_flush();
+                ew32(RAH(index), rar_high);
+                e1e_flush();
+                return;
+        }
+
+        if (index < hw->mac.rar_entry_count) {
+                s32 ret_val;
+
+                ret_val = e1000_acquire_swflag_ich8lan(hw);
+                if (ret_val)
+                        goto out;
+
+                ew32(SHRAL(index - 1), rar_low);
+                e1e_flush();
+                ew32(SHRAH(index - 1), rar_high);
+                e1e_flush();
+
+                e1000_release_swflag_ich8lan(hw);
+
+                /* verify the register updates */
+                if ((er32(SHRAL(index - 1)) == rar_low) &&
+                    (er32(SHRAH(index - 1)) == rar_high))
+                        return;
+
+                e_dbg("SHRA[%d] might be locked by ME - FWSM=0x%8.8x\n",
+                      (index - 1), er32(FWSM));
+        }
+
+out:
+        e_dbg("Failed to write receive address at index %d\n", index);
+}
+
+/**
+ *  e1000_rar_set_pch_lpt - Set receive address registers
+ *  @hw: pointer to the HW structure
+ *  @addr: pointer to the receive address
+ *  @index: receive address array register
+ *
+ *  Sets the receive address register array at index to the address passed
+ *  in by addr. For LPT, RAR[0] is the base address register that is to
+ *  contain the MAC address. SHRA[0-10] are the shared receive address
+ *  registers that are shared between the Host and manageability engine (ME).
+ **/
+static void e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index)
+{
+        u32 rar_low, rar_high;
+        u32 wlock_mac;
+
+        /*
+         * HW expects these in little endian so we reverse the byte order
+         * from network order (big endian) to little endian
+         */
+        rar_low = ((u32)addr[0] | ((u32)addr[1] << 8) |
+                   ((u32)addr[2] << 16) | ((u32)addr[3] << 24));
+
+        rar_high = ((u32)addr[4] | ((u32)addr[5] << 8));
+
+        /* If MAC address zero, no need to set the AV bit */
+        if (rar_low || rar_high)
+                rar_high |= E1000_RAH_AV;
+
+        if (index == 0) {
+                ew32(RAL(index), rar_low);
+                e1e_flush();
+                ew32(RAH(index), rar_high);
+                e1e_flush();
+                return;
+        }
+
+        /*
+         * The manageability engine (ME) can lock certain SHRAR registers that
+         * it is using - those registers are unavailable for use.
+         */
+        if (index < hw->mac.rar_entry_count) {
+                wlock_mac = er32(FWSM) & E1000_FWSM_WLOCK_MAC_MASK;
+                wlock_mac >>= E1000_FWSM_WLOCK_MAC_SHIFT;
+
+                /* Check if all SHRAR registers are locked */
+                if (wlock_mac == 1)
+                        goto out;
+
+                if ((wlock_mac == 0) || (index <= wlock_mac)) {
+                        s32 ret_val;
+
+                        ret_val = e1000_acquire_swflag_ich8lan(hw);
+
+                        if (ret_val)
+                                goto out;
+
+                        ew32(SHRAL_PCH_LPT(index - 1), rar_low);
+                        e1e_flush();
+                        ew32(SHRAH_PCH_LPT(index - 1), rar_high);
+                        e1e_flush();
+
+                        e1000_release_swflag_ich8lan(hw);
+
+                        /* verify the register updates */
+                        if ((er32(SHRAL_PCH_LPT(index - 1)) == rar_low) &&
+                            (er32(SHRAH_PCH_LPT(index - 1)) == rar_high))
+                                return;
+                }
+        }
+
+out:
+        e_dbg("Failed to write receive address at index %d\n", index);
+}
+
+/**
  *  e1000_check_reset_block_ich8lan - Check if PHY reset is blocked
  *  @hw: pointer to the HW structure
  *
@@ -994,6 +1321,8 @@ static s32 e1000_write_smbus_addr(struct e1000_hw *hw)
 {
         u16 phy_data;
         u32 strap = er32(STRAP);
+        u32 freq = (strap & E1000_STRAP_SMT_FREQ_MASK) >>
+            E1000_STRAP_SMT_FREQ_SHIFT;
         s32 ret_val = 0;
 
         strap &= E1000_STRAP_SMBUS_ADDRESS_MASK;
@@ -1006,6 +1335,19 @@ static s32 e1000_write_smbus_addr(struct e1000_hw *hw)
         phy_data |= (strap >> E1000_STRAP_SMBUS_ADDRESS_SHIFT);
         phy_data |= HV_SMB_ADDR_PEC_EN | HV_SMB_ADDR_VALID;
 
+        if (hw->phy.type == e1000_phy_i217) {
+                /* Restore SMBus frequency */
+                if (freq--) {
+                        phy_data &= ~HV_SMB_ADDR_FREQ_MASK;
+                        phy_data |= (freq & (1 << 0)) <<
+                            HV_SMB_ADDR_FREQ_LOW_SHIFT;
+                        phy_data |= (freq & (1 << 1)) <<
+                            (HV_SMB_ADDR_FREQ_HIGH_SHIFT - 1);
+                } else {
+                        e_dbg("Unsupported SMB frequency in PHY\n");
+                }
+        }
+
         return e1000_write_phy_reg_hv_locked(hw, HV_SMB_ADDR, phy_data);
 }
 
@@ -1043,6 +1385,7 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
                 /* Fall-thru */
         case e1000_pchlan:
         case e1000_pch2lan:
+        case e1000_pch_lpt:
                 sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG_ICH8M;
                 break;
         default:
@@ -1062,10 +1405,9 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
          * extended configuration before SW configuration
          */
         data = er32(EXTCNF_CTRL);
-        if (!(hw->mac.type == e1000_pch2lan)) {
-                if (data & E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE)
-                        goto release;
-        }
+        if ((hw->mac.type < e1000_pch2lan) &&
+            (data & E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE))
+                goto release;
 
         cnf_size = er32(EXTCNF_SIZE);
         cnf_size &= E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_MASK;
@@ -1076,9 +1418,9 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
         cnf_base_addr = data & E1000_EXTCNF_CTRL_EXT_CNF_POINTER_MASK;
         cnf_base_addr >>= E1000_EXTCNF_CTRL_EXT_CNF_POINTER_SHIFT;
 
-        if ((!(data & E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE) &&
-            (hw->mac.type == e1000_pchlan)) ||
-             (hw->mac.type == e1000_pch2lan)) {
+        if (((hw->mac.type == e1000_pchlan) &&
+             !(data & E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE)) ||
+            (hw->mac.type > e1000_pchlan)) {
                 /*
                  * HW configures the SMBus address and LEDs when the
                  * OEM and LCD Write Enable bits are set in the NVM.
@@ -1121,8 +1463,7 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
                 reg_addr &= PHY_REG_MASK;
                 reg_addr |= phy_page;
 
-                ret_val = phy->ops.write_reg_locked(hw, (u32)reg_addr,
-                                                    reg_data);
+                ret_val = e1e_wphy_locked(hw, (u32)reg_addr, reg_data);
                 if (ret_val)
                         goto release;
         }
@@ -1159,8 +1500,8 @@ static s32 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link)
         /* Disable K1 when link is 1Gbps, otherwise use the NVM setting */
         if (link) {
                 if (hw->phy.type == e1000_phy_82578) {
-                        ret_val = hw->phy.ops.read_reg_locked(hw, BM_CS_STATUS,
-                                                                  &status_reg);
+                        ret_val = e1e_rphy_locked(hw, BM_CS_STATUS,
+                                                  &status_reg);
                         if (ret_val)
                                 goto release;
 
@@ -1175,8 +1516,7 @@ static s32 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link)
                 }
 
                 if (hw->phy.type == e1000_phy_82577) {
-                        ret_val = hw->phy.ops.read_reg_locked(hw, HV_M_STATUS,
-                                                                  &status_reg);
+                        ret_val = e1e_rphy_locked(hw, HV_M_STATUS, &status_reg);
                         if (ret_val)
                                 goto release;
 
@@ -1191,15 +1531,13 @@ static s32 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link)
                 }
 
                 /* Link stall fix for link up */
-                ret_val = hw->phy.ops.write_reg_locked(hw, PHY_REG(770, 19),
-                                                           0x0100);
+                ret_val = e1e_wphy_locked(hw, PHY_REG(770, 19), 0x0100);
                 if (ret_val)
                         goto release;
 
         } else {
                 /* Link stall fix for link down */
-                ret_val = hw->phy.ops.write_reg_locked(hw, PHY_REG(770, 19),
-                                                           0x4100);
+                ret_val = e1e_wphy_locked(hw, PHY_REG(770, 19), 0x4100);
                 if (ret_val)
                         goto release;
         }
@@ -1279,14 +1617,14 @@ static s32 e1000_oem_bits_config_ich8lan(struct e1000_hw *hw, bool d0_state)
         u32 mac_reg;
         u16 oem_reg;
 
-        if ((hw->mac.type != e1000_pch2lan) && (hw->mac.type != e1000_pchlan))
+        if (hw->mac.type < e1000_pchlan)
                 return ret_val;
 
         ret_val = hw->phy.ops.acquire(hw);
         if (ret_val)
                 return ret_val;
 
-        if (!(hw->mac.type == e1000_pch2lan)) {
+        if (hw->mac.type == e1000_pchlan) {
                 mac_reg = er32(EXTCNF_CTRL);
                 if (mac_reg & E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE)
                         goto release;
@@ -1298,7 +1636,7 @@ static s32 e1000_oem_bits_config_ich8lan(struct e1000_hw *hw, bool d0_state)
 
         mac_reg = er32(PHY_CTRL);
 
-        ret_val = hw->phy.ops.read_reg_locked(hw, HV_OEM_BITS, &oem_reg);
+        ret_val = e1e_rphy_locked(hw, HV_OEM_BITS, &oem_reg);
         if (ret_val)
                 goto release;
 
@@ -1310,10 +1648,6 @@ static s32 e1000_oem_bits_config_ich8lan(struct e1000_hw *hw, bool d0_state)
 
                 if (mac_reg & E1000_PHY_CTRL_D0A_LPLU)
                         oem_reg |= HV_OEM_BITS_LPLU;
-
-                /* Set Restart auto-neg to activate the bits */
-                if (!hw->phy.ops.check_reset_block(hw))
-                        oem_reg |= HV_OEM_BITS_RESTART_AN;
         } else {
                 if (mac_reg & (E1000_PHY_CTRL_GBE_DISABLE |
                                E1000_PHY_CTRL_NOND0A_GBE_DISABLE))
@@ -1324,7 +1658,12 @@ static s32 e1000_oem_bits_config_ich8lan(struct e1000_hw *hw, bool d0_state)
                         oem_reg |= HV_OEM_BITS_LPLU;
         }
 
-        ret_val = hw->phy.ops.write_reg_locked(hw, HV_OEM_BITS, oem_reg);
+        /* Set Restart auto-neg to activate the bits */
+        if ((d0_state || (hw->mac.type != e1000_pchlan)) &&
+            !hw->phy.ops.check_reset_block(hw))
+                oem_reg |= HV_OEM_BITS_RESTART_AN;
+
+        ret_val = e1e_wphy_locked(hw, HV_OEM_BITS, oem_reg);
 
 release:
         hw->phy.ops.release(hw);
@@ -1420,11 +1759,10 @@ static s32 e1000_hv_phy_workarounds_ich8lan(struct e1000_hw *hw)
         ret_val = hw->phy.ops.acquire(hw);
         if (ret_val)
                 return ret_val;
-        ret_val = hw->phy.ops.read_reg_locked(hw, BM_PORT_GEN_CFG, &phy_data);
+        ret_val = e1e_rphy_locked(hw, BM_PORT_GEN_CFG, &phy_data);
         if (ret_val)
                 goto release;
-        ret_val = hw->phy.ops.write_reg_locked(hw, BM_PORT_GEN_CFG,
-                                               phy_data & 0x00FF);
+        ret_val = e1e_wphy_locked(hw, BM_PORT_GEN_CFG, phy_data & 0x00FF);
 release:
         hw->phy.ops.release(hw);
 
@@ -1483,7 +1821,7 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable)
         u32 mac_reg;
         u16 i;
 
-        if (hw->mac.type != e1000_pch2lan)
+        if (hw->mac.type < e1000_pch2lan)
                 return 0;
 
         /* disable Rx path while enabling/disabling workaround */
@@ -1656,20 +1994,18 @@ static s32 e1000_lv_phy_workarounds_ich8lan(struct e1000_hw *hw)
         ret_val = hw->phy.ops.acquire(hw);
         if (ret_val)
                 return ret_val;
-        ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_ADDR,
-                                               I82579_MSE_THRESHOLD);
+        ret_val = e1e_wphy_locked(hw, I82579_EMI_ADDR, I82579_MSE_THRESHOLD);
         if (ret_val)
                 goto release;
         /* set MSE higher to enable link to stay up when noise is high */
-        ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_DATA, 0x0034);
+        ret_val = e1e_wphy_locked(hw, I82579_EMI_DATA, 0x0034);
         if (ret_val)
                 goto release;
-        ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_ADDR,
-                                               I82579_MSE_LINK_DOWN);
+        ret_val = e1e_wphy_locked(hw, I82579_EMI_ADDR, I82579_MSE_LINK_DOWN);
         if (ret_val)
                 goto release;
         /* drop link after 5 times MSE threshold was reached */
-        ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_DATA, 0x0005);
+        ret_val = e1e_wphy_locked(hw, I82579_EMI_DATA, 0x0005);
 release:
         hw->phy.ops.release(hw);
 
@@ -1707,8 +2043,18 @@ static s32 e1000_k1_workaround_lv(struct e1000_hw *hw)
                         return ret_val;
 
                 if (status_reg & HV_M_STATUS_SPEED_1000) {
+                        u16 pm_phy_reg;
+
                         mac_reg |= E1000_FEXTNVM4_BEACON_DURATION_8USEC;
                         phy_reg &= ~I82579_LPI_CTRL_FORCE_PLL_LOCK_COUNT;
+                        /* LV 1G Packet drop issue wa  */
+                        ret_val = e1e_rphy(hw, HV_PM_CTRL, &pm_phy_reg);
+                        if (ret_val)
+                                return ret_val;
+                        pm_phy_reg &= ~HV_PM_CTRL_PLL_STOP_IN_K1_GIGA;
+                        ret_val = e1e_wphy(hw, HV_PM_CTRL, pm_phy_reg);
+                        if (ret_val)
+                                return ret_val;
                 } else {
                         mac_reg |= E1000_FEXTNVM4_BEACON_DURATION_16USEC;
                         phy_reg |= I82579_LPI_CTRL_FORCE_PLL_LOCK_COUNT;
@@ -1732,7 +2078,7 @@ static void e1000_gate_hw_phy_config_ich8lan(struct e1000_hw *hw, bool gate)
 {
         u32 extcnf_ctrl;
 
-        if (hw->mac.type != e1000_pch2lan)
+        if (hw->mac.type < e1000_pch2lan)
                 return;
 
         extcnf_ctrl = er32(EXTCNF_CTRL);
@@ -1834,12 +2180,10 @@ static s32 e1000_post_phy_reset_ich8lan(struct e1000_hw *hw)
                 ret_val = hw->phy.ops.acquire(hw);
                 if (ret_val)
                         return ret_val;
-                ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_ADDR,
-                                                       I82579_LPI_UPDATE_TIMER);
+                ret_val = e1e_wphy_locked(hw, I82579_EMI_ADDR,
+                                          I82579_LPI_UPDATE_TIMER);
                 if (!ret_val)
-                        ret_val = hw->phy.ops.write_reg_locked(hw,
-                                                               I82579_EMI_DATA,
-                                                               0x1387);
+                        ret_val = e1e_wphy_locked(hw, I82579_EMI_DATA, 0x1387);
                 hw->phy.ops.release(hw);
         }
 
@@ -2212,7 +2556,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
         hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
 
         /* Check if the flash descriptor is valid */
-        if (hsfsts.hsf_status.fldesvalid == 0) {
+        if (!hsfsts.hsf_status.fldesvalid) {
                 e_dbg("Flash descriptor invalid.  SW Sequencing must be used.\n");
                 return -E1000_ERR_NVM;
         }
@@ -2232,7 +2576,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
          * completed.
          */
 
-        if (hsfsts.hsf_status.flcinprog == 0) {
+        if (!hsfsts.hsf_status.flcinprog) {
                 /*
                  * There is no cycle running at present,
                  * so we can start a cycle.
@@ -2250,7 +2594,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
                  */
                 for (i = 0; i < ICH_FLASH_READ_COMMAND_TIMEOUT; i++) {
                         hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
-                        if (hsfsts.hsf_status.flcinprog == 0) {
+                        if (!hsfsts.hsf_status.flcinprog) {
                                 ret_val = 0;
                                 break;
                         }
@@ -2292,12 +2636,12 @@ static s32 e1000_flash_cycle_ich8lan(struct e1000_hw *hw, u32 timeout)
         /* wait till FDONE bit is set to 1 */
         do {
                 hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
-                if (hsfsts.hsf_status.flcdone == 1)
+                if (hsfsts.hsf_status.flcdone)
                         break;
                 udelay(1);
         } while (i++ < timeout);
 
-        if (hsfsts.hsf_status.flcdone == 1 && hsfsts.hsf_status.flcerr == 0)
+        if (hsfsts.hsf_status.flcdone && !hsfsts.hsf_status.flcerr)
                 return 0;
 
         return -E1000_ERR_NVM;
@@ -2408,10 +2752,10 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
                          * ICH_FLASH_CYCLE_REPEAT_COUNT times.
                          */
                         hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
-                        if (hsfsts.hsf_status.flcerr == 1) {
+                        if (hsfsts.hsf_status.flcerr) {
                                 /* Repeat for some time before giving up. */
                                 continue;
-                        } else if (hsfsts.hsf_status.flcdone == 0) {
+                        } else if (!hsfsts.hsf_status.flcdone) {
                                 e_dbg("Timeout error - flash cycle did not complete.\n");
                                 break;
                         }
@@ -2641,7 +2985,7 @@ static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        if ((data & 0x40) == 0) {
+        if (!(data & 0x40)) {
                 data |= 0x40;
                 ret_val = e1000_write_nvm(hw, 0x19, 1, &data);
                 if (ret_val)
@@ -2759,10 +3103,10 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
                  * try...ICH_FLASH_CYCLE_REPEAT_COUNT times.
                  */
                 hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
-                if (hsfsts.hsf_status.flcerr == 1)
+                if (hsfsts.hsf_status.flcerr)
                         /* Repeat for some time before giving up. */
                         continue;
-                if (hsfsts.hsf_status.flcdone == 0) {
+                if (!hsfsts.hsf_status.flcdone) {
                         e_dbg("Timeout error - flash cycle did not complete.\n");
                         break;
                 }
@@ -2914,10 +3258,10 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
                          * a few more times else Done
                          */
                         hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
-                        if (hsfsts.hsf_status.flcerr == 1)
+                        if (hsfsts.hsf_status.flcerr)
                                 /* repeat for some time before giving up */
                                 continue;
-                        else if (hsfsts.hsf_status.flcdone == 0)
+                        else if (!hsfsts.hsf_status.flcdone)
                                 return ret_val;
                 } while (++count < ICH_FLASH_CYCLE_REPEAT_COUNT);
         }
@@ -3059,8 +3403,8 @@ static s32 e1000_get_bus_info_ich8lan(struct e1000_hw *hw)
 static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
 {
         struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
-        u16 reg;
-        u32 ctrl, kab;
+        u16 kum_cfg;
+        u32 ctrl, reg;
         s32 ret_val;
 
         /*
@@ -3094,12 +3438,12 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
         }
 
         if (hw->mac.type == e1000_pchlan) {
-                /* Save the NVM K1 bit setting*/
-                ret_val = e1000_read_nvm(hw, E1000_NVM_K1_CONFIG, 1, &reg);
+                /* Save the NVM K1 bit setting */
+                ret_val = e1000_read_nvm(hw, E1000_NVM_K1_CONFIG, 1, &kum_cfg);
                 if (ret_val)
                         return ret_val;
 
-                if (reg & E1000_NVM_K1_ENABLE)
+                if (kum_cfg & E1000_NVM_K1_ENABLE)
                         dev_spec->nvm_k1_enabled = true;
                 else
                         dev_spec->nvm_k1_enabled = false;
@@ -3129,6 +3473,14 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
         /* cannot issue a flush here because it hangs the hardware */
         msleep(20);
 
+        /* Set Phy Config Counter to 50msec */
+        if (hw->mac.type == e1000_pch2lan) {
+                reg = er32(FEXTNVM3);
+                reg &= ~E1000_FEXTNVM3_PHY_CFG_COUNTER_MASK;
+                reg |= E1000_FEXTNVM3_PHY_CFG_COUNTER_50MSEC;
+                ew32(FEXTNVM3, reg);
+        }
+
         if (!ret_val)
                 clear_bit(__E1000_ACCESS_SHARED_RESOURCE, &hw->adapter->state);
 
@@ -3153,9 +3505,9 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
         ew32(IMC, 0xffffffff);
         er32(ICR);
 
-        kab = er32(KABGTXD);
-        kab |= E1000_KABGTXD_BGSQLBIAS;
-        ew32(KABGTXD, kab);
+        reg = er32(KABGTXD);
+        reg |= E1000_KABGTXD_BGSQLBIAS;
+        ew32(KABGTXD, reg);
 
         return 0;
 }
@@ -3308,6 +3660,13 @@ static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw)
          */
         reg = er32(RFCTL);
         reg |= (E1000_RFCTL_NFSW_DIS | E1000_RFCTL_NFSR_DIS);
+
+        /*
+         * Disable IPv6 extension header parsing because some malformed
+         * IPv6 headers can hang the Rx.
+         */
+        if (hw->mac.type == e1000_ich8lan)
+                reg |= (E1000_RFCTL_IPV6_EX_DIS | E1000_RFCTL_NEW_IPV6_EXT_DIS);
         ew32(RFCTL, reg);
 }
 
@@ -3358,6 +3717,7 @@ static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw)
         ew32(FCTTV, hw->fc.pause_time);
         if ((hw->phy.type == e1000_phy_82578) ||
             (hw->phy.type == e1000_phy_82579) ||
+            (hw->phy.type == e1000_phy_i217) ||
             (hw->phy.type == e1000_phy_82577)) {
                 ew32(FCRTV_PCH, hw->fc.refresh_time);
 
@@ -3421,6 +3781,7 @@ static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw)
                 break;
         case e1000_phy_82577:
         case e1000_phy_82579:
+        case e1000_phy_i217:
                 ret_val = e1000_copper_link_setup_82577(hw);
                 if (ret_val)
                         return ret_val;
@@ -3667,14 +4028,88 @@ void e1000e_gig_downshift_workaround_ich8lan(struct e1000_hw *hw)
  *  the LPLU setting in the NVM or custom setting.  For PCH and newer parts,
  *  the OEM bits PHY register (LED, GbE disable and LPLU configurations) also
  *  needs to be written.
+ *  Parts that support (and are linked to a partner which support) EEE in
+ *  100Mbps should disable LPLU since 100Mbps w/ EEE requires less power
+ *  than 10Mbps w/o EEE.
  **/
 void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
 {
+        struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
         u32 phy_ctrl;
         s32 ret_val;
 
         phy_ctrl = er32(PHY_CTRL);
         phy_ctrl |= E1000_PHY_CTRL_GBE_DISABLE;
+        if (hw->phy.type == e1000_phy_i217) {
+                u16 phy_reg;
+
+                ret_val = hw->phy.ops.acquire(hw);
+                if (ret_val)
+                        goto out;
+
+                if (!dev_spec->eee_disable) {
+                        u16 eee_advert;
+
+                        ret_val = e1e_wphy_locked(hw, I82579_EMI_ADDR,
+                                                  I217_EEE_ADVERTISEMENT);
+                        if (ret_val)
+                                goto release;
+                        e1e_rphy_locked(hw, I82579_EMI_DATA, &eee_advert);
+
+                        /*
+                         * Disable LPLU if both link partners support 100BaseT
+                         * EEE and 100Full is advertised on both ends of the
+                         * link.
+                         */
+                        if ((eee_advert & I217_EEE_100_SUPPORTED) &&
+                            (dev_spec->eee_lp_ability &
+                             I217_EEE_100_SUPPORTED) &&
+                            (hw->phy.autoneg_advertised & ADVERTISE_100_FULL))
+                                phy_ctrl &= ~(E1000_PHY_CTRL_D0A_LPLU |
+                                              E1000_PHY_CTRL_NOND0A_LPLU);
+                }
+
+                /*
+                 * For i217 Intel Rapid Start Technology support,
+                 * when the system is going into Sx and no manageability engine
+                 * is present, the driver must configure proxy to reset only on
+                 * power good.  LPI (Low Power Idle) state must also reset only
+                 * on power good, as well as the MTA (Multicast table array).
+                 * The SMBus release must also be disabled on LCD reset.
+                 */
+                if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {
+
+                        /* Enable proxy to reset only on power good. */
+                        e1e_rphy_locked(hw, I217_PROXY_CTRL, &phy_reg);
+                        phy_reg |= I217_PROXY_CTRL_AUTO_DISABLE;
+                        e1e_wphy_locked(hw, I217_PROXY_CTRL, phy_reg);
+
+                        /*
+                         * Set bit enable LPI (EEE) to reset only on
+                         * power good.
+                         */
+                        e1e_rphy_locked(hw, I217_SxCTRL, &phy_reg);
+                        phy_reg |= I217_SxCTRL_MASK;
+                        e1e_wphy_locked(hw, I217_SxCTRL, phy_reg);
+
+                        /* Disable the SMB release on LCD reset. */
+                        e1e_rphy_locked(hw, I217_MEMPWR, &phy_reg);
+                        phy_reg &= ~I217_MEMPWR;
+                        e1e_wphy_locked(hw, I217_MEMPWR, phy_reg);
+                }
+
+                /*
+                 * Enable MTA to reset for Intel Rapid Start Technology
+                 * Support
+                 */
+                e1e_rphy_locked(hw, I217_CGFREG, &phy_reg);
+                phy_reg |= I217_CGFREG_MASK;
+                e1e_wphy_locked(hw, I217_CGFREG, phy_reg);
+
+release:
+                hw->phy.ops.release(hw);
+        }
+out:
         ew32(PHY_CTRL, phy_ctrl);
 
         if (hw->mac.type == e1000_ich8lan)
@@ -3682,7 +4117,11 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
 
         if (hw->mac.type >= e1000_pchlan) {
                 e1000_oem_bits_config_ich8lan(hw, false);
-                e1000_phy_hw_reset_ich8lan(hw);
+
+                /* Reset PHY to activate OEM bits on 82577/8 */
+                if (hw->mac.type == e1000_pchlan)
+                        e1000e_phy_hw_reset_generic(hw);
+
                 ret_val = hw->phy.ops.acquire(hw);
                 if (ret_val)
                         return;
@@ -3699,44 +4138,61 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
  *  on which PHY resets are not blocked, if the PHY registers cannot be
  *  accessed properly by the s/w toggle the LANPHYPC value to power cycle
  *  the PHY.
+ *  On i217, setup Intel Rapid Start Technology.
  **/
 void e1000_resume_workarounds_pchlan(struct e1000_hw *hw)
 {
-        u16 phy_id1, phy_id2;
         s32 ret_val;
 
-        if ((hw->mac.type != e1000_pch2lan) ||
-            hw->phy.ops.check_reset_block(hw))
+        if (hw->mac.type < e1000_pch2lan)
                 return;
 
-        ret_val = hw->phy.ops.acquire(hw);
+        ret_val = e1000_init_phy_workarounds_pchlan(hw);
         if (ret_val) {
-                e_dbg("Failed to acquire PHY semaphore in resume\n");
+                e_dbg("Failed to init PHY flow ret_val=%d\n", ret_val);
                 return;
         }
 
-        /* Test access to the PHY registers by reading the ID regs */
-        ret_val = hw->phy.ops.read_reg_locked(hw, PHY_ID1, &phy_id1);
-        if (ret_val)
-                goto release;
-        ret_val = hw->phy.ops.read_reg_locked(hw, PHY_ID2, &phy_id2);
-        if (ret_val)
-                goto release;
-
-        if (hw->phy.id == ((u32)(phy_id1 << 16) |
-                           (u32)(phy_id2 & PHY_REVISION_MASK)))
-                goto release;
+        /*
+         * For i217 Intel Rapid Start Technology support when the system
+         * is transitioning from Sx and no manageability engine is present
+         * configure SMBus to restore on reset, disable proxy, and enable
+         * the reset on MTA (Multicast table array).
+         */
+        if (hw->phy.type == e1000_phy_i217) {
+                u16 phy_reg;
 
-        e1000_toggle_lanphypc_value_ich8lan(hw);
+                ret_val = hw->phy.ops.acquire(hw);
+                if (ret_val) {
+                        e_dbg("Failed to setup iRST\n");
+                        return;
+                }
 
-        hw->phy.ops.release(hw);
-        msleep(50);
-        e1000_phy_hw_reset(hw);
-        msleep(50);
-        return;
+                if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {
+                        /*
+                         * Restore clear on SMB if no manageability engine
+                         * is present
+                         */
+                        ret_val = e1e_rphy_locked(hw, I217_MEMPWR, &phy_reg);
+                        if (ret_val)
+                                goto release;
+                        phy_reg |= I217_MEMPWR_MASK;
+                        e1e_wphy_locked(hw, I217_MEMPWR, phy_reg);
 
+                        /* Disable Proxy */
+                        e1e_wphy_locked(hw, I217_PROXY_CTRL, 0);
+                }
+                /* Enable reset on MTA */
+                ret_val = e1e_rphy_locked(hw, I217_CGFREG, &phy_reg);
+                if (ret_val)
+                        goto release;
+                phy_reg &= ~I217_CGFREG_MASK;
+                e1e_wphy_locked(hw, I217_CGFREG, phy_reg);
 release:
-        hw->phy.ops.release(hw);
+                if (ret_val)
+                        e_dbg("Error %d in resume workarounds\n", ret_val);
+                hw->phy.ops.release(hw);
+        }
 }
 
 /**
@@ -3916,7 +4372,7 @@ static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw)
 
         /* If EEPROM is not marked present, init the IGP 3 PHY manually */
         if (hw->mac.type <= e1000_ich9lan) {
-                if (((er32(EECD) & E1000_EECD_PRES) == 0) &&
+                if (!(er32(EECD) & E1000_EECD_PRES) &&
                     (hw->phy.type == e1000_phy_igp_3)) {
                         e1000e_phy_init_script_igp3(hw);
                 }
@@ -3977,6 +4433,7 @@ static void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw)
         /* Clear PHY statistics registers */
         if ((hw->phy.type == e1000_phy_82578) ||
             (hw->phy.type == e1000_phy_82579) ||
+            (hw->phy.type == e1000_phy_i217) ||
             (hw->phy.type == e1000_phy_82577)) {
                 ret_val = hw->phy.ops.acquire(hw);
                 if (ret_val)
@@ -4021,6 +4478,7 @@ static const struct e1000_mac_operations ich8_mac_ops = {
         .setup_physical_interface= e1000_setup_copper_link_ich8lan,
         /* id_led_init dependent on mac type */
         .config_collision_dist  = e1000e_config_collision_dist_generic,
+        .rar_set                = e1000e_rar_set_generic,
 };
 
 static const struct e1000_phy_operations ich8_phy_ops = {
@@ -4135,3 +4593,22 @@ const struct e1000_info e1000_pch2_info = {
         .phy_ops                = &ich8_phy_ops,
         .nvm_ops                = &ich8_nvm_ops,
 };
+
+const struct e1000_info e1000_pch_lpt_info = {
+        .mac                    = e1000_pch_lpt,
+        .flags                  = FLAG_IS_ICH
+                                  | FLAG_HAS_WOL
+                                  | FLAG_HAS_CTRLEXT_ON_LOAD
+                                  | FLAG_HAS_AMT
+                                  | FLAG_HAS_FLASH
+                                  | FLAG_HAS_JUMBO_FRAMES
+                                  | FLAG_APME_IN_WUC,
+        .flags2                 = FLAG2_HAS_PHY_STATS
+                                  | FLAG2_HAS_EEE,
+        .pba                    = 26,
+        .max_hw_frame_size      = DEFAULT_JUMBO,
+        .get_variants           = e1000_get_variants_ich8lan,
+        .mac_ops                = &ich8_mac_ops,
+        .phy_ops                = &ich8_phy_ops,
+        .nvm_ops                = &ich8_nvm_ops,
+};
diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c
index decad98c1059..026e8b3ab52e 100644
--- a/drivers/net/ethernet/intel/e1000e/mac.c
+++ b/drivers/net/ethernet/intel/e1000e/mac.c
@@ -143,12 +143,12 @@ void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count)
         /* Setup the receive address */
         e_dbg("Programming MAC Address into RAR[0]\n");
 
-        e1000e_rar_set(hw, hw->mac.addr, 0);
+        hw->mac.ops.rar_set(hw, hw->mac.addr, 0);
 
         /* Zero out the other (rar_entry_count - 1) receive addresses */
         e_dbg("Clearing RAR[1-%u]\n", rar_count - 1);
         for (i = 1; i < rar_count; i++)
-                e1000e_rar_set(hw, mac_addr, i);
+                hw->mac.ops.rar_set(hw, mac_addr, i);
 }
 
 /**
@@ -215,13 +215,13 @@ s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw)
          * same as the normal permanent MAC address stored by the HW into the
          * RAR. Do this by mapping this address into RAR0.
          */
-        e1000e_rar_set(hw, alt_mac_addr, 0);
+        hw->mac.ops.rar_set(hw, alt_mac_addr, 0);
 
         return 0;
 }
 
 /**
- *  e1000e_rar_set - Set receive address register
+ *  e1000e_rar_set_generic - Set receive address register
  *  @hw: pointer to the HW structure
  *  @addr: pointer to the receive address
  *  @index: receive address array register
@@ -229,7 +229,7 @@ s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw)
  *  Sets the receive address array register at index to the address passed
  *  in by addr.
  **/
-void e1000e_rar_set(struct e1000_hw *hw, u8 *addr, u32 index)
+void e1000e_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index)
 {
         u32 rar_low, rar_high;
 
@@ -681,7 +681,7 @@ static s32 e1000_set_default_fc_generic(struct e1000_hw *hw)
                 return ret_val;
         }
 
-        if ((nvm_data & NVM_WORD0F_PAUSE_MASK) == 0)
+        if (!(nvm_data & NVM_WORD0F_PAUSE_MASK))
                 hw->fc.requested_mode = e1000_fc_none;
         else if ((nvm_data & NVM_WORD0F_PAUSE_MASK) == NVM_WORD0F_ASM_DIR)
                 hw->fc.requested_mode = e1000_fc_tx_pause;
diff --git a/drivers/net/ethernet/intel/e1000e/manage.c b/drivers/net/ethernet/intel/e1000e/manage.c
index 473f8e711510..bacc950fc684 100644
--- a/drivers/net/ethernet/intel/e1000e/manage.c
+++ b/drivers/net/ethernet/intel/e1000e/manage.c
@@ -85,7 +85,7 @@ static s32 e1000_mng_enable_host_if(struct e1000_hw *hw)
 
         /* Check that the host interface is enabled. */
         hicr = er32(HICR);
-        if ((hicr & E1000_HICR_EN) == 0) {
+        if (!(hicr & E1000_HICR_EN)) {
                 e_dbg("E1000_HOST_EN bit disabled.\n");
                 return -E1000_ERR_HOST_INTERFACE_COMMAND;
         }
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 19ab2154802c..a4b0435b00dc 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -56,7 +56,7 @@
 
 #define DRV_EXTRAVERSION "-k"
 
-#define DRV_VERSION "1.9.5" DRV_EXTRAVERSION
+#define DRV_VERSION "2.0.0" DRV_EXTRAVERSION
 char e1000e_driver_name[] = "e1000e";
 const char e1000e_driver_version[] = DRV_VERSION;
 
@@ -79,6 +79,7 @@ static const struct e1000_info *e1000_info_tbl[] = {
         [board_ich10lan]        = &e1000_ich10_info,
         [board_pchlan]          = &e1000_pch_info,
         [board_pch2lan]         = &e1000_pch2_info,
+        [board_pch_lpt]         = &e1000_pch_lpt_info,
 };
 
 struct e1000_reg_info {
@@ -110,14 +111,14 @@ static const struct e1000_reg_info e1000_reg_info_tbl[] = {
 
         /* Rx Registers */
         {E1000_RCTL, "RCTL"},
-        {E1000_RDLEN, "RDLEN"},
-        {E1000_RDH, "RDH"},
-        {E1000_RDT, "RDT"},
+        {E1000_RDLEN(0), "RDLEN"},
+        {E1000_RDH(0), "RDH"},
+        {E1000_RDT(0), "RDT"},
         {E1000_RDTR, "RDTR"},
         {E1000_RXDCTL(0), "RXDCTL"},
         {E1000_ERT, "ERT"},
-        {E1000_RDBAL, "RDBAL"},
-        {E1000_RDBAH, "RDBAH"},
+        {E1000_RDBAL(0), "RDBAL"},
+        {E1000_RDBAH(0), "RDBAH"},
         {E1000_RDFH, "RDFH"},
         {E1000_RDFT, "RDFT"},
         {E1000_RDFHS, "RDFHS"},
@@ -126,11 +127,11 @@ static const struct e1000_reg_info e1000_reg_info_tbl[] = {
 
         /* Tx Registers */
         {E1000_TCTL, "TCTL"},
-        {E1000_TDBAL, "TDBAL"},
-        {E1000_TDBAH, "TDBAH"},
-        {E1000_TDLEN, "TDLEN"},
-        {E1000_TDH, "TDH"},
-        {E1000_TDT, "TDT"},
+        {E1000_TDBAL(0), "TDBAL"},
+        {E1000_TDBAH(0), "TDBAH"},
+        {E1000_TDLEN(0), "TDLEN"},
+        {E1000_TDH(0), "TDH"},
+        {E1000_TDT(0), "TDT"},
         {E1000_TIDV, "TIDV"},
         {E1000_TXDCTL(0), "TXDCTL"},
         {E1000_TADV, "TADV"},
@@ -538,43 +539,15 @@ static void e1000_rx_checksum(struct e1000_adapter *adapter, u32 status_err,
         adapter->hw_csum_good++;
 }
 
-/**
- * e1000e_update_tail_wa - helper function for e1000e_update_[rt]dt_wa()
- * @hw: pointer to the HW structure
- * @tail: address of tail descriptor register
- * @i: value to write to tail descriptor register
- *
- * When updating the tail register, the ME could be accessing Host CSR
- * registers at the same time.  Normally, this is handled in h/w by an
- * arbiter but on some parts there is a bug that acknowledges Host accesses
- * later than it should which could result in the descriptor register to
- * have an incorrect value.  Workaround this by checking the FWSM register
- * which has bit 24 set while ME is accessing Host CSR registers, wait
- * if it is set and try again a number of times.
- **/
-static inline s32 e1000e_update_tail_wa(struct e1000_hw *hw, void __iomem *tail,
-                                        unsigned int i)
-{
-        unsigned int j = 0;
-
-        while ((j++ < E1000_ICH_FWSM_PCIM2PCI_COUNT) &&
-               (er32(FWSM) & E1000_ICH_FWSM_PCIM2PCI))
-                udelay(50);
-
-        writel(i, tail);
-
-        if ((j == E1000_ICH_FWSM_PCIM2PCI_COUNT) && (i != readl(tail)))
-                return E1000_ERR_SWFW_SYNC;
-
-        return 0;
-}
-
 static void e1000e_update_rdt_wa(struct e1000_ring *rx_ring, unsigned int i)
 {
         struct e1000_adapter *adapter = rx_ring->adapter;
         struct e1000_hw *hw = &adapter->hw;
+        s32 ret_val = __ew32_prepare(hw);
 
-        if (e1000e_update_tail_wa(hw, rx_ring->tail, i)) {
+        writel(i, rx_ring->tail);
+
+        if (unlikely(!ret_val && (i != readl(rx_ring->tail)))) {
                 u32 rctl = er32(RCTL);
                 ew32(RCTL, rctl & ~E1000_RCTL_EN);
                 e_err("ME firmware caused invalid RDT - resetting\n");
@@ -586,8 +559,11 @@ static void e1000e_update_tdt_wa(struct e1000_ring *tx_ring, unsigned int i)
 {
         struct e1000_adapter *adapter = tx_ring->adapter;
         struct e1000_hw *hw = &adapter->hw;
+        s32 ret_val = __ew32_prepare(hw);
+
+        writel(i, tx_ring->tail);
 
-        if (e1000e_update_tail_wa(hw, tx_ring->tail, i)) {
+        if (unlikely(!ret_val && (i != readl(tx_ring->tail)))) {
                 u32 tctl = er32(TCTL);
                 ew32(TCTL, tctl & ~E1000_TCTL_EN);
                 e_err("ME firmware caused invalid TDT - resetting\n");
@@ -1053,7 +1029,8 @@ static void e1000_print_hw_hang(struct work_struct *work)
 
         if (!adapter->tx_hang_recheck &&
             (adapter->flags2 & FLAG2_DMA_BURST)) {
-                /* May be block on write-back, flush and detect again
+                /*
+                 * May be block on write-back, flush and detect again
                  * flush pending descriptor writebacks to memory
                  */
                 ew32(TIDV, adapter->tx_int_delay | E1000_TIDV_FPD);
@@ -1108,6 +1085,10 @@ static void e1000_print_hw_hang(struct work_struct *work)
               phy_1000t_status,
               phy_ext_status,
               pci_status);
+
+        /* Suggest workaround for known h/w issue */
+        if ((hw->mac.type == e1000_pchlan) && (er32(CTRL) & E1000_CTRL_TFCE))
+                e_err("Try turning off Tx pause (flow control) via ethtool\n");
 }
 
 /**
@@ -1645,7 +1626,10 @@ static void e1000_clean_rx_ring(struct e1000_ring *rx_ring)
         adapter->flags2 &= ~FLAG2_IS_DISCARDING;
 
         writel(0, rx_ring->head);
-        writel(0, rx_ring->tail);
+        if (rx_ring->adapter->flags2 & FLAG2_PCIM2PCI_ARBITER_WA)
+                e1000e_update_rdt_wa(rx_ring, 0);
+        else
+                writel(0, rx_ring->tail);
 }
 
 static void e1000e_downshift_workaround(struct work_struct *work)
@@ -2318,7 +2302,10 @@ static void e1000_clean_tx_ring(struct e1000_ring *tx_ring)
         tx_ring->next_to_clean = 0;
 
         writel(0, tx_ring->head);
-        writel(0, tx_ring->tail);
+        if (tx_ring->adapter->flags2 & FLAG2_PCIM2PCI_ARBITER_WA)
+                e1000e_update_tdt_wa(tx_ring, 0);
+        else
+                writel(0, tx_ring->tail);
 }
 
 /**
@@ -2530,33 +2517,31 @@ err:
 }
 
 /**
- * e1000_clean - NAPI Rx polling callback
+ * e1000e_poll - NAPI Rx polling callback
  * @napi: struct associated with this polling callback
- * @budget: amount of packets driver is allowed to process this poll
+ * @weight: number of packets driver is allowed to process this poll
  **/
-static int e1000_clean(struct napi_struct *napi, int budget)
+static int e1000e_poll(struct napi_struct *napi, int weight)
 {
-        struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi);
+        struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter,
+                                                     napi);
         struct e1000_hw *hw = &adapter->hw;
         struct net_device *poll_dev = adapter->netdev;
         int tx_cleaned = 1, work_done = 0;
 
         adapter = netdev_priv(poll_dev);
 
-        if (adapter->msix_entries &&
-            !(adapter->rx_ring->ims_val & adapter->tx_ring->ims_val))
-                goto clean_rx;
-
-        tx_cleaned = e1000_clean_tx_irq(adapter->tx_ring);
+        if (!adapter->msix_entries ||
+            (adapter->rx_ring->ims_val & adapter->tx_ring->ims_val))
+                tx_cleaned = e1000_clean_tx_irq(adapter->tx_ring);
 
-clean_rx:
-        adapter->clean_rx(adapter->rx_ring, &work_done, budget);
+        adapter->clean_rx(adapter->rx_ring, &work_done, weight);
 
         if (!tx_cleaned)
-                work_done = budget;
+                work_done = weight;
 
-        /* If budget not fully consumed, exit the polling mode */
-        if (work_done < budget) {
+        /* If weight not fully consumed, exit the polling mode */
+        if (work_done < weight) {
                 if (adapter->itr_setting & 3)
                         e1000_set_itr(adapter);
                 napi_complete(napi);
@@ -2800,13 +2785,13 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
         /* Setup the HW Tx Head and Tail descriptor pointers */
         tdba = tx_ring->dma;
         tdlen = tx_ring->count * sizeof(struct e1000_tx_desc);
-        ew32(TDBAL, (tdba & DMA_BIT_MASK(32)));
-        ew32(TDBAH, (tdba >> 32));
-        ew32(TDLEN, tdlen);
-        ew32(TDH, 0);
-        ew32(TDT, 0);
-        tx_ring->head = adapter->hw.hw_addr + E1000_TDH;
-        tx_ring->tail = adapter->hw.hw_addr + E1000_TDT;
+        ew32(TDBAL(0), (tdba & DMA_BIT_MASK(32)));
+        ew32(TDBAH(0), (tdba >> 32));
+        ew32(TDLEN(0), tdlen);
+        ew32(TDH(0), 0);
+        ew32(TDT(0), 0);
+        tx_ring->head = adapter->hw.hw_addr + E1000_TDH(0);
+        tx_ring->tail = adapter->hw.hw_addr + E1000_TDT(0);
 
         /* Set the Tx Interrupt Delay register */
         ew32(TIDV, adapter->tx_int_delay);
@@ -2879,8 +2864,8 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
         u32 rctl, rfctl;
         u32 pages = 0;
 
-        /* Workaround Si errata on 82579 - configure jumbo frame flow */
-        if (hw->mac.type == e1000_pch2lan) {
+        /* Workaround Si errata on PCHx - configure jumbo frame flow */
+        if (hw->mac.type >= e1000_pch2lan) {
                 s32 ret_val;
 
                 if (adapter->netdev->mtu > ETH_DATA_LEN)
@@ -2955,6 +2940,7 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
         /* Enable Extended Status in all Receive Descriptors */
         rfctl = er32(RFCTL);
         rfctl |= E1000_RFCTL_EXTEN;
+        ew32(RFCTL, rfctl);
 
         /*
          * 82571 and greater support packet-split where the protocol
@@ -2980,13 +2966,6 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
         if (adapter->rx_ps_pages) {
                 u32 psrctl = 0;
 
-                /*
-                 * disable packet split support for IPv6 extension headers,
-                 * because some malformed IPv6 headers can hang the Rx
-                 */
-                rfctl |= (E1000_RFCTL_IPV6_EX_DIS |
-                          E1000_RFCTL_NEW_IPV6_EXT_DIS);
-
                 /* Enable Packet split descriptors */
                 rctl |= E1000_RCTL_DTYP_PS;
 
@@ -3025,7 +3004,6 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
                  */
         }
 
-        ew32(RFCTL, rfctl);
         ew32(RCTL, rctl);
         /* just started the receive unit, no need to restart */
         adapter->flags &= ~FLAG_RX_RESTART_NOW;
@@ -3110,13 +3088,13 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
          * the Base and Length of the Rx Descriptor Ring
          */
         rdba = rx_ring->dma;
-        ew32(RDBAL, (rdba & DMA_BIT_MASK(32)));
-        ew32(RDBAH, (rdba >> 32));
-        ew32(RDLEN, rdlen);
-        ew32(RDH, 0);
-        ew32(RDT, 0);
-        rx_ring->head = adapter->hw.hw_addr + E1000_RDH;
-        rx_ring->tail = adapter->hw.hw_addr + E1000_RDT;
+        ew32(RDBAL(0), (rdba & DMA_BIT_MASK(32)));
+        ew32(RDBAH(0), (rdba >> 32));
+        ew32(RDLEN(0), rdlen);
+        ew32(RDH(0), 0);
+        ew32(RDT(0), 0);
+        rx_ring->head = adapter->hw.hw_addr + E1000_RDH(0);
+        rx_ring->tail = adapter->hw.hw_addr + E1000_RDT(0);
 
         /* Enable Receive Checksum Offload for TCP and UDP */
         rxcsum = er32(RXCSUM);
@@ -3229,7 +3207,7 @@ static int e1000e_write_uc_addr_list(struct net_device *netdev)
                 netdev_for_each_uc_addr(ha, netdev) {
                         if (!rar_entries)
                                 break;
-                        e1000e_rar_set(hw, ha->addr, rar_entries--);
+                        hw->mac.ops.rar_set(hw, ha->addr, rar_entries--);
                         count++;
                 }
         }
@@ -3510,6 +3488,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
                 fc->refresh_time = 0x1000;
                 break;
         case e1000_pch2lan:
+        case e1000_pch_lpt:
                 fc->high_water = 0x05C20;
                 fc->low_water = 0x05048;
                 fc->pause_time = 0x0650;
@@ -3799,7 +3778,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
         /* fire an unusual interrupt on the test handler */
         ew32(ICS, E1000_ICS_RXSEQ);
         e1e_flush();
-        msleep(50);
+        msleep(100);
 
         e1000_irq_disable(adapter);
 
@@ -4038,6 +4017,7 @@ static int e1000_close(struct net_device *netdev)
 static int e1000_set_mac(struct net_device *netdev, void *p)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
+        struct e1000_hw *hw = &adapter->hw;
         struct sockaddr *addr = p;
 
         if (!is_valid_ether_addr(addr->sa_data))
@@ -4046,7 +4026,7 @@ static int e1000_set_mac(struct net_device *netdev, void *p)
         memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
         memcpy(adapter->hw.mac.addr, addr->sa_data, netdev->addr_len);
 
-        e1000e_rar_set(&adapter->hw, adapter->hw.mac.addr, 0);
+        hw->mac.ops.rar_set(&adapter->hw, adapter->hw.mac.addr, 0);
 
         if (adapter->flags & FLAG_RESET_OVERWRITES_LAA) {
                 /* activate the work around */
@@ -4060,9 +4040,8 @@ static int e1000_set_mac(struct net_device *netdev, void *p)
                  * are dropped. Eventually the LAA will be in RAR[0] and
                  * RAR[14]
                  */
-                e1000e_rar_set(&adapter->hw,
-                              adapter->hw.mac.addr,
-                              adapter->hw.mac.rar_entry_count - 1);
+                hw->mac.ops.rar_set(&adapter->hw, adapter->hw.mac.addr,
+                                    adapter->hw.mac.rar_entry_count - 1);
         }
 
         return 0;
@@ -4641,7 +4620,7 @@ link_up:
          * reset from the other port. Set the appropriate LAA in RAR[0]
          */
         if (e1000e_get_laa_state_82571(hw))
-                e1000e_rar_set(hw, adapter->hw.mac.addr, 0);
+                hw->mac.ops.rar_set(hw, adapter->hw.mac.addr, 0);
 
         if (adapter->flags2 & FLAG2_CHECK_PHY_HANG)
                 e1000e_check_82574_phy_workaround(adapter);
@@ -5151,6 +5130,8 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
         /* if count is 0 then mapping error has occurred */
         count = e1000_tx_map(tx_ring, skb, first, max_per_txd, nr_frags, mss);
         if (count) {
+                skb_tx_timestamp(skb);
+
                 netdev_sent_queue(netdev, skb->len);
                 e1000_tx_queue(tx_ring, tx_flags, count);
                 /* Make sure there is space in the ring for the next send. */
@@ -5285,22 +5266,14 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
                 return -EINVAL;
         }
 
-        /* Jumbo frame workaround on 82579 requires CRC be stripped */
-        if ((adapter->hw.mac.type == e1000_pch2lan) &&
+        /* Jumbo frame workaround on 82579 and newer requires CRC be stripped */
+        if ((adapter->hw.mac.type >= e1000_pch2lan) &&
             !(adapter->flags2 & FLAG2_CRC_STRIPPING) &&
             (new_mtu > ETH_DATA_LEN)) {
-                e_err("Jumbo Frames not supported on 82579 when CRC stripping is disabled.\n");
+                e_err("Jumbo Frames not supported on this device when CRC stripping is disabled.\n");
                 return -EINVAL;
         }
 
-        /* 82573 Errata 17 */
-        if (((adapter->hw.mac.type == e1000_82573) ||
-             (adapter->hw.mac.type == e1000_82574)) &&
-            (max_frame > ETH_FRAME_LEN + ETH_FCS_LEN)) {
-                adapter->flags2 |= FLAG2_DISABLE_ASPM_L1;
-                e1000e_disable_aspm(adapter->pdev, PCIE_LINK_STATE_L1);
-        }
-
         while (test_and_set_bit(__E1000_RESETTING, &adapter->state))
                 usleep_range(1000, 2000);
         /* e1000e_down -> e1000e_reset dependent on max_frame_size & mtu */
@@ -5694,7 +5667,7 @@ static int __e1000_resume(struct pci_dev *pdev)
                         return err;
         }
 
-        if (hw->mac.type == e1000_pch2lan)
+        if (hw->mac.type >= e1000_pch2lan)
                 e1000_resume_workarounds_pchlan(&adapter->hw);
 
         e1000e_power_up_phy(adapter);
@@ -6226,7 +6199,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         netdev->netdev_ops              = &e1000e_netdev_ops;
         e1000e_set_ethtool_ops(netdev);
         netdev->watchdog_timeo          = 5 * HZ;
-        netif_napi_add(netdev, &adapter->napi, e1000_clean, 64);
+        netif_napi_add(netdev, &adapter->napi, e1000e_poll, 64);
         strlcpy(netdev->name, pci_name(pdev), sizeof(netdev->name));
 
         netdev->mem_start = mmio_start;
@@ -6593,6 +6566,9 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_LM), board_pch2lan },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_V), board_pch2lan },
 
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LPT_I217_LM), board_pch_lpt },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LPT_I217_V), board_pch_lpt },
+
         { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c
index ff796e42c3eb..55cc1565bc2f 100644
--- a/drivers/net/ethernet/intel/e1000e/param.c
+++ b/drivers/net/ethernet/intel/e1000e/param.c
@@ -106,7 +106,7 @@ E1000_PARAM(RxAbsIntDelay, "Receive Absolute Interrupt Delay");
 /*
  * Interrupt Throttle Rate (interrupts/sec)
  *
- * Valid Range: 100-100000 (0=off, 1=dynamic, 3=dynamic conservative)
+ * Valid Range: 100-100000 or one of: 0=off, 1=dynamic, 3=dynamic conservative
  */
 E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate");
 #define DEFAULT_ITR 3
@@ -166,8 +166,8 @@ E1000_PARAM(WriteProtectNVM, "Write-protect NVM [WARNING: disabling this can lea
  *
  * Default Value: 1 (enabled)
  */
-E1000_PARAM(CrcStripping, "Enable CRC Stripping, disable if your BMC needs " \
-                          "the CRC");
+E1000_PARAM(CrcStripping,
+            "Enable CRC Stripping, disable if your BMC needs the CRC");
 
 struct e1000_option {
         enum { enable_option, range_option, list_option } type;
@@ -344,53 +344,60 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
 
                 if (num_InterruptThrottleRate > bd) {
                         adapter->itr = InterruptThrottleRate[bd];
-                        switch (adapter->itr) {
-                        case 0:
-                                e_info("%s turned off\n", opt.name);
-                                break;
-                        case 1:
-                                e_info("%s set to dynamic mode\n", opt.name);
-                                adapter->itr_setting = adapter->itr;
-                                adapter->itr = 20000;
-                                break;
-                        case 3:
-                                e_info("%s set to dynamic conservative mode\n",
-                                        opt.name);
-                                adapter->itr_setting = adapter->itr;
-                                adapter->itr = 20000;
-                                break;
-                        case 4:
-                                e_info("%s set to simplified (2000-8000 ints) "
-                                       "mode\n", opt.name);
-                                adapter->itr_setting = 4;
-                                break;
-                        default:
-                                /*
-                                 * Save the setting, because the dynamic bits
-                                 * change itr.
-                                 */
-                                if (e1000_validate_option(&adapter->itr, &opt,
-                                                          adapter) &&
-                                    (adapter->itr == 3)) {
-                                        /*
-                                         * In case of invalid user value,
-                                         * default to conservative mode.
-                                         */
-                                        adapter->itr_setting = adapter->itr;
-                                        adapter->itr = 20000;
-                                } else {
-                                        /*
-                                         * Clear the lower two bits because
-                                         * they are used as control.
-                                         */
-                                        adapter->itr_setting =
-                                                adapter->itr & ~3;
-                                }
-                                break;
-                        }
+
+                        /*
+                         * Make sure a message is printed for non-special
+                         * values. And in case of an invalid option, display
+                         * warning, use default and go through itr/itr_setting
+                         * adjustment logic below
+                         */
+                        if ((adapter->itr > 4) &&
+                            e1000_validate_option(&adapter->itr, &opt, adapter))
+                                adapter->itr = opt.def;
                 } else {
-                        adapter->itr_setting = opt.def;
+                        /*
+                         * If no option specified, use default value and go
+                         * through the logic below to adjust itr/itr_setting
+                         */
+                        adapter->itr = opt.def;
+
+                        /*
+                         * Make sure a message is printed for non-special
+                         * default values
+                         */
+                        if (adapter->itr > 4)
+                                e_info("%s set to default %d\n", opt.name,
+                                       adapter->itr);
+                }
+
+                adapter->itr_setting = adapter->itr;
+                switch (adapter->itr) {
+                case 0:
+                        e_info("%s turned off\n", opt.name);
+                        break;
+                case 1:
+                        e_info("%s set to dynamic mode\n", opt.name);
+                        adapter->itr = 20000;
+                        break;
+                case 3:
+                        e_info("%s set to dynamic conservative mode\n",
+                               opt.name);
                         adapter->itr = 20000;
+                        break;
+                case 4:
+                        e_info("%s set to simplified (2000-8000 ints) mode\n",
+                               opt.name);
+                        break;
+                default:
+                        /*
+                         * Save the setting, because the dynamic bits
+                         * change itr.
+                         *
+                         * Clear the lower two bits because
+                         * they are used as control.
+                         */
+                        adapter->itr_setting &= ~3;
+                        break;
                 }
         }
         { /* Interrupt Mode */
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index 35b45578c604..0334d013bc3c 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -639,6 +639,45 @@ s32 e1000e_write_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, u16 data)
 }
 
 /**
+ *  e1000_set_master_slave_mode - Setup PHY for Master/slave mode
+ *  @hw: pointer to the HW structure
+ *
+ *  Sets up Master/slave mode
+ **/
+static s32 e1000_set_master_slave_mode(struct e1000_hw *hw)
+{
+        s32 ret_val;
+        u16 phy_data;
+
+        /* Resolve Master/Slave mode */
+        ret_val = e1e_rphy(hw, PHY_1000T_CTRL, &phy_data);
+        if (ret_val)
+                return ret_val;
+
+        /* load defaults for future use */
+        hw->phy.original_ms_type = (phy_data & CR_1000T_MS_ENABLE) ?
+            ((phy_data & CR_1000T_MS_VALUE) ?
+             e1000_ms_force_master : e1000_ms_force_slave) : e1000_ms_auto;
+
+        switch (hw->phy.ms_type) {
+        case e1000_ms_force_master:
+                phy_data |= (CR_1000T_MS_ENABLE | CR_1000T_MS_VALUE);
+                break;
+        case e1000_ms_force_slave:
+                phy_data |= CR_1000T_MS_ENABLE;
+                phy_data &= ~(CR_1000T_MS_VALUE);
+                break;
+        case e1000_ms_auto:
+                phy_data &= ~CR_1000T_MS_ENABLE;
+                /* fall-through */
+        default:
+                break;
+        }
+
+        return e1e_wphy(hw, PHY_1000T_CTRL, phy_data);
+}
+
+/**
  *  e1000_copper_link_setup_82577 - Setup 82577 PHY for copper link
  *  @hw: pointer to the HW structure
  *
@@ -659,7 +698,11 @@ s32 e1000_copper_link_setup_82577(struct e1000_hw *hw)
         /* Enable downshift */
         phy_data |= I82577_CFG_ENABLE_DOWNSHIFT;
 
-        return e1e_wphy(hw, I82577_CFG_REG, phy_data);
+        ret_val = e1e_wphy(hw, I82577_CFG_REG, phy_data);
+        if (ret_val)
+                return ret_val;
+
+        return e1000_set_master_slave_mode(hw);
 }
 
 /**
@@ -718,12 +761,28 @@ s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw)
          *   1 - Enabled
          */
         phy_data &= ~M88E1000_PSCR_POLARITY_REVERSAL;
-        if (phy->disable_polarity_correction == 1)
+        if (phy->disable_polarity_correction)
                 phy_data |= M88E1000_PSCR_POLARITY_REVERSAL;
 
         /* Enable downshift on BM (disabled by default) */
-        if (phy->type == e1000_phy_bm)
+        if (phy->type == e1000_phy_bm) {
+                /* For 82574/82583, first disable then enable downshift */
+                if (phy->id == BME1000_E_PHY_ID_R2) {
+                        phy_data &= ~BME1000_PSCR_ENABLE_DOWNSHIFT;
+                        ret_val = e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL,
+                                           phy_data);
+                        if (ret_val)
+                                return ret_val;
+                        /* Commit the changes. */
+                        ret_val = e1000e_commit_phy(hw);
+                        if (ret_val) {
+                                e_dbg("Error committing the PHY changes\n");
+                                return ret_val;
+                        }
+                }
+
                 phy_data |= BME1000_PSCR_ENABLE_DOWNSHIFT;
+        }
 
         ret_val = e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
         if (ret_val)
@@ -879,31 +938,7 @@ s32 e1000e_copper_link_setup_igp(struct e1000_hw *hw)
                                 return ret_val;
                 }
 
-                ret_val = e1e_rphy(hw, PHY_1000T_CTRL, &data);
-                if (ret_val)
-                        return ret_val;
-
-                /* load defaults for future use */
-                phy->original_ms_type = (data & CR_1000T_MS_ENABLE) ?
-                        ((data & CR_1000T_MS_VALUE) ?
-                        e1000_ms_force_master :
-                        e1000_ms_force_slave) :
-                        e1000_ms_auto;
-
-                switch (phy->ms_type) {
-                case e1000_ms_force_master:
-                        data |= (CR_1000T_MS_ENABLE | CR_1000T_MS_VALUE);
-                        break;
-                case e1000_ms_force_slave:
-                        data |= CR_1000T_MS_ENABLE;
-                        data &= ~(CR_1000T_MS_VALUE);
-                        break;
-                case e1000_ms_auto:
-                        data &= ~CR_1000T_MS_ENABLE;
-                default:
-                        break;
-                }
-                ret_val = e1e_wphy(hw, PHY_1000T_CTRL, data);
+                ret_val = e1000_set_master_slave_mode(hw);
         }
 
         return ret_val;
@@ -1090,7 +1125,7 @@ static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
          * If autoneg_advertised is zero, we assume it was not defaulted
          * by the calling code so we set to advertise full capability.
          */
-        if (phy->autoneg_advertised == 0)
+        if (!phy->autoneg_advertised)
                 phy->autoneg_advertised = phy->autoneg_mask;
 
         e_dbg("Reconfiguring auto-neg advertisement params\n");
@@ -1596,7 +1631,7 @@ s32 e1000e_check_downshift(struct e1000_hw *hw)
         ret_val = e1e_rphy(hw, offset, &phy_data);
 
         if (!ret_val)
-                phy->speed_downgraded = (phy_data & mask);
+                phy->speed_downgraded = !!(phy_data & mask);
 
         return ret_val;
 }
@@ -1925,8 +1960,8 @@ s32 e1000e_get_phy_info_m88(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        phy->polarity_correction = (phy_data &
-                                    M88E1000_PSCR_POLARITY_REVERSAL);
+        phy->polarity_correction = !!(phy_data &
+                                      M88E1000_PSCR_POLARITY_REVERSAL);
 
         ret_val = e1000_check_polarity_m88(hw);
         if (ret_val)
@@ -1936,7 +1971,7 @@ s32 e1000e_get_phy_info_m88(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        phy->is_mdix = (phy_data & M88E1000_PSSR_MDIX);
+        phy->is_mdix = !!(phy_data & M88E1000_PSSR_MDIX);
 
         if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS) {
                 ret_val = e1000_get_cable_length(hw);
@@ -1999,7 +2034,7 @@ s32 e1000e_get_phy_info_igp(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        phy->is_mdix = (data & IGP01E1000_PSSR_MDIX);
+        phy->is_mdix = !!(data & IGP01E1000_PSSR_MDIX);
 
         if ((data & IGP01E1000_PSSR_SPEED_MASK) ==
             IGP01E1000_PSSR_SPEED_1000MBPS) {
@@ -2052,8 +2087,7 @@ s32 e1000_get_phy_info_ife(struct e1000_hw *hw)
         ret_val = e1e_rphy(hw, IFE_PHY_SPECIAL_CONTROL, &data);
         if (ret_val)
                 return ret_val;
-        phy->polarity_correction = (data & IFE_PSC_AUTO_POLARITY_DISABLE)
-                                   ? false : true;
+        phy->polarity_correction = !(data & IFE_PSC_AUTO_POLARITY_DISABLE);
 
         if (phy->polarity_correction) {
                 ret_val = e1000_check_polarity_ife(hw);
@@ -2070,7 +2104,7 @@ s32 e1000_get_phy_info_ife(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        phy->is_mdix = (data & IFE_PMC_MDIX_STATUS) ? true : false;
+        phy->is_mdix = !!(data & IFE_PMC_MDIX_STATUS);
 
         /* The following parameters are undefined for 10/100 operation. */
         phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
@@ -2320,6 +2354,9 @@ enum e1000_phy_type e1000e_get_phy_type_from_id(u32 phy_id)
         case I82579_E_PHY_ID:
                 phy_type = e1000_phy_82579;
                 break;
+        case I217_E_PHY_ID:
+                phy_type = e1000_phy_i217;
+                break;
         default:
                 phy_type = e1000_phy_unknown;
                 break;
@@ -2979,7 +3016,7 @@ static s32 __e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data,
                 if ((hw->phy.type == e1000_phy_82578) &&
                     (hw->phy.revision >= 1) &&
                     (hw->phy.addr == 2) &&
-                    ((MAX_PHY_REG_ADDRESS & reg) == 0) && (data & (1 << 11))) {
+                    !(MAX_PHY_REG_ADDRESS & reg) && (data & (1 << 11))) {
                         u16 data2 = 0x7EFF;
                         ret_val = e1000_access_phy_debug_regs_hv(hw,
                                                                  (1 << 6) | 0x3,
@@ -3265,7 +3302,7 @@ s32 e1000_get_phy_info_82577(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        phy->is_mdix = (data & I82577_PHY_STATUS2_MDIX) ? true : false;
+        phy->is_mdix = !!(data & I82577_PHY_STATUS2_MDIX);
 
         if ((data & I82577_PHY_STATUS2_SPEED_MASK) ==
             I82577_PHY_STATUS2_SPEED_1000MBPS) {
diff --git a/drivers/net/ethernet/intel/igb/Makefile b/drivers/net/ethernet/intel/igb/Makefile
index 6565c463185c..97c197fd4a8e 100644
--- a/drivers/net/ethernet/intel/igb/Makefile
+++ b/drivers/net/ethernet/intel/igb/Makefile
@@ -33,5 +33,7 @@
 obj-$(CONFIG_IGB) += igb.o
 
 igb-objs := igb_main.o igb_ethtool.o e1000_82575.o \
-            e1000_mac.o e1000_nvm.o e1000_phy.o e1000_mbx.o
+            e1000_mac.o e1000_nvm.o e1000_phy.o e1000_mbx.o \
+            e1000_i210.o
 
+igb-$(CONFIG_IGB_PTP) += igb_ptp.o
diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c
index 08bdc33715ee..e65083958421 100644
--- a/drivers/net/ethernet/intel/igb/e1000_82575.c
+++ b/drivers/net/ethernet/intel/igb/e1000_82575.c
@@ -36,6 +36,7 @@
 
 #include "e1000_mac.h"
 #include "e1000_82575.h"
+#include "e1000_i210.h"
 
 static s32  igb_get_invariants_82575(struct e1000_hw *);
 static s32  igb_acquire_phy_82575(struct e1000_hw *);
@@ -52,6 +53,8 @@ static s32  igb_write_phy_reg_82580(struct e1000_hw *, u32, u16);
 static s32  igb_reset_hw_82575(struct e1000_hw *);
 static s32  igb_reset_hw_82580(struct e1000_hw *);
 static s32  igb_set_d0_lplu_state_82575(struct e1000_hw *, bool);
+static s32  igb_set_d0_lplu_state_82580(struct e1000_hw *, bool);
+static s32  igb_set_d3_lplu_state_82580(struct e1000_hw *, bool);
 static s32  igb_setup_copper_link_82575(struct e1000_hw *);
 static s32  igb_setup_serdes_link_82575(struct e1000_hw *);
 static s32  igb_write_phy_reg_sgmii_82575(struct e1000_hw *, u32, u16);
@@ -96,6 +99,8 @@ static bool igb_sgmii_uses_mdio_82575(struct e1000_hw *hw)
                 break;
         case e1000_82580:
         case e1000_i350:
+        case e1000_i210:
+        case e1000_i211:
                 reg = rd32(E1000_MDICNFG);
                 ext_mdio = !!(reg & E1000_MDICNFG_EXT_MDIO);
                 break;
@@ -150,6 +155,17 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
         case E1000_DEV_ID_I350_SGMII:
                 mac->type = e1000_i350;
                 break;
+        case E1000_DEV_ID_I210_COPPER:
+        case E1000_DEV_ID_I210_COPPER_OEM1:
+        case E1000_DEV_ID_I210_COPPER_IT:
+        case E1000_DEV_ID_I210_FIBER:
+        case E1000_DEV_ID_I210_SERDES:
+        case E1000_DEV_ID_I210_SGMII:
+                mac->type = e1000_i210;
+                break;
+        case E1000_DEV_ID_I211_COPPER:
+                mac->type = e1000_i211;
+                break;
         default:
                 return -E1000_ERR_MAC_INIT;
                 break;
@@ -182,26 +198,44 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
         /* Set mta register count */
         mac->mta_reg_count = 128;
         /* Set rar entry count */
-        mac->rar_entry_count = E1000_RAR_ENTRIES_82575;
-        if (mac->type == e1000_82576)
+        switch (mac->type) {
+        case e1000_82576:
                 mac->rar_entry_count = E1000_RAR_ENTRIES_82576;
-        if (mac->type == e1000_82580)
+                break;
+        case e1000_82580:
                 mac->rar_entry_count = E1000_RAR_ENTRIES_82580;
-        if (mac->type == e1000_i350)
+                break;
+        case e1000_i350:
+        case e1000_i210:
+        case e1000_i211:
                 mac->rar_entry_count = E1000_RAR_ENTRIES_I350;
+                break;
+        default:
+                mac->rar_entry_count = E1000_RAR_ENTRIES_82575;
+                break;
+        }
         /* reset */
         if (mac->type >= e1000_82580)
                 mac->ops.reset_hw = igb_reset_hw_82580;
         else
                 mac->ops.reset_hw = igb_reset_hw_82575;
+
+        if (mac->type >= e1000_i210) {
+                mac->ops.acquire_swfw_sync = igb_acquire_swfw_sync_i210;
+                mac->ops.release_swfw_sync = igb_release_swfw_sync_i210;
+        } else {
+                mac->ops.acquire_swfw_sync = igb_acquire_swfw_sync_82575;
+                mac->ops.release_swfw_sync = igb_release_swfw_sync_82575;
+        }
+
         /* Set if part includes ASF firmware */
         mac->asf_firmware_present = true;
         /* Set if manageability features are enabled. */
         mac->arc_subsystem_valid =
                 (rd32(E1000_FWSM) & E1000_FWSM_MODE_MASK)
                         ? true : false;
-        /* enable EEE on i350 parts */
-        if (mac->type == e1000_i350)
+        /* enable EEE on i350 parts and later parts */
+        if (mac->type >= e1000_i350)
                 dev_spec->eee_disable = false;
         else
                 dev_spec->eee_disable = true;
@@ -213,26 +247,6 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
 
         /* NVM initialization */
         eecd = rd32(E1000_EECD);
-
-        nvm->opcode_bits        = 8;
-        nvm->delay_usec         = 1;
-        switch (nvm->override) {
-        case e1000_nvm_override_spi_large:
-                nvm->page_size    = 32;
-                nvm->address_bits = 16;
-                break;
-        case e1000_nvm_override_spi_small:
-                nvm->page_size    = 8;
-                nvm->address_bits = 8;
-                break;
-        default:
-                nvm->page_size    = eecd & E1000_EECD_ADDR_BITS ? 32 : 8;
-                nvm->address_bits = eecd & E1000_EECD_ADDR_BITS ? 16 : 8;
-                break;
-        }
-
-        nvm->type = e1000_nvm_eeprom_spi;
-
         size = (u16)((eecd & E1000_EECD_SIZE_EX_MASK) >>
                      E1000_EECD_SIZE_EX_SHIFT);
 
@@ -242,6 +256,33 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
          */
         size += NVM_WORD_SIZE_BASE_SHIFT;
 
+        nvm->word_size = 1 << size;
+        if (hw->mac.type < e1000_i210) {
+                nvm->opcode_bits        = 8;
+                nvm->delay_usec         = 1;
+                switch (nvm->override) {
+                case e1000_nvm_override_spi_large:
+                        nvm->page_size    = 32;
+                        nvm->address_bits = 16;
+                        break;
+                case e1000_nvm_override_spi_small:
+                        nvm->page_size    = 8;
+                        nvm->address_bits = 8;
+                        break;
+                default:
+                        nvm->page_size    = eecd
+                                & E1000_EECD_ADDR_BITS ? 32 : 8;
+                        nvm->address_bits = eecd
+                                & E1000_EECD_ADDR_BITS ? 16 : 8;
+                        break;
+                }
+                if (nvm->word_size == (1 << 15))
+                        nvm->page_size = 128;
+
+                nvm->type = e1000_nvm_eeprom_spi;
+        } else
+                nvm->type = e1000_nvm_flash_hw;
+
         /*
          * Check for invalid size
          */
@@ -249,32 +290,60 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
                 pr_notice("The NVM size is not valid, defaulting to 32K\n");
                 size = 15;
         }
-        nvm->word_size = 1 << size;
-        if (nvm->word_size == (1 << 15))
-                nvm->page_size = 128;
 
         /* NVM Function Pointers */
-        nvm->ops.acquire = igb_acquire_nvm_82575;
-        if (nvm->word_size < (1 << 15))
-                nvm->ops.read = igb_read_nvm_eerd;
-        else
-                nvm->ops.read = igb_read_nvm_spi;
-
-        nvm->ops.release = igb_release_nvm_82575;
         switch (hw->mac.type) {
         case e1000_82580:
                 nvm->ops.validate = igb_validate_nvm_checksum_82580;
                 nvm->ops.update = igb_update_nvm_checksum_82580;
+                nvm->ops.acquire = igb_acquire_nvm_82575;
+                nvm->ops.release = igb_release_nvm_82575;
+                if (nvm->word_size < (1 << 15))
+                        nvm->ops.read = igb_read_nvm_eerd;
+                else
+                        nvm->ops.read = igb_read_nvm_spi;
+                nvm->ops.write = igb_write_nvm_spi;
                 break;
         case e1000_i350:
                 nvm->ops.validate = igb_validate_nvm_checksum_i350;
                 nvm->ops.update = igb_update_nvm_checksum_i350;
+                nvm->ops.acquire = igb_acquire_nvm_82575;
+                nvm->ops.release = igb_release_nvm_82575;
+                if (nvm->word_size < (1 << 15))
+                        nvm->ops.read = igb_read_nvm_eerd;
+                else
+                        nvm->ops.read = igb_read_nvm_spi;
+                nvm->ops.write = igb_write_nvm_spi;
+                break;
+        case e1000_i210:
+                nvm->ops.validate = igb_validate_nvm_checksum_i210;
+                nvm->ops.update   = igb_update_nvm_checksum_i210;
+                nvm->ops.acquire = igb_acquire_nvm_i210;
+                nvm->ops.release = igb_release_nvm_i210;
+                nvm->ops.read    = igb_read_nvm_srrd_i210;
+                nvm->ops.valid_led_default = igb_valid_led_default_i210;
+                break;
+        case e1000_i211:
+                nvm->ops.acquire  = igb_acquire_nvm_i210;
+                nvm->ops.release  = igb_release_nvm_i210;
+                nvm->ops.read     = igb_read_nvm_i211;
+                nvm->ops.valid_led_default = igb_valid_led_default_i210;
+                nvm->ops.validate = NULL;
+                nvm->ops.update   = NULL;
+                nvm->ops.write    = NULL;
                 break;
         default:
                 nvm->ops.validate = igb_validate_nvm_checksum;
                 nvm->ops.update = igb_update_nvm_checksum;
+                nvm->ops.acquire = igb_acquire_nvm_82575;
+                nvm->ops.release = igb_release_nvm_82575;
+                if (nvm->word_size < (1 << 15))
+                        nvm->ops.read = igb_read_nvm_eerd;
+                else
+                        nvm->ops.read = igb_read_nvm_spi;
+                nvm->ops.write = igb_write_nvm_spi;
+                break;
         }
-        nvm->ops.write = igb_write_nvm_spi;
 
         /* if part supports SR-IOV then initialize mailbox parameters */
         switch (mac->type) {
@@ -312,9 +381,13 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
         if (igb_sgmii_active_82575(hw) && !igb_sgmii_uses_mdio_82575(hw)) {
                 phy->ops.read_reg   = igb_read_phy_reg_sgmii_82575;
                 phy->ops.write_reg  = igb_write_phy_reg_sgmii_82575;
-        } else if (hw->mac.type >= e1000_82580) {
+        } else if ((hw->mac.type == e1000_82580)
+                || (hw->mac.type == e1000_i350)) {
                 phy->ops.read_reg   = igb_read_phy_reg_82580;
                 phy->ops.write_reg  = igb_write_phy_reg_82580;
+        } else if (hw->phy.type >= e1000_phy_i210) {
+                phy->ops.read_reg   = igb_read_phy_reg_gs40g;
+                phy->ops.write_reg  = igb_write_phy_reg_gs40g;
         } else {
                 phy->ops.read_reg   = igb_read_phy_reg_igp;
                 phy->ops.write_reg  = igb_write_phy_reg_igp;
@@ -343,6 +416,14 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
                 else
                         phy->ops.get_cable_length = igb_get_cable_length_m88;
 
+                if (phy->id == I210_I_PHY_ID) {
+                        phy->ops.get_cable_length =
+                                         igb_get_cable_length_m88_gen2;
+                        phy->ops.set_d0_lplu_state =
+                                        igb_set_d0_lplu_state_82580;
+                        phy->ops.set_d3_lplu_state =
+                                        igb_set_d3_lplu_state_82580;
+                }
                 phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_m88;
                 break;
         case IGP03E1000_E_PHY_ID:
@@ -359,6 +440,17 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
                 phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_82580;
                 phy->ops.get_cable_length   = igb_get_cable_length_82580;
                 phy->ops.get_phy_info       = igb_get_phy_info_82580;
+                phy->ops.set_d0_lplu_state  = igb_set_d0_lplu_state_82580;
+                phy->ops.set_d3_lplu_state  = igb_set_d3_lplu_state_82580;
+                break;
+        case I210_I_PHY_ID:
+                phy->type                   = e1000_phy_i210;
+                phy->ops.get_phy_info       = igb_get_phy_info_m88;
+                phy->ops.check_polarity     = igb_check_polarity_m88;
+                phy->ops.get_cable_length   = igb_get_cable_length_m88_gen2;
+                phy->ops.set_d0_lplu_state  = igb_set_d0_lplu_state_82580;
+                phy->ops.set_d3_lplu_state  = igb_set_d3_lplu_state_82580;
+                phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_m88;
                 break;
         default:
                 return -E1000_ERR_PHY;
@@ -385,7 +477,7 @@ static s32 igb_acquire_phy_82575(struct e1000_hw *hw)
         else if (hw->bus.func == E1000_FUNC_3)
                 mask = E1000_SWFW_PHY3_SM;
 
-        return igb_acquire_swfw_sync_82575(hw, mask);
+        return hw->mac.ops.acquire_swfw_sync(hw, mask);
 }
 
 /**
@@ -406,7 +498,7 @@ static void igb_release_phy_82575(struct e1000_hw *hw)
         else if (hw->bus.func == E1000_FUNC_3)
                 mask = E1000_SWFW_PHY3_SM;
 
-        igb_release_swfw_sync_82575(hw, mask);
+        hw->mac.ops.release_swfw_sync(hw, mask);
 }
 
 /**
@@ -510,6 +602,8 @@ static s32 igb_get_phy_id_82575(struct e1000_hw *hw)
                         break;
                 case e1000_82580:
                 case e1000_i350:
+                case e1000_i210:
+                case e1000_i211:
                         mdic = rd32(E1000_MDICNFG);
                         mdic &= E1000_MDICNFG_PHY_MASK;
                         phy->addr = mdic >> E1000_MDICNFG_PHY_SHIFT;
@@ -674,6 +768,96 @@ out:
 }
 
 /**
+ *  igb_set_d0_lplu_state_82580 - Set Low Power Linkup D0 state
+ *  @hw: pointer to the HW structure
+ *  @active: true to enable LPLU, false to disable
+ *
+ *  Sets the LPLU D0 state according to the active flag.  When
+ *  activating LPLU this function also disables smart speed
+ *  and vice versa.  LPLU will not be activated unless the
+ *  device autonegotiation advertisement meets standards of
+ *  either 10 or 10/100 or 10/100/1000 at all duplexes.
+ *  This is a function pointer entry point only called by
+ *  PHY setup routines.
+ **/
+static s32 igb_set_d0_lplu_state_82580(struct e1000_hw *hw, bool active)
+{
+        struct e1000_phy_info *phy = &hw->phy;
+        s32 ret_val = 0;
+        u16 data;
+
+        data = rd32(E1000_82580_PHY_POWER_MGMT);
+
+        if (active) {
+                data |= E1000_82580_PM_D0_LPLU;
+
+                /* When LPLU is enabled, we should disable SmartSpeed */
+                data &= ~E1000_82580_PM_SPD;
+        } else {
+                data &= ~E1000_82580_PM_D0_LPLU;
+
+                /*
+                 * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
+                 * during Dx states where the power conservation is most
+                 * important.  During driver activity we should enable
+                 * SmartSpeed, so performance is maintained.
+                 */
+                if (phy->smart_speed == e1000_smart_speed_on)
+                        data |= E1000_82580_PM_SPD;
+                else if (phy->smart_speed == e1000_smart_speed_off)
+                        data &= ~E1000_82580_PM_SPD; }
+
+        wr32(E1000_82580_PHY_POWER_MGMT, data);
+        return ret_val;
+}
+
+/**
+ *  igb_set_d3_lplu_state_82580 - Sets low power link up state for D3
+ *  @hw: pointer to the HW structure
+ *  @active: boolean used to enable/disable lplu
+ *
+ *  Success returns 0, Failure returns 1
+ *
+ *  The low power link up (lplu) state is set to the power management level D3
+ *  and SmartSpeed is disabled when active is true, else clear lplu for D3
+ *  and enable Smartspeed.  LPLU and Smartspeed are mutually exclusive.  LPLU
+ *  is used during Dx states where the power conservation is most important.
+ *  During driver activity, SmartSpeed should be enabled so performance is
+ *  maintained.
+ **/
+s32 igb_set_d3_lplu_state_82580(struct e1000_hw *hw, bool active)
+{
+        struct e1000_phy_info *phy = &hw->phy;
+        s32 ret_val = 0;
+        u16 data;
+
+        data = rd32(E1000_82580_PHY_POWER_MGMT);
+
+        if (!active) {
+                data &= ~E1000_82580_PM_D3_LPLU;
+                /*
+                 * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
+                 * during Dx states where the power conservation is most
+                 * important.  During driver activity we should enable
+                 * SmartSpeed, so performance is maintained.
+                 */
+                if (phy->smart_speed == e1000_smart_speed_on)
+                        data |= E1000_82580_PM_SPD;
+                else if (phy->smart_speed == e1000_smart_speed_off)
+                        data &= ~E1000_82580_PM_SPD;
+        } else if ((phy->autoneg_advertised == E1000_ALL_SPEED_DUPLEX) ||
+                   (phy->autoneg_advertised == E1000_ALL_NOT_GIG) ||
+                   (phy->autoneg_advertised == E1000_ALL_10_SPEED)) {
+                data |= E1000_82580_PM_D3_LPLU;
+                /* When LPLU is enabled, we should disable SmartSpeed */
+                data &= ~E1000_82580_PM_SPD;
+        }
+
+        wr32(E1000_82580_PHY_POWER_MGMT, data);
+        return ret_val;
+}
+
+/**
  *  igb_acquire_nvm_82575 - Request for access to EEPROM
  *  @hw: pointer to the HW structure
  *
@@ -686,14 +870,14 @@ static s32 igb_acquire_nvm_82575(struct e1000_hw *hw)
 {
         s32 ret_val;
 
-        ret_val = igb_acquire_swfw_sync_82575(hw, E1000_SWFW_EEP_SM);
+        ret_val = hw->mac.ops.acquire_swfw_sync(hw, E1000_SWFW_EEP_SM);
         if (ret_val)
                 goto out;
 
         ret_val = igb_acquire_nvm(hw);
 
         if (ret_val)
-                igb_release_swfw_sync_82575(hw, E1000_SWFW_EEP_SM);
+                hw->mac.ops.release_swfw_sync(hw, E1000_SWFW_EEP_SM);
 
 out:
         return ret_val;
@@ -709,7 +893,7 @@ out:
 static void igb_release_nvm_82575(struct e1000_hw *hw)
 {
         igb_release_nvm(hw);
-        igb_release_swfw_sync_82575(hw, E1000_SWFW_EEP_SM);
+        hw->mac.ops.release_swfw_sync(hw, E1000_SWFW_EEP_SM);
 }
 
 /**
@@ -1080,7 +1264,6 @@ static s32 igb_init_hw_82575(struct e1000_hw *hw)
          * is no link.
          */
         igb_clear_hw_cntrs_82575(hw);
-
         return ret_val;
 }
 
@@ -1117,6 +1300,7 @@ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw)
                 }
         }
         switch (hw->phy.type) {
+        case e1000_phy_i210:
         case e1000_phy_m88:
                 if (hw->phy.id == I347AT4_E_PHY_ID ||
                     hw->phy.id == M88E1112_E_PHY_ID)
@@ -1757,7 +1941,7 @@ static s32 igb_reset_hw_82580(struct e1000_hw *hw)
 
         /* Determine whether or not a global dev reset is requested */
         if (global_device_reset &&
-                igb_acquire_swfw_sync_82575(hw, swmbsw_mask))
+                hw->mac.ops.acquire_swfw_sync(hw, swmbsw_mask))
                         global_device_reset = false;
 
         if (global_device_reset &&
@@ -1803,7 +1987,7 @@ static s32 igb_reset_hw_82580(struct e1000_hw *hw)
 
         /* Release semaphore */
         if (global_device_reset)
-                igb_release_swfw_sync_82575(hw, swmbsw_mask);
+                hw->mac.ops.release_swfw_sync(hw, swmbsw_mask);
 
         return ret_val;
 }
diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.h b/drivers/net/ethernet/intel/igb/e1000_82575.h
index b927d79ab536..e85c453f5428 100644
--- a/drivers/net/ethernet/intel/igb/e1000_82575.h
+++ b/drivers/net/ethernet/intel/igb/e1000_82575.h
@@ -55,10 +55,11 @@ extern void igb_rx_fifo_flush_82575(struct e1000_hw *hw);
 #define E1000_SRRCTL_DROP_EN                            0x80000000
 #define E1000_SRRCTL_TIMESTAMP                          0x40000000
 
+
 #define E1000_MRQC_ENABLE_RSS_4Q            0x00000002
 #define E1000_MRQC_ENABLE_VMDQ              0x00000003
-#define E1000_MRQC_ENABLE_VMDQ_RSS_2Q       0x00000005
 #define E1000_MRQC_RSS_FIELD_IPV4_UDP       0x00400000
+#define E1000_MRQC_ENABLE_VMDQ_RSS_2Q       0x00000005
 #define E1000_MRQC_RSS_FIELD_IPV6_UDP       0x00800000
 #define E1000_MRQC_RSS_FIELD_IPV6_UDP_EX    0x01000000
 
diff --git a/drivers/net/ethernet/intel/igb/e1000_defines.h b/drivers/net/ethernet/intel/igb/e1000_defines.h
index 89eb1f85b9fa..ec7e4fe3e3ee 100644
--- a/drivers/net/ethernet/intel/igb/e1000_defines.h
+++ b/drivers/net/ethernet/intel/igb/e1000_defines.h
@@ -301,6 +301,8 @@
                                                         * transactions */
 #define E1000_DMACR_DMAC_LX_SHIFT       28
 #define E1000_DMACR_DMAC_EN             0x80000000 /* Enable DMA Coalescing */
+/* DMA Coalescing BMC-to-OS Watchdog Enable */
+#define E1000_DMACR_DC_BMC2OSW_EN       0x00008000
 
 #define E1000_DMCTXTH_DMCTTHR_MASK      0x00000FFF /* DMA Coalescing Transmit
                                                         * Threshold */
@@ -458,6 +460,7 @@
 #define E1000_ERR_INVALID_ARGUMENT  16
 #define E1000_ERR_NO_SPACE          17
 #define E1000_ERR_NVM_PBA_SECTION   18
+#define E1000_ERR_INVM_VALUE_NOT_FOUND  19
 
 /* Loop limit on how long we wait for auto-negotiation to complete */
 #define COPPER_LINK_UP_LIMIT              10
@@ -595,6 +598,25 @@
 #define E1000_EECD_AUTO_RD          0x00000200  /* NVM Auto Read done */
 #define E1000_EECD_SIZE_EX_MASK     0x00007800  /* NVM Size */
 #define E1000_EECD_SIZE_EX_SHIFT     11
+#define E1000_EECD_FLUPD_I210           0x00800000 /* Update FLASH */
+#define E1000_EECD_FLUDONE_I210         0x04000000 /* Update FLASH done*/
+#define E1000_FLUDONE_ATTEMPTS          20000
+#define E1000_EERD_EEWR_MAX_COUNT       512 /* buffered EEPROM words rw */
+#define E1000_I210_FIFO_SEL_RX          0x00
+#define E1000_I210_FIFO_SEL_TX_QAV(_i)  (0x02 + (_i))
+#define E1000_I210_FIFO_SEL_TX_LEGACY   E1000_I210_FIFO_SEL_TX_QAV(0)
+#define E1000_I210_FIFO_SEL_BMC2OS_TX   0x06
+#define E1000_I210_FIFO_SEL_BMC2OS_RX   0x01
+#define E1000_EECD_FLUPD_I210           0x00800000 /* Update FLASH */
+#define E1000_EECD_FLUDONE_I210         0x04000000 /* Update FLASH done*/
+#define E1000_FLUDONE_ATTEMPTS          20000
+#define E1000_EERD_EEWR_MAX_COUNT       512 /* buffered EEPROM words rw */
+#define E1000_I210_FIFO_SEL_RX          0x00
+#define E1000_I210_FIFO_SEL_TX_QAV(_i)  (0x02 + (_i))
+#define E1000_I210_FIFO_SEL_TX_LEGACY   E1000_I210_FIFO_SEL_TX_QAV(0)
+#define E1000_I210_FIFO_SEL_BMC2OS_TX   0x06
+#define E1000_I210_FIFO_SEL_BMC2OS_RX   0x01
+
 
 /* Offset to data in NVM read/write registers */
 #define E1000_NVM_RW_REG_DATA   16
@@ -613,6 +635,16 @@
 #define NVM_CHECKSUM_REG           0x003F
 #define NVM_COMPATIBILITY_REG_3    0x0003
 #define NVM_COMPATIBILITY_BIT_MASK 0x8000
+#define NVM_MAC_ADDR               0x0000
+#define NVM_SUB_DEV_ID             0x000B
+#define NVM_SUB_VEN_ID             0x000C
+#define NVM_DEV_ID                 0x000D
+#define NVM_VEN_ID                 0x000E
+#define NVM_INIT_CTRL_2            0x000F
+#define NVM_INIT_CTRL_4            0x0013
+#define NVM_LED_1_CFG              0x001C
+#define NVM_LED_0_2_CFG            0x001F
+
 
 #define E1000_NVM_CFG_DONE_PORT_0  0x040000 /* MNG config cycle done */
 #define E1000_NVM_CFG_DONE_PORT_1  0x080000 /* ...for second port */
@@ -639,6 +671,7 @@
 
 #define NVM_PBA_OFFSET_0           8
 #define NVM_PBA_OFFSET_1           9
+#define NVM_RESERVED_WORD               0xFFFF
 #define NVM_PBA_PTR_GUARD          0xFAFA
 #define NVM_WORD_SIZE_BASE_SHIFT   6
 
@@ -696,6 +729,7 @@
 #define I82580_I_PHY_ID      0x015403A0
 #define I350_I_PHY_ID        0x015403B0
 #define M88_VENDOR           0x0141
+#define I210_I_PHY_ID        0x01410C00
 
 /* M88E1000 Specific Registers */
 #define M88E1000_PHY_SPEC_CTRL     0x10  /* PHY Specific Control Register */
@@ -815,6 +849,7 @@
 #define E1000_IPCNFG_EEE_100M_AN     0x00000004  /* EEE Enable 100M AN */
 #define E1000_EEER_TX_LPI_EN         0x00010000  /* EEE Tx LPI Enable */
 #define E1000_EEER_RX_LPI_EN         0x00020000  /* EEE Rx LPI Enable */
+#define E1000_EEER_FRC_AN            0x10000000 /* Enable EEE in loopback */
 #define E1000_EEER_LPI_FC            0x00040000  /* EEE Enable on FC */
 
 /* SerDes Control */
diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
index f67cbd3fa307..c2a51dcda550 100644
--- a/drivers/net/ethernet/intel/igb/e1000_hw.h
+++ b/drivers/net/ethernet/intel/igb/e1000_hw.h
@@ -63,6 +63,13 @@ struct e1000_hw;
 #define E1000_DEV_ID_I350_FIBER               0x1522
 #define E1000_DEV_ID_I350_SERDES              0x1523
 #define E1000_DEV_ID_I350_SGMII               0x1524
+#define E1000_DEV_ID_I210_COPPER                0x1533
+#define E1000_DEV_ID_I210_COPPER_OEM1           0x1534
+#define E1000_DEV_ID_I210_COPPER_IT             0x1535
+#define E1000_DEV_ID_I210_FIBER                 0x1536
+#define E1000_DEV_ID_I210_SERDES                0x1537
+#define E1000_DEV_ID_I210_SGMII                 0x1538
+#define E1000_DEV_ID_I211_COPPER                0x1539
 
 #define E1000_REVISION_2 2
 #define E1000_REVISION_4 4
@@ -83,6 +90,8 @@ enum e1000_mac_type {
         e1000_82576,
         e1000_82580,
         e1000_i350,
+        e1000_i210,
+        e1000_i211,
         e1000_num_macs  /* List is 1-based, so subtract 1 for true count. */
 };
 
@@ -117,6 +126,7 @@ enum e1000_phy_type {
         e1000_phy_igp_3,
         e1000_phy_ife,
         e1000_phy_82580,
+        e1000_phy_i210,
 };
 
 enum e1000_bus_type {
@@ -313,6 +323,9 @@ struct e1000_mac_operations {
         void (*rar_set)(struct e1000_hw *, u8 *, u32);
         s32  (*read_mac_addr)(struct e1000_hw *);
         s32  (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
+        s32  (*acquire_swfw_sync)(struct e1000_hw *, u16);
+        void (*release_swfw_sync)(struct e1000_hw *, u16);
+
 };
 
 struct e1000_phy_operations {
@@ -338,6 +351,7 @@ struct e1000_nvm_operations {
         s32  (*write)(struct e1000_hw *, u16, u16, u16 *);
         s32  (*update)(struct e1000_hw *);
         s32  (*validate)(struct e1000_hw *);
+        s32  (*valid_led_default)(struct e1000_hw *, u16 *);
 };
 
 struct e1000_info {
diff --git a/drivers/net/ethernet/intel/igb/e1000_i210.c b/drivers/net/ethernet/intel/igb/e1000_i210.c
new file mode 100644
index 000000000000..77a5f939bc74
--- /dev/null
+++ b/drivers/net/ethernet/intel/igb/e1000_i210.c
@@ -0,0 +1,603 @@
+/*******************************************************************************
+
+  Intel(R) Gigabit Ethernet Linux driver
+  Copyright(c) 2007-2012 Intel Corporation.
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms and conditions of the GNU General Public License,
+  version 2, as published by the Free Software Foundation.
+
+  This program is distributed in the hope it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+
+  The full GNU General Public License is included in this distribution in
+  the file called "COPYING".
+
+  Contact Information:
+  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+******************************************************************************/
+
+/* e1000_i210
+ * e1000_i211
+ */
+
+#include <linux/types.h>
+#include <linux/if_ether.h>
+
+#include "e1000_hw.h"
+#include "e1000_i210.h"
+
+static s32 igb_get_hw_semaphore_i210(struct e1000_hw *hw);
+static void igb_put_hw_semaphore_i210(struct e1000_hw *hw);
+static s32 igb_write_nvm_srwr(struct e1000_hw *hw, u16 offset, u16 words,
+                                u16 *data);
+static s32 igb_pool_flash_update_done_i210(struct e1000_hw *hw);
+
+/**
+ *  igb_acquire_nvm_i210 - Request for access to EEPROM
+ *  @hw: pointer to the HW structure
+ *
+ *  Acquire the necessary semaphores for exclusive access to the EEPROM.
+ *  Set the EEPROM access request bit and wait for EEPROM access grant bit.
+ *  Return successful if access grant bit set, else clear the request for
+ *  EEPROM access and return -E1000_ERR_NVM (-1).
+ **/
+s32 igb_acquire_nvm_i210(struct e1000_hw *hw)
+{
+        return igb_acquire_swfw_sync_i210(hw, E1000_SWFW_EEP_SM);
+}
+
+/**
+ *  igb_release_nvm_i210 - Release exclusive access to EEPROM
+ *  @hw: pointer to the HW structure
+ *
+ *  Stop any current commands to the EEPROM and clear the EEPROM request bit,
+ *  then release the semaphores acquired.
+ **/
+void igb_release_nvm_i210(struct e1000_hw *hw)
+{
+        igb_release_swfw_sync_i210(hw, E1000_SWFW_EEP_SM);
+}
+
+/**
+ *  igb_acquire_swfw_sync_i210 - Acquire SW/FW semaphore
+ *  @hw: pointer to the HW structure
+ *  @mask: specifies which semaphore to acquire
+ *
+ *  Acquire the SW/FW semaphore to access the PHY or NVM.  The mask
+ *  will also specify which port we're acquiring the lock for.
+ **/
+s32 igb_acquire_swfw_sync_i210(struct e1000_hw *hw, u16 mask)
+{
+        u32 swfw_sync;
+        u32 swmask = mask;
+        u32 fwmask = mask << 16;
+        s32 ret_val = E1000_SUCCESS;
+        s32 i = 0, timeout = 200; /* FIXME: find real value to use here */
+
+        while (i < timeout) {
+                if (igb_get_hw_semaphore_i210(hw)) {
+                        ret_val = -E1000_ERR_SWFW_SYNC;
+                        goto out;
+                }
+
+                swfw_sync = rd32(E1000_SW_FW_SYNC);
+                if (!(swfw_sync & fwmask))
+                        break;
+
+                /*
+                 * Firmware currently using resource (fwmask)
+                 */
+                igb_put_hw_semaphore_i210(hw);
+                mdelay(5);
+                i++;
+        }
+
+        if (i == timeout) {
+                hw_dbg("Driver can't access resource, SW_FW_SYNC timeout.\n");
+                ret_val = -E1000_ERR_SWFW_SYNC;
+                goto out;
+        }
+
+        swfw_sync |= swmask;
+        wr32(E1000_SW_FW_SYNC, swfw_sync);
+
+        igb_put_hw_semaphore_i210(hw);
+out:
+        return ret_val;
+}
+
+/**
+ *  igb_release_swfw_sync_i210 - Release SW/FW semaphore
+ *  @hw: pointer to the HW structure
+ *  @mask: specifies which semaphore to acquire
+ *
+ *  Release the SW/FW semaphore used to access the PHY or NVM.  The mask
+ *  will also specify which port we're releasing the lock for.
+ **/
+void igb_release_swfw_sync_i210(struct e1000_hw *hw, u16 mask)
+{
+        u32 swfw_sync;
+
+        while (igb_get_hw_semaphore_i210(hw) != E1000_SUCCESS)
+                ; /* Empty */
+
+        swfw_sync = rd32(E1000_SW_FW_SYNC);
+        swfw_sync &= ~mask;
+        wr32(E1000_SW_FW_SYNC, swfw_sync);
+
+        igb_put_hw_semaphore_i210(hw);
+}
+
+/**
+ *  igb_get_hw_semaphore_i210 - Acquire hardware semaphore
+ *  @hw: pointer to the HW structure
+ *
+ *  Acquire the HW semaphore to access the PHY or NVM
+ **/
+static s32 igb_get_hw_semaphore_i210(struct e1000_hw *hw)
+{
+        u32 swsm;
+        s32 ret_val = E1000_SUCCESS;
+        s32 timeout = hw->nvm.word_size + 1;
+        s32 i = 0;
+
+        /* Get the FW semaphore. */
+        for (i = 0; i < timeout; i++) {
+                swsm = rd32(E1000_SWSM);
+                wr32(E1000_SWSM, swsm | E1000_SWSM_SWESMBI);
+
+                /* Semaphore acquired if bit latched */
+                if (rd32(E1000_SWSM) & E1000_SWSM_SWESMBI)
+                        break;
+
+                udelay(50);
+        }
+
+        if (i == timeout) {
+                /* Release semaphores */
+                igb_put_hw_semaphore(hw);
+                hw_dbg("Driver can't access the NVM\n");
+                ret_val = -E1000_ERR_NVM;
+                goto out;
+        }
+
+out:
+        return ret_val;
+}
+
+/**
+ *  igb_put_hw_semaphore_i210 - Release hardware semaphore
+ *  @hw: pointer to the HW structure
+ *
+ *  Release hardware semaphore used to access the PHY or NVM
+ **/
+static void igb_put_hw_semaphore_i210(struct e1000_hw *hw)
+{
+        u32 swsm;
+
+        swsm = rd32(E1000_SWSM);
+
+        swsm &= ~E1000_SWSM_SWESMBI;
+
+        wr32(E1000_SWSM, swsm);
+}
+
+/**
+ *  igb_read_nvm_srrd_i210 - Reads Shadow Ram using EERD register
+ *  @hw: pointer to the HW structure
+ *  @offset: offset of word in the Shadow Ram to read
+ *  @words: number of words to read
+ *  @data: word read from the Shadow Ram
+ *
+ *  Reads a 16 bit word from the Shadow Ram using the EERD register.
+ *  Uses necessary synchronization semaphores.
+ **/
+s32 igb_read_nvm_srrd_i210(struct e1000_hw *hw, u16 offset, u16 words,
+                             u16 *data)
+{
+        s32 status = E1000_SUCCESS;
+        u16 i, count;
+
+        /* We cannot hold synchronization semaphores for too long,
+         * because of forceful takeover procedure. However it is more efficient
+         * to read in bursts than synchronizing access for each word. */
+        for (i = 0; i < words; i += E1000_EERD_EEWR_MAX_COUNT) {
+                count = (words - i) / E1000_EERD_EEWR_MAX_COUNT > 0 ?
+                        E1000_EERD_EEWR_MAX_COUNT : (words - i);
+                if (hw->nvm.ops.acquire(hw) == E1000_SUCCESS) {
+                        status = igb_read_nvm_eerd(hw, offset, count,
+                                                     data + i);
+                        hw->nvm.ops.release(hw);
+                } else {
+                        status = E1000_ERR_SWFW_SYNC;
+                }
+
+                if (status != E1000_SUCCESS)
+                        break;
+        }
+
+        return status;
+}
+
+/**
+ *  igb_write_nvm_srwr_i210 - Write to Shadow RAM using EEWR
+ *  @hw: pointer to the HW structure
+ *  @offset: offset within the Shadow RAM to be written to
+ *  @words: number of words to write
+ *  @data: 16 bit word(s) to be written to the Shadow RAM
+ *
+ *  Writes data to Shadow RAM at offset using EEWR register.
+ *
+ *  If e1000_update_nvm_checksum is not called after this function , the
+ *  data will not be committed to FLASH and also Shadow RAM will most likely
+ *  contain an invalid checksum.
+ *
+ *  If error code is returned, data and Shadow RAM may be inconsistent - buffer
+ *  partially written.
+ **/
+s32 igb_write_nvm_srwr_i210(struct e1000_hw *hw, u16 offset, u16 words,
+                              u16 *data)
+{
+        s32 status = E1000_SUCCESS;
+        u16 i, count;
+
+        /* We cannot hold synchronization semaphores for too long,
+         * because of forceful takeover procedure. However it is more efficient
+         * to write in bursts than synchronizing access for each word. */
+        for (i = 0; i < words; i += E1000_EERD_EEWR_MAX_COUNT) {
+                count = (words - i) / E1000_EERD_EEWR_MAX_COUNT > 0 ?
+                        E1000_EERD_EEWR_MAX_COUNT : (words - i);
+                if (hw->nvm.ops.acquire(hw) == E1000_SUCCESS) {
+                        status = igb_write_nvm_srwr(hw, offset, count,
+                                                      data + i);
+                        hw->nvm.ops.release(hw);
+                } else {
+                        status = E1000_ERR_SWFW_SYNC;
+                }
+
+                if (status != E1000_SUCCESS)
+                        break;
+        }
+
+        return status;
+}
+
+/**
+ *  igb_write_nvm_srwr - Write to Shadow Ram using EEWR
+ *  @hw: pointer to the HW structure
+ *  @offset: offset within the Shadow Ram to be written to
+ *  @words: number of words to write
+ *  @data: 16 bit word(s) to be written to the Shadow Ram
+ *
+ *  Writes data to Shadow Ram at offset using EEWR register.
+ *
+ *  If igb_update_nvm_checksum is not called after this function , the
+ *  Shadow Ram will most likely contain an invalid checksum.
+ **/
+static s32 igb_write_nvm_srwr(struct e1000_hw *hw, u16 offset, u16 words,
+                                u16 *data)
+{
+        struct e1000_nvm_info *nvm = &hw->nvm;
+        u32 i, k, eewr = 0;
+        u32 attempts = 100000;
+        s32 ret_val = E1000_SUCCESS;
+
+        /*
+         * A check for invalid values:  offset too large, too many words,
+         * too many words for the offset, and not enough words.
+         */
+        if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
+            (words == 0)) {
+                hw_dbg("nvm parameter(s) out of bounds\n");
+                ret_val = -E1000_ERR_NVM;
+                goto out;
+        }
+
+        for (i = 0; i < words; i++) {
+                eewr = ((offset+i) << E1000_NVM_RW_ADDR_SHIFT) |
+                        (data[i] << E1000_NVM_RW_REG_DATA) |
+                        E1000_NVM_RW_REG_START;
+
+                wr32(E1000_SRWR, eewr);
+
+                for (k = 0; k < attempts; k++) {
+                        if (E1000_NVM_RW_REG_DONE &
+                            rd32(E1000_SRWR)) {
+                                ret_val = E1000_SUCCESS;
+                                break;
+                        }
+                        udelay(5);
+        }
+
+                if (ret_val != E1000_SUCCESS) {
+                        hw_dbg("Shadow RAM write EEWR timed out\n");
+                        break;
+                }
+        }
+
+out:
+        return ret_val;
+}
+
+/**
+ *  igb_read_nvm_i211 - Read NVM wrapper function for I211
+ *  @hw: pointer to the HW structure
+ *  @address: the word address (aka eeprom offset) to read
+ *  @data: pointer to the data read
+ *
+ *  Wrapper function to return data formerly found in the NVM.
+ **/
+s32 igb_read_nvm_i211(struct e1000_hw *hw, u16 offset, u16 words,
+                               u16 *data)
+{
+        s32 ret_val = E1000_SUCCESS;
+
+        /* Only the MAC addr is required to be present in the iNVM */
+        switch (offset) {
+        case NVM_MAC_ADDR:
+                ret_val = igb_read_invm_i211(hw, offset, &data[0]);
+                ret_val |= igb_read_invm_i211(hw, offset+1, &data[1]);
+                ret_val |= igb_read_invm_i211(hw, offset+2, &data[2]);
+                if (ret_val != E1000_SUCCESS)
+                        hw_dbg("MAC Addr not found in iNVM\n");
+                break;
+        case NVM_ID_LED_SETTINGS:
+        case NVM_INIT_CTRL_2:
+        case NVM_INIT_CTRL_4:
+        case NVM_LED_1_CFG:
+        case NVM_LED_0_2_CFG:
+                igb_read_invm_i211(hw, offset, data);
+                break;
+        case NVM_COMPAT:
+                *data = ID_LED_DEFAULT_I210;
+                break;
+        case NVM_SUB_DEV_ID:
+                *data = hw->subsystem_device_id;
+                break;
+        case NVM_SUB_VEN_ID:
+                *data = hw->subsystem_vendor_id;
+                break;
+        case NVM_DEV_ID:
+                *data = hw->device_id;
+                break;
+        case NVM_VEN_ID:
+                *data = hw->vendor_id;
+                break;
+        default:
+                hw_dbg("NVM word 0x%02x is not mapped.\n", offset);
+                *data = NVM_RESERVED_WORD;
+                break;
+        }
+        return ret_val;
+}
+
+/**
+ *  igb_read_invm_i211 - Reads OTP
+ *  @hw: pointer to the HW structure
+ *  @address: the word address (aka eeprom offset) to read
+ *  @data: pointer to the data read
+ *
+ *  Reads 16-bit words from the OTP. Return error when the word is not
+ *  stored in OTP.
+ **/
+s32 igb_read_invm_i211(struct e1000_hw *hw, u16 address, u16 *data)
+{
+        s32 status = -E1000_ERR_INVM_VALUE_NOT_FOUND;
+        u32 invm_dword;
+        u16 i;
+        u8 record_type, word_address;
+
+        for (i = 0; i < E1000_INVM_SIZE; i++) {
+                invm_dword = rd32(E1000_INVM_DATA_REG(i));
+                /* Get record type */
+                record_type = INVM_DWORD_TO_RECORD_TYPE(invm_dword);
+                if (record_type == E1000_INVM_UNINITIALIZED_STRUCTURE)
+                        break;
+                if (record_type == E1000_INVM_CSR_AUTOLOAD_STRUCTURE)
+                        i += E1000_INVM_CSR_AUTOLOAD_DATA_SIZE_IN_DWORDS;
+                if (record_type == E1000_INVM_RSA_KEY_SHA256_STRUCTURE)
+                        i += E1000_INVM_RSA_KEY_SHA256_DATA_SIZE_IN_DWORDS;
+                if (record_type == E1000_INVM_WORD_AUTOLOAD_STRUCTURE) {
+                        word_address = INVM_DWORD_TO_WORD_ADDRESS(invm_dword);
+                        if (word_address == (u8)address) {
+                                *data = INVM_DWORD_TO_WORD_DATA(invm_dword);
+                                hw_dbg("Read INVM Word 0x%02x = %x",
+                                          address, *data);
+                                status = E1000_SUCCESS;
+                                break;
+                        }
+                }
+        }
+        if (status != E1000_SUCCESS)
+                hw_dbg("Requested word 0x%02x not found in OTP\n", address);
+        return status;
+}
+
+/**
+ *  igb_validate_nvm_checksum_i210 - Validate EEPROM checksum
+ *  @hw: pointer to the HW structure
+ *
+ *  Calculates the EEPROM checksum by reading/adding each word of the EEPROM
+ *  and then verifies that the sum of the EEPROM is equal to 0xBABA.
+ **/
+s32 igb_validate_nvm_checksum_i210(struct e1000_hw *hw)
+{
+        s32 status = E1000_SUCCESS;
+        s32 (*read_op_ptr)(struct e1000_hw *, u16, u16, u16 *);
+
+        if (hw->nvm.ops.acquire(hw) == E1000_SUCCESS) {
+
+                /*
+                 * Replace the read function with semaphore grabbing with
+                 * the one that skips this for a while.
+                 * We have semaphore taken already here.
+                 */
+                read_op_ptr = hw->nvm.ops.read;
+                hw->nvm.ops.read = igb_read_nvm_eerd;
+
+                status = igb_validate_nvm_checksum(hw);
+
+                /* Revert original read operation. */
+                hw->nvm.ops.read = read_op_ptr;
+
+                hw->nvm.ops.release(hw);
+        } else {
+                status = E1000_ERR_SWFW_SYNC;
+        }
+
+        return status;
+}
+
+
+/**
+ *  igb_update_nvm_checksum_i210 - Update EEPROM checksum
+ *  @hw: pointer to the HW structure
+ *
+ *  Updates the EEPROM checksum by reading/adding each word of the EEPROM
+ *  up to the checksum.  Then calculates the EEPROM checksum and writes the
+ *  value to the EEPROM. Next commit EEPROM data onto the Flash.
+ **/
+s32 igb_update_nvm_checksum_i210(struct e1000_hw *hw)
+{
+        s32 ret_val = E1000_SUCCESS;
+        u16 checksum = 0;
+        u16 i, nvm_data;
+
+        /*
+         * Read the first word from the EEPROM. If this times out or fails, do
+         * not continue or we could be in for a very long wait while every
+         * EEPROM read fails
+         */
+        ret_val = igb_read_nvm_eerd(hw, 0, 1, &nvm_data);
+        if (ret_val != E1000_SUCCESS) {
+                hw_dbg("EEPROM read failed\n");
+                goto out;
+        }
+
+        if (hw->nvm.ops.acquire(hw) == E1000_SUCCESS) {
+                /*
+                 * Do not use hw->nvm.ops.write, hw->nvm.ops.read
+                 * because we do not want to take the synchronization
+                 * semaphores twice here.
+                 */
+
+                for (i = 0; i < NVM_CHECKSUM_REG; i++) {
+                        ret_val = igb_read_nvm_eerd(hw, i, 1, &nvm_data);
+                        if (ret_val) {
+                                hw->nvm.ops.release(hw);
+                                hw_dbg("NVM Read Error while updating checksum.\n");
+                                goto out;
+                        }
+                        checksum += nvm_data;
+                }
+                checksum = (u16) NVM_SUM - checksum;
+                ret_val = igb_write_nvm_srwr(hw, NVM_CHECKSUM_REG, 1,
+                                                &checksum);
+                if (ret_val != E1000_SUCCESS) {
+                        hw->nvm.ops.release(hw);
+                        hw_dbg("NVM Write Error while updating checksum.\n");
+                        goto out;
+                }
+
+                hw->nvm.ops.release(hw);
+
+                ret_val = igb_update_flash_i210(hw);
+        } else {
+                ret_val = -E1000_ERR_SWFW_SYNC;
+        }
+out:
+        return ret_val;
+}
+
+/**
+ *  igb_update_flash_i210 - Commit EEPROM to the flash
+ *  @hw: pointer to the HW structure
+ *
+ **/
+s32 igb_update_flash_i210(struct e1000_hw *hw)
+{
+        s32 ret_val = E1000_SUCCESS;
+        u32 flup;
+
+        ret_val = igb_pool_flash_update_done_i210(hw);
+        if (ret_val == -E1000_ERR_NVM) {
+                hw_dbg("Flash update time out\n");
+                goto out;
+        }
+
+        flup = rd32(E1000_EECD) | E1000_EECD_FLUPD_I210;
+        wr32(E1000_EECD, flup);
+
+        ret_val = igb_pool_flash_update_done_i210(hw);
+        if (ret_val == E1000_SUCCESS)
+                hw_dbg("Flash update complete\n");
+        else
+                hw_dbg("Flash update time out\n");
+
+out:
+        return ret_val;
+}
+
+/**
+ *  igb_pool_flash_update_done_i210 - Pool FLUDONE status.
+ *  @hw: pointer to the HW structure
+ *
+ **/
+s32 igb_pool_flash_update_done_i210(struct e1000_hw *hw)
+{
+        s32 ret_val = -E1000_ERR_NVM;
+        u32 i, reg;
+
+        for (i = 0; i < E1000_FLUDONE_ATTEMPTS; i++) {
+                reg = rd32(E1000_EECD);
+                if (reg & E1000_EECD_FLUDONE_I210) {
+                        ret_val = E1000_SUCCESS;
+                        break;
+                }
+                udelay(5);
+        }
+
+        return ret_val;
+}
+
+/**
+ *  igb_valid_led_default_i210 - Verify a valid default LED config
+ *  @hw: pointer to the HW structure
+ *  @data: pointer to the NVM (EEPROM)
+ *
+ *  Read the EEPROM for the current default LED configuration.  If the
+ *  LED configuration is not valid, set to a valid LED configuration.
+ **/
+s32 igb_valid_led_default_i210(struct e1000_hw *hw, u16 *data)
+{
+        s32 ret_val;
+
+        ret_val = hw->nvm.ops.read(hw, NVM_ID_LED_SETTINGS, 1, data);
+        if (ret_val) {
+                hw_dbg("NVM Read Error\n");
+                goto out;
+        }
+
+        if (*data == ID_LED_RESERVED_0000 || *data == ID_LED_RESERVED_FFFF) {
+                switch (hw->phy.media_type) {
+                case e1000_media_type_internal_serdes:
+                        *data = ID_LED_DEFAULT_I210_SERDES;
+                        break;
+                case e1000_media_type_copper:
+                default:
+                        *data = ID_LED_DEFAULT_I210;
+                        break;
+                }
+        }
+out:
+        return ret_val;
+}
diff --git a/drivers/net/ethernet/intel/igb/e1000_i210.h b/drivers/net/ethernet/intel/igb/e1000_i210.h
new file mode 100644
index 000000000000..5dc2bd3f50bc
--- /dev/null
+++ b/drivers/net/ethernet/intel/igb/e1000_i210.h
@@ -0,0 +1,76 @@
+/*******************************************************************************
+
+  Intel(R) Gigabit Ethernet Linux driver
+  Copyright(c) 2007-2012 Intel Corporation.
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms and conditions of the GNU General Public License,
+  version 2, as published by the Free Software Foundation.
+
+  This program is distributed in the hope it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+
+  The full GNU General Public License is included in this distribution in
+  the file called "COPYING".
+
+  Contact Information:
+  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+#ifndef _E1000_I210_H_
+#define _E1000_I210_H_
+
+extern s32 igb_update_flash_i210(struct e1000_hw *hw);
+extern s32 igb_update_nvm_checksum_i210(struct e1000_hw *hw);
+extern s32 igb_validate_nvm_checksum_i210(struct e1000_hw *hw);
+extern s32 igb_write_nvm_srwr_i210(struct e1000_hw *hw, u16 offset,
+                              u16 words, u16 *data);
+extern s32 igb_read_nvm_srrd_i210(struct e1000_hw *hw, u16 offset,
+                             u16 words, u16 *data);
+extern s32 igb_read_invm_i211(struct e1000_hw *hw, u16 address, u16 *data);
+extern s32 igb_acquire_swfw_sync_i210(struct e1000_hw *hw, u16 mask);
+extern void igb_release_swfw_sync_i210(struct e1000_hw *hw, u16 mask);
+extern s32 igb_acquire_nvm_i210(struct e1000_hw *hw);
+extern void igb_release_nvm_i210(struct e1000_hw *hw);
+extern s32 igb_valid_led_default_i210(struct e1000_hw *hw, u16 *data);
+extern s32 igb_read_nvm_i211(struct e1000_hw *hw, u16 offset, u16 words,
+                               u16 *data);
+
+#define E1000_STM_OPCODE                0xDB00
+#define E1000_EEPROM_FLASH_SIZE_WORD    0x11
+
+#define INVM_DWORD_TO_RECORD_TYPE(invm_dword) \
+        (u8)((invm_dword) & 0x7)
+#define INVM_DWORD_TO_WORD_ADDRESS(invm_dword) \
+        (u8)(((invm_dword) & 0x0000FE00) >> 9)
+#define INVM_DWORD_TO_WORD_DATA(invm_dword) \
+        (u16)(((invm_dword) & 0xFFFF0000) >> 16)
+
+enum E1000_INVM_STRUCTURE_TYPE {
+        E1000_INVM_UNINITIALIZED_STRUCTURE              = 0x00,
+        E1000_INVM_WORD_AUTOLOAD_STRUCTURE              = 0x01,
+        E1000_INVM_CSR_AUTOLOAD_STRUCTURE               = 0x02,
+        E1000_INVM_PHY_REGISTER_AUTOLOAD_STRUCTURE      = 0x03,
+        E1000_INVM_RSA_KEY_SHA256_STRUCTURE             = 0x04,
+        E1000_INVM_INVALIDATED_STRUCTURE                = 0x0F,
+};
+
+#define E1000_INVM_RSA_KEY_SHA256_DATA_SIZE_IN_DWORDS   8
+#define E1000_INVM_CSR_AUTOLOAD_DATA_SIZE_IN_DWORDS     1
+
+#define ID_LED_DEFAULT_I210             ((ID_LED_OFF1_ON2  << 8) | \
+                                         (ID_LED_OFF1_OFF2 <<  4) | \
+                                         (ID_LED_DEF1_DEF2))
+#define ID_LED_DEFAULT_I210_SERDES      ((ID_LED_DEF1_DEF2 << 8) | \
+                                         (ID_LED_DEF1_DEF2 <<  4) | \
+                                         (ID_LED_DEF1_DEF2))
+
+#endif
diff --git a/drivers/net/ethernet/intel/igb/e1000_mac.c b/drivers/net/ethernet/intel/igb/e1000_mac.c
index f57338afd71f..819c145ac762 100644
--- a/drivers/net/ethernet/intel/igb/e1000_mac.c
+++ b/drivers/net/ethernet/intel/igb/e1000_mac.c
@@ -658,6 +658,7 @@ s32 igb_setup_link(struct e1000_hw *hw)
         ret_val = igb_set_fc_watermarks(hw);
 
 out:
+
         return ret_val;
 }
 
diff --git a/drivers/net/ethernet/intel/igb/e1000_nvm.c b/drivers/net/ethernet/intel/igb/e1000_nvm.c
index fa2c6ba62139..aa5fcdf3f357 100644
--- a/drivers/net/ethernet/intel/igb/e1000_nvm.c
+++ b/drivers/net/ethernet/intel/igb/e1000_nvm.c
@@ -710,4 +710,3 @@ s32 igb_update_nvm_checksum(struct e1000_hw *hw)
 out:
         return ret_val;
 }
-
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
index 789de5b83aad..7be98b6f1052 100644
--- a/drivers/net/ethernet/intel/igb/e1000_phy.c
+++ b/drivers/net/ethernet/intel/igb/e1000_phy.c
@@ -35,6 +35,7 @@ static s32  igb_phy_setup_autoneg(struct e1000_hw *hw);
 static void igb_phy_force_speed_duplex_setup(struct e1000_hw *hw,
                                                u16 *phy_ctrl);
 static s32  igb_wait_autoneg(struct e1000_hw *hw);
+static s32  igb_set_master_slave_mode(struct e1000_hw *hw);
 
 /* Cable length tables */
 static const u16 e1000_m88_cable_length_table[] =
@@ -570,6 +571,11 @@ s32 igb_copper_link_setup_m88(struct e1000_hw *hw)
                 hw_dbg("Error committing the PHY changes\n");
                 goto out;
         }
+        if (phy->type == e1000_phy_i210) {
+                ret_val = igb_set_master_slave_mode(hw);
+                if (ret_val)
+                        return ret_val;
+        }
 
 out:
         return ret_val;
@@ -1213,12 +1219,22 @@ s32 igb_phy_force_speed_duplex_m88(struct e1000_hw *hw)
                         goto out;
 
                 if (!link) {
-                        if (hw->phy.type != e1000_phy_m88 ||
-                            hw->phy.id == I347AT4_E_PHY_ID ||
-                            hw->phy.id == M88E1112_E_PHY_ID) {
+                        bool reset_dsp = true;
+
+                        switch (hw->phy.id) {
+                        case I347AT4_E_PHY_ID:
+                        case M88E1112_E_PHY_ID:
+                        case I210_I_PHY_ID:
+                                reset_dsp = false;
+                                break;
+                        default:
+                                if (hw->phy.type != e1000_phy_m88)
+                                        reset_dsp = false;
+                                break;
+                        }
+                        if (!reset_dsp)
                                 hw_dbg("Link taking longer than expected.\n");
-                        } else {
-
+                        else {
                                 /*
                                  * We didn't get link.
                                  * Reset the DSP and cross our fingers.
@@ -1243,7 +1259,8 @@ s32 igb_phy_force_speed_duplex_m88(struct e1000_hw *hw)
 
         if (hw->phy.type != e1000_phy_m88 ||
             hw->phy.id == I347AT4_E_PHY_ID ||
-            hw->phy.id == M88E1112_E_PHY_ID)
+            hw->phy.id == M88E1112_E_PHY_ID ||
+            hw->phy.id == I210_I_PHY_ID)
                 goto out;
 
         ret_val = phy->ops.read_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_data);
@@ -1441,6 +1458,7 @@ s32 igb_check_downshift(struct e1000_hw *hw)
         u16 phy_data, offset, mask;
 
         switch (phy->type) {
+        case e1000_phy_i210:
         case e1000_phy_m88:
         case e1000_phy_gg82563:
                 offset  = M88E1000_PHY_SPEC_STATUS;
@@ -1476,7 +1494,7 @@ out:
  *
  *  Polarity is determined based on the PHY specific status register.
  **/
-static s32 igb_check_polarity_m88(struct e1000_hw *hw)
+s32 igb_check_polarity_m88(struct e1000_hw *hw)
 {
         struct e1000_phy_info *phy = &hw->phy;
         s32 ret_val;
@@ -1665,6 +1683,7 @@ s32 igb_get_cable_length_m88_gen2(struct e1000_hw *hw)
         u16 phy_data, phy_data2, index, default_page, is_cm;
 
         switch (hw->phy.id) {
+        case I210_I_PHY_ID:
         case I347AT4_E_PHY_ID:
                 /* Remember the original page select and set it to 7 */
                 ret_val = phy->ops.read_reg(hw, I347AT4_PAGE_SELECT,
@@ -2129,10 +2148,16 @@ s32 igb_phy_init_script_igp3(struct e1000_hw *hw)
 void igb_power_up_phy_copper(struct e1000_hw *hw)
 {
         u16 mii_reg = 0;
+        u16 power_reg = 0;
 
         /* The PHY will retain its settings across a power down/up cycle */
         hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg);
         mii_reg &= ~MII_CR_POWER_DOWN;
+        if (hw->phy.type == e1000_phy_i210) {
+                hw->phy.ops.read_reg(hw, GS40G_COPPER_SPEC, &power_reg);
+                power_reg &= ~GS40G_CS_POWER_DOWN;
+                hw->phy.ops.write_reg(hw, GS40G_COPPER_SPEC, power_reg);
+        }
         hw->phy.ops.write_reg(hw, PHY_CONTROL, mii_reg);
 }
 
@@ -2146,10 +2171,18 @@ void igb_power_up_phy_copper(struct e1000_hw *hw)
 void igb_power_down_phy_copper(struct e1000_hw *hw)
 {
         u16 mii_reg = 0;
+        u16 power_reg = 0;
 
         /* The PHY will retain its settings across a power down/up cycle */
         hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg);
         mii_reg |= MII_CR_POWER_DOWN;
+
+        /* i210 Phy requires an additional bit for power up/down */
+        if (hw->phy.type == e1000_phy_i210) {
+                hw->phy.ops.read_reg(hw, GS40G_COPPER_SPEC, &power_reg);
+                power_reg |= GS40G_CS_POWER_DOWN;
+                hw->phy.ops.write_reg(hw, GS40G_COPPER_SPEC, power_reg);
+        }
         hw->phy.ops.write_reg(hw, PHY_CONTROL, mii_reg);
         msleep(1);
 }
@@ -2345,3 +2378,103 @@ s32 igb_get_cable_length_82580(struct e1000_hw *hw)
 out:
         return ret_val;
 }
+
+/**
+ *  igb_write_phy_reg_gs40g - Write GS40G PHY register
+ *  @hw: pointer to the HW structure
+ *  @offset: lower half is register offset to write to
+ *     upper half is page to use.
+ *  @data: data to write at register offset
+ *
+ *  Acquires semaphore, if necessary, then writes the data to PHY register
+ *  at the offset.  Release any acquired semaphores before exiting.
+ **/
+s32 igb_write_phy_reg_gs40g(struct e1000_hw *hw, u32 offset, u16 data)
+{
+        s32 ret_val;
+        u16 page = offset >> GS40G_PAGE_SHIFT;
+
+        offset = offset & GS40G_OFFSET_MASK;
+        ret_val = hw->phy.ops.acquire(hw);
+        if (ret_val)
+                return ret_val;
+
+        ret_val = igb_write_phy_reg_mdic(hw, GS40G_PAGE_SELECT, page);
+        if (ret_val)
+                goto release;
+        ret_val = igb_write_phy_reg_mdic(hw, offset, data);
+
+release:
+        hw->phy.ops.release(hw);
+        return ret_val;
+}
+
+/**
+ *  igb_read_phy_reg_gs40g - Read GS40G  PHY register
+ *  @hw: pointer to the HW structure
+ *  @offset: lower half is register offset to read to
+ *     upper half is page to use.
+ *  @data: data to read at register offset
+ *
+ *  Acquires semaphore, if necessary, then reads the data in the PHY register
+ *  at the offset.  Release any acquired semaphores before exiting.
+ **/
+s32 igb_read_phy_reg_gs40g(struct e1000_hw *hw, u32 offset, u16 *data)
+{
+        s32 ret_val;
+        u16 page = offset >> GS40G_PAGE_SHIFT;
+
+        offset = offset & GS40G_OFFSET_MASK;
+        ret_val = hw->phy.ops.acquire(hw);
+        if (ret_val)
+                return ret_val;
+
+        ret_val = igb_write_phy_reg_mdic(hw, GS40G_PAGE_SELECT, page);
+        if (ret_val)
+                goto release;
+        ret_val = igb_read_phy_reg_mdic(hw, offset, data);
+
+release:
+        hw->phy.ops.release(hw);
+        return ret_val;
+}
+
+/**
+ *  igb_set_master_slave_mode - Setup PHY for Master/slave mode
+ *  @hw: pointer to the HW structure
+ *
+ *  Sets up Master/slave mode
+ **/
+static s32 igb_set_master_slave_mode(struct e1000_hw *hw)
+{
+        s32 ret_val;
+        u16 phy_data;
+
+        /* Resolve Master/Slave mode */
+        ret_val = hw->phy.ops.read_reg(hw, PHY_1000T_CTRL, &phy_data);
+        if (ret_val)
+                return ret_val;
+
+        /* load defaults for future use */
+        hw->phy.original_ms_type = (phy_data & CR_1000T_MS_ENABLE) ?
+                                   ((phy_data & CR_1000T_MS_VALUE) ?
+                                    e1000_ms_force_master :
+                                    e1000_ms_force_slave) : e1000_ms_auto;
+
+        switch (hw->phy.ms_type) {
+        case e1000_ms_force_master:
+                phy_data |= (CR_1000T_MS_ENABLE | CR_1000T_MS_VALUE);
+                break;
+        case e1000_ms_force_slave:
+                phy_data |= CR_1000T_MS_ENABLE;
+                phy_data &= ~(CR_1000T_MS_VALUE);
+                break;
+        case e1000_ms_auto:
+                phy_data &= ~CR_1000T_MS_ENABLE;
+                /* fall-through */
+        default:
+                break;
+        }
+
+        return hw->phy.ops.write_reg(hw, PHY_1000T_CTRL, phy_data);
+}
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.h b/drivers/net/ethernet/intel/igb/e1000_phy.h
index 4c32ac66ff39..34e40619f16b 100644
--- a/drivers/net/ethernet/intel/igb/e1000_phy.h
+++ b/drivers/net/ethernet/intel/igb/e1000_phy.h
@@ -73,6 +73,9 @@ s32  igb_copper_link_setup_82580(struct e1000_hw *hw);
 s32  igb_get_phy_info_82580(struct e1000_hw *hw);
 s32  igb_phy_force_speed_duplex_82580(struct e1000_hw *hw);
 s32  igb_get_cable_length_82580(struct e1000_hw *hw);
+s32  igb_read_phy_reg_gs40g(struct e1000_hw *hw, u32 offset, u16 *data);
+s32  igb_write_phy_reg_gs40g(struct e1000_hw *hw, u32 offset, u16 data);
+s32  igb_check_polarity_m88(struct e1000_hw *hw);
 
 /* IGP01E1000 Specific Registers */
 #define IGP01E1000_PHY_PORT_CONFIG        0x10 /* Port Config */
@@ -114,6 +117,13 @@ s32  igb_get_cable_length_82580(struct e1000_hw *hw);
 /* I82580 PHY Diagnostics Status */
 #define I82580_DSTATUS_CABLE_LENGTH       0x03FC
 #define I82580_DSTATUS_CABLE_LENGTH_SHIFT 2
+
+/* 82580 PHY Power Management */
+#define E1000_82580_PHY_POWER_MGMT      0xE14
+#define E1000_82580_PM_SPD              0x0001 /* Smart Power Down */
+#define E1000_82580_PM_D0_LPLU          0x0002 /* For D0a states */
+#define E1000_82580_PM_D3_LPLU          0x0004 /* For all other states */
+
 /* Enable flexible speed on link-up */
 #define IGP02E1000_PM_D0_LPLU             0x0002 /* For D0a states */
 #define IGP02E1000_PM_D3_LPLU             0x0004 /* For all other states */
@@ -133,4 +143,16 @@ s32  igb_get_cable_length_82580(struct e1000_hw *hw);
 
 #define E1000_CABLE_LENGTH_UNDEFINED      0xFF
 
+/* GS40G - I210 PHY defines */
+#define GS40G_PAGE_SELECT               0x16
+#define GS40G_PAGE_SHIFT                16
+#define GS40G_OFFSET_MASK               0xFFFF
+#define GS40G_PAGE_2                    0x20000
+#define GS40G_MAC_REG2                  0x15
+#define GS40G_MAC_LB                    0x4140
+#define GS40G_MAC_SPEED_1G              0X0006
+#define GS40G_COPPER_SPEC               0x0010
+#define GS40G_CS_POWER_DOWN             0x0002
+#define GS40G_LINE_LB                   0x4000
+
 #endif
diff --git a/drivers/net/ethernet/intel/igb/e1000_regs.h b/drivers/net/ethernet/intel/igb/e1000_regs.h
index ccdf36d503fd..35d1e4f2c92c 100644
--- a/drivers/net/ethernet/intel/igb/e1000_regs.h
+++ b/drivers/net/ethernet/intel/igb/e1000_regs.h
@@ -352,4 +352,18 @@
 #define E1000_O2BGPTC   0x08FE4 /* OS2BMC packets received by BMC */
 #define E1000_O2BSPC    0x0415C /* OS2BMC packets transmitted by host */
 
+#define E1000_SRWR              0x12018  /* Shadow Ram Write Register - RW */
+#define E1000_I210_FLMNGCTL     0x12038
+#define E1000_I210_FLMNGDATA    0x1203C
+#define E1000_I210_FLMNGCNT     0x12040
+
+#define E1000_I210_FLSWCTL      0x12048
+#define E1000_I210_FLSWDATA     0x1204C
+#define E1000_I210_FLSWCNT      0x12050
+
+#define E1000_I210_FLA          0x1201C
+
+#define E1000_INVM_DATA_REG(_n) (0x12120 + 4*(_n))
+#define E1000_INVM_SIZE         64 /* Number of INVM Data Registers */
+
 #endif
diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h
index 8e33bdd33eea..ae6d3f393a54 100644
--- a/drivers/net/ethernet/intel/igb/igb.h
+++ b/drivers/net/ethernet/intel/igb/igb.h
@@ -35,8 +35,8 @@
 #include "e1000_82575.h"
 
 #include <linux/clocksource.h>
-#include <linux/timecompare.h>
 #include <linux/net_tstamp.h>
+#include <linux/ptp_clock_kernel.h>
 #include <linux/bitops.h>
 #include <linux/if_vlan.h>
 
@@ -65,10 +65,13 @@ struct igb_adapter;
 #define MAX_Q_VECTORS                      8
 
 /* Transmit and receive queues */
-#define IGB_MAX_RX_QUEUES                  (adapter->vfs_allocated_count ? 2 : \
-                                           (hw->mac.type > e1000_82575 ? 8 : 4))
+#define IGB_MAX_RX_QUEUES               ((adapter->vfs_allocated_count ? 2 : \
+                                        (hw->mac.type > e1000_82575 ? 8 : 4)))
+#define IGB_MAX_RX_QUEUES_I210             4
+#define IGB_MAX_RX_QUEUES_I211             2
 #define IGB_MAX_TX_QUEUES                  16
-
+#define IGB_MAX_TX_QUEUES_I210             4
+#define IGB_MAX_TX_QUEUES_I211             2
 #define IGB_MAX_VF_MC_ENTRIES              30
 #define IGB_MAX_VF_FUNCTIONS               8
 #define IGB_MAX_VFTA_ENTRIES               128
@@ -328,9 +331,6 @@ struct igb_adapter {
 
         /* OS defined structs */
         struct pci_dev *pdev;
-        struct cyclecounter cycles;
-        struct timecounter clock;
-        struct timecompare compare;
         struct hwtstamp_config hwtstamp_config;
 
         spinlock_t stats64_lock;
@@ -364,6 +364,13 @@ struct igb_adapter {
         u32 wvbr;
         int node;
         u32 *shadow_vfta;
+
+        struct ptp_clock *ptp_clock;
+        struct ptp_clock_info caps;
+        struct delayed_work overflow_work;
+        spinlock_t tmreg_lock;
+        struct cyclecounter cc;
+        struct timecounter tc;
 };
 
 #define IGB_FLAG_HAS_MSI           (1 << 0)
@@ -378,7 +385,6 @@ struct igb_adapter {
 #define IGB_DMCTLX_DCFLUSH_DIS     0x80000000  /* Disable DMA Coal Flush */
 
 #define IGB_82576_TSYNC_SHIFT 19
-#define IGB_82580_TSYNC_SHIFT 24
 #define IGB_TS_HDR_LEN        16
 enum e1000_state_t {
         __IGB_TESTING,
@@ -414,7 +420,15 @@ extern void igb_update_stats(struct igb_adapter *, struct rtnl_link_stats64 *);
 extern bool igb_has_link(struct igb_adapter *adapter);
 extern void igb_set_ethtool_ops(struct net_device *);
 extern void igb_power_up_link(struct igb_adapter *);
+#ifdef CONFIG_IGB_PTP
+extern void igb_ptp_init(struct igb_adapter *adapter);
+extern void igb_ptp_remove(struct igb_adapter *adapter);
 
+extern void igb_systim_to_hwtstamp(struct igb_adapter *adapter,
+                                   struct skb_shared_hwtstamps *hwtstamps,
+                                   u64 systim);
+
+#endif
 static inline s32 igb_reset_phy(struct e1000_hw *hw)
 {
         if (hw->phy.ops.reset)
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index e10821a0f249..812d4f963bd1 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -335,7 +335,7 @@ static void igb_set_msglevel(struct net_device *netdev, u32 data)
 
 static int igb_get_regs_len(struct net_device *netdev)
 {
-#define IGB_REGS_LEN 551
+#define IGB_REGS_LEN 739
         return IGB_REGS_LEN * sizeof(u32);
 }
 
@@ -552,10 +552,49 @@ static void igb_get_regs(struct net_device *netdev,
         regs_buff[548] = rd32(E1000_TDFT);
         regs_buff[549] = rd32(E1000_TDFHS);
         regs_buff[550] = rd32(E1000_TDFPC);
-        regs_buff[551] = adapter->stats.o2bgptc;
-        regs_buff[552] = adapter->stats.b2ospc;
-        regs_buff[553] = adapter->stats.o2bspc;
-        regs_buff[554] = adapter->stats.b2ogprc;
+
+        if (hw->mac.type > e1000_82580) {
+                regs_buff[551] = adapter->stats.o2bgptc;
+                regs_buff[552] = adapter->stats.b2ospc;
+                regs_buff[553] = adapter->stats.o2bspc;
+                regs_buff[554] = adapter->stats.b2ogprc;
+        }
+
+        if (hw->mac.type != e1000_82576)
+                return;
+        for (i = 0; i < 12; i++)
+                regs_buff[555 + i] = rd32(E1000_SRRCTL(i + 4));
+        for (i = 0; i < 4; i++)
+                regs_buff[567 + i] = rd32(E1000_PSRTYPE(i + 4));
+        for (i = 0; i < 12; i++)
+                regs_buff[571 + i] = rd32(E1000_RDBAL(i + 4));
+        for (i = 0; i < 12; i++)
+                regs_buff[583 + i] = rd32(E1000_RDBAH(i + 4));
+        for (i = 0; i < 12; i++)
+                regs_buff[595 + i] = rd32(E1000_RDLEN(i + 4));
+        for (i = 0; i < 12; i++)
+                regs_buff[607 + i] = rd32(E1000_RDH(i + 4));
+        for (i = 0; i < 12; i++)
+                regs_buff[619 + i] = rd32(E1000_RDT(i + 4));
+        for (i = 0; i < 12; i++)
+                regs_buff[631 + i] = rd32(E1000_RXDCTL(i + 4));
+
+        for (i = 0; i < 12; i++)
+                regs_buff[643 + i] = rd32(E1000_TDBAL(i + 4));
+        for (i = 0; i < 12; i++)
+                regs_buff[655 + i] = rd32(E1000_TDBAH(i + 4));
+        for (i = 0; i < 12; i++)
+                regs_buff[667 + i] = rd32(E1000_TDLEN(i + 4));
+        for (i = 0; i < 12; i++)
+                regs_buff[679 + i] = rd32(E1000_TDH(i + 4));
+        for (i = 0; i < 12; i++)
+                regs_buff[691 + i] = rd32(E1000_TDT(i + 4));
+        for (i = 0; i < 12; i++)
+                regs_buff[703 + i] = rd32(E1000_TXDCTL(i + 4));
+        for (i = 0; i < 12; i++)
+                regs_buff[715 + i] = rd32(E1000_TDWBAL(i + 4));
+        for (i = 0; i < 12; i++)
+                regs_buff[727 + i] = rd32(E1000_TDWBAH(i + 4));
 }
 
 static int igb_get_eeprom_len(struct net_device *netdev)
@@ -624,6 +663,9 @@ static int igb_set_eeprom(struct net_device *netdev,
         if (eeprom->len == 0)
                 return -EOPNOTSUPP;
 
+        if (hw->mac.type == e1000_i211)
+                return -EOPNOTSUPP;
+
         if (eeprom->magic != (hw->vendor_id | (hw->device_id << 16)))
                 return -EFAULT;
 
@@ -851,6 +893,36 @@ struct igb_reg_test {
 #define TABLE64_TEST_LO 5
 #define TABLE64_TEST_HI 6
 
+/* i210 reg test */
+static struct igb_reg_test reg_test_i210[] = {
+        { E1000_FCAL,      0x100, 1,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+        { E1000_FCAH,      0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },
+        { E1000_FCT,       0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },
+        { E1000_RDBAL(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+        { E1000_RDBAH(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+        { E1000_RDLEN(0),  0x100, 4,  PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
+        /* RDH is read-only for i210, only test RDT. */
+        { E1000_RDT(0),    0x100, 4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+        { E1000_FCRTH,     0x100, 1,  PATTERN_TEST, 0x0000FFF0, 0x0000FFF0 },
+        { E1000_FCTTV,     0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+        { E1000_TIPG,      0x100, 1,  PATTERN_TEST, 0x3FFFFFFF, 0x3FFFFFFF },
+        { E1000_TDBAL(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+        { E1000_TDBAH(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+        { E1000_TDLEN(0),  0x100, 4,  PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
+        { E1000_TDT(0),    0x100, 4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+        { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },
+        { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0x04CFB0FE, 0x003FFFFB },
+        { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0x04CFB0FE, 0xFFFFFFFF },
+        { E1000_TCTL,      0x100, 1,  SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },
+        { E1000_RA,        0, 16, TABLE64_TEST_LO,
+                                                0xFFFFFFFF, 0xFFFFFFFF },
+        { E1000_RA,        0, 16, TABLE64_TEST_HI,
+                                                0x900FFFFF, 0xFFFFFFFF },
+        { E1000_MTA,       0, 128, TABLE32_TEST,
+                                                0xFFFFFFFF, 0xFFFFFFFF },
+        { 0, 0, 0, 0, 0 }
+};
+
 /* i350 reg test */
 static struct igb_reg_test reg_test_i350[] = {
         { E1000_FCAL,      0x100, 1,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
@@ -1073,6 +1145,11 @@ static int igb_reg_test(struct igb_adapter *adapter, u64 *data)
                 test = reg_test_i350;
                 toggle = 0x7FEFF3FF;
                 break;
+        case e1000_i210:
+        case e1000_i211:
+                test = reg_test_i210;
+                toggle = 0x7FEFF3FF;
+                break;
         case e1000_82580:
                 test = reg_test_82580;
                 toggle = 0x7FEFF3FF;
@@ -1154,23 +1231,13 @@ static int igb_reg_test(struct igb_adapter *adapter, u64 *data)
 
 static int igb_eeprom_test(struct igb_adapter *adapter, u64 *data)
 {
-        u16 temp;
-        u16 checksum = 0;
-        u16 i;
-
         *data = 0;
-        /* Read and add up the contents of the EEPROM */
-        for (i = 0; i < (NVM_CHECKSUM_REG + 1); i++) {
-                if ((adapter->hw.nvm.ops.read(&adapter->hw, i, 1, &temp)) < 0) {
-                        *data = 1;
-                        break;
-                }
-                checksum += temp;
-        }
 
-        /* If Checksum is not Correct return error else test passed */
-        if ((checksum != (u16) NVM_SUM) && !(*data))
-                *data = 2;
+        /* Validate eeprom on all parts but i211 */
+        if (adapter->hw.mac.type != e1000_i211) {
+                if (adapter->hw.nvm.ops.validate(&adapter->hw) < 0)
+                        *data = 2;
+        }
 
         return *data;
 }
@@ -1236,6 +1303,8 @@ static int igb_intr_test(struct igb_adapter *adapter, u64 *data)
                 ics_mask = 0x77DCFED5;
                 break;
         case e1000_i350:
+        case e1000_i210:
+        case e1000_i211:
                 ics_mask = 0x77DCFED5;
                 break;
         default:
@@ -1402,23 +1471,35 @@ static int igb_integrated_phy_loopback(struct igb_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
         u32 ctrl_reg = 0;
+        u16 phy_reg = 0;
 
         hw->mac.autoneg = false;
 
-        if (hw->phy.type == e1000_phy_m88) {
+        switch (hw->phy.type) {
+        case e1000_phy_m88:
                 /* Auto-MDI/MDIX Off */
                 igb_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, 0x0808);
                 /* reset to update Auto-MDI/MDIX */
                 igb_write_phy_reg(hw, PHY_CONTROL, 0x9140);
                 /* autoneg off */
                 igb_write_phy_reg(hw, PHY_CONTROL, 0x8140);
-        } else if (hw->phy.type == e1000_phy_82580) {
+                break;
+        case e1000_phy_82580:
                 /* enable MII loopback */
                 igb_write_phy_reg(hw, I82580_PHY_LBK_CTRL, 0x8041);
+                break;
+        case e1000_phy_i210:
+                /* set loopback speed in PHY */
+                igb_read_phy_reg(hw, (GS40G_PAGE_SELECT & GS40G_PAGE_2),
+                                        &phy_reg);
+                phy_reg |= GS40G_MAC_SPEED_1G;
+                igb_write_phy_reg(hw, (GS40G_PAGE_SELECT & GS40G_PAGE_2),
+                                        phy_reg);
+                ctrl_reg = rd32(E1000_CTRL_EXT);
+        default:
+                break;
         }
 
-        ctrl_reg = rd32(E1000_CTRL);
-
         /* force 1000, set loopback */
         igb_write_phy_reg(hw, PHY_CONTROL, 0x4140);
 
@@ -1431,7 +1512,7 @@ static int igb_integrated_phy_loopback(struct igb_adapter *adapter)
                      E1000_CTRL_FD |     /* Force Duplex to FULL */
                      E1000_CTRL_SLU);    /* Set link up enable bit */
 
-        if (hw->phy.type == e1000_phy_m88)
+        if ((hw->phy.type == e1000_phy_m88) || (hw->phy.type == e1000_phy_i210))
                 ctrl_reg |= E1000_CTRL_ILOS; /* Invert Loss of Signal */
 
         wr32(E1000_CTRL, ctrl_reg);
@@ -1439,7 +1520,7 @@ static int igb_integrated_phy_loopback(struct igb_adapter *adapter)
         /* Disable the receiver on the PHY so when a cable is plugged in, the
          * PHY does not begin to autoneg when a cable is reconnected to the NIC.
          */
-        if (hw->phy.type == e1000_phy_m88)
+        if ((hw->phy.type == e1000_phy_m88) || (hw->phy.type == e1000_phy_i210))
                 igb_phy_disable_receiver(adapter);
 
         udelay(500);
@@ -1704,6 +1785,14 @@ static int igb_loopback_test(struct igb_adapter *adapter, u64 *data)
                 *data = 0;
                 goto out;
         }
+        if ((adapter->hw.mac.type == e1000_i210)
+                || (adapter->hw.mac.type == e1000_i210)) {
+                dev_err(&adapter->pdev->dev,
+                        "Loopback test not supported "
+                        "on this part at this time.\n");
+                *data = 0;
+                goto out;
+        }
         *data = igb_setup_desc_rings(adapter);
         if (*data)
                 goto out;
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 5ec31598ee47..dd3bfe8cd36c 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -60,8 +60,8 @@
 #include "igb.h"
 
 #define MAJ 3
-#define MIN 2
-#define BUILD 10
+#define MIN 4
+#define BUILD 7
 #define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \
 __stringify(BUILD) "-k"
 char igb_driver_name[] = "igb";
@@ -75,6 +75,11 @@ static const struct e1000_info *igb_info_tbl[] = {
 };
 
 static DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl) = {
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_I211_COPPER), board_82575 },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_COPPER), board_82575 },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_FIBER), board_82575 },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_SERDES), board_82575 },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_SGMII), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_COPPER), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_FIBER), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_SERDES), board_82575 },
@@ -114,7 +119,6 @@ static void igb_free_all_rx_resources(struct igb_adapter *);
 static void igb_setup_mrqc(struct igb_adapter *);
 static int igb_probe(struct pci_dev *, const struct pci_device_id *);
 static void __devexit igb_remove(struct pci_dev *pdev);
-static void igb_init_hw_timer(struct igb_adapter *adapter);
 static int igb_sw_init(struct igb_adapter *);
 static int igb_open(struct net_device *);
 static int igb_close(struct net_device *);
@@ -565,33 +569,6 @@ exit:
         return;
 }
 
-
-/**
- * igb_read_clock - read raw cycle counter (to be used by time counter)
- */
-static cycle_t igb_read_clock(const struct cyclecounter *tc)
-{
-        struct igb_adapter *adapter =
-                container_of(tc, struct igb_adapter, cycles);
-        struct e1000_hw *hw = &adapter->hw;
-        u64 stamp = 0;
-        int shift = 0;
-
-        /*
-         * The timestamp latches on lowest register read. For the 82580
-         * the lowest register is SYSTIMR instead of SYSTIML.  However we never
-         * adjusted TIMINCA so SYSTIMR will just read as all 0s so ignore it.
-         */
-        if (hw->mac.type >= e1000_82580) {
-                stamp = rd32(E1000_SYSTIMR) >> 8;
-                shift = IGB_82580_TSYNC_SHIFT;
-        }
-
-        stamp |= (u64)rd32(E1000_SYSTIML) << shift;
-        stamp |= (u64)rd32(E1000_SYSTIMH) << (shift + 32);
-        return stamp;
-}
-
 /**
  * igb_get_hw_dev - return device
  * used by hardware layer to print debugging information
@@ -669,6 +646,8 @@ static void igb_cache_ring_register(struct igb_adapter *adapter)
         case e1000_82575:
         case e1000_82580:
         case e1000_i350:
+        case e1000_i210:
+        case e1000_i211:
         default:
                 for (; i < adapter->num_rx_queues; i++)
                         adapter->rx_ring[i]->reg_idx = rbase_offset + i;
@@ -755,8 +734,11 @@ static int igb_alloc_queues(struct igb_adapter *adapter)
                 if (adapter->hw.mac.type >= e1000_82576)
                         set_bit(IGB_RING_FLAG_RX_SCTP_CSUM, &ring->flags);
 
-                /* On i350, loopback VLAN packets have the tag byte-swapped. */
-                if (adapter->hw.mac.type == e1000_i350)
+                /*
+                 * On i350, i210, and i211, loopback VLAN packets
+                 * have the tag byte-swapped.
+                 * */
+                if (adapter->hw.mac.type >= e1000_i350)
                         set_bit(IGB_RING_FLAG_RX_LB_VLAN_BSWAP, &ring->flags);
 
                 adapter->rx_ring[i] = ring;
@@ -850,6 +832,8 @@ static void igb_assign_vector(struct igb_q_vector *q_vector, int msix_vector)
                 break;
         case e1000_82580:
         case e1000_i350:
+        case e1000_i210:
+        case e1000_i211:
                 /*
                  * On 82580 and newer adapters the scheme is similar to 82576
                  * however instead of ordering column-major we have things
@@ -916,6 +900,8 @@ static void igb_configure_msix(struct igb_adapter *adapter)
         case e1000_82576:
         case e1000_82580:
         case e1000_i350:
+        case e1000_i210:
+        case e1000_i211:
                 /* Turn on MSI-X capability first, or our settings
                  * won't stick.  And it will take days to debug. */
                 wr32(E1000_GPIE, E1000_GPIE_MSIX_MODE |
@@ -1062,6 +1048,11 @@ static int igb_set_interrupt_capability(struct igb_adapter *adapter)
         if (!(adapter->flags & IGB_FLAG_QUEUE_PAIRS))
                 numvecs += adapter->num_tx_queues;
 
+        /* i210 and i211 can only have 4 MSIX vectors for rx/tx queues. */
+        if ((adapter->hw.mac.type == e1000_i210)
+                || (adapter->hw.mac.type == e1000_i211))
+                numvecs = 4;
+
         /* store the number of vectors reserved for queues */
         adapter->num_q_vectors = numvecs;
 
@@ -1069,6 +1060,7 @@ static int igb_set_interrupt_capability(struct igb_adapter *adapter)
         numvecs++;
         adapter->msix_entries = kcalloc(numvecs, sizeof(struct msix_entry),
                                         GFP_KERNEL);
+
         if (!adapter->msix_entries)
                 goto msi_only;
 
@@ -1111,9 +1103,12 @@ msi_only:
                 adapter->flags |= IGB_FLAG_HAS_MSI;
 out:
         /* Notify the stack of the (possibly) reduced queue counts. */
+        rtnl_lock();
         netif_set_real_num_tx_queues(adapter->netdev, adapter->num_tx_queues);
-        return netif_set_real_num_rx_queues(adapter->netdev,
-                                            adapter->num_rx_queues);
+        err = netif_set_real_num_rx_queues(adapter->netdev,
+                adapter->num_rx_queues);
+        rtnl_unlock();
+        return err;
 }
 
 /**
@@ -1659,6 +1654,8 @@ void igb_reset(struct igb_adapter *adapter)
                 pba &= E1000_RXPBS_SIZE_MASK_82576;
                 break;
         case e1000_82575:
+        case e1000_i210:
+        case e1000_i211:
         default:
                 pba = E1000_PBA_34K;
                 break;
@@ -1743,6 +1740,13 @@ void igb_reset(struct igb_adapter *adapter)
         if (hw->mac.ops.init_hw(hw))
                 dev_err(&pdev->dev, "Hardware Error\n");
 
+        /*
+         * Flow control settings reset on hardware reset, so guarantee flow
+         * control is off when forcing speed.
+         */
+        if (!hw->mac.autoneg)
+                igb_force_mac_fc(hw);
+
         igb_init_dmac(adapter, pba);
         if (!netif_running(adapter->netdev))
                 igb_power_down_link(adapter);
@@ -1847,7 +1851,7 @@ static int __devinit igb_probe(struct pci_dev *pdev,
          */
         if (pdev->is_virtfn) {
                 WARN(1, KERN_ERR "%s (%hx:%hx) should not be a VF!\n",
-                     pci_name(pdev), pdev->vendor, pdev->device);
+                        pci_name(pdev), pdev->vendor, pdev->device);
                 return -EINVAL;
         }
 
@@ -2001,11 +2005,16 @@ static int __devinit igb_probe(struct pci_dev *pdev,
          * known good starting state */
         hw->mac.ops.reset_hw(hw);
 
-        /* make sure the NVM is good */
-        if (hw->nvm.ops.validate(hw) < 0) {
-                dev_err(&pdev->dev, "The NVM Checksum Is Not Valid\n");
-                err = -EIO;
-                goto err_eeprom;
+        /*
+         * make sure the NVM is good , i211 parts have special NVM that
+         * doesn't contain a checksum
+         */
+        if (hw->mac.type != e1000_i211) {
+                if (hw->nvm.ops.validate(hw) < 0) {
+                        dev_err(&pdev->dev, "The NVM Checksum Is Not Valid\n");
+                        err = -EIO;
+                        goto err_eeprom;
+                }
         }
 
         /* copy the MAC address out of the NVM */
@@ -2110,9 +2119,11 @@ static int __devinit igb_probe(struct pci_dev *pdev,
         }
 
 #endif
+#ifdef CONFIG_IGB_PTP
         /* do hw tstamp init after resetting */
-        igb_init_hw_timer(adapter);
+        igb_ptp_init(adapter);
 
+#endif
         dev_info(&pdev->dev, "Intel(R) Gigabit Ethernet Network Connection\n");
         /* print bus type/speed/width info */
         dev_info(&pdev->dev, "%s: (PCIe:%s:%s) %pM\n",
@@ -2137,6 +2148,8 @@ static int __devinit igb_probe(struct pci_dev *pdev,
                 adapter->num_rx_queues, adapter->num_tx_queues);
         switch (hw->mac.type) {
         case e1000_i350:
+        case e1000_i210:
+        case e1000_i211:
                 igb_set_eee_i350(hw);
                 break;
         default:
@@ -2184,7 +2197,10 @@ static void __devexit igb_remove(struct pci_dev *pdev)
         struct e1000_hw *hw = &adapter->hw;
 
         pm_runtime_get_noresume(&pdev->dev);
+#ifdef CONFIG_IGB_PTP
+        igb_ptp_remove(adapter);
 
+#endif
         /*
          * The watchdog timer may be rescheduled, so explicitly
          * disable watchdog from being rescheduled.
@@ -2260,9 +2276,14 @@ static void __devinit igb_probe_vfs(struct igb_adapter * adapter)
 {
 #ifdef CONFIG_PCI_IOV
         struct pci_dev *pdev = adapter->pdev;
+        struct e1000_hw *hw = &adapter->hw;
         int old_vfs = igb_find_enabled_vfs(adapter);
         int i;
 
+        /* Virtualization features not supported on i210 family. */
+        if ((hw->mac.type == e1000_i210) || (hw->mac.type == e1000_i211))
+                return;
+
         if (old_vfs) {
                 dev_info(&pdev->dev, "%d pre-allocated VFs found - override "
                          "max_vfs setting of %d\n", old_vfs, max_vfs);
@@ -2274,6 +2295,7 @@ static void __devinit igb_probe_vfs(struct igb_adapter * adapter)
 
         adapter->vf_data = kcalloc(adapter->vfs_allocated_count,
                                 sizeof(struct vf_data_storage), GFP_KERNEL);
+
         /* if allocation failed then we do not support SR-IOV */
         if (!adapter->vf_data) {
                 adapter->vfs_allocated_count = 0;
@@ -2304,112 +2326,6 @@ out:
 }
 
 /**
- * igb_init_hw_timer - Initialize hardware timer used with IEEE 1588 timestamp
- * @adapter: board private structure to initialize
- *
- * igb_init_hw_timer initializes the function pointer and values for the hw
- * timer found in hardware.
- **/
-static void igb_init_hw_timer(struct igb_adapter *adapter)
-{
-        struct e1000_hw *hw = &adapter->hw;
-
-        switch (hw->mac.type) {
-        case e1000_i350:
-        case e1000_82580:
-                memset(&adapter->cycles, 0, sizeof(adapter->cycles));
-                adapter->cycles.read = igb_read_clock;
-                adapter->cycles.mask = CLOCKSOURCE_MASK(64);
-                adapter->cycles.mult = 1;
-                /*
-                 * The 82580 timesync updates the system timer every 8ns by 8ns
-                 * and the value cannot be shifted.  Instead we need to shift
-                 * the registers to generate a 64bit timer value.  As a result
-                 * SYSTIMR/L/H, TXSTMPL/H, RXSTMPL/H all have to be shifted by
-                 * 24 in order to generate a larger value for synchronization.
-                 */
-                adapter->cycles.shift = IGB_82580_TSYNC_SHIFT;
-                /* disable system timer temporarily by setting bit 31 */
-                wr32(E1000_TSAUXC, 0x80000000);
-                wrfl();
-
-                /* Set registers so that rollover occurs soon to test this. */
-                wr32(E1000_SYSTIMR, 0x00000000);
-                wr32(E1000_SYSTIML, 0x80000000);
-                wr32(E1000_SYSTIMH, 0x000000FF);
-                wrfl();
-
-                /* enable system timer by clearing bit 31 */
-                wr32(E1000_TSAUXC, 0x0);
-                wrfl();
-
-                timecounter_init(&adapter->clock,
-                                 &adapter->cycles,
-                                 ktime_to_ns(ktime_get_real()));
-                /*
-                 * Synchronize our NIC clock against system wall clock. NIC
-                 * time stamp reading requires ~3us per sample, each sample
-                 * was pretty stable even under load => only require 10
-                 * samples for each offset comparison.
-                 */
-                memset(&adapter->compare, 0, sizeof(adapter->compare));
-                adapter->compare.source = &adapter->clock;
-                adapter->compare.target = ktime_get_real;
-                adapter->compare.num_samples = 10;
-                timecompare_update(&adapter->compare, 0);
-                break;
-        case e1000_82576:
-                /*
-                 * Initialize hardware timer: we keep it running just in case
-                 * that some program needs it later on.
-                 */
-                memset(&adapter->cycles, 0, sizeof(adapter->cycles));
-                adapter->cycles.read = igb_read_clock;
-                adapter->cycles.mask = CLOCKSOURCE_MASK(64);
-                adapter->cycles.mult = 1;
-                /**
-                 * Scale the NIC clock cycle by a large factor so that
-                 * relatively small clock corrections can be added or
-                 * subtracted at each clock tick. The drawbacks of a large
-                 * factor are a) that the clock register overflows more quickly
-                 * (not such a big deal) and b) that the increment per tick has
-                 * to fit into 24 bits.  As a result we need to use a shift of
-                 * 19 so we can fit a value of 16 into the TIMINCA register.
-                 */
-                adapter->cycles.shift = IGB_82576_TSYNC_SHIFT;
-                wr32(E1000_TIMINCA,
-                                (1 << E1000_TIMINCA_16NS_SHIFT) |
-                                (16 << IGB_82576_TSYNC_SHIFT));
-
-                /* Set registers so that rollover occurs soon to test this. */
-                wr32(E1000_SYSTIML, 0x00000000);
-                wr32(E1000_SYSTIMH, 0xFF800000);
-                wrfl();
-
-                timecounter_init(&adapter->clock,
-                                 &adapter->cycles,
-                                 ktime_to_ns(ktime_get_real()));
-                /*
-                 * Synchronize our NIC clock against system wall clock. NIC
-                 * time stamp reading requires ~3us per sample, each sample
-                 * was pretty stable even under load => only require 10
-                 * samples for each offset comparison.
-                 */
-                memset(&adapter->compare, 0, sizeof(adapter->compare));
-                adapter->compare.source = &adapter->clock;
-                adapter->compare.target = ktime_get_real;
-                adapter->compare.num_samples = 10;
-                timecompare_update(&adapter->compare, 0);
-                break;
-        case e1000_82575:
-                /* 82575 does not support timesync */
-        default:
-                break;
-        }
-
-}
-
-/**
  * igb_sw_init - Initialize general software structures (struct igb_adapter)
  * @adapter: board private structure to initialize
  *
@@ -2454,11 +2370,28 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter)
                 } else
                         adapter->vfs_allocated_count = max_vfs;
                 break;
+        case e1000_i210:
+        case e1000_i211:
+                adapter->vfs_allocated_count = 0;
+                break;
         default:
                 break;
         }
 #endif /* CONFIG_PCI_IOV */
-        adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES, num_online_cpus());
+        switch (hw->mac.type) {
+        case e1000_i210:
+                adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES_I210,
+                        num_online_cpus());
+                break;
+        case e1000_i211:
+                adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES_I211,
+                        num_online_cpus());
+                break;
+        default:
+                adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES,
+                num_online_cpus());
+                break;
+        }
         /* i350 cannot do RSS and SR-IOV at the same time */
         if (hw->mac.type == e1000_i350 && adapter->vfs_allocated_count)
                 adapter->rss_queues = 1;
@@ -2488,7 +2421,7 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter)
         /* Explicitly disable IRQ since the NIC can be in any state. */
         igb_irq_disable(adapter);
 
-        if (hw->mac.type == e1000_i350)
+        if (hw->mac.type >= e1000_i350)
                 adapter->flags &= ~IGB_FLAG_DMAC;
 
         set_bit(__IGB_DOWN, &adapter->state);
@@ -2771,8 +2704,6 @@ void igb_configure_tx_ring(struct igb_adapter *adapter,
 
         txdctl |= E1000_TXDCTL_QUEUE_ENABLE;
         wr32(E1000_TXDCTL(reg_idx), txdctl);
-
-        netdev_tx_reset_queue(txring_txq(ring));
 }
 
 /**
@@ -2943,6 +2874,17 @@ static void igb_setup_mrqc(struct igb_adapter *adapter)
 
         /* Don't need to set TUOFL or IPOFL, they default to 1 */
         wr32(E1000_RXCSUM, rxcsum);
+        /*
+         * Generate RSS hash based on TCP port numbers and/or
+         * IPv4/v6 src and dst addresses since UDP cannot be
+         * hashed reliably due to IP fragmentation
+         */
+
+        mrqc = E1000_MRQC_RSS_FIELD_IPV4 |
+               E1000_MRQC_RSS_FIELD_IPV4_TCP |
+               E1000_MRQC_RSS_FIELD_IPV6 |
+               E1000_MRQC_RSS_FIELD_IPV6_TCP |
+               E1000_MRQC_RSS_FIELD_IPV6_TCP_EX;
 
         /* If VMDq is enabled then we set the appropriate mode for that, else
          * we default to RSS so that an RSS hash is calculated per packet even
@@ -2958,25 +2900,15 @@ static void igb_setup_mrqc(struct igb_adapter *adapter)
                         wr32(E1000_VT_CTL, vtctl);
                 }
                 if (adapter->rss_queues > 1)
-                        mrqc = E1000_MRQC_ENABLE_VMDQ_RSS_2Q;
+                        mrqc |= E1000_MRQC_ENABLE_VMDQ_RSS_2Q;
                 else
-                        mrqc = E1000_MRQC_ENABLE_VMDQ;
+                        mrqc |= E1000_MRQC_ENABLE_VMDQ;
         } else {
-                mrqc = E1000_MRQC_ENABLE_RSS_4Q;
+                if (hw->mac.type != e1000_i211)
+                        mrqc |= E1000_MRQC_ENABLE_RSS_4Q;
         }
         igb_vmm_control(adapter);
 
-        /*
-         * Generate RSS hash based on TCP port numbers and/or
-         * IPv4/v6 src and dst addresses since UDP cannot be
-         * hashed reliably due to IP fragmentation
-         */
-        mrqc |= E1000_MRQC_RSS_FIELD_IPV4 |
-                E1000_MRQC_RSS_FIELD_IPV4_TCP |
-                E1000_MRQC_RSS_FIELD_IPV6 |
-                E1000_MRQC_RSS_FIELD_IPV6_TCP |
-                E1000_MRQC_RSS_FIELD_IPV6_TCP_EX;
-
         wr32(E1000_MRQC, mrqc);
 }
 
@@ -3282,6 +3214,8 @@ static void igb_clean_tx_ring(struct igb_ring *tx_ring)
                 igb_unmap_and_free_tx_resource(tx_ring, buffer_info);
         }
 
+        netdev_tx_reset_queue(txring_txq(tx_ring));
+
         size = sizeof(struct igb_tx_buffer) * tx_ring->count;
         memset(tx_ring->tx_buffer_info, 0, size);
 
@@ -3576,7 +3510,7 @@ static void igb_set_rx_mode(struct net_device *netdev)
          * we will have issues with VLAN tag stripping not being done for frames
          * that are only arriving because we are the default pool
          */
-        if (hw->mac.type < e1000_82576)
+        if ((hw->mac.type < e1000_82576) || (hw->mac.type > e1000_i350))
                 return;
 
         vmolr |= rd32(E1000_VMOLR(vfn)) &
@@ -3673,7 +3607,7 @@ static bool igb_thermal_sensor_event(struct e1000_hw *hw, u32 event)
         bool ret = false;
         u32 ctrl_ext, thstat;
 
-        /* check for thermal sensor event on i350, copper only */
+        /* check for thermal sensor event on i350 copper only */
         if (hw->mac.type == e1000_i350) {
                 thstat = rd32(E1000_THSTAT);
                 ctrl_ext = rd32(E1000_CTRL_EXT);
@@ -5718,35 +5652,7 @@ static int igb_poll(struct napi_struct *napi, int budget)
         return 0;
 }
 
-/**
- * igb_systim_to_hwtstamp - convert system time value to hw timestamp
- * @adapter: board private structure
- * @shhwtstamps: timestamp structure to update
- * @regval: unsigned 64bit system time value.
- *
- * We need to convert the system time value stored in the RX/TXSTMP registers
- * into a hwtstamp which can be used by the upper level timestamping functions
- */
-static void igb_systim_to_hwtstamp(struct igb_adapter *adapter,
-                                   struct skb_shared_hwtstamps *shhwtstamps,
-                                   u64 regval)
-{
-        u64 ns;
-
-        /*
-         * The 82580 starts with 1ns at bit 0 in RX/TXSTMPL, shift this up to
-         * 24 to match clock shift we setup earlier.
-         */
-        if (adapter->hw.mac.type >= e1000_82580)
-                regval <<= IGB_82580_TSYNC_SHIFT;
-
-        ns = timecounter_cyc2time(&adapter->clock, regval);
-        timecompare_update(&adapter->compare, ns);
-        memset(shhwtstamps, 0, sizeof(struct skb_shared_hwtstamps));
-        shhwtstamps->hwtstamp = ns_to_ktime(ns);
-        shhwtstamps->syststamp = timecompare_transform(&adapter->compare, ns);
-}
-
+#ifdef CONFIG_IGB_PTP
 /**
  * igb_tx_hwtstamp - utility function which checks for TX time stamp
  * @q_vector: pointer to q_vector containing needed info
@@ -5776,6 +5682,7 @@ static void igb_tx_hwtstamp(struct igb_q_vector *q_vector,
         skb_tstamp_tx(buffer_info->skb, &shhwtstamps);
 }
 
+#endif
 /**
  * igb_clean_tx_irq - Reclaim resources after transmit completes
  * @q_vector: pointer to q_vector containing needed info
@@ -5819,9 +5726,11 @@ static bool igb_clean_tx_irq(struct igb_q_vector *q_vector)
                 total_bytes += tx_buffer->bytecount;
                 total_packets += tx_buffer->gso_segs;
 
+#ifdef CONFIG_IGB_PTP
                 /* retrieve hardware timestamp */
                 igb_tx_hwtstamp(q_vector, tx_buffer);
 
+#endif
                 /* free the skb */
                 dev_kfree_skb_any(tx_buffer->skb);
                 tx_buffer->skb = NULL;
@@ -5993,6 +5902,7 @@ static inline void igb_rx_hash(struct igb_ring *ring,
                 skb->rxhash = le32_to_cpu(rx_desc->wb.lower.hi_dword.rss);
 }
 
+#ifdef CONFIG_IGB_PTP
 static void igb_rx_hwtstamp(struct igb_q_vector *q_vector,
                             union e1000_adv_rx_desc *rx_desc,
                             struct sk_buff *skb)
@@ -6032,6 +5942,7 @@ static void igb_rx_hwtstamp(struct igb_q_vector *q_vector,
         igb_systim_to_hwtstamp(adapter, skb_hwtstamps(skb), regval);
 }
 
+#endif
 static void igb_rx_vlan(struct igb_ring *ring,
                         union e1000_adv_rx_desc *rx_desc,
                         struct sk_buff *skb)
@@ -6142,7 +6053,9 @@ static bool igb_clean_rx_irq(struct igb_q_vector *q_vector, int budget)
                         goto next_desc;
                 }
 
+#ifdef CONFIG_IGB_PTP
                 igb_rx_hwtstamp(q_vector, rx_desc, skb);
+#endif
                 igb_rx_hash(rx_ring, rx_desc, skb);
                 igb_rx_checksum(rx_ring, rx_desc, skb);
                 igb_rx_vlan(rx_ring, rx_desc, skb);
@@ -6796,18 +6709,7 @@ static int igb_resume(struct device *dev)
         pci_enable_wake(pdev, PCI_D3hot, 0);
         pci_enable_wake(pdev, PCI_D3cold, 0);
 
-        if (!rtnl_is_locked()) {
-                /*
-                 * shut up ASSERT_RTNL() warning in
-                 * netif_set_real_num_tx/rx_queues.
-                 */
-                rtnl_lock();
-                err = igb_init_interrupt_scheme(adapter);
-                rtnl_unlock();
-        } else {
-                err = igb_init_interrupt_scheme(adapter);
-        }
-        if (err) {
+        if (igb_init_interrupt_scheme(adapter)) {
                 dev_err(&pdev->dev, "Unable to allocate memory for queues\n");
                 return -ENOMEM;
         }
@@ -7170,6 +7072,8 @@ static void igb_vmm_control(struct igb_adapter *adapter)
 
         switch (hw->mac.type) {
         case e1000_82575:
+        case e1000_i210:
+        case e1000_i211:
         default:
                 /* replication is not supported for 82575 */
                 return;
@@ -7243,6 +7147,9 @@ static void igb_init_dmac(struct igb_adapter *adapter, u32 pba)
 
                         /* watchdog timer= +-1000 usec in 32usec intervals */
                         reg |= (1000 >> 5);
+
+                        /* Disable BMC-to-OS Watchdog Enable */
+                        reg &= ~E1000_DMACR_DC_BMC2OSW_EN;
                         wr32(E1000_DMACR, reg);
 
                         /*
diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c
new file mode 100644
index 000000000000..d5ee7fa50723
--- /dev/null
+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c
@@ -0,0 +1,385 @@
+/*
+ * PTP Hardware Clock (PHC) driver for the Intel 82576 and 82580
+ *
+ * Copyright (C) 2011 Richard Cochran <richardcochran@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/pci.h>
+
+#include "igb.h"
+
+#define INCVALUE_MASK           0x7fffffff
+#define ISGN                    0x80000000
+
+/*
+ * The 82580 timesync updates the system timer every 8ns by 8ns,
+ * and this update value cannot be reprogrammed.
+ *
+ * Neither the 82576 nor the 82580 offer registers wide enough to hold
+ * nanoseconds time values for very long. For the 82580, SYSTIM always
+ * counts nanoseconds, but the upper 24 bits are not availible. The
+ * frequency is adjusted by changing the 32 bit fractional nanoseconds
+ * register, TIMINCA.
+ *
+ * For the 82576, the SYSTIM register time unit is affect by the
+ * choice of the 24 bit TININCA:IV (incvalue) field. Five bits of this
+ * field are needed to provide the nominal 16 nanosecond period,
+ * leaving 19 bits for fractional nanoseconds.
+ *
+ * We scale the NIC clock cycle by a large factor so that relatively
+ * small clock corrections can be added or subtracted at each clock
+ * tick. The drawbacks of a large factor are a) that the clock
+ * register overflows more quickly (not such a big deal) and b) that
+ * the increment per tick has to fit into 24 bits.  As a result we
+ * need to use a shift of 19 so we can fit a value of 16 into the
+ * TIMINCA register.
+ *
+ *
+ *             SYSTIMH            SYSTIML
+ *        +--------------+   +---+---+------+
+ *  82576 |      32      |   | 8 | 5 |  19  |
+ *        +--------------+   +---+---+------+
+ *         \________ 45 bits _______/  fract
+ *
+ *        +----------+---+   +--------------+
+ *  82580 |    24    | 8 |   |      32      |
+ *        +----------+---+   +--------------+
+ *          reserved  \______ 40 bits _____/
+ *
+ *
+ * The 45 bit 82576 SYSTIM overflows every
+ *   2^45 * 10^-9 / 3600 = 9.77 hours.
+ *
+ * The 40 bit 82580 SYSTIM overflows every
+ *   2^40 * 10^-9 /  60  = 18.3 minutes.
+ */
+
+#define IGB_OVERFLOW_PERIOD     (HZ * 60 * 9)
+#define INCPERIOD_82576         (1 << E1000_TIMINCA_16NS_SHIFT)
+#define INCVALUE_82576_MASK     ((1 << E1000_TIMINCA_16NS_SHIFT) - 1)
+#define INCVALUE_82576          (16 << IGB_82576_TSYNC_SHIFT)
+#define IGB_NBITS_82580         40
+
+/*
+ * SYSTIM read access for the 82576
+ */
+
+static cycle_t igb_82576_systim_read(const struct cyclecounter *cc)
+{
+        u64 val;
+        u32 lo, hi;
+        struct igb_adapter *igb = container_of(cc, struct igb_adapter, cc);
+        struct e1000_hw *hw = &igb->hw;
+
+        lo = rd32(E1000_SYSTIML);
+        hi = rd32(E1000_SYSTIMH);
+
+        val = ((u64) hi) << 32;
+        val |= lo;
+
+        return val;
+}
+
+/*
+ * SYSTIM read access for the 82580
+ */
+
+static cycle_t igb_82580_systim_read(const struct cyclecounter *cc)
+{
+        u64 val;
+        u32 lo, hi, jk;
+        struct igb_adapter *igb = container_of(cc, struct igb_adapter, cc);
+        struct e1000_hw *hw = &igb->hw;
+
+        /*
+         * The timestamp latches on lowest register read. For the 82580
+         * the lowest register is SYSTIMR instead of SYSTIML.  However we only
+         * need to provide nanosecond resolution, so we just ignore it.
+         */
+        jk = rd32(E1000_SYSTIMR);
+        lo = rd32(E1000_SYSTIML);
+        hi = rd32(E1000_SYSTIMH);
+
+        val = ((u64) hi) << 32;
+        val |= lo;
+
+        return val;
+}
+
+/*
+ * PTP clock operations
+ */
+
+static int ptp_82576_adjfreq(struct ptp_clock_info *ptp, s32 ppb)
+{
+        u64 rate;
+        u32 incvalue;
+        int neg_adj = 0;
+        struct igb_adapter *igb = container_of(ptp, struct igb_adapter, caps);
+        struct e1000_hw *hw = &igb->hw;
+
+        if (ppb < 0) {
+                neg_adj = 1;
+                ppb = -ppb;
+        }
+        rate = ppb;
+        rate <<= 14;
+        rate = div_u64(rate, 1953125);
+
+        incvalue = 16 << IGB_82576_TSYNC_SHIFT;
+
+        if (neg_adj)
+                incvalue -= rate;
+        else
+                incvalue += rate;
+
+        wr32(E1000_TIMINCA, INCPERIOD_82576 | (incvalue & INCVALUE_82576_MASK));
+
+        return 0;
+}
+
+static int ptp_82580_adjfreq(struct ptp_clock_info *ptp, s32 ppb)
+{
+        u64 rate;
+        u32 inca;
+        int neg_adj = 0;
+        struct igb_adapter *igb = container_of(ptp, struct igb_adapter, caps);
+        struct e1000_hw *hw = &igb->hw;
+
+        if (ppb < 0) {
+                neg_adj = 1;
+                ppb = -ppb;
+        }
+        rate = ppb;
+        rate <<= 26;
+        rate = div_u64(rate, 1953125);
+
+        inca = rate & INCVALUE_MASK;
+        if (neg_adj)
+                inca |= ISGN;
+
+        wr32(E1000_TIMINCA, inca);
+
+        return 0;
+}
+
+static int igb_adjtime(struct ptp_clock_info *ptp, s64 delta)
+{
+        s64 now;
+        unsigned long flags;
+        struct igb_adapter *igb = container_of(ptp, struct igb_adapter, caps);
+
+        spin_lock_irqsave(&igb->tmreg_lock, flags);
+
+        now = timecounter_read(&igb->tc);
+        now += delta;
+        timecounter_init(&igb->tc, &igb->cc, now);
+
+        spin_unlock_irqrestore(&igb->tmreg_lock, flags);
+
+        return 0;
+}
+
+static int igb_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
+{
+        u64 ns;
+        u32 remainder;
+        unsigned long flags;
+        struct igb_adapter *igb = container_of(ptp, struct igb_adapter, caps);
+
+        spin_lock_irqsave(&igb->tmreg_lock, flags);
+
+        ns = timecounter_read(&igb->tc);
+
+        spin_unlock_irqrestore(&igb->tmreg_lock, flags);
+
+        ts->tv_sec = div_u64_rem(ns, 1000000000, &remainder);
+        ts->tv_nsec = remainder;
+
+        return 0;
+}
+
+static int igb_settime(struct ptp_clock_info *ptp, const struct timespec *ts)
+{
+        u64 ns;
+        unsigned long flags;
+        struct igb_adapter *igb = container_of(ptp, struct igb_adapter, caps);
+
+        ns = ts->tv_sec * 1000000000ULL;
+        ns += ts->tv_nsec;
+
+        spin_lock_irqsave(&igb->tmreg_lock, flags);
+
+        timecounter_init(&igb->tc, &igb->cc, ns);
+
+        spin_unlock_irqrestore(&igb->tmreg_lock, flags);
+
+        return 0;
+}
+
+static int ptp_82576_enable(struct ptp_clock_info *ptp,
+                            struct ptp_clock_request *rq, int on)
+{
+        return -EOPNOTSUPP;
+}
+
+static int ptp_82580_enable(struct ptp_clock_info *ptp,
+                            struct ptp_clock_request *rq, int on)
+{
+        return -EOPNOTSUPP;
+}
+
+static void igb_overflow_check(struct work_struct *work)
+{
+        struct timespec ts;
+        struct igb_adapter *igb =
+                container_of(work, struct igb_adapter, overflow_work.work);
+
+        igb_gettime(&igb->caps, &ts);
+
+        pr_debug("igb overflow check at %ld.%09lu\n", ts.tv_sec, ts.tv_nsec);
+
+        schedule_delayed_work(&igb->overflow_work, IGB_OVERFLOW_PERIOD);
+}
+
+void igb_ptp_init(struct igb_adapter *adapter)
+{
+        struct e1000_hw *hw = &adapter->hw;
+
+        switch (hw->mac.type) {
+        case e1000_i210:
+        case e1000_i211:
+        case e1000_i350:
+        case e1000_82580:
+                adapter->caps.owner     = THIS_MODULE;
+                strcpy(adapter->caps.name, "igb-82580");
+                adapter->caps.max_adj   = 62499999;
+                adapter->caps.n_ext_ts  = 0;
+                adapter->caps.pps       = 0;
+                adapter->caps.adjfreq   = ptp_82580_adjfreq;
+                adapter->caps.adjtime   = igb_adjtime;
+                adapter->caps.gettime   = igb_gettime;
+                adapter->caps.settime   = igb_settime;
+                adapter->caps.enable    = ptp_82580_enable;
+                adapter->cc.read        = igb_82580_systim_read;
+                adapter->cc.mask        = CLOCKSOURCE_MASK(IGB_NBITS_82580);
+                adapter->cc.mult        = 1;
+                adapter->cc.shift       = 0;
+                /* Enable the timer functions by clearing bit 31. */
+                wr32(E1000_TSAUXC, 0x0);
+                break;
+
+        case e1000_82576:
+                adapter->caps.owner     = THIS_MODULE;
+                strcpy(adapter->caps.name, "igb-82576");
+                adapter->caps.max_adj   = 1000000000;
+                adapter->caps.n_ext_ts  = 0;
+                adapter->caps.pps       = 0;
+                adapter->caps.adjfreq   = ptp_82576_adjfreq;
+                adapter->caps.adjtime   = igb_adjtime;
+                adapter->caps.gettime   = igb_gettime;
+                adapter->caps.settime   = igb_settime;
+                adapter->caps.enable    = ptp_82576_enable;
+                adapter->cc.read        = igb_82576_systim_read;
+                adapter->cc.mask        = CLOCKSOURCE_MASK(64);
+                adapter->cc.mult        = 1;
+                adapter->cc.shift       = IGB_82576_TSYNC_SHIFT;
+                /* Dial the nominal frequency. */
+                wr32(E1000_TIMINCA, INCPERIOD_82576 | INCVALUE_82576);
+                break;
+
+        default:
+                adapter->ptp_clock = NULL;
+                return;
+        }
+
+        wrfl();
+
+        timecounter_init(&adapter->tc, &adapter->cc,
+                         ktime_to_ns(ktime_get_real()));
+
+        INIT_DELAYED_WORK(&adapter->overflow_work, igb_overflow_check);
+
+        spin_lock_init(&adapter->tmreg_lock);
+
+        schedule_delayed_work(&adapter->overflow_work, IGB_OVERFLOW_PERIOD);
+
+        adapter->ptp_clock = ptp_clock_register(&adapter->caps);
+        if (IS_ERR(adapter->ptp_clock)) {
+                adapter->ptp_clock = NULL;
+                dev_err(&adapter->pdev->dev, "ptp_clock_register failed\n");
+        } else
+                dev_info(&adapter->pdev->dev, "added PHC on %s\n",
+                         adapter->netdev->name);
+}
+
+void igb_ptp_remove(struct igb_adapter *adapter)
+{
+        cancel_delayed_work_sync(&adapter->overflow_work);
+
+        if (adapter->ptp_clock) {
+                ptp_clock_unregister(adapter->ptp_clock);
+                dev_info(&adapter->pdev->dev, "removed PHC on %s\n",
+                         adapter->netdev->name);
+        }
+}
+
+/**
+ * igb_systim_to_hwtstamp - convert system time value to hw timestamp
+ * @adapter: board private structure
+ * @hwtstamps: timestamp structure to update
+ * @systim: unsigned 64bit system time value.
+ *
+ * We need to convert the system time value stored in the RX/TXSTMP registers
+ * into a hwtstamp which can be used by the upper level timestamping functions.
+ *
+ * The 'tmreg_lock' spinlock is used to protect the consistency of the
+ * system time value. This is needed because reading the 64 bit time
+ * value involves reading two (or three) 32 bit registers. The first
+ * read latches the value. Ditto for writing.
+ *
+ * In addition, here have extended the system time with an overflow
+ * counter in software.
+ **/
+void igb_systim_to_hwtstamp(struct igb_adapter *adapter,
+                            struct skb_shared_hwtstamps *hwtstamps,
+                            u64 systim)
+{
+        u64 ns;
+        unsigned long flags;
+
+        switch (adapter->hw.mac.type) {
+        case e1000_i210:
+        case e1000_i211:
+        case e1000_i350:
+        case e1000_82580:
+        case e1000_82576:
+                break;
+        default:
+                return;
+        }
+
+        spin_lock_irqsave(&adapter->tmreg_lock, flags);
+
+        ns = timecounter_cyc2time(&adapter->tc, systim);
+
+        spin_unlock_irqrestore(&adapter->tmreg_lock, flags);
+
+        memset(hwtstamps, 0, sizeof(*hwtstamps));
+        hwtstamps->hwtstamp = ns_to_ktime(ns);
+}
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index d61ca2a732f0..8ec74b07f940 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -2731,14 +2731,14 @@ static int __devinit igbvf_probe(struct pci_dev *pdev,
                         netdev->addr_len);
         }
 
-        if (!is_valid_ether_addr(netdev->perm_addr)) {
+        if (!is_valid_ether_addr(netdev->dev_addr)) {
                 dev_err(&pdev->dev, "Invalid MAC Address: %pM\n",
                         netdev->dev_addr);
                 err = -EIO;
                 goto err_hw_init;
         }
 
-        memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
+        memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len);
 
         setup_timer(&adapter->watchdog_timer, &igbvf_watchdog,
                     (unsigned long) adapter);
diff --git a/drivers/net/ethernet/intel/ixgbe/Makefile b/drivers/net/ethernet/intel/ixgbe/Makefile
index 8be1d1b2132e..0bdf06bc5c49 100644
--- a/drivers/net/ethernet/intel/ixgbe/Makefile
+++ b/drivers/net/ethernet/intel/ixgbe/Makefile
@@ -34,9 +34,11 @@ obj-$(CONFIG_IXGBE) += ixgbe.o
 
 ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \
               ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \
-              ixgbe_mbx.o ixgbe_x540.o ixgbe_lib.o
+              ixgbe_mbx.o ixgbe_x540.o ixgbe_sysfs.o ixgbe_lib.o
 
 ixgbe-$(CONFIG_IXGBE_DCB) +=  ixgbe_dcb.o ixgbe_dcb_82598.o \
                               ixgbe_dcb_82599.o ixgbe_dcb_nl.o
 
+ixgbe-$(CONFIG_IXGBE_PTP) += ixgbe_ptp.o
+
 ixgbe-$(CONFIG_FCOE:m=y) += ixgbe_fcoe.o
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index 74e192107f9a..3ef3c5284e52 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -36,6 +36,12 @@
 #include <linux/aer.h>
 #include <linux/if_vlan.h>
 
+#ifdef CONFIG_IXGBE_PTP
+#include <linux/clocksource.h>
+#include <linux/net_tstamp.h>
+#include <linux/ptp_clock_kernel.h>
+#endif /* CONFIG_IXGBE_PTP */
+
 #include "ixgbe_type.h"
 #include "ixgbe_common.h"
 #include "ixgbe_dcb.h"
@@ -96,6 +102,7 @@
 #define IXGBE_TX_FLAGS_FCOE             (u32)(1 << 5)
 #define IXGBE_TX_FLAGS_FSO              (u32)(1 << 6)
 #define IXGBE_TX_FLAGS_TXSW             (u32)(1 << 7)
+#define IXGBE_TX_FLAGS_TSTAMP           (u32)(1 << 8)
 #define IXGBE_TX_FLAGS_VLAN_MASK        0xffff0000
 #define IXGBE_TX_FLAGS_VLAN_PRIO_MASK   0xe0000000
 #define IXGBE_TX_FLAGS_VLAN_PRIO_SHIFT  29
@@ -331,6 +338,26 @@ struct ixgbe_q_vector {
         /* for dynamic allocation of rings associated with this q_vector */
         struct ixgbe_ring ring[0] ____cacheline_internodealigned_in_smp;
 };
+#ifdef CONFIG_IXGBE_HWMON
+
+#define IXGBE_HWMON_TYPE_LOC            0
+#define IXGBE_HWMON_TYPE_TEMP           1
+#define IXGBE_HWMON_TYPE_CAUTION        2
+#define IXGBE_HWMON_TYPE_MAX            3
+
+struct hwmon_attr {
+        struct device_attribute dev_attr;
+        struct ixgbe_hw *hw;
+        struct ixgbe_thermal_diode_data *sensor;
+        char name[12];
+};
+
+struct hwmon_buff {
+        struct device *device;
+        struct hwmon_attr *hwmon_list;
+        unsigned int n_hwmon;
+};
+#endif /* CONFIG_IXGBE_HWMON */
 
 /*
  * microsecond values for various ITR rates shifted by 2 to fit itr register
@@ -438,6 +465,8 @@ struct ixgbe_adapter {
 #define IXGBE_FLAG2_FDIR_REQUIRES_REINIT        (u32)(1 << 7)
 #define IXGBE_FLAG2_RSS_FIELD_IPV4_UDP          (u32)(1 << 8)
 #define IXGBE_FLAG2_RSS_FIELD_IPV6_UDP          (u32)(1 << 9)
+#define IXGBE_FLAG2_OVERFLOW_CHECK_ENABLED      (u32)(1 << 10)
+#define IXGBE_FLAG2_PTP_PPS_ENABLED             (u32)(1 << 11)
 
         /* Tx fast path data */
         int num_tx_queues;
@@ -525,6 +554,17 @@ struct ixgbe_adapter {
         u32 interrupt_event;
         u32 led_reg;
 
+#ifdef CONFIG_IXGBE_PTP
+        struct ptp_clock *ptp_clock;
+        struct ptp_clock_info ptp_caps;
+        unsigned long last_overflow_check;
+        spinlock_t tmreg_lock;
+        struct cyclecounter cc;
+        struct timecounter tc;
+        u32 base_incval;
+        u32 cycle_speed;
+#endif /* CONFIG_IXGBE_PTP */
+
         /* SR-IOV */
         DECLARE_BITMAP(active_vfs, IXGBE_MAX_VF_FUNCTIONS);
         unsigned int num_vfs;
@@ -535,6 +575,10 @@ struct ixgbe_adapter {
 
         u32 timer_event_accumulator;
         u32 vferr_refcount;
+        struct kobject *info_kobj;
+#ifdef CONFIG_IXGBE_HWMON
+        struct hwmon_buff ixgbe_hwmon_buff;
+#endif /* CONFIG_IXGBE_HWMON */
 };
 
 struct ixgbe_fdir_filter {
@@ -574,9 +618,6 @@ extern struct ixgbe_info ixgbe_82599_info;
 extern struct ixgbe_info ixgbe_X540_info;
 #ifdef CONFIG_IXGBE_DCB
 extern const struct dcbnl_rtnl_ops dcbnl_ops;
-extern int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,
-                              struct ixgbe_dcb_config *dst_dcb_cfg,
-                              int tc_max);
 #endif
 
 extern char ixgbe_driver_name[];
@@ -600,6 +641,8 @@ extern void ixgbe_disable_rx_queue(struct ixgbe_adapter *adapter,
                                    struct ixgbe_ring *);
 extern void ixgbe_update_stats(struct ixgbe_adapter *adapter);
 extern int ixgbe_init_interrupt_scheme(struct ixgbe_adapter *adapter);
+extern int ixgbe_wol_supported(struct ixgbe_adapter *adapter, u16 device_id,
+                               u16 subdevice_id);
 extern void ixgbe_clear_interrupt_scheme(struct ixgbe_adapter *adapter);
 extern netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *,
                                          struct ixgbe_adapter *,
@@ -629,10 +672,15 @@ extern void ixgbe_atr_compute_perfect_hash_82599(union ixgbe_atr_input *input,
                                                  union ixgbe_atr_input *mask);
 extern void ixgbe_set_rx_mode(struct net_device *netdev);
 #ifdef CONFIG_IXGBE_DCB
+extern void ixgbe_set_rx_drop_en(struct ixgbe_adapter *adapter);
 extern int ixgbe_setup_tc(struct net_device *dev, u8 tc);
 #endif
 extern void ixgbe_tx_ctxtdesc(struct ixgbe_ring *, u32, u32, u32, u32);
 extern void ixgbe_do_reset(struct net_device *netdev);
+#ifdef CONFIG_IXGBE_HWMON
+extern void ixgbe_sysfs_exit(struct ixgbe_adapter *adapter);
+extern int ixgbe_sysfs_init(struct ixgbe_adapter *adapter);
+#endif /* CONFIG_IXGBE_HWMON */
 #ifdef IXGBE_FCOE
 extern void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter);
 extern int ixgbe_fso(struct ixgbe_ring *tx_ring,
@@ -663,4 +711,18 @@ static inline struct netdev_queue *txring_txq(const struct ixgbe_ring *ring)
         return netdev_get_tx_queue(ring->netdev, ring->queue_index);
 }
 
+#ifdef CONFIG_IXGBE_PTP
+extern void ixgbe_ptp_init(struct ixgbe_adapter *adapter);
+extern void ixgbe_ptp_stop(struct ixgbe_adapter *adapter);
+extern void ixgbe_ptp_overflow_check(struct ixgbe_adapter *adapter);
+extern void ixgbe_ptp_tx_hwtstamp(struct ixgbe_q_vector *q_vector,
+                                  struct sk_buff *skb);
+extern void ixgbe_ptp_rx_hwtstamp(struct ixgbe_q_vector *q_vector,
+                                  struct sk_buff *skb);
+extern int ixgbe_ptp_hwtstamp_ioctl(struct ixgbe_adapter *adapter,
+                                    struct ifreq *ifr, int cmd);
+extern void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter);
+extern void ixgbe_ptp_check_pps_event(struct ixgbe_adapter *adapter, u32 eicr);
+#endif /* CONFIG_IXGBE_PTP */
+
 #endif /* _IXGBE_H_ */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
index 85d2e2c4ce4a..42537336110c 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
@@ -91,29 +91,6 @@ out:
         IXGBE_WRITE_REG(hw, IXGBE_GCR, gcr);
 }
 
-/**
- *  ixgbe_get_pcie_msix_count_82598 - Gets MSI-X vector count
- *  @hw: pointer to hardware structure
- *
- *  Read PCIe configuration space, and get the MSI-X vector count from
- *  the capabilities table.
- **/
-static u16 ixgbe_get_pcie_msix_count_82598(struct ixgbe_hw *hw)
-{
-        struct ixgbe_adapter *adapter = hw->back;
-        u16 msix_count;
-        pci_read_config_word(adapter->pdev, IXGBE_PCIE_MSIX_82598_CAPS,
-                             &msix_count);
-        msix_count &= IXGBE_PCIE_MSIX_TBL_SZ_MASK;
-
-        /* MSI-X count is zero-based in HW, so increment to give proper value */
-        msix_count++;
-
-        return msix_count;
-}
-
-/**
- */
 static s32 ixgbe_get_invariants_82598(struct ixgbe_hw *hw)
 {
         struct ixgbe_mac_info *mac = &hw->mac;
@@ -126,7 +103,7 @@ static s32 ixgbe_get_invariants_82598(struct ixgbe_hw *hw)
         mac->num_rar_entries = IXGBE_82598_RAR_ENTRIES;
         mac->max_rx_queues = IXGBE_82598_MAX_RX_QUEUES;
         mac->max_tx_queues = IXGBE_82598_MAX_TX_QUEUES;
-        mac->max_msix_vectors = ixgbe_get_pcie_msix_count_82598(hw);
+        mac->max_msix_vectors = ixgbe_get_pcie_msix_count_generic(hw);
 
         return 0;
 }
@@ -347,24 +324,33 @@ out:
 /**
  *  ixgbe_fc_enable_82598 - Enable flow control
  *  @hw: pointer to hardware structure
- *  @packetbuf_num: packet buffer number (0-7)
  *
  *  Enable flow control according to the current settings.
  **/
-static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
+static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw)
 {
         s32 ret_val = 0;
         u32 fctrl_reg;
         u32 rmcs_reg;
         u32 reg;
+        u32 fcrtl, fcrth;
         u32 link_speed = 0;
+        int i;
         bool link_up;
 
-#ifdef CONFIG_DCB
-        if (hw->fc.requested_mode == ixgbe_fc_pfc)
+        /*
+         * Validate the water mark configuration for packet buffer 0.  Zero
+         * water marks indicate that the packet buffer was not configured
+         * and the watermarks for packet buffer 0 should always be configured.
+         */
+        if (!hw->fc.low_water ||
+            !hw->fc.high_water[0] ||
+            !hw->fc.pause_time) {
+                hw_dbg(hw, "Invalid water mark configuration\n");
+                ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
                 goto out;
+        }
 
-#endif /* CONFIG_DCB */
         /*
          * On 82598 having Rx FC on causes resets while doing 1G
          * so if it's on turn it off once we know link_speed. For
@@ -386,9 +372,7 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
         }
 
         /* Negotiate the fc mode to use */
-        ret_val = ixgbe_fc_autoneg(hw);
-        if (ret_val == IXGBE_ERR_FLOW_CONTROL)
-                goto out;
+        ixgbe_fc_autoneg(hw);
 
         /* Disable any previous flow control settings */
         fctrl_reg = IXGBE_READ_REG(hw, IXGBE_FCTRL);
@@ -405,9 +389,6 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
          * 2: Tx flow control is enabled (we can send pause frames but
          *     we do not support receiving pause frames).
          * 3: Both Rx and Tx flow control (symmetric) are enabled.
-#ifdef CONFIG_DCB
-         * 4: Priority Flow Control is enabled.
-#endif
          * other: Invalid.
          */
         switch (hw->fc.current_mode) {
@@ -440,11 +421,6 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
                 fctrl_reg |= IXGBE_FCTRL_RFCE;
                 rmcs_reg |= IXGBE_RMCS_TFCE_802_3X;
                 break;
-#ifdef CONFIG_DCB
-        case ixgbe_fc_pfc:
-                goto out;
-                break;
-#endif /* CONFIG_DCB */
         default:
                 hw_dbg(hw, "Flow control param set incorrectly\n");
                 ret_val = IXGBE_ERR_CONFIG;
@@ -457,29 +433,29 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
         IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl_reg);
         IXGBE_WRITE_REG(hw, IXGBE_RMCS, rmcs_reg);
 
-        /* Set up and enable Rx high/low water mark thresholds, enable XON. */
-        if (hw->fc.current_mode & ixgbe_fc_tx_pause) {
-                reg = hw->fc.low_water << 6;
-                if (hw->fc.send_xon)
-                        reg |= IXGBE_FCRTL_XONE;
-
-                IXGBE_WRITE_REG(hw, IXGBE_FCRTL(packetbuf_num), reg);
+        fcrtl = (hw->fc.low_water << 10) | IXGBE_FCRTL_XONE;
 
-                reg = hw->fc.high_water[packetbuf_num] << 6;
-                reg |= IXGBE_FCRTH_FCEN;
+        /* Set up and enable Rx high/low water mark thresholds, enable XON. */
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                if ((hw->fc.current_mode & ixgbe_fc_tx_pause) &&
+                    hw->fc.high_water[i]) {
+                        fcrth = (hw->fc.high_water[i] << 10) | IXGBE_FCRTH_FCEN;
+                        IXGBE_WRITE_REG(hw, IXGBE_FCRTL(i), fcrtl);
+                        IXGBE_WRITE_REG(hw, IXGBE_FCRTH(i), fcrth);
+                } else {
+                        IXGBE_WRITE_REG(hw, IXGBE_FCRTL(i), 0);
+                        IXGBE_WRITE_REG(hw, IXGBE_FCRTH(i), 0);
+                }
 
-                IXGBE_WRITE_REG(hw, IXGBE_FCRTH(packetbuf_num), reg);
         }
 
         /* Configure pause time (2 TCs per register) */
-        reg = IXGBE_READ_REG(hw, IXGBE_FCTTV(packetbuf_num / 2));
-        if ((packetbuf_num & 1) == 0)
-                reg = (reg & 0xFFFF0000) | hw->fc.pause_time;
-        else
-                reg = (reg & 0x0000FFFF) | (hw->fc.pause_time << 16);
-        IXGBE_WRITE_REG(hw, IXGBE_FCTTV(packetbuf_num / 2), reg);
+        reg = hw->fc.pause_time * 0x00010001;
+        for (i = 0; i < (MAX_TRAFFIC_CLASS / 2); i++)
+                IXGBE_WRITE_REG(hw, IXGBE_FCTTV(i), reg);
 
-        IXGBE_WRITE_REG(hw, IXGBE_FCRTV, (hw->fc.pause_time >> 1));
+        /* Configure flow control refresh threshold value */
+        IXGBE_WRITE_REG(hw, IXGBE_FCRTV, hw->fc.pause_time / 2);
 
 out:
         return ret_val;
@@ -1300,6 +1276,8 @@ static struct ixgbe_mac_operations mac_ops_82598 = {
         .set_fw_drv_ver         = NULL,
         .acquire_swfw_sync      = &ixgbe_acquire_swfw_sync,
         .release_swfw_sync      = &ixgbe_release_swfw_sync,
+        .get_thermal_sensor_data = NULL,
+        .init_thermal_sensor_thresh = NULL,
 };
 
 static struct ixgbe_eeprom_operations eeprom_ops_82598 = {
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
index 9c14685358eb..dee64d2703f0 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
@@ -2119,6 +2119,8 @@ static struct ixgbe_mac_operations mac_ops_82599 = {
         .set_vlan_anti_spoofing = &ixgbe_set_vlan_anti_spoofing,
         .acquire_swfw_sync      = &ixgbe_acquire_swfw_sync,
         .release_swfw_sync      = &ixgbe_release_swfw_sync,
+        .get_thermal_sensor_data = &ixgbe_get_thermal_sensor_data_generic,
+        .init_thermal_sensor_thresh = &ixgbe_init_thermal_sensor_thresh_generic,
 
 };
 
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index 49aa41fe7b84..77ac41feb0fe 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -47,13 +47,6 @@ static void ixgbe_lower_eeprom_clk(struct ixgbe_hw *hw, u32 *eec);
 static void ixgbe_release_eeprom(struct ixgbe_hw *hw);
 
 static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr);
-static s32 ixgbe_fc_autoneg_fiber(struct ixgbe_hw *hw);
-static s32 ixgbe_fc_autoneg_backplane(struct ixgbe_hw *hw);
-static s32 ixgbe_fc_autoneg_copper(struct ixgbe_hw *hw);
-static s32 ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw);
-static s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg,
-                              u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm);
-static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num);
 static s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg);
 static s32 ixgbe_read_eeprom_buffer_bit_bang(struct ixgbe_hw *hw, u16 offset,
                                              u16 words, u16 *data);
@@ -64,6 +57,172 @@ static s32 ixgbe_detect_eeprom_page_size_generic(struct ixgbe_hw *hw,
 static s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw);
 
 /**
+ *  ixgbe_device_supports_autoneg_fc - Check if phy supports autoneg flow
+ *  control
+ *  @hw: pointer to hardware structure
+ *
+ *  There are several phys that do not support autoneg flow control. This
+ *  function check the device id to see if the associated phy supports
+ *  autoneg flow control.
+ **/
+static s32 ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw)
+{
+
+        switch (hw->device_id) {
+        case IXGBE_DEV_ID_X540T:
+                return 0;
+        case IXGBE_DEV_ID_82599_T3_LOM:
+                return 0;
+        default:
+                return IXGBE_ERR_FC_NOT_SUPPORTED;
+        }
+}
+
+/**
+ *  ixgbe_setup_fc - Set up flow control
+ *  @hw: pointer to hardware structure
+ *
+ *  Called at init time to set up flow control.
+ **/
+static s32 ixgbe_setup_fc(struct ixgbe_hw *hw)
+{
+        s32 ret_val = 0;
+        u32 reg = 0, reg_bp = 0;
+        u16 reg_cu = 0;
+
+        /*
+         * Validate the requested mode.  Strict IEEE mode does not allow
+         * ixgbe_fc_rx_pause because it will cause us to fail at UNH.
+         */
+        if (hw->fc.strict_ieee && hw->fc.requested_mode == ixgbe_fc_rx_pause) {
+                hw_dbg(hw, "ixgbe_fc_rx_pause not valid in strict IEEE mode\n");
+                ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
+                goto out;
+        }
+
+        /*
+         * 10gig parts do not have a word in the EEPROM to determine the
+         * default flow control setting, so we explicitly set it to full.
+         */
+        if (hw->fc.requested_mode == ixgbe_fc_default)
+                hw->fc.requested_mode = ixgbe_fc_full;
+
+        /*
+         * Set up the 1G and 10G flow control advertisement registers so the
+         * HW will be able to do fc autoneg once the cable is plugged in.  If
+         * we link at 10G, the 1G advertisement is harmless and vice versa.
+         */
+        switch (hw->phy.media_type) {
+        case ixgbe_media_type_fiber:
+        case ixgbe_media_type_backplane:
+                reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);
+                reg_bp = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+                break;
+        case ixgbe_media_type_copper:
+                hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE,
+                                        MDIO_MMD_AN, &reg_cu);
+                break;
+        default:
+                break;
+        }
+
+        /*
+         * The possible values of fc.requested_mode are:
+         * 0: Flow control is completely disabled
+         * 1: Rx flow control is enabled (we can receive pause frames,
+         *    but not send pause frames).
+         * 2: Tx flow control is enabled (we can send pause frames but
+         *    we do not support receiving pause frames).
+         * 3: Both Rx and Tx flow control (symmetric) are enabled.
+         * other: Invalid.
+         */
+        switch (hw->fc.requested_mode) {
+        case ixgbe_fc_none:
+                /* Flow control completely disabled by software override. */
+                reg &= ~(IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);
+                if (hw->phy.media_type == ixgbe_media_type_backplane)
+                        reg_bp &= ~(IXGBE_AUTOC_SYM_PAUSE |
+                                    IXGBE_AUTOC_ASM_PAUSE);
+                else if (hw->phy.media_type == ixgbe_media_type_copper)
+                        reg_cu &= ~(IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);
+                break;
+        case ixgbe_fc_tx_pause:
+                /*
+                 * Tx Flow control is enabled, and Rx Flow control is
+                 * disabled by software override.
+                 */
+                reg |= IXGBE_PCS1GANA_ASM_PAUSE;
+                reg &= ~IXGBE_PCS1GANA_SYM_PAUSE;
+                if (hw->phy.media_type == ixgbe_media_type_backplane) {
+                        reg_bp |= IXGBE_AUTOC_ASM_PAUSE;
+                        reg_bp &= ~IXGBE_AUTOC_SYM_PAUSE;
+                } else if (hw->phy.media_type == ixgbe_media_type_copper) {
+                        reg_cu |= IXGBE_TAF_ASM_PAUSE;
+                        reg_cu &= ~IXGBE_TAF_SYM_PAUSE;
+                }
+                break;
+        case ixgbe_fc_rx_pause:
+                /*
+                 * Rx Flow control is enabled and Tx Flow control is
+                 * disabled by software override. Since there really
+                 * isn't a way to advertise that we are capable of RX
+                 * Pause ONLY, we will advertise that we support both
+                 * symmetric and asymmetric Rx PAUSE, as such we fall
+                 * through to the fc_full statement.  Later, we will
+                 * disable the adapter's ability to send PAUSE frames.
+                 */
+        case ixgbe_fc_full:
+                /* Flow control (both Rx and Tx) is enabled by SW override. */
+                reg |= IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE;
+                if (hw->phy.media_type == ixgbe_media_type_backplane)
+                        reg_bp |= IXGBE_AUTOC_SYM_PAUSE |
+                                  IXGBE_AUTOC_ASM_PAUSE;
+                else if (hw->phy.media_type == ixgbe_media_type_copper)
+                        reg_cu |= IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE;
+                break;
+        default:
+                hw_dbg(hw, "Flow control param set incorrectly\n");
+                ret_val = IXGBE_ERR_CONFIG;
+                goto out;
+                break;
+        }
+
+        if (hw->mac.type != ixgbe_mac_X540) {
+                /*
+                 * Enable auto-negotiation between the MAC & PHY;
+                 * the MAC will advertise clause 37 flow control.
+                 */
+                IXGBE_WRITE_REG(hw, IXGBE_PCS1GANA, reg);
+                reg = IXGBE_READ_REG(hw, IXGBE_PCS1GLCTL);
+
+                /* Disable AN timeout */
+                if (hw->fc.strict_ieee)
+                        reg &= ~IXGBE_PCS1GLCTL_AN_1G_TIMEOUT_EN;
+
+                IXGBE_WRITE_REG(hw, IXGBE_PCS1GLCTL, reg);
+                hw_dbg(hw, "Set up FC; PCS1GLCTL = 0x%08X\n", reg);
+        }
+
+        /*
+         * AUTOC restart handles negotiation of 1G and 10G on backplane
+         * and copper. There is no need to set the PCS1GCTL register.
+         *
+         */
+        if (hw->phy.media_type == ixgbe_media_type_backplane) {
+                reg_bp |= IXGBE_AUTOC_AN_RESTART;
+                IXGBE_WRITE_REG(hw, IXGBE_AUTOC, reg_bp);
+        } else if ((hw->phy.media_type == ixgbe_media_type_copper) &&
+                    (ixgbe_device_supports_autoneg_fc(hw) == 0)) {
+                hw->phy.ops.write_reg(hw, MDIO_AN_ADVERTISE,
+                                      MDIO_MMD_AN, reg_cu);
+        }
+
+        hw_dbg(hw, "Set up FC; IXGBE_AUTOC = 0x%08X\n", reg);
+out:
+        return ret_val;
+}
+
+/**
  *  ixgbe_start_hw_generic - Prepare hardware for Tx/Rx
  *  @hw: pointer to hardware structure
  *
@@ -95,7 +254,7 @@ s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw)
         IXGBE_WRITE_FLUSH(hw);
 
         /* Setup flow control */
-        ixgbe_setup_fc(hw, 0);
+        ixgbe_setup_fc(hw);
 
         /* Clear adapter stopped flag */
         hw->adapter_stopped = false;
@@ -1923,30 +2082,36 @@ s32 ixgbe_disable_mc_generic(struct ixgbe_hw *hw)
 /**
  *  ixgbe_fc_enable_generic - Enable flow control
  *  @hw: pointer to hardware structure
- *  @packetbuf_num: packet buffer number (0-7)
  *
  *  Enable flow control according to the current settings.
  **/
-s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packetbuf_num)
+s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw)
 {
         s32 ret_val = 0;
         u32 mflcn_reg, fccfg_reg;
         u32 reg;
         u32 fcrtl, fcrth;
+        int i;
 
-#ifdef CONFIG_DCB
-        if (hw->fc.requested_mode == ixgbe_fc_pfc)
+        /*
+         * Validate the water mark configuration for packet buffer 0.  Zero
+         * water marks indicate that the packet buffer was not configured
+         * and the watermarks for packet buffer 0 should always be configured.
+         */
+        if (!hw->fc.low_water ||
+            !hw->fc.high_water[0] ||
+            !hw->fc.pause_time) {
+                hw_dbg(hw, "Invalid water mark configuration\n");
+                ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
                 goto out;
+        }
 
-#endif /* CONFIG_DCB */
         /* Negotiate the fc mode to use */
-        ret_val = ixgbe_fc_autoneg(hw);
-        if (ret_val == IXGBE_ERR_FLOW_CONTROL)
-                goto out;
+        ixgbe_fc_autoneg(hw);
 
         /* Disable any previous flow control settings */
         mflcn_reg = IXGBE_READ_REG(hw, IXGBE_MFLCN);
-        mflcn_reg &= ~(IXGBE_MFLCN_RFCE | IXGBE_MFLCN_RPFCE);
+        mflcn_reg &= ~(IXGBE_MFLCN_RPFCE_MASK | IXGBE_MFLCN_RFCE);
 
         fccfg_reg = IXGBE_READ_REG(hw, IXGBE_FCCFG);
         fccfg_reg &= ~(IXGBE_FCCFG_TFCE_802_3X | IXGBE_FCCFG_TFCE_PRIORITY);
@@ -1959,9 +2124,6 @@ s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packetbuf_num)
          * 2: Tx flow control is enabled (we can send pause frames but
          *    we do not support receiving pause frames).
          * 3: Both Rx and Tx flow control (symmetric) are enabled.
-#ifdef CONFIG_DCB
-         * 4: Priority Flow Control is enabled.
-#endif
          * other: Invalid.
          */
         switch (hw->fc.current_mode) {
@@ -1994,11 +2156,6 @@ s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packetbuf_num)
                 mflcn_reg |= IXGBE_MFLCN_RFCE;
                 fccfg_reg |= IXGBE_FCCFG_TFCE_802_3X;
                 break;
-#ifdef CONFIG_DCB
-        case ixgbe_fc_pfc:
-                goto out;
-                break;
-#endif /* CONFIG_DCB */
         default:
                 hw_dbg(hw, "Flow control param set incorrectly\n");
                 ret_val = IXGBE_ERR_CONFIG;
@@ -2011,100 +2168,86 @@ s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packetbuf_num)
         IXGBE_WRITE_REG(hw, IXGBE_MFLCN, mflcn_reg);
         IXGBE_WRITE_REG(hw, IXGBE_FCCFG, fccfg_reg);
 
-        fcrtl = hw->fc.low_water << 10;
+        fcrtl = (hw->fc.low_water << 10) | IXGBE_FCRTL_XONE;
 
-        if (hw->fc.current_mode & ixgbe_fc_tx_pause) {
-                fcrth = hw->fc.high_water[packetbuf_num] << 10;
-                fcrth |= IXGBE_FCRTH_FCEN;
-                if (hw->fc.send_xon)
-                        fcrtl |= IXGBE_FCRTL_XONE;
-        } else {
-                /*
-                 * If Tx flow control is disabled, set our high water mark
-                 * to Rx FIFO size minus 32 in order prevent Tx switch
-                 * loopback from stalling on DMA.
-                 */
-                fcrth = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(packetbuf_num)) - 32;
-        }
+        /* Set up and enable Rx high/low water mark thresholds, enable XON. */
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                if ((hw->fc.current_mode & ixgbe_fc_tx_pause) &&
+                    hw->fc.high_water[i]) {
+                        IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), fcrtl);
+                        fcrth = (hw->fc.high_water[i] << 10) | IXGBE_FCRTH_FCEN;
+                } else {
+                        IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), 0);
+                        /*
+                         * In order to prevent Tx hangs when the internal Tx
+                         * switch is enabled we must set the high water mark
+                         * to the maximum FCRTH value.  This allows the Tx
+                         * switch to function even under heavy Rx workloads.
+                         */
+                        fcrth = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i)) - 32;
+                }
 
-        IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(packetbuf_num), fcrth);
-        IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(packetbuf_num), fcrtl);
+                IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(i), fcrth);
+        }
 
         /* Configure pause time (2 TCs per register) */
-        reg = IXGBE_READ_REG(hw, IXGBE_FCTTV(packetbuf_num / 2));
-        if ((packetbuf_num & 1) == 0)
-                reg = (reg & 0xFFFF0000) | hw->fc.pause_time;
-        else
-                reg = (reg & 0x0000FFFF) | (hw->fc.pause_time << 16);
-        IXGBE_WRITE_REG(hw, IXGBE_FCTTV(packetbuf_num / 2), reg);
+        reg = hw->fc.pause_time * 0x00010001;
+        for (i = 0; i < (MAX_TRAFFIC_CLASS / 2); i++)
+                IXGBE_WRITE_REG(hw, IXGBE_FCTTV(i), reg);
 
-        IXGBE_WRITE_REG(hw, IXGBE_FCRTV, (hw->fc.pause_time >> 1));
+        IXGBE_WRITE_REG(hw, IXGBE_FCRTV, hw->fc.pause_time / 2);
 
 out:
         return ret_val;
 }
 
 /**
- *  ixgbe_fc_autoneg - Configure flow control
+ *  ixgbe_negotiate_fc - Negotiate flow control
  *  @hw: pointer to hardware structure
+ *  @adv_reg: flow control advertised settings
+ *  @lp_reg: link partner's flow control settings
+ *  @adv_sym: symmetric pause bit in advertisement
+ *  @adv_asm: asymmetric pause bit in advertisement
+ *  @lp_sym: symmetric pause bit in link partner advertisement
+ *  @lp_asm: asymmetric pause bit in link partner advertisement
  *
- *  Compares our advertised flow control capabilities to those advertised by
- *  our link partner, and determines the proper flow control mode to use.
+ *  Find the intersection between advertised settings and link partner's
+ *  advertised settings
  **/
-s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw)
+static s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg,
+                              u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm)
 {
-        s32 ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
-        ixgbe_link_speed speed;
-        bool link_up;
-
-        if (hw->fc.disable_fc_autoneg)
-                goto out;
-
-        /*
-         * AN should have completed when the cable was plugged in.
-         * Look for reasons to bail out.  Bail out if:
-         * - FC autoneg is disabled, or if
-         * - link is not up.
-         *
-         * Since we're being called from an LSC, link is already known to be up.
-         * So use link_up_wait_to_complete=false.
-         */
-        hw->mac.ops.check_link(hw, &speed, &link_up, false);
-        if (!link_up) {
-                ret_val = IXGBE_ERR_FLOW_CONTROL;
-                goto out;
-        }
-
-        switch (hw->phy.media_type) {
-        /* Autoneg flow control on fiber adapters */
-        case ixgbe_media_type_fiber:
-                if (speed == IXGBE_LINK_SPEED_1GB_FULL)
-                        ret_val = ixgbe_fc_autoneg_fiber(hw);
-                break;
-
-        /* Autoneg flow control on backplane adapters */
-        case ixgbe_media_type_backplane:
-                ret_val = ixgbe_fc_autoneg_backplane(hw);
-                break;
-
-        /* Autoneg flow control on copper adapters */
-        case ixgbe_media_type_copper:
-                if (ixgbe_device_supports_autoneg_fc(hw) == 0)
-                        ret_val = ixgbe_fc_autoneg_copper(hw);
-                break;
-
-        default:
-                break;
-        }
+        if ((!(adv_reg)) ||  (!(lp_reg)))
+                return IXGBE_ERR_FC_NOT_NEGOTIATED;
 
-out:
-        if (ret_val == 0) {
-                hw->fc.fc_was_autonegged = true;
+        if ((adv_reg & adv_sym) && (lp_reg & lp_sym)) {
+                /*
+                 * Now we need to check if the user selected Rx ONLY
+                 * of pause frames.  In this case, we had to advertise
+                 * FULL flow control because we could not advertise RX
+                 * ONLY. Hence, we must now check to see if we need to
+                 * turn OFF the TRANSMISSION of PAUSE frames.
+                 */
+                if (hw->fc.requested_mode == ixgbe_fc_full) {
+                        hw->fc.current_mode = ixgbe_fc_full;
+                        hw_dbg(hw, "Flow Control = FULL.\n");
+                } else {
+                        hw->fc.current_mode = ixgbe_fc_rx_pause;
+                        hw_dbg(hw, "Flow Control=RX PAUSE frames only\n");
+                }
+        } else if (!(adv_reg & adv_sym) && (adv_reg & adv_asm) &&
+                   (lp_reg & lp_sym) && (lp_reg & lp_asm)) {
+                hw->fc.current_mode = ixgbe_fc_tx_pause;
+                hw_dbg(hw, "Flow Control = TX PAUSE frames only.\n");
+        } else if ((adv_reg & adv_sym) && (adv_reg & adv_asm) &&
+                   !(lp_reg & lp_sym) && (lp_reg & lp_asm)) {
+                hw->fc.current_mode = ixgbe_fc_rx_pause;
+                hw_dbg(hw, "Flow Control = RX PAUSE frames only.\n");
         } else {
-                hw->fc.fc_was_autonegged = false;
-                hw->fc.current_mode = hw->fc.requested_mode;
+                hw->fc.current_mode = ixgbe_fc_none;
+                hw_dbg(hw, "Flow Control = NONE.\n");
         }
-        return ret_val;
+        return 0;
 }
 
 /**
@@ -2116,7 +2259,7 @@ out:
 static s32 ixgbe_fc_autoneg_fiber(struct ixgbe_hw *hw)
 {
         u32 pcs_anadv_reg, pcs_lpab_reg, linkstat;
-        s32 ret_val;
+        s32 ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
 
         /*
          * On multispeed fiber at 1g, bail out if
@@ -2126,10 +2269,8 @@ static s32 ixgbe_fc_autoneg_fiber(struct ixgbe_hw *hw)
 
         linkstat = IXGBE_READ_REG(hw, IXGBE_PCS1GLSTA);
         if ((!!(linkstat & IXGBE_PCS1GLSTA_AN_COMPLETE) == 0) ||
-            (!!(linkstat & IXGBE_PCS1GLSTA_AN_TIMED_OUT) == 1)) {
-                ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
+            (!!(linkstat & IXGBE_PCS1GLSTA_AN_TIMED_OUT) == 1))
                 goto out;
-        }
 
         pcs_anadv_reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);
         pcs_lpab_reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANLP);
@@ -2153,7 +2294,7 @@ out:
 static s32 ixgbe_fc_autoneg_backplane(struct ixgbe_hw *hw)
 {
         u32 links2, anlp1_reg, autoc_reg, links;
-        s32 ret_val;
+        s32 ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
 
         /*
          * On backplane, bail out if
@@ -2161,21 +2302,13 @@ static s32 ixgbe_fc_autoneg_backplane(struct ixgbe_hw *hw)
          * - we are 82599 and link partner is not AN enabled
          */
         links = IXGBE_READ_REG(hw, IXGBE_LINKS);
-        if ((links & IXGBE_LINKS_KX_AN_COMP) == 0) {
-                hw->fc.fc_was_autonegged = false;
-                hw->fc.current_mode = hw->fc.requested_mode;
-                ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
+        if ((links & IXGBE_LINKS_KX_AN_COMP) == 0)
                 goto out;
-        }
 
         if (hw->mac.type == ixgbe_mac_82599EB) {
                 links2 = IXGBE_READ_REG(hw, IXGBE_LINKS2);
-                if ((links2 & IXGBE_LINKS2_AN_SUPPORTED) == 0) {
-                        hw->fc.fc_was_autonegged = false;
-                        hw->fc.current_mode = hw->fc.requested_mode;
-                        ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
+                if ((links2 & IXGBE_LINKS2_AN_SUPPORTED) == 0)
                         goto out;
-                }
         }
         /*
          * Read the 10g AN autoc and LP ability registers and resolve
@@ -2217,241 +2350,63 @@ static s32 ixgbe_fc_autoneg_copper(struct ixgbe_hw *hw)
 }
 
 /**
- *  ixgbe_negotiate_fc - Negotiate flow control
- *  @hw: pointer to hardware structure
- *  @adv_reg: flow control advertised settings
- *  @lp_reg: link partner's flow control settings
- *  @adv_sym: symmetric pause bit in advertisement
- *  @adv_asm: asymmetric pause bit in advertisement
- *  @lp_sym: symmetric pause bit in link partner advertisement
- *  @lp_asm: asymmetric pause bit in link partner advertisement
- *
- *  Find the intersection between advertised settings and link partner's
- *  advertised settings
- **/
-static s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg,
-                              u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm)
-{
-        if ((!(adv_reg)) ||  (!(lp_reg)))
-                return IXGBE_ERR_FC_NOT_NEGOTIATED;
-
-        if ((adv_reg & adv_sym) && (lp_reg & lp_sym)) {
-                /*
-                 * Now we need to check if the user selected Rx ONLY
-                 * of pause frames.  In this case, we had to advertise
-                 * FULL flow control because we could not advertise RX
-                 * ONLY. Hence, we must now check to see if we need to
-                 * turn OFF the TRANSMISSION of PAUSE frames.
-                 */
-                if (hw->fc.requested_mode == ixgbe_fc_full) {
-                        hw->fc.current_mode = ixgbe_fc_full;
-                        hw_dbg(hw, "Flow Control = FULL.\n");
-                } else {
-                        hw->fc.current_mode = ixgbe_fc_rx_pause;
-                        hw_dbg(hw, "Flow Control=RX PAUSE frames only\n");
-                }
-        } else if (!(adv_reg & adv_sym) && (adv_reg & adv_asm) &&
-                   (lp_reg & lp_sym) && (lp_reg & lp_asm)) {
-                hw->fc.current_mode = ixgbe_fc_tx_pause;
-                hw_dbg(hw, "Flow Control = TX PAUSE frames only.\n");
-        } else if ((adv_reg & adv_sym) && (adv_reg & adv_asm) &&
-                   !(lp_reg & lp_sym) && (lp_reg & lp_asm)) {
-                hw->fc.current_mode = ixgbe_fc_rx_pause;
-                hw_dbg(hw, "Flow Control = RX PAUSE frames only.\n");
-        } else {
-                hw->fc.current_mode = ixgbe_fc_none;
-                hw_dbg(hw, "Flow Control = NONE.\n");
-        }
-        return 0;
-}
-
-/**
- *  ixgbe_setup_fc - Set up flow control
+ *  ixgbe_fc_autoneg - Configure flow control
  *  @hw: pointer to hardware structure
  *
- *  Called at init time to set up flow control.
+ *  Compares our advertised flow control capabilities to those advertised by
+ *  our link partner, and determines the proper flow control mode to use.
  **/
-static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num)
+void ixgbe_fc_autoneg(struct ixgbe_hw *hw)
 {
-        s32 ret_val = 0;
-        u32 reg = 0, reg_bp = 0;
-        u16 reg_cu = 0;
-
-#ifdef CONFIG_DCB
-        if (hw->fc.requested_mode == ixgbe_fc_pfc) {
-                hw->fc.current_mode = hw->fc.requested_mode;
-                goto out;
-        }
-
-#endif /* CONFIG_DCB */
-        /* Validate the packetbuf configuration */
-        if (packetbuf_num < 0 || packetbuf_num > 7) {
-                hw_dbg(hw, "Invalid packet buffer number [%d], expected range "
-                       "is 0-7\n", packetbuf_num);
-                ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
-                goto out;
-        }
+        s32 ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
+        ixgbe_link_speed speed;
+        bool link_up;
 
         /*
-         * Validate the water mark configuration.  Zero water marks are invalid
-         * because it causes the controller to just blast out fc packets.
+         * AN should have completed when the cable was plugged in.
+         * Look for reasons to bail out.  Bail out if:
+         * - FC autoneg is disabled, or if
+         * - link is not up.
+         *
+         * Since we're being called from an LSC, link is already known to be up.
+         * So use link_up_wait_to_complete=false.
          */
-        if (!hw->fc.low_water ||
-            !hw->fc.high_water[packetbuf_num] ||
-            !hw->fc.pause_time) {
-                hw_dbg(hw, "Invalid water mark configuration\n");
-                ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
+        if (hw->fc.disable_fc_autoneg)
                 goto out;
-        }
 
-        /*
-         * Validate the requested mode.  Strict IEEE mode does not allow
-         * ixgbe_fc_rx_pause because it will cause us to fail at UNH.
-         */
-        if (hw->fc.strict_ieee && hw->fc.requested_mode == ixgbe_fc_rx_pause) {
-                hw_dbg(hw, "ixgbe_fc_rx_pause not valid in strict "
-                       "IEEE mode\n");
-                ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
+        hw->mac.ops.check_link(hw, &speed, &link_up, false);
+        if (!link_up)
                 goto out;
-        }
-
-        /*
-         * 10gig parts do not have a word in the EEPROM to determine the
-         * default flow control setting, so we explicitly set it to full.
-         */
-        if (hw->fc.requested_mode == ixgbe_fc_default)
-                hw->fc.requested_mode = ixgbe_fc_full;
-
-        /*
-         * Set up the 1G and 10G flow control advertisement registers so the
-         * HW will be able to do fc autoneg once the cable is plugged in.  If
-         * we link at 10G, the 1G advertisement is harmless and vice versa.
-         */
 
         switch (hw->phy.media_type) {
+        /* Autoneg flow control on fiber adapters */
         case ixgbe_media_type_fiber:
+                if (speed == IXGBE_LINK_SPEED_1GB_FULL)
+                        ret_val = ixgbe_fc_autoneg_fiber(hw);
+                break;
+
+        /* Autoneg flow control on backplane adapters */
         case ixgbe_media_type_backplane:
-                reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);
-                reg_bp = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+                ret_val = ixgbe_fc_autoneg_backplane(hw);
                 break;
 
+        /* Autoneg flow control on copper adapters */
         case ixgbe_media_type_copper:
-                hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE,
-                                        MDIO_MMD_AN, &reg_cu);
+                if (ixgbe_device_supports_autoneg_fc(hw) == 0)
+                        ret_val = ixgbe_fc_autoneg_copper(hw);
                 break;
 
         default:
-                ;
-        }
-
-        /*
-         * The possible values of fc.requested_mode are:
-         * 0: Flow control is completely disabled
-         * 1: Rx flow control is enabled (we can receive pause frames,
-         *    but not send pause frames).
-         * 2: Tx flow control is enabled (we can send pause frames but
-         *    we do not support receiving pause frames).
-         * 3: Both Rx and Tx flow control (symmetric) are enabled.
-#ifdef CONFIG_DCB
-         * 4: Priority Flow Control is enabled.
-#endif
-         * other: Invalid.
-         */
-        switch (hw->fc.requested_mode) {
-        case ixgbe_fc_none:
-                /* Flow control completely disabled by software override. */
-                reg &= ~(IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);
-                if (hw->phy.media_type == ixgbe_media_type_backplane)
-                        reg_bp &= ~(IXGBE_AUTOC_SYM_PAUSE |
-                                    IXGBE_AUTOC_ASM_PAUSE);
-                else if (hw->phy.media_type == ixgbe_media_type_copper)
-                        reg_cu &= ~(IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);
-                break;
-        case ixgbe_fc_rx_pause:
-                /*
-                 * Rx Flow control is enabled and Tx Flow control is
-                 * disabled by software override. Since there really
-                 * isn't a way to advertise that we are capable of RX
-                 * Pause ONLY, we will advertise that we support both
-                 * symmetric and asymmetric Rx PAUSE.  Later, we will
-                 * disable the adapter's ability to send PAUSE frames.
-                 */
-                reg |= (IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);
-                if (hw->phy.media_type == ixgbe_media_type_backplane)
-                        reg_bp |= (IXGBE_AUTOC_SYM_PAUSE |
-                                   IXGBE_AUTOC_ASM_PAUSE);
-                else if (hw->phy.media_type == ixgbe_media_type_copper)
-                        reg_cu |= (IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);
-                break;
-        case ixgbe_fc_tx_pause:
-                /*
-                 * Tx Flow control is enabled, and Rx Flow control is
-                 * disabled by software override.
-                 */
-                reg |= (IXGBE_PCS1GANA_ASM_PAUSE);
-                reg &= ~(IXGBE_PCS1GANA_SYM_PAUSE);
-                if (hw->phy.media_type == ixgbe_media_type_backplane) {
-                        reg_bp |= (IXGBE_AUTOC_ASM_PAUSE);
-                        reg_bp &= ~(IXGBE_AUTOC_SYM_PAUSE);
-                } else if (hw->phy.media_type == ixgbe_media_type_copper) {
-                        reg_cu |= (IXGBE_TAF_ASM_PAUSE);
-                        reg_cu &= ~(IXGBE_TAF_SYM_PAUSE);
-                }
                 break;
-        case ixgbe_fc_full:
-                /* Flow control (both Rx and Tx) is enabled by SW override. */
-                reg |= (IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);
-                if (hw->phy.media_type == ixgbe_media_type_backplane)
-                        reg_bp |= (IXGBE_AUTOC_SYM_PAUSE |
-                                   IXGBE_AUTOC_ASM_PAUSE);
-                else if (hw->phy.media_type == ixgbe_media_type_copper)
-                        reg_cu |= (IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);
-                break;
-#ifdef CONFIG_DCB
-        case ixgbe_fc_pfc:
-                goto out;
-                break;
-#endif /* CONFIG_DCB */
-        default:
-                hw_dbg(hw, "Flow control param set incorrectly\n");
-                ret_val = IXGBE_ERR_CONFIG;
-                goto out;
-                break;
-        }
-
-        if (hw->mac.type != ixgbe_mac_X540) {
-                /*
-                 * Enable auto-negotiation between the MAC & PHY;
-                 * the MAC will advertise clause 37 flow control.
-                 */
-                IXGBE_WRITE_REG(hw, IXGBE_PCS1GANA, reg);
-                reg = IXGBE_READ_REG(hw, IXGBE_PCS1GLCTL);
-
-                /* Disable AN timeout */
-                if (hw->fc.strict_ieee)
-                        reg &= ~IXGBE_PCS1GLCTL_AN_1G_TIMEOUT_EN;
-
-                IXGBE_WRITE_REG(hw, IXGBE_PCS1GLCTL, reg);
-                hw_dbg(hw, "Set up FC; PCS1GLCTL = 0x%08X\n", reg);
-        }
-
-        /*
-         * AUTOC restart handles negotiation of 1G and 10G on backplane
-         * and copper. There is no need to set the PCS1GCTL register.
-         *
-         */
-        if (hw->phy.media_type == ixgbe_media_type_backplane) {
-                reg_bp |= IXGBE_AUTOC_AN_RESTART;
-                IXGBE_WRITE_REG(hw, IXGBE_AUTOC, reg_bp);
-        } else if ((hw->phy.media_type == ixgbe_media_type_copper) &&
-                    (ixgbe_device_supports_autoneg_fc(hw) == 0)) {
-                hw->phy.ops.write_reg(hw, MDIO_AN_ADVERTISE,
-                                      MDIO_MMD_AN, reg_cu);
         }
 
-        hw_dbg(hw, "Set up FC; IXGBE_AUTOC = 0x%08X\n", reg);
 out:
-        return ret_val;
+        if (ret_val == 0) {
+                hw->fc.fc_was_autonegged = true;
+        } else {
+                hw->fc.fc_was_autonegged = false;
+                hw->fc.current_mode = hw->fc.requested_mode;
+        }
 }
 
 /**
@@ -2606,7 +2561,7 @@ s32 ixgbe_disable_rx_buff_generic(struct ixgbe_hw *hw)
                         break;
                 else
                         /* Use interrupt-safe sleep just in case */
-                        udelay(10);
+                        udelay(1000);
         }
 
         /* For informational purposes only */
@@ -2783,17 +2738,36 @@ san_mac_addr_out:
  *  Read PCIe configuration space, and get the MSI-X vector count from
  *  the capabilities table.
  **/
-u32 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw)
+u16 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw)
 {
         struct ixgbe_adapter *adapter = hw->back;
-        u16 msix_count;
-        pci_read_config_word(adapter->pdev, IXGBE_PCIE_MSIX_82599_CAPS,
-                             &msix_count);
+        u16 msix_count = 1;
+        u16 max_msix_count;
+        u16 pcie_offset;
+
+        switch (hw->mac.type) {
+        case ixgbe_mac_82598EB:
+                pcie_offset = IXGBE_PCIE_MSIX_82598_CAPS;
+                max_msix_count = IXGBE_MAX_MSIX_VECTORS_82598;
+                break;
+        case ixgbe_mac_82599EB:
+        case ixgbe_mac_X540:
+                pcie_offset = IXGBE_PCIE_MSIX_82599_CAPS;
+                max_msix_count = IXGBE_MAX_MSIX_VECTORS_82599;
+                break;
+        default:
+                return msix_count;
+        }
+
+        pci_read_config_word(adapter->pdev, pcie_offset, &msix_count);
         msix_count &= IXGBE_PCIE_MSIX_TBL_SZ_MASK;
 
-        /* MSI-X count is zero-based in HW, so increment to give proper value */
+        /* MSI-X count is zero-based in HW */
         msix_count++;
 
+        if (msix_count > max_msix_count)
+                msix_count = max_msix_count;
+
         return msix_count;
 }
 
@@ -3203,28 +3177,6 @@ wwn_prefix_out:
 }
 
 /**
- *  ixgbe_device_supports_autoneg_fc - Check if phy supports autoneg flow
- *  control
- *  @hw: pointer to hardware structure
- *
- *  There are several phys that do not support autoneg flow control. This
- *  function check the device id to see if the associated phy supports
- *  autoneg flow control.
- **/
-static s32 ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw)
-{
-
-        switch (hw->device_id) {
-        case IXGBE_DEV_ID_X540T:
-                return 0;
-        case IXGBE_DEV_ID_82599_T3_LOM:
-                return 0;
-        default:
-                return IXGBE_ERR_FC_NOT_SUPPORTED;
-        }
-}
-
-/**
  *  ixgbe_set_mac_anti_spoofing - Enable/Disable MAC anti-spoofing
  *  @hw: pointer to hardware structure
  *  @enable: enable or disable switch for anti-spoofing
@@ -3585,3 +3537,172 @@ void ixgbe_clear_tx_pending(struct ixgbe_hw *hw)
         IXGBE_WRITE_REG(hw, IXGBE_GCR_EXT, gcr_ext);
         IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg0);
 }
+
+static const u8 ixgbe_emc_temp_data[4] = {
+        IXGBE_EMC_INTERNAL_DATA,
+        IXGBE_EMC_DIODE1_DATA,
+        IXGBE_EMC_DIODE2_DATA,
+        IXGBE_EMC_DIODE3_DATA
+};
+static const u8 ixgbe_emc_therm_limit[4] = {
+        IXGBE_EMC_INTERNAL_THERM_LIMIT,
+        IXGBE_EMC_DIODE1_THERM_LIMIT,
+        IXGBE_EMC_DIODE2_THERM_LIMIT,
+        IXGBE_EMC_DIODE3_THERM_LIMIT
+};
+
+/**
+ *  ixgbe_get_ets_data - Extracts the ETS bit data
+ *  @hw: pointer to hardware structure
+ *  @ets_cfg: extected ETS data
+ *  @ets_offset: offset of ETS data
+ *
+ *  Returns error code.
+ **/
+static s32 ixgbe_get_ets_data(struct ixgbe_hw *hw, u16 *ets_cfg,
+                              u16 *ets_offset)
+{
+        s32 status = 0;
+
+        status = hw->eeprom.ops.read(hw, IXGBE_ETS_CFG, ets_offset);
+        if (status)
+                goto out;
+
+        if ((*ets_offset == 0x0000) || (*ets_offset == 0xFFFF)) {
+                status = IXGBE_NOT_IMPLEMENTED;
+                goto out;
+        }
+
+        status = hw->eeprom.ops.read(hw, *ets_offset, ets_cfg);
+        if (status)
+                goto out;
+
+        if ((*ets_cfg & IXGBE_ETS_TYPE_MASK) != IXGBE_ETS_TYPE_EMC_SHIFTED) {
+                status = IXGBE_NOT_IMPLEMENTED;
+                goto out;
+        }
+
+out:
+        return status;
+}
+
+/**
+ *  ixgbe_get_thermal_sensor_data - Gathers thermal sensor data
+ *  @hw: pointer to hardware structure
+ *
+ *  Returns the thermal sensor data structure
+ **/
+s32 ixgbe_get_thermal_sensor_data_generic(struct ixgbe_hw *hw)
+{
+        s32 status = 0;
+        u16 ets_offset;
+        u16 ets_cfg;
+        u16 ets_sensor;
+        u8  num_sensors;
+        u8  i;
+        struct ixgbe_thermal_sensor_data *data = &hw->mac.thermal_sensor_data;
+
+        /* Only support thermal sensors attached to physical port 0 */
+        if ((IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_LAN_ID_1)) {
+                status = IXGBE_NOT_IMPLEMENTED;
+                goto out;
+        }
+
+        status = ixgbe_get_ets_data(hw, &ets_cfg, &ets_offset);
+        if (status)
+                goto out;
+
+        num_sensors = (ets_cfg & IXGBE_ETS_NUM_SENSORS_MASK);
+        if (num_sensors > IXGBE_MAX_SENSORS)
+                num_sensors = IXGBE_MAX_SENSORS;
+
+        for (i = 0; i < num_sensors; i++) {
+                u8  sensor_index;
+                u8  sensor_location;
+
+                status = hw->eeprom.ops.read(hw, (ets_offset + 1 + i),
+                                             &ets_sensor);
+                if (status)
+                        goto out;
+
+                sensor_index = ((ets_sensor & IXGBE_ETS_DATA_INDEX_MASK) >>
+                                IXGBE_ETS_DATA_INDEX_SHIFT);
+                sensor_location = ((ets_sensor & IXGBE_ETS_DATA_LOC_MASK) >>
+                                   IXGBE_ETS_DATA_LOC_SHIFT);
+
+                if (sensor_location != 0) {
+                        status = hw->phy.ops.read_i2c_byte(hw,
+                                        ixgbe_emc_temp_data[sensor_index],
+                                        IXGBE_I2C_THERMAL_SENSOR_ADDR,
+                                        &data->sensor[i].temp);
+                        if (status)
+                                goto out;
+                }
+        }
+out:
+        return status;
+}
+
+/**
+ * ixgbe_init_thermal_sensor_thresh_generic - Inits thermal sensor thresholds
+ * @hw: pointer to hardware structure
+ *
+ * Inits the thermal sensor thresholds according to the NVM map
+ * and save off the threshold and location values into mac.thermal_sensor_data
+ **/
+s32 ixgbe_init_thermal_sensor_thresh_generic(struct ixgbe_hw *hw)
+{
+        s32 status = 0;
+        u16 ets_offset;
+        u16 ets_cfg;
+        u16 ets_sensor;
+        u8  low_thresh_delta;
+        u8  num_sensors;
+        u8  therm_limit;
+        u8  i;
+        struct ixgbe_thermal_sensor_data *data = &hw->mac.thermal_sensor_data;
+
+        memset(data, 0, sizeof(struct ixgbe_thermal_sensor_data));
+
+        /* Only support thermal sensors attached to physical port 0 */
+        if ((IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_LAN_ID_1)) {
+                status = IXGBE_NOT_IMPLEMENTED;
+                goto out;
+        }
+
+        status = ixgbe_get_ets_data(hw, &ets_cfg, &ets_offset);
+        if (status)
+                goto out;
+
+        low_thresh_delta = ((ets_cfg & IXGBE_ETS_LTHRES_DELTA_MASK) >>
+                             IXGBE_ETS_LTHRES_DELTA_SHIFT);
+        num_sensors = (ets_cfg & IXGBE_ETS_NUM_SENSORS_MASK);
+        if (num_sensors > IXGBE_MAX_SENSORS)
+                num_sensors = IXGBE_MAX_SENSORS;
+
+        for (i = 0; i < num_sensors; i++) {
+                u8  sensor_index;
+                u8  sensor_location;
+
+                hw->eeprom.ops.read(hw, (ets_offset + 1 + i), &ets_sensor);
+                sensor_index = ((ets_sensor & IXGBE_ETS_DATA_INDEX_MASK) >>
+                                IXGBE_ETS_DATA_INDEX_SHIFT);
+                sensor_location = ((ets_sensor & IXGBE_ETS_DATA_LOC_MASK) >>
+                                   IXGBE_ETS_DATA_LOC_SHIFT);
+                therm_limit = ets_sensor & IXGBE_ETS_DATA_HTHRESH_MASK;
+
+                hw->phy.ops.write_i2c_byte(hw,
+                        ixgbe_emc_therm_limit[sensor_index],
+                        IXGBE_I2C_THERMAL_SENSOR_ADDR, therm_limit);
+
+                if (sensor_location == 0)
+                        continue;
+
+                data->sensor[i].location = sensor_location;
+                data->sensor[i].caution_thresh = therm_limit;
+                data->sensor[i].max_op_thresh = therm_limit - low_thresh_delta;
+        }
+out:
+        return status;
+}
+
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
index 204f06235b45..6222fdb3d3f1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
@@ -31,7 +31,7 @@
 #include "ixgbe_type.h"
 #include "ixgbe.h"
 
-u32 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw);
+u16 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw);
 s32 ixgbe_init_ops_generic(struct ixgbe_hw *hw);
 s32 ixgbe_init_hw_generic(struct ixgbe_hw *hw);
 s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw);
@@ -77,8 +77,8 @@ s32 ixgbe_disable_mc_generic(struct ixgbe_hw *hw);
 s32 ixgbe_disable_rx_buff_generic(struct ixgbe_hw *hw);
 s32 ixgbe_enable_rx_buff_generic(struct ixgbe_hw *hw);
 s32 ixgbe_enable_rx_dma_generic(struct ixgbe_hw *hw, u32 regval);
-s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packetbuf_num);
-s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw);
+s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw);
+void ixgbe_fc_autoneg(struct ixgbe_hw *hw);
 
 s32 ixgbe_validate_mac_addr(u8 *mac_addr);
 s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u16 mask);
@@ -107,6 +107,19 @@ void ixgbe_clear_tx_pending(struct ixgbe_hw *hw);
 void ixgbe_set_rxpba_generic(struct ixgbe_hw *hw, int num_pb,
                              u32 headroom, int strategy);
 
+#define IXGBE_I2C_THERMAL_SENSOR_ADDR   0xF8
+#define IXGBE_EMC_INTERNAL_DATA         0x00
+#define IXGBE_EMC_INTERNAL_THERM_LIMIT  0x20
+#define IXGBE_EMC_DIODE1_DATA           0x01
+#define IXGBE_EMC_DIODE1_THERM_LIMIT    0x19
+#define IXGBE_EMC_DIODE2_DATA           0x23
+#define IXGBE_EMC_DIODE2_THERM_LIMIT    0x1A
+#define IXGBE_EMC_DIODE3_DATA           0x2A
+#define IXGBE_EMC_DIODE3_THERM_LIMIT    0x30
+
+s32 ixgbe_get_thermal_sensor_data_generic(struct ixgbe_hw *hw);
+s32 ixgbe_init_thermal_sensor_thresh_generic(struct ixgbe_hw *hw);
+
 #define IXGBE_WRITE_REG(a, reg, value) writel((value), ((a)->hw_addr + (reg)))
 
 #ifndef writeq
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
index d3695edfcb8b..87592b458c9c 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
@@ -191,53 +191,46 @@ s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
  */
 s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *hw, u8 pfc_en)
 {
-        u32 reg;
+        u32 fcrtl, reg;
         u8  i;
 
-        if (pfc_en) {
-                /* Enable Transmit Priority Flow Control */
-                reg = IXGBE_READ_REG(hw, IXGBE_RMCS);
-                reg &= ~IXGBE_RMCS_TFCE_802_3X;
-                /* correct the reporting of our flow control status */
-                reg |= IXGBE_RMCS_TFCE_PRIORITY;
-                IXGBE_WRITE_REG(hw, IXGBE_RMCS, reg);
-
-                /* Enable Receive Priority Flow Control */
-                reg = IXGBE_READ_REG(hw, IXGBE_FCTRL);
-                reg &= ~IXGBE_FCTRL_RFCE;
-                reg |= IXGBE_FCTRL_RPFCE;
-                IXGBE_WRITE_REG(hw, IXGBE_FCTRL, reg);
-
-                /* Configure pause time */
-                for (i = 0; i < (MAX_TRAFFIC_CLASS >> 1); i++)
-                        IXGBE_WRITE_REG(hw, IXGBE_FCTTV(i), 0x68006800);
+        /* Enable Transmit Priority Flow Control */
+        reg = IXGBE_READ_REG(hw, IXGBE_RMCS);
+        reg &= ~IXGBE_RMCS_TFCE_802_3X;
+        reg |= IXGBE_RMCS_TFCE_PRIORITY;
+        IXGBE_WRITE_REG(hw, IXGBE_RMCS, reg);
 
-                /* Configure flow control refresh threshold value */
-                IXGBE_WRITE_REG(hw, IXGBE_FCRTV, 0x3400);
-        }
+        /* Enable Receive Priority Flow Control */
+        reg = IXGBE_READ_REG(hw, IXGBE_FCTRL);
+        reg &= ~(IXGBE_FCTRL_RPFCE | IXGBE_FCTRL_RFCE);
 
-        /*
-         * Configure flow control thresholds and enable priority flow control
-         * for each traffic class.
-         */
-        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-                int enabled = pfc_en & (1 << i);
+        if (pfc_en)
+                reg |= IXGBE_FCTRL_RPFCE;
 
-                reg = hw->fc.low_water << 10;
+        IXGBE_WRITE_REG(hw, IXGBE_FCTRL, reg);
 
-                if (enabled == pfc_enabled_tx ||
-                    enabled == pfc_enabled_full)
-                        reg |= IXGBE_FCRTL_XONE;
+        fcrtl = (hw->fc.low_water << 10) | IXGBE_FCRTL_XONE;
+        /* Configure PFC Tx thresholds per TC */
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                if (!(pfc_en & (1 << i))) {
+                        IXGBE_WRITE_REG(hw, IXGBE_FCRTL(i), 0);
+                        IXGBE_WRITE_REG(hw, IXGBE_FCRTH(i), 0);
+                        continue;
+                }
+
+                reg = (hw->fc.high_water[i] << 10) | IXGBE_FCRTH_FCEN;
+                IXGBE_WRITE_REG(hw, IXGBE_FCRTL(i), fcrtl);
+                IXGBE_WRITE_REG(hw, IXGBE_FCRTH(i), reg);
+        }
 
-                IXGBE_WRITE_REG(hw, IXGBE_FCRTL(i), reg);
+        /* Configure pause time */
+        reg = hw->fc.pause_time * 0x00010001;
+        for (i = 0; i < (MAX_TRAFFIC_CLASS / 2); i++)
+                IXGBE_WRITE_REG(hw, IXGBE_FCTTV(i), reg);
 
-                reg = hw->fc.high_water[i] << 10;
-                if (enabled == pfc_enabled_tx ||
-                    enabled == pfc_enabled_full)
-                        reg |= IXGBE_FCRTH_FCEN;
+        /* Configure flow control refresh threshold value */
+        IXGBE_WRITE_REG(hw, IXGBE_FCRTV, hw->fc.pause_time / 2);
 
-                IXGBE_WRITE_REG(hw, IXGBE_FCRTH(i), reg);
-        }
 
         return 0;
 }
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
index 888a419dc3d9..4eac80d01857 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
@@ -211,24 +211,42 @@ s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
  */
 s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, u8 pfc_en, u8 *prio_tc)
 {
-        u32 i, j, reg;
+        u32 i, j, fcrtl, reg;
         u8 max_tc = 0;
 
-        for (i = 0; i < MAX_USER_PRIORITY; i++)
+        /* Enable Transmit Priority Flow Control */
+        IXGBE_WRITE_REG(hw, IXGBE_FCCFG, IXGBE_FCCFG_TFCE_PRIORITY);
+
+        /* Enable Receive Priority Flow Control */
+        reg = IXGBE_READ_REG(hw, IXGBE_MFLCN);
+        reg |= IXGBE_MFLCN_DPF;
+
+        /*
+         * X540 supports per TC Rx priority flow control.  So
+         * clear all TCs and only enable those that should be
+         * enabled.
+         */
+        reg &= ~(IXGBE_MFLCN_RPFCE_MASK | IXGBE_MFLCN_RFCE);
+
+        if (hw->mac.type == ixgbe_mac_X540)
+                reg |= pfc_en << IXGBE_MFLCN_RPFCE_SHIFT;
+
+        if (pfc_en)
+                reg |= IXGBE_MFLCN_RPFCE;
+
+        IXGBE_WRITE_REG(hw, IXGBE_MFLCN, reg);
+
+        for (i = 0; i < MAX_USER_PRIORITY; i++) {
                 if (prio_tc[i] > max_tc)
                         max_tc = prio_tc[i];
+        }
+
+        fcrtl = (hw->fc.low_water << 10) | IXGBE_FCRTL_XONE;
 
         /* Configure PFC Tx thresholds per TC */
-        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+        for (i = 0; i <= max_tc; i++) {
                 int enabled = 0;
 
-                if (i > max_tc) {
-                        reg = 0;
-                        IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), reg);
-                        IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(i), reg);
-                        continue;
-                }
-
                 for (j = 0; j < MAX_USER_PRIORITY; j++) {
                         if ((prio_tc[j] == i) && (pfc_en & (1 << j))) {
                                 enabled = 1;
@@ -236,61 +254,29 @@ s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, u8 pfc_en, u8 *prio_tc)
                         }
                 }
 
-                reg = hw->fc.low_water << 10;
-
-                if (enabled)
-                        reg |= IXGBE_FCRTL_XONE;
-                IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), reg);
+                if (enabled) {
+                        reg = (hw->fc.high_water[i] << 10) | IXGBE_FCRTH_FCEN;
+                        IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), fcrtl);
+                } else {
+                        reg = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i)) - 32;
+                        IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), 0);
+                }
 
-                reg = hw->fc.high_water[i] << 10;
-                if (enabled)
-                        reg |= IXGBE_FCRTH_FCEN;
                 IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(i), reg);
         }
 
-        if (pfc_en) {
-                /* Configure pause time (2 TCs per register) */
-                reg = hw->fc.pause_time | (hw->fc.pause_time << 16);
-                for (i = 0; i < (MAX_TRAFFIC_CLASS / 2); i++)
-                        IXGBE_WRITE_REG(hw, IXGBE_FCTTV(i), reg);
-
-                /* Configure flow control refresh threshold value */
-                IXGBE_WRITE_REG(hw, IXGBE_FCRTV, hw->fc.pause_time / 2);
-
-
-                reg = IXGBE_FCCFG_TFCE_PRIORITY;
-                IXGBE_WRITE_REG(hw, IXGBE_FCCFG, reg);
-                /*
-                 * Enable Receive PFC
-                 * 82599 will always honor XOFF frames we receive when
-                 * we are in PFC mode however X540 only honors enabled
-                 * traffic classes.
-                 */
-                reg = IXGBE_READ_REG(hw, IXGBE_MFLCN);
-                reg &= ~IXGBE_MFLCN_RFCE;
-                reg |= IXGBE_MFLCN_RPFCE | IXGBE_MFLCN_DPF;
-
-                if (hw->mac.type == ixgbe_mac_X540) {
-                        reg &= ~IXGBE_MFLCN_RPFCE_MASK;
-                        reg |= pfc_en << IXGBE_MFLCN_RPFCE_SHIFT;
-                }
+        for (; i < MAX_TRAFFIC_CLASS; i++) {
+                IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), 0);
+                IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(i), 0);
+        }
 
-                IXGBE_WRITE_REG(hw, IXGBE_MFLCN, reg);
-
-        } else {
-                /* X540 devices have a RX bit that should be cleared
-                 * if PFC is disabled on all TCs but PFC features is
-                 * enabled.
-                 */
-                if (hw->mac.type == ixgbe_mac_X540) {
-                        reg = IXGBE_READ_REG(hw, IXGBE_MFLCN);
-                        reg &= ~IXGBE_MFLCN_RPFCE_MASK;
-                        IXGBE_WRITE_REG(hw, IXGBE_MFLCN, reg);
-                }
+        /* Configure pause time (2 TCs per register) */
+        reg = hw->fc.pause_time * 0x00010001;
+        for (i = 0; i < (MAX_TRAFFIC_CLASS / 2); i++)
+                IXGBE_WRITE_REG(hw, IXGBE_FCTTV(i), reg);
 
-                for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
-                        hw->mac.ops.fc_enable(hw, i);
-        }
+        /* Configure flow control refresh threshold value */
+        IXGBE_WRITE_REG(hw, IXGBE_FCRTV, hw->fc.pause_time / 2);
 
         return 0;
 }
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
index 652e4b09546d..5164a21b13ca 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
@@ -44,18 +44,26 @@
 #define DCB_NO_HW_CHG   1  /* DCB configuration did not change */
 #define DCB_HW_CHG      2  /* DCB configuration changed, no reset */
 
-int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *scfg,
-                       struct ixgbe_dcb_config *dcfg, int tc_max)
+static int ixgbe_copy_dcb_cfg(struct ixgbe_adapter *adapter, int tc_max)
 {
+        struct ixgbe_dcb_config *scfg = &adapter->temp_dcb_cfg;
+        struct ixgbe_dcb_config *dcfg = &adapter->dcb_cfg;
         struct tc_configuration *src = NULL;
         struct tc_configuration *dst = NULL;
         int i, j;
         int tx = DCB_TX_CONFIG;
         int rx = DCB_RX_CONFIG;
         int changes = 0;
+#ifdef IXGBE_FCOE
+        struct dcb_app app = {
+                              .selector = DCB_APP_IDTYPE_ETHTYPE,
+                              .protocol = ETH_P_FCOE,
+                             };
+        u8 up = dcb_getapp(adapter->netdev, &app);
 
-        if (!scfg || !dcfg)
-                return changes;
+        if (up && !(up & (1 << adapter->fcoe.up)))
+                changes |= BIT_APP_UPCHG;
+#endif
 
         for (i = DCB_PG_ATTR_TC_0; i < tc_max + DCB_PG_ATTR_TC_0; i++) {
                 src = &scfg->tc_config[i - DCB_PG_ATTR_TC_0];
@@ -330,60 +338,20 @@ static void ixgbe_dcbnl_devreset(struct net_device *dev)
 static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
+        struct ixgbe_dcb_config *dcb_cfg = &adapter->dcb_cfg;
+        struct ixgbe_hw *hw = &adapter->hw;
         int ret = DCB_NO_HW_CHG;
         int i;
-#ifdef IXGBE_FCOE
-        struct dcb_app app = {
-                              .selector = DCB_APP_IDTYPE_ETHTYPE,
-                              .protocol = ETH_P_FCOE,
-                             };
-        u8 up;
-
-        /* In IEEE mode, use the IEEE Ethertype selector value */
-        if (adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE) {
-                app.selector = IEEE_8021QAZ_APP_SEL_ETHERTYPE;
-                up = dcb_ieee_getapp_mask(netdev, &app);
-        } else {
-                up = dcb_getapp(netdev, &app);
-        }
-#endif
 
         /* Fail command if not in CEE mode */
         if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE))
                 return ret;
 
-        adapter->dcb_set_bitmap |= ixgbe_copy_dcb_cfg(&adapter->temp_dcb_cfg,
-                                                      &adapter->dcb_cfg,
+        adapter->dcb_set_bitmap |= ixgbe_copy_dcb_cfg(adapter,
                                                       MAX_TRAFFIC_CLASS);
         if (!adapter->dcb_set_bitmap)
                 return ret;
 
-        if (adapter->dcb_cfg.pfc_mode_enable) {
-                switch (adapter->hw.mac.type) {
-                case ixgbe_mac_82599EB:
-                case ixgbe_mac_X540:
-                        if (adapter->hw.fc.current_mode != ixgbe_fc_pfc)
-                                adapter->last_lfc_mode =
-                                                  adapter->hw.fc.current_mode;
-                        break;
-                default:
-                        break;
-                }
-                adapter->hw.fc.requested_mode = ixgbe_fc_pfc;
-        } else {
-                switch (adapter->hw.mac.type) {
-                case ixgbe_mac_82598EB:
-                        adapter->hw.fc.requested_mode = ixgbe_fc_none;
-                        break;
-                case ixgbe_mac_82599EB:
-                case ixgbe_mac_X540:
-                        adapter->hw.fc.requested_mode = adapter->last_lfc_mode;
-                        break;
-                default:
-                        break;
-                }
-        }
-
         if (adapter->dcb_set_bitmap & (BIT_PG_TX|BIT_PG_RX)) {
                 u16 refill[MAX_TRAFFIC_CLASS], max[MAX_TRAFFIC_CLASS];
                 u8 bwg_id[MAX_TRAFFIC_CLASS], prio_type[MAX_TRAFFIC_CLASS];
@@ -396,23 +364,19 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
                         max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE);
 #endif
 
-                ixgbe_dcb_calculate_tc_credits(&adapter->hw, &adapter->dcb_cfg,
-                                               max_frame, DCB_TX_CONFIG);
-                ixgbe_dcb_calculate_tc_credits(&adapter->hw, &adapter->dcb_cfg,
-                                               max_frame, DCB_RX_CONFIG);
+                ixgbe_dcb_calculate_tc_credits(hw, dcb_cfg, max_frame,
+                                               DCB_TX_CONFIG);
+                ixgbe_dcb_calculate_tc_credits(hw, dcb_cfg, max_frame,
+                                               DCB_RX_CONFIG);
 
-                ixgbe_dcb_unpack_refill(&adapter->dcb_cfg,
-                                        DCB_TX_CONFIG, refill);
-                ixgbe_dcb_unpack_max(&adapter->dcb_cfg, max);
-                ixgbe_dcb_unpack_bwgid(&adapter->dcb_cfg,
-                                       DCB_TX_CONFIG, bwg_id);
-                ixgbe_dcb_unpack_prio(&adapter->dcb_cfg,
-                                      DCB_TX_CONFIG, prio_type);
-                ixgbe_dcb_unpack_map(&adapter->dcb_cfg,
-                                     DCB_TX_CONFIG, prio_tc);
+                ixgbe_dcb_unpack_refill(dcb_cfg, DCB_TX_CONFIG, refill);
+                ixgbe_dcb_unpack_max(dcb_cfg, max);
+                ixgbe_dcb_unpack_bwgid(dcb_cfg, DCB_TX_CONFIG, bwg_id);
+                ixgbe_dcb_unpack_prio(dcb_cfg, DCB_TX_CONFIG, prio_type);
+                ixgbe_dcb_unpack_map(dcb_cfg, DCB_TX_CONFIG, prio_tc);
 
-                ixgbe_dcb_hw_ets_config(&adapter->hw, refill, max,
-                                        bwg_id, prio_type, prio_tc);
+                ixgbe_dcb_hw_ets_config(hw, refill, max, bwg_id,
+                                        prio_type, prio_tc);
 
                 for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++)
                         netdev_set_prio_tc_map(netdev, i, prio_tc[i]);
@@ -421,27 +385,34 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
         }
 
         if (adapter->dcb_set_bitmap & BIT_PFC) {
-                u8 pfc_en;
-                u8 prio_tc[MAX_USER_PRIORITY];
+                if (dcb_cfg->pfc_mode_enable) {
+                        u8 pfc_en;
+                        u8 prio_tc[MAX_USER_PRIORITY];
+
+                        ixgbe_dcb_unpack_map(dcb_cfg, DCB_TX_CONFIG, prio_tc);
+                        ixgbe_dcb_unpack_pfc(dcb_cfg, &pfc_en);
+                        ixgbe_dcb_hw_pfc_config(hw, pfc_en, prio_tc);
+                } else {
+                        hw->mac.ops.fc_enable(hw);
+                }
 
-                ixgbe_dcb_unpack_map(&adapter->dcb_cfg,
-                                     DCB_TX_CONFIG, prio_tc);
-                ixgbe_dcb_unpack_pfc(&adapter->dcb_cfg, &pfc_en);
-                ixgbe_dcb_hw_pfc_config(&adapter->hw, pfc_en, prio_tc);
-                if (ret != DCB_HW_CHG_RST)
-                        ret = DCB_HW_CHG;
-        }
+                ixgbe_set_rx_drop_en(adapter);
 
-        if (adapter->dcb_cfg.pfc_mode_enable)
-                adapter->hw.fc.current_mode = ixgbe_fc_pfc;
+                ret = DCB_HW_CHG;
+        }
 
 #ifdef IXGBE_FCOE
         /* Reprogam FCoE hardware offloads when the traffic class
          * FCoE is using changes. This happens if the APP info
          * changes or the up2tc mapping is updated.
          */
-        if ((up && !(up & (1 << adapter->fcoe.up))) ||
-            (adapter->dcb_set_bitmap & BIT_APP_UPCHG)) {
+        if (adapter->dcb_set_bitmap & BIT_APP_UPCHG) {
+                struct dcb_app app = {
+                                      .selector = DCB_APP_IDTYPE_ETHTYPE,
+                                      .protocol = ETH_P_FCOE,
+                                     };
+                u8 up = dcb_getapp(netdev, &app);
+
                 adapter->fcoe.up = ffs(up) - 1;
                 ixgbe_dcbnl_devreset(netdev);
                 ret = DCB_HW_CHG_RST;
@@ -650,7 +621,9 @@ static int ixgbe_dcbnl_ieee_setpfc(struct net_device *dev,
                                    struct ieee_pfc *pfc)
 {
         struct ixgbe_adapter *adapter = netdev_priv(dev);
+        struct ixgbe_hw *hw = &adapter->hw;
         u8 *prio_tc;
+        int err;
 
         if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))
                 return -EINVAL;
@@ -664,7 +637,16 @@ static int ixgbe_dcbnl_ieee_setpfc(struct net_device *dev,
 
         prio_tc = adapter->ixgbe_ieee_ets->prio_tc;
         memcpy(adapter->ixgbe_ieee_pfc, pfc, sizeof(*adapter->ixgbe_ieee_pfc));
-        return ixgbe_dcb_hw_pfc_config(&adapter->hw, pfc->pfc_en, prio_tc);
+
+        /* Enable link flow control parameters if PFC is disabled */
+        if (pfc->pfc_en)
+                err = ixgbe_dcb_hw_pfc_config(hw, pfc->pfc_en, prio_tc);
+        else
+                err = hw->mac.ops.fc_enable(hw);
+
+        ixgbe_set_rx_drop_en(adapter);
+
+        return err;
 }
 
 static int ixgbe_dcbnl_ieee_setapp(struct net_device *dev,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index 31a2bf76a346..3178f1ec3711 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -391,11 +391,6 @@ static void ixgbe_get_pauseparam(struct net_device *netdev,
         } else if (hw->fc.current_mode == ixgbe_fc_full) {
                 pause->rx_pause = 1;
                 pause->tx_pause = 1;
-#ifdef CONFIG_DCB
-        } else if (hw->fc.current_mode == ixgbe_fc_pfc) {
-                pause->rx_pause = 0;
-                pause->tx_pause = 0;
-#endif
         }
 }
 
@@ -404,21 +399,14 @@ static int ixgbe_set_pauseparam(struct net_device *netdev,
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_hw *hw = &adapter->hw;
-        struct ixgbe_fc_info fc;
+        struct ixgbe_fc_info fc = hw->fc;
 
-#ifdef CONFIG_DCB
-        if (adapter->dcb_cfg.pfc_mode_enable ||
-                ((hw->mac.type == ixgbe_mac_82598EB) &&
-                (adapter->flags & IXGBE_FLAG_DCB_ENABLED)))
+        /* 82598 does no support link flow control with DCB enabled */
+        if ((hw->mac.type == ixgbe_mac_82598EB) &&
+            (adapter->flags & IXGBE_FLAG_DCB_ENABLED))
                 return -EINVAL;
 
-#endif
-        fc = hw->fc;
-
-        if (pause->autoneg != AUTONEG_ENABLE)
-                fc.disable_fc_autoneg = true;
-        else
-                fc.disable_fc_autoneg = false;
+        fc.disable_fc_autoneg = (pause->autoneg != AUTONEG_ENABLE);
 
         if ((pause->rx_pause && pause->tx_pause) || pause->autoneg)
                 fc.requested_mode = ixgbe_fc_full;
@@ -426,14 +414,8 @@ static int ixgbe_set_pauseparam(struct net_device *netdev,
                 fc.requested_mode = ixgbe_fc_rx_pause;
         else if (!pause->rx_pause && pause->tx_pause)
                 fc.requested_mode = ixgbe_fc_tx_pause;
-        else if (!pause->rx_pause && !pause->tx_pause)
-                fc.requested_mode = ixgbe_fc_none;
         else
-                return -EINVAL;
-
-#ifdef CONFIG_DCB
-        adapter->last_lfc_mode = fc.requested_mode;
-#endif
+                fc.requested_mode = ixgbe_fc_none;
 
         /* if the thing changed then we'll update and use new autoneg */
         if (memcmp(&fc, &hw->fc, sizeof(struct ixgbe_fc_info))) {
@@ -1780,6 +1762,8 @@ static u16 ixgbe_clean_test_rings(struct ixgbe_ring *rx_ring,
                 rx_desc = IXGBE_RX_DESC(rx_ring, rx_ntc);
         }
 
+        netdev_tx_reset_queue(txring_txq(tx_ring));
+
         /* re-map buffers to ring, store next to clean values */
         ixgbe_alloc_rx_buffers(rx_ring, count);
         rx_ring->next_to_clean = rx_ntc;
@@ -1969,53 +1953,12 @@ static int ixgbe_wol_exclusion(struct ixgbe_adapter *adapter,
                                struct ethtool_wolinfo *wol)
 {
         struct ixgbe_hw *hw = &adapter->hw;
-        int retval = 1;
-        u16 wol_cap = adapter->eeprom_cap & IXGBE_DEVICE_CAPS_WOL_MASK;
-
-        /* WOL not supported except for the following */
-        switch(hw->device_id) {
-        case IXGBE_DEV_ID_82599_SFP:
-                /* Only these subdevices could supports WOL */
-                switch (hw->subsystem_device_id) {
-                case IXGBE_SUBDEV_ID_82599_560FLR:
-                        /* only support first port */
-                        if (hw->bus.func != 0) {
-                                wol->supported = 0;
-                                break;
-                        }
-                case IXGBE_SUBDEV_ID_82599_SFP:
-                        retval = 0;
-                        break;
-                default:
-                        wol->supported = 0;
-                        break;
-                }
-                break;
-        case IXGBE_DEV_ID_82599_COMBO_BACKPLANE:
-                /* All except this subdevice support WOL */
-                if (hw->subsystem_device_id ==
-                    IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ) {
-                        wol->supported = 0;
-                        break;
-                }
-                retval = 0;
-                break;
-        case IXGBE_DEV_ID_82599_KX4:
-                retval = 0;
-                break;
-        case IXGBE_DEV_ID_X540T:
-                /* check eeprom to see if enabled wol */
-                if ((wol_cap == IXGBE_DEVICE_CAPS_WOL_PORT0_1) ||
-                    ((wol_cap == IXGBE_DEVICE_CAPS_WOL_PORT0) &&
-                     (hw->bus.func == 0))) {
-                        retval = 0;
-                        break;
-                }
+        int retval = 0;
 
-                /* All others not supported */
-                wol->supported = 0;
-                break;
-        default:
+        /* WOL not supported for all devices */
+        if (!ixgbe_wol_supported(adapter, hw->device_id,
+                                 hw->subsystem_device_id)) {
+                retval = 1;
                 wol->supported = 0;
         }
 
@@ -2753,6 +2696,46 @@ static int ixgbe_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)
         return ret;
 }
 
+static int ixgbe_get_ts_info(struct net_device *dev,
+                             struct ethtool_ts_info *info)
+{
+        struct ixgbe_adapter *adapter = netdev_priv(dev);
+
+        switch (adapter->hw.mac.type) {
+#ifdef CONFIG_IXGBE_PTP
+        case ixgbe_mac_X540:
+        case ixgbe_mac_82599EB:
+                info->so_timestamping =
+                        SOF_TIMESTAMPING_TX_HARDWARE |
+                        SOF_TIMESTAMPING_RX_HARDWARE |
+                        SOF_TIMESTAMPING_RAW_HARDWARE;
+
+                if (adapter->ptp_clock)
+                        info->phc_index = ptp_clock_index(adapter->ptp_clock);
+                else
+                        info->phc_index = -1;
+
+                info->tx_types =
+                        (1 << HWTSTAMP_TX_OFF) |
+                        (1 << HWTSTAMP_TX_ON);
+
+                info->rx_filters =
+                        (1 << HWTSTAMP_FILTER_NONE) |
+                        (1 << HWTSTAMP_FILTER_PTP_V1_L4_SYNC) |
+                        (1 << HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ) |
+                        (1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |
+                        (1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ) |
+                        (1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |
+                        (1 << HWTSTAMP_FILTER_SOME);
+                break;
+#endif /* CONFIG_IXGBE_PTP */
+        default:
+                return ethtool_op_get_ts_info(dev, info);
+                break;
+        }
+        return 0;
+}
+
 static const struct ethtool_ops ixgbe_ethtool_ops = {
         .get_settings           = ixgbe_get_settings,
         .set_settings           = ixgbe_set_settings,
@@ -2781,6 +2764,7 @@ static const struct ethtool_ops ixgbe_ethtool_ops = {
         .set_coalesce           = ixgbe_set_coalesce,
         .get_rxnfc              = ixgbe_get_rxnfc,
         .set_rxnfc              = ixgbe_set_rxnfc,
+        .get_ts_info            = ixgbe_get_ts_info,
 };
 
 void ixgbe_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
index 77ea4b716535..bc07933d67da 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
@@ -437,6 +437,7 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
          */
         if ((fh->fh_r_ctl == FC_RCTL_DD_SOL_DATA) &&
             (fctl & FC_FC_END_SEQ)) {
+                skb_linearize(skb);
                 crc = (struct fcoe_crc_eof *)skb_put(skb, sizeof(*crc));
                 crc->fcoe_eof = FC_EOF_T;
         }
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
index 027d7a75be39..af1a5314b494 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
@@ -523,11 +523,17 @@ static void ixgbe_add_ring(struct ixgbe_ring *ring,
 /**
  * ixgbe_alloc_q_vector - Allocate memory for a single interrupt vector
  * @adapter: board private structure to initialize
+ * @v_count: q_vectors allocated on adapter, used for ring interleaving
  * @v_idx: index of vector in adapter struct
+ * @txr_count: total number of Tx rings to allocate
+ * @txr_idx: index of first Tx ring to allocate
+ * @rxr_count: total number of Rx rings to allocate
+ * @rxr_idx: index of first Rx ring to allocate
  *
  * We allocate one q_vector.  If allocation fails we return -ENOMEM.
  **/
-static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter, int v_idx,
+static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter,
+                                int v_count, int v_idx,
                                 int txr_count, int txr_idx,
                                 int rxr_count, int rxr_idx)
 {
@@ -598,7 +604,7 @@ static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter, int v_idx,
 
                 /* update count and index */
                 txr_count--;
-                txr_idx++;
+                txr_idx += v_count;
 
                 /* push pointer to next ring */
                 ring++;
@@ -622,6 +628,16 @@ static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter, int v_idx,
                 if (adapter->hw.mac.type == ixgbe_mac_82599EB)
                         set_bit(__IXGBE_RX_CSUM_UDP_ZERO_ERR, &ring->state);
 
+#ifdef IXGBE_FCOE
+                if (adapter->netdev->features & NETIF_F_FCOE_MTU) {
+                        struct ixgbe_ring_feature *f;
+                        f = &adapter->ring_feature[RING_F_FCOE];
+                        if ((rxr_idx >= f->mask) &&
+                            (rxr_idx < f->mask + f->indices))
+                                set_bit(__IXGBE_RX_FCOE_BUFSZ, &ring->state);
+                }
+
+#endif /* IXGBE_FCOE */
                 /* apply Rx specific ring traits */
                 ring->count = adapter->rx_ring_count;
                 ring->queue_index = rxr_idx;
@@ -631,7 +647,7 @@ static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter, int v_idx,
 
                 /* update count and index */
                 rxr_count--;
-                rxr_idx++;
+                rxr_idx += v_count;
 
                 /* push pointer to next ring */
                 ring++;
@@ -690,24 +706,23 @@ static int ixgbe_alloc_q_vectors(struct ixgbe_adapter *adapter)
                 q_vectors = 1;
 
         if (q_vectors >= (rxr_remaining + txr_remaining)) {
-                for (; rxr_remaining; v_idx++, q_vectors--) {
-                        int rqpv = DIV_ROUND_UP(rxr_remaining, q_vectors);
-                        err = ixgbe_alloc_q_vector(adapter, v_idx,
-                                                   0, 0, rqpv, rxr_idx);
+                for (; rxr_remaining; v_idx++) {
+                        err = ixgbe_alloc_q_vector(adapter, q_vectors, v_idx,
+                                                   0, 0, 1, rxr_idx);
 
                         if (err)
                                 goto err_out;
 
                         /* update counts and index */
-                        rxr_remaining -= rqpv;
-                        rxr_idx += rqpv;
+                        rxr_remaining--;
+                        rxr_idx++;
                 }
         }
 
-        for (; q_vectors; v_idx++, q_vectors--) {
-                int rqpv = DIV_ROUND_UP(rxr_remaining, q_vectors);
-                int tqpv = DIV_ROUND_UP(txr_remaining, q_vectors);
-                err = ixgbe_alloc_q_vector(adapter, v_idx,
+        for (; v_idx < q_vectors; v_idx++) {
+                int rqpv = DIV_ROUND_UP(rxr_remaining, q_vectors - v_idx);
+                int tqpv = DIV_ROUND_UP(txr_remaining, q_vectors - v_idx);
+                err = ixgbe_alloc_q_vector(adapter, q_vectors, v_idx,
                                            tqpv, txr_idx,
                                            rqpv, rxr_idx);
 
@@ -716,9 +731,9 @@ static int ixgbe_alloc_q_vectors(struct ixgbe_adapter *adapter)
 
                 /* update counts and index */
                 rxr_remaining -= rqpv;
-                rxr_idx += rqpv;
                 txr_remaining -= tqpv;
-                txr_idx += tqpv;
+                rxr_idx++;
+                txr_idx++;
         }
 
         return 0;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 3e26b1f9ac75..bf20457ea23a 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -63,8 +63,8 @@ static char ixgbe_default_device_descr[] =
                               "Intel(R) 10 Gigabit Network Connection";
 #endif
 #define MAJ 3
-#define MIN 8
-#define BUILD 21
+#define MIN 9
+#define BUILD 15
 #define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \
         __stringify(BUILD) "-k"
 const char ixgbe_driver_version[] = DRV_VERSION;
@@ -133,7 +133,7 @@ static struct notifier_block dca_notifier = {
 static unsigned int max_vfs;
 module_param(max_vfs, uint, 0);
 MODULE_PARM_DESC(max_vfs,
-                 "Maximum number of virtual functions to allocate per physical function");
+                 "Maximum number of virtual functions to allocate per physical function - default is zero and maximum value is 63");
 #endif /* CONFIG_PCI_IOV */
 
 static unsigned int allow_unsupported_sfp;
@@ -610,35 +610,50 @@ void ixgbe_unmap_and_free_tx_resource(struct ixgbe_ring *ring,
         /* tx_buffer must be completely set up in the transmit path */
 }
 
-static void ixgbe_update_xoff_received(struct ixgbe_adapter *adapter)
+static void ixgbe_update_xoff_rx_lfc(struct ixgbe_adapter *adapter)
 {
         struct ixgbe_hw *hw = &adapter->hw;
         struct ixgbe_hw_stats *hwstats = &adapter->stats;
-        u32 data = 0;
-        u32 xoff[8] = {0};
         int i;
+        u32 data;
 
-        if ((hw->fc.current_mode == ixgbe_fc_full) ||
-            (hw->fc.current_mode == ixgbe_fc_rx_pause)) {
-                switch (hw->mac.type) {
-                case ixgbe_mac_82598EB:
-                        data = IXGBE_READ_REG(hw, IXGBE_LXOFFRXC);
-                        break;
-                default:
-                        data = IXGBE_READ_REG(hw, IXGBE_LXOFFRXCNT);
-                }
-                hwstats->lxoffrxc += data;
+        if ((hw->fc.current_mode != ixgbe_fc_full) &&
+            (hw->fc.current_mode != ixgbe_fc_rx_pause))
+                return;
 
-                /* refill credits (no tx hang) if we received xoff */
-                if (!data)
-                        return;
+        switch (hw->mac.type) {
+        case ixgbe_mac_82598EB:
+                data = IXGBE_READ_REG(hw, IXGBE_LXOFFRXC);
+                break;
+        default:
+                data = IXGBE_READ_REG(hw, IXGBE_LXOFFRXCNT);
+        }
+        hwstats->lxoffrxc += data;
 
-                for (i = 0; i < adapter->num_tx_queues; i++)
-                        clear_bit(__IXGBE_HANG_CHECK_ARMED,
-                                  &adapter->tx_ring[i]->state);
+        /* refill credits (no tx hang) if we received xoff */
+        if (!data)
                 return;
-        } else if (!(adapter->dcb_cfg.pfc_mode_enable))
+
+        for (i = 0; i < adapter->num_tx_queues; i++)
+                clear_bit(__IXGBE_HANG_CHECK_ARMED,
+                          &adapter->tx_ring[i]->state);
+}
+
+static void ixgbe_update_xoff_received(struct ixgbe_adapter *adapter)
+{
+        struct ixgbe_hw *hw = &adapter->hw;
+        struct ixgbe_hw_stats *hwstats = &adapter->stats;
+        u32 xoff[8] = {0};
+        int i;
+        bool pfc_en = adapter->dcb_cfg.pfc_mode_enable;
+
+        if (adapter->ixgbe_ieee_pfc)
+                pfc_en |= !!(adapter->ixgbe_ieee_pfc->pfc_en);
+
+        if (!(adapter->flags & IXGBE_FLAG_DCB_ENABLED) || !pfc_en) {
+                ixgbe_update_xoff_rx_lfc(adapter);
                 return;
+        }
 
         /* update stats for each tc, only valid with PFC enabled */
         for (i = 0; i < MAX_TX_PACKET_BUFFERS; i++) {
@@ -774,6 +789,13 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
                 total_bytes += tx_buffer->bytecount;
                 total_packets += tx_buffer->gso_segs;
 
+#ifdef CONFIG_IXGBE_PTP
+                if (unlikely(tx_buffer->tx_flags &
+                             IXGBE_TX_FLAGS_TSTAMP))
+                        ixgbe_ptp_tx_hwtstamp(q_vector,
+                                              tx_buffer->skb);
+
+#endif
                 /* free the skb */
                 dev_kfree_skb_any(tx_buffer->skb);
 
@@ -1144,7 +1166,7 @@ static bool ixgbe_alloc_mapped_page(struct ixgbe_ring *rx_ring,
          * there isn't much point in holding memory we can't use
          */
         if (dma_mapping_error(rx_ring->dev, dma)) {
-                put_page(page);
+                __free_pages(page, ixgbe_rx_pg_order(rx_ring));
                 bi->page = NULL;
 
                 rx_ring->rx_stats.alloc_rx_page_failed++;
@@ -1374,6 +1396,11 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring,
 
         ixgbe_rx_checksum(rx_ring, rx_desc, skb);
 
+#ifdef CONFIG_IXGBE_PTP
+        if (ixgbe_test_staterr(rx_desc, IXGBE_RXDADV_STAT_TS))
+                ixgbe_ptp_rx_hwtstamp(rx_ring->q_vector, skb);
+#endif
+
         if (ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_VP)) {
                 u16 vid = le16_to_cpu(rx_desc->wb.upper.vlan);
                 __vlan_hwaccel_put_tag(skb, vid);
@@ -2295,6 +2322,9 @@ static irqreturn_t ixgbe_msix_other(int irq, void *data)
         }
 
         ixgbe_check_fan_failure(adapter, eicr);
+#ifdef CONFIG_IXGBE_PTP
+        ixgbe_ptp_check_pps_event(adapter, eicr);
+#endif
 
         /* re-enable the original interrupt state, no lsc, no queues */
         if (!test_bit(__IXGBE_DOWN, &adapter->state))
@@ -2487,6 +2517,9 @@ static irqreturn_t ixgbe_intr(int irq, void *data)
         }
 
         ixgbe_check_fan_failure(adapter, eicr);
+#ifdef CONFIG_IXGBE_PTP
+        ixgbe_ptp_check_pps_event(adapter, eicr);
+#endif
 
         /* would disable interrupts here but EIAM disabled it */
         napi_schedule(&q_vector->napi);
@@ -2671,8 +2704,6 @@ void ixgbe_configure_tx_ring(struct ixgbe_adapter *adapter,
         /* enable queue */
         IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(reg_idx), txdctl);
 
-        netdev_tx_reset_queue(txring_txq(ring));
-
         /* TXDCTL.EN will return 0 on 82598 if link is down, so skip it */
         if (hw->mac.type == ixgbe_mac_82598EB &&
             !(IXGBE_READ_REG(hw, IXGBE_LINKS) & IXGBE_LINKS_UP))
@@ -2758,6 +2789,61 @@ static void ixgbe_configure_tx(struct ixgbe_adapter *adapter)
                 ixgbe_configure_tx_ring(adapter, adapter->tx_ring[i]);
 }
 
+static void ixgbe_enable_rx_drop(struct ixgbe_adapter *adapter,
+                                 struct ixgbe_ring *ring)
+{
+        struct ixgbe_hw *hw = &adapter->hw;
+        u8 reg_idx = ring->reg_idx;
+        u32 srrctl = IXGBE_READ_REG(hw, IXGBE_SRRCTL(reg_idx));
+
+        srrctl |= IXGBE_SRRCTL_DROP_EN;
+
+        IXGBE_WRITE_REG(hw, IXGBE_SRRCTL(reg_idx), srrctl);
+}
+
+static void ixgbe_disable_rx_drop(struct ixgbe_adapter *adapter,
+                                  struct ixgbe_ring *ring)
+{
+        struct ixgbe_hw *hw = &adapter->hw;
+        u8 reg_idx = ring->reg_idx;
+        u32 srrctl = IXGBE_READ_REG(hw, IXGBE_SRRCTL(reg_idx));
+
+        srrctl &= ~IXGBE_SRRCTL_DROP_EN;
+
+        IXGBE_WRITE_REG(hw, IXGBE_SRRCTL(reg_idx), srrctl);
+}
+
+#ifdef CONFIG_IXGBE_DCB
+void ixgbe_set_rx_drop_en(struct ixgbe_adapter *adapter)
+#else
+static void ixgbe_set_rx_drop_en(struct ixgbe_adapter *adapter)
+#endif
+{
+        int i;
+        bool pfc_en = adapter->dcb_cfg.pfc_mode_enable;
+
+        if (adapter->ixgbe_ieee_pfc)
+                pfc_en |= !!(adapter->ixgbe_ieee_pfc->pfc_en);
+
+        /*
+         * We should set the drop enable bit if:
+         *  SR-IOV is enabled
+         *   or
+         *  Number of Rx queues > 1 and flow control is disabled
+         *
+         *  This allows us to avoid head of line blocking for security
+         *  and performance reasons.
+         */
+        if (adapter->num_vfs || (adapter->num_rx_queues > 1 &&
+            !(adapter->hw.fc.current_mode & ixgbe_fc_tx_pause) && !pfc_en)) {
+                for (i = 0; i < adapter->num_rx_queues; i++)
+                        ixgbe_enable_rx_drop(adapter, adapter->rx_ring[i]);
+        } else {
+                for (i = 0; i < adapter->num_rx_queues; i++)
+                        ixgbe_disable_rx_drop(adapter, adapter->rx_ring[i]);
+        }
+}
+
 #define IXGBE_SRRCTL_BSIZEHDRSIZE_SHIFT 2
 
 static void ixgbe_configure_srrctl(struct ixgbe_adapter *adapter,
@@ -2904,33 +2990,6 @@ static void ixgbe_configure_rscctl(struct ixgbe_adapter *adapter,
         IXGBE_WRITE_REG(hw, IXGBE_RSCCTL(reg_idx), rscctrl);
 }
 
-/**
- *  ixgbe_set_uta - Set unicast filter table address
- *  @adapter: board private structure
- *
- *  The unicast table address is a register array of 32-bit registers.
- *  The table is meant to be used in a way similar to how the MTA is used
- *  however due to certain limitations in the hardware it is necessary to
- *  set all the hash bits to 1 and use the VMOLR ROPE bit as a promiscuous
- *  enable bit to allow vlan tag stripping when promiscuous mode is enabled
- **/
-static void ixgbe_set_uta(struct ixgbe_adapter *adapter)
-{
-        struct ixgbe_hw *hw = &adapter->hw;
-        int i;
-
-        /* The UTA table only exists on 82599 hardware and newer */
-        if (hw->mac.type < ixgbe_mac_82599EB)
-                return;
-
-        /* we only need to do this if VMDq is enabled */
-        if (!(adapter->flags & IXGBE_FLAG_SRIOV_ENABLED))
-                return;
-
-        for (i = 0; i < 128; i++)
-                IXGBE_WRITE_REG(hw, IXGBE_UTA(i), ~0);
-}
-
 #define IXGBE_MAX_RX_DESC_POLL 10
 static void ixgbe_rx_desc_queue_enable(struct ixgbe_adapter *adapter,
                                        struct ixgbe_ring *ring)
@@ -3154,14 +3213,6 @@ static void ixgbe_set_rx_buffer_len(struct ixgbe_adapter *adapter)
                         set_ring_rsc_enabled(rx_ring);
                 else
                         clear_ring_rsc_enabled(rx_ring);
-#ifdef IXGBE_FCOE
-                if (netdev->features & NETIF_F_FCOE_MTU) {
-                        struct ixgbe_ring_feature *f;
-                        f = &adapter->ring_feature[RING_F_FCOE];
-                        if ((i >= f->mask) && (i < f->mask + f->indices))
-                                set_bit(__IXGBE_RX_FCOE_BUFSZ, &rx_ring->state);
-                }
-#endif /* IXGBE_FCOE */
         }
 }
 
@@ -3224,8 +3275,6 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
         /* Program registers for the distribution of queues */
         ixgbe_setup_mrqc(adapter);
 
-        ixgbe_set_uta(adapter);
-
         /* set_rx_buffer_len must be called before ring initialization */
         ixgbe_set_rx_buffer_len(adapter);
 
@@ -3462,16 +3511,17 @@ void ixgbe_set_rx_mode(struct net_device *netdev)
                 }
                 ixgbe_vlan_filter_enable(adapter);
                 hw->addr_ctrl.user_set_promisc = false;
-                /*
-                 * Write addresses to available RAR registers, if there is not
-                 * sufficient space to store all the addresses then enable
-                 * unicast promiscuous mode
-                 */
-                count = ixgbe_write_uc_addr_list(netdev);
-                if (count < 0) {
-                        fctrl |= IXGBE_FCTRL_UPE;
-                        vmolr |= IXGBE_VMOLR_ROPE;
-                }
+        }
+
+        /*
+         * Write addresses to available RAR registers, if there is not
+         * sufficient space to store all the addresses then enable
+         * unicast promiscuous mode
+         */
+        count = ixgbe_write_uc_addr_list(netdev);
+        if (count < 0) {
+                fctrl |= IXGBE_FCTRL_UPE;
+                vmolr |= IXGBE_VMOLR_ROPE;
         }
 
         if (adapter->num_vfs) {
@@ -4138,7 +4188,8 @@ static void ixgbe_clean_rx_ring(struct ixgbe_ring *rx_ring)
                                        DMA_FROM_DEVICE);
                 rx_buffer->dma = 0;
                 if (rx_buffer->page)
-                        put_page(rx_buffer->page);
+                        __free_pages(rx_buffer->page,
+                                     ixgbe_rx_pg_order(rx_ring));
                 rx_buffer->page = NULL;
         }
 
@@ -4175,6 +4226,8 @@ static void ixgbe_clean_tx_ring(struct ixgbe_ring *tx_ring)
                 ixgbe_unmap_and_free_tx_resource(tx_ring, tx_buffer_info);
         }
 
+        netdev_tx_reset_queue(txring_txq(tx_ring));
+
         size = sizeof(struct ixgbe_tx_buffer) * tx_ring->count;
         memset(tx_ring->tx_buffer_info, 0, size);
 
@@ -4426,17 +4479,14 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
         adapter->dcb_cfg.pfc_mode_enable = false;
         adapter->dcb_set_bitmap = 0x00;
         adapter->dcbx_cap = DCB_CAP_DCBX_HOST | DCB_CAP_DCBX_VER_CEE;
-        ixgbe_copy_dcb_cfg(&adapter->dcb_cfg, &adapter->temp_dcb_cfg,
-                           MAX_TRAFFIC_CLASS);
+        memcpy(&adapter->temp_dcb_cfg, &adapter->dcb_cfg,
+               sizeof(adapter->temp_dcb_cfg));
 
 #endif
 
         /* default flow control settings */
         hw->fc.requested_mode = ixgbe_fc_full;
         hw->fc.current_mode = ixgbe_fc_full;    /* init for ethtool output */
-#ifdef CONFIG_DCB
-        adapter->last_lfc_mode = hw->fc.current_mode;
-#endif
         ixgbe_pbthresh_setup(adapter);
         hw->fc.pause_time = IXGBE_DEFAULT_FCPAUSE;
         hw->fc.send_xon = true;
@@ -4836,7 +4886,9 @@ static int ixgbe_resume(struct pci_dev *pdev)
 
         pci_wake_from_d3(pdev, false);
 
+        rtnl_lock();
         err = ixgbe_init_interrupt_scheme(adapter);
+        rtnl_unlock();
         if (err) {
                 e_dev_err("Cannot initialize interrupts for device\n");
                 return err;
@@ -4872,17 +4924,15 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)
         netif_device_detach(netdev);
 
         if (netif_running(netdev)) {
+                rtnl_lock();
                 ixgbe_down(adapter);
                 ixgbe_free_irq(adapter);
                 ixgbe_free_all_tx_resources(adapter);
                 ixgbe_free_all_rx_resources(adapter);
+                rtnl_unlock();
         }
 
         ixgbe_clear_interrupt_scheme(adapter);
-#ifdef CONFIG_DCB
-        kfree(adapter->ixgbe_ieee_pfc);
-        kfree(adapter->ixgbe_ieee_ets);
-#endif
 
 #ifdef CONFIG_PM
         retval = pci_save_state(pdev);
@@ -4893,6 +4943,16 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)
         if (wufc) {
                 ixgbe_set_rx_mode(netdev);
 
+                /*
+                 * enable the optics for both mult-speed fiber and
+                 * 82599 SFP+ fiber as we can WoL.
+                 */
+                if (hw->mac.ops.enable_tx_laser &&
+                    (hw->phy.multispeed_fiber ||
+                    (hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber &&
+                     hw->mac.type == ixgbe_mac_82599EB)))
+                        hw->mac.ops.enable_tx_laser(hw);
+
                 /* turn on all-multi mode if wake on multicast is enabled */
                 if (wufc & IXGBE_WUFC_MC) {
                         fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL);
@@ -4991,9 +5051,6 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
         if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {
                 u64 rsc_count = 0;
                 u64 rsc_flush = 0;
-                for (i = 0; i < 16; i++)
-                        adapter->hw_rx_no_dma_resources +=
-                                IXGBE_READ_REG(hw, IXGBE_QPRDC(i));
                 for (i = 0; i < adapter->num_rx_queues; i++) {
                         rsc_count += adapter->rx_ring[i]->rx_stats.rsc_count;
                         rsc_flush += adapter->rx_ring[i]->rx_stats.rsc_flush;
@@ -5096,6 +5153,9 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
                 hwstats->b2ospc += IXGBE_READ_REG(hw, IXGBE_B2OSPC);
                 hwstats->b2ogprc += IXGBE_READ_REG(hw, IXGBE_B2OGPRC);
         case ixgbe_mac_82599EB:
+                for (i = 0; i < 16; i++)
+                        adapter->hw_rx_no_dma_resources +=
+                                             IXGBE_READ_REG(hw, IXGBE_QPRDC(i));
                 hwstats->gorc += IXGBE_READ_REG(hw, IXGBE_GORCL);
                 IXGBE_READ_REG(hw, IXGBE_GORCH); /* to clear */
                 hwstats->gotc += IXGBE_READ_REG(hw, IXGBE_GOTCL);
@@ -5273,7 +5333,7 @@ static void ixgbe_watchdog_update_link(struct ixgbe_adapter *adapter)
         struct ixgbe_hw *hw = &adapter->hw;
         u32 link_speed = adapter->link_speed;
         bool link_up = adapter->link_up;
-        int i;
+        bool pfc_en = adapter->dcb_cfg.pfc_mode_enable;
 
         if (!(adapter->flags & IXGBE_FLAG_NEED_LINK_UPDATE))
                 return;
@@ -5285,13 +5345,13 @@ static void ixgbe_watchdog_update_link(struct ixgbe_adapter *adapter)
                 link_speed = IXGBE_LINK_SPEED_10GB_FULL;
                 link_up = true;
         }
-        if (link_up) {
-                if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-                        for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
-                                hw->mac.ops.fc_enable(hw, i);
-                } else {
-                        hw->mac.ops.fc_enable(hw, 0);
-                }
+
+        if (adapter->ixgbe_ieee_pfc)
+                pfc_en |= !!(adapter->ixgbe_ieee_pfc->pfc_en);
+
+        if (link_up && !((adapter->flags & IXGBE_FLAG_DCB_ENABLED) && pfc_en)) {
+                hw->mac.ops.fc_enable(hw);
+                ixgbe_set_rx_drop_en(adapter);
         }
 
         if (link_up ||
@@ -5345,6 +5405,11 @@ static void ixgbe_watchdog_link_is_up(struct ixgbe_adapter *adapter)
                 flow_rx = false;
                 break;
         }
+
+#ifdef CONFIG_IXGBE_PTP
+        ixgbe_ptp_start_cyclecounter(adapter);
+#endif
+
         e_info(drv, "NIC Link is Up %s, Flow Control: %s\n",
                (link_speed == IXGBE_LINK_SPEED_10GB_FULL ?
                "10 Gbps" :
@@ -5382,6 +5447,10 @@ static void ixgbe_watchdog_link_is_down(struct ixgbe_adapter *adapter)
         if (ixgbe_is_sfp(hw) && hw->mac.type == ixgbe_mac_82598EB)
                 adapter->flags2 |= IXGBE_FLAG2_SEARCH_FOR_SFP;
 
+#ifdef CONFIG_IXGBE_PTP
+        ixgbe_ptp_start_cyclecounter(adapter);
+#endif
+
         e_info(drv, "NIC Link is Down\n");
         netif_carrier_off(netdev);
 }
@@ -5681,6 +5750,9 @@ static void ixgbe_service_task(struct work_struct *work)
         ixgbe_watchdog_subtask(adapter);
         ixgbe_fdir_reinit_subtask(adapter);
         ixgbe_check_hang_subtask(adapter);
+#ifdef CONFIG_IXGBE_PTP
+        ixgbe_ptp_overflow_check(adapter);
+#endif
 
         ixgbe_service_event_complete(adapter);
 }
@@ -5831,6 +5903,11 @@ static __le32 ixgbe_tx_cmd_type(u32 tx_flags)
         if (tx_flags & IXGBE_TX_FLAGS_HW_VLAN)
                 cmd_type |= cpu_to_le32(IXGBE_ADVTXD_DCMD_VLE);
 
+#ifdef CONFIG_IXGBE_PTP
+        if (tx_flags & IXGBE_TX_FLAGS_TSTAMP)
+                cmd_type |= cpu_to_le32(IXGBE_ADVTXD_MAC_TSTAMP);
+#endif
+
         /* set segmentation enable bits for TSO/FSO */
 #ifdef IXGBE_FCOE
         if (tx_flags & (IXGBE_TX_FLAGS_TSO | IXGBE_TX_FLAGS_FSO))
@@ -6221,6 +6298,15 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,
                 tx_flags |= IXGBE_TX_FLAGS_SW_VLAN;
         }
 
+        skb_tx_timestamp(skb);
+
+#ifdef CONFIG_IXGBE_PTP
+        if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
+                skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
+                tx_flags |= IXGBE_TX_FLAGS_TSTAMP;
+        }
+#endif
+
 #ifdef CONFIG_PCI_IOV
         /*
          * Use the l2switch_enable flag - would be false if the DMA
@@ -6373,7 +6459,14 @@ static int ixgbe_ioctl(struct net_device *netdev, struct ifreq *req, int cmd)
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
-        return mdio_mii_ioctl(&adapter->hw.phy.mdio, if_mii(req), cmd);
+        switch (cmd) {
+#ifdef CONFIG_IXGBE_PTP
+        case SIOCSHWTSTAMP:
+                return ixgbe_ptp_hwtstamp_ioctl(adapter, req, cmd);
+#endif
+        default:
+                return mdio_mii_ioctl(&adapter->hw.phy.mdio, if_mii(req), cmd);
+        }
 }
 
 /**
@@ -6565,15 +6658,17 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc)
 
         if (tc) {
                 netdev_set_num_tc(dev, tc);
-                adapter->last_lfc_mode = adapter->hw.fc.current_mode;
                 adapter->flags |= IXGBE_FLAG_DCB_ENABLED;
                 adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;
 
-                if (adapter->hw.mac.type == ixgbe_mac_82598EB)
+                if (adapter->hw.mac.type == ixgbe_mac_82598EB) {
+                        adapter->last_lfc_mode = adapter->hw.fc.requested_mode;
                         adapter->hw.fc.requested_mode = ixgbe_fc_none;
+                }
         } else {
                 netdev_reset_tc(dev);
-                adapter->hw.fc.requested_mode = adapter->last_lfc_mode;
+                if (adapter->hw.mac.type == ixgbe_mac_82598EB)
+                        adapter->hw.fc.requested_mode = adapter->last_lfc_mode;
 
                 adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED;
                 adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;
@@ -6622,7 +6717,7 @@ static netdev_features_t ixgbe_fix_features(struct net_device *netdev,
         /* Turn off LRO if not RSC capable */
         if (!(adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE))
                 features &= ~NETIF_F_LRO;
-        
+
 
         return features;
 }
@@ -6681,6 +6776,74 @@ static int ixgbe_set_features(struct net_device *netdev,
         return 0;
 }
 
+static int ixgbe_ndo_fdb_add(struct ndmsg *ndm,
+                             struct net_device *dev,
+                             unsigned char *addr,
+                             u16 flags)
+{
+        struct ixgbe_adapter *adapter = netdev_priv(dev);
+        int err = -EOPNOTSUPP;
+
+        if (ndm->ndm_state & NUD_PERMANENT) {
+                pr_info("%s: FDB only supports static addresses\n",
+                        ixgbe_driver_name);
+                return -EINVAL;
+        }
+
+        if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {
+                if (is_unicast_ether_addr(addr))
+                        err = dev_uc_add_excl(dev, addr);
+                else if (is_multicast_ether_addr(addr))
+                        err = dev_mc_add_excl(dev, addr);
+                else
+                        err = -EINVAL;
+        }
+
+        /* Only return duplicate errors if NLM_F_EXCL is set */
+        if (err == -EEXIST && !(flags & NLM_F_EXCL))
+                err = 0;
+
+        return err;
+}
+
+static int ixgbe_ndo_fdb_del(struct ndmsg *ndm,
+                             struct net_device *dev,
+                             unsigned char *addr)
+{
+        struct ixgbe_adapter *adapter = netdev_priv(dev);
+        int err = -EOPNOTSUPP;
+
+        if (ndm->ndm_state & NUD_PERMANENT) {
+                pr_info("%s: FDB only supports static addresses\n",
+                        ixgbe_driver_name);
+                return -EINVAL;
+        }
+
+        if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {
+                if (is_unicast_ether_addr(addr))
+                        err = dev_uc_del(dev, addr);
+                else if (is_multicast_ether_addr(addr))
+                        err = dev_mc_del(dev, addr);
+                else
+                        err = -EINVAL;
+        }
+
+        return err;
+}
+
+static int ixgbe_ndo_fdb_dump(struct sk_buff *skb,
+                              struct netlink_callback *cb,
+                              struct net_device *dev,
+                              int idx)
+{
+        struct ixgbe_adapter *adapter = netdev_priv(dev);
+
+        if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
+                idx = ndo_dflt_fdb_dump(skb, cb, dev, idx);
+
+        return idx;
+}
+
 static const struct net_device_ops ixgbe_netdev_ops = {
         .ndo_open               = ixgbe_open,
         .ndo_stop               = ixgbe_close,
@@ -6717,6 +6880,9 @@ static const struct net_device_ops ixgbe_netdev_ops = {
 #endif /* IXGBE_FCOE */
         .ndo_set_features = ixgbe_set_features,
         .ndo_fix_features = ixgbe_fix_features,
+        .ndo_fdb_add            = ixgbe_ndo_fdb_add,
+        .ndo_fdb_del            = ixgbe_ndo_fdb_del,
+        .ndo_fdb_dump           = ixgbe_ndo_fdb_dump,
 };
 
 static void __devinit ixgbe_probe_vf(struct ixgbe_adapter *adapter,
@@ -6731,14 +6897,66 @@ static void __devinit ixgbe_probe_vf(struct ixgbe_adapter *adapter,
         /* The 82599 supports up to 64 VFs per physical function
          * but this implementation limits allocation to 63 so that
          * basic networking resources are still available to the
-         * physical function
+         * physical function.  If the user requests greater thn
+         * 63 VFs then it is an error - reset to default of zero.
          */
-        adapter->num_vfs = (max_vfs > 63) ? 63 : max_vfs;
+        adapter->num_vfs = (max_vfs > 63) ? 0 : max_vfs;
         ixgbe_enable_sriov(adapter, ii);
 #endif /* CONFIG_PCI_IOV */
 }
 
 /**
+ * ixgbe_wol_supported - Check whether device supports WoL
+ * @hw: hw specific details
+ * @device_id: the device ID
+ * @subdev_id: the subsystem device ID
+ *
+ * This function is used by probe and ethtool to determine
+ * which devices have WoL support
+ *
+ **/
+int ixgbe_wol_supported(struct ixgbe_adapter *adapter, u16 device_id,
+                        u16 subdevice_id)
+{
+        struct ixgbe_hw *hw = &adapter->hw;
+        u16 wol_cap = adapter->eeprom_cap & IXGBE_DEVICE_CAPS_WOL_MASK;
+        int is_wol_supported = 0;
+
+        switch (device_id) {
+        case IXGBE_DEV_ID_82599_SFP:
+                /* Only these subdevices could supports WOL */
+                switch (subdevice_id) {
+                case IXGBE_SUBDEV_ID_82599_560FLR:
+                        /* only support first port */
+                        if (hw->bus.func != 0)
+                                break;
+                case IXGBE_SUBDEV_ID_82599_SFP:
+                        is_wol_supported = 1;
+                        break;
+                }
+                break;
+        case IXGBE_DEV_ID_82599_COMBO_BACKPLANE:
+                /* All except this subdevice support WOL */
+                if (subdevice_id != IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ)
+                        is_wol_supported = 1;
+                break;
+        case IXGBE_DEV_ID_82599_KX4:
+                is_wol_supported = 1;
+                break;
+        case IXGBE_DEV_ID_X540T:
+                /* check eeprom to see if enabled wol */
+                if ((wol_cap == IXGBE_DEVICE_CAPS_WOL_PORT0_1) ||
+                    ((wol_cap == IXGBE_DEVICE_CAPS_WOL_PORT0) &&
+                     (hw->bus.func == 0))) {
+                        is_wol_supported = 1;
+                }
+                break;
+        }
+
+        return is_wol_supported;
+}
+
+/**
  * ixgbe_probe - Device Initialization Routine
  * @pdev: PCI device information struct
  * @ent: entry in ixgbe_pci_tbl
@@ -6764,7 +6982,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         u16 device_caps;
 #endif
         u32 eec;
-        u16 wol_cap;
 
         /* Catch broken hardware that put the wrong VF device ID in
          * the PCIe SR-IOV capability.
@@ -7028,42 +7245,18 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
                 netdev->features &= ~NETIF_F_RXHASH;
         }
 
-        /* WOL not supported for all but the following */
+        /* WOL not supported for all devices */
         adapter->wol = 0;
-        switch (pdev->device) {
-        case IXGBE_DEV_ID_82599_SFP:
-                /* Only these subdevice supports WOL */
-                switch (pdev->subsystem_device) {
-                case IXGBE_SUBDEV_ID_82599_560FLR:
-                        /* only support first port */
-                        if (hw->bus.func != 0)
-                                break;
-                case IXGBE_SUBDEV_ID_82599_SFP:
-                        adapter->wol = IXGBE_WUFC_MAG;
-                        break;
-                }
-                break;
-        case IXGBE_DEV_ID_82599_COMBO_BACKPLANE:
-                /* All except this subdevice support WOL */
-                if (pdev->subsystem_device != IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ)
-                        adapter->wol = IXGBE_WUFC_MAG;
-                break;
-        case IXGBE_DEV_ID_82599_KX4:
+        hw->eeprom.ops.read(hw, 0x2c, &adapter->eeprom_cap);
+        if (ixgbe_wol_supported(adapter, pdev->device, pdev->subsystem_device))
                 adapter->wol = IXGBE_WUFC_MAG;
-                break;
-        case IXGBE_DEV_ID_X540T:
-                /* Check eeprom to see if it is enabled */
-                hw->eeprom.ops.read(hw, 0x2c, &adapter->eeprom_cap);
-                wol_cap = adapter->eeprom_cap & IXGBE_DEVICE_CAPS_WOL_MASK;
 
-                if ((wol_cap == IXGBE_DEVICE_CAPS_WOL_PORT0_1) ||
-                    ((wol_cap == IXGBE_DEVICE_CAPS_WOL_PORT0) &&
-                     (hw->bus.func == 0)))
-                        adapter->wol = IXGBE_WUFC_MAG;
-                break;
-        }
         device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
 
+#ifdef CONFIG_IXGBE_PTP
+        ixgbe_ptp_init(adapter);
+#endif /* CONFIG_IXGBE_PTP*/
+
         /* save off EEPROM version number */
         hw->eeprom.ops.read(hw, 0x2e, &adapter->eeprom_verh);
         hw->eeprom.ops.read(hw, 0x2d, &adapter->eeprom_verl);
@@ -7150,6 +7343,12 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
 
         e_dev_info("%s\n", ixgbe_default_device_descr);
         cards_found++;
+
+#ifdef CONFIG_IXGBE_HWMON
+        if (ixgbe_sysfs_init(adapter))
+                e_err(probe, "failed to allocate sysfs resources\n");
+#endif /* CONFIG_IXGBE_HWMON */
+
         return 0;
 
 err_register:
@@ -7188,6 +7387,10 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev)
         set_bit(__IXGBE_DOWN, &adapter->state);
         cancel_work_sync(&adapter->service_task);
 
+#ifdef CONFIG_IXGBE_PTP
+        ixgbe_ptp_stop(adapter);
+#endif
+
 #ifdef CONFIG_IXGBE_DCA
         if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {
                 adapter->flags &= ~IXGBE_FLAG_DCA_ENABLED;
@@ -7196,6 +7399,10 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev)
         }
 
 #endif
+#ifdef CONFIG_IXGBE_HWMON
+        ixgbe_sysfs_exit(adapter);
+#endif /* CONFIG_IXGBE_HWMON */
+
 #ifdef IXGBE_FCOE
         if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)
                 ixgbe_cleanup_fcoe(adapter);
@@ -7220,6 +7427,11 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev)
 
         ixgbe_release_hw_control(adapter);
 
+#ifdef CONFIG_DCB
+        kfree(adapter->ixgbe_ieee_pfc);
+        kfree(adapter->ixgbe_ieee_ets);
+
+#endif
         iounmap(adapter->hw.hw_addr);
         pci_release_selected_regions(pdev, pci_select_bars(pdev,
                                      IORESOURCE_MEM));
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
index bf9f82f4b1ae..24117709d6a2 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
@@ -1582,13 +1582,21 @@ static s32 ixgbe_clock_out_i2c_bit(struct ixgbe_hw *hw, bool data)
  **/
 static void ixgbe_raise_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl)
 {
-        *i2cctl |= IXGBE_I2C_CLK_OUT;
-
-        IXGBE_WRITE_REG(hw, IXGBE_I2CCTL, *i2cctl);
-        IXGBE_WRITE_FLUSH(hw);
+        u32 i = 0;
+        u32 timeout = IXGBE_I2C_CLOCK_STRETCHING_TIMEOUT;
+        u32 i2cctl_r = 0;
 
-        /* SCL rise time (1000ns) */
-        udelay(IXGBE_I2C_T_RISE);
+        for (i = 0; i < timeout; i++) {
+                *i2cctl |= IXGBE_I2C_CLK_OUT;
+                IXGBE_WRITE_REG(hw, IXGBE_I2CCTL, *i2cctl);
+                IXGBE_WRITE_FLUSH(hw);
+                /* SCL rise time (1000ns) */
+                udelay(IXGBE_I2C_T_RISE);
+
+                i2cctl_r = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
+                if (i2cctl_r & IXGBE_I2C_CLK_IN)
+                        break;
+        }
 }
 
 /**
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
new file mode 100644
index 000000000000..ddc6a4d19302
--- /dev/null
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
@@ -0,0 +1,900 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2012 Intel Corporation.
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms and conditions of the GNU General Public License,
+  version 2, as published by the Free Software Foundation.
+
+  This program is distributed in the hope it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+
+  The full GNU General Public License is included in this distribution in
+  the file called "COPYING".
+
+  Contact Information:
+  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+#include "ixgbe.h"
+#include <linux/export.h>
+
+/*
+ * The 82599 and the X540 do not have true 64bit nanosecond scale
+ * counter registers. Instead, SYSTIME is defined by a fixed point
+ * system which allows the user to define the scale counter increment
+ * value at every level change of the oscillator driving the SYSTIME
+ * value. For both devices the TIMINCA:IV field defines this
+ * increment. On the X540 device, 31 bits are provided. However on the
+ * 82599 only provides 24 bits. The time unit is determined by the
+ * clock frequency of the oscillator in combination with the TIMINCA
+ * register. When these devices link at 10Gb the oscillator has a
+ * period of 6.4ns. In order to convert the scale counter into
+ * nanoseconds the cyclecounter and timecounter structures are
+ * used. The SYSTIME registers need to be converted to ns values by use
+ * of only a right shift (division by power of 2). The following math
+ * determines the largest incvalue that will fit into the available
+ * bits in the TIMINCA register.
+ *
+ * PeriodWidth: Number of bits to store the clock period
+ * MaxWidth: The maximum width value of the TIMINCA register
+ * Period: The clock period for the oscillator
+ * round(): discard the fractional portion of the calculation
+ *
+ * Period * [ 2 ^ ( MaxWidth - PeriodWidth ) ]
+ *
+ * For the X540, MaxWidth is 31 bits, and the base period is 6.4 ns
+ * For the 82599, MaxWidth is 24 bits, and the base period is 6.4 ns
+ *
+ * The period also changes based on the link speed:
+ * At 10Gb link or no link, the period remains the same.
+ * At 1Gb link, the period is multiplied by 10. (64ns)
+ * At 100Mb link, the period is multiplied by 100. (640ns)
+ *
+ * The calculated value allows us to right shift the SYSTIME register
+ * value in order to quickly convert it into a nanosecond clock,
+ * while allowing for the maximum possible adjustment value.
+ *
+ * These diagrams are only for the 10Gb link period
+ *
+ *           SYSTIMEH            SYSTIMEL
+ *       +--------------+  +--------------+
+ * X540  |      32      |  | 1 | 3 |  28  |
+ *       *--------------+  +--------------+
+ *        \________ 36 bits ______/  fract
+ *
+ *       +--------------+  +--------------+
+ * 82599 |      32      |  | 8 | 3 |  21  |
+ *       *--------------+  +--------------+
+ *        \________ 43 bits ______/  fract
+ *
+ * The 36 bit X540 SYSTIME overflows every
+ *   2^36 * 10^-9 / 60 = 1.14 minutes or 69 seconds
+ *
+ * The 43 bit 82599 SYSTIME overflows every
+ *   2^43 * 10^-9 / 3600 = 2.4 hours
+ */
+#define IXGBE_INCVAL_10GB 0x66666666
+#define IXGBE_INCVAL_1GB  0x40000000
+#define IXGBE_INCVAL_100  0x50000000
+
+#define IXGBE_INCVAL_SHIFT_10GB  28
+#define IXGBE_INCVAL_SHIFT_1GB   24
+#define IXGBE_INCVAL_SHIFT_100   21
+
+#define IXGBE_INCVAL_SHIFT_82599 7
+#define IXGBE_INCPER_SHIFT_82599 24
+#define IXGBE_MAX_TIMEADJ_VALUE  0x7FFFFFFFFFFFFFFFULL
+
+#define IXGBE_OVERFLOW_PERIOD    (HZ * 30)
+
+#ifndef NSECS_PER_SEC
+#define NSECS_PER_SEC 1000000000ULL
+#endif
+
+/**
+ * ixgbe_ptp_read - read raw cycle counter (to be used by time counter)
+ * @cc - the cyclecounter structure
+ *
+ * this function reads the cyclecounter registers and is called by the
+ * cyclecounter structure used to construct a ns counter from the
+ * arbitrary fixed point registers
+ */
+static cycle_t ixgbe_ptp_read(const struct cyclecounter *cc)
+{
+        struct ixgbe_adapter *adapter =
+                container_of(cc, struct ixgbe_adapter, cc);
+        struct ixgbe_hw *hw = &adapter->hw;
+        u64 stamp = 0;
+
+        stamp |= (u64)IXGBE_READ_REG(hw, IXGBE_SYSTIML);
+        stamp |= (u64)IXGBE_READ_REG(hw, IXGBE_SYSTIMH) << 32;
+
+        return stamp;
+}
+
+/**
+ * ixgbe_ptp_adjfreq
+ * @ptp - the ptp clock structure
+ * @ppb - parts per billion adjustment from base
+ *
+ * adjust the frequency of the ptp cycle counter by the
+ * indicated ppb from the base frequency.
+ */
+static int ixgbe_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)
+{
+        struct ixgbe_adapter *adapter =
+                container_of(ptp, struct ixgbe_adapter, ptp_caps);
+        struct ixgbe_hw *hw = &adapter->hw;
+        u64 freq;
+        u32 diff, incval;
+        int neg_adj = 0;
+
+        if (ppb < 0) {
+                neg_adj = 1;
+                ppb = -ppb;
+        }
+
+        smp_mb();
+        incval = ACCESS_ONCE(adapter->base_incval);
+
+        freq = incval;
+        freq *= ppb;
+        diff = div_u64(freq, 1000000000ULL);
+
+        incval = neg_adj ? (incval - diff) : (incval + diff);
+
+        switch (hw->mac.type) {
+        case ixgbe_mac_X540:
+                IXGBE_WRITE_REG(hw, IXGBE_TIMINCA, incval);
+                break;
+        case ixgbe_mac_82599EB:
+                IXGBE_WRITE_REG(hw, IXGBE_TIMINCA,
+                                (1 << IXGBE_INCPER_SHIFT_82599) |
+                                incval);
+                break;
+        default:
+                break;
+        }
+
+        return 0;
+}
+
+/**
+ * ixgbe_ptp_adjtime
+ * @ptp - the ptp clock structure
+ * @delta - offset to adjust the cycle counter by
+ *
+ * adjust the timer by resetting the timecounter structure.
+ */
+static int ixgbe_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
+{
+        struct ixgbe_adapter *adapter =
+                container_of(ptp, struct ixgbe_adapter, ptp_caps);
+        unsigned long flags;
+        u64 now;
+
+        spin_lock_irqsave(&adapter->tmreg_lock, flags);
+
+        now = timecounter_read(&adapter->tc);
+        now += delta;
+
+        /* reset the timecounter */
+        timecounter_init(&adapter->tc,
+                         &adapter->cc,
+                         now);
+
+        spin_unlock_irqrestore(&adapter->tmreg_lock, flags);
+        return 0;
+}
+
+/**
+ * ixgbe_ptp_gettime
+ * @ptp - the ptp clock structure
+ * @ts - timespec structure to hold the current time value
+ *
+ * read the timecounter and return the correct value on ns,
+ * after converting it into a struct timespec.
+ */
+static int ixgbe_ptp_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
+{
+        struct ixgbe_adapter *adapter =
+                container_of(ptp, struct ixgbe_adapter, ptp_caps);
+        u64 ns;
+        u32 remainder;
+        unsigned long flags;
+
+        spin_lock_irqsave(&adapter->tmreg_lock, flags);
+        ns = timecounter_read(&adapter->tc);
+        spin_unlock_irqrestore(&adapter->tmreg_lock, flags);
+
+        ts->tv_sec = div_u64_rem(ns, 1000000000ULL, &remainder);
+        ts->tv_nsec = remainder;
+
+        return 0;
+}
+
+/**
+ * ixgbe_ptp_settime
+ * @ptp - the ptp clock structure
+ * @ts - the timespec containing the new time for the cycle counter
+ *
+ * reset the timecounter to use a new base value instead of the kernel
+ * wall timer value.
+ */
+static int ixgbe_ptp_settime(struct ptp_clock_info *ptp,
+                             const struct timespec *ts)
+{
+        struct ixgbe_adapter *adapter =
+                container_of(ptp, struct ixgbe_adapter, ptp_caps);
+        u64 ns;
+        unsigned long flags;
+
+        ns = ts->tv_sec * 1000000000ULL;
+        ns += ts->tv_nsec;
+
+        /* reset the timecounter */
+        spin_lock_irqsave(&adapter->tmreg_lock, flags);
+        timecounter_init(&adapter->tc, &adapter->cc, ns);
+        spin_unlock_irqrestore(&adapter->tmreg_lock, flags);
+
+        return 0;
+}
+
+/**
+ * ixgbe_ptp_enable
+ * @ptp - the ptp clock structure
+ * @rq - the requested feature to change
+ * @on - whether to enable or disable the feature
+ *
+ * enable (or disable) ancillary features of the phc subsystem.
+ * our driver only supports the PPS feature on the X540
+ */
+static int ixgbe_ptp_enable(struct ptp_clock_info *ptp,
+                            struct ptp_clock_request *rq, int on)
+{
+        struct ixgbe_adapter *adapter =
+                container_of(ptp, struct ixgbe_adapter, ptp_caps);
+
+        /**
+         * When PPS is enabled, unmask the interrupt for the ClockOut
+         * feature, so that the interrupt handler can send the PPS
+         * event when the clock SDP triggers. Clear mask when PPS is
+         * disabled
+         */
+        if (rq->type == PTP_CLK_REQ_PPS) {
+                switch (adapter->hw.mac.type) {
+                case ixgbe_mac_X540:
+                        if (on)
+                                adapter->flags2 |= IXGBE_FLAG2_PTP_PPS_ENABLED;
+                        else
+                                adapter->flags2 &=
+                                        ~IXGBE_FLAG2_PTP_PPS_ENABLED;
+                        return 0;
+                default:
+                        break;
+                }
+        }
+
+        return -ENOTSUPP;
+}
+
+/**
+ * ixgbe_ptp_check_pps_event
+ * @adapter - the private adapter structure
+ * @eicr - the interrupt cause register value
+ *
+ * This function is called by the interrupt routine when checking for
+ * interrupts. It will check and handle a pps event.
+ */
+void ixgbe_ptp_check_pps_event(struct ixgbe_adapter *adapter, u32 eicr)
+{
+        struct ixgbe_hw *hw = &adapter->hw;
+        struct ptp_clock_event event;
+
+        event.type = PTP_CLOCK_PPS;
+
+        /* Make sure ptp clock is valid, and PPS event enabled */
+        if (!adapter->ptp_clock ||
+            !(adapter->flags2 & IXGBE_FLAG2_PTP_PPS_ENABLED))
+                return;
+
+        switch (hw->mac.type) {
+        case ixgbe_mac_X540:
+                if (eicr & IXGBE_EICR_TIMESYNC)
+                        ptp_clock_event(adapter->ptp_clock, &event);
+                break;
+        default:
+                break;
+        }
+}
+
+/**
+ * ixgbe_ptp_enable_sdp
+ * @hw - the hardware private structure
+ * @shift - the clock shift for calculating nanoseconds
+ *
+ * this function enables the clock out feature on the sdp0 for the
+ * X540 device. It will create a 1second periodic output that can be
+ * used as the PPS (via an interrupt).
+ *
+ * It calculates when the systime will be on an exact second, and then
+ * aligns the start of the PPS signal to that value. The shift is
+ * necessary because it can change based on the link speed.
+ */
+static void ixgbe_ptp_enable_sdp(struct ixgbe_hw *hw, int shift)
+{
+        u32 esdp, tsauxc, clktiml, clktimh, trgttiml, trgttimh;
+        u64 clock_edge = 0;
+        u32 rem;
+
+        switch (hw->mac.type) {
+        case ixgbe_mac_X540:
+                esdp = IXGBE_READ_REG(hw, IXGBE_ESDP);
+
+                /*
+                 * enable the SDP0 pin as output, and connected to the native
+                 * function for Timesync (ClockOut)
+                 */
+                esdp |= (IXGBE_ESDP_SDP0_DIR |
+                         IXGBE_ESDP_SDP0_NATIVE);
+
+                /*
+                 * enable the Clock Out feature on SDP0, and allow interrupts
+                 * to occur when the pin changes
+                 */
+                tsauxc = (IXGBE_TSAUXC_EN_CLK |
+                          IXGBE_TSAUXC_SYNCLK |
+                          IXGBE_TSAUXC_SDP0_INT);
+
+                /* clock period (or pulse length) */
+                clktiml = (u32)(NSECS_PER_SEC << shift);
+                clktimh = (u32)((NSECS_PER_SEC << shift) >> 32);
+
+                clock_edge |= (u64)IXGBE_READ_REG(hw, IXGBE_SYSTIML);
+                clock_edge |= (u64)IXGBE_READ_REG(hw, IXGBE_SYSTIMH) << 32;
+
+                /*
+                 * account for the fact that we can't do u64 division
+                 * with remainder, by converting the clock values into
+                 * nanoseconds first
+                 */
+                clock_edge >>= shift;
+                div_u64_rem(clock_edge, NSECS_PER_SEC, &rem);
+                clock_edge += (NSECS_PER_SEC - rem);
+                clock_edge <<= shift;
+
+                /* specify the initial clock start time */
+                trgttiml = (u32)clock_edge;
+                trgttimh = (u32)(clock_edge >> 32);
+
+                IXGBE_WRITE_REG(hw, IXGBE_CLKTIML, clktiml);
+                IXGBE_WRITE_REG(hw, IXGBE_CLKTIMH, clktimh);
+                IXGBE_WRITE_REG(hw, IXGBE_TRGTTIML0, trgttiml);
+                IXGBE_WRITE_REG(hw, IXGBE_TRGTTIMH0, trgttimh);
+
+                IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp);
+                IXGBE_WRITE_REG(hw, IXGBE_TSAUXC, tsauxc);
+
+                IXGBE_WRITE_REG(hw, IXGBE_EIMS, IXGBE_EICR_TIMESYNC);
+                break;
+        default:
+                break;
+        }
+}
+
+/**
+ * ixgbe_ptp_disable_sdp
+ * @hw - the private hardware structure
+ *
+ * this function disables the auxiliary SDP clock out feature
+ */
+static void ixgbe_ptp_disable_sdp(struct ixgbe_hw *hw)
+{
+        IXGBE_WRITE_REG(hw, IXGBE_EIMC, IXGBE_EICR_TIMESYNC);
+        IXGBE_WRITE_REG(hw, IXGBE_TSAUXC, 0);
+}
+
+/**
+ * ixgbe_ptp_overflow_check - delayed work to detect SYSTIME overflow
+ * @work: structure containing information about this work task
+ *
+ * this work function is scheduled to continue reading the timecounter
+ * in order to prevent missing when the system time registers wrap
+ * around. This needs to be run approximately twice a minute when no
+ * PTP activity is occurring.
+ */
+void ixgbe_ptp_overflow_check(struct ixgbe_adapter *adapter)
+{
+        unsigned long elapsed_jiffies = adapter->last_overflow_check - jiffies;
+        struct timespec ts;
+
+        if ((adapter->flags2 & IXGBE_FLAG2_OVERFLOW_CHECK_ENABLED) &&
+            (elapsed_jiffies >= IXGBE_OVERFLOW_PERIOD)) {
+                ixgbe_ptp_gettime(&adapter->ptp_caps, &ts);
+                adapter->last_overflow_check = jiffies;
+        }
+}
+
+/**
+ * ixgbe_ptp_tx_hwtstamp - utility function which checks for TX time stamp
+ * @q_vector: structure containing interrupt and ring information
+ * @skb: particular skb to send timestamp with
+ *
+ * if the timestamp is valid, we convert it into the timecounter ns
+ * value, then store that result into the shhwtstamps structure which
+ * is passed up the network stack
+ */
+void ixgbe_ptp_tx_hwtstamp(struct ixgbe_q_vector *q_vector,
+                           struct sk_buff *skb)
+{
+        struct ixgbe_adapter *adapter;
+        struct ixgbe_hw *hw;
+        struct skb_shared_hwtstamps shhwtstamps;
+        u64 regval = 0, ns;
+        u32 tsynctxctl;
+        unsigned long flags;
+
+        /* we cannot process timestamps on a ring without a q_vector */
+        if (!q_vector || !q_vector->adapter)
+                return;
+
+        adapter = q_vector->adapter;
+        hw = &adapter->hw;
+
+        tsynctxctl = IXGBE_READ_REG(hw, IXGBE_TSYNCTXCTL);
+        regval |= (u64)IXGBE_READ_REG(hw, IXGBE_TXSTMPL);
+        regval |= (u64)IXGBE_READ_REG(hw, IXGBE_TXSTMPH) << 32;
+
+        /*
+         * if TX timestamp is not valid, exit after clearing the
+         * timestamp registers
+         */
+        if (!(tsynctxctl & IXGBE_TSYNCTXCTL_VALID))
+                return;
+
+        spin_lock_irqsave(&adapter->tmreg_lock, flags);
+        ns = timecounter_cyc2time(&adapter->tc, regval);
+        spin_unlock_irqrestore(&adapter->tmreg_lock, flags);
+
+        memset(&shhwtstamps, 0, sizeof(shhwtstamps));
+        shhwtstamps.hwtstamp = ns_to_ktime(ns);
+        skb_tstamp_tx(skb, &shhwtstamps);
+}
+
+/**
+ * ixgbe_ptp_rx_hwtstamp - utility function which checks for RX time stamp
+ * @q_vector: structure containing interrupt and ring information
+ * @skb: particular skb to send timestamp with
+ *
+ * if the timestamp is valid, we convert it into the timecounter ns
+ * value, then store that result into the shhwtstamps structure which
+ * is passed up the network stack
+ */
+void ixgbe_ptp_rx_hwtstamp(struct ixgbe_q_vector *q_vector,
+                           struct sk_buff *skb)
+{
+        struct ixgbe_adapter *adapter;
+        struct ixgbe_hw *hw;
+        struct skb_shared_hwtstamps *shhwtstamps;
+        u64 regval = 0, ns;
+        u32 tsyncrxctl;
+        unsigned long flags;
+
+        /* we cannot process timestamps on a ring without a q_vector */
+        if (!q_vector || !q_vector->adapter)
+                return;
+
+        adapter = q_vector->adapter;
+        hw = &adapter->hw;
+
+        tsyncrxctl = IXGBE_READ_REG(hw, IXGBE_TSYNCRXCTL);
+        regval |= (u64)IXGBE_READ_REG(hw, IXGBE_RXSTMPL);
+        regval |= (u64)IXGBE_READ_REG(hw, IXGBE_RXSTMPH) << 32;
+
+        /*
+         * If this bit is set, then the RX registers contain the time stamp. No
+         * other packet will be time stamped until we read these registers, so
+         * read the registers to make them available again. Because only one
+         * packet can be time stamped at a time, we know that the register
+         * values must belong to this one here and therefore we don't need to
+         * compare any of the additional attributes stored for it.
+         *
+         * If nothing went wrong, then it should have a skb_shared_tx that we
+         * can turn into a skb_shared_hwtstamps.
+         */
+        if (!(tsyncrxctl & IXGBE_TSYNCRXCTL_VALID))
+                return;
+
+        spin_lock_irqsave(&adapter->tmreg_lock, flags);
+        ns = timecounter_cyc2time(&adapter->tc, regval);
+        spin_unlock_irqrestore(&adapter->tmreg_lock, flags);
+
+        shhwtstamps = skb_hwtstamps(skb);
+        shhwtstamps->hwtstamp = ns_to_ktime(ns);
+}
+
+/**
+ * ixgbe_ptp_hwtstamp_ioctl - control hardware time stamping
+ * @adapter: pointer to adapter struct
+ * @ifreq: ioctl data
+ * @cmd: particular ioctl requested
+ *
+ * Outgoing time stamping can be enabled and disabled. Play nice and
+ * disable it when requested, although it shouldn't case any overhead
+ * when no packet needs it. At most one packet in the queue may be
+ * marked for time stamping, otherwise it would be impossible to tell
+ * for sure to which packet the hardware time stamp belongs.
+ *
+ * Incoming time stamping has to be configured via the hardware
+ * filters. Not all combinations are supported, in particular event
+ * type has to be specified. Matching the kind of event packet is
+ * not supported, with the exception of "all V2 events regardless of
+ * level 2 or 4".
+ */
+int ixgbe_ptp_hwtstamp_ioctl(struct ixgbe_adapter *adapter,
+                             struct ifreq *ifr, int cmd)
+{
+        struct ixgbe_hw *hw = &adapter->hw;
+        struct hwtstamp_config config;
+        u32 tsync_tx_ctl = IXGBE_TSYNCTXCTL_ENABLED;
+        u32 tsync_rx_ctl = IXGBE_TSYNCRXCTL_ENABLED;
+        u32 tsync_rx_mtrl = 0;
+        bool is_l4 = false;
+        bool is_l2 = false;
+        u32 regval;
+
+        if (copy_from_user(&config, ifr->ifr_data, sizeof(config)))
+                return -EFAULT;
+
+        /* reserved for future extensions */
+        if (config.flags)
+                return -EINVAL;
+
+        switch (config.tx_type) {
+        case HWTSTAMP_TX_OFF:
+                tsync_tx_ctl = 0;
+        case HWTSTAMP_TX_ON:
+                break;
+        default:
+                return -ERANGE;
+        }
+
+        switch (config.rx_filter) {
+        case HWTSTAMP_FILTER_NONE:
+                tsync_rx_ctl = 0;
+                break;
+        case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:
+                tsync_rx_ctl |= IXGBE_TSYNCRXCTL_TYPE_L4_V1;
+                tsync_rx_mtrl = IXGBE_RXMTRL_V1_SYNC_MSG;
+                is_l4 = true;
+                break;
+        case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:
+                tsync_rx_ctl |= IXGBE_TSYNCRXCTL_TYPE_L4_V1;
+                tsync_rx_mtrl = IXGBE_RXMTRL_V1_DELAY_REQ_MSG;
+                is_l4 = true;
+                break;
+        case HWTSTAMP_FILTER_PTP_V2_SYNC:
+        case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:
+        case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:
+                tsync_rx_ctl |= IXGBE_TSYNCRXCTL_TYPE_L2_L4_V2;
+                tsync_rx_mtrl = IXGBE_RXMTRL_V2_SYNC_MSG;
+                is_l2 = true;
+                is_l4 = true;
+                config.rx_filter = HWTSTAMP_FILTER_SOME;
+                break;
+        case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:
+        case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:
+        case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:
+                tsync_rx_ctl |= IXGBE_TSYNCRXCTL_TYPE_L2_L4_V2;
+                tsync_rx_mtrl = IXGBE_RXMTRL_V2_DELAY_REQ_MSG;
+                is_l2 = true;
+                is_l4 = true;
+                config.rx_filter = HWTSTAMP_FILTER_SOME;
+                break;
+        case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
+        case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:
+        case HWTSTAMP_FILTER_PTP_V2_EVENT:
+                tsync_rx_ctl |= IXGBE_TSYNCRXCTL_TYPE_EVENT_V2;
+                config.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;
+                is_l2 = true;
+                is_l4 = true;
+                break;
+        case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:
+        case HWTSTAMP_FILTER_ALL:
+        default:
+                /*
+                 * register RXMTRL must be set, therefore it is not
+                 * possible to time stamp both V1 Sync and Delay_Req messages
+                 * and hardware does not support timestamping all packets
+                 * => return error
+                 */
+                return -ERANGE;
+        }
+
+        if (hw->mac.type == ixgbe_mac_82598EB) {
+                if (tsync_rx_ctl | tsync_tx_ctl)
+                        return -ERANGE;
+                return 0;
+        }
+
+        /* define ethertype filter for timestamped packets */
+        if (is_l2)
+                IXGBE_WRITE_REG(hw, IXGBE_ETQF(3),
+                                (IXGBE_ETQF_FILTER_EN | /* enable filter */
+                                 IXGBE_ETQF_1588 | /* enable timestamping */
+                                 ETH_P_1588));     /* 1588 eth protocol type */
+        else
+                IXGBE_WRITE_REG(hw, IXGBE_ETQF(3), 0);
+
+#define PTP_PORT 319
+        /* L4 Queue Filter[3]: filter by destination port and protocol */
+        if (is_l4) {
+                u32 ftqf = (IXGBE_FTQF_PROTOCOL_UDP /* UDP */
+                            | IXGBE_FTQF_POOL_MASK_EN /* Pool not compared */
+                            | IXGBE_FTQF_QUEUE_ENABLE);
+
+                ftqf |= ((IXGBE_FTQF_PROTOCOL_COMP_MASK /* protocol check */
+                          & IXGBE_FTQF_DEST_PORT_MASK /* dest check */
+                          & IXGBE_FTQF_SOURCE_PORT_MASK) /* source check */
+                         << IXGBE_FTQF_5TUPLE_MASK_SHIFT);
+
+                IXGBE_WRITE_REG(hw, IXGBE_L34T_IMIR(3),
+                                (3 << IXGBE_IMIR_RX_QUEUE_SHIFT_82599 |
+                                 IXGBE_IMIR_SIZE_BP_82599));
+
+                /* enable port check */
+                IXGBE_WRITE_REG(hw, IXGBE_SDPQF(3),
+                                (htons(PTP_PORT) |
+                                 htons(PTP_PORT) << 16));
+
+                IXGBE_WRITE_REG(hw, IXGBE_FTQF(3), ftqf);
+
+                tsync_rx_mtrl |= PTP_PORT << 16;
+        } else {
+                IXGBE_WRITE_REG(hw, IXGBE_FTQF(3), 0);
+        }
+
+        /* enable/disable TX */
+        regval = IXGBE_READ_REG(hw, IXGBE_TSYNCTXCTL);
+        regval &= ~IXGBE_TSYNCTXCTL_ENABLED;
+        regval |= tsync_tx_ctl;
+        IXGBE_WRITE_REG(hw, IXGBE_TSYNCTXCTL, regval);
+
+        /* enable/disable RX */
+        regval = IXGBE_READ_REG(hw, IXGBE_TSYNCRXCTL);
+        regval &= ~(IXGBE_TSYNCRXCTL_ENABLED | IXGBE_TSYNCRXCTL_TYPE_MASK);
+        regval |= tsync_rx_ctl;
+        IXGBE_WRITE_REG(hw, IXGBE_TSYNCRXCTL, regval);
+
+        /* define which PTP packets are time stamped */
+        IXGBE_WRITE_REG(hw, IXGBE_RXMTRL, tsync_rx_mtrl);
+
+        IXGBE_WRITE_FLUSH(hw);
+
+        /* clear TX/RX time stamp registers, just to be sure */
+        regval = IXGBE_READ_REG(hw, IXGBE_TXSTMPH);
+        regval = IXGBE_READ_REG(hw, IXGBE_RXSTMPH);
+
+        return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ?
+                -EFAULT : 0;
+}
+
+/**
+ * ixgbe_ptp_start_cyclecounter - create the cycle counter from hw
+ * @adapter - pointer to the adapter structure
+ *
+ * this function initializes the timecounter and cyclecounter
+ * structures for use in generated a ns counter from the arbitrary
+ * fixed point cycles registers in the hardware.
+ *
+ * A change in link speed impacts the frequency of the DMA clock on
+ * the device, which is used to generate the cycle counter
+ * registers. Therefor this function is called whenever the link speed
+ * changes.
+ *
+ * This function also turns on the SDP pin for clock out feature (X540
+ * only), because this is where the shift is first calculated.
+ */
+void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
+{
+        struct ixgbe_hw *hw = &adapter->hw;
+        u32 incval = 0;
+        u32 shift = 0;
+        u32 cycle_speed;
+        unsigned long flags;
+
+        /**
+         * Determine what speed we need to set the cyclecounter
+         * for. It should be different for 100Mb, 1Gb, and 10Gb. Treat
+         * unknown speeds as 10Gb. (Hence why we can't just copy the
+         * link_speed.
+         */
+        switch (adapter->link_speed) {
+        case IXGBE_LINK_SPEED_100_FULL:
+        case IXGBE_LINK_SPEED_1GB_FULL:
+        case IXGBE_LINK_SPEED_10GB_FULL:
+                cycle_speed = adapter->link_speed;
+                break;
+        default:
+                /* cycle speed should be 10Gb when there is no link */
+                cycle_speed = IXGBE_LINK_SPEED_10GB_FULL;
+                break;
+        }
+
+        /* Bail if the cycle speed didn't change */
+        if (adapter->cycle_speed == cycle_speed)
+                return;
+
+        /* disable the SDP clock out */
+        ixgbe_ptp_disable_sdp(hw);
+
+        /**
+         * Scale the NIC cycle counter by a large factor so that
+         * relatively small corrections to the frequency can be added
+         * or subtracted. The drawbacks of a large factor include
+         * (a) the clock register overflows more quickly, (b) the cycle
+         * counter structure must be able to convert the systime value
+         * to nanoseconds using only a multiplier and a right-shift,
+         * and (c) the value must fit within the timinca register space
+         * => math based on internal DMA clock rate and available bits
+         */
+        switch (cycle_speed) {
+        case IXGBE_LINK_SPEED_100_FULL:
+                incval = IXGBE_INCVAL_100;
+                shift = IXGBE_INCVAL_SHIFT_100;
+                break;
+        case IXGBE_LINK_SPEED_1GB_FULL:
+                incval = IXGBE_INCVAL_1GB;
+                shift = IXGBE_INCVAL_SHIFT_1GB;
+                break;
+        case IXGBE_LINK_SPEED_10GB_FULL:
+                incval = IXGBE_INCVAL_10GB;
+                shift = IXGBE_INCVAL_SHIFT_10GB;
+                break;
+        }
+
+        /**
+         * Modify the calculated values to fit within the correct
+         * number of bits specified by the hardware. The 82599 doesn't
+         * have the same space as the X540, so bitshift the calculated
+         * values to fit.
+         */
+        switch (hw->mac.type) {
+        case ixgbe_mac_X540:
+                IXGBE_WRITE_REG(hw, IXGBE_TIMINCA, incval);
+                break;
+        case ixgbe_mac_82599EB:
+                incval >>= IXGBE_INCVAL_SHIFT_82599;
+                shift -= IXGBE_INCVAL_SHIFT_82599;
+                IXGBE_WRITE_REG(hw, IXGBE_TIMINCA,
+                                (1 << IXGBE_INCPER_SHIFT_82599) |
+                                incval);
+                break;
+        default:
+                /* other devices aren't supported */
+                return;
+        }
+
+        /* reset the system time registers */
+        IXGBE_WRITE_REG(hw, IXGBE_SYSTIML, 0x00000000);
+        IXGBE_WRITE_REG(hw, IXGBE_SYSTIMH, 0x00000000);
+        IXGBE_WRITE_FLUSH(hw);
+
+        /* now that the shift has been calculated and the systime
+         * registers reset, (re-)enable the Clock out feature*/
+        ixgbe_ptp_enable_sdp(hw, shift);
+
+        /* store the new cycle speed */
+        adapter->cycle_speed = cycle_speed;
+
+        ACCESS_ONCE(adapter->base_incval) = incval;
+        smp_mb();
+
+        /* grab the ptp lock */
+        spin_lock_irqsave(&adapter->tmreg_lock, flags);
+
+        memset(&adapter->cc, 0, sizeof(adapter->cc));
+        adapter->cc.read = ixgbe_ptp_read;
+        adapter->cc.mask = CLOCKSOURCE_MASK(64);
+        adapter->cc.shift = shift;
+        adapter->cc.mult = 1;
+
+        /* reset the ns time counter */
+        timecounter_init(&adapter->tc, &adapter->cc,
+                         ktime_to_ns(ktime_get_real()));
+
+        spin_unlock_irqrestore(&adapter->tmreg_lock, flags);
+}
+
+/**
+ * ixgbe_ptp_init
+ * @adapter - the ixgbe private adapter structure
+ *
+ * This function performs the required steps for enabling ptp
+ * support. If ptp support has already been loaded it simply calls the
+ * cyclecounter init routine and exits.
+ */
+void ixgbe_ptp_init(struct ixgbe_adapter *adapter)
+{
+        struct net_device *netdev = adapter->netdev;
+
+        switch (adapter->hw.mac.type) {
+        case ixgbe_mac_X540:
+                snprintf(adapter->ptp_caps.name, 16, "%pm", netdev->dev_addr);
+                adapter->ptp_caps.owner = THIS_MODULE;
+                adapter->ptp_caps.max_adj = 250000000;
+                adapter->ptp_caps.n_alarm = 0;
+                adapter->ptp_caps.n_ext_ts = 0;
+                adapter->ptp_caps.n_per_out = 0;
+                adapter->ptp_caps.pps = 1;
+                adapter->ptp_caps.adjfreq = ixgbe_ptp_adjfreq;
+                adapter->ptp_caps.adjtime = ixgbe_ptp_adjtime;
+                adapter->ptp_caps.gettime = ixgbe_ptp_gettime;
+                adapter->ptp_caps.settime = ixgbe_ptp_settime;
+                adapter->ptp_caps.enable = ixgbe_ptp_enable;
+                break;
+        case ixgbe_mac_82599EB:
+                snprintf(adapter->ptp_caps.name, 16, "%pm", netdev->dev_addr);
+                adapter->ptp_caps.owner = THIS_MODULE;
+                adapter->ptp_caps.max_adj = 250000000;
+                adapter->ptp_caps.n_alarm = 0;
+                adapter->ptp_caps.n_ext_ts = 0;
+                adapter->ptp_caps.n_per_out = 0;
+                adapter->ptp_caps.pps = 0;
+                adapter->ptp_caps.adjfreq = ixgbe_ptp_adjfreq;
+                adapter->ptp_caps.adjtime = ixgbe_ptp_adjtime;
+                adapter->ptp_caps.gettime = ixgbe_ptp_gettime;
+                adapter->ptp_caps.settime = ixgbe_ptp_settime;
+                adapter->ptp_caps.enable = ixgbe_ptp_enable;
+                break;
+        default:
+                adapter->ptp_clock = NULL;
+                return;
+        }
+
+        spin_lock_init(&adapter->tmreg_lock);
+
+        ixgbe_ptp_start_cyclecounter(adapter);
+
+        /* (Re)start the overflow check */
+        adapter->flags2 |= IXGBE_FLAG2_OVERFLOW_CHECK_ENABLED;
+
+        adapter->ptp_clock = ptp_clock_register(&adapter->ptp_caps);
+        if (IS_ERR(adapter->ptp_clock)) {
+                adapter->ptp_clock = NULL;
+                e_dev_err("ptp_clock_register failed\n");
+        } else
+                e_dev_info("registered PHC device on %s\n", netdev->name);
+
+        return;
+}
+
+/**
+ * ixgbe_ptp_stop - disable ptp device and stop the overflow check
+ * @adapter: pointer to adapter struct
+ *
+ * this function stops the ptp support, and cancels the delayed work.
+ */
+void ixgbe_ptp_stop(struct ixgbe_adapter *adapter)
+{
+        ixgbe_ptp_disable_sdp(&adapter->hw);
+
+        /* stop the overflow check task */
+        adapter->flags2 &= ~IXGBE_FLAG2_OVERFLOW_CHECK_ENABLED;
+
+        if (adapter->ptp_clock) {
+                ptp_clock_unregister(adapter->ptp_clock);
+                adapter->ptp_clock = NULL;
+                e_dev_info("removed PHC on %s\n",
+                           adapter->netdev->name);
+        }
+}
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index 88a58cb08569..2d971d18696e 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -544,13 +544,18 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf)
 
         retval = ixgbe_read_mbx(hw, msgbuf, mbx_size, vf);
 
-        if (retval)
+        if (retval) {
                 pr_err("Error receiving message from VF\n");
+                return retval;
+        }
 
         /* this is a message we already processed, do nothing */
         if (msgbuf[0] & (IXGBE_VT_MSGTYPE_ACK | IXGBE_VT_MSGTYPE_NACK))
                 return retval;
 
+        /* flush the ack before we write any messages back */
+        IXGBE_WRITE_FLUSH(hw);
+
         /*
          * until the vf completes a virtual function reset it should not be
          * allowed to start any configuration.
@@ -637,6 +642,12 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf)
         case IXGBE_VF_SET_MACVLAN:
                 index = (msgbuf[0] & IXGBE_VT_MSGINFO_MASK) >>
                         IXGBE_VT_MSGINFO_SHIFT;
+                if (adapter->vfinfo[vf].pf_set_mac && index > 0) {
+                        e_warn(drv, "VF %d requested MACVLAN filter but is "
+                                    "administratively denied\n", vf);
+                        retval = -1;
+                        break;
+                }
                 /*
                  * If the VF is allowed to set MAC filters then turn off
                  * anti-spoofing to avoid false positives.  An index
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c
new file mode 100644
index 000000000000..1d80b1cefa6a
--- /dev/null
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c
@@ -0,0 +1,245 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2012 Intel Corporation.
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms and conditions of the GNU General Public License,
+  version 2, as published by the Free Software Foundation.
+
+  This program is distributed in the hope it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+
+  The full GNU General Public License is included in this distribution in
+  the file called "COPYING".
+
+  Contact Information:
+  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+#include "ixgbe.h"
+#include "ixgbe_common.h"
+#include "ixgbe_type.h"
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/sysfs.h>
+#include <linux/kobject.h>
+#include <linux/device.h>
+#include <linux/netdevice.h>
+#include <linux/hwmon.h>
+
+#ifdef CONFIG_IXGBE_HWMON
+/* hwmon callback functions */
+static ssize_t ixgbe_hwmon_show_location(struct device *dev,
+                                         struct device_attribute *attr,
+                                         char *buf)
+{
+        struct hwmon_attr *ixgbe_attr = container_of(attr, struct hwmon_attr,
+                                                     dev_attr);
+        return sprintf(buf, "loc%u\n",
+                       ixgbe_attr->sensor->location);
+}
+
+static ssize_t ixgbe_hwmon_show_temp(struct device *dev,
+                                     struct device_attribute *attr,
+                                     char *buf)
+{
+        struct hwmon_attr *ixgbe_attr = container_of(attr, struct hwmon_attr,
+                                                     dev_attr);
+        unsigned int value;
+
+        /* reset the temp field */
+        ixgbe_attr->hw->mac.ops.get_thermal_sensor_data(ixgbe_attr->hw);
+
+        value = ixgbe_attr->sensor->temp;
+
+        /* display millidegree */
+        value *= 1000;
+
+        return sprintf(buf, "%u\n", value);
+}
+
+static ssize_t ixgbe_hwmon_show_cautionthresh(struct device *dev,
+                                     struct device_attribute *attr,
+                                     char *buf)
+{
+        struct hwmon_attr *ixgbe_attr = container_of(attr, struct hwmon_attr,
+                                                     dev_attr);
+        unsigned int value = ixgbe_attr->sensor->caution_thresh;
+
+        /* display millidegree */
+        value *= 1000;
+
+        return sprintf(buf, "%u\n", value);
+}
+
+static ssize_t ixgbe_hwmon_show_maxopthresh(struct device *dev,
+                                     struct device_attribute *attr,
+                                     char *buf)
+{
+        struct hwmon_attr *ixgbe_attr = container_of(attr, struct hwmon_attr,
+                                                     dev_attr);
+        unsigned int value = ixgbe_attr->sensor->max_op_thresh;
+
+        /* display millidegree */
+        value *= 1000;
+
+        return sprintf(buf, "%u\n", value);
+}
+
+/*
+ * ixgbe_add_hwmon_attr - Create hwmon attr table for a hwmon sysfs file.
+ * @ adapter: pointer to the adapter structure
+ * @ offset: offset in the eeprom sensor data table
+ * @ type: type of sensor data to display
+ *
+ * For each file we want in hwmon's sysfs interface we need a device_attribute
+ * This is included in our hwmon_attr struct that contains the references to
+ * the data structures we need to get the data to display.
+ */
+static int ixgbe_add_hwmon_attr(struct ixgbe_adapter *adapter,
+                                unsigned int offset, int type) {
+        int rc;
+        unsigned int n_attr;
+        struct hwmon_attr *ixgbe_attr;
+
+        n_attr = adapter->ixgbe_hwmon_buff.n_hwmon;
+        ixgbe_attr = &adapter->ixgbe_hwmon_buff.hwmon_list[n_attr];
+
+        switch (type) {
+        case IXGBE_HWMON_TYPE_LOC:
+                ixgbe_attr->dev_attr.show = ixgbe_hwmon_show_location;
+                snprintf(ixgbe_attr->name, sizeof(ixgbe_attr->name),
+                         "temp%u_label", offset);
+                break;
+        case IXGBE_HWMON_TYPE_TEMP:
+                ixgbe_attr->dev_attr.show = ixgbe_hwmon_show_temp;
+                snprintf(ixgbe_attr->name, sizeof(ixgbe_attr->name),
+                         "temp%u_input", offset);
+                break;
+        case IXGBE_HWMON_TYPE_CAUTION:
+                ixgbe_attr->dev_attr.show = ixgbe_hwmon_show_cautionthresh;
+                snprintf(ixgbe_attr->name, sizeof(ixgbe_attr->name),
+                         "temp%u_max", offset);
+                break;
+        case IXGBE_HWMON_TYPE_MAX:
+                ixgbe_attr->dev_attr.show = ixgbe_hwmon_show_maxopthresh;
+                snprintf(ixgbe_attr->name, sizeof(ixgbe_attr->name),
+                         "temp%u_crit", offset);
+                break;
+        default:
+                rc = -EPERM;
+                return rc;
+        }
+
+        /* These always the same regardless of type */
+        ixgbe_attr->sensor =
+                &adapter->hw.mac.thermal_sensor_data.sensor[offset];
+        ixgbe_attr->hw = &adapter->hw;
+        ixgbe_attr->dev_attr.store = NULL;
+        ixgbe_attr->dev_attr.attr.mode = S_IRUGO;
+        ixgbe_attr->dev_attr.attr.name = ixgbe_attr->name;
+
+        rc = device_create_file(&adapter->pdev->dev,
+                                &ixgbe_attr->dev_attr);
+
+        if (rc == 0)
+                ++adapter->ixgbe_hwmon_buff.n_hwmon;
+
+        return rc;
+}
+
+static void ixgbe_sysfs_del_adapter(struct ixgbe_adapter *adapter)
+{
+        int i;
+
+        if (adapter == NULL)
+                return;
+
+        for (i = 0; i < adapter->ixgbe_hwmon_buff.n_hwmon; i++) {
+                device_remove_file(&adapter->pdev->dev,
+                           &adapter->ixgbe_hwmon_buff.hwmon_list[i].dev_attr);
+        }
+
+        kfree(adapter->ixgbe_hwmon_buff.hwmon_list);
+
+        if (adapter->ixgbe_hwmon_buff.device)
+                hwmon_device_unregister(adapter->ixgbe_hwmon_buff.device);
+}
+
+/* called from ixgbe_main.c */
+void ixgbe_sysfs_exit(struct ixgbe_adapter *adapter)
+{
+        ixgbe_sysfs_del_adapter(adapter);
+}
+
+/* called from ixgbe_main.c */
+int ixgbe_sysfs_init(struct ixgbe_adapter *adapter)
+{
+        struct hwmon_buff *ixgbe_hwmon = &adapter->ixgbe_hwmon_buff;
+        unsigned int i;
+        int n_attrs;
+        int rc = 0;
+
+        /* If this method isn't defined we don't support thermals */
+        if (adapter->hw.mac.ops.init_thermal_sensor_thresh == NULL) {
+                goto exit;
+        }
+
+        /* Don't create thermal hwmon interface if no sensors present */
+        if (adapter->hw.mac.ops.init_thermal_sensor_thresh(&adapter->hw))
+                goto exit;
+
+        /*
+         * Allocation space for max attributs
+         * max num sensors * values (loc, temp, max, caution)
+         */
+        n_attrs = IXGBE_MAX_SENSORS * 4;
+        ixgbe_hwmon->hwmon_list = kcalloc(n_attrs, sizeof(struct hwmon_attr),
+                                          GFP_KERNEL);
+        if (!ixgbe_hwmon->hwmon_list) {
+                rc = -ENOMEM;
+                goto err;
+        }
+
+        ixgbe_hwmon->device = hwmon_device_register(&adapter->pdev->dev);
+        if (IS_ERR(ixgbe_hwmon->device)) {
+                rc = PTR_ERR(ixgbe_hwmon->device);
+                goto err;
+        }
+
+        for (i = 0; i < IXGBE_MAX_SENSORS; i++) {
+                /*
+                 * Only create hwmon sysfs entries for sensors that have
+                 * meaningful data for.
+                 */
+                if (adapter->hw.mac.thermal_sensor_data.sensor[i].location == 0)
+                        continue;
+
+                /* Bail if any hwmon attr struct fails to initialize */
+                rc = ixgbe_add_hwmon_attr(adapter, i, IXGBE_HWMON_TYPE_CAUTION);
+                rc |= ixgbe_add_hwmon_attr(adapter, i, IXGBE_HWMON_TYPE_LOC);
+                rc |= ixgbe_add_hwmon_attr(adapter, i, IXGBE_HWMON_TYPE_TEMP);
+                rc |= ixgbe_add_hwmon_attr(adapter, i, IXGBE_HWMON_TYPE_MAX);
+                if (rc)
+                        goto err;
+        }
+
+        goto exit;
+
+err:
+        ixgbe_sysfs_del_adapter(adapter);
+exit:
+        return rc;
+}
+#endif /* CONFIG_IXGBE_HWMON */
+
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
index 8636e8344fc9..204848d2448c 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
@@ -110,6 +110,28 @@
 #define IXGBE_I2C_CLK_OUT   0x00000002
 #define IXGBE_I2C_DATA_IN   0x00000004
 #define IXGBE_I2C_DATA_OUT  0x00000008
+#define IXGBE_I2C_CLOCK_STRETCHING_TIMEOUT      500
+
+#define IXGBE_I2C_THERMAL_SENSOR_ADDR   0xF8
+#define IXGBE_EMC_INTERNAL_DATA         0x00
+#define IXGBE_EMC_INTERNAL_THERM_LIMIT  0x20
+#define IXGBE_EMC_DIODE1_DATA           0x01
+#define IXGBE_EMC_DIODE1_THERM_LIMIT    0x19
+#define IXGBE_EMC_DIODE2_DATA           0x23
+#define IXGBE_EMC_DIODE2_THERM_LIMIT    0x1A
+
+#define IXGBE_MAX_SENSORS               3
+
+struct ixgbe_thermal_diode_data {
+        u8 location;
+        u8 temp;
+        u8 caution_thresh;
+        u8 max_op_thresh;
+};
+
+struct ixgbe_thermal_sensor_data {
+        struct ixgbe_thermal_diode_data sensor[IXGBE_MAX_SENSORS];
+};
 
 /* Interrupt Registers */
 #define IXGBE_EICR      0x00800
@@ -802,6 +824,8 @@
 #define IXGBE_TRGTTIMH0  0x08C28 /* Target Time Register 0 High - RW */
 #define IXGBE_TRGTTIML1  0x08C2C /* Target Time Register 1 Low - RW */
 #define IXGBE_TRGTTIMH1  0x08C30 /* Target Time Register 1 High - RW */
+#define IXGBE_CLKTIML    0x08C34 /* Clock Out Time Register Low - RW */
+#define IXGBE_CLKTIMH    0x08C38 /* Clock Out Time Register High - RW */
 #define IXGBE_FREQOUT0   0x08C34 /* Frequency Out 0 Control register - RW */
 #define IXGBE_FREQOUT1   0x08C38 /* Frequency Out 1 Control register - RW */
 #define IXGBE_AUXSTMPL0  0x08C3C /* Auxiliary Time Stamp 0 register Low - RO */
@@ -1287,6 +1311,7 @@ enum {
 #define IXGBE_EICR_LINKSEC      0x00200000 /* PN Threshold */
 #define IXGBE_EICR_MNG          0x00400000 /* Manageability Event Interrupt */
 #define IXGBE_EICR_TS           0x00800000 /* Thermal Sensor Event */
+#define IXGBE_EICR_TIMESYNC     0x01000000 /* Timesync Event */
 #define IXGBE_EICR_GPI_SDP0     0x01000000 /* Gen Purpose Interrupt on SDP0 */
 #define IXGBE_EICR_GPI_SDP1     0x02000000 /* Gen Purpose Interrupt on SDP1 */
 #define IXGBE_EICR_GPI_SDP2     0x04000000 /* Gen Purpose Interrupt on SDP2 */
@@ -1304,6 +1329,7 @@ enum {
 #define IXGBE_EICS_MAILBOX      IXGBE_EICR_MAILBOX   /* VF to PF Mailbox Int */
 #define IXGBE_EICS_LSC          IXGBE_EICR_LSC       /* Link Status Change */
 #define IXGBE_EICS_MNG          IXGBE_EICR_MNG       /* MNG Event Interrupt */
+#define IXGBE_EICS_TIMESYNC     IXGBE_EICR_TIMESYNC  /* Timesync Event */
 #define IXGBE_EICS_GPI_SDP0     IXGBE_EICR_GPI_SDP0  /* SDP0 Gen Purpose Int */
 #define IXGBE_EICS_GPI_SDP1     IXGBE_EICR_GPI_SDP1  /* SDP1 Gen Purpose Int */
 #define IXGBE_EICS_GPI_SDP2     IXGBE_EICR_GPI_SDP2  /* SDP2 Gen Purpose Int */
@@ -1322,6 +1348,7 @@ enum {
 #define IXGBE_EIMS_LSC          IXGBE_EICR_LSC       /* Link Status Change */
 #define IXGBE_EIMS_MNG          IXGBE_EICR_MNG       /* MNG Event Interrupt */
 #define IXGBE_EIMS_TS           IXGBE_EICR_TS        /* Thermel Sensor Event */
+#define IXGBE_EIMS_TIMESYNC     IXGBE_EICR_TIMESYNC  /* Timesync Event */
 #define IXGBE_EIMS_GPI_SDP0     IXGBE_EICR_GPI_SDP0  /* SDP0 Gen Purpose Int */
 #define IXGBE_EIMS_GPI_SDP1     IXGBE_EICR_GPI_SDP1  /* SDP1 Gen Purpose Int */
 #define IXGBE_EIMS_GPI_SDP2     IXGBE_EICR_GPI_SDP2  /* SDP2 Gen Purpose Int */
@@ -1339,6 +1366,7 @@ enum {
 #define IXGBE_EIMC_MAILBOX      IXGBE_EICR_MAILBOX   /* VF to PF Mailbox Int */
 #define IXGBE_EIMC_LSC          IXGBE_EICR_LSC       /* Link Status Change */
 #define IXGBE_EIMC_MNG          IXGBE_EICR_MNG       /* MNG Event Interrupt */
+#define IXGBE_EIMC_TIMESYNC     IXGBE_EICR_TIMESYNC  /* Timesync Event */
 #define IXGBE_EIMC_GPI_SDP0     IXGBE_EICR_GPI_SDP0  /* SDP0 Gen Purpose Int */
 #define IXGBE_EIMC_GPI_SDP1     IXGBE_EICR_GPI_SDP1  /* SDP1 Gen Purpose Int */
 #define IXGBE_EIMC_GPI_SDP2     IXGBE_EICR_GPI_SDP2  /* SDP2 Gen Purpose Int */
@@ -1479,8 +1507,10 @@ enum {
 #define IXGBE_ESDP_SDP4 0x00000010 /* SDP4 Data Value */
 #define IXGBE_ESDP_SDP5 0x00000020 /* SDP5 Data Value */
 #define IXGBE_ESDP_SDP6 0x00000040 /* SDP6 Data Value */
+#define IXGBE_ESDP_SDP0_DIR     0x00000100 /* SDP0 IO direction */
 #define IXGBE_ESDP_SDP4_DIR     0x00000004 /* SDP4 IO direction */
 #define IXGBE_ESDP_SDP5_DIR     0x00002000 /* SDP5 IO direction */
+#define IXGBE_ESDP_SDP0_NATIVE  0x00010000 /* SDP0 Native Function */
 
 /* LEDCTL Bit Masks */
 #define IXGBE_LED_IVRT_BASE      0x00000040
@@ -1677,11 +1707,29 @@ enum {
 #define IXGBE_PBANUM0_PTR       0x15
 #define IXGBE_PBANUM1_PTR       0x16
 #define IXGBE_FREE_SPACE_PTR    0X3E
+
+/* External Thermal Sensor Config */
+#define IXGBE_ETS_CFG                   0x26
+#define IXGBE_ETS_LTHRES_DELTA_MASK     0x07C0
+#define IXGBE_ETS_LTHRES_DELTA_SHIFT    6
+#define IXGBE_ETS_TYPE_MASK             0x0038
+#define IXGBE_ETS_TYPE_SHIFT            3
+#define IXGBE_ETS_TYPE_EMC              0x000
+#define IXGBE_ETS_TYPE_EMC_SHIFTED      0x000
+#define IXGBE_ETS_NUM_SENSORS_MASK      0x0007
+#define IXGBE_ETS_DATA_LOC_MASK         0x3C00
+#define IXGBE_ETS_DATA_LOC_SHIFT        10
+#define IXGBE_ETS_DATA_INDEX_MASK       0x0300
+#define IXGBE_ETS_DATA_INDEX_SHIFT      8
+#define IXGBE_ETS_DATA_HTHRESH_MASK     0x00FF
+
 #define IXGBE_SAN_MAC_ADDR_PTR  0x28
 #define IXGBE_DEVICE_CAPS       0x2C
 #define IXGBE_SERIAL_NUMBER_MAC_ADDR 0x11
 #define IXGBE_PCIE_MSIX_82599_CAPS  0x72
+#define IXGBE_MAX_MSIX_VECTORS_82599    0x40
 #define IXGBE_PCIE_MSIX_82598_CAPS  0x62
+#define IXGBE_MAX_MSIX_VECTORS_82598    0x13
 
 /* MSI-X capability fields masks */
 #define IXGBE_PCIE_MSIX_TBL_SZ_MASK     0x7FF
@@ -1839,6 +1887,40 @@ enum {
 #define IXGBE_RXDCTL_RLPML_EN   0x00008000
 #define IXGBE_RXDCTL_VME        0x40000000  /* VLAN mode enable */
 
+#define IXGBE_TSAUXC_EN_CLK   0x00000004
+#define IXGBE_TSAUXC_SYNCLK   0x00000008
+#define IXGBE_TSAUXC_SDP0_INT 0x00000040
+
+#define IXGBE_TSYNCTXCTL_VALID          0x00000001 /* Tx timestamp valid */
+#define IXGBE_TSYNCTXCTL_ENABLED        0x00000010 /* Tx timestamping enabled */
+
+#define IXGBE_TSYNCRXCTL_VALID          0x00000001 /* Rx timestamp valid */
+#define IXGBE_TSYNCRXCTL_TYPE_MASK      0x0000000E /* Rx type mask */
+#define IXGBE_TSYNCRXCTL_TYPE_L2_V2     0x00
+#define IXGBE_TSYNCRXCTL_TYPE_L4_V1     0x02
+#define IXGBE_TSYNCRXCTL_TYPE_L2_L4_V2  0x04
+#define IXGBE_TSYNCRXCTL_TYPE_EVENT_V2  0x0A
+#define IXGBE_TSYNCRXCTL_ENABLED        0x00000010 /* Rx Timestamping enabled */
+
+#define IXGBE_RXMTRL_V1_CTRLT_MASK      0x000000FF
+#define IXGBE_RXMTRL_V1_SYNC_MSG        0x00
+#define IXGBE_RXMTRL_V1_DELAY_REQ_MSG   0x01
+#define IXGBE_RXMTRL_V1_FOLLOWUP_MSG    0x02
+#define IXGBE_RXMTRL_V1_DELAY_RESP_MSG  0x03
+#define IXGBE_RXMTRL_V1_MGMT_MSG        0x04
+
+#define IXGBE_RXMTRL_V2_MSGID_MASK              0x0000FF00
+#define IXGBE_RXMTRL_V2_SYNC_MSG                0x0000
+#define IXGBE_RXMTRL_V2_DELAY_REQ_MSG           0x0100
+#define IXGBE_RXMTRL_V2_PDELAY_REQ_MSG          0x0200
+#define IXGBE_RXMTRL_V2_PDELAY_RESP_MSG         0x0300
+#define IXGBE_RXMTRL_V2_FOLLOWUP_MSG            0x0800
+#define IXGBE_RXMTRL_V2_DELAY_RESP_MSG          0x0900
+#define IXGBE_RXMTRL_V2_PDELAY_FOLLOWUP_MSG     0x0A00
+#define IXGBE_RXMTRL_V2_ANNOUNCE_MSG            0x0B00
+#define IXGBE_RXMTRL_V2_SIGNALING_MSG           0x0C00
+#define IXGBE_RXMTRL_V2_MGMT_MSG                0x0D00
+
 #define IXGBE_FCTRL_SBP 0x00000002 /* Store Bad Packet */
 #define IXGBE_FCTRL_MPE 0x00000100 /* Multicast Promiscuous Ena*/
 #define IXGBE_FCTRL_UPE 0x00000200 /* Unicast Promiscuous Ena */
@@ -1852,7 +1934,7 @@ enum {
 #define IXGBE_MFLCN_DPF         0x00000002 /* Discard Pause Frame */
 #define IXGBE_MFLCN_RPFCE       0x00000004 /* Receive Priority FC Enable */
 #define IXGBE_MFLCN_RFCE        0x00000008 /* Receive FC Enable */
-#define IXGBE_MFLCN_RPFCE_MASK  0x00000FF0 /* Receive FC Mask */
+#define IXGBE_MFLCN_RPFCE_MASK  0x00000FF4 /* Receive FC Mask */
 
 #define IXGBE_MFLCN_RPFCE_SHIFT          4
 
@@ -1968,6 +2050,7 @@ enum {
 #define IXGBE_RXDADV_STAT_FCSTAT_NODDP  0x00000010 /* 01: Ctxt w/o DDP */
 #define IXGBE_RXDADV_STAT_FCSTAT_FCPRSP 0x00000020 /* 10: Recv. FCP_RSP */
 #define IXGBE_RXDADV_STAT_FCSTAT_DDP    0x00000030 /* 11: Ctxt w/ DDP */
+#define IXGBE_RXDADV_STAT_TS            0x00010000 /* IEEE 1588 Time Stamp */
 
 /* PSRTYPE bit definitions */
 #define IXGBE_PSRTYPE_TCPHDR    0x00000010
@@ -2245,6 +2328,7 @@ struct ixgbe_adv_tx_context_desc {
 /* Adv Transmit Descriptor Config Masks */
 #define IXGBE_ADVTXD_DTALEN_MASK      0x0000FFFF /* Data buf length(bytes) */
 #define IXGBE_ADVTXD_MAC_LINKSEC      0x00040000 /* Insert LinkSec */
+#define IXGBE_ADVTXD_MAC_TSTAMP       0x00080000 /* IEEE 1588 Time Stamp */
 #define IXGBE_ADVTXD_IPSEC_SA_INDEX_MASK   0x000003FF /* IPSec SA index */
 #define IXGBE_ADVTXD_IPSEC_ESP_LEN_MASK    0x000001FF /* IPSec ESP length */
 #define IXGBE_ADVTXD_DTYP_MASK  0x00F00000 /* DTYP mask */
@@ -2533,9 +2617,6 @@ enum ixgbe_fc_mode {
         ixgbe_fc_rx_pause,
         ixgbe_fc_tx_pause,
         ixgbe_fc_full,
-#ifdef CONFIG_DCB
-        ixgbe_fc_pfc,
-#endif
         ixgbe_fc_default
 };
 
@@ -2768,10 +2849,12 @@ struct ixgbe_mac_operations {
         void (*set_vlan_anti_spoofing)(struct ixgbe_hw *, bool, int);
 
         /* Flow Control */
-        s32 (*fc_enable)(struct ixgbe_hw *, s32);
+        s32 (*fc_enable)(struct ixgbe_hw *);
 
         /* Manageability interface */
         s32 (*set_fw_drv_ver)(struct ixgbe_hw *, u8, u8, u8, u8);
+        s32 (*get_thermal_sensor_data)(struct ixgbe_hw *);
+        s32 (*init_thermal_sensor_thresh)(struct ixgbe_hw *hw);
 };
 
 struct ixgbe_phy_operations {
@@ -2813,6 +2896,7 @@ struct ixgbe_mac_info {
         u16                             wwnn_prefix;
         /* prefix for World Wide Port Name (WWPN) */
         u16                             wwpn_prefix;
+        u16                             max_msix_vectors;
 #define IXGBE_MAX_MTA                   128
         u32                             mta_shadow[IXGBE_MAX_MTA];
         s32                             mc_filter_type;
@@ -2823,12 +2907,12 @@ struct ixgbe_mac_info {
         u32                             rx_pb_size;
         u32                             max_tx_queues;
         u32                             max_rx_queues;
-        u32                             max_msix_vectors;
         u32                             orig_autoc;
         u32                             orig_autoc2;
         bool                            orig_link_settings_stored;
         bool                            autotry_restart;
         u8                              flags;
+        struct ixgbe_thermal_sensor_data  thermal_sensor_data;
 };
 
 struct ixgbe_phy_info {
@@ -2938,7 +3022,6 @@ struct ixgbe_info {
 #define IXGBE_ERR_OVERTEMP                      -26
 #define IXGBE_ERR_FC_NOT_NEGOTIATED             -27
 #define IXGBE_ERR_FC_NOT_SUPPORTED              -28
-#define IXGBE_ERR_FLOW_CONTROL                  -29
 #define IXGBE_ERR_SFP_SETUP_NOT_COMPLETE        -30
 #define IXGBE_ERR_PBA_SECTION                   -31
 #define IXGBE_ERR_INVALID_ARGUMENT              -32
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
index 97a991403bbd..f90ec078ece2 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
@@ -849,6 +849,8 @@ static struct ixgbe_mac_operations mac_ops_X540 = {
         .release_swfw_sync      = &ixgbe_release_swfw_sync_X540,
         .disable_rx_buff        = &ixgbe_disable_rx_buff_generic,
         .enable_rx_buff         = &ixgbe_enable_rx_buff_generic,
+        .get_thermal_sensor_data = NULL,
+        .init_thermal_sensor_thresh = NULL,
 };
 
 static struct ixgbe_eeprom_operations eeprom_ops_X540 = {
diff --git a/drivers/net/ethernet/intel/ixgbevf/defines.h b/drivers/net/ethernet/intel/ixgbevf/defines.h
index 947b5c830735..e09a6cc633bb 100644
--- a/drivers/net/ethernet/intel/ixgbevf/defines.h
+++ b/drivers/net/ethernet/intel/ixgbevf/defines.h
@@ -40,6 +40,7 @@
 typedef u32 ixgbe_link_speed;
 #define IXGBE_LINK_SPEED_1GB_FULL       0x0020
 #define IXGBE_LINK_SPEED_10GB_FULL      0x0080
+#define IXGBE_LINK_SPEED_100_FULL       0x0008
 
 #define IXGBE_CTRL_RST              0x04000000 /* Reset (SW) */
 #define IXGBE_RXDCTL_ENABLE         0x02000000 /* Enable specific Rx Queue */
@@ -48,6 +49,7 @@ typedef u32 ixgbe_link_speed;
 #define IXGBE_LINKS_SPEED_82599     0x30000000
 #define IXGBE_LINKS_SPEED_10G_82599 0x30000000
 #define IXGBE_LINKS_SPEED_1G_82599  0x20000000
+#define IXGBE_LINKS_SPEED_100_82599 0x10000000
 
 /* Number of Transmit and Receive Descriptors must be a multiple of 8 */
 #define IXGBE_REQ_TX_DESCRIPTOR_MULTIPLE  8
diff --git a/drivers/net/ethernet/intel/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
index 2bfe0d1d7958..e8dddf572d38 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
@@ -107,10 +107,20 @@ static int ixgbevf_get_settings(struct net_device *netdev,
         hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
 
         if (link_up) {
-                ethtool_cmd_speed_set(
-                        ecmd,
-                        (link_speed == IXGBE_LINK_SPEED_10GB_FULL) ?
-                        SPEED_10000 : SPEED_1000);
+                __u32 speed = SPEED_10000;
+                switch (link_speed) {
+                case IXGBE_LINK_SPEED_10GB_FULL:
+                        speed = SPEED_10000;
+                        break;
+                case IXGBE_LINK_SPEED_1GB_FULL:
+                        speed = SPEED_1000;
+                        break;
+                case IXGBE_LINK_SPEED_100_FULL:
+                        speed = SPEED_100;
+                        break;
+                }
+
+                ethtool_cmd_speed_set(ecmd, speed);
                 ecmd->duplex = DUPLEX_FULL;
         } else {
                 ethtool_cmd_speed_set(ecmd, -1);
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
index dfed420a1bf6..0a1b99240d43 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
@@ -287,7 +287,7 @@ extern const struct ixgbe_mbx_operations ixgbevf_mbx_ops;
 extern const char ixgbevf_driver_name[];
 extern const char ixgbevf_driver_version[];
 
-extern int ixgbevf_up(struct ixgbevf_adapter *adapter);
+extern void ixgbevf_up(struct ixgbevf_adapter *adapter);
 extern void ixgbevf_down(struct ixgbevf_adapter *adapter);
 extern void ixgbevf_reinit_locked(struct ixgbevf_adapter *adapter);
 extern void ixgbevf_reset(struct ixgbevf_adapter *adapter);
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 307611ae831d..f69ec4288b10 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -57,7 +57,7 @@ const char ixgbevf_driver_name[] = "ixgbevf";
 static const char ixgbevf_driver_string[] =
         "Intel(R) 10 Gigabit PCI Express Virtual Function Network Driver";
 
-#define DRV_VERSION "2.2.0-k"
+#define DRV_VERSION "2.6.0-k"
 const char ixgbevf_driver_version[] = DRV_VERSION;
 static char ixgbevf_copyright[] =
         "Copyright (c) 2009 - 2012 Intel Corporation.";
@@ -1608,13 +1608,14 @@ static void ixgbevf_init_last_counter_stats(struct ixgbevf_adapter *adapter)
         adapter->stats.base_vfmprc = adapter->stats.last_vfmprc;
 }
 
-static int ixgbevf_up_complete(struct ixgbevf_adapter *adapter)
+static void ixgbevf_up_complete(struct ixgbevf_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
         struct ixgbe_hw *hw = &adapter->hw;
         int i, j = 0;
         int num_rx_rings = adapter->num_rx_queues;
         u32 txdctl, rxdctl;
+        u32 msg[2];
 
         for (i = 0; i < adapter->num_tx_queues; i++) {
                 j = adapter->tx_ring[i].reg_idx;
@@ -1653,6 +1654,10 @@ static int ixgbevf_up_complete(struct ixgbevf_adapter *adapter)
                         hw->mac.ops.set_rar(hw, 0, hw->mac.perm_addr, 0);
         }
 
+        msg[0] = IXGBE_VF_SET_LPE;
+        msg[1] = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
+        hw->mbx.ops.write_posted(hw, msg, 2);
+
         clear_bit(__IXGBEVF_DOWN, &adapter->state);
         ixgbevf_napi_enable_all(adapter);
 
@@ -1667,24 +1672,20 @@ static int ixgbevf_up_complete(struct ixgbevf_adapter *adapter)
         adapter->flags |= IXGBE_FLAG_NEED_LINK_UPDATE;
         adapter->link_check_timeout = jiffies;
         mod_timer(&adapter->watchdog_timer, jiffies);
-        return 0;
 }
 
-int ixgbevf_up(struct ixgbevf_adapter *adapter)
+void ixgbevf_up(struct ixgbevf_adapter *adapter)
 {
-        int err;
         struct ixgbe_hw *hw = &adapter->hw;
 
         ixgbevf_configure(adapter);
 
-        err = ixgbevf_up_complete(adapter);
+        ixgbevf_up_complete(adapter);
 
         /* clear any pending interrupts, may auto mask */
         IXGBE_READ_REG(hw, IXGBE_VTEICR);
 
         ixgbevf_irq_enable(adapter, true, true);
-
-        return err;
 }
 
 /**
@@ -2673,9 +2674,7 @@ static int ixgbevf_open(struct net_device *netdev)
          */
         ixgbevf_map_rings_to_vectors(adapter);
 
-        err = ixgbevf_up_complete(adapter);
-        if (err)
-                goto err_up;
+        ixgbevf_up_complete(adapter);
 
         /* clear any pending interrupts, may auto mask */
         IXGBE_READ_REG(hw, IXGBE_VTEICR);
@@ -2689,7 +2688,6 @@ static int ixgbevf_open(struct net_device *netdev)
 
 err_req_irq:
         ixgbevf_down(adapter);
-err_up:
         ixgbevf_free_irq(adapter);
 err_setup_rx:
         ixgbevf_free_all_rx_resources(adapter);
@@ -3196,9 +3194,11 @@ static int ixgbevf_change_mtu(struct net_device *netdev, int new_mtu)
         /* must set new MTU before calling down or up */
         netdev->mtu = new_mtu;
 
-        msg[0] = IXGBE_VF_SET_LPE;
-        msg[1] = max_frame;
-        hw->mbx.ops.write_posted(hw, msg, 2);
+        if (!netif_running(netdev)) {
+                msg[0] = IXGBE_VF_SET_LPE;
+                msg[1] = max_frame;
+                hw->mbx.ops.write_posted(hw, msg, 2);
+        }
 
         if (netif_running(netdev))
                 ixgbevf_reinit_locked(adapter);
diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c
index 74be7411242a..ec89b86f7ca4 100644
--- a/drivers/net/ethernet/intel/ixgbevf/vf.c
+++ b/drivers/net/ethernet/intel/ixgbevf/vf.c
@@ -404,11 +404,17 @@ static s32 ixgbevf_check_mac_link_vf(struct ixgbe_hw *hw,
         else
                 *link_up = false;
 
-        if ((links_reg & IXGBE_LINKS_SPEED_82599) ==
-            IXGBE_LINKS_SPEED_10G_82599)
+        switch (links_reg & IXGBE_LINKS_SPEED_82599) {
+        case IXGBE_LINKS_SPEED_10G_82599:
                 *speed = IXGBE_LINK_SPEED_10GB_FULL;
-        else
+                break;
+        case IXGBE_LINKS_SPEED_1G_82599:
                 *speed = IXGBE_LINK_SPEED_1GB_FULL;
+                break;
+        case IXGBE_LINKS_SPEED_100_82599:
+                *speed = IXGBE_LINK_SPEED_100_FULL;
+                break;
+        }
 
         return 0;
 }
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 5e1ca0f05090..c8950da60e6b 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -1665,6 +1665,7 @@ static const struct ethtool_ops mv643xx_eth_ethtool_ops = {
         .get_strings            = mv643xx_eth_get_strings,
         .get_ethtool_stats      = mv643xx_eth_get_ethtool_stats,
         .get_sset_count         = mv643xx_eth_get_sset_count,
+        .get_ts_info            = ethtool_op_get_ts_info,
 };
 
 
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index efec6b60b327..1db023b075a1 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -1456,6 +1456,7 @@ static const struct ethtool_ops pxa168_ethtool_ops = {
         .set_settings = pxa168_set_settings,
         .get_drvinfo = pxa168_get_drvinfo,
         .get_link = ethtool_op_get_link,
+        .get_ts_info = ethtool_op_get_ts_info,
 };
 
 static const struct net_device_ops pxa168_eth_netdev_ops = {
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index c9b504e2dfc3..cace36f2ab92 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -2494,8 +2494,13 @@ static struct sk_buff *receive_copy(struct sky2_port *sky2,
                 skb_copy_from_linear_data(re->skb, skb->data, length);
                 skb->ip_summed = re->skb->ip_summed;
                 skb->csum = re->skb->csum;
+                skb->rxhash = re->skb->rxhash;
+                skb->vlan_tci = re->skb->vlan_tci;
+
                 pci_dma_sync_single_for_device(sky2->hw->pdev, re->data_addr,
                                                length, PCI_DMA_FROMDEVICE);
+                re->skb->vlan_tci = 0;
+                re->skb->rxhash = 0;
                 re->skb->ip_summed = CHECKSUM_NONE;
                 skb_put(skb, length);
         }
@@ -2580,9 +2585,6 @@ static struct sk_buff *sky2_receive(struct net_device *dev,
         struct sk_buff *skb = NULL;
         u16 count = (status & GMR_FS_LEN) >> 16;
 
-        if (status & GMR_FS_VLAN)
-                count -= VLAN_HLEN;     /* Account for vlan tag */
-
         netif_printk(sky2, rx_status, KERN_DEBUG, dev,
                      "rx slot %u status 0x%x len %d\n",
                      sky2->rx_next, status, length);
@@ -2590,6 +2592,9 @@ static struct sk_buff *sky2_receive(struct net_device *dev,
         sky2->rx_next = (sky2->rx_next + 1) % sky2->rx_pending;
         prefetch(sky2->rx_ring + sky2->rx_next);
 
+        if (vlan_tx_tag_present(re->skb))
+                count -= VLAN_HLEN;     /* Account for vlan tag */
+
         /* This chip has hardware problems that generates bogus status.
          * So do only marginal checking and expect higher level protocols
          * to handle crap frames.
@@ -2647,11 +2652,8 @@ static inline void sky2_tx_done(struct net_device *dev, u16 last)
 }
 
 static inline void sky2_skb_rx(const struct sky2_port *sky2,
-                               u32 status, struct sk_buff *skb)
+                               struct sk_buff *skb)
 {
-        if (status & GMR_FS_VLAN)
-                __vlan_hwaccel_put_tag(skb, be16_to_cpu(sky2->rx_tag));
-
         if (skb->ip_summed == CHECKSUM_NONE)
                 netif_receive_skb(skb);
         else
@@ -2705,6 +2707,14 @@ static void sky2_rx_checksum(struct sky2_port *sky2, u32 status)
         }
 }
 
+static void sky2_rx_tag(struct sky2_port *sky2, u16 length)
+{
+        struct sk_buff *skb;
+
+        skb = sky2->rx_ring[sky2->rx_next].skb;
+        __vlan_hwaccel_put_tag(skb, be16_to_cpu(length));
+}
+
 static void sky2_rx_hash(struct sky2_port *sky2, u32 status)
 {
         struct sk_buff *skb;
@@ -2763,8 +2773,7 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do, u16 idx)
                         }
 
                         skb->protocol = eth_type_trans(skb, dev);
-
-                        sky2_skb_rx(sky2, status, skb);
+                        sky2_skb_rx(sky2, skb);
 
                         /* Stop after net poll weight */
                         if (++work_done >= to_do)
@@ -2772,11 +2781,11 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do, u16 idx)
                         break;
 
                 case OP_RXVLAN:
-                        sky2->rx_tag = length;
+                        sky2_rx_tag(sky2, length);
                         break;
 
                 case OP_RXCHKSVLAN:
-                        sky2->rx_tag = length;
+                        sky2_rx_tag(sky2, length);
                         /* fall through */
                 case OP_RXCHKS:
                         if (likely(dev->features & NETIF_F_RXCSUM))
@@ -4816,14 +4825,14 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw)
 
         init_waitqueue_head(&hw->msi_wait);
 
-        sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW);
-
         err = request_irq(pdev->irq, sky2_test_intr, 0, DRV_NAME, hw);
         if (err) {
                 dev_err(&pdev->dev, "cannot assign irq %d\n", pdev->irq);
                 return err;
         }
 
+        sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW);
+
         sky2_write8(hw, B0_CTST, CS_ST_SW_IRQ);
         sky2_read8(hw, B0_CTST);
 
diff --git a/drivers/net/ethernet/marvell/sky2.h b/drivers/net/ethernet/marvell/sky2.h
index ff6f58bf822a..3c896ce80b71 100644
--- a/drivers/net/ethernet/marvell/sky2.h
+++ b/drivers/net/ethernet/marvell/sky2.h
@@ -2241,7 +2241,6 @@ struct sky2_port {
         u16                  rx_pending;
         u16                  rx_data_size;
         u16                  rx_nfrags;
-        u16                  rx_tag;
 
         struct {
                 unsigned long last;
diff --git a/drivers/net/ethernet/mellanox/mlx4/Kconfig b/drivers/net/ethernet/mellanox/mlx4/Kconfig
index 1bb93531f1ba..5f027f95cc84 100644
--- a/drivers/net/ethernet/mellanox/mlx4/Kconfig
+++ b/drivers/net/ethernet/mellanox/mlx4/Kconfig
@@ -11,6 +11,18 @@ config MLX4_EN
           This driver supports Mellanox Technologies ConnectX Ethernet
           devices.
 
+config MLX4_EN_DCB
+        bool "Data Center Bridging (DCB) Support"
+        default y
+        depends on MLX4_EN && DCB
+        ---help---
+          Say Y here if you want to use Data Center Bridging (DCB) in the
+          driver.
+          If set to N, will not be able to configure QoS and ratelimit attributes.
+          This flag is depended on the kernel's DCB support.
+
+          If unsure, set to Y
+
 config MLX4_CORE
         tristate
         depends on PCI
diff --git a/drivers/net/ethernet/mellanox/mlx4/Makefile b/drivers/net/ethernet/mellanox/mlx4/Makefile
index 4a40ab967eeb..293127d28b33 100644
--- a/drivers/net/ethernet/mellanox/mlx4/Makefile
+++ b/drivers/net/ethernet/mellanox/mlx4/Makefile
@@ -7,3 +7,4 @@ obj-$(CONFIG_MLX4_EN)               += mlx4_en.o
 
 mlx4_en-y :=    en_main.o en_tx.o en_rx.o en_ethtool.o en_port.o en_cq.o \
                 en_resources.o en_netdev.o en_selftest.o
+mlx4_en-$(CONFIG_MLX4_EN_DCB) += en_dcb_nl.o
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index 773c70ea3f62..1bcead1fa2f6 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1254,7 +1254,6 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct mlx4_slave_state *slave_state = priv->mfunc.master.slave_state;
         u32 reply;
-        u32 slave_status = 0;
         u8 is_going_down = 0;
         int i;
 
@@ -1274,10 +1273,8 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
                 }
                 /*check if we are in the middle of FLR process,
                 if so return "retry" status to the slave*/
-                if (MLX4_COMM_CMD_FLR == slave_state[slave].last_cmd) {
-                        slave_status = MLX4_DELAY_RESET_SLAVE;
+                if (MLX4_COMM_CMD_FLR == slave_state[slave].last_cmd)
                         goto inform_slave_state;
-                }
 
                 /* write the version in the event field */
                 reply |= mlx4_comm_get_version();
@@ -1557,7 +1554,7 @@ int mlx4_multi_func_init(struct mlx4_dev *dev)
         return 0;
 
 err_resource:
-        mlx4_free_resource_tracker(dev);
+        mlx4_free_resource_tracker(dev, RES_TR_FREE_ALL);
 err_thread:
         flush_workqueue(priv->mfunc.master.comm_wq);
         destroy_workqueue(priv->mfunc.master.comm_wq);
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_cq.c b/drivers/net/ethernet/mellanox/mlx4/en_cq.c
index 00b81272e314..908a460d8db6 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_cq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_cq.c
@@ -124,11 +124,7 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq,
         cq->mcq.comp  = cq->is_tx ? mlx4_en_tx_irq : mlx4_en_rx_irq;
         cq->mcq.event = mlx4_en_cq_event;
 
-        if (cq->is_tx) {
-                init_timer(&cq->timer);
-                cq->timer.function = mlx4_en_poll_tx_cq;
-                cq->timer.data = (unsigned long) cq;
-        } else {
+        if (!cq->is_tx) {
                 netif_napi_add(cq->dev, &cq->napi, mlx4_en_poll_rx_cq, 64);
                 napi_enable(&cq->napi);
         }
@@ -151,16 +147,12 @@ void mlx4_en_destroy_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)
 
 void mlx4_en_deactivate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)
 {
-        struct mlx4_en_dev *mdev = priv->mdev;
-
-        if (cq->is_tx)
-                del_timer(&cq->timer);
-        else {
+        if (!cq->is_tx) {
                 napi_disable(&cq->napi);
                 netif_napi_del(&cq->napi);
         }
 
-        mlx4_cq_free(mdev->dev, &cq->mcq);
+        mlx4_cq_free(priv->mdev->dev, &cq->mcq);
 }
 
 /* Set rx cq moderation parameters */
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
new file mode 100644
index 000000000000..5d36795877cb
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
@@ -0,0 +1,255 @@
+/*
+ * Copyright (c) 2011 Mellanox Technologies. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include <linux/dcbnl.h>
+#include <linux/math64.h>
+
+#include "mlx4_en.h"
+
+static int mlx4_en_dcbnl_ieee_getets(struct net_device *dev,
+                                   struct ieee_ets *ets)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct ieee_ets *my_ets = &priv->ets;
+
+        /* No IEEE PFC settings available */
+        if (!my_ets)
+                return -EINVAL;
+
+        ets->ets_cap = IEEE_8021QAZ_MAX_TCS;
+        ets->cbs = my_ets->cbs;
+        memcpy(ets->tc_tx_bw, my_ets->tc_tx_bw, sizeof(ets->tc_tx_bw));
+        memcpy(ets->tc_tsa, my_ets->tc_tsa, sizeof(ets->tc_tsa));
+        memcpy(ets->prio_tc, my_ets->prio_tc, sizeof(ets->prio_tc));
+
+        return 0;
+}
+
+static int mlx4_en_ets_validate(struct mlx4_en_priv *priv, struct ieee_ets *ets)
+{
+        int i;
+        int total_ets_bw = 0;
+        int has_ets_tc = 0;
+
+        for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {
+                if (ets->prio_tc[i] > MLX4_EN_NUM_UP) {
+                        en_err(priv, "Bad priority in UP <=> TC mapping. TC: %d, UP: %d\n",
+                                        i, ets->prio_tc[i]);
+                        return -EINVAL;
+                }
+
+                switch (ets->tc_tsa[i]) {
+                case IEEE_8021QAZ_TSA_STRICT:
+                        break;
+                case IEEE_8021QAZ_TSA_ETS:
+                        has_ets_tc = 1;
+                        total_ets_bw += ets->tc_tx_bw[i];
+                        break;
+                default:
+                        en_err(priv, "TC[%d]: Not supported TSA: %d\n",
+                                        i, ets->tc_tsa[i]);
+                        return -ENOTSUPP;
+                }
+        }
+
+        if (has_ets_tc && total_ets_bw != MLX4_EN_BW_MAX) {
+                en_err(priv, "Bad ETS BW sum: %d. Should be exactly 100%%\n",
+                                total_ets_bw);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int mlx4_en_config_port_scheduler(struct mlx4_en_priv *priv,
+                struct ieee_ets *ets, u16 *ratelimit)
+{
+        struct mlx4_en_dev *mdev = priv->mdev;
+        int num_strict = 0;
+        int i;
+        __u8 tc_tx_bw[IEEE_8021QAZ_MAX_TCS] = { 0 };
+        __u8 pg[IEEE_8021QAZ_MAX_TCS] = { 0 };
+
+        ets = ets ?: &priv->ets;
+        ratelimit = ratelimit ?: priv->maxrate;
+
+        /* higher TC means higher priority => lower pg */
+        for (i = IEEE_8021QAZ_MAX_TCS - 1; i >= 0; i--) {
+                switch (ets->tc_tsa[i]) {
+                case IEEE_8021QAZ_TSA_STRICT:
+                        pg[i] = num_strict++;
+                        tc_tx_bw[i] = MLX4_EN_BW_MAX;
+                        break;
+                case IEEE_8021QAZ_TSA_ETS:
+                        pg[i] = MLX4_EN_TC_ETS;
+                        tc_tx_bw[i] = ets->tc_tx_bw[i] ?: MLX4_EN_BW_MIN;
+                        break;
+                }
+        }
+
+        return mlx4_SET_PORT_SCHEDULER(mdev->dev, priv->port, tc_tx_bw, pg,
+                        ratelimit);
+}
+
+static int
+mlx4_en_dcbnl_ieee_setets(struct net_device *dev, struct ieee_ets *ets)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct mlx4_en_dev *mdev = priv->mdev;
+        int err;
+
+        err = mlx4_en_ets_validate(priv, ets);
+        if (err)
+                return err;
+
+        err = mlx4_SET_PORT_PRIO2TC(mdev->dev, priv->port, ets->prio_tc);
+        if (err)
+                return err;
+
+        err = mlx4_en_config_port_scheduler(priv, ets, NULL);
+        if (err)
+                return err;
+
+        memcpy(&priv->ets, ets, sizeof(priv->ets));
+
+        return 0;
+}
+
+static int mlx4_en_dcbnl_ieee_getpfc(struct net_device *dev,
+                struct ieee_pfc *pfc)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+
+        pfc->pfc_cap = IEEE_8021QAZ_MAX_TCS;
+        pfc->pfc_en = priv->prof->tx_ppp;
+
+        return 0;
+}
+
+static int mlx4_en_dcbnl_ieee_setpfc(struct net_device *dev,
+                struct ieee_pfc *pfc)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct mlx4_en_dev *mdev = priv->mdev;
+        int err;
+
+        en_dbg(DRV, priv, "cap: 0x%x en: 0x%x mbc: 0x%x delay: %d\n",
+                        pfc->pfc_cap,
+                        pfc->pfc_en,
+                        pfc->mbc,
+                        pfc->delay);
+
+        priv->prof->rx_pause = priv->prof->tx_pause = !!pfc->pfc_en;
+        priv->prof->rx_ppp = priv->prof->tx_ppp = pfc->pfc_en;
+
+        err = mlx4_SET_PORT_general(mdev->dev, priv->port,
+                                    priv->rx_skb_size + ETH_FCS_LEN,
+                                    priv->prof->tx_pause,
+                                    priv->prof->tx_ppp,
+                                    priv->prof->rx_pause,
+                                    priv->prof->rx_ppp);
+        if (err)
+                en_err(priv, "Failed setting pause params\n");
+
+        return err;
+}
+
+static u8 mlx4_en_dcbnl_getdcbx(struct net_device *dev)
+{
+        return DCB_CAP_DCBX_VER_IEEE;
+}
+
+static u8 mlx4_en_dcbnl_setdcbx(struct net_device *dev, u8 mode)
+{
+        if ((mode & DCB_CAP_DCBX_LLD_MANAGED) ||
+            (mode & DCB_CAP_DCBX_VER_CEE) ||
+            !(mode & DCB_CAP_DCBX_VER_IEEE) ||
+            !(mode & DCB_CAP_DCBX_HOST))
+                return 1;
+
+        return 0;
+}
+
+#define MLX4_RATELIMIT_UNITS_IN_KB 100000 /* rate-limit HW unit in Kbps */
+static int mlx4_en_dcbnl_ieee_getmaxrate(struct net_device *dev,
+                                   struct ieee_maxrate *maxrate)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        int i;
+
+        if (!priv->maxrate)
+                return -EINVAL;
+
+        for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++)
+                maxrate->tc_maxrate[i] =
+                        priv->maxrate[i] * MLX4_RATELIMIT_UNITS_IN_KB;
+
+        return 0;
+}
+
+static int mlx4_en_dcbnl_ieee_setmaxrate(struct net_device *dev,
+                struct ieee_maxrate *maxrate)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        u16 tmp[IEEE_8021QAZ_MAX_TCS];
+        int i, err;
+
+        for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {
+                /* Convert from Kbps into HW units, rounding result up.
+                 * Setting to 0, means unlimited BW.
+                 */
+                tmp[i] = div_u64(maxrate->tc_maxrate[i] +
+                                 MLX4_RATELIMIT_UNITS_IN_KB - 1,
+                                 MLX4_RATELIMIT_UNITS_IN_KB);
+        }
+
+        err = mlx4_en_config_port_scheduler(priv, NULL, tmp);
+        if (err)
+                return err;
+
+        memcpy(priv->maxrate, tmp, sizeof(*priv->maxrate));
+
+        return 0;
+}
+
+const struct dcbnl_rtnl_ops mlx4_en_dcbnl_ops = {
+        .ieee_getets    = mlx4_en_dcbnl_ieee_getets,
+        .ieee_setets    = mlx4_en_dcbnl_ieee_setets,
+        .ieee_getmaxrate = mlx4_en_dcbnl_ieee_getmaxrate,
+        .ieee_setmaxrate = mlx4_en_dcbnl_ieee_setmaxrate,
+        .ieee_getpfc    = mlx4_en_dcbnl_ieee_getpfc,
+        .ieee_setpfc    = mlx4_en_dcbnl_ieee_setpfc,
+
+        .getdcbx        = mlx4_en_dcbnl_getdcbx,
+        .setdcbx        = mlx4_en_dcbnl_setdcbx,
+};
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index 70346fd7f9c4..72901ce2b088 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -83,7 +83,7 @@ static const char main_strings[][ETH_GSTRING_LEN] = {
 #define NUM_ALL_STATS   (NUM_MAIN_STATS + NUM_PORT_STATS + NUM_PKT_STATS + NUM_PERF_STATS)
 
 static const char mlx4_en_test_names[][ETH_GSTRING_LEN]= {
-        "Interupt Test",
+        "Interrupt Test",
         "Link Test",
         "Speed Test",
         "Register Test",
@@ -359,8 +359,8 @@ static int mlx4_en_get_coalesce(struct net_device *dev,
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
 
-        coal->tx_coalesce_usecs = 0;
-        coal->tx_max_coalesced_frames = 0;
+        coal->tx_coalesce_usecs = priv->tx_usecs;
+        coal->tx_max_coalesced_frames = priv->tx_frames;
         coal->rx_coalesce_usecs = priv->rx_usecs;
         coal->rx_max_coalesced_frames = priv->rx_frames;
 
@@ -388,6 +388,21 @@ static int mlx4_en_set_coalesce(struct net_device *dev,
                                 MLX4_EN_RX_COAL_TIME :
                                 coal->rx_coalesce_usecs;
 
+        /* Setting TX coalescing parameters */
+        if (coal->tx_coalesce_usecs != priv->tx_usecs ||
+            coal->tx_max_coalesced_frames != priv->tx_frames) {
+                priv->tx_usecs = coal->tx_coalesce_usecs;
+                priv->tx_frames = coal->tx_max_coalesced_frames;
+                for (i = 0; i < priv->tx_ring_num; i++) {
+                        priv->tx_cq[i].moder_cnt = priv->tx_frames;
+                        priv->tx_cq[i].moder_time = priv->tx_usecs;
+                        if (mlx4_en_set_cq_moder(priv, &priv->tx_cq[i])) {
+                                en_warn(priv, "Failed changing moderation "
+                                              "for TX cq %d\n", i);
+                        }
+                }
+        }
+
         /* Set adaptive coalescing params */
         priv->pkt_rate_low = coal->pkt_rate_low;
         priv->rx_usecs_low = coal->rx_coalesce_usecs_low;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
index 2097a7d3c5b8..988b2424e1c6 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c
@@ -101,6 +101,8 @@ static int mlx4_en_get_profile(struct mlx4_en_dev *mdev)
         int i;
 
         params->udp_rss = udp_rss;
+        params->num_tx_rings_p_up = min_t(int, num_online_cpus(),
+                        MLX4_EN_MAX_TX_RING_P_UP);
         if (params->udp_rss && !(mdev->dev->caps.flags
                                         & MLX4_DEV_CAP_FLAG_UDP_RSS)) {
                 mlx4_warn(mdev, "UDP RSS is not supported on this device.\n");
@@ -113,8 +115,8 @@ static int mlx4_en_get_profile(struct mlx4_en_dev *mdev)
                 params->prof[i].tx_ppp = pfctx;
                 params->prof[i].tx_ring_size = MLX4_EN_DEF_TX_RING_SIZE;
                 params->prof[i].rx_ring_size = MLX4_EN_DEF_RX_RING_SIZE;
-                params->prof[i].tx_ring_num = MLX4_EN_NUM_TX_RINGS +
-                        (!!pfcrx) * MLX4_EN_NUM_PPP_RINGS;
+                params->prof[i].tx_ring_num = params->num_tx_rings_p_up *
+                        MLX4_EN_NUM_UP;
                 params->prof[i].rss_rings = 0;
         }
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 31b455a49273..926d8aac941c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -45,6 +45,27 @@
 #include "mlx4_en.h"
 #include "en_port.h"
 
+static int mlx4_en_setup_tc(struct net_device *dev, u8 up)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        int i;
+        unsigned int q, offset = 0;
+
+        if (up && up != MLX4_EN_NUM_UP)
+                return -EINVAL;
+
+        netdev_set_num_tc(dev, up);
+
+        /* Partition Tx queues evenly amongst UP's */
+        q = priv->tx_ring_num / up;
+        for (i = 0; i < up; i++) {
+                netdev_set_tc_queue(dev, i, q, offset);
+                offset += q;
+        }
+
+        return 0;
+}
+
 static int mlx4_en_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
@@ -421,6 +442,8 @@ static void mlx4_en_set_default_moderation(struct mlx4_en_priv *priv)
          */
         priv->rx_frames = MLX4_EN_RX_COAL_TARGET;
         priv->rx_usecs = MLX4_EN_RX_COAL_TIME;
+        priv->tx_frames = MLX4_EN_TX_COAL_PKTS;
+        priv->tx_usecs = MLX4_EN_TX_COAL_TIME;
         en_dbg(INTR, priv, "Default coalesing params for mtu:%d - "
                            "rx_frames:%d rx_usecs:%d\n",
                  priv->dev->mtu, priv->rx_frames, priv->rx_usecs);
@@ -437,8 +460,8 @@ static void mlx4_en_set_default_moderation(struct mlx4_en_priv *priv)
 
         for (i = 0; i < priv->tx_ring_num; i++) {
                 cq = &priv->tx_cq[i];
-                cq->moder_cnt = MLX4_EN_TX_COAL_PKTS;
-                cq->moder_time = MLX4_EN_TX_COAL_TIME;
+                cq->moder_cnt = priv->tx_frames;
+                cq->moder_time = priv->tx_usecs;
         }
 
         /* Reset auto-moderation params */
@@ -650,12 +673,18 @@ int mlx4_en_start_port(struct net_device *dev)
 
                 /* Configure ring */
                 tx_ring = &priv->tx_ring[i];
-                err = mlx4_en_activate_tx_ring(priv, tx_ring, cq->mcq.cqn);
+                err = mlx4_en_activate_tx_ring(priv, tx_ring, cq->mcq.cqn,
+                        i / priv->mdev->profile.num_tx_rings_p_up);
                 if (err) {
                         en_err(priv, "Failed allocating Tx ring\n");
                         mlx4_en_deactivate_cq(priv, cq);
                         goto tx_err;
                 }
+                tx_ring->tx_queue = netdev_get_tx_queue(dev, i);
+
+                /* Arm CQ for TX completions */
+                mlx4_en_arm_cq(priv, cq);
+
                 /* Set initial ownership of all Tx TXBBs to SW (1) */
                 for (j = 0; j < tx_ring->buf_size; j += STAMP_STRIDE)
                         *((u32 *) (tx_ring->buf + j)) = 0xffffffff;
@@ -797,12 +826,15 @@ static void mlx4_en_restart(struct work_struct *work)
                                                  watchdog_task);
         struct mlx4_en_dev *mdev = priv->mdev;
         struct net_device *dev = priv->dev;
+        int i;
 
         en_dbg(DRV, priv, "Watchdog task called for port %d\n", priv->port);
 
         mutex_lock(&mdev->state_lock);
         if (priv->port_up) {
                 mlx4_en_stop_port(dev);
+                for (i = 0; i < priv->tx_ring_num; i++)
+                        netdev_tx_reset_queue(priv->tx_ring[i].tx_queue);
                 if (mlx4_en_start_port(dev))
                         en_err(priv, "Failed restarting port %d\n", priv->port);
         }
@@ -966,6 +998,10 @@ void mlx4_en_destroy_netdev(struct net_device *dev)
         mutex_unlock(&mdev->state_lock);
 
         mlx4_en_free_resources(priv);
+
+        kfree(priv->tx_ring);
+        kfree(priv->tx_cq);
+
         free_netdev(dev);
 }
 
@@ -1036,6 +1072,7 @@ static const struct net_device_ops mlx4_netdev_ops = {
         .ndo_poll_controller    = mlx4_en_netpoll,
 #endif
         .ndo_set_features       = mlx4_en_set_features,
+        .ndo_setup_tc           = mlx4_en_setup_tc,
 };
 
 int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
@@ -1070,6 +1107,18 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
         priv->ctrl_flags = cpu_to_be32(MLX4_WQE_CTRL_CQ_UPDATE |
                         MLX4_WQE_CTRL_SOLICITED);
         priv->tx_ring_num = prof->tx_ring_num;
+        priv->tx_ring = kzalloc(sizeof(struct mlx4_en_tx_ring) *
+                        priv->tx_ring_num, GFP_KERNEL);
+        if (!priv->tx_ring) {
+                err = -ENOMEM;
+                goto out;
+        }
+        priv->tx_cq = kzalloc(sizeof(struct mlx4_en_cq) * priv->tx_ring_num,
+                        GFP_KERNEL);
+        if (!priv->tx_cq) {
+                err = -ENOMEM;
+                goto out;
+        }
         priv->rx_ring_num = prof->rx_ring_num;
         priv->mac_index = -1;
         priv->msg_enable = MLX4_EN_MSG_LEVEL;
@@ -1079,6 +1128,10 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
         INIT_WORK(&priv->watchdog_task, mlx4_en_restart);
         INIT_WORK(&priv->linkstate_task, mlx4_en_linkstate);
         INIT_DELAYED_WORK(&priv->stats_task, mlx4_en_do_get_stats);
+#ifdef CONFIG_MLX4_EN_DCB
+        if (!mlx4_is_slave(priv->mdev->dev))
+                dev->dcbnl_ops = &mlx4_en_dcbnl_ops;
+#endif
 
         /* Query for default mac and max mtu */
         priv->max_mtu = mdev->dev->caps.eth_mtu_cap[priv->port];
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_port.h b/drivers/net/ethernet/mellanox/mlx4/en_port.h
index 6934fd7e66ed..745090b49d9e 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_port.h
+++ b/drivers/net/ethernet/mellanox/mlx4/en_port.h
@@ -39,6 +39,8 @@
 #define SET_PORT_PROMISC_SHIFT  31
 #define SET_PORT_MC_PROMISC_SHIFT       30
 
+#define MLX4_EN_NUM_TC          8
+
 #define VLAN_FLTR_SIZE  128
 struct mlx4_set_vlan_fltr_mbox {
         __be32 entry[VLAN_FLTR_SIZE];
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_resources.c b/drivers/net/ethernet/mellanox/mlx4/en_resources.c
index bcbc54c16947..10c24c784b70 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_resources.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_resources.c
@@ -39,7 +39,7 @@
 
 void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride,
                              int is_tx, int rss, int qpn, int cqn,
-                             struct mlx4_qp_context *context)
+                             int user_prio, struct mlx4_qp_context *context)
 {
         struct mlx4_en_dev *mdev = priv->mdev;
 
@@ -57,6 +57,10 @@ void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride,
         context->local_qpn = cpu_to_be32(qpn);
         context->pri_path.ackto = 1 & 0x07;
         context->pri_path.sched_queue = 0x83 | (priv->port - 1) << 6;
+        if (user_prio >= 0) {
+                context->pri_path.sched_queue |= user_prio << 3;
+                context->pri_path.feup = 1 << 6;
+        }
         context->pri_path.counter_index = 0xff;
         context->cqn_send = cpu_to_be32(cqn);
         context->cqn_recv = cpu_to_be32(cqn);
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 9adbd53da525..d49a7ac3187d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -823,7 +823,7 @@ static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv, int qpn,
 
         memset(context, 0, sizeof *context);
         mlx4_en_fill_qp_context(priv, ring->actual_size, ring->stride, 0, 0,
-                                qpn, ring->cqn, context);
+                                qpn, ring->cqn, -1, context);
         context->db_rec_addr = cpu_to_be64(ring->wqres.db.dma);
 
         /* Cancel FCS removal if FW allows */
@@ -890,7 +890,7 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)
         }
         rss_map->indir_qp.event = mlx4_en_sqp_event;
         mlx4_en_fill_qp_context(priv, 0, 0, 0, 1, priv->base_qpn,
-                                priv->rx_ring[0].cqn, &context);
+                                priv->rx_ring[0].cqn, -1, &context);
 
         if (!priv->prof->rss_rings || priv->prof->rss_rings > priv->rx_ring_num)
                 rss_rings = priv->rx_ring_num;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 17968244c399..019d856b1334 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -67,8 +67,6 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
 
         inline_thold = min(inline_thold, MAX_INLINE);
 
-        spin_lock_init(&ring->comp_lock);
-
         tmp = size * sizeof(struct mlx4_en_tx_info);
         ring->tx_info = vmalloc(tmp);
         if (!ring->tx_info)
@@ -156,7 +154,7 @@ void mlx4_en_destroy_tx_ring(struct mlx4_en_priv *priv,
 
 int mlx4_en_activate_tx_ring(struct mlx4_en_priv *priv,
                              struct mlx4_en_tx_ring *ring,
-                             int cq)
+                             int cq, int user_prio)
 {
         struct mlx4_en_dev *mdev = priv->mdev;
         int err;
@@ -174,7 +172,7 @@ int mlx4_en_activate_tx_ring(struct mlx4_en_priv *priv,
         ring->doorbell_qpn = ring->qp.qpn << 8;
 
         mlx4_en_fill_qp_context(priv, ring->size, ring->stride, 1, 0, ring->qpn,
-                                ring->cqn, &ring->context);
+                                ring->cqn, user_prio, &ring->context);
         if (ring->bf_enabled)
                 ring->context.usr_page = cpu_to_be32(ring->bf.uar->index);
 
@@ -317,6 +315,8 @@ static void mlx4_en_process_tx_cq(struct net_device *dev, struct mlx4_en_cq *cq)
         int size = cq->size;
         u32 size_mask = ring->size_mask;
         struct mlx4_cqe *buf = cq->buf;
+        u32 packets = 0;
+        u32 bytes = 0;
 
         if (!priv->port_up)
                 return;
@@ -345,6 +345,8 @@ static void mlx4_en_process_tx_cq(struct net_device *dev, struct mlx4_en_cq *cq)
                                         priv, ring, ring_index,
                                         !!((ring->cons + txbbs_skipped) &
                                                         ring->size));
+                        packets++;
+                        bytes += ring->tx_info[ring_index].nr_bytes;
                 } while (ring_index != new_index);
 
                 ++cons_index;
@@ -361,13 +363,14 @@ static void mlx4_en_process_tx_cq(struct net_device *dev, struct mlx4_en_cq *cq)
         mlx4_cq_set_ci(mcq);
         wmb();
         ring->cons += txbbs_skipped;
+        netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
 
         /* Wakeup Tx queue if this ring stopped it */
         if (unlikely(ring->blocked)) {
                 if ((u32) (ring->prod - ring->cons) <=
                      ring->size - HEADROOM - MAX_DESC_TXBBS) {
                         ring->blocked = 0;
-                        netif_tx_wake_queue(netdev_get_tx_queue(dev, cq->ring));
+                        netif_tx_wake_queue(ring->tx_queue);
                         priv->port_stats.wake_queue++;
                 }
         }
@@ -377,41 +380,12 @@ void mlx4_en_tx_irq(struct mlx4_cq *mcq)
 {
         struct mlx4_en_cq *cq = container_of(mcq, struct mlx4_en_cq, mcq);
         struct mlx4_en_priv *priv = netdev_priv(cq->dev);
-        struct mlx4_en_tx_ring *ring = &priv->tx_ring[cq->ring];
 
-        if (!spin_trylock(&ring->comp_lock))
-                return;
         mlx4_en_process_tx_cq(cq->dev, cq);
-        mod_timer(&cq->timer, jiffies + 1);
-        spin_unlock(&ring->comp_lock);
+        mlx4_en_arm_cq(priv, cq);
 }
 
 
-void mlx4_en_poll_tx_cq(unsigned long data)
-{
-        struct mlx4_en_cq *cq = (struct mlx4_en_cq *) data;
-        struct mlx4_en_priv *priv = netdev_priv(cq->dev);
-        struct mlx4_en_tx_ring *ring = &priv->tx_ring[cq->ring];
-        u32 inflight;
-
-        INC_PERF_COUNTER(priv->pstats.tx_poll);
-
-        if (!spin_trylock_irq(&ring->comp_lock)) {
-                mod_timer(&cq->timer, jiffies + MLX4_EN_TX_POLL_TIMEOUT);
-                return;
-        }
-        mlx4_en_process_tx_cq(cq->dev, cq);
-        inflight = (u32) (ring->prod - ring->cons - ring->last_nr_txbb);
-
-        /* If there are still packets in flight and the timer has not already
-         * been scheduled by the Tx routine then schedule it here to guarantee
-         * completion processing of these packets */
-        if (inflight && priv->port_up)
-                mod_timer(&cq->timer, jiffies + MLX4_EN_TX_POLL_TIMEOUT);
-
-        spin_unlock_irq(&ring->comp_lock);
-}
-
 static struct mlx4_en_tx_desc *mlx4_en_bounce_to_desc(struct mlx4_en_priv *priv,
                                                       struct mlx4_en_tx_ring *ring,
                                                       u32 index,
@@ -440,25 +414,6 @@ static struct mlx4_en_tx_desc *mlx4_en_bounce_to_desc(struct mlx4_en_priv *priv,
         return ring->buf + index * TXBB_SIZE;
 }
 
-static inline void mlx4_en_xmit_poll(struct mlx4_en_priv *priv, int tx_ind)
-{
-        struct mlx4_en_cq *cq = &priv->tx_cq[tx_ind];
-        struct mlx4_en_tx_ring *ring = &priv->tx_ring[tx_ind];
-        unsigned long flags;
-
-        /* If we don't have a pending timer, set one up to catch our recent
-           post in case the interface becomes idle */
-        if (!timer_pending(&cq->timer))
-                mod_timer(&cq->timer, jiffies + MLX4_EN_TX_POLL_TIMEOUT);
-
-        /* Poll the CQ every mlx4_en_TX_MODER_POLL packets */
-        if ((++ring->poll_cnt & (MLX4_EN_TX_POLL_MODER - 1)) == 0)
-                if (spin_trylock_irqsave(&ring->comp_lock, flags)) {
-                        mlx4_en_process_tx_cq(priv->dev, cq);
-                        spin_unlock_irqrestore(&ring->comp_lock, flags);
-                }
-}
-
 static int is_inline(struct sk_buff *skb, void **pfrag)
 {
         void *ptr;
@@ -571,17 +526,16 @@ static void build_inline_wqe(struct mlx4_en_tx_desc *tx_desc, struct sk_buff *sk
 u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
-        u16 vlan_tag = 0;
+        u16 rings_p_up = priv->mdev->profile.num_tx_rings_p_up;
+        u8 up = 0;
 
-        /* If we support per priority flow control and the packet contains
-         * a vlan tag, send the packet to the TX ring assigned to that priority
-         */
-        if (priv->prof->rx_ppp && vlan_tx_tag_present(skb)) {
-                vlan_tag = vlan_tx_tag_get(skb);
-                return MLX4_EN_NUM_TX_RINGS + (vlan_tag >> 13);
-        }
+        if (dev->num_tc)
+                return skb_tx_hash(dev, skb);
 
-        return skb_tx_hash(dev, skb);
+        if (vlan_tx_tag_present(skb))
+                up = vlan_tx_tag_get(skb) >> VLAN_PRIO_SHIFT;
+
+        return __skb_tx_hash(dev, skb, rings_p_up) + up * rings_p_up;
 }
 
 static void mlx4_bf_copy(void __iomem *dst, unsigned long *src, unsigned bytecnt)
@@ -594,7 +548,6 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = priv->mdev;
         struct mlx4_en_tx_ring *ring;
-        struct mlx4_en_cq *cq;
         struct mlx4_en_tx_desc *tx_desc;
         struct mlx4_wqe_data_seg *data;
         struct skb_frag_struct *frag;
@@ -638,13 +591,10 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
         if (unlikely(((int)(ring->prod - ring->cons)) >
                      ring->size - HEADROOM - MAX_DESC_TXBBS)) {
                 /* every full Tx ring stops queue */
-                netif_tx_stop_queue(netdev_get_tx_queue(dev, tx_ind));
+                netif_tx_stop_queue(ring->tx_queue);
                 ring->blocked = 1;
                 priv->port_stats.queue_stopped++;
 
-                /* Use interrupts to find out when queue opened */
-                cq = &priv->tx_cq[tx_ind];
-                mlx4_en_arm_cq(priv, cq);
                 return NETDEV_TX_BUSY;
         }
 
@@ -707,7 +657,7 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
                 priv->port_stats.tso_packets++;
                 i = ((skb->len - lso_header_size) / skb_shinfo(skb)->gso_size) +
                         !!((skb->len - lso_header_size) % skb_shinfo(skb)->gso_size);
-                ring->bytes += skb->len + (i - 1) * lso_header_size;
+                tx_info->nr_bytes = skb->len + (i - 1) * lso_header_size;
                 ring->packets += i;
         } else {
                 /* Normal (Non LSO) packet */
@@ -715,10 +665,12 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
                         ((ring->prod & ring->size) ?
                          cpu_to_be32(MLX4_EN_BIT_DESC_OWN) : 0);
                 data = &tx_desc->data;
-                ring->bytes += max(skb->len, (unsigned int) ETH_ZLEN);
+                tx_info->nr_bytes = max_t(unsigned int, skb->len, ETH_ZLEN);
                 ring->packets++;
 
         }
+        ring->bytes += tx_info->nr_bytes;
+        netdev_tx_sent_queue(ring->tx_queue, tx_info->nr_bytes);
         AVG_PERF_COUNTER(priv->pstats.tx_pktsz_avg, skb->len);
 
 
@@ -792,9 +744,6 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
                 iowrite32be(ring->doorbell_qpn, ring->bf.uar->map + MLX4_SEND_DOORBELL);
         }
 
-        /* Poll CQ here */
-        mlx4_en_xmit_poll(priv, tx_ind);
-
         return NETDEV_TX_OK;
 
 tx_drop:
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index 2a02ba522e60..24429a99190d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -1164,9 +1164,8 @@ int mlx4_INIT_PORT_wrapper(struct mlx4_dev *dev, int slave,
                                MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);
                 if (err)
                         return err;
-                priv->mfunc.master.slave_state[slave].init_port_mask |=
-                        (1 << port);
         }
+        priv->mfunc.master.slave_state[slave].init_port_mask |= (1 << port);
         ++priv->mfunc.master.init_port_ref[port];
         return 0;
 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 8bb05b46db86..984ace44104f 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -1306,7 +1306,7 @@ static void mlx4_cleanup_counters_table(struct mlx4_dev *dev)
         mlx4_bitmap_cleanup(&mlx4_priv(dev)->counters_bitmap);
 }
 
-int mlx4_counter_alloc(struct mlx4_dev *dev, u32 *idx)
+int __mlx4_counter_alloc(struct mlx4_dev *dev, u32 *idx)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
 
@@ -1319,13 +1319,44 @@ int mlx4_counter_alloc(struct mlx4_dev *dev, u32 *idx)
 
         return 0;
 }
+
+int mlx4_counter_alloc(struct mlx4_dev *dev, u32 *idx)
+{
+        u64 out_param;
+        int err;
+
+        if (mlx4_is_mfunc(dev)) {
+                err = mlx4_cmd_imm(dev, 0, &out_param, RES_COUNTER,
+                                   RES_OP_RESERVE, MLX4_CMD_ALLOC_RES,
+                                   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);
+                if (!err)
+                        *idx = get_param_l(&out_param);
+
+                return err;
+        }
+        return __mlx4_counter_alloc(dev, idx);
+}
 EXPORT_SYMBOL_GPL(mlx4_counter_alloc);
 
-void mlx4_counter_free(struct mlx4_dev *dev, u32 idx)
+void __mlx4_counter_free(struct mlx4_dev *dev, u32 idx)
 {
         mlx4_bitmap_free(&mlx4_priv(dev)->counters_bitmap, idx);
         return;
 }
+
+void mlx4_counter_free(struct mlx4_dev *dev, u32 idx)
+{
+        u64 in_param;
+
+        if (mlx4_is_mfunc(dev)) {
+                set_param_l(&in_param, idx);
+                mlx4_cmd(dev, in_param, RES_COUNTER, RES_OP_RESERVE,
+                         MLX4_CMD_FREE_RES, MLX4_CMD_TIME_CLASS_A,
+                         MLX4_CMD_WRAPPED);
+                return;
+        }
+        __mlx4_counter_free(dev, idx);
+}
 EXPORT_SYMBOL_GPL(mlx4_counter_free);
 
 static int mlx4_setup_hca(struct mlx4_dev *dev)
@@ -1865,7 +1896,6 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                                 mlx4_err(dev, "Failed to enable sriov,"
                                          "continuing without sriov enabled"
                                          " (err = %d).\n", err);
-                                num_vfs = 0;
                                 err = 0;
                         } else {
                                 mlx4_warn(dev, "Running in master mode\n");
@@ -2022,7 +2052,7 @@ err_cmd:
         mlx4_cmd_cleanup(dev);
 
 err_sriov:
-        if (num_vfs && (dev->flags & MLX4_FLAG_SRIOV))
+        if (dev->flags & MLX4_FLAG_SRIOV)
                 pci_disable_sriov(pdev);
 
 err_rel_own:
@@ -2070,6 +2100,10 @@ static void mlx4_remove_one(struct pci_dev *pdev)
                         mlx4_CLOSE_PORT(dev, p);
                 }
 
+                if (mlx4_is_master(dev))
+                        mlx4_free_resource_tracker(dev,
+                                                   RES_TR_FREE_SLAVES_ONLY);
+
                 mlx4_cleanup_counters_table(dev);
                 mlx4_cleanup_mcg_table(dev);
                 mlx4_cleanup_qp_table(dev);
@@ -2082,7 +2116,8 @@ static void mlx4_remove_one(struct pci_dev *pdev)
                 mlx4_cleanup_pd_table(dev);
 
                 if (mlx4_is_master(dev))
-                        mlx4_free_resource_tracker(dev);
+                        mlx4_free_resource_tracker(dev,
+                                                   RES_TR_FREE_STRUCTS_ONLY);
 
                 iounmap(priv->kar);
                 mlx4_uar_free(dev, &priv->driver_uar);
@@ -2099,7 +2134,7 @@ static void mlx4_remove_one(struct pci_dev *pdev)
 
                 if (dev->flags & MLX4_FLAG_MSI_X)
                         pci_disable_msix(pdev);
-                if (num_vfs && (dev->flags & MLX4_FLAG_SRIOV)) {
+                if (dev->flags & MLX4_FLAG_SRIOV) {
                         mlx4_warn(dev, "Disabling sriov\n");
                         pci_disable_sriov(pdev);
                 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c
index 4799e824052f..f4a8f98e402a 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mcg.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c
@@ -357,7 +357,6 @@ static int add_promisc_qp(struct mlx4_dev *dev, u8 port,
         u32 prot;
         int i;
         bool found;
-        int last_index;
         int err;
         struct mlx4_priv *priv = mlx4_priv(dev);
 
@@ -419,7 +418,6 @@ static int add_promisc_qp(struct mlx4_dev *dev, u8 port,
                         if (err)
                                 goto out_mailbox;
                 }
-                last_index = entry->index;
         }
 
         /* add the new qpn to list of promisc qps */
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
index 2a0ff2cc7182..86b6e5a2fabf 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@ -53,6 +53,26 @@
 #define DRV_VERSION     "1.1"
 #define DRV_RELDATE     "Dec, 2011"
 
+#define MLX4_NUM_UP             8
+#define MLX4_NUM_TC             8
+#define MLX4_RATELIMIT_UNITS 3 /* 100 Mbps */
+#define MLX4_RATELIMIT_DEFAULT 0xffff
+
+struct mlx4_set_port_prio2tc_context {
+        u8 prio2tc[4];
+};
+
+struct mlx4_port_scheduler_tc_cfg_be {
+        __be16 pg;
+        __be16 bw_precentage;
+        __be16 max_bw_units; /* 3-100Mbps, 4-1Gbps, other values - reserved */
+        __be16 max_bw_value;
+};
+
+struct mlx4_set_port_scheduler_context {
+        struct mlx4_port_scheduler_tc_cfg_be tc[MLX4_NUM_TC];
+};
+
 enum {
         MLX4_HCR_BASE           = 0x80680,
         MLX4_HCR_SIZE           = 0x0001c,
@@ -126,6 +146,11 @@ enum mlx4_alloc_mode {
         RES_OP_MAP_ICM,
 };
 
+enum mlx4_res_tracker_free_type {
+        RES_TR_FREE_ALL,
+        RES_TR_FREE_SLAVES_ONLY,
+        RES_TR_FREE_STRUCTS_ONLY,
+};
 
 /*
  *Virtual HCR structures.
@@ -851,6 +876,10 @@ void __mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac);
 int __mlx4_replace_mac(struct mlx4_dev *dev, u8 port, int qpn, u64 new_mac);
 int __mlx4_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
                      int start_index, int npages, u64 *page_list);
+int __mlx4_counter_alloc(struct mlx4_dev *dev, u32 *idx);
+void __mlx4_counter_free(struct mlx4_dev *dev, u32 idx);
+int __mlx4_xrcd_alloc(struct mlx4_dev *dev, u32 *xrcdn);
+void __mlx4_xrcd_free(struct mlx4_dev *dev, u32 xrcdn);
 
 void mlx4_start_catas_poll(struct mlx4_dev *dev);
 void mlx4_stop_catas_poll(struct mlx4_dev *dev);
@@ -1007,7 +1036,8 @@ int mlx4_get_slave_from_resource_id(struct mlx4_dev *dev,
 void mlx4_delete_all_resources_for_slave(struct mlx4_dev *dev, int slave_id);
 int mlx4_init_resource_tracker(struct mlx4_dev *dev);
 
-void mlx4_free_resource_tracker(struct mlx4_dev *dev);
+void mlx4_free_resource_tracker(struct mlx4_dev *dev,
+                                enum mlx4_res_tracker_free_type type);
 
 int mlx4_SET_PORT_wrapper(struct mlx4_dev *dev, int slave,
                           struct mlx4_vhcr *vhcr,
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index d69fee41f24a..6ae350921b1a 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -40,6 +40,9 @@
 #include <linux/mutex.h>
 #include <linux/netdevice.h>
 #include <linux/if_vlan.h>
+#ifdef CONFIG_MLX4_EN_DCB
+#include <linux/dcbnl.h>
+#endif
 
 #include <linux/mlx4/device.h>
 #include <linux/mlx4/qp.h>
@@ -108,9 +111,8 @@ enum {
 #define MLX4_EN_MIN_TX_SIZE     (4096 / TXBB_SIZE)
 
 #define MLX4_EN_SMALL_PKT_SIZE          64
-#define MLX4_EN_NUM_TX_RINGS            8
-#define MLX4_EN_NUM_PPP_RINGS           8
-#define MAX_TX_RINGS                    (MLX4_EN_NUM_TX_RINGS + MLX4_EN_NUM_PPP_RINGS)
+#define MLX4_EN_MAX_TX_RING_P_UP        32
+#define MLX4_EN_NUM_UP                  8
 #define MLX4_EN_DEF_TX_RING_SIZE        512
 #define MLX4_EN_DEF_RX_RING_SIZE        1024
 
@@ -118,7 +120,7 @@ enum {
 #define MLX4_EN_RX_COAL_TARGET  44
 #define MLX4_EN_RX_COAL_TIME    0x10
 
-#define MLX4_EN_TX_COAL_PKTS    5
+#define MLX4_EN_TX_COAL_PKTS    16
 #define MLX4_EN_TX_COAL_TIME    0x80
 
 #define MLX4_EN_RX_RATE_LOW             400000
@@ -196,6 +198,7 @@ enum cq_type {
 struct mlx4_en_tx_info {
         struct sk_buff *skb;
         u32 nr_txbb;
+        u32 nr_bytes;
         u8 linear;
         u8 data_offset;
         u8 inl;
@@ -251,9 +254,9 @@ struct mlx4_en_tx_ring {
         unsigned long bytes;
         unsigned long packets;
         unsigned long tx_csum;
-        spinlock_t comp_lock;
         struct mlx4_bf bf;
         bool bf_enabled;
+        struct netdev_queue *tx_queue;
 };
 
 struct mlx4_en_rx_desc {
@@ -304,8 +307,6 @@ struct mlx4_en_cq {
         spinlock_t              lock;
         struct net_device      *dev;
         struct napi_struct      napi;
-        /* Per-core Tx cq processing support */
-        struct timer_list timer;
         int size;
         int buf_size;
         unsigned vector;
@@ -336,6 +337,7 @@ struct mlx4_en_profile {
         u32 active_ports;
         u32 small_pkt_int;
         u8 no_reset;
+        u8 num_tx_rings_p_up;
         struct mlx4_en_port_profile prof[MLX4_MAX_PORTS + 1];
 };
 
@@ -411,6 +413,15 @@ struct mlx4_en_frag_info {
 
 };
 
+#ifdef CONFIG_MLX4_EN_DCB
+/* Minimal TC BW - setting to 0 will block traffic */
+#define MLX4_EN_BW_MIN 1
+#define MLX4_EN_BW_MAX 100 /* Utilize 100% of the line */
+
+#define MLX4_EN_TC_ETS 7
+
+#endif
+
 struct mlx4_en_priv {
         struct mlx4_en_dev *mdev;
         struct mlx4_en_port_profile *prof;
@@ -465,9 +476,9 @@ struct mlx4_en_priv {
         u16 num_frags;
         u16 log_rx_info;
 
-        struct mlx4_en_tx_ring tx_ring[MAX_TX_RINGS];
+        struct mlx4_en_tx_ring *tx_ring;
         struct mlx4_en_rx_ring rx_ring[MAX_RX_RINGS];
-        struct mlx4_en_cq tx_cq[MAX_TX_RINGS];
+        struct mlx4_en_cq *tx_cq;
         struct mlx4_en_cq rx_cq[MAX_RX_RINGS];
         struct work_struct mcast_task;
         struct work_struct mac_task;
@@ -484,6 +495,11 @@ struct mlx4_en_priv {
         int vids[128];
         bool wol;
         struct device *ddev;
+
+#ifdef CONFIG_MLX4_EN_DCB
+        struct ieee_ets ets;
+        u16 maxrate[IEEE_8021QAZ_MAX_TCS];
+#endif
 };
 
 enum mlx4_en_wol {
@@ -512,7 +528,6 @@ void mlx4_en_deactivate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);
 int mlx4_en_set_cq_moder(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);
 int mlx4_en_arm_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);
 
-void mlx4_en_poll_tx_cq(unsigned long data);
 void mlx4_en_tx_irq(struct mlx4_cq *mcq);
 u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb);
 netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev);
@@ -522,7 +537,7 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, struct mlx4_en_tx_ring *ri
 void mlx4_en_destroy_tx_ring(struct mlx4_en_priv *priv, struct mlx4_en_tx_ring *ring);
 int mlx4_en_activate_tx_ring(struct mlx4_en_priv *priv,
                              struct mlx4_en_tx_ring *ring,
-                             int cq);
+                             int cq, int user_prio);
 void mlx4_en_deactivate_tx_ring(struct mlx4_en_priv *priv,
                                 struct mlx4_en_tx_ring *ring);
 
@@ -540,8 +555,8 @@ int mlx4_en_process_rx_cq(struct net_device *dev,
                           int budget);
 int mlx4_en_poll_rx_cq(struct napi_struct *napi, int budget);
 void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride,
-                             int is_tx, int rss, int qpn, int cqn,
-                             struct mlx4_qp_context *context);
+                int is_tx, int rss, int qpn, int cqn, int user_prio,
+                struct mlx4_qp_context *context);
 void mlx4_en_sqp_event(struct mlx4_qp *qp, enum mlx4_event event);
 int mlx4_en_map_buffer(struct mlx4_buf *buf);
 void mlx4_en_unmap_buffer(struct mlx4_buf *buf);
@@ -558,6 +573,10 @@ int mlx4_SET_VLAN_FLTR(struct mlx4_dev *dev, struct mlx4_en_priv *priv);
 int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset);
 int mlx4_en_QUERY_PORT(struct mlx4_en_dev *mdev, u8 port);
 
+#ifdef CONFIG_MLX4_EN_DCB
+extern const struct dcbnl_rtnl_ops mlx4_en_dcbnl_ops;
+#endif
+
 #define MLX4_EN_NUM_SELF_TEST   5
 void mlx4_en_ex_selftest(struct net_device *dev, u32 *flags, u64 *buf);
 u64 mlx4_en_mac_to_u64(u8 *addr);
diff --git a/drivers/net/ethernet/mellanox/mlx4/mr.c b/drivers/net/ethernet/mellanox/mlx4/mr.c
index fe2ac8449c19..af55b7ce5341 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mr.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mr.c
@@ -788,7 +788,6 @@ int mlx4_fmr_alloc(struct mlx4_dev *dev, u32 pd, u32 access, int max_pages,
                    int max_maps, u8 page_shift, struct mlx4_fmr *fmr)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
-        u64 mtt_offset;
         int err = -ENOMEM;
 
         if (max_maps > dev->caps.max_fmr_maps)
@@ -811,8 +810,6 @@ int mlx4_fmr_alloc(struct mlx4_dev *dev, u32 pd, u32 access, int max_pages,
         if (err)
                 return err;
 
-        mtt_offset = fmr->mr.mtt.offset * dev->caps.mtt_entry_sz;
-
         fmr->mtts = mlx4_table_find(&priv->mr_table.mtt_table,
                                     fmr->mr.mtt.offset,
                                     &fmr->dma_handle);
@@ -895,6 +892,6 @@ EXPORT_SYMBOL_GPL(mlx4_fmr_free);
 int mlx4_SYNC_TPT(struct mlx4_dev *dev)
 {
         return mlx4_cmd(dev, 0, 0, 0, MLX4_CMD_SYNC_TPT, 1000,
-                        MLX4_CMD_WRAPPED);
+                        MLX4_CMD_NATIVE);
 }
 EXPORT_SYMBOL_GPL(mlx4_SYNC_TPT);
diff --git a/drivers/net/ethernet/mellanox/mlx4/pd.c b/drivers/net/ethernet/mellanox/mlx4/pd.c
index db4746d0dca7..1ac88637ad9d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/pd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/pd.c
@@ -63,7 +63,7 @@ void mlx4_pd_free(struct mlx4_dev *dev, u32 pdn)
 }
 EXPORT_SYMBOL_GPL(mlx4_pd_free);
 
-int mlx4_xrcd_alloc(struct mlx4_dev *dev, u32 *xrcdn)
+int __mlx4_xrcd_alloc(struct mlx4_dev *dev, u32 *xrcdn)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
 
@@ -73,12 +73,47 @@ int mlx4_xrcd_alloc(struct mlx4_dev *dev, u32 *xrcdn)
 
         return 0;
 }
+
+int mlx4_xrcd_alloc(struct mlx4_dev *dev, u32 *xrcdn)
+{
+        u64 out_param;
+        int err;
+
+        if (mlx4_is_mfunc(dev)) {
+                err = mlx4_cmd_imm(dev, 0, &out_param,
+                                   RES_XRCD, RES_OP_RESERVE,
+                                   MLX4_CMD_ALLOC_RES,
+                                   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);
+                if (err)
+                        return err;
+
+                *xrcdn = get_param_l(&out_param);
+                return 0;
+        }
+        return __mlx4_xrcd_alloc(dev, xrcdn);
+}
 EXPORT_SYMBOL_GPL(mlx4_xrcd_alloc);
 
-void mlx4_xrcd_free(struct mlx4_dev *dev, u32 xrcdn)
+void __mlx4_xrcd_free(struct mlx4_dev *dev, u32 xrcdn)
 {
         mlx4_bitmap_free(&mlx4_priv(dev)->xrcd_bitmap, xrcdn);
 }
+
+void mlx4_xrcd_free(struct mlx4_dev *dev, u32 xrcdn)
+{
+        u64 in_param;
+        int err;
+
+        if (mlx4_is_mfunc(dev)) {
+                set_param_l(&in_param, xrcdn);
+                err = mlx4_cmd(dev, in_param, RES_XRCD,
+                               RES_OP_RESERVE, MLX4_CMD_FREE_RES,
+                               MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);
+                if (err)
+                        mlx4_warn(dev, "Failed to release xrcdn %d\n", xrcdn);
+        } else
+                __mlx4_xrcd_free(dev, xrcdn);
+}
 EXPORT_SYMBOL_GPL(mlx4_xrcd_free);
 
 int mlx4_init_pd_table(struct mlx4_dev *dev)
diff --git a/drivers/net/ethernet/mellanox/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c
index 77535ff18f1b..1fe2c7a8b40c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/port.c
+++ b/drivers/net/ethernet/mellanox/mlx4/port.c
@@ -338,13 +338,12 @@ EXPORT_SYMBOL_GPL(__mlx4_unregister_mac);
 void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac)
 {
         u64 out_param;
-        int err;
 
         if (mlx4_is_mfunc(dev)) {
                 set_param_l(&out_param, port);
-                err = mlx4_cmd_imm(dev, mac, &out_param, RES_MAC,
-                                   RES_OP_RESERVE_AND_MAP, MLX4_CMD_FREE_RES,
-                                   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);
+                (void) mlx4_cmd_imm(dev, mac, &out_param, RES_MAC,
+                                    RES_OP_RESERVE_AND_MAP, MLX4_CMD_FREE_RES,
+                                    MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);
                 return;
         }
         __mlx4_unregister_mac(dev, port, mac);
@@ -834,6 +833,68 @@ int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
 }
 EXPORT_SYMBOL(mlx4_SET_PORT_qpn_calc);
 
+int mlx4_SET_PORT_PRIO2TC(struct mlx4_dev *dev, u8 port, u8 *prio2tc)
+{
+        struct mlx4_cmd_mailbox *mailbox;
+        struct mlx4_set_port_prio2tc_context *context;
+        int err;
+        u32 in_mod;
+        int i;
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+        context = mailbox->buf;
+        memset(context, 0, sizeof *context);
+
+        for (i = 0; i < MLX4_NUM_UP; i += 2)
+                context->prio2tc[i >> 1] = prio2tc[i] << 4 | prio2tc[i + 1];
+
+        in_mod = MLX4_SET_PORT_PRIO2TC << 8 | port;
+        err = mlx4_cmd(dev, mailbox->dma, in_mod, 1, MLX4_CMD_SET_PORT,
+                       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);
+
+        mlx4_free_cmd_mailbox(dev, mailbox);
+        return err;
+}
+EXPORT_SYMBOL(mlx4_SET_PORT_PRIO2TC);
+
+int mlx4_SET_PORT_SCHEDULER(struct mlx4_dev *dev, u8 port, u8 *tc_tx_bw,
+                u8 *pg, u16 *ratelimit)
+{
+        struct mlx4_cmd_mailbox *mailbox;
+        struct mlx4_set_port_scheduler_context *context;
+        int err;
+        u32 in_mod;
+        int i;
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+        context = mailbox->buf;
+        memset(context, 0, sizeof *context);
+
+        for (i = 0; i < MLX4_NUM_TC; i++) {
+                struct mlx4_port_scheduler_tc_cfg_be *tc = &context->tc[i];
+                u16 r = ratelimit && ratelimit[i] ? ratelimit[i] :
+                        MLX4_RATELIMIT_DEFAULT;
+
+                tc->pg = htons(pg[i]);
+                tc->bw_precentage = htons(tc_tx_bw[i]);
+
+                tc->max_bw_units = htons(MLX4_RATELIMIT_UNITS);
+                tc->max_bw_value = htons(r);
+        }
+
+        in_mod = MLX4_SET_PORT_SCHEDULER << 8 | port;
+        err = mlx4_cmd(dev, mailbox->dma, in_mod, 1, MLX4_CMD_SET_PORT,
+                       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);
+
+        mlx4_free_cmd_mailbox(dev, mailbox);
+        return err;
+}
+EXPORT_SYMBOL(mlx4_SET_PORT_SCHEDULER);
+
 int mlx4_SET_MCAST_FLTR_wrapper(struct mlx4_dev *dev, int slave,
                                 struct mlx4_vhcr *vhcr,
                                 struct mlx4_cmd_mailbox *inbox,
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index 8752e6e08169..b45d0e7f6ab0 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -89,17 +89,6 @@ enum res_qp_states {
         RES_QP_HW
 };
 
-static inline const char *qp_states_str(enum res_qp_states state)
-{
-        switch (state) {
-        case RES_QP_BUSY: return "RES_QP_BUSY";
-        case RES_QP_RESERVED: return "RES_QP_RESERVED";
-        case RES_QP_MAPPED: return "RES_QP_MAPPED";
-        case RES_QP_HW: return "RES_QP_HW";
-        default: return "Unknown";
-        }
-}
-
 struct res_qp {
         struct res_common       com;
         struct res_mtt         *mtt;
@@ -173,16 +162,6 @@ enum res_srq_states {
         RES_SRQ_HW,
 };
 
-static inline const char *srq_states_str(enum res_srq_states state)
-{
-        switch (state) {
-        case RES_SRQ_BUSY: return "RES_SRQ_BUSY";
-        case RES_SRQ_ALLOCATED: return "RES_SRQ_ALLOCATED";
-        case RES_SRQ_HW: return "RES_SRQ_HW";
-        default: return "Unknown";
-        }
-}
-
 struct res_srq {
         struct res_common       com;
         struct res_mtt         *mtt;
@@ -195,20 +174,21 @@ enum res_counter_states {
         RES_COUNTER_ALLOCATED,
 };
 
-static inline const char *counter_states_str(enum res_counter_states state)
-{
-        switch (state) {
-        case RES_COUNTER_BUSY: return "RES_COUNTER_BUSY";
-        case RES_COUNTER_ALLOCATED: return "RES_COUNTER_ALLOCATED";
-        default: return "Unknown";
-        }
-}
-
 struct res_counter {
         struct res_common       com;
         int                     port;
 };
 
+enum res_xrcdn_states {
+        RES_XRCD_BUSY = RES_ANY_BUSY,
+        RES_XRCD_ALLOCATED,
+};
+
+struct res_xrcdn {
+        struct res_common       com;
+        int                     port;
+};
+
 /* For Debug uses */
 static const char *ResourceType(enum mlx4_resource rt)
 {
@@ -221,6 +201,7 @@ static const char *ResourceType(enum mlx4_resource rt)
         case RES_MAC: return  "RES_MAC";
         case RES_EQ: return "RES_EQ";
         case RES_COUNTER: return "RES_COUNTER";
+        case RES_XRCD: return "RES_XRCD";
         default: return "Unknown resource type !!!";
         };
 }
@@ -254,16 +235,23 @@ int mlx4_init_resource_tracker(struct mlx4_dev *dev)
         return 0 ;
 }
 
-void mlx4_free_resource_tracker(struct mlx4_dev *dev)
+void mlx4_free_resource_tracker(struct mlx4_dev *dev,
+                                enum mlx4_res_tracker_free_type type)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
         int i;
 
         if (priv->mfunc.master.res_tracker.slave_list) {
-                for (i = 0 ; i < dev->num_slaves; i++)
-                        mlx4_delete_all_resources_for_slave(dev, i);
-
-                kfree(priv->mfunc.master.res_tracker.slave_list);
+                if (type != RES_TR_FREE_STRUCTS_ONLY)
+                        for (i = 0 ; i < dev->num_slaves; i++)
+                                if (type == RES_TR_FREE_ALL ||
+                                    dev->caps.function != i)
+                                        mlx4_delete_all_resources_for_slave(dev, i);
+
+                if (type != RES_TR_FREE_SLAVES_ONLY) {
+                        kfree(priv->mfunc.master.res_tracker.slave_list);
+                        priv->mfunc.master.res_tracker.slave_list = NULL;
+                }
         }
 }
 
@@ -471,6 +459,20 @@ static struct res_common *alloc_counter_tr(int id)
         return &ret->com;
 }
 
+static struct res_common *alloc_xrcdn_tr(int id)
+{
+        struct res_xrcdn *ret;
+
+        ret = kzalloc(sizeof *ret, GFP_KERNEL);
+        if (!ret)
+                return NULL;
+
+        ret->com.res_id = id;
+        ret->com.state = RES_XRCD_ALLOCATED;
+
+        return &ret->com;
+}
+
 static struct res_common *alloc_tr(int id, enum mlx4_resource type, int slave,
                                    int extra)
 {
@@ -501,7 +503,9 @@ static struct res_common *alloc_tr(int id, enum mlx4_resource type, int slave,
         case RES_COUNTER:
                 ret = alloc_counter_tr(id);
                 break;
-
+        case RES_XRCD:
+                ret = alloc_xrcdn_tr(id);
+                break;
         default:
                 return NULL;
         }
@@ -624,6 +628,16 @@ static int remove_counter_ok(struct res_counter *res)
         return 0;
 }
 
+static int remove_xrcdn_ok(struct res_xrcdn *res)
+{
+        if (res->com.state == RES_XRCD_BUSY)
+                return -EBUSY;
+        else if (res->com.state != RES_XRCD_ALLOCATED)
+                return -EPERM;
+
+        return 0;
+}
+
 static int remove_cq_ok(struct res_cq *res)
 {
         if (res->com.state == RES_CQ_BUSY)
@@ -663,6 +677,8 @@ static int remove_ok(struct res_common *res, enum mlx4_resource type, int extra)
                 return remove_eq_ok((struct res_eq *)res);
         case RES_COUNTER:
                 return remove_counter_ok((struct res_counter *)res);
+        case RES_XRCD:
+                return remove_xrcdn_ok((struct res_xrcdn *)res);
         default:
                 return -EINVAL;
         }
@@ -1269,6 +1285,50 @@ static int vlan_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
         return 0;
 }
 
+static int counter_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
+                             u64 in_param, u64 *out_param)
+{
+        u32 index;
+        int err;
+
+        if (op != RES_OP_RESERVE)
+                return -EINVAL;
+
+        err = __mlx4_counter_alloc(dev, &index);
+        if (err)
+                return err;
+
+        err = add_res_range(dev, slave, index, 1, RES_COUNTER, 0);
+        if (err)
+                __mlx4_counter_free(dev, index);
+        else
+                set_param_l(out_param, index);
+
+        return err;
+}
+
+static int xrcdn_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
+                           u64 in_param, u64 *out_param)
+{
+        u32 xrcdn;
+        int err;
+
+        if (op != RES_OP_RESERVE)
+                return -EINVAL;
+
+        err = __mlx4_xrcd_alloc(dev, &xrcdn);
+        if (err)
+                return err;
+
+        err = add_res_range(dev, slave, xrcdn, 1, RES_XRCD, 0);
+        if (err)
+                __mlx4_xrcd_free(dev, xrcdn);
+        else
+                set_param_l(out_param, xrcdn);
+
+        return err;
+}
+
 int mlx4_ALLOC_RES_wrapper(struct mlx4_dev *dev, int slave,
                            struct mlx4_vhcr *vhcr,
                            struct mlx4_cmd_mailbox *inbox,
@@ -1314,6 +1374,16 @@ int mlx4_ALLOC_RES_wrapper(struct mlx4_dev *dev, int slave,
                                     vhcr->in_param, &vhcr->out_param);
                 break;
 
+        case RES_COUNTER:
+                err = counter_alloc_res(dev, slave, vhcr->op_modifier, alop,
+                                        vhcr->in_param, &vhcr->out_param);
+                break;
+
+        case RES_XRCD:
+                err = xrcdn_alloc_res(dev, slave, vhcr->op_modifier, alop,
+                                      vhcr->in_param, &vhcr->out_param);
+                break;
+
         default:
                 err = -EINVAL;
                 break;
@@ -1496,6 +1566,44 @@ static int vlan_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,
         return 0;
 }
 
+static int counter_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,
+                            u64 in_param, u64 *out_param)
+{
+        int index;
+        int err;
+
+        if (op != RES_OP_RESERVE)
+                return -EINVAL;
+
+        index = get_param_l(&in_param);
+        err = rem_res_range(dev, slave, index, 1, RES_COUNTER, 0);
+        if (err)
+                return err;
+
+        __mlx4_counter_free(dev, index);
+
+        return err;
+}
+
+static int xrcdn_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,
+                          u64 in_param, u64 *out_param)
+{
+        int xrcdn;
+        int err;
+
+        if (op != RES_OP_RESERVE)
+                return -EINVAL;
+
+        xrcdn = get_param_l(&in_param);
+        err = rem_res_range(dev, slave, xrcdn, 1, RES_XRCD, 0);
+        if (err)
+                return err;
+
+        __mlx4_xrcd_free(dev, xrcdn);
+
+        return err;
+}
+
 int mlx4_FREE_RES_wrapper(struct mlx4_dev *dev, int slave,
                           struct mlx4_vhcr *vhcr,
                           struct mlx4_cmd_mailbox *inbox,
@@ -1541,6 +1649,15 @@ int mlx4_FREE_RES_wrapper(struct mlx4_dev *dev, int slave,
                                    vhcr->in_param, &vhcr->out_param);
                 break;
 
+        case RES_COUNTER:
+                err = counter_free_res(dev, slave, vhcr->op_modifier, alop,
+                                       vhcr->in_param, &vhcr->out_param);
+                break;
+
+        case RES_XRCD:
+                err = xrcdn_free_res(dev, slave, vhcr->op_modifier, alop,
+                                     vhcr->in_param, &vhcr->out_param);
+
         default:
                 break;
         }
@@ -2536,7 +2653,7 @@ int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
         struct mlx4_qp qp; /* dummy for calling attach/detach */
         u8 *gid = inbox->buf;
         enum mlx4_protocol prot = (vhcr->in_modifier >> 28) & 0x7;
-        int err, err1;
+        int err;
         int qpn;
         struct res_qp *rqp;
         int attach = vhcr->op_modifier;
@@ -2571,7 +2688,7 @@ int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
 
 ex_rem:
         /* ignore error return below, already in error */
-        err1 = rem_mcg_res(dev, slave, rqp, gid, prot, type);
+        (void) rem_mcg_res(dev, slave, rqp, gid, prot, type);
 ex_put:
         put_res(dev, slave, qpn, RES_QP);
 
@@ -2604,13 +2721,12 @@ static void detach_qp(struct mlx4_dev *dev, int slave, struct res_qp *rqp)
 {
         struct res_gid *rgid;
         struct res_gid *tmp;
-        int err;
         struct mlx4_qp qp; /* dummy for calling attach/detach */
 
         list_for_each_entry_safe(rgid, tmp, &rqp->mcg_list, list) {
                 qp.qpn = rqp->local_qpn;
-                err = mlx4_qp_detach_common(dev, &qp, rgid->gid, rgid->prot,
-                                            rgid->steer);
+                (void) mlx4_qp_detach_common(dev, &qp, rgid->gid, rgid->prot,
+                                             rgid->steer);
                 list_del(&rgid->list);
                 kfree(rgid);
         }
@@ -3036,14 +3152,13 @@ static void rem_slave_eqs(struct mlx4_dev *dev, int slave)
                                                            MLX4_CMD_HW2SW_EQ,
                                                            MLX4_CMD_TIME_CLASS_A,
                                                            MLX4_CMD_NATIVE);
-                                        mlx4_dbg(dev, "rem_slave_eqs: failed"
-                                                 " to move slave %d eqs %d to"
-                                                 " SW ownership\n", slave, eqn);
+                                        if (err)
+                                                mlx4_dbg(dev, "rem_slave_eqs: failed"
+                                                         " to move slave %d eqs %d to"
+                                                         " SW ownership\n", slave, eqn);
                                         mlx4_free_cmd_mailbox(dev, mailbox);
-                                        if (!err) {
-                                                atomic_dec(&eq->mtt->ref_count);
-                                                state = RES_EQ_RESERVED;
-                                        }
+                                        atomic_dec(&eq->mtt->ref_count);
+                                        state = RES_EQ_RESERVED;
                                         break;
 
                                 default:
@@ -3056,6 +3171,64 @@ static void rem_slave_eqs(struct mlx4_dev *dev, int slave)
         spin_unlock_irq(mlx4_tlock(dev));
 }
 
+static void rem_slave_counters(struct mlx4_dev *dev, int slave)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_resource_tracker *tracker = &priv->mfunc.master.res_tracker;
+        struct list_head *counter_list =
+                &tracker->slave_list[slave].res_list[RES_COUNTER];
+        struct res_counter *counter;
+        struct res_counter *tmp;
+        int err;
+        int index;
+
+        err = move_all_busy(dev, slave, RES_COUNTER);
+        if (err)
+                mlx4_warn(dev, "rem_slave_counters: Could not move all counters to "
+                          "busy for slave %d\n", slave);
+
+        spin_lock_irq(mlx4_tlock(dev));
+        list_for_each_entry_safe(counter, tmp, counter_list, com.list) {
+                if (counter->com.owner == slave) {
+                        index = counter->com.res_id;
+                        radix_tree_delete(&tracker->res_tree[RES_COUNTER], index);
+                        list_del(&counter->com.list);
+                        kfree(counter);
+                        __mlx4_counter_free(dev, index);
+                }
+        }
+        spin_unlock_irq(mlx4_tlock(dev));
+}
+
+static void rem_slave_xrcdns(struct mlx4_dev *dev, int slave)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_resource_tracker *tracker = &priv->mfunc.master.res_tracker;
+        struct list_head *xrcdn_list =
+                &tracker->slave_list[slave].res_list[RES_XRCD];
+        struct res_xrcdn *xrcd;
+        struct res_xrcdn *tmp;
+        int err;
+        int xrcdn;
+
+        err = move_all_busy(dev, slave, RES_XRCD);
+        if (err)
+                mlx4_warn(dev, "rem_slave_xrcdns: Could not move all xrcdns to "
+                          "busy for slave %d\n", slave);
+
+        spin_lock_irq(mlx4_tlock(dev));
+        list_for_each_entry_safe(xrcd, tmp, xrcdn_list, com.list) {
+                if (xrcd->com.owner == slave) {
+                        xrcdn = xrcd->com.res_id;
+                        radix_tree_delete(&tracker->res_tree[RES_XRCD], xrcdn);
+                        list_del(&xrcd->com.list);
+                        kfree(xrcd);
+                        __mlx4_xrcd_free(dev, xrcdn);
+                }
+        }
+        spin_unlock_irq(mlx4_tlock(dev));
+}
+
 void mlx4_delete_all_resources_for_slave(struct mlx4_dev *dev, int slave)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
@@ -3069,5 +3242,7 @@ void mlx4_delete_all_resources_for_slave(struct mlx4_dev *dev, int slave)
         rem_slave_mrs(dev, slave);
         rem_slave_eqs(dev, slave);
         rem_slave_mtts(dev, slave);
+        rem_slave_counters(dev, slave);
+        rem_slave_xrcdns(dev, slave);
         mutex_unlock(&priv->mfunc.master.res_tracker.slave_list[slave].mutex);
 }
diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c
index f84dd2dc82b6..24fb049ac2f2 100644
--- a/drivers/net/ethernet/micrel/ks8842.c
+++ b/drivers/net/ethernet/micrel/ks8842.c
@@ -1262,7 +1262,7 @@ static struct platform_driver ks8842_platform_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ks8842_probe,
-        .remove         = ks8842_remove,
+        .remove         = __devexit_p(ks8842_remove),
 };
 
 module_platform_driver(ks8842_platform_driver);
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index c722aa607d07..5e313e9a252f 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -618,10 +618,8 @@ static void ks8851_irq_work(struct work_struct *work)
         netif_dbg(ks, intr, ks->netdev,
                   "%s: status 0x%04x\n", __func__, status);
 
-        if (status & IRQ_LCI) {
-                /* should do something about checking link status */
+        if (status & IRQ_LCI)
                 handled |= IRQ_LCI;
-        }
 
         if (status & IRQ_LDI) {
                 u16 pmecr = ks8851_rdreg16(ks, KS_PMECR);
@@ -684,6 +682,9 @@ static void ks8851_irq_work(struct work_struct *work)
 
         mutex_unlock(&ks->lock);
 
+        if (status & IRQ_LCI)
+                mii_check_link(&ks->mii);
+
         if (status & IRQ_TXI)
                 netif_wake_queue(ks->netdev);
 
@@ -889,16 +890,17 @@ static int ks8851_net_stop(struct net_device *dev)
         netif_stop_queue(dev);
 
         mutex_lock(&ks->lock);
+        /* turn off the IRQs and ack any outstanding */
+        ks8851_wrreg16(ks, KS_IER, 0x0000);
+        ks8851_wrreg16(ks, KS_ISR, 0xffff);
+        mutex_unlock(&ks->lock);
 
         /* stop any outstanding work */
         flush_work(&ks->irq_work);
         flush_work(&ks->tx_work);
         flush_work(&ks->rxctrl_work);
 
-        /* turn off the IRQs and ack any outstanding */
-        ks8851_wrreg16(ks, KS_IER, 0x0000);
-        ks8851_wrreg16(ks, KS_ISR, 0xffff);
-
+        mutex_lock(&ks->lock);
         /* shutdown RX process */
         ks8851_wrreg16(ks, KS_RXCR1, 0x0000);
 
@@ -907,6 +909,7 @@ static int ks8851_net_stop(struct net_device *dev)
 
         /* set powermode to soft power down to save power */
         ks8851_set_powermode(ks, PMECR_PM_SOFTDOWN);
+        mutex_unlock(&ks->lock);
 
         /* ensure any queued tx buffers are dumped */
         while (!skb_queue_empty(&ks->txq)) {
@@ -918,7 +921,6 @@ static int ks8851_net_stop(struct net_device *dev)
                 dev_kfree_skb(txb);
         }
 
-        mutex_unlock(&ks->lock);
         return 0;
 }
 
@@ -1418,6 +1420,7 @@ static int __devinit ks8851_probe(struct spi_device *spi)
         struct net_device *ndev;
         struct ks8851_net *ks;
         int ret;
+        unsigned cider;
 
         ndev = alloc_etherdev(sizeof(struct ks8851_net));
         if (!ndev)
@@ -1484,8 +1487,8 @@ static int __devinit ks8851_probe(struct spi_device *spi)
         ks8851_soft_reset(ks, GRR_GSR);
 
         /* simple check for a valid chip being connected to the bus */
-
-        if ((ks8851_rdreg16(ks, KS_CIDER) & ~CIDER_REV_MASK) != CIDER_ID) {
+        cider = ks8851_rdreg16(ks, KS_CIDER);
+        if ((cider & ~CIDER_REV_MASK) != CIDER_ID) {
                 dev_err(&spi->dev, "failed to read device ID\n");
                 ret = -ENODEV;
                 goto err_id;
@@ -1516,15 +1519,14 @@ static int __devinit ks8851_probe(struct spi_device *spi)
         }
 
         netdev_info(ndev, "revision %d, MAC %pM, IRQ %d, %s EEPROM\n",
-                    CIDER_REV_GET(ks8851_rdreg16(ks, KS_CIDER)),
-                    ndev->dev_addr, ndev->irq,
+                    CIDER_REV_GET(cider), ndev->dev_addr, ndev->irq,
                     ks->rc_ccr & CCR_EEPROM ? "has" : "no");
 
         return 0;
 
 
 err_netdev:
-        free_irq(ndev->irq, ndev);
+        free_irq(ndev->irq, ks);
 
 err_id:
 err_irq:
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c
index b8104d9f4081..5ffde23ac8fb 100644
--- a/drivers/net/ethernet/micrel/ks8851_mll.c
+++ b/drivers/net/ethernet/micrel/ks8851_mll.c
@@ -40,7 +40,7 @@
 #define DRV_NAME        "ks8851_mll"
 
 static u8 KS_DEFAULT_MAC_ADDRESS[] = { 0x00, 0x10, 0xA1, 0x86, 0x95, 0x11 };
-#define MAX_RECV_FRAMES                 32
+#define MAX_RECV_FRAMES                 255
 #define MAX_BUF_SIZE                    2048
 #define TX_BUF_SIZE                     2000
 #define RX_BUF_SIZE                     2000
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index ef723b185d85..eaf9ff0262a9 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -5675,7 +5675,7 @@ static int netdev_set_mac_address(struct net_device *dev, void *addr)
                 memcpy(hw->override_addr, mac->sa_data, ETH_ALEN);
         }
 
-        memcpy(dev->dev_addr, mac->sa_data, MAX_ADDR_LEN);
+        memcpy(dev->dev_addr, mac->sa_data, ETH_ALEN);
 
         interrupt = hw_block_intr(hw);
 
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
index 27273ae1a6e6..90153fc983cb 100644
--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
@@ -4033,7 +4033,6 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         netdev->netdev_ops = &myri10ge_netdev_ops;
         netdev->mtu = myri10ge_initial_mtu;
-        netdev->base_addr = mgp->iomem_base;
         netdev->hw_features = mgp->features | NETIF_F_LRO | NETIF_F_RXCSUM;
         netdev->features = netdev->hw_features;
 
@@ -4047,12 +4046,10 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 netdev->vlan_features &= ~NETIF_F_TSO;
 
         /* make sure we can get an irq, and that MSI can be
-         * setup (if available).  Also ensure netdev->irq
-         * is set to correct value if MSI is enabled */
+         * setup (if available). */
         status = myri10ge_request_irq(mgp);
         if (status != 0)
                 goto abort_with_firmware;
-        netdev->irq = pdev->irq;
         myri10ge_free_irq(mgp);
 
         /* Save configuration space to be restored if the
@@ -4077,7 +4074,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         else
                 dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n",
                          mgp->msi_enabled ? "MSI" : "xPIC",
-                         netdev->irq, mgp->tx_boundary, mgp->fw_name,
+                         pdev->irq, mgp->tx_boundary, mgp->fw_name,
                          (mgp->wc_enabled ? "Enabled" : "Disabled"));
 
         board_number++;
diff --git a/drivers/net/ethernet/natsemi/Kconfig b/drivers/net/ethernet/natsemi/Kconfig
index eb836f770f50..f157334579fd 100644
--- a/drivers/net/ethernet/natsemi/Kconfig
+++ b/drivers/net/ethernet/natsemi/Kconfig
@@ -6,9 +6,8 @@ config NET_VENDOR_NATSEMI
         bool "National Semi-conductor devices"
         default y
         depends on AMIGA_PCMCIA || ARM || EISA || EXPERIMENTAL || H8300 || \
-                   ISA || M32R || MAC || MACH_JAZZ || MACH_TX49XX || MCA || \
-                   MCA_LEGACY || MIPS || PCI || PCMCIA || SUPERH || \
-                   XTENSA_PLATFORM_XT2000 || ZORRO
+                   ISA || M32R || MAC || MACH_JAZZ || MACH_TX49XX || MIPS || \
+                   PCI || PCMCIA || SUPERH || XTENSA_PLATFORM_XT2000 || ZORRO
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
           and read the Ethernet-HOWTO, available from
@@ -21,21 +20,6 @@ config NET_VENDOR_NATSEMI
 
 if NET_VENDOR_NATSEMI
 
-config IBMLANA
-        tristate "IBM LAN Adapter/A support"
-        depends on MCA
-        ---help---
-          This is a Micro Channel Ethernet adapter.  You need to set
-          CONFIG_MCA to use this driver.  It is both available as an in-kernel
-          driver and as a module.
-
-          To compile this driver as a module, choose M here. The only
-          currently supported card is the IBM LAN Adapter/A for Ethernet.  It
-          will both support 16K and 32K memory windows, however a 32K window
-          gives a better security against packet losses.  Usage of multiple
-          boards with this driver should be possible, but has not been tested
-          up to now due to lack of hardware.
-
 config MACSONIC
         tristate "Macintosh SONIC based ethernet (onboard, NuBus, LC, CS)"
         depends on MAC
diff --git a/drivers/net/ethernet/natsemi/Makefile b/drivers/net/ethernet/natsemi/Makefile
index 9aa5dea52b3e..764c532a96d1 100644
--- a/drivers/net/ethernet/natsemi/Makefile
+++ b/drivers/net/ethernet/natsemi/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the National Semi-conductor Sonic devices.
 #
 
-obj-$(CONFIG_IBMLANA) += ibmlana.o
 obj-$(CONFIG_MACSONIC) += macsonic.o
 obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
 obj-$(CONFIG_NATSEMI) += natsemi.o
diff --git a/drivers/net/ethernet/natsemi/natsemi.c b/drivers/net/ethernet/natsemi/natsemi.c
index d38e48d4f430..5b61d12f8b91 100644
--- a/drivers/net/ethernet/natsemi/natsemi.c
+++ b/drivers/net/ethernet/natsemi/natsemi.c
@@ -547,6 +547,7 @@ struct netdev_private {
         struct sk_buff *tx_skbuff[TX_RING_SIZE];
         dma_addr_t tx_dma[TX_RING_SIZE];
         struct net_device *dev;
+        void __iomem *ioaddr;
         struct napi_struct napi;
         /* Media monitoring timer */
         struct timer_list timer;
@@ -699,7 +700,9 @@ static ssize_t natsemi_set_dspcfg_workaround(struct device *dev,
 
 static inline void __iomem *ns_ioaddr(struct net_device *dev)
 {
-        return (void __iomem *) dev->base_addr;
+        struct netdev_private *np = netdev_priv(dev);
+
+        return np->ioaddr;
 }
 
 static inline void natsemi_irq_enable(struct net_device *dev)
@@ -863,10 +866,9 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
         /* Store MAC Address in perm_addr */
         memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN);
 
-        dev->base_addr = (unsigned long __force) ioaddr;
-        dev->irq = irq;
-
         np = netdev_priv(dev);
+        np->ioaddr = ioaddr;
+
         netif_napi_add(dev, &np->napi, natsemi_poll, 64);
         np->dev = dev;
 
@@ -914,9 +916,6 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
         }
 
         option = find_cnt < MAX_UNITS ? options[find_cnt] : 0;
-        if (dev->mem_start)
-                option = dev->mem_start;
-
         /* The lower four bits are the media type. */
         if (option) {
                 if (option & 0x200)
@@ -1532,20 +1531,21 @@ static int netdev_open(struct net_device *dev)
 {
         struct netdev_private *np = netdev_priv(dev);
         void __iomem * ioaddr = ns_ioaddr(dev);
+        const int irq = np->pci_dev->irq;
         int i;
 
         /* Reset the chip, just in case. */
         natsemi_reset(dev);
 
-        i = request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev);
+        i = request_irq(irq, intr_handler, IRQF_SHARED, dev->name, dev);
         if (i) return i;
 
         if (netif_msg_ifup(np))
                 printk(KERN_DEBUG "%s: netdev_open() irq %d.\n",
-                        dev->name, dev->irq);
+                        dev->name, irq);
         i = alloc_ring(dev);
         if (i < 0) {
-                free_irq(dev->irq, dev);
+                free_irq(irq, dev);
                 return i;
         }
         napi_enable(&np->napi);
@@ -1794,6 +1794,7 @@ static void netdev_timer(unsigned long data)
         struct netdev_private *np = netdev_priv(dev);
         void __iomem * ioaddr = ns_ioaddr(dev);
         int next_tick = NATSEMI_TIMER_FREQ;
+        const int irq = np->pci_dev->irq;
 
         if (netif_msg_timer(np)) {
                 /* DO NOT read the IntrStatus register,
@@ -1817,14 +1818,14 @@ static void netdev_timer(unsigned long data)
                                 if (netif_msg_drv(np))
                                         printk(KERN_NOTICE "%s: possible phy reset: "
                                                 "re-initializing\n", dev->name);
-                                disable_irq(dev->irq);
+                                disable_irq(irq);
                                 spin_lock_irq(&np->lock);
                                 natsemi_stop_rxtx(dev);
                                 dump_ring(dev);
                                 reinit_ring(dev);
                                 init_registers(dev);
                                 spin_unlock_irq(&np->lock);
-                                enable_irq(dev->irq);
+                                enable_irq(irq);
                         } else {
                                 /* hurry back */
                                 next_tick = HZ;
@@ -1841,10 +1842,10 @@ static void netdev_timer(unsigned long data)
                 spin_unlock_irq(&np->lock);
         }
         if (np->oom) {
-                disable_irq(dev->irq);
+                disable_irq(irq);
                 np->oom = 0;
                 refill_rx(dev);
-                enable_irq(dev->irq);
+                enable_irq(irq);
                 if (!np->oom) {
                         writel(RxOn, ioaddr + ChipCmd);
                 } else {
@@ -1885,8 +1886,9 @@ static void ns_tx_timeout(struct net_device *dev)
 {
         struct netdev_private *np = netdev_priv(dev);
         void __iomem * ioaddr = ns_ioaddr(dev);
+        const int irq = np->pci_dev->irq;
 
-        disable_irq(dev->irq);
+        disable_irq(irq);
         spin_lock_irq(&np->lock);
         if (!np->hands_off) {
                 if (netif_msg_tx_err(np))
@@ -1905,7 +1907,7 @@ static void ns_tx_timeout(struct net_device *dev)
                         dev->name);
         }
         spin_unlock_irq(&np->lock);
-        enable_irq(dev->irq);
+        enable_irq(irq);
 
         dev->trans_start = jiffies; /* prevent tx timeout */
         dev->stats.tx_errors++;
@@ -2470,9 +2472,12 @@ static struct net_device_stats *get_stats(struct net_device *dev)
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void natsemi_poll_controller(struct net_device *dev)
 {
-        disable_irq(dev->irq);
-        intr_handler(dev->irq, dev);
-        enable_irq(dev->irq);
+        struct netdev_private *np = netdev_priv(dev);
+        const int irq = np->pci_dev->irq;
+
+        disable_irq(irq);
+        intr_handler(irq, dev);
+        enable_irq(irq);
 }
 #endif
 
@@ -2523,8 +2528,9 @@ static int natsemi_change_mtu(struct net_device *dev, int new_mtu)
         if (netif_running(dev)) {
                 struct netdev_private *np = netdev_priv(dev);
                 void __iomem * ioaddr = ns_ioaddr(dev);
+                const int irq = np->pci_dev->irq;
 
-                disable_irq(dev->irq);
+                disable_irq(irq);
                 spin_lock(&np->lock);
                 /* stop engines */
                 natsemi_stop_rxtx(dev);
@@ -2537,7 +2543,7 @@ static int natsemi_change_mtu(struct net_device *dev, int new_mtu)
                 /* restart engines */
                 writel(RxOn | TxOn, ioaddr + ChipCmd);
                 spin_unlock(&np->lock);
-                enable_irq(dev->irq);
+                enable_irq(irq);
         }
         return 0;
 }
@@ -3135,6 +3141,7 @@ static int netdev_close(struct net_device *dev)
 {
         void __iomem * ioaddr = ns_ioaddr(dev);
         struct netdev_private *np = netdev_priv(dev);
+        const int irq = np->pci_dev->irq;
 
         if (netif_msg_ifdown(np))
                 printk(KERN_DEBUG
@@ -3156,14 +3163,14 @@ static int netdev_close(struct net_device *dev)
          */
 
         del_timer_sync(&np->timer);
-        disable_irq(dev->irq);
+        disable_irq(irq);
         spin_lock_irq(&np->lock);
         natsemi_irq_disable(dev);
         np->hands_off = 1;
         spin_unlock_irq(&np->lock);
-        enable_irq(dev->irq);
+        enable_irq(irq);
 
-        free_irq(dev->irq, dev);
+        free_irq(irq, dev);
 
         /* Interrupt disabled, interrupt handler released,
          * queue stopped, timer deleted, rtnl_lock held
@@ -3256,9 +3263,11 @@ static int natsemi_suspend (struct pci_dev *pdev, pm_message_t state)
 
         rtnl_lock();
         if (netif_running (dev)) {
+                const int irq = np->pci_dev->irq;
+
                 del_timer_sync(&np->timer);
 
-                disable_irq(dev->irq);
+                disable_irq(irq);
                 spin_lock_irq(&np->lock);
 
                 natsemi_irq_disable(dev);
@@ -3267,7 +3276,7 @@ static int natsemi_suspend (struct pci_dev *pdev, pm_message_t state)
                 netif_stop_queue(dev);
 
                 spin_unlock_irq(&np->lock);
-                enable_irq(dev->irq);
+                enable_irq(irq);
 
                 napi_disable(&np->napi);
 
@@ -3307,6 +3316,8 @@ static int natsemi_resume (struct pci_dev *pdev)
         if (netif_device_present(dev))
                 goto out;
         if (netif_running(dev)) {
+                const int irq = np->pci_dev->irq;
+
                 BUG_ON(!np->hands_off);
                 ret = pci_enable_device(pdev);
                 if (ret < 0) {
@@ -3320,13 +3331,13 @@ static int natsemi_resume (struct pci_dev *pdev)
 
                 natsemi_reset(dev);
                 init_ring(dev);
-                disable_irq(dev->irq);
+                disable_irq(irq);
                 spin_lock_irq(&np->lock);
                 np->hands_off = 0;
                 init_registers(dev);
                 netif_device_attach(dev);
                 spin_unlock_irq(&np->lock);
-                enable_irq(dev->irq);
+                enable_irq(irq);
 
                 mod_timer(&np->timer, round_jiffies(jiffies + 1*HZ));
         }
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index 6338ef8606ae..bb367582c1e8 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -2846,6 +2846,7 @@ static int s2io_poll_inta(struct napi_struct *napi, int budget)
 static void s2io_netpoll(struct net_device *dev)
 {
         struct s2io_nic *nic = netdev_priv(dev);
+        const int irq = nic->pdev->irq;
         struct XENA_dev_config __iomem *bar0 = nic->bar0;
         u64 val64 = 0xFFFFFFFFFFFFFFFFULL;
         int i;
@@ -2855,7 +2856,7 @@ static void s2io_netpoll(struct net_device *dev)
         if (pci_channel_offline(nic->pdev))
                 return;
 
-        disable_irq(dev->irq);
+        disable_irq(irq);
 
         writeq(val64, &bar0->rx_traffic_int);
         writeq(val64, &bar0->tx_traffic_int);
@@ -2884,7 +2885,7 @@ static void s2io_netpoll(struct net_device *dev)
                         break;
                 }
         }
-        enable_irq(dev->irq);
+        enable_irq(irq);
 }
 #endif
 
@@ -3897,9 +3898,7 @@ static void remove_msix_isr(struct s2io_nic *sp)
 
 static void remove_inta_isr(struct s2io_nic *sp)
 {
-        struct net_device *dev = sp->dev;
-
-        free_irq(sp->pdev->irq, dev);
+        free_irq(sp->pdev->irq, sp->dev);
 }
 
 /* ********************************************************* *
@@ -7046,7 +7045,7 @@ static int s2io_add_isr(struct s2io_nic *sp)
                 }
         }
         if (sp->config.intr_type == INTA) {
-                err = request_irq((int)sp->pdev->irq, s2io_isr, IRQF_SHARED,
+                err = request_irq(sp->pdev->irq, s2io_isr, IRQF_SHARED,
                                   sp->name, dev);
                 if (err) {
                         DBG_PRINT(ERR_DBG, "%s: ISR registration failed\n",
@@ -7908,9 +7907,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                 goto bar1_remap_failed;
         }
 
-        dev->irq = pdev->irq;
-        dev->base_addr = (unsigned long)sp->bar0;
-
         /* Initializing the BAR1 address as the start of the FIFO pointer. */
         for (j = 0; j < MAX_TX_FIFOS; j++) {
                 mac_control->tx_FIFO_start[j] = sp->bar1 + (j * 0x00020000);
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index ef76725454d2..51387c31914b 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
@@ -1882,25 +1882,24 @@ static int vxge_poll_inta(struct napi_struct *napi, int budget)
  */
 static void vxge_netpoll(struct net_device *dev)
 {
-        struct __vxge_hw_device *hldev;
-        struct vxgedev *vdev;
-
-        vdev = netdev_priv(dev);
-        hldev = pci_get_drvdata(vdev->pdev);
+        struct vxgedev *vdev = netdev_priv(dev);
+        struct pci_dev *pdev = vdev->pdev;
+        struct __vxge_hw_device *hldev = pci_get_drvdata(pdev);
+        const int irq = pdev->irq;
 
         vxge_debug_entryexit(VXGE_TRACE, "%s:%d", __func__, __LINE__);
 
-        if (pci_channel_offline(vdev->pdev))
+        if (pci_channel_offline(pdev))
                 return;
 
-        disable_irq(dev->irq);
+        disable_irq(irq);
         vxge_hw_device_clear_tx_rx(hldev);
 
         vxge_hw_device_clear_tx_rx(hldev);
         VXGE_COMPLETE_ALL_RX(vdev);
         VXGE_COMPLETE_ALL_TX(vdev);
 
-        enable_irq(dev->irq);
+        enable_irq(irq);
 
         vxge_debug_entryexit(VXGE_TRACE,
                 "%s:%d  Exiting...", __func__, __LINE__);
@@ -2860,12 +2859,12 @@ static int vxge_open(struct net_device *dev)
                 vdev->config.rx_pause_enable);
 
         if (vdev->vp_reset_timer.function == NULL)
-                vxge_os_timer(vdev->vp_reset_timer,
-                        vxge_poll_vp_reset, vdev, (HZ/2));
+                vxge_os_timer(&vdev->vp_reset_timer, vxge_poll_vp_reset, vdev,
+                              HZ / 2);
 
         /* There is no need to check for RxD leak and RxD lookup on Titan1A */
         if (vdev->titan1 && vdev->vp_lockup_timer.function == NULL)
-                vxge_os_timer(vdev->vp_lockup_timer, vxge_poll_vp_lockup, vdev,
+                vxge_os_timer(&vdev->vp_lockup_timer, vxge_poll_vp_lockup, vdev,
                               HZ / 2);
 
         set_bit(__VXGE_STATE_CARD_UP, &vdev->state);
@@ -3424,9 +3423,6 @@ static int __devinit vxge_device_register(struct __vxge_hw_device *hldev,
         ndev->features |= ndev->hw_features |
                 NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER;
 
-        /*  Driver entry points */
-        ndev->irq = vdev->pdev->irq;
-        ndev->base_addr = (unsigned long) hldev->bar0;
 
         ndev->netdev_ops = &vxge_netdev_ops;
 
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.h b/drivers/net/ethernet/neterion/vxge/vxge-main.h
index f52a42d1dbb7..35f3e7552ec2 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.h
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.h
@@ -416,12 +416,15 @@ struct vxge_tx_priv {
         static int p = val; \
         module_param(p, int, 0)
 
-#define vxge_os_timer(timer, handle, arg, exp) do { \
-                init_timer(&timer); \
-                timer.function = handle; \
-                timer.data = (unsigned long) arg; \
-                mod_timer(&timer, (jiffies + exp)); \
-        } while (0);
+static inline
+void vxge_os_timer(struct timer_list *timer, void (*func)(unsigned long data),
+                   struct vxgedev *vdev, unsigned long timeout)
+{
+        init_timer(timer);
+        timer->function = func;
+        timer->data = (unsigned long)vdev;
+        mod_timer(timer, jiffies + timeout);
+}
 
 void vxge_initialize_ethtool_ops(struct net_device *ndev);
 enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev);
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index aca13046e432..928913c4f3ff 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -2279,6 +2279,8 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         netdev_sent_queue(np->dev, skb->len);
 
+        skb_tx_timestamp(skb);
+
         np->put_tx.orig = put_tx;
 
         spin_unlock_irqrestore(&np->lock, flags);
@@ -2426,6 +2428,8 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb,
 
         netdev_sent_queue(np->dev, skb->len);
 
+        skb_tx_timestamp(skb);
+
         np->put_tx.ex = put_tx;
 
         spin_unlock_irqrestore(&np->lock, flags);
@@ -3942,13 +3946,11 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
                 ret = pci_enable_msi(np->pci_dev);
                 if (ret == 0) {
                         np->msi_flags |= NV_MSI_ENABLED;
-                        dev->irq = np->pci_dev->irq;
                         if (request_irq(np->pci_dev->irq, handler, IRQF_SHARED, dev->name, dev) != 0) {
                                 netdev_info(dev, "request_irq failed %d\n",
                                             ret);
                                 pci_disable_msi(np->pci_dev);
                                 np->msi_flags &= ~NV_MSI_ENABLED;
-                                dev->irq = np->pci_dev->irq;
                                 goto out_err;
                         }
 
@@ -5649,9 +5651,6 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
         np->base = ioremap(addr, np->register_size);
         if (!np->base)
                 goto out_relreg;
-        dev->base_addr = (unsigned long)np->base;
-
-        dev->irq = pci_dev->irq;
 
         np->rx_ring_size = RX_RING_DEFAULT;
         np->tx_ring_size = TX_RING_DEFAULT;
diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c
index 6dfc26d85e47..d3469d8e3f0d 100644
--- a/drivers/net/ethernet/nxp/lpc_eth.c
+++ b/drivers/net/ethernet/nxp/lpc_eth.c
@@ -990,10 +990,10 @@ static int __lpc_handle_recv(struct net_device *ndev, int budget)
                         ndev->stats.rx_errors++;
                 } else {
                         /* Packet is good */
-                        skb = dev_alloc_skb(len + 8);
-                        if (!skb)
+                        skb = dev_alloc_skb(len);
+                        if (!skb) {
                                 ndev->stats.rx_dropped++;
-                        else {
+                        } else {
                                 prdbuf = skb_put(skb, len);
 
                                 /* Copy packet from buffer */
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
index dd14915f54bb..b07311eaa693 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
@@ -584,7 +584,6 @@ struct pch_gbe_hw_stats {
 /**
  * struct pch_gbe_adapter - board specific private data structure
  * @stats_lock: Spinlock structure for status
- * @tx_queue_lock:      Spinlock structure for transmit
  * @ethtool_lock:       Spinlock structure for ethtool
  * @irq_sem:            Semaphore for interrupt
  * @netdev:             Pointer of network device structure
@@ -609,7 +608,6 @@ struct pch_gbe_hw_stats {
 
 struct pch_gbe_adapter {
         spinlock_t stats_lock;
-        spinlock_t tx_queue_lock;
         spinlock_t ethtool_lock;
         atomic_t irq_sem;
         struct net_device *netdev;
@@ -660,6 +658,7 @@ extern u32 pch_src_uuid_lo_read(struct pci_dev *pdev);
 extern u32 pch_src_uuid_hi_read(struct pci_dev *pdev);
 extern u64 pch_rx_snap_read(struct pci_dev *pdev);
 extern u64 pch_tx_snap_read(struct pci_dev *pdev);
+extern int pch_set_station_address(u8 *addr, struct pci_dev *pdev);
 #endif
 
 /* pch_gbe_param.c */
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 8035e5ff6e06..3787c64ee71c 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -79,7 +79,6 @@ const char pch_driver_version[] = DRV_VERSION;
 #define PCH_GBE_PAUSE_PKT4_VALUE    0x01000888
 #define PCH_GBE_PAUSE_PKT5_VALUE    0x0000FFFF
 
-#define PCH_GBE_ETH_ALEN            6
 
 /* This defines the bits that are set in the Interrupt Mask
  * Set/Read Register.  Each bit is documented below:
@@ -101,18 +100,19 @@ const char pch_driver_version[] = DRV_VERSION;
 
 #ifdef CONFIG_PCH_PTP
 /* Macros for ieee1588 */
-#define TICKS_NS_SHIFT  5
-
 /* 0x40 Time Synchronization Channel Control Register Bits */
 #define MASTER_MODE   (1<<0)
-#define SLAVE_MODE    (0<<0)
+#define SLAVE_MODE    (0)
 #define V2_MODE       (1<<31)
-#define CAP_MODE0     (0<<16)
+#define CAP_MODE0     (0)
 #define CAP_MODE2     (1<<17)
 
 /* 0x44 Time Synchronization Channel Event Register Bits */
 #define TX_SNAPSHOT_LOCKED (1<<0)
 #define RX_SNAPSHOT_LOCKED (1<<1)
+
+#define PTP_L4_MULTICAST_SA "01:00:5e:00:01:81"
+#define PTP_L2_MULTICAST_SA "01:1b:19:00:00:00"
 #endif
 
 static unsigned int copybreak __read_mostly = PCH_GBE_COPYBREAK_DEFAULT;
@@ -120,6 +120,7 @@ static unsigned int copybreak __read_mostly = PCH_GBE_COPYBREAK_DEFAULT;
 static int pch_gbe_mdio_read(struct net_device *netdev, int addr, int reg);
 static void pch_gbe_mdio_write(struct net_device *netdev, int addr, int reg,
                                int data);
+static void pch_gbe_set_multi(struct net_device *netdev);
 
 #ifdef CONFIG_PCH_PTP
 static struct sock_filter ptp_filter[] = {
@@ -133,10 +134,8 @@ static int pch_ptp_match(struct sk_buff *skb, u16 uid_hi, u32 uid_lo, u16 seqid)
         u16 *hi, *id;
         u32 lo;
 
-        if ((sk_run_filter(skb, ptp_filter) != PTP_CLASS_V2_IPV4) &&
-                (sk_run_filter(skb, ptp_filter) != PTP_CLASS_V1_IPV4)) {
+        if (sk_run_filter(skb, ptp_filter) == PTP_CLASS_NONE)
                 return 0;
-        }
 
         offset = ETH_HLEN + IPV4_HLEN(data) + UDP_HLEN;
 
@@ -153,8 +152,8 @@ static int pch_ptp_match(struct sk_buff *skb, u16 uid_hi, u32 uid_lo, u16 seqid)
                 seqid  == *id);
 }
 
-static void pch_rx_timestamp(
-                        struct pch_gbe_adapter *adapter, struct sk_buff *skb)
+static void
+pch_rx_timestamp(struct pch_gbe_adapter *adapter, struct sk_buff *skb)
 {
         struct skb_shared_hwtstamps *shhwtstamps;
         struct pci_dev *pdev;
@@ -183,7 +182,6 @@ static void pch_rx_timestamp(
                 goto out;
 
         ns = pch_rx_snap_read(pdev);
-        ns <<= TICKS_NS_SHIFT;
 
         shhwtstamps = skb_hwtstamps(skb);
         memset(shhwtstamps, 0, sizeof(*shhwtstamps));
@@ -192,8 +190,8 @@ out:
         pch_ch_event_write(pdev, RX_SNAPSHOT_LOCKED);
 }
 
-static void pch_tx_timestamp(
-                        struct pch_gbe_adapter *adapter, struct sk_buff *skb)
+static void
+pch_tx_timestamp(struct pch_gbe_adapter *adapter, struct sk_buff *skb)
 {
         struct skb_shared_hwtstamps shhwtstamps;
         struct pci_dev *pdev;
@@ -202,17 +200,16 @@ static void pch_tx_timestamp(
         u32 cnt, val;
 
         shtx = skb_shinfo(skb);
-        if (unlikely(shtx->tx_flags & SKBTX_HW_TSTAMP && adapter->hwts_tx_en))
-                shtx->tx_flags |= SKBTX_IN_PROGRESS;
-        else
+        if (likely(!(shtx->tx_flags & SKBTX_HW_TSTAMP && adapter->hwts_tx_en)))
                 return;
 
+        shtx->tx_flags |= SKBTX_IN_PROGRESS;
+
         /* Get ieee1588's dev information */
         pdev = adapter->ptp_pdev;
 
         /*
          * This really stinks, but we have to poll for the Tx time stamp.
-         * Usually, the time stamp is ready after 4 to 6 microseconds.
          */
         for (cnt = 0; cnt < 100; cnt++) {
                 val = pch_ch_event_read(pdev);
@@ -226,7 +223,6 @@ static void pch_tx_timestamp(
         }
 
         ns = pch_tx_snap_read(pdev);
-        ns <<= TICKS_NS_SHIFT;
 
         memset(&shhwtstamps, 0, sizeof(shhwtstamps));
         shhwtstamps.hwtstamp = ns_to_ktime(ns);
@@ -240,6 +236,7 @@ static int hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
         struct hwtstamp_config cfg;
         struct pch_gbe_adapter *adapter = netdev_priv(netdev);
         struct pci_dev *pdev;
+        u8 station[20];
 
         if (copy_from_user(&cfg, ifr->ifr_data, sizeof(cfg)))
                 return -EFAULT;
@@ -267,15 +264,23 @@ static int hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
                 break;
         case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:
                 adapter->hwts_rx_en = 0;
-                pch_ch_control_write(pdev, (SLAVE_MODE | CAP_MODE0));
+                pch_ch_control_write(pdev, SLAVE_MODE | CAP_MODE0);
                 break;
         case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:
                 adapter->hwts_rx_en = 1;
-                pch_ch_control_write(pdev, (MASTER_MODE | CAP_MODE0));
+                pch_ch_control_write(pdev, MASTER_MODE | CAP_MODE0);
+                break;
+        case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
+                adapter->hwts_rx_en = 1;
+                pch_ch_control_write(pdev, V2_MODE | CAP_MODE2);
+                strcpy(station, PTP_L4_MULTICAST_SA);
+                pch_set_station_address(station, pdev);
                 break;
-        case HWTSTAMP_FILTER_PTP_V2_EVENT:
+        case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:
                 adapter->hwts_rx_en = 1;
-                pch_ch_control_write(pdev, (V2_MODE | CAP_MODE2));
+                pch_ch_control_write(pdev, V2_MODE | CAP_MODE2);
+                strcpy(station, PTP_L2_MULTICAST_SA);
+                pch_set_station_address(station, pdev);
                 break;
         default:
                 return -ERANGE;
@@ -399,18 +404,18 @@ static void pch_gbe_mac_reset_hw(struct pch_gbe_hw *hw)
         iowrite32(PCH_GBE_MODE_GMII_ETHER, &hw->reg->MODE);
 #endif
         pch_gbe_wait_clr_bit(&hw->reg->RESET, PCH_GBE_ALL_RST);
-        /* Setup the receive address */
+        /* Setup the receive addresses */
         pch_gbe_mac_mar_set(hw, hw->mac.addr, 0);
         return;
 }
 
 static void pch_gbe_mac_reset_rx(struct pch_gbe_hw *hw)
 {
-        /* Read the MAC address. and store to the private data */
+        /* Read the MAC addresses. and store to the private data */
         pch_gbe_mac_read_mac_addr(hw);
         iowrite32(PCH_GBE_RX_RST, &hw->reg->RESET);
         pch_gbe_wait_clr_bit_irq(&hw->reg->RESET, PCH_GBE_RX_RST);
-        /* Setup the MAC address */
+        /* Setup the MAC addresses */
         pch_gbe_mac_mar_set(hw, hw->mac.addr, 0);
         return;
 }
@@ -460,7 +465,7 @@ static void pch_gbe_mac_mc_addr_list_update(struct pch_gbe_hw *hw,
                 if (mc_addr_count) {
                         pch_gbe_mac_mar_set(hw, mc_addr_list, i);
                         mc_addr_count--;
-                        mc_addr_list += PCH_GBE_ETH_ALEN;
+                        mc_addr_list += ETH_ALEN;
                 } else {
                         /* Clear MAC address mask */
                         adrmask = ioread32(&hw->reg->ADDR_MASK);
@@ -640,14 +645,11 @@ static void pch_gbe_mac_set_pause_packet(struct pch_gbe_hw *hw)
  */
 static int pch_gbe_alloc_queues(struct pch_gbe_adapter *adapter)
 {
-        int size;
-
-        size = (int)sizeof(struct pch_gbe_tx_ring);
-        adapter->tx_ring = kzalloc(size, GFP_KERNEL);
+        adapter->tx_ring = kzalloc(sizeof(*adapter->tx_ring), GFP_KERNEL);
         if (!adapter->tx_ring)
                 return -ENOMEM;
-        size = (int)sizeof(struct pch_gbe_rx_ring);
-        adapter->rx_ring = kzalloc(size, GFP_KERNEL);
+
+        adapter->rx_ring = kzalloc(sizeof(*adapter->rx_ring), GFP_KERNEL);
         if (!adapter->rx_ring) {
                 kfree(adapter->tx_ring);
                 return -ENOMEM;
@@ -778,6 +780,8 @@ void pch_gbe_reinit_locked(struct pch_gbe_adapter *adapter)
 void pch_gbe_reset(struct pch_gbe_adapter *adapter)
 {
         pch_gbe_mac_reset_hw(&adapter->hw);
+        /* reprogram multicast address register after reset */
+        pch_gbe_set_multi(adapter->netdev);
         /* Setup the receive address. */
         pch_gbe_mac_init_rx_addrs(&adapter->hw, PCH_GBE_MAR_ENTRIES);
         if (pch_gbe_hal_init_hw(&adapter->hw))
@@ -1162,7 +1166,6 @@ static void pch_gbe_tx_queue(struct pch_gbe_adapter *adapter,
         struct sk_buff *tmp_skb;
         unsigned int frame_ctrl;
         unsigned int ring_num;
-        unsigned long flags;
 
         /*-- Set frame control --*/
         frame_ctrl = 0;
@@ -1182,8 +1185,6 @@ static void pch_gbe_tx_queue(struct pch_gbe_adapter *adapter,
                 if (skb->protocol == htons(ETH_P_IP)) {
                         struct iphdr *iph = ip_hdr(skb);
                         unsigned int offset;
-                        iph->check = 0;
-                        iph->check = ip_fast_csum((u8 *) iph, iph->ihl);
                         offset = skb_transport_offset(skb);
                         if (iph->protocol == IPPROTO_TCP) {
                                 skb->csum = 0;
@@ -1211,14 +1212,14 @@ static void pch_gbe_tx_queue(struct pch_gbe_adapter *adapter,
                         }
                 }
         }
-        spin_lock_irqsave(&tx_ring->tx_lock, flags);
+
         ring_num = tx_ring->next_to_use;
         if (unlikely((ring_num + 1) == tx_ring->count))
                 tx_ring->next_to_use = 0;
         else
                 tx_ring->next_to_use = ring_num + 1;
 
-        spin_unlock_irqrestore(&tx_ring->tx_lock, flags);
+
         buffer_info = &tx_ring->buffer_info[ring_num];
         tmp_skb = buffer_info->skb;
 
@@ -1342,6 +1343,8 @@ static void pch_gbe_stop_receive(struct pch_gbe_adapter *adapter)
                 /* Stop Receive */
                 pch_gbe_mac_reset_rx(hw);
         }
+        /* reprogram multicast address register after reset */
+        pch_gbe_set_multi(adapter->netdev);
 }
 
 static void pch_gbe_start_receive(struct pch_gbe_hw *hw)
@@ -1518,7 +1521,7 @@ pch_gbe_alloc_rx_buffers_pool(struct pch_gbe_adapter *adapter,
                                                 &rx_ring->rx_buff_pool_logic,
                                                 GFP_KERNEL);
         if (!rx_ring->rx_buff_pool) {
-                pr_err("Unable to allocate memory for the receive poll buffer\n");
+                pr_err("Unable to allocate memory for the receive pool buffer\n");
                 return -ENOMEM;
         }
         memset(rx_ring->rx_buff_pool, 0, size);
@@ -1637,15 +1640,17 @@ pch_gbe_clean_tx(struct pch_gbe_adapter *adapter,
         pr_debug("called pch_gbe_unmap_and_free_tx_resource() %d count\n",
                  cleaned_count);
         /* Recover from running out of Tx resources in xmit_frame */
+        spin_lock(&tx_ring->tx_lock);
         if (unlikely(cleaned && (netif_queue_stopped(adapter->netdev)))) {
                 netif_wake_queue(adapter->netdev);
                 adapter->stats.tx_restart_count++;
                 pr_debug("Tx wake queue\n");
         }
-        spin_lock(&adapter->tx_queue_lock);
+
         tx_ring->next_to_clean = i;
-        spin_unlock(&adapter->tx_queue_lock);
+
         pr_debug("next_to_clean : %d\n", tx_ring->next_to_clean);
+        spin_unlock(&tx_ring->tx_lock);
         return cleaned;
 }
 
@@ -1924,7 +1929,6 @@ static int pch_gbe_request_irq(struct pch_gbe_adapter *adapter)
 }
 
 
-static void pch_gbe_set_multi(struct net_device *netdev);
 /**
  * pch_gbe_up - Up GbE network device
  * @adapter:  Board private structure
@@ -2037,7 +2041,6 @@ static int pch_gbe_sw_init(struct pch_gbe_adapter *adapter)
                 return -ENOMEM;
         }
         spin_lock_init(&adapter->hw.miim_lock);
-        spin_lock_init(&adapter->tx_queue_lock);
         spin_lock_init(&adapter->stats_lock);
         spin_lock_init(&adapter->ethtool_lock);
         atomic_set(&adapter->irq_sem, 0);
@@ -2142,10 +2145,10 @@ static int pch_gbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                          tx_ring->next_to_use, tx_ring->next_to_clean);
                 return NETDEV_TX_BUSY;
         }
-        spin_unlock_irqrestore(&tx_ring->tx_lock, flags);
 
         /* CRC,ITAG no support */
         pch_gbe_tx_queue(adapter, tx_ring, skb);
+        spin_unlock_irqrestore(&tx_ring->tx_lock, flags);
         return NETDEV_TX_OK;
 }
 
diff --git a/drivers/net/ethernet/packetengines/hamachi.c b/drivers/net/ethernet/packetengines/hamachi.c
index 0d29f5f4b8e4..c2367158350e 100644
--- a/drivers/net/ethernet/packetengines/hamachi.c
+++ b/drivers/net/ethernet/packetengines/hamachi.c
@@ -683,8 +683,6 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev,
         }
 
         hmp->base = ioaddr;
-        dev->base_addr = (unsigned long)ioaddr;
-        dev->irq = irq;
         pci_set_drvdata(pdev, dev);
 
         hmp->chip_id = chip_id;
@@ -859,14 +857,11 @@ static int hamachi_open(struct net_device *dev)
         u32 rx_int_var, tx_int_var;
         u16 fifo_info;
 
-        i = request_irq(dev->irq, hamachi_interrupt, IRQF_SHARED, dev->name, dev);
+        i = request_irq(hmp->pci_dev->irq, hamachi_interrupt, IRQF_SHARED,
+                        dev->name, dev);
         if (i)
                 return i;
 
-        if (hamachi_debug > 1)
-                printk(KERN_DEBUG "%s: hamachi_open() irq %d.\n",
-                           dev->name, dev->irq);
-
         hamachi_init_ring(dev);
 
 #if ADDRLEN == 64
@@ -1705,7 +1700,7 @@ static int hamachi_close(struct net_device *dev)
         }
 #endif /* __i386__ debugging only */
 
-        free_irq(dev->irq, dev);
+        free_irq(hmp->pci_dev->irq, dev);
 
         del_timer_sync(&hmp->timer);
 
diff --git a/drivers/net/ethernet/packetengines/yellowfin.c b/drivers/net/ethernet/packetengines/yellowfin.c
index 7757b80ef924..04e622fd468d 100644
--- a/drivers/net/ethernet/packetengines/yellowfin.c
+++ b/drivers/net/ethernet/packetengines/yellowfin.c
@@ -427,9 +427,6 @@ static int __devinit yellowfin_init_one(struct pci_dev *pdev,
         /* Reset the chip. */
         iowrite32(0x80000000, ioaddr + DMACtrl);
 
-        dev->base_addr = (unsigned long)ioaddr;
-        dev->irq = irq;
-
         pci_set_drvdata(pdev, dev);
         spin_lock_init(&np->lock);
 
@@ -569,25 +566,20 @@ static void mdio_write(void __iomem *ioaddr, int phy_id, int location, int value
 static int yellowfin_open(struct net_device *dev)
 {
         struct yellowfin_private *yp = netdev_priv(dev);
+        const int irq = yp->pci_dev->irq;
         void __iomem *ioaddr = yp->base;
-        int i, ret;
+        int i, rc;
 
         /* Reset the chip. */
         iowrite32(0x80000000, ioaddr + DMACtrl);
 
-        ret = request_irq(dev->irq, yellowfin_interrupt, IRQF_SHARED, dev->name, dev);
-        if (ret)
-                return ret;
-
-        if (yellowfin_debug > 1)
-                netdev_printk(KERN_DEBUG, dev, "%s() irq %d\n",
-                              __func__, dev->irq);
+        rc = request_irq(irq, yellowfin_interrupt, IRQF_SHARED, dev->name, dev);
+        if (rc)
+                return rc;
 
-        ret = yellowfin_init_ring(dev);
-        if (ret) {
-                free_irq(dev->irq, dev);
-                return ret;
-        }
+        rc = yellowfin_init_ring(dev);
+        if (rc < 0)
+                goto err_free_irq;
 
         iowrite32(yp->rx_ring_dma, ioaddr + RxPtr);
         iowrite32(yp->tx_ring_dma, ioaddr + TxPtr);
@@ -647,8 +639,12 @@ static int yellowfin_open(struct net_device *dev)
         yp->timer.data = (unsigned long)dev;
         yp->timer.function = yellowfin_timer;                           /* timer handler */
         add_timer(&yp->timer);
+out:
+        return rc;
 
-        return 0;
+err_free_irq:
+        free_irq(irq, dev);
+        goto out;
 }
 
 static void yellowfin_timer(unsigned long data)
@@ -1251,7 +1247,7 @@ static int yellowfin_close(struct net_device *dev)
         }
 #endif /* __i386__ debugging only */
 
-        free_irq(dev->irq, dev);
+        free_irq(yp->pci_dev->irq, dev);
 
         /* Free all the skbuffs in the Rx queue. */
         for (i = 0; i < RX_RING_SIZE; i++) {
diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c
index ddc95b0ac78d..e559dfa06d6a 100644
--- a/drivers/net/ethernet/pasemi/pasemi_mac.c
+++ b/drivers/net/ethernet/pasemi/pasemi_mac.c
@@ -623,7 +623,7 @@ static void pasemi_mac_free_rx_resources(struct pasemi_mac *mac)
         mac->rx = NULL;
 }
 
-static void pasemi_mac_replenish_rx_ring(const struct net_device *dev,
+static void pasemi_mac_replenish_rx_ring(struct net_device *dev,
                                          const int limit)
 {
         const struct pasemi_mac *mac = netdev_priv(dev);
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
index b5de8a7b90f1..37ccbe54e62d 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
@@ -53,8 +53,8 @@
 
 #define _NETXEN_NIC_LINUX_MAJOR 4
 #define _NETXEN_NIC_LINUX_MINOR 0
-#define _NETXEN_NIC_LINUX_SUBVERSION 78
-#define NETXEN_NIC_LINUX_VERSIONID  "4.0.78"
+#define _NETXEN_NIC_LINUX_SUBVERSION 79
+#define NETXEN_NIC_LINUX_VERSIONID  "4.0.79"
 
 #define NETXEN_VERSION_CODE(a, b, c)    (((a) << 24) + ((b) << 16) + (c))
 #define _major(v)       (((v) >> 24) & 0xff)
@@ -419,6 +419,8 @@ struct rcv_desc {
         (((sts_data) >> 52) & 0x1)
 #define netxen_get_lro_sts_seq_number(sts_data)         \
         ((sts_data) & 0x0FFFFFFFF)
+#define netxen_get_lro_sts_mss(sts_data1)               \
+        ((sts_data1 >> 32) & 0x0FFFF)
 
 
 struct status_desc {
@@ -794,6 +796,7 @@ struct netxen_cmd_args {
 #define NX_CAP0_JUMBO_CONTIGUOUS        NX_CAP_BIT(0, 7)
 #define NX_CAP0_LRO_CONTIGUOUS          NX_CAP_BIT(0, 8)
 #define NX_CAP0_HW_LRO                  NX_CAP_BIT(0, 10)
+#define NX_CAP0_HW_LRO_MSS              NX_CAP_BIT(0, 21)
 
 /*
  * Context state
@@ -1073,6 +1076,8 @@ typedef struct {
 #define NX_FW_CAPABILITY_FVLANTX                (1 << 9)
 #define NX_FW_CAPABILITY_HW_LRO                 (1 << 10)
 #define NX_FW_CAPABILITY_GBE_LINK_CFG           (1 << 11)
+#define NX_FW_CAPABILITY_MORE_CAPS              (1 << 31)
+#define NX_FW_CAPABILITY_2_LRO_MAX_TCP_SEG      (1 << 2)
 
 /* module types */
 #define LINKEVENT_MODULE_NOT_PRESENT                    1
@@ -1155,6 +1160,7 @@ typedef struct {
 #define NETXEN_NIC_BRIDGE_ENABLED       0X10
 #define NETXEN_NIC_DIAG_ENABLED         0x20
 #define NETXEN_FW_RESET_OWNER           0x40
+#define NETXEN_FW_MSS_CAP               0x80
 #define NETXEN_IS_MSI_FAMILY(adapter) \
         ((adapter)->flags & (NETXEN_NIC_MSI_ENABLED | NETXEN_NIC_MSIX_ENABLED))
 
@@ -1201,6 +1207,9 @@ typedef struct {
 #define NX_FORCE_FW_RESET               0xdeaddead
 
 
+/* Fw dump levels */
+static const u32 FW_DUMP_LEVELS[] = { 0x3, 0x7, 0xf, 0x1f, 0x3f, 0x7f, 0xff };
+
 /* Flash read/write address */
 #define NX_FW_DUMP_REG1         0x00130060
 #define NX_FW_DUMP_REG2         0x001e0000
@@ -1814,6 +1823,13 @@ struct netxen_brdinfo {
         char short_name[NETXEN_MAX_SHORT_NAME];
 };
 
+struct netxen_dimm_cfg {
+        u8 presence;
+        u8 mem_type;
+        u8 dimm_type;
+        u32 size;
+};
+
 static const struct netxen_brdinfo netxen_boards[] = {
         {NETXEN_BRDTYPE_P2_SB31_10G_CX4, 1, "XGb CX4"},
         {NETXEN_BRDTYPE_P2_SB31_10G_HMEZ, 1, "XGb HMEZ"},
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
index f3c0057a802b..7f556a84925d 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
@@ -229,7 +229,7 @@ netxen_setup_minidump(struct netxen_adapter *adapter)
                                 adapter->mdump.md_template;
         adapter->mdump.md_capture_buff = NULL;
         adapter->mdump.fw_supports_md = 1;
-        adapter->mdump.md_enabled = 1;
+        adapter->mdump.md_enabled = 0;
 
         return err;
 
@@ -328,6 +328,9 @@ nx_fw_cmd_create_rx_ctx(struct netxen_adapter *adapter)
         cap = (NX_CAP0_LEGACY_CONTEXT | NX_CAP0_LEGACY_MN);
         cap |= (NX_CAP0_JUMBO_CONTIGUOUS | NX_CAP0_LRO_CONTIGUOUS);
 
+        if (adapter->flags & NETXEN_FW_MSS_CAP)
+                cap |= NX_CAP0_HW_LRO_MSS;
+
         prq->capabilities[0] = cpu_to_le32(cap);
         prq->host_int_crb_mode =
                 cpu_to_le32(NX_HOST_INT_CRB_MODE_SHARED);
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
index 8c39299331a2..39730403782f 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
@@ -834,7 +834,7 @@ netxen_get_dump_flag(struct net_device *netdev, struct ethtool_dump *dump)
 static int
 netxen_set_dump(struct net_device *netdev, struct ethtool_dump *val)
 {
-        int ret = 0;
+        int i;
         struct netxen_adapter *adapter = netdev_priv(netdev);
         struct netxen_minidump *mdump = &adapter->mdump;
 
@@ -844,7 +844,7 @@ netxen_set_dump(struct net_device *netdev, struct ethtool_dump *val)
                         mdump->md_enabled = 1;
                 if (adapter->fw_mdump_rdy) {
                         netdev_info(netdev, "Previous dump not cleared, not forcing dump\n");
-                        return ret;
+                        return 0;
                 }
                 netdev_info(netdev, "Forcing a fw dump\n");
                 nx_dev_request_reset(adapter);
@@ -867,19 +867,21 @@ netxen_set_dump(struct net_device *netdev, struct ethtool_dump *val)
                 adapter->flags &= ~NETXEN_FW_RESET_OWNER;
                 break;
         default:
-                if (val->flag <= NX_DUMP_MASK_MAX &&
-                        val->flag >= NX_DUMP_MASK_MIN) {
-                        mdump->md_capture_mask = val->flag & 0xff;
-                        netdev_info(netdev, "Driver mask changed to: 0x%x\n",
+                for (i = 0; i < ARRAY_SIZE(FW_DUMP_LEVELS); i++) {
+                        if (val->flag == FW_DUMP_LEVELS[i]) {
+                                mdump->md_capture_mask = val->flag;
+                                netdev_info(netdev,
+                                        "Driver mask changed to: 0x%x\n",
                                         mdump->md_capture_mask);
-                        break;
+                                return 0;
+                        }
                 }
                 netdev_info(netdev,
                         "Invalid dump level: 0x%x\n", val->flag);
                 return -EINVAL;
         }
 
-        return ret;
+        return 0;
 }
 
 static int
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
index b1a897cd9a8d..28e076960bcb 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
@@ -776,6 +776,7 @@ enum {
 #define CRB_SW_INT_MASK_3               (NETXEN_NIC_REG(0x1e8))
 
 #define CRB_FW_CAPABILITIES_1           (NETXEN_CAM_RAM(0x128))
+#define CRB_FW_CAPABILITIES_2           (NETXEN_CAM_RAM(0x12c))
 #define CRB_MAC_BLOCK_START             (NETXEN_CAM_RAM(0x1c0))
 
 /*
@@ -955,6 +956,31 @@ enum {
 #define NX_CRB_DEV_REF_COUNT            (NETXEN_CAM_RAM(0x138))
 #define NX_CRB_DEV_STATE                (NETXEN_CAM_RAM(0x140))
 
+/* MiniDIMM related macros */
+#define NETXEN_DIMM_CAPABILITY          (NETXEN_CAM_RAM(0x258))
+#define NETXEN_DIMM_PRESENT                     0x1
+#define NETXEN_DIMM_MEMTYPE_DDR2_SDRAM  0x2
+#define NETXEN_DIMM_SIZE                        0x4
+#define NETXEN_DIMM_MEMTYPE(VAL)                ((VAL >> 3) & 0xf)
+#define NETXEN_DIMM_NUMROWS(VAL)                ((VAL >> 7) & 0xf)
+#define NETXEN_DIMM_NUMCOLS(VAL)                ((VAL >> 11) & 0xf)
+#define NETXEN_DIMM_NUMRANKS(VAL)               ((VAL >> 15) & 0x3)
+#define NETXEN_DIMM_DATAWIDTH(VAL)              ((VAL >> 18) & 0x3)
+#define NETXEN_DIMM_NUMBANKS(VAL)               ((VAL >> 21) & 0xf)
+#define NETXEN_DIMM_TYPE(VAL)           ((VAL >> 25) & 0x3f)
+#define NETXEN_DIMM_VALID_FLAG          0x80000000
+
+#define NETXEN_DIMM_MEM_DDR2_SDRAM      0x8
+
+#define NETXEN_DIMM_STD_MEM_SIZE        512
+
+#define NETXEN_DIMM_TYPE_RDIMM  0x1
+#define NETXEN_DIMM_TYPE_UDIMM  0x2
+#define NETXEN_DIMM_TYPE_SO_DIMM        0x4
+#define NETXEN_DIMM_TYPE_Micro_DIMM     0x8
+#define NETXEN_DIMM_TYPE_Mini_RDIMM     0x10
+#define NETXEN_DIMM_TYPE_Mini_UDIMM     0x20
+
 /* Device State */
 #define NX_DEV_COLD             1
 #define NX_DEV_INITALIZING      2
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
index 718b27440351..0d725dc91bcb 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
@@ -1131,7 +1131,6 @@ netxen_validate_firmware(struct netxen_adapter *adapter)
                  _build(file_fw_ver));
                 return -EINVAL;
         }
-
         val = nx_get_bios_version(adapter);
         netxen_rom_fast_read(adapter, NX_BIOS_VERSION_OFFSET, (int *)&bios);
         if ((__force u32)val != bios) {
@@ -1661,6 +1660,9 @@ netxen_process_lro(struct netxen_adapter *adapter,
 
         length = skb->len;
 
+        if (adapter->flags & NETXEN_FW_MSS_CAP)
+                skb_shinfo(skb)->gso_size  =  netxen_get_lro_sts_mss(sts_data1);
+
         netif_receive_skb(skb);
 
         adapter->stats.lro_pkts++;
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index 65a718f9ccd3..342b3a79bd0f 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -1184,6 +1184,7 @@ netxen_nic_attach(struct netxen_adapter *adapter)
         int err, ring;
         struct nx_host_rds_ring *rds_ring;
         struct nx_host_tx_ring *tx_ring;
+        u32 capab2;
 
         if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC)
                 return 0;
@@ -1192,6 +1193,13 @@ netxen_nic_attach(struct netxen_adapter *adapter)
         if (err)
                 return err;
 
+        adapter->flags &= ~NETXEN_FW_MSS_CAP;
+        if (adapter->capabilities & NX_FW_CAPABILITY_MORE_CAPS) {
+                capab2 = NXRD32(adapter, CRB_FW_CAPABILITIES_2);
+                if (capab2 & NX_FW_CAPABILITY_2_LRO_MAX_TCP_SEG)
+                        adapter->flags |= NETXEN_FW_MSS_CAP;
+        }
+
         err = netxen_napi_add(adapter, netdev);
         if (err)
                 return err;
@@ -1810,7 +1818,6 @@ netxen_tso_check(struct net_device *netdev,
                 flags = FLAGS_VLAN_TAGGED;
 
         } else if (vlan_tx_tag_present(skb)) {
-
                 flags = FLAGS_VLAN_OOB;
                 vid = vlan_tx_tag_get(skb);
                 netxen_set_tx_vlan_tci(first_desc, vid);
@@ -2926,6 +2933,134 @@ static struct bin_attribute bin_attr_mem = {
         .write = netxen_sysfs_write_mem,
 };
 
+static ssize_t
+netxen_sysfs_read_dimm(struct file *filp, struct kobject *kobj,
+                struct bin_attribute *attr,
+                char *buf, loff_t offset, size_t size)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct netxen_adapter *adapter = dev_get_drvdata(dev);
+        struct net_device *netdev = adapter->netdev;
+        struct netxen_dimm_cfg dimm;
+        u8 dw, rows, cols, banks, ranks;
+        u32 val;
+
+        if (size != sizeof(struct netxen_dimm_cfg)) {
+                netdev_err(netdev, "Invalid size\n");
+                return -1;
+        }
+
+        memset(&dimm, 0, sizeof(struct netxen_dimm_cfg));
+        val = NXRD32(adapter, NETXEN_DIMM_CAPABILITY);
+
+        /* Checks if DIMM info is valid. */
+        if (val & NETXEN_DIMM_VALID_FLAG) {
+                netdev_err(netdev, "Invalid DIMM flag\n");
+                dimm.presence = 0xff;
+                goto out;
+        }
+
+        rows = NETXEN_DIMM_NUMROWS(val);
+        cols = NETXEN_DIMM_NUMCOLS(val);
+        ranks = NETXEN_DIMM_NUMRANKS(val);
+        banks = NETXEN_DIMM_NUMBANKS(val);
+        dw = NETXEN_DIMM_DATAWIDTH(val);
+
+        dimm.presence = (val & NETXEN_DIMM_PRESENT);
+
+        /* Checks if DIMM info is present. */
+        if (!dimm.presence) {
+                netdev_err(netdev, "DIMM not present\n");
+                goto out;
+        }
+
+        dimm.dimm_type = NETXEN_DIMM_TYPE(val);
+
+        switch (dimm.dimm_type) {
+        case NETXEN_DIMM_TYPE_RDIMM:
+        case NETXEN_DIMM_TYPE_UDIMM:
+        case NETXEN_DIMM_TYPE_SO_DIMM:
+        case NETXEN_DIMM_TYPE_Micro_DIMM:
+        case NETXEN_DIMM_TYPE_Mini_RDIMM:
+        case NETXEN_DIMM_TYPE_Mini_UDIMM:
+                break;
+        default:
+                netdev_err(netdev, "Invalid DIMM type %x\n", dimm.dimm_type);
+                goto out;
+        }
+
+        if (val & NETXEN_DIMM_MEMTYPE_DDR2_SDRAM)
+                dimm.mem_type = NETXEN_DIMM_MEM_DDR2_SDRAM;
+        else
+                dimm.mem_type = NETXEN_DIMM_MEMTYPE(val);
+
+        if (val & NETXEN_DIMM_SIZE) {
+                dimm.size = NETXEN_DIMM_STD_MEM_SIZE;
+                goto out;
+        }
+
+        if (!rows) {
+                netdev_err(netdev, "Invalid no of rows %x\n", rows);
+                goto out;
+        }
+
+        if (!cols) {
+                netdev_err(netdev, "Invalid no of columns %x\n", cols);
+                goto out;
+        }
+
+        if (!banks) {
+                netdev_err(netdev, "Invalid no of banks %x\n", banks);
+                goto out;
+        }
+
+        ranks += 1;
+
+        switch (dw) {
+        case 0x0:
+                dw = 32;
+                break;
+        case 0x1:
+                dw = 33;
+                break;
+        case 0x2:
+                dw = 36;
+                break;
+        case 0x3:
+                dw = 64;
+                break;
+        case 0x4:
+                dw = 72;
+                break;
+        case 0x5:
+                dw = 80;
+                break;
+        case 0x6:
+                dw = 128;
+                break;
+        case 0x7:
+                dw = 144;
+                break;
+        default:
+                netdev_err(netdev, "Invalid data-width %x\n", dw);
+                goto out;
+        }
+
+        dimm.size = ((1 << rows) * (1 << cols) * dw * banks * ranks) / 8;
+        /* Size returned in MB. */
+        dimm.size = (dimm.size) / 0x100000;
+out:
+        memcpy(buf, &dimm, sizeof(struct netxen_dimm_cfg));
+        return sizeof(struct netxen_dimm_cfg);
+
+}
+
+static struct bin_attribute bin_attr_dimm = {
+        .attr = { .name = "dimm", .mode = (S_IRUGO | S_IWUSR) },
+        .size = 0,
+        .read = netxen_sysfs_read_dimm,
+};
+
 
 static void
 netxen_create_sysfs_entries(struct netxen_adapter *adapter)
@@ -2963,6 +3098,8 @@ netxen_create_diag_entries(struct netxen_adapter *adapter)
                 dev_info(dev, "failed to create crb sysfs entry\n");
         if (device_create_bin_file(dev, &bin_attr_mem))
                 dev_info(dev, "failed to create mem sysfs entry\n");
+        if (device_create_bin_file(dev, &bin_attr_dimm))
+                dev_info(dev, "failed to create dimm sysfs entry\n");
 }
 
 
@@ -2975,6 +3112,7 @@ netxen_remove_diag_entries(struct netxen_adapter *adapter)
         device_remove_file(dev, &dev_attr_diag_mode);
         device_remove_bin_file(dev, &bin_attr_crb);
         device_remove_bin_file(dev, &bin_attr_mem);
+        device_remove_bin_file(dev, &bin_attr_dimm);
 }
 
 #ifdef CONFIG_INET
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index 385a4d5c7c25..8680a5dae4a2 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -36,8 +36,8 @@
 
 #define _QLCNIC_LINUX_MAJOR 5
 #define _QLCNIC_LINUX_MINOR 0
-#define _QLCNIC_LINUX_SUBVERSION 27
-#define QLCNIC_LINUX_VERSIONID  "5.0.27"
+#define _QLCNIC_LINUX_SUBVERSION 28
+#define QLCNIC_LINUX_VERSIONID  "5.0.28"
 #define QLCNIC_DRV_IDC_VER  0x01
 #define QLCNIC_DRIVER_VERSION  ((_QLCNIC_LINUX_MAJOR << 16) |\
                  (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))
@@ -607,6 +607,7 @@ struct qlcnic_recv_context {
 #define QLCNIC_CDRP_CMD_CONFIG_PORT             0x0000002E
 #define QLCNIC_CDRP_CMD_TEMP_SIZE               0x0000002f
 #define QLCNIC_CDRP_CMD_GET_TEMP_HDR            0x00000030
+#define QLCNIC_CDRP_CMD_GET_MAC_STATS           0x00000037
 
 #define QLCNIC_RCODE_SUCCESS            0
 #define QLCNIC_RCODE_NOT_SUPPORTED      9
@@ -1180,18 +1181,62 @@ struct qlcnic_esw_func_cfg {
 #define QLCNIC_STATS_ESWITCH            2
 #define QLCNIC_QUERY_RX_COUNTER         0
 #define QLCNIC_QUERY_TX_COUNTER         1
-#define QLCNIC_ESW_STATS_NOT_AVAIL      0xffffffffffffffffULL
+#define QLCNIC_STATS_NOT_AVAIL  0xffffffffffffffffULL
+#define QLCNIC_FILL_STATS(VAL1) \
+        (((VAL1) == QLCNIC_STATS_NOT_AVAIL) ? 0 : VAL1)
+#define QLCNIC_MAC_STATS 1
+#define QLCNIC_ESW_STATS 2
 
 #define QLCNIC_ADD_ESW_STATS(VAL1, VAL2)\
 do {    \
-        if (((VAL1) == QLCNIC_ESW_STATS_NOT_AVAIL) && \
-            ((VAL2) != QLCNIC_ESW_STATS_NOT_AVAIL)) \
+        if (((VAL1) == QLCNIC_STATS_NOT_AVAIL) && \
+            ((VAL2) != QLCNIC_STATS_NOT_AVAIL)) \
                 (VAL1) = (VAL2); \
-        else if (((VAL1) != QLCNIC_ESW_STATS_NOT_AVAIL) && \
-                 ((VAL2) != QLCNIC_ESW_STATS_NOT_AVAIL)) \
+        else if (((VAL1) != QLCNIC_STATS_NOT_AVAIL) && \
+                 ((VAL2) != QLCNIC_STATS_NOT_AVAIL)) \
                         (VAL1) += (VAL2); \
 } while (0)
 
+struct qlcnic_mac_statistics{
+        __le64  mac_tx_frames;
+        __le64  mac_tx_bytes;
+        __le64  mac_tx_mcast_pkts;
+        __le64  mac_tx_bcast_pkts;
+        __le64  mac_tx_pause_cnt;
+        __le64  mac_tx_ctrl_pkt;
+        __le64  mac_tx_lt_64b_pkts;
+        __le64  mac_tx_lt_127b_pkts;
+        __le64  mac_tx_lt_255b_pkts;
+        __le64  mac_tx_lt_511b_pkts;
+        __le64  mac_tx_lt_1023b_pkts;
+        __le64  mac_tx_lt_1518b_pkts;
+        __le64  mac_tx_gt_1518b_pkts;
+        __le64  rsvd1[3];
+
+        __le64  mac_rx_frames;
+        __le64  mac_rx_bytes;
+        __le64  mac_rx_mcast_pkts;
+        __le64  mac_rx_bcast_pkts;
+        __le64  mac_rx_pause_cnt;
+        __le64  mac_rx_ctrl_pkt;
+        __le64  mac_rx_lt_64b_pkts;
+        __le64  mac_rx_lt_127b_pkts;
+        __le64  mac_rx_lt_255b_pkts;
+        __le64  mac_rx_lt_511b_pkts;
+        __le64  mac_rx_lt_1023b_pkts;
+        __le64  mac_rx_lt_1518b_pkts;
+        __le64  mac_rx_gt_1518b_pkts;
+        __le64  rsvd2[3];
+
+        __le64  mac_rx_length_error;
+        __le64  mac_rx_length_small;
+        __le64  mac_rx_length_large;
+        __le64  mac_rx_jabber;
+        __le64  mac_rx_dropped;
+        __le64  mac_rx_crc_error;
+        __le64  mac_align_error;
+} __packed;
+
 struct __qlcnic_esw_statistics {
         __le16 context_id;
         __le16 version;
@@ -1352,6 +1397,8 @@ enum op_codes {
 #define QLCNIC_ENABLE_FW_DUMP           0xaddfeed
 #define QLCNIC_DISABLE_FW_DUMP          0xbadfeed
 #define QLCNIC_FORCE_FW_RESET           0xdeaddead
+#define QLCNIC_SET_QUIESCENT            0xadd00010
+#define QLCNIC_RESET_QUIESCENT          0xadd00020
 
 struct qlcnic_dump_operations {
         enum op_codes opcode;
@@ -1510,6 +1557,7 @@ int qlcnic_get_port_stats(struct qlcnic_adapter *, const u8, const u8,
 int qlcnic_get_eswitch_stats(struct qlcnic_adapter *, const u8, u8,
                                         struct __qlcnic_esw_statistics *);
 int qlcnic_clear_esw_stats(struct qlcnic_adapter *adapter, u8, u8, u8);
+int qlcnic_get_mac_stats(struct qlcnic_adapter *, struct qlcnic_mac_statistics *);
 extern int qlcnic_config_tso;
 
 /*
@@ -1559,6 +1607,7 @@ static inline u32 qlcnic_tx_avail(struct qlcnic_host_tx_ring *tx_ring)
 }
 
 extern const struct ethtool_ops qlcnic_ethtool_ops;
+extern const struct ethtool_ops qlcnic_ethtool_failed_ops;
 
 struct qlcnic_nic_template {
         int (*config_bridged_mode) (struct qlcnic_adapter *, u32);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
index 569a837d2ac4..8db85244e8ad 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
@@ -905,6 +905,65 @@ int qlcnic_get_port_stats(struct qlcnic_adapter *adapter, const u8 func,
         return err;
 }
 
+/* This routine will retrieve the MAC statistics from firmware */
+int qlcnic_get_mac_stats(struct qlcnic_adapter *adapter,
+                struct qlcnic_mac_statistics *mac_stats)
+{
+        struct qlcnic_mac_statistics *stats;
+        struct qlcnic_cmd_args cmd;
+        size_t stats_size = sizeof(struct qlcnic_mac_statistics);
+        dma_addr_t stats_dma_t;
+        void *stats_addr;
+        int err;
+
+        stats_addr = dma_alloc_coherent(&adapter->pdev->dev, stats_size,
+                        &stats_dma_t, GFP_KERNEL);
+        if (!stats_addr) {
+                dev_err(&adapter->pdev->dev,
+                        "%s: Unable to allocate memory.\n", __func__);
+                return -ENOMEM;
+        }
+        memset(stats_addr, 0, stats_size);
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.req.cmd = QLCNIC_CDRP_CMD_GET_MAC_STATS;
+        cmd.req.arg1 = stats_size << 16;
+        cmd.req.arg2 = MSD(stats_dma_t);
+        cmd.req.arg3 = LSD(stats_dma_t);
+
+        qlcnic_issue_cmd(adapter, &cmd);
+        err = cmd.rsp.cmd;
+
+        if (!err) {
+                stats = stats_addr;
+                mac_stats->mac_tx_frames = le64_to_cpu(stats->mac_tx_frames);
+                mac_stats->mac_tx_bytes = le64_to_cpu(stats->mac_tx_bytes);
+                mac_stats->mac_tx_mcast_pkts =
+                                        le64_to_cpu(stats->mac_tx_mcast_pkts);
+                mac_stats->mac_tx_bcast_pkts =
+                                        le64_to_cpu(stats->mac_tx_bcast_pkts);
+                mac_stats->mac_rx_frames = le64_to_cpu(stats->mac_rx_frames);
+                mac_stats->mac_rx_bytes = le64_to_cpu(stats->mac_rx_bytes);
+                mac_stats->mac_rx_mcast_pkts =
+                                        le64_to_cpu(stats->mac_rx_mcast_pkts);
+                mac_stats->mac_rx_length_error =
+                                le64_to_cpu(stats->mac_rx_length_error);
+                mac_stats->mac_rx_length_small =
+                                le64_to_cpu(stats->mac_rx_length_small);
+                mac_stats->mac_rx_length_large =
+                                le64_to_cpu(stats->mac_rx_length_large);
+                mac_stats->mac_rx_jabber = le64_to_cpu(stats->mac_rx_jabber);
+                mac_stats->mac_rx_dropped = le64_to_cpu(stats->mac_rx_dropped);
+                mac_stats->mac_rx_crc_error = le64_to_cpu(stats->mac_rx_crc_error);
+        } else {
+                dev_info(&adapter->pdev->dev,
+                        "%s: Get mac stats failed =%d.\n", __func__, err);
+        }
+
+        dma_free_coherent(&adapter->pdev->dev, stats_size, stats_addr,
+                stats_dma_t);
+        return err;
+}
+
 int qlcnic_get_eswitch_stats(struct qlcnic_adapter *adapter, const u8 eswitch,
                 const u8 rx_tx, struct __qlcnic_esw_statistics *esw_stats) {
 
@@ -920,13 +979,13 @@ int qlcnic_get_eswitch_stats(struct qlcnic_adapter *adapter, const u8 eswitch,
                 return -EIO;
 
         memset(esw_stats, 0, sizeof(u64));
-        esw_stats->unicast_frames = QLCNIC_ESW_STATS_NOT_AVAIL;
-        esw_stats->multicast_frames = QLCNIC_ESW_STATS_NOT_AVAIL;
-        esw_stats->broadcast_frames = QLCNIC_ESW_STATS_NOT_AVAIL;
-        esw_stats->dropped_frames = QLCNIC_ESW_STATS_NOT_AVAIL;
-        esw_stats->errors = QLCNIC_ESW_STATS_NOT_AVAIL;
-        esw_stats->local_frames = QLCNIC_ESW_STATS_NOT_AVAIL;
-        esw_stats->numbytes = QLCNIC_ESW_STATS_NOT_AVAIL;
+        esw_stats->unicast_frames = QLCNIC_STATS_NOT_AVAIL;
+        esw_stats->multicast_frames = QLCNIC_STATS_NOT_AVAIL;
+        esw_stats->broadcast_frames = QLCNIC_STATS_NOT_AVAIL;
+        esw_stats->dropped_frames = QLCNIC_STATS_NOT_AVAIL;
+        esw_stats->errors = QLCNIC_STATS_NOT_AVAIL;
+        esw_stats->local_frames = QLCNIC_STATS_NOT_AVAIL;
+        esw_stats->numbytes = QLCNIC_STATS_NOT_AVAIL;
         esw_stats->context_id = eswitch;
 
         for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) {
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index 89ddf7f7d7df..9e9e78a5c4d7 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
@@ -78,8 +78,46 @@ static const char qlcnic_device_gstrings_stats[][ETH_GSTRING_LEN] = {
         "tx numbytes",
 };
 
-#define QLCNIC_STATS_LEN        ARRAY_SIZE(qlcnic_gstrings_stats)
+static const char qlcnic_mac_stats_strings [][ETH_GSTRING_LEN] = {
+        "mac_tx_frames",
+        "mac_tx_bytes",
+        "mac_tx_mcast_pkts",
+        "mac_tx_bcast_pkts",
+        "mac_tx_pause_cnt",
+        "mac_tx_ctrl_pkt",
+        "mac_tx_lt_64b_pkts",
+        "mac_tx_lt_127b_pkts",
+        "mac_tx_lt_255b_pkts",
+        "mac_tx_lt_511b_pkts",
+        "mac_tx_lt_1023b_pkts",
+        "mac_tx_lt_1518b_pkts",
+        "mac_tx_gt_1518b_pkts",
+        "mac_rx_frames",
+        "mac_rx_bytes",
+        "mac_rx_mcast_pkts",
+        "mac_rx_bcast_pkts",
+        "mac_rx_pause_cnt",
+        "mac_rx_ctrl_pkt",
+        "mac_rx_lt_64b_pkts",
+        "mac_rx_lt_127b_pkts",
+        "mac_rx_lt_255b_pkts",
+        "mac_rx_lt_511b_pkts",
+        "mac_rx_lt_1023b_pkts",
+        "mac_rx_lt_1518b_pkts",
+        "mac_rx_gt_1518b_pkts",
+        "mac_rx_length_error",
+        "mac_rx_length_small",
+        "mac_rx_length_large",
+        "mac_rx_jabber",
+        "mac_rx_dropped",
+        "mac_rx_crc_error",
+        "mac_align_error",
+};
+
+#define QLCNIC_STATS_LEN ARRAY_SIZE(qlcnic_gstrings_stats)
+#define QLCNIC_MAC_STATS_LEN ARRAY_SIZE(qlcnic_mac_stats_strings)
 #define QLCNIC_DEVICE_STATS_LEN ARRAY_SIZE(qlcnic_device_gstrings_stats)
+#define QLCNIC_TOTAL_STATS_LEN QLCNIC_STATS_LEN + QLCNIC_MAC_STATS_LEN
 
 static const char qlcnic_gstrings_test[][ETH_GSTRING_LEN] = {
         "Register_Test_on_offline",
@@ -644,8 +682,8 @@ static int qlcnic_get_sset_count(struct net_device *dev, int sset)
                 return QLCNIC_TEST_LEN;
         case ETH_SS_STATS:
                 if (adapter->flags & QLCNIC_ESWITCH_ENABLED)
-                        return QLCNIC_STATS_LEN + QLCNIC_DEVICE_STATS_LEN;
-                return QLCNIC_STATS_LEN;
+                        return QLCNIC_TOTAL_STATS_LEN + QLCNIC_DEVICE_STATS_LEN;
+                return QLCNIC_TOTAL_STATS_LEN;
         default:
                 return -EOPNOTSUPP;
         }
@@ -851,7 +889,7 @@ static void
 qlcnic_get_strings(struct net_device *dev, u32 stringset, u8 * data)
 {
         struct qlcnic_adapter *adapter = netdev_priv(dev);
-        int index, i;
+        int index, i, j;
 
         switch (stringset) {
         case ETH_SS_TEST:
@@ -864,6 +902,11 @@ qlcnic_get_strings(struct net_device *dev, u32 stringset, u8 * data)
                                qlcnic_gstrings_stats[index].stat_string,
                                ETH_GSTRING_LEN);
                 }
+                for (j = 0; j < QLCNIC_MAC_STATS_LEN; index++, j++) {
+                        memcpy(data + index * ETH_GSTRING_LEN,
+                               qlcnic_mac_stats_strings[j],
+                               ETH_GSTRING_LEN);
+                }
                 if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED))
                         return;
                 for (i = 0; i < QLCNIC_DEVICE_STATS_LEN; index++, i++) {
@@ -874,22 +917,64 @@ qlcnic_get_strings(struct net_device *dev, u32 stringset, u8 * data)
         }
 }
 
-#define QLCNIC_FILL_ESWITCH_STATS(VAL1) \
-        (((VAL1) == QLCNIC_ESW_STATS_NOT_AVAIL) ? 0 : VAL1)
-
 static void
-qlcnic_fill_device_stats(int *index, u64 *data,
-                struct __qlcnic_esw_statistics *stats)
+qlcnic_fill_stats(int *index, u64 *data, void *stats, int type)
 {
         int ind = *index;
 
-        data[ind++] = QLCNIC_FILL_ESWITCH_STATS(stats->unicast_frames);
-        data[ind++] = QLCNIC_FILL_ESWITCH_STATS(stats->multicast_frames);
-        data[ind++] = QLCNIC_FILL_ESWITCH_STATS(stats->broadcast_frames);
-        data[ind++] = QLCNIC_FILL_ESWITCH_STATS(stats->dropped_frames);
-        data[ind++] = QLCNIC_FILL_ESWITCH_STATS(stats->errors);
-        data[ind++] = QLCNIC_FILL_ESWITCH_STATS(stats->local_frames);
-        data[ind++] = QLCNIC_FILL_ESWITCH_STATS(stats->numbytes);
+        if (type == QLCNIC_MAC_STATS) {
+                struct qlcnic_mac_statistics *mac_stats =
+                                        (struct qlcnic_mac_statistics *)stats;
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_tx_frames);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_tx_bytes);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_tx_mcast_pkts);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_tx_bcast_pkts);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_tx_pause_cnt);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_tx_ctrl_pkt);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_tx_lt_64b_pkts);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_tx_lt_127b_pkts);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_tx_lt_255b_pkts);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_tx_lt_511b_pkts);
+                data[ind++] =
+                        QLCNIC_FILL_STATS(mac_stats->mac_tx_lt_1023b_pkts);
+                data[ind++] =
+                        QLCNIC_FILL_STATS(mac_stats->mac_tx_lt_1518b_pkts);
+                data[ind++] =
+                        QLCNIC_FILL_STATS(mac_stats->mac_tx_gt_1518b_pkts);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_rx_frames);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_rx_bytes);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_rx_mcast_pkts);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_rx_bcast_pkts);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_rx_pause_cnt);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_rx_ctrl_pkt);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_rx_lt_64b_pkts);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_rx_lt_127b_pkts);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_rx_lt_255b_pkts);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_rx_lt_511b_pkts);
+                data[ind++] =
+                        QLCNIC_FILL_STATS(mac_stats->mac_rx_lt_1023b_pkts);
+                data[ind++] =
+                        QLCNIC_FILL_STATS(mac_stats->mac_rx_lt_1518b_pkts);
+                data[ind++] =
+                        QLCNIC_FILL_STATS(mac_stats->mac_rx_gt_1518b_pkts);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_rx_length_error);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_rx_length_small);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_rx_length_large);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_rx_jabber);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_rx_dropped);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_rx_crc_error);
+                data[ind++] = QLCNIC_FILL_STATS(mac_stats->mac_align_error);
+        } else if (type == QLCNIC_ESW_STATS) {
+                struct __qlcnic_esw_statistics *esw_stats =
+                                (struct __qlcnic_esw_statistics *)stats;
+                data[ind++] = QLCNIC_FILL_STATS(esw_stats->unicast_frames);
+                data[ind++] = QLCNIC_FILL_STATS(esw_stats->multicast_frames);
+                data[ind++] = QLCNIC_FILL_STATS(esw_stats->broadcast_frames);
+                data[ind++] = QLCNIC_FILL_STATS(esw_stats->dropped_frames);
+                data[ind++] = QLCNIC_FILL_STATS(esw_stats->errors);
+                data[ind++] = QLCNIC_FILL_STATS(esw_stats->local_frames);
+                data[ind++] = QLCNIC_FILL_STATS(esw_stats->numbytes);
+        }
 
         *index = ind;
 }
@@ -900,6 +985,7 @@ qlcnic_get_ethtool_stats(struct net_device *dev,
 {
         struct qlcnic_adapter *adapter = netdev_priv(dev);
         struct qlcnic_esw_statistics port_stats;
+        struct qlcnic_mac_statistics mac_stats;
         int index, ret;
 
         for (index = 0; index < QLCNIC_STATS_LEN; index++) {
@@ -911,6 +997,11 @@ qlcnic_get_ethtool_stats(struct net_device *dev,
                      sizeof(u64)) ? *(u64 *)p:(*(u32 *)p);
         }
 
+        /* Retrieve MAC statistics from firmware */
+        memset(&mac_stats, 0, sizeof(struct qlcnic_mac_statistics));
+        qlcnic_get_mac_stats(adapter, &mac_stats);
+        qlcnic_fill_stats(&index, data, &mac_stats, QLCNIC_MAC_STATS);
+
         if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED))
                 return;
 
@@ -920,14 +1011,14 @@ qlcnic_get_ethtool_stats(struct net_device *dev,
         if (ret)
                 return;
 
-        qlcnic_fill_device_stats(&index, data, &port_stats.rx);
+        qlcnic_fill_stats(&index, data, &port_stats.rx, QLCNIC_ESW_STATS);
 
         ret = qlcnic_get_port_stats(adapter, adapter->ahw->pci_func,
                         QLCNIC_QUERY_TX_COUNTER, &port_stats.tx);
         if (ret)
                 return;
 
-        qlcnic_fill_device_stats(&index, data, &port_stats.tx);
+        qlcnic_fill_stats(&index, data, &port_stats.tx, QLCNIC_ESW_STATS);
 }
 
 static int qlcnic_set_led(struct net_device *dev,
@@ -1132,11 +1223,21 @@ qlcnic_get_dump_flag(struct net_device *netdev, struct ethtool_dump *dump)
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
 
+        if (!fw_dump->tmpl_hdr) {
+                netdev_err(adapter->netdev, "FW Dump not supported\n");
+                return -ENOTSUPP;
+        }
+
         if (fw_dump->clr)
                 dump->len = fw_dump->tmpl_hdr->size + fw_dump->size;
         else
                 dump->len = 0;
-        dump->flag = fw_dump->tmpl_hdr->drv_cap_mask;
+
+        if (!fw_dump->enable)
+                dump->flag = ETH_FW_DUMP_DISABLE;
+        else
+                dump->flag = fw_dump->tmpl_hdr->drv_cap_mask;
+
         dump->version = adapter->fw_version;
         return 0;
 }
@@ -1150,6 +1251,11 @@ qlcnic_get_dump_data(struct net_device *netdev, struct ethtool_dump *dump,
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
 
+        if (!fw_dump->tmpl_hdr) {
+                netdev_err(netdev, "FW Dump not supported\n");
+                return -ENOTSUPP;
+        }
+
         if (!fw_dump->clr) {
                 netdev_info(netdev, "Dump not available\n");
                 return -EINVAL;
@@ -1177,55 +1283,74 @@ qlcnic_get_dump_data(struct net_device *netdev, struct ethtool_dump *dump,
 static int
 qlcnic_set_dump(struct net_device *netdev, struct ethtool_dump *val)
 {
-        int ret = 0;
+        int i;
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
+        u32 state;
 
         switch (val->flag) {
         case QLCNIC_FORCE_FW_DUMP_KEY:
+                if (!fw_dump->tmpl_hdr) {
+                        netdev_err(netdev, "FW dump not supported\n");
+                        return -ENOTSUPP;
+                }
                 if (!fw_dump->enable) {
                         netdev_info(netdev, "FW dump not enabled\n");
-                        return ret;
+                        return 0;
                 }
                 if (fw_dump->clr) {
                         netdev_info(netdev,
                         "Previous dump not cleared, not forcing dump\n");
-                        return ret;
+                        return 0;
                 }
                 netdev_info(netdev, "Forcing a FW dump\n");
                 qlcnic_dev_request_reset(adapter);
                 break;
         case QLCNIC_DISABLE_FW_DUMP:
-                if (fw_dump->enable) {
+                if (fw_dump->enable && fw_dump->tmpl_hdr) {
                         netdev_info(netdev, "Disabling FW dump\n");
                         fw_dump->enable = 0;
                 }
-                break;
+                return 0;
         case QLCNIC_ENABLE_FW_DUMP:
-                if (!fw_dump->enable && fw_dump->tmpl_hdr) {
+                if (!fw_dump->tmpl_hdr) {
+                        netdev_err(netdev, "FW dump not supported\n");
+                        return -ENOTSUPP;
+                }
+                if (!fw_dump->enable) {
                         netdev_info(netdev, "Enabling FW dump\n");
                         fw_dump->enable = 1;
                 }
-                break;
+                return 0;
         case QLCNIC_FORCE_FW_RESET:
                 netdev_info(netdev, "Forcing a FW reset\n");
                 qlcnic_dev_request_reset(adapter);
                 adapter->flags &= ~QLCNIC_FW_RESET_OWNER;
-                break;
+                return 0;
+        case QLCNIC_SET_QUIESCENT:
+        case QLCNIC_RESET_QUIESCENT:
+                state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE);
+                if (state == QLCNIC_DEV_FAILED || (state == QLCNIC_DEV_BADBAD))
+                        netdev_info(netdev, "Device in FAILED state\n");
+                return 0;
         default:
-                if (val->flag > QLCNIC_DUMP_MASK_MAX ||
-                        val->flag < QLCNIC_DUMP_MASK_MIN) {
-                                netdev_info(netdev,
-                                "Invalid dump level: 0x%x\n", val->flag);
-                                ret = -EINVAL;
-                                goto out;
+                if (!fw_dump->tmpl_hdr) {
+                        netdev_err(netdev, "FW dump not supported\n");
+                        return -ENOTSUPP;
+                }
+                for (i = 0; i < ARRAY_SIZE(FW_DUMP_LEVELS); i++) {
+                        if (val->flag == FW_DUMP_LEVELS[i]) {
+                                fw_dump->tmpl_hdr->drv_cap_mask =
+                                                        val->flag;
+                                netdev_info(netdev, "Driver mask changed to: 0x%x\n",
+                                        fw_dump->tmpl_hdr->drv_cap_mask);
+                                return 0;
+                        }
                 }
-                fw_dump->tmpl_hdr->drv_cap_mask = val->flag & 0xff;
-                netdev_info(netdev, "Driver mask changed to: 0x%x\n",
-                        fw_dump->tmpl_hdr->drv_cap_mask);
+                netdev_info(netdev, "Invalid dump level: 0x%x\n", val->flag);
+                return -EINVAL;
         }
-out:
-        return ret;
+        return 0;
 }
 
 const struct ethtool_ops qlcnic_ethtool_ops = {
@@ -1258,3 +1383,10 @@ const struct ethtool_ops qlcnic_ethtool_ops = {
         .get_dump_data = qlcnic_get_dump_data,
         .set_dump = qlcnic_set_dump,
 };
+
+const struct ethtool_ops qlcnic_ethtool_failed_ops = {
+        .get_settings = qlcnic_get_settings,
+        .get_drvinfo = qlcnic_get_drvinfo,
+        .set_msglevel = qlcnic_set_msglevel,
+        .get_msglevel = qlcnic_get_msglevel,
+};
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
index a52819303d1b..6ced3195aad3 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
@@ -704,6 +704,8 @@ enum {
 #define QLCNIC_DEV_FAILED               0x6
 #define QLCNIC_DEV_QUISCENT             0x7
 
+#define QLCNIC_DEV_BADBAD               0xbad0bad0
+
 #define QLCNIC_DEV_NPAR_NON_OPER        0 /* NON Operational */
 #define QLCNIC_DEV_NPAR_OPER            1 /* NPAR Operational */
 #define QLCNIC_DEV_NPAR_OPER_TIMEO      30 /* Operational time out */
@@ -776,6 +778,10 @@ struct qlcnic_legacy_intr_set {
 #define FLASH_ROM_WINDOW        0x42110030
 #define FLASH_ROM_DATA          0x42150000
 
+
+static const u32 FW_DUMP_LEVELS[] = {
+        0x3, 0x7, 0xf, 0x1f, 0x3f, 0x7f, 0xff };
+
 static const u32 MIU_TEST_READ_DATA[] = {
         0x410000A8, 0x410000AC, 0x410000B8, 0x410000BC, };
 
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 75c32e875fef..46e77a2c5121 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -338,6 +338,10 @@ static const struct net_device_ops qlcnic_netdev_ops = {
 #endif
 };
 
+static const struct net_device_ops qlcnic_netdev_failed_ops = {
+        .ndo_open          = qlcnic_open,
+};
+
 static struct qlcnic_nic_template qlcnic_ops = {
         .config_bridged_mode = qlcnic_config_bridged_mode,
         .config_led = qlcnic_config_led,
@@ -1623,8 +1627,9 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         err = adapter->nic_ops->start_firmware(adapter);
         if (err) {
-                dev_err(&pdev->dev, "Loading fw failed.Please Reboot\n");
-                goto err_out_decr_ref;
+                dev_err(&pdev->dev, "Loading fw failed. Please Reboot\n"
+                        "\t\tIf reboot doesn't help, try flashing the card\n");
+                goto err_out_maintenance_mode;
         }
 
         if (qlcnic_read_mac_addr(adapter))
@@ -1695,6 +1700,18 @@ err_out_disable_pdev:
         pci_set_drvdata(pdev, NULL);
         pci_disable_device(pdev);
         return err;
+
+err_out_maintenance_mode:
+        netdev->netdev_ops = &qlcnic_netdev_failed_ops;
+        SET_ETHTOOL_OPS(netdev, &qlcnic_ethtool_failed_ops);
+        err = register_netdev(netdev);
+        if (err) {
+                dev_err(&pdev->dev, "failed to register net device\n");
+                goto err_out_decr_ref;
+        }
+        pci_set_drvdata(pdev, adapter);
+        qlcnic_create_diag_entries(adapter);
+        return 0;
 }
 
 static void __devexit qlcnic_remove(struct pci_dev *pdev)
@@ -1831,8 +1848,14 @@ done:
 static int qlcnic_open(struct net_device *netdev)
 {
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
+        u32 state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE);
         int err;
 
+        if (state == QLCNIC_DEV_FAILED || (state == QLCNIC_DEV_BADBAD)) {
+                netdev_err(netdev, "Device in FAILED state\n");
+                return -EIO;
+        }
+
         netif_carrier_off(netdev);
 
         err = qlcnic_attach(adapter);
@@ -1942,7 +1965,7 @@ qlcnic_send_filter(struct qlcnic_adapter *adapter,
         __le16 vlan_id = 0;
         u8 hindex;
 
-        if (!compare_ether_addr(phdr->h_source, adapter->mac_addr))
+        if (ether_addr_equal(phdr->h_source, adapter->mac_addr))
                 return;
 
         if (adapter->fhash.fnum >= adapter->fhash.fmax)
@@ -2212,8 +2235,7 @@ qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 
         if (adapter->flags & QLCNIC_MACSPOOF) {
                 phdr = (struct ethhdr *)skb->data;
-                if (compare_ether_addr(phdr->h_source,
-                                        adapter->mac_addr))
+                if (!ether_addr_equal(phdr->h_source, adapter->mac_addr))
                         goto drop_packet;
         }
 
@@ -3018,6 +3040,12 @@ qlcnic_dev_request_reset(struct qlcnic_adapter *adapter)
                 return;
 
         state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE);
+        if (state  == QLCNIC_DEV_FAILED || (state == QLCNIC_DEV_BADBAD)) {
+                netdev_err(adapter->netdev,
+                                "Device is in FAILED state, Please Reboot\n");
+                qlcnic_api_unlock(adapter);
+                return;
+        }
 
         if (state == QLCNIC_DEV_READY) {
                 QLCWR32(adapter, QLCNIC_CRB_DEV_STATE, QLCNIC_DEV_NEED_RESET);
@@ -3061,6 +3089,9 @@ qlcnic_cancel_fw_work(struct qlcnic_adapter *adapter)
         while (test_and_set_bit(__QLCNIC_RESETTING, &adapter->state))
                 msleep(10);
 
+        if (!adapter->fw_work.work.func)
+                return;
+
         cancel_delayed_work_sync(&adapter->fw_work);
 }
 
@@ -4280,6 +4311,7 @@ static void
 qlcnic_create_diag_entries(struct qlcnic_adapter *adapter)
 {
         struct device *dev = &adapter->pdev->dev;
+        u32 state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE);
 
         if (device_create_bin_file(dev, &bin_attr_port_stats))
                 dev_info(dev, "failed to create port stats sysfs entry");
@@ -4288,14 +4320,19 @@ qlcnic_create_diag_entries(struct qlcnic_adapter *adapter)
                 return;
         if (device_create_file(dev, &dev_attr_diag_mode))
                 dev_info(dev, "failed to create diag_mode sysfs entry\n");
-        if (device_create_file(dev, &dev_attr_beacon))
-                dev_info(dev, "failed to create beacon sysfs entry");
         if (device_create_bin_file(dev, &bin_attr_crb))
                 dev_info(dev, "failed to create crb sysfs entry\n");
         if (device_create_bin_file(dev, &bin_attr_mem))
                 dev_info(dev, "failed to create mem sysfs entry\n");
+
+        if (state == QLCNIC_DEV_FAILED || (state == QLCNIC_DEV_BADBAD))
+                return;
+
         if (device_create_bin_file(dev, &bin_attr_pci_config))
                 dev_info(dev, "failed to create pci config sysfs entry");
+        if (device_create_file(dev, &dev_attr_beacon))
+                dev_info(dev, "failed to create beacon sysfs entry");
+
         if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED))
                 return;
         if (device_create_bin_file(dev, &bin_attr_esw_config))
@@ -4314,16 +4351,19 @@ static void
 qlcnic_remove_diag_entries(struct qlcnic_adapter *adapter)
 {
         struct device *dev = &adapter->pdev->dev;
+        u32 state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE);
 
         device_remove_bin_file(dev, &bin_attr_port_stats);
 
         if (adapter->op_mode == QLCNIC_NON_PRIV_FUNC)
                 return;
         device_remove_file(dev, &dev_attr_diag_mode);
-        device_remove_file(dev, &dev_attr_beacon);
         device_remove_bin_file(dev, &bin_attr_crb);
         device_remove_bin_file(dev, &bin_attr_mem);
+        if (state == QLCNIC_DEV_FAILED || (state == QLCNIC_DEV_BADBAD))
+                return;
         device_remove_bin_file(dev, &bin_attr_pci_config);
+        device_remove_file(dev, &dev_attr_beacon);
         if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED))
                 return;
         device_remove_bin_file(dev, &bin_attr_esw_config);
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index 49343ec21c82..09d8d33171df 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -3845,7 +3845,7 @@ static int ql_wol(struct ql_adapter *qdev)
         if (qdev->wol & (WAKE_ARP | WAKE_MAGICSECURE | WAKE_PHY | WAKE_UCAST |
                         WAKE_MCAST | WAKE_BCAST)) {
                 netif_err(qdev, ifdown, qdev->ndev,
-                          "Unsupported WOL paramter. qdev->wol = 0x%x.\n",
+                          "Unsupported WOL parameter. qdev->wol = 0x%x.\n",
                           qdev->wol);
                 return -EINVAL;
         }
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c
index b96e1920e045..4de73643fec6 100644
--- a/drivers/net/ethernet/rdc/r6040.c
+++ b/drivers/net/ethernet/rdc/r6040.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2004 Sten Wang <sten.wang@rdc.com.tw>
  * Copyright (C) 2007
  *      Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
- *      Florian Fainelli <florian@openwrt.org>
+ * Copyright (C) 2007-2012 Florian Fainelli <florian@openwrt.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -74,9 +74,13 @@
 #define MT_ICR          0x0C    /* TX interrupt control */
 #define MR_ICR          0x10    /* RX interrupt control */
 #define MTPR            0x14    /* TX poll command register */
+#define  TM2TX          0x0001  /* Trigger MAC to transmit */
 #define MR_BSR          0x18    /* RX buffer size */
 #define MR_DCR          0x1A    /* RX descriptor control */
 #define MLSR            0x1C    /* Last status */
+#define  TX_FIFO_UNDR   0x0200  /* TX FIFO under-run */
+#define  TX_EXCEEDC     0x2000  /* Transmit exceed collision */
+#define  TX_LATEC       0x4000  /* Transmit late collision */
 #define MMDIO           0x20    /* MDIO control register */
 #define  MDIO_WRITE     0x4000  /* MDIO write */
 #define  MDIO_READ      0x2000  /* MDIO read */
@@ -124,6 +128,9 @@
 #define MID_3M          0x82    /* MID3 Medium */
 #define MID_3H          0x84    /* MID3 High */
 #define PHY_CC          0x88    /* PHY status change configuration register */
+#define  SCEN           0x8000  /* PHY status change enable */
+#define  PHYAD_SHIFT    8       /* PHY address shift */
+#define  TMRDIV_SHIFT   0       /* Timer divider shift */
 #define PHY_ST          0x8A    /* PHY status register */
 #define MAC_SM          0xAC    /* MAC status machine */
 #define  MAC_SM_RST     0x0002  /* MAC status machine reset */
@@ -137,6 +144,8 @@
 #define MBCR_DEFAULT    0x012A  /* MAC Bus Control Register */
 #define MCAST_MAX       3       /* Max number multicast addresses to filter */
 
+#define MAC_DEF_TIMEOUT 2048    /* Default MAC read/write operation timeout */
+
 /* Descriptor status */
 #define DSC_OWNER_MAC   0x8000  /* MAC is the owner of this descriptor */
 #define DSC_RX_OK       0x4000  /* RX was successful */
@@ -187,7 +196,7 @@ struct r6040_private {
         dma_addr_t rx_ring_dma;
         dma_addr_t tx_ring_dma;
         u16     tx_free_desc;
-        u16     mcr0, mcr1;
+        u16     mcr0;
         struct net_device *dev;
         struct mii_bus *mii_bus;
         struct napi_struct napi;
@@ -204,7 +213,7 @@ static char version[] __devinitdata = DRV_NAME
 /* Read a word data from PHY Chip */
 static int r6040_phy_read(void __iomem *ioaddr, int phy_addr, int reg)
 {
-        int limit = 2048;
+        int limit = MAC_DEF_TIMEOUT;
         u16 cmd;
 
         iowrite16(MDIO_READ + reg + (phy_addr << 8), ioaddr + MMDIO);
@@ -222,7 +231,7 @@ static int r6040_phy_read(void __iomem *ioaddr, int phy_addr, int reg)
 static void r6040_phy_write(void __iomem *ioaddr,
                                         int phy_addr, int reg, u16 val)
 {
-        int limit = 2048;
+        int limit = MAC_DEF_TIMEOUT;
         u16 cmd;
 
         iowrite16(val, ioaddr + MMWD);
@@ -358,27 +367,35 @@ err_exit:
         return rc;
 }
 
-static void r6040_init_mac_regs(struct net_device *dev)
+static void r6040_reset_mac(struct r6040_private *lp)
 {
-        struct r6040_private *lp = netdev_priv(dev);
         void __iomem *ioaddr = lp->base;
-        int limit = 2048;
+        int limit = MAC_DEF_TIMEOUT;
         u16 cmd;
 
-        /* Mask Off Interrupt */
-        iowrite16(MSK_INT, ioaddr + MIER);
-
-        /* Reset RDC MAC */
         iowrite16(MAC_RST, ioaddr + MCR1);
         while (limit--) {
                 cmd = ioread16(ioaddr + MCR1);
                 if (cmd & MAC_RST)
                         break;
         }
+
         /* Reset internal state machine */
         iowrite16(MAC_SM_RST, ioaddr + MAC_SM);
         iowrite16(0, ioaddr + MAC_SM);
         mdelay(5);
+}
+
+static void r6040_init_mac_regs(struct net_device *dev)
+{
+        struct r6040_private *lp = netdev_priv(dev);
+        void __iomem *ioaddr = lp->base;
+
+        /* Mask Off Interrupt */
+        iowrite16(MSK_INT, ioaddr + MIER);
+
+        /* Reset RDC MAC */
+        r6040_reset_mac(lp);
 
         /* MAC Bus Control Register */
         iowrite16(MBCR_DEFAULT, ioaddr + MBCR);
@@ -407,7 +424,7 @@ static void r6040_init_mac_regs(struct net_device *dev)
         /* Let TX poll the descriptors
          * we may got called by r6040_tx_timeout which has left
          * some unsent tx buffers */
-        iowrite16(0x01, ioaddr + MTPR);
+        iowrite16(TM2TX, ioaddr + MTPR);
 }
 
 static void r6040_tx_timeout(struct net_device *dev)
@@ -445,18 +462,13 @@ static void r6040_down(struct net_device *dev)
 {
         struct r6040_private *lp = netdev_priv(dev);
         void __iomem *ioaddr = lp->base;
-        int limit = 2048;
         u16 *adrp;
-        u16 cmd;
 
         /* Stop MAC */
         iowrite16(MSK_INT, ioaddr + MIER);      /* Mask Off Interrupt */
-        iowrite16(MAC_RST, ioaddr + MCR1);      /* Reset RDC MAC */
-        while (limit--) {
-                cmd = ioread16(ioaddr + MCR1);
-                if (cmd & MAC_RST)
-                        break;
-        }
+
+        /* Reset RDC MAC */
+        r6040_reset_mac(lp);
 
         /* Restore MAC Address to MIDx */
         adrp = (u16 *) dev->dev_addr;
@@ -599,9 +611,9 @@ static void r6040_tx(struct net_device *dev)
                 /* Check for errors */
                 err = ioread16(ioaddr + MLSR);
 
-                if (err & 0x0200)
-                        dev->stats.rx_fifo_errors++;
-                if (err & (0x2000 | 0x4000))
+                if (err & TX_FIFO_UNDR)
+                        dev->stats.tx_fifo_errors++;
+                if (err & (TX_EXCEEDC | TX_LATEC))
                         dev->stats.tx_carrier_errors++;
 
                 if (descptr->status & DSC_OWNER_MAC)
@@ -736,11 +748,7 @@ static void r6040_mac_address(struct net_device *dev)
         u16 *adrp;
 
         /* Reset MAC */
-        iowrite16(MAC_RST, ioaddr + MCR1);
-        /* Reset internal state machine */
-        iowrite16(MAC_SM_RST, ioaddr + MAC_SM);
-        iowrite16(0, ioaddr + MAC_SM);
-        mdelay(5);
+        r6040_reset_mac(lp);
 
         /* Restore MAC Address */
         adrp = (u16 *) dev->dev_addr;
@@ -840,7 +848,7 @@ static netdev_tx_t r6040_start_xmit(struct sk_buff *skb,
         skb_tx_timestamp(skb);
 
         /* Trigger the MAC to check the TX descriptor */
-        iowrite16(0x01, ioaddr + MTPR);
+        iowrite16(TM2TX, ioaddr + MTPR);
         lp->tx_insert_ptr = descptr->vndescp;
 
         /* If no tx resource, stop */
@@ -973,6 +981,7 @@ static const struct ethtool_ops netdev_ethtool_ops = {
         .get_settings           = netdev_get_settings,
         .set_settings           = netdev_set_settings,
         .get_link               = ethtool_op_get_link,
+        .get_ts_info            = ethtool_op_get_ts_info,
 };
 
 static const struct net_device_ops r6040_netdev_ops = {
@@ -1126,10 +1135,15 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
                 err = -EIO;
                 goto err_out_free_res;
         }
+
         /* If PHY status change register is still set to zero it means the
-         * bootloader didn't initialize it */
+         * bootloader didn't initialize it, so we set it to:
+         * - enable phy status change
+         * - enable all phy addresses
+         * - set to lowest timer divider */
         if (ioread16(ioaddr + PHY_CC) == 0)
-                iowrite16(0x9f07, ioaddr + PHY_CC);
+                iowrite16(SCEN | PHY_MAX_ADDR << PHYAD_SHIFT |
+                                7 << TMRDIV_SHIFT, ioaddr + PHY_CC);
 
         /* Init system & device */
         lp->base = ioaddr;
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index abc79076f867..5eef290997f9 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -635,9 +635,12 @@ static irqreturn_t cp_interrupt (int irq, void *dev_instance)
  */
 static void cp_poll_controller(struct net_device *dev)
 {
-        disable_irq(dev->irq);
-        cp_interrupt(dev->irq, dev);
-        enable_irq(dev->irq);
+        struct cp_private *cp = netdev_priv(dev);
+        const int irq = cp->pdev->irq;
+
+        disable_irq(irq);
+        cp_interrupt(irq, dev);
+        enable_irq(irq);
 }
 #endif
 
@@ -958,6 +961,11 @@ static inline void cp_start_hw (struct cp_private *cp)
         cpw8(Cmd, RxOn | TxOn);
 }
 
+static void cp_enable_irq(struct cp_private *cp)
+{
+        cpw16_f(IntrMask, cp_intr_mask);
+}
+
 static void cp_init_hw (struct cp_private *cp)
 {
         struct net_device *dev = cp->dev;
@@ -997,8 +1005,6 @@ static void cp_init_hw (struct cp_private *cp)
 
         cpw16(MultiIntr, 0);
 
-        cpw16_f(IntrMask, cp_intr_mask);
-
         cpw8_f(Cfg9346, Cfg9346_Lock);
 }
 
@@ -1114,6 +1120,7 @@ static void cp_free_rings (struct cp_private *cp)
 static int cp_open (struct net_device *dev)
 {
         struct cp_private *cp = netdev_priv(dev);
+        const int irq = cp->pdev->irq;
         int rc;
 
         netif_dbg(cp, ifup, dev, "enabling interface\n");
@@ -1126,10 +1133,12 @@ static int cp_open (struct net_device *dev)
 
         cp_init_hw(cp);
 
-        rc = request_irq(dev->irq, cp_interrupt, IRQF_SHARED, dev->name, dev);
+        rc = request_irq(irq, cp_interrupt, IRQF_SHARED, dev->name, dev);
         if (rc)
                 goto err_out_hw;
 
+        cp_enable_irq(cp);
+
         netif_carrier_off(dev);
         mii_check_media(&cp->mii_if, netif_msg_link(cp), true);
         netif_start_queue(dev);
@@ -1161,7 +1170,7 @@ static int cp_close (struct net_device *dev)
 
         spin_unlock_irqrestore(&cp->lock, flags);
 
-        free_irq(dev->irq, dev);
+        free_irq(cp->pdev->irq, dev);
 
         cp_free_rings(cp);
         return 0;
@@ -1909,7 +1918,6 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                        (unsigned long long)pciaddr);
                 goto err_out_res;
         }
-        dev->base_addr = (unsigned long) regs;
         cp->regs = regs;
 
         cp_stop_hw(cp);
@@ -1937,14 +1945,12 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
                 NETIF_F_HIGHDMA;
 
-        dev->irq = pdev->irq;
-
         rc = register_netdev(dev);
         if (rc)
                 goto err_out_iomap;
 
-        netdev_info(dev, "RTL-8139C+ at 0x%lx, %pM, IRQ %d\n",
-                    dev->base_addr, dev->dev_addr, dev->irq);
+        netdev_info(dev, "RTL-8139C+ at 0x%p, %pM, IRQ %d\n",
+                    regs, dev->dev_addr, pdev->irq);
 
         pci_set_drvdata(pdev, dev);
 
@@ -2031,6 +2037,7 @@ static int cp_resume (struct pci_dev *pdev)
         /* FIXME: sh*t may happen if the Rx ring buffer is depleted */
         cp_init_rings_index (cp);
         cp_init_hw (cp);
+        cp_enable_irq(cp);
         netif_start_queue (dev);
 
         spin_lock_irqsave (&cp->lock, flags);
diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
index df7fd8d083dc..03df076ed596 100644
--- a/drivers/net/ethernet/realtek/8139too.c
+++ b/drivers/net/ethernet/realtek/8139too.c
@@ -148,9 +148,9 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
 
 /* Whether to use MMIO or PIO. Default to MMIO. */
 #ifdef CONFIG_8139TOO_PIO
-static int use_io = 1;
+static bool use_io = true;
 #else
-static int use_io = 0;
+static bool use_io = false;
 #endif
 
 /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
@@ -620,7 +620,7 @@ MODULE_DESCRIPTION ("RealTek RTL-8139 Fast Ethernet driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 
-module_param(use_io, int, 0);
+module_param(use_io, bool, 0);
 MODULE_PARM_DESC(use_io, "Force use of I/O access mode. 0=MMIO 1=PIO");
 module_param(multicast_filter_limit, int, 0);
 module_param_array(media, int, NULL, 0);
@@ -750,15 +750,22 @@ static void rtl8139_chip_reset (void __iomem *ioaddr)
 
 static __devinit struct net_device * rtl8139_init_board (struct pci_dev *pdev)
 {
+        struct device *d = &pdev->dev;
         void __iomem *ioaddr;
         struct net_device *dev;
         struct rtl8139_private *tp;
         u8 tmp8;
         int rc, disable_dev_on_err = 0;
-        unsigned int i;
-        unsigned long pio_start, pio_end, pio_flags, pio_len;
-        unsigned long mmio_start, mmio_end, mmio_flags, mmio_len;
+        unsigned int i, bar;
+        unsigned long io_len;
         u32 version;
+        static const struct {
+                unsigned long mask;
+                char *type;
+        } res[] = {
+                { IORESOURCE_IO,  "PIO" },
+                { IORESOURCE_MEM, "MMIO" }
+        };
 
         assert (pdev != NULL);
 
@@ -777,78 +784,45 @@ static __devinit struct net_device * rtl8139_init_board (struct pci_dev *pdev)
         if (rc)
                 goto err_out;
 
-        pio_start = pci_resource_start (pdev, 0);
-        pio_end = pci_resource_end (pdev, 0);
-        pio_flags = pci_resource_flags (pdev, 0);
-        pio_len = pci_resource_len (pdev, 0);
-
-        mmio_start = pci_resource_start (pdev, 1);
-        mmio_end = pci_resource_end (pdev, 1);
-        mmio_flags = pci_resource_flags (pdev, 1);
-        mmio_len = pci_resource_len (pdev, 1);
-
-        /* set this immediately, we need to know before
-         * we talk to the chip directly */
-        pr_debug("PIO region size == 0x%02lX\n", pio_len);
-        pr_debug("MMIO region size == 0x%02lX\n", mmio_len);
-
-retry:
-        if (use_io) {
-                /* make sure PCI base addr 0 is PIO */
-                if (!(pio_flags & IORESOURCE_IO)) {
-                        dev_err(&pdev->dev, "region #0 not a PIO resource, aborting\n");
-                        rc = -ENODEV;
-                        goto err_out;
-                }
-                /* check for weird/broken PCI region reporting */
-                if (pio_len < RTL_MIN_IO_SIZE) {
-                        dev_err(&pdev->dev, "Invalid PCI I/O region size(s), aborting\n");
-                        rc = -ENODEV;
-                        goto err_out;
-                }
-        } else {
-                /* make sure PCI base addr 1 is MMIO */
-                if (!(mmio_flags & IORESOURCE_MEM)) {
-                        dev_err(&pdev->dev, "region #1 not an MMIO resource, aborting\n");
-                        rc = -ENODEV;
-                        goto err_out;
-                }
-                if (mmio_len < RTL_MIN_IO_SIZE) {
-                        dev_err(&pdev->dev, "Invalid PCI mem region size(s), aborting\n");
-                        rc = -ENODEV;
-                        goto err_out;
-                }
-        }
-
         rc = pci_request_regions (pdev, DRV_NAME);
         if (rc)
                 goto err_out;
         disable_dev_on_err = 1;
 
-        /* enable PCI bus-mastering */
         pci_set_master (pdev);
 
-        if (use_io) {
-                ioaddr = pci_iomap(pdev, 0, 0);
-                if (!ioaddr) {
-                        dev_err(&pdev->dev, "cannot map PIO, aborting\n");
-                        rc = -EIO;
-                        goto err_out;
-                }
-                dev->base_addr = pio_start;
-                tp->regs_len = pio_len;
-        } else {
-                /* ioremap MMIO region */
-                ioaddr = pci_iomap(pdev, 1, 0);
-                if (ioaddr == NULL) {
-                        dev_err(&pdev->dev, "cannot remap MMIO, trying PIO\n");
-                        pci_release_regions(pdev);
-                        use_io = 1;
+retry:
+        /* PIO bar register comes first. */
+        bar = !use_io;
+
+        io_len = pci_resource_len(pdev, bar);
+
+        dev_dbg(d, "%s region size = 0x%02lX\n", res[bar].type, io_len);
+
+        if (!(pci_resource_flags(pdev, bar) & res[bar].mask)) {
+                dev_err(d, "region #%d not a %s resource, aborting\n", bar,
+                        res[bar].type);
+                rc = -ENODEV;
+                goto err_out;
+        }
+        if (io_len < RTL_MIN_IO_SIZE) {
+                dev_err(d, "Invalid PCI %s region size(s), aborting\n",
+                        res[bar].type);
+                rc = -ENODEV;
+                goto err_out;
+        }
+
+        ioaddr = pci_iomap(pdev, bar, 0);
+        if (!ioaddr) {
+                dev_err(d, "cannot map %s\n", res[bar].type);
+                if (!use_io) {
+                        use_io = true;
                         goto retry;
                 }
-                dev->base_addr = (long) ioaddr;
-                tp->regs_len = mmio_len;
+                rc = -ENODEV;
+                goto err_out;
         }
+        tp->regs_len = io_len;
         tp->mmio_addr = ioaddr;
 
         /* Bring old chips out of low-power mode. */
@@ -1035,8 +1009,6 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
         dev->hw_features |= NETIF_F_RXALL;
         dev->hw_features |= NETIF_F_RXFCS;
 
-        dev->irq = pdev->irq;
-
         /* tp zeroed and aligned in alloc_etherdev */
         tp = netdev_priv(dev);
 
@@ -1062,9 +1034,9 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
 
         pci_set_drvdata (pdev, dev);
 
-        netdev_info(dev, "%s at 0x%lx, %pM, IRQ %d\n",
+        netdev_info(dev, "%s at 0x%p, %pM, IRQ %d\n",
                     board_info[ent->driver_data].name,
-                    dev->base_addr, dev->dev_addr, dev->irq);
+                    ioaddr, dev->dev_addr, pdev->irq);
 
         netdev_dbg(dev, "Identified 8139 chip type '%s'\n",
                    rtl_chip_info[tp->chipset].name);
@@ -1339,10 +1311,11 @@ static void mdio_write (struct net_device *dev, int phy_id, int location,
 static int rtl8139_open (struct net_device *dev)
 {
         struct rtl8139_private *tp = netdev_priv(dev);
-        int retval;
         void __iomem *ioaddr = tp->mmio_addr;
+        const int irq = tp->pci_dev->irq;
+        int retval;
 
-        retval = request_irq (dev->irq, rtl8139_interrupt, IRQF_SHARED, dev->name, dev);
+        retval = request_irq(irq, rtl8139_interrupt, IRQF_SHARED, dev->name, dev);
         if (retval)
                 return retval;
 
@@ -1351,7 +1324,7 @@ static int rtl8139_open (struct net_device *dev)
         tp->rx_ring = dma_alloc_coherent(&tp->pci_dev->dev, RX_BUF_TOT_LEN,
                                            &tp->rx_ring_dma, GFP_KERNEL);
         if (tp->tx_bufs == NULL || tp->rx_ring == NULL) {
-                free_irq(dev->irq, dev);
+                free_irq(irq, dev);
 
                 if (tp->tx_bufs)
                         dma_free_coherent(&tp->pci_dev->dev, TX_BUF_TOT_LEN,
@@ -1377,7 +1350,7 @@ static int rtl8139_open (struct net_device *dev)
                   "%s() ioaddr %#llx IRQ %d GP Pins %02x %s-duplex\n",
                   __func__,
                   (unsigned long long)pci_resource_start (tp->pci_dev, 1),
-                  dev->irq, RTL_R8 (MediaStatus),
+                  irq, RTL_R8 (MediaStatus),
                   tp->mii.full_duplex ? "full" : "half");
 
         rtl8139_start_thread(tp);
@@ -2240,9 +2213,12 @@ static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance)
  */
 static void rtl8139_poll_controller(struct net_device *dev)
 {
-        disable_irq(dev->irq);
-        rtl8139_interrupt(dev->irq, dev);
-        enable_irq(dev->irq);
+        struct rtl8139_private *tp = netdev_priv(dev);
+        const int irq = tp->pci_dev->irq;
+
+        disable_irq(irq);
+        rtl8139_interrupt(irq, dev);
+        enable_irq(irq);
 }
 #endif
 
@@ -2295,7 +2271,7 @@ static int rtl8139_close (struct net_device *dev)
 
         spin_unlock_irqrestore (&tp->lock, flags);
 
-        free_irq (dev->irq, dev);
+        free_irq(tp->pci_dev->irq, dev);
 
         rtl8139_tx_clear (tp);
 
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index f54509377efa..4f74b9762c29 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -44,6 +44,8 @@
 #define FIRMWARE_8168F_1        "rtl_nic/rtl8168f-1.fw"
 #define FIRMWARE_8168F_2        "rtl_nic/rtl8168f-2.fw"
 #define FIRMWARE_8105E_1        "rtl_nic/rtl8105e-1.fw"
+#define FIRMWARE_8402_1         "rtl_nic/rtl8402-1.fw"
+#define FIRMWARE_8411_1         "rtl_nic/rtl8411-1.fw"
 
 #ifdef RTL8169_DEBUG
 #define assert(expr) \
@@ -61,8 +63,12 @@
 #define R8169_MSG_DEFAULT \
         (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_IFUP | NETIF_MSG_IFDOWN)
 
-#define TX_BUFFS_AVAIL(tp) \
-        (tp->dirty_tx + NUM_TX_DESC - tp->cur_tx - 1)
+#define TX_SLOTS_AVAIL(tp) \
+        (tp->dirty_tx + NUM_TX_DESC - tp->cur_tx)
+
+/* A skbuff with nr_frags needs nr_frags+1 entries in the tx queue */
+#define TX_FRAGS_READY_FOR(tp,nr_frags) \
+        (TX_SLOTS_AVAIL(tp) >= (nr_frags + 1))
 
 /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
    The RTL chips use a 64 element hash table based on the Ethernet CRC. */
@@ -133,6 +139,8 @@ enum mac_version {
         RTL_GIGA_MAC_VER_34,
         RTL_GIGA_MAC_VER_35,
         RTL_GIGA_MAC_VER_36,
+        RTL_GIGA_MAC_VER_37,
+        RTL_GIGA_MAC_VER_38,
         RTL_GIGA_MAC_NONE   = 0xff,
 };
 
@@ -245,6 +253,12 @@ static const struct {
         [RTL_GIGA_MAC_VER_36] =
                 _R("RTL8168f/8111f",    RTL_TD_1, FIRMWARE_8168F_2,
                                                         JUMBO_9K, false),
+        [RTL_GIGA_MAC_VER_37] =
+                _R("RTL8402",           RTL_TD_1, FIRMWARE_8402_1,
+                                                        JUMBO_1K, true),
+        [RTL_GIGA_MAC_VER_38] =
+                _R("RTL8411",           RTL_TD_1, FIRMWARE_8411_1,
+                                                        JUMBO_9K, false),
 };
 #undef _R
 
@@ -315,6 +329,8 @@ enum rtl_registers {
         Config0         = 0x51,
         Config1         = 0x52,
         Config2         = 0x53,
+#define PME_SIGNAL                      (1 << 5)        /* 8168c and later */
+
         Config3         = 0x54,
         Config4         = 0x55,
         Config5         = 0x56,
@@ -355,6 +371,9 @@ enum rtl8168_8101_registers {
 #define CSIAR_BYTE_ENABLE               0x0f
 #define CSIAR_BYTE_ENABLE_SHIFT         12
 #define CSIAR_ADDR_MASK                 0x0fff
+#define CSIAR_FUNC_CARD                 0x00000000
+#define CSIAR_FUNC_SDIO                 0x00010000
+#define CSIAR_FUNC_NIC                  0x00020000
         PMCH                    = 0x6f,
         EPHYAR                  = 0x80,
 #define EPHYAR_FLAG                     0x80000000
@@ -716,6 +735,11 @@ struct rtl8169_private {
                 void (*disable)(struct rtl8169_private *);
         } jumbo_ops;
 
+        struct csi_ops {
+                void (*write)(void __iomem *, int, int);
+                u32 (*read)(void __iomem *, int);
+        } csi_ops;
+
         int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
         int (*get_settings)(struct net_device *, struct ethtool_cmd *);
         void (*phy_reset_enable)(struct rtl8169_private *tp);
@@ -768,6 +792,8 @@ MODULE_FIRMWARE(FIRMWARE_8168E_3);
 MODULE_FIRMWARE(FIRMWARE_8105E_1);
 MODULE_FIRMWARE(FIRMWARE_8168F_1);
 MODULE_FIRMWARE(FIRMWARE_8168F_2);
+MODULE_FIRMWARE(FIRMWARE_8402_1);
+MODULE_FIRMWARE(FIRMWARE_8411_1);
 
 static void rtl_lock_work(struct rtl8169_private *tp)
 {
@@ -1078,40 +1104,6 @@ static u16 rtl_ephy_read(void __iomem *ioaddr, int reg_addr)
         return value;
 }
 
-static void rtl_csi_write(void __iomem *ioaddr, int addr, int value)
-{
-        unsigned int i;
-
-        RTL_W32(CSIDR, value);
-        RTL_W32(CSIAR, CSIAR_WRITE_CMD | (addr & CSIAR_ADDR_MASK) |
-                CSIAR_BYTE_ENABLE << CSIAR_BYTE_ENABLE_SHIFT);
-
-        for (i = 0; i < 100; i++) {
-                if (!(RTL_R32(CSIAR) & CSIAR_FLAG))
-                        break;
-                udelay(10);
-        }
-}
-
-static u32 rtl_csi_read(void __iomem *ioaddr, int addr)
-{
-        u32 value = ~0x00;
-        unsigned int i;
-
-        RTL_W32(CSIAR, (addr & CSIAR_ADDR_MASK) |
-                CSIAR_BYTE_ENABLE << CSIAR_BYTE_ENABLE_SHIFT);
-
-        for (i = 0; i < 100; i++) {
-                if (RTL_R32(CSIAR) & CSIAR_FLAG) {
-                        value = RTL_R32(CSIDR);
-                        break;
-                }
-                udelay(10);
-        }
-
-        return value;
-}
-
 static
 void rtl_eri_write(void __iomem *ioaddr, int addr, u32 mask, u32 val, int type)
 {
@@ -1281,7 +1273,8 @@ static void rtl_link_chg_patch(struct rtl8169_private *tp)
         if (!netif_running(dev))
                 return;
 
-        if (tp->mac_version == RTL_GIGA_MAC_VER_34) {
+        if (tp->mac_version == RTL_GIGA_MAC_VER_34 ||
+            tp->mac_version == RTL_GIGA_MAC_VER_38) {
                 if (RTL_R8(PHYstatus) & _1000bpsF) {
                         rtl_eri_write(ioaddr, 0x1bc, ERIAR_MASK_1111,
                                       0x00000011, ERIAR_EXGMAC);
@@ -1316,6 +1309,16 @@ static void rtl_link_chg_patch(struct rtl8169_private *tp)
                         rtl_eri_write(ioaddr, 0x1dc, ERIAR_MASK_1111,
                                       0x0000003f, ERIAR_EXGMAC);
                 }
+        } else if (tp->mac_version == RTL_GIGA_MAC_VER_37) {
+                if (RTL_R8(PHYstatus) & _10bps) {
+                        rtl_eri_write(ioaddr, 0x1d0, ERIAR_MASK_0011,
+                                      0x4d02, ERIAR_EXGMAC);
+                        rtl_eri_write(ioaddr, 0x1dc, ERIAR_MASK_0011,
+                                      0x0060, ERIAR_EXGMAC);
+                } else {
+                        rtl_eri_write(ioaddr, 0x1d0, ERIAR_MASK_0011,
+                                      0x0000, ERIAR_EXGMAC);
+                }
         }
 }
 
@@ -1396,7 +1399,6 @@ static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts)
                 u16 reg;
                 u8  mask;
         } cfg[] = {
-                { WAKE_ANY,   Config1, PMEnable },
                 { WAKE_PHY,   Config3, LinkUp },
                 { WAKE_MAGIC, Config3, MagicPacket },
                 { WAKE_UCAST, Config5, UWF },
@@ -1404,16 +1406,32 @@ static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts)
                 { WAKE_MCAST, Config5, MWF },
                 { WAKE_ANY,   Config5, LanWake }
         };
+        u8 options;
 
         RTL_W8(Cfg9346, Cfg9346_Unlock);
 
         for (i = 0; i < ARRAY_SIZE(cfg); i++) {
-                u8 options = RTL_R8(cfg[i].reg) & ~cfg[i].mask;
+                options = RTL_R8(cfg[i].reg) & ~cfg[i].mask;
                 if (wolopts & cfg[i].opt)
                         options |= cfg[i].mask;
                 RTL_W8(cfg[i].reg, options);
         }
 
+        switch (tp->mac_version) {
+        case RTL_GIGA_MAC_VER_01 ... RTL_GIGA_MAC_VER_17:
+                options = RTL_R8(Config1) & ~PMEnable;
+                if (wolopts)
+                        options |= PMEnable;
+                RTL_W8(Config1, options);
+                break;
+        default:
+                options = RTL_R8(Config2) & ~PME_SIGNAL;
+                if (wolopts)
+                        options |= PME_SIGNAL;
+                RTL_W8(Config2, options);
+                break;
+        }
+
         RTL_W8(Cfg9346, Cfg9346_Lock);
 }
 
@@ -1853,6 +1871,7 @@ static const struct ethtool_ops rtl8169_ethtool_ops = {
         .get_strings            = rtl8169_get_strings,
         .get_sset_count         = rtl8169_get_sset_count,
         .get_ethtool_stats      = rtl8169_get_ethtool_stats,
+        .get_ts_info            = ethtool_op_get_ts_info,
 };
 
 static void rtl8169_get_mac_version(struct rtl8169_private *tp,
@@ -1876,6 +1895,7 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
                 int mac_version;
         } mac_info[] = {
                 /* 8168F family. */
+                { 0x7c800000, 0x48800000,       RTL_GIGA_MAC_VER_38 },
                 { 0x7cf00000, 0x48100000,       RTL_GIGA_MAC_VER_36 },
                 { 0x7cf00000, 0x48000000,       RTL_GIGA_MAC_VER_35 },
 
@@ -1913,6 +1933,7 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
                 { 0x7c800000, 0x30000000,       RTL_GIGA_MAC_VER_11 },
 
                 /* 8101 family. */
+                { 0x7c800000, 0x44000000,       RTL_GIGA_MAC_VER_37 },
                 { 0x7cf00000, 0x40b00000,       RTL_GIGA_MAC_VER_30 },
                 { 0x7cf00000, 0x40a00000,       RTL_GIGA_MAC_VER_30 },
                 { 0x7cf00000, 0x40900000,       RTL_GIGA_MAC_VER_29 },
@@ -3013,6 +3034,28 @@ static void rtl8168e_2_hw_phy_config(struct rtl8169_private *tp)
         rtl_writephy(tp, 0x1f, 0x0000);
 }
 
+static void rtl8168f_hw_phy_config(struct rtl8169_private *tp)
+{
+        /* For 4-corner performance improve */
+        rtl_writephy(tp, 0x1f, 0x0005);
+        rtl_writephy(tp, 0x05, 0x8b80);
+        rtl_w1w0_phy(tp, 0x06, 0x0006, 0x0000);
+        rtl_writephy(tp, 0x1f, 0x0000);
+
+        /* PHY auto speed down */
+        rtl_writephy(tp, 0x1f, 0x0007);
+        rtl_writephy(tp, 0x1e, 0x002d);
+        rtl_w1w0_phy(tp, 0x18, 0x0010, 0x0000);
+        rtl_writephy(tp, 0x1f, 0x0000);
+        rtl_w1w0_phy(tp, 0x14, 0x8000, 0x0000);
+
+        /* Improve 10M EEE waveform */
+        rtl_writephy(tp, 0x1f, 0x0005);
+        rtl_writephy(tp, 0x05, 0x8b86);
+        rtl_w1w0_phy(tp, 0x06, 0x0001, 0x0000);
+        rtl_writephy(tp, 0x1f, 0x0000);
+}
+
 static void rtl8168f_1_hw_phy_config(struct rtl8169_private *tp)
 {
         static const struct phy_reg phy_reg_init[] = {
@@ -3054,24 +3097,7 @@ static void rtl8168f_1_hw_phy_config(struct rtl8169_private *tp)
 
         rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));
 
-        /* For 4-corner performance improve */
-        rtl_writephy(tp, 0x1f, 0x0005);
-        rtl_writephy(tp, 0x05, 0x8b80);
-        rtl_w1w0_phy(tp, 0x06, 0x0006, 0x0000);
-        rtl_writephy(tp, 0x1f, 0x0000);
-
-        /* PHY auto speed down */
-        rtl_writephy(tp, 0x1f, 0x0007);
-        rtl_writephy(tp, 0x1e, 0x002d);
-        rtl_w1w0_phy(tp, 0x18, 0x0010, 0x0000);
-        rtl_writephy(tp, 0x1f, 0x0000);
-        rtl_w1w0_phy(tp, 0x14, 0x8000, 0x0000);
-
-        /* Improve 10M EEE waveform */
-        rtl_writephy(tp, 0x1f, 0x0005);
-        rtl_writephy(tp, 0x05, 0x8b86);
-        rtl_w1w0_phy(tp, 0x06, 0x0001, 0x0000);
-        rtl_writephy(tp, 0x1f, 0x0000);
+        rtl8168f_hw_phy_config(tp);
 
         /* Improve 2-pair detection performance */
         rtl_writephy(tp, 0x1f, 0x0005);
@@ -3084,23 +3110,104 @@ static void rtl8168f_2_hw_phy_config(struct rtl8169_private *tp)
 {
         rtl_apply_firmware(tp);
 
-        /* For 4-corner performance improve */
+        rtl8168f_hw_phy_config(tp);
+}
+
+static void rtl8411_hw_phy_config(struct rtl8169_private *tp)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+        static const struct phy_reg phy_reg_init[] = {
+                /* Channel estimation fine tune */
+                { 0x1f, 0x0003 },
+                { 0x09, 0xa20f },
+                { 0x1f, 0x0000 },
+
+                /* Modify green table for giga & fnet */
+                { 0x1f, 0x0005 },
+                { 0x05, 0x8b55 },
+                { 0x06, 0x0000 },
+                { 0x05, 0x8b5e },
+                { 0x06, 0x0000 },
+                { 0x05, 0x8b67 },
+                { 0x06, 0x0000 },
+                { 0x05, 0x8b70 },
+                { 0x06, 0x0000 },
+                { 0x1f, 0x0000 },
+                { 0x1f, 0x0007 },
+                { 0x1e, 0x0078 },
+                { 0x17, 0x0000 },
+                { 0x19, 0x00aa },
+                { 0x1f, 0x0000 },
+
+                /* Modify green table for 10M */
+                { 0x1f, 0x0005 },
+                { 0x05, 0x8b79 },
+                { 0x06, 0xaa00 },
+                { 0x1f, 0x0000 },
+
+                /* Disable hiimpedance detection (RTCT) */
+                { 0x1f, 0x0003 },
+                { 0x01, 0x328a },
+                { 0x1f, 0x0000 }
+        };
+
+
+        rtl_apply_firmware(tp);
+
+        rtl8168f_hw_phy_config(tp);
+
+        /* Improve 2-pair detection performance */
         rtl_writephy(tp, 0x1f, 0x0005);
-        rtl_writephy(tp, 0x05, 0x8b80);
-        rtl_w1w0_phy(tp, 0x06, 0x0006, 0x0000);
+        rtl_writephy(tp, 0x05, 0x8b85);
+        rtl_w1w0_phy(tp, 0x06, 0x4000, 0x0000);
         rtl_writephy(tp, 0x1f, 0x0000);
 
-        /* PHY auto speed down */
-        rtl_writephy(tp, 0x1f, 0x0007);
-        rtl_writephy(tp, 0x1e, 0x002d);
-        rtl_w1w0_phy(tp, 0x18, 0x0010, 0x0000);
+        rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));
+
+        /* Modify green table for giga */
+        rtl_writephy(tp, 0x1f, 0x0005);
+        rtl_writephy(tp, 0x05, 0x8b54);
+        rtl_w1w0_phy(tp, 0x06, 0x0000, 0x0800);
+        rtl_writephy(tp, 0x05, 0x8b5d);
+        rtl_w1w0_phy(tp, 0x06, 0x0000, 0x0800);
+        rtl_writephy(tp, 0x05, 0x8a7c);
+        rtl_w1w0_phy(tp, 0x06, 0x0000, 0x0100);
+        rtl_writephy(tp, 0x05, 0x8a7f);
+        rtl_w1w0_phy(tp, 0x06, 0x0100, 0x0000);
+        rtl_writephy(tp, 0x05, 0x8a82);
+        rtl_w1w0_phy(tp, 0x06, 0x0000, 0x0100);
+        rtl_writephy(tp, 0x05, 0x8a85);
+        rtl_w1w0_phy(tp, 0x06, 0x0000, 0x0100);
+        rtl_writephy(tp, 0x05, 0x8a88);
+        rtl_w1w0_phy(tp, 0x06, 0x0000, 0x0100);
         rtl_writephy(tp, 0x1f, 0x0000);
-        rtl_w1w0_phy(tp, 0x14, 0x8000, 0x0000);
 
-        /* Improve 10M EEE waveform */
+        /* uc same-seed solution */
         rtl_writephy(tp, 0x1f, 0x0005);
-        rtl_writephy(tp, 0x05, 0x8b86);
-        rtl_w1w0_phy(tp, 0x06, 0x0001, 0x0000);
+        rtl_writephy(tp, 0x05, 0x8b85);
+        rtl_w1w0_phy(tp, 0x06, 0x8000, 0x0000);
+        rtl_writephy(tp, 0x1f, 0x0000);
+
+        /* eee setting */
+        rtl_w1w0_eri(ioaddr, 0x1b0, ERIAR_MASK_0001, 0x00, 0x03, ERIAR_EXGMAC);
+        rtl_writephy(tp, 0x1f, 0x0005);
+        rtl_writephy(tp, 0x05, 0x8b85);
+        rtl_w1w0_phy(tp, 0x06, 0x0000, 0x2000);
+        rtl_writephy(tp, 0x1f, 0x0004);
+        rtl_writephy(tp, 0x1f, 0x0007);
+        rtl_writephy(tp, 0x1e, 0x0020);
+        rtl_w1w0_phy(tp, 0x15, 0x0000, 0x0100);
+        rtl_writephy(tp, 0x1f, 0x0000);
+        rtl_writephy(tp, 0x0d, 0x0007);
+        rtl_writephy(tp, 0x0e, 0x003c);
+        rtl_writephy(tp, 0x0d, 0x4007);
+        rtl_writephy(tp, 0x0e, 0x0000);
+        rtl_writephy(tp, 0x0d, 0x0000);
+
+        /* Green feature */
+        rtl_writephy(tp, 0x1f, 0x0003);
+        rtl_w1w0_phy(tp, 0x19, 0x0000, 0x0001);
+        rtl_w1w0_phy(tp, 0x10, 0x0000, 0x0400);
         rtl_writephy(tp, 0x1f, 0x0000);
 }
 
@@ -3147,6 +3254,25 @@ static void rtl8105e_hw_phy_config(struct rtl8169_private *tp)
         rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));
 }
 
+static void rtl8402_hw_phy_config(struct rtl8169_private *tp)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        /* Disable ALDPS before setting firmware */
+        rtl_writephy(tp, 0x1f, 0x0000);
+        rtl_writephy(tp, 0x18, 0x0310);
+        msleep(20);
+
+        rtl_apply_firmware(tp);
+
+        /* EEE setting */
+        rtl_eri_write(ioaddr, 0x1b0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
+        rtl_writephy(tp, 0x1f, 0x0004);
+        rtl_writephy(tp, 0x10, 0x401f);
+        rtl_writephy(tp, 0x19, 0x7030);
+        rtl_writephy(tp, 0x1f, 0x0000);
+}
+
 static void rtl_hw_phy_config(struct net_device *dev)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
@@ -3235,6 +3361,14 @@ static void rtl_hw_phy_config(struct net_device *dev)
                 rtl8168f_2_hw_phy_config(tp);
                 break;
 
+        case RTL_GIGA_MAC_VER_37:
+                rtl8402_hw_phy_config(tp);
+                break;
+
+        case RTL_GIGA_MAC_VER_38:
+                rtl8411_hw_phy_config(tp);
+                break;
+
         default:
                 break;
         }
@@ -3472,6 +3606,8 @@ static void rtl_wol_suspend_quirk(struct rtl8169_private *tp)
         case RTL_GIGA_MAC_VER_32:
         case RTL_GIGA_MAC_VER_33:
         case RTL_GIGA_MAC_VER_34:
+        case RTL_GIGA_MAC_VER_37:
+        case RTL_GIGA_MAC_VER_38:
                 RTL_W32(RxConfig, RTL_R32(RxConfig) |
                         AcceptBroadcast | AcceptMulticast | AcceptMyPhys);
                 break;
@@ -3507,15 +3643,45 @@ static void r810x_phy_power_up(struct rtl8169_private *tp)
 
 static void r810x_pll_power_down(struct rtl8169_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
+
         if (rtl_wol_pll_power_down(tp))
                 return;
 
         r810x_phy_power_down(tp);
+
+        switch (tp->mac_version) {
+        case RTL_GIGA_MAC_VER_07:
+        case RTL_GIGA_MAC_VER_08:
+        case RTL_GIGA_MAC_VER_09:
+        case RTL_GIGA_MAC_VER_10:
+        case RTL_GIGA_MAC_VER_13:
+        case RTL_GIGA_MAC_VER_16:
+                break;
+        default:
+                RTL_W8(PMCH, RTL_R8(PMCH) & ~0x80);
+                break;
+        }
 }
 
 static void r810x_pll_power_up(struct rtl8169_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
+
         r810x_phy_power_up(tp);
+
+        switch (tp->mac_version) {
+        case RTL_GIGA_MAC_VER_07:
+        case RTL_GIGA_MAC_VER_08:
+        case RTL_GIGA_MAC_VER_09:
+        case RTL_GIGA_MAC_VER_10:
+        case RTL_GIGA_MAC_VER_13:
+        case RTL_GIGA_MAC_VER_16:
+                break;
+        default:
+                RTL_W8(PMCH, RTL_R8(PMCH) | 0x80);
+                break;
+        }
 }
 
 static void r8168_phy_power_up(struct rtl8169_private *tp)
@@ -3619,13 +3785,6 @@ static void r8168_pll_power_up(struct rtl8169_private *tp)
 {
         void __iomem *ioaddr = tp->mmio_addr;
 
-        if ((tp->mac_version == RTL_GIGA_MAC_VER_27 ||
-             tp->mac_version == RTL_GIGA_MAC_VER_28 ||
-             tp->mac_version == RTL_GIGA_MAC_VER_31) &&
-            r8168dp_check_dash(tp)) {
-                return;
-        }
-
         switch (tp->mac_version) {
         case RTL_GIGA_MAC_VER_25:
         case RTL_GIGA_MAC_VER_26:
@@ -3670,6 +3829,7 @@ static void __devinit rtl_init_pll_power_ops(struct rtl8169_private *tp)
         case RTL_GIGA_MAC_VER_16:
         case RTL_GIGA_MAC_VER_29:
         case RTL_GIGA_MAC_VER_30:
+        case RTL_GIGA_MAC_VER_37:
                 ops->down       = r810x_pll_power_down;
                 ops->up         = r810x_pll_power_up;
                 break;
@@ -3694,6 +3854,7 @@ static void __devinit rtl_init_pll_power_ops(struct rtl8169_private *tp)
         case RTL_GIGA_MAC_VER_34:
         case RTL_GIGA_MAC_VER_35:
         case RTL_GIGA_MAC_VER_36:
+        case RTL_GIGA_MAC_VER_38:
                 ops->down       = r8168_pll_power_down;
                 ops->up         = r8168_pll_power_up;
                 break;
@@ -3979,7 +4140,9 @@ static void rtl8169_hw_reset(struct rtl8169_private *tp)
                         udelay(20);
         } else if (tp->mac_version == RTL_GIGA_MAC_VER_34 ||
                    tp->mac_version == RTL_GIGA_MAC_VER_35 ||
-                   tp->mac_version == RTL_GIGA_MAC_VER_36) {
+                   tp->mac_version == RTL_GIGA_MAC_VER_36 ||
+                   tp->mac_version == RTL_GIGA_MAC_VER_37 ||
+                   tp->mac_version == RTL_GIGA_MAC_VER_38) {
                 RTL_W8(ChipCmd, RTL_R8(ChipCmd) | StopReq);
                 while (!(RTL_R32(TxConfig) & TXCFG_EMPTY))
                         udelay(100);
@@ -4185,22 +4348,141 @@ static void rtl_hw_start_8169(struct net_device *dev)
         RTL_W16(MultiIntr, RTL_R16(MultiIntr) & 0xF000);
 }
 
-static void rtl_csi_access_enable(void __iomem *ioaddr, u32 bits)
+static void rtl_csi_write(struct rtl8169_private *tp, int addr, int value)
+{
+        if (tp->csi_ops.write)
+                tp->csi_ops.write(tp->mmio_addr, addr, value);
+}
+
+static u32 rtl_csi_read(struct rtl8169_private *tp, int addr)
+{
+        if (tp->csi_ops.read)
+                return tp->csi_ops.read(tp->mmio_addr, addr);
+        else
+                return ~0;
+}
+
+static void rtl_csi_access_enable(struct rtl8169_private *tp, u32 bits)
 {
         u32 csi;
 
-        csi = rtl_csi_read(ioaddr, 0x070c) & 0x00ffffff;
-        rtl_csi_write(ioaddr, 0x070c, csi | bits);
+        csi = rtl_csi_read(tp, 0x070c) & 0x00ffffff;
+        rtl_csi_write(tp, 0x070c, csi | bits);
+}
+
+static void rtl_csi_access_enable_1(struct rtl8169_private *tp)
+{
+        rtl_csi_access_enable(tp, 0x17000000);
+}
+
+static void rtl_csi_access_enable_2(struct rtl8169_private *tp)
+{
+        rtl_csi_access_enable(tp, 0x27000000);
+}
+
+static void r8169_csi_write(void __iomem *ioaddr, int addr, int value)
+{
+        unsigned int i;
+
+        RTL_W32(CSIDR, value);
+        RTL_W32(CSIAR, CSIAR_WRITE_CMD | (addr & CSIAR_ADDR_MASK) |
+                CSIAR_BYTE_ENABLE << CSIAR_BYTE_ENABLE_SHIFT);
+
+        for (i = 0; i < 100; i++) {
+                if (!(RTL_R32(CSIAR) & CSIAR_FLAG))
+                        break;
+                udelay(10);
+        }
+}
+
+static u32 r8169_csi_read(void __iomem *ioaddr, int addr)
+{
+        u32 value = ~0x00;
+        unsigned int i;
+
+        RTL_W32(CSIAR, (addr & CSIAR_ADDR_MASK) |
+                CSIAR_BYTE_ENABLE << CSIAR_BYTE_ENABLE_SHIFT);
+
+        for (i = 0; i < 100; i++) {
+                if (RTL_R32(CSIAR) & CSIAR_FLAG) {
+                        value = RTL_R32(CSIDR);
+                        break;
+                }
+                udelay(10);
+        }
+
+        return value;
+}
+
+static void r8402_csi_write(void __iomem *ioaddr, int addr, int value)
+{
+        unsigned int i;
+
+        RTL_W32(CSIDR, value);
+        RTL_W32(CSIAR, CSIAR_WRITE_CMD | (addr & CSIAR_ADDR_MASK) |
+                CSIAR_BYTE_ENABLE << CSIAR_BYTE_ENABLE_SHIFT |
+                CSIAR_FUNC_NIC);
+
+        for (i = 0; i < 100; i++) {
+                if (!(RTL_R32(CSIAR) & CSIAR_FLAG))
+                        break;
+                udelay(10);
+        }
 }
 
-static void rtl_csi_access_enable_1(void __iomem *ioaddr)
+static u32 r8402_csi_read(void __iomem *ioaddr, int addr)
 {
-        rtl_csi_access_enable(ioaddr, 0x17000000);
+        u32 value = ~0x00;
+        unsigned int i;
+
+        RTL_W32(CSIAR, (addr & CSIAR_ADDR_MASK) | CSIAR_FUNC_NIC |
+                CSIAR_BYTE_ENABLE << CSIAR_BYTE_ENABLE_SHIFT);
+
+        for (i = 0; i < 100; i++) {
+                if (RTL_R32(CSIAR) & CSIAR_FLAG) {
+                        value = RTL_R32(CSIDR);
+                        break;
+                }
+                udelay(10);
+        }
+
+        return value;
 }
 
-static void rtl_csi_access_enable_2(void __iomem *ioaddr)
+static void __devinit rtl_init_csi_ops(struct rtl8169_private *tp)
 {
-        rtl_csi_access_enable(ioaddr, 0x27000000);
+        struct csi_ops *ops = &tp->csi_ops;
+
+        switch (tp->mac_version) {
+        case RTL_GIGA_MAC_VER_01:
+        case RTL_GIGA_MAC_VER_02:
+        case RTL_GIGA_MAC_VER_03:
+        case RTL_GIGA_MAC_VER_04:
+        case RTL_GIGA_MAC_VER_05:
+        case RTL_GIGA_MAC_VER_06:
+        case RTL_GIGA_MAC_VER_10:
+        case RTL_GIGA_MAC_VER_11:
+        case RTL_GIGA_MAC_VER_12:
+        case RTL_GIGA_MAC_VER_13:
+        case RTL_GIGA_MAC_VER_14:
+        case RTL_GIGA_MAC_VER_15:
+        case RTL_GIGA_MAC_VER_16:
+        case RTL_GIGA_MAC_VER_17:
+                ops->write      = NULL;
+                ops->read       = NULL;
+                break;
+
+        case RTL_GIGA_MAC_VER_37:
+        case RTL_GIGA_MAC_VER_38:
+                ops->write      = r8402_csi_write;
+                ops->read       = r8402_csi_read;
+                break;
+
+        default:
+                ops->write      = r8169_csi_write;
+                ops->read       = r8169_csi_read;
+                break;
+        }
 }
 
 struct ephy_info {
@@ -4257,8 +4539,11 @@ static void rtl_enable_clock_request(struct pci_dev *pdev)
         PktCntrDisable | \
         Mac_dbgo_sel)
 
-static void rtl_hw_start_8168bb(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8168bb(struct rtl8169_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
+        struct pci_dev *pdev = tp->pci_dev;
+
         RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
 
         RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R8168_CPCMD_QUIRK_MASK);
@@ -4267,17 +4552,22 @@ static void rtl_hw_start_8168bb(void __iomem *ioaddr, struct pci_dev *pdev)
                 (0x5 << MAX_READ_REQUEST_SHIFT) | PCI_EXP_DEVCTL_NOSNOOP_EN);
 }
 
-static void rtl_hw_start_8168bef(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8168bef(struct rtl8169_private *tp)
 {
-        rtl_hw_start_8168bb(ioaddr, pdev);
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        rtl_hw_start_8168bb(tp);
 
         RTL_W8(MaxTxPacketSize, TxPacketMax);
 
         RTL_W8(Config4, RTL_R8(Config4) & ~(1 << 0));
 }
 
-static void __rtl_hw_start_8168cp(void __iomem *ioaddr, struct pci_dev *pdev)
+static void __rtl_hw_start_8168cp(struct rtl8169_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
+        struct pci_dev *pdev = tp->pci_dev;
+
         RTL_W8(Config1, RTL_R8(Config1) | Speed_down);
 
         RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
@@ -4289,8 +4579,9 @@ static void __rtl_hw_start_8168cp(void __iomem *ioaddr, struct pci_dev *pdev)
         RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R8168_CPCMD_QUIRK_MASK);
 }
 
-static void rtl_hw_start_8168cp_1(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8168cp_1(struct rtl8169_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         static const struct ephy_info e_info_8168cp[] = {
                 { 0x01, 0,      0x0001 },
                 { 0x02, 0x0800, 0x1000 },
@@ -4299,16 +4590,19 @@ static void rtl_hw_start_8168cp_1(void __iomem *ioaddr, struct pci_dev *pdev)
                 { 0x07, 0,      0x2000 }
         };
 
-        rtl_csi_access_enable_2(ioaddr);
+        rtl_csi_access_enable_2(tp);
 
         rtl_ephy_init(ioaddr, e_info_8168cp, ARRAY_SIZE(e_info_8168cp));
 
-        __rtl_hw_start_8168cp(ioaddr, pdev);
+        __rtl_hw_start_8168cp(tp);
 }
 
-static void rtl_hw_start_8168cp_2(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8168cp_2(struct rtl8169_private *tp)
 {
-        rtl_csi_access_enable_2(ioaddr);
+        void __iomem *ioaddr = tp->mmio_addr;
+        struct pci_dev *pdev = tp->pci_dev;
+
+        rtl_csi_access_enable_2(tp);
 
         RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
 
@@ -4317,9 +4611,12 @@ static void rtl_hw_start_8168cp_2(void __iomem *ioaddr, struct pci_dev *pdev)
         RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R8168_CPCMD_QUIRK_MASK);
 }
 
-static void rtl_hw_start_8168cp_3(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8168cp_3(struct rtl8169_private *tp)
 {
-        rtl_csi_access_enable_2(ioaddr);
+        void __iomem *ioaddr = tp->mmio_addr;
+        struct pci_dev *pdev = tp->pci_dev;
+
+        rtl_csi_access_enable_2(tp);
 
         RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
 
@@ -4333,52 +4630,57 @@ static void rtl_hw_start_8168cp_3(void __iomem *ioaddr, struct pci_dev *pdev)
         RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R8168_CPCMD_QUIRK_MASK);
 }
 
-static void rtl_hw_start_8168c_1(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8168c_1(struct rtl8169_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         static const struct ephy_info e_info_8168c_1[] = {
                 { 0x02, 0x0800, 0x1000 },
                 { 0x03, 0,      0x0002 },
                 { 0x06, 0x0080, 0x0000 }
         };
 
-        rtl_csi_access_enable_2(ioaddr);
+        rtl_csi_access_enable_2(tp);
 
         RTL_W8(DBG_REG, 0x06 | FIX_NAK_1 | FIX_NAK_2);
 
         rtl_ephy_init(ioaddr, e_info_8168c_1, ARRAY_SIZE(e_info_8168c_1));
 
-        __rtl_hw_start_8168cp(ioaddr, pdev);
+        __rtl_hw_start_8168cp(tp);
 }
 
-static void rtl_hw_start_8168c_2(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8168c_2(struct rtl8169_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         static const struct ephy_info e_info_8168c_2[] = {
                 { 0x01, 0,      0x0001 },
                 { 0x03, 0x0400, 0x0220 }
         };
 
-        rtl_csi_access_enable_2(ioaddr);
+        rtl_csi_access_enable_2(tp);
 
         rtl_ephy_init(ioaddr, e_info_8168c_2, ARRAY_SIZE(e_info_8168c_2));
 
-        __rtl_hw_start_8168cp(ioaddr, pdev);
+        __rtl_hw_start_8168cp(tp);
 }
 
-static void rtl_hw_start_8168c_3(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8168c_3(struct rtl8169_private *tp)
 {
-        rtl_hw_start_8168c_2(ioaddr, pdev);
+        rtl_hw_start_8168c_2(tp);
 }
 
-static void rtl_hw_start_8168c_4(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8168c_4(struct rtl8169_private *tp)
 {
-        rtl_csi_access_enable_2(ioaddr);
+        rtl_csi_access_enable_2(tp);
 
-        __rtl_hw_start_8168cp(ioaddr, pdev);
+        __rtl_hw_start_8168cp(tp);
 }
 
-static void rtl_hw_start_8168d(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8168d(struct rtl8169_private *tp)
 {
-        rtl_csi_access_enable_2(ioaddr);
+        void __iomem *ioaddr = tp->mmio_addr;
+        struct pci_dev *pdev = tp->pci_dev;
+
+        rtl_csi_access_enable_2(tp);
 
         rtl_disable_clock_request(pdev);
 
@@ -4389,9 +4691,12 @@ static void rtl_hw_start_8168d(void __iomem *ioaddr, struct pci_dev *pdev)
         RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R8168_CPCMD_QUIRK_MASK);
 }
 
-static void rtl_hw_start_8168dp(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8168dp(struct rtl8169_private *tp)
 {
-        rtl_csi_access_enable_1(ioaddr);
+        void __iomem *ioaddr = tp->mmio_addr;
+        struct pci_dev *pdev = tp->pci_dev;
+
+        rtl_csi_access_enable_1(tp);
 
         rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);
 
@@ -4400,8 +4705,10 @@ static void rtl_hw_start_8168dp(void __iomem *ioaddr, struct pci_dev *pdev)
         rtl_disable_clock_request(pdev);
 }
 
-static void rtl_hw_start_8168d_4(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8168d_4(struct rtl8169_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
+        struct pci_dev *pdev = tp->pci_dev;
         static const struct ephy_info e_info_8168d_4[] = {
                 { 0x0b, ~0,     0x48 },
                 { 0x19, 0x20,   0x50 },
@@ -4409,7 +4716,7 @@ static void rtl_hw_start_8168d_4(void __iomem *ioaddr, struct pci_dev *pdev)
         };
         int i;
 
-        rtl_csi_access_enable_1(ioaddr);
+        rtl_csi_access_enable_1(tp);
 
         rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);
 
@@ -4426,8 +4733,10 @@ static void rtl_hw_start_8168d_4(void __iomem *ioaddr, struct pci_dev *pdev)
         rtl_enable_clock_request(pdev);
 }
 
-static void rtl_hw_start_8168e_1(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8168e_1(struct rtl8169_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
+        struct pci_dev *pdev = tp->pci_dev;
         static const struct ephy_info e_info_8168e_1[] = {
                 { 0x00, 0x0200, 0x0100 },
                 { 0x00, 0x0000, 0x0004 },
@@ -4444,7 +4753,7 @@ static void rtl_hw_start_8168e_1(void __iomem *ioaddr, struct pci_dev *pdev)
                 { 0x0a, 0x0000, 0x0040 }
         };
 
-        rtl_csi_access_enable_2(ioaddr);
+        rtl_csi_access_enable_2(tp);
 
         rtl_ephy_init(ioaddr, e_info_8168e_1, ARRAY_SIZE(e_info_8168e_1));
 
@@ -4461,14 +4770,16 @@ static void rtl_hw_start_8168e_1(void __iomem *ioaddr, struct pci_dev *pdev)
         RTL_W8(Config5, RTL_R8(Config5) & ~Spi_en);
 }
 
-static void rtl_hw_start_8168e_2(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8168e_2(struct rtl8169_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
+        struct pci_dev *pdev = tp->pci_dev;
         static const struct ephy_info e_info_8168e_2[] = {
                 { 0x09, 0x0000, 0x0080 },
                 { 0x19, 0x0000, 0x0224 }
         };
 
-        rtl_csi_access_enable_1(ioaddr);
+        rtl_csi_access_enable_1(tp);
 
         rtl_ephy_init(ioaddr, e_info_8168e_2, ARRAY_SIZE(e_info_8168e_2));
 
@@ -4499,18 +4810,12 @@ static void rtl_hw_start_8168e_2(void __iomem *ioaddr, struct pci_dev *pdev)
         RTL_W8(Config5, RTL_R8(Config5) & ~Spi_en);
 }
 
-static void rtl_hw_start_8168f_1(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8168f(struct rtl8169_private *tp)
 {
-        static const struct ephy_info e_info_8168f_1[] = {
-                { 0x06, 0x00c0, 0x0020 },
-                { 0x08, 0x0001, 0x0002 },
-                { 0x09, 0x0000, 0x0080 },
-                { 0x19, 0x0000, 0x0224 }
-        };
-
-        rtl_csi_access_enable_1(ioaddr);
+        void __iomem *ioaddr = tp->mmio_addr;
+        struct pci_dev *pdev = tp->pci_dev;
 
-        rtl_ephy_init(ioaddr, e_info_8168f_1, ARRAY_SIZE(e_info_8168f_1));
+        rtl_csi_access_enable_2(tp);
 
         rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);
 
@@ -4524,8 +4829,6 @@ static void rtl_hw_start_8168f_1(void __iomem *ioaddr, struct pci_dev *pdev)
         rtl_w1w0_eri(ioaddr, 0x1d0, ERIAR_MASK_0001, 0x10, 0x00, ERIAR_EXGMAC);
         rtl_eri_write(ioaddr, 0xcc, ERIAR_MASK_1111, 0x00000050, ERIAR_EXGMAC);
         rtl_eri_write(ioaddr, 0xd0, ERIAR_MASK_1111, 0x00000060, ERIAR_EXGMAC);
-        rtl_w1w0_eri(ioaddr, 0x0d4, ERIAR_MASK_0011, 0x0c00, 0xff00,
-                     ERIAR_EXGMAC);
 
         RTL_W8(MaxTxPacketSize, EarlySize);
 
@@ -4533,20 +4836,54 @@ static void rtl_hw_start_8168f_1(void __iomem *ioaddr, struct pci_dev *pdev)
 
         RTL_W32(TxConfig, RTL_R32(TxConfig) | TXCFG_AUTO_FIFO);
         RTL_W8(MCU, RTL_R8(MCU) & ~NOW_IS_OOB);
+        RTL_W8(DLLPR, RTL_R8(DLLPR) | PFM_EN);
+        RTL_W32(MISC, RTL_R32(MISC) | PWM_EN);
+        RTL_W8(Config5, RTL_R8(Config5) & ~Spi_en);
+}
+
+static void rtl_hw_start_8168f_1(struct rtl8169_private *tp)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+        static const struct ephy_info e_info_8168f_1[] = {
+                { 0x06, 0x00c0, 0x0020 },
+                { 0x08, 0x0001, 0x0002 },
+                { 0x09, 0x0000, 0x0080 },
+                { 0x19, 0x0000, 0x0224 }
+        };
+
+        rtl_hw_start_8168f(tp);
+
+        rtl_ephy_init(ioaddr, e_info_8168f_1, ARRAY_SIZE(e_info_8168f_1));
+
+        rtl_w1w0_eri(ioaddr, 0x0d4, ERIAR_MASK_0011, 0x0c00, 0xff00,
+                     ERIAR_EXGMAC);
 
         /* Adjust EEE LED frequency */
         RTL_W8(EEE_LED, RTL_R8(EEE_LED) & ~0x07);
+}
 
-        RTL_W8(DLLPR, RTL_R8(DLLPR) | PFM_EN);
-        RTL_W32(MISC, RTL_R32(MISC) | PWM_EN);
-        RTL_W8(Config5, RTL_R8(Config5) & ~Spi_en);
+static void rtl_hw_start_8411(struct rtl8169_private *tp)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+        static const struct ephy_info e_info_8168f_1[] = {
+                { 0x06, 0x00c0, 0x0020 },
+                { 0x0f, 0xffff, 0x5200 },
+                { 0x1e, 0x0000, 0x4000 },
+                { 0x19, 0x0000, 0x0224 }
+        };
+
+        rtl_hw_start_8168f(tp);
+
+        rtl_ephy_init(ioaddr, e_info_8168f_1, ARRAY_SIZE(e_info_8168f_1));
+
+        rtl_w1w0_eri(ioaddr, 0x0d4, ERIAR_MASK_0011, 0x0c00, 0x0000,
+                     ERIAR_EXGMAC);
 }
 
 static void rtl_hw_start_8168(struct net_device *dev)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
         void __iomem *ioaddr = tp->mmio_addr;
-        struct pci_dev *pdev = tp->pci_dev;
 
         RTL_W8(Cfg9346, Cfg9346_Unlock);
 
@@ -4577,67 +4914,71 @@ static void rtl_hw_start_8168(struct net_device *dev)
 
         switch (tp->mac_version) {
         case RTL_GIGA_MAC_VER_11:
-                rtl_hw_start_8168bb(ioaddr, pdev);
+                rtl_hw_start_8168bb(tp);
                 break;
 
         case RTL_GIGA_MAC_VER_12:
         case RTL_GIGA_MAC_VER_17:
-                rtl_hw_start_8168bef(ioaddr, pdev);
+                rtl_hw_start_8168bef(tp);
                 break;
 
         case RTL_GIGA_MAC_VER_18:
-                rtl_hw_start_8168cp_1(ioaddr, pdev);
+                rtl_hw_start_8168cp_1(tp);
                 break;
 
         case RTL_GIGA_MAC_VER_19:
-                rtl_hw_start_8168c_1(ioaddr, pdev);
+                rtl_hw_start_8168c_1(tp);
                 break;
 
         case RTL_GIGA_MAC_VER_20:
-                rtl_hw_start_8168c_2(ioaddr, pdev);
+                rtl_hw_start_8168c_2(tp);
                 break;
 
         case RTL_GIGA_MAC_VER_21:
-                rtl_hw_start_8168c_3(ioaddr, pdev);
+                rtl_hw_start_8168c_3(tp);
                 break;
 
         case RTL_GIGA_MAC_VER_22:
-                rtl_hw_start_8168c_4(ioaddr, pdev);
+                rtl_hw_start_8168c_4(tp);
                 break;
 
         case RTL_GIGA_MAC_VER_23:
-                rtl_hw_start_8168cp_2(ioaddr, pdev);
+                rtl_hw_start_8168cp_2(tp);
                 break;
 
         case RTL_GIGA_MAC_VER_24:
-                rtl_hw_start_8168cp_3(ioaddr, pdev);
+                rtl_hw_start_8168cp_3(tp);
                 break;
 
         case RTL_GIGA_MAC_VER_25:
         case RTL_GIGA_MAC_VER_26:
         case RTL_GIGA_MAC_VER_27:
-                rtl_hw_start_8168d(ioaddr, pdev);
+                rtl_hw_start_8168d(tp);
                 break;
 
         case RTL_GIGA_MAC_VER_28:
-                rtl_hw_start_8168d_4(ioaddr, pdev);
+                rtl_hw_start_8168d_4(tp);
                 break;
 
         case RTL_GIGA_MAC_VER_31:
-                rtl_hw_start_8168dp(ioaddr, pdev);
+                rtl_hw_start_8168dp(tp);
                 break;
 
         case RTL_GIGA_MAC_VER_32:
         case RTL_GIGA_MAC_VER_33:
-                rtl_hw_start_8168e_1(ioaddr, pdev);
+                rtl_hw_start_8168e_1(tp);
                 break;
         case RTL_GIGA_MAC_VER_34:
-                rtl_hw_start_8168e_2(ioaddr, pdev);
+                rtl_hw_start_8168e_2(tp);
                 break;
 
         case RTL_GIGA_MAC_VER_35:
         case RTL_GIGA_MAC_VER_36:
-                rtl_hw_start_8168f_1(ioaddr, pdev);
+                rtl_hw_start_8168f_1(tp);
+                break;
+
+        case RTL_GIGA_MAC_VER_38:
+                rtl_hw_start_8411(tp);
                 break;
 
         default:
@@ -4664,8 +5005,10 @@ static void rtl_hw_start_8168(struct net_device *dev)
         PktCntrDisable | \
         Mac_dbgo_sel)
 
-static void rtl_hw_start_8102e_1(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8102e_1(struct rtl8169_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
+        struct pci_dev *pdev = tp->pci_dev;
         static const struct ephy_info e_info_8102e_1[] = {
                 { 0x01, 0, 0x6e65 },
                 { 0x02, 0, 0x091f },
@@ -4678,7 +5021,7 @@ static void rtl_hw_start_8102e_1(void __iomem *ioaddr, struct pci_dev *pdev)
         };
         u8 cfg1;
 
-        rtl_csi_access_enable_2(ioaddr);
+        rtl_csi_access_enable_2(tp);
 
         RTL_W8(DBG_REG, FIX_NAK_1);
 
@@ -4695,9 +5038,12 @@ static void rtl_hw_start_8102e_1(void __iomem *ioaddr, struct pci_dev *pdev)
         rtl_ephy_init(ioaddr, e_info_8102e_1, ARRAY_SIZE(e_info_8102e_1));
 }
 
-static void rtl_hw_start_8102e_2(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8102e_2(struct rtl8169_private *tp)
 {
-        rtl_csi_access_enable_2(ioaddr);
+        void __iomem *ioaddr = tp->mmio_addr;
+        struct pci_dev *pdev = tp->pci_dev;
+
+        rtl_csi_access_enable_2(tp);
 
         rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);
 
@@ -4705,15 +5051,16 @@ static void rtl_hw_start_8102e_2(void __iomem *ioaddr, struct pci_dev *pdev)
         RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
 }
 
-static void rtl_hw_start_8102e_3(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8102e_3(struct rtl8169_private *tp)
 {
-        rtl_hw_start_8102e_2(ioaddr, pdev);
+        rtl_hw_start_8102e_2(tp);
 
-        rtl_ephy_write(ioaddr, 0x03, 0xc2f9);
+        rtl_ephy_write(tp->mmio_addr, 0x03, 0xc2f9);
 }
 
-static void rtl_hw_start_8105e_1(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8105e_1(struct rtl8169_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         static const struct ephy_info e_info_8105e_1[] = {
                 { 0x07, 0, 0x4000 },
                 { 0x19, 0, 0x0200 },
@@ -4737,12 +5084,44 @@ static void rtl_hw_start_8105e_1(void __iomem *ioaddr, struct pci_dev *pdev)
         rtl_ephy_init(ioaddr, e_info_8105e_1, ARRAY_SIZE(e_info_8105e_1));
 }
 
-static void rtl_hw_start_8105e_2(void __iomem *ioaddr, struct pci_dev *pdev)
+static void rtl_hw_start_8105e_2(struct rtl8169_private *tp)
 {
-        rtl_hw_start_8105e_1(ioaddr, pdev);
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        rtl_hw_start_8105e_1(tp);
         rtl_ephy_write(ioaddr, 0x1e, rtl_ephy_read(ioaddr, 0x1e) | 0x8000);
 }
 
+static void rtl_hw_start_8402(struct rtl8169_private *tp)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+        static const struct ephy_info e_info_8402[] = {
+                { 0x19, 0xffff, 0xff64 },
+                { 0x1e, 0, 0x4000 }
+        };
+
+        rtl_csi_access_enable_2(tp);
+
+        /* Force LAN exit from ASPM if Rx/Tx are not idle */
+        RTL_W32(FuncEvent, RTL_R32(FuncEvent) | 0x002800);
+
+        RTL_W32(TxConfig, RTL_R32(TxConfig) | TXCFG_AUTO_FIFO);
+        RTL_W8(MCU, RTL_R8(MCU) & ~NOW_IS_OOB);
+
+        rtl_ephy_init(ioaddr, e_info_8402, ARRAY_SIZE(e_info_8402));
+
+        rtl_tx_performance_tweak(tp->pci_dev, 0x5 << MAX_READ_REQUEST_SHIFT);
+
+        rtl_eri_write(ioaddr, 0xc8, ERIAR_MASK_1111, 0x00000002, ERIAR_EXGMAC);
+        rtl_eri_write(ioaddr, 0xe8, ERIAR_MASK_1111, 0x00000006, ERIAR_EXGMAC);
+        rtl_w1w0_eri(ioaddr, 0xdc, ERIAR_MASK_0001, 0x00, 0x01, ERIAR_EXGMAC);
+        rtl_w1w0_eri(ioaddr, 0xdc, ERIAR_MASK_0001, 0x01, 0x00, ERIAR_EXGMAC);
+        rtl_eri_write(ioaddr, 0xc0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
+        rtl_eri_write(ioaddr, 0xb8, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
+        rtl_w1w0_eri(ioaddr, 0x0d4, ERIAR_MASK_0011, 0x0e00, 0xff00,
+                     ERIAR_EXGMAC);
+}
+
 static void rtl_hw_start_8101(struct net_device *dev)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
@@ -4766,22 +5145,26 @@ static void rtl_hw_start_8101(struct net_device *dev)
 
         switch (tp->mac_version) {
         case RTL_GIGA_MAC_VER_07:
-                rtl_hw_start_8102e_1(ioaddr, pdev);
+                rtl_hw_start_8102e_1(tp);
                 break;
 
         case RTL_GIGA_MAC_VER_08:
-                rtl_hw_start_8102e_3(ioaddr, pdev);
+                rtl_hw_start_8102e_3(tp);
                 break;
 
         case RTL_GIGA_MAC_VER_09:
-                rtl_hw_start_8102e_2(ioaddr, pdev);
+                rtl_hw_start_8102e_2(tp);
                 break;
 
         case RTL_GIGA_MAC_VER_29:
-                rtl_hw_start_8105e_1(ioaddr, pdev);
+                rtl_hw_start_8105e_1(tp);
                 break;
         case RTL_GIGA_MAC_VER_30:
-                rtl_hw_start_8105e_2(ioaddr, pdev);
+                rtl_hw_start_8105e_2(tp);
+                break;
+
+        case RTL_GIGA_MAC_VER_37:
+                rtl_hw_start_8402(tp);
                 break;
         }
 
@@ -5115,7 +5498,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
         u32 opts[2];
         int frags;
 
-        if (unlikely(TX_BUFFS_AVAIL(tp) < skb_shinfo(skb)->nr_frags)) {
+        if (unlikely(!TX_FRAGS_READY_FOR(tp, skb_shinfo(skb)->nr_frags))) {
                 netif_err(tp, drv, dev, "BUG! Tx Ring full when queue awake!\n");
                 goto err_stop_0;
         }
@@ -5169,7 +5552,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
 
         mmiowb();
 
-        if (TX_BUFFS_AVAIL(tp) < MAX_SKB_FRAGS) {
+        if (!TX_FRAGS_READY_FOR(tp, MAX_SKB_FRAGS)) {
                 /* Avoid wrongly optimistic queue wake-up: rtl_tx thread must
                  * not miss a ring update when it notices a stopped queue.
                  */
@@ -5183,7 +5566,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
                  * can't.
                  */
                 smp_mb();
-                if (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)
+                if (TX_FRAGS_READY_FOR(tp, MAX_SKB_FRAGS))
                         netif_wake_queue(dev);
         }
 
@@ -5306,7 +5689,7 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp)
                  */
                 smp_mb();
                 if (netif_queue_stopped(dev) &&
-                    (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)) {
+                    TX_FRAGS_READY_FOR(tp, MAX_SKB_FRAGS)) {
                         netif_wake_queue(dev);
                 }
                 /*
@@ -6178,6 +6561,7 @@ rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         rtl_init_mdio_ops(tp);
         rtl_init_pll_power_ops(tp);
         rtl_init_jumbo_ops(tp);
+        rtl_init_csi_ops(tp);
 
         rtl8169_print_mac_version(tp);
 
diff --git a/drivers/net/ethernet/renesas/Kconfig b/drivers/net/ethernet/renesas/Kconfig
index 3fb2355af37e..46df3a04030c 100644
--- a/drivers/net/ethernet/renesas/Kconfig
+++ b/drivers/net/ethernet/renesas/Kconfig
@@ -4,11 +4,11 @@
 
 config SH_ETH
         tristate "Renesas SuperH Ethernet support"
-        depends on SUPERH && \
+        depends on (SUPERH || ARCH_SHMOBILE) && \
                 (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || \
                  CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7619 || \
                  CPU_SUBTYPE_SH7724 || CPU_SUBTYPE_SH7734 || \
-                 CPU_SUBTYPE_SH7757)
+                 CPU_SUBTYPE_SH7757 || ARCH_R8A7740)
         select CRC32
         select NET_CORE
         select MII
@@ -17,4 +17,5 @@ config SH_ETH
         ---help---
           Renesas SuperH Ethernet device driver.
           This driver supporting CPUs are:
-                - SH7619, SH7710, SH7712, SH7724, SH7734, SH7763 and SH7757.
+                - SH7619, SH7710, SH7712, SH7724, SH7734, SH7763, SH7757,
+                  and R8A7740.
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index d63e09b29a96..be3c22179161 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -386,6 +386,114 @@ static void sh_eth_reset_hw_crc(struct net_device *ndev)
                 sh_eth_write(ndev, 0x0, CSMR);
 }
 
+#elif defined(CONFIG_ARCH_R8A7740)
+#define SH_ETH_HAS_TSU  1
+static void sh_eth_chip_reset(struct net_device *ndev)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+        unsigned long mii;
+
+        /* reset device */
+        sh_eth_tsu_write(mdp, ARSTR_ARSTR, ARSTR);
+        mdelay(1);
+
+        switch (mdp->phy_interface) {
+        case PHY_INTERFACE_MODE_GMII:
+                mii = 2;
+                break;
+        case PHY_INTERFACE_MODE_MII:
+                mii = 1;
+                break;
+        case PHY_INTERFACE_MODE_RMII:
+        default:
+                mii = 0;
+                break;
+        }
+        sh_eth_write(ndev, mii, RMII_MII);
+}
+
+static void sh_eth_reset(struct net_device *ndev)
+{
+        int cnt = 100;
+
+        sh_eth_write(ndev, EDSR_ENALL, EDSR);
+        sh_eth_write(ndev, sh_eth_read(ndev, EDMR) | EDMR_SRST_GETHER, EDMR);
+        while (cnt > 0) {
+                if (!(sh_eth_read(ndev, EDMR) & 0x3))
+                        break;
+                mdelay(1);
+                cnt--;
+        }
+        if (cnt == 0)
+                printk(KERN_ERR "Device reset fail\n");
+
+        /* Table Init */
+        sh_eth_write(ndev, 0x0, TDLAR);
+        sh_eth_write(ndev, 0x0, TDFAR);
+        sh_eth_write(ndev, 0x0, TDFXR);
+        sh_eth_write(ndev, 0x0, TDFFR);
+        sh_eth_write(ndev, 0x0, RDLAR);
+        sh_eth_write(ndev, 0x0, RDFAR);
+        sh_eth_write(ndev, 0x0, RDFXR);
+        sh_eth_write(ndev, 0x0, RDFFR);
+}
+
+static void sh_eth_set_duplex(struct net_device *ndev)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+
+        if (mdp->duplex) /* Full */
+                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) | ECMR_DM, ECMR);
+        else            /* Half */
+                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~ECMR_DM, ECMR);
+}
+
+static void sh_eth_set_rate(struct net_device *ndev)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+
+        switch (mdp->speed) {
+        case 10: /* 10BASE */
+                sh_eth_write(ndev, GECMR_10, GECMR);
+                break;
+        case 100:/* 100BASE */
+                sh_eth_write(ndev, GECMR_100, GECMR);
+                break;
+        case 1000: /* 1000BASE */
+                sh_eth_write(ndev, GECMR_1000, GECMR);
+                break;
+        default:
+                break;
+        }
+}
+
+/* R8A7740 */
+static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
+        .chip_reset     = sh_eth_chip_reset,
+        .set_duplex     = sh_eth_set_duplex,
+        .set_rate       = sh_eth_set_rate,
+
+        .ecsr_value     = ECSR_ICD | ECSR_MPD,
+        .ecsipr_value   = ECSIPR_LCHNGIP | ECSIPR_ICDIP | ECSIPR_MPDIP,
+        .eesipr_value   = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
+
+        .tx_check       = EESR_TC1 | EESR_FTC,
+        .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT | \
+                          EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | \
+                          EESR_ECI,
+        .tx_error_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_TDE | \
+                          EESR_TFE,
+
+        .apr            = 1,
+        .mpr            = 1,
+        .tpauser        = 1,
+        .bculr          = 1,
+        .hw_swap        = 1,
+        .no_trimd       = 1,
+        .no_ade         = 1,
+        .tsu            = 1,
+};
+
 #elif defined(CONFIG_CPU_SUBTYPE_SH7619)
 #define SH_ETH_RESET_DEFAULT    1
 static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
@@ -443,7 +551,7 @@ static void sh_eth_reset(struct net_device *ndev)
 }
 #endif
 
-#if defined(CONFIG_CPU_SH4)
+#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)
 static void sh_eth_set_receive_align(struct sk_buff *skb)
 {
         int reserve;
@@ -919,6 +1027,10 @@ static int sh_eth_rx(struct net_device *ndev)
                 desc_status = edmac_to_cpu(mdp, rxdesc->status);
                 pkt_len = rxdesc->frame_length;
 
+#if defined(CONFIG_ARCH_R8A7740)
+                desc_status >>= 16;
+#endif
+
                 if (--boguscnt < 0)
                         break;
 
diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h
index 0fa14afce23d..57b8e1fc5d15 100644
--- a/drivers/net/ethernet/renesas/sh_eth.h
+++ b/drivers/net/ethernet/renesas/sh_eth.h
@@ -372,7 +372,7 @@ static const u16 sh_eth_offset_fast_sh3_sh2[SH_ETH_MAX_REGISTER_OFFSET] = {
 };
 
 /* Driver's parameters */
-#if defined(CONFIG_CPU_SH4)
+#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)
 #define SH4_SKB_RX_ALIGN        32
 #else
 #define SH2_SH3_SKB_RX_ALIGN    2
@@ -381,7 +381,8 @@ static const u16 sh_eth_offset_fast_sh3_sh2[SH_ETH_MAX_REGISTER_OFFSET] = {
 /*
  * Register's bits
  */
-#if defined(CONFIG_CPU_SUBTYPE_SH7734) || defined(CONFIG_CPU_SUBTYPE_SH7763)
+#if defined(CONFIG_CPU_SUBTYPE_SH7734) || defined(CONFIG_CPU_SUBTYPE_SH7763) ||\
+    defined(CONFIG_ARCH_R8A7740)
 /* EDSR */
 enum EDSR_BIT {
         EDSR_ENT = 0x01, EDSR_ENR = 0x02,
diff --git a/drivers/net/ethernet/s6gmac.c b/drivers/net/ethernet/s6gmac.c
index 1895605abb35..8e9fda0c7aeb 100644
--- a/drivers/net/ethernet/s6gmac.c
+++ b/drivers/net/ethernet/s6gmac.c
@@ -937,7 +937,7 @@ static struct net_device_stats *s6gmac_stats(struct net_device *dev)
         do {
                 unsigned long flags;
                 spin_lock_irqsave(&pd->lock, flags);
-                for (i = 0; i < sizeof(pd->stats) / sizeof(unsigned long); i++)
+                for (i = 0; i < ARRAY_SIZE(pd->stats); i++)
                         pd->stats[i] =
                                 pd->carry[i] << (S6_GMAC_STAT_SIZE_MIN - 1);
                 s6gmac_stats_collect(pd, &statinf[0][0]);
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 3cbfbffe3f00..b95f2e1b33f0 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -656,25 +656,30 @@ static void efx_stop_datapath(struct efx_nic *efx)
         struct efx_channel *channel;
         struct efx_tx_queue *tx_queue;
         struct efx_rx_queue *rx_queue;
+        struct pci_dev *dev = efx->pci_dev;
         int rc;
 
         EFX_ASSERT_RESET_SERIALISED(efx);
         BUG_ON(efx->port_enabled);
 
-        rc = efx_nic_flush_queues(efx);
-        if (rc && EFX_WORKAROUND_7803(efx)) {
-                /* Schedule a reset to recover from the flush failure. The
-                 * descriptor caches reference memory we're about to free,
-                 * but falcon_reconfigure_mac_wrapper() won't reconnect
-                 * the MACs because of the pending reset. */
-                netif_err(efx, drv, efx->net_dev,
-                          "Resetting to recover from flush failure\n");
-                efx_schedule_reset(efx, RESET_TYPE_ALL);
-        } else if (rc) {
-                netif_err(efx, drv, efx->net_dev, "failed to flush queues\n");
-        } else {
-                netif_dbg(efx, drv, efx->net_dev,
-                          "successfully flushed all queues\n");
+        /* Only perform flush if dma is enabled */
+        if (dev->is_busmaster) {
+                rc = efx_nic_flush_queues(efx);
+
+                if (rc && EFX_WORKAROUND_7803(efx)) {
+                        /* Schedule a reset to recover from the flush failure. The
+                         * descriptor caches reference memory we're about to free,
+                         * but falcon_reconfigure_mac_wrapper() won't reconnect
+                         * the MACs because of the pending reset. */
+                        netif_err(efx, drv, efx->net_dev,
+                                  "Resetting to recover from flush failure\n");
+                        efx_schedule_reset(efx, RESET_TYPE_ALL);
+                } else if (rc) {
+                        netif_err(efx, drv, efx->net_dev, "failed to flush queues\n");
+                } else {
+                        netif_dbg(efx, drv, efx->net_dev,
+                                  "successfully flushed all queues\n");
+                }
         }
 
         efx_for_each_channel(channel, efx) {
@@ -1349,7 +1354,7 @@ static int efx_probe_interrupts(struct efx_nic *efx)
         }
 
         /* RSS might be usable on VFs even if it is disabled on the PF */
-        efx->rss_spread = (efx->n_rx_channels > 1 ?
+        efx->rss_spread = ((efx->n_rx_channels > 1 || !efx_sriov_wanted(efx)) ?
                            efx->n_rx_channels : efx_vf_size(efx));
 
         return 0;
@@ -2492,8 +2497,8 @@ static void efx_pci_remove(struct pci_dev *pci_dev)
         efx_fini_io(efx);
         netif_dbg(efx, drv, efx->net_dev, "shutdown successful\n");
 
-        pci_set_drvdata(pci_dev, NULL);
         efx_fini_struct(efx);
+        pci_set_drvdata(pci_dev, NULL);
         free_netdev(efx->net_dev);
 };
 
@@ -2695,6 +2700,7 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev,
  fail2:
         efx_fini_struct(efx);
  fail1:
+        pci_set_drvdata(pci_dev, NULL);
         WARN_ON(rc > 0);
         netif_dbg(efx, drv, efx->net_dev, "initialisation failed. rc=%d\n", rc);
         free_netdev(net_dev);
diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c
index f22f45f515a8..03ded364c8da 100644
--- a/drivers/net/ethernet/sfc/ethtool.c
+++ b/drivers/net/ethernet/sfc/ethtool.c
@@ -1023,7 +1023,7 @@ static int efx_ethtool_set_class_rule(struct efx_nic *efx,
                         return -EINVAL;
 
                 /* Is it a default UC or MC filter? */
-                if (!compare_ether_addr(mac_mask->h_dest, mac_addr_mc_mask) &&
+                if (ether_addr_equal(mac_mask->h_dest, mac_addr_mc_mask) &&
                     vlan_tag_mask == 0) {
                         if (is_multicast_ether_addr(mac_entry->h_dest))
                                 rc = efx_filter_set_mc_def(&spec);
@@ -1108,6 +1108,39 @@ static int efx_ethtool_set_rxfh_indir(struct net_device *net_dev,
         return 0;
 }
 
+static int efx_ethtool_get_module_eeprom(struct net_device *net_dev,
+                                         struct ethtool_eeprom *ee,
+                                         u8 *data)
+{
+        struct efx_nic *efx = netdev_priv(net_dev);
+        int ret;
+
+        if (!efx->phy_op || !efx->phy_op->get_module_eeprom)
+                return -EOPNOTSUPP;
+
+        mutex_lock(&efx->mac_lock);
+        ret = efx->phy_op->get_module_eeprom(efx, ee, data);
+        mutex_unlock(&efx->mac_lock);
+
+        return ret;
+}
+
+static int efx_ethtool_get_module_info(struct net_device *net_dev,
+                                       struct ethtool_modinfo *modinfo)
+{
+        struct efx_nic *efx = netdev_priv(net_dev);
+        int ret;
+
+        if (!efx->phy_op || !efx->phy_op->get_module_info)
+                return -EOPNOTSUPP;
+
+        mutex_lock(&efx->mac_lock);
+        ret = efx->phy_op->get_module_info(efx, modinfo);
+        mutex_unlock(&efx->mac_lock);
+
+        return ret;
+}
+
 const struct ethtool_ops efx_ethtool_ops = {
         .get_settings           = efx_ethtool_get_settings,
         .set_settings           = efx_ethtool_set_settings,
@@ -1137,4 +1170,6 @@ const struct ethtool_ops efx_ethtool_ops = {
         .get_rxfh_indir_size    = efx_ethtool_get_rxfh_indir_size,
         .get_rxfh_indir         = efx_ethtool_get_rxfh_indir,
         .set_rxfh_indir         = efx_ethtool_set_rxfh_indir,
+        .get_module_info        = efx_ethtool_get_module_info,
+        .get_module_eeprom      = efx_ethtool_get_module_eeprom,
 };
diff --git a/drivers/net/ethernet/sfc/mcdi_phy.c b/drivers/net/ethernet/sfc/mcdi_phy.c
index 7bcad899a936..13cb40fe90c1 100644
--- a/drivers/net/ethernet/sfc/mcdi_phy.c
+++ b/drivers/net/ethernet/sfc/mcdi_phy.c
@@ -739,6 +739,80 @@ static const char *efx_mcdi_phy_test_name(struct efx_nic *efx,
         return NULL;
 }
 
+#define SFP_PAGE_SIZE   128
+#define SFP_NUM_PAGES   2
+static int efx_mcdi_phy_get_module_eeprom(struct efx_nic *efx,
+                                          struct ethtool_eeprom *ee, u8 *data)
+{
+        u8 outbuf[MC_CMD_GET_PHY_MEDIA_INFO_OUT_LENMAX];
+        u8 inbuf[MC_CMD_GET_PHY_MEDIA_INFO_IN_LEN];
+        size_t outlen;
+        int rc;
+        unsigned int payload_len;
+        unsigned int space_remaining = ee->len;
+        unsigned int page;
+        unsigned int page_off;
+        unsigned int to_copy;
+        u8 *user_data = data;
+
+        BUILD_BUG_ON(SFP_PAGE_SIZE * SFP_NUM_PAGES != ETH_MODULE_SFF_8079_LEN);
+
+        page_off = ee->offset % SFP_PAGE_SIZE;
+        page = ee->offset / SFP_PAGE_SIZE;
+
+        while (space_remaining && (page < SFP_NUM_PAGES)) {
+                MCDI_SET_DWORD(inbuf, GET_PHY_MEDIA_INFO_IN_PAGE, page);
+
+                rc = efx_mcdi_rpc(efx, MC_CMD_GET_PHY_MEDIA_INFO,
+                                  inbuf, sizeof(inbuf),
+                                  outbuf, sizeof(outbuf),
+                                  &outlen);
+                if (rc)
+                        return rc;
+
+                if (outlen < (MC_CMD_GET_PHY_MEDIA_INFO_OUT_DATA_OFST +
+                              SFP_PAGE_SIZE))
+                        return -EIO;
+
+                payload_len = MCDI_DWORD(outbuf,
+                                         GET_PHY_MEDIA_INFO_OUT_DATALEN);
+                if (payload_len != SFP_PAGE_SIZE)
+                        return -EIO;
+
+                /* Copy as much as we can into data */
+                payload_len -= page_off;
+                to_copy = (space_remaining < payload_len) ?
+                        space_remaining : payload_len;
+
+                memcpy(user_data,
+                       outbuf + page_off +
+                       MC_CMD_GET_PHY_MEDIA_INFO_OUT_DATA_OFST,
+                       to_copy);
+
+                space_remaining -= to_copy;
+                user_data += to_copy;
+                page_off = 0;
+                page++;
+        }
+
+        return 0;
+}
+
+static int efx_mcdi_phy_get_module_info(struct efx_nic *efx,
+                                        struct ethtool_modinfo *modinfo)
+{
+        struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
+
+        switch (phy_cfg->media) {
+        case MC_CMD_MEDIA_SFP_PLUS:
+                modinfo->type = ETH_MODULE_SFF_8079;
+                modinfo->eeprom_len = ETH_MODULE_SFF_8079_LEN;
+                return 0;
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+
 const struct efx_phy_operations efx_mcdi_phy_ops = {
         .probe          = efx_mcdi_phy_probe,
         .init           = efx_port_dummy_op_int,
@@ -751,4 +825,6 @@ const struct efx_phy_operations efx_mcdi_phy_ops = {
         .test_alive     = efx_mcdi_phy_test_alive,
         .run_tests      = efx_mcdi_phy_run_tests,
         .test_name      = efx_mcdi_phy_test_name,
+        .get_module_eeprom = efx_mcdi_phy_get_module_eeprom,
+        .get_module_info = efx_mcdi_phy_get_module_info,
 };
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index f0385e1fb2d8..0e575359af17 100644
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -252,8 +252,6 @@ struct efx_rx_page_state {
  * @max_fill: RX descriptor maximum fill level (<= ring size)
  * @fast_fill_trigger: RX descriptor fill level that will trigger a fast fill
  *      (<= @max_fill)
- * @fast_fill_limit: The level to which a fast fill will fill
- *      (@fast_fill_trigger <= @fast_fill_limit <= @max_fill)
  * @min_fill: RX descriptor minimum non-zero fill level.
  *      This records the minimum fill level observed when a ring
  *      refill was triggered.
@@ -274,7 +272,6 @@ struct efx_rx_queue {
         int removed_count;
         unsigned int max_fill;
         unsigned int fast_fill_trigger;
-        unsigned int fast_fill_limit;
         unsigned int min_fill;
         unsigned int min_overfill;
         unsigned int alloc_page_count;
@@ -522,6 +519,11 @@ struct efx_phy_operations {
         int (*test_alive) (struct efx_nic *efx);
         const char *(*test_name) (struct efx_nic *efx, unsigned int index);
         int (*run_tests) (struct efx_nic *efx, int *results, unsigned flags);
+        int (*get_module_eeprom) (struct efx_nic *efx,
+                               struct ethtool_eeprom *ee,
+                               u8 *data);
+        int (*get_module_info) (struct efx_nic *efx,
+                                struct ethtool_modinfo *modinfo);
 };
 
 /**
diff --git a/drivers/net/ethernet/sfc/qt202x_phy.c b/drivers/net/ethernet/sfc/qt202x_phy.c
index 8a7caf88ffb6..326a28637f3c 100644
--- a/drivers/net/ethernet/sfc/qt202x_phy.c
+++ b/drivers/net/ethernet/sfc/qt202x_phy.c
@@ -449,6 +449,37 @@ static void qt202x_phy_remove(struct efx_nic *efx)
         efx->phy_data = NULL;
 }
 
+static int qt202x_phy_get_module_info(struct efx_nic *efx,
+                                      struct ethtool_modinfo *modinfo)
+{
+        modinfo->type = ETH_MODULE_SFF_8079;
+        modinfo->eeprom_len = ETH_MODULE_SFF_8079_LEN;
+        return 0;
+}
+
+static int qt202x_phy_get_module_eeprom(struct efx_nic *efx,
+                                        struct ethtool_eeprom *ee, u8 *data)
+{
+        int mmd, reg_base, rc, i;               
+
+        if (efx->phy_type == PHY_TYPE_QT2025C) {
+                mmd = MDIO_MMD_PCS;
+                reg_base = 0xd000;
+        } else {
+                mmd = MDIO_MMD_PMAPMD;
+                reg_base = 0x8007;
+        }
+
+        for (i = 0; i < ee->len; i++) {
+                rc = efx_mdio_read(efx, mmd, reg_base + ee->offset + i);
+                if (rc < 0)
+                        return rc;
+                data[i] = rc;
+        }
+
+        return 0;
+}
+
 const struct efx_phy_operations falcon_qt202x_phy_ops = {
         .probe           = qt202x_phy_probe,
         .init            = qt202x_phy_init,
@@ -459,4 +490,6 @@ const struct efx_phy_operations falcon_qt202x_phy_ops = {
         .get_settings    = qt202x_phy_get_settings,
         .set_settings    = efx_mdio_set_settings,
         .test_alive      = efx_mdio_test_alive,
+        .get_module_eeprom = qt202x_phy_get_module_eeprom,
+        .get_module_info = qt202x_phy_get_module_info,
 };
diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c
index 763fa2fe1a38..243e91f3dff9 100644
--- a/drivers/net/ethernet/sfc/rx.c
+++ b/drivers/net/ethernet/sfc/rx.c
@@ -76,12 +76,7 @@ static int rx_alloc_method = RX_ALLOC_METHOD_AUTO;
 /* This is the percentage fill level below which new RX descriptors
  * will be added to the RX descriptor ring.
  */
-static unsigned int rx_refill_threshold = 90;
-
-/* This is the percentage fill level to which an RX queue will be refilled
- * when the "RX refill threshold" is reached.
- */
-static unsigned int rx_refill_limit = 95;
+static unsigned int rx_refill_threshold;
 
 /*
  * RX maximum head room required.
@@ -342,7 +337,7 @@ static void efx_recycle_rx_buffer(struct efx_channel *channel,
  * efx_fast_push_rx_descriptors - push new RX descriptors quickly
  * @rx_queue:           RX descriptor queue
  * This will aim to fill the RX descriptor queue up to
- * @rx_queue->@fast_fill_limit. If there is insufficient atomic
+ * @rx_queue->@max_fill. If there is insufficient atomic
  * memory to do so, a slow fill will be scheduled.
  *
  * The caller must provide serialisation (none is used here). In practise,
@@ -367,15 +362,14 @@ void efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue)
                         rx_queue->min_fill = fill_level;
         }
 
-        space = rx_queue->fast_fill_limit - fill_level;
-        if (space < EFX_RX_BATCH)
-                goto out;
+        space = rx_queue->max_fill - fill_level;
+        EFX_BUG_ON_PARANOID(space < EFX_RX_BATCH);
 
         netif_vdbg(rx_queue->efx, rx_status, rx_queue->efx->net_dev,
                    "RX queue %d fast-filling descriptor ring from"
                    " level %d to level %d using %s allocation\n",
                    efx_rx_queue_index(rx_queue), fill_level,
-                   rx_queue->fast_fill_limit,
+                   rx_queue->max_fill,
                    channel->rx_alloc_push_pages ? "page" : "skb");
 
         do {
@@ -681,7 +675,7 @@ int efx_probe_rx_queue(struct efx_rx_queue *rx_queue)
 void efx_init_rx_queue(struct efx_rx_queue *rx_queue)
 {
         struct efx_nic *efx = rx_queue->efx;
-        unsigned int max_fill, trigger, limit;
+        unsigned int max_fill, trigger, max_trigger;
 
         netif_dbg(rx_queue->efx, drv, rx_queue->efx->net_dev,
                   "initialising RX queue %d\n", efx_rx_queue_index(rx_queue));
@@ -694,12 +688,17 @@ void efx_init_rx_queue(struct efx_rx_queue *rx_queue)
 
         /* Initialise limit fields */
         max_fill = efx->rxq_entries - EFX_RXD_HEAD_ROOM;
-        trigger = max_fill * min(rx_refill_threshold, 100U) / 100U;
-        limit = max_fill * min(rx_refill_limit, 100U) / 100U;
+        max_trigger = max_fill - EFX_RX_BATCH;
+        if (rx_refill_threshold != 0) {
+                trigger = max_fill * min(rx_refill_threshold, 100U) / 100U;
+                if (trigger > max_trigger)
+                        trigger = max_trigger;
+        } else {
+                trigger = max_trigger;
+        }
 
         rx_queue->max_fill = max_fill;
         rx_queue->fast_fill_trigger = trigger;
-        rx_queue->fast_fill_limit = limit;
 
         /* Set up RX descriptor ring */
         rx_queue->enabled = true;
@@ -746,5 +745,5 @@ MODULE_PARM_DESC(rx_alloc_method, "Allocation method used for RX buffers");
 
 module_param(rx_refill_threshold, uint, 0444);
 MODULE_PARM_DESC(rx_refill_threshold,
-                 "RX descriptor ring fast/slow fill threshold (%)");
+                 "RX descriptor ring refill threshold (%)");
 
diff --git a/drivers/net/ethernet/silan/sc92031.c b/drivers/net/ethernet/silan/sc92031.c
index a284d6440538..32e55664df6e 100644
--- a/drivers/net/ethernet/silan/sc92031.c
+++ b/drivers/net/ethernet/silan/sc92031.c
@@ -39,9 +39,7 @@
 #define SC92031_NAME "sc92031"
 
 /* BAR 0 is MMIO, BAR 1 is PIO */
-#ifndef SC92031_USE_BAR
-#define SC92031_USE_BAR 0
-#endif
+#define SC92031_USE_PIO 0
 
 /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast). */
 static int multicast_filter_limit = 64;
@@ -366,7 +364,7 @@ static void sc92031_disable_interrupts(struct net_device *dev)
         mmiowb();
 
         /* wait for any concurrent interrupt/tasklet to finish */
-        synchronize_irq(dev->irq);
+        synchronize_irq(priv->pdev->irq);
         tasklet_disable(&priv->tasklet);
 }
 
@@ -1114,10 +1112,13 @@ static void sc92031_tx_timeout(struct net_device *dev)
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void sc92031_poll_controller(struct net_device *dev)
 {
-        disable_irq(dev->irq);
-        if (sc92031_interrupt(dev->irq, dev) != IRQ_NONE)
+        struct sc92031_priv *priv = netdev_priv(dev);
+        const int irq = priv->pdev->irq;
+
+        disable_irq(irq);
+        if (sc92031_interrupt(irq, dev) != IRQ_NONE)
                 sc92031_tasklet((unsigned long)dev);
-        enable_irq(dev->irq);
+        enable_irq(irq);
 }
 #endif
 
@@ -1402,7 +1403,6 @@ static int __devinit sc92031_probe(struct pci_dev *pdev,
         struct net_device *dev;
         struct sc92031_priv *priv;
         u32 mac0, mac1;
-        unsigned long base_addr;
 
         err = pci_enable_device(pdev);
         if (unlikely(err < 0))
@@ -1422,7 +1422,7 @@ static int __devinit sc92031_probe(struct pci_dev *pdev,
         if (unlikely(err < 0))
                 goto out_request_regions;
 
-        port_base = pci_iomap(pdev, SC92031_USE_BAR, 0);
+        port_base = pci_iomap(pdev, SC92031_USE_PIO, 0);
         if (unlikely(!port_base)) {
                 err = -EIO;
                 goto out_iomap;
@@ -1437,14 +1437,6 @@ static int __devinit sc92031_probe(struct pci_dev *pdev,
         pci_set_drvdata(pdev, dev);
         SET_NETDEV_DEV(dev, &pdev->dev);
 
-#if SC92031_USE_BAR == 0
-        dev->mem_start = pci_resource_start(pdev, SC92031_USE_BAR);
-        dev->mem_end = pci_resource_end(pdev, SC92031_USE_BAR);
-#elif SC92031_USE_BAR == 1
-        dev->base_addr = pci_resource_start(pdev, SC92031_USE_BAR);
-#endif
-        dev->irq = pdev->irq;
-
         /* faked with skb_copy_and_csum_dev */
         dev->features = NETIF_F_SG | NETIF_F_HIGHDMA |
                 NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
@@ -1478,13 +1470,9 @@ static int __devinit sc92031_probe(struct pci_dev *pdev,
         if (err < 0)
                 goto out_register_netdev;
 
-#if SC92031_USE_BAR == 0
-        base_addr = dev->mem_start;
-#elif SC92031_USE_BAR == 1
-        base_addr = dev->base_addr;
-#endif
         printk(KERN_INFO "%s: SC92031 at 0x%lx, %pM, IRQ %d\n", dev->name,
-                        base_addr, dev->dev_addr, dev->irq);
+               (long)pci_resource_start(pdev, SC92031_USE_PIO), dev->dev_addr,
+               pdev->irq);
 
         return 0;
 
diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
index a9deda8eaf63..4613591b43e7 100644
--- a/drivers/net/ethernet/sis/sis190.c
+++ b/drivers/net/ethernet/sis/sis190.c
@@ -729,7 +729,7 @@ static void sis190_tx_interrupt(struct net_device *dev,
  * The interrupt handler does all of the Rx thread work and cleans up after
  * the Tx thread.
  */
-static irqreturn_t sis190_interrupt(int irq, void *__dev)
+static irqreturn_t sis190_irq(int irq, void *__dev)
 {
         struct net_device *dev = __dev;
         struct sis190_private *tp = netdev_priv(dev);
@@ -772,11 +772,11 @@ out:
 static void sis190_netpoll(struct net_device *dev)
 {
         struct sis190_private *tp = netdev_priv(dev);
-        struct pci_dev *pdev = tp->pci_dev;
+        const int irq = tp->pci_dev->irq;
 
-        disable_irq(pdev->irq);
-        sis190_interrupt(pdev->irq, dev);
-        enable_irq(pdev->irq);
+        disable_irq(irq);
+        sis190_irq(irq, dev);
+        enable_irq(irq);
 }
 #endif
 
@@ -1085,7 +1085,7 @@ static int sis190_open(struct net_device *dev)
 
         sis190_request_timer(dev);
 
-        rc = request_irq(dev->irq, sis190_interrupt, IRQF_SHARED, dev->name, dev);
+        rc = request_irq(pdev->irq, sis190_irq, IRQF_SHARED, dev->name, dev);
         if (rc < 0)
                 goto err_release_timer_2;
 
@@ -1097,11 +1097,9 @@ err_release_timer_2:
         sis190_delete_timer(dev);
         sis190_rx_clear(tp);
 err_free_rx_1:
-        pci_free_consistent(tp->pci_dev, RX_RING_BYTES, tp->RxDescRing,
-                tp->rx_dma);
+        pci_free_consistent(pdev, RX_RING_BYTES, tp->RxDescRing, tp->rx_dma);
 err_free_tx_0:
-        pci_free_consistent(tp->pci_dev, TX_RING_BYTES, tp->TxDescRing,
-                tp->tx_dma);
+        pci_free_consistent(pdev, TX_RING_BYTES, tp->TxDescRing, tp->tx_dma);
         goto out;
 }
 
@@ -1141,7 +1139,7 @@ static void sis190_down(struct net_device *dev)
 
                 spin_unlock_irq(&tp->lock);
 
-                synchronize_irq(dev->irq);
+                synchronize_irq(tp->pci_dev->irq);
 
                 if (!poll_locked)
                         poll_locked++;
@@ -1161,7 +1159,7 @@ static int sis190_close(struct net_device *dev)
 
         sis190_down(dev);
 
-        free_irq(dev->irq, dev);
+        free_irq(pdev->irq, dev);
 
         pci_free_consistent(pdev, TX_RING_BYTES, tp->TxDescRing, tp->tx_dma);
         pci_free_consistent(pdev, RX_RING_BYTES, tp->RxDescRing, tp->rx_dma);
@@ -1884,8 +1882,6 @@ static int __devinit sis190_init_one(struct pci_dev *pdev,
         dev->netdev_ops = &sis190_netdev_ops;
 
         SET_ETHTOOL_OPS(dev, &sis190_ethtool_ops);
-        dev->irq = pdev->irq;
-        dev->base_addr = (unsigned long) 0xdead;
         dev->watchdog_timeo = SIS190_TX_TIMEOUT;
 
         spin_lock_init(&tp->lock);
@@ -1902,7 +1898,7 @@ static int __devinit sis190_init_one(struct pci_dev *pdev,
                 netdev_info(dev, "%s: %s at %p (IRQ: %d), %pM\n",
                             pci_name(pdev),
                             sis_chip_info[ent->driver_data].name,
-                            ioaddr, dev->irq, dev->dev_addr);
+                            ioaddr, pdev->irq, dev->dev_addr);
                 netdev_info(dev, "%s mode.\n",
                             (tp->features & F_HAS_RGMII) ? "RGMII" : "GMII");
         }
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index 5ccf02e7e3ad..203d9c6ec23a 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -168,6 +168,8 @@ struct sis900_private {
         unsigned int cur_phy;
         struct mii_if_info mii_info;
 
+        void __iomem    *ioaddr;
+
         struct timer_list timer; /* Link status detection timer. */
         u8 autong_complete; /* 1: auto-negotiate complete  */
 
@@ -201,13 +203,18 @@ MODULE_PARM_DESC(multicast_filter_limit, "SiS 900/7016 maximum number of filtere
 MODULE_PARM_DESC(max_interrupt_work, "SiS 900/7016 maximum events handled per interrupt");
 MODULE_PARM_DESC(sis900_debug, "SiS 900/7016 bitmapped debugging message level");
 
+#define sw32(reg, val)  iowrite32(val, ioaddr + (reg))
+#define sw8(reg, val)   iowrite8(val, ioaddr + (reg))
+#define sr32(reg)       ioread32(ioaddr + (reg))
+#define sr16(reg)       ioread16(ioaddr + (reg))
+
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void sis900_poll(struct net_device *dev);
 #endif
 static int sis900_open(struct net_device *net_dev);
 static int sis900_mii_probe (struct net_device * net_dev);
 static void sis900_init_rxfilter (struct net_device * net_dev);
-static u16 read_eeprom(long ioaddr, int location);
+static u16 read_eeprom(void __iomem *ioaddr, int location);
 static int mdio_read(struct net_device *net_dev, int phy_id, int location);
 static void mdio_write(struct net_device *net_dev, int phy_id, int location, int val);
 static void sis900_timer(unsigned long data);
@@ -231,7 +238,7 @@ static u16 sis900_default_phy(struct net_device * net_dev);
 static void sis900_set_capability( struct net_device *net_dev ,struct mii_phy *phy);
 static u16 sis900_reset_phy(struct net_device *net_dev, int phy_addr);
 static void sis900_auto_negotiate(struct net_device *net_dev, int phy_addr);
-static void sis900_set_mode (long ioaddr, int speed, int duplex);
+static void sis900_set_mode(struct sis900_private *, int speed, int duplex);
 static const struct ethtool_ops sis900_ethtool_ops;
 
 /**
@@ -246,7 +253,8 @@ static const struct ethtool_ops sis900_ethtool_ops;
 
 static int __devinit sis900_get_mac_addr(struct pci_dev * pci_dev, struct net_device *net_dev)
 {
-        long ioaddr = pci_resource_start(pci_dev, 0);
+        struct sis900_private *sis_priv = netdev_priv(net_dev);
+        void __iomem *ioaddr = sis_priv->ioaddr;
         u16 signature;
         int i;
 
@@ -325,29 +333,30 @@ static int __devinit sis630e_get_mac_addr(struct pci_dev * pci_dev,
 static int __devinit sis635_get_mac_addr(struct pci_dev * pci_dev,
                                         struct net_device *net_dev)
 {
-        long ioaddr = net_dev->base_addr;
+        struct sis900_private *sis_priv = netdev_priv(net_dev);
+        void __iomem *ioaddr = sis_priv->ioaddr;
         u32 rfcrSave;
         u32 i;
 
-        rfcrSave = inl(rfcr + ioaddr);
+        rfcrSave = sr32(rfcr);
 
-        outl(rfcrSave | RELOAD, ioaddr + cr);
-        outl(0, ioaddr + cr);
+        sw32(cr, rfcrSave | RELOAD);
+        sw32(cr, 0);
 
         /* disable packet filtering before setting filter */
-        outl(rfcrSave & ~RFEN, rfcr + ioaddr);
+        sw32(rfcr, rfcrSave & ~RFEN);
 
         /* load MAC addr to filter data register */
         for (i = 0 ; i < 3 ; i++) {
-                outl((i << RFADDR_shift), ioaddr + rfcr);
-                *( ((u16 *)net_dev->dev_addr) + i) = inw(ioaddr + rfdr);
+                sw32(rfcr, (i << RFADDR_shift));
+                *( ((u16 *)net_dev->dev_addr) + i) = sr16(rfdr);
         }
 
         /* Store MAC Address in perm_addr */
         memcpy(net_dev->perm_addr, net_dev->dev_addr, ETH_ALEN);
 
         /* enable packet filtering */
-        outl(rfcrSave | RFEN, rfcr + ioaddr);
+        sw32(rfcr, rfcrSave | RFEN);
 
         return 1;
 }
@@ -371,31 +380,30 @@ static int __devinit sis635_get_mac_addr(struct pci_dev * pci_dev,
 static int __devinit sis96x_get_mac_addr(struct pci_dev * pci_dev,
                                         struct net_device *net_dev)
 {
-        long ioaddr = net_dev->base_addr;
-        long ee_addr = ioaddr + mear;
-        u32 waittime = 0;
-        int i;
+        struct sis900_private *sis_priv = netdev_priv(net_dev);
+        void __iomem *ioaddr = sis_priv->ioaddr;
+        int wait, rc = 0;
 
-        outl(EEREQ, ee_addr);
-        while(waittime < 2000) {
-                if(inl(ee_addr) & EEGNT) {
+        sw32(mear, EEREQ);
+        for (wait = 0; wait < 2000; wait++) {
+                if (sr32(mear) & EEGNT) {
+                        u16 *mac = (u16 *)net_dev->dev_addr;
+                        int i;
 
                         /* get MAC address from EEPROM */
                         for (i = 0; i < 3; i++)
-                                ((u16 *)(net_dev->dev_addr))[i] = read_eeprom(ioaddr, i+EEPROMMACAddr);
+                                mac[i] = read_eeprom(ioaddr, i + EEPROMMACAddr);
 
                         /* Store MAC Address in perm_addr */
                         memcpy(net_dev->perm_addr, net_dev->dev_addr, ETH_ALEN);
 
-                        outl(EEDONE, ee_addr);
-                        return 1;
-                } else {
-                        udelay(1);
-                        waittime ++;
+                        rc = 1;
+                        break;
                 }
+                udelay(1);
         }
-        outl(EEDONE, ee_addr);
-        return 0;
+        sw32(mear, EEDONE);
+        return rc;
 }
 
 static const struct net_device_ops sis900_netdev_ops = {
@@ -433,7 +441,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
         struct pci_dev *dev;
         dma_addr_t ring_dma;
         void *ring_space;
-        long ioaddr;
+        void __iomem *ioaddr;
         int i, ret;
         const char *card_name = card_names[pci_id->driver_data];
         const char *dev_name = pci_name(pci_dev);
@@ -464,14 +472,17 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
         SET_NETDEV_DEV(net_dev, &pci_dev->dev);
 
         /* We do a request_region() to register /proc/ioports info. */
-        ioaddr = pci_resource_start(pci_dev, 0);
         ret = pci_request_regions(pci_dev, "sis900");
         if (ret)
                 goto err_out;
 
+        /* IO region. */
+        ioaddr = pci_iomap(pci_dev, 0, 0);
+        if (!ioaddr)
+                goto err_out_cleardev;
+
         sis_priv = netdev_priv(net_dev);
-        net_dev->base_addr = ioaddr;
-        net_dev->irq = pci_dev->irq;
+        sis_priv->ioaddr = ioaddr;
         sis_priv->pci_dev = pci_dev;
         spin_lock_init(&sis_priv->lock);
 
@@ -480,7 +491,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
         ring_space = pci_alloc_consistent(pci_dev, TX_TOTAL_SIZE, &ring_dma);
         if (!ring_space) {
                 ret = -ENOMEM;
-                goto err_out_cleardev;
+                goto err_out_unmap;
         }
         sis_priv->tx_ring = ring_space;
         sis_priv->tx_ring_dma = ring_dma;
@@ -534,7 +545,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
 
         /* 630ET : set the mii access mode as software-mode */
         if (sis_priv->chipset_rev == SIS630ET_900_REV)
-                outl(ACCESSMODE | inl(ioaddr + cr), ioaddr + cr);
+                sw32(cr, ACCESSMODE | sr32(cr));
 
         /* probe for mii transceiver */
         if (sis900_mii_probe(net_dev) == 0) {
@@ -556,25 +567,27 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
                 goto err_unmap_rx;
 
         /* print some information about our NIC */
-        printk(KERN_INFO "%s: %s at %#lx, IRQ %d, %pM\n",
-               net_dev->name, card_name, ioaddr, net_dev->irq,
+        printk(KERN_INFO "%s: %s at 0x%p, IRQ %d, %pM\n",
+               net_dev->name, card_name, ioaddr, pci_dev->irq,
                net_dev->dev_addr);
 
         /* Detect Wake on Lan support */
-        ret = (inl(net_dev->base_addr + CFGPMC) & PMESP) >> 27;
+        ret = (sr32(CFGPMC) & PMESP) >> 27;
         if (netif_msg_probe(sis_priv) && (ret & PME_D3C) == 0)
                 printk(KERN_INFO "%s: Wake on LAN only available from suspend to RAM.", net_dev->name);
 
         return 0;
 
- err_unmap_rx:
+err_unmap_rx:
         pci_free_consistent(pci_dev, RX_TOTAL_SIZE, sis_priv->rx_ring,
                 sis_priv->rx_ring_dma);
- err_unmap_tx:
+err_unmap_tx:
         pci_free_consistent(pci_dev, TX_TOTAL_SIZE, sis_priv->tx_ring,
                 sis_priv->tx_ring_dma);
- err_out_cleardev:
-        pci_set_drvdata(pci_dev, NULL);
+err_out_unmap:
+        pci_iounmap(pci_dev, ioaddr);
+err_out_cleardev:
+        pci_set_drvdata(pci_dev, NULL);
         pci_release_regions(pci_dev);
  err_out:
         free_netdev(net_dev);
@@ -798,7 +811,7 @@ static void sis900_set_capability(struct net_device *net_dev, struct mii_phy *ph
 
 
 /* Delay between EEPROM clock transitions. */
-#define eeprom_delay()  inl(ee_addr)
+#define eeprom_delay()  sr32(mear)
 
 /**
  *      read_eeprom - Read Serial EEPROM
@@ -809,41 +822,41 @@ static void sis900_set_capability(struct net_device *net_dev, struct mii_phy *ph
  *      Note that location is in word (16 bits) unit
  */
 
-static u16 __devinit read_eeprom(long ioaddr, int location)
+static u16 __devinit read_eeprom(void __iomem *ioaddr, int location)
 {
+        u32 read_cmd = location | EEread;
         int i;
         u16 retval = 0;
-        long ee_addr = ioaddr + mear;
-        u32 read_cmd = location | EEread;
 
-        outl(0, ee_addr);
+        sw32(mear, 0);
         eeprom_delay();
-        outl(EECS, ee_addr);
+        sw32(mear, EECS);
         eeprom_delay();
 
         /* Shift the read command (9) bits out. */
         for (i = 8; i >= 0; i--) {
                 u32 dataval = (read_cmd & (1 << i)) ? EEDI | EECS : EECS;
-                outl(dataval, ee_addr);
+
+                sw32(mear, dataval);
                 eeprom_delay();
-                outl(dataval | EECLK, ee_addr);
+                sw32(mear, dataval | EECLK);
                 eeprom_delay();
         }
-        outl(EECS, ee_addr);
+        sw32(mear, EECS);
         eeprom_delay();
 
         /* read the 16-bits data in */
         for (i = 16; i > 0; i--) {
-                outl(EECS, ee_addr);
+                sw32(mear, EECS);
                 eeprom_delay();
-                outl(EECS | EECLK, ee_addr);
+                sw32(mear, EECS | EECLK);
                 eeprom_delay();
-                retval = (retval << 1) | ((inl(ee_addr) & EEDO) ? 1 : 0);
+                retval = (retval << 1) | ((sr32(mear) & EEDO) ? 1 : 0);
                 eeprom_delay();
         }
 
         /* Terminate the EEPROM access. */
-        outl(0, ee_addr);
+        sw32(mear, 0);
         eeprom_delay();
 
         return retval;
@@ -852,24 +865,27 @@ static u16 __devinit read_eeprom(long ioaddr, int location)
 /* Read and write the MII management registers using software-generated
    serial MDIO protocol. Note that the command bits and data bits are
    send out separately */
-#define mdio_delay()    inl(mdio_addr)
+#define mdio_delay()    sr32(mear)
 
-static void mdio_idle(long mdio_addr)
+static void mdio_idle(struct sis900_private *sp)
 {
-        outl(MDIO | MDDIR, mdio_addr);
+        void __iomem *ioaddr = sp->ioaddr;
+
+        sw32(mear, MDIO | MDDIR);
         mdio_delay();
-        outl(MDIO | MDDIR | MDC, mdio_addr);
+        sw32(mear, MDIO | MDDIR | MDC);
 }
 
-/* Syncronize the MII management interface by shifting 32 one bits out. */
-static void mdio_reset(long mdio_addr)
+/* Synchronize the MII management interface by shifting 32 one bits out. */
+static void mdio_reset(struct sis900_private *sp)
 {
+        void __iomem *ioaddr = sp->ioaddr;
         int i;
 
         for (i = 31; i >= 0; i--) {
-                outl(MDDIR | MDIO, mdio_addr);
+                sw32(mear, MDDIR | MDIO);
                 mdio_delay();
-                outl(MDDIR | MDIO | MDC, mdio_addr);
+                sw32(mear, MDDIR | MDIO | MDC);
                 mdio_delay();
         }
 }
@@ -887,31 +903,33 @@ static void mdio_reset(long mdio_addr)
 
 static int mdio_read(struct net_device *net_dev, int phy_id, int location)
 {
-        long mdio_addr = net_dev->base_addr + mear;
         int mii_cmd = MIIread|(phy_id<<MIIpmdShift)|(location<<MIIregShift);
+        struct sis900_private *sp = netdev_priv(net_dev);
+        void __iomem *ioaddr = sp->ioaddr;
         u16 retval = 0;
         int i;
 
-        mdio_reset(mdio_addr);
-        mdio_idle(mdio_addr);
+        mdio_reset(sp);
+        mdio_idle(sp);
 
         for (i = 15; i >= 0; i--) {
                 int dataval = (mii_cmd & (1 << i)) ? MDDIR | MDIO : MDDIR;
-                outl(dataval, mdio_addr);
+
+                sw32(mear, dataval);
                 mdio_delay();
-                outl(dataval | MDC, mdio_addr);
+                sw32(mear, dataval | MDC);
                 mdio_delay();
         }
 
         /* Read the 16 data bits. */
         for (i = 16; i > 0; i--) {
-                outl(0, mdio_addr);
+                sw32(mear, 0);
                 mdio_delay();
-                retval = (retval << 1) | ((inl(mdio_addr) & MDIO) ? 1 : 0);
-                outl(MDC, mdio_addr);
+                retval = (retval << 1) | ((sr32(mear) & MDIO) ? 1 : 0);
+                sw32(mear, MDC);
                 mdio_delay();
         }
-        outl(0x00, mdio_addr);
+        sw32(mear, 0x00);
 
         return retval;
 }
@@ -931,19 +949,21 @@ static int mdio_read(struct net_device *net_dev, int phy_id, int location)
 static void mdio_write(struct net_device *net_dev, int phy_id, int location,
                         int value)
 {
-        long mdio_addr = net_dev->base_addr + mear;
         int mii_cmd = MIIwrite|(phy_id<<MIIpmdShift)|(location<<MIIregShift);
+        struct sis900_private *sp = netdev_priv(net_dev);
+        void __iomem *ioaddr = sp->ioaddr;
         int i;
 
-        mdio_reset(mdio_addr);
-        mdio_idle(mdio_addr);
+        mdio_reset(sp);
+        mdio_idle(sp);
 
         /* Shift the command bits out. */
         for (i = 15; i >= 0; i--) {
                 int dataval = (mii_cmd & (1 << i)) ? MDDIR | MDIO : MDDIR;
-                outb(dataval, mdio_addr);
+
+                sw8(mear, dataval);
                 mdio_delay();
-                outb(dataval | MDC, mdio_addr);
+                sw8(mear, dataval | MDC);
                 mdio_delay();
         }
         mdio_delay();
@@ -951,21 +971,22 @@ static void mdio_write(struct net_device *net_dev, int phy_id, int location,
         /* Shift the value bits out. */
         for (i = 15; i >= 0; i--) {
                 int dataval = (value & (1 << i)) ? MDDIR | MDIO : MDDIR;
-                outl(dataval, mdio_addr);
+
+                sw32(mear, dataval);
                 mdio_delay();
-                outl(dataval | MDC, mdio_addr);
+                sw32(mear, dataval | MDC);
                 mdio_delay();
         }
         mdio_delay();
 
         /* Clear out extra bits. */
         for (i = 2; i > 0; i--) {
-                outb(0, mdio_addr);
+                sw8(mear, 0);
                 mdio_delay();
-                outb(MDC, mdio_addr);
+                sw8(mear, MDC);
                 mdio_delay();
         }
-        outl(0x00, mdio_addr);
+        sw32(mear, 0x00);
 }
 
 
@@ -1000,9 +1021,12 @@ static u16 sis900_reset_phy(struct net_device *net_dev, int phy_addr)
 */
 static void sis900_poll(struct net_device *dev)
 {
-        disable_irq(dev->irq);
-        sis900_interrupt(dev->irq, dev);
-        enable_irq(dev->irq);
+        struct sis900_private *sp = netdev_priv(dev);
+        const int irq = sp->pci_dev->irq;
+
+        disable_irq(irq);
+        sis900_interrupt(irq, dev);
+        enable_irq(irq);
 }
 #endif
 
@@ -1018,7 +1042,7 @@ static int
 sis900_open(struct net_device *net_dev)
 {
         struct sis900_private *sis_priv = netdev_priv(net_dev);
-        long ioaddr = net_dev->base_addr;
+        void __iomem *ioaddr = sis_priv->ioaddr;
         int ret;
 
         /* Soft reset the chip. */
@@ -1027,8 +1051,8 @@ sis900_open(struct net_device *net_dev)
         /* Equalizer workaround Rule */
         sis630_set_eq(net_dev, sis_priv->chipset_rev);
 
-        ret = request_irq(net_dev->irq, sis900_interrupt, IRQF_SHARED,
-                                                net_dev->name, net_dev);
+        ret = request_irq(sis_priv->pci_dev->irq, sis900_interrupt, IRQF_SHARED,
+                          net_dev->name, net_dev);
         if (ret)
                 return ret;
 
@@ -1042,12 +1066,12 @@ sis900_open(struct net_device *net_dev)
         netif_start_queue(net_dev);
 
         /* Workaround for EDB */
-        sis900_set_mode(ioaddr, HW_SPEED_10_MBPS, FDX_CAPABLE_HALF_SELECTED);
+        sis900_set_mode(sis_priv, HW_SPEED_10_MBPS, FDX_CAPABLE_HALF_SELECTED);
 
         /* Enable all known interrupts by setting the interrupt mask. */
-        outl((RxSOVR|RxORN|RxERR|RxOK|TxURN|TxERR|TxIDLE), ioaddr + imr);
-        outl(RxENA | inl(ioaddr + cr), ioaddr + cr);
-        outl(IE, ioaddr + ier);
+        sw32(imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE);
+        sw32(cr, RxENA | sr32(cr));
+        sw32(ier, IE);
 
         sis900_check_mode(net_dev, sis_priv->mii);
 
@@ -1074,31 +1098,30 @@ static void
 sis900_init_rxfilter (struct net_device * net_dev)
 {
         struct sis900_private *sis_priv = netdev_priv(net_dev);
-        long ioaddr = net_dev->base_addr;
+        void __iomem *ioaddr = sis_priv->ioaddr;
         u32 rfcrSave;
         u32 i;
 
-        rfcrSave = inl(rfcr + ioaddr);
+        rfcrSave = sr32(rfcr);
 
         /* disable packet filtering before setting filter */
-        outl(rfcrSave & ~RFEN, rfcr + ioaddr);
+        sw32(rfcr, rfcrSave & ~RFEN);
 
         /* load MAC addr to filter data register */
         for (i = 0 ; i < 3 ; i++) {
-                u32 w;
+                u32 w = (u32) *((u16 *)(net_dev->dev_addr)+i);
 
-                w = (u32) *((u16 *)(net_dev->dev_addr)+i);
-                outl((i << RFADDR_shift), ioaddr + rfcr);
-                outl(w, ioaddr + rfdr);
+                sw32(rfcr, i << RFADDR_shift);
+                sw32(rfdr, w);
 
                 if (netif_msg_hw(sis_priv)) {
                         printk(KERN_DEBUG "%s: Receive Filter Addrss[%d]=%x\n",
-                               net_dev->name, i, inl(ioaddr + rfdr));
+                               net_dev->name, i, sr32(rfdr));
                 }
         }
 
         /* enable packet filtering */
-        outl(rfcrSave | RFEN, rfcr + ioaddr);
+        sw32(rfcr, rfcrSave | RFEN);
 }
 
 /**
@@ -1112,7 +1135,7 @@ static void
 sis900_init_tx_ring(struct net_device *net_dev)
 {
         struct sis900_private *sis_priv = netdev_priv(net_dev);
-        long ioaddr = net_dev->base_addr;
+        void __iomem *ioaddr = sis_priv->ioaddr;
         int i;
 
         sis_priv->tx_full = 0;
@@ -1128,10 +1151,10 @@ sis900_init_tx_ring(struct net_device *net_dev)
         }
 
         /* load Transmit Descriptor Register */
-        outl(sis_priv->tx_ring_dma, ioaddr + txdp);
+        sw32(txdp, sis_priv->tx_ring_dma);
         if (netif_msg_hw(sis_priv))
                 printk(KERN_DEBUG "%s: TX descriptor register loaded with: %8.8x\n",
-                       net_dev->name, inl(ioaddr + txdp));
+                       net_dev->name, sr32(txdp));
 }
 
 /**
@@ -1146,7 +1169,7 @@ static void
 sis900_init_rx_ring(struct net_device *net_dev)
 {
         struct sis900_private *sis_priv = netdev_priv(net_dev);
-        long ioaddr = net_dev->base_addr;
+        void __iomem *ioaddr = sis_priv->ioaddr;
         int i;
 
         sis_priv->cur_rx = 0;
@@ -1181,10 +1204,10 @@ sis900_init_rx_ring(struct net_device *net_dev)
         sis_priv->dirty_rx = (unsigned int) (i - NUM_RX_DESC);
 
         /* load Receive Descriptor Register */
-        outl(sis_priv->rx_ring_dma, ioaddr + rxdp);
+        sw32(rxdp, sis_priv->rx_ring_dma);
         if (netif_msg_hw(sis_priv))
                 printk(KERN_DEBUG "%s: RX descriptor register loaded with: %8.8x\n",
-                       net_dev->name, inl(ioaddr + rxdp));
+                       net_dev->name, sr32(rxdp));
 }
 
 /**
@@ -1298,7 +1321,7 @@ static void sis900_timer(unsigned long data)
 
                 sis900_read_mode(net_dev, &speed, &duplex);
                 if (duplex){
-                        sis900_set_mode(net_dev->base_addr, speed, duplex);
+                        sis900_set_mode(sis_priv, speed, duplex);
                         sis630_set_eq(net_dev, sis_priv->chipset_rev);
                         netif_start_queue(net_dev);
                 }
@@ -1359,25 +1382,25 @@ static void sis900_timer(unsigned long data)
 static void sis900_check_mode(struct net_device *net_dev, struct mii_phy *mii_phy)
 {
         struct sis900_private *sis_priv = netdev_priv(net_dev);
-        long ioaddr = net_dev->base_addr;
+        void __iomem *ioaddr = sis_priv->ioaddr;
         int speed, duplex;
 
         if (mii_phy->phy_types == LAN) {
-                outl(~EXD & inl(ioaddr + cfg), ioaddr + cfg);
+                sw32(cfg, ~EXD & sr32(cfg));
                 sis900_set_capability(net_dev , mii_phy);
                 sis900_auto_negotiate(net_dev, sis_priv->cur_phy);
         } else {
-                outl(EXD | inl(ioaddr + cfg), ioaddr + cfg);
+                sw32(cfg, EXD | sr32(cfg));
                 speed = HW_SPEED_HOME;
                 duplex = FDX_CAPABLE_HALF_SELECTED;
-                sis900_set_mode(ioaddr, speed, duplex);
+                sis900_set_mode(sis_priv, speed, duplex);
                 sis_priv->autong_complete = 1;
         }
 }
 
 /**
  *      sis900_set_mode - Set the media mode of mac register.
- *      @ioaddr: the address of the device
+ *      @sp:     the device private data
  *      @speed : the transmit speed to be determined
  *      @duplex: the duplex mode to be determined
  *
@@ -1388,11 +1411,12 @@ static void sis900_check_mode(struct net_device *net_dev, struct mii_phy *mii_ph
  *      double words.
  */
 
-static void sis900_set_mode (long ioaddr, int speed, int duplex)
+static void sis900_set_mode(struct sis900_private *sp, int speed, int duplex)
 {
+        void __iomem *ioaddr = sp->ioaddr;
         u32 tx_flags = 0, rx_flags = 0;
 
-        if (inl(ioaddr + cfg) & EDB_MASTER_EN) {
+        if (sr32( cfg) & EDB_MASTER_EN) {
                 tx_flags = TxATP | (DMA_BURST_64 << TxMXDMA_shift) |
                                         (TX_FILL_THRESH << TxFILLT_shift);
                 rx_flags = DMA_BURST_64 << RxMXDMA_shift;
@@ -1420,8 +1444,8 @@ static void sis900_set_mode (long ioaddr, int speed, int duplex)
         rx_flags |= RxAJAB;
 #endif
 
-        outl (tx_flags, ioaddr + txcfg);
-        outl (rx_flags, ioaddr + rxcfg);
+        sw32(txcfg, tx_flags);
+        sw32(rxcfg, rx_flags);
 }
 
 /**
@@ -1528,16 +1552,17 @@ static void sis900_read_mode(struct net_device *net_dev, int *speed, int *duplex
 static void sis900_tx_timeout(struct net_device *net_dev)
 {
         struct sis900_private *sis_priv = netdev_priv(net_dev);
-        long ioaddr = net_dev->base_addr;
+        void __iomem *ioaddr = sis_priv->ioaddr;
         unsigned long flags;
         int i;
 
-        if(netif_msg_tx_err(sis_priv))
+        if (netif_msg_tx_err(sis_priv)) {
                 printk(KERN_INFO "%s: Transmit timeout, status %8.8x %8.8x\n",
-                        net_dev->name, inl(ioaddr + cr), inl(ioaddr + isr));
+                        net_dev->name, sr32(cr), sr32(isr));
+        }
 
         /* Disable interrupts by clearing the interrupt mask. */
-        outl(0x0000, ioaddr + imr);
+        sw32(imr, 0x0000);
 
         /* use spinlock to prevent interrupt handler accessing buffer ring */
         spin_lock_irqsave(&sis_priv->lock, flags);
@@ -1566,10 +1591,10 @@ static void sis900_tx_timeout(struct net_device *net_dev)
         net_dev->trans_start = jiffies; /* prevent tx timeout */
 
         /* load Transmit Descriptor Register */
-        outl(sis_priv->tx_ring_dma, ioaddr + txdp);
+        sw32(txdp, sis_priv->tx_ring_dma);
 
         /* Enable all known interrupts by setting the interrupt mask. */
-        outl((RxSOVR|RxORN|RxERR|RxOK|TxURN|TxERR|TxIDLE), ioaddr + imr);
+        sw32(imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE);
 }
 
 /**
@@ -1586,7 +1611,7 @@ static netdev_tx_t
 sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev)
 {
         struct sis900_private *sis_priv = netdev_priv(net_dev);
-        long ioaddr = net_dev->base_addr;
+        void __iomem *ioaddr = sis_priv->ioaddr;
         unsigned int  entry;
         unsigned long flags;
         unsigned int  index_cur_tx, index_dirty_tx;
@@ -1608,7 +1633,7 @@ sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev)
         sis_priv->tx_ring[entry].bufptr = pci_map_single(sis_priv->pci_dev,
                 skb->data, skb->len, PCI_DMA_TODEVICE);
         sis_priv->tx_ring[entry].cmdsts = (OWN | skb->len);
-        outl(TxENA | inl(ioaddr + cr), ioaddr + cr);
+        sw32(cr, TxENA | sr32(cr));
 
         sis_priv->cur_tx ++;
         index_cur_tx = sis_priv->cur_tx;
@@ -1654,14 +1679,14 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance)
         struct net_device *net_dev = dev_instance;
         struct sis900_private *sis_priv = netdev_priv(net_dev);
         int boguscnt = max_interrupt_work;
-        long ioaddr = net_dev->base_addr;
+        void __iomem *ioaddr = sis_priv->ioaddr;
         u32 status;
         unsigned int handled = 0;
 
         spin_lock (&sis_priv->lock);
 
         do {
-                status = inl(ioaddr + isr);
+                status = sr32(isr);
 
                 if ((status & (HIBERR|TxURN|TxERR|TxIDLE|RxORN|RxERR|RxOK)) == 0)
                         /* nothing intresting happened */
@@ -1696,7 +1721,7 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance)
         if(netif_msg_intr(sis_priv))
                 printk(KERN_DEBUG "%s: exiting interrupt, "
                        "interrupt status = 0x%#8.8x.\n",
-                       net_dev->name, inl(ioaddr + isr));
+                       net_dev->name, sr32(isr));
 
         spin_unlock (&sis_priv->lock);
         return IRQ_RETVAL(handled);
@@ -1715,7 +1740,7 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance)
 static int sis900_rx(struct net_device *net_dev)
 {
         struct sis900_private *sis_priv = netdev_priv(net_dev);
-        long ioaddr = net_dev->base_addr;
+        void __iomem *ioaddr = sis_priv->ioaddr;
         unsigned int entry = sis_priv->cur_rx % NUM_RX_DESC;
         u32 rx_status = sis_priv->rx_ring[entry].cmdsts;
         int rx_work_limit;
@@ -1847,7 +1872,7 @@ refill_rx_ring:
                 }
         }
         /* re-enable the potentially idle receive state matchine */
-        outl(RxENA | inl(ioaddr + cr), ioaddr + cr );
+        sw32(cr , RxENA | sr32(cr));
 
         return 0;
 }
@@ -1932,31 +1957,31 @@ static void sis900_finish_xmit (struct net_device *net_dev)
 
 static int sis900_close(struct net_device *net_dev)
 {
-        long ioaddr = net_dev->base_addr;
         struct sis900_private *sis_priv = netdev_priv(net_dev);
+        struct pci_dev *pdev = sis_priv->pci_dev;
+        void __iomem *ioaddr = sis_priv->ioaddr;
         struct sk_buff *skb;
         int i;
 
         netif_stop_queue(net_dev);
 
         /* Disable interrupts by clearing the interrupt mask. */
-        outl(0x0000, ioaddr + imr);
-        outl(0x0000, ioaddr + ier);
+        sw32(imr, 0x0000);
+        sw32(ier, 0x0000);
 
         /* Stop the chip's Tx and Rx Status Machine */
-        outl(RxDIS | TxDIS | inl(ioaddr + cr), ioaddr + cr);
+        sw32(cr, RxDIS | TxDIS | sr32(cr));
 
         del_timer(&sis_priv->timer);
 
-        free_irq(net_dev->irq, net_dev);
+        free_irq(pdev->irq, net_dev);
 
         /* Free Tx and RX skbuff */
         for (i = 0; i < NUM_RX_DESC; i++) {
                 skb = sis_priv->rx_skbuff[i];
                 if (skb) {
-                        pci_unmap_single(sis_priv->pci_dev,
-                                sis_priv->rx_ring[i].bufptr,
-                                RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
+                        pci_unmap_single(pdev, sis_priv->rx_ring[i].bufptr,
+                                         RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
                         dev_kfree_skb(skb);
                         sis_priv->rx_skbuff[i] = NULL;
                 }
@@ -1964,9 +1989,8 @@ static int sis900_close(struct net_device *net_dev)
         for (i = 0; i < NUM_TX_DESC; i++) {
                 skb = sis_priv->tx_skbuff[i];
                 if (skb) {
-                        pci_unmap_single(sis_priv->pci_dev,
-                                sis_priv->tx_ring[i].bufptr, skb->len,
-                                PCI_DMA_TODEVICE);
+                        pci_unmap_single(pdev, sis_priv->tx_ring[i].bufptr,
+                                         skb->len, PCI_DMA_TODEVICE);
                         dev_kfree_skb(skb);
                         sis_priv->tx_skbuff[i] = NULL;
                 }
@@ -2055,14 +2079,14 @@ static int sis900_nway_reset(struct net_device *net_dev)
 static int sis900_set_wol(struct net_device *net_dev, struct ethtool_wolinfo *wol)
 {
         struct sis900_private *sis_priv = netdev_priv(net_dev);
-        long pmctrl_addr = net_dev->base_addr + pmctrl;
+        void __iomem *ioaddr = sis_priv->ioaddr;
         u32 cfgpmcsr = 0, pmctrl_bits = 0;
 
         if (wol->wolopts == 0) {
                 pci_read_config_dword(sis_priv->pci_dev, CFGPMCSR, &cfgpmcsr);
                 cfgpmcsr &= ~PME_EN;
                 pci_write_config_dword(sis_priv->pci_dev, CFGPMCSR, cfgpmcsr);
-                outl(pmctrl_bits, pmctrl_addr);
+                sw32(pmctrl, pmctrl_bits);
                 if (netif_msg_wol(sis_priv))
                         printk(KERN_DEBUG "%s: Wake on LAN disabled\n", net_dev->name);
                 return 0;
@@ -2077,7 +2101,7 @@ static int sis900_set_wol(struct net_device *net_dev, struct ethtool_wolinfo *wo
         if (wol->wolopts & WAKE_PHY)
                 pmctrl_bits |= LINKON;
 
-        outl(pmctrl_bits, pmctrl_addr);
+        sw32(pmctrl, pmctrl_bits);
 
         pci_read_config_dword(sis_priv->pci_dev, CFGPMCSR, &cfgpmcsr);
         cfgpmcsr |= PME_EN;
@@ -2090,10 +2114,11 @@ static int sis900_set_wol(struct net_device *net_dev, struct ethtool_wolinfo *wo
 
 static void sis900_get_wol(struct net_device *net_dev, struct ethtool_wolinfo *wol)
 {
-        long pmctrl_addr = net_dev->base_addr + pmctrl;
+        struct sis900_private *sp = netdev_priv(net_dev);
+        void __iomem *ioaddr = sp->ioaddr;
         u32 pmctrl_bits;
 
-        pmctrl_bits = inl(pmctrl_addr);
+        pmctrl_bits = sr32(pmctrl);
         if (pmctrl_bits & MAGICPKT)
                 wol->wolopts |= WAKE_MAGIC;
         if (pmctrl_bits & LINKON)
@@ -2279,8 +2304,8 @@ static inline u16 sis900_mcast_bitnr(u8 *addr, u8 revision)
 
 static void set_rx_mode(struct net_device *net_dev)
 {
-        long ioaddr = net_dev->base_addr;
         struct sis900_private *sis_priv = netdev_priv(net_dev);
+        void __iomem *ioaddr = sis_priv->ioaddr;
         u16 mc_filter[16] = {0};        /* 256/128 bits multicast hash table */
         int i, table_entries;
         u32 rx_mode;
@@ -2322,24 +2347,24 @@ static void set_rx_mode(struct net_device *net_dev)
         /* update Multicast Hash Table in Receive Filter */
         for (i = 0; i < table_entries; i++) {
                 /* why plus 0x04 ??, That makes the correct value for hash table. */
-                outl((u32)(0x00000004+i) << RFADDR_shift, ioaddr + rfcr);
-                outl(mc_filter[i], ioaddr + rfdr);
+                sw32(rfcr, (u32)(0x00000004 + i) << RFADDR_shift);
+                sw32(rfdr, mc_filter[i]);
         }
 
-        outl(RFEN | rx_mode, ioaddr + rfcr);
+        sw32(rfcr, RFEN | rx_mode);
 
         /* sis900 is capable of looping back packets at MAC level for
          * debugging purpose */
         if (net_dev->flags & IFF_LOOPBACK) {
                 u32 cr_saved;
                 /* We must disable Tx/Rx before setting loopback mode */
-                cr_saved = inl(ioaddr + cr);
-                outl(cr_saved | TxDIS | RxDIS, ioaddr + cr);
+                cr_saved = sr32(cr);
+                sw32(cr, cr_saved | TxDIS | RxDIS);
                 /* enable loopback */
-                outl(inl(ioaddr + txcfg) | TxMLB, ioaddr + txcfg);
-                outl(inl(ioaddr + rxcfg) | RxATX, ioaddr + rxcfg);
+                sw32(txcfg, sr32(txcfg) | TxMLB);
+                sw32(rxcfg, sr32(rxcfg) | RxATX);
                 /* restore cr */
-                outl(cr_saved, ioaddr + cr);
+                sw32(cr, cr_saved);
         }
 }
 
@@ -2355,26 +2380,25 @@ static void set_rx_mode(struct net_device *net_dev)
 static void sis900_reset(struct net_device *net_dev)
 {
         struct sis900_private *sis_priv = netdev_priv(net_dev);
-        long ioaddr = net_dev->base_addr;
-        int i = 0;
+        void __iomem *ioaddr = sis_priv->ioaddr;
         u32 status = TxRCMP | RxRCMP;
+        int i;
 
-        outl(0, ioaddr + ier);
-        outl(0, ioaddr + imr);
-        outl(0, ioaddr + rfcr);
+        sw32(ier, 0);
+        sw32(imr, 0);
+        sw32(rfcr, 0);
 
-        outl(RxRESET | TxRESET | RESET | inl(ioaddr + cr), ioaddr + cr);
+        sw32(cr, RxRESET | TxRESET | RESET | sr32(cr));
 
         /* Check that the chip has finished the reset. */
-        while (status && (i++ < 1000)) {
-                status ^= (inl(isr + ioaddr) & status);
-        }
+        for (i = 0; status && (i < 1000); i++)
+                status ^= sr32(isr) & status;
 
-        if( (sis_priv->chipset_rev >= SIS635A_900_REV) ||
-                        (sis_priv->chipset_rev == SIS900B_900_REV) )
-                outl(PESEL | RND_CNT, ioaddr + cfg);
+        if (sis_priv->chipset_rev >= SIS635A_900_REV ||
+            sis_priv->chipset_rev == SIS900B_900_REV)
+                sw32(cfg, PESEL | RND_CNT);
         else
-                outl(PESEL, ioaddr + cfg);
+                sw32(cfg, PESEL);
 }
 
 /**
@@ -2388,10 +2412,12 @@ static void __devexit sis900_remove(struct pci_dev *pci_dev)
 {
         struct net_device *net_dev = pci_get_drvdata(pci_dev);
         struct sis900_private *sis_priv = netdev_priv(net_dev);
-        struct mii_phy *phy = NULL;
+
+        unregister_netdev(net_dev);
 
         while (sis_priv->first_mii) {
-                phy = sis_priv->first_mii;
+                struct mii_phy *phy = sis_priv->first_mii;
+
                 sis_priv->first_mii = phy->next;
                 kfree(phy);
         }
@@ -2400,7 +2426,7 @@ static void __devexit sis900_remove(struct pci_dev *pci_dev)
                 sis_priv->rx_ring_dma);
         pci_free_consistent(pci_dev, TX_TOTAL_SIZE, sis_priv->tx_ring,
                 sis_priv->tx_ring_dma);
-        unregister_netdev(net_dev);
+        pci_iounmap(pci_dev, sis_priv->ioaddr);
         free_netdev(net_dev);
         pci_release_regions(pci_dev);
         pci_set_drvdata(pci_dev, NULL);
@@ -2411,7 +2437,8 @@ static void __devexit sis900_remove(struct pci_dev *pci_dev)
 static int sis900_suspend(struct pci_dev *pci_dev, pm_message_t state)
 {
         struct net_device *net_dev = pci_get_drvdata(pci_dev);
-        long ioaddr = net_dev->base_addr;
+        struct sis900_private *sis_priv = netdev_priv(net_dev);
+        void __iomem *ioaddr = sis_priv->ioaddr;
 
         if(!netif_running(net_dev))
                 return 0;
@@ -2420,7 +2447,7 @@ static int sis900_suspend(struct pci_dev *pci_dev, pm_message_t state)
         netif_device_detach(net_dev);
 
         /* Stop the chip's Tx and Rx Status Machine */
-        outl(RxDIS | TxDIS | inl(ioaddr + cr), ioaddr + cr);
+        sw32(cr, RxDIS | TxDIS | sr32(cr));
 
         pci_set_power_state(pci_dev, PCI_D3hot);
         pci_save_state(pci_dev);
@@ -2432,7 +2459,7 @@ static int sis900_resume(struct pci_dev *pci_dev)
 {
         struct net_device *net_dev = pci_get_drvdata(pci_dev);
         struct sis900_private *sis_priv = netdev_priv(net_dev);
-        long ioaddr = net_dev->base_addr;
+        void __iomem *ioaddr = sis_priv->ioaddr;
 
         if(!netif_running(net_dev))
                 return 0;
@@ -2453,9 +2480,9 @@ static int sis900_resume(struct pci_dev *pci_dev)
         sis900_set_mode(ioaddr, HW_SPEED_10_MBPS, FDX_CAPABLE_HALF_SELECTED);
 
         /* Enable all known interrupts by setting the interrupt mask. */
-        outl((RxSOVR|RxORN|RxERR|RxOK|TxURN|TxERR|TxIDLE), ioaddr + imr);
-        outl(RxENA | inl(ioaddr + cr), ioaddr + cr);
-        outl(IE, ioaddr + ier);
+        sw32(imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE);
+        sw32(cr, RxENA | sr32(cr));
+        sw32(ier, IE);
 
         sis900_check_mode(net_dev, sis_priv->mii);
 
diff --git a/drivers/net/ethernet/smsc/epic100.c b/drivers/net/ethernet/smsc/epic100.c
index 2a662e6112e9..d01e59c348ad 100644
--- a/drivers/net/ethernet/smsc/epic100.c
+++ b/drivers/net/ethernet/smsc/epic100.c
@@ -146,6 +146,12 @@ enum chip_capability_flags { MII_PWRDWN=1, TYPE2_INTR=2, NO_MII=4 };
 #define EPIC_TOTAL_SIZE 0x100
 #define USE_IO_OPS 1
 
+#ifdef USE_IO_OPS
+#define EPIC_BAR        0
+#else
+#define EPIC_BAR        1
+#endif
+
 typedef enum {
         SMSC_83C170_0,
         SMSC_83C170,
@@ -176,21 +182,11 @@ static DEFINE_PCI_DEVICE_TABLE(epic_pci_tbl) = {
 };
 MODULE_DEVICE_TABLE (pci, epic_pci_tbl);
 
-
-#ifndef USE_IO_OPS
-#undef inb
-#undef inw
-#undef inl
-#undef outb
-#undef outw
-#undef outl
-#define inb readb
-#define inw readw
-#define inl readl
-#define outb writeb
-#define outw writew
-#define outl writel
-#endif
+#define ew16(reg, val)  iowrite16(val, ioaddr + (reg))
+#define ew32(reg, val)  iowrite32(val, ioaddr + (reg))
+#define er8(reg)        ioread8(ioaddr + (reg))
+#define er16(reg)       ioread16(ioaddr + (reg))
+#define er32(reg)       ioread32(ioaddr + (reg))
 
 /* Offsets to registers, using the (ugh) SMC names. */
 enum epic_registers {
@@ -275,6 +271,7 @@ struct epic_private {
         u32 irq_mask;
         unsigned int rx_buf_sz;                         /* Based on MTU+slack. */
 
+        void __iomem *ioaddr;
         struct pci_dev *pci_dev;                        /* PCI bus location. */
         int chip_id, chip_flags;
 
@@ -290,7 +287,7 @@ struct epic_private {
 };
 
 static int epic_open(struct net_device *dev);
-static int read_eeprom(long ioaddr, int location);
+static int read_eeprom(struct epic_private *, int);
 static int mdio_read(struct net_device *dev, int phy_id, int location);
 static void mdio_write(struct net_device *dev, int phy_id, int loc, int val);
 static void epic_restart(struct net_device *dev);
@@ -321,11 +318,11 @@ static const struct net_device_ops epic_netdev_ops = {
         .ndo_validate_addr      = eth_validate_addr,
 };
 
-static int __devinit epic_init_one (struct pci_dev *pdev,
-                                    const struct pci_device_id *ent)
+static int __devinit epic_init_one(struct pci_dev *pdev,
+                                   const struct pci_device_id *ent)
 {
         static int card_idx = -1;
-        long ioaddr;
+        void __iomem *ioaddr;
         int chip_idx = (int) ent->driver_data;
         int irq;
         struct net_device *dev;
@@ -368,19 +365,15 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
 
         SET_NETDEV_DEV(dev, &pdev->dev);
 
-#ifdef USE_IO_OPS
-        ioaddr = pci_resource_start (pdev, 0);
-#else
-        ioaddr = pci_resource_start (pdev, 1);
-        ioaddr = (long) pci_ioremap_bar(pdev, 1);
+        ioaddr = pci_iomap(pdev, EPIC_BAR, 0);
         if (!ioaddr) {
                 dev_err(&pdev->dev, "ioremap failed\n");
                 goto err_out_free_netdev;
         }
-#endif
 
         pci_set_drvdata(pdev, dev);
         ep = netdev_priv(dev);
+        ep->ioaddr = ioaddr;
         ep->mii.dev = dev;
         ep->mii.mdio_read = mdio_read;
         ep->mii.mdio_write = mdio_write;
@@ -409,34 +402,31 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
                         duplex = full_duplex[card_idx];
         }
 
-        dev->base_addr = ioaddr;
-        dev->irq = irq;
-
         spin_lock_init(&ep->lock);
         spin_lock_init(&ep->napi_lock);
         ep->reschedule_in_poll = 0;
 
         /* Bring the chip out of low-power mode. */
-        outl(0x4200, ioaddr + GENCTL);
+        ew32(GENCTL, 0x4200);
         /* Magic?!  If we don't set this bit the MII interface won't work. */
         /* This magic is documented in SMSC app note 7.15 */
         for (i = 16; i > 0; i--)
-                outl(0x0008, ioaddr + TEST1);
+                ew32(TEST1, 0x0008);
 
         /* Turn on the MII transceiver. */
-        outl(0x12, ioaddr + MIICfg);
+        ew32(MIICfg, 0x12);
         if (chip_idx == 1)
-                outl((inl(ioaddr + NVCTL) & ~0x003C) | 0x4800, ioaddr + NVCTL);
-        outl(0x0200, ioaddr + GENCTL);
+                ew32(NVCTL, (er32(NVCTL) & ~0x003c) | 0x4800);
+        ew32(GENCTL, 0x0200);
 
         /* Note: the '175 does not have a serial EEPROM. */
         for (i = 0; i < 3; i++)
-                ((__le16 *)dev->dev_addr)[i] = cpu_to_le16(inw(ioaddr + LAN0 + i*4));
+                ((__le16 *)dev->dev_addr)[i] = cpu_to_le16(er16(LAN0 + i*4));
 
         if (debug > 2) {
                 dev_printk(KERN_DEBUG, &pdev->dev, "EEPROM contents:\n");
                 for (i = 0; i < 64; i++)
-                        printk(" %4.4x%s", read_eeprom(ioaddr, i),
+                        printk(" %4.4x%s", read_eeprom(ep, i),
                                    i % 16 == 15 ? "\n" : "");
         }
 
@@ -481,8 +471,8 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
 
         /* Turn off the MII xcvr (175 only!), leave the chip in low-power mode. */
         if (ep->chip_flags & MII_PWRDWN)
-                outl(inl(ioaddr + NVCTL) & ~0x483C, ioaddr + NVCTL);
-        outl(0x0008, ioaddr + GENCTL);
+                ew32(NVCTL, er32(NVCTL) & ~0x483c);
+        ew32(GENCTL, 0x0008);
 
         /* The lower four bits are the media type. */
         if (duplex) {
@@ -501,8 +491,9 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
         if (ret < 0)
                 goto err_out_unmap_rx;
 
-        printk(KERN_INFO "%s: %s at %#lx, IRQ %d, %pM\n",
-               dev->name, pci_id_tbl[chip_idx].name, ioaddr, dev->irq,
+        printk(KERN_INFO "%s: %s at %lx, IRQ %d, %pM\n",
+               dev->name, pci_id_tbl[chip_idx].name,
+               (long)pci_resource_start(pdev, EPIC_BAR), pdev->irq,
                dev->dev_addr);
 
 out:
@@ -513,10 +504,8 @@ err_out_unmap_rx:
 err_out_unmap_tx:
         pci_free_consistent(pdev, TX_TOTAL_SIZE, ep->tx_ring, ep->tx_ring_dma);
 err_out_iounmap:
-#ifndef USE_IO_OPS
-        iounmap(ioaddr);
+        pci_iounmap(pdev, ioaddr);
 err_out_free_netdev:
-#endif
         free_netdev(dev);
 err_out_free_res:
         pci_release_regions(pdev);
@@ -540,7 +529,7 @@ err_out_disable:
    This serves to flush the operation to the PCI bus.
  */
 
-#define eeprom_delay()  inl(ee_addr)
+#define eeprom_delay()  er32(EECTL)
 
 /* The EEPROM commands include the alway-set leading bit. */
 #define EE_WRITE_CMD    (5 << 6)
@@ -550,67 +539,67 @@ err_out_disable:
 
 static void epic_disable_int(struct net_device *dev, struct epic_private *ep)
 {
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = ep->ioaddr;
 
-        outl(0x00000000, ioaddr + INTMASK);
+        ew32(INTMASK, 0x00000000);
 }
 
-static inline void __epic_pci_commit(long ioaddr)
+static inline void __epic_pci_commit(void __iomem *ioaddr)
 {
 #ifndef USE_IO_OPS
-        inl(ioaddr + INTMASK);
+        er32(INTMASK);
 #endif
 }
 
 static inline void epic_napi_irq_off(struct net_device *dev,
                                      struct epic_private *ep)
 {
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = ep->ioaddr;
 
-        outl(ep->irq_mask & ~EpicNapiEvent, ioaddr + INTMASK);
+        ew32(INTMASK, ep->irq_mask & ~EpicNapiEvent);
         __epic_pci_commit(ioaddr);
 }
 
 static inline void epic_napi_irq_on(struct net_device *dev,
                                     struct epic_private *ep)
 {
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = ep->ioaddr;
 
         /* No need to commit possible posted write */
-        outl(ep->irq_mask | EpicNapiEvent, ioaddr + INTMASK);
+        ew32(INTMASK, ep->irq_mask | EpicNapiEvent);
 }
 
-static int __devinit read_eeprom(long ioaddr, int location)
+static int __devinit read_eeprom(struct epic_private *ep, int location)
 {
+        void __iomem *ioaddr = ep->ioaddr;
         int i;
         int retval = 0;
-        long ee_addr = ioaddr + EECTL;
         int read_cmd = location |
-                (inl(ee_addr) & 0x40 ? EE_READ64_CMD : EE_READ256_CMD);
+                (er32(EECTL) & 0x40 ? EE_READ64_CMD : EE_READ256_CMD);
 
-        outl(EE_ENB & ~EE_CS, ee_addr);
-        outl(EE_ENB, ee_addr);
+        ew32(EECTL, EE_ENB & ~EE_CS);
+        ew32(EECTL, EE_ENB);
 
         /* Shift the read command bits out. */
         for (i = 12; i >= 0; i--) {
                 short dataval = (read_cmd & (1 << i)) ? EE_WRITE_1 : EE_WRITE_0;
-                outl(EE_ENB | dataval, ee_addr);
+                ew32(EECTL, EE_ENB | dataval);
                 eeprom_delay();
-                outl(EE_ENB | dataval | EE_SHIFT_CLK, ee_addr);
+                ew32(EECTL, EE_ENB | dataval | EE_SHIFT_CLK);
                 eeprom_delay();
         }
-        outl(EE_ENB, ee_addr);
+        ew32(EECTL, EE_ENB);
 
         for (i = 16; i > 0; i--) {
-                outl(EE_ENB | EE_SHIFT_CLK, ee_addr);
+                ew32(EECTL, EE_ENB | EE_SHIFT_CLK);
                 eeprom_delay();
-                retval = (retval << 1) | ((inl(ee_addr) & EE_DATA_READ) ? 1 : 0);
-                outl(EE_ENB, ee_addr);
+                retval = (retval << 1) | ((er32(EECTL) & EE_DATA_READ) ? 1 : 0);
+                ew32(EECTL, EE_ENB);
                 eeprom_delay();
         }
 
         /* Terminate the EEPROM access. */
-        outl(EE_ENB & ~EE_CS, ee_addr);
+        ew32(EECTL, EE_ENB & ~EE_CS);
         return retval;
 }
 
@@ -618,22 +607,23 @@ static int __devinit read_eeprom(long ioaddr, int location)
 #define MII_WRITEOP             2
 static int mdio_read(struct net_device *dev, int phy_id, int location)
 {
-        long ioaddr = dev->base_addr;
+        struct epic_private *ep = netdev_priv(dev);
+        void __iomem *ioaddr = ep->ioaddr;
         int read_cmd = (phy_id << 9) | (location << 4) | MII_READOP;
         int i;
 
-        outl(read_cmd, ioaddr + MIICtrl);
+        ew32(MIICtrl, read_cmd);
         /* Typical operation takes 25 loops. */
         for (i = 400; i > 0; i--) {
                 barrier();
-                if ((inl(ioaddr + MIICtrl) & MII_READOP) == 0) {
+                if ((er32(MIICtrl) & MII_READOP) == 0) {
                         /* Work around read failure bug. */
                         if (phy_id == 1 && location < 6 &&
-                            inw(ioaddr + MIIData) == 0xffff) {
-                                outl(read_cmd, ioaddr + MIICtrl);
+                            er16(MIIData) == 0xffff) {
+                                ew32(MIICtrl, read_cmd);
                                 continue;
                         }
-                        return inw(ioaddr + MIIData);
+                        return er16(MIIData);
                 }
         }
         return 0xffff;
@@ -641,14 +631,15 @@ static int mdio_read(struct net_device *dev, int phy_id, int location)
 
 static void mdio_write(struct net_device *dev, int phy_id, int loc, int value)
 {
-        long ioaddr = dev->base_addr;
+        struct epic_private *ep = netdev_priv(dev);
+        void __iomem *ioaddr = ep->ioaddr;
         int i;
 
-        outw(value, ioaddr + MIIData);
-        outl((phy_id << 9) | (loc << 4) | MII_WRITEOP, ioaddr + MIICtrl);
+        ew16(MIIData, value);
+        ew32(MIICtrl, (phy_id << 9) | (loc << 4) | MII_WRITEOP);
         for (i = 10000; i > 0; i--) {
                 barrier();
-                if ((inl(ioaddr + MIICtrl) & MII_WRITEOP) == 0)
+                if ((er32(MIICtrl) & MII_WRITEOP) == 0)
                         break;
         }
 }
@@ -657,25 +648,26 @@ static void mdio_write(struct net_device *dev, int phy_id, int loc, int value)
 static int epic_open(struct net_device *dev)
 {
         struct epic_private *ep = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
-        int i;
-        int retval;
+        void __iomem *ioaddr = ep->ioaddr;
+        const int irq = ep->pci_dev->irq;
+        int rc, i;
 
         /* Soft reset the chip. */
-        outl(0x4001, ioaddr + GENCTL);
+        ew32(GENCTL, 0x4001);
 
         napi_enable(&ep->napi);
-        if ((retval = request_irq(dev->irq, epic_interrupt, IRQF_SHARED, dev->name, dev))) {
+        rc = request_irq(irq, epic_interrupt, IRQF_SHARED, dev->name, dev);
+        if (rc) {
                 napi_disable(&ep->napi);
-                return retval;
+                return rc;
         }
 
         epic_init_ring(dev);
 
-        outl(0x4000, ioaddr + GENCTL);
+        ew32(GENCTL, 0x4000);
         /* This magic is documented in SMSC app note 7.15 */
         for (i = 16; i > 0; i--)
-                outl(0x0008, ioaddr + TEST1);
+                ew32(TEST1, 0x0008);
 
         /* Pull the chip out of low-power mode, enable interrupts, and set for
            PCI read multiple.  The MIIcfg setting and strange write order are
@@ -683,29 +675,29 @@ static int epic_open(struct net_device *dev)
            wiring on the Ositech CardBus card.
         */
 #if 0
-        outl(dev->if_port == 1 ? 0x13 : 0x12, ioaddr + MIICfg);
+        ew32(MIICfg, dev->if_port == 1 ? 0x13 : 0x12);
 #endif
         if (ep->chip_flags & MII_PWRDWN)
-                outl((inl(ioaddr + NVCTL) & ~0x003C) | 0x4800, ioaddr + NVCTL);
+                ew32(NVCTL, (er32(NVCTL) & ~0x003c) | 0x4800);
 
         /* Tell the chip to byteswap descriptors on big-endian hosts */
 #ifdef __BIG_ENDIAN
-        outl(0x4432 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL);
-        inl(ioaddr + GENCTL);
-        outl(0x0432 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL);
+        ew32(GENCTL, 0x4432 | (RX_FIFO_THRESH << 8));
+        er32(GENCTL);
+        ew32(GENCTL, 0x0432 | (RX_FIFO_THRESH << 8));
 #else
-        outl(0x4412 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL);
-        inl(ioaddr + GENCTL);
-        outl(0x0412 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL);
+        ew32(GENCTL, 0x4412 | (RX_FIFO_THRESH << 8));
+        er32(GENCTL);
+        ew32(GENCTL, 0x0412 | (RX_FIFO_THRESH << 8));
 #endif
 
         udelay(20); /* Looks like EPII needs that if you want reliable RX init. FIXME: pci posting bug? */
 
         for (i = 0; i < 3; i++)
-                outl(le16_to_cpu(((__le16*)dev->dev_addr)[i]), ioaddr + LAN0 + i*4);
+                ew32(LAN0 + i*4, le16_to_cpu(((__le16*)dev->dev_addr)[i]));
 
         ep->tx_threshold = TX_FIFO_THRESH;
-        outl(ep->tx_threshold, ioaddr + TxThresh);
+        ew32(TxThresh, ep->tx_threshold);
 
         if (media2miictl[dev->if_port & 15]) {
                 if (ep->mii_phy_cnt)
@@ -731,26 +723,27 @@ static int epic_open(struct net_device *dev)
                 }
         }
 
-        outl(ep->mii.full_duplex ? 0x7F : 0x79, ioaddr + TxCtrl);
-        outl(ep->rx_ring_dma, ioaddr + PRxCDAR);
-        outl(ep->tx_ring_dma, ioaddr + PTxCDAR);
+        ew32(TxCtrl, ep->mii.full_duplex ? 0x7f : 0x79);
+        ew32(PRxCDAR, ep->rx_ring_dma);
+        ew32(PTxCDAR, ep->tx_ring_dma);
 
         /* Start the chip's Rx process. */
         set_rx_mode(dev);
-        outl(StartRx | RxQueued, ioaddr + COMMAND);
+        ew32(COMMAND, StartRx | RxQueued);
 
         netif_start_queue(dev);
 
         /* Enable interrupts by setting the interrupt mask. */
-        outl((ep->chip_flags & TYPE2_INTR ? PCIBusErr175 : PCIBusErr170)
-                 | CntFull | TxUnderrun
-                 | RxError | RxHeader | EpicNapiEvent, ioaddr + INTMASK);
-
-        if (debug > 1)
-                printk(KERN_DEBUG "%s: epic_open() ioaddr %lx IRQ %d status %4.4x "
-                           "%s-duplex.\n",
-                           dev->name, ioaddr, dev->irq, (int)inl(ioaddr + GENCTL),
-                           ep->mii.full_duplex ? "full" : "half");
+        ew32(INTMASK, RxError | RxHeader | EpicNapiEvent | CntFull |
+             ((ep->chip_flags & TYPE2_INTR) ? PCIBusErr175 : PCIBusErr170) |
+             TxUnderrun);
+
+        if (debug > 1) {
+                printk(KERN_DEBUG "%s: epic_open() ioaddr %p IRQ %d "
+                       "status %4.4x %s-duplex.\n",
+                       dev->name, ioaddr, irq, er32(GENCTL),
+                       ep->mii.full_duplex ? "full" : "half");
+        }
 
         /* Set the timer to switch to check for link beat and perhaps switch
            to an alternate media type. */
@@ -760,27 +753,29 @@ static int epic_open(struct net_device *dev)
         ep->timer.function = epic_timer;                                /* timer handler */
         add_timer(&ep->timer);
 
-        return 0;
+        return rc;
 }
 
 /* Reset the chip to recover from a PCI transaction error.
    This may occur at interrupt time. */
 static void epic_pause(struct net_device *dev)
 {
-        long ioaddr = dev->base_addr;
+        struct net_device_stats *stats = &dev->stats;
+        struct epic_private *ep = netdev_priv(dev);
+        void __iomem *ioaddr = ep->ioaddr;
 
         netif_stop_queue (dev);
 
         /* Disable interrupts by clearing the interrupt mask. */
-        outl(0x00000000, ioaddr + INTMASK);
+        ew32(INTMASK, 0x00000000);
         /* Stop the chip's Tx and Rx DMA processes. */
-        outw(StopRx | StopTxDMA | StopRxDMA, ioaddr + COMMAND);
+        ew16(COMMAND, StopRx | StopTxDMA | StopRxDMA);
 
         /* Update the error counts. */
-        if (inw(ioaddr + COMMAND) != 0xffff) {
-                dev->stats.rx_missed_errors += inb(ioaddr + MPCNT);
-                dev->stats.rx_frame_errors += inb(ioaddr + ALICNT);
-                dev->stats.rx_crc_errors += inb(ioaddr + CRCCNT);
+        if (er16(COMMAND) != 0xffff) {
+                stats->rx_missed_errors += er8(MPCNT);
+                stats->rx_frame_errors  += er8(ALICNT);
+                stats->rx_crc_errors    += er8(CRCCNT);
         }
 
         /* Remove the packets on the Rx queue. */
@@ -789,12 +784,12 @@ static void epic_pause(struct net_device *dev)
 
 static void epic_restart(struct net_device *dev)
 {
-        long ioaddr = dev->base_addr;
         struct epic_private *ep = netdev_priv(dev);
+        void __iomem *ioaddr = ep->ioaddr;
         int i;
 
         /* Soft reset the chip. */
-        outl(0x4001, ioaddr + GENCTL);
+        ew32(GENCTL, 0x4001);
 
         printk(KERN_DEBUG "%s: Restarting the EPIC chip, Rx %d/%d Tx %d/%d.\n",
                    dev->name, ep->cur_rx, ep->dirty_rx, ep->dirty_tx, ep->cur_tx);
@@ -802,47 +797,46 @@ static void epic_restart(struct net_device *dev)
 
         /* This magic is documented in SMSC app note 7.15 */
         for (i = 16; i > 0; i--)
-                outl(0x0008, ioaddr + TEST1);
+                ew32(TEST1, 0x0008);
 
 #ifdef __BIG_ENDIAN
-        outl(0x0432 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL);
+        ew32(GENCTL, 0x0432 | (RX_FIFO_THRESH << 8));
 #else
-        outl(0x0412 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL);
+        ew32(GENCTL, 0x0412 | (RX_FIFO_THRESH << 8));
 #endif
-        outl(dev->if_port == 1 ? 0x13 : 0x12, ioaddr + MIICfg);
+        ew32(MIICfg, dev->if_port == 1 ? 0x13 : 0x12);
         if (ep->chip_flags & MII_PWRDWN)
-                outl((inl(ioaddr + NVCTL) & ~0x003C) | 0x4800, ioaddr + NVCTL);
+                ew32(NVCTL, (er32(NVCTL) & ~0x003c) | 0x4800);
 
         for (i = 0; i < 3; i++)
-                outl(le16_to_cpu(((__le16*)dev->dev_addr)[i]), ioaddr + LAN0 + i*4);
+                ew32(LAN0 + i*4, le16_to_cpu(((__le16*)dev->dev_addr)[i]));
 
         ep->tx_threshold = TX_FIFO_THRESH;
-        outl(ep->tx_threshold, ioaddr + TxThresh);
-        outl(ep->mii.full_duplex ? 0x7F : 0x79, ioaddr + TxCtrl);
-        outl(ep->rx_ring_dma + (ep->cur_rx%RX_RING_SIZE)*
-                sizeof(struct epic_rx_desc), ioaddr + PRxCDAR);
-        outl(ep->tx_ring_dma + (ep->dirty_tx%TX_RING_SIZE)*
-                 sizeof(struct epic_tx_desc), ioaddr + PTxCDAR);
+        ew32(TxThresh, ep->tx_threshold);
+        ew32(TxCtrl, ep->mii.full_duplex ? 0x7f : 0x79);
+        ew32(PRxCDAR, ep->rx_ring_dma +
+             (ep->cur_rx % RX_RING_SIZE) * sizeof(struct epic_rx_desc));
+        ew32(PTxCDAR, ep->tx_ring_dma +
+             (ep->dirty_tx % TX_RING_SIZE) * sizeof(struct epic_tx_desc));
 
         /* Start the chip's Rx process. */
         set_rx_mode(dev);
-        outl(StartRx | RxQueued, ioaddr + COMMAND);
+        ew32(COMMAND, StartRx | RxQueued);
 
         /* Enable interrupts by setting the interrupt mask. */
-        outl((ep->chip_flags & TYPE2_INTR ? PCIBusErr175 : PCIBusErr170)
-                 | CntFull | TxUnderrun
-                 | RxError | RxHeader | EpicNapiEvent, ioaddr + INTMASK);
+        ew32(INTMASK, RxError | RxHeader | EpicNapiEvent | CntFull |
+             ((ep->chip_flags & TYPE2_INTR) ? PCIBusErr175 : PCIBusErr170) |
+             TxUnderrun);
 
         printk(KERN_DEBUG "%s: epic_restart() done, cmd status %4.4x, ctl %4.4x"
                    " interrupt %4.4x.\n",
-                   dev->name, (int)inl(ioaddr + COMMAND), (int)inl(ioaddr + GENCTL),
-                   (int)inl(ioaddr + INTSTAT));
+                   dev->name, er32(COMMAND), er32(GENCTL), er32(INTSTAT));
 }
 
 static void check_media(struct net_device *dev)
 {
         struct epic_private *ep = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = ep->ioaddr;
         int mii_lpa = ep->mii_phy_cnt ? mdio_read(dev, ep->phys[0], MII_LPA) : 0;
         int negotiated = mii_lpa & ep->mii.advertising;
         int duplex = (negotiated & 0x0100) || (negotiated & 0x01C0) == 0x0040;
@@ -856,7 +850,7 @@ static void check_media(struct net_device *dev)
                 printk(KERN_INFO "%s: Setting %s-duplex based on MII #%d link"
                            " partner capability of %4.4x.\n", dev->name,
                            ep->mii.full_duplex ? "full" : "half", ep->phys[0], mii_lpa);
-                outl(ep->mii.full_duplex ? 0x7F : 0x79, ioaddr + TxCtrl);
+                ew32(TxCtrl, ep->mii.full_duplex ? 0x7F : 0x79);
         }
 }
 
@@ -864,16 +858,15 @@ static void epic_timer(unsigned long data)
 {
         struct net_device *dev = (struct net_device *)data;
         struct epic_private *ep = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = ep->ioaddr;
         int next_tick = 5*HZ;
 
         if (debug > 3) {
                 printk(KERN_DEBUG "%s: Media monitor tick, Tx status %8.8x.\n",
-                           dev->name, (int)inl(ioaddr + TxSTAT));
+                       dev->name, er32(TxSTAT));
                 printk(KERN_DEBUG "%s: Other registers are IntMask %4.4x "
-                           "IntStatus %4.4x RxStatus %4.4x.\n",
-                           dev->name, (int)inl(ioaddr + INTMASK),
-                           (int)inl(ioaddr + INTSTAT), (int)inl(ioaddr + RxSTAT));
+                       "IntStatus %4.4x RxStatus %4.4x.\n", dev->name,
+                       er32(INTMASK), er32(INTSTAT), er32(RxSTAT));
         }
 
         check_media(dev);
@@ -885,23 +878,22 @@ static void epic_timer(unsigned long data)
 static void epic_tx_timeout(struct net_device *dev)
 {
         struct epic_private *ep = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = ep->ioaddr;
 
         if (debug > 0) {
                 printk(KERN_WARNING "%s: Transmit timeout using MII device, "
-                           "Tx status %4.4x.\n",
-                           dev->name, (int)inw(ioaddr + TxSTAT));
+                       "Tx status %4.4x.\n", dev->name, er16(TxSTAT));
                 if (debug > 1) {
                         printk(KERN_DEBUG "%s: Tx indices: dirty_tx %d, cur_tx %d.\n",
                                    dev->name, ep->dirty_tx, ep->cur_tx);
                 }
         }
-        if (inw(ioaddr + TxSTAT) & 0x10) {              /* Tx FIFO underflow. */
+        if (er16(TxSTAT) & 0x10) {              /* Tx FIFO underflow. */
                 dev->stats.tx_fifo_errors++;
-                outl(RestartTx, ioaddr + COMMAND);
+                ew32(COMMAND, RestartTx);
         } else {
                 epic_restart(dev);
-                outl(TxQueued, dev->base_addr + COMMAND);
+                ew32(COMMAND, TxQueued);
         }
 
         dev->trans_start = jiffies; /* prevent tx timeout */
@@ -959,6 +951,7 @@ static void epic_init_ring(struct net_device *dev)
 static netdev_tx_t epic_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct epic_private *ep = netdev_priv(dev);
+        void __iomem *ioaddr = ep->ioaddr;
         int entry, free_count;
         u32 ctrl_word;
         unsigned long flags;
@@ -999,13 +992,12 @@ static netdev_tx_t epic_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         spin_unlock_irqrestore(&ep->lock, flags);
         /* Trigger an immediate transmit demand. */
-        outl(TxQueued, dev->base_addr + COMMAND);
+        ew32(COMMAND, TxQueued);
 
         if (debug > 4)
                 printk(KERN_DEBUG "%s: Queued Tx packet size %d to slot %d, "
-                           "flag %2.2x Tx status %8.8x.\n",
-                           dev->name, (int)skb->len, entry, ctrl_word,
-                           (int)inl(dev->base_addr + TxSTAT));
+                       "flag %2.2x Tx status %8.8x.\n", dev->name, skb->len,
+                       entry, ctrl_word, er32(TxSTAT));
 
         return NETDEV_TX_OK;
 }
@@ -1086,18 +1078,17 @@ static irqreturn_t epic_interrupt(int irq, void *dev_instance)
 {
         struct net_device *dev = dev_instance;
         struct epic_private *ep = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = ep->ioaddr;
         unsigned int handled = 0;
         int status;
 
-        status = inl(ioaddr + INTSTAT);
+        status = er32(INTSTAT);
         /* Acknowledge all of the current interrupt sources ASAP. */
-        outl(status & EpicNormalEvent, ioaddr + INTSTAT);
+        ew32(INTSTAT, status & EpicNormalEvent);
 
         if (debug > 4) {
                 printk(KERN_DEBUG "%s: Interrupt, status=%#8.8x new "
-                                   "intstat=%#8.8x.\n", dev->name, status,
-                                   (int)inl(ioaddr + INTSTAT));
+                       "intstat=%#8.8x.\n", dev->name, status, er32(INTSTAT));
         }
 
         if ((status & IntrSummary) == 0)
@@ -1118,19 +1109,21 @@ static irqreturn_t epic_interrupt(int irq, void *dev_instance)
 
         /* Check uncommon events all at once. */
         if (status & (CntFull | TxUnderrun | PCIBusErr170 | PCIBusErr175)) {
+                struct net_device_stats *stats = &dev->stats;
+
                 if (status == EpicRemoved)
                         goto out;
 
                 /* Always update the error counts to avoid overhead later. */
-                dev->stats.rx_missed_errors += inb(ioaddr + MPCNT);
-                dev->stats.rx_frame_errors += inb(ioaddr + ALICNT);
-                dev->stats.rx_crc_errors += inb(ioaddr + CRCCNT);
+                stats->rx_missed_errors += er8(MPCNT);
+                stats->rx_frame_errors  += er8(ALICNT);
+                stats->rx_crc_errors    += er8(CRCCNT);
 
                 if (status & TxUnderrun) { /* Tx FIFO underflow. */
-                        dev->stats.tx_fifo_errors++;
-                        outl(ep->tx_threshold += 128, ioaddr + TxThresh);
+                        stats->tx_fifo_errors++;
+                        ew32(TxThresh, ep->tx_threshold += 128);
                         /* Restart the transmit process. */
-                        outl(RestartTx, ioaddr + COMMAND);
+                        ew32(COMMAND, RestartTx);
                 }
                 if (status & PCIBusErr170) {
                         printk(KERN_ERR "%s: PCI Bus Error! status %4.4x.\n",
@@ -1139,7 +1132,7 @@ static irqreturn_t epic_interrupt(int irq, void *dev_instance)
                         epic_restart(dev);
                 }
                 /* Clear all error sources. */
-                outl(status & 0x7f18, ioaddr + INTSTAT);
+                ew32(INTSTAT, status & 0x7f18);
         }
 
 out:
@@ -1248,17 +1241,17 @@ static int epic_rx(struct net_device *dev, int budget)
 
 static void epic_rx_err(struct net_device *dev, struct epic_private *ep)
 {
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = ep->ioaddr;
         int status;
 
-        status = inl(ioaddr + INTSTAT);
+        status = er32(INTSTAT);
 
         if (status == EpicRemoved)
                 return;
         if (status & RxOverflow)        /* Missed a Rx frame. */
                 dev->stats.rx_errors++;
         if (status & (RxOverflow | RxFull))
-                outw(RxQueued, ioaddr + COMMAND);
+                ew16(COMMAND, RxQueued);
 }
 
 static int epic_poll(struct napi_struct *napi, int budget)
@@ -1266,7 +1259,7 @@ static int epic_poll(struct napi_struct *napi, int budget)
         struct epic_private *ep = container_of(napi, struct epic_private, napi);
         struct net_device *dev = ep->mii.dev;
         int work_done = 0;
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = ep->ioaddr;
 
 rx_action:
 
@@ -1287,7 +1280,7 @@ rx_action:
                 more = ep->reschedule_in_poll;
                 if (!more) {
                         __napi_complete(napi);
-                        outl(EpicNapiEvent, ioaddr + INTSTAT);
+                        ew32(INTSTAT, EpicNapiEvent);
                         epic_napi_irq_on(dev, ep);
                 } else
                         ep->reschedule_in_poll--;
@@ -1303,8 +1296,9 @@ rx_action:
 
 static int epic_close(struct net_device *dev)
 {
-        long ioaddr = dev->base_addr;
         struct epic_private *ep = netdev_priv(dev);
+        struct pci_dev *pdev = ep->pci_dev;
+        void __iomem *ioaddr = ep->ioaddr;
         struct sk_buff *skb;
         int i;
 
@@ -1313,13 +1307,13 @@ static int epic_close(struct net_device *dev)
 
         if (debug > 1)
                 printk(KERN_DEBUG "%s: Shutting down ethercard, status was %2.2x.\n",
-                           dev->name, (int)inl(ioaddr + INTSTAT));
+                       dev->name, er32(INTSTAT));
 
         del_timer_sync(&ep->timer);
 
         epic_disable_int(dev, ep);
 
-        free_irq(dev->irq, dev);
+        free_irq(pdev->irq, dev);
 
         epic_pause(dev);
 
@@ -1330,7 +1324,7 @@ static int epic_close(struct net_device *dev)
                 ep->rx_ring[i].rxstatus = 0;            /* Not owned by Epic chip. */
                 ep->rx_ring[i].buflength = 0;
                 if (skb) {
-                        pci_unmap_single(ep->pci_dev, ep->rx_ring[i].bufaddr,
+                        pci_unmap_single(pdev, ep->rx_ring[i].bufaddr,
                                          ep->rx_buf_sz, PCI_DMA_FROMDEVICE);
                         dev_kfree_skb(skb);
                 }
@@ -1341,26 +1335,28 @@ static int epic_close(struct net_device *dev)
                 ep->tx_skbuff[i] = NULL;
                 if (!skb)
                         continue;
-                pci_unmap_single(ep->pci_dev, ep->tx_ring[i].bufaddr,
-                                 skb->len, PCI_DMA_TODEVICE);
+                pci_unmap_single(pdev, ep->tx_ring[i].bufaddr, skb->len,
+                                 PCI_DMA_TODEVICE);
                 dev_kfree_skb(skb);
         }
 
         /* Green! Leave the chip in low-power mode. */
-        outl(0x0008, ioaddr + GENCTL);
+        ew32(GENCTL, 0x0008);
 
         return 0;
 }
 
 static struct net_device_stats *epic_get_stats(struct net_device *dev)
 {
-        long ioaddr = dev->base_addr;
+        struct epic_private *ep = netdev_priv(dev);
+        void __iomem *ioaddr = ep->ioaddr;
 
         if (netif_running(dev)) {
-                /* Update the error counts. */
-                dev->stats.rx_missed_errors += inb(ioaddr + MPCNT);
-                dev->stats.rx_frame_errors += inb(ioaddr + ALICNT);
-                dev->stats.rx_crc_errors += inb(ioaddr + CRCCNT);
+                struct net_device_stats *stats = &dev->stats;
+
+                stats->rx_missed_errors += er8(MPCNT);
+                stats->rx_frame_errors  += er8(ALICNT);
+                stats->rx_crc_errors    += er8(CRCCNT);
         }
 
         return &dev->stats;
@@ -1373,13 +1369,13 @@ static struct net_device_stats *epic_get_stats(struct net_device *dev)
 
 static void set_rx_mode(struct net_device *dev)
 {
-        long ioaddr = dev->base_addr;
         struct epic_private *ep = netdev_priv(dev);
+        void __iomem *ioaddr = ep->ioaddr;
         unsigned char mc_filter[8];              /* Multicast hash filter */
         int i;
 
         if (dev->flags & IFF_PROMISC) {                 /* Set promiscuous. */
-                outl(0x002C, ioaddr + RxCtrl);
+                ew32(RxCtrl, 0x002c);
                 /* Unconditionally log net taps. */
                 memset(mc_filter, 0xff, sizeof(mc_filter));
         } else if ((!netdev_mc_empty(dev)) || (dev->flags & IFF_ALLMULTI)) {
@@ -1387,9 +1383,9 @@ static void set_rx_mode(struct net_device *dev)
                    is never enabled. */
                 /* Too many to filter perfectly -- accept all multicasts. */
                 memset(mc_filter, 0xff, sizeof(mc_filter));
-                outl(0x000C, ioaddr + RxCtrl);
+                ew32(RxCtrl, 0x000c);
         } else if (netdev_mc_empty(dev)) {
-                outl(0x0004, ioaddr + RxCtrl);
+                ew32(RxCtrl, 0x0004);
                 return;
         } else {                                        /* Never executed, for now. */
                 struct netdev_hw_addr *ha;
@@ -1404,7 +1400,7 @@ static void set_rx_mode(struct net_device *dev)
         /* ToDo: perhaps we need to stop the Tx and Rx process here? */
         if (memcmp(mc_filter, ep->mc_filter, sizeof(mc_filter))) {
                 for (i = 0; i < 4; i++)
-                        outw(((u16 *)mc_filter)[i], ioaddr + MC0 + i*4);
+                        ew16(MC0 + i*4, ((u16 *)mc_filter)[i]);
                 memcpy(ep->mc_filter, mc_filter, sizeof(mc_filter));
         }
 }
@@ -1466,22 +1462,26 @@ static void netdev_set_msglevel(struct net_device *dev, u32 value)
 
 static int ethtool_begin(struct net_device *dev)
 {
-        unsigned long ioaddr = dev->base_addr;
+        struct epic_private *ep = netdev_priv(dev);
+        void __iomem *ioaddr = ep->ioaddr;
+
         /* power-up, if interface is down */
-        if (! netif_running(dev)) {
-                outl(0x0200, ioaddr + GENCTL);
-                outl((inl(ioaddr + NVCTL) & ~0x003C) | 0x4800, ioaddr + NVCTL);
+        if (!netif_running(dev)) {
+                ew32(GENCTL, 0x0200);
+                ew32(NVCTL, (er32(NVCTL) & ~0x003c) | 0x4800);
         }
         return 0;
 }
 
 static void ethtool_complete(struct net_device *dev)
 {
-        unsigned long ioaddr = dev->base_addr;
+        struct epic_private *ep = netdev_priv(dev);
+        void __iomem *ioaddr = ep->ioaddr;
+
         /* power-down, if interface is down */
-        if (! netif_running(dev)) {
-                outl(0x0008, ioaddr + GENCTL);
-                outl((inl(ioaddr + NVCTL) & ~0x483C) | 0x0000, ioaddr + NVCTL);
+        if (!netif_running(dev)) {
+                ew32(GENCTL, 0x0008);
+                ew32(NVCTL, (er32(NVCTL) & ~0x483c) | 0x0000);
         }
 }
 
@@ -1500,14 +1500,14 @@ static const struct ethtool_ops netdev_ethtool_ops = {
 static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
         struct epic_private *np = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = np->ioaddr;
         struct mii_ioctl_data *data = if_mii(rq);
         int rc;
 
         /* power-up, if interface is down */
         if (! netif_running(dev)) {
-                outl(0x0200, ioaddr + GENCTL);
-                outl((inl(ioaddr + NVCTL) & ~0x003C) | 0x4800, ioaddr + NVCTL);
+                ew32(GENCTL, 0x0200);
+                ew32(NVCTL, (er32(NVCTL) & ~0x003c) | 0x4800);
         }
 
         /* all non-ethtool ioctls (the SIOC[GS]MIIxxx ioctls) */
@@ -1517,14 +1517,14 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 
         /* power-down, if interface is down */
         if (! netif_running(dev)) {
-                outl(0x0008, ioaddr + GENCTL);
-                outl((inl(ioaddr + NVCTL) & ~0x483C) | 0x0000, ioaddr + NVCTL);
+                ew32(GENCTL, 0x0008);
+                ew32(NVCTL, (er32(NVCTL) & ~0x483c) | 0x0000);
         }
         return rc;
 }
 
 
-static void __devexit epic_remove_one (struct pci_dev *pdev)
+static void __devexit epic_remove_one(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
         struct epic_private *ep = netdev_priv(dev);
@@ -1532,9 +1532,7 @@ static void __devexit epic_remove_one (struct pci_dev *pdev)
         pci_free_consistent(pdev, TX_TOTAL_SIZE, ep->tx_ring, ep->tx_ring_dma);
         pci_free_consistent(pdev, RX_TOTAL_SIZE, ep->rx_ring, ep->rx_ring_dma);
         unregister_netdev(dev);
-#ifndef USE_IO_OPS
-        iounmap((void*) dev->base_addr);
-#endif
+        pci_iounmap(pdev, ep->ioaddr);
         pci_release_regions(pdev);
         free_netdev(dev);
         pci_disable_device(pdev);
@@ -1548,13 +1546,14 @@ static void __devexit epic_remove_one (struct pci_dev *pdev)
 static int epic_suspend (struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
-        long ioaddr = dev->base_addr;
+        struct epic_private *ep = netdev_priv(dev);
+        void __iomem *ioaddr = ep->ioaddr;
 
         if (!netif_running(dev))
                 return 0;
         epic_pause(dev);
         /* Put the chip into low-power mode. */
-        outl(0x0008, ioaddr + GENCTL);
+        ew32(GENCTL, 0x0008);
         /* pci_power_off(pdev, -1); */
         return 0;
 }
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index 4a6971027076..dab9c6f671ec 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -1166,10 +1166,8 @@ smsc911x_rx_counterrors(struct net_device *dev, unsigned int rxstat)
 
 /* Quickly dumps bad packets */
 static void
-smsc911x_rx_fastforward(struct smsc911x_data *pdata, unsigned int pktbytes)
+smsc911x_rx_fastforward(struct smsc911x_data *pdata, unsigned int pktwords)
 {
-        unsigned int pktwords = (pktbytes + NET_IP_ALIGN + 3) >> 2;
-
         if (likely(pktwords >= 4)) {
                 unsigned int timeout = 500;
                 unsigned int val;
@@ -1233,7 +1231,7 @@ static int smsc911x_poll(struct napi_struct *napi, int budget)
                         continue;
                 }
 
-                skb = netdev_alloc_skb(dev, pktlength + NET_IP_ALIGN);
+                skb = netdev_alloc_skb(dev, pktwords << 2);
                 if (unlikely(!skb)) {
                         SMSC_WARN(pdata, rx_err,
                                   "Unable to allocate skb for rx packet");
@@ -1243,14 +1241,12 @@ static int smsc911x_poll(struct napi_struct *napi, int budget)
                         break;
                 }
 
-                skb->data = skb->head;
-                skb_reset_tail_pointer(skb);
+                pdata->ops->rx_readfifo(pdata,
+                                 (unsigned int *)skb->data, pktwords);
 
                 /* Align IP on 16B boundary */
                 skb_reserve(skb, NET_IP_ALIGN);
                 skb_put(skb, pktlength - 4);
-                pdata->ops->rx_readfifo(pdata,
-                                 (unsigned int *)skb->head, pktwords);
                 skb->protocol = eth_type_trans(skb, dev);
                 skb_checksum_none_assert(skb);
                 netif_receive_skb(skb);
@@ -1565,7 +1561,7 @@ static int smsc911x_open(struct net_device *dev)
         smsc911x_reg_write(pdata, FIFO_INT, temp);
 
         /* set RX Data offset to 2 bytes for alignment */
-        smsc911x_reg_write(pdata, RX_CFG, (2 << 8));
+        smsc911x_reg_write(pdata, RX_CFG, (NET_IP_ALIGN << 8));
 
         /* enable NAPI polling before enabling RX interrupts */
         napi_enable(&pdata->napi);
@@ -2070,6 +2066,7 @@ static const struct ethtool_ops smsc911x_ethtool_ops = {
         .get_eeprom_len = smsc911x_ethtool_get_eeprom_len,
         .get_eeprom = smsc911x_ethtool_get_eeprom,
         .set_eeprom = smsc911x_ethtool_set_eeprom,
+        .get_ts_info = ethtool_op_get_ts_info,
 };
 
 static const struct net_device_ops smsc911x_netdev_ops = {
@@ -2382,7 +2379,6 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)
         SET_NETDEV_DEV(dev, &pdev->dev);
 
         pdata = netdev_priv(dev);
-
         dev->irq = irq_res->start;
         irq_flags = irq_res->flags & IRQF_TRIGGER_MASK;
         pdata->ioaddr = ioremap_nocache(res->start, res_size);
@@ -2446,7 +2442,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)
         if (retval) {
                 SMSC_WARN(pdata, probe,
                           "Unable to claim requested irq: %d", dev->irq);
-                goto out_free_irq;
+                goto out_disable_resources;
         }
 
         retval = register_netdev(dev);
diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c
index 38386478532b..fd33b21f6c96 100644
--- a/drivers/net/ethernet/smsc/smsc9420.c
+++ b/drivers/net/ethernet/smsc/smsc9420.c
@@ -54,7 +54,7 @@ struct smsc9420_ring_info {
 };
 
 struct smsc9420_pdata {
-        void __iomem *base_addr;
+        void __iomem *ioaddr;
         struct pci_dev *pdev;
         struct net_device *dev;
 
@@ -114,13 +114,13 @@ do {	if ((pd)->msg_enable & NETIF_MSG_##TYPE) \
 
 static inline u32 smsc9420_reg_read(struct smsc9420_pdata *pd, u32 offset)
 {
-        return ioread32(pd->base_addr + offset);
+        return ioread32(pd->ioaddr + offset);
 }
 
 static inline void
 smsc9420_reg_write(struct smsc9420_pdata *pd, u32 offset, u32 value)
 {
-        iowrite32(value, pd->base_addr + offset);
+        iowrite32(value, pd->ioaddr + offset);
 }
 
 static inline void smsc9420_pci_flush_write(struct smsc9420_pdata *pd)
@@ -469,6 +469,7 @@ static const struct ethtool_ops smsc9420_ethtool_ops = {
         .set_eeprom = smsc9420_ethtool_set_eeprom,
         .get_regs_len = smsc9420_ethtool_getregslen,
         .get_regs = smsc9420_ethtool_getregs,
+        .get_ts_info = ethtool_op_get_ts_info,
 };
 
 /* Sets the device MAC address to dev_addr */
@@ -659,7 +660,7 @@ static irqreturn_t smsc9420_isr(int irq, void *dev_id)
         ulong flags;
 
         BUG_ON(!pd);
-        BUG_ON(!pd->base_addr);
+        BUG_ON(!pd->ioaddr);
 
         int_cfg = smsc9420_reg_read(pd, INT_CFG);
 
@@ -720,9 +721,12 @@ static irqreturn_t smsc9420_isr(int irq, void *dev_id)
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void smsc9420_poll_controller(struct net_device *dev)
 {
-        disable_irq(dev->irq);
+        struct smsc9420_pdata *pd = netdev_priv(dev);
+        const int irq = pd->pdev->irq;
+
+        disable_irq(irq);
         smsc9420_isr(0, dev);
-        enable_irq(dev->irq);
+        enable_irq(irq);
 }
 #endif /* CONFIG_NET_POLL_CONTROLLER */
 
@@ -759,7 +763,7 @@ static int smsc9420_stop(struct net_device *dev)
         smsc9420_stop_rx(pd);
         smsc9420_free_rx_ring(pd);
 
-        free_irq(dev->irq, pd);
+        free_irq(pd->pdev->irq, pd);
 
         smsc9420_dmac_soft_reset(pd);
 
@@ -1331,15 +1335,12 @@ out:
 
 static int smsc9420_open(struct net_device *dev)
 {
-        struct smsc9420_pdata *pd;
+        struct smsc9420_pdata *pd = netdev_priv(dev);
         u32 bus_mode, mac_cr, dmac_control, int_cfg, dma_intr_ena, int_ctl;
+        const int irq = pd->pdev->irq;
         unsigned long flags;
         int result = 0, timeout;
 
-        BUG_ON(!dev);
-        pd = netdev_priv(dev);
-        BUG_ON(!pd);
-
         if (!is_valid_ether_addr(dev->dev_addr)) {
                 smsc_warn(IFUP, "dev_addr is not a valid MAC address");
                 result = -EADDRNOTAVAIL;
@@ -1358,9 +1359,10 @@ static int smsc9420_open(struct net_device *dev)
         smsc9420_reg_write(pd, INT_STAT, 0xFFFFFFFF);
         smsc9420_pci_flush_write(pd);
 
-        if (request_irq(dev->irq, smsc9420_isr, IRQF_SHARED | IRQF_DISABLED,
-                        DRV_NAME, pd)) {
-                smsc_warn(IFUP, "Unable to use IRQ = %d", dev->irq);
+        result = request_irq(irq, smsc9420_isr, IRQF_SHARED | IRQF_DISABLED,
+                             DRV_NAME, pd);
+        if (result) {
+                smsc_warn(IFUP, "Unable to use IRQ = %d", irq);
                 result = -ENODEV;
                 goto out_0;
         }
@@ -1395,7 +1397,7 @@ static int smsc9420_open(struct net_device *dev)
         smsc9420_pci_flush_write(pd);
 
         /* test the IRQ connection to the ISR */
-        smsc_dbg(IFUP, "Testing ISR using IRQ %d", dev->irq);
+        smsc_dbg(IFUP, "Testing ISR using IRQ %d", irq);
         pd->software_irq_signal = false;
 
         spin_lock_irqsave(&pd->int_lock, flags);
@@ -1430,7 +1432,7 @@ static int smsc9420_open(struct net_device *dev)
                 goto out_free_irq_1;
         }
 
-        smsc_dbg(IFUP, "ISR passed test using IRQ %d", dev->irq);
+        smsc_dbg(IFUP, "ISR passed test using IRQ %d", irq);
 
         result = smsc9420_alloc_tx_ring(pd);
         if (result) {
@@ -1490,7 +1492,7 @@ out_free_rx_ring_3:
 out_free_tx_ring_2:
         smsc9420_free_tx_ring(pd);
 out_free_irq_1:
-        free_irq(dev->irq, pd);
+        free_irq(irq, pd);
 out_0:
         return result;
 }
@@ -1519,7 +1521,7 @@ static int smsc9420_suspend(struct pci_dev *pdev, pm_message_t state)
                 smsc9420_stop_rx(pd);
                 smsc9420_free_rx_ring(pd);
 
-                free_irq(dev->irq, pd);
+                free_irq(pd->pdev->irq, pd);
 
                 netif_device_detach(dev);
         }
@@ -1552,6 +1554,7 @@ static int smsc9420_resume(struct pci_dev *pdev)
                 smsc_warn(IFUP, "pci_enable_wake failed: %d", err);
 
         if (netif_running(dev)) {
+                /* FIXME: gross. It looks like ancient PM relic.*/
                 err = smsc9420_open(dev);
                 netif_device_attach(dev);
         }
@@ -1625,8 +1628,6 @@ smsc9420_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         /* registers are double mapped with 0 offset for LE and 0x200 for BE */
         virt_addr += LAN9420_CPSR_ENDIAN_OFFSET;
 
-        dev->base_addr = (ulong)virt_addr;
-
         pd = netdev_priv(dev);
 
         /* pci descriptors are created in the PCI consistent area */
@@ -1646,7 +1647,7 @@ smsc9420_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
         pd->pdev = pdev;
         pd->dev = dev;
-        pd->base_addr = virt_addr;
+        pd->ioaddr = virt_addr;
         pd->msg_enable = smsc_debug;
         pd->rx_csum = true;
 
@@ -1669,7 +1670,6 @@ smsc9420_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
         dev->netdev_ops = &smsc9420_netdev_ops;
         dev->ethtool_ops = &smsc9420_ethtool_ops;
-        dev->irq = pdev->irq;
 
         netif_napi_add(dev, &pd->napi, smsc9420_rx_poll, NAPI_WEIGHT);
 
@@ -1727,7 +1727,7 @@ static void __devexit smsc9420_remove(struct pci_dev *pdev)
         pci_free_consistent(pdev, sizeof(struct smsc9420_dma_desc) *
                 (RX_RING_SIZE + TX_RING_SIZE), pd->rx_ring, pd->rx_dma_addr);
 
-        iounmap(pd->base_addr - LAN9420_CPSR_ENDIAN_OFFSET);
+        iounmap(pd->ioaddr - LAN9420_CPSR_ENDIAN_OFFSET);
         pci_release_regions(pdev);
         free_netdev(dev);
         pci_disable_device(pdev);
diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
index 0319d640f728..bcd54d6e94fd 100644
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@ -97,6 +97,16 @@ struct stmmac_extra_stats {
         unsigned long normal_irq_n;
 };
 
+/* CSR Frequency Access Defines*/
+#define CSR_F_35M       35000000
+#define CSR_F_60M       60000000
+#define CSR_F_100M      100000000
+#define CSR_F_150M      150000000
+#define CSR_F_250M      250000000
+#define CSR_F_300M      300000000
+
+#define MAC_CSR_H_FRQ_MASK      0x20
+
 #define HASH_TABLE_SIZE 64
 #define PAUSE_TIME 0x200
 
@@ -137,6 +147,7 @@ struct stmmac_extra_stats {
 #define DMA_HW_FEAT_FLEXIPPSEN  0x04000000 /* Flexible PPS Output */
 #define DMA_HW_FEAT_SAVLANINS   0x08000000 /* Source Addr or VLAN Insertion */
 #define DMA_HW_FEAT_ACTPHYIF    0x70000000 /* Active/selected PHY interface */
+#define DEFAULT_DMA_PBL         8
 
 enum rx_frame_status { /* IPC status */
         good_frame = 0,
@@ -228,7 +239,7 @@ struct stmmac_desc_ops {
         int (*get_rx_owner) (struct dma_desc *p);
         void (*set_rx_owner) (struct dma_desc *p);
         /* Get the receive frame size */
-        int (*get_rx_frame_len) (struct dma_desc *p);
+        int (*get_rx_frame_len) (struct dma_desc *p, int rx_coe_type);
         /* Return the reception status looking at the RDES1 */
         int (*rx_status) (void *data, struct stmmac_extra_stats *x,
                           struct dma_desc *p);
@@ -236,7 +247,8 @@ struct stmmac_desc_ops {
 
 struct stmmac_dma_ops {
         /* DMA core initialization */
-        int (*init) (void __iomem *ioaddr, int pbl, u32 dma_tx, u32 dma_rx);
+        int (*init) (void __iomem *ioaddr, int pbl, int fb, int mb,
+                     int burst_len, u32 dma_tx, u32 dma_rx);
         /* Dump DMA registers */
         void (*dump_regs) (void __iomem *ioaddr);
         /* Set tx/rx threshold in the csr6 register
@@ -261,14 +273,14 @@ struct stmmac_dma_ops {
 struct stmmac_ops {
         /* MAC core initialization */
         void (*core_init) (void __iomem *ioaddr) ____cacheline_aligned;
-        /* Support checksum offload engine */
-        int  (*rx_coe) (void __iomem *ioaddr);
+        /* Enable and verify that the IPC module is supported */
+        int (*rx_ipc) (void __iomem *ioaddr);
         /* Dump MAC registers */
         void (*dump_regs) (void __iomem *ioaddr);
         /* Handle extra events on specific interrupts hw dependent */
         void (*host_irq_status) (void __iomem *ioaddr);
         /* Multicast filter setting */
-        void (*set_filter) (struct net_device *dev);
+        void (*set_filter) (struct net_device *dev, int id);
         /* Flow control setting */
         void (*flow_ctrl) (void __iomem *ioaddr, unsigned int duplex,
                            unsigned int fc, unsigned int pause_time);
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
index cfcef0ea0fa5..23478bf4ed7a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
@@ -61,9 +61,11 @@ enum power_event {
 };
 
 /* GMAC HW ADDR regs */
-#define GMAC_ADDR_HIGH(reg)             (0x00000040+(reg * 8))
-#define GMAC_ADDR_LOW(reg)              (0x00000044+(reg * 8))
-#define GMAC_MAX_UNICAST_ADDRESSES      16
+#define GMAC_ADDR_HIGH(reg)     (((reg > 15) ? 0x00000800 : 0x00000040) + \
+                                (reg * 8))
+#define GMAC_ADDR_LOW(reg)      (((reg > 15) ? 0x00000804 : 0x00000044) + \
+                                (reg * 8))
+#define GMAC_MAX_PERFECT_ADDRESSES      32
 
 #define GMAC_AN_CTRL    0x000000c0      /* AN control */
 #define GMAC_AN_STATUS  0x000000c4      /* AN status */
@@ -139,10 +141,11 @@ enum rx_tx_priority_ratio {
 };
 
 #define DMA_BUS_MODE_FB         0x00010000      /* Fixed burst */
+#define DMA_BUS_MODE_MB         0x04000000      /* Mixed burst */
 #define DMA_BUS_MODE_RPBL_MASK  0x003e0000      /* Rx-Programmable Burst Len */
 #define DMA_BUS_MODE_RPBL_SHIFT 17
 #define DMA_BUS_MODE_USP        0x00800000
-#define DMA_BUS_MODE_4PBL       0x01000000
+#define DMA_BUS_MODE_PBL        0x01000000
 #define DMA_BUS_MODE_AAL        0x02000000
 
 /* DMA CRS Control and Status Register Mapping */
@@ -205,4 +208,7 @@ enum rtc_control {
 #define GMAC_MMC_TX_INTR   0x108
 #define GMAC_MMC_RX_CSUM_OFFLOAD   0x208
 
+/* Synopsys Core versions */
+#define DWMAC_CORE_3_40 34
+
 extern const struct stmmac_dma_ops dwmac1000_dma_ops;
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
index b1c48b975945..b5e4d02f15c9 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
@@ -46,7 +46,7 @@ static void dwmac1000_core_init(void __iomem *ioaddr)
 #endif
 }
 
-static int dwmac1000_rx_coe_supported(void __iomem *ioaddr)
+static int dwmac1000_rx_ipc_enable(void __iomem *ioaddr)
 {
         u32 value = readl(ioaddr + GMAC_CONTROL);
 
@@ -84,10 +84,11 @@ static void dwmac1000_get_umac_addr(void __iomem *ioaddr, unsigned char *addr,
                                 GMAC_ADDR_LOW(reg_n));
 }
 
-static void dwmac1000_set_filter(struct net_device *dev)
+static void dwmac1000_set_filter(struct net_device *dev, int id)
 {
         void __iomem *ioaddr = (void __iomem *) dev->base_addr;
         unsigned int value = 0;
+        unsigned int perfect_addr_number;
 
         CHIP_DBG(KERN_INFO "%s: # mcasts %d, # unicast %d\n",
                  __func__, netdev_mc_count(dev), netdev_uc_count(dev));
@@ -121,8 +122,14 @@ static void dwmac1000_set_filter(struct net_device *dev)
                 writel(mc_filter[1], ioaddr + GMAC_HASH_HIGH);
         }
 
+        /* Extra 16 regs are available in cores newer than the 3.40. */
+        if (id > DWMAC_CORE_3_40)
+                perfect_addr_number = GMAC_MAX_PERFECT_ADDRESSES;
+        else
+                perfect_addr_number = GMAC_MAX_PERFECT_ADDRESSES / 2;
+
         /* Handle multiple unicast addresses (perfect filtering)*/
-        if (netdev_uc_count(dev) > GMAC_MAX_UNICAST_ADDRESSES)
+        if (netdev_uc_count(dev) > perfect_addr_number)
                 /* Switch to promiscuous mode is more than 16 addrs
                    are required */
                 value |= GMAC_FRAME_FILTER_PR;
@@ -211,7 +218,7 @@ static void dwmac1000_irq_status(void __iomem *ioaddr)
 
 static const struct stmmac_ops dwmac1000_ops = {
         .core_init = dwmac1000_core_init,
-        .rx_coe = dwmac1000_rx_coe_supported,
+        .rx_ipc = dwmac1000_rx_ipc_enable,
         .dump_regs = dwmac1000_dump_regs,
         .host_irq_status = dwmac1000_irq_status,
         .set_filter = dwmac1000_set_filter,
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
index 4d5402a1d262..033500090f55 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
@@ -30,8 +30,8 @@
 #include "dwmac1000.h"
 #include "dwmac_dma.h"
 
-static int dwmac1000_dma_init(void __iomem *ioaddr, int pbl, u32 dma_tx,
-                              u32 dma_rx)
+static int dwmac1000_dma_init(void __iomem *ioaddr, int pbl, int fb,
+                              int mb, int burst_len, u32 dma_tx, u32 dma_rx)
 {
         u32 value = readl(ioaddr + DMA_BUS_MODE);
         int limit;
@@ -48,15 +48,51 @@ static int dwmac1000_dma_init(void __iomem *ioaddr, int pbl, u32 dma_tx,
         if (limit < 0)
                 return -EBUSY;
 
-        value = /* DMA_BUS_MODE_FB | */ DMA_BUS_MODE_4PBL |
-            ((pbl << DMA_BUS_MODE_PBL_SHIFT) |
-             (pbl << DMA_BUS_MODE_RPBL_SHIFT));
+        /*
+         * Set the DMA PBL (Programmable Burst Length) mode
+         * Before stmmac core 3.50 this mode bit was 4xPBL, and
+         * post 3.5 mode bit acts as 8*PBL.
+         * For core rev < 3.5, when the core is set for 4xPBL mode, the
+         * DMA transfers the data in 4, 8, 16, 32, 64 & 128 beats
+         * depending on pbl value.
+         * For core rev > 3.5, when the core is set for 8xPBL mode, the
+         * DMA transfers the data in 8, 16, 32, 64, 128 & 256 beats
+         * depending on pbl value.
+         */
+        value = DMA_BUS_MODE_PBL | ((pbl << DMA_BUS_MODE_PBL_SHIFT) |
+                (pbl << DMA_BUS_MODE_RPBL_SHIFT));
+
+        /* Set the Fixed burst mode */
+        if (fb)
+                value |= DMA_BUS_MODE_FB;
+
+        /* Mixed Burst has no effect when fb is set */
+        if (mb)
+                value |= DMA_BUS_MODE_MB;
 
 #ifdef CONFIG_STMMAC_DA
         value |= DMA_BUS_MODE_DA;       /* Rx has priority over tx */
 #endif
         writel(value, ioaddr + DMA_BUS_MODE);
 
+        /* In case of GMAC AXI configuration, program the DMA_AXI_BUS_MODE
+         * for supported bursts.
+         *
+         * Note: This is applicable only for revision GMACv3.61a. For
+         * older version this register is reserved and shall have no
+         * effect.
+         *
+         * Note:
+         *  For Fixed Burst Mode: if we directly write 0xFF to this
+         *  register using the configurations pass from platform code,
+         *  this would ensure that all bursts supported by core are set
+         *  and those which are not supported would remain ineffective.
+         *
+         *  For Non Fixed Burst Mode: provide the maximum value of the
+         *  burst length. Any burst equal or below the provided burst
+         *  length would be allowed to perform. */
+        writel(burst_len, ioaddr + DMA_AXI_BUS_MODE);
+
         /* Mask interrupts by writing to CSR7 */
         writel(DMA_INTR_DEFAULT_MASK, ioaddr + DMA_INTR_ENA);
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
index 138fb8dd1e87..19e0f4eed2bc 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
@@ -43,11 +43,6 @@ static void dwmac100_core_init(void __iomem *ioaddr)
 #endif
 }
 
-static int dwmac100_rx_coe_supported(void __iomem *ioaddr)
-{
-        return 0;
-}
-
 static void dwmac100_dump_mac_regs(void __iomem *ioaddr)
 {
         pr_info("\t----------------------------------------------\n"
@@ -72,6 +67,11 @@ static void dwmac100_dump_mac_regs(void __iomem *ioaddr)
                 readl(ioaddr + MAC_VLAN2));
 }
 
+static int dwmac100_rx_ipc_enable(void __iomem *ioaddr)
+{
+        return 0;
+}
+
 static void dwmac100_irq_status(void __iomem *ioaddr)
 {
         return;
@@ -89,7 +89,7 @@ static void dwmac100_get_umac_addr(void __iomem *ioaddr, unsigned char *addr,
         stmmac_get_mac_addr(ioaddr, addr, MAC_ADDR_HIGH, MAC_ADDR_LOW);
 }
 
-static void dwmac100_set_filter(struct net_device *dev)
+static void dwmac100_set_filter(struct net_device *dev, int id)
 {
         void __iomem *ioaddr = (void __iomem *) dev->base_addr;
         u32 value = readl(ioaddr + MAC_CONTROL);
@@ -160,7 +160,7 @@ static void dwmac100_pmt(void __iomem *ioaddr, unsigned long mode)
 
 static const struct stmmac_ops dwmac100_ops = {
         .core_init = dwmac100_core_init,
-        .rx_coe = dwmac100_rx_coe_supported,
+        .rx_ipc = dwmac100_rx_ipc_enable,
         .dump_regs = dwmac100_dump_mac_regs,
         .host_irq_status = dwmac100_irq_status,
         .set_filter = dwmac100_set_filter,
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c
index bc17fd08b55d..c2b4d55a79b6 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c
@@ -32,8 +32,8 @@
 #include "dwmac100.h"
 #include "dwmac_dma.h"
 
-static int dwmac100_dma_init(void __iomem *ioaddr, int pbl, u32 dma_tx,
-                             u32 dma_rx)
+static int dwmac100_dma_init(void __iomem *ioaddr, int pbl, int fb,
+                             int mb, int burst_len, u32 dma_tx, u32 dma_rx)
 {
         u32 value = readl(ioaddr + DMA_BUS_MODE);
         int limit;
@@ -52,7 +52,7 @@ static int dwmac100_dma_init(void __iomem *ioaddr, int pbl, u32 dma_tx,
 
         /* Enable Application Access by writing to DMA CSR0 */
         writel(DMA_BUS_MODE_DEFAULT | (pbl << DMA_BUS_MODE_PBL_SHIFT),
-               ioaddr + DMA_BUS_MODE);
+                        ioaddr + DMA_BUS_MODE);
 
         /* Mask interrupts by writing to CSR7 */
         writel(DMA_INTR_DEFAULT_MASK, ioaddr + DMA_INTR_ENA);
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h b/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
index 437edacd602e..6e0360f9cfde 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
@@ -32,6 +32,7 @@
 #define DMA_CONTROL             0x00001018      /* Ctrl (Operational Mode) */
 #define DMA_INTR_ENA            0x0000101c      /* Interrupt Enable */
 #define DMA_MISSED_FRAME_CTR    0x00001020      /* Missed Frame Counter */
+#define DMA_AXI_BUS_MODE       0x00001028      /* AXI Bus Mode */
 #define DMA_CUR_TX_BUF_ADDR     0x00001050      /* Current Host Tx Buffer */
 #define DMA_CUR_RX_BUF_ADDR     0x00001054      /* Current Host Rx Buffer */
 #define DMA_HW_FEATURE          0x00001058      /* HW Feature Register */
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
index f20aa12931d0..4e0e18a44fcc 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
@@ -31,6 +31,8 @@
 #define DWMAC_LIB_DBG(fmt, args...)  do { } while (0)
 #endif
 
+#define GMAC_HI_REG_AE          0x80000000
+
 /* CSR1 enables the transmit DMA to check for new descriptor */
 void dwmac_enable_dma_transmission(void __iomem *ioaddr)
 {
@@ -233,7 +235,11 @@ void stmmac_set_mac_addr(void __iomem *ioaddr, u8 addr[6],
         unsigned long data;
 
         data = (addr[5] << 8) | addr[4];
-        writel(data, ioaddr + high);
+        /* For MAC Addr registers se have to set the Address Enable (AE)
+         * bit that has no effect on the High Reg 0 where the bit 31 (MO)
+         * is RO.
+         */
+        writel(data | GMAC_HI_REG_AE, ioaddr + high);
         data = (addr[3] << 24) | (addr[2] << 16) | (addr[1] << 8) | addr[0];
         writel(data, ioaddr + low);
 }
diff --git a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
index ad1b627f8ec2..2fc8ef95f97a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
@@ -22,6 +22,7 @@
   Author: Giuseppe Cavallaro <peppe.cavallaro@st.com>
 *******************************************************************************/
 
+#include <linux/stmmac.h>
 #include "common.h"
 #include "descs_com.h"
 
@@ -309,9 +310,17 @@ static void enh_desc_close_tx_desc(struct dma_desc *p)
         p->des01.etx.interrupt = 1;
 }
 
-static int enh_desc_get_rx_frame_len(struct dma_desc *p)
+static int enh_desc_get_rx_frame_len(struct dma_desc *p, int rx_coe_type)
 {
-        return p->des01.erx.frame_length;
+        /* The type-1 checksum offload engines append the checksum at
+         * the end of frame and the two bytes of checksum are added in
+         * the length.
+         * Adjust for that in the framelen for type-1 checksum offload
+         * engines. */
+        if (rx_coe_type == STMMAC_RX_COE_TYPE1)
+                return p->des01.erx.frame_length - 2;
+        else
+                return p->des01.erx.frame_length;
 }
 
 const struct stmmac_desc_ops enh_desc_ops = {
diff --git a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
index 25953bb45a73..68962c549a2d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
@@ -22,6 +22,7 @@
   Author: Giuseppe Cavallaro <peppe.cavallaro@st.com>
 *******************************************************************************/
 
+#include <linux/stmmac.h>
 #include "common.h"
 #include "descs_com.h"
 
@@ -201,9 +202,17 @@ static void ndesc_close_tx_desc(struct dma_desc *p)
         p->des01.tx.interrupt = 1;
 }
 
-static int ndesc_get_rx_frame_len(struct dma_desc *p)
+static int ndesc_get_rx_frame_len(struct dma_desc *p, int rx_coe_type)
 {
-        return p->des01.rx.frame_length;
+        /* The type-1 checksum offload engines append the checksum at
+         * the end of frame and the two bytes of checksum are added in
+         * the length.
+         * Adjust for that in the framelen for type-1 checksum offload
+         * engines. */
+        if (rx_coe_type == STMMAC_RX_COE_TYPE1)
+                return p->des01.rx.frame_length - 2;
+        else
+                return p->des01.rx.frame_length;
 }
 
 const struct stmmac_desc_ops ndesc_ops = {
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index b4b095fdcf29..6b5d060ee9de 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -21,7 +21,9 @@
 *******************************************************************************/
 
 #define STMMAC_RESOURCE_NAME   "stmmaceth"
-#define DRV_MODULE_VERSION      "Feb_2012"
+#define DRV_MODULE_VERSION      "March_2012"
+
+#include <linux/clk.h>
 #include <linux/stmmac.h>
 #include <linux/phy.h>
 #include "common.h"
@@ -56,8 +58,6 @@ struct stmmac_priv {
 
         struct stmmac_extra_stats xstats;
         struct napi_struct napi;
-
-        int rx_coe;
         int no_csum_insertion;
 
         struct phy_device *phydev;
@@ -81,6 +81,11 @@ struct stmmac_priv {
         struct stmmac_counters mmc;
         struct dma_features dma_cap;
         int hw_cap_support;
+#ifdef CONFIG_HAVE_CLK
+        struct clk *stmmac_clk;
+#endif
+        int clk_csr;
+        int synopsys_id;
 };
 
 extern int phyaddr;
@@ -99,3 +104,42 @@ int stmmac_dvr_remove(struct net_device *ndev);
 struct stmmac_priv *stmmac_dvr_probe(struct device *device,
                                      struct plat_stmmacenet_data *plat_dat,
                                      void __iomem *addr);
+
+#ifdef CONFIG_HAVE_CLK
+static inline int stmmac_clk_enable(struct stmmac_priv *priv)
+{
+        if (!IS_ERR(priv->stmmac_clk))
+                return clk_enable(priv->stmmac_clk);
+
+        return 0;
+}
+
+static inline void stmmac_clk_disable(struct stmmac_priv *priv)
+{
+        if (IS_ERR(priv->stmmac_clk))
+                return;
+
+        clk_disable(priv->stmmac_clk);
+}
+static inline int stmmac_clk_get(struct stmmac_priv *priv)
+{
+        priv->stmmac_clk = clk_get(priv->device, NULL);
+
+        if (IS_ERR(priv->stmmac_clk))
+                return PTR_ERR(priv->stmmac_clk);
+
+        return 0;
+}
+#else
+static inline int stmmac_clk_enable(struct stmmac_priv *priv)
+{
+        return 0;
+}
+static inline void stmmac_clk_disable(struct stmmac_priv *priv)
+{
+}
+static inline int stmmac_clk_get(struct stmmac_priv *priv)
+{
+        return 0;
+}
+#endif /* CONFIG_HAVE_CLK */
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index f98e1511660f..ce431846fc6f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -481,6 +481,7 @@ static const struct ethtool_ops stmmac_ethtool_ops = {
         .get_wol = stmmac_get_wol,
         .set_wol = stmmac_set_wol,
         .get_sset_count = stmmac_get_sset_count,
+        .get_ts_info = ethtool_op_get_ts_info,
 };
 
 void stmmac_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 48d56da62f08..70966330f44e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -163,6 +163,38 @@ static void stmmac_verify_args(void)
                 pause = PAUSE_TIME;
 }
 
+static void stmmac_clk_csr_set(struct stmmac_priv *priv)
+{
+#ifdef CONFIG_HAVE_CLK
+        u32 clk_rate;
+
+        if (IS_ERR(priv->stmmac_clk))
+                return;
+
+        clk_rate = clk_get_rate(priv->stmmac_clk);
+
+        /* Platform provided default clk_csr would be assumed valid
+         * for all other cases except for the below mentioned ones. */
+        if (!(priv->clk_csr & MAC_CSR_H_FRQ_MASK)) {
+                if (clk_rate < CSR_F_35M)
+                        priv->clk_csr = STMMAC_CSR_20_35M;
+                else if ((clk_rate >= CSR_F_35M) && (clk_rate < CSR_F_60M))
+                        priv->clk_csr = STMMAC_CSR_35_60M;
+                else if ((clk_rate >= CSR_F_60M) && (clk_rate < CSR_F_100M))
+                        priv->clk_csr = STMMAC_CSR_60_100M;
+                else if ((clk_rate >= CSR_F_100M) && (clk_rate < CSR_F_150M))
+                        priv->clk_csr = STMMAC_CSR_100_150M;
+                else if ((clk_rate >= CSR_F_150M) && (clk_rate < CSR_F_250M))
+                        priv->clk_csr = STMMAC_CSR_150_250M;
+                else if ((clk_rate >= CSR_F_250M) && (clk_rate < CSR_F_300M))
+                        priv->clk_csr = STMMAC_CSR_250_300M;
+        } /* For values higher than the IEEE 802.3 specified frequency
+           * we can not estimate the proper divider as it is not known
+           * the frequency of clk_csr_i. So we do not change the default
+           * divider. */
+#endif
+}
+
 #if defined(STMMAC_XMIT_DEBUG) || defined(STMMAC_RX_DEBUG)
 static void print_pkt(unsigned char *buf, int len)
 {
@@ -307,7 +339,13 @@ static int stmmac_init_phy(struct net_device *dev)
         priv->speed = 0;
         priv->oldduplex = -1;
 
-        snprintf(bus_id, MII_BUS_ID_SIZE, "stmmac-%x", priv->plat->bus_id);
+        if (priv->plat->phy_bus_name)
+                snprintf(bus_id, MII_BUS_ID_SIZE, "%s-%x",
+                                priv->plat->phy_bus_name, priv->plat->bus_id);
+        else
+                snprintf(bus_id, MII_BUS_ID_SIZE, "stmmac-%x",
+                                priv->plat->bus_id);
+
         snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id,
                  priv->plat->phy_addr);
         pr_debug("stmmac_init_phy:  trying to attach to %s\n", phy_id);
@@ -884,6 +922,26 @@ static void stmmac_check_ether_addr(struct stmmac_priv *priv)
                                                    priv->dev->dev_addr);
 }
 
+static int stmmac_init_dma_engine(struct stmmac_priv *priv)
+{
+        int pbl = DEFAULT_DMA_PBL, fixed_burst = 0, burst_len = 0;
+        int mixed_burst = 0;
+
+        /* Some DMA parameters can be passed from the platform;
+         * in case of these are not passed we keep a default
+         * (good for all the chips) and init the DMA! */
+        if (priv->plat->dma_cfg) {
+                pbl = priv->plat->dma_cfg->pbl;
+                fixed_burst = priv->plat->dma_cfg->fixed_burst;
+                mixed_burst = priv->plat->dma_cfg->mixed_burst;
+                burst_len = priv->plat->dma_cfg->burst_len;
+        }
+
+        return priv->hw->dma->init(priv->ioaddr, pbl, fixed_burst, mixed_burst,
+                                   burst_len, priv->dma_tx_phy,
+                                   priv->dma_rx_phy);
+}
+
 /**
  *  stmmac_open - open entry point of the driver
  *  @dev : pointer to the device structure.
@@ -898,16 +956,6 @@ static int stmmac_open(struct net_device *dev)
         struct stmmac_priv *priv = netdev_priv(dev);
         int ret;
 
-        stmmac_check_ether_addr(priv);
-
-        /* MDIO bus Registration */
-        ret = stmmac_mdio_register(dev);
-        if (ret < 0) {
-                pr_debug("%s: MDIO bus (id: %d) registration failed",
-                         __func__, priv->plat->bus_id);
-                return ret;
-        }
-
 #ifdef CONFIG_STMMAC_TIMER
         priv->tm = kzalloc(sizeof(struct stmmac_timer *), GFP_KERNEL);
         if (unlikely(priv->tm == NULL))
@@ -925,6 +973,10 @@ static int stmmac_open(struct net_device *dev)
         } else
                 priv->tm->enable = 1;
 #endif
+        stmmac_clk_enable(priv);
+
+        stmmac_check_ether_addr(priv);
+
         ret = stmmac_init_phy(dev);
         if (unlikely(ret)) {
                 pr_err("%s: Cannot attach to PHY (error: %d)\n", __func__, ret);
@@ -938,8 +990,7 @@ static int stmmac_open(struct net_device *dev)
         init_dma_desc_rings(dev);
 
         /* DMA initialization and SW reset */
-        ret = priv->hw->dma->init(priv->ioaddr, priv->plat->pbl,
-                                  priv->dma_tx_phy, priv->dma_rx_phy);
+        ret = stmmac_init_dma_engine(priv);
         if (ret < 0) {
                 pr_err("%s: DMA initialization failed\n", __func__);
                 goto open_error;
@@ -1026,6 +1077,8 @@ open_error:
         if (priv->phydev)
                 phy_disconnect(priv->phydev);
 
+        stmmac_clk_disable(priv);
+
         return ret;
 }
 
@@ -1077,7 +1130,7 @@ static int stmmac_release(struct net_device *dev)
 #ifdef CONFIG_STMMAC_DEBUG_FS
         stmmac_exit_fs();
 #endif
-        stmmac_mdio_unregister(dev);
+        stmmac_clk_disable(priv);
 
         return 0;
 }
@@ -1276,7 +1329,8 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
                         struct sk_buff *skb;
                         int frame_len;
 
-                        frame_len = priv->hw->desc->get_rx_frame_len(p);
+                        frame_len = priv->hw->desc->get_rx_frame_len(p,
+                                        priv->plat->rx_coe);
                         /* ACS is set; GMAC core strips PAD/FCS for IEEE 802.3
                          * Type frames (LLC/LLC-SNAP) */
                         if (unlikely(status != llc_snap))
@@ -1312,7 +1366,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
 #endif
                         skb->protocol = eth_type_trans(skb, priv->dev);
 
-                        if (unlikely(!priv->rx_coe)) {
+                        if (unlikely(!priv->plat->rx_coe)) {
                                 /* No RX COE for old mac10/100 devices */
                                 skb_checksum_none_assert(skb);
                                 netif_receive_skb(skb);
@@ -1413,7 +1467,7 @@ static void stmmac_set_rx_mode(struct net_device *dev)
         struct stmmac_priv *priv = netdev_priv(dev);
 
         spin_lock(&priv->lock);
-        priv->hw->mac->set_filter(dev);
+        priv->hw->mac->set_filter(dev, priv->synopsys_id);
         spin_unlock(&priv->lock);
 }
 
@@ -1459,8 +1513,10 @@ static netdev_features_t stmmac_fix_features(struct net_device *dev,
 {
         struct stmmac_priv *priv = netdev_priv(dev);
 
-        if (!priv->rx_coe)
+        if (priv->plat->rx_coe == STMMAC_RX_COE_NONE)
                 features &= ~NETIF_F_RXCSUM;
+        else if (priv->plat->rx_coe == STMMAC_RX_COE_TYPE1)
+                features &= ~NETIF_F_IPV6_CSUM;
         if (!priv->plat->tx_coe)
                 features &= ~NETIF_F_ALL_CSUM;
 
@@ -1584,7 +1640,7 @@ static const struct file_operations stmmac_rings_status_fops = {
         .open = stmmac_sysfs_ring_open,
         .read = seq_read,
         .llseek = seq_lseek,
-        .release = seq_release,
+        .release = single_release,
 };
 
 static int stmmac_sysfs_dma_cap_read(struct seq_file *seq, void *v)
@@ -1656,7 +1712,7 @@ static const struct file_operations stmmac_dma_cap_fops = {
         .open = stmmac_sysfs_dma_cap_open,
         .read = seq_read,
         .llseek = seq_lseek,
-        .release = seq_release,
+        .release = single_release,
 };
 
 static int stmmac_init_fs(struct net_device *dev)
@@ -1752,7 +1808,7 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
         priv->hw->ring = &ring_mode_ops;
 
         /* Get and dump the chip ID */
-        stmmac_get_synopsys_id(priv);
+        priv->synopsys_id = stmmac_get_synopsys_id(priv);
 
         /* Get the HW capability (new GMAC newer than 3.50a) */
         priv->hw_cap_support = stmmac_get_hw_features(priv);
@@ -1765,17 +1821,32 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
                  * register (if supported).
                  */
                 priv->plat->enh_desc = priv->dma_cap.enh_desc;
-                priv->plat->tx_coe = priv->dma_cap.tx_coe;
                 priv->plat->pmt = priv->dma_cap.pmt_remote_wake_up;
+
+                priv->plat->tx_coe = priv->dma_cap.tx_coe;
+
+                if (priv->dma_cap.rx_coe_type2)
+                        priv->plat->rx_coe = STMMAC_RX_COE_TYPE2;
+                else if (priv->dma_cap.rx_coe_type1)
+                        priv->plat->rx_coe = STMMAC_RX_COE_TYPE1;
+
         } else
                 pr_info(" No HW DMA feature register supported");
 
         /* Select the enhnaced/normal descriptor structures */
         stmmac_selec_desc_mode(priv);
 
-        priv->rx_coe = priv->hw->mac->rx_coe(priv->ioaddr);
-        if (priv->rx_coe)
-                pr_info(" RX Checksum Offload Engine supported\n");
+        /* Enable the IPC (Checksum Offload) and check if the feature has been
+         * enabled during the core configuration. */
+        ret = priv->hw->mac->rx_ipc(priv->ioaddr);
+        if (!ret) {
+                pr_warning(" RX IPC Checksum Offload not configured.\n");
+                priv->plat->rx_coe = STMMAC_RX_COE_NONE;
+        }
+
+        if (priv->plat->rx_coe)
+                pr_info(" RX Checksum Offload Engine supported (type %d)\n",
+                        priv->plat->rx_coe);
         if (priv->plat->tx_coe)
                 pr_info(" TX Checksum insertion supported\n");
 
@@ -1856,6 +1927,28 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device,
                 goto error;
         }
 
+        if (stmmac_clk_get(priv))
+                pr_warning("%s: warning: cannot get CSR clock\n", __func__);
+
+        /* If a specific clk_csr value is passed from the platform
+         * this means that the CSR Clock Range selection cannot be
+         * changed at run-time and it is fixed. Viceversa the driver'll try to
+         * set the MDC clock dynamically according to the csr actual
+         * clock input.
+         */
+        if (!priv->plat->clk_csr)
+                stmmac_clk_csr_set(priv);
+        else
+                priv->clk_csr = priv->plat->clk_csr;
+
+        /* MDIO bus Registration */
+        ret = stmmac_mdio_register(ndev);
+        if (ret < 0) {
+                pr_debug("%s: MDIO bus (id: %d) registration failed",
+                         __func__, priv->plat->bus_id);
+                goto error;
+        }
+
         return priv;
 
 error:
@@ -1883,6 +1976,7 @@ int stmmac_dvr_remove(struct net_device *ndev)
         priv->hw->dma->stop_tx(priv->ioaddr);
 
         stmmac_set_mac(priv->ioaddr, false);
+        stmmac_mdio_unregister(ndev);
         netif_carrier_off(ndev);
         unregister_netdev(ndev);
         free_netdev(ndev);
@@ -1895,6 +1989,7 @@ int stmmac_suspend(struct net_device *ndev)
 {
         struct stmmac_priv *priv = netdev_priv(ndev);
         int dis_ic = 0;
+        unsigned long flags;
 
         if (!ndev || !netif_running(ndev))
                 return 0;
@@ -1902,7 +1997,7 @@ int stmmac_suspend(struct net_device *ndev)
         if (priv->phydev)
                 phy_stop(priv->phydev);
 
-        spin_lock(&priv->lock);
+        spin_lock_irqsave(&priv->lock, flags);
 
         netif_device_detach(ndev);
         netif_stop_queue(ndev);
@@ -1925,21 +2020,24 @@ int stmmac_suspend(struct net_device *ndev)
         /* Enable Power down mode by programming the PMT regs */
         if (device_may_wakeup(priv->device))
                 priv->hw->mac->pmt(priv->ioaddr, priv->wolopts);
-        else
+        else {
                 stmmac_set_mac(priv->ioaddr, false);
-
-        spin_unlock(&priv->lock);
+                /* Disable clock in case of PWM is off */
+                stmmac_clk_disable(priv);
+        }
+        spin_unlock_irqrestore(&priv->lock, flags);
         return 0;
 }
 
 int stmmac_resume(struct net_device *ndev)
 {
         struct stmmac_priv *priv = netdev_priv(ndev);
+        unsigned long flags;
 
         if (!netif_running(ndev))
                 return 0;
 
-        spin_lock(&priv->lock);
+        spin_lock_irqsave(&priv->lock, flags);
 
         /* Power Down bit, into the PM register, is cleared
          * automatically as soon as a magic packet or a Wake-up frame
@@ -1948,6 +2046,9 @@ int stmmac_resume(struct net_device *ndev)
          * from another devices (e.g. serial console). */
         if (device_may_wakeup(priv->device))
                 priv->hw->mac->pmt(priv->ioaddr, 0);
+        else
+                /* enable the clk prevously disabled */
+                stmmac_clk_enable(priv);
 
         netif_device_attach(ndev);
 
@@ -1964,7 +2065,7 @@ int stmmac_resume(struct net_device *ndev)
 
         netif_start_queue(ndev);
 
-        spin_unlock(&priv->lock);
+        spin_unlock_irqrestore(&priv->lock, flags);
 
         if (priv->phydev)
                 phy_start(priv->phydev);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index 73195329aa46..ade108232048 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -34,6 +34,22 @@
 #define MII_BUSY 0x00000001
 #define MII_WRITE 0x00000002
 
+static int stmmac_mdio_busy_wait(void __iomem *ioaddr, unsigned int mii_addr)
+{
+        unsigned long curr;
+        unsigned long finish = jiffies + 3 * HZ;
+
+        do {
+                curr = jiffies;
+                if (readl(ioaddr + mii_addr) & MII_BUSY)
+                        cpu_relax();
+                else
+                        return 0;
+        } while (!time_after_eq(curr, finish));
+
+        return -EBUSY;
+}
+
 /**
  * stmmac_mdio_read
  * @bus: points to the mii_bus structure
@@ -54,11 +70,15 @@ static int stmmac_mdio_read(struct mii_bus *bus, int phyaddr, int phyreg)
         int data;
         u16 regValue = (((phyaddr << 11) & (0x0000F800)) |
                         ((phyreg << 6) & (0x000007C0)));
-        regValue |= MII_BUSY | ((priv->plat->clk_csr & 7) << 2);
+        regValue |= MII_BUSY | ((priv->clk_csr & 0xF) << 2);
+
+        if (stmmac_mdio_busy_wait(priv->ioaddr, mii_address))
+                return -EBUSY;
 
-        do {} while (((readl(priv->ioaddr + mii_address)) & MII_BUSY) == 1);
         writel(regValue, priv->ioaddr + mii_address);
-        do {} while (((readl(priv->ioaddr + mii_address)) & MII_BUSY) == 1);
+
+        if (stmmac_mdio_busy_wait(priv->ioaddr, mii_address))
+                return -EBUSY;
 
         /* Read the data from the MII data register */
         data = (int)readl(priv->ioaddr + mii_data);
@@ -86,20 +106,18 @@ static int stmmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg,
             (((phyaddr << 11) & (0x0000F800)) | ((phyreg << 6) & (0x000007C0)))
             | MII_WRITE;
 
-        value |= MII_BUSY | ((priv->plat->clk_csr & 7) << 2);
-
+        value |= MII_BUSY | ((priv->clk_csr & 0xF) << 2);
 
         /* Wait until any existing MII operation is complete */
-        do {} while (((readl(priv->ioaddr + mii_address)) & MII_BUSY) == 1);
+        if (stmmac_mdio_busy_wait(priv->ioaddr, mii_address))
+                return -EBUSY;
 
         /* Set the MII address register to write */
         writel(phydata, priv->ioaddr + mii_data);
         writel(value, priv->ioaddr + mii_address);
 
         /* Wait until any existing MII operation is complete */
-        do {} while (((readl(priv->ioaddr + mii_address)) & MII_BUSY) == 1);
-
-        return 0;
+        return stmmac_mdio_busy_wait(priv->ioaddr, mii_address);
 }
 
 /**
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index da66ed7c3c5d..58fab5303e9c 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -28,6 +28,7 @@
 
 struct plat_stmmacenet_data plat_dat;
 struct stmmac_mdio_bus_data mdio_data;
+struct stmmac_dma_cfg dma_cfg;
 
 static void stmmac_default_data(void)
 {
@@ -35,7 +36,6 @@ static void stmmac_default_data(void)
         plat_dat.bus_id = 1;
         plat_dat.phy_addr = 0;
         plat_dat.interface = PHY_INTERFACE_MODE_GMII;
-        plat_dat.pbl = 32;
         plat_dat.clk_csr = 2;   /* clk_csr_i = 20-35MHz & MDC = clk_csr_i/16 */
         plat_dat.has_gmac = 1;
         plat_dat.force_sf_dma_mode = 1;
@@ -44,6 +44,10 @@ static void stmmac_default_data(void)
         mdio_data.phy_reset = NULL;
         mdio_data.phy_mask = 0;
         plat_dat.mdio_bus_data = &mdio_data;
+
+        dma_cfg.pbl = 32;
+        dma_cfg.burst_len = DMA_AXI_BLEN_256;
+        plat_dat.dma_cfg = &dma_cfg;
 }
 
 /**
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 116529a366b2..3dd8f0803808 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -50,7 +50,6 @@ static int __devinit stmmac_probe_config_dt(struct platform_device *pdev,
          * once needed on other platforms.
          */
         if (of_device_is_compatible(np, "st,spear600-gmac")) {
-                plat->pbl = 8;
                 plat->has_gmac = 1;
                 plat->pmt = 1;
         }
@@ -189,9 +188,6 @@ static int stmmac_pltfr_remove(struct platform_device *pdev)
         if (priv->plat->exit)
                 priv->plat->exit(pdev);
 
-        if (priv->plat->exit)
-                priv->plat->exit(pdev);
-
         platform_set_drvdata(pdev, NULL);
 
         iounmap((void *)priv->ioaddr);
@@ -218,14 +214,26 @@ static int stmmac_pltfr_resume(struct device *dev)
 
 int stmmac_pltfr_freeze(struct device *dev)
 {
+        int ret;
+        struct plat_stmmacenet_data *plat_dat = dev_get_platdata(dev);
         struct net_device *ndev = dev_get_drvdata(dev);
+        struct platform_device *pdev = to_platform_device(dev);
 
-        return stmmac_freeze(ndev);
+        ret = stmmac_freeze(ndev);
+        if (plat_dat->exit)
+                plat_dat->exit(pdev);
+
+        return ret;
 }
 
 int stmmac_pltfr_restore(struct device *dev)
 {
+        struct plat_stmmacenet_data *plat_dat = dev_get_platdata(dev);
         struct net_device *ndev = dev_get_drvdata(dev);
+        struct platform_device *pdev = to_platform_device(dev);
+
+        if (plat_dat->init)
+                plat_dat->init(pdev);
 
         return stmmac_restore(ndev);
 }
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index c99b3b0e2eae..703c8cce2a2c 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -9838,7 +9838,7 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev,
                         goto err_out_release_parent;
                 }
         }
-        if (err || dma_mask == DMA_BIT_MASK(32)) {
+        if (err) {
                 err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
                         dev_err(&pdev->dev, "No usable DMA configuration, aborting\n");
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index 558409ff4058..3cf4ab755838 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c
@@ -401,7 +401,7 @@ static int gem_rxmac_reset(struct gem *gp)
                 return 1;
         }
 
-        udelay(5000);
+        mdelay(5);
 
         /* Execute RX reset command. */
         writel(gp->swrst_base | GREG_SWRST_RXRST,
@@ -2339,7 +2339,7 @@ static int gem_suspend(struct pci_dev *pdev, pm_message_t state)
         netif_device_detach(dev);
 
         /* Switch off chip, remember WOL setting */
-        gp->asleep_wol = gp->wake_on_lan;
+        gp->asleep_wol = !!gp->wake_on_lan;
         gem_do_stop(dev, gp->asleep_wol);
 
         /* Unlock the network stack */
@@ -2898,7 +2898,6 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
         }
 
         gp->pdev = pdev;
-        dev->base_addr = (long) pdev;
         gp->dev = dev;
 
         gp->msg_enable = DEFAULT_MSG;
@@ -2972,7 +2971,6 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
         netif_napi_add(dev, &gp->napi, gem_poll, 64);
         dev->ethtool_ops = &gem_ethtool_ops;
         dev->watchdog_timeo = 5 * HZ;
-        dev->irq = pdev->irq;
         dev->dma = 0;
 
         /* Set that now, in case PM kicks in now */
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
index b95e7e681b38..dfc00c4683e5 100644
--- a/drivers/net/ethernet/sun/sunhme.c
+++ b/drivers/net/ethernet/sun/sunhme.c
@@ -2182,11 +2182,12 @@ static int happy_meal_open(struct net_device *dev)
          * into a single source which we register handling at probe time.
          */
         if ((hp->happy_flags & (HFLAG_QUATTRO|HFLAG_PCI)) != HFLAG_QUATTRO) {
-                if (request_irq(dev->irq, happy_meal_interrupt,
-                                IRQF_SHARED, dev->name, (void *)dev)) {
+                res = request_irq(hp->irq, happy_meal_interrupt, IRQF_SHARED,
+                                  dev->name, dev);
+                if (res) {
                         HMD(("EAGAIN\n"));
                         printk(KERN_ERR "happy_meal(SBUS): Can't order irq %d to go.\n",
-                               dev->irq);
+                               hp->irq);
 
                         return -EAGAIN;
                 }
@@ -2199,7 +2200,7 @@ static int happy_meal_open(struct net_device *dev)
         spin_unlock_irq(&hp->happy_lock);
 
         if (res && ((hp->happy_flags & (HFLAG_QUATTRO|HFLAG_PCI)) != HFLAG_QUATTRO))
-                free_irq(dev->irq, dev);
+                free_irq(hp->irq, dev);
         return res;
 }
 
@@ -2221,7 +2222,7 @@ static int happy_meal_close(struct net_device *dev)
          * time and never unregister.
          */
         if ((hp->happy_flags & (HFLAG_QUATTRO|HFLAG_PCI)) != HFLAG_QUATTRO)
-                free_irq(dev->irq, dev);
+                free_irq(hp->irq, dev);
 
         return 0;
 }
@@ -2777,7 +2778,7 @@ static int __devinit happy_meal_sbus_probe_one(struct platform_device *op, int i
         dev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM;
         dev->features |= dev->hw_features | NETIF_F_RXCSUM;
 
-        dev->irq = op->archdata.irqs[0];
+        hp->irq = op->archdata.irqs[0];
 
 #if defined(CONFIG_SBUS) && defined(CONFIG_PCI)
         /* Hook up SBUS register/descriptor accessors. */
@@ -2981,8 +2982,6 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
         if (hme_version_printed++ == 0)
                 printk(KERN_INFO "%s", version);
 
-        dev->base_addr = (long) pdev;
-
         hp = netdev_priv(dev);
 
         hp->happy_dev = pdev;
@@ -3087,12 +3086,11 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
 
         init_timer(&hp->happy_timer);
 
+        hp->irq = pdev->irq;
         hp->dev = dev;
         dev->netdev_ops = &hme_netdev_ops;
         dev->watchdog_timeo = 5*HZ;
         dev->ethtool_ops = &hme_ethtool_ops;
-        dev->irq = pdev->irq;
-        dev->dma = 0;
 
         /* Happy Meal can do it all... */
         dev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM;
diff --git a/drivers/net/ethernet/sun/sunhme.h b/drivers/net/ethernet/sun/sunhme.h
index 64f278360d89..f4307654e4ae 100644
--- a/drivers/net/ethernet/sun/sunhme.h
+++ b/drivers/net/ethernet/sun/sunhme.h
@@ -432,6 +432,7 @@ struct happy_meal {
 
         dma_addr_t                hblock_dvma;    /* DVMA visible address happy block  */
         unsigned int              happy_flags;    /* Driver state flags                */
+        int                       irq;
         enum happy_transceiver    tcvr_type;      /* Kind of transceiver in use        */
         unsigned int              happy_bursts;   /* Get your mind out of the gutter   */
         unsigned int              paddr;          /* PHY address for transceiver       */
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
index 38e3ae9155b7..a108db35924e 100644
--- a/drivers/net/ethernet/sun/sunvnet.c
+++ b/drivers/net/ethernet/sun/sunvnet.c
@@ -618,7 +618,7 @@ struct vnet_port *__tx_port_find(struct vnet *vp, struct sk_buff *skb)
         struct vnet_port *port;
 
         hlist_for_each_entry(port, n, hp, hash) {
-                if (!compare_ether_addr(port->raddr, skb->data))
+                if (ether_addr_equal(port->raddr, skb->data))
                         return port;
         }
         port = NULL;
diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c
index ad973ffc9ff3..8846516678c3 100644
--- a/drivers/net/ethernet/tehuti/tehuti.c
+++ b/drivers/net/ethernet/tehuti/tehuti.c
@@ -1317,7 +1317,7 @@ static void print_rxdd(struct rxd_desc *rxdd, u32 rxd_val1, u16 len,
 
 static void print_rxfd(struct rxf_desc *rxfd)
 {
-        DBG("=== RxF desc CHIP ORDER/ENDIANESS =============\n"
+        DBG("=== RxF desc CHIP ORDER/ENDIANNESS =============\n"
             "info 0x%x va_lo %u pa_lo 0x%x pa_hi 0x%x len 0x%x\n",
             rxfd->info, rxfd->va_lo, rxfd->pa_lo, rxfd->pa_hi, rxfd->len);
 }
@@ -1988,10 +1988,6 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 /* these fields are used for info purposes only
                  * so we can have them same for all ports of the board */
                 ndev->if_port = port;
-                ndev->base_addr = pciaddr;
-                ndev->mem_start = pciaddr;
-                ndev->mem_end = pciaddr + regionSize;
-                ndev->irq = pdev->irq;
                 ndev->features = NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_TSO
                     | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX |
                     NETIF_F_HW_VLAN_FILTER | NETIF_F_RXCSUM
diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
index 34558766cbf0..d614c374ed9d 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.c
+++ b/drivers/net/ethernet/ti/davinci_cpdma.c
@@ -92,7 +92,7 @@ enum cpdma_state {
         CPDMA_STATE_TEARDOWN,
 };
 
-const char *cpdma_state_str[] = { "idle", "active", "teardown" };
+static const char *cpdma_state_str[] = { "idle", "active", "teardown" };
 
 struct cpdma_ctlr {
         enum cpdma_state        state;
@@ -276,6 +276,7 @@ struct cpdma_ctlr *cpdma_ctlr_create(struct cpdma_params *params)
                 ctlr->num_chan = CPDMA_MAX_CHANNELS;
         return ctlr;
 }
+EXPORT_SYMBOL_GPL(cpdma_ctlr_create);
 
 int cpdma_ctlr_start(struct cpdma_ctlr *ctlr)
 {
@@ -321,6 +322,7 @@ int cpdma_ctlr_start(struct cpdma_ctlr *ctlr)
         spin_unlock_irqrestore(&ctlr->lock, flags);
         return 0;
 }
+EXPORT_SYMBOL_GPL(cpdma_ctlr_start);
 
 int cpdma_ctlr_stop(struct cpdma_ctlr *ctlr)
 {
@@ -351,6 +353,7 @@ int cpdma_ctlr_stop(struct cpdma_ctlr *ctlr)
         spin_unlock_irqrestore(&ctlr->lock, flags);
         return 0;
 }
+EXPORT_SYMBOL_GPL(cpdma_ctlr_stop);
 
 int cpdma_ctlr_dump(struct cpdma_ctlr *ctlr)
 {
@@ -421,6 +424,7 @@ int cpdma_ctlr_dump(struct cpdma_ctlr *ctlr)
         spin_unlock_irqrestore(&ctlr->lock, flags);
         return 0;
 }
+EXPORT_SYMBOL_GPL(cpdma_ctlr_dump);
 
 int cpdma_ctlr_destroy(struct cpdma_ctlr *ctlr)
 {
@@ -444,6 +448,7 @@ int cpdma_ctlr_destroy(struct cpdma_ctlr *ctlr)
         kfree(ctlr);
         return ret;
 }
+EXPORT_SYMBOL_GPL(cpdma_ctlr_destroy);
 
 int cpdma_ctlr_int_ctrl(struct cpdma_ctlr *ctlr, bool enable)
 {
@@ -528,6 +533,7 @@ err_chan_busy:
 err_chan_alloc:
         return ERR_PTR(ret);
 }
+EXPORT_SYMBOL_GPL(cpdma_chan_create);
 
 int cpdma_chan_destroy(struct cpdma_chan *chan)
 {
@@ -545,6 +551,7 @@ int cpdma_chan_destroy(struct cpdma_chan *chan)
         kfree(chan);
         return 0;
 }
+EXPORT_SYMBOL_GPL(cpdma_chan_destroy);
 
 int cpdma_chan_get_stats(struct cpdma_chan *chan,
                          struct cpdma_chan_stats *stats)
@@ -693,6 +700,7 @@ unlock_ret:
         spin_unlock_irqrestore(&chan->lock, flags);
         return ret;
 }
+EXPORT_SYMBOL_GPL(cpdma_chan_submit);
 
 static void __cpdma_chan_free(struct cpdma_chan *chan,
                               struct cpdma_desc __iomem *desc,
@@ -776,6 +784,7 @@ int cpdma_chan_process(struct cpdma_chan *chan, int quota)
         }
         return used;
 }
+EXPORT_SYMBOL_GPL(cpdma_chan_process);
 
 int cpdma_chan_start(struct cpdma_chan *chan)
 {
@@ -803,6 +812,7 @@ int cpdma_chan_start(struct cpdma_chan *chan)
         spin_unlock_irqrestore(&chan->lock, flags);
         return 0;
 }
+EXPORT_SYMBOL_GPL(cpdma_chan_start);
 
 int cpdma_chan_stop(struct cpdma_chan *chan)
 {
@@ -863,6 +873,7 @@ int cpdma_chan_stop(struct cpdma_chan *chan)
         spin_unlock_irqrestore(&chan->lock, flags);
         return 0;
 }
+EXPORT_SYMBOL_GPL(cpdma_chan_stop);
 
 int cpdma_chan_int_ctrl(struct cpdma_chan *chan, bool enable)
 {
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 174a3348f676..4da93a5d7ec6 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -627,6 +627,7 @@ static const struct ethtool_ops ethtool_ops = {
         .get_link = ethtool_op_get_link,
         .get_coalesce = emac_get_coalesce,
         .set_coalesce =  emac_set_coalesce,
+        .get_ts_info = ethtool_op_get_ts_info,
 };
 
 /**
@@ -1511,7 +1512,7 @@ static int emac_devioctl(struct net_device *ndev, struct ifreq *ifrq, int cmd)
 
 static int match_first_device(struct device *dev, void *data)
 {
-        return 1;
+        return !strncmp(dev_name(dev), "davinci_mdio", 12);
 }
 
 /**
diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c
index 2757c7d6e633..e4e47088e26b 100644
--- a/drivers/net/ethernet/ti/davinci_mdio.c
+++ b/drivers/net/ethernet/ti/davinci_mdio.c
@@ -181,6 +181,11 @@ static inline int wait_for_user_access(struct davinci_mdio_data *data)
                 __davinci_mdio_reset(data);
                 return -EAGAIN;
         }
+
+        reg = __raw_readl(&regs->user[0].access);
+        if ((reg & USERACCESS_GO) == 0)
+                return 0;
+
         dev_err(data->dev, "timed out waiting for user access\n");
         return -ETIMEDOUT;
 }
diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c
index 817ad3bc4957..3e6abf0f2771 100644
--- a/drivers/net/ethernet/ti/tlan.c
+++ b/drivers/net/ethernet/ti/tlan.c
@@ -228,7 +228,7 @@ tlan_get_skb(const struct tlan_list *tag)
         unsigned long addr;
 
         addr = tag->buffer[9].address;
-        addr |= (tag->buffer[8].address << 16) << 16;
+        addr |= ((unsigned long) tag->buffer[8].address << 16) << 16;
         return (struct sk_buff *) addr;
 }
 
@@ -2545,7 +2545,7 @@ static void tlan_phy_reset(struct net_device *dev)
 
         phy = priv->phy[priv->phy_num];
 
-        TLAN_DBG(TLAN_DEBUG_GNRL, "%s: Reseting PHY.\n", dev->name);
+        TLAN_DBG(TLAN_DEBUG_GNRL, "%s: Resetting PHY.\n", dev->name);
         tlan_mii_sync(dev->base_addr);
         value = MII_GC_LOOPBK | MII_GC_RESET;
         tlan_mii_write_reg(dev, phy, MII_GEN_CTL, value);
diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c
index 3d501ec7fad7..96070e9b50dc 100644
--- a/drivers/net/ethernet/tile/tilepro.c
+++ b/drivers/net/ethernet/tile/tilepro.c
@@ -843,7 +843,7 @@ static bool tile_net_poll_aux(struct tile_net_cpu *info, int index)
                 if (!is_multicast_ether_addr(buf)) {
                         /* Filter packets not for our address. */
                         const u8 *mine = dev->dev_addr;
-                        filter = compare_ether_addr(mine, buf);
+                        filter = !ether_addr_equal(mine, buf);
                 }
         }
 
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
index 5c14f82c4954..961c8321451f 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
@@ -1590,8 +1590,8 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
                 found = 0;
                 oldest = NULL;
                 list_for_each_entry(target, &wl->network_list, list) {
-                        if (!compare_ether_addr(&target->hwinfo->bssid[2],
-                                                &scan_info->bssid[2])) {
+                        if (ether_addr_equal(&target->hwinfo->bssid[2],
+                                             &scan_info->bssid[2])) {
                                 found = 1;
                                 pr_debug("%s: same BBS found scanned list\n",
                                          __func__);
@@ -1691,8 +1691,8 @@ struct gelic_wl_scan_info *gelic_wl_find_best_bss(struct gelic_wl_info *wl)
 
                 /* If bss specified, check it only */
                 if (test_bit(GELIC_WL_STAT_BSSID_SET, &wl->stat)) {
-                        if (!compare_ether_addr(&scan_info->hwinfo->bssid[2],
-                                                wl->bssid)) {
+                        if (ether_addr_equal(&scan_info->hwinfo->bssid[2],
+                                             wl->bssid)) {
                                 best_bss = scan_info;
                                 pr_debug("%s: bssid matched\n", __func__);
                                 break;
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index fcfa01f7ceb6..0459c096629f 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -689,9 +689,12 @@ static void __devinit rhine_reload_eeprom(long pioaddr, struct net_device *dev)
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void rhine_poll(struct net_device *dev)
 {
-        disable_irq(dev->irq);
-        rhine_interrupt(dev->irq, (void *)dev);
-        enable_irq(dev->irq);
+        struct rhine_private *rp = netdev_priv(dev);
+        const int irq = rp->pdev->irq;
+
+        disable_irq(irq);
+        rhine_interrupt(irq, dev);
+        enable_irq(irq);
 }
 #endif
 
@@ -972,7 +975,6 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
         }
 #endif /* USE_MMIO */
 
-        dev->base_addr = (unsigned long)ioaddr;
         rp->base = ioaddr;
 
         /* Get chip registers into a sane state */
@@ -995,8 +997,6 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
         if (!phy_id)
                 phy_id = ioread8(ioaddr + 0x6C);
 
-        dev->irq = pdev->irq;
-
         spin_lock_init(&rp->lock);
         mutex_init(&rp->task_lock);
         INIT_WORK(&rp->reset_task, rhine_reset_task);
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
index 8a5d7c100a5e..ea3e0a21ba74 100644
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -2488,8 +2488,8 @@ static int velocity_close(struct net_device *dev)
 
         if (vptr->flags & VELOCITY_FLAGS_WOL_ENABLED)
                 velocity_get_ip(vptr);
-        if (dev->irq != 0)
-                free_irq(dev->irq, dev);
+
+        free_irq(vptr->pdev->irq, dev);
 
         velocity_free_rings(vptr);
 
@@ -2755,8 +2755,6 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
         if (ret < 0)
                 goto err_free_dev;
 
-        dev->irq = pdev->irq;
-
         ret = velocity_get_pci_info(vptr, pdev);
         if (ret < 0) {
                 /* error message already printed */
@@ -2779,8 +2777,6 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
 
         mac_wol_reset(regs);
 
-        dev->base_addr = vptr->ioaddr;
-
         for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = readb(&regs->PAR[i]);
 
@@ -2806,7 +2802,6 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
 
         vptr->phy_id = MII_GET_PHY_ID(vptr->mac_regs);
 
-        dev->irq = pdev->irq;
         dev->netdev_ops = &velocity_netdev_ops;
         dev->ethtool_ops = &velocity_ethtool_ops;
         netif_napi_add(dev, &vptr->napi, velocity_poll, VELOCITY_NAPI_WEIGHT);
diff --git a/drivers/net/ethernet/wiznet/Kconfig b/drivers/net/ethernet/wiznet/Kconfig
new file mode 100644
index 000000000000..cb18043f5830
--- /dev/null
+++ b/drivers/net/ethernet/wiznet/Kconfig
@@ -0,0 +1,73 @@
+#
+# WIZnet devices configuration
+#
+
+config NET_VENDOR_WIZNET
+        bool "WIZnet devices"
+        default y
+        ---help---
+          If you have a network (Ethernet) card belonging to this class, say Y
+          and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+
+          Note that the answer to this question doesn't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about WIZnet devices. If you say Y, you will be asked
+          for your specific card in the following questions.
+
+if NET_VENDOR_WIZNET
+
+config WIZNET_W5100
+        tristate "WIZnet W5100 Ethernet support"
+        depends on HAS_IOMEM
+        ---help---
+          Support for WIZnet W5100 chips.
+
+          W5100 is a single chip with integrated 10/100 Ethernet MAC,
+          PHY and hardware TCP/IP stack, but this driver is limited to
+          the MAC and PHY functions only, onchip TCP/IP is unused.
+
+          To compile this driver as a module, choose M here: the module
+          will be called w5100.
+
+config WIZNET_W5300
+        tristate "WIZnet W5300 Ethernet support"
+        depends on HAS_IOMEM
+        ---help---
+          Support for WIZnet W5300 chips.
+
+          W5300 is a single chip with integrated 10/100 Ethernet MAC,
+          PHY and hardware TCP/IP stack, but this driver is limited to
+          the MAC and PHY functions only, onchip TCP/IP is unused.
+
+          To compile this driver as a module, choose M here: the module
+          will be called w5300.
+
+choice
+        prompt "WIZnet interface mode"
+        depends on WIZNET_W5100 || WIZNET_W5300
+        default WIZNET_BUS_ANY
+
+config WIZNET_BUS_DIRECT
+        bool "Direct address bus mode"
+        ---help---
+          In direct address mode host system can directly access all registers
+          after mapping to Memory-Mapped I/O space.
+
+config WIZNET_BUS_INDIRECT
+        bool "Indirect address bus mode"
+        ---help---
+          In indirect address mode host system indirectly accesses registers
+          using Indirect Mode Address Register and Indirect Mode Data Register,
+          which are directly mapped to Memory-Mapped I/O space.
+
+config WIZNET_BUS_ANY
+        bool "Select interface mode in runtime"
+        ---help---
+          If interface mode is unknown in compile time, it can be selected
+          in runtime from board/platform resources configuration.
+
+          Performance may decrease compared to explicitly selected bus mode.
+endchoice
+
+endif # NET_VENDOR_WIZNET
diff --git a/drivers/net/ethernet/wiznet/Makefile b/drivers/net/ethernet/wiznet/Makefile
new file mode 100644
index 000000000000..c614535227e8
--- /dev/null
+++ b/drivers/net/ethernet/wiznet/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_WIZNET_W5100) += w5100.o
+obj-$(CONFIG_WIZNET_W5300) += w5300.o
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
new file mode 100644
index 000000000000..a75e9ef5a4ce
--- /dev/null
+++ b/drivers/net/ethernet/wiznet/w5100.c
@@ -0,0 +1,808 @@
+/*
+ * Ethernet driver for the WIZnet W5100 chip.
+ *
+ * Copyright (C) 2006-2008 WIZnet Co.,Ltd.
+ * Copyright (C) 2012 Mike Sinkovsky <msink@permonline.ru>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/kconfig.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/platform_device.h>
+#include <linux/platform_data/wiznet.h>
+#include <linux/ethtool.h>
+#include <linux/skbuff.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+
+#define DRV_NAME        "w5100"
+#define DRV_VERSION     "2012-04-04"
+
+MODULE_DESCRIPTION("WIZnet W5100 Ethernet driver v"DRV_VERSION);
+MODULE_AUTHOR("Mike Sinkovsky <msink@permonline.ru>");
+MODULE_ALIAS("platform:"DRV_NAME);
+MODULE_LICENSE("GPL");
+
+/*
+ * Registers
+ */
+#define W5100_COMMON_REGS       0x0000
+#define W5100_MR                0x0000 /* Mode Register */
+#define   MR_RST                  0x80 /* S/W reset */
+#define   MR_PB                   0x10 /* Ping block */
+#define   MR_AI                   0x02 /* Address Auto-Increment */
+#define   MR_IND                  0x01 /* Indirect mode */
+#define W5100_SHAR              0x0009 /* Source MAC address */
+#define W5100_IR                0x0015 /* Interrupt Register */
+#define W5100_IMR               0x0016 /* Interrupt Mask Register */
+#define   IR_S0                   0x01 /* S0 interrupt */
+#define W5100_RTR               0x0017 /* Retry Time-value Register */
+#define   RTR_DEFAULT             2000 /* =0x07d0 (2000) */
+#define W5100_RMSR              0x001a /* Receive Memory Size */
+#define W5100_TMSR              0x001b /* Transmit Memory Size */
+#define W5100_COMMON_REGS_LEN   0x0040
+
+#define W5100_S0_REGS           0x0400
+#define W5100_S0_MR             0x0400 /* S0 Mode Register */
+#define   S0_MR_MACRAW            0x04 /* MAC RAW mode (promiscous) */
+#define   S0_MR_MACRAW_MF         0x44 /* MAC RAW mode (filtered) */
+#define W5100_S0_CR             0x0401 /* S0 Command Register */
+#define   S0_CR_OPEN              0x01 /* OPEN command */
+#define   S0_CR_CLOSE             0x10 /* CLOSE command */
+#define   S0_CR_SEND              0x20 /* SEND command */
+#define   S0_CR_RECV              0x40 /* RECV command */
+#define W5100_S0_IR             0x0402 /* S0 Interrupt Register */
+#define   S0_IR_SENDOK            0x10 /* complete sending */
+#define   S0_IR_RECV              0x04 /* receiving data */
+#define W5100_S0_SR             0x0403 /* S0 Status Register */
+#define   S0_SR_MACRAW            0x42 /* mac raw mode */
+#define W5100_S0_TX_FSR         0x0420 /* S0 Transmit free memory size */
+#define W5100_S0_TX_RD          0x0422 /* S0 Transmit memory read pointer */
+#define W5100_S0_TX_WR          0x0424 /* S0 Transmit memory write pointer */
+#define W5100_S0_RX_RSR         0x0426 /* S0 Receive free memory size */
+#define W5100_S0_RX_RD          0x0428 /* S0 Receive memory read pointer */
+#define W5100_S0_REGS_LEN       0x0040
+
+#define W5100_TX_MEM_START      0x4000
+#define W5100_TX_MEM_END        0x5fff
+#define W5100_TX_MEM_MASK       0x1fff
+#define W5100_RX_MEM_START      0x6000
+#define W5100_RX_MEM_END        0x7fff
+#define W5100_RX_MEM_MASK       0x1fff
+
+/*
+ * Device driver private data structure
+ */
+struct w5100_priv {
+        void __iomem *base;
+        spinlock_t reg_lock;
+        bool indirect;
+        u8   (*read)(struct w5100_priv *priv, u16 addr);
+        void (*write)(struct w5100_priv *priv, u16 addr, u8 data);
+        u16  (*read16)(struct w5100_priv *priv, u16 addr);
+        void (*write16)(struct w5100_priv *priv, u16 addr, u16 data);
+        void (*readbuf)(struct w5100_priv *priv, u16 addr, u8 *buf, int len);
+        void (*writebuf)(struct w5100_priv *priv, u16 addr, u8 *buf, int len);
+        int irq;
+        int link_irq;
+        int link_gpio;
+
+        struct napi_struct napi;
+        struct net_device *ndev;
+        bool promisc;
+        u32 msg_enable;
+};
+
+/************************************************************************
+ *
+ *  Lowlevel I/O functions
+ *
+ ***********************************************************************/
+
+/*
+ * In direct address mode host system can directly access W5100 registers
+ * after mapping to Memory-Mapped I/O space.
+ *
+ * 0x8000 bytes are required for memory space.
+ */
+static inline u8 w5100_read_direct(struct w5100_priv *priv, u16 addr)
+{
+        return ioread8(priv->base + (addr << CONFIG_WIZNET_BUS_SHIFT));
+}
+
+static inline void w5100_write_direct(struct w5100_priv *priv,
+                                      u16 addr, u8 data)
+{
+        iowrite8(data, priv->base + (addr << CONFIG_WIZNET_BUS_SHIFT));
+}
+
+static u16 w5100_read16_direct(struct w5100_priv *priv, u16 addr)
+{
+        u16 data;
+        data  = w5100_read_direct(priv, addr) << 8;
+        data |= w5100_read_direct(priv, addr + 1);
+        return data;
+}
+
+static void w5100_write16_direct(struct w5100_priv *priv, u16 addr, u16 data)
+{
+        w5100_write_direct(priv, addr, data >> 8);
+        w5100_write_direct(priv, addr + 1, data);
+}
+
+static void w5100_readbuf_direct(struct w5100_priv *priv,
+                                 u16 offset, u8 *buf, int len)
+{
+        u16 addr = W5100_RX_MEM_START + (offset & W5100_RX_MEM_MASK);
+        int i;
+
+        for (i = 0; i < len; i++, addr++) {
+                if (unlikely(addr > W5100_RX_MEM_END))
+                        addr = W5100_RX_MEM_START;
+                *buf++ = w5100_read_direct(priv, addr);
+        }
+}
+
+static void w5100_writebuf_direct(struct w5100_priv *priv,
+                                  u16 offset, u8 *buf, int len)
+{
+        u16 addr = W5100_TX_MEM_START + (offset & W5100_TX_MEM_MASK);
+        int i;
+
+        for (i = 0; i < len; i++, addr++) {
+                if (unlikely(addr > W5100_TX_MEM_END))
+                        addr = W5100_TX_MEM_START;
+                w5100_write_direct(priv, addr, *buf++);
+        }
+}
+
+/*
+ * In indirect address mode host system indirectly accesses registers by
+ * using Indirect Mode Address Register (IDM_AR) and Indirect Mode Data
+ * Register (IDM_DR), which are directly mapped to Memory-Mapped I/O space.
+ * Mode Register (MR) is directly accessible.
+ *
+ * Only 0x04 bytes are required for memory space.
+ */
+#define W5100_IDM_AR            0x01   /* Indirect Mode Address Register */
+#define W5100_IDM_DR            0x03   /* Indirect Mode Data Register */
+
+static u8 w5100_read_indirect(struct w5100_priv *priv, u16 addr)
+{
+        unsigned long flags;
+        u8 data;
+
+        spin_lock_irqsave(&priv->reg_lock, flags);
+        w5100_write16_direct(priv, W5100_IDM_AR, addr);
+        mmiowb();
+        data = w5100_read_direct(priv, W5100_IDM_DR);
+        spin_unlock_irqrestore(&priv->reg_lock, flags);
+
+        return data;
+}
+
+static void w5100_write_indirect(struct w5100_priv *priv, u16 addr, u8 data)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->reg_lock, flags);
+        w5100_write16_direct(priv, W5100_IDM_AR, addr);
+        mmiowb();
+        w5100_write_direct(priv, W5100_IDM_DR, data);
+        mmiowb();
+        spin_unlock_irqrestore(&priv->reg_lock, flags);
+}
+
+static u16 w5100_read16_indirect(struct w5100_priv *priv, u16 addr)
+{
+        unsigned long flags;
+        u16 data;
+
+        spin_lock_irqsave(&priv->reg_lock, flags);
+        w5100_write16_direct(priv, W5100_IDM_AR, addr);
+        mmiowb();
+        data  = w5100_read_direct(priv, W5100_IDM_DR) << 8;
+        data |= w5100_read_direct(priv, W5100_IDM_DR);
+        spin_unlock_irqrestore(&priv->reg_lock, flags);
+
+        return data;
+}
+
+static void w5100_write16_indirect(struct w5100_priv *priv, u16 addr, u16 data)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->reg_lock, flags);
+        w5100_write16_direct(priv, W5100_IDM_AR, addr);
+        mmiowb();
+        w5100_write_direct(priv, W5100_IDM_DR, data >> 8);
+        w5100_write_direct(priv, W5100_IDM_DR, data);
+        mmiowb();
+        spin_unlock_irqrestore(&priv->reg_lock, flags);
+}
+
+static void w5100_readbuf_indirect(struct w5100_priv *priv,
+                                   u16 offset, u8 *buf, int len)
+{
+        u16 addr = W5100_RX_MEM_START + (offset & W5100_RX_MEM_MASK);
+        unsigned long flags;
+        int i;
+
+        spin_lock_irqsave(&priv->reg_lock, flags);
+        w5100_write16_direct(priv, W5100_IDM_AR, addr);
+        mmiowb();
+
+        for (i = 0; i < len; i++, addr++) {
+                if (unlikely(addr > W5100_RX_MEM_END)) {
+                        addr = W5100_RX_MEM_START;
+                        w5100_write16_direct(priv, W5100_IDM_AR, addr);
+                        mmiowb();
+                }
+                *buf++ = w5100_read_direct(priv, W5100_IDM_DR);
+        }
+        mmiowb();
+        spin_unlock_irqrestore(&priv->reg_lock, flags);
+}
+
+static void w5100_writebuf_indirect(struct w5100_priv *priv,
+                                    u16 offset, u8 *buf, int len)
+{
+        u16 addr = W5100_TX_MEM_START + (offset & W5100_TX_MEM_MASK);
+        unsigned long flags;
+        int i;
+
+        spin_lock_irqsave(&priv->reg_lock, flags);
+        w5100_write16_direct(priv, W5100_IDM_AR, addr);
+        mmiowb();
+
+        for (i = 0; i < len; i++, addr++) {
+                if (unlikely(addr > W5100_TX_MEM_END)) {
+                        addr = W5100_TX_MEM_START;
+                        w5100_write16_direct(priv, W5100_IDM_AR, addr);
+                        mmiowb();
+                }
+                w5100_write_direct(priv, W5100_IDM_DR, *buf++);
+        }
+        mmiowb();
+        spin_unlock_irqrestore(&priv->reg_lock, flags);
+}
+
+#if defined(CONFIG_WIZNET_BUS_DIRECT)
+#define w5100_read      w5100_read_direct
+#define w5100_write     w5100_write_direct
+#define w5100_read16    w5100_read16_direct
+#define w5100_write16   w5100_write16_direct
+#define w5100_readbuf   w5100_readbuf_direct
+#define w5100_writebuf  w5100_writebuf_direct
+
+#elif defined(CONFIG_WIZNET_BUS_INDIRECT)
+#define w5100_read      w5100_read_indirect
+#define w5100_write     w5100_write_indirect
+#define w5100_read16    w5100_read16_indirect
+#define w5100_write16   w5100_write16_indirect
+#define w5100_readbuf   w5100_readbuf_indirect
+#define w5100_writebuf  w5100_writebuf_indirect
+
+#else /* CONFIG_WIZNET_BUS_ANY */
+#define w5100_read      priv->read
+#define w5100_write     priv->write
+#define w5100_read16    priv->read16
+#define w5100_write16   priv->write16
+#define w5100_readbuf   priv->readbuf
+#define w5100_writebuf  priv->writebuf
+#endif
+
+static int w5100_command(struct w5100_priv *priv, u16 cmd)
+{
+        unsigned long timeout = jiffies + msecs_to_jiffies(100);
+
+        w5100_write(priv, W5100_S0_CR, cmd);
+        mmiowb();
+
+        while (w5100_read(priv, W5100_S0_CR) != 0) {
+                if (time_after(jiffies, timeout))
+                        return -EIO;
+                cpu_relax();
+        }
+
+        return 0;
+}
+
+static void w5100_write_macaddr(struct w5100_priv *priv)
+{
+        struct net_device *ndev = priv->ndev;
+        int i;
+
+        for (i = 0; i < ETH_ALEN; i++)
+                w5100_write(priv, W5100_SHAR + i, ndev->dev_addr[i]);
+        mmiowb();
+}
+
+static void w5100_hw_reset(struct w5100_priv *priv)
+{
+        w5100_write_direct(priv, W5100_MR, MR_RST);
+        mmiowb();
+        mdelay(5);
+        w5100_write_direct(priv, W5100_MR, priv->indirect ?
+                                  MR_PB | MR_AI | MR_IND :
+                                  MR_PB);
+        mmiowb();
+        w5100_write(priv, W5100_IMR, 0);
+        w5100_write_macaddr(priv);
+
+        /* Configure 16K of internal memory
+         * as 8K RX buffer and 8K TX buffer
+         */
+        w5100_write(priv, W5100_RMSR, 0x03);
+        w5100_write(priv, W5100_TMSR, 0x03);
+        mmiowb();
+}
+
+static void w5100_hw_start(struct w5100_priv *priv)
+{
+        w5100_write(priv, W5100_S0_MR, priv->promisc ?
+                          S0_MR_MACRAW : S0_MR_MACRAW_MF);
+        mmiowb();
+        w5100_command(priv, S0_CR_OPEN);
+        w5100_write(priv, W5100_IMR, IR_S0);
+        mmiowb();
+}
+
+static void w5100_hw_close(struct w5100_priv *priv)
+{
+        w5100_write(priv, W5100_IMR, 0);
+        mmiowb();
+        w5100_command(priv, S0_CR_CLOSE);
+}
+
+/***********************************************************************
+ *
+ *   Device driver functions / callbacks
+ *
+ ***********************************************************************/
+
+static void w5100_get_drvinfo(struct net_device *ndev,
+                              struct ethtool_drvinfo *info)
+{
+        strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
+        strlcpy(info->version, DRV_VERSION, sizeof(info->version));
+        strlcpy(info->bus_info, dev_name(ndev->dev.parent),
+                sizeof(info->bus_info));
+}
+
+static u32 w5100_get_link(struct net_device *ndev)
+{
+        struct w5100_priv *priv = netdev_priv(ndev);
+
+        if (gpio_is_valid(priv->link_gpio))
+                return !!gpio_get_value(priv->link_gpio);
+
+        return 1;
+}
+
+static u32 w5100_get_msglevel(struct net_device *ndev)
+{
+        struct w5100_priv *priv = netdev_priv(ndev);
+
+        return priv->msg_enable;
+}
+
+static void w5100_set_msglevel(struct net_device *ndev, u32 value)
+{
+        struct w5100_priv *priv = netdev_priv(ndev);
+
+        priv->msg_enable = value;
+}
+
+static int w5100_get_regs_len(struct net_device *ndev)
+{
+        return W5100_COMMON_REGS_LEN + W5100_S0_REGS_LEN;
+}
+
+static void w5100_get_regs(struct net_device *ndev,
+                           struct ethtool_regs *regs, void *_buf)
+{
+        struct w5100_priv *priv = netdev_priv(ndev);
+        u8 *buf = _buf;
+        u16 i;
+
+        regs->version = 1;
+        for (i = 0; i < W5100_COMMON_REGS_LEN; i++)
+                *buf++ = w5100_read(priv, W5100_COMMON_REGS + i);
+        for (i = 0; i < W5100_S0_REGS_LEN; i++)
+                *buf++ = w5100_read(priv, W5100_S0_REGS + i);
+}
+
+static void w5100_tx_timeout(struct net_device *ndev)
+{
+        struct w5100_priv *priv = netdev_priv(ndev);
+
+        netif_stop_queue(ndev);
+        w5100_hw_reset(priv);
+        w5100_hw_start(priv);
+        ndev->stats.tx_errors++;
+        ndev->trans_start = jiffies;
+        netif_wake_queue(ndev);
+}
+
+static int w5100_start_tx(struct sk_buff *skb, struct net_device *ndev)
+{
+        struct w5100_priv *priv = netdev_priv(ndev);
+        u16 offset;
+
+        netif_stop_queue(ndev);
+
+        offset = w5100_read16(priv, W5100_S0_TX_WR);
+        w5100_writebuf(priv, offset, skb->data, skb->len);
+        w5100_write16(priv, W5100_S0_TX_WR, offset + skb->len);
+        mmiowb();
+        ndev->stats.tx_bytes += skb->len;
+        ndev->stats.tx_packets++;
+        dev_kfree_skb(skb);
+
+        w5100_command(priv, S0_CR_SEND);
+
+        return NETDEV_TX_OK;
+}
+
+static int w5100_napi_poll(struct napi_struct *napi, int budget)
+{
+        struct w5100_priv *priv = container_of(napi, struct w5100_priv, napi);
+        struct net_device *ndev = priv->ndev;
+        struct sk_buff *skb;
+        int rx_count;
+        u16 rx_len;
+        u16 offset;
+        u8 header[2];
+
+        for (rx_count = 0; rx_count < budget; rx_count++) {
+                u16 rx_buf_len = w5100_read16(priv, W5100_S0_RX_RSR);
+                if (rx_buf_len == 0)
+                        break;
+
+                offset = w5100_read16(priv, W5100_S0_RX_RD);
+                w5100_readbuf(priv, offset, header, 2);
+                rx_len = get_unaligned_be16(header) - 2;
+
+                skb = netdev_alloc_skb_ip_align(ndev, rx_len);
+                if (unlikely(!skb)) {
+                        w5100_write16(priv, W5100_S0_RX_RD,
+                                            offset + rx_buf_len);
+                        w5100_command(priv, S0_CR_RECV);
+                        ndev->stats.rx_dropped++;
+                        return -ENOMEM;
+                }
+
+                skb_put(skb, rx_len);
+                w5100_readbuf(priv, offset + 2, skb->data, rx_len);
+                w5100_write16(priv, W5100_S0_RX_RD, offset + 2 + rx_len);
+                mmiowb();
+                w5100_command(priv, S0_CR_RECV);
+                skb->protocol = eth_type_trans(skb, ndev);
+
+                netif_receive_skb(skb);
+                ndev->stats.rx_packets++;
+                ndev->stats.rx_bytes += rx_len;
+        }
+
+        if (rx_count < budget) {
+                w5100_write(priv, W5100_IMR, IR_S0);
+                mmiowb();
+                napi_complete(napi);
+        }
+
+        return rx_count;
+}
+
+static irqreturn_t w5100_interrupt(int irq, void *ndev_instance)
+{
+        struct net_device *ndev = ndev_instance;
+        struct w5100_priv *priv = netdev_priv(ndev);
+
+        int ir = w5100_read(priv, W5100_S0_IR);
+        if (!ir)
+                return IRQ_NONE;
+        w5100_write(priv, W5100_S0_IR, ir);
+        mmiowb();
+
+        if (ir & S0_IR_SENDOK) {
+                netif_dbg(priv, tx_done, ndev, "tx done\n");
+                netif_wake_queue(ndev);
+        }
+
+        if (ir & S0_IR_RECV) {
+                if (napi_schedule_prep(&priv->napi)) {
+                        w5100_write(priv, W5100_IMR, 0);
+                        mmiowb();
+                        __napi_schedule(&priv->napi);
+                }
+        }
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t w5100_detect_link(int irq, void *ndev_instance)
+{
+        struct net_device *ndev = ndev_instance;
+        struct w5100_priv *priv = netdev_priv(ndev);
+
+        if (netif_running(ndev)) {
+                if (gpio_get_value(priv->link_gpio) != 0) {
+                        netif_info(priv, link, ndev, "link is up\n");
+                        netif_carrier_on(ndev);
+                } else {
+                        netif_info(priv, link, ndev, "link is down\n");
+                        netif_carrier_off(ndev);
+                }
+        }
+
+        return IRQ_HANDLED;
+}
+
+static void w5100_set_rx_mode(struct net_device *ndev)
+{
+        struct w5100_priv *priv = netdev_priv(ndev);
+        bool set_promisc = (ndev->flags & IFF_PROMISC) != 0;
+
+        if (priv->promisc != set_promisc) {
+                priv->promisc = set_promisc;
+                w5100_hw_start(priv);
+        }
+}
+
+static int w5100_set_macaddr(struct net_device *ndev, void *addr)
+{
+        struct w5100_priv *priv = netdev_priv(ndev);
+        struct sockaddr *sock_addr = addr;
+
+        if (!is_valid_ether_addr(sock_addr->sa_data))
+                return -EADDRNOTAVAIL;
+        memcpy(ndev->dev_addr, sock_addr->sa_data, ETH_ALEN);
+        ndev->addr_assign_type &= ~NET_ADDR_RANDOM;
+        w5100_write_macaddr(priv);
+        return 0;
+}
+
+static int w5100_open(struct net_device *ndev)
+{
+        struct w5100_priv *priv = netdev_priv(ndev);
+
+        netif_info(priv, ifup, ndev, "enabling\n");
+        if (!is_valid_ether_addr(ndev->dev_addr))
+                return -EINVAL;
+        w5100_hw_start(priv);
+        napi_enable(&priv->napi);
+        netif_start_queue(ndev);
+        if (!gpio_is_valid(priv->link_gpio) ||
+            gpio_get_value(priv->link_gpio) != 0)
+                netif_carrier_on(ndev);
+        return 0;
+}
+
+static int w5100_stop(struct net_device *ndev)
+{
+        struct w5100_priv *priv = netdev_priv(ndev);
+
+        netif_info(priv, ifdown, ndev, "shutting down\n");
+        w5100_hw_close(priv);
+        netif_carrier_off(ndev);
+        netif_stop_queue(ndev);
+        napi_disable(&priv->napi);
+        return 0;
+}
+
+static const struct ethtool_ops w5100_ethtool_ops = {
+        .get_drvinfo            = w5100_get_drvinfo,
+        .get_msglevel           = w5100_get_msglevel,
+        .set_msglevel           = w5100_set_msglevel,
+        .get_link               = w5100_get_link,
+        .get_regs_len           = w5100_get_regs_len,
+        .get_regs               = w5100_get_regs,
+};
+
+static const struct net_device_ops w5100_netdev_ops = {
+        .ndo_open               = w5100_open,
+        .ndo_stop               = w5100_stop,
+        .ndo_start_xmit         = w5100_start_tx,
+        .ndo_tx_timeout         = w5100_tx_timeout,
+        .ndo_set_rx_mode        = w5100_set_rx_mode,
+        .ndo_set_mac_address    = w5100_set_macaddr,
+        .ndo_validate_addr      = eth_validate_addr,
+        .ndo_change_mtu         = eth_change_mtu,
+};
+
+static int __devinit w5100_hw_probe(struct platform_device *pdev)
+{
+        struct wiznet_platform_data *data = pdev->dev.platform_data;
+        struct net_device *ndev = platform_get_drvdata(pdev);
+        struct w5100_priv *priv = netdev_priv(ndev);
+        const char *name = netdev_name(ndev);
+        struct resource *mem;
+        int mem_size;
+        int irq;
+        int ret;
+
+        if (data && is_valid_ether_addr(data->mac_addr)) {
+                memcpy(ndev->dev_addr, data->mac_addr, ETH_ALEN);
+        } else {
+                random_ether_addr(ndev->dev_addr);
+                ndev->addr_assign_type |= NET_ADDR_RANDOM;
+        }
+
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!mem)
+                return -ENXIO;
+        mem_size = resource_size(mem);
+        if (!devm_request_mem_region(&pdev->dev, mem->start, mem_size, name))
+                return -EBUSY;
+        priv->base = devm_ioremap(&pdev->dev, mem->start, mem_size);
+        if (!priv->base)
+                return -EBUSY;
+
+        spin_lock_init(&priv->reg_lock);
+        priv->indirect = mem_size < W5100_BUS_DIRECT_SIZE;
+        if (priv->indirect) {
+                priv->read     = w5100_read_indirect;
+                priv->write    = w5100_write_indirect;
+                priv->read16   = w5100_read16_indirect;
+                priv->write16  = w5100_write16_indirect;
+                priv->readbuf  = w5100_readbuf_indirect;
+                priv->writebuf = w5100_writebuf_indirect;
+        } else {
+                priv->read     = w5100_read_direct;
+                priv->write    = w5100_write_direct;
+                priv->read16   = w5100_read16_direct;
+                priv->write16  = w5100_write16_direct;
+                priv->readbuf  = w5100_readbuf_direct;
+                priv->writebuf = w5100_writebuf_direct;
+        }
+
+        w5100_hw_reset(priv);
+        if (w5100_read16(priv, W5100_RTR) != RTR_DEFAULT)
+                return -ENODEV;
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0)
+                return irq;
+        ret = request_irq(irq, w5100_interrupt,
+                          IRQ_TYPE_LEVEL_LOW, name, ndev);
+        if (ret < 0)
+                return ret;
+        priv->irq = irq;
+
+        priv->link_gpio = data ? data->link_gpio : -EINVAL;
+        if (gpio_is_valid(priv->link_gpio)) {
+                char *link_name = devm_kzalloc(&pdev->dev, 16, GFP_KERNEL);
+                if (!link_name)
+                        return -ENOMEM;
+                snprintf(link_name, 16, "%s-link", name);
+                priv->link_irq = gpio_to_irq(priv->link_gpio);
+                if (request_any_context_irq(priv->link_irq, w5100_detect_link,
+                                IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+                                link_name, priv->ndev) < 0)
+                        priv->link_gpio = -EINVAL;
+        }
+
+        netdev_info(ndev, "at 0x%llx irq %d\n", (u64)mem->start, irq);
+        return 0;
+}
+
+static int __devinit w5100_probe(struct platform_device *pdev)
+{
+        struct w5100_priv *priv;
+        struct net_device *ndev;
+        int err;
+
+        ndev = alloc_etherdev(sizeof(*priv));
+        if (!ndev)
+                return -ENOMEM;
+        SET_NETDEV_DEV(ndev, &pdev->dev);
+        platform_set_drvdata(pdev, ndev);
+        priv = netdev_priv(ndev);
+        priv->ndev = ndev;
+
+        ether_setup(ndev);
+        ndev->netdev_ops = &w5100_netdev_ops;
+        ndev->ethtool_ops = &w5100_ethtool_ops;
+        ndev->watchdog_timeo = HZ;
+        netif_napi_add(ndev, &priv->napi, w5100_napi_poll, 16);
+
+        /* This chip doesn't support VLAN packets with normal MTU,
+         * so disable VLAN for this device.
+         */
+        ndev->features |= NETIF_F_VLAN_CHALLENGED;
+
+        err = register_netdev(ndev);
+        if (err < 0)
+                goto err_register;
+
+        err = w5100_hw_probe(pdev);
+        if (err < 0)
+                goto err_hw_probe;
+
+        return 0;
+
+err_hw_probe:
+        unregister_netdev(ndev);
+err_register:
+        free_netdev(ndev);
+        platform_set_drvdata(pdev, NULL);
+        return err;
+}
+
+static int __devexit w5100_remove(struct platform_device *pdev)
+{
+        struct net_device *ndev = platform_get_drvdata(pdev);
+        struct w5100_priv *priv = netdev_priv(ndev);
+
+        w5100_hw_reset(priv);
+        free_irq(priv->irq, ndev);
+        if (gpio_is_valid(priv->link_gpio))
+                free_irq(priv->link_irq, ndev);
+
+        unregister_netdev(ndev);
+        free_netdev(ndev);
+        platform_set_drvdata(pdev, NULL);
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int w5100_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct net_device *ndev = platform_get_drvdata(pdev);
+        struct w5100_priv *priv = netdev_priv(ndev);
+
+        if (netif_running(ndev)) {
+                netif_carrier_off(ndev);
+                netif_device_detach(ndev);
+
+                w5100_hw_close(priv);
+        }
+        return 0;
+}
+
+static int w5100_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct net_device *ndev = platform_get_drvdata(pdev);
+        struct w5100_priv *priv = netdev_priv(ndev);
+
+        if (netif_running(ndev)) {
+                w5100_hw_reset(priv);
+                w5100_hw_start(priv);
+
+                netif_device_attach(ndev);
+                if (!gpio_is_valid(priv->link_gpio) ||
+                    gpio_get_value(priv->link_gpio) != 0)
+                        netif_carrier_on(ndev);
+        }
+        return 0;
+}
+#endif /* CONFIG_PM */
+
+static SIMPLE_DEV_PM_OPS(w5100_pm_ops, w5100_suspend, w5100_resume);
+
+static struct platform_driver w5100_driver = {
+        .driver         = {
+                .name   = DRV_NAME,
+                .owner  = THIS_MODULE,
+                .pm     = &w5100_pm_ops,
+        },
+        .probe          = w5100_probe,
+        .remove         = __devexit_p(w5100_remove),
+};
+
+module_platform_driver(w5100_driver);
diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c
new file mode 100644
index 000000000000..3306a20ec211
--- /dev/null
+++ b/drivers/net/ethernet/wiznet/w5300.c
@@ -0,0 +1,720 @@
+/*
+ * Ethernet driver for the WIZnet W5300 chip.
+ *
+ * Copyright (C) 2008-2009 WIZnet Co.,Ltd.
+ * Copyright (C) 2011 Taehun Kim <kth3321 <at> gmail.com>
+ * Copyright (C) 2012 Mike Sinkovsky <msink@permonline.ru>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/kconfig.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/platform_device.h>
+#include <linux/platform_data/wiznet.h>
+#include <linux/ethtool.h>
+#include <linux/skbuff.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+
+#define DRV_NAME        "w5300"
+#define DRV_VERSION     "2012-04-04"
+
+MODULE_DESCRIPTION("WIZnet W5300 Ethernet driver v"DRV_VERSION);
+MODULE_AUTHOR("Mike Sinkovsky <msink@permonline.ru>");
+MODULE_ALIAS("platform:"DRV_NAME);
+MODULE_LICENSE("GPL");
+
+/*
+ * Registers
+ */
+#define W5300_MR                0x0000  /* Mode Register */
+#define   MR_DBW                  (1 << 15) /* Data bus width */
+#define   MR_MPF                  (1 << 14) /* Mac layer pause frame */
+#define   MR_WDF(n)               (((n)&7)<<11) /* Write data fetch time */
+#define   MR_RDH                  (1 << 10) /* Read data hold time */
+#define   MR_FS                   (1 << 8)  /* FIFO swap */
+#define   MR_RST                  (1 << 7)  /* S/W reset */
+#define   MR_PB                   (1 << 4)  /* Ping block */
+#define   MR_DBS                  (1 << 2)  /* Data bus swap */
+#define   MR_IND                  (1 << 0)  /* Indirect mode */
+#define W5300_IR                0x0002  /* Interrupt Register */
+#define W5300_IMR               0x0004  /* Interrupt Mask Register */
+#define   IR_S0                   0x0001  /* S0 interrupt */
+#define W5300_SHARL             0x0008  /* Source MAC address (0123) */
+#define W5300_SHARH             0x000c  /* Source MAC address (45) */
+#define W5300_TMSRL             0x0020  /* Transmit Memory Size (0123) */
+#define W5300_TMSRH             0x0024  /* Transmit Memory Size (4567) */
+#define W5300_RMSRL             0x0028  /* Receive Memory Size (0123) */
+#define W5300_RMSRH             0x002c  /* Receive Memory Size (4567) */
+#define W5300_MTYPE             0x0030  /* Memory Type */
+#define W5300_IDR               0x00fe  /* Chip ID register */
+#define   IDR_W5300               0x5300  /* =0x5300 for WIZnet W5300 */
+#define W5300_S0_MR             0x0200  /* S0 Mode Register */
+#define   S0_MR_CLOSED            0x0000  /* Close mode */
+#define   S0_MR_MACRAW            0x0004  /* MAC RAW mode (promiscous) */
+#define   S0_MR_MACRAW_MF         0x0044  /* MAC RAW mode (filtered) */
+#define W5300_S0_CR             0x0202  /* S0 Command Register */
+#define   S0_CR_OPEN              0x0001  /* OPEN command */
+#define   S0_CR_CLOSE             0x0010  /* CLOSE command */
+#define   S0_CR_SEND              0x0020  /* SEND command */
+#define   S0_CR_RECV              0x0040  /* RECV command */
+#define W5300_S0_IMR            0x0204  /* S0 Interrupt Mask Register */
+#define W5300_S0_IR             0x0206  /* S0 Interrupt Register */
+#define   S0_IR_RECV              0x0004  /* Receive interrupt */
+#define   S0_IR_SENDOK            0x0010  /* Send OK interrupt */
+#define W5300_S0_SSR            0x0208  /* S0 Socket Status Register */
+#define W5300_S0_TX_WRSR        0x0220  /* S0 TX Write Size Register */
+#define W5300_S0_TX_FSR         0x0224  /* S0 TX Free Size Register */
+#define W5300_S0_RX_RSR         0x0228  /* S0 Received data Size */
+#define W5300_S0_TX_FIFO        0x022e  /* S0 Transmit FIFO */
+#define W5300_S0_RX_FIFO        0x0230  /* S0 Receive FIFO */
+#define W5300_REGS_LEN          0x0400
+
+/*
+ * Device driver private data structure
+ */
+struct w5300_priv {
+        void __iomem *base;
+        spinlock_t reg_lock;
+        bool indirect;
+        u16  (*read) (struct w5300_priv *priv, u16 addr);
+        void (*write)(struct w5300_priv *priv, u16 addr, u16 data);
+        int irq;
+        int link_irq;
+        int link_gpio;
+
+        struct napi_struct napi;
+        struct net_device *ndev;
+        bool promisc;
+        u32 msg_enable;
+};
+
+/************************************************************************
+ *
+ *  Lowlevel I/O functions
+ *
+ ***********************************************************************/
+
+/*
+ * In direct address mode host system can directly access W5300 registers
+ * after mapping to Memory-Mapped I/O space.
+ *
+ * 0x400 bytes are required for memory space.
+ */
+static inline u16 w5300_read_direct(struct w5300_priv *priv, u16 addr)
+{
+        return ioread16(priv->base + (addr << CONFIG_WIZNET_BUS_SHIFT));
+}
+
+static inline void w5300_write_direct(struct w5300_priv *priv,
+                                      u16 addr, u16 data)
+{
+        iowrite16(data, priv->base + (addr << CONFIG_WIZNET_BUS_SHIFT));
+}
+
+/*
+ * In indirect address mode host system indirectly accesses registers by
+ * using Indirect Mode Address Register (IDM_AR) and Indirect Mode Data
+ * Register (IDM_DR), which are directly mapped to Memory-Mapped I/O space.
+ * Mode Register (MR) is directly accessible.
+ *
+ * Only 0x06 bytes are required for memory space.
+ */
+#define W5300_IDM_AR            0x0002   /* Indirect Mode Address */
+#define W5300_IDM_DR            0x0004   /* Indirect Mode Data */
+
+static u16 w5300_read_indirect(struct w5300_priv *priv, u16 addr)
+{
+        unsigned long flags;
+        u16 data;
+
+        spin_lock_irqsave(&priv->reg_lock, flags);
+        w5300_write_direct(priv, W5300_IDM_AR, addr);
+        mmiowb();
+        data = w5300_read_direct(priv, W5300_IDM_DR);
+        spin_unlock_irqrestore(&priv->reg_lock, flags);
+
+        return data;
+}
+
+static void w5300_write_indirect(struct w5300_priv *priv, u16 addr, u16 data)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->reg_lock, flags);
+        w5300_write_direct(priv, W5300_IDM_AR, addr);
+        mmiowb();
+        w5300_write_direct(priv, W5300_IDM_DR, data);
+        mmiowb();
+        spin_unlock_irqrestore(&priv->reg_lock, flags);
+}
+
+#if defined(CONFIG_WIZNET_BUS_DIRECT)
+#define w5300_read      w5300_read_direct
+#define w5300_write     w5300_write_direct
+
+#elif defined(CONFIG_WIZNET_BUS_INDIRECT)
+#define w5300_read      w5300_read_indirect
+#define w5300_write     w5300_write_indirect
+
+#else /* CONFIG_WIZNET_BUS_ANY */
+#define w5300_read      priv->read
+#define w5300_write     priv->write
+#endif
+
+static u32 w5300_read32(struct w5300_priv *priv, u16 addr)
+{
+        u32 data;
+        data  = w5300_read(priv, addr) << 16;
+        data |= w5300_read(priv, addr + 2);
+        return data;
+}
+
+static void w5300_write32(struct w5300_priv *priv, u16 addr, u32 data)
+{
+        w5300_write(priv, addr, data >> 16);
+        w5300_write(priv, addr + 2, data);
+}
+
+static int w5300_command(struct w5300_priv *priv, u16 cmd)
+{
+        unsigned long timeout = jiffies + msecs_to_jiffies(100);
+
+        w5300_write(priv, W5300_S0_CR, cmd);
+        mmiowb();
+
+        while (w5300_read(priv, W5300_S0_CR) != 0) {
+                if (time_after(jiffies, timeout))
+                        return -EIO;
+                cpu_relax();
+        }
+
+        return 0;
+}
+
+static void w5300_read_frame(struct w5300_priv *priv, u8 *buf, int len)
+{
+        u16 fifo;
+        int i;
+
+        for (i = 0; i < len; i += 2) {
+                fifo = w5300_read(priv, W5300_S0_RX_FIFO);
+                *buf++ = fifo >> 8;
+                *buf++ = fifo;
+        }
+        fifo = w5300_read(priv, W5300_S0_RX_FIFO);
+        fifo = w5300_read(priv, W5300_S0_RX_FIFO);
+}
+
+static void w5300_write_frame(struct w5300_priv *priv, u8 *buf, int len)
+{
+        u16 fifo;
+        int i;
+
+        for (i = 0; i < len; i += 2) {
+                fifo  = *buf++ << 8;
+                fifo |= *buf++;
+                w5300_write(priv, W5300_S0_TX_FIFO, fifo);
+        }
+        w5300_write32(priv, W5300_S0_TX_WRSR, len);
+}
+
+static void w5300_write_macaddr(struct w5300_priv *priv)
+{
+        struct net_device *ndev = priv->ndev;
+        w5300_write32(priv, W5300_SHARL,
+                      ndev->dev_addr[0] << 24 |
+                      ndev->dev_addr[1] << 16 |
+                      ndev->dev_addr[2] << 8 |
+                      ndev->dev_addr[3]);
+        w5300_write(priv, W5300_SHARH,
+                      ndev->dev_addr[4] << 8 |
+                      ndev->dev_addr[5]);
+        mmiowb();
+}
+
+static void w5300_hw_reset(struct w5300_priv *priv)
+{
+        w5300_write_direct(priv, W5300_MR, MR_RST);
+        mmiowb();
+        mdelay(5);
+        w5300_write_direct(priv, W5300_MR, priv->indirect ?
+                                 MR_WDF(7) | MR_PB | MR_IND :
+                                 MR_WDF(7) | MR_PB);
+        mmiowb();
+        w5300_write(priv, W5300_IMR, 0);
+        w5300_write_macaddr(priv);
+
+        /* Configure 128K of internal memory
+         * as 64K RX fifo and 64K TX fifo
+         */
+        w5300_write32(priv, W5300_RMSRL, 64 << 24);
+        w5300_write32(priv, W5300_RMSRH, 0);
+        w5300_write32(priv, W5300_TMSRL, 64 << 24);
+        w5300_write32(priv, W5300_TMSRH, 0);
+        w5300_write(priv, W5300_MTYPE, 0x00ff);
+        mmiowb();
+}
+
+static void w5300_hw_start(struct w5300_priv *priv)
+{
+        w5300_write(priv, W5300_S0_MR, priv->promisc ?
+                          S0_MR_MACRAW : S0_MR_MACRAW_MF);
+        mmiowb();
+        w5300_command(priv, S0_CR_OPEN);
+        w5300_write(priv, W5300_S0_IMR, S0_IR_RECV | S0_IR_SENDOK);
+        w5300_write(priv, W5300_IMR, IR_S0);
+        mmiowb();
+}
+
+static void w5300_hw_close(struct w5300_priv *priv)
+{
+        w5300_write(priv, W5300_IMR, 0);
+        mmiowb();
+        w5300_command(priv, S0_CR_CLOSE);
+}
+
+/***********************************************************************
+ *
+ *   Device driver functions / callbacks
+ *
+ ***********************************************************************/
+
+static void w5300_get_drvinfo(struct net_device *ndev,
+                              struct ethtool_drvinfo *info)
+{
+        strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
+        strlcpy(info->version, DRV_VERSION, sizeof(info->version));
+        strlcpy(info->bus_info, dev_name(ndev->dev.parent),
+                sizeof(info->bus_info));
+}
+
+static u32 w5300_get_link(struct net_device *ndev)
+{
+        struct w5300_priv *priv = netdev_priv(ndev);
+
+        if (gpio_is_valid(priv->link_gpio))
+                return !!gpio_get_value(priv->link_gpio);
+
+        return 1;
+}
+
+static u32 w5300_get_msglevel(struct net_device *ndev)
+{
+        struct w5300_priv *priv = netdev_priv(ndev);
+
+        return priv->msg_enable;
+}
+
+static void w5300_set_msglevel(struct net_device *ndev, u32 value)
+{
+        struct w5300_priv *priv = netdev_priv(ndev);
+
+        priv->msg_enable = value;
+}
+
+static int w5300_get_regs_len(struct net_device *ndev)
+{
+        return W5300_REGS_LEN;
+}
+
+static void w5300_get_regs(struct net_device *ndev,
+                           struct ethtool_regs *regs, void *_buf)
+{
+        struct w5300_priv *priv = netdev_priv(ndev);
+        u8 *buf = _buf;
+        u16 addr;
+        u16 data;
+
+        regs->version = 1;
+        for (addr = 0; addr < W5300_REGS_LEN; addr += 2) {
+                switch (addr & 0x23f) {
+                case W5300_S0_TX_FIFO: /* cannot read TX_FIFO */
+                case W5300_S0_RX_FIFO: /* cannot read RX_FIFO */
+                        data = 0xffff;
+                        break;
+                default:
+                        data = w5300_read(priv, addr);
+                        break;
+                }
+                *buf++ = data >> 8;
+                *buf++ = data;
+        }
+}
+
+static void w5300_tx_timeout(struct net_device *ndev)
+{
+        struct w5300_priv *priv = netdev_priv(ndev);
+
+        netif_stop_queue(ndev);
+        w5300_hw_reset(priv);
+        w5300_hw_start(priv);
+        ndev->stats.tx_errors++;
+        ndev->trans_start = jiffies;
+        netif_wake_queue(ndev);
+}
+
+static int w5300_start_tx(struct sk_buff *skb, struct net_device *ndev)
+{
+        struct w5300_priv *priv = netdev_priv(ndev);
+
+        netif_stop_queue(ndev);
+
+        w5300_write_frame(priv, skb->data, skb->len);
+        mmiowb();
+        ndev->stats.tx_packets++;
+        ndev->stats.tx_bytes += skb->len;
+        dev_kfree_skb(skb);
+        netif_dbg(priv, tx_queued, ndev, "tx queued\n");
+
+        w5300_command(priv, S0_CR_SEND);
+
+        return NETDEV_TX_OK;
+}
+
+static int w5300_napi_poll(struct napi_struct *napi, int budget)
+{
+        struct w5300_priv *priv = container_of(napi, struct w5300_priv, napi);
+        struct net_device *ndev = priv->ndev;
+        struct sk_buff *skb;
+        int rx_count;
+        u16 rx_len;
+
+        for (rx_count = 0; rx_count < budget; rx_count++) {
+                u32 rx_fifo_len = w5300_read32(priv, W5300_S0_RX_RSR);
+                if (rx_fifo_len == 0)
+                        break;
+
+                rx_len = w5300_read(priv, W5300_S0_RX_FIFO);
+
+                skb = netdev_alloc_skb_ip_align(ndev, roundup(rx_len, 2));
+                if (unlikely(!skb)) {
+                        u32 i;
+                        for (i = 0; i < rx_fifo_len; i += 2)
+                                w5300_read(priv, W5300_S0_RX_FIFO);
+                        ndev->stats.rx_dropped++;
+                        return -ENOMEM;
+                }
+
+                skb_put(skb, rx_len);
+                w5300_read_frame(priv, skb->data, rx_len);
+                skb->protocol = eth_type_trans(skb, ndev);
+
+                netif_receive_skb(skb);
+                ndev->stats.rx_packets++;
+                ndev->stats.rx_bytes += rx_len;
+        }
+
+        if (rx_count < budget) {
+                w5300_write(priv, W5300_IMR, IR_S0);
+                mmiowb();
+                napi_complete(napi);
+        }
+
+        return rx_count;
+}
+
+static irqreturn_t w5300_interrupt(int irq, void *ndev_instance)
+{
+        struct net_device *ndev = ndev_instance;
+        struct w5300_priv *priv = netdev_priv(ndev);
+
+        int ir = w5300_read(priv, W5300_S0_IR);
+        if (!ir)
+                return IRQ_NONE;
+        w5300_write(priv, W5300_S0_IR, ir);
+        mmiowb();
+
+        if (ir & S0_IR_SENDOK) {
+                netif_dbg(priv, tx_done, ndev, "tx done\n");
+                netif_wake_queue(ndev);
+        }
+
+        if (ir & S0_IR_RECV) {
+                if (napi_schedule_prep(&priv->napi)) {
+                        w5300_write(priv, W5300_IMR, 0);
+                        mmiowb();
+                        __napi_schedule(&priv->napi);
+                }
+        }
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t w5300_detect_link(int irq, void *ndev_instance)
+{
+        struct net_device *ndev = ndev_instance;
+        struct w5300_priv *priv = netdev_priv(ndev);
+
+        if (netif_running(ndev)) {
+                if (gpio_get_value(priv->link_gpio) != 0) {
+                        netif_info(priv, link, ndev, "link is up\n");
+                        netif_carrier_on(ndev);
+                } else {
+                        netif_info(priv, link, ndev, "link is down\n");
+                        netif_carrier_off(ndev);
+                }
+        }
+
+        return IRQ_HANDLED;
+}
+
+static void w5300_set_rx_mode(struct net_device *ndev)
+{
+        struct w5300_priv *priv = netdev_priv(ndev);
+        bool set_promisc = (ndev->flags & IFF_PROMISC) != 0;
+
+        if (priv->promisc != set_promisc) {
+                priv->promisc = set_promisc;
+                w5300_hw_start(priv);
+        }
+}
+
+static int w5300_set_macaddr(struct net_device *ndev, void *addr)
+{
+        struct w5300_priv *priv = netdev_priv(ndev);
+        struct sockaddr *sock_addr = addr;
+
+        if (!is_valid_ether_addr(sock_addr->sa_data))
+                return -EADDRNOTAVAIL;
+        memcpy(ndev->dev_addr, sock_addr->sa_data, ETH_ALEN);
+        ndev->addr_assign_type &= ~NET_ADDR_RANDOM;
+        w5300_write_macaddr(priv);
+        return 0;
+}
+
+static int w5300_open(struct net_device *ndev)
+{
+        struct w5300_priv *priv = netdev_priv(ndev);
+
+        netif_info(priv, ifup, ndev, "enabling\n");
+        if (!is_valid_ether_addr(ndev->dev_addr))
+                return -EINVAL;
+        w5300_hw_start(priv);
+        napi_enable(&priv->napi);
+        netif_start_queue(ndev);
+        if (!gpio_is_valid(priv->link_gpio) ||
+            gpio_get_value(priv->link_gpio) != 0)
+                netif_carrier_on(ndev);
+        return 0;
+}
+
+static int w5300_stop(struct net_device *ndev)
+{
+        struct w5300_priv *priv = netdev_priv(ndev);
+
+        netif_info(priv, ifdown, ndev, "shutting down\n");
+        w5300_hw_close(priv);
+        netif_carrier_off(ndev);
+        netif_stop_queue(ndev);
+        napi_disable(&priv->napi);
+        return 0;
+}
+
+static const struct ethtool_ops w5300_ethtool_ops = {
+        .get_drvinfo            = w5300_get_drvinfo,
+        .get_msglevel           = w5300_get_msglevel,
+        .set_msglevel           = w5300_set_msglevel,
+        .get_link               = w5300_get_link,
+        .get_regs_len           = w5300_get_regs_len,
+        .get_regs               = w5300_get_regs,
+};
+
+static const struct net_device_ops w5300_netdev_ops = {
+        .ndo_open               = w5300_open,
+        .ndo_stop               = w5300_stop,
+        .ndo_start_xmit         = w5300_start_tx,
+        .ndo_tx_timeout         = w5300_tx_timeout,
+        .ndo_set_rx_mode        = w5300_set_rx_mode,
+        .ndo_set_mac_address    = w5300_set_macaddr,
+        .ndo_validate_addr      = eth_validate_addr,
+        .ndo_change_mtu         = eth_change_mtu,
+};
+
+static int __devinit w5300_hw_probe(struct platform_device *pdev)
+{
+        struct wiznet_platform_data *data = pdev->dev.platform_data;
+        struct net_device *ndev = platform_get_drvdata(pdev);
+        struct w5300_priv *priv = netdev_priv(ndev);
+        const char *name = netdev_name(ndev);
+        struct resource *mem;
+        int mem_size;
+        int irq;
+        int ret;
+
+        if (data && is_valid_ether_addr(data->mac_addr)) {
+                memcpy(ndev->dev_addr, data->mac_addr, ETH_ALEN);
+        } else {
+                random_ether_addr(ndev->dev_addr);
+                ndev->addr_assign_type |= NET_ADDR_RANDOM;
+        }
+
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!mem)
+                return -ENXIO;
+        mem_size = resource_size(mem);
+        if (!devm_request_mem_region(&pdev->dev, mem->start, mem_size, name))
+                return -EBUSY;
+        priv->base = devm_ioremap(&pdev->dev, mem->start, mem_size);
+        if (!priv->base)
+                return -EBUSY;
+
+        spin_lock_init(&priv->reg_lock);
+        priv->indirect = mem_size < W5300_BUS_DIRECT_SIZE;
+        if (priv->indirect) {
+                priv->read  = w5300_read_indirect;
+                priv->write = w5300_write_indirect;
+        } else {
+                priv->read  = w5300_read_direct;
+                priv->write = w5300_write_direct;
+        }
+
+        w5300_hw_reset(priv);
+        if (w5300_read(priv, W5300_IDR) != IDR_W5300)
+                return -ENODEV;
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0)
+                return irq;
+        ret = request_irq(irq, w5300_interrupt,
+                          IRQ_TYPE_LEVEL_LOW, name, ndev);
+        if (ret < 0)
+                return ret;
+        priv->irq = irq;
+
+        priv->link_gpio = data ? data->link_gpio : -EINVAL;
+        if (gpio_is_valid(priv->link_gpio)) {
+                char *link_name = devm_kzalloc(&pdev->dev, 16, GFP_KERNEL);
+                if (!link_name)
+                        return -ENOMEM;
+                snprintf(link_name, 16, "%s-link", name);
+                priv->link_irq = gpio_to_irq(priv->link_gpio);
+                if (request_any_context_irq(priv->link_irq, w5300_detect_link,
+                                IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+                                link_name, priv->ndev) < 0)
+                        priv->link_gpio = -EINVAL;
+        }
+
+        netdev_info(ndev, "at 0x%llx irq %d\n", (u64)mem->start, irq);
+        return 0;
+}
+
+static int __devinit w5300_probe(struct platform_device *pdev)
+{
+        struct w5300_priv *priv;
+        struct net_device *ndev;
+        int err;
+
+        ndev = alloc_etherdev(sizeof(*priv));
+        if (!ndev)
+                return -ENOMEM;
+        SET_NETDEV_DEV(ndev, &pdev->dev);
+        platform_set_drvdata(pdev, ndev);
+        priv = netdev_priv(ndev);
+        priv->ndev = ndev;
+
+        ether_setup(ndev);
+        ndev->netdev_ops = &w5300_netdev_ops;
+        ndev->ethtool_ops = &w5300_ethtool_ops;
+        ndev->watchdog_timeo = HZ;
+        netif_napi_add(ndev, &priv->napi, w5300_napi_poll, 16);
+
+        /* This chip doesn't support VLAN packets with normal MTU,
+         * so disable VLAN for this device.
+         */
+        ndev->features |= NETIF_F_VLAN_CHALLENGED;
+
+        err = register_netdev(ndev);
+        if (err < 0)
+                goto err_register;
+
+        err = w5300_hw_probe(pdev);
+        if (err < 0)
+                goto err_hw_probe;
+
+        return 0;
+
+err_hw_probe:
+        unregister_netdev(ndev);
+err_register:
+        free_netdev(ndev);
+        platform_set_drvdata(pdev, NULL);
+        return err;
+}
+
+static int __devexit w5300_remove(struct platform_device *pdev)
+{
+        struct net_device *ndev = platform_get_drvdata(pdev);
+        struct w5300_priv *priv = netdev_priv(ndev);
+
+        w5300_hw_reset(priv);
+        free_irq(priv->irq, ndev);
+        if (gpio_is_valid(priv->link_gpio))
+                free_irq(priv->link_irq, ndev);
+
+        unregister_netdev(ndev);
+        free_netdev(ndev);
+        platform_set_drvdata(pdev, NULL);
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int w5300_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct net_device *ndev = platform_get_drvdata(pdev);
+        struct w5300_priv *priv = netdev_priv(ndev);
+
+        if (netif_running(ndev)) {
+                netif_carrier_off(ndev);
+                netif_device_detach(ndev);
+
+                w5300_hw_close(priv);
+        }
+        return 0;
+}
+
+static int w5300_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct net_device *ndev = platform_get_drvdata(pdev);
+        struct w5300_priv *priv = netdev_priv(ndev);
+
+        if (!netif_running(ndev)) {
+                w5300_hw_reset(priv);
+                w5300_hw_start(priv);
+
+                netif_device_attach(ndev);
+                if (!gpio_is_valid(priv->link_gpio) ||
+                    gpio_get_value(priv->link_gpio) != 0)
+                        netif_carrier_on(ndev);
+        }
+        return 0;
+}
+#endif /* CONFIG_PM */
+
+static SIMPLE_DEV_PM_OPS(w5300_pm_ops, w5300_suspend, w5300_resume);
+
+static struct platform_driver w5300_driver = {
+        .driver         = {
+                .name   = DRV_NAME,
+                .owner  = THIS_MODULE,
+                .pm     = &w5300_pm_ops,
+        },
+        .probe          = w5300_probe,
+        .remove         = __devexit_p(w5300_remove),
+};
+
+module_platform_driver(w5300_driver);
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index d21591a2c593..1eaf7128afee 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -1000,6 +1000,7 @@ static const struct ethtool_ops temac_ethtool_ops = {
         .set_settings = temac_set_settings,
         .nway_reset = temac_nway_reset,
         .get_link = ethtool_op_get_link,
+        .get_ts_info = ethtool_op_get_ts_info,
 };
 
 static int __devinit temac_of_probe(struct platform_device *op)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet.h b/drivers/net/ethernet/xilinx/xilinx_axienet.h
index cc83af083fd7..44b8d2bad8c3 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet.h
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet.h
@@ -2,9 +2,7 @@
  * Definitions for Xilinx Axi Ethernet device driver.
  *
  * Copyright (c) 2009 Secret Lab Technologies, Ltd.
- * Copyright (c) 2010 Xilinx, Inc. All rights reserved.
- * Copyright (c) 2012 Daniel Borkmann, <daniel.borkmann@tik.ee.ethz.ch>
- * Copyright (c) 2012 Ariane Keller, <ariane.keller@tik.ee.ethz.ch>
+ * Copyright (c) 2010 - 2012 Xilinx, Inc. All rights reserved.
  */
 
 #ifndef XILINX_AXIENET_H
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 2fcbeba6814b..9c365e192a31 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -4,9 +4,9 @@
  * Copyright (c) 2008 Nissin Systems Co., Ltd.,  Yoshio Kashiwagi
  * Copyright (c) 2005-2008 DLA Systems,  David H. Lynch Jr. <dhlii@dlasys.net>
  * Copyright (c) 2008-2009 Secret Lab Technologies Ltd.
- * Copyright (c) 2010 Xilinx, Inc. All rights reserved.
- * Copyright (c) 2012 Daniel Borkmann, <daniel.borkmann@tik.ee.ethz.ch>
- * Copyright (c) 2012 Ariane Keller, <ariane.keller@tik.ee.ethz.ch>
+ * Copyright (c) 2010 - 2011 Michal Simek <monstr@monstr.eu>
+ * Copyright (c) 2010 - 2011 PetaLogix
+ * Copyright (c) 2010 - 2012 Xilinx, Inc. All rights reserved.
  *
  * This is a driver for the Xilinx Axi Ethernet which is used in the Virtex6
  * and Spartan6.
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
index d70b6e79f6c0..e90e1f46121e 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
@@ -2,9 +2,9 @@
  * MDIO bus driver for the Xilinx Axi Ethernet device
  *
  * Copyright (c) 2009 Secret Lab Technologies, Ltd.
- * Copyright (c) 2010 Xilinx, Inc. All rights reserved.
- * Copyright (c) 2012 Daniel Borkmann, <daniel.borkmann@tik.ee.ethz.ch>
- * Copyright (c) 2012 Ariane Keller, <ariane.keller@tik.ee.ethz.ch>
+ * Copyright (c) 2010 - 2011 Michal Simek <monstr@monstr.eu>
+ * Copyright (c) 2010 - 2011 PetaLogix
+ * Copyright (c) 2010 - 2012 Xilinx, Inc. All rights reserved.
  */
 
 #include <linux/of_address.h>
diff --git a/drivers/net/ethernet/xscale/Kconfig b/drivers/net/ethernet/xscale/Kconfig
index cf67352cea14..3f431019e615 100644
--- a/drivers/net/ethernet/xscale/Kconfig
+++ b/drivers/net/ethernet/xscale/Kconfig
@@ -5,8 +5,8 @@
 config NET_VENDOR_XSCALE
         bool "Intel XScale IXP devices"
         default y
-        depends on NET_VENDOR_INTEL && ((ARM && ARCH_IXP4XX && \
-                   IXP4XX_NPE && IXP4XX_QMGR) || ARCH_ENP2611)
+        depends on NET_VENDOR_INTEL && (ARM && ARCH_IXP4XX && \
+                   IXP4XX_NPE && IXP4XX_QMGR)
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
           and read the Ethernet-HOWTO, available from
@@ -27,6 +27,4 @@ config IXP4XX_ETH
           Say Y here if you want to use built-in Ethernet ports
           on IXP4xx processor.
 
-source "drivers/net/ethernet/xscale/ixp2000/Kconfig"
-
 endif # NET_VENDOR_XSCALE
diff --git a/drivers/net/ethernet/xscale/Makefile b/drivers/net/ethernet/xscale/Makefile
index b195b9d7fe81..abc3b031fba7 100644
--- a/drivers/net/ethernet/xscale/Makefile
+++ b/drivers/net/ethernet/xscale/Makefile
@@ -2,5 +2,4 @@
 # Makefile for the Intel XScale IXP device drivers.
 #
 
-obj-$(CONFIG_ENP2611_MSF_NET) += ixp2000/
 obj-$(CONFIG_IXP4XX_ETH) += ixp4xx_eth.o
diff --git a/drivers/net/ethernet/xscale/ixp2000/Kconfig b/drivers/net/ethernet/xscale/ixp2000/Kconfig
deleted file mode 100644
index 58dbc5b876bc..000000000000
--- a/drivers/net/ethernet/xscale/ixp2000/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-config ENP2611_MSF_NET
-        tristate "Radisys ENP2611 MSF network interface support"
-        depends on ARCH_ENP2611
-        ---help---
-          This is a driver for the MSF network interface unit in
-          the IXP2400 on the Radisys ENP2611 platform.
diff --git a/drivers/net/ethernet/xscale/ixp2000/Makefile b/drivers/net/ethernet/xscale/ixp2000/Makefile
deleted file mode 100644
index fd38351ceaa7..000000000000
--- a/drivers/net/ethernet/xscale/ixp2000/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-$(CONFIG_ENP2611_MSF_NET) += enp2611_mod.o
-
-enp2611_mod-objs := caleb.o enp2611.o ixp2400-msf.o ixpdev.o pm3386.o
diff --git a/drivers/net/ethernet/xscale/ixp2000/caleb.c b/drivers/net/ethernet/xscale/ixp2000/caleb.c
deleted file mode 100644
index 7dea5b95012c..000000000000
--- a/drivers/net/ethernet/xscale/ixp2000/caleb.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Helper functions for the SPI-3 bridge FPGA on the Radisys ENP2611
- * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
- * Dedicated to Marija Kulikova.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/module.h>
-#include <linux/delay.h>
-#include <asm/io.h>
-#include "caleb.h"
-
-#define CALEB_IDLO              0x00
-#define CALEB_IDHI              0x01
-#define CALEB_RID               0x02
-#define CALEB_RESET             0x03
-#define CALEB_INTREN0           0x04
-#define CALEB_INTREN1           0x05
-#define CALEB_INTRSTAT0         0x06
-#define CALEB_INTRSTAT1         0x07
-#define CALEB_PORTEN            0x08
-#define CALEB_BURST             0x09
-#define CALEB_PORTPAUS          0x0A
-#define CALEB_PORTPAUSD         0x0B
-#define CALEB_PHY0RX            0x10
-#define CALEB_PHY1RX            0x11
-#define CALEB_PHY0TX            0x12
-#define CALEB_PHY1TX            0x13
-#define CALEB_IXPRX_HI_CNTR     0x15
-#define CALEB_PHY0RX_HI_CNTR    0x16
-#define CALEB_PHY1RX_HI_CNTR    0x17
-#define CALEB_IXPRX_CNTR        0x18
-#define CALEB_PHY0RX_CNTR       0x19
-#define CALEB_PHY1RX_CNTR       0x1A
-#define CALEB_IXPTX_CNTR        0x1B
-#define CALEB_PHY0TX_CNTR       0x1C
-#define CALEB_PHY1TX_CNTR       0x1D
-#define CALEB_DEBUG0            0x1E
-#define CALEB_DEBUG1            0x1F
-
-
-static u8 caleb_reg_read(int reg)
-{
-        u8 value;
-
-        value = *((volatile u8 *)(ENP2611_CALEB_VIRT_BASE + reg));
-
-//      printk(KERN_INFO "caleb_reg_read(%d) = %.2x\n", reg, value);
-
-        return value;
-}
-
-static void caleb_reg_write(int reg, u8 value)
-{
-        u8 dummy;
-
-//      printk(KERN_INFO "caleb_reg_write(%d, %.2x)\n", reg, value);
-
-        *((volatile u8 *)(ENP2611_CALEB_VIRT_BASE + reg)) = value;
-
-        dummy = *((volatile u8 *)ENP2611_CALEB_VIRT_BASE);
-        __asm__ __volatile__("mov %0, %0" : "+r" (dummy));
-}
-
-
-void caleb_reset(void)
-{
-        /*
-         * Perform a chip reset.
-         */
-        caleb_reg_write(CALEB_RESET, 0x02);
-        udelay(1);
-
-        /*
-         * Enable all interrupt sources.  This is needed to get
-         * meaningful results out of the status bits (register 6
-         * and 7.)
-         */
-        caleb_reg_write(CALEB_INTREN0, 0xff);
-        caleb_reg_write(CALEB_INTREN1, 0x07);
-
-        /*
-         * Set RX and TX FIFO thresholds to 1.5kb.
-         */
-        caleb_reg_write(CALEB_PHY0RX, 0x11);
-        caleb_reg_write(CALEB_PHY1RX, 0x11);
-        caleb_reg_write(CALEB_PHY0TX, 0x11);
-        caleb_reg_write(CALEB_PHY1TX, 0x11);
-
-        /*
-         * Program SPI-3 burst size.
-         */
-        caleb_reg_write(CALEB_BURST, 0);        // 64-byte RBUF mpackets
-//      caleb_reg_write(CALEB_BURST, 1);        // 128-byte RBUF mpackets
-//      caleb_reg_write(CALEB_BURST, 2);        // 256-byte RBUF mpackets
-}
-
-void caleb_enable_rx(int port)
-{
-        u8 temp;
-
-        temp = caleb_reg_read(CALEB_PORTEN);
-        temp |= 1 << port;
-        caleb_reg_write(CALEB_PORTEN, temp);
-}
-
-void caleb_disable_rx(int port)
-{
-        u8 temp;
-
-        temp = caleb_reg_read(CALEB_PORTEN);
-        temp &= ~(1 << port);
-        caleb_reg_write(CALEB_PORTEN, temp);
-}
-
-void caleb_enable_tx(int port)
-{
-        u8 temp;
-
-        temp = caleb_reg_read(CALEB_PORTEN);
-        temp |= 1 << (port + 4);
-        caleb_reg_write(CALEB_PORTEN, temp);
-}
-
-void caleb_disable_tx(int port)
-{
-        u8 temp;
-
-        temp = caleb_reg_read(CALEB_PORTEN);
-        temp &= ~(1 << (port + 4));
-        caleb_reg_write(CALEB_PORTEN, temp);
-}
diff --git a/drivers/net/ethernet/xscale/ixp2000/caleb.h b/drivers/net/ethernet/xscale/ixp2000/caleb.h
deleted file mode 100644
index e93a1ef5b8a3..000000000000
--- a/drivers/net/ethernet/xscale/ixp2000/caleb.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Helper functions for the SPI-3 bridge FPGA on the Radisys ENP2611
- * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
- * Dedicated to Marija Kulikova.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef __CALEB_H
-#define __CALEB_H
-
-void caleb_reset(void);
-void caleb_enable_rx(int port);
-void caleb_disable_rx(int port);
-void caleb_enable_tx(int port);
-void caleb_disable_tx(int port);
-
-
-#endif
diff --git a/drivers/net/ethernet/xscale/ixp2000/enp2611.c b/drivers/net/ethernet/xscale/ixp2000/enp2611.c
deleted file mode 100644
index 34a6cfd17930..000000000000
--- a/drivers/net/ethernet/xscale/ixp2000/enp2611.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * IXP2400 MSF network device driver for the Radisys ENP2611
- * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
- * Dedicated to Marija Kulikova.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/init.h>
-#include <linux/moduleparam.h>
-#include <asm/hardware/uengine.h>
-#include <asm/mach-types.h>
-#include <asm/io.h>
-#include "ixpdev.h"
-#include "caleb.h"
-#include "ixp2400-msf.h"
-#include "pm3386.h"
-
-/***********************************************************************
- * The Radisys ENP2611 is a PCI form factor board with three SFP GBIC
- * slots, connected via two PMC/Sierra 3386s and an SPI-3 bridge FPGA
- * to the IXP2400.
- *
- *                +-------------+
- * SFP GBIC #0 ---+             |       +---------+
- *                |  PM3386 #0  +-------+         |
- * SFP GBIC #1 ---+             |       | "Caleb" |         +---------+
- *                +-------------+       |         |         |         |
- *                                      | SPI-3   +---------+ IXP2400 |
- *                +-------------+       | bridge  |         |         |
- * SFP GBIC #2 ---+             |       | FPGA    |         +---------+
- *                |  PM3386 #1  +-------+         |
- *                |             |       +---------+
- *                +-------------+
- *              ^                   ^                  ^
- *              | 1.25Gbaud         | 104MHz           | 104MHz
- *              | SERDES ea.        | SPI-3 ea.        | SPI-3
- *
- ***********************************************************************/
-static struct ixp2400_msf_parameters enp2611_msf_parameters =
-{
-        .rx_mode =              IXP2400_RX_MODE_UTOPIA_POS |
-                                IXP2400_RX_MODE_1x32 |
-                                IXP2400_RX_MODE_MPHY |
-                                IXP2400_RX_MODE_MPHY_32 |
-                                IXP2400_RX_MODE_MPHY_POLLED_STATUS |
-                                IXP2400_RX_MODE_MPHY_LEVEL3 |
-                                IXP2400_RX_MODE_RBUF_SIZE_64,
-
-        .rxclk01_multiplier =   IXP2400_PLL_MULTIPLIER_16,
-
-        .rx_poll_ports =        3,
-
-        .rx_channel_mode = {
-                IXP2400_PORT_RX_MODE_MASTER |
-                IXP2400_PORT_RX_MODE_POS_PHY |
-                IXP2400_PORT_RX_MODE_POS_PHY_L3 |
-                IXP2400_PORT_RX_MODE_ODD_PARITY |
-                IXP2400_PORT_RX_MODE_2_CYCLE_DECODE,
-
-                IXP2400_PORT_RX_MODE_MASTER |
-                IXP2400_PORT_RX_MODE_POS_PHY |
-                IXP2400_PORT_RX_MODE_POS_PHY_L3 |
-                IXP2400_PORT_RX_MODE_ODD_PARITY |
-                IXP2400_PORT_RX_MODE_2_CYCLE_DECODE,
-
-                IXP2400_PORT_RX_MODE_MASTER |
-                IXP2400_PORT_RX_MODE_POS_PHY |
-                IXP2400_PORT_RX_MODE_POS_PHY_L3 |
-                IXP2400_PORT_RX_MODE_ODD_PARITY |
-                IXP2400_PORT_RX_MODE_2_CYCLE_DECODE,
-
-                IXP2400_PORT_RX_MODE_MASTER |
-                IXP2400_PORT_RX_MODE_POS_PHY |
-                IXP2400_PORT_RX_MODE_POS_PHY_L3 |
-                IXP2400_PORT_RX_MODE_ODD_PARITY |
-                IXP2400_PORT_RX_MODE_2_CYCLE_DECODE
-        },
-
-        .tx_mode =              IXP2400_TX_MODE_UTOPIA_POS |
-                                IXP2400_TX_MODE_1x32 |
-                                IXP2400_TX_MODE_MPHY |
-                                IXP2400_TX_MODE_MPHY_32 |
-                                IXP2400_TX_MODE_MPHY_POLLED_STATUS |
-                                IXP2400_TX_MODE_MPHY_LEVEL3 |
-                                IXP2400_TX_MODE_TBUF_SIZE_64,
-
-        .txclk01_multiplier =   IXP2400_PLL_MULTIPLIER_16,
-
-        .tx_poll_ports =        3,
-
-        .tx_channel_mode = {
-                IXP2400_PORT_TX_MODE_MASTER |
-                IXP2400_PORT_TX_MODE_POS_PHY |
-                IXP2400_PORT_TX_MODE_ODD_PARITY |
-                IXP2400_PORT_TX_MODE_2_CYCLE_DECODE,
-
-                IXP2400_PORT_TX_MODE_MASTER |
-                IXP2400_PORT_TX_MODE_POS_PHY |
-                IXP2400_PORT_TX_MODE_ODD_PARITY |
-                IXP2400_PORT_TX_MODE_2_CYCLE_DECODE,
-
-                IXP2400_PORT_TX_MODE_MASTER |
-                IXP2400_PORT_TX_MODE_POS_PHY |
-                IXP2400_PORT_TX_MODE_ODD_PARITY |
-                IXP2400_PORT_TX_MODE_2_CYCLE_DECODE,
-
-                IXP2400_PORT_TX_MODE_MASTER |
-                IXP2400_PORT_TX_MODE_POS_PHY |
-                IXP2400_PORT_TX_MODE_ODD_PARITY |
-                IXP2400_PORT_TX_MODE_2_CYCLE_DECODE
-        }
-};
-
-static struct net_device *nds[3];
-static struct timer_list link_check_timer;
-
-/* @@@ Poll the SFP moddef0 line too.  */
-/* @@@ Try to use the pm3386 DOOL interrupt as well.  */
-static void enp2611_check_link_status(unsigned long __dummy)
-{
-        int i;
-
-        for (i = 0; i < 3; i++) {
-                struct net_device *dev;
-                int status;
-
-                dev = nds[i];
-                if (dev == NULL)
-                        continue;
-
-                status = pm3386_is_link_up(i);
-                if (status && !netif_carrier_ok(dev)) {
-                        /* @@@ Should report autonegotiation status.  */
-                        printk(KERN_INFO "%s: NIC Link is Up\n", dev->name);
-
-                        pm3386_enable_tx(i);
-                        caleb_enable_tx(i);
-                        netif_carrier_on(dev);
-                } else if (!status && netif_carrier_ok(dev)) {
-                        printk(KERN_INFO "%s: NIC Link is Down\n", dev->name);
-
-                        netif_carrier_off(dev);
-                        caleb_disable_tx(i);
-                        pm3386_disable_tx(i);
-                }
-        }
-
-        link_check_timer.expires = jiffies + HZ / 10;
-        add_timer(&link_check_timer);
-}
-
-static void enp2611_set_port_admin_status(int port, int up)
-{
-        if (up) {
-                caleb_enable_rx(port);
-
-                pm3386_set_carrier(port, 1);
-                pm3386_enable_rx(port);
-        } else {
-                caleb_disable_tx(port);
-                pm3386_disable_tx(port);
-                /* @@@ Flush out pending packets.  */
-                pm3386_set_carrier(port, 0);
-
-                pm3386_disable_rx(port);
-                caleb_disable_rx(port);
-        }
-}
-
-static int __init enp2611_init_module(void)
-{ 
-        int ports;
-        int i;
-
-        if (!machine_is_enp2611())
-                return -ENODEV;
-
-        caleb_reset();
-        pm3386_reset();
-
-        ports = pm3386_port_count();
-        for (i = 0; i < ports; i++) {
-                nds[i] = ixpdev_alloc(i, sizeof(struct ixpdev_priv));
-                if (nds[i] == NULL) {
-                        while (--i >= 0)
-                                free_netdev(nds[i]);
-                        return -ENOMEM;
-                }
-
-                pm3386_init_port(i);
-                pm3386_get_mac(i, nds[i]->dev_addr);
-        }
-
-        ixp2400_msf_init(&enp2611_msf_parameters);
-
-        if (ixpdev_init(ports, nds, enp2611_set_port_admin_status)) {
-                for (i = 0; i < ports; i++)
-                        if (nds[i])
-                                free_netdev(nds[i]);
-                return -EINVAL;
-        }
-
-        init_timer(&link_check_timer);
-        link_check_timer.function = enp2611_check_link_status;
-        link_check_timer.expires = jiffies;
-        add_timer(&link_check_timer);
-
-        return 0;
-}
-
-static void __exit enp2611_cleanup_module(void)
-{
-        int i;
-
-        del_timer_sync(&link_check_timer);
-
-        ixpdev_deinit();
-        for (i = 0; i < 3; i++)
-                free_netdev(nds[i]);
-}
-
-module_init(enp2611_init_module);
-module_exit(enp2611_cleanup_module);
-MODULE_LICENSE("GPL");
diff --git a/drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.c b/drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.c
deleted file mode 100644
index f5ffd7e05d26..000000000000
--- a/drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Generic library functions for the MSF (Media and Switch Fabric) unit
- * found on the Intel IXP2400 network processor.
- *
- * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
- * Dedicated to Marija Kulikova.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <mach/hardware.h>
-#include <mach/ixp2000-regs.h>
-#include <asm/delay.h>
-#include <asm/io.h>
-#include "ixp2400-msf.h"
-
-/*
- * This is the Intel recommended PLL init procedure as described on
- * page 340 of the IXP2400/IXP2800 Programmer's Reference Manual.
- */
-static void ixp2400_pll_init(struct ixp2400_msf_parameters *mp)
-{
-        int rx_dual_clock;
-        int tx_dual_clock;
-        u32 value;
-
-        /*
-         * If the RX mode is not 1x32, we have to enable both RX PLLs
-         * (#0 and #1.)  The same thing for the TX direction.
-         */
-        rx_dual_clock = !!(mp->rx_mode & IXP2400_RX_MODE_WIDTH_MASK);
-        tx_dual_clock = !!(mp->tx_mode & IXP2400_TX_MODE_WIDTH_MASK);
-
-        /*
-         * Read initial value.
-         */
-        value = ixp2000_reg_read(IXP2000_MSF_CLK_CNTRL);
-
-        /*
-         * Put PLLs in powerdown and bypass mode.
-         */
-        value |= 0x0000f0f0;
-        ixp2000_reg_write(IXP2000_MSF_CLK_CNTRL, value);
-
-        /*
-         * Set single or dual clock mode bits.
-         */
-        value &= ~0x03000000;
-        value |= (rx_dual_clock << 24) | (tx_dual_clock << 25);
-
-        /*
-         * Set multipliers.
-         */
-        value &= ~0x00ff0000;
-        value |= mp->rxclk01_multiplier << 16;
-        value |= mp->rxclk23_multiplier << 18;
-        value |= mp->txclk01_multiplier << 20;
-        value |= mp->txclk23_multiplier << 22;
-
-        /*
-         * And write value.
-         */
-        ixp2000_reg_write(IXP2000_MSF_CLK_CNTRL, value);
-
-        /*
-         * Disable PLL bypass mode.
-         */
-        value &= ~(0x00005000 | rx_dual_clock << 13 | tx_dual_clock << 15);
-        ixp2000_reg_write(IXP2000_MSF_CLK_CNTRL, value);
-
-        /*
-         * Turn on PLLs.
-         */
-        value &= ~(0x00000050 | rx_dual_clock << 5 | tx_dual_clock << 7);
-        ixp2000_reg_write(IXP2000_MSF_CLK_CNTRL, value);
-
-        /*
-         * Wait for PLLs to lock.  There are lock status bits, but IXP2400
-         * erratum #65 says that these lock bits should not be relied upon
-         * as they might not accurately reflect the true state of the PLLs.
-         */
-        udelay(100);
-}
-
-/*
- * Needed according to p480 of Programmer's Reference Manual.
- */
-static void ixp2400_msf_free_rbuf_entries(struct ixp2400_msf_parameters *mp)
-{
-        int size_bits;
-        int i;
-
-        /*
-         * Work around IXP2400 erratum #69 (silent RBUF-to-DRAM transfer
-         * corruption) in the Intel-recommended way: do not add the RBUF
-         * elements susceptible to corruption to the freelist.
-         */
-        size_bits = mp->rx_mode & IXP2400_RX_MODE_RBUF_SIZE_MASK;
-        if (size_bits == IXP2400_RX_MODE_RBUF_SIZE_64) {
-                for (i = 1; i < 128; i++) {
-                        if (i == 9 || i == 18 || i == 27)
-                                continue;
-                        ixp2000_reg_write(IXP2000_MSF_RBUF_ELEMENT_DONE, i);
-                }
-        } else if (size_bits == IXP2400_RX_MODE_RBUF_SIZE_128) {
-                for (i = 1; i < 64; i++) {
-                        if (i == 4 || i == 9 || i == 13)
-                                continue;
-                        ixp2000_reg_write(IXP2000_MSF_RBUF_ELEMENT_DONE, i);
-                }
-        } else if (size_bits == IXP2400_RX_MODE_RBUF_SIZE_256) {
-                for (i = 1; i < 32; i++) {
-                        if (i == 2 || i == 4 || i == 6)
-                                continue;
-                        ixp2000_reg_write(IXP2000_MSF_RBUF_ELEMENT_DONE, i);
-                }
-        }
-}
-
-static u32 ixp2400_msf_valid_channels(u32 reg)
-{
-        u32 channels;
-
-        channels = 0;
-        switch (reg & IXP2400_RX_MODE_WIDTH_MASK) {
-        case IXP2400_RX_MODE_1x32:
-                channels = 0x1;
-                if (reg & IXP2400_RX_MODE_MPHY &&
-                    !(reg & IXP2400_RX_MODE_MPHY_32))
-                        channels = 0xf;
-                break;
-
-        case IXP2400_RX_MODE_2x16:
-                channels = 0x5;
-                break;
-
-        case IXP2400_RX_MODE_4x8:
-                channels = 0xf;
-                break;
-
-        case IXP2400_RX_MODE_1x16_2x8:
-                channels = 0xd;
-                break;
-        }
-
-        return channels;
-}
-
-static void ixp2400_msf_enable_rx(struct ixp2400_msf_parameters *mp)
-{
-        u32 value;
-
-        value = ixp2000_reg_read(IXP2000_MSF_RX_CONTROL) & 0x0fffffff;
-        value |= ixp2400_msf_valid_channels(mp->rx_mode) << 28;
-        ixp2000_reg_write(IXP2000_MSF_RX_CONTROL, value);
-}
-
-static void ixp2400_msf_enable_tx(struct ixp2400_msf_parameters *mp)
-{
-        u32 value;
-
-        value = ixp2000_reg_read(IXP2000_MSF_TX_CONTROL) & 0x0fffffff;
-        value |= ixp2400_msf_valid_channels(mp->tx_mode) << 28;
-        ixp2000_reg_write(IXP2000_MSF_TX_CONTROL, value);
-}
-
-
-void ixp2400_msf_init(struct ixp2400_msf_parameters *mp)
-{
-        u32 value;
-        int i;
-
-        /*
-         * Init the RX/TX PLLs based on the passed parameter block.
-         */
-        ixp2400_pll_init(mp);
-
-        /*
-         * Reset MSF.  Bit 7 in IXP_RESET_0 resets the MSF.
-         */
-        value = ixp2000_reg_read(IXP2000_RESET0);
-        ixp2000_reg_write(IXP2000_RESET0, value | 0x80);
-        ixp2000_reg_write(IXP2000_RESET0, value & ~0x80);
-
-        /*
-         * Initialise the RX section.
-         */
-        ixp2000_reg_write(IXP2000_MSF_RX_MPHY_POLL_LIMIT, mp->rx_poll_ports - 1);
-        ixp2000_reg_write(IXP2000_MSF_RX_CONTROL, mp->rx_mode);
-        for (i = 0; i < 4; i++) {
-                ixp2000_reg_write(IXP2000_MSF_RX_UP_CONTROL_0 + i,
-                                                mp->rx_channel_mode[i]);
-        }
-        ixp2400_msf_free_rbuf_entries(mp);
-        ixp2400_msf_enable_rx(mp);
-
-        /*
-         * Initialise the TX section.
-         */
-        ixp2000_reg_write(IXP2000_MSF_TX_MPHY_POLL_LIMIT, mp->tx_poll_ports - 1);
-        ixp2000_reg_write(IXP2000_MSF_TX_CONTROL, mp->tx_mode);
-        for (i = 0; i < 4; i++) {
-                ixp2000_reg_write(IXP2000_MSF_TX_UP_CONTROL_0 + i,
-                                                mp->tx_channel_mode[i]);
-        }
-        ixp2400_msf_enable_tx(mp);
-}
diff --git a/drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.h b/drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.h
deleted file mode 100644
index 3ac1af2771da..000000000000
--- a/drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Generic library functions for the MSF (Media and Switch Fabric) unit
- * found on the Intel IXP2400 network processor.
- *
- * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
- * Dedicated to Marija Kulikova.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
- */
-
-#ifndef __IXP2400_MSF_H
-#define __IXP2400_MSF_H
-
-struct ixp2400_msf_parameters
-{
-        u32                             rx_mode;
-        unsigned                        rxclk01_multiplier:2;
-        unsigned                        rxclk23_multiplier:2;
-        unsigned                        rx_poll_ports:6;
-        u32                             rx_channel_mode[4];
-
-        u32                             tx_mode;
-        unsigned                        txclk01_multiplier:2;
-        unsigned                        txclk23_multiplier:2;
-        unsigned                        tx_poll_ports:6;
-        u32                             tx_channel_mode[4];
-};
-
-void ixp2400_msf_init(struct ixp2400_msf_parameters *mp);
-
-#define IXP2400_PLL_MULTIPLIER_48               0x00
-#define IXP2400_PLL_MULTIPLIER_24               0x01
-#define IXP2400_PLL_MULTIPLIER_16               0x02
-#define IXP2400_PLL_MULTIPLIER_12               0x03
-
-#define IXP2400_RX_MODE_CSIX                    0x00400000
-#define IXP2400_RX_MODE_UTOPIA_POS              0x00000000
-#define IXP2400_RX_MODE_WIDTH_MASK              0x00300000
-#define IXP2400_RX_MODE_1x16_2x8                0x00300000
-#define IXP2400_RX_MODE_4x8                     0x00200000
-#define IXP2400_RX_MODE_2x16                    0x00100000
-#define IXP2400_RX_MODE_1x32                    0x00000000
-#define IXP2400_RX_MODE_MPHY                    0x00080000
-#define IXP2400_RX_MODE_SPHY                    0x00000000
-#define IXP2400_RX_MODE_MPHY_32                 0x00040000
-#define IXP2400_RX_MODE_MPHY_4                  0x00000000
-#define IXP2400_RX_MODE_MPHY_POLLED_STATUS      0x00020000
-#define IXP2400_RX_MODE_MPHY_DIRECT_STATUS      0x00000000
-#define IXP2400_RX_MODE_CBUS_FULL_DUPLEX        0x00010000
-#define IXP2400_RX_MODE_CBUS_SIMPLEX            0x00000000
-#define IXP2400_RX_MODE_MPHY_LEVEL2             0x00004000
-#define IXP2400_RX_MODE_MPHY_LEVEL3             0x00000000
-#define IXP2400_RX_MODE_CBUS_8BIT               0x00002000
-#define IXP2400_RX_MODE_CBUS_4BIT               0x00000000
-#define IXP2400_RX_MODE_CSIX_SINGLE_FREELIST    0x00000200
-#define IXP2400_RX_MODE_CSIX_SPLIT_FREELISTS    0x00000000
-#define IXP2400_RX_MODE_RBUF_SIZE_MASK          0x0000000c
-#define IXP2400_RX_MODE_RBUF_SIZE_256           0x00000008
-#define IXP2400_RX_MODE_RBUF_SIZE_128           0x00000004
-#define IXP2400_RX_MODE_RBUF_SIZE_64            0x00000000
-
-#define IXP2400_PORT_RX_MODE_SLAVE              0x00000040
-#define IXP2400_PORT_RX_MODE_MASTER             0x00000000
-#define IXP2400_PORT_RX_MODE_POS_PHY_L3         0x00000020
-#define IXP2400_PORT_RX_MODE_POS_PHY_L2         0x00000000
-#define IXP2400_PORT_RX_MODE_POS_PHY            0x00000010
-#define IXP2400_PORT_RX_MODE_UTOPIA             0x00000000
-#define IXP2400_PORT_RX_MODE_EVEN_PARITY        0x0000000c
-#define IXP2400_PORT_RX_MODE_ODD_PARITY         0x00000008
-#define IXP2400_PORT_RX_MODE_NO_PARITY          0x00000000
-#define IXP2400_PORT_RX_MODE_UTOPIA_BIG_CELLS   0x00000002
-#define IXP2400_PORT_RX_MODE_UTOPIA_NORMAL_CELLS        0x00000000
-#define IXP2400_PORT_RX_MODE_2_CYCLE_DECODE     0x00000001
-#define IXP2400_PORT_RX_MODE_1_CYCLE_DECODE     0x00000000
-
-#define IXP2400_TX_MODE_CSIX                    0x00400000
-#define IXP2400_TX_MODE_UTOPIA_POS              0x00000000
-#define IXP2400_TX_MODE_WIDTH_MASK              0x00300000
-#define IXP2400_TX_MODE_1x16_2x8                0x00300000
-#define IXP2400_TX_MODE_4x8                     0x00200000
-#define IXP2400_TX_MODE_2x16                    0x00100000
-#define IXP2400_TX_MODE_1x32                    0x00000000
-#define IXP2400_TX_MODE_MPHY                    0x00080000
-#define IXP2400_TX_MODE_SPHY                    0x00000000
-#define IXP2400_TX_MODE_MPHY_32                 0x00040000
-#define IXP2400_TX_MODE_MPHY_4                  0x00000000
-#define IXP2400_TX_MODE_MPHY_POLLED_STATUS      0x00020000
-#define IXP2400_TX_MODE_MPHY_DIRECT_STATUS      0x00000000
-#define IXP2400_TX_MODE_CBUS_FULL_DUPLEX        0x00010000
-#define IXP2400_TX_MODE_CBUS_SIMPLEX            0x00000000
-#define IXP2400_TX_MODE_MPHY_LEVEL2             0x00004000
-#define IXP2400_TX_MODE_MPHY_LEVEL3             0x00000000
-#define IXP2400_TX_MODE_CBUS_8BIT               0x00002000
-#define IXP2400_TX_MODE_CBUS_4BIT               0x00000000
-#define IXP2400_TX_MODE_TBUF_SIZE_MASK          0x0000000c
-#define IXP2400_TX_MODE_TBUF_SIZE_256           0x00000008
-#define IXP2400_TX_MODE_TBUF_SIZE_128           0x00000004
-#define IXP2400_TX_MODE_TBUF_SIZE_64            0x00000000
-
-#define IXP2400_PORT_TX_MODE_SLAVE              0x00000040
-#define IXP2400_PORT_TX_MODE_MASTER             0x00000000
-#define IXP2400_PORT_TX_MODE_POS_PHY            0x00000010
-#define IXP2400_PORT_TX_MODE_UTOPIA             0x00000000
-#define IXP2400_PORT_TX_MODE_EVEN_PARITY        0x0000000c
-#define IXP2400_PORT_TX_MODE_ODD_PARITY         0x00000008
-#define IXP2400_PORT_TX_MODE_NO_PARITY          0x00000000
-#define IXP2400_PORT_TX_MODE_UTOPIA_BIG_CELLS   0x00000002
-#define IXP2400_PORT_TX_MODE_2_CYCLE_DECODE     0x00000001
-#define IXP2400_PORT_TX_MODE_1_CYCLE_DECODE     0x00000000
-
-
-#endif
diff --git a/drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.uc b/drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.uc
deleted file mode 100644
index 42a73e357afa..000000000000
--- a/drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.uc
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- * RX ucode for the Intel IXP2400 in POS-PHY mode.
- * Copyright (C) 2004, 2005 Lennert Buytenhek
- * Dedicated to Marija Kulikova.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Assumptions made in this code:
- * - The IXP2400 MSF is configured for POS-PHY mode, in a mode where
- *   only one full element list is used.  This includes, for example,
- *   1x32 SPHY and 1x32 MPHY32, but not 4x8 SPHY or 1x32 MPHY4.  (This
- *   is not an exhaustive list.)
- * - The RBUF uses 64-byte mpackets.
- * - RX descriptors reside in SRAM, and have the following format:
- *      struct rx_desc
- *      {
- *      // to uengine
- *              u32     buf_phys_addr;
- *              u32     buf_length;
- *
- *      // from uengine
- *              u32     channel;
- *              u32     pkt_length;
- *      };
- * - Packet data resides in DRAM.
- * - Packet buffer addresses are 8-byte aligned.
- * - Scratch ring 0 is rx_pending.
- * - Scratch ring 1 is rx_done, and has status condition 'full'.
- * - The host triggers rx_done flush and rx_pending refill on seeing INTA.
- * - This code is run on all eight threads of the microengine it runs on.
- *
- * Local memory is used for per-channel RX state.
- */
-
-#define RX_THREAD_FREELIST_0            0x0030
-#define RBUF_ELEMENT_DONE               0x0044
-
-#define CHANNEL_FLAGS                   *l$index0[0]
-#define CHANNEL_FLAG_RECEIVING          1
-#define PACKET_LENGTH                   *l$index0[1]
-#define PACKET_CHECKSUM                 *l$index0[2]
-#define BUFFER_HANDLE                   *l$index0[3]
-#define BUFFER_START                    *l$index0[4]
-#define BUFFER_LENGTH                   *l$index0[5]
-
-#define CHANNEL_STATE_SIZE              24      // in bytes
-#define CHANNEL_STATE_SHIFT             5       // ceil(log2(state size))
-
-
-        .sig volatile sig1
-        .sig volatile sig2
-        .sig volatile sig3
-
-        .sig mpacket_arrived
-        .reg add_to_rx_freelist
-        .reg read $rsw0, $rsw1
-        .xfer_order $rsw0 $rsw1
-
-        .reg zero
-
-        /*
-         * Initialise add_to_rx_freelist.
-         */
-        .begin
-                .reg temp
-                .reg temp2
-
-                immed[add_to_rx_freelist, RX_THREAD_FREELIST_0]
-                immed_w1[add_to_rx_freelist, (&$rsw0 | (&mpacket_arrived << 12))]
-
-                local_csr_rd[ACTIVE_CTX_STS]
-                immed[temp, 0]
-                alu[temp2, temp, and, 0x1f]
-                alu_shf[add_to_rx_freelist, add_to_rx_freelist, or, temp2, <<20]
-                alu[temp2, temp, and, 0x80]
-                alu_shf[add_to_rx_freelist, add_to_rx_freelist, or, temp2, <<18]
-        .end
-
-        immed[zero, 0]
-
-        /*
-         * Skip context 0 initialisation?
-         */
-        .begin
-                br!=ctx[0, mpacket_receive_loop#]
-        .end
-
-        /*
-         * Initialise local memory.
-         */
-        .begin
-                .reg addr
-                .reg temp
-
-                immed[temp, 0]
-        init_local_mem_loop#:
-                alu_shf[addr, --, b, temp, <<CHANNEL_STATE_SHIFT]
-                local_csr_wr[ACTIVE_LM_ADDR_0, addr]
-                nop
-                nop
-                nop
-
-                immed[CHANNEL_FLAGS, 0]
-
-                alu[temp, temp, +, 1]
-                alu[--, temp, and, 0x20]
-                beq[init_local_mem_loop#]
-        .end
-
-        /*
-         * Initialise signal pipeline.
-         */
-        .begin
-                local_csr_wr[SAME_ME_SIGNAL, (&sig1 << 3)]
-                .set_sig sig1
-
-                local_csr_wr[SAME_ME_SIGNAL, (&sig2 << 3)]
-                .set_sig sig2
-
-                local_csr_wr[SAME_ME_SIGNAL, (&sig3 << 3)]
-                .set_sig sig3
-        .end
-
-mpacket_receive_loop#:
-        /*
-         * Synchronise and wait for mpacket.
-         */
-        .begin
-                ctx_arb[sig1]
-                local_csr_wr[SAME_ME_SIGNAL, (0x80 | (&sig1 << 3))]
-
-                msf[fast_wr, --, add_to_rx_freelist, 0]
-                .set_sig mpacket_arrived
-                ctx_arb[mpacket_arrived]
-                .set $rsw0 $rsw1
-        .end
-
-        /*
-         * We halt if we see {inbparerr,parerr,null,soperror}.
-         */
-        .begin
-                alu_shf[--, 0x1b, and, $rsw0, >>8]
-                bne[abort_rswerr#]
-        .end
-
-        /*
-         * Point local memory pointer to this channel's state area.
-         */
-        .begin
-                .reg chanaddr
-
-                alu[chanaddr, $rsw0, and, 0x1f]
-                alu_shf[chanaddr, --, b, chanaddr, <<CHANNEL_STATE_SHIFT]
-                local_csr_wr[ACTIVE_LM_ADDR_0, chanaddr]
-                nop
-                nop
-                nop
-        .end
-
-        /*
-         * Check whether we received a SOP mpacket while we were already
-         * working on a packet, or a non-SOP mpacket while there was no
-         * packet pending.  (SOP == RECEIVING -> abort)  If everything's
-         * okay, update the RECEIVING flag to reflect our new state.
-         */
-        .begin
-                .reg temp
-                .reg eop
-
-                #if CHANNEL_FLAG_RECEIVING != 1
-                #error CHANNEL_FLAG_RECEIVING is not 1
-                #endif
-
-                alu_shf[temp, 1, and, $rsw0, >>15]
-                alu[temp, temp, xor, CHANNEL_FLAGS]
-                alu[--, temp, and, CHANNEL_FLAG_RECEIVING]
-                beq[abort_proterr#]
-
-                alu_shf[eop, 1, and, $rsw0, >>14]
-                alu[CHANNEL_FLAGS, temp, xor, eop]
-        .end
-
-        /*
-         * Copy the mpacket into the right spot, and in case of EOP,
-         * write back the descriptor and pass the packet on.
-         */
-        .begin
-                .reg buffer_offset
-                .reg _packet_length
-                .reg _packet_checksum
-                .reg _buffer_handle
-                .reg _buffer_start
-                .reg _buffer_length
-
-                /*
-                 * Determine buffer_offset, _packet_length and
-                 * _packet_checksum.
-                 */
-                .begin
-                        .reg temp
-
-                        alu[--, 1, and, $rsw0, >>15]
-                        beq[not_sop#]
-
-                        immed[PACKET_LENGTH, 0]
-                        immed[PACKET_CHECKSUM, 0]
-
-                not_sop#:
-                        alu[buffer_offset, --, b, PACKET_LENGTH]
-                        alu_shf[temp, 0xff, and, $rsw0, >>16]
-                        alu[_packet_length, buffer_offset, +, temp]
-                        alu[PACKET_LENGTH, --, b, _packet_length]
-
-                        immed[temp, 0xffff]
-                        alu[temp, $rsw1, and, temp]
-                        alu[_packet_checksum, PACKET_CHECKSUM, +, temp]
-                        alu[PACKET_CHECKSUM, --, b, _packet_checksum]
-                .end
-
-                /*
-                 * Allocate buffer in case of SOP.
-                 */
-                .begin
-                        .reg temp
-
-                        alu[temp, 1, and, $rsw0, >>15]
-                        beq[skip_buffer_alloc#]
-
-                        .begin
-                                .sig zzz
-                                .reg read $stemp $stemp2
-                                .xfer_order $stemp $stemp2
-
-                        rx_nobufs#:
-                                scratch[get, $stemp, zero, 0, 1], ctx_swap[zzz]
-                                alu[_buffer_handle, --, b, $stemp]
-                                beq[rx_nobufs#]
-
-                                sram[read, $stemp, _buffer_handle, 0, 2],
-                                                                ctx_swap[zzz]
-                                alu[_buffer_start, --, b, $stemp]
-                                alu[_buffer_length, --, b, $stemp2]
-                        .end
-
-                skip_buffer_alloc#:
-                .end
-
-                /*
-                 * Resynchronise.
-                 */
-                .begin
-                        ctx_arb[sig2]
-                        local_csr_wr[SAME_ME_SIGNAL, (0x80 | (&sig2 << 3))]
-                .end
-
-                /*
-                 * Synchronise buffer state.
-                 */
-                .begin
-                        .reg temp
-
-                        alu[temp, 1, and, $rsw0, >>15]
-                        beq[copy_from_local_mem#]
-
-                        alu[BUFFER_HANDLE, --, b, _buffer_handle]
-                        alu[BUFFER_START, --, b, _buffer_start]
-                        alu[BUFFER_LENGTH, --, b, _buffer_length]
-                        br[sync_state_done#]
-
-                copy_from_local_mem#:
-                        alu[_buffer_handle, --, b, BUFFER_HANDLE]
-                        alu[_buffer_start, --, b, BUFFER_START]
-                        alu[_buffer_length, --, b, BUFFER_LENGTH]
-
-                sync_state_done#:
-                .end
-
-#if 0
-                /*
-                 * Debug buffer state management.
-                 */
-                .begin
-                        .reg temp
-
-                        alu[temp, 1, and, $rsw0, >>14]
-                        beq[no_poison#]
-                        immed[BUFFER_HANDLE, 0xdead]
-                        immed[BUFFER_START, 0xdead]
-                        immed[BUFFER_LENGTH, 0xdead]
-                no_poison#:
-
-                        immed[temp, 0xdead]
-                        alu[--, _buffer_handle, -, temp]
-                        beq[state_corrupted#]
-                        alu[--, _buffer_start, -, temp]
-                        beq[state_corrupted#]
-                        alu[--, _buffer_length, -, temp]
-                        beq[state_corrupted#]
-                .end
-#endif
-
-                /*
-                 * Check buffer length.
-                 */
-                .begin
-                        alu[--, _buffer_length, -, _packet_length]
-                        blo[buffer_overflow#]
-                .end
-
-                /*
-                 * Copy the mpacket and give back the RBUF element.
-                 */
-                .begin
-                        .reg element
-                        .reg xfer_size
-                        .reg temp
-                        .sig copy_sig
-
-                        alu_shf[element, 0x7f, and, $rsw0, >>24]
-                        alu_shf[xfer_size, 0xff, and, $rsw0, >>16]
-
-                        alu[xfer_size, xfer_size, -, 1]
-                        alu_shf[xfer_size, 0x10, or, xfer_size, >>3]
-                        alu_shf[temp, 0x10, or, xfer_size, <<21]
-                        alu_shf[temp, temp, or, element, <<11]
-                        alu_shf[--, temp, or, 1, <<18]
-
-                        dram[rbuf_rd, --, _buffer_start, buffer_offset, max_8],
-                                                indirect_ref, sig_done[copy_sig]
-                        ctx_arb[copy_sig]
-
-                        alu[temp, RBUF_ELEMENT_DONE, or, element, <<16]
-                        msf[fast_wr, --, temp, 0]
-                .end
-
-                /*
-                 * If EOP, write back the packet descriptor.
-                 */
-                .begin
-                        .reg write $stemp $stemp2
-                        .xfer_order $stemp $stemp2
-                        .sig zzz
-
-                        alu_shf[--, 1, and, $rsw0, >>14]
-                        beq[no_writeback#]
-
-                        alu[$stemp, $rsw0, and, 0x1f]
-                        alu[$stemp2, --, b, _packet_length]
-                        sram[write, $stemp, _buffer_handle, 8, 2], ctx_swap[zzz]
-
-                no_writeback#:
-                .end
-
-                /*
-                 * Resynchronise.
-                 */
-                .begin
-                        ctx_arb[sig3]
-                        local_csr_wr[SAME_ME_SIGNAL, (0x80 | (&sig3 << 3))]
-                .end
-
-                /*
-                 * If EOP, put the buffer back onto the scratch ring.
-                 */
-                .begin
-                        .reg write $stemp
-                        .sig zzz
-
-                        br_inp_state[SCR_Ring1_Status, rx_done_ring_overflow#]
-
-                        alu_shf[--, 1, and, $rsw0, >>14]
-                        beq[mpacket_receive_loop#]
-
-                        alu[--, 1, and, $rsw0, >>10]
-                        bne[rxerr#]
-
-                        alu[$stemp, --, b, _buffer_handle]
-                        scratch[put, $stemp, zero, 4, 1], ctx_swap[zzz]
-                        cap[fast_wr, 0, XSCALE_INT_A]
-                        br[mpacket_receive_loop#]
-
-                rxerr#:
-                        alu[$stemp, --, b, _buffer_handle]
-                        scratch[put, $stemp, zero, 0, 1], ctx_swap[zzz]
-                        br[mpacket_receive_loop#]
-                .end
-        .end
-
-
-abort_rswerr#:
-        halt
-
-abort_proterr#:
-        halt
-
-state_corrupted#:
-        halt
-
-buffer_overflow#:
-        halt
-
-rx_done_ring_overflow#:
-        halt
-
-
diff --git a/drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.ucode b/drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.ucode
deleted file mode 100644
index e8aee2f81aad..000000000000
--- a/drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.ucode
+++ /dev/null
@@ -1,130 +0,0 @@
-static struct ixp2000_uengine_code ixp2400_rx =
-{
-        .cpu_model_bitmask      = 0x000003fe,
-        .cpu_min_revision       = 0,
-        .cpu_max_revision       = 255,
-
-        .uengine_parameters     = IXP2000_UENGINE_8_CONTEXTS |
-                                  IXP2000_UENGINE_PRN_UPDATE_EVERY |
-                                  IXP2000_UENGINE_NN_FROM_PREVIOUS |
-                                  IXP2000_UENGINE_ASSERT_EMPTY_AT_0 |
-                                  IXP2000_UENGINE_LM_ADDR1_PER_CONTEXT |
-                                  IXP2000_UENGINE_LM_ADDR0_PER_CONTEXT,
-
-        .initial_reg_values     = (struct ixp2000_reg_value []) {
-                { -1, -1 }
-        },
-
-        .num_insns              = 109,
-        .insns                  = (u8 []) {
-                0xf0, 0x00, 0x0c, 0xc0, 0x05,
-                0xf4, 0x44, 0x0c, 0x00, 0x05,
-                0xfc, 0x04, 0x4c, 0x00, 0x00,
-                0xf0, 0x00, 0x00, 0x3b, 0x00,
-                0xb4, 0x40, 0xf0, 0x3b, 0x1f,
-                0x8a, 0xc0, 0x50, 0x3e, 0x05,
-                0xb4, 0x40, 0xf0, 0x3b, 0x80,
-                0x9a, 0xe0, 0x00, 0x3e, 0x05,
-                0xf0, 0x00, 0x00, 0x07, 0x00,
-                0xd8, 0x05, 0xc0, 0x00, 0x11,
-                0xf0, 0x00, 0x00, 0x0f, 0x00,
-                0x91, 0xb0, 0x20, 0x0e, 0x00,
-                0xfc, 0x06, 0x60, 0x0b, 0x00,
-                0xf0, 0x00, 0x0c, 0x03, 0x00,
-                0xf0, 0x00, 0x0c, 0x03, 0x00,
-                0xf0, 0x00, 0x0c, 0x03, 0x00,
-                0xf0, 0x00, 0x0c, 0x02, 0x00,
-                0xb0, 0xc0, 0x30, 0x0f, 0x01,
-                0xa4, 0x70, 0x00, 0x0f, 0x20,
-                0xd8, 0x02, 0xc0, 0x01, 0x00,
-                0xfc, 0x10, 0xac, 0x23, 0x08,
-                0xfc, 0x10, 0xac, 0x43, 0x10,
-                0xfc, 0x10, 0xac, 0x63, 0x18,
-                0xe0, 0x00, 0x00, 0x00, 0x02,
-                0xfc, 0x10, 0xae, 0x23, 0x88,
-                0x3d, 0x00, 0x04, 0x03, 0x20,
-                0xe0, 0x00, 0x00, 0x00, 0x10,
-                0x84, 0x82, 0x02, 0x01, 0x3b,
-                0xd8, 0x1a, 0x00, 0x01, 0x01,
-                0xb4, 0x00, 0x8c, 0x7d, 0x80,
-                0x91, 0xb0, 0x80, 0x22, 0x00,
-                0xfc, 0x06, 0x60, 0x23, 0x00,
-                0xf0, 0x00, 0x0c, 0x03, 0x00,
-                0xf0, 0x00, 0x0c, 0x03, 0x00,
-                0xf0, 0x00, 0x0c, 0x03, 0x00,
-                0x94, 0xf0, 0x92, 0x01, 0x21,
-                0xac, 0x40, 0x60, 0x26, 0x00,
-                0xa4, 0x30, 0x0c, 0x04, 0x06,
-                0xd8, 0x1a, 0x40, 0x01, 0x00,
-                0x94, 0xe0, 0xa2, 0x01, 0x21,
-                0xac, 0x20, 0x00, 0x28, 0x06,
-                0x84, 0xf2, 0x02, 0x01, 0x21,
-                0xd8, 0x0b, 0x40, 0x01, 0x00,
-                0xf0, 0x00, 0x0c, 0x02, 0x01,
-                0xf0, 0x00, 0x0c, 0x02, 0x02,
-                0xa0, 0x00, 0x08, 0x04, 0x00,
-                0x95, 0x00, 0xc6, 0x01, 0xff,
-                0xa0, 0x80, 0x10, 0x30, 0x00,
-                0xa0, 0x60, 0x1c, 0x00, 0x01,
-                0xf0, 0x0f, 0xf0, 0x33, 0xff,
-                0xb4, 0x00, 0xc0, 0x31, 0x81,
-                0xb0, 0x80, 0xb0, 0x32, 0x02,
-                0xa0, 0x20, 0x20, 0x2c, 0x00,
-                0x94, 0xf0, 0xd2, 0x01, 0x21,
-                0xd8, 0x0f, 0x40, 0x01, 0x00,
-                0x19, 0x40, 0x10, 0x04, 0x20,
-                0xa0, 0x00, 0x26, 0x04, 0x00,
-                0xd8, 0x0d, 0xc0, 0x01, 0x00,
-                0x00, 0x42, 0x10, 0x80, 0x02,
-                0xb0, 0x00, 0x46, 0x04, 0x00,
-                0xb0, 0x00, 0x56, 0x08, 0x00,
-                0xe0, 0x00, 0x00, 0x00, 0x04,
-                0xfc, 0x10, 0xae, 0x43, 0x90,
-                0x84, 0xf0, 0x32, 0x01, 0x21,
-                0xd8, 0x11, 0x40, 0x01, 0x00,
-                0xa0, 0x60, 0x3c, 0x00, 0x02,
-                0xa0, 0x20, 0x40, 0x10, 0x00,
-                0xa0, 0x20, 0x50, 0x14, 0x00,
-                0xd8, 0x12, 0x00, 0x00, 0x18,
-                0xa0, 0x00, 0x28, 0x0c, 0x00,
-                0xb0, 0x00, 0x48, 0x10, 0x00,
-                0xb0, 0x00, 0x58, 0x14, 0x00,
-                0xaa, 0xf0, 0x00, 0x14, 0x01,
-                0xd8, 0x1a, 0xc0, 0x01, 0x05,
-                0x85, 0x80, 0x42, 0x01, 0xff,
-                0x95, 0x00, 0x66, 0x01, 0xff,
-                0xba, 0xc0, 0x60, 0x1b, 0x01,
-                0x9a, 0x30, 0x60, 0x19, 0x30,
-                0x9a, 0xb0, 0x70, 0x1a, 0x30,
-                0x9b, 0x50, 0x78, 0x1e, 0x04,
-                0x8a, 0xe2, 0x08, 0x1e, 0x21,
-                0x6a, 0x4e, 0x00, 0x13, 0x00,
-                0xe0, 0x00, 0x00, 0x00, 0x30,
-                0x9b, 0x00, 0x7a, 0x92, 0x04,
-                0x3d, 0x00, 0x04, 0x1f, 0x20,
-                0x84, 0xe2, 0x02, 0x01, 0x21,
-                0xd8, 0x16, 0x80, 0x01, 0x00,
-                0xa4, 0x18, 0x0c, 0x7d, 0x80,
-                0xa0, 0x58, 0x1c, 0x00, 0x01,
-                0x01, 0x42, 0x00, 0xa0, 0x02,
-                0xe0, 0x00, 0x00, 0x00, 0x08,
-                0xfc, 0x10, 0xae, 0x63, 0x98,
-                0xd8, 0x1b, 0x00, 0xc2, 0x14,
-                0x84, 0xe2, 0x02, 0x01, 0x21,
-                0xd8, 0x05, 0xc0, 0x01, 0x00,
-                0x84, 0xa2, 0x02, 0x01, 0x21,
-                0xd8, 0x19, 0x40, 0x01, 0x01,
-                0xa0, 0x58, 0x0c, 0x00, 0x02,
-                0x1a, 0x40, 0x00, 0x04, 0x24,
-                0x33, 0x00, 0x01, 0x2f, 0x20,
-                0xd8, 0x05, 0xc0, 0x00, 0x18,
-                0xa0, 0x58, 0x0c, 0x00, 0x02,
-                0x1a, 0x40, 0x00, 0x04, 0x20,
-                0xd8, 0x05, 0xc0, 0x00, 0x18,
-                0xe0, 0x00, 0x02, 0x00, 0x00,
-                0xe0, 0x00, 0x02, 0x00, 0x00,
-                0xe0, 0x00, 0x02, 0x00, 0x00,
-                0xe0, 0x00, 0x02, 0x00, 0x00,
-                0xe0, 0x00, 0x02, 0x00, 0x00,
-        }
-};
diff --git a/drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.uc b/drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.uc
deleted file mode 100644
index d090d1884fb7..000000000000
--- a/drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.uc
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * TX ucode for the Intel IXP2400 in POS-PHY mode.
- * Copyright (C) 2004, 2005 Lennert Buytenhek
- * Dedicated to Marija Kulikova.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Assumptions made in this code:
- * - The IXP2400 MSF is configured for POS-PHY mode, in a mode where
- *   only one TBUF partition is used.  This includes, for example,
- *   1x32 SPHY and 1x32 MPHY32, but not 4x8 SPHY or 1x32 MPHY4. (This
- *   is not an exhaustive list.)
- * - The TBUF uses 64-byte mpackets.
- * - TX descriptors reside in SRAM, and have the following format:
- *      struct tx_desc
- *      {
- *      // to uengine
- *              u32     buf_phys_addr;
- *              u32     pkt_length;
- *              u32     channel;
- *      };
- * - Packet data resides in DRAM.
- * - Packet buffer addresses are 8-byte aligned.
- * - Scratch ring 2 is tx_pending.
- * - Scratch ring 3 is tx_done, and has status condition 'full'.
- * - This code is run on all eight threads of the microengine it runs on.
- */
-
-#define TX_SEQUENCE_0           0x0060
-#define TBUF_CTRL               0x1800
-
-#define PARTITION_SIZE          128
-#define PARTITION_THRESH        96
-
-
-        .sig volatile sig1
-        .sig volatile sig2
-        .sig volatile sig3
-
-        .reg @old_tx_seq_0
-        .reg @mpkts_in_flight
-        .reg @next_tbuf_mpacket
-
-        .reg @buffer_handle
-        .reg @buffer_start
-        .reg @packet_length
-        .reg @channel
-        .reg @packet_offset
-
-        .reg zero
-
-        immed[zero, 0]
-
-        /*
-         * Skip context 0 initialisation?
-         */
-        .begin
-                br!=ctx[0, mpacket_tx_loop#]
-        .end
-
-        /*
-         * Wait until all pending TBUF elements have been transmitted.
-         */
-        .begin
-                .reg read $tx
-                .sig zzz
-
-        loop_empty#:
-                msf[read, $tx, zero, TX_SEQUENCE_0, 1], ctx_swap[zzz]
-                alu_shf[--, --, b, $tx, >>31]
-                beq[loop_empty#]
-
-                alu[@old_tx_seq_0, --, b, $tx]
-        .end
-
-        immed[@mpkts_in_flight, 0]
-        alu[@next_tbuf_mpacket, @old_tx_seq_0, and, (PARTITION_SIZE - 1)]
-
-        immed[@buffer_handle, 0]
-
-        /*
-         * Initialise signal pipeline.
-         */
-        .begin
-                local_csr_wr[SAME_ME_SIGNAL, (&sig1 << 3)]
-                .set_sig sig1
-
-                local_csr_wr[SAME_ME_SIGNAL, (&sig2 << 3)]
-                .set_sig sig2
-
-                local_csr_wr[SAME_ME_SIGNAL, (&sig3 << 3)]
-                .set_sig sig3
-        .end
-
-mpacket_tx_loop#:
-        .begin
-                .reg tbuf_element_index
-                .reg buffer_handle
-                .reg sop_eop
-                .reg packet_data
-                .reg channel
-                .reg mpacket_size
-
-                /*
-                 * If there is no packet currently being transmitted,
-                 * dequeue the next TX descriptor, and fetch the buffer
-                 * address, packet length and destination channel number.
-                 */
-                .begin
-                        .reg read $stemp $stemp2 $stemp3
-                        .xfer_order $stemp $stemp2 $stemp3
-                        .sig zzz
-
-                        ctx_arb[sig1]
-
-                        alu[--, --, b, @buffer_handle]
-                        bne[already_got_packet#]
-
-                tx_nobufs#:
-                        scratch[get, $stemp, zero, 8, 1], ctx_swap[zzz]
-                        alu[@buffer_handle, --, b, $stemp]
-                        beq[tx_nobufs#]
-
-                        sram[read, $stemp, $stemp, 0, 3], ctx_swap[zzz]
-                        alu[@buffer_start, --, b, $stemp]
-                        alu[@packet_length, --, b, $stemp2]
-                        beq[zero_byte_packet#]
-                        alu[@channel, --, b, $stemp3]
-                        immed[@packet_offset, 0]
-
-                already_got_packet#:
-                        local_csr_wr[SAME_ME_SIGNAL, (0x80 | (&sig1 << 3))]
-                .end
-
-                /*
-                 * Determine tbuf element index, SOP/EOP flags, mpacket
-                 * offset and mpacket size and cache buffer_handle and
-                 * channel number.
-                 */
-                .begin
-                        alu[tbuf_element_index, --, b, @next_tbuf_mpacket]
-                        alu[@next_tbuf_mpacket, @next_tbuf_mpacket, +, 1]
-                        alu[@next_tbuf_mpacket, @next_tbuf_mpacket, and,
-                                                        (PARTITION_SIZE - 1)]
-
-                        alu[buffer_handle, --, b, @buffer_handle]
-                        immed[@buffer_handle, 0]
-
-                        immed[sop_eop, 1]
-
-                        alu[packet_data, --, b, @packet_offset]
-                        bne[no_sop#]
-                        alu[sop_eop, sop_eop, or, 2]
-                no_sop#:
-                        alu[packet_data, packet_data, +, @buffer_start]
-
-                        alu[channel, --, b, @channel]
-
-                        alu[mpacket_size, @packet_length, -, @packet_offset]
-                        alu[--, 64, -, mpacket_size]
-                        bhs[eop#]
-                        alu[@buffer_handle, --, b, buffer_handle]
-                        immed[mpacket_size, 64]
-                        alu[sop_eop, sop_eop, and, 2]
-                eop#:
-
-                        alu[@packet_offset, @packet_offset, +, mpacket_size]
-                .end
-
-                /*
-                 * Wait until there's enough space in the TBUF.
-                 */
-                .begin
-                        .reg read $tx
-                        .reg temp
-                        .sig zzz
-
-                        ctx_arb[sig2]
-
-                        br[test_space#]
-
-                loop_space#:
-                        msf[read, $tx, zero, TX_SEQUENCE_0, 1], ctx_swap[zzz]
-
-                        alu[temp, $tx, -, @old_tx_seq_0]
-                        alu[temp, temp, and, 0xff]
-                        alu[@mpkts_in_flight, @mpkts_in_flight, -, temp]
-
-                        alu[@old_tx_seq_0, --, b, $tx]
-
-                test_space#:
-                        alu[--, PARTITION_THRESH, -, @mpkts_in_flight]
-                        blo[loop_space#]
-
-                        alu[@mpkts_in_flight, @mpkts_in_flight, +, 1]
-
-                        local_csr_wr[SAME_ME_SIGNAL, (0x80 | (&sig2 << 3))]
-                .end
-
-                /*
-                 * Copy the packet data to the TBUF.
-                 */
-                .begin
-                        .reg temp
-                        .sig copy_sig
-
-                        alu[temp, mpacket_size, -, 1]
-                        alu_shf[temp, 0x10, or, temp, >>3]
-                        alu_shf[temp, 0x10, or, temp, <<21]
-                        alu_shf[temp, temp, or, tbuf_element_index, <<11]
-                        alu_shf[--, temp, or, 1, <<18]
-
-                        dram[tbuf_wr, --, packet_data, 0, max_8],
-                                        indirect_ref, sig_done[copy_sig]
-                        ctx_arb[copy_sig]
-                .end
-
-                /*
-                 * Mark TBUF element as ready-to-be-transmitted.
-                 */
-                .begin
-                        .reg write $tsw $tsw2
-                        .xfer_order $tsw $tsw2
-                        .reg temp
-                        .sig zzz
-
-                        alu_shf[temp, channel, or, mpacket_size, <<24]
-                        alu_shf[$tsw, temp, or, sop_eop, <<8]
-                        immed[$tsw2, 0]
-
-                        immed[temp, TBUF_CTRL]
-                        alu_shf[temp, temp, or, tbuf_element_index, <<3]
-                        msf[write, $tsw, temp, 0, 2], ctx_swap[zzz]
-                .end
-
-                /*
-                 * Resynchronise.
-                 */
-                .begin
-                        ctx_arb[sig3]
-                        local_csr_wr[SAME_ME_SIGNAL, (0x80 | (&sig3 << 3))]
-                .end
-
-                /*
-                 * If this was an EOP mpacket, recycle the TX buffer
-                 * and signal the host.
-                 */
-                .begin
-                        .reg write $stemp
-                        .sig zzz
-
-                        alu[--, sop_eop, and, 1]
-                        beq[mpacket_tx_loop#]
-
-                tx_done_ring_full#:
-                        br_inp_state[SCR_Ring3_Status, tx_done_ring_full#]
-
-                        alu[$stemp, --, b, buffer_handle]
-                        scratch[put, $stemp, zero, 12, 1], ctx_swap[zzz]
-                        cap[fast_wr, 0, XSCALE_INT_A]
-                        br[mpacket_tx_loop#]
-                .end
-        .end
-
-
-zero_byte_packet#:
-        halt
-
-
diff --git a/drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.ucode b/drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.ucode
deleted file mode 100644
index a433e24b0a51..000000000000
--- a/drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.ucode
+++ /dev/null
@@ -1,98 +0,0 @@
-static struct ixp2000_uengine_code ixp2400_tx =
-{
-        .cpu_model_bitmask      = 0x000003fe,
-        .cpu_min_revision       = 0,
-        .cpu_max_revision       = 255,
-
-        .uengine_parameters     = IXP2000_UENGINE_8_CONTEXTS |
-                                  IXP2000_UENGINE_PRN_UPDATE_EVERY |
-                                  IXP2000_UENGINE_NN_FROM_PREVIOUS |
-                                  IXP2000_UENGINE_ASSERT_EMPTY_AT_0 |
-                                  IXP2000_UENGINE_LM_ADDR1_PER_CONTEXT |
-                                  IXP2000_UENGINE_LM_ADDR0_PER_CONTEXT,
-
-        .initial_reg_values     = (struct ixp2000_reg_value []) {
-                { -1, -1 }
-        },
-
-        .num_insns              = 77,
-        .insns                  = (u8 []) {
-                0xf0, 0x00, 0x00, 0x07, 0x00,
-                0xd8, 0x03, 0x00, 0x00, 0x11,
-                0x3c, 0x40, 0x00, 0x04, 0xe0,
-                0x81, 0xf2, 0x02, 0x01, 0x00,
-                0xd8, 0x00, 0x80, 0x01, 0x00,
-                0xb0, 0x08, 0x06, 0x00, 0x00,
-                0xf0, 0x00, 0x0c, 0x00, 0x80,
-                0xb4, 0x49, 0x02, 0x03, 0x7f,
-                0xf0, 0x00, 0x02, 0x83, 0x00,
-                0xfc, 0x10, 0xac, 0x23, 0x08,
-                0xfc, 0x10, 0xac, 0x43, 0x10,
-                0xfc, 0x10, 0xac, 0x63, 0x18,
-                0xe0, 0x00, 0x00, 0x00, 0x02,
-                0xa0, 0x30, 0x02, 0x80, 0x00,
-                0xd8, 0x06, 0x00, 0x01, 0x01,
-                0x19, 0x40, 0x00, 0x04, 0x28,
-                0xb0, 0x0a, 0x06, 0x00, 0x00,
-                0xd8, 0x03, 0xc0, 0x01, 0x00,
-                0x00, 0x44, 0x00, 0x80, 0x80,
-                0xa0, 0x09, 0x06, 0x00, 0x00,
-                0xb0, 0x0b, 0x06, 0x04, 0x00,
-                0xd8, 0x13, 0x00, 0x01, 0x00,
-                0xb0, 0x0c, 0x06, 0x08, 0x00,
-                0xf0, 0x00, 0x0c, 0x00, 0xa0,
-                0xfc, 0x10, 0xae, 0x23, 0x88,
-                0xa0, 0x00, 0x12, 0x40, 0x00,
-                0xb0, 0xc9, 0x02, 0x43, 0x01,
-                0xb4, 0x49, 0x02, 0x43, 0x7f,
-                0xb0, 0x00, 0x22, 0x80, 0x00,
-                0xf0, 0x00, 0x02, 0x83, 0x00,
-                0xf0, 0x00, 0x0c, 0x04, 0x02,
-                0xb0, 0x40, 0x6c, 0x00, 0xa0,
-                0xd8, 0x08, 0x80, 0x01, 0x01,
-                0xaa, 0x00, 0x2c, 0x08, 0x02,
-                0xa0, 0xc0, 0x30, 0x18, 0x90,
-                0xa0, 0x00, 0x43, 0x00, 0x00,
-                0xba, 0xc0, 0x32, 0xc0, 0xa0,
-                0xaa, 0xb0, 0x00, 0x0f, 0x40,
-                0xd8, 0x0a, 0x80, 0x01, 0x04,
-                0xb0, 0x0a, 0x00, 0x08, 0x00,
-                0xf0, 0x00, 0x00, 0x0f, 0x40,
-                0xa4, 0x00, 0x2c, 0x08, 0x02,
-                0xa0, 0x8a, 0x00, 0x0c, 0xa0,
-                0xe0, 0x00, 0x00, 0x00, 0x04,
-                0xd8, 0x0c, 0x80, 0x00, 0x18,
-                0x3c, 0x40, 0x00, 0x04, 0xe0,
-                0xba, 0x80, 0x42, 0x01, 0x80,
-                0xb4, 0x40, 0x40, 0x13, 0xff,
-                0xaa, 0x88, 0x00, 0x10, 0x80,
-                0xb0, 0x08, 0x06, 0x00, 0x00,
-                0xaa, 0xf0, 0x0d, 0x80, 0x80,
-                0xd8, 0x0b, 0x40, 0x01, 0x05,
-                0xa0, 0x88, 0x0c, 0x04, 0x80,
-                0xfc, 0x10, 0xae, 0x43, 0x90,
-                0xba, 0xc0, 0x50, 0x0f, 0x01,
-                0x9a, 0x30, 0x50, 0x15, 0x30,
-                0x9a, 0xb0, 0x50, 0x16, 0x30,
-                0x9b, 0x50, 0x58, 0x16, 0x01,
-                0x8a, 0xe2, 0x08, 0x16, 0x21,
-                0x6b, 0x4e, 0x00, 0x83, 0x03,
-                0xe0, 0x00, 0x00, 0x00, 0x30,
-                0x9a, 0x80, 0x70, 0x0e, 0x04,
-                0x8b, 0x88, 0x08, 0x1e, 0x02,
-                0xf0, 0x00, 0x0c, 0x01, 0x81,
-                0xf0, 0x01, 0x80, 0x1f, 0x00,
-                0x9b, 0xd0, 0x78, 0x1e, 0x01,
-                0x3d, 0x42, 0x00, 0x1c, 0x20,
-                0xe0, 0x00, 0x00, 0x00, 0x08,
-                0xfc, 0x10, 0xae, 0x63, 0x98,
-                0xa4, 0x30, 0x0c, 0x04, 0x02,
-                0xd8, 0x03, 0x00, 0x01, 0x00,
-                0xd8, 0x11, 0xc1, 0x42, 0x14,
-                0xa0, 0x18, 0x00, 0x08, 0x00,
-                0x1a, 0x40, 0x00, 0x04, 0x2c,
-                0x33, 0x00, 0x01, 0x2f, 0x20,
-                0xd8, 0x03, 0x00, 0x00, 0x18,
-                0xe0, 0x00, 0x02, 0x00, 0x00,
-        }
-};
diff --git a/drivers/net/ethernet/xscale/ixp2000/ixpdev.c b/drivers/net/ethernet/xscale/ixp2000/ixpdev.c
deleted file mode 100644
index 45008377c8bf..000000000000
--- a/drivers/net/ethernet/xscale/ixp2000/ixpdev.c
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- * IXP2000 MSF network device driver
- * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
- * Dedicated to Marija Kulikova.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/moduleparam.h>
-#include <linux/gfp.h>
-#include <asm/hardware/uengine.h>
-#include <asm/io.h>
-#include "ixp2400_rx.ucode"
-#include "ixp2400_tx.ucode"
-#include "ixpdev_priv.h"
-#include "ixpdev.h"
-#include "pm3386.h"
-
-#define DRV_MODULE_VERSION      "0.2"
-
-static int nds_count;
-static struct net_device **nds;
-static int nds_open;
-static void (*set_port_admin_status)(int port, int up);
-
-static struct ixpdev_rx_desc * const rx_desc =
-        (struct ixpdev_rx_desc *)(IXP2000_SRAM0_VIRT_BASE + RX_BUF_DESC_BASE);
-static struct ixpdev_tx_desc * const tx_desc =
-        (struct ixpdev_tx_desc *)(IXP2000_SRAM0_VIRT_BASE + TX_BUF_DESC_BASE);
-static int tx_pointer;
-
-
-static int ixpdev_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-        struct ixpdev_priv *ip = netdev_priv(dev);
-        struct ixpdev_tx_desc *desc;
-        int entry;
-        unsigned long flags;
-
-        if (unlikely(skb->len > PAGE_SIZE)) {
-                /* @@@ Count drops.  */
-                dev_kfree_skb(skb);
-                return NETDEV_TX_OK;
-        }
-
-        entry = tx_pointer;
-        tx_pointer = (tx_pointer + 1) % TX_BUF_COUNT;
-
-        desc = tx_desc + entry;
-        desc->pkt_length = skb->len;
-        desc->channel = ip->channel;
-
-        skb_copy_and_csum_dev(skb, phys_to_virt(desc->buf_addr));
-        dev_kfree_skb(skb);
-
-        ixp2000_reg_write(RING_TX_PENDING,
-                TX_BUF_DESC_BASE + (entry * sizeof(struct ixpdev_tx_desc)));
-
-        local_irq_save(flags);
-        ip->tx_queue_entries++;
-        if (ip->tx_queue_entries == TX_BUF_COUNT_PER_CHAN)
-                netif_stop_queue(dev);
-        local_irq_restore(flags);
-
-        return NETDEV_TX_OK;
-}
-
-
-static int ixpdev_rx(struct net_device *dev, int processed, int budget)
-{
-        while (processed < budget) {
-                struct ixpdev_rx_desc *desc;
-                struct sk_buff *skb;
-                void *buf;
-                u32 _desc;
-
-                _desc = ixp2000_reg_read(RING_RX_DONE);
-                if (_desc == 0)
-                        return 0;
-
-                desc = rx_desc +
-                        ((_desc - RX_BUF_DESC_BASE) / sizeof(struct ixpdev_rx_desc));
-                buf = phys_to_virt(desc->buf_addr);
-
-                if (desc->pkt_length < 4 || desc->pkt_length > PAGE_SIZE) {
-                        printk(KERN_ERR "ixp2000: rx err, length %d\n",
-                                        desc->pkt_length);
-                        goto err;
-                }
-
-                if (desc->channel < 0 || desc->channel >= nds_count) {
-                        printk(KERN_ERR "ixp2000: rx err, channel %d\n",
-                                        desc->channel);
-                        goto err;
-                }
-
-                /* @@@ Make FCS stripping configurable.  */
-                desc->pkt_length -= 4;
-
-                if (unlikely(!netif_running(nds[desc->channel])))
-                        goto err;
-
-                skb = netdev_alloc_skb_ip_align(dev, desc->pkt_length);
-                if (likely(skb != NULL)) {
-                        skb_copy_to_linear_data(skb, buf, desc->pkt_length);
-                        skb_put(skb, desc->pkt_length);
-                        skb->protocol = eth_type_trans(skb, nds[desc->channel]);
-
-                        netif_receive_skb(skb);
-                }
-
-err:
-                ixp2000_reg_write(RING_RX_PENDING, _desc);
-                processed++;
-        }
-
-        return processed;
-}
-
-/* dev always points to nds[0].  */
-static int ixpdev_poll(struct napi_struct *napi, int budget)
-{
-        struct ixpdev_priv *ip = container_of(napi, struct ixpdev_priv, napi);
-        struct net_device *dev = ip->dev;
-        int rx;
-
-        rx = 0;
-        do {
-                ixp2000_reg_write(IXP2000_IRQ_THD_RAW_STATUS_A_0, 0x00ff);
-
-                rx = ixpdev_rx(dev, rx, budget);
-                if (rx >= budget)
-                        break;
-        } while (ixp2000_reg_read(IXP2000_IRQ_THD_RAW_STATUS_A_0) & 0x00ff);
-
-        napi_complete(napi);
-        ixp2000_reg_write(IXP2000_IRQ_THD_ENABLE_SET_A_0, 0x00ff);
-
-        return rx;
-}
-
-static void ixpdev_tx_complete(void)
-{
-        int channel;
-        u32 wake;
-
-        wake = 0;
-        while (1) {
-                struct ixpdev_priv *ip;
-                u32 desc;
-                int entry;
-
-                desc = ixp2000_reg_read(RING_TX_DONE);
-                if (desc == 0)
-                        break;
-
-                /* @@@ Check whether entries come back in order.  */
-                entry = (desc - TX_BUF_DESC_BASE) / sizeof(struct ixpdev_tx_desc);
-                channel = tx_desc[entry].channel;
-
-                if (channel < 0 || channel >= nds_count) {
-                        printk(KERN_ERR "ixp2000: txcomp channel index "
-                                        "out of bounds (%d, %.8i, %d)\n",
-                                        channel, (unsigned int)desc, entry);
-                        continue;
-                }
-
-                ip = netdev_priv(nds[channel]);
-                if (ip->tx_queue_entries == TX_BUF_COUNT_PER_CHAN)
-                        wake |= 1 << channel;
-                ip->tx_queue_entries--;
-        }
-
-        for (channel = 0; wake != 0; channel++) {
-                if (wake & (1 << channel)) {
-                        netif_wake_queue(nds[channel]);
-                        wake &= ~(1 << channel);
-                }
-        }
-}
-
-static irqreturn_t ixpdev_interrupt(int irq, void *dev_id)
-{
-        u32 status;
-
-        status = ixp2000_reg_read(IXP2000_IRQ_THD_STATUS_A_0);
-        if (status == 0)
-                return IRQ_NONE;
-
-        /*
-         * Any of the eight receive units signaled RX?
-         */
-        if (status & 0x00ff) {
-                struct net_device *dev = nds[0];
-                struct ixpdev_priv *ip = netdev_priv(dev);
-
-                ixp2000_reg_wrb(IXP2000_IRQ_THD_ENABLE_CLEAR_A_0, 0x00ff);
-                if (likely(napi_schedule_prep(&ip->napi))) {
-                        __napi_schedule(&ip->napi);
-                } else {
-                        printk(KERN_CRIT "ixp2000: irq while polling!!\n");
-                }
-        }
-
-        /*
-         * Any of the eight transmit units signaled TXdone?
-         */
-        if (status & 0xff00) {
-                ixp2000_reg_wrb(IXP2000_IRQ_THD_RAW_STATUS_A_0, 0xff00);
-                ixpdev_tx_complete();
-        }
-
-        return IRQ_HANDLED;
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-static void ixpdev_poll_controller(struct net_device *dev)
-{
-        disable_irq(IRQ_IXP2000_THDA0);
-        ixpdev_interrupt(IRQ_IXP2000_THDA0, dev);
-        enable_irq(IRQ_IXP2000_THDA0);
-}
-#endif
-
-static int ixpdev_open(struct net_device *dev)
-{
-        struct ixpdev_priv *ip = netdev_priv(dev);
-        int err;
-
-        napi_enable(&ip->napi);
-        if (!nds_open++) {
-                err = request_irq(IRQ_IXP2000_THDA0, ixpdev_interrupt,
-                                        IRQF_SHARED, "ixp2000_eth", nds);
-                if (err) {
-                        nds_open--;
-                        napi_disable(&ip->napi);
-                        return err;
-                }
-
-                ixp2000_reg_write(IXP2000_IRQ_THD_ENABLE_SET_A_0, 0xffff);
-        }
-
-        set_port_admin_status(ip->channel, 1);
-        netif_start_queue(dev);
-
-        return 0;
-}
-
-static int ixpdev_close(struct net_device *dev)
-{
-        struct ixpdev_priv *ip = netdev_priv(dev);
-
-        netif_stop_queue(dev);
-        napi_disable(&ip->napi);
-        set_port_admin_status(ip->channel, 0);
-
-        if (!--nds_open) {
-                ixp2000_reg_write(IXP2000_IRQ_THD_ENABLE_CLEAR_A_0, 0xffff);
-                free_irq(IRQ_IXP2000_THDA0, nds);
-        }
-
-        return 0;
-}
-
-static struct net_device_stats *ixpdev_get_stats(struct net_device *dev)
-{
-        struct ixpdev_priv *ip = netdev_priv(dev);
-
-        pm3386_get_stats(ip->channel, &(dev->stats));
-
-        return &(dev->stats);
-}
-
-static const struct net_device_ops ixpdev_netdev_ops = {
-        .ndo_open               = ixpdev_open,
-        .ndo_stop               = ixpdev_close,
-        .ndo_start_xmit         = ixpdev_xmit,
-        .ndo_change_mtu         = eth_change_mtu,
-        .ndo_validate_addr      = eth_validate_addr,
-        .ndo_set_mac_address    = eth_mac_addr,
-        .ndo_get_stats          = ixpdev_get_stats,
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        .ndo_poll_controller    = ixpdev_poll_controller,
-#endif
-};
-
-struct net_device *ixpdev_alloc(int channel, int sizeof_priv)
-{
-        struct net_device *dev;
-        struct ixpdev_priv *ip;
-
-        dev = alloc_etherdev(sizeof_priv);
-        if (dev == NULL)
-                return NULL;
-
-        dev->netdev_ops = &ixpdev_netdev_ops;
-
-        dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;
-
-        ip = netdev_priv(dev);
-        ip->dev = dev;
-        netif_napi_add(dev, &ip->napi, ixpdev_poll, 64);
-        ip->channel = channel;
-        ip->tx_queue_entries = 0;
-
-        return dev;
-}
-
-int ixpdev_init(int __nds_count, struct net_device **__nds,
-                void (*__set_port_admin_status)(int port, int up))
-{
-        int i;
-        int err;
-
-        BUILD_BUG_ON(RX_BUF_COUNT > 192 || TX_BUF_COUNT > 192);
-
-        printk(KERN_INFO "IXP2000 MSF ethernet driver %s\n", DRV_MODULE_VERSION);
-
-        nds_count = __nds_count;
-        nds = __nds;
-        set_port_admin_status = __set_port_admin_status;
-
-        for (i = 0; i < RX_BUF_COUNT; i++) {
-                void *buf;
-
-                buf = (void *)get_zeroed_page(GFP_KERNEL);
-                if (buf == NULL) {
-                        err = -ENOMEM;
-                        while (--i >= 0)
-                                free_page((unsigned long)phys_to_virt(rx_desc[i].buf_addr));
-                        goto err_out;
-                }
-                rx_desc[i].buf_addr = virt_to_phys(buf);
-                rx_desc[i].buf_length = PAGE_SIZE;
-        }
-
-        /* @@@ Maybe we shouldn't be preallocating TX buffers.  */
-        for (i = 0; i < TX_BUF_COUNT; i++) {
-                void *buf;
-
-                buf = (void *)get_zeroed_page(GFP_KERNEL);
-                if (buf == NULL) {
-                        err = -ENOMEM;
-                        while (--i >= 0)
-                                free_page((unsigned long)phys_to_virt(tx_desc[i].buf_addr));
-                        goto err_free_rx;
-                }
-                tx_desc[i].buf_addr = virt_to_phys(buf);
-        }
-
-        /* 256 entries, ring status set means 'empty', base address 0x0000.  */
-        ixp2000_reg_write(RING_RX_PENDING_BASE, 0x44000000);
-        ixp2000_reg_write(RING_RX_PENDING_HEAD, 0x00000000);
-        ixp2000_reg_write(RING_RX_PENDING_TAIL, 0x00000000);
-
-        /* 256 entries, ring status set means 'full', base address 0x0400.  */
-        ixp2000_reg_write(RING_RX_DONE_BASE, 0x40000400);
-        ixp2000_reg_write(RING_RX_DONE_HEAD, 0x00000000);
-        ixp2000_reg_write(RING_RX_DONE_TAIL, 0x00000000);
-
-        for (i = 0; i < RX_BUF_COUNT; i++) {
-                ixp2000_reg_write(RING_RX_PENDING,
-                        RX_BUF_DESC_BASE + (i * sizeof(struct ixpdev_rx_desc)));
-        }
-
-        ixp2000_uengine_load(0, &ixp2400_rx);
-        ixp2000_uengine_start_contexts(0, 0xff);
-
-        /* 256 entries, ring status set means 'empty', base address 0x0800.  */
-        ixp2000_reg_write(RING_TX_PENDING_BASE, 0x44000800);
-        ixp2000_reg_write(RING_TX_PENDING_HEAD, 0x00000000);
-        ixp2000_reg_write(RING_TX_PENDING_TAIL, 0x00000000);
-
-        /* 256 entries, ring status set means 'full', base address 0x0c00.  */
-        ixp2000_reg_write(RING_TX_DONE_BASE, 0x40000c00);
-        ixp2000_reg_write(RING_TX_DONE_HEAD, 0x00000000);
-        ixp2000_reg_write(RING_TX_DONE_TAIL, 0x00000000);
-
-        ixp2000_uengine_load(1, &ixp2400_tx);
-        ixp2000_uengine_start_contexts(1, 0xff);
-
-        for (i = 0; i < nds_count; i++) {
-                err = register_netdev(nds[i]);
-                if (err) {
-                        while (--i >= 0)
-                                unregister_netdev(nds[i]);
-                        goto err_free_tx;
-                }
-        }
-
-        for (i = 0; i < nds_count; i++) {
-                printk(KERN_INFO "%s: IXP2000 MSF ethernet (port %d), %pM.\n",
-                                 nds[i]->name, i, nds[i]->dev_addr);
-        }
-
-        return 0;
-
-err_free_tx:
-        for (i = 0; i < TX_BUF_COUNT; i++)
-                free_page((unsigned long)phys_to_virt(tx_desc[i].buf_addr));
-
-err_free_rx:
-        for (i = 0; i < RX_BUF_COUNT; i++)
-                free_page((unsigned long)phys_to_virt(rx_desc[i].buf_addr));
-
-err_out:
-        return err;
-} 
-
-void ixpdev_deinit(void)
-{
-        int i;
-
-        /* @@@ Flush out pending packets.  */
-
-        for (i = 0; i < nds_count; i++)
-                unregister_netdev(nds[i]);
-
-        ixp2000_uengine_stop_contexts(1, 0xff);
-        ixp2000_uengine_stop_contexts(0, 0xff);
-        ixp2000_uengine_reset(0x3);
-
-        for (i = 0; i < TX_BUF_COUNT; i++)
-                free_page((unsigned long)phys_to_virt(tx_desc[i].buf_addr));
-
-        for (i = 0; i < RX_BUF_COUNT; i++)
-                free_page((unsigned long)phys_to_virt(rx_desc[i].buf_addr));
-}
diff --git a/drivers/net/ethernet/xscale/ixp2000/ixpdev.h b/drivers/net/ethernet/xscale/ixp2000/ixpdev.h
deleted file mode 100644
index 391ece623243..000000000000
--- a/drivers/net/ethernet/xscale/ixp2000/ixpdev.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * IXP2000 MSF network device driver
- * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
- * Dedicated to Marija Kulikova.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef __IXPDEV_H
-#define __IXPDEV_H
-
-struct ixpdev_priv
-{
-        struct net_device *dev;
-        struct napi_struct napi;
-        int     channel;
-        int     tx_queue_entries;
-};
-
-struct net_device *ixpdev_alloc(int channel, int sizeof_priv);
-int ixpdev_init(int num_ports, struct net_device **nds,
-                void (*set_port_admin_status)(int port, int up));
-void ixpdev_deinit(void);
-
-
-#endif
diff --git a/drivers/net/ethernet/xscale/ixp2000/ixpdev_priv.h b/drivers/net/ethernet/xscale/ixp2000/ixpdev_priv.h
deleted file mode 100644
index 86aa08ea0c33..000000000000
--- a/drivers/net/ethernet/xscale/ixp2000/ixpdev_priv.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * IXP2000 MSF network device driver
- * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
- * Dedicated to Marija Kulikova.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef __IXPDEV_PRIV_H
-#define __IXPDEV_PRIV_H
-
-#define RX_BUF_DESC_BASE        0x00001000
-#define RX_BUF_COUNT            ((3 * PAGE_SIZE) / (4 * sizeof(struct ixpdev_rx_desc)))
-#define TX_BUF_DESC_BASE        0x00002000
-#define TX_BUF_COUNT            ((3 * PAGE_SIZE) / (4 * sizeof(struct ixpdev_tx_desc)))
-#define TX_BUF_COUNT_PER_CHAN   (TX_BUF_COUNT / 4)
-
-#define RING_RX_PENDING         ((u32 *)IXP2000_SCRATCH_RING_VIRT_BASE)
-#define RING_RX_DONE            ((u32 *)(IXP2000_SCRATCH_RING_VIRT_BASE + 4))
-#define RING_TX_PENDING         ((u32 *)(IXP2000_SCRATCH_RING_VIRT_BASE + 8))
-#define RING_TX_DONE            ((u32 *)(IXP2000_SCRATCH_RING_VIRT_BASE + 12))
-
-#define SCRATCH_REG(x)          ((u32 *)(IXP2000_GLOBAL_REG_VIRT_BASE | 0x0800 | (x)))
-#define RING_RX_PENDING_BASE    SCRATCH_REG(0x00)
-#define RING_RX_PENDING_HEAD    SCRATCH_REG(0x04)
-#define RING_RX_PENDING_TAIL    SCRATCH_REG(0x08)
-#define RING_RX_DONE_BASE       SCRATCH_REG(0x10)
-#define RING_RX_DONE_HEAD       SCRATCH_REG(0x14)
-#define RING_RX_DONE_TAIL       SCRATCH_REG(0x18)
-#define RING_TX_PENDING_BASE    SCRATCH_REG(0x20)
-#define RING_TX_PENDING_HEAD    SCRATCH_REG(0x24)
-#define RING_TX_PENDING_TAIL    SCRATCH_REG(0x28)
-#define RING_TX_DONE_BASE       SCRATCH_REG(0x30)
-#define RING_TX_DONE_HEAD       SCRATCH_REG(0x34)
-#define RING_TX_DONE_TAIL       SCRATCH_REG(0x38)
-
-struct ixpdev_rx_desc
-{
-        u32     buf_addr;
-        u32     buf_length;
-        u32     channel;
-        u32     pkt_length;
-};
-
-struct ixpdev_tx_desc
-{
-        u32     buf_addr;
-        u32     pkt_length;
-        u32     channel;
-        u32     unused;
-};
-
-
-#endif
diff --git a/drivers/net/ethernet/xscale/ixp2000/pm3386.c b/drivers/net/ethernet/xscale/ixp2000/pm3386.c
deleted file mode 100644
index e08d3f9863b8..000000000000
--- a/drivers/net/ethernet/xscale/ixp2000/pm3386.c
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- * Helper functions for the PM3386s on the Radisys ENP2611
- * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
- * Dedicated to Marija Kulikova.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/module.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <asm/io.h>
-#include "pm3386.h"
-
-/*
- * Read from register 'reg' of PM3386 device 'pm'.
- */
-static u16 pm3386_reg_read(int pm, int reg)
-{
-        void *_reg;
-        u16 value;
-
-        _reg = (void *)ENP2611_PM3386_0_VIRT_BASE;
-        if (pm == 1)
-                _reg = (void *)ENP2611_PM3386_1_VIRT_BASE;
-
-        value = *((volatile u16 *)(_reg + (reg << 1)));
-
-//      printk(KERN_INFO "pm3386_reg_read(%d, %.3x) = %.8x\n", pm, reg, value);
-
-        return value;
-}
-
-/*
- * Write to register 'reg' of PM3386 device 'pm', and perform
- * a readback from the identification register.
- */
-static void pm3386_reg_write(int pm, int reg, u16 value)
-{
-        void *_reg;
-        u16 dummy;
-
-//      printk(KERN_INFO "pm3386_reg_write(%d, %.3x, %.8x)\n", pm, reg, value);
-
-        _reg = (void *)ENP2611_PM3386_0_VIRT_BASE;
-        if (pm == 1)
-                _reg = (void *)ENP2611_PM3386_1_VIRT_BASE;
-
-        *((volatile u16 *)(_reg + (reg << 1))) = value;
-
-        dummy = *((volatile u16 *)_reg);
-        __asm__ __volatile__("mov %0, %0" : "+r" (dummy));
-}
-
-/*
- * Read from port 'port' register 'reg', where the registers
- * for the different ports are 'spacing' registers apart.
- */
-static u16 pm3386_port_reg_read(int port, int _reg, int spacing)
-{
-        int reg;
-
-        reg = _reg;
-        if (port & 1)
-                reg += spacing;
-
-        return pm3386_reg_read(port >> 1, reg);
-}
-
-/*
- * Write to port 'port' register 'reg', where the registers
- * for the different ports are 'spacing' registers apart.
- */
-static void pm3386_port_reg_write(int port, int _reg, int spacing, u16 value)
-{
-        int reg;
-
-        reg = _reg;
-        if (port & 1)
-                reg += spacing;
-
-        pm3386_reg_write(port >> 1, reg, value);
-}
-
-int pm3386_secondary_present(void)
-{
-        return pm3386_reg_read(1, 0) == 0x3386;
-}
-
-void pm3386_reset(void)
-{
-        u8 mac[3][6];
-        int secondary;
-
-        secondary = pm3386_secondary_present();
-
-        /* Save programmed MAC addresses.  */
-        pm3386_get_mac(0, mac[0]);
-        pm3386_get_mac(1, mac[1]);
-        if (secondary)
-                pm3386_get_mac(2, mac[2]);
-
-        /* Assert analog and digital reset.  */
-        pm3386_reg_write(0, 0x002, 0x0060);
-        if (secondary)
-                pm3386_reg_write(1, 0x002, 0x0060);
-        mdelay(1);
-
-        /* Deassert analog reset.  */
-        pm3386_reg_write(0, 0x002, 0x0062);
-        if (secondary)
-                pm3386_reg_write(1, 0x002, 0x0062);
-        mdelay(10);
-
-        /* Deassert digital reset.  */
-        pm3386_reg_write(0, 0x002, 0x0063);
-        if (secondary)
-                pm3386_reg_write(1, 0x002, 0x0063);
-        mdelay(10);
-
-        /* Restore programmed MAC addresses.  */
-        pm3386_set_mac(0, mac[0]);
-        pm3386_set_mac(1, mac[1]);
-        if (secondary)
-                pm3386_set_mac(2, mac[2]);
-
-        /* Disable carrier on all ports.  */
-        pm3386_set_carrier(0, 0);
-        pm3386_set_carrier(1, 0);
-        if (secondary)
-                pm3386_set_carrier(2, 0);
-}
-
-static u16 swaph(u16 x)
-{
-        return ((x << 8) | (x >> 8)) & 0xffff;
-}
-
-int pm3386_port_count(void)
-{
-        return 2 + pm3386_secondary_present();
-}
-
-void pm3386_init_port(int port)
-{
-        int pm = port >> 1;
-
-        /*
-         * Work around ENP2611 bootloader programming MAC address
-         * in reverse.
-         */
-        if (pm3386_port_reg_read(port, 0x30a, 0x100) == 0x0000 &&
-            (pm3386_port_reg_read(port, 0x309, 0x100) & 0xff00) == 0x5000) {
-                u16 temp[3];
-
-                temp[0] = pm3386_port_reg_read(port, 0x308, 0x100);
-                temp[1] = pm3386_port_reg_read(port, 0x309, 0x100);
-                temp[2] = pm3386_port_reg_read(port, 0x30a, 0x100);
-                pm3386_port_reg_write(port, 0x308, 0x100, swaph(temp[2]));
-                pm3386_port_reg_write(port, 0x309, 0x100, swaph(temp[1]));
-                pm3386_port_reg_write(port, 0x30a, 0x100, swaph(temp[0]));
-        }
-
-        /*
-         * Initialise narrowbanding mode.  See application note 2010486
-         * for more information.  (@@@ We also need to issue a reset
-         * when ROOL or DOOL are detected.)
-         */
-        pm3386_port_reg_write(port, 0x708, 0x10, 0xd055);
-        udelay(500);
-        pm3386_port_reg_write(port, 0x708, 0x10, 0x5055);
-
-        /*
-         * SPI-3 ingress block.  Set 64 bytes SPI-3 burst size
-         * towards SPI-3 bridge.
-         */
-        pm3386_port_reg_write(port, 0x122, 0x20, 0x0002);
-
-        /*
-         * Enable ingress protocol checking, and soft reset the
-         * SPI-3 ingress block.
-         */
-        pm3386_reg_write(pm, 0x103, 0x0003);
-        while (!(pm3386_reg_read(pm, 0x103) & 0x80))
-                ;
-
-        /*
-         * SPI-3 egress block.  Gather 12288 bytes of the current
-         * packet in the TX fifo before initiating transmit on the
-         * SERDES interface.  (Prevents TX underflows.)
-         */
-        pm3386_port_reg_write(port, 0x221, 0x20, 0x0007);
-
-        /*
-         * Enforce odd parity from the SPI-3 bridge, and soft reset
-         * the SPI-3 egress block.
-         */
-        pm3386_reg_write(pm, 0x203, 0x000d & ~(4 << (port & 1)));
-        while ((pm3386_reg_read(pm, 0x203) & 0x000c) != 0x000c)
-                ;
-
-        /*
-         * EGMAC block.  Set this channels to reject long preambles,
-         * not send or transmit PAUSE frames, enable preamble checking,
-         * disable frame length checking, enable FCS appending, enable
-         * TX frame padding.
-         */
-        pm3386_port_reg_write(port, 0x302, 0x100, 0x0113);
-
-        /*
-         * Soft reset the EGMAC block.
-         */
-        pm3386_port_reg_write(port, 0x301, 0x100, 0x8000);
-        pm3386_port_reg_write(port, 0x301, 0x100, 0x0000);
-
-        /*
-         * Auto-sense autonegotiation status.
-         */
-        pm3386_port_reg_write(port, 0x306, 0x100, 0x0100);
-
-        /*
-         * Allow reception of jumbo frames.
-         */
-        pm3386_port_reg_write(port, 0x310, 0x100, 9018);
-
-        /*
-         * Allow transmission of jumbo frames.
-         */
-        pm3386_port_reg_write(port, 0x336, 0x100, 9018);
-
-        /* @@@ Should set 0x337/0x437 (RX forwarding threshold.)  */
-
-        /*
-         * Set autonegotiation parameters to 'no PAUSE, full duplex.'
-         */
-        pm3386_port_reg_write(port, 0x31c, 0x100, 0x0020);
-
-        /*
-         * Enable and restart autonegotiation.
-         */
-        pm3386_port_reg_write(port, 0x318, 0x100, 0x0003);
-        pm3386_port_reg_write(port, 0x318, 0x100, 0x0002);
-}
-
-void pm3386_get_mac(int port, u8 *mac)
-{
-        u16 temp;
-
-        temp = pm3386_port_reg_read(port, 0x308, 0x100);
-        mac[0] = temp & 0xff;
-        mac[1] = (temp >> 8) & 0xff;
-
-        temp = pm3386_port_reg_read(port, 0x309, 0x100);
-        mac[2] = temp & 0xff;
-        mac[3] = (temp >> 8) & 0xff;
-
-        temp = pm3386_port_reg_read(port, 0x30a, 0x100);
-        mac[4] = temp & 0xff;
-        mac[5] = (temp >> 8) & 0xff;
-}
-
-void pm3386_set_mac(int port, u8 *mac)
-{
-        pm3386_port_reg_write(port, 0x308, 0x100, (mac[1] << 8) | mac[0]);
-        pm3386_port_reg_write(port, 0x309, 0x100, (mac[3] << 8) | mac[2]);
-        pm3386_port_reg_write(port, 0x30a, 0x100, (mac[5] << 8) | mac[4]);
-}
-
-static u32 pm3386_get_stat(int port, u16 base)
-{
-        u32 value;
-
-        value = pm3386_port_reg_read(port, base, 0x100);
-        value |= pm3386_port_reg_read(port, base + 1, 0x100) << 16;
-
-        return value;
-}
-
-void pm3386_get_stats(int port, struct net_device_stats *stats)
-{
-        /*
-         * Snapshot statistics counters.
-         */
-        pm3386_port_reg_write(port, 0x500, 0x100, 0x0001);
-        while (pm3386_port_reg_read(port, 0x500, 0x100) & 0x0001)
-                ;
-
-        memset(stats, 0, sizeof(*stats));
-
-        stats->rx_packets = pm3386_get_stat(port, 0x510);
-        stats->tx_packets = pm3386_get_stat(port, 0x590);
-        stats->rx_bytes = pm3386_get_stat(port, 0x514);
-        stats->tx_bytes = pm3386_get_stat(port, 0x594);
-        /* @@@ Add other stats.  */
-}
-
-void pm3386_set_carrier(int port, int state)
-{
-        pm3386_port_reg_write(port, 0x703, 0x10, state ? 0x1001 : 0x0000);
-}
-
-int pm3386_is_link_up(int port)
-{
-        u16 temp;
-
-        temp = pm3386_port_reg_read(port, 0x31a, 0x100);
-        temp = pm3386_port_reg_read(port, 0x31a, 0x100);
-
-        return !!(temp & 0x0002);
-}
-
-void pm3386_enable_rx(int port)
-{
-        u16 temp;
-
-        temp = pm3386_port_reg_read(port, 0x303, 0x100);
-        temp |= 0x1000;
-        pm3386_port_reg_write(port, 0x303, 0x100, temp);
-}
-
-void pm3386_disable_rx(int port)
-{
-        u16 temp;
-
-        temp = pm3386_port_reg_read(port, 0x303, 0x100);
-        temp &= 0xefff;
-        pm3386_port_reg_write(port, 0x303, 0x100, temp);
-}
-
-void pm3386_enable_tx(int port)
-{
-        u16 temp;
-
-        temp = pm3386_port_reg_read(port, 0x303, 0x100);
-        temp |= 0x4000;
-        pm3386_port_reg_write(port, 0x303, 0x100, temp);
-}
-
-void pm3386_disable_tx(int port)
-{
-        u16 temp;
-
-        temp = pm3386_port_reg_read(port, 0x303, 0x100);
-        temp &= 0xbfff;
-        pm3386_port_reg_write(port, 0x303, 0x100, temp);
-}
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/net/ethernet/xscale/ixp2000/pm3386.h b/drivers/net/ethernet/xscale/ixp2000/pm3386.h
deleted file mode 100644
index cc4183dca911..000000000000
--- a/drivers/net/ethernet/xscale/ixp2000/pm3386.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Helper functions for the PM3386s on the Radisys ENP2611
- * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
- * Dedicated to Marija Kulikova.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef __PM3386_H
-#define __PM3386_H
-
-void pm3386_reset(void);
-int pm3386_port_count(void);
-void pm3386_init_port(int port);
-void pm3386_get_mac(int port, u8 *mac);
-void pm3386_set_mac(int port, u8 *mac);
-void pm3386_get_stats(int port, struct net_device_stats *stats);
-void pm3386_set_carrier(int port, int state);
-int pm3386_is_link_up(int port);
-void pm3386_enable_rx(int port);
-void pm3386_disable_rx(int port);
-void pm3386_enable_tx(int port);
-void pm3386_disable_tx(int port);
-
-
-#endif
diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
index 41a8b5a9849e..482648fcf0b6 100644
--- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
@@ -1002,12 +1002,41 @@ static int ixp4xx_nway_reset(struct net_device *dev)
         return phy_start_aneg(port->phydev);
 }
 
+int ixp46x_phc_index = -1;
+
+static int ixp4xx_get_ts_info(struct net_device *dev,
+                              struct ethtool_ts_info *info)
+{
+        if (!cpu_is_ixp46x()) {
+                info->so_timestamping =
+                        SOF_TIMESTAMPING_TX_SOFTWARE |
+                        SOF_TIMESTAMPING_RX_SOFTWARE |
+                        SOF_TIMESTAMPING_SOFTWARE;
+                info->phc_index = -1;
+                return 0;
+        }
+        info->so_timestamping =
+                SOF_TIMESTAMPING_TX_HARDWARE |
+                SOF_TIMESTAMPING_RX_HARDWARE |
+                SOF_TIMESTAMPING_RAW_HARDWARE;
+        info->phc_index = ixp46x_phc_index;
+        info->tx_types =
+                (1 << HWTSTAMP_TX_OFF) |
+                (1 << HWTSTAMP_TX_ON);
+        info->rx_filters =
+                (1 << HWTSTAMP_FILTER_NONE) |
+                (1 << HWTSTAMP_FILTER_PTP_V1_L4_SYNC) |
+                (1 << HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ);
+        return 0;
+}
+
 static const struct ethtool_ops ixp4xx_ethtool_ops = {
         .get_drvinfo = ixp4xx_get_drvinfo,
         .get_settings = ixp4xx_get_settings,
         .set_settings = ixp4xx_set_settings,
         .nway_reset = ixp4xx_nway_reset,
         .get_link = ethtool_op_get_link,
+        .get_ts_info = ixp4xx_get_ts_info,
 };
 
 
diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index 168c8f41d09f..d4719632ffc6 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -113,10 +113,9 @@ static int __devinit rr_init_one(struct pci_dev *pdev,
 
         SET_NETDEV_DEV(dev, &pdev->dev);
 
-        if (pci_request_regions(pdev, "rrunner")) {
-                ret = -EIO;
+        ret = pci_request_regions(pdev, "rrunner");
+        if (ret < 0)
                 goto out;
-        }
 
         pci_set_drvdata(pdev, dev);
 
@@ -124,11 +123,8 @@ static int __devinit rr_init_one(struct pci_dev *pdev,
 
         spin_lock_init(&rrpriv->lock);
 
-        dev->irq = pdev->irq;
         dev->netdev_ops = &rr_netdev_ops;
 
-        dev->base_addr = pci_resource_start(pdev, 0);
-
         /* display version info if adapter is found */
         if (!version_disp) {
                 /* set display flag to TRUE so that */
@@ -146,16 +142,15 @@ static int __devinit rr_init_one(struct pci_dev *pdev,
         pci_set_master(pdev);
 
         printk(KERN_INFO "%s: Essential RoadRunner serial HIPPI "
-               "at 0x%08lx, irq %i, PCI latency %i\n", dev->name,
-               dev->base_addr, dev->irq, pci_latency);
+               "at 0x%llx, irq %i, PCI latency %i\n", dev->name,
+               (unsigned long long)pci_resource_start(pdev, 0),
+               pdev->irq, pci_latency);
 
         /*
-         * Remap the regs into kernel space.
+         * Remap the MMIO regs into kernel space.
          */
-
-        rrpriv->regs = ioremap(dev->base_addr, 0x1000);
-
-        if (!rrpriv->regs){
+        rrpriv->regs = pci_iomap(pdev, 0, 0x1000);
+        if (!rrpriv->regs) {
                 printk(KERN_ERR "%s:  Unable to map I/O register, "
                         "RoadRunner will be disabled.\n", dev->name);
                 ret = -EIO;
@@ -202,8 +197,6 @@ static int __devinit rr_init_one(struct pci_dev *pdev,
 
         rr_init(dev);
 
-        dev->base_addr = 0;
-
         ret = register_netdev(dev);
         if (ret)
                 goto out;
@@ -217,7 +210,7 @@ static int __devinit rr_init_one(struct pci_dev *pdev,
                 pci_free_consistent(pdev, TX_TOTAL_SIZE, rrpriv->tx_ring,
                                     rrpriv->tx_ring_dma);
         if (rrpriv->regs)
-                iounmap(rrpriv->regs);
+                pci_iounmap(pdev, rrpriv->regs);
         if (pdev) {
                 pci_release_regions(pdev);
                 pci_set_drvdata(pdev, NULL);
@@ -231,29 +224,26 @@ static int __devinit rr_init_one(struct pci_dev *pdev,
 static void __devexit rr_remove_one (struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
+        struct rr_private *rr = netdev_priv(dev);
 
-        if (dev) {
-                struct rr_private *rr = netdev_priv(dev);
-
-                if (!(readl(&rr->regs->HostCtrl) & NIC_HALTED)){
-                        printk(KERN_ERR "%s: trying to unload running NIC\n",
-                               dev->name);
-                        writel(HALT_NIC, &rr->regs->HostCtrl);
-                }
-
-                pci_free_consistent(pdev, EVT_RING_SIZE, rr->evt_ring,
-                                    rr->evt_ring_dma);
-                pci_free_consistent(pdev, RX_TOTAL_SIZE, rr->rx_ring,
-                                    rr->rx_ring_dma);
-                pci_free_consistent(pdev, TX_TOTAL_SIZE, rr->tx_ring,
-                                    rr->tx_ring_dma);
-                unregister_netdev(dev);
-                iounmap(rr->regs);
-                free_netdev(dev);
-                pci_release_regions(pdev);
-                pci_disable_device(pdev);
-                pci_set_drvdata(pdev, NULL);
+        if (!(readl(&rr->regs->HostCtrl) & NIC_HALTED)) {
+                printk(KERN_ERR "%s: trying to unload running NIC\n",
+                       dev->name);
+                writel(HALT_NIC, &rr->regs->HostCtrl);
         }
+
+        unregister_netdev(dev);
+        pci_free_consistent(pdev, EVT_RING_SIZE, rr->evt_ring,
+                            rr->evt_ring_dma);
+        pci_free_consistent(pdev, RX_TOTAL_SIZE, rr->rx_ring,
+                            rr->rx_ring_dma);
+        pci_free_consistent(pdev, TX_TOTAL_SIZE, rr->tx_ring,
+                            rr->tx_ring_dma);
+        pci_iounmap(pdev, rr->regs);
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+        free_netdev(dev);
 }
 
 
@@ -1229,9 +1219,9 @@ static int rr_open(struct net_device *dev)
         readl(&regs->HostCtrl);
         spin_unlock_irqrestore(&rrpriv->lock, flags);
 
-        if (request_irq(dev->irq, rr_interrupt, IRQF_SHARED, dev->name, dev)) {
+        if (request_irq(pdev->irq, rr_interrupt, IRQF_SHARED, dev->name, dev)) {
                 printk(KERN_WARNING "%s: Requested IRQ %d is busy\n",
-                       dev->name, dev->irq);
+                       dev->name, pdev->irq);
                 ecode = -EAGAIN;
                 goto error;
         }
@@ -1338,16 +1328,15 @@ static void rr_dump(struct net_device *dev)
 
 static int rr_close(struct net_device *dev)
 {
-        struct rr_private *rrpriv;
-        struct rr_regs __iomem *regs;
+        struct rr_private *rrpriv = netdev_priv(dev);
+        struct rr_regs __iomem *regs = rrpriv->regs;
+        struct pci_dev *pdev = rrpriv->pci_dev;
         unsigned long flags;
         u32 tmp;
         short i;
 
         netif_stop_queue(dev);
 
-        rrpriv = netdev_priv(dev);
-        regs = rrpriv->regs;
 
         /*
          * Lock to make sure we are not cleaning up while another CPU
@@ -1386,15 +1375,15 @@ static int rr_close(struct net_device *dev)
         rr_raz_tx(rrpriv, dev);
         rr_raz_rx(rrpriv, dev);
 
-        pci_free_consistent(rrpriv->pci_dev, 256 * sizeof(struct ring_ctrl),
+        pci_free_consistent(pdev, 256 * sizeof(struct ring_ctrl),
                             rrpriv->rx_ctrl, rrpriv->rx_ctrl_dma);
         rrpriv->rx_ctrl = NULL;
 
-        pci_free_consistent(rrpriv->pci_dev, sizeof(struct rr_info),
-                            rrpriv->info, rrpriv->info_dma);
+        pci_free_consistent(pdev, sizeof(struct rr_info), rrpriv->info,
+                            rrpriv->info_dma);
         rrpriv->info = NULL;
 
-        free_irq(dev->irq, dev);
+        free_irq(pdev->irq, dev);
         spin_unlock_irqrestore(&rrpriv->lock, flags);
 
         return 0;
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index c35824552792..4ffcd57b011b 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -27,6 +27,7 @@
 
 #include <linux/list.h>
 #include <linux/hyperv.h>
+#include <linux/rndis.h>
 
 /* Fwd declaration */
 struct hv_netvsc_packet;
@@ -506,295 +507,6 @@ struct netvsc_device {
         void *extension;
 };
 
-
-/*  Status codes */
-
-
-#ifndef STATUS_SUCCESS
-#define STATUS_SUCCESS                          (0x00000000L)
-#endif
-
-#ifndef STATUS_UNSUCCESSFUL
-#define STATUS_UNSUCCESSFUL                     (0xC0000001L)
-#endif
-
-#ifndef STATUS_PENDING
-#define STATUS_PENDING                          (0x00000103L)
-#endif
-
-#ifndef STATUS_INSUFFICIENT_RESOURCES
-#define STATUS_INSUFFICIENT_RESOURCES           (0xC000009AL)
-#endif
-
-#ifndef STATUS_BUFFER_OVERFLOW
-#define STATUS_BUFFER_OVERFLOW                  (0x80000005L)
-#endif
-
-#ifndef STATUS_NOT_SUPPORTED
-#define STATUS_NOT_SUPPORTED                    (0xC00000BBL)
-#endif
-
-#define RNDIS_STATUS_SUCCESS                    (STATUS_SUCCESS)
-#define RNDIS_STATUS_PENDING                    (STATUS_PENDING)
-#define RNDIS_STATUS_NOT_RECOGNIZED             (0x00010001L)
-#define RNDIS_STATUS_NOT_COPIED                 (0x00010002L)
-#define RNDIS_STATUS_NOT_ACCEPTED               (0x00010003L)
-#define RNDIS_STATUS_CALL_ACTIVE                (0x00010007L)
-
-#define RNDIS_STATUS_ONLINE                     (0x40010003L)
-#define RNDIS_STATUS_RESET_START                (0x40010004L)
-#define RNDIS_STATUS_RESET_END                  (0x40010005L)
-#define RNDIS_STATUS_RING_STATUS                (0x40010006L)
-#define RNDIS_STATUS_CLOSED                     (0x40010007L)
-#define RNDIS_STATUS_WAN_LINE_UP                (0x40010008L)
-#define RNDIS_STATUS_WAN_LINE_DOWN              (0x40010009L)
-#define RNDIS_STATUS_WAN_FRAGMENT               (0x4001000AL)
-#define RNDIS_STATUS_MEDIA_CONNECT              (0x4001000BL)
-#define RNDIS_STATUS_MEDIA_DISCONNECT           (0x4001000CL)
-#define RNDIS_STATUS_HARDWARE_LINE_UP           (0x4001000DL)
-#define RNDIS_STATUS_HARDWARE_LINE_DOWN         (0x4001000EL)
-#define RNDIS_STATUS_INTERFACE_UP               (0x4001000FL)
-#define RNDIS_STATUS_INTERFACE_DOWN             (0x40010010L)
-#define RNDIS_STATUS_MEDIA_BUSY                 (0x40010011L)
-#define RNDIS_STATUS_MEDIA_SPECIFIC_INDICATION  (0x40010012L)
-#define RNDIS_STATUS_WW_INDICATION              RDIA_SPECIFIC_INDICATION
-#define RNDIS_STATUS_LINK_SPEED_CHANGE          (0x40010013L)
-
-#define RNDIS_STATUS_NOT_RESETTABLE             (0x80010001L)
-#define RNDIS_STATUS_SOFT_ERRORS                (0x80010003L)
-#define RNDIS_STATUS_HARD_ERRORS                (0x80010004L)
-#define RNDIS_STATUS_BUFFER_OVERFLOW            (STATUS_BUFFER_OVERFLOW)
-
-#define RNDIS_STATUS_FAILURE                    (STATUS_UNSUCCESSFUL)
-#define RNDIS_STATUS_RESOURCES                  (STATUS_INSUFFICIENT_RESOURCES)
-#define RNDIS_STATUS_CLOSING                    (0xC0010002L)
-#define RNDIS_STATUS_BAD_VERSION                (0xC0010004L)
-#define RNDIS_STATUS_BAD_CHARACTERISTICS        (0xC0010005L)
-#define RNDIS_STATUS_ADAPTER_NOT_FOUND          (0xC0010006L)
-#define RNDIS_STATUS_OPEN_FAILED                (0xC0010007L)
-#define RNDIS_STATUS_DEVICE_FAILED              (0xC0010008L)
-#define RNDIS_STATUS_MULTICAST_FULL             (0xC0010009L)
-#define RNDIS_STATUS_MULTICAST_EXISTS           (0xC001000AL)
-#define RNDIS_STATUS_MULTICAST_NOT_FOUND        (0xC001000BL)
-#define RNDIS_STATUS_REQUEST_ABORTED            (0xC001000CL)
-#define RNDIS_STATUS_RESET_IN_PROGRESS          (0xC001000DL)
-#define RNDIS_STATUS_CLOSING_INDICATING         (0xC001000EL)
-#define RNDIS_STATUS_NOT_SUPPORTED              (STATUS_NOT_SUPPORTED)
-#define RNDIS_STATUS_INVALID_PACKET             (0xC001000FL)
-#define RNDIS_STATUS_OPEN_LIST_FULL             (0xC0010010L)
-#define RNDIS_STATUS_ADAPTER_NOT_READY          (0xC0010011L)
-#define RNDIS_STATUS_ADAPTER_NOT_OPEN           (0xC0010012L)
-#define RNDIS_STATUS_NOT_INDICATING             (0xC0010013L)
-#define RNDIS_STATUS_INVALID_LENGTH             (0xC0010014L)
-#define RNDIS_STATUS_INVALID_DATA               (0xC0010015L)
-#define RNDIS_STATUS_BUFFER_TOO_SHORT           (0xC0010016L)
-#define RNDIS_STATUS_INVALID_OID                (0xC0010017L)
-#define RNDIS_STATUS_ADAPTER_REMOVED            (0xC0010018L)
-#define RNDIS_STATUS_UNSUPPORTED_MEDIA          (0xC0010019L)
-#define RNDIS_STATUS_GROUP_ADDRESS_IN_USE       (0xC001001AL)
-#define RNDIS_STATUS_FILE_NOT_FOUND             (0xC001001BL)
-#define RNDIS_STATUS_ERROR_READING_FILE         (0xC001001CL)
-#define RNDIS_STATUS_ALREADY_MAPPED             (0xC001001DL)
-#define RNDIS_STATUS_RESOURCE_CONFLICT          (0xC001001EL)
-#define RNDIS_STATUS_NO_CABLE                   (0xC001001FL)
-
-#define RNDIS_STATUS_INVALID_SAP                (0xC0010020L)
-#define RNDIS_STATUS_SAP_IN_USE                 (0xC0010021L)
-#define RNDIS_STATUS_INVALID_ADDRESS            (0xC0010022L)
-#define RNDIS_STATUS_VC_NOT_ACTIVATED           (0xC0010023L)
-#define RNDIS_STATUS_DEST_OUT_OF_ORDER          (0xC0010024L)
-#define RNDIS_STATUS_VC_NOT_AVAILABLE           (0xC0010025L)
-#define RNDIS_STATUS_CELLRATE_NOT_AVAILABLE     (0xC0010026L)
-#define RNDIS_STATUS_INCOMPATABLE_QOS           (0xC0010027L)
-#define RNDIS_STATUS_AAL_PARAMS_UNSUPPORTED     (0xC0010028L)
-#define RNDIS_STATUS_NO_ROUTE_TO_DESTINATION    (0xC0010029L)
-
-#define RNDIS_STATUS_TOKEN_RING_OPEN_ERROR      (0xC0011000L)
-
-/* Object Identifiers used by NdisRequest Query/Set Information */
-/* General Objects */
-#define RNDIS_OID_GEN_SUPPORTED_LIST            0x00010101
-#define RNDIS_OID_GEN_HARDWARE_STATUS           0x00010102
-#define RNDIS_OID_GEN_MEDIA_SUPPORTED           0x00010103
-#define RNDIS_OID_GEN_MEDIA_IN_USE              0x00010104
-#define RNDIS_OID_GEN_MAXIMUM_LOOKAHEAD         0x00010105
-#define RNDIS_OID_GEN_MAXIMUM_FRAME_SIZE        0x00010106
-#define RNDIS_OID_GEN_LINK_SPEED                0x00010107
-#define RNDIS_OID_GEN_TRANSMIT_BUFFER_SPACE     0x00010108
-#define RNDIS_OID_GEN_RECEIVE_BUFFER_SPACE      0x00010109
-#define RNDIS_OID_GEN_TRANSMIT_BLOCK_SIZE       0x0001010A
-#define RNDIS_OID_GEN_RECEIVE_BLOCK_SIZE        0x0001010B
-#define RNDIS_OID_GEN_VENDOR_ID                 0x0001010C
-#define RNDIS_OID_GEN_VENDOR_DESCRIPTION        0x0001010D
-#define RNDIS_OID_GEN_CURRENT_PACKET_FILTER     0x0001010E
-#define RNDIS_OID_GEN_CURRENT_LOOKAHEAD         0x0001010F
-#define RNDIS_OID_GEN_DRIVER_VERSION            0x00010110
-#define RNDIS_OID_GEN_MAXIMUM_TOTAL_SIZE        0x00010111
-#define RNDIS_OID_GEN_PROTOCOL_OPTIONS          0x00010112
-#define RNDIS_OID_GEN_MAC_OPTIONS               0x00010113
-#define RNDIS_OID_GEN_MEDIA_CONNECT_STATUS      0x00010114
-#define RNDIS_OID_GEN_MAXIMUM_SEND_PACKETS      0x00010115
-#define RNDIS_OID_GEN_VENDOR_DRIVER_VERSION     0x00010116
-#define RNDIS_OID_GEN_NETWORK_LAYER_ADDRESSES   0x00010118
-#define RNDIS_OID_GEN_TRANSPORT_HEADER_OFFSET   0x00010119
-#define RNDIS_OID_GEN_MACHINE_NAME              0x0001021A
-#define RNDIS_OID_GEN_RNDIS_CONFIG_PARAMETER    0x0001021B
-
-#define RNDIS_OID_GEN_XMIT_OK                   0x00020101
-#define RNDIS_OID_GEN_RCV_OK                    0x00020102
-#define RNDIS_OID_GEN_XMIT_ERROR                0x00020103
-#define RNDIS_OID_GEN_RCV_ERROR                 0x00020104
-#define RNDIS_OID_GEN_RCV_NO_BUFFER             0x00020105
-
-#define RNDIS_OID_GEN_DIRECTED_BYTES_XMIT       0x00020201
-#define RNDIS_OID_GEN_DIRECTED_FRAMES_XMIT      0x00020202
-#define RNDIS_OID_GEN_MULTICAST_BYTES_XMIT      0x00020203
-#define RNDIS_OID_GEN_MULTICAST_FRAMES_XMIT     0x00020204
-#define RNDIS_OID_GEN_BROADCAST_BYTES_XMIT      0x00020205
-#define RNDIS_OID_GEN_BROADCAST_FRAMES_XMIT     0x00020206
-#define RNDIS_OID_GEN_DIRECTED_BYTES_RCV        0x00020207
-#define RNDIS_OID_GEN_DIRECTED_FRAMES_RCV       0x00020208
-#define RNDIS_OID_GEN_MULTICAST_BYTES_RCV       0x00020209
-#define RNDIS_OID_GEN_MULTICAST_FRAMES_RCV      0x0002020A
-#define RNDIS_OID_GEN_BROADCAST_BYTES_RCV       0x0002020B
-#define RNDIS_OID_GEN_BROADCAST_FRAMES_RCV      0x0002020C
-
-#define RNDIS_OID_GEN_RCV_CRC_ERROR             0x0002020D
-#define RNDIS_OID_GEN_TRANSMIT_QUEUE_LENGTH     0x0002020E
-
-#define RNDIS_OID_GEN_GET_TIME_CAPS             0x0002020F
-#define RNDIS_OID_GEN_GET_NETCARD_TIME          0x00020210
-
-/* These are connection-oriented general OIDs. */
-/* These replace the above OIDs for connection-oriented media. */
-#define RNDIS_OID_GEN_CO_SUPPORTED_LIST         0x00010101
-#define RNDIS_OID_GEN_CO_HARDWARE_STATUS        0x00010102
-#define RNDIS_OID_GEN_CO_MEDIA_SUPPORTED        0x00010103
-#define RNDIS_OID_GEN_CO_MEDIA_IN_USE           0x00010104
-#define RNDIS_OID_GEN_CO_LINK_SPEED             0x00010105
-#define RNDIS_OID_GEN_CO_VENDOR_ID              0x00010106
-#define RNDIS_OID_GEN_CO_VENDOR_DESCRIPTION     0x00010107
-#define RNDIS_OID_GEN_CO_DRIVER_VERSION         0x00010108
-#define RNDIS_OID_GEN_CO_PROTOCOL_OPTIONS       0x00010109
-#define RNDIS_OID_GEN_CO_MAC_OPTIONS            0x0001010A
-#define RNDIS_OID_GEN_CO_MEDIA_CONNECT_STATUS   0x0001010B
-#define RNDIS_OID_GEN_CO_VENDOR_DRIVER_VERSION  0x0001010C
-#define RNDIS_OID_GEN_CO_MINIMUM_LINK_SPEED     0x0001010D
-
-#define RNDIS_OID_GEN_CO_GET_TIME_CAPS          0x00010201
-#define RNDIS_OID_GEN_CO_GET_NETCARD_TIME       0x00010202
-
-/* These are connection-oriented statistics OIDs. */
-#define RNDIS_OID_GEN_CO_XMIT_PDUS_OK           0x00020101
-#define RNDIS_OID_GEN_CO_RCV_PDUS_OK            0x00020102
-#define RNDIS_OID_GEN_CO_XMIT_PDUS_ERROR        0x00020103
-#define RNDIS_OID_GEN_CO_RCV_PDUS_ERROR         0x00020104
-#define RNDIS_OID_GEN_CO_RCV_PDUS_NO_BUFFER     0x00020105
-
-
-#define RNDIS_OID_GEN_CO_RCV_CRC_ERROR          0x00020201
-#define RNDIS_OID_GEN_CO_TRANSMIT_QUEUE_LENGTH  0x00020202
-#define RNDIS_OID_GEN_CO_BYTES_XMIT             0x00020203
-#define RNDIS_OID_GEN_CO_BYTES_RCV              0x00020204
-#define RNDIS_OID_GEN_CO_BYTES_XMIT_OUTSTANDING 0x00020205
-#define RNDIS_OID_GEN_CO_NETCARD_LOAD           0x00020206
-
-/* These are objects for Connection-oriented media call-managers. */
-#define RNDIS_OID_CO_ADD_PVC                    0xFF000001
-#define RNDIS_OID_CO_DELETE_PVC                 0xFF000002
-#define RNDIS_OID_CO_GET_CALL_INFORMATION       0xFF000003
-#define RNDIS_OID_CO_ADD_ADDRESS                0xFF000004
-#define RNDIS_OID_CO_DELETE_ADDRESS             0xFF000005
-#define RNDIS_OID_CO_GET_ADDRESSES              0xFF000006
-#define RNDIS_OID_CO_ADDRESS_CHANGE             0xFF000007
-#define RNDIS_OID_CO_SIGNALING_ENABLED          0xFF000008
-#define RNDIS_OID_CO_SIGNALING_DISABLED         0xFF000009
-
-/* 802.3 Objects (Ethernet) */
-#define RNDIS_OID_802_3_PERMANENT_ADDRESS       0x01010101
-#define RNDIS_OID_802_3_CURRENT_ADDRESS         0x01010102
-#define RNDIS_OID_802_3_MULTICAST_LIST          0x01010103
-#define RNDIS_OID_802_3_MAXIMUM_LIST_SIZE       0x01010104
-#define RNDIS_OID_802_3_MAC_OPTIONS             0x01010105
-
-#define NDIS_802_3_MAC_OPTION_PRIORITY          0x00000001
-
-#define RNDIS_OID_802_3_RCV_ERROR_ALIGNMENT     0x01020101
-#define RNDIS_OID_802_3_XMIT_ONE_COLLISION      0x01020102
-#define RNDIS_OID_802_3_XMIT_MORE_COLLISIONS    0x01020103
-
-#define RNDIS_OID_802_3_XMIT_DEFERRED           0x01020201
-#define RNDIS_OID_802_3_XMIT_MAX_COLLISIONS     0x01020202
-#define RNDIS_OID_802_3_RCV_OVERRUN             0x01020203
-#define RNDIS_OID_802_3_XMIT_UNDERRUN           0x01020204
-#define RNDIS_OID_802_3_XMIT_HEARTBEAT_FAILURE  0x01020205
-#define RNDIS_OID_802_3_XMIT_TIMES_CRS_LOST     0x01020206
-#define RNDIS_OID_802_3_XMIT_LATE_COLLISIONS    0x01020207
-
-/* Remote NDIS message types */
-#define REMOTE_NDIS_PACKET_MSG                  0x00000001
-#define REMOTE_NDIS_INITIALIZE_MSG              0x00000002
-#define REMOTE_NDIS_HALT_MSG                    0x00000003
-#define REMOTE_NDIS_QUERY_MSG                   0x00000004
-#define REMOTE_NDIS_SET_MSG                     0x00000005
-#define REMOTE_NDIS_RESET_MSG                   0x00000006
-#define REMOTE_NDIS_INDICATE_STATUS_MSG         0x00000007
-#define REMOTE_NDIS_KEEPALIVE_MSG               0x00000008
-
-#define REMOTE_CONDIS_MP_CREATE_VC_MSG          0x00008001
-#define REMOTE_CONDIS_MP_DELETE_VC_MSG          0x00008002
-#define REMOTE_CONDIS_MP_ACTIVATE_VC_MSG        0x00008005
-#define REMOTE_CONDIS_MP_DEACTIVATE_VC_MSG      0x00008006
-#define REMOTE_CONDIS_INDICATE_STATUS_MSG       0x00008007
-
-/* Remote NDIS message completion types */
-#define REMOTE_NDIS_INITIALIZE_CMPLT            0x80000002
-#define REMOTE_NDIS_QUERY_CMPLT                 0x80000004
-#define REMOTE_NDIS_SET_CMPLT                   0x80000005
-#define REMOTE_NDIS_RESET_CMPLT                 0x80000006
-#define REMOTE_NDIS_KEEPALIVE_CMPLT             0x80000008
-
-#define REMOTE_CONDIS_MP_CREATE_VC_CMPLT        0x80008001
-#define REMOTE_CONDIS_MP_DELETE_VC_CMPLT        0x80008002
-#define REMOTE_CONDIS_MP_ACTIVATE_VC_CMPLT      0x80008005
-#define REMOTE_CONDIS_MP_DEACTIVATE_VC_CMPLT    0x80008006
-
-/*
- * Reserved message type for private communication between lower-layer host
- * driver and remote device, if necessary.
- */
-#define REMOTE_NDIS_BUS_MSG                     0xff000001
-
-/*  Defines for DeviceFlags in struct rndis_initialize_complete */
-#define RNDIS_DF_CONNECTIONLESS                 0x00000001
-#define RNDIS_DF_CONNECTION_ORIENTED            0x00000002
-#define RNDIS_DF_RAW_DATA                       0x00000004
-
-/*  Remote NDIS medium types. */
-#define RNDIS_MEDIUM_802_3                      0x00000000
-#define RNDIS_MEDIUM_802_5                      0x00000001
-#define RNDIS_MEDIUM_FDDI                               0x00000002
-#define RNDIS_MEDIUM_WAN                                0x00000003
-#define RNDIS_MEDIUM_LOCAL_TALK                 0x00000004
-#define RNDIS_MEDIUM_ARCNET_RAW                 0x00000006
-#define RNDIS_MEDIUM_ARCNET_878_2                       0x00000007
-#define RNDIS_MEDIUM_ATM                                0x00000008
-#define RNDIS_MEDIUM_WIRELESS_WAN                       0x00000009
-#define RNDIS_MEDIUM_IRDA                               0x0000000a
-#define RNDIS_MEDIUM_CO_WAN                     0x0000000b
-/* Not a real medium, defined as an upper-bound */
-#define RNDIS_MEDIUM_MAX                                0x0000000d
-
-
-/* Remote NDIS medium connection states. */
-#define RNDIS_MEDIA_STATE_CONNECTED             0x00000000
-#define RNDIS_MEDIA_STATE_DISCONNECTED          0x00000001
-
-/*  Remote NDIS version numbers */
-#define RNDIS_MAJOR_VERSION                     0x00000001
-#define RNDIS_MINOR_VERSION                     0x00000000
-
-
 /* NdisInitialize message */
 struct rndis_initialize_request {
         u32 req_id;
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index d025c83cd12a..8b919471472f 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -428,6 +428,24 @@ int netvsc_device_remove(struct hv_device *device)
         return 0;
 }
 
+
+#define RING_AVAIL_PERCENT_HIWATER 20
+#define RING_AVAIL_PERCENT_LOWATER 10
+
+/*
+ * Get the percentage of available bytes to write in the ring.
+ * The return value is in range from 0 to 100.
+ */
+static inline u32 hv_ringbuf_avail_percent(
+                struct hv_ring_buffer_info *ring_info)
+{
+        u32 avail_read, avail_write;
+
+        hv_get_ringbuffer_availbytes(ring_info, &avail_read, &avail_write);
+
+        return avail_write * 100 / ring_info->ring_datasize;
+}
+
 static void netvsc_send_completion(struct hv_device *device,
                                    struct vmpacket_descriptor *packet)
 {
@@ -455,6 +473,8 @@ static void netvsc_send_completion(struct hv_device *device,
                 complete(&net_device->channel_init_wait);
         } else if (nvsp_packet->hdr.msg_type ==
                    NVSP_MSG1_TYPE_SEND_RNDIS_PKT_COMPLETE) {
+                int num_outstanding_sends;
+
                 /* Get the send context */
                 nvsc_packet = (struct hv_netvsc_packet *)(unsigned long)
                         packet->trans_id;
@@ -463,10 +483,14 @@ static void netvsc_send_completion(struct hv_device *device,
                 nvsc_packet->completion.send.send_completion(
                         nvsc_packet->completion.send.send_completion_ctx);
 
-                atomic_dec(&net_device->num_outstanding_sends);
+                num_outstanding_sends =
+                        atomic_dec_return(&net_device->num_outstanding_sends);
 
-                if (netif_queue_stopped(ndev) && !net_device->start_remove)
-                        netif_wake_queue(ndev);
+                if (netif_queue_stopped(ndev) && !net_device->start_remove &&
+                        (hv_ringbuf_avail_percent(&device->channel->outbound)
+                        > RING_AVAIL_PERCENT_HIWATER ||
+                        num_outstanding_sends < 1))
+                                netif_wake_queue(ndev);
         } else {
                 netdev_err(ndev, "Unknown send completion packet type- "
                            "%d received!!\n", nvsp_packet->hdr.msg_type);
@@ -519,10 +543,19 @@ int netvsc_send(struct hv_device *device,
 
         if (ret == 0) {
                 atomic_inc(&net_device->num_outstanding_sends);
+                if (hv_ringbuf_avail_percent(&device->channel->outbound) <
+                        RING_AVAIL_PERCENT_LOWATER) {
+                        netif_stop_queue(ndev);
+                        if (atomic_read(&net_device->
+                                num_outstanding_sends) < 1)
+                                netif_wake_queue(ndev);
+                }
         } else if (ret == -EAGAIN) {
                 netif_stop_queue(ndev);
-                if (atomic_read(&net_device->num_outstanding_sends) < 1)
+                if (atomic_read(&net_device->num_outstanding_sends) < 1) {
                         netif_wake_queue(ndev);
+                        ret = -ENOSPC;
+                }
         } else {
                 netdev_err(ndev, "Unable to send packet %p ret %d\n",
                            packet, ret);
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index dd294783b5c5..8f8ed3320425 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -44,6 +44,7 @@ struct net_device_context {
         /* point back to our device context */
         struct hv_device *device_ctx;
         struct delayed_work dwork;
+        struct work_struct work;
 };
 
 
@@ -51,30 +52,22 @@ static int ring_size = 128;
 module_param(ring_size, int, S_IRUGO);
 MODULE_PARM_DESC(ring_size, "Ring buffer size (# of pages)");
 
-struct set_multicast_work {
-        struct work_struct work;
-        struct net_device *net;
-};
-
 static void do_set_multicast(struct work_struct *w)
 {
-        struct set_multicast_work *swk =
-                container_of(w, struct set_multicast_work, work);
-        struct net_device *net = swk->net;
-
-        struct net_device_context *ndevctx = netdev_priv(net);
+        struct net_device_context *ndevctx =
+                container_of(w, struct net_device_context, work);
         struct netvsc_device *nvdev;
         struct rndis_device *rdev;
 
         nvdev = hv_get_drvdata(ndevctx->device_ctx);
-        if (nvdev == NULL)
-                goto out;
+        if (nvdev == NULL || nvdev->ndev == NULL)
+                return;
 
         rdev = nvdev->extension;
         if (rdev == NULL)
-                goto out;
+                return;
 
-        if (net->flags & IFF_PROMISC)
+        if (nvdev->ndev->flags & IFF_PROMISC)
                 rndis_filter_set_packet_filter(rdev,
                         NDIS_PACKET_TYPE_PROMISCUOUS);
         else
@@ -82,21 +75,13 @@ static void do_set_multicast(struct work_struct *w)
                         NDIS_PACKET_TYPE_BROADCAST |
                         NDIS_PACKET_TYPE_ALL_MULTICAST |
                         NDIS_PACKET_TYPE_DIRECTED);
-
-out:
-        kfree(w);
 }
 
 static void netvsc_set_multicast_list(struct net_device *net)
 {
-        struct set_multicast_work *swk =
-                kmalloc(sizeof(struct set_multicast_work), GFP_ATOMIC);
-        if (swk == NULL)
-                return;
+        struct net_device_context *net_device_ctx = netdev_priv(net);
 
-        swk->net = net;
-        INIT_WORK(&swk->work, do_set_multicast);
-        schedule_work(&swk->work);
+        schedule_work(&net_device_ctx->work);
 }
 
 static int netvsc_open(struct net_device *net)
@@ -125,6 +110,8 @@ static int netvsc_close(struct net_device *net)
 
         netif_tx_disable(net);
 
+        /* Make sure netvsc_set_multicast_list doesn't re-enable filter! */
+        cancel_work_sync(&net_device_ctx->work);
         ret = rndis_filter_close(device_obj);
         if (ret != 0)
                 netdev_err(net, "unable to close device (ret %d).\n", ret);
@@ -224,9 +211,13 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
                 net->stats.tx_packets++;
         } else {
                 kfree(packet);
+                if (ret != -EAGAIN) {
+                        dev_kfree_skb_any(skb);
+                        net->stats.tx_dropped++;
+                }
         }
 
-        return ret ? NETDEV_TX_BUSY : NETDEV_TX_OK;
+        return (ret == -EAGAIN) ? NETDEV_TX_BUSY : NETDEV_TX_OK;
 }
 
 /*
@@ -335,6 +326,7 @@ static int netvsc_change_mtu(struct net_device *ndev, int mtu)
 
         nvdev->start_remove = true;
         cancel_delayed_work_sync(&ndevctx->dwork);
+        cancel_work_sync(&ndevctx->work);
         netif_tx_disable(ndev);
         rndis_filter_device_remove(hdev);
 
@@ -403,6 +395,7 @@ static int netvsc_probe(struct hv_device *dev,
         net_device_ctx->device_ctx = dev;
         hv_set_drvdata(dev, net);
         INIT_DELAYED_WORK(&net_device_ctx->dwork, netvsc_send_garp);
+        INIT_WORK(&net_device_ctx->work, do_set_multicast);
 
         net->netdev_ops = &device_ops;
 
@@ -456,6 +449,7 @@ static int netvsc_remove(struct hv_device *dev)
 
         ndev_ctx = netdev_priv(net);
         cancel_delayed_work_sync(&ndev_ctx->dwork);
+        cancel_work_sync(&ndev_ctx->work);
 
         /* Stop outbound asap */
         netif_tx_disable(net);
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index d6be64bcefd4..981ebb115637 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -129,8 +129,8 @@ static void dump_rndis_message(struct hv_device *hv_dev,
         netdev = net_device->ndev;
 
         switch (rndis_msg->ndis_msg_type) {
-        case REMOTE_NDIS_PACKET_MSG:
-                netdev_dbg(netdev, "REMOTE_NDIS_PACKET_MSG (len %u, "
+        case RNDIS_MSG_PACKET:
+                netdev_dbg(netdev, "RNDIS_MSG_PACKET (len %u, "
                            "data offset %u data len %u, # oob %u, "
                            "oob offset %u, oob len %u, pkt offset %u, "
                            "pkt len %u\n",
@@ -144,8 +144,8 @@ static void dump_rndis_message(struct hv_device *hv_dev,
                            rndis_msg->msg.pkt.per_pkt_info_len);
                 break;
 
-        case REMOTE_NDIS_INITIALIZE_CMPLT:
-                netdev_dbg(netdev, "REMOTE_NDIS_INITIALIZE_CMPLT "
+        case RNDIS_MSG_INIT_C:
+                netdev_dbg(netdev, "RNDIS_MSG_INIT_C "
                         "(len %u, id 0x%x, status 0x%x, major %d, minor %d, "
                         "device flags %d, max xfer size 0x%x, max pkts %u, "
                         "pkt aligned %u)\n",
@@ -162,8 +162,8 @@ static void dump_rndis_message(struct hv_device *hv_dev,
                            pkt_alignment_factor);
                 break;
 
-        case REMOTE_NDIS_QUERY_CMPLT:
-                netdev_dbg(netdev, "REMOTE_NDIS_QUERY_CMPLT "
+        case RNDIS_MSG_QUERY_C:
+                netdev_dbg(netdev, "RNDIS_MSG_QUERY_C "
                         "(len %u, id 0x%x, status 0x%x, buf len %u, "
                         "buf offset %u)\n",
                         rndis_msg->msg_len,
@@ -175,16 +175,16 @@ static void dump_rndis_message(struct hv_device *hv_dev,
                            info_buf_offset);
                 break;
 
-        case REMOTE_NDIS_SET_CMPLT:
+        case RNDIS_MSG_SET_C:
                 netdev_dbg(netdev,
-                        "REMOTE_NDIS_SET_CMPLT (len %u, id 0x%x, status 0x%x)\n",
+                        "RNDIS_MSG_SET_C (len %u, id 0x%x, status 0x%x)\n",
                         rndis_msg->msg_len,
                         rndis_msg->msg.set_complete.req_id,
                         rndis_msg->msg.set_complete.status);
                 break;
 
-        case REMOTE_NDIS_INDICATE_STATUS_MSG:
-                netdev_dbg(netdev, "REMOTE_NDIS_INDICATE_STATUS_MSG "
+        case RNDIS_MSG_INDICATE:
+                netdev_dbg(netdev, "RNDIS_MSG_INDICATE "
                         "(len %u, status 0x%x, buf len %u, buf offset %u)\n",
                         rndis_msg->msg_len,
                         rndis_msg->msg.indicate_status.status,
@@ -264,14 +264,14 @@ static void rndis_filter_receive_response(struct rndis_device *dev,
                                 sizeof(struct rndis_filter_packet));
 
                         if (resp->ndis_msg_type ==
-                            REMOTE_NDIS_RESET_CMPLT) {
+                            RNDIS_MSG_RESET_C) {
                                 /* does not have a request id field */
                                 request->response_msg.msg.reset_complete.
-                                        status = STATUS_BUFFER_OVERFLOW;
+                                        status = RNDIS_STATUS_BUFFER_OVERFLOW;
                         } else {
                                 request->response_msg.msg.
                                 init_complete.status =
-                                        STATUS_BUFFER_OVERFLOW;
+                                        RNDIS_STATUS_BUFFER_OVERFLOW;
                         }
                 }
 
@@ -415,19 +415,19 @@ int rndis_filter_receive(struct hv_device *dev,
         dump_rndis_message(dev, rndis_msg);
 
         switch (rndis_msg->ndis_msg_type) {
-        case REMOTE_NDIS_PACKET_MSG:
+        case RNDIS_MSG_PACKET:
                 /* data msg */
                 rndis_filter_receive_data(rndis_dev, rndis_msg, pkt);
                 break;
 
-        case REMOTE_NDIS_INITIALIZE_CMPLT:
-        case REMOTE_NDIS_QUERY_CMPLT:
-        case REMOTE_NDIS_SET_CMPLT:
+        case RNDIS_MSG_INIT_C:
+        case RNDIS_MSG_QUERY_C:
+        case RNDIS_MSG_SET_C:
                 /* completion msgs */
                 rndis_filter_receive_response(rndis_dev, rndis_msg);
                 break;
 
-        case REMOTE_NDIS_INDICATE_STATUS_MSG:
+        case RNDIS_MSG_INDICATE:
                 /* notification msgs */
                 rndis_filter_receive_indicate_status(rndis_dev, rndis_msg);
                 break;
@@ -456,7 +456,7 @@ static int rndis_filter_query_device(struct rndis_device *dev, u32 oid,
                 return -EINVAL;
 
         *result_size = 0;
-        request = get_rndis_request(dev, REMOTE_NDIS_QUERY_MSG,
+        request = get_rndis_request(dev, RNDIS_MSG_QUERY,
                         RNDIS_MESSAGE_SIZE(struct rndis_query_request));
         if (!request) {
                 ret = -ENOMEM;
@@ -536,7 +536,7 @@ int rndis_filter_set_packet_filter(struct rndis_device *dev, u32 new_filter)
 
         ndev = dev->net_dev->ndev;
 
-        request = get_rndis_request(dev, REMOTE_NDIS_SET_MSG,
+        request = get_rndis_request(dev, RNDIS_MSG_SET,
                         RNDIS_MESSAGE_SIZE(struct rndis_set_request) +
                         sizeof(u32));
         if (!request) {
@@ -588,7 +588,7 @@ static int rndis_filter_init_device(struct rndis_device *dev)
         u32 status;
         int ret, t;
 
-        request = get_rndis_request(dev, REMOTE_NDIS_INITIALIZE_MSG,
+        request = get_rndis_request(dev, RNDIS_MSG_INIT,
                         RNDIS_MESSAGE_SIZE(struct rndis_initialize_request));
         if (!request) {
                 ret = -ENOMEM;
@@ -641,7 +641,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
         struct rndis_halt_request *halt;
 
         /* Attempt to do a rndis device halt */
-        request = get_rndis_request(dev, REMOTE_NDIS_HALT_MSG,
+        request = get_rndis_request(dev, RNDIS_MSG_HALT,
                                 RNDIS_MESSAGE_SIZE(struct rndis_halt_request));
         if (!request)
                 goto cleanup;
@@ -805,7 +805,7 @@ int rndis_filter_send(struct hv_device *dev,
         if (isvlan)
                 rndis_msg_size += NDIS_VLAN_PPI_SIZE;
 
-        rndis_msg->ndis_msg_type = REMOTE_NDIS_PACKET_MSG;
+        rndis_msg->ndis_msg_type = RNDIS_MSG_PACKET;
         rndis_msg->msg_len = pkt->total_data_buflen +
                                       rndis_msg_size;
 
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index 468047866c8c..35758445297e 100644
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -321,8 +321,8 @@ config AU1000_FIR
           Say M to build a module; it will be called au1k_ir.ko
 
 config SMC_IRCC_FIR
-        tristate "SMSC IrCC (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && IRDA && ISA_DMA_API
+        tristate "SMSC IrCC"
+        depends on IRDA && ISA_DMA_API
         help
           Say Y here if you want to build support for the SMC Infrared
           Communications Controller.  It is used in a wide variety of
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index 4351296dde32..510b9c8d23a9 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -1710,7 +1710,7 @@ toshoboe_gotosleep (struct pci_dev *pci_dev, pm_message_t crap)
 
 /* Flush all packets */
   while ((i--) && (self->txpending))
-    udelay (10000);
+    msleep(10);
 
   spin_lock_irqsave(&self->spinlock, flags);
 
diff --git a/drivers/net/irda/sh_irda.c b/drivers/net/irda/sh_irda.c
index 725d6b367822..eb315b8d07a3 100644
--- a/drivers/net/irda/sh_irda.c
+++ b/drivers/net/irda/sh_irda.c
@@ -737,7 +737,7 @@ static int sh_irda_stop(struct net_device *ndev)
         netif_stop_queue(ndev);
         pm_runtime_put_sync(&self->pdev->dev);
 
-        dev_info(&ndev->dev, "stoped\n");
+        dev_info(&ndev->dev, "stopped\n");
 
         return 0;
 }
diff --git a/drivers/net/irda/sh_sir.c b/drivers/net/irda/sh_sir.c
index e6661b5c1f83..256eddf1f75a 100644
--- a/drivers/net/irda/sh_sir.c
+++ b/drivers/net/irda/sh_sir.c
@@ -685,7 +685,7 @@ static int sh_sir_stop(struct net_device *ndev)
 
         netif_stop_queue(ndev);
 
-        dev_info(&ndev->dev, "stoped\n");
+        dev_info(&ndev->dev, "stopped\n");
 
         return 0;
 }
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 6c95d4087b2d..a926813ee91d 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -1,7 +1,6 @@
 /*********************************************************************
  *
  * Description:   Driver for the SMC Infrared Communications Controller
- * Status:        Experimental.
  * Author:        Daniele Peri (peri@csai.unipa.it)
  * Created at:
  * Modified at:
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index f975afdc315c..66a9bfe7b1c8 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -57,7 +57,7 @@ static struct macvlan_dev *macvlan_hash_lookup(const struct macvlan_port *port,
         struct hlist_node *n;
 
         hlist_for_each_entry_rcu(vlan, n, &port->vlan_hash[addr[5]], hlist) {
-                if (!compare_ether_addr_64bits(vlan->dev->dev_addr, addr))
+                if (ether_addr_equal_64bits(vlan->dev->dev_addr, addr))
                         return vlan;
         }
         return NULL;
@@ -96,7 +96,7 @@ static int macvlan_addr_busy(const struct macvlan_port *port,
          * currently in use by the underlying device or
          * another macvlan.
          */
-        if (!compare_ether_addr_64bits(port->dev->dev_addr, addr))
+        if (ether_addr_equal_64bits(port->dev->dev_addr, addr))
                 return 1;
 
         if (macvlan_hash_lookup(port, addr))
@@ -118,8 +118,7 @@ static int macvlan_broadcast_one(struct sk_buff *skb,
                 return vlan->forward(dev, skb);
 
         skb->dev = dev;
-        if (!compare_ether_addr_64bits(eth->h_dest,
-                                       dev->broadcast))
+        if (ether_addr_equal_64bits(eth->h_dest, dev->broadcast))
                 skb->pkt_type = PACKET_BROADCAST;
         else
                 skb->pkt_type = PACKET_MULTICAST;
@@ -259,7 +258,7 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
 
 xmit_world:
         skb->ip_summed = ip_summed;
-        skb_set_dev(skb, vlan->lowerdev);
+        skb->dev = vlan->lowerdev;
         return dev_queue_xmit(skb);
 }
 
@@ -312,7 +311,8 @@ static int macvlan_open(struct net_device *dev)
         int err;
 
         if (vlan->port->passthru) {
-                dev_set_promiscuity(lowerdev, 1);
+                if (!(vlan->flags & MACVLAN_FLAG_NOPROMISC))
+                        dev_set_promiscuity(lowerdev, 1);
                 goto hash_add;
         }
 
@@ -344,12 +344,15 @@ static int macvlan_stop(struct net_device *dev)
         struct macvlan_dev *vlan = netdev_priv(dev);
         struct net_device *lowerdev = vlan->lowerdev;
 
+        dev_uc_unsync(lowerdev, dev);
+        dev_mc_unsync(lowerdev, dev);
+
         if (vlan->port->passthru) {
-                dev_set_promiscuity(lowerdev, -1);
+                if (!(vlan->flags & MACVLAN_FLAG_NOPROMISC))
+                        dev_set_promiscuity(lowerdev, -1);
                 goto hash_del;
         }
 
-        dev_mc_unsync(lowerdev, dev);
         if (dev->flags & IFF_ALLMULTI)
                 dev_set_allmulti(lowerdev, -1);
 
@@ -399,10 +402,11 @@ static void macvlan_change_rx_flags(struct net_device *dev, int change)
                 dev_set_allmulti(lowerdev, dev->flags & IFF_ALLMULTI ? 1 : -1);
 }
 
-static void macvlan_set_multicast_list(struct net_device *dev)
+static void macvlan_set_mac_lists(struct net_device *dev)
 {
         struct macvlan_dev *vlan = netdev_priv(dev);
 
+        dev_uc_sync(vlan->lowerdev, dev);
         dev_mc_sync(vlan->lowerdev, dev);
 }
 
@@ -542,6 +546,43 @@ static int macvlan_vlan_rx_kill_vid(struct net_device *dev,
         return 0;
 }
 
+static int macvlan_fdb_add(struct ndmsg *ndm,
+                           struct net_device *dev,
+                           unsigned char *addr,
+                           u16 flags)
+{
+        struct macvlan_dev *vlan = netdev_priv(dev);
+        int err = -EINVAL;
+
+        if (!vlan->port->passthru)
+                return -EOPNOTSUPP;
+
+        if (is_unicast_ether_addr(addr))
+                err = dev_uc_add_excl(dev, addr);
+        else if (is_multicast_ether_addr(addr))
+                err = dev_mc_add_excl(dev, addr);
+
+        return err;
+}
+
+static int macvlan_fdb_del(struct ndmsg *ndm,
+                           struct net_device *dev,
+                           unsigned char *addr)
+{
+        struct macvlan_dev *vlan = netdev_priv(dev);
+        int err = -EINVAL;
+
+        if (!vlan->port->passthru)
+                return -EOPNOTSUPP;
+
+        if (is_unicast_ether_addr(addr))
+                err = dev_uc_del(dev, addr);
+        else if (is_multicast_ether_addr(addr))
+                err = dev_mc_del(dev, addr);
+
+        return err;
+}
+
 static void macvlan_ethtool_get_drvinfo(struct net_device *dev,
                                         struct ethtool_drvinfo *drvinfo)
 {
@@ -572,11 +613,14 @@ static const struct net_device_ops macvlan_netdev_ops = {
         .ndo_change_mtu         = macvlan_change_mtu,
         .ndo_change_rx_flags    = macvlan_change_rx_flags,
         .ndo_set_mac_address    = macvlan_set_mac_address,
-        .ndo_set_rx_mode        = macvlan_set_multicast_list,
+        .ndo_set_rx_mode        = macvlan_set_mac_lists,
         .ndo_get_stats64        = macvlan_dev_get_stats64,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_vlan_rx_add_vid    = macvlan_vlan_rx_add_vid,
         .ndo_vlan_rx_kill_vid   = macvlan_vlan_rx_kill_vid,
+        .ndo_fdb_add            = macvlan_fdb_add,
+        .ndo_fdb_del            = macvlan_fdb_del,
+        .ndo_fdb_dump           = ndo_dflt_fdb_dump,
 };
 
 void macvlan_common_setup(struct net_device *dev)
@@ -711,6 +755,9 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
         if (data && data[IFLA_MACVLAN_MODE])
                 vlan->mode = nla_get_u32(data[IFLA_MACVLAN_MODE]);
 
+        if (data && data[IFLA_MACVLAN_FLAGS])
+                vlan->flags = nla_get_u16(data[IFLA_MACVLAN_FLAGS]);
+
         if (vlan->mode == MACVLAN_MODE_PASSTHRU) {
                 if (port->count)
                         return -EINVAL;
@@ -760,6 +807,16 @@ static int macvlan_changelink(struct net_device *dev,
         struct macvlan_dev *vlan = netdev_priv(dev);
         if (data && data[IFLA_MACVLAN_MODE])
                 vlan->mode = nla_get_u32(data[IFLA_MACVLAN_MODE]);
+        if (data && data[IFLA_MACVLAN_FLAGS]) {
+                __u16 flags = nla_get_u16(data[IFLA_MACVLAN_FLAGS]);
+                bool promisc = (flags ^ vlan->flags) & MACVLAN_FLAG_NOPROMISC;
+
+                if (promisc && (flags & MACVLAN_FLAG_NOPROMISC))
+                        dev_set_promiscuity(vlan->lowerdev, -1);
+                else if (promisc && !(flags & MACVLAN_FLAG_NOPROMISC))
+                        dev_set_promiscuity(vlan->lowerdev, 1);
+                vlan->flags = flags;
+        }
         return 0;
 }
 
@@ -773,7 +830,10 @@ static int macvlan_fill_info(struct sk_buff *skb,
 {
         struct macvlan_dev *vlan = netdev_priv(dev);
 
-        NLA_PUT_U32(skb, IFLA_MACVLAN_MODE, vlan->mode);
+        if (nla_put_u32(skb, IFLA_MACVLAN_MODE, vlan->mode))
+                goto nla_put_failure;
+        if (nla_put_u16(skb, IFLA_MACVLAN_FLAGS, vlan->flags))
+                goto nla_put_failure;
         return 0;
 
 nla_put_failure:
@@ -781,7 +841,8 @@ nla_put_failure:
 }
 
 static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
-        [IFLA_MACVLAN_MODE] = { .type = NLA_U32 },
+        [IFLA_MACVLAN_MODE]  = { .type = NLA_U32 },
+        [IFLA_MACVLAN_FLAGS] = { .type = NLA_U16 },
 };
 
 int macvlan_link_register(struct rtnl_link_ops *ops)
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 0427c6561c84..2ee56de7b0ca 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -1,5 +1,6 @@
 #include <linux/etherdevice.h>
 #include <linux/if_macvlan.h>
+#include <linux/if_vlan.h>
 #include <linux/interrupt.h>
 #include <linux/nsproxy.h>
 #include <linux/compat.h>
@@ -505,10 +506,11 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
                 if (copy > size) {
                         ++from;
                         --count;
-                }
+                        offset = 0;
+                } else
+                        offset += size;
                 copy -= size;
                 offset1 += size;
-                offset = 0;
         }
 
         if (len == offset1)
@@ -518,24 +520,29 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
                 struct page *page[MAX_SKB_FRAGS];
                 int num_pages;
                 unsigned long base;
+                unsigned long truesize;
 
-                len = from->iov_len - offset1;
+                len = from->iov_len - offset;
                 if (!len) {
-                        offset1 = 0;
+                        offset = 0;
                         ++from;
                         continue;
                 }
-                base = (unsigned long)from->iov_base + offset1;
+                base = (unsigned long)from->iov_base + offset;
                 size = ((base & ~PAGE_MASK) + len + ~PAGE_MASK) >> PAGE_SHIFT;
+                if (i + size > MAX_SKB_FRAGS)
+                        return -EMSGSIZE;
                 num_pages = get_user_pages_fast(base, size, 0, &page[i]);
-                if ((num_pages != size) ||
-                    (num_pages > MAX_SKB_FRAGS - skb_shinfo(skb)->nr_frags))
-                        /* put_page is in skb free */
+                if (num_pages != size) {
+                        for (i = 0; i < num_pages; i++)
+                                put_page(page[i]);
                         return -EFAULT;
+                }
+                truesize = size * PAGE_SIZE;
                 skb->data_len += len;
                 skb->len += len;
-                skb->truesize += len;
-                atomic_add(len, &skb->sk->sk_wmem_alloc);
+                skb->truesize += truesize;
+                atomic_add(truesize, &skb->sk->sk_wmem_alloc);
                 while (len) {
                         int off = base & ~PAGE_MASK;
                         int size = min_t(int, len, PAGE_SIZE - off);
@@ -546,7 +553,7 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
                         len -= size;
                         i++;
                 }
-                offset1 = 0;
+                offset = 0;
                 ++from;
         }
         return 0;
@@ -646,7 +653,7 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,
         int err;
         struct virtio_net_hdr vnet_hdr = { 0 };
         int vnet_hdr_len = 0;
-        int copylen;
+        int copylen = 0;
         bool zerocopy = false;
 
         if (q->flags & IFF_VNET_HDR) {
@@ -675,15 +682,31 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,
         if (unlikely(len < ETH_HLEN))
                 goto err;
 
+        err = -EMSGSIZE;
+        if (unlikely(count > UIO_MAXIOV))
+                goto err;
+
         if (m && m->msg_control && sock_flag(&q->sk, SOCK_ZEROCOPY))
                 zerocopy = true;
 
         if (zerocopy) {
+                /* Userspace may produce vectors with count greater than
+                 * MAX_SKB_FRAGS, so we need to linearize parts of the skb
+                 * to let the rest of data to be fit in the frags.
+                 */
+                if (count > MAX_SKB_FRAGS) {
+                        copylen = iov_length(iv, count - MAX_SKB_FRAGS);
+                        if (copylen < vnet_hdr_len)
+                                copylen = 0;
+                        else
+                                copylen -= vnet_hdr_len;
+                }
                 /* There are 256 bytes to be copied in skb, so there is enough
                  * room for skb expand head in case it is used.
                  * The rest buffer is mapped from userspace.
                  */
-                copylen = vnet_hdr.hdr_len;
+                if (copylen < vnet_hdr.hdr_len)
+                        copylen = vnet_hdr.hdr_len;
                 if (!copylen)
                         copylen = GOODCOPY_LEN;
         } else
@@ -694,10 +717,9 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,
         if (!skb)
                 goto err;
 
-        if (zerocopy) {
+        if (zerocopy)
                 err = zerocopy_sg_from_iovec(skb, iv, vnet_hdr_len, count);
-                skb_shinfo(skb)->tx_flags |= SKBTX_DEV_ZEROCOPY;
-        } else
+        else
                 err = skb_copy_datagram_from_iovec(skb, 0, iv, vnet_hdr_len,
                                                    len);
         if (err)
@@ -716,8 +738,10 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,
         rcu_read_lock_bh();
         vlan = rcu_dereference_bh(q->vlan);
         /* copy skb_ubuf_info for callback when skb has no error */
-        if (zerocopy)
+        if (zerocopy) {
                 skb_shinfo(skb)->destructor_arg = m->msg_control;
+                skb_shinfo(skb)->tx_flags |= SKBTX_DEV_ZEROCOPY;
+        }
         if (vlan)
                 macvlan_start_xmit(skb, vlan->dev);
         else
@@ -759,6 +783,8 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
         struct macvlan_dev *vlan;
         int ret;
         int vnet_hdr_len = 0;
+        int vlan_offset = 0;
+        int copied;
 
         if (q->flags & IFF_VNET_HDR) {
                 struct virtio_net_hdr vnet_hdr;
@@ -773,18 +799,48 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
                 if (memcpy_toiovecend(iv, (void *)&vnet_hdr, 0, sizeof(vnet_hdr)))
                         return -EFAULT;
         }
+        copied = vnet_hdr_len;
+
+        if (!vlan_tx_tag_present(skb))
+                len = min_t(int, skb->len, len);
+        else {
+                int copy;
+                struct {
+                        __be16 h_vlan_proto;
+                        __be16 h_vlan_TCI;
+                } veth;
+                veth.h_vlan_proto = htons(ETH_P_8021Q);
+                veth.h_vlan_TCI = htons(vlan_tx_tag_get(skb));
+
+                vlan_offset = offsetof(struct vlan_ethhdr, h_vlan_proto);
+                len = min_t(int, skb->len + VLAN_HLEN, len);
+
+                copy = min_t(int, vlan_offset, len);
+                ret = skb_copy_datagram_const_iovec(skb, 0, iv, copied, copy);
+                len -= copy;
+                copied += copy;
+                if (ret || !len)
+                        goto done;
+
+                copy = min_t(int, sizeof(veth), len);
+                ret = memcpy_toiovecend(iv, (void *)&veth, copied, copy);
+                len -= copy;
+                copied += copy;
+                if (ret || !len)
+                        goto done;
+        }
 
-        len = min_t(int, skb->len, len);
-
-        ret = skb_copy_datagram_const_iovec(skb, 0, iv, vnet_hdr_len, len);
+        ret = skb_copy_datagram_const_iovec(skb, vlan_offset, iv, copied, len);
+        copied += len;
 
+done:
         rcu_read_lock_bh();
         vlan = rcu_dereference_bh(q->vlan);
         if (vlan)
-                macvlan_count_rx(vlan, len, ret == 0, 0);
+                macvlan_count_rx(vlan, copied - vnet_hdr_len, ret == 0, 0);
         rcu_read_unlock_bh();
 
-        return ret ? ret : (len + vnet_hdr_len);
+        return ret ? ret : copied;
 }
 
 static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 0e01f4e5cd64..944cdfb80fe4 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -135,6 +135,25 @@ config MDIO_OCTEON
 
           If in doubt, say Y.
 
+config MDIO_BUS_MUX
+        tristate
+        depends on OF_MDIO
+        help
+          This module provides a driver framework for MDIO bus
+          multiplexers which connect one of several child MDIO busses
+          to a parent bus.  Switching between child busses is done by
+          device specific drivers.
+
+config MDIO_BUS_MUX_GPIO
+        tristate "Support for GPIO controlled MDIO bus multiplexers"
+        depends on OF_GPIO && OF_MDIO
+        select MDIO_BUS_MUX
+        help
+          This module provides a driver for MDIO bus multiplexers that
+          are controlled via GPIO lines.  The multiplexer connects one of
+          several child MDIO busses to a parent bus.  Child bus
+          selection is under the control of GPIO lines.
+
 endif # PHYLIB
 
 config MICREL_KS8995MA
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index b7438b1b94b9..f51af688ef8b 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -25,3 +25,5 @@ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
 obj-$(CONFIG_MDIO_OCTEON)       += mdio-octeon.o
 obj-$(CONFIG_MICREL_KS8995MA)   += spi_ks8995.o
 obj-$(CONFIG_AMD_PHY)           += amd.o
+obj-$(CONFIG_MDIO_BUS_MUX)      += mdio-mux.o
+obj-$(CONFIG_MDIO_BUS_MUX_GPIO) += mdio-mux-gpio.o
diff --git a/drivers/net/phy/bcm63xx.c b/drivers/net/phy/bcm63xx.c
index e16f98cb4f04..cd802eb25fd2 100644
--- a/drivers/net/phy/bcm63xx.c
+++ b/drivers/net/phy/bcm63xx.c
@@ -39,10 +39,7 @@ static int bcm63xx_config_init(struct phy_device *phydev)
                 MII_BCM63XX_IR_SPEED |
                 MII_BCM63XX_IR_LINK) |
                 MII_BCM63XX_IR_EN;
-        err = phy_write(phydev, MII_BCM63XX_IR, reg);
-        if (err < 0)
-                return err;
-        return 0;
+        return phy_write(phydev, MII_BCM63XX_IR, reg);
 }
 
 static int bcm63xx_ack_interrupt(struct phy_device *phydev)
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c
index 2f774acdb551..5f59cc064778 100644
--- a/drivers/net/phy/davicom.c
+++ b/drivers/net/phy/davicom.c
@@ -134,12 +134,7 @@ static int dm9161_config_init(struct phy_device *phydev)
                 return err;
 
         /* Reconnect the PHY, and enable Autonegotiation */
-        err = phy_write(phydev, MII_BMCR, BMCR_ANENABLE);
-
-        if (err < 0)
-                return err;
-
-        return 0;
+        return phy_write(phydev, MII_BMCR, BMCR_ANENABLE);
 }
 
 static int dm9161_ack_interrupt(struct phy_device *phydev)
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index dd7ae19579d1..940b29022d0c 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -1215,6 +1215,36 @@ static void dp83640_txtstamp(struct phy_device *phydev,
         }
 }
 
+static int dp83640_ts_info(struct phy_device *dev, struct ethtool_ts_info *info)
+{
+        struct dp83640_private *dp83640 = dev->priv;
+
+        info->so_timestamping =
+                SOF_TIMESTAMPING_TX_HARDWARE |
+                SOF_TIMESTAMPING_RX_HARDWARE |
+                SOF_TIMESTAMPING_RAW_HARDWARE;
+        info->phc_index = ptp_clock_index(dp83640->clock->ptp_clock);
+        info->tx_types =
+                (1 << HWTSTAMP_TX_OFF) |
+                (1 << HWTSTAMP_TX_ON) |
+                (1 << HWTSTAMP_TX_ONESTEP_SYNC);
+        info->rx_filters =
+                (1 << HWTSTAMP_FILTER_NONE) |
+                (1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |
+                (1 << HWTSTAMP_FILTER_PTP_V1_L4_SYNC) |
+                (1 << HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ) |
+                (1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT) |
+                (1 << HWTSTAMP_FILTER_PTP_V2_L4_SYNC) |
+                (1 << HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ) |
+                (1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |
+                (1 << HWTSTAMP_FILTER_PTP_V2_L2_SYNC) |
+                (1 << HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ) |
+                (1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |
+                (1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |
+                (1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ);
+        return 0;
+}
+
 static struct phy_driver dp83640_driver = {
         .phy_id         = DP83640_PHY_ID,
         .phy_id_mask    = 0xfffffff0,
@@ -1225,6 +1255,7 @@ static struct phy_driver dp83640_driver = {
         .remove         = dp83640_remove,
         .config_aneg    = genphy_config_aneg,
         .read_status    = genphy_read_status,
+        .ts_info        = dp83640_ts_info,
         .hwtstamp       = dp83640_hwtstamp,
         .rxtstamp       = dp83640_rxtstamp,
         .txtstamp       = dp83640_txtstamp,
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c
index f08c85acf761..5ac46f5226f3 100644
--- a/drivers/net/phy/icplus.c
+++ b/drivers/net/phy/icplus.c
@@ -40,6 +40,7 @@ MODULE_LICENSE("GPL");
 #define IP1001_PHASE_SEL_MASK           3       /* IP1001 RX/TXPHASE_SEL */
 #define IP1001_APS_ON                   11      /* IP1001 APS Mode  bit */
 #define IP101A_G_APS_ON                 2       /* IP101A/G APS Mode bit */
+#define IP101A_G_IRQ_CONF_STATUS        0x11    /* Conf Info IRQ & Status Reg */
 
 static int ip175c_config_init(struct phy_device *phydev)
 {
@@ -185,6 +186,15 @@ static int ip175c_config_aneg(struct phy_device *phydev)
         return 0;
 }
 
+static int ip101a_g_ack_interrupt(struct phy_device *phydev)
+{
+        int err = phy_read(phydev, IP101A_G_IRQ_CONF_STATUS);
+        if (err < 0)
+                return err;
+
+        return 0;
+}
+
 static struct phy_driver ip175c_driver = {
         .phy_id         = 0x02430d80,
         .name           = "ICPlus IP175C",
@@ -204,7 +214,6 @@ static struct phy_driver ip1001_driver = {
         .phy_id_mask    = 0x0ffffff0,
         .features       = PHY_GBIT_FEATURES | SUPPORTED_Pause |
                           SUPPORTED_Asym_Pause,
-        .flags          = PHY_HAS_INTERRUPT,
         .config_init    = &ip1001_config_init,
         .config_aneg    = &genphy_config_aneg,
         .read_status    = &genphy_read_status,
@@ -220,6 +229,7 @@ static struct phy_driver ip101a_g_driver = {
         .features       = PHY_BASIC_FEATURES | SUPPORTED_Pause |
                           SUPPORTED_Asym_Pause,
         .flags          = PHY_HAS_INTERRUPT,
+        .ack_interrupt  = ip101a_g_ack_interrupt,
         .config_init    = &ip101a_g_config_init,
         .config_aneg    = &genphy_config_aneg,
         .read_status    = &genphy_read_status,
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index e8b9c53c304b..418928d644bf 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -455,11 +455,7 @@ static int m88e1111_config_init(struct phy_device *phydev)
         if (err < 0)
                 return err;
 
-        err = phy_write(phydev, MII_BMCR, BMCR_RESET);
-        if (err < 0)
-                return err;
-
-        return 0;
+        return phy_write(phydev, MII_BMCR, BMCR_RESET);
 }
 
 static int m88e1118_config_aneg(struct phy_device *phydev)
@@ -515,11 +511,7 @@ static int m88e1118_config_init(struct phy_device *phydev)
         if (err < 0)
                 return err;
 
-        err = phy_write(phydev, MII_BMCR, BMCR_RESET);
-        if (err < 0)
-                return err;
-
-        return 0;
+        return phy_write(phydev, MII_BMCR, BMCR_RESET);
 }
 
 static int m88e1149_config_init(struct phy_device *phydev)
@@ -545,11 +537,7 @@ static int m88e1149_config_init(struct phy_device *phydev)
         if (err < 0)
                 return err;
 
-        err = phy_write(phydev, MII_BMCR, BMCR_RESET);
-        if (err < 0)
-                return err;
-
-        return 0;
+        return phy_write(phydev, MII_BMCR, BMCR_RESET);
 }
 
 static int m88e1145_config_init(struct phy_device *phydev)
diff --git a/drivers/net/phy/mdio-mux-gpio.c b/drivers/net/phy/mdio-mux-gpio.c
new file mode 100644
index 000000000000..e0cc4ef33dee
--- /dev/null
+++ b/drivers/net/phy/mdio-mux-gpio.c
@@ -0,0 +1,142 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2011, 2012 Cavium, Inc.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/device.h>
+#include <linux/of_mdio.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/phy.h>
+#include <linux/mdio-mux.h>
+#include <linux/of_gpio.h>
+
+#define DRV_VERSION "1.0"
+#define DRV_DESCRIPTION "GPIO controlled MDIO bus multiplexer driver"
+
+#define MDIO_MUX_GPIO_MAX_BITS 8
+
+struct mdio_mux_gpio_state {
+        int gpio[MDIO_MUX_GPIO_MAX_BITS];
+        unsigned int num_gpios;
+        void *mux_handle;
+};
+
+static int mdio_mux_gpio_switch_fn(int current_child, int desired_child,
+                                   void *data)
+{
+        int change;
+        unsigned int n;
+        struct mdio_mux_gpio_state *s = data;
+
+        if (current_child == desired_child)
+                return 0;
+
+        change = current_child == -1 ? -1 : current_child ^ desired_child;
+
+        for (n = 0; n < s->num_gpios; n++) {
+                if (change & 1)
+                        gpio_set_value_cansleep(s->gpio[n],
+                                                (desired_child & 1) != 0);
+                change >>= 1;
+                desired_child >>= 1;
+        }
+
+        return 0;
+}
+
+static int __devinit mdio_mux_gpio_probe(struct platform_device *pdev)
+{
+        enum of_gpio_flags f;
+        struct mdio_mux_gpio_state *s;
+        unsigned int num_gpios;
+        unsigned int n;
+        int r;
+
+        if (!pdev->dev.of_node)
+                return -ENODEV;
+
+        num_gpios = of_gpio_count(pdev->dev.of_node);
+        if (num_gpios == 0 || num_gpios > MDIO_MUX_GPIO_MAX_BITS)
+                return -ENODEV;
+
+        s = devm_kzalloc(&pdev->dev, sizeof(*s), GFP_KERNEL);
+        if (!s)
+                return -ENOMEM;
+
+        s->num_gpios = num_gpios;
+
+        for (n = 0; n < num_gpios; ) {
+                int gpio = of_get_gpio_flags(pdev->dev.of_node, n, &f);
+                if (gpio < 0) {
+                        r = (gpio == -ENODEV) ? -EPROBE_DEFER : gpio;
+                        goto err;
+                }
+                s->gpio[n] = gpio;
+
+                n++;
+
+                r = gpio_request(gpio, "mdio_mux_gpio");
+                if (r)
+                        goto err;
+
+                r = gpio_direction_output(gpio, 0);
+                if (r)
+                        goto err;
+        }
+
+        r = mdio_mux_init(&pdev->dev,
+                          mdio_mux_gpio_switch_fn, &s->mux_handle, s);
+
+        if (r == 0) {
+                pdev->dev.platform_data = s;
+                return 0;
+        }
+err:
+        while (n) {
+                n--;
+                gpio_free(s->gpio[n]);
+        }
+        devm_kfree(&pdev->dev, s);
+        return r;
+}
+
+static int __devexit mdio_mux_gpio_remove(struct platform_device *pdev)
+{
+        struct mdio_mux_gpio_state *s = pdev->dev.platform_data;
+        mdio_mux_uninit(s->mux_handle);
+        return 0;
+}
+
+static struct of_device_id mdio_mux_gpio_match[] = {
+        {
+                .compatible = "mdio-mux-gpio",
+        },
+        {
+                /* Legacy compatible property. */
+                .compatible = "cavium,mdio-mux-sn74cbtlv3253",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, mdio_mux_gpio_match);
+
+static struct platform_driver mdio_mux_gpio_driver = {
+        .driver = {
+                .name           = "mdio-mux-gpio",
+                .owner          = THIS_MODULE,
+                .of_match_table = mdio_mux_gpio_match,
+        },
+        .probe          = mdio_mux_gpio_probe,
+        .remove         = __devexit_p(mdio_mux_gpio_remove),
+};
+
+module_platform_driver(mdio_mux_gpio_driver);
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("David Daney");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/phy/mdio-mux.c b/drivers/net/phy/mdio-mux.c
new file mode 100644
index 000000000000..39ea0674dcde
--- /dev/null
+++ b/drivers/net/phy/mdio-mux.c
@@ -0,0 +1,192 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2011, 2012 Cavium, Inc.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/mdio-mux.h>
+#include <linux/of_mdio.h>
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/phy.h>
+
+#define DRV_VERSION "1.0"
+#define DRV_DESCRIPTION "MDIO bus multiplexer driver"
+
+struct mdio_mux_child_bus;
+
+struct mdio_mux_parent_bus {
+        struct mii_bus *mii_bus;
+        int current_child;
+        int parent_id;
+        void *switch_data;
+        int (*switch_fn)(int current_child, int desired_child, void *data);
+
+        /* List of our children linked through their next fields. */
+        struct mdio_mux_child_bus *children;
+};
+
+struct mdio_mux_child_bus {
+        struct mii_bus *mii_bus;
+        struct mdio_mux_parent_bus *parent;
+        struct mdio_mux_child_bus *next;
+        int bus_number;
+        int phy_irq[PHY_MAX_ADDR];
+};
+
+/*
+ * The parent bus' lock is used to order access to the switch_fn.
+ */
+static int mdio_mux_read(struct mii_bus *bus, int phy_id, int regnum)
+{
+        struct mdio_mux_child_bus *cb = bus->priv;
+        struct mdio_mux_parent_bus *pb = cb->parent;
+        int r;
+
+        mutex_lock(&pb->mii_bus->mdio_lock);
+        r = pb->switch_fn(pb->current_child, cb->bus_number, pb->switch_data);
+        if (r)
+                goto out;
+
+        pb->current_child = cb->bus_number;
+
+        r = pb->mii_bus->read(pb->mii_bus, phy_id, regnum);
+out:
+        mutex_unlock(&pb->mii_bus->mdio_lock);
+
+        return r;
+}
+
+/*
+ * The parent bus' lock is used to order access to the switch_fn.
+ */
+static int mdio_mux_write(struct mii_bus *bus, int phy_id,
+                          int regnum, u16 val)
+{
+        struct mdio_mux_child_bus *cb = bus->priv;
+        struct mdio_mux_parent_bus *pb = cb->parent;
+
+        int r;
+
+        mutex_lock(&pb->mii_bus->mdio_lock);
+        r = pb->switch_fn(pb->current_child, cb->bus_number, pb->switch_data);
+        if (r)
+                goto out;
+
+        pb->current_child = cb->bus_number;
+
+        r = pb->mii_bus->write(pb->mii_bus, phy_id, regnum, val);
+out:
+        mutex_unlock(&pb->mii_bus->mdio_lock);
+
+        return r;
+}
+
+static int parent_count;
+
+int mdio_mux_init(struct device *dev,
+                  int (*switch_fn)(int cur, int desired, void *data),
+                  void **mux_handle,
+                  void *data)
+{
+        struct device_node *parent_bus_node;
+        struct device_node *child_bus_node;
+        int r, ret_val;
+        struct mii_bus *parent_bus;
+        struct mdio_mux_parent_bus *pb;
+        struct mdio_mux_child_bus *cb;
+
+        if (!dev->of_node)
+                return -ENODEV;
+
+        parent_bus_node = of_parse_phandle(dev->of_node, "mdio-parent-bus", 0);
+
+        if (!parent_bus_node)
+                return -ENODEV;
+
+        parent_bus = of_mdio_find_bus(parent_bus_node);
+        if (parent_bus == NULL) {
+                ret_val = -EPROBE_DEFER;
+                goto err_parent_bus;
+        }
+
+        pb = devm_kzalloc(dev, sizeof(*pb), GFP_KERNEL);
+        if (pb == NULL) {
+                ret_val = -ENOMEM;
+                goto err_parent_bus;
+        }
+
+        pb->switch_data = data;
+        pb->switch_fn = switch_fn;
+        pb->current_child = -1;
+        pb->parent_id = parent_count++;
+        pb->mii_bus = parent_bus;
+
+        ret_val = -ENODEV;
+        for_each_child_of_node(dev->of_node, child_bus_node) {
+                u32 v;
+
+                r = of_property_read_u32(child_bus_node, "reg", &v);
+                if (r)
+                        continue;
+
+                cb = devm_kzalloc(dev, sizeof(*cb), GFP_KERNEL);
+                if (cb == NULL) {
+                        dev_err(dev,
+                                "Error: Failed to allocate memory for child\n");
+                        ret_val = -ENOMEM;
+                        break;
+                }
+                cb->bus_number = v;
+                cb->parent = pb;
+                cb->mii_bus = mdiobus_alloc();
+                cb->mii_bus->priv = cb;
+
+                cb->mii_bus->irq = cb->phy_irq;
+                cb->mii_bus->name = "mdio_mux";
+                snprintf(cb->mii_bus->id, MII_BUS_ID_SIZE, "%x.%x",
+                         pb->parent_id, v);
+                cb->mii_bus->parent = dev;
+                cb->mii_bus->read = mdio_mux_read;
+                cb->mii_bus->write = mdio_mux_write;
+                r = of_mdiobus_register(cb->mii_bus, child_bus_node);
+                if (r) {
+                        mdiobus_free(cb->mii_bus);
+                        devm_kfree(dev, cb);
+                } else {
+                        of_node_get(child_bus_node);
+                        cb->next = pb->children;
+                        pb->children = cb;
+                }
+        }
+        if (pb->children) {
+                *mux_handle = pb;
+                dev_info(dev, "Version " DRV_VERSION "\n");
+                return 0;
+        }
+err_parent_bus:
+        of_node_put(parent_bus_node);
+        return ret_val;
+}
+EXPORT_SYMBOL_GPL(mdio_mux_init);
+
+void mdio_mux_uninit(void *mux_handle)
+{
+        struct mdio_mux_parent_bus *pb = mux_handle;
+        struct mdio_mux_child_bus *cb = pb->children;
+
+        while (cb) {
+                mdiobus_unregister(cb->mii_bus);
+                mdiobus_free(cb->mii_bus);
+                cb = cb->next;
+        }
+}
+EXPORT_SYMBOL_GPL(mdio_mux_uninit);
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("David Daney");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 8985cc62cf41..683ef1ce5519 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -88,6 +88,38 @@ static struct class mdio_bus_class = {
         .dev_release    = mdiobus_release,
 };
 
+#if IS_ENABLED(CONFIG_OF_MDIO)
+/* Helper function for of_mdio_find_bus */
+static int of_mdio_bus_match(struct device *dev, void *mdio_bus_np)
+{
+        return dev->of_node == mdio_bus_np;
+}
+/**
+ * of_mdio_find_bus - Given an mii_bus node, find the mii_bus.
+ * @mdio_np: Pointer to the mii_bus.
+ *
+ * Returns a pointer to the mii_bus, or NULL if none found.
+ *
+ * Because the association of a device_node and mii_bus is made via
+ * of_mdiobus_register(), the mii_bus cannot be found before it is
+ * registered with of_mdiobus_register().
+ *
+ */
+struct mii_bus *of_mdio_find_bus(struct device_node *mdio_bus_np)
+{
+        struct device *d;
+
+        if (!mdio_bus_np)
+                return NULL;
+
+        d = class_find_device(&mdio_bus_class, NULL,  mdio_bus_np,
+                              of_mdio_bus_match);
+
+        return d ? to_mii_bus(d) : NULL;
+}
+EXPORT_SYMBOL(of_mdio_find_bus);
+#endif
+
 /**
  * mdiobus_register - bring up all the PHYs on a given bus and attach them to bus
  * @bus: target mii_bus
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index e8c42d6a7d1c..de86a5582224 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -207,7 +207,7 @@ static struct phy_device* phy_device_create(struct mii_bus *bus,
  * Description: Reads the ID registers of the PHY at @addr on the
  *   @bus, stores it in @phy_id and returns zero on success.
  */
-int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)
+static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)
 {
         int phy_reg;
 
@@ -230,7 +230,6 @@ int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)
 
         return 0;
 }
-EXPORT_SYMBOL(get_phy_id);
 
 /**
  * get_phy_device - reads the specified PHY device and returns its @phy_device struct
diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c
index 116a2dd7c879..4eb98bc52a0a 100644
--- a/drivers/net/phy/spi_ks8995.c
+++ b/drivers/net/phy/spi_ks8995.c
@@ -348,7 +348,6 @@ static int __devexit ks8995_remove(struct spi_device *spi)
 static struct spi_driver ks8995_driver = {
         .driver = {
                 .name       = "spi-ks8995",
-                .bus         = &spi_bus_type,
                 .owner     = THIS_MODULE,
         },
         .probe    = ks8995_probe,
diff --git a/drivers/net/ppp/ppp_async.c b/drivers/net/ppp/ppp_async.c
index af95a98fd86f..a031f6b456b4 100644
--- a/drivers/net/ppp/ppp_async.c
+++ b/drivers/net/ppp/ppp_async.c
@@ -613,7 +613,7 @@ ppp_async_encode(struct asyncppp *ap)
         *buf++ = PPP_FLAG;
         ap->olim = buf;
 
-        kfree_skb(ap->tpkt);
+        consume_skb(ap->tpkt);
         ap->tpkt = NULL;
         return 1;
 }
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
index 33f8c51968b6..5c0557222f20 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -235,7 +235,7 @@ struct ppp_net {
 /* Prototypes. */
 static int ppp_unattached_ioctl(struct net *net, struct ppp_file *pf,
                         struct file *file, unsigned int cmd, unsigned long arg);
-static int ppp_xmit_process(struct ppp *ppp);
+static void ppp_xmit_process(struct ppp *ppp);
 static void ppp_send_frame(struct ppp *ppp, struct sk_buff *skb);
 static void ppp_push(struct ppp *ppp);
 static void ppp_channel_push(struct channel *pch);
@@ -969,8 +969,7 @@ ppp_start_xmit(struct sk_buff *skb, struct net_device *dev)
         put_unaligned_be16(proto, pp);
 
         skb_queue_tail(&ppp->file.xq, skb);
-        if (!ppp_xmit_process(ppp))
-                netif_stop_queue(dev);
+        ppp_xmit_process(ppp);
         return NETDEV_TX_OK;
 
  outf:
@@ -1048,11 +1047,10 @@ static void ppp_setup(struct net_device *dev)
  * Called to do any work queued up on the transmit side
  * that can now be done.
  */
-static int
+static void
 ppp_xmit_process(struct ppp *ppp)
 {
         struct sk_buff *skb;
-        int ret = 0;
 
         ppp_xmit_lock(ppp);
         if (!ppp->closing) {
@@ -1062,13 +1060,12 @@ ppp_xmit_process(struct ppp *ppp)
                         ppp_send_frame(ppp, skb);
                 /* If there's no work left to do, tell the core net
                    code that we can accept some more. */
-                if (!ppp->xmit_pending && !skb_peek(&ppp->file.xq)) {
+                if (!ppp->xmit_pending && !skb_peek(&ppp->file.xq))
                         netif_wake_queue(ppp->dev);
-                        ret = 1;
-                }
+                else
+                        netif_stop_queue(ppp->dev);
         }
         ppp_xmit_unlock(ppp);
-        return ret;
 }
 
 static inline struct sk_buff *
@@ -1095,13 +1092,13 @@ pad_compress_skb(struct ppp *ppp, struct sk_buff *skb)
                                    new_skb->data, skb->len + 2,
                                    compressor_skb_size);
         if (len > 0 && (ppp->flags & SC_CCP_UP)) {
-                kfree_skb(skb);
+                consume_skb(skb);
                 skb = new_skb;
                 skb_put(skb, len);
                 skb_pull(skb, 2);       /* pull off A/C bytes */
         } else if (len == 0) {
                 /* didn't compress, or CCP not up yet */
-                kfree_skb(new_skb);
+                consume_skb(new_skb);
                 new_skb = skb;
         } else {
                 /*
@@ -1115,7 +1112,7 @@ pad_compress_skb(struct ppp *ppp, struct sk_buff *skb)
                 if (net_ratelimit())
                         netdev_err(ppp->dev, "ppp: compressor dropped pkt\n");
                 kfree_skb(skb);
-                kfree_skb(new_skb);
+                consume_skb(new_skb);
                 new_skb = NULL;
         }
         return new_skb;
@@ -1181,7 +1178,7 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)
                                     !(ppp->flags & SC_NO_TCP_CCID));
                 if (cp == skb->data + 2) {
                         /* didn't compress */
-                        kfree_skb(new_skb);
+                        consume_skb(new_skb);
                 } else {
                         if (cp[0] & SL_TYPE_COMPRESSED_TCP) {
                                 proto = PPP_VJC_COMP;
@@ -1190,7 +1187,7 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)
                                 proto = PPP_VJC_UNCOMP;
                                 cp[0] = skb->data[2];
                         }
-                        kfree_skb(skb);
+                        consume_skb(skb);
                         skb = new_skb;
                         cp = skb_put(skb, len + 2);
                         cp[0] = 0;
@@ -1706,7 +1703,7 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
                         }
                         skb_reserve(ns, 2);
                         skb_copy_bits(skb, 0, skb_put(ns, skb->len), skb->len);
-                        kfree_skb(skb);
+                        consume_skb(skb);
                         skb = ns;
                 }
                 else
@@ -1854,7 +1851,7 @@ ppp_decompress_frame(struct ppp *ppp, struct sk_buff *skb)
                         goto err;
                 }
 
-                kfree_skb(skb);
+                consume_skb(skb);
                 skb = ns;
                 skb_put(skb, len);
                 skb_pull(skb, 2);       /* pull off the A/C bytes */
diff --git a/drivers/net/ppp/ppp_synctty.c b/drivers/net/ppp/ppp_synctty.c
index 55e466c511d5..1a12033d2efa 100644
--- a/drivers/net/ppp/ppp_synctty.c
+++ b/drivers/net/ppp/ppp_synctty.c
@@ -588,7 +588,7 @@ ppp_sync_txmunge(struct syncppp *ap, struct sk_buff *skb)
                         skb_reserve(npkt,2);
                         skb_copy_from_linear_data(skb,
                                       skb_put(npkt, skb->len), skb->len);
-                        kfree_skb(skb);
+                        consume_skb(skb);
                         skb = npkt;
                 }
                 skb_push(skb,2);
@@ -656,7 +656,7 @@ ppp_sync_push(struct syncppp *ap)
                         if (sent < ap->tpkt->len) {
                                 tty_stuffed = 1;
                         } else {
-                                kfree_skb(ap->tpkt);
+                                consume_skb(ap->tpkt);
                                 ap->tpkt = NULL;
                                 clear_bit(XMIT_FULL, &ap->xmit_flags);
                                 done = 1;
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
index 2fa1a9b6f498..cbf7047decc0 100644
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
@@ -201,7 +201,7 @@ static int __set_item(struct pppoe_net *pn, struct pppox_sock *po)
         return 0;
 }
 
-static struct pppox_sock *__delete_item(struct pppoe_net *pn, __be16 sid,
+static void __delete_item(struct pppoe_net *pn, __be16 sid,
                                         char *addr, int ifindex)
 {
         int hash = hash_item(sid, addr);
@@ -220,8 +220,6 @@ static struct pppox_sock *__delete_item(struct pppoe_net *pn, __be16 sid,
                 src = &ret->next;
                 ret = ret->next;
         }
-
-        return ret;
 }
 
 /**********************************************************************
@@ -264,16 +262,12 @@ static inline struct pppox_sock *get_item_by_addr(struct net *net,
         return pppox_sock;
 }
 
-static inline struct pppox_sock *delete_item(struct pppoe_net *pn, __be16 sid,
+static inline void delete_item(struct pppoe_net *pn, __be16 sid,
                                         char *addr, int ifindex)
 {
-        struct pppox_sock *ret;
-
         write_lock_bh(&pn->hash_lock);
-        ret = __delete_item(pn, sid, addr, ifindex);
+        __delete_item(pn, sid, addr, ifindex);
         write_unlock_bh(&pn->hash_lock);
-
-        return ret;
 }
 
 /***************************************************************************
@@ -990,8 +984,10 @@ static int pppoe_recvmsg(struct kiocb *iocb, struct socket *sock,
         if (skb) {
                 total_len = min_t(size_t, total_len, skb->len);
                 error = skb_copy_datagram_iovec(skb, 0, m->msg_iov, total_len);
-                if (error == 0)
-                        error = total_len;
+                if (error == 0) {
+                        consume_skb(skb);
+                        return total_len;
+                }
         }
 
         kfree_skb(skb);
diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
index 885dbdd9c39e..1c98321b56cc 100644
--- a/drivers/net/ppp/pptp.c
+++ b/drivers/net/ppp/pptp.c
@@ -116,8 +116,8 @@ static int lookup_chan_dst(u16 call_id, __be32 d_addr)
         int i;
 
         rcu_read_lock();
-        for (i = find_next_bit(callid_bitmap, MAX_CALLID, 1); i < MAX_CALLID;
-             i = find_next_bit(callid_bitmap, MAX_CALLID, i + 1)) {
+        i = 1;
+        for_each_set_bit_from(i, callid_bitmap, MAX_CALLID) {
                 sock = rcu_dereference(callid_sock[i]);
                 if (!sock)
                         continue;
@@ -209,7 +209,7 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
                 }
                 if (skb->sk)
                         skb_set_owner_w(new_skb, skb->sk);
-                kfree_skb(skb);
+                consume_skb(skb);
                 skb = new_skb;
         }
 
diff --git a/drivers/net/team/Kconfig b/drivers/net/team/Kconfig
index 248a144033ca..89024d5fc33a 100644
--- a/drivers/net/team/Kconfig
+++ b/drivers/net/team/Kconfig
@@ -40,4 +40,15 @@ config NET_TEAM_MODE_ACTIVEBACKUP
           To compile this team mode as a module, choose M here: the module
           will be called team_mode_activebackup.
 
+config NET_TEAM_MODE_LOADBALANCE
+        tristate "Load-balance mode support"
+        depends on NET_TEAM
+        ---help---
+          This mode provides load balancing functionality. Tx port selection
+          is done using BPF function set up from userspace (bpf_hash_func
+          option)
+
+          To compile this team mode as a module, choose M here: the module
+          will be called team_mode_loadbalance.
+
 endif # NET_TEAM
diff --git a/drivers/net/team/Makefile b/drivers/net/team/Makefile
index 85f2028a87af..fb9f4c1c51ff 100644
--- a/drivers/net/team/Makefile
+++ b/drivers/net/team/Makefile
@@ -5,3 +5,4 @@
 obj-$(CONFIG_NET_TEAM) += team.o
 obj-$(CONFIG_NET_TEAM_MODE_ROUNDROBIN) += team_mode_roundrobin.o
 obj-$(CONFIG_NET_TEAM_MODE_ACTIVEBACKUP) += team_mode_activebackup.o
+obj-$(CONFIG_NET_TEAM_MODE_LOADBALANCE) += team_mode_loadbalance.o
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 8f81805c6825..c61ae35a53ce 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -65,7 +65,7 @@ static int __set_port_mac(struct net_device *port_dev,
         return dev_set_mac_address(port_dev, &addr);
 }
 
-int team_port_set_orig_mac(struct team_port *port)
+static int team_port_set_orig_mac(struct team_port *port)
 {
         return __set_port_mac(port->dev, port->orig.dev_addr);
 }
@@ -76,12 +76,26 @@ int team_port_set_team_mac(struct team_port *port)
 }
 EXPORT_SYMBOL(team_port_set_team_mac);
 
+static void team_refresh_port_linkup(struct team_port *port)
+{
+        port->linkup = port->user.linkup_enabled ? port->user.linkup :
+                                                   port->state.linkup;
+}
 
 /*******************
  * Options handling
  *******************/
 
-struct team_option *__team_find_option(struct team *team, const char *opt_name)
+struct team_option_inst { /* One for each option instance */
+        struct list_head list;
+        struct team_option *option;
+        struct team_port *port; /* != NULL if per-port */
+        bool changed;
+        bool removed;
+};
+
+static struct team_option *__team_find_option(struct team *team,
+                                              const char *opt_name)
 {
         struct team_option *option;
 
@@ -92,9 +106,121 @@ struct team_option *__team_find_option(struct team *team, const char *opt_name)
         return NULL;
 }
 
-int __team_options_register(struct team *team,
-                            const struct team_option *option,
-                            size_t option_count)
+static int __team_option_inst_add(struct team *team, struct team_option *option,
+                                  struct team_port *port)
+{
+        struct team_option_inst *opt_inst;
+
+        opt_inst = kmalloc(sizeof(*opt_inst), GFP_KERNEL);
+        if (!opt_inst)
+                return -ENOMEM;
+        opt_inst->option = option;
+        opt_inst->port = port;
+        opt_inst->changed = true;
+        opt_inst->removed = false;
+        list_add_tail(&opt_inst->list, &team->option_inst_list);
+        return 0;
+}
+
+static void __team_option_inst_del(struct team_option_inst *opt_inst)
+{
+        list_del(&opt_inst->list);
+        kfree(opt_inst);
+}
+
+static void __team_option_inst_del_option(struct team *team,
+                                          struct team_option *option)
+{
+        struct team_option_inst *opt_inst, *tmp;
+
+        list_for_each_entry_safe(opt_inst, tmp, &team->option_inst_list, list) {
+                if (opt_inst->option == option)
+                        __team_option_inst_del(opt_inst);
+        }
+}
+
+static int __team_option_inst_add_option(struct team *team,
+                                         struct team_option *option)
+{
+        struct team_port *port;
+        int err;
+
+        if (!option->per_port)
+                return __team_option_inst_add(team, option, 0);
+
+        list_for_each_entry(port, &team->port_list, list) {
+                err = __team_option_inst_add(team, option, port);
+                if (err)
+                        goto inst_del_option;
+        }
+        return 0;
+
+inst_del_option:
+        __team_option_inst_del_option(team, option);
+        return err;
+}
+
+static void __team_option_inst_mark_removed_option(struct team *team,
+                                                   struct team_option *option)
+{
+        struct team_option_inst *opt_inst;
+
+        list_for_each_entry(opt_inst, &team->option_inst_list, list) {
+                if (opt_inst->option == option) {
+                        opt_inst->changed = true;
+                        opt_inst->removed = true;
+                }
+        }
+}
+
+static void __team_option_inst_del_port(struct team *team,
+                                        struct team_port *port)
+{
+        struct team_option_inst *opt_inst, *tmp;
+
+        list_for_each_entry_safe(opt_inst, tmp, &team->option_inst_list, list) {
+                if (opt_inst->option->per_port &&
+                    opt_inst->port == port)
+                        __team_option_inst_del(opt_inst);
+        }
+}
+
+static int __team_option_inst_add_port(struct team *team,
+                                       struct team_port *port)
+{
+        struct team_option *option;
+        int err;
+
+        list_for_each_entry(option, &team->option_list, list) {
+                if (!option->per_port)
+                        continue;
+                err = __team_option_inst_add(team, option, port);
+                if (err)
+                        goto inst_del_port;
+        }
+        return 0;
+
+inst_del_port:
+        __team_option_inst_del_port(team, port);
+        return err;
+}
+
+static void __team_option_inst_mark_removed_port(struct team *team,
+                                                 struct team_port *port)
+{
+        struct team_option_inst *opt_inst;
+
+        list_for_each_entry(opt_inst, &team->option_inst_list, list) {
+                if (opt_inst->port == port) {
+                        opt_inst->changed = true;
+                        opt_inst->removed = true;
+                }
+        }
+}
+
+static int __team_options_register(struct team *team,
+                                   const struct team_option *option,
+                                   size_t option_count)
 {
         int i;
         struct team_option **dst_opts;
@@ -107,26 +233,32 @@ int __team_options_register(struct team *team,
         for (i = 0; i < option_count; i++, option++) {
                 if (__team_find_option(team, option->name)) {
                         err = -EEXIST;
-                        goto rollback;
+                        goto alloc_rollback;
                 }
                 dst_opts[i] = kmemdup(option, sizeof(*option), GFP_KERNEL);
                 if (!dst_opts[i]) {
                         err = -ENOMEM;
-                        goto rollback;
+                        goto alloc_rollback;
                 }
         }
 
         for (i = 0; i < option_count; i++) {
-                dst_opts[i]->changed = true;
-                dst_opts[i]->removed = false;
+                err = __team_option_inst_add_option(team, dst_opts[i]);
+                if (err)
+                        goto inst_rollback;
                 list_add_tail(&dst_opts[i]->list, &team->option_list);
         }
 
         kfree(dst_opts);
         return 0;
 
-rollback:
-        for (i = 0; i < option_count; i++)
+inst_rollback:
+        for (i--; i >= 0; i--)
+                __team_option_inst_del_option(team, dst_opts[i]);
+
+        i = option_count - 1;
+alloc_rollback:
+        for (i--; i >= 0; i--)
                 kfree(dst_opts[i]);
 
         kfree(dst_opts);
@@ -143,10 +275,8 @@ static void __team_options_mark_removed(struct team *team,
                 struct team_option *del_opt;
 
                 del_opt = __team_find_option(team, option->name);
-                if (del_opt) {
-                        del_opt->changed = true;
-                        del_opt->removed = true;
-                }
+                if (del_opt)
+                        __team_option_inst_mark_removed_option(team, del_opt);
         }
 }
 
@@ -161,6 +291,7 @@ static void __team_options_unregister(struct team *team,
 
                 del_opt = __team_find_option(team, option->name);
                 if (del_opt) {
+                        __team_option_inst_del_option(team, del_opt);
                         list_del(&del_opt->list);
                         kfree(del_opt);
                 }
@@ -193,22 +324,42 @@ void team_options_unregister(struct team *team,
 }
 EXPORT_SYMBOL(team_options_unregister);
 
-static int team_option_get(struct team *team, struct team_option *option,
-                           void *arg)
+static int team_option_port_add(struct team *team, struct team_port *port)
+{
+        int err;
+
+        err = __team_option_inst_add_port(team, port);
+        if (err)
+                return err;
+        __team_options_change_check(team);
+        return 0;
+}
+
+static void team_option_port_del(struct team *team, struct team_port *port)
+{
+        __team_option_inst_mark_removed_port(team, port);
+        __team_options_change_check(team);
+        __team_option_inst_del_port(team, port);
+}
+
+static int team_option_get(struct team *team,
+                           struct team_option_inst *opt_inst,
+                           struct team_gsetter_ctx *ctx)
 {
-        return option->getter(team, arg);
+        return opt_inst->option->getter(team, ctx);
 }
 
-static int team_option_set(struct team *team, struct team_option *option,
-                           void *arg)
+static int team_option_set(struct team *team,
+                           struct team_option_inst *opt_inst,
+                           struct team_gsetter_ctx *ctx)
 {
         int err;
 
-        err = option->setter(team, arg);
+        err = opt_inst->option->setter(team, ctx);
         if (err)
                 return err;
 
-        option->changed = true;
+        opt_inst->changed = true;
         __team_options_change_check(team);
         return err;
 }
@@ -408,6 +559,8 @@ static int team_change_mode(struct team *team, const char *kind)
  * Rx path frame handler
  ************************/
 
+static bool team_port_enabled(struct team_port *port);
+
 /* note: already called with rcu_read_lock */
 static rx_handler_result_t team_handle_frame(struct sk_buff **pskb)
 {
@@ -424,8 +577,12 @@ static rx_handler_result_t team_handle_frame(struct sk_buff **pskb)
 
         port = team_port_get_rcu(skb->dev);
         team = port->team;
-
-        res = team->ops.receive(team, port, skb);
+        if (!team_port_enabled(port)) {
+                /* allow exact match delivery for disabled ports */
+                res = RX_HANDLER_EXACT;
+        } else {
+                res = team->ops.receive(team, port, skb);
+        }
         if (res == RX_HANDLER_ANOTHER) {
                 struct team_pcpu_stats *pcpu_stats;
 
@@ -461,17 +618,25 @@ static bool team_port_find(const struct team *team,
         return false;
 }
 
+static bool team_port_enabled(struct team_port *port)
+{
+        return port->index != -1;
+}
+
 /*
- * Add/delete port to the team port list. Write guarded by rtnl_lock.
- * Takes care of correct port->index setup (might be racy).
+ * Enable/disable port by adding to enabled port hashlist and setting
+ * port->index (Might be racy so reader could see incorrect ifindex when
+ * processing a flying packet, but that is not a problem). Write guarded
+ * by team->lock.
  */
-static void team_port_list_add_port(struct team *team,
-                                    struct team_port *port)
+static void team_port_enable(struct team *team,
+                             struct team_port *port)
 {
-        port->index = team->port_count++;
+        if (team_port_enabled(port))
+                return;
+        port->index = team->en_port_count++;
         hlist_add_head_rcu(&port->hlist,
                            team_port_index_hash(team, port->index));
-        list_add_tail_rcu(&port->list, &team->port_list);
 }
 
 static void __reconstruct_port_hlist(struct team *team, int rm_index)
@@ -479,7 +644,7 @@ static void __reconstruct_port_hlist(struct team *team, int rm_index)
         int i;
         struct team_port *port;
 
-        for (i = rm_index + 1; i < team->port_count; i++) {
+        for (i = rm_index + 1; i < team->en_port_count; i++) {
                 port = team_get_port_by_index(team, i);
                 hlist_del_rcu(&port->hlist);
                 port->index--;
@@ -488,15 +653,17 @@ static void __reconstruct_port_hlist(struct team *team, int rm_index)
         }
 }
 
-static void team_port_list_del_port(struct team *team,
-                                   struct team_port *port)
+static void team_port_disable(struct team *team,
+                              struct team_port *port)
 {
         int rm_index = port->index;
 
+        if (!team_port_enabled(port))
+                return;
         hlist_del_rcu(&port->hlist);
-        list_del_rcu(&port->list);
         __reconstruct_port_hlist(team, rm_index);
-        team->port_count--;
+        team->en_port_count--;
+        port->index = -1;
 }
 
 #define TEAM_VLAN_FEATURES (NETIF_F_ALL_CSUM | NETIF_F_SG | \
@@ -642,7 +809,16 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
                 goto err_handler_register;
         }
 
-        team_port_list_add_port(team, port);
+        err = team_option_port_add(team, port);
+        if (err) {
+                netdev_err(dev, "Device %s failed to add per-port options\n",
+                           portname);
+                goto err_option_port_add;
+        }
+
+        port->index = -1;
+        team_port_enable(team, port);
+        list_add_tail_rcu(&port->list, &team->port_list);
         team_adjust_ops(team);
         __team_compute_features(team);
         __team_port_change_check(port, !!netif_carrier_ok(port_dev));
@@ -651,6 +827,9 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
 
         return 0;
 
+err_option_port_add:
+        netdev_rx_handler_unregister(port_dev);
+
 err_handler_register:
         netdev_set_master(port_dev, NULL);
 
@@ -688,8 +867,10 @@ static int team_port_del(struct team *team, struct net_device *port_dev)
 
         port->removed = true;
         __team_port_change_check(port, false);
-        team_port_list_del_port(team, port);
+        team_port_disable(team, port);
+        list_del_rcu(&port->list);
         team_adjust_ops(team);
+        team_option_port_del(team, port);
         netdev_rx_handler_unregister(port_dev);
         netdev_set_master(port_dev, NULL);
         vlan_vids_del_by_dev(port_dev, dev);
@@ -712,19 +893,66 @@ static int team_port_del(struct team *team, struct net_device *port_dev)
 
 static const char team_no_mode_kind[] = "*NOMODE*";
 
-static int team_mode_option_get(struct team *team, void *arg)
+static int team_mode_option_get(struct team *team, struct team_gsetter_ctx *ctx)
+{
+        ctx->data.str_val = team->mode ? team->mode->kind : team_no_mode_kind;
+        return 0;
+}
+
+static int team_mode_option_set(struct team *team, struct team_gsetter_ctx *ctx)
+{
+        return team_change_mode(team, ctx->data.str_val);
+}
+
+static int team_port_en_option_get(struct team *team,
+                                   struct team_gsetter_ctx *ctx)
+{
+        ctx->data.bool_val = team_port_enabled(ctx->port);
+        return 0;
+}
+
+static int team_port_en_option_set(struct team *team,
+                                   struct team_gsetter_ctx *ctx)
+{
+        if (ctx->data.bool_val)
+                team_port_enable(team, ctx->port);
+        else
+                team_port_disable(team, ctx->port);
+        return 0;
+}
+
+static int team_user_linkup_option_get(struct team *team,
+                                       struct team_gsetter_ctx *ctx)
+{
+        ctx->data.bool_val = ctx->port->user.linkup;
+        return 0;
+}
+
+static int team_user_linkup_option_set(struct team *team,
+                                       struct team_gsetter_ctx *ctx)
+{
+        ctx->port->user.linkup = ctx->data.bool_val;
+        team_refresh_port_linkup(ctx->port);
+        return 0;
+}
+
+static int team_user_linkup_en_option_get(struct team *team,
+                                          struct team_gsetter_ctx *ctx)
 {
-        const char **str = arg;
+        struct team_port *port = ctx->port;
 
-        *str = team->mode ? team->mode->kind : team_no_mode_kind;
+        ctx->data.bool_val = port->user.linkup_enabled;
         return 0;
 }
 
-static int team_mode_option_set(struct team *team, void *arg)
+static int team_user_linkup_en_option_set(struct team *team,
+                                          struct team_gsetter_ctx *ctx)
 {
-        const char **str = arg;
+        struct team_port *port = ctx->port;
 
-        return team_change_mode(team, *str);
+        port->user.linkup_enabled = ctx->data.bool_val;
+        team_refresh_port_linkup(ctx->port);
+        return 0;
 }
 
 static const struct team_option team_options[] = {
@@ -734,6 +962,27 @@ static const struct team_option team_options[] = {
                 .getter = team_mode_option_get,
                 .setter = team_mode_option_set,
         },
+        {
+                .name = "enabled",
+                .type = TEAM_OPTION_TYPE_BOOL,
+                .per_port = true,
+                .getter = team_port_en_option_get,
+                .setter = team_port_en_option_set,
+        },
+        {
+                .name = "user_linkup",
+                .type = TEAM_OPTION_TYPE_BOOL,
+                .per_port = true,
+                .getter = team_user_linkup_option_get,
+                .setter = team_user_linkup_option_set,
+        },
+        {
+                .name = "user_linkup_enabled",
+                .type = TEAM_OPTION_TYPE_BOOL,
+                .per_port = true,
+                .getter = team_user_linkup_en_option_get,
+                .setter = team_user_linkup_en_option_set,
+        },
 };
 
 static int team_init(struct net_device *dev)
@@ -750,12 +999,13 @@ static int team_init(struct net_device *dev)
                 return -ENOMEM;
 
         for (i = 0; i < TEAM_PORT_HASHENTRIES; i++)
-                INIT_HLIST_HEAD(&team->port_hlist[i]);
+                INIT_HLIST_HEAD(&team->en_port_hlist[i]);
         INIT_LIST_HEAD(&team->port_list);
 
         team_adjust_ops(team);
 
         INIT_LIST_HEAD(&team->option_list);
+        INIT_LIST_HEAD(&team->option_inst_list);
         err = team_options_register(team, team_options, ARRAY_SIZE(team_options));
         if (err)
                 goto err_options_register;
@@ -1145,10 +1395,7 @@ team_nl_option_policy[TEAM_ATTR_OPTION_MAX + 1] = {
         },
         [TEAM_ATTR_OPTION_CHANGED]              = { .type = NLA_FLAG },
         [TEAM_ATTR_OPTION_TYPE]                 = { .type = NLA_U8 },
-        [TEAM_ATTR_OPTION_DATA] = {
-                .type = NLA_BINARY,
-                .len = TEAM_STRING_MAX_LEN,
-        },
+        [TEAM_ATTR_OPTION_DATA]                 = { .type = NLA_BINARY },
 };
 
 static int team_nl_cmd_noop(struct sk_buff *skb, struct genl_info *info)
@@ -1241,46 +1488,86 @@ static int team_nl_fill_options_get(struct sk_buff *skb,
 {
         struct nlattr *option_list;
         void *hdr;
-        struct team_option *option;
+        struct team_option_inst *opt_inst;
+        int err;
 
         hdr = genlmsg_put(skb, pid, seq, &team_nl_family, flags,
                           TEAM_CMD_OPTIONS_GET);
         if (IS_ERR(hdr))
                 return PTR_ERR(hdr);
 
-        NLA_PUT_U32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex);
+        if (nla_put_u32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex))
+                goto nla_put_failure;
         option_list = nla_nest_start(skb, TEAM_ATTR_LIST_OPTION);
         if (!option_list)
                 return -EMSGSIZE;
 
-        list_for_each_entry(option, &team->option_list, list) {
+        list_for_each_entry(opt_inst, &team->option_inst_list, list) {
                 struct nlattr *option_item;
-                long arg;
+                struct team_option *option = opt_inst->option;
+                struct team_gsetter_ctx ctx;
 
                 /* Include only changed options if fill all mode is not on */
-                if (!fillall && !option->changed)
+                if (!fillall && !opt_inst->changed)
                         continue;
                 option_item = nla_nest_start(skb, TEAM_ATTR_ITEM_OPTION);
                 if (!option_item)
                         goto nla_put_failure;
-                NLA_PUT_STRING(skb, TEAM_ATTR_OPTION_NAME, option->name);
-                if (option->changed) {
-                        NLA_PUT_FLAG(skb, TEAM_ATTR_OPTION_CHANGED);
-                        option->changed = false;
+                if (nla_put_string(skb, TEAM_ATTR_OPTION_NAME, option->name))
+                        goto nla_put_failure;
+                if (opt_inst->changed) {
+                        if (nla_put_flag(skb, TEAM_ATTR_OPTION_CHANGED))
+                                goto nla_put_failure;
+                        opt_inst->changed = false;
                 }
-                if (option->removed)
-                        NLA_PUT_FLAG(skb, TEAM_ATTR_OPTION_REMOVED);
+                if (opt_inst->removed &&
+                    nla_put_flag(skb, TEAM_ATTR_OPTION_REMOVED))
+                        goto nla_put_failure;
+                if (opt_inst->port &&
+                    nla_put_u32(skb, TEAM_ATTR_OPTION_PORT_IFINDEX,
+                                opt_inst->port->dev->ifindex))
+                        goto nla_put_failure;
+                ctx.port = opt_inst->port;
                 switch (option->type) {
                 case TEAM_OPTION_TYPE_U32:
-                        NLA_PUT_U8(skb, TEAM_ATTR_OPTION_TYPE, NLA_U32);
-                        team_option_get(team, option, &arg);
-                        NLA_PUT_U32(skb, TEAM_ATTR_OPTION_DATA, arg);
+                        if (nla_put_u8(skb, TEAM_ATTR_OPTION_TYPE, NLA_U32))
+                                goto nla_put_failure;
+                        err = team_option_get(team, opt_inst, &ctx);
+                        if (err)
+                                goto errout;
+                        if (nla_put_u32(skb, TEAM_ATTR_OPTION_DATA,
+                                        ctx.data.u32_val))
+                                goto nla_put_failure;
                         break;
                 case TEAM_OPTION_TYPE_STRING:
-                        NLA_PUT_U8(skb, TEAM_ATTR_OPTION_TYPE, NLA_STRING);
-                        team_option_get(team, option, &arg);
-                        NLA_PUT_STRING(skb, TEAM_ATTR_OPTION_DATA,
-                                       (char *) arg);
+                        if (nla_put_u8(skb, TEAM_ATTR_OPTION_TYPE, NLA_STRING))
+                                goto nla_put_failure;
+                        err = team_option_get(team, opt_inst, &ctx);
+                        if (err)
+                                goto errout;
+                        if (nla_put_string(skb, TEAM_ATTR_OPTION_DATA,
+                                           ctx.data.str_val))
+                                goto nla_put_failure;
+                        break;
+                case TEAM_OPTION_TYPE_BINARY:
+                        if (nla_put_u8(skb, TEAM_ATTR_OPTION_TYPE, NLA_BINARY))
+                                goto nla_put_failure;
+                        err = team_option_get(team, opt_inst, &ctx);
+                        if (err)
+                                goto errout;
+                        if (nla_put(skb, TEAM_ATTR_OPTION_DATA,
+                                    ctx.data.bin_val.len, ctx.data.bin_val.ptr))
+                                goto nla_put_failure;
+                        break;
+                case TEAM_OPTION_TYPE_BOOL:
+                        if (nla_put_u8(skb, TEAM_ATTR_OPTION_TYPE, NLA_FLAG))
+                                goto nla_put_failure;
+                        err = team_option_get(team, opt_inst, &ctx);
+                        if (err)
+                                goto errout;
+                        if (ctx.data.bool_val &&
+                            nla_put_flag(skb, TEAM_ATTR_OPTION_DATA))
+                                goto nla_put_failure;
                         break;
                 default:
                         BUG();
@@ -1292,8 +1579,10 @@ static int team_nl_fill_options_get(struct sk_buff *skb,
         return genlmsg_end(skb, hdr);
 
 nla_put_failure:
+        err = -EMSGSIZE;
+errout:
         genlmsg_cancel(skb, hdr);
-        return -EMSGSIZE;
+        return err;
 }
 
 static int team_nl_fill_options_get_all(struct sk_buff *skb,
@@ -1339,9 +1628,12 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)
         }
 
         nla_for_each_nested(nl_option, info->attrs[TEAM_ATTR_LIST_OPTION], i) {
-                struct nlattr *mode_attrs[TEAM_ATTR_OPTION_MAX + 1];
+                struct nlattr *opt_attrs[TEAM_ATTR_OPTION_MAX + 1];
+                struct nlattr *attr_port_ifindex;
+                struct nlattr *attr_data;
                 enum team_option_type opt_type;
-                struct team_option *option;
+                int opt_port_ifindex = 0; /* != 0 for per-port options */
+                struct team_option_inst *opt_inst;
                 char *opt_name;
                 bool opt_found = false;
 
@@ -1349,48 +1641,78 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)
                         err = -EINVAL;
                         goto team_put;
                 }
-                err = nla_parse_nested(mode_attrs, TEAM_ATTR_OPTION_MAX,
+                err = nla_parse_nested(opt_attrs, TEAM_ATTR_OPTION_MAX,
                                        nl_option, team_nl_option_policy);
                 if (err)
                         goto team_put;
-                if (!mode_attrs[TEAM_ATTR_OPTION_NAME] ||
-                    !mode_attrs[TEAM_ATTR_OPTION_TYPE] ||
-                    !mode_attrs[TEAM_ATTR_OPTION_DATA]) {
+                if (!opt_attrs[TEAM_ATTR_OPTION_NAME] ||
+                    !opt_attrs[TEAM_ATTR_OPTION_TYPE]) {
                         err = -EINVAL;
                         goto team_put;
                 }
-                switch (nla_get_u8(mode_attrs[TEAM_ATTR_OPTION_TYPE])) {
+                switch (nla_get_u8(opt_attrs[TEAM_ATTR_OPTION_TYPE])) {
                 case NLA_U32:
                         opt_type = TEAM_OPTION_TYPE_U32;
                         break;
                 case NLA_STRING:
                         opt_type = TEAM_OPTION_TYPE_STRING;
                         break;
+                case NLA_BINARY:
+                        opt_type = TEAM_OPTION_TYPE_BINARY;
+                        break;
+                case NLA_FLAG:
+                        opt_type = TEAM_OPTION_TYPE_BOOL;
+                        break;
                 default:
                         goto team_put;
                 }
 
-                opt_name = nla_data(mode_attrs[TEAM_ATTR_OPTION_NAME]);
-                list_for_each_entry(option, &team->option_list, list) {
-                        long arg;
-                        struct nlattr *opt_data_attr;
+                attr_data = opt_attrs[TEAM_ATTR_OPTION_DATA];
+                if (opt_type != TEAM_OPTION_TYPE_BOOL && !attr_data) {
+                        err = -EINVAL;
+                        goto team_put;
+                }
+
+                opt_name = nla_data(opt_attrs[TEAM_ATTR_OPTION_NAME]);
+                attr_port_ifindex = opt_attrs[TEAM_ATTR_OPTION_PORT_IFINDEX];
+                if (attr_port_ifindex)
+                        opt_port_ifindex = nla_get_u32(attr_port_ifindex);
+
+                list_for_each_entry(opt_inst, &team->option_inst_list, list) {
+                        struct team_option *option = opt_inst->option;
+                        struct team_gsetter_ctx ctx;
+                        int tmp_ifindex;
 
+                        tmp_ifindex = opt_inst->port ?
+                                      opt_inst->port->dev->ifindex : 0;
                         if (option->type != opt_type ||
-                            strcmp(option->name, opt_name))
+                            strcmp(option->name, opt_name) ||
+                            tmp_ifindex != opt_port_ifindex)
                                 continue;
                         opt_found = true;
-                        opt_data_attr = mode_attrs[TEAM_ATTR_OPTION_DATA];
+                        ctx.port = opt_inst->port;
                         switch (opt_type) {
                         case TEAM_OPTION_TYPE_U32:
-                                arg = nla_get_u32(opt_data_attr);
+                                ctx.data.u32_val = nla_get_u32(attr_data);
                                 break;
                         case TEAM_OPTION_TYPE_STRING:
-                                arg = (long) nla_data(opt_data_attr);
+                                if (nla_len(attr_data) > TEAM_STRING_MAX_LEN) {
+                                        err = -EINVAL;
+                                        goto team_put;
+                                }
+                                ctx.data.str_val = nla_data(attr_data);
+                                break;
+                        case TEAM_OPTION_TYPE_BINARY:
+                                ctx.data.bin_val.len = nla_len(attr_data);
+                                ctx.data.bin_val.ptr = nla_data(attr_data);
+                                break;
+                        case TEAM_OPTION_TYPE_BOOL:
+                                ctx.data.bool_val = attr_data ? true : false;
                                 break;
                         default:
                                 BUG();
                         }
-                        err = team_option_set(team, option, &arg);
+                        err = team_option_set(team, opt_inst, &ctx);
                         if (err)
                                 goto team_put;
                 }
@@ -1420,7 +1742,8 @@ static int team_nl_fill_port_list_get(struct sk_buff *skb,
         if (IS_ERR(hdr))
                 return PTR_ERR(hdr);
 
-        NLA_PUT_U32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex);
+        if (nla_put_u32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex))
+                goto nla_put_failure;
         port_list = nla_nest_start(skb, TEAM_ATTR_LIST_PORT);
         if (!port_list)
                 return -EMSGSIZE;
@@ -1434,17 +1757,20 @@ static int team_nl_fill_port_list_get(struct sk_buff *skb,
                 port_item = nla_nest_start(skb, TEAM_ATTR_ITEM_PORT);
                 if (!port_item)
                         goto nla_put_failure;
-                NLA_PUT_U32(skb, TEAM_ATTR_PORT_IFINDEX, port->dev->ifindex);
+                if (nla_put_u32(skb, TEAM_ATTR_PORT_IFINDEX, port->dev->ifindex))
+                        goto nla_put_failure;
                 if (port->changed) {
-                        NLA_PUT_FLAG(skb, TEAM_ATTR_PORT_CHANGED);
+                        if (nla_put_flag(skb, TEAM_ATTR_PORT_CHANGED))
+                                goto nla_put_failure;
                         port->changed = false;
                 }
-                if (port->removed)
-                        NLA_PUT_FLAG(skb, TEAM_ATTR_PORT_REMOVED);
-                if (port->linkup)
-                        NLA_PUT_FLAG(skb, TEAM_ATTR_PORT_LINKUP);
-                NLA_PUT_U32(skb, TEAM_ATTR_PORT_SPEED, port->speed);
-                NLA_PUT_U8(skb, TEAM_ATTR_PORT_DUPLEX, port->duplex);
+                if ((port->removed &&
+                     nla_put_flag(skb, TEAM_ATTR_PORT_REMOVED)) ||
+                    (port->state.linkup &&
+                     nla_put_flag(skb, TEAM_ATTR_PORT_LINKUP)) ||
+                    nla_put_u32(skb, TEAM_ATTR_PORT_SPEED, port->state.speed) ||
+                    nla_put_u8(skb, TEAM_ATTR_PORT_DUPLEX, port->state.duplex))
+                        goto nla_put_failure;
                 nla_nest_end(skb, port_item);
         }
 
@@ -1603,23 +1929,24 @@ static void __team_port_change_check(struct team_port *port, bool linkup)
 {
         int err;
 
-        if (!port->removed && port->linkup == linkup)
+        if (!port->removed && port->state.linkup == linkup)
                 return;
 
         port->changed = true;
-        port->linkup = linkup;
+        port->state.linkup = linkup;
+        team_refresh_port_linkup(port);
         if (linkup) {
                 struct ethtool_cmd ecmd;
 
                 err = __ethtool_get_settings(port->dev, &ecmd);
                 if (!err) {
-                        port->speed = ethtool_cmd_speed(&ecmd);
-                        port->duplex = ecmd.duplex;
+                        port->state.speed = ethtool_cmd_speed(&ecmd);
+                        port->state.duplex = ecmd.duplex;
                         goto send_event;
                 }
         }
-        port->speed = 0;
-        port->duplex = 0;
+        port->state.speed = 0;
+        port->state.duplex = 0;
 
 send_event:
         err = team_nl_send_event_port_list_get(port->team);
diff --git a/drivers/net/team/team_mode_activebackup.c b/drivers/net/team/team_mode_activebackup.c
index f4d960e82e29..fd6bd03aaa89 100644
--- a/drivers/net/team/team_mode_activebackup.c
+++ b/drivers/net/team/team_mode_activebackup.c
@@ -59,23 +59,21 @@ static void ab_port_leave(struct team *team, struct team_port *port)
                 RCU_INIT_POINTER(ab_priv(team)->active_port, NULL);
 }
 
-static int ab_active_port_get(struct team *team, void *arg)
+static int ab_active_port_get(struct team *team, struct team_gsetter_ctx *ctx)
 {
-        u32 *ifindex = arg;
-
-        *ifindex = 0;
         if (ab_priv(team)->active_port)
-                *ifindex = ab_priv(team)->active_port->dev->ifindex;
+                ctx->data.u32_val = ab_priv(team)->active_port->dev->ifindex;
+        else
+                ctx->data.u32_val = 0;
         return 0;
 }
 
-static int ab_active_port_set(struct team *team, void *arg)
+static int ab_active_port_set(struct team *team, struct team_gsetter_ctx *ctx)
 {
-        u32 *ifindex = arg;
         struct team_port *port;
 
-        list_for_each_entry_rcu(port, &team->port_list, list) {
-                if (port->dev->ifindex == *ifindex) {
+        list_for_each_entry(port, &team->port_list, list) {
+                if (port->dev->ifindex == ctx->data.u32_val) {
                         rcu_assign_pointer(ab_priv(team)->active_port, port);
                         return 0;
                 }
@@ -92,12 +90,12 @@ static const struct team_option ab_options[] = {
         },
 };
 
-int ab_init(struct team *team)
+static int ab_init(struct team *team)
 {
         return team_options_register(team, ab_options, ARRAY_SIZE(ab_options));
 }
 
-void ab_exit(struct team *team)
+static void ab_exit(struct team *team)
 {
         team_options_unregister(team, ab_options, ARRAY_SIZE(ab_options));
 }
diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c
new file mode 100644
index 000000000000..86e8183c8e3d
--- /dev/null
+++ b/drivers/net/team/team_mode_loadbalance.c
@@ -0,0 +1,174 @@
+/*
+ * drivers/net/team/team_mode_loadbalance.c - Load-balancing mode for team
+ * Copyright (c) 2012 Jiri Pirko <jpirko@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/netdevice.h>
+#include <linux/filter.h>
+#include <linux/if_team.h>
+
+struct lb_priv {
+        struct sk_filter __rcu *fp;
+        struct sock_fprog *orig_fprog;
+};
+
+static struct lb_priv *lb_priv(struct team *team)
+{
+        return (struct lb_priv *) &team->mode_priv;
+}
+
+static bool lb_transmit(struct team *team, struct sk_buff *skb)
+{
+        struct sk_filter *fp;
+        struct team_port *port;
+        unsigned int hash;
+        int port_index;
+
+        fp = rcu_dereference(lb_priv(team)->fp);
+        if (unlikely(!fp))
+                goto drop;
+        hash = SK_RUN_FILTER(fp, skb);
+        port_index = hash % team->en_port_count;
+        port = team_get_port_by_index_rcu(team, port_index);
+        if (unlikely(!port))
+                goto drop;
+        skb->dev = port->dev;
+        if (dev_queue_xmit(skb))
+                return false;
+        return true;
+
+drop:
+        dev_kfree_skb_any(skb);
+        return false;
+}
+
+static int lb_bpf_func_get(struct team *team, struct team_gsetter_ctx *ctx)
+{
+        if (!lb_priv(team)->orig_fprog) {
+                ctx->data.bin_val.len = 0;
+                ctx->data.bin_val.ptr = NULL;
+                return 0;
+        }
+        ctx->data.bin_val.len = lb_priv(team)->orig_fprog->len *
+                                sizeof(struct sock_filter);
+        ctx->data.bin_val.ptr = lb_priv(team)->orig_fprog->filter;
+        return 0;
+}
+
+static int __fprog_create(struct sock_fprog **pfprog, u32 data_len,
+                          const void *data)
+{
+        struct sock_fprog *fprog;
+        struct sock_filter *filter = (struct sock_filter *) data;
+
+        if (data_len % sizeof(struct sock_filter))
+                return -EINVAL;
+        fprog = kmalloc(sizeof(struct sock_fprog), GFP_KERNEL);
+        if (!fprog)
+                return -ENOMEM;
+        fprog->filter = kmemdup(filter, data_len, GFP_KERNEL);
+        if (!fprog->filter) {
+                kfree(fprog);
+                return -ENOMEM;
+        }
+        fprog->len = data_len / sizeof(struct sock_filter);
+        *pfprog = fprog;
+        return 0;
+}
+
+static void __fprog_destroy(struct sock_fprog *fprog)
+{
+        kfree(fprog->filter);
+        kfree(fprog);
+}
+
+static int lb_bpf_func_set(struct team *team, struct team_gsetter_ctx *ctx)
+{
+        struct sk_filter *fp = NULL;
+        struct sock_fprog *fprog = NULL;
+        int err;
+
+        if (ctx->data.bin_val.len) {
+                err = __fprog_create(&fprog, ctx->data.bin_val.len,
+                                     ctx->data.bin_val.ptr);
+                if (err)
+                        return err;
+                err = sk_unattached_filter_create(&fp, fprog);
+                if (err) {
+                        __fprog_destroy(fprog);
+                        return err;
+                }
+        }
+
+        if (lb_priv(team)->orig_fprog) {
+                /* Clear old filter data */
+                __fprog_destroy(lb_priv(team)->orig_fprog);
+                sk_unattached_filter_destroy(lb_priv(team)->fp);
+        }
+
+        rcu_assign_pointer(lb_priv(team)->fp, fp);
+        lb_priv(team)->orig_fprog = fprog;
+        return 0;
+}
+
+static const struct team_option lb_options[] = {
+        {
+                .name = "bpf_hash_func",
+                .type = TEAM_OPTION_TYPE_BINARY,
+                .getter = lb_bpf_func_get,
+                .setter = lb_bpf_func_set,
+        },
+};
+
+static int lb_init(struct team *team)
+{
+        return team_options_register(team, lb_options,
+                                     ARRAY_SIZE(lb_options));
+}
+
+static void lb_exit(struct team *team)
+{
+        team_options_unregister(team, lb_options,
+                                ARRAY_SIZE(lb_options));
+}
+
+static const struct team_mode_ops lb_mode_ops = {
+        .init                   = lb_init,
+        .exit                   = lb_exit,
+        .transmit               = lb_transmit,
+};
+
+static struct team_mode lb_mode = {
+        .kind           = "loadbalance",
+        .owner          = THIS_MODULE,
+        .priv_size      = sizeof(struct lb_priv),
+        .ops            = &lb_mode_ops,
+};
+
+static int __init lb_init_module(void)
+{
+        return team_mode_register(&lb_mode);
+}
+
+static void __exit lb_cleanup_module(void)
+{
+        team_mode_unregister(&lb_mode);
+}
+
+module_init(lb_init_module);
+module_exit(lb_cleanup_module);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Jiri Pirko <jpirko@redhat.com>");
+MODULE_DESCRIPTION("Load-balancing mode for team");
+MODULE_ALIAS("team-mode-loadbalance");
diff --git a/drivers/net/team/team_mode_roundrobin.c b/drivers/net/team/team_mode_roundrobin.c
index a0e8f806331a..6abfbdc96be5 100644
--- a/drivers/net/team/team_mode_roundrobin.c
+++ b/drivers/net/team/team_mode_roundrobin.c
@@ -50,7 +50,7 @@ static bool rr_transmit(struct team *team, struct sk_buff *skb)
         struct team_port *port;
         int port_index;
 
-        port_index = rr_priv(team)->sent_packets++ % team->port_count;
+        port_index = rr_priv(team)->sent_packets++ % team->en_port_count;
         port = team_get_port_by_index_rcu(team, port_index);
         port = __get_first_port_up(team, port);
         if (unlikely(!port))
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
deleted file mode 100644
index b15ac81d46fa..000000000000
--- a/drivers/net/tokenring/3c359.c
+++ /dev/null
@@ -1,1843 +0,0 @@
-/*
- *   3c359.c (c) 2000 Mike Phillips (mikep@linuxtr.net) All Rights Reserved
- *
- *  Linux driver for 3Com 3c359 Tokenlink Velocity XL PCI NIC
- *
- *  Base Driver Olympic:
- *      Written 1999 Peter De Schrijver & Mike Phillips
- *
- *  This software may be used and distributed according to the terms
- *  of the GNU General Public License, incorporated herein by reference.
- * 
- *  7/17/00 - Clean up, version number 0.9.0. Ready to release to the world.
- *
- *  2/16/01 - Port up to kernel 2.4.2 ready for submission into the kernel.
- *  3/05/01 - Last clean up stuff before submission.
- *  2/15/01 - Finally, update to new pci api. 
- *
- *  To Do:
- */
-
-/* 
- *      Technical Card Details
- *
- *  All access to data is done with 16/8 bit transfers.  The transfer
- *  method really sucks. You can only read or write one location at a time.
- *
- *  Also, the microcode for the card must be uploaded if the card does not have
- *  the flashrom on board.  This is a 28K bloat in the driver when compiled
- *  as a module.
- *
- *  Rx is very simple, status into a ring of descriptors, dma data transfer,
- *  interrupts to tell us when a packet is received.
- *
- *  Tx is a little more interesting. Similar scenario, descriptor and dma data
- *  transfers, but we don't have to interrupt the card to tell it another packet
- *  is ready for transmission, we are just doing simple memory writes, not io or mmio
- *  writes.  The card can be set up to simply poll on the next
- *  descriptor pointer and when this value is non-zero will automatically download
- *  the next packet.  The card then interrupts us when the packet is done.
- *
- */
-
-#define XL_DEBUG 0
-
-#include <linux/jiffies.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/timer.h>
-#include <linux/in.h>
-#include <linux/ioport.h>
-#include <linux/string.h>
-#include <linux/proc_fs.h>
-#include <linux/ptrace.h>
-#include <linux/skbuff.h>
-#include <linux/interrupt.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/trdevice.h>
-#include <linux/stddef.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/spinlock.h>
-#include <linux/bitops.h>
-#include <linux/firmware.h>
-#include <linux/slab.h>
-
-#include <net/checksum.h>
-
-#include <asm/io.h>
-
-#include "3c359.h"
-
-static char version[] __devinitdata  = 
-"3c359.c v1.2.0 2/17/01 - Mike Phillips (mikep@linuxtr.net)" ; 
-
-#define FW_NAME         "3com/3C359.bin"
-MODULE_AUTHOR("Mike Phillips <mikep@linuxtr.net>") ; 
-MODULE_DESCRIPTION("3Com 3C359 Velocity XL Token Ring Adapter Driver\n") ;
-MODULE_FIRMWARE(FW_NAME);
-
-/* Module parameters */
-
-/* Ring Speed 0,4,16 
- * 0 = Autosense   
- * 4,16 = Selected speed only, no autosense
- * This allows the card to be the first on the ring
- * and become the active monitor.
- *
- * WARNING: Some hubs will allow you to insert
- * at the wrong speed.
- * 
- * The adapter will _not_ fail to open if there are no
- * active monitors on the ring, it will simply open up in 
- * its last known ringspeed if no ringspeed is specified.
- */
-
-static int ringspeed[XL_MAX_ADAPTERS] = {0,} ;
-
-module_param_array(ringspeed, int, NULL, 0);
-MODULE_PARM_DESC(ringspeed,"3c359: Ringspeed selection - 4,16 or 0") ;
-
-/* Packet buffer size */
-
-static int pkt_buf_sz[XL_MAX_ADAPTERS] = {0,} ;
- 
-module_param_array(pkt_buf_sz, int, NULL, 0) ;
-MODULE_PARM_DESC(pkt_buf_sz,"3c359: Initial buffer size") ;
-/* Message Level */
-
-static int message_level[XL_MAX_ADAPTERS] = {0,} ;
-
-module_param_array(message_level, int, NULL, 0) ;
-MODULE_PARM_DESC(message_level, "3c359: Level of reported messages") ;
-/* 
- *      This is a real nasty way of doing this, but otherwise you
- *      will be stuck with 1555 lines of hex #'s in the code.
- */
-
-static DEFINE_PCI_DEVICE_TABLE(xl_pci_tbl) =
-{
-        {PCI_VENDOR_ID_3COM,PCI_DEVICE_ID_3COM_3C359, PCI_ANY_ID, PCI_ANY_ID, },
-        { }                     /* terminate list */
-};
-MODULE_DEVICE_TABLE(pci,xl_pci_tbl) ; 
-
-static int xl_init(struct net_device *dev);
-static int xl_open(struct net_device *dev);
-static int xl_open_hw(struct net_device *dev) ;  
-static int xl_hw_reset(struct net_device *dev); 
-static netdev_tx_t xl_xmit(struct sk_buff *skb, struct net_device *dev);
-static void xl_dn_comp(struct net_device *dev); 
-static int xl_close(struct net_device *dev);
-static void xl_set_rx_mode(struct net_device *dev);
-static irqreturn_t xl_interrupt(int irq, void *dev_id);
-static int xl_set_mac_address(struct net_device *dev, void *addr) ; 
-static void xl_arb_cmd(struct net_device *dev);
-static void xl_asb_cmd(struct net_device *dev) ; 
-static void xl_srb_cmd(struct net_device *dev, int srb_cmd) ; 
-static void xl_wait_misr_flags(struct net_device *dev) ; 
-static int xl_change_mtu(struct net_device *dev, int mtu);
-static void xl_srb_bh(struct net_device *dev) ; 
-static void xl_asb_bh(struct net_device *dev) ; 
-static void xl_reset(struct net_device *dev) ;  
-static void xl_freemem(struct net_device *dev) ;  
-
-
-/* EEProm Access Functions */
-static u16  xl_ee_read(struct net_device *dev, int ee_addr) ; 
-static void  xl_ee_write(struct net_device *dev, int ee_addr, u16 ee_value) ; 
-
-/* Debugging functions */
-#if XL_DEBUG
-static void print_tx_state(struct net_device *dev) ; 
-static void print_rx_state(struct net_device *dev) ; 
-
-static void print_tx_state(struct net_device *dev)
-{
-
-        struct xl_private *xl_priv = netdev_priv(dev);
-        struct xl_tx_desc *txd ; 
-        u8 __iomem *xl_mmio = xl_priv->xl_mmio ; 
-        int i ; 
-
-        printk("tx_ring_head: %d, tx_ring_tail: %d, free_ent: %d\n",xl_priv->tx_ring_head,
-                xl_priv->tx_ring_tail, xl_priv->free_ring_entries) ; 
-        printk("Ring    , Address ,   FSH  , DnNextPtr, Buffer, Buffer_Len\n");
-        for (i = 0; i < 16; i++) {
-                txd = &(xl_priv->xl_tx_ring[i]) ; 
-                printk("%d, %08lx, %08x, %08x, %08x, %08x\n", i, virt_to_bus(txd),
-                        txd->framestartheader, txd->dnnextptr, txd->buffer, txd->buffer_length ) ; 
-        }
-
-        printk("DNLISTPTR = %04x\n", readl(xl_mmio + MMIO_DNLISTPTR) );
-        
-        printk("DmaCtl = %04x\n", readl(xl_mmio + MMIO_DMA_CTRL) );
-        printk("Queue status = %0x\n",netif_running(dev) ) ;
-}
-
-static void print_rx_state(struct net_device *dev)
-{
-
-        struct xl_private *xl_priv = netdev_priv(dev);
-        struct xl_rx_desc *rxd ; 
-        u8 __iomem *xl_mmio = xl_priv->xl_mmio ; 
-        int i ; 
-
-        printk("rx_ring_tail: %d\n", xl_priv->rx_ring_tail);
-        printk("Ring    , Address ,   FrameState  , UPNextPtr, FragAddr, Frag_Len\n");
-        for (i = 0; i < 16; i++) { 
-                /* rxd = (struct xl_rx_desc *)xl_priv->rx_ring_dma_addr + (i * sizeof(struct xl_rx_desc)) ; */
-                rxd = &(xl_priv->xl_rx_ring[i]) ; 
-                printk("%d, %08lx, %08x, %08x, %08x, %08x\n", i, virt_to_bus(rxd),
-                        rxd->framestatus, rxd->upnextptr, rxd->upfragaddr, rxd->upfraglen ) ; 
-        }
-
-        printk("UPLISTPTR = %04x\n", readl(xl_mmio + MMIO_UPLISTPTR));
-        
-        printk("DmaCtl = %04x\n", readl(xl_mmio + MMIO_DMA_CTRL));
-        printk("Queue status = %0x\n",netif_running(dev));
-} 
-#endif
-
-/*
- *      Read values from the on-board EEProm.  This looks very strange
- *      but you have to wait for the EEProm to get/set the value before 
- *      passing/getting the next value from the nic. As with all requests
- *      on this nic it has to be done in two stages, a) tell the nic which
- *      memory address you want to access and b) pass/get the value from the nic.
- *      With the EEProm, you have to wait before and between access a) and b).
- *      As this is only read at initialization time and the wait period is very 
- *      small we shouldn't have to worry about scheduling issues.
- */
-
-static u16 xl_ee_read(struct net_device *dev, int ee_addr)
-{ 
-        struct xl_private *xl_priv = netdev_priv(dev);
-        u8 __iomem *xl_mmio = xl_priv->xl_mmio ; 
-
-        /* Wait for EEProm to not be busy */
-        writel(IO_WORD_READ | EECONTROL, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        while ( readw(xl_mmio + MMIO_MACDATA) & EEBUSY ) ;
-
-        /* Tell EEProm what we want to do and where */
-        writel(IO_WORD_WRITE | EECONTROL, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writew(EEREAD + ee_addr, xl_mmio + MMIO_MACDATA) ; 
-
-        /* Wait for EEProm to not be busy */
-        writel(IO_WORD_READ | EECONTROL, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        while ( readw(xl_mmio + MMIO_MACDATA) & EEBUSY ) ; 
-        
-        /* Tell EEProm what we want to do and where */
-        writel(IO_WORD_WRITE | EECONTROL , xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writew(EEREAD + ee_addr, xl_mmio + MMIO_MACDATA) ; 
-
-        /* Finally read the value from the EEProm */
-        writel(IO_WORD_READ | EEDATA , xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        return readw(xl_mmio + MMIO_MACDATA) ; 
-}
-
-/* 
- *      Write values to the onboard eeprom. As with eeprom read you need to 
- *      set which location to write, wait, value to write, wait, with the 
- *      added twist of having to enable eeprom writes as well.
- */
-
-static void  xl_ee_write(struct net_device *dev, int ee_addr, u16 ee_value) 
-{
-        struct xl_private *xl_priv = netdev_priv(dev);
-        u8 __iomem *xl_mmio = xl_priv->xl_mmio ; 
-
-        /* Wait for EEProm to not be busy */
-        writel(IO_WORD_READ | EECONTROL, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        while ( readw(xl_mmio + MMIO_MACDATA) & EEBUSY ) ;
-        
-        /* Enable write/erase */
-        writel(IO_WORD_WRITE | EECONTROL, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writew(EE_ENABLE_WRITE, xl_mmio + MMIO_MACDATA) ; 
-
-        /* Wait for EEProm to not be busy */
-        writel(IO_WORD_READ | EECONTROL, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        while ( readw(xl_mmio + MMIO_MACDATA) & EEBUSY ) ;
-
-        /* Put the value we want to write into EEDATA */ 
-        writel(IO_WORD_WRITE | EEDATA, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writew(ee_value, xl_mmio + MMIO_MACDATA) ;
-
-        /* Tell EEProm to write eevalue into ee_addr */
-        writel(IO_WORD_WRITE | EECONTROL, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writew(EEWRITE + ee_addr, xl_mmio + MMIO_MACDATA) ; 
-
-        /* Wait for EEProm to not be busy, to ensure write gets done */
-        writel(IO_WORD_READ | EECONTROL, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        while ( readw(xl_mmio + MMIO_MACDATA) & EEBUSY ) ;
-        
-        return ; 
-}
-
-static const struct net_device_ops xl_netdev_ops = {
-        .ndo_open               = xl_open,
-        .ndo_stop               = xl_close,
-        .ndo_start_xmit         = xl_xmit,
-        .ndo_change_mtu         = xl_change_mtu,
-        .ndo_set_rx_mode        = xl_set_rx_mode,
-        .ndo_set_mac_address    = xl_set_mac_address,
-};
- 
-static int __devinit xl_probe(struct pci_dev *pdev,
-                              const struct pci_device_id *ent) 
-{
-        struct net_device *dev ; 
-        struct xl_private *xl_priv ; 
-        static int card_no = -1 ;
-        int i ; 
-
-        card_no++ ; 
-
-        if (pci_enable_device(pdev)) { 
-                return -ENODEV ; 
-        } 
-
-        pci_set_master(pdev);
-
-        if ((i = pci_request_regions(pdev,"3c359"))) { 
-                return i ; 
-        }
-
-        /* 
-         * Allowing init_trdev to allocate the private data will align
-         * xl_private on a 32 bytes boundary which we need for the rx/tx
-         * descriptors
-         */
-
-        dev = alloc_trdev(sizeof(struct xl_private)) ; 
-        if (!dev) { 
-                pci_release_regions(pdev) ; 
-                return -ENOMEM ; 
-        } 
-        xl_priv = netdev_priv(dev);
-
-#if XL_DEBUG  
-        printk("pci_device: %p, dev:%p, dev->priv: %p, ba[0]: %10x, ba[1]:%10x\n", 
-                pdev, dev, netdev_priv(dev), (unsigned int)pdev->resource[0].start, (unsigned int)pdev->resource[1].start);
-#endif 
-
-        dev->irq=pdev->irq;
-        dev->base_addr=pci_resource_start(pdev,0) ; 
-        xl_priv->xl_card_name = pci_name(pdev);
-        xl_priv->xl_mmio=ioremap(pci_resource_start(pdev,1), XL_IO_SPACE);
-        xl_priv->pdev = pdev ; 
-                
-        if ((pkt_buf_sz[card_no] < 100) || (pkt_buf_sz[card_no] > 18000) )
-                xl_priv->pkt_buf_sz = PKT_BUF_SZ ; 
-        else
-                xl_priv->pkt_buf_sz = pkt_buf_sz[card_no] ; 
-
-        dev->mtu = xl_priv->pkt_buf_sz - TR_HLEN ; 
-        xl_priv->xl_ring_speed = ringspeed[card_no] ; 
-        xl_priv->xl_message_level = message_level[card_no] ; 
-        xl_priv->xl_functional_addr[0] = xl_priv->xl_functional_addr[1] = xl_priv->xl_functional_addr[2] = xl_priv->xl_functional_addr[3] = 0 ; 
-        xl_priv->xl_copy_all_options = 0 ; 
-                
-        if((i = xl_init(dev))) {
-                iounmap(xl_priv->xl_mmio) ; 
-                free_netdev(dev) ; 
-                pci_release_regions(pdev) ; 
-                return i ; 
-        }                               
-
-        dev->netdev_ops = &xl_netdev_ops;
-        SET_NETDEV_DEV(dev, &pdev->dev);
-
-        pci_set_drvdata(pdev,dev) ; 
-        if ((i = register_netdev(dev))) { 
-                printk(KERN_ERR "3C359, register netdev failed\n") ;  
-                pci_set_drvdata(pdev,NULL) ; 
-                iounmap(xl_priv->xl_mmio) ; 
-                free_netdev(dev) ; 
-                pci_release_regions(pdev) ; 
-                return i ; 
-        }
-   
-        printk(KERN_INFO "3C359: %s registered as: %s\n",xl_priv->xl_card_name,dev->name) ; 
-
-        return 0; 
-}
-
-static int xl_init_firmware(struct xl_private *xl_priv)
-{
-        int err;
-
-        err = request_firmware(&xl_priv->fw, FW_NAME, &xl_priv->pdev->dev);
-        if (err) {
-                printk(KERN_ERR "Failed to load firmware \"%s\"\n", FW_NAME);
-                return err;
-        }
-
-        if (xl_priv->fw->size < 16) {
-                printk(KERN_ERR "Bogus length %zu in \"%s\"\n",
-                       xl_priv->fw->size, FW_NAME);
-                release_firmware(xl_priv->fw);
-                err = -EINVAL;
-        }
-
-        return err;
-}
-
-static int __devinit xl_init(struct net_device *dev) 
-{
-        struct xl_private *xl_priv = netdev_priv(dev);
-        int err;
-
-        printk(KERN_INFO "%s\n", version);
-        printk(KERN_INFO "%s: I/O at %hx, MMIO at %p, using irq %d\n",
-                xl_priv->xl_card_name, (unsigned int)dev->base_addr ,xl_priv->xl_mmio, dev->irq);
-
-        spin_lock_init(&xl_priv->xl_lock) ; 
-
-        err = xl_init_firmware(xl_priv);
-        if (err == 0)
-                err = xl_hw_reset(dev);
-
-        return err;
-}
-
-
-/* 
- *      Hardware reset.  This needs to be a separate entity as we need to reset the card
- *      when we change the EEProm settings.
- */
-
-static int xl_hw_reset(struct net_device *dev) 
-{
-        struct xl_private *xl_priv = netdev_priv(dev);
-        u8 __iomem *xl_mmio = xl_priv->xl_mmio ; 
-        unsigned long t ; 
-        u16 i ; 
-        u16 result_16 ; 
-        u8 result_8 ;
-        u16 start ; 
-        int j ;
-
-        if (xl_priv->fw == NULL)
-                return -EINVAL;
-
-        /*
-         *  Reset the card.  If the card has got the microcode on board, we have 
-         *  missed the initialization interrupt, so we must always do this.
-         */
-
-        writew( GLOBAL_RESET, xl_mmio + MMIO_COMMAND ) ; 
-
-        /* 
-         * Must wait for cmdInProgress bit (12) to clear before continuing with
-         * card configuration.
-         */
-
-        t=jiffies;
-        while (readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_CMD_IN_PROGRESS) { 
-                schedule();             
-                if (time_after(jiffies, t + 40 * HZ)) {
-                        printk(KERN_ERR "%s: 3COM 3C359 Velocity XL  card not responding to global reset.\n", dev->name);
-                        return -ENODEV;
-                }
-        }
-
-        /*
-         *  Enable pmbar by setting bit in CPAttention
-         */
-
-        writel( (IO_BYTE_READ | CPATTENTION), xl_mmio + MMIO_MAC_ACCESS_CMD) ;
-        result_8 = readb(xl_mmio + MMIO_MACDATA) ; 
-        result_8 = result_8 | CPA_PMBARVIS ; 
-        writel( (IO_BYTE_WRITE | CPATTENTION), xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writeb(result_8, xl_mmio + MMIO_MACDATA) ; 
-        
-        /*
-         * Read cpHold bit in pmbar, if cleared we have got Flashrom on board.
-         * If not, we need to upload the microcode to the card
-         */
-
-        writel( (IO_WORD_READ | PMBAR),xl_mmio + MMIO_MAC_ACCESS_CMD);  
-
-#if XL_DEBUG
-        printk(KERN_INFO "Read from PMBAR = %04x\n", readw(xl_mmio + MMIO_MACDATA));
-#endif
-
-        if ( readw( (xl_mmio + MMIO_MACDATA))  & PMB_CPHOLD ) { 
-
-                /* Set PmBar, privateMemoryBase bits (8:2) to 0 */
-
-                writel( (IO_WORD_READ | PMBAR),xl_mmio + MMIO_MAC_ACCESS_CMD);  
-                result_16 = readw(xl_mmio + MMIO_MACDATA) ; 
-                result_16 = result_16 & ~((0x7F) << 2) ; 
-                writel( (IO_WORD_WRITE | PMBAR), xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                writew(result_16,xl_mmio + MMIO_MACDATA) ; 
-        
-                /* Set CPAttention, memWrEn bit */
-
-                writel( (IO_BYTE_READ | CPATTENTION), xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                result_8 = readb(xl_mmio + MMIO_MACDATA) ; 
-                result_8 = result_8 | CPA_MEMWREN  ; 
-                writel( (IO_BYTE_WRITE | CPATTENTION), xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                writeb(result_8, xl_mmio + MMIO_MACDATA) ; 
-
-                /* 
-                 * Now to write the microcode into the shared ram 
-                 * The microcode must finish at position 0xFFFF,
-                 * so we must subtract to get the start position for the code
-                 *
-                 * Looks strange but ensures compiler only uses
-                 * 16 bit unsigned int
-                 */
-                start = (0xFFFF - (xl_priv->fw->size) + 1) ;
-
-                printk(KERN_INFO "3C359: Uploading Microcode: "); 
-
-                for (i = start, j = 0; j < xl_priv->fw->size; i++, j++) {
-                        writel(MEM_BYTE_WRITE | 0XD0000 | i,
-                               xl_mmio + MMIO_MAC_ACCESS_CMD);
-                        writeb(xl_priv->fw->data[j], xl_mmio + MMIO_MACDATA);
-                        if (j % 1024 == 0)
-                                printk(".");
-                }
-                printk("\n") ; 
-
-                for (i = 0; i < 16; i++) {
-                        writel((MEM_BYTE_WRITE | 0xDFFF0) + i,
-                               xl_mmio + MMIO_MAC_ACCESS_CMD);
-                        writeb(xl_priv->fw->data[xl_priv->fw->size - 16 + i],
-                               xl_mmio + MMIO_MACDATA);
-                }
-
-                /*
-                 * Have to write the start address of the upload to FFF4, but
-                 * the address must be >> 4. You do not want to know how long
-                 * it took me to discover this.
-                 */
-
-                writel(MEM_WORD_WRITE | 0xDFFF4, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                writew(start >> 4, xl_mmio + MMIO_MACDATA);
-
-                /* Clear the CPAttention, memWrEn Bit */
-        
-                writel( (IO_BYTE_READ | CPATTENTION), xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                result_8 = readb(xl_mmio + MMIO_MACDATA) ; 
-                result_8 = result_8 & ~CPA_MEMWREN ; 
-                writel( (IO_BYTE_WRITE | CPATTENTION), xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                writeb(result_8, xl_mmio + MMIO_MACDATA) ; 
-
-                /* Clear the cpHold bit in pmbar */
-
-                writel( (IO_WORD_READ | PMBAR),xl_mmio + MMIO_MAC_ACCESS_CMD);  
-                result_16 = readw(xl_mmio + MMIO_MACDATA) ; 
-                result_16 = result_16 & ~PMB_CPHOLD ; 
-                writel( (IO_WORD_WRITE | PMBAR), xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                writew(result_16,xl_mmio + MMIO_MACDATA) ; 
-
-
-        } /* If microcode upload required */
-
-        /* 
-         * The card should now go though a self test procedure and get itself ready
-         * to be opened, we must wait for an srb response with the initialization
-         * information. 
-         */
-
-#if XL_DEBUG
-        printk(KERN_INFO "%s: Microcode uploaded, must wait for the self test to complete\n", dev->name);
-#endif
-
-        writew(SETINDENABLE | 0xFFF, xl_mmio + MMIO_COMMAND) ; 
-
-        t=jiffies;
-        while ( !(readw(xl_mmio + MMIO_INTSTATUS_AUTO) & INTSTAT_SRB) ) { 
-                schedule();             
-                if (time_after(jiffies, t + 15 * HZ)) {
-                        printk(KERN_ERR "3COM 3C359 Velocity XL  card not responding.\n");
-                        return -ENODEV; 
-                }
-        }
-
-        /*
-         * Write the RxBufArea with D000, RxEarlyThresh, TxStartThresh, 
-         * DnPriReqThresh, read the tech docs if you want to know what
-         * values they need to be.
-         */
-
-        writel(MMIO_WORD_WRITE | RXBUFAREA, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writew(0xD000, xl_mmio + MMIO_MACDATA) ; 
-        
-        writel(MMIO_WORD_WRITE | RXEARLYTHRESH, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writew(0X0020, xl_mmio + MMIO_MACDATA) ; 
-        
-        writew( SETTXSTARTTHRESH | 0x40 , xl_mmio + MMIO_COMMAND) ; 
-
-        writeb(0x04, xl_mmio + MMIO_DNBURSTTHRESH) ; 
-        writeb(0x04, xl_mmio + DNPRIREQTHRESH) ;
-
-        /*
-         * Read WRBR to provide the location of the srb block, have to use byte reads not word reads. 
-         * Tech docs have this wrong !!!!
-         */
-
-        writel(MMIO_BYTE_READ | WRBR, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        xl_priv->srb = readb(xl_mmio + MMIO_MACDATA) << 8 ; 
-        writel( (MMIO_BYTE_READ | WRBR) + 1, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        xl_priv->srb = xl_priv->srb | readb(xl_mmio + MMIO_MACDATA) ;
-
-#if XL_DEBUG
-        writel(IO_WORD_READ | SWITCHSETTINGS, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        if ( readw(xl_mmio + MMIO_MACDATA) & 2) { 
-                printk(KERN_INFO "Default ring speed 4 mbps\n");
-        } else {
-                printk(KERN_INFO "Default ring speed 16 mbps\n");
-        } 
-        printk(KERN_INFO "%s: xl_priv->srb = %04x\n",xl_priv->xl_card_name, xl_priv->srb);
-#endif
-
-        return 0;
-}
-
-static int xl_open(struct net_device *dev) 
-{
-        struct xl_private *xl_priv=netdev_priv(dev);
-        u8 __iomem *xl_mmio = xl_priv->xl_mmio ; 
-        u8 i ; 
-        __le16 hwaddr[3] ; /* Should be u8[6] but we get word return values */
-        int open_err ;
-
-        u16 switchsettings, switchsettings_eeprom  ;
- 
-        if (request_irq(dev->irq, xl_interrupt, IRQF_SHARED , "3c359", dev))
-                return -EAGAIN;
-
-        /* 
-         * Read the information from the EEPROM that we need.
-         */
-        
-        hwaddr[0] = cpu_to_le16(xl_ee_read(dev,0x10));
-        hwaddr[1] = cpu_to_le16(xl_ee_read(dev,0x11));
-        hwaddr[2] = cpu_to_le16(xl_ee_read(dev,0x12));
-
-        /* Ring speed */
-
-        switchsettings_eeprom = xl_ee_read(dev,0x08) ;
-        switchsettings = switchsettings_eeprom ;  
-
-        if (xl_priv->xl_ring_speed != 0) { 
-                if (xl_priv->xl_ring_speed == 4)  
-                        switchsettings = switchsettings | 0x02 ; 
-                else 
-                        switchsettings = switchsettings & ~0x02 ; 
-        }
-
-        /* Only write EEProm if there has been a change */
-        if (switchsettings != switchsettings_eeprom) { 
-                xl_ee_write(dev,0x08,switchsettings) ; 
-                /* Hardware reset after changing EEProm */
-                xl_hw_reset(dev) ; 
-        }
-
-        memcpy(dev->dev_addr,hwaddr,dev->addr_len) ; 
-        
-        open_err = xl_open_hw(dev) ; 
-
-        /* 
-         * This really needs to be cleaned up with better error reporting.
-         */
-
-        if (open_err != 0) { /* Something went wrong with the open command */
-                if (open_err & 0x07) { /* Wrong speed, retry at different speed */
-                        printk(KERN_WARNING "%s: Open Error, retrying at different ringspeed\n", dev->name);
-                        switchsettings = switchsettings ^ 2 ; 
-                        xl_ee_write(dev,0x08,switchsettings) ; 
-                        xl_hw_reset(dev) ; 
-                        open_err = xl_open_hw(dev) ; 
-                        if (open_err != 0) { 
-                                printk(KERN_WARNING "%s: Open error returned a second time, we're bombing out now\n", dev->name); 
-                                free_irq(dev->irq,dev) ;                                                
-                                return -ENODEV ;
-                        }  
-                } else { 
-                        printk(KERN_WARNING "%s: Open Error = %04x\n", dev->name, open_err) ; 
-                        free_irq(dev->irq,dev) ; 
-                        return -ENODEV ; 
-                }
-        }
-
-        /*
-         * Now to set up the Rx and Tx buffer structures
-         */
-        /* These MUST be on 8 byte boundaries */
-        xl_priv->xl_tx_ring = kzalloc((sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE) + 7, GFP_DMA | GFP_KERNEL);
-        if (xl_priv->xl_tx_ring == NULL) {
-                free_irq(dev->irq,dev);
-                return -ENOMEM;
-        }
-        xl_priv->xl_rx_ring = kzalloc((sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) +7, GFP_DMA | GFP_KERNEL);
-        if (xl_priv->xl_rx_ring == NULL) {
-                free_irq(dev->irq,dev);
-                kfree(xl_priv->xl_tx_ring);
-                return -ENOMEM;
-        }
-
-         /* Setup Rx Ring */
-         for (i=0 ; i < XL_RX_RING_SIZE ; i++) { 
-                struct sk_buff *skb ; 
-
-                skb = dev_alloc_skb(xl_priv->pkt_buf_sz) ; 
-                if (skb==NULL) 
-                        break ; 
-
-                skb->dev = dev ; 
-                xl_priv->xl_rx_ring[i].upfragaddr = cpu_to_le32(pci_map_single(xl_priv->pdev, skb->data,xl_priv->pkt_buf_sz, PCI_DMA_FROMDEVICE));
-                xl_priv->xl_rx_ring[i].upfraglen = cpu_to_le32(xl_priv->pkt_buf_sz) | RXUPLASTFRAG;
-                xl_priv->rx_ring_skb[i] = skb ;         
-        }
-
-        if (i==0) { 
-                printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers. Adapter disabled\n",dev->name);
-                free_irq(dev->irq,dev) ; 
-                kfree(xl_priv->xl_tx_ring);
-                kfree(xl_priv->xl_rx_ring);
-                return -EIO ; 
-        } 
-
-        xl_priv->rx_ring_no = i ; 
-        xl_priv->rx_ring_tail = 0 ; 
-        xl_priv->rx_ring_dma_addr = pci_map_single(xl_priv->pdev,xl_priv->xl_rx_ring, sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE, PCI_DMA_TODEVICE) ; 
-        for (i=0;i<(xl_priv->rx_ring_no-1);i++) { 
-                xl_priv->xl_rx_ring[i].upnextptr = cpu_to_le32(xl_priv->rx_ring_dma_addr + (sizeof (struct xl_rx_desc) * (i+1)));
-        } 
-        xl_priv->xl_rx_ring[i].upnextptr = 0 ; 
-
-        writel(xl_priv->rx_ring_dma_addr, xl_mmio + MMIO_UPLISTPTR) ; 
-        
-        /* Setup Tx Ring */
-        
-        xl_priv->tx_ring_dma_addr = pci_map_single(xl_priv->pdev,xl_priv->xl_tx_ring, sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE,PCI_DMA_TODEVICE) ; 
-        
-        xl_priv->tx_ring_head = 1 ; 
-        xl_priv->tx_ring_tail = 255 ; /* Special marker for first packet */
-        xl_priv->free_ring_entries = XL_TX_RING_SIZE ; 
-
-        /*
-         * Setup the first dummy DPD entry for polling to start working.
-         */
-
-        xl_priv->xl_tx_ring[0].framestartheader = TXDPDEMPTY;
-        xl_priv->xl_tx_ring[0].buffer = 0 ; 
-        xl_priv->xl_tx_ring[0].buffer_length = 0 ; 
-        xl_priv->xl_tx_ring[0].dnnextptr = 0 ; 
-
-        writel(xl_priv->tx_ring_dma_addr, xl_mmio + MMIO_DNLISTPTR) ; 
-        writel(DNUNSTALL, xl_mmio + MMIO_COMMAND) ; 
-        writel(UPUNSTALL, xl_mmio + MMIO_COMMAND) ; 
-        writel(DNENABLE, xl_mmio + MMIO_COMMAND) ; 
-        writeb(0x40, xl_mmio + MMIO_DNPOLL) ;   
-
-        /*
-         * Enable interrupts on the card
-         */
-
-        writel(SETINTENABLE | INT_MASK, xl_mmio + MMIO_COMMAND) ; 
-        writel(SETINDENABLE | INT_MASK, xl_mmio + MMIO_COMMAND) ; 
-
-        netif_start_queue(dev) ;        
-        return 0;
-        
-}       
-
-static int xl_open_hw(struct net_device *dev) 
-{ 
-        struct xl_private *xl_priv=netdev_priv(dev);
-        u8 __iomem *xl_mmio = xl_priv->xl_mmio ; 
-        u16 vsoff ;
-        char ver_str[33];  
-        int open_err ; 
-        int i ; 
-        unsigned long t ; 
-
-        /*
-         * Okay, let's build up the Open.NIC srb command
-         *
-         */
-                
-        writel( (MEM_BYTE_WRITE | 0xD0000 | xl_priv->srb), xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writeb(OPEN_NIC, xl_mmio + MMIO_MACDATA) ; 
-        
-        /*
-         * Use this as a test byte, if it comes back with the same value, the command didn't work
-         */
-
-        writel( (MEM_BYTE_WRITE | 0xD0000 | xl_priv->srb)+ 2, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writeb(0xff,xl_mmio + MMIO_MACDATA) ; 
-
-        /* Open options */
-        writel( (MEM_BYTE_WRITE | 0xD0000 | xl_priv->srb) + 8, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writeb(0x00, xl_mmio + MMIO_MACDATA) ; 
-        writel( (MEM_BYTE_WRITE | 0xD0000 | xl_priv->srb) + 9, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writeb(0x00, xl_mmio + MMIO_MACDATA) ; 
-
-        /* 
-         * Node address, be careful here, the docs say you can just put zeros here and it will use
-         * the hardware address, it doesn't, you must include the node address in the open command.
-         */
-
-        if (xl_priv->xl_laa[0]) {  /* If using a LAA address */
-                for (i=10;i<16;i++) { 
-                        writel( (MEM_BYTE_WRITE | 0xD0000 | xl_priv->srb) + i, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                        writeb(xl_priv->xl_laa[i-10],xl_mmio + MMIO_MACDATA) ;
-                }
-                memcpy(dev->dev_addr,xl_priv->xl_laa,dev->addr_len) ; 
-        } else { /* Regular hardware address */ 
-                for (i=10;i<16;i++) { 
-                        writel( (MEM_BYTE_WRITE | 0xD0000 | xl_priv->srb) + i, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                        writeb(dev->dev_addr[i-10], xl_mmio + MMIO_MACDATA) ; 
-                }
-        }
-
-        /* Default everything else to 0 */
-        for (i = 16; i < 34; i++) {
-                writel( (MEM_BYTE_WRITE | 0xD0000 | xl_priv->srb) + i, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                writeb(0x00,xl_mmio + MMIO_MACDATA) ; 
-        }
-        
-        /*
-         *  Set the csrb bit in the MISR register
-         */
-
-        xl_wait_misr_flags(dev) ; 
-        writel(MEM_BYTE_WRITE | MF_CSRB, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writeb(0xFF, xl_mmio + MMIO_MACDATA) ; 
-        writel(MMIO_BYTE_WRITE | MISR_SET, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writeb(MISR_CSRB , xl_mmio + MMIO_MACDATA) ; 
-
-        /*
-         * Now wait for the command to run
-         */
-
-        t=jiffies;
-        while (! (readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_SRB)) { 
-                schedule();             
-                if (time_after(jiffies, t + 40 * HZ)) {
-                        printk(KERN_ERR "3COM 3C359 Velocity XL  card not responding.\n");
-                        break ; 
-                }
-        }
-
-        /*
-         * Let's interpret the open response
-         */
-
-        writel( (MEM_BYTE_READ | 0xD0000 | xl_priv->srb)+2, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        if (readb(xl_mmio + MMIO_MACDATA)!=0) {
-                open_err = readb(xl_mmio + MMIO_MACDATA) << 8 ; 
-                writel( (MEM_BYTE_READ | 0xD0000 | xl_priv->srb) + 7, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                open_err |= readb(xl_mmio + MMIO_MACDATA) ; 
-                return open_err ; 
-        } else { 
-                writel( (MEM_WORD_READ | 0xD0000 | xl_priv->srb) + 8, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                xl_priv->asb = swab16(readw(xl_mmio + MMIO_MACDATA)) ;
-                printk(KERN_INFO "%s: Adapter Opened Details: ",dev->name) ; 
-                printk("ASB: %04x",xl_priv->asb ) ; 
-                writel( (MEM_WORD_READ | 0xD0000 | xl_priv->srb) + 10, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                printk(", SRB: %04x",swab16(readw(xl_mmio + MMIO_MACDATA)) ) ;
- 
-                writel( (MEM_WORD_READ | 0xD0000 | xl_priv->srb) + 12, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                xl_priv->arb = swab16(readw(xl_mmio + MMIO_MACDATA)) ;
-                printk(", ARB: %04x\n",xl_priv->arb );
-                writel( (MEM_WORD_READ | 0xD0000 | xl_priv->srb) + 14, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                vsoff = swab16(readw(xl_mmio + MMIO_MACDATA)) ;
-
-                /* 
-                 * Interesting, sending the individual characters directly to printk was causing klogd to use
-                 * use 100% of processor time, so we build up the string and print that instead.
-                 */
-
-                for (i=0;i<0x20;i++) { 
-                        writel( (MEM_BYTE_READ | 0xD0000 | vsoff) + i, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                        ver_str[i] = readb(xl_mmio + MMIO_MACDATA) ; 
-                }
-                ver_str[i] = '\0' ; 
-                printk(KERN_INFO "%s: Microcode version String: %s\n",dev->name,ver_str);
-        }       
-        
-        /*
-         * Issue the AckInterrupt
-         */
-        writew(ACK_INTERRUPT | SRBRACK | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; 
-
-        return 0 ; 
-}
-
-/*
- *      There are two ways of implementing rx on the 359 NIC, either
- *      interrupt driven or polling.  We are going to uses interrupts,
- *      it is the easier way of doing things.
- *      
- *      The Rx works with a ring of Rx descriptors.  At initialise time the ring
- *      entries point to the next entry except for the last entry in the ring 
- *      which points to 0.  The card is programmed with the location of the first
- *      available descriptor and keeps reading the next_ptr until next_ptr is set
- *      to 0.  Hopefully with a ring size of 16 the card will never get to read a next_ptr
- *      of 0.  As the Rx interrupt is received we copy the frame up to the protocol layers
- *      and then point the end of the ring to our current position and point our current
- *      position to 0, therefore making the current position the last position on the ring.
- *      The last position on the ring therefore loops continually loops around the rx ring.
- *      
- *      rx_ring_tail is the position on the ring to process next. (Think of a snake, the head 
- *      expands as the card adds new packets and we go around eating the tail processing the
- *      packets.)
- *
- *      Undoubtably it could be streamlined and improved upon, but at the moment it works 
- *      and the fast path through the routine is fine. 
- *      
- *      adv_rx_ring could be inlined to increase performance, but its called a *lot* of times
- *      in xl_rx so would increase the size of the function significantly. 
- */
-
-static void adv_rx_ring(struct net_device *dev) /* Advance rx_ring, cut down on bloat in xl_rx */ 
-{
-        struct xl_private *xl_priv=netdev_priv(dev);
-        int n = xl_priv->rx_ring_tail;
-        int prev_ring_loc;
-
-        prev_ring_loc = (n + XL_RX_RING_SIZE - 1) & (XL_RX_RING_SIZE - 1);
-        xl_priv->xl_rx_ring[prev_ring_loc].upnextptr = cpu_to_le32(xl_priv->rx_ring_dma_addr + (sizeof (struct xl_rx_desc) * n));
-        xl_priv->xl_rx_ring[n].framestatus = 0;
-        xl_priv->xl_rx_ring[n].upnextptr = 0;
-        xl_priv->rx_ring_tail++;
-        xl_priv->rx_ring_tail &= (XL_RX_RING_SIZE-1);
-}
-
-static void xl_rx(struct net_device *dev)
-{
-        struct xl_private *xl_priv=netdev_priv(dev);
-        u8 __iomem * xl_mmio = xl_priv->xl_mmio ; 
-        struct sk_buff *skb, *skb2 ; 
-        int frame_length = 0, copy_len = 0  ;   
-        int temp_ring_loc ;  
-
-        /*
-         * Receive the next frame, loop around the ring until all frames
-         * have been received.
-         */      
-        
-        while (xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].framestatus & (RXUPDCOMPLETE | RXUPDFULL) ) { /* Descriptor to process */
-
-                if (xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].framestatus & RXUPDFULL ) { /* UpdFull, Multiple Descriptors used for the frame */
-
-                        /* 
-                         * This is a pain, you need to go through all the descriptors until the last one 
-                         * for this frame to find the framelength
-                         */
-
-                        temp_ring_loc = xl_priv->rx_ring_tail ; 
-
-                        while (xl_priv->xl_rx_ring[temp_ring_loc].framestatus & RXUPDFULL ) {
-                                temp_ring_loc++ ; 
-                                temp_ring_loc &= (XL_RX_RING_SIZE-1) ; 
-                        }
-
-                        frame_length = le32_to_cpu(xl_priv->xl_rx_ring[temp_ring_loc].framestatus) & 0x7FFF;
-
-                        skb = dev_alloc_skb(frame_length) ;
- 
-                        if (skb==NULL) { /* No memory for frame, still need to roll forward the rx ring */
-                                printk(KERN_WARNING "%s: dev_alloc_skb failed - multi buffer !\n", dev->name) ; 
-                                while (xl_priv->rx_ring_tail != temp_ring_loc)  
-                                        adv_rx_ring(dev) ; 
-                                
-                                adv_rx_ring(dev) ; /* One more time just for luck :) */ 
-                                dev->stats.rx_dropped++ ; 
-
-                                writel(ACK_INTERRUPT | UPCOMPACK | LATCH_ACK , xl_mmio + MMIO_COMMAND) ; 
-                                return ;                                
-                        }
-        
-                        while (xl_priv->rx_ring_tail != temp_ring_loc) { 
-                                copy_len = le32_to_cpu(xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfraglen) & 0x7FFF;
-                                frame_length -= copy_len ;  
-                                pci_dma_sync_single_for_cpu(xl_priv->pdev,le32_to_cpu(xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr),xl_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE);
-                                skb_copy_from_linear_data(xl_priv->rx_ring_skb[xl_priv->rx_ring_tail],
-                                                          skb_put(skb, copy_len),
-                                                          copy_len);
-                                pci_dma_sync_single_for_device(xl_priv->pdev,le32_to_cpu(xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr),xl_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE);
-                                adv_rx_ring(dev) ; 
-                        } 
-
-                        /* Now we have found the last fragment */
-                        pci_dma_sync_single_for_cpu(xl_priv->pdev,le32_to_cpu(xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr),xl_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE);
-                        skb_copy_from_linear_data(xl_priv->rx_ring_skb[xl_priv->rx_ring_tail],
-                                      skb_put(skb,copy_len), frame_length);
-/*                      memcpy(skb_put(skb,frame_length), bus_to_virt(xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr), frame_length) ; */
-                        pci_dma_sync_single_for_device(xl_priv->pdev,le32_to_cpu(xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr),xl_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE);
-                        adv_rx_ring(dev) ; 
-                        skb->protocol = tr_type_trans(skb,dev) ; 
-                        netif_rx(skb) ; 
-
-                } else { /* Single Descriptor Used, simply swap buffers over, fast path  */
-
-                        frame_length = le32_to_cpu(xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].framestatus) & 0x7FFF;
-                        
-                        skb = dev_alloc_skb(xl_priv->pkt_buf_sz) ; 
-
-                        if (skb==NULL) { /* Still need to fix the rx ring */
-                                printk(KERN_WARNING "%s: dev_alloc_skb failed in rx, single buffer\n",dev->name);
-                                adv_rx_ring(dev) ; 
-                                dev->stats.rx_dropped++ ; 
-                                writel(ACK_INTERRUPT | UPCOMPACK | LATCH_ACK , xl_mmio + MMIO_COMMAND) ; 
-                                return ; 
-                        }
-
-                        skb2 = xl_priv->rx_ring_skb[xl_priv->rx_ring_tail] ; 
-                        pci_unmap_single(xl_priv->pdev, le32_to_cpu(xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr), xl_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE) ;
-                        skb_put(skb2, frame_length) ; 
-                        skb2->protocol = tr_type_trans(skb2,dev) ; 
-
-                        xl_priv->rx_ring_skb[xl_priv->rx_ring_tail] = skb ;     
-                        xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr = cpu_to_le32(pci_map_single(xl_priv->pdev,skb->data,xl_priv->pkt_buf_sz, PCI_DMA_FROMDEVICE));
-                        xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfraglen = cpu_to_le32(xl_priv->pkt_buf_sz) | RXUPLASTFRAG;
-                        adv_rx_ring(dev) ; 
-                        dev->stats.rx_packets++ ; 
-                        dev->stats.rx_bytes += frame_length ;   
-
-                        netif_rx(skb2) ;                
-                 } /* if multiple buffers */
-        } /* while packet to do */
-
-        /* Clear the updComplete interrupt */
-        writel(ACK_INTERRUPT | UPCOMPACK | LATCH_ACK , xl_mmio + MMIO_COMMAND) ; 
-        return ;        
-}
-
-/*
- * This is ruthless, it doesn't care what state the card is in it will 
- * completely reset the adapter.
- */
-
-static void xl_reset(struct net_device *dev) 
-{
-        struct xl_private *xl_priv=netdev_priv(dev);
-        u8 __iomem * xl_mmio = xl_priv->xl_mmio ; 
-        unsigned long t; 
-
-        writew( GLOBAL_RESET, xl_mmio + MMIO_COMMAND ) ; 
-
-        /* 
-         * Must wait for cmdInProgress bit (12) to clear before continuing with
-         * card configuration.
-         */
-
-        t=jiffies;
-        while (readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_CMD_IN_PROGRESS) { 
-                if (time_after(jiffies, t + 40 * HZ)) {
-                        printk(KERN_ERR "3COM 3C359 Velocity XL  card not responding.\n");
-                        break ; 
-                }
-        }
-        
-}
-
-static void xl_freemem(struct net_device *dev) 
-{
-        struct xl_private *xl_priv=netdev_priv(dev);
-        int i ; 
-
-        for (i=0;i<XL_RX_RING_SIZE;i++) {
-                dev_kfree_skb_irq(xl_priv->rx_ring_skb[xl_priv->rx_ring_tail]) ; 
-                pci_unmap_single(xl_priv->pdev,le32_to_cpu(xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr),xl_priv->pkt_buf_sz, PCI_DMA_FROMDEVICE);
-                xl_priv->rx_ring_tail++ ; 
-                xl_priv->rx_ring_tail &= XL_RX_RING_SIZE-1; 
-        } 
-
-        /* unmap ring */
-        pci_unmap_single(xl_priv->pdev,xl_priv->rx_ring_dma_addr, sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE, PCI_DMA_FROMDEVICE) ; 
-        
-        pci_unmap_single(xl_priv->pdev,xl_priv->tx_ring_dma_addr, sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE, PCI_DMA_TODEVICE) ; 
-
-        kfree(xl_priv->xl_rx_ring) ; 
-        kfree(xl_priv->xl_tx_ring) ; 
-
-        return  ; 
-}
-
-static irqreturn_t xl_interrupt(int irq, void *dev_id) 
-{
-        struct net_device *dev = (struct net_device *)dev_id;
-        struct xl_private *xl_priv =netdev_priv(dev);
-        u8 __iomem * xl_mmio = xl_priv->xl_mmio ; 
-        u16 intstatus, macstatus  ;
-
-        intstatus = readw(xl_mmio + MMIO_INTSTATUS) ;  
-
-        if (!(intstatus & 1)) /* We didn't generate the interrupt */
-                return IRQ_NONE;
-
-        spin_lock(&xl_priv->xl_lock) ; 
-
-        /*
-         * Process the interrupt
-         */
-        /*
-         * Something fishy going on here, we shouldn't get 0001 ints, not fatal though.
-         */
-        if (intstatus == 0x0001) {  
-                writel(ACK_INTERRUPT | LATCH_ACK, xl_mmio + MMIO_COMMAND) ;
-                printk(KERN_INFO "%s: 00001 int received\n",dev->name);
-        } else {  
-                if (intstatus & (HOSTERRINT | SRBRINT | ARBCINT | UPCOMPINT | DNCOMPINT | HARDERRINT | (1<<8) | TXUNDERRUN | ASBFINT)) { 
-                        
-                        /* 
-                         * Host Error.
-                         * It may be possible to recover from this, but usually it means something
-                         * is seriously fubar, so we just close the adapter.
-                         */
-
-                        if (intstatus & HOSTERRINT) {
-                                printk(KERN_WARNING "%s: Host Error, performing global reset, intstatus = %04x\n",dev->name,intstatus);
-                                writew( GLOBAL_RESET, xl_mmio + MMIO_COMMAND ) ;
-                                printk(KERN_WARNING "%s: Resetting hardware:\n", dev->name);
-                                netif_stop_queue(dev) ;
-                                xl_freemem(dev) ; 
-                                free_irq(dev->irq,dev);         
-                                xl_reset(dev) ; 
-                                writel(ACK_INTERRUPT | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; 
-                                spin_unlock(&xl_priv->xl_lock) ; 
-                                return IRQ_HANDLED;
-                        } /* Host Error */
-
-                        if (intstatus & SRBRINT ) {  /* Srbc interrupt */
-                                writel(ACK_INTERRUPT | SRBRACK | LATCH_ACK, xl_mmio + MMIO_COMMAND) ;
-                                if (xl_priv->srb_queued)
-                                        xl_srb_bh(dev) ; 
-                        } /* SRBR Interrupt */
-
-                        if (intstatus & TXUNDERRUN) { /* Issue DnReset command */
-                                writel(DNRESET, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                                while (readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_CMD_IN_PROGRESS) { /* Wait for command to run */
-                                        /* !!! FIX-ME !!!! 
-                                        Must put a timeout check here ! */
-                                        /* Empty Loop */
-                                } 
-                                printk(KERN_WARNING "%s: TX Underrun received\n",dev->name);
-                                writel(ACK_INTERRUPT | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; 
-                        } /* TxUnderRun */
-        
-                        if (intstatus & ARBCINT ) { /* Arbc interrupt */
-                                xl_arb_cmd(dev) ; 
-                        } /* Arbc */
-
-                        if (intstatus & ASBFINT) { 
-                                if (xl_priv->asb_queued == 1) {
-                                        xl_asb_cmd(dev) ; 
-                                } else if (xl_priv->asb_queued == 2) {
-                                        xl_asb_bh(dev) ; 
-                                } else { 
-                                        writel(ACK_INTERRUPT | LATCH_ACK | ASBFACK, xl_mmio + MMIO_COMMAND) ; 
-                                }  
-                        } /* Asbf */
-
-                        if (intstatus & UPCOMPINT ) /* UpComplete */
-                                xl_rx(dev) ; 
-
-                        if (intstatus & DNCOMPINT )  /* DnComplete */
-                                xl_dn_comp(dev) ; 
-
-                        if (intstatus & HARDERRINT ) { /* Hardware error */
-                                writel(MMIO_WORD_READ | MACSTATUS, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                                macstatus = readw(xl_mmio + MMIO_MACDATA) ; 
-                                printk(KERN_WARNING "%s: MacStatusError, details: ", dev->name);
-                                if (macstatus & (1<<14)) 
-                                        printk(KERN_WARNING "tchk error: Unrecoverable error\n");
-                                if (macstatus & (1<<3))
-                                        printk(KERN_WARNING "eint error: Internal watchdog timer expired\n");
-                                if (macstatus & (1<<2))
-                                        printk(KERN_WARNING "aint error: Host tried to perform invalid operation\n");
-                                printk(KERN_WARNING "Instatus = %02x, macstatus = %02x\n",intstatus,macstatus) ; 
-                                printk(KERN_WARNING "%s: Resetting hardware:\n", dev->name);
-                                netif_stop_queue(dev) ;
-                                xl_freemem(dev) ; 
-                                free_irq(dev->irq,dev); 
-                                unregister_netdev(dev) ; 
-                                free_netdev(dev) ;  
-                                xl_reset(dev) ; 
-                                writel(ACK_INTERRUPT | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; 
-                                spin_unlock(&xl_priv->xl_lock) ; 
-                                return IRQ_HANDLED;
-                        }
-                } else { 
-                        printk(KERN_WARNING "%s: Received Unknown interrupt : %04x\n", dev->name, intstatus);
-                        writel(ACK_INTERRUPT | LATCH_ACK, xl_mmio + MMIO_COMMAND) ;     
-                }
-        } 
-
-        /* Turn interrupts back on */
-
-        writel( SETINDENABLE | INT_MASK, xl_mmio + MMIO_COMMAND) ; 
-        writel( SETINTENABLE | INT_MASK, xl_mmio + MMIO_COMMAND) ; 
-
-        spin_unlock(&xl_priv->xl_lock) ;
-        return IRQ_HANDLED;
-}       
-
-/*
- *      Tx - Polling configuration
- */
-        
-static netdev_tx_t xl_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-        struct xl_private *xl_priv=netdev_priv(dev);
-        struct xl_tx_desc *txd ; 
-        int tx_head, tx_tail, tx_prev ; 
-        unsigned long flags ;   
-
-        spin_lock_irqsave(&xl_priv->xl_lock,flags) ; 
-
-        netif_stop_queue(dev) ; 
-
-        if (xl_priv->free_ring_entries > 1 ) {  
-                /*
-                 * Set up the descriptor for the packet 
-                 */
-                tx_head = xl_priv->tx_ring_head ; 
-                tx_tail = xl_priv->tx_ring_tail ; 
-
-                txd = &(xl_priv->xl_tx_ring[tx_head]) ; 
-                txd->dnnextptr = 0 ; 
-                txd->framestartheader = cpu_to_le32(skb->len) | TXDNINDICATE;
-                txd->buffer = cpu_to_le32(pci_map_single(xl_priv->pdev, skb->data, skb->len, PCI_DMA_TODEVICE));
-                txd->buffer_length = cpu_to_le32(skb->len) | TXDNFRAGLAST;
-                xl_priv->tx_ring_skb[tx_head] = skb ; 
-                dev->stats.tx_packets++ ; 
-                dev->stats.tx_bytes += skb->len ;
-
-                /* 
-                 * Set the nextptr of the previous descriptor equal to this descriptor, add XL_TX_RING_SIZE -1 
-                 * to ensure no negative numbers in unsigned locations.
-                 */ 
-        
-                tx_prev = (xl_priv->tx_ring_head + XL_TX_RING_SIZE - 1) & (XL_TX_RING_SIZE - 1) ; 
-
-                xl_priv->tx_ring_head++ ; 
-                xl_priv->tx_ring_head &= (XL_TX_RING_SIZE - 1) ;
-                xl_priv->free_ring_entries-- ; 
-
-                xl_priv->xl_tx_ring[tx_prev].dnnextptr = cpu_to_le32(xl_priv->tx_ring_dma_addr + (sizeof (struct xl_tx_desc) * tx_head));
-
-                /* Sneaky, by doing a read on DnListPtr we can force the card to poll on the DnNextPtr */
-                /* readl(xl_mmio + MMIO_DNLISTPTR) ; */
-
-                netif_wake_queue(dev) ; 
-
-                spin_unlock_irqrestore(&xl_priv->xl_lock,flags) ; 
- 
-                return NETDEV_TX_OK;
-        } else {
-                spin_unlock_irqrestore(&xl_priv->xl_lock,flags) ; 
-                return NETDEV_TX_BUSY;
-        }
-
-}
-        
-/* 
- * The NIC has told us that a packet has been downloaded onto the card, we must
- * find out which packet it has done, clear the skb and information for the packet
- * then advance around the ring for all transmitted packets
- */
-
-static void xl_dn_comp(struct net_device *dev) 
-{
-        struct xl_private *xl_priv=netdev_priv(dev);
-        u8 __iomem * xl_mmio = xl_priv->xl_mmio ; 
-        struct xl_tx_desc *txd ; 
-
-
-        if (xl_priv->tx_ring_tail == 255) {/* First time */
-                xl_priv->xl_tx_ring[0].framestartheader = 0 ; 
-                xl_priv->xl_tx_ring[0].dnnextptr = 0 ;  
-                xl_priv->tx_ring_tail = 1 ; 
-        }
-
-        while (xl_priv->xl_tx_ring[xl_priv->tx_ring_tail].framestartheader & TXDNCOMPLETE ) { 
-                txd = &(xl_priv->xl_tx_ring[xl_priv->tx_ring_tail]) ;
-                pci_unmap_single(xl_priv->pdev, le32_to_cpu(txd->buffer), xl_priv->tx_ring_skb[xl_priv->tx_ring_tail]->len, PCI_DMA_TODEVICE);
-                txd->framestartheader = 0 ; 
-                txd->buffer = cpu_to_le32(0xdeadbeef);
-                txd->buffer_length  = 0 ;  
-                dev_kfree_skb_irq(xl_priv->tx_ring_skb[xl_priv->tx_ring_tail]) ;
-                xl_priv->tx_ring_tail++ ; 
-                xl_priv->tx_ring_tail &= (XL_TX_RING_SIZE - 1) ; 
-                xl_priv->free_ring_entries++ ; 
-        }
-
-        netif_wake_queue(dev) ; 
-
-        writel(ACK_INTERRUPT | DNCOMPACK | LATCH_ACK , xl_mmio + MMIO_COMMAND) ; 
-}
-
-/*
- * Close the adapter properly.
- * This srb reply cannot be handled from interrupt context as we have
- * to free the interrupt from the driver. 
- */
-
-static int xl_close(struct net_device *dev) 
-{
-        struct xl_private *xl_priv = netdev_priv(dev);
-        u8 __iomem * xl_mmio = xl_priv->xl_mmio ; 
-        unsigned long t ; 
-
-        netif_stop_queue(dev) ; 
-
-        /*
-         * Close the adapter, need to stall the rx and tx queues.
-         */
-
-        writew(DNSTALL, xl_mmio + MMIO_COMMAND) ; 
-        t=jiffies;
-        while (readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_CMD_IN_PROGRESS) { 
-                schedule();             
-                if (time_after(jiffies, t + 10 * HZ)) {
-                        printk(KERN_ERR "%s: 3COM 3C359 Velocity XL-DNSTALL not responding.\n", dev->name);
-                        break ; 
-                }
-        }
-        writew(DNDISABLE, xl_mmio + MMIO_COMMAND) ; 
-        t=jiffies;
-        while (readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_CMD_IN_PROGRESS) { 
-                schedule();             
-                if (time_after(jiffies, t + 10 * HZ)) {
-                        printk(KERN_ERR "%s: 3COM 3C359 Velocity XL-DNDISABLE not responding.\n", dev->name);
-                        break ;
-                }
-        }
-        writew(UPSTALL, xl_mmio + MMIO_COMMAND) ; 
-        t=jiffies;
-        while (readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_CMD_IN_PROGRESS) { 
-                schedule();             
-                if (time_after(jiffies, t + 10 * HZ)) {
-                        printk(KERN_ERR "%s: 3COM 3C359 Velocity XL-UPSTALL not responding.\n", dev->name);
-                        break ; 
-                }
-        }
-
-        /* Turn off interrupts, we will still get the indication though
-         * so we can trap it
-         */
-
-        writel(SETINTENABLE, xl_mmio + MMIO_COMMAND) ; 
-
-        xl_srb_cmd(dev,CLOSE_NIC) ; 
-
-        t=jiffies;
-        while (!(readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_SRB)) { 
-                schedule();             
-                if (time_after(jiffies, t + 10 * HZ)) {
-                        printk(KERN_ERR "%s: 3COM 3C359 Velocity XL-CLOSENIC not responding.\n", dev->name);
-                        break ; 
-                }
-        }
-        /* Read the srb response from the adapter */
-
-        writel(MEM_BYTE_READ | 0xd0000 | xl_priv->srb, xl_mmio + MMIO_MAC_ACCESS_CMD);
-        if (readb(xl_mmio + MMIO_MACDATA) != CLOSE_NIC) { 
-                printk(KERN_INFO "%s: CLOSE_NIC did not get a CLOSE_NIC response\n",dev->name);
-        } else { 
-                writel((MEM_BYTE_READ | 0xd0000 | xl_priv->srb) +2, xl_mmio + MMIO_MAC_ACCESS_CMD) ;
-                if (readb(xl_mmio + MMIO_MACDATA)==0) { 
-                        printk(KERN_INFO "%s: Adapter has been closed\n",dev->name);
-                        writew(ACK_INTERRUPT | SRBRACK | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; 
-
-                        xl_freemem(dev) ; 
-                        free_irq(dev->irq,dev) ; 
-                } else { 
-                        printk(KERN_INFO "%s: Close nic command returned error code %02x\n",dev->name, readb(xl_mmio + MMIO_MACDATA)) ;
-                } 
-        }
-
-        /* Reset the upload and download logic */
- 
-        writew(UPRESET, xl_mmio + MMIO_COMMAND) ; 
-        t=jiffies;
-        while (readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_CMD_IN_PROGRESS) { 
-                schedule();             
-                if (time_after(jiffies, t + 10 * HZ)) {
-                        printk(KERN_ERR "%s: 3COM 3C359 Velocity XL-UPRESET not responding.\n", dev->name);
-                        break ; 
-                }
-        }
-        writew(DNRESET, xl_mmio + MMIO_COMMAND) ; 
-        t=jiffies;
-        while (readw(xl_mmio + MMIO_INTSTATUS) & INTSTAT_CMD_IN_PROGRESS) { 
-                schedule();             
-                if (time_after(jiffies, t + 10 * HZ)) {
-                        printk(KERN_ERR "%s: 3COM 3C359 Velocity XL-DNRESET not responding.\n", dev->name);
-                        break ; 
-                }
-        }
-        xl_hw_reset(dev) ; 
-        return 0 ;
-}
-
-static void xl_set_rx_mode(struct net_device *dev) 
-{
-        struct xl_private *xl_priv = netdev_priv(dev);
-        struct netdev_hw_addr *ha;
-        unsigned char dev_mc_address[4] ; 
-        u16 options ; 
-
-        if (dev->flags & IFF_PROMISC)
-                options = 0x0004 ; 
-        else
-                options = 0x0000 ; 
-
-        if (options ^ xl_priv->xl_copy_all_options) { /* Changed, must send command */
-                xl_priv->xl_copy_all_options = options ; 
-                xl_srb_cmd(dev, SET_RECEIVE_MODE) ;
-                return ;  
-        }
-
-        dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ;
-
-        netdev_for_each_mc_addr(ha, dev) {
-                dev_mc_address[0] |= ha->addr[2];
-                dev_mc_address[1] |= ha->addr[3];
-                dev_mc_address[2] |= ha->addr[4];
-                dev_mc_address[3] |= ha->addr[5];
-        }
-
-        if (memcmp(xl_priv->xl_functional_addr,dev_mc_address,4) != 0) { /* Options have changed, run the command */
-                memcpy(xl_priv->xl_functional_addr, dev_mc_address,4) ; 
-                xl_srb_cmd(dev, SET_FUNC_ADDRESS) ; 
-        }
-        return ; 
-}
-
-
-/*
- *      We issued an srb command and now we must read
- *      the response from the completed command.
- */
-
-static void xl_srb_bh(struct net_device *dev) 
-{ 
-        struct xl_private *xl_priv = netdev_priv(dev);
-        u8 __iomem * xl_mmio = xl_priv->xl_mmio ; 
-        u8 srb_cmd, ret_code ; 
-        int i ; 
-
-        writel(MEM_BYTE_READ | 0xd0000 | xl_priv->srb, xl_mmio + MMIO_MAC_ACCESS_CMD) ;
-        srb_cmd = readb(xl_mmio + MMIO_MACDATA) ; 
-        writel((MEM_BYTE_READ | 0xd0000 | xl_priv->srb) +2, xl_mmio + MMIO_MAC_ACCESS_CMD) ;
-        ret_code = readb(xl_mmio + MMIO_MACDATA) ; 
-
-        /* Ret_code is standard across all commands */
-
-        switch (ret_code) { 
-        case 1:
-                printk(KERN_INFO "%s: Command: %d - Invalid Command code\n",dev->name,srb_cmd) ; 
-                break ; 
-        case 4:
-                printk(KERN_INFO "%s: Command: %d - Adapter is closed, must be open for this command\n",dev->name,srb_cmd);
-                break ;
-        
-        case 6:
-                printk(KERN_INFO "%s: Command: %d - Options Invalid for command\n",dev->name,srb_cmd);
-                break ;
-
-        case 0: /* Successful command execution */ 
-                switch (srb_cmd) { 
-                case READ_LOG: /* Returns 14 bytes of data from the NIC */
-                        if(xl_priv->xl_message_level)
-                                printk(KERN_INFO "%s: READ.LOG 14 bytes of data ",dev->name) ; 
-                        /* 
-                         * We still have to read the log even if message_level = 0 and we don't want
-                         * to see it
-                         */
-                        for (i=0;i<14;i++) { 
-                                writel(MEM_BYTE_READ | 0xd0000 | xl_priv->srb | i, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                                if(xl_priv->xl_message_level) 
-                                        printk("%02x:",readb(xl_mmio + MMIO_MACDATA)) ;         
-                        } 
-                        printk("\n") ; 
-                        break ; 
-                case SET_FUNC_ADDRESS:
-                        if(xl_priv->xl_message_level) 
-                                printk(KERN_INFO "%s: Functional Address Set\n",dev->name);
-                        break ; 
-                case CLOSE_NIC:
-                        if(xl_priv->xl_message_level)
-                                printk(KERN_INFO "%s: Received CLOSE_NIC interrupt in interrupt handler\n",dev->name);
-                        break ; 
-                case SET_MULTICAST_MODE:
-                        if(xl_priv->xl_message_level)
-                                printk(KERN_INFO "%s: Multicast options successfully changed\n",dev->name) ; 
-                        break ;
-                case SET_RECEIVE_MODE:
-                        if(xl_priv->xl_message_level) {  
-                                if (xl_priv->xl_copy_all_options == 0x0004) 
-                                        printk(KERN_INFO "%s: Entering promiscuous mode\n", dev->name);
-                                else
-                                        printk(KERN_INFO "%s: Entering normal receive mode\n",dev->name);
-                        }
-                        break ; 
- 
-                } /* switch */
-                break ; 
-        } /* switch */
-        return ;        
-} 
-
-static int xl_set_mac_address (struct net_device *dev, void *addr) 
-{
-        struct sockaddr *saddr = addr ; 
-        struct xl_private *xl_priv = netdev_priv(dev);
-
-        if (netif_running(dev)) { 
-                printk(KERN_WARNING "%s: Cannot set mac/laa address while card is open\n", dev->name) ; 
-                return -EIO ; 
-        }
-
-        memcpy(xl_priv->xl_laa, saddr->sa_data,dev->addr_len) ; 
-        
-        if (xl_priv->xl_message_level) { 
-                printk(KERN_INFO "%s: MAC/LAA Set to  = %x.%x.%x.%x.%x.%x\n",dev->name, xl_priv->xl_laa[0],
-                xl_priv->xl_laa[1], xl_priv->xl_laa[2],
-                xl_priv->xl_laa[3], xl_priv->xl_laa[4],
-                xl_priv->xl_laa[5]);
-        } 
-
-        return 0 ; 
-}
-
-static void xl_arb_cmd(struct net_device *dev)
-{
-        struct xl_private *xl_priv = netdev_priv(dev);
-        u8 __iomem * xl_mmio = xl_priv->xl_mmio ; 
-        u8 arb_cmd ; 
-        u16 lan_status, lan_status_diff ; 
-
-        writel( ( MEM_BYTE_READ | 0xD0000 | xl_priv->arb), xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        arb_cmd = readb(xl_mmio + MMIO_MACDATA) ; 
-        
-        if (arb_cmd == RING_STATUS_CHANGE) { /* Ring.Status.Change */
-                writel( ( (MEM_WORD_READ | 0xD0000 | xl_priv->arb) + 6), xl_mmio + MMIO_MAC_ACCESS_CMD) ;
-                 
-                printk(KERN_INFO "%s: Ring Status Change: New Status = %04x\n", dev->name, swab16(readw(xl_mmio + MMIO_MACDATA) )) ;
-
-                lan_status = swab16(readw(xl_mmio + MMIO_MACDATA));
-        
-                /* Acknowledge interrupt, this tells nic we are done with the arb */
-                writel(ACK_INTERRUPT | ARBCACK | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; 
-                        
-                lan_status_diff = xl_priv->xl_lan_status ^ lan_status ; 
-
-                if (lan_status_diff & (LSC_LWF | LSC_ARW | LSC_FPE | LSC_RR) ) { 
-                        if (lan_status_diff & LSC_LWF) 
-                                printk(KERN_WARNING "%s: Short circuit detected on the lobe\n",dev->name);
-                        if (lan_status_diff & LSC_ARW) 
-                                printk(KERN_WARNING "%s: Auto removal error\n",dev->name);
-                        if (lan_status_diff & LSC_FPE)
-                                printk(KERN_WARNING "%s: FDX Protocol Error\n",dev->name);
-                        if (lan_status_diff & LSC_RR) 
-                                printk(KERN_WARNING "%s: Force remove MAC frame received\n",dev->name);
-                
-                        /* Adapter has been closed by the hardware */
-
-                        netif_stop_queue(dev);
-                        xl_freemem(dev) ; 
-                        free_irq(dev->irq,dev);
-                        
-                        printk(KERN_WARNING "%s: Adapter has been closed\n", dev->name);
-                } /* If serious error */
-                
-                if (xl_priv->xl_message_level) { 
-                        if (lan_status_diff & LSC_SIG_LOSS) 
-                                        printk(KERN_WARNING "%s: No receive signal detected\n", dev->name);
-                        if (lan_status_diff & LSC_HARD_ERR)
-                                        printk(KERN_INFO "%s: Beaconing\n",dev->name);
-                        if (lan_status_diff & LSC_SOFT_ERR)
-                                        printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame\n",dev->name);
-                        if (lan_status_diff & LSC_TRAN_BCN) 
-                                        printk(KERN_INFO "%s: We are transmitting the beacon, aaah\n",dev->name);
-                        if (lan_status_diff & LSC_SS) 
-                                        printk(KERN_INFO "%s: Single Station on the ring\n", dev->name);
-                        if (lan_status_diff & LSC_RING_REC)
-                                        printk(KERN_INFO "%s: Ring recovery ongoing\n",dev->name);
-                        if (lan_status_diff & LSC_FDX_MODE)
-                                        printk(KERN_INFO "%s: Operating in FDX mode\n",dev->name);
-                }       
-                
-                if (lan_status_diff & LSC_CO) { 
-                                if (xl_priv->xl_message_level) 
-                                        printk(KERN_INFO "%s: Counter Overflow\n", dev->name);
-                                /* Issue READ.LOG command */
-                                xl_srb_cmd(dev, READ_LOG) ;     
-                }
-
-                /* There is no command in the tech docs to issue the read_sr_counters */
-                if (lan_status_diff & LSC_SR_CO) { 
-                        if (xl_priv->xl_message_level)
-                                printk(KERN_INFO "%s: Source routing counters overflow\n", dev->name);
-                }
-
-                xl_priv->xl_lan_status = lan_status ; 
-        
-        }  /* Lan.change.status */
-        else if ( arb_cmd == RECEIVE_DATA) { /* Received.Data */
-#if XL_DEBUG
-                printk(KERN_INFO "Received.Data\n");
-#endif          
-                writel( ((MEM_WORD_READ | 0xD0000 | xl_priv->arb) + 6), xl_mmio + MMIO_MAC_ACCESS_CMD) ;
-                xl_priv->mac_buffer = swab16(readw(xl_mmio + MMIO_MACDATA)) ;
-                
-                /* Now we are going to be really basic here and not do anything
-                 * with the data at all. The tech docs do not give me enough
-                 * information to calculate the buffers properly so we're
-                 * just going to tell the nic that we've dealt with the frame
-                 * anyway.
-                 */
-
-                /* Acknowledge interrupt, this tells nic we are done with the arb */
-                writel(ACK_INTERRUPT | ARBCACK | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; 
-
-                /* Is the ASB free ? */         
-                        
-                xl_priv->asb_queued = 0 ;                       
-                writel( ((MEM_BYTE_READ | 0xD0000 | xl_priv->asb) + 2), xl_mmio + MMIO_MAC_ACCESS_CMD) ;
-                if (readb(xl_mmio + MMIO_MACDATA) != 0xff) { 
-                        xl_priv->asb_queued = 1 ;
-
-                        xl_wait_misr_flags(dev) ;  
-
-                        writel(MEM_BYTE_WRITE | MF_ASBFR, xl_mmio + MMIO_MAC_ACCESS_CMD); 
-                        writeb(0xff, xl_mmio + MMIO_MACDATA) ;
-                        writel(MMIO_BYTE_WRITE | MISR_SET, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                        writeb(MISR_ASBFR, xl_mmio + MMIO_MACDATA) ; 
-                        return ;        
-                        /* Drop out and wait for the bottom half to be run */
-                }
-        
-                xl_asb_cmd(dev) ; 
-                
-        } else {
-                printk(KERN_WARNING "%s: Received unknown arb (xl_priv) command: %02x\n",dev->name,arb_cmd);
-        }
-
-        /* Acknowledge the arb interrupt */
-
-        writel(ACK_INTERRUPT | ARBCACK | LATCH_ACK , xl_mmio + MMIO_COMMAND) ; 
-
-        return ; 
-}
-
-
-/*
- *      There is only one asb command, but we can get called from different
- *      places.
- */
-
-static void xl_asb_cmd(struct net_device *dev)
-{
-        struct xl_private *xl_priv = netdev_priv(dev);
-        u8 __iomem * xl_mmio = xl_priv->xl_mmio ; 
-
-        if (xl_priv->asb_queued == 1) 
-                writel(ACK_INTERRUPT | LATCH_ACK | ASBFACK, xl_mmio + MMIO_COMMAND) ; 
-                
-        writel(MEM_BYTE_WRITE | 0xd0000 | xl_priv->asb, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writeb(0x81, xl_mmio + MMIO_MACDATA) ; 
-
-        writel(MEM_WORD_WRITE | 0xd0000 | xl_priv->asb | 6, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writew(swab16(xl_priv->mac_buffer), xl_mmio + MMIO_MACDATA) ;
-
-        xl_wait_misr_flags(dev) ;       
-
-        writel(MEM_BYTE_WRITE | MF_RASB, xl_mmio + MMIO_MAC_ACCESS_CMD); 
-        writeb(0xff, xl_mmio + MMIO_MACDATA) ;
-
-        writel(MMIO_BYTE_WRITE | MISR_SET, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writeb(MISR_RASB, xl_mmio + MMIO_MACDATA) ; 
-
-        xl_priv->asb_queued = 2 ; 
-
-        return ; 
-}
-
-/*
- *      This will only get called if there was an error
- *      from the asb cmd.
- */
-static void xl_asb_bh(struct net_device *dev) 
-{
-        struct xl_private *xl_priv = netdev_priv(dev);
-        u8 __iomem * xl_mmio = xl_priv->xl_mmio ; 
-        u8 ret_code ; 
-
-        writel(MMIO_BYTE_READ | 0xd0000 | xl_priv->asb | 2, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        ret_code = readb(xl_mmio + MMIO_MACDATA) ; 
-        switch (ret_code) { 
-                case 0x01:
-                        printk(KERN_INFO "%s: ASB Command, unrecognized command code\n",dev->name);
-                        break ;
-                case 0x26:
-                        printk(KERN_INFO "%s: ASB Command, unexpected receive buffer\n", dev->name);
-                        break ; 
-                case 0x40:
-                        printk(KERN_INFO "%s: ASB Command, Invalid Station ID\n", dev->name);
-                        break ;  
-        }
-        xl_priv->asb_queued = 0 ; 
-        writel(ACK_INTERRUPT | LATCH_ACK | ASBFACK, xl_mmio + MMIO_COMMAND) ;
-        return ;  
-}
-
-/*      
- *      Issue srb commands to the nic 
- */
-
-static void xl_srb_cmd(struct net_device *dev, int srb_cmd) 
-{
-        struct xl_private *xl_priv = netdev_priv(dev);
-        u8 __iomem * xl_mmio = xl_priv->xl_mmio ; 
-
-        switch (srb_cmd) { 
-        case READ_LOG:
-                writel(MEM_BYTE_WRITE | 0xD0000 | xl_priv->srb, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                writeb(READ_LOG, xl_mmio + MMIO_MACDATA) ; 
-                break; 
-
-        case CLOSE_NIC:
-                writel(MEM_BYTE_WRITE | 0xD0000 | xl_priv->srb, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                writeb(CLOSE_NIC, xl_mmio + MMIO_MACDATA) ; 
-                break ;
-
-        case SET_RECEIVE_MODE:
-                writel(MEM_BYTE_WRITE | 0xD0000 | xl_priv->srb, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                writeb(SET_RECEIVE_MODE, xl_mmio + MMIO_MACDATA) ; 
-                writel(MEM_WORD_WRITE | 0xD0000 | xl_priv->srb | 4, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                writew(xl_priv->xl_copy_all_options, xl_mmio + MMIO_MACDATA) ; 
-                break ;
-
-        case SET_FUNC_ADDRESS:
-                writel(MEM_BYTE_WRITE | 0xD0000 | xl_priv->srb, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                writeb(SET_FUNC_ADDRESS, xl_mmio + MMIO_MACDATA) ; 
-                writel(MEM_BYTE_WRITE | 0xD0000 | xl_priv->srb | 6 , xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                writeb(xl_priv->xl_functional_addr[0], xl_mmio + MMIO_MACDATA) ; 
-                writel(MEM_BYTE_WRITE | 0xD0000 | xl_priv->srb | 7 , xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                writeb(xl_priv->xl_functional_addr[1], xl_mmio + MMIO_MACDATA) ; 
-                writel(MEM_BYTE_WRITE | 0xD0000 | xl_priv->srb | 8 , xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                writeb(xl_priv->xl_functional_addr[2], xl_mmio + MMIO_MACDATA) ; 
-                writel(MEM_BYTE_WRITE | 0xD0000 | xl_priv->srb | 9 , xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                writeb(xl_priv->xl_functional_addr[3], xl_mmio + MMIO_MACDATA) ;
-                break ;  
-        } /* switch */
-
-
-        xl_wait_misr_flags(dev)  ; 
-
-        /* Write 0xff to the CSRB flag */
-        writel(MEM_BYTE_WRITE | MF_CSRB , xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writeb(0xFF, xl_mmio + MMIO_MACDATA) ; 
-        /* Set csrb bit in MISR register to process command */
-        writel(MMIO_BYTE_WRITE | MISR_SET, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writeb(MISR_CSRB, xl_mmio + MMIO_MACDATA) ; 
-        xl_priv->srb_queued = 1 ; 
-
-        return ; 
-}
-
-/*
- * This is nasty, to use the MISR command you have to wait for 6 memory locations
- * to be zero. This is the way the driver does on other OS'es so we should be ok with 
- * the empty loop.
- */
-
-static void xl_wait_misr_flags(struct net_device *dev) 
-{
-        struct xl_private *xl_priv = netdev_priv(dev);
-        u8 __iomem * xl_mmio = xl_priv->xl_mmio ; 
-        
-        int i  ; 
-        
-        writel(MMIO_BYTE_READ | MISR_RW, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        if (readb(xl_mmio + MMIO_MACDATA) != 0) {  /* Misr not clear */
-                for (i=0; i<6; i++) { 
-                        writel(MEM_BYTE_READ | 0xDFFE0 | i, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                        while (readb(xl_mmio + MMIO_MACDATA) != 0) {
-                                ;       /* Empty Loop */
-                        }
-                } 
-        }
-
-        writel(MMIO_BYTE_WRITE | MISR_AND, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writeb(0x80, xl_mmio + MMIO_MACDATA) ; 
-
-        return ; 
-} 
-
-/*
- *      Change mtu size, this should work the same as olympic
- */
-
-static int xl_change_mtu(struct net_device *dev, int mtu) 
-{
-        struct xl_private *xl_priv = netdev_priv(dev);
-        u16 max_mtu ; 
-
-        if (xl_priv->xl_ring_speed == 4)
-                max_mtu = 4500 ; 
-        else
-                max_mtu = 18000 ; 
-        
-        if (mtu > max_mtu)
-                return -EINVAL ; 
-        if (mtu < 100) 
-                return -EINVAL ; 
-
-        dev->mtu = mtu ; 
-        xl_priv->pkt_buf_sz = mtu + TR_HLEN ; 
-
-        return 0 ; 
-}
-
-static void __devexit xl_remove_one (struct pci_dev *pdev)
-{
-        struct net_device *dev = pci_get_drvdata(pdev);
-        struct xl_private *xl_priv=netdev_priv(dev);
-        
-        release_firmware(xl_priv->fw);
-        unregister_netdev(dev);
-        iounmap(xl_priv->xl_mmio) ; 
-        pci_release_regions(pdev) ; 
-        pci_set_drvdata(pdev,NULL) ; 
-        free_netdev(dev);
-        return ; 
-}
-
-static struct pci_driver xl_3c359_driver = {
-        .name           = "3c359",
-        .id_table       = xl_pci_tbl,
-        .probe          = xl_probe,
-        .remove         = __devexit_p(xl_remove_one),
-};
-
-static int __init xl_pci_init (void)
-{
-        return pci_register_driver(&xl_3c359_driver);
-}
-
-
-static void __exit xl_pci_cleanup (void)
-{
-        pci_unregister_driver (&xl_3c359_driver);
-}
-
-module_init(xl_pci_init);
-module_exit(xl_pci_cleanup);
-
-MODULE_LICENSE("GPL") ; 
diff --git a/drivers/net/tokenring/3c359.h b/drivers/net/tokenring/3c359.h
deleted file mode 100644
index bcb1a6b4a4c7..000000000000
--- a/drivers/net/tokenring/3c359.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- *  3c359.h (c) 2000 Mike Phillips (mikep@linuxtr.net) All Rights Reserved
- *
- *  Linux driver for 3Com 3C359 Token Link PCI XL cards.
- *
- *  This software may be used and distributed according to the terms
- *  of the GNU General Public License Version 2 or (at your option) 
- *  any later verion, incorporated herein by reference.
- */
-
-/* Memory Access Commands */
-#define IO_BYTE_READ 0x28 << 24
-#define IO_BYTE_WRITE 0x18 << 24 
-#define IO_WORD_READ 0x20 << 24
-#define IO_WORD_WRITE 0x10 << 24
-#define MMIO_BYTE_READ 0x88 << 24
-#define MMIO_BYTE_WRITE 0x48 << 24
-#define MMIO_WORD_READ 0x80 << 24
-#define MMIO_WORD_WRITE 0x40 << 24
-#define MEM_BYTE_READ 0x8C << 24
-#define MEM_BYTE_WRITE 0x4C << 24
-#define MEM_WORD_READ 0x84 << 24
-#define MEM_WORD_WRITE 0x44 << 24
-
-#define PMBAR 0x1C80
-#define PMB_CPHOLD (1<<10)
-
-#define CPATTENTION 0x180D
-#define CPA_PMBARVIS (1<<7)
-#define CPA_MEMWREN (1<<6)
-
-#define SWITCHSETTINGS 0x1C88
-#define EECONTROL 0x1C8A
-#define EEDATA 0x1C8C
-#define EEREAD 0x0080 
-#define EEWRITE 0x0040
-#define EEERASE 0x0060
-#define EE_ENABLE_WRITE 0x0030
-#define EEBUSY (1<<15)
-
-#define WRBR 0xCDE02
-#define WWOR 0xCDE04
-#define WWCR 0xCDE06
-#define MACSTATUS 0xCDE08 
-#define MISR_RW 0xCDE0B
-#define MISR_AND 0xCDE2B
-#define MISR_SET 0xCDE4B
-#define RXBUFAREA 0xCDE10
-#define RXEARLYTHRESH 0xCDE12
-#define TXSTARTTHRESH 0x58
-#define DNPRIREQTHRESH 0x2C
-
-#define MISR_CSRB (1<<5)
-#define MISR_RASB (1<<4)
-#define MISR_SRBFR (1<<3)
-#define MISR_ASBFR (1<<2)
-#define MISR_ARBF (1<<1) 
-
-/* MISR Flags memory locations */
-#define MF_SSBF 0xDFFE0 
-#define MF_ARBF 0xDFFE1
-#define MF_ASBFR 0xDFFE2
-#define MF_SRBFR 0xDFFE3
-#define MF_RASB 0xDFFE4
-#define MF_CSRB 0xDFFE5
-
-#define MMIO_MACDATA 0x10 
-#define MMIO_MAC_ACCESS_CMD 0x14
-#define MMIO_TIMER 0x1A
-#define MMIO_DMA_CTRL 0x20
-#define MMIO_DNLISTPTR 0x24
-#define MMIO_HASHFILTER 0x28
-#define MMIO_CONFIG 0x29
-#define MMIO_DNPRIREQTHRESH 0x2C
-#define MMIO_DNPOLL 0x2D
-#define MMIO_UPPKTSTATUS 0x30
-#define MMIO_FREETIMER 0x34
-#define MMIO_COUNTDOWN 0x36
-#define MMIO_UPLISTPTR 0x38
-#define MMIO_UPPOLL 0x3C
-#define MMIO_UPBURSTTHRESH 0x40
-#define MMIO_DNBURSTTHRESH 0x41
-#define MMIO_INTSTATUS_AUTO 0x56
-#define MMIO_TXSTARTTHRESH 0x58
-#define MMIO_INTERRUPTENABLE 0x5A
-#define MMIO_INDICATIONENABLE 0x5C
-#define MMIO_COMMAND 0x5E  /* These two are meant to be the same */
-#define MMIO_INTSTATUS 0x5E /* Makes the code more readable this way */
-#define INTSTAT_CMD_IN_PROGRESS (1<<12) 
-#define INTSTAT_SRB (1<<14)
-#define INTSTAT_INTLATCH (1<<0)
-
-/* Indication / Interrupt Mask 
- * Annoyingly the bits to be set in the indication and interrupt enable
- * do not match with the actual bits received in the interrupt, although
- * they are in the same order. 
- * The mapping for the indication / interrupt are:
- * Bit  Indication / Interrupt
- *   0  HostError
- *   1  txcomplete
- *   2  updneeded
- *   3  rxcomplete
- *   4  intrequested
- *   5  macerror
- *   6  dncomplete
- *   7  upcomplete
- *   8  txunderrun
- *   9  asbf
- *  10  srbr
- *  11  arbc
- *
- *  The only ones we don't want to receive are txcomplete and rxcomplete
- *  we use dncomplete and upcomplete instead.
- */
-
-#define INT_MASK 0xFF5
-
-/* Note the subtle difference here, IND and INT */
-
-#define SETINDENABLE (8<<12)
-#define SETINTENABLE (7<<12)
-#define SRBBIT (1<<10)
-#define ASBBIT (1<<9)
-#define ARBBIT (1<<11)
-
-#define SRB 0xDFE90
-#define ASB 0xDFED0
-#define ARB 0xD0000
-#define SCRATCH 0xDFEF0
-
-#define INT_REQUEST 0x6000 /* (6 << 12) */
-#define ACK_INTERRUPT 0x6800 /* (13 <<11) */
-#define GLOBAL_RESET 0x00 
-#define DNDISABLE 0x5000 
-#define DNENABLE 0x4800 
-#define DNSTALL 0x3002
-#define DNRESET 0x5800
-#define DNUNSTALL 0x3003
-#define UPRESET 0x2800
-#define UPSTALL 0x3000
-#define UPUNSTALL 0x3001
-#define SETCONFIG 0x4000
-#define SETTXSTARTTHRESH 0x9800 
-
-/* Received Interrupts */
-#define ASBFINT (1<<13)
-#define SRBRINT (1<<14)
-#define ARBCINT (1<<15)
-#define TXUNDERRUN (1<<11)
-
-#define UPCOMPINT (1<<10)
-#define DNCOMPINT (1<<9)
-#define HARDERRINT (1<<7)
-#define RXCOMPLETE (1<<4)
-#define TXCOMPINT (1<<2)
-#define HOSTERRINT (1<<1)
-
-/* Receive descriptor bits */
-#define RXOVERRUN cpu_to_le32(1<<19)
-#define RXFC cpu_to_le32(1<<21)
-#define RXAR cpu_to_le32(1<<22)
-#define RXUPDCOMPLETE cpu_to_le32(1<<23)
-#define RXUPDFULL cpu_to_le32(1<<24)
-#define RXUPLASTFRAG cpu_to_le32(1<<31)
-
-/* Transmit descriptor bits */
-#define TXDNCOMPLETE cpu_to_le32(1<<16)
-#define TXTXINDICATE cpu_to_le32(1<<27)
-#define TXDPDEMPTY cpu_to_le32(1<<29)
-#define TXDNINDICATE cpu_to_le32(1<<31)
-#define TXDNFRAGLAST cpu_to_le32(1<<31)
-
-/* Interrupts to Acknowledge */
-#define LATCH_ACK 1 
-#define TXCOMPACK (1<<1)
-#define INTREQACK (1<<2)
-#define DNCOMPACK (1<<3)
-#define UPCOMPACK (1<<4)
-#define ASBFACK (1<<5)
-#define SRBRACK (1<<6)
-#define ARBCACK (1<<7)
-
-#define XL_IO_SPACE 128
-#define SRB_COMMAND_SIZE 50
-
-/* Adapter Commands */
-#define REQUEST_INT 0x00
-#define MODIFY_OPEN_PARMS 0x01
-#define RESTORE_OPEN_PARMS 0x02
-#define OPEN_NIC 0x03
-#define CLOSE_NIC 0x04
-#define SET_SLEEP_MODE 0x05
-#define SET_GROUP_ADDRESS 0x06
-#define SET_FUNC_ADDRESS 0x07
-#define READ_LOG 0x08
-#define SET_MULTICAST_MODE 0x0C
-#define CHANGE_WAKEUP_PATTERN 0x0D
-#define GET_STATISTICS 0x13
-#define SET_RECEIVE_MODE 0x1F
-
-/* ARB Commands */
-#define RECEIVE_DATA 0x81
-#define RING_STATUS_CHANGE 0x84
-
-/* ASB Commands */
-#define ASB_RECEIVE_DATE 0x81 
-
-/* Defines for LAN STATUS CHANGE reports */
-#define LSC_SIG_LOSS 0x8000
-#define LSC_HARD_ERR 0x4000
-#define LSC_SOFT_ERR 0x2000
-#define LSC_TRAN_BCN 0x1000
-#define LSC_LWF      0x0800
-#define LSC_ARW      0x0400
-#define LSC_FPE      0x0200
-#define LSC_RR       0x0100
-#define LSC_CO       0x0080
-#define LSC_SS       0x0040
-#define LSC_RING_REC 0x0020
-#define LSC_SR_CO    0x0010
-#define LSC_FDX_MODE 0x0004
-
-#define XL_MAX_ADAPTERS 8 /* 0x08 __MODULE_STRING can't hand 0xnn */
-
-/* 3c359 defaults for buffers */
- 
-#define XL_RX_RING_SIZE 16 /* must be a power of 2 */
-#define XL_TX_RING_SIZE 16 /* must be a power of 2 */
-
-#define PKT_BUF_SZ 4096 /* Default packet size */
-
-/* 3c359 data structures */
-
-struct xl_tx_desc {
-        __le32 dnnextptr;
-        __le32 framestartheader;
-        __le32 buffer;
-        __le32 buffer_length;
-};
-
-struct xl_rx_desc {
-        __le32 upnextptr;
-        __le32 framestatus;
-        __le32 upfragaddr;
-        __le32 upfraglen;
-};
-
-struct xl_private {
-        
-
-        /* These two structures must be aligned on 8 byte boundaries */
-
-        /* struct xl_rx_desc xl_rx_ring[XL_RX_RING_SIZE]; */
-        /* struct xl_tx_desc xl_tx_ring[XL_TX_RING_SIZE]; */
-        struct xl_rx_desc *xl_rx_ring ; 
-        struct xl_tx_desc *xl_tx_ring ; 
-        struct sk_buff *tx_ring_skb[XL_TX_RING_SIZE], *rx_ring_skb[XL_RX_RING_SIZE];    
-        int tx_ring_head, tx_ring_tail ;  
-        int rx_ring_tail, rx_ring_no ; 
-        int free_ring_entries ; 
-
-        u16 srb;
-        u16 arb;
-        u16 asb;
-
-        u8 __iomem *xl_mmio;
-        const char *xl_card_name;
-        struct pci_dev *pdev ; 
-        
-        spinlock_t xl_lock ; 
-
-        volatile int srb_queued;    
-        struct wait_queue *srb_wait;
-        volatile int asb_queued;   
-
-        u16 mac_buffer ;        
-        u16 xl_lan_status ;
-        u8 xl_ring_speed ;
-        u16 pkt_buf_sz ; 
-        u8 xl_message_level; 
-        u16 xl_copy_all_options ;  
-        unsigned char xl_functional_addr[4] ; 
-        u16 xl_addr_table_addr, xl_parms_addr ; 
-        u8 xl_laa[6] ; 
-        u32 rx_ring_dma_addr ; 
-        u32 tx_ring_dma_addr ; 
-
-        /* firmware section */
-        const struct firmware *fw;
-};
-
diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
deleted file mode 100644
index 45550d42b368..000000000000
--- a/drivers/net/tokenring/Kconfig
+++ /dev/null
@@ -1,199 +0,0 @@
-#
-# Token Ring driver configuration
-#
-
-# So far, we only have PCI, ISA, and MCA token ring devices
-menuconfig TR
-        bool "Token Ring driver support"
-        depends on NETDEVICES && !UML
-        depends on (PCI || ISA || MCA || CCW || PCMCIA)
-        help
-          Token Ring is IBM's way of communication on a local network; the
-          rest of the world uses Ethernet. To participate on a Token Ring
-          network, you need a special Token ring network card. If you are
-          connected to such a Token Ring network and want to use your Token
-          Ring card under Linux, say Y here and to the driver for your
-          particular card below and read the Token-Ring mini-HOWTO, available
-          from <http://www.tldp.org/docs.html#howto>. Most people can
-          say N here.
-
-if TR
-
-config WANT_LLC
-        def_bool y
-        select LLC
-
-config PCMCIA_IBMTR
-        tristate "IBM PCMCIA tokenring adapter support"
-        depends on IBMTR!=y && PCMCIA
-        ---help---
-          Say Y here if you intend to attach this type of Token Ring PCMCIA
-          card to your computer. You then also need to say Y to "Token Ring
-          driver support".
-
-          To compile this driver as a module, choose M here: the module will be
-          called ibmtr_cs.
-
-config IBMTR
-        tristate "IBM Tropic chipset based adapter support"
-        depends on ISA || MCA
-        ---help---
-          This is support for all IBM Token Ring cards that don't use DMA. If
-          you have such a beast, say Y and read the Token-Ring mini-HOWTO,
-          available from <http://www.tldp.org/docs.html#howto>.
-
-          Warning: this driver will almost definitely fail if more than one
-          active Token Ring card is present.
-
-          To compile this driver as a module, choose M here: the module will be
-          called ibmtr.
-
-config IBMOL
-        tristate "IBM Olympic chipset PCI adapter support"
-        depends on PCI
-        ---help---
-          This is support for all non-Lanstreamer IBM PCI Token Ring Cards.
-          Specifically this is all IBM PCI, PCI Wake On Lan, PCI II, PCI II
-          Wake On Lan, and PCI 100/16/4 adapters.
-
-          If you have such an adapter, say Y and read the Token-Ring
-          mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>.
-
-          To compile this driver as a module, choose M here: the module will be
-          called olympic.
-
-          Also read <file:Documentation/networking/olympic.txt> or check the
-          Linux Token Ring Project site for the latest information at
-          <http://www.linuxtr.net/>.
-
-config IBMLS
-        tristate "IBM Lanstreamer chipset PCI adapter support"
-        depends on PCI && !64BIT
-        help
-          This is support for IBM Lanstreamer PCI Token Ring Cards.
-
-          If you have such an adapter, say Y and read the Token-Ring
-          mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>.
-
-          To compile this driver as a module, choose M here: the module will be
-          called lanstreamer.
-
-config 3C359
-        tristate "3Com 3C359 Token Link Velocity XL adapter support"
-        depends on PCI
-        ---help---
-          This is support for the 3Com PCI Velocity XL cards, specifically
-          the 3Com 3C359, please note this is not for the 3C339 cards, you
-          should use the tms380 driver instead.
-
-          If you have such an adapter, say Y and read the Token-Ring
-          mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>.
-
-          To compile this driver as a module, choose M here: the module will be
-          called 3c359.
-
-          Also read the file <file:Documentation/networking/3c359.txt> or check the 
-          Linux Token Ring Project site for the latest information at
-          <http://www.linuxtr.net>
-
-config TMS380TR
-        tristate "Generic TMS380 Token Ring ISA/PCI adapter support"
-        depends on PCI || ISA && ISA_DMA_API || MCA
-        select FW_LOADER
-        ---help---
-          This driver provides generic support for token ring adapters
-          based on the Texas Instruments TMS380 series chipsets.  This
-          includes the SysKonnect TR4/16(+) ISA (SK-4190), SysKonnect
-          TR4/16(+) PCI (SK-4590), SysKonnect TR4/16 PCI (SK-4591),
-          Compaq 4/16 PCI, Thomas-Conrad TC4048 4/16 PCI, and several
-          Madge adapters.  If you say Y here, you will be asked to select
-          which cards to support below.  If you're using modules, each
-          class of card will be supported by a separate module.
-
-          If you have such an adapter and would like to use it, say Y and
-          read the Token-Ring mini-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-
-          Also read the file <file:Documentation/networking/tms380tr.txt> or
-          check <http://www.auk.cx/tms380tr/>.
-
-          To compile this driver as a module, choose M here: the module will be
-          called tms380tr.
-
-config TMSPCI
-        tristate "Generic TMS380 PCI support"
-        depends on TMS380TR && PCI
-        ---help---
-          This tms380 module supports generic TMS380-based PCI cards.
-
-          These cards are known to work:
-          - Compaq 4/16 TR PCI
-          - SysKonnect TR4/16 PCI (SK-4590/SK-4591)
-          - Thomas-Conrad TC4048 PCI 4/16
-          - 3Com Token Link Velocity
-
-          To compile this driver as a module, choose M here: the module will be
-          called tmspci.
-
-config SKISA
-        tristate "SysKonnect TR4/16 ISA support"
-        depends on TMS380TR && ISA
-        help
-          This tms380 module supports SysKonnect TR4/16 ISA cards.
-
-          These cards are known to work:
-          - SysKonnect TR4/16 ISA (SK-4190)
-
-          To compile this driver as a module, choose M here: the module will be
-          called skisa.
-
-config PROTEON
-        tristate "Proteon ISA support"
-        depends on TMS380TR && ISA
-        help
-          This tms380 module supports Proteon ISA cards.
-
-          These cards are known to work:
-          - Proteon 1392
-          - Proteon 1392 plus
-
-          To compile this driver as a module, choose M here: the module will be
-          called proteon.
-
-config ABYSS
-        tristate "Madge Smart 16/4 PCI Mk2 support"
-        depends on TMS380TR && PCI
-        help
-          This tms380 module supports the Madge Smart 16/4 PCI Mk2
-          cards (51-02).
-
-          To compile this driver as a module, choose M here: the module will be
-          called abyss.
-
-config MADGEMC
-        tristate "Madge Smart 16/4 Ringnode MicroChannel"
-        depends on TMS380TR && MCA
-        help
-          This tms380 module supports the Madge Smart 16/4 MC16 and MC32
-          MicroChannel adapters.
-
-          To compile this driver as a module, choose M here: the module will be
-          called madgemc.
-
-config SMCTR
-        tristate "SMC ISA/MCA adapter support"
-        depends on (ISA || MCA_LEGACY) && (BROKEN || !64BIT)
-        ---help---
-          This is support for the ISA and MCA SMC Token Ring cards,
-          specifically SMC TokenCard Elite (8115T) and SMC TokenCard Elite/A
-          (8115T/A) adapters.
-
-          If you have such an adapter and would like to use it, say Y or M and
-          read the Token-Ring mini-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto> and the file
-          <file:Documentation/networking/smctr.txt>.
-
-          To compile this driver as a module, choose M here: the module will be
-          called smctr.
-
-endif # TR
diff --git a/drivers/net/tokenring/Makefile b/drivers/net/tokenring/Makefile
deleted file mode 100644
index f1be8d97b7a8..000000000000
--- a/drivers/net/tokenring/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Makefile for drivers/net/tokenring
-#
-
-obj-$(CONFIG_PCMCIA_IBMTR)      += ibmtr_cs.o
-obj-$(CONFIG_IBMTR)     += ibmtr.o
-obj-$(CONFIG_IBMOL)     += olympic.o
-obj-$(CONFIG_IBMLS)     += lanstreamer.o
-obj-$(CONFIG_TMS380TR)  += tms380tr.o
-obj-$(CONFIG_ABYSS)     += abyss.o
-obj-$(CONFIG_MADGEMC)   += madgemc.o
-obj-$(CONFIG_PROTEON)   += proteon.o
-obj-$(CONFIG_TMSPCI)    += tmspci.o
-obj-$(CONFIG_SKISA)     += skisa.o
-obj-$(CONFIG_SMCTR)     += smctr.o
-obj-$(CONFIG_3C359)     += 3c359.o
diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
deleted file mode 100644
index b715e6b444da..000000000000
--- a/drivers/net/tokenring/abyss.c
+++ /dev/null
@@ -1,468 +0,0 @@
-/*
- *  abyss.c: Network driver for the Madge Smart 16/4 PCI Mk2 token ring card.
- *
- *  Written 1999-2000 by Adam Fritzler
- *
- *  This software may be used and distributed according to the terms
- *  of the GNU General Public License, incorporated herein by reference.
- *
- *  This driver module supports the following cards:
- *      - Madge Smart 16/4 PCI Mk2
- *
- *  Maintainer(s):
- *    AF        Adam Fritzler
- *
- *  Modification History:
- *      30-Dec-99       AF      Split off from the tms380tr driver.
- *      22-Jan-00       AF      Updated to use indirect read/writes 
- *      23-Nov-00       JG      New PCI API, cleanups
- *
- *
- *  TODO:
- *      1. See if we can use MMIO instead of inb/outb/inw/outw
- *      2. Add support for Mk1 (has AT24 attached to the PCI
- *              config registers)
- *
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/netdevice.h>
-#include <linux/trdevice.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-
-#include "tms380tr.h"
-#include "abyss.h"            /* Madge-specific constants */
-
-static char version[] __devinitdata =
-"abyss.c: v1.02 23/11/2000 by Adam Fritzler\n";
-
-#define ABYSS_IO_EXTENT 64
-
-static DEFINE_PCI_DEVICE_TABLE(abyss_pci_tbl) = {
-        { PCI_VENDOR_ID_MADGE, PCI_DEVICE_ID_MADGE_MK2,
-          PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_TOKEN_RING << 8, 0x00ffffff, },
-        { }                     /* Terminating entry */
-};
-MODULE_DEVICE_TABLE(pci, abyss_pci_tbl);
-
-MODULE_LICENSE("GPL");
-
-static int abyss_open(struct net_device *dev);
-static int abyss_close(struct net_device *dev);
-static void abyss_enable(struct net_device *dev);
-static int abyss_chipset_init(struct net_device *dev);
-static void abyss_read_eeprom(struct net_device *dev);
-static unsigned short abyss_setnselout_pins(struct net_device *dev);
-
-static void at24_writedatabyte(unsigned long regaddr, unsigned char byte);
-static int at24_sendfullcmd(unsigned long regaddr, unsigned char cmd, unsigned char addr);
-static int at24_sendcmd(unsigned long regaddr, unsigned char cmd);
-static unsigned char at24_readdatabit(unsigned long regaddr);
-static unsigned char at24_readdatabyte(unsigned long regaddr);
-static int at24_waitforack(unsigned long regaddr);
-static int at24_waitfornack(unsigned long regaddr);
-static void at24_setlines(unsigned long regaddr, unsigned char clock, unsigned char data);
-static void at24_start(unsigned long regaddr);
-static unsigned char at24_readb(unsigned long regaddr, unsigned char addr);
-
-static unsigned short abyss_sifreadb(struct net_device *dev, unsigned short reg)
-{
-        return inb(dev->base_addr + reg);
-}
-
-static unsigned short abyss_sifreadw(struct net_device *dev, unsigned short reg)
-{
-        return inw(dev->base_addr + reg);
-}
-
-static void abyss_sifwriteb(struct net_device *dev, unsigned short val, unsigned short reg)
-{
-        outb(val, dev->base_addr + reg);
-}
-
-static void abyss_sifwritew(struct net_device *dev, unsigned short val, unsigned short reg)
-{
-        outw(val, dev->base_addr + reg);
-}
-
-static struct net_device_ops abyss_netdev_ops;
-
-static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_id *ent)
-{       
-        static int versionprinted;
-        struct net_device *dev;
-        struct net_local *tp;
-        int ret, pci_irq_line;
-        unsigned long pci_ioaddr;
-        
-        if (versionprinted++ == 0)
-                printk("%s", version);
-
-        if (pci_enable_device(pdev))
-                return -EIO;
-
-        /* Remove I/O space marker in bit 0. */
-        pci_irq_line = pdev->irq;
-        pci_ioaddr = pci_resource_start (pdev, 0);
-                
-        /* At this point we have found a valid card. */
-                
-        dev = alloc_trdev(sizeof(struct net_local));
-        if (!dev)
-                return -ENOMEM;
-
-        if (!request_region(pci_ioaddr, ABYSS_IO_EXTENT, dev->name)) {
-                ret = -EBUSY;
-                goto err_out_trdev;
-        }
-                
-        ret = request_irq(pdev->irq, tms380tr_interrupt, IRQF_SHARED,
-                          dev->name, dev);
-        if (ret)
-                goto err_out_region;
-                
-        dev->base_addr  = pci_ioaddr;
-        dev->irq        = pci_irq_line;
-                
-        printk("%s: Madge Smart 16/4 PCI Mk2 (Abyss)\n", dev->name);
-        printk("%s:    IO: %#4lx  IRQ: %d\n",
-               dev->name, pci_ioaddr, dev->irq);
-        /*
-         * The TMS SIF registers lay 0x10 above the card base address.
-         */
-        dev->base_addr += 0x10;
-                
-        ret = tmsdev_init(dev, &pdev->dev);
-        if (ret) {
-                printk("%s: unable to get memory for dev->priv.\n", 
-                       dev->name);
-                goto err_out_irq;
-        }
-
-        abyss_read_eeprom(dev);
-
-        printk("%s:    Ring Station Address: %pM\n", dev->name, dev->dev_addr);
-
-        tp = netdev_priv(dev);
-        tp->setnselout = abyss_setnselout_pins;
-        tp->sifreadb = abyss_sifreadb;
-        tp->sifreadw = abyss_sifreadw;
-        tp->sifwriteb = abyss_sifwriteb;
-        tp->sifwritew = abyss_sifwritew;
-
-        memcpy(tp->ProductID, "Madge PCI 16/4 Mk2", PROD_ID_SIZE + 1);
-                
-        dev->netdev_ops = &abyss_netdev_ops;
-
-        pci_set_drvdata(pdev, dev);
-        SET_NETDEV_DEV(dev, &pdev->dev);
-
-        ret = register_netdev(dev);
-        if (ret)
-                goto err_out_tmsdev;
-        return 0;
-
-err_out_tmsdev:
-        pci_set_drvdata(pdev, NULL);
-        tmsdev_term(dev);
-err_out_irq:
-        free_irq(pdev->irq, dev);
-err_out_region:
-        release_region(pci_ioaddr, ABYSS_IO_EXTENT);
-err_out_trdev:
-        free_netdev(dev);
-        return ret;
-}
-
-static unsigned short abyss_setnselout_pins(struct net_device *dev)
-{
-        unsigned short val = 0;
-        struct net_local *tp = netdev_priv(dev);
-        
-        if(tp->DataRate == SPEED_4)
-                val |= 0x01;  /* Set 4Mbps */
-        else
-                val |= 0x00;  /* Set 16Mbps */
-        
-        return val;
-}
-
-/*
- * The following Madge boards should use this code:
- *   - Smart 16/4 PCI Mk2 (Abyss)
- *   - Smart 16/4 PCI Mk1 (PCI T)
- *   - Smart 16/4 Client Plus PnP (Big Apple)
- *   - Smart 16/4 Cardbus Mk2
- *
- * These access an Atmel AT24 SEEPROM using their glue chip registers. 
- *
- */
-static void at24_writedatabyte(unsigned long regaddr, unsigned char byte)
-{
-        int i;
-        
-        for (i = 0; i < 8; i++) {
-                at24_setlines(regaddr, 0, (byte >> (7-i))&0x01);
-                at24_setlines(regaddr, 1, (byte >> (7-i))&0x01);
-                at24_setlines(regaddr, 0, (byte >> (7-i))&0x01);
-        }
-}
-
-static int at24_sendfullcmd(unsigned long regaddr, unsigned char cmd, unsigned char addr)
-{
-        if (at24_sendcmd(regaddr, cmd)) {
-                at24_writedatabyte(regaddr, addr);
-                return at24_waitforack(regaddr);
-        }
-        return 0;
-}
-
-static int at24_sendcmd(unsigned long regaddr, unsigned char cmd)
-{
-        int i;
-        
-        for (i = 0; i < 10; i++) {
-                at24_start(regaddr);
-                at24_writedatabyte(regaddr, cmd);
-                if (at24_waitforack(regaddr))
-                        return 1;
-        }
-        return 0;
-}
-
-static unsigned char at24_readdatabit(unsigned long regaddr)
-{
-        unsigned char val;
-
-        at24_setlines(regaddr, 0, 1);
-        at24_setlines(regaddr, 1, 1);
-        val = (inb(regaddr) & AT24_DATA)?1:0;
-        at24_setlines(regaddr, 1, 1);
-        at24_setlines(regaddr, 0, 1);
-        return val;
-}
-
-static unsigned char at24_readdatabyte(unsigned long regaddr)
-{
-        unsigned char data = 0;
-        int i;
-        
-        for (i = 0; i < 8; i++) {
-                data <<= 1;
-                data |= at24_readdatabit(regaddr);
-        }
-
-        return data;
-}
-
-static int at24_waitforack(unsigned long regaddr)
-{
-        int i;
-        
-        for (i = 0; i < 10; i++) {
-                if ((at24_readdatabit(regaddr) & 0x01) == 0x00)
-                        return 1;
-        }
-        return 0;
-}
-
-static int at24_waitfornack(unsigned long regaddr)
-{
-        int i;
-        for (i = 0; i < 10; i++) {
-                if ((at24_readdatabit(regaddr) & 0x01) == 0x01)
-                        return 1;
-        }
-        return 0;
-}
-
-static void at24_setlines(unsigned long regaddr, unsigned char clock, unsigned char data)
-{
-        unsigned char val = AT24_ENABLE;
-        if (clock)
-                val |= AT24_CLOCK;
-        if (data)
-                val |= AT24_DATA;
-
-        outb(val, regaddr); 
-        tms380tr_wait(20); /* Very necessary. */
-}
-
-static void at24_start(unsigned long regaddr)
-{
-        at24_setlines(regaddr, 0, 1);
-        at24_setlines(regaddr, 1, 1);
-        at24_setlines(regaddr, 1, 0);
-        at24_setlines(regaddr, 0, 1);
-}
-
-static unsigned char at24_readb(unsigned long regaddr, unsigned char addr)
-{
-        unsigned char data = 0xff;
-        
-        if (at24_sendfullcmd(regaddr, AT24_WRITE, addr)) {
-                if (at24_sendcmd(regaddr, AT24_READ)) {
-                        data = at24_readdatabyte(regaddr);
-                        if (!at24_waitfornack(regaddr))
-                                data = 0xff;
-                }
-        }
-        return data;
-}
-
-
-/*
- * Enable basic functions of the Madge chipset needed
- * for initialization.
- */
-static void abyss_enable(struct net_device *dev)
-{
-        unsigned char reset_reg;
-        unsigned long ioaddr;
-        
-        ioaddr = dev->base_addr;
-        reset_reg = inb(ioaddr + PCIBM2_RESET_REG);
-        reset_reg |= PCIBM2_RESET_REG_CHIP_NRES;
-        outb(reset_reg, ioaddr + PCIBM2_RESET_REG);
-        tms380tr_wait(100);
-}
-
-/*
- * Enable the functions of the Madge chipset needed for
- * full working order. 
- */
-static int abyss_chipset_init(struct net_device *dev)
-{
-        unsigned char reset_reg;
-        unsigned long ioaddr;
-        
-        ioaddr = dev->base_addr;
-        
-        reset_reg = inb(ioaddr + PCIBM2_RESET_REG);
-        
-        reset_reg |= PCIBM2_RESET_REG_CHIP_NRES;
-        outb(reset_reg, ioaddr + PCIBM2_RESET_REG);
-        
-        reset_reg &= ~(PCIBM2_RESET_REG_CHIP_NRES |
-                       PCIBM2_RESET_REG_FIFO_NRES | 
-                       PCIBM2_RESET_REG_SIF_NRES);
-        outb(reset_reg, ioaddr + PCIBM2_RESET_REG);
-        
-        tms380tr_wait(100);
-        
-        reset_reg |= PCIBM2_RESET_REG_CHIP_NRES;
-        outb(reset_reg, ioaddr + PCIBM2_RESET_REG);
-        
-        reset_reg |= PCIBM2_RESET_REG_SIF_NRES;
-        outb(reset_reg, ioaddr + PCIBM2_RESET_REG);
-
-        reset_reg |= PCIBM2_RESET_REG_FIFO_NRES;
-        outb(reset_reg, ioaddr + PCIBM2_RESET_REG);
-
-        outb(PCIBM2_INT_CONTROL_REG_SINTEN | 
-             PCIBM2_INT_CONTROL_REG_PCI_ERR_ENABLE, 
-             ioaddr + PCIBM2_INT_CONTROL_REG);
-  
-        outb(30, ioaddr + PCIBM2_FIFO_THRESHOLD);
-        
-        return 0;
-}
-
-static inline void abyss_chipset_close(struct net_device *dev)
-{
-        unsigned long ioaddr;
-        
-        ioaddr = dev->base_addr;
-        outb(0, ioaddr + PCIBM2_RESET_REG);
-}
-
-/*
- * Read configuration data from the AT24 SEEPROM on Madge cards.
- *
- */
-static void abyss_read_eeprom(struct net_device *dev)
-{
-        struct net_local *tp;
-        unsigned long ioaddr;
-        unsigned short val;
-        int i;
-        
-        tp = netdev_priv(dev);
-        ioaddr = dev->base_addr;
-        
-        /* Must enable glue chip first */
-        abyss_enable(dev);
-        
-        val = at24_readb(ioaddr + PCIBM2_SEEPROM_REG, 
-                         PCIBM2_SEEPROM_RING_SPEED);
-        tp->DataRate = val?SPEED_4:SPEED_16; /* set open speed */
-        printk("%s:    SEEPROM: ring speed: %dMb/sec\n", dev->name, tp->DataRate);
-        
-        val = at24_readb(ioaddr + PCIBM2_SEEPROM_REG,
-                         PCIBM2_SEEPROM_RAM_SIZE) * 128;
-        printk("%s:    SEEPROM: adapter RAM: %dkb\n", dev->name, val);
-        
-        dev->addr_len = 6;
-        for (i = 0; i < 6; i++) 
-                dev->dev_addr[i] = at24_readb(ioaddr + PCIBM2_SEEPROM_REG, 
-                                              PCIBM2_SEEPROM_BIA+i);
-}
-
-static int abyss_open(struct net_device *dev)
-{  
-        abyss_chipset_init(dev);
-        tms380tr_open(dev);
-        return 0;
-}
-
-static int abyss_close(struct net_device *dev)
-{
-        tms380tr_close(dev);
-        abyss_chipset_close(dev);
-        return 0;
-}
-
-static void __devexit abyss_detach (struct pci_dev *pdev)
-{
-        struct net_device *dev = pci_get_drvdata(pdev);
-        
-        BUG_ON(!dev);
-        unregister_netdev(dev);
-        release_region(dev->base_addr-0x10, ABYSS_IO_EXTENT);
-        free_irq(dev->irq, dev);
-        tmsdev_term(dev);
-        free_netdev(dev);
-        pci_set_drvdata(pdev, NULL);
-}
-
-static struct pci_driver abyss_driver = {
-        .name           = "abyss",
-        .id_table       = abyss_pci_tbl,
-        .probe          = abyss_attach,
-        .remove         = __devexit_p(abyss_detach),
-};
-
-static int __init abyss_init (void)
-{
-        abyss_netdev_ops = tms380tr_netdev_ops;
-
-        abyss_netdev_ops.ndo_open = abyss_open;
-        abyss_netdev_ops.ndo_stop = abyss_close;
-
-        return pci_register_driver(&abyss_driver);
-}
-
-static void __exit abyss_rmmod (void)
-{
-        pci_unregister_driver (&abyss_driver);
-}
-
-module_init(abyss_init);
-module_exit(abyss_rmmod);
-
diff --git a/drivers/net/tokenring/abyss.h b/drivers/net/tokenring/abyss.h
deleted file mode 100644
index b0a473b89133..000000000000
--- a/drivers/net/tokenring/abyss.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* 
- * abyss.h: Header for the abyss tms380tr module
- *
- * Authors:
- * - Adam Fritzler
- */
-
-#ifndef __LINUX_MADGETR_H
-#define __LINUX_MADGETR_H
-
-#ifdef __KERNEL__
-
-/*
- * For Madge Smart 16/4 PCI Mk2.  Since we increment the base address
- * to get everything correct for the TMS SIF, we do these as negatives
- * as they fall below the SIF in addressing.
- */
-#define PCIBM2_INT_STATUS_REG          ((short)-15)/* 0x01 */
-#define PCIBM2_INT_CONTROL_REG         ((short)-14)/* 0x02 */
-#define PCIBM2_RESET_REG               ((short)-12)/* 0x04 */
-#define PCIBM2_SEEPROM_REG             ((short)-9) /* 0x07 */
-
-#define PCIBM2_INT_CONTROL_REG_SINTEN           0x02
-#define PCIBM2_INT_CONTROL_REG_PCI_ERR_ENABLE   0x80
-#define PCIBM2_INT_STATUS_REG_PCI_ERR           0x80
-
-#define PCIBM2_RESET_REG_CHIP_NRES              0x01
-#define PCIBM2_RESET_REG_FIFO_NRES              0x02
-#define PCIBM2_RESET_REG_SIF_NRES               0x04
-
-#define PCIBM2_FIFO_THRESHOLD   0x21
-#define PCIBM2_BURST_LENGTH     0x22
-
-/*
- * Bits in PCIBM2_SEEPROM_REG.
- */
-#define AT24_ENABLE             0x04
-#define AT24_DATA               0x02
-#define AT24_CLOCK              0x01
-
-/*
- * AT24 Commands.
- */
-#define AT24_WRITE              0xA0
-#define AT24_READ               0xA1
-
-/*
- * Addresses in AT24 SEEPROM.
- */
-#define PCIBM2_SEEPROM_BIA          0x12
-#define PCIBM2_SEEPROM_RING_SPEED   0x18
-#define PCIBM2_SEEPROM_RAM_SIZE     0x1A
-#define PCIBM2_SEEPROM_HWF1         0x1C
-#define PCIBM2_SEEPROM_HWF2         0x1E
-
-
-#endif /* __KERNEL__ */
-#endif /* __LINUX_MADGETR_H */
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
deleted file mode 100644
index b5c8c18f5046..000000000000
--- a/drivers/net/tokenring/ibmtr.c
+++ /dev/null
@@ -1,1964 +0,0 @@
-/* ibmtr.c:  A shared-memory IBM Token Ring 16/4 driver for linux
- *
- *      Written 1993 by Mark Swanson and Peter De Schrijver.
- *      This software may be used and distributed according to the terms
- *      of the GNU General Public License, incorporated herein by reference.
- *
- *      This device driver should work with Any IBM Token Ring Card that does
- *      not use DMA.
- *
- *      I used Donald Becker's (becker@scyld.com) device driver work
- *      as a base for most of my initial work.
- *
- *      Changes by Peter De Schrijver
- *              (Peter.Deschrijver@linux.cc.kuleuven.ac.be) :
- *
- *      + changed name to ibmtr.c in anticipation of other tr boards.
- *      + changed reset code and adapter open code.
- *      + added SAP open code.
- *      + a first attempt to write interrupt, transmit and receive routines.
- *
- *      Changes by David W. Morris (dwm@shell.portal.com) :
- *      941003 dwm: - Restructure tok_probe for multiple adapters, devices.
- *      + Add comments, misc reorg for clarity.
- *      + Flatten interrupt handler levels.
- *
- *      Changes by Farzad Farid (farzy@zen.via.ecp.fr)
- *      and Pascal Andre (andre@chimay.via.ecp.fr) (March 9 1995) :
- *      + multi ring support clean up.
- *      + RFC1042 compliance enhanced.
- *
- *      Changes by Pascal Andre (andre@chimay.via.ecp.fr) (September 7 1995) :
- *      + bug correction in tr_tx
- *      + removed redundant information display
- *      + some code reworking
- *
- *      Changes by Michel Lespinasse (walken@via.ecp.fr),
- *      Yann Doussot (doussot@via.ecp.fr) and Pascal Andre (andre@via.ecp.fr)
- *      (February 18, 1996) :
- *      + modified shared memory and mmio access port the driver to
- *        alpha platform (structure access -> readb/writeb)
- *
- *      Changes by Steve Kipisz (bungy@ibm.net or kipisz@vnet.ibm.com)
- *      (January 18 1996):
- *      + swapped WWOR and WWCR in ibmtr.h
- *      + moved some init code from tok_probe into trdev_init.  The
- *        PCMCIA code can call trdev_init to complete initializing
- *        the driver.
- *      + added -DPCMCIA to support PCMCIA
- *      + detecting PCMCIA Card Removal in interrupt handler.  If
- *        ISRP is FF, then a PCMCIA card has been removed
- *        10/2000 Burt needed a new method to avoid crashing the OS
- *
- *      Changes by Paul Norton (pnorton@cts.com) :
- *      + restructured the READ.LOG logic to prevent the transmit SRB
- *        from being rudely overwritten before the transmit cycle is
- *        complete. (August 15 1996)
- *      + completed multiple adapter support. (November 20 1996)
- *      + implemented csum_partial_copy in tr_rx and increased receive 
- *        buffer size and count. Minor fixes. (March 15, 1997)
- *
- *      Changes by Christopher Turcksin <wabbit@rtfc.demon.co.uk>
- *      + Now compiles ok as a module again.
- *
- *      Changes by Paul Norton (pnorton@ieee.org) :
- *      + moved the header manipulation code in tr_tx and tr_rx to
- *        net/802/tr.c. (July 12 1997)
- *      + add retry and timeout on open if cable disconnected. (May 5 1998)
- *      + lifted 2000 byte mtu limit. now depends on shared-RAM size.
- *        May 25 1998)
- *      + can't allocate 2k recv buff at 8k shared-RAM. (20 October 1998)
- *
- *      Changes by Joel Sloan (jjs@c-me.com) :
- *      + disable verbose debug messages by default - to enable verbose
- *        debugging, edit the IBMTR_DEBUG_MESSAGES define below 
- *      
- *      Changes by Mike Phillips <phillim@amtrak.com> :
- *      + Added extra #ifdef's to work with new PCMCIA Token Ring Code.
- *        The PCMCIA code now just sets up the card so it can be recognized
- *        by ibmtr_probe. Also checks allocated memory vs. on-board memory
- *        for correct figure to use.
- *
- *      Changes by Tim Hockin (thockin@isunix.it.ilstu.edu) :
- *      + added spinlocks for SMP sanity (10 March 1999)
- *
- *      Changes by Jochen Friedrich to enable RFC1469 Option 2 multicasting
- *      i.e. using functional address C0 00 00 04 00 00 to transmit and 
- *      receive multicast packets.
- *
- *      Changes by Mike Sullivan (based on original sram patch by Dave Grothe
- *      to support windowing into on adapter shared ram.
- *      i.e. Use LANAID to setup a PnP configuration with 16K RAM. Paging
- *      will shift this 16K window over the entire available shared RAM.
- *
- *      Changes by Peter De Schrijver (p2@mind.be) :
- *      + fixed a problem with PCMCIA card removal
- *
- *      Change by Mike Sullivan et al.:
- *      + added turbo card support. No need to use lanaid to configure
- *      the adapter into isa compatibility mode.
- *
- *      Changes by Burt Silverman to allow the computer to behave nicely when
- *      a cable is pulled or not in place, or a PCMCIA card is removed hot.
- */
-
-/* change the define of IBMTR_DEBUG_MESSAGES to a nonzero value 
-in the event that chatty debug messages are desired - jjs 12/30/98 */
-
-#define IBMTR_DEBUG_MESSAGES 0
-
-#include <linux/module.h>
-#include <linux/sched.h>
-
-#ifdef PCMCIA           /* required for ibmtr_cs.c to build */
-#undef MODULE           /* yes, really */
-#undef ENABLE_PAGING
-#else
-#define ENABLE_PAGING 1         
-#endif
-
-/* changes the output format of driver initialization */
-#define TR_VERBOSE      0
-
-/* some 95 OS send many non UI frame; this allow removing the warning */
-#define TR_FILTERNONUI  1
-
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/netdevice.h>
-#include <linux/ip.h>
-#include <linux/trdevice.h>
-#include <linux/ibmtr.h>
-
-#include <net/checksum.h>
-
-#include <asm/io.h>
-
-#define DPRINTK(format, args...) printk("%s: " format, dev->name , ## args)
-#define DPRINTD(format, args...) DummyCall("%s: " format, dev->name , ## args)
-
-/* version and credits */
-#ifndef PCMCIA
-static char version[] __devinitdata =
-    "\nibmtr.c: v1.3.57   8/ 7/94 Peter De Schrijver and Mark Swanson\n"
-    "         v2.1.125 10/20/98 Paul Norton    <pnorton@ieee.org>\n"
-    "         v2.2.0   12/30/98 Joel Sloan     <jjs@c-me.com>\n"
-    "         v2.2.1   02/08/00 Mike Sullivan  <sullivam@us.ibm.com>\n" 
-    "         v2.2.2   07/27/00 Burt Silverman <burts@us.ibm.com>\n" 
-    "         v2.4.0   03/01/01 Mike Sullivan <sullivan@us.ibm.com>\n";
-#endif
-
-/* this allows displaying full adapter information */
-
-static char *channel_def[] __devinitdata = { "ISA", "MCA", "ISA P&P" };
-
-static char pcchannelid[] __devinitdata = {
-        0x05, 0x00, 0x04, 0x09,
-        0x04, 0x03, 0x04, 0x0f,
-        0x03, 0x06, 0x03, 0x01,
-        0x03, 0x01, 0x03, 0x00,
-        0x03, 0x09, 0x03, 0x09,
-        0x03, 0x00, 0x02, 0x00
-};
-
-static char mcchannelid[] __devinitdata =  {
-        0x04, 0x0d, 0x04, 0x01,
-        0x05, 0x02, 0x05, 0x03,
-        0x03, 0x06, 0x03, 0x03,
-        0x05, 0x08, 0x03, 0x04,
-        0x03, 0x05, 0x03, 0x01,
-        0x03, 0x08, 0x02, 0x00
-};
-
-static char __devinit *adapter_def(char type)
-{
-        switch (type) {
-        case 0xF: return "PC Adapter | PC Adapter II | Adapter/A";
-        case 0xE: return "16/4 Adapter | 16/4 Adapter/A (long)";
-        case 0xD: return "16/4 Adapter/A (short) | 16/4 ISA-16 Adapter";
-        case 0xC: return "Auto 16/4 Adapter";
-        default: return "adapter (unknown type)";
-        }
-};
-
-#define TRC_INIT 0x01           /*  Trace initialization & PROBEs */
-#define TRC_INITV 0x02          /*  verbose init trace points     */
-static unsigned char ibmtr_debug_trace = 0;
-
-static int      ibmtr_probe1(struct net_device *dev, int ioaddr);
-static unsigned char get_sram_size(struct tok_info *adapt_info);
-static int      trdev_init(struct net_device *dev);
-static int      tok_open(struct net_device *dev);
-static int      tok_init_card(struct net_device *dev);
-static void     tok_open_adapter(unsigned long dev_addr);
-static void     open_sap(unsigned char type, struct net_device *dev);
-static void     tok_set_multicast_list(struct net_device *dev);
-static netdev_tx_t tok_send_packet(struct sk_buff *skb,
-                                         struct net_device *dev);
-static int      tok_close(struct net_device *dev);
-static irqreturn_t tok_interrupt(int irq, void *dev_id);
-static void     initial_tok_int(struct net_device *dev);
-static void     tr_tx(struct net_device *dev);
-static void     tr_rx(struct net_device *dev);
-static void     ibmtr_reset_timer(struct timer_list*tmr,struct net_device *dev);
-static void     tok_rerun(unsigned long dev_addr);
-static void     ibmtr_readlog(struct net_device *dev);
-static int      ibmtr_change_mtu(struct net_device *dev, int mtu);
-static void     find_turbo_adapters(int *iolist);
-
-static int ibmtr_portlist[IBMTR_MAX_ADAPTERS+1] __devinitdata = {
-        0xa20, 0xa24, 0, 0, 0
-};
-static int __devinitdata turbo_io[IBMTR_MAX_ADAPTERS] = {0};
-static int __devinitdata turbo_irq[IBMTR_MAX_ADAPTERS] = {0};
-static int __devinitdata turbo_searched = 0;
-
-#ifndef PCMCIA
-static __u32 ibmtr_mem_base __devinitdata = 0xd0000;
-#endif
-
-static void __devinit PrtChanID(char *pcid, short stride)
-{
-        short i, j;
-        for (i = 0, j = 0; i < 24; i++, j += stride)
-                printk("%1x", ((int) pcid[j]) & 0x0f);
-        printk("\n");
-}
-
-static void __devinit HWPrtChanID(void __iomem *pcid, short stride)
-{
-        short i, j;
-        for (i = 0, j = 0; i < 24; i++, j += stride)
-                printk("%1x", ((int) readb(pcid + j)) & 0x0f);
-        printk("\n");
-}
-
-/* We have to ioremap every checked address, because isa_readb is 
- * going away. 
- */
-
-static void __devinit find_turbo_adapters(int *iolist)
-{
-        int ram_addr;
-        int index=0;
-        void __iomem *chanid;
-        int found_turbo=0;
-        unsigned char *tchanid, ctemp;
-        int i, j;
-        unsigned long jif;
-        void __iomem *ram_mapped ;   
-
-        if (turbo_searched == 1) return;
-        turbo_searched=1;
-        for (ram_addr=0xC0000; ram_addr < 0xE0000; ram_addr+=0x2000) {
-
-                __u32 intf_tbl=0;
-
-                found_turbo=1;
-                ram_mapped = ioremap((u32)ram_addr,0x1fff) ; 
-                if (ram_mapped==NULL) 
-                        continue ; 
-                chanid=(CHANNEL_ID + ram_mapped);
-                tchanid=pcchannelid;
-                ctemp=readb(chanid) & 0x0f;
-                if (ctemp != *tchanid) continue;
-                for (i=2,j=1; i<=46; i=i+2,j++) {
-                        if ((readb(chanid+i) & 0x0f) != tchanid[j]){
-                                found_turbo=0;
-                                break;
-                        }
-                }
-                if (!found_turbo) continue;
-
-                writeb(0x90, ram_mapped+0x1E01);
-                for(i=2; i<0x0f; i++) {
-                        writeb(0x00, ram_mapped+0x1E01+i);
-                }
-                writeb(0x00, ram_mapped+0x1E01);
-                for(jif=jiffies+TR_BUSY_INTERVAL; time_before_eq(jiffies,jif););
-                intf_tbl=ntohs(readw(ram_mapped+ACA_OFFSET+ACA_RW+WRBR_EVEN));
-                if (intf_tbl) {
-#if IBMTR_DEBUG_MESSAGES
-                        printk("ibmtr::find_turbo_adapters, Turbo found at "
-                                "ram_addr %x\n",ram_addr);
-                        printk("ibmtr::find_turbo_adapters, interface_table ");
-                        for(i=0; i<6; i++) {
-                                printk("%x:",readb(ram_addr+intf_tbl+i));
-                        }
-                        printk("\n");
-#endif
-                        turbo_io[index]=ntohs(readw(ram_mapped+intf_tbl+4));
-                        turbo_irq[index]=readb(ram_mapped+intf_tbl+3);
-                        outb(0, turbo_io[index] + ADAPTRESET);
-                        for(jif=jiffies+TR_RST_TIME;time_before_eq(jiffies,jif););
-                        outb(0, turbo_io[index] + ADAPTRESETREL);
-                        index++;
-                        continue;
-                }
-#if IBMTR_DEBUG_MESSAGES 
-                printk("ibmtr::find_turbo_adapters, ibmtr card found at"
-                        " %x but not a Turbo model\n",ram_addr);
-#endif
-        iounmap(ram_mapped) ;   
-        } /* for */
-        for(i=0; i<IBMTR_MAX_ADAPTERS; i++) {
-                if(!turbo_io[i]) break;
-                for (j=0; j<IBMTR_MAX_ADAPTERS; j++) {
-                        if ( iolist[j] && iolist[j] != turbo_io[i]) continue;
-                        iolist[j]=turbo_io[i];
-                        break;
-                }
-        }
-}
-
-static void ibmtr_cleanup_card(struct net_device *dev)
-{
-        if (dev->base_addr) {
-                outb(0,dev->base_addr+ADAPTRESET);
-                
-                schedule_timeout_uninterruptible(TR_RST_TIME); /* wait 50ms */
-
-                outb(0,dev->base_addr+ADAPTRESETREL);
-        }
-
-#ifndef PCMCIA
-        free_irq(dev->irq, dev);
-        release_region(dev->base_addr, IBMTR_IO_EXTENT);
-
-        { 
-                struct tok_info *ti = netdev_priv(dev);
-                iounmap(ti->mmio);
-                iounmap(ti->sram_virt);
-        }
-#endif          
-}
-
-/****************************************************************************
- *      ibmtr_probe():  Routine specified in the network device structure
- *      to probe for an IBM Token Ring Adapter.  Routine outline:
- *      I.    Interrogate hardware to determine if an adapter exists
- *            and what the speeds and feeds are
- *      II.   Setup data structures to control execution based upon
- *            adapter characteristics.
- *
- *      We expect ibmtr_probe to be called once for each device entry
- *      which references it.
- ****************************************************************************/
-
-static int __devinit ibmtr_probe(struct net_device *dev)
-{
-        int i;
-        int base_addr = dev->base_addr;
-
-        if (base_addr && base_addr <= 0x1ff) /* Don't probe at all. */
-                return -ENXIO;
-        if (base_addr > 0x1ff) { /* Check a single specified location.  */
-                if (!ibmtr_probe1(dev, base_addr)) return 0;
-                return -ENODEV;
-        }
-        find_turbo_adapters(ibmtr_portlist);
-        for (i = 0; ibmtr_portlist[i]; i++) {
-                int ioaddr = ibmtr_portlist[i];
-
-                if (!ibmtr_probe1(dev, ioaddr)) return 0;
-        }
-        return -ENODEV;
-}
-
-int __devinit ibmtr_probe_card(struct net_device *dev)
-{
-        int err = ibmtr_probe(dev);
-        if (!err) {
-                err = register_netdev(dev);
-                if (err)
-                        ibmtr_cleanup_card(dev);
-        }
-        return err;
-}
-
-/*****************************************************************************/
-
-static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr)
-{
-
-        unsigned char segment, intr=0, irq=0, i, j, cardpresent=NOTOK, temp=0;
-        void __iomem * t_mmio = NULL;
-        struct tok_info *ti = netdev_priv(dev);
-        void __iomem *cd_chanid;
-        unsigned char *tchanid, ctemp;
-#ifndef PCMCIA
-        unsigned char t_irq=0;
-        unsigned long timeout;
-        static int version_printed;
-#endif
-
-        /*    Query the adapter PIO base port which will return
-         *    indication of where MMIO was placed. We also have a
-         *    coded interrupt number.
-         */
-        segment = inb(PIOaddr);
-        if (segment < 0x40 || segment > 0xe0) {
-                /* Out of range values so we'll assume non-existent IO device
-                 * but this is not necessarily a problem, esp if a turbo
-                 * adapter is being used.  */
-#if IBMTR_DEBUG_MESSAGES
-                DPRINTK("ibmtr_probe1(): unhappy that inb(0x%X) == 0x%X, "
-                        "Hardware Problem?\n",PIOaddr,segment);
-#endif
-                return -ENODEV;
-        }
-        /*
-         *    Compute the linear base address of the MMIO area
-         *    as LINUX doesn't care about segments
-         */
-        t_mmio = ioremap(((__u32) (segment & 0xfc) << 11) + 0x80000,2048);
-        if (!t_mmio) { 
-                DPRINTK("Cannot remap mmiobase memory area") ; 
-                return -ENODEV ; 
-        } 
-        intr = segment & 0x03;  /* low bits is coded interrupt # */
-        if (ibmtr_debug_trace & TRC_INIT)
-                DPRINTK("PIOaddr: %4hx seg/intr: %2x mmio base: %p intr: %d\n"
-                                , PIOaddr, (int) segment, t_mmio, (int) intr);
-
-        /*
-         *    Now we will compare expected 'channelid' strings with
-         *    what we is there to learn of ISA/MCA or not TR card
-         */
-#ifdef PCMCIA
-        iounmap(t_mmio);
-        t_mmio = ti->mmio;      /*BMS to get virtual address */
-        irq = ti->irq;          /*BMS to display the irq!   */
-#endif
-        cd_chanid = (CHANNEL_ID + t_mmio);      /* for efficiency */
-        tchanid = pcchannelid;
-        cardpresent = TR_ISA;   /* try ISA */
-
-        /*    Suboptimize knowing first byte different */
-        ctemp = readb(cd_chanid) & 0x0f;
-        if (ctemp != *tchanid) {        /* NOT ISA card, try MCA */
-                tchanid = mcchannelid;
-                cardpresent = TR_MCA;
-                if (ctemp != *tchanid)  /* Neither ISA nor MCA */
-                        cardpresent = NOTOK;
-        }
-        if (cardpresent != NOTOK) {
-                /*       Know presumed type, try rest of ID */
-                for (i = 2, j = 1; i <= 46; i = i + 2, j++) {
-                        if( (readb(cd_chanid+i)&0x0f) == tchanid[j]) continue;
-                        /* match failed, not TR card */
-                        cardpresent = NOTOK;
-                        break;
-                }
-        }
-        /* 
-         *    If we have an ISA board check for the ISA P&P version,
-         *    as it has different IRQ settings 
-         */
-        if (cardpresent == TR_ISA && (readb(AIPFID + t_mmio) == 0x0e))
-                cardpresent = TR_ISAPNP;
-        if (cardpresent == NOTOK) {     /* "channel_id" did not match, report */
-                if (!(ibmtr_debug_trace & TRC_INIT)) {
-#ifndef PCMCIA
-                        iounmap(t_mmio);
-#endif
-                        return -ENODEV;
-                }
-                DPRINTK( "Channel ID string not found for PIOaddr: %4hx\n",
-                                                                PIOaddr);
-                DPRINTK("Expected for ISA: ");
-                PrtChanID(pcchannelid, 1);
-                DPRINTK("           found: ");
-/* BMS Note that this can be misleading, when hardware is flaky, because you
-   are reading it a second time here. So with my flaky hardware, I'll see my-
-   self in this block, with the HW ID matching the ISA ID exactly! */
-                HWPrtChanID(cd_chanid, 2);
-                DPRINTK("Expected for MCA: ");
-                PrtChanID(mcchannelid, 1);
-        }
-        /* Now, setup some of the pl0 buffers for this driver.. */
-        /* If called from PCMCIA, it is already set up, so no need to 
-           waste the memory, just use the existing structure */
-#ifndef PCMCIA
-        ti->mmio = t_mmio;
-        for (i = 0; i < IBMTR_MAX_ADAPTERS; i++) {
-                if (turbo_io[i] != PIOaddr)
-                        continue;
-#if IBMTR_DEBUG_MESSAGES 
-                printk("ibmtr::tr_probe1, setting PIOaddr %x to Turbo\n",
-                       PIOaddr);
-#endif
-                ti->turbo = 1;
-                t_irq = turbo_irq[i];
-        }
-#endif /* !PCMCIA */
-        ti->readlog_pending = 0;
-        init_waitqueue_head(&ti->wait_for_reset);
-
-        /* if PCMCIA, the card can be recognized as either TR_ISA or TR_ISAPNP
-         * depending which card is inserted.    */
-        
-#ifndef PCMCIA
-        switch (cardpresent) {
-        case TR_ISA:
-                if (intr == 0) irq = 9; /* irq2 really is irq9 */
-                if (intr == 1) irq = 3;
-                if (intr == 2) irq = 6;
-                if (intr == 3) irq = 7;
-                ti->adapter_int_enable = PIOaddr + ADAPTINTREL;
-                break;
-        case TR_MCA:
-                if (intr == 0) irq = 9;
-                if (intr == 1) irq = 3;
-                if (intr == 2) irq = 10;
-                if (intr == 3) irq = 11;
-                ti->global_int_enable = 0;
-                ti->adapter_int_enable = 0;
-                ti->sram_phys=(__u32)(inb(PIOaddr+ADAPTRESETREL) & 0xfe) << 12;
-                break;
-        case TR_ISAPNP:
-                if (!t_irq) {
-                        if (intr == 0) irq = 9;
-                        if (intr == 1) irq = 3;
-                        if (intr == 2) irq = 10;
-                        if (intr == 3) irq = 11;
-                } else
-                        irq=t_irq;
-                timeout = jiffies + TR_SPIN_INTERVAL;
-                while (!readb(ti->mmio + ACA_OFFSET + ACA_RW + RRR_EVEN)){
-                        if (!time_after(jiffies, timeout)) continue;
-                        DPRINTK( "Hardware timeout during initialization.\n");
-                        iounmap(t_mmio);
-                        return -ENODEV;
-                }
-                ti->sram_phys =
-                     ((__u32)readb(ti->mmio+ACA_OFFSET+ACA_RW+RRR_EVEN)<<12);
-                ti->adapter_int_enable = PIOaddr + ADAPTINTREL;
-                break;
-        } /*end switch (cardpresent) */
-#endif  /*not PCMCIA */
-
-        if (ibmtr_debug_trace & TRC_INIT) {     /* just report int */
-                DPRINTK("irq=%d", irq);
-                printk(", sram_phys=0x%x", ti->sram_phys);
-                if(ibmtr_debug_trace&TRC_INITV){ /* full chat in verbose only */
-                        DPRINTK(", ti->mmio=%p", ti->mmio);
-                        printk(", segment=%02X", segment);
-                }
-                printk(".\n");
-        }
-
-        /* Get hw address of token ring card */
-        j = 0;
-        for (i = 0; i < 0x18; i = i + 2) {
-                /* technical reference states to do this */
-                temp = readb(ti->mmio + AIP + i) & 0x0f;
-                ti->hw_address[j] = temp;
-                if (j & 1)
-                        dev->dev_addr[(j / 2)] =
-                                ti->hw_address[j]+ (ti->hw_address[j - 1] << 4);
-                ++j;
-        }
-        /* get Adapter type:  'F' = Adapter/A, 'E' = 16/4 Adapter II,... */
-        ti->adapter_type = readb(ti->mmio + AIPADAPTYPE);
-
-        /* get Data Rate:  F=4Mb, E=16Mb, D=4Mb & 16Mb ?? */
-        ti->data_rate = readb(ti->mmio + AIPDATARATE);
-
-        /* Get Early Token Release support?: F=no, E=4Mb, D=16Mb, C=4&16Mb */
-        ti->token_release = readb(ti->mmio + AIPEARLYTOKEN);
-
-        /* How much shared RAM is on adapter ? */
-        if (ti->turbo) {
-                ti->avail_shared_ram=127;
-        } else {
-                ti->avail_shared_ram = get_sram_size(ti);/*in 512 byte units */
-        }
-        /* We need to set or do a bunch of work here based on previous results*/
-        /* Support paging?  What sizes?:  F=no, E=16k, D=32k, C=16 & 32k */
-        ti->shared_ram_paging = readb(ti->mmio + AIPSHRAMPAGE);
-
-        /* Available DHB  4Mb size:   F=2048, E=4096, D=4464 */
-        switch (readb(ti->mmio + AIP4MBDHB)) {
-        case 0xe: ti->dhb_size4mb = 4096; break;
-        case 0xd: ti->dhb_size4mb = 4464; break;
-        default:  ti->dhb_size4mb = 2048; break;
-        }
-
-        /* Available DHB 16Mb size:  F=2048, E=4096, D=8192, C=16384, B=17960 */
-        switch (readb(ti->mmio + AIP16MBDHB)) {
-        case 0xe: ti->dhb_size16mb = 4096; break;
-        case 0xd: ti->dhb_size16mb = 8192; break;
-        case 0xc: ti->dhb_size16mb = 16384; break;
-        case 0xb: ti->dhb_size16mb = 17960; break;
-        default:  ti->dhb_size16mb = 2048; break;
-        }
-
-        /*    We must figure out how much shared memory space this adapter
-         *    will occupy so that if there are two adapters we can fit both
-         *    in.  Given a choice, we will limit this adapter to 32K.  The
-         *    maximum space will will use for two adapters is 64K so if the
-         *    adapter we are working on demands 64K (it also doesn't support
-         *    paging), then only one adapter can be supported.  
-         */
-
-        /*
-         *    determine how much of total RAM is mapped into PC space 
-         */
-        ti->mapped_ram_size= /*sixteen to onehundredtwentyeight 512byte blocks*/
-            1<< ((readb(ti->mmio+ACA_OFFSET+ACA_RW+RRR_ODD) >> 2 & 0x03) + 4);
-        ti->page_mask = 0;
-        if (ti->turbo)  ti->page_mask=0xf0;
-        else if (ti->shared_ram_paging == 0xf);  /* No paging in adapter */
-        else {
-#ifdef ENABLE_PAGING
-                unsigned char pg_size = 0;
-                /* BMS:   page size: PCMCIA, use configuration register;
-                   ISAPNP, use LANAIDC config tool from www.ibm.com  */
-                switch (ti->shared_ram_paging) {
-                case 0xf:
-                        break;
-                case 0xe:
-                        ti->page_mask = (ti->mapped_ram_size == 32) ? 0xc0 : 0;
-                        pg_size = 32;   /* 16KB page size */
-                        break;
-                case 0xd:
-                        ti->page_mask = (ti->mapped_ram_size == 64) ? 0x80 : 0;
-                        pg_size = 64;   /* 32KB page size */
-                        break;
-                case 0xc:
-                        switch (ti->mapped_ram_size) {
-                        case 32:
-                                ti->page_mask = 0xc0;
-                                pg_size = 32;
-                                break;
-                        case 64:
-                                ti->page_mask = 0x80;
-                                pg_size = 64;
-                                break;
-                        }
-                        break;
-                default:
-                        DPRINTK("Unknown shared ram paging info %01X\n",
-                                                        ti->shared_ram_paging);
-                        iounmap(t_mmio); 
-                        return -ENODEV;
-                        break;
-                } /*end switch shared_ram_paging */
-
-                if (ibmtr_debug_trace & TRC_INIT)
-                        DPRINTK("Shared RAM paging code: %02X, "
-                                "mapped RAM size: %dK, shared RAM size: %dK, "
-                                "page mask: %02X\n:",
-                                ti->shared_ram_paging, ti->mapped_ram_size / 2,
-                                ti->avail_shared_ram / 2, ti->page_mask);
-#endif  /*ENABLE_PAGING */
-        }
-
-#ifndef PCMCIA
-        /* finish figuring the shared RAM address */
-        if (cardpresent == TR_ISA) {
-                static const __u32 ram_bndry_mask[] = {
-                        0xffffe000, 0xffffc000, 0xffff8000, 0xffff0000
-                };
-                __u32 new_base, rrr_32, chk_base, rbm;
-
-                rrr_32=readb(ti->mmio+ACA_OFFSET+ACA_RW+RRR_ODD) >> 2 & 0x03;
-                rbm = ram_bndry_mask[rrr_32];
-                new_base = (ibmtr_mem_base + (~rbm)) & rbm;/* up to boundary */
-                chk_base = new_base + (ti->mapped_ram_size << 9);
-                if (chk_base > (ibmtr_mem_base + IBMTR_SHARED_RAM_SIZE)) {
-                        DPRINTK("Shared RAM for this adapter (%05x) exceeds "
-                        "driver limit (%05x), adapter not started.\n",
-                        chk_base, ibmtr_mem_base + IBMTR_SHARED_RAM_SIZE);
-                        iounmap(t_mmio);
-                        return -ENODEV;
-                } else { /* seems cool, record what we have figured out */
-                        ti->sram_base = new_base >> 12;
-                        ibmtr_mem_base = chk_base;
-                }
-        }
-        else  ti->sram_base = ti->sram_phys >> 12;
-
-        /* The PCMCIA has already got the interrupt line and the io port, 
-           so no chance of anybody else getting it - MLP */
-        if (request_irq(dev->irq = irq, tok_interrupt, 0, "ibmtr", dev) != 0) {
-                DPRINTK("Could not grab irq %d.  Halting Token Ring driver.\n",
-                                        irq);
-                iounmap(t_mmio);
-                return -ENODEV;
-        }
-        /*?? Now, allocate some of the PIO PORTs for this driver.. */
-        /* record PIOaddr range as busy */
-        if (!request_region(PIOaddr, IBMTR_IO_EXTENT, "ibmtr")) {
-                DPRINTK("Could not grab PIO range. Halting driver.\n");
-                free_irq(dev->irq, dev);
-                iounmap(t_mmio);
-                return -EBUSY;
-        }
-
-        if (!version_printed++) {
-                printk(version);
-        }
-#endif /* !PCMCIA */
-        DPRINTK("%s %s found\n",
-                channel_def[cardpresent - 1], adapter_def(ti->adapter_type));
-        DPRINTK("using irq %d, PIOaddr %hx, %dK shared RAM.\n",
-                        irq, PIOaddr, ti->mapped_ram_size / 2);
-        DPRINTK("Hardware address : %pM\n", dev->dev_addr);
-        if (ti->page_mask)
-                DPRINTK("Shared RAM paging enabled. "
-                        "Page size: %uK Shared Ram size %dK\n",
-                        ((ti->page_mask^0xff)+1) >>2, ti->avail_shared_ram / 2);
-        else
-                DPRINTK("Shared RAM paging disabled. ti->page_mask %x\n",
-                                                                ti->page_mask);
-
-        /* Calculate the maximum DHB we can use */
-        /* two cases where avail_shared_ram doesn't equal mapped_ram_size:
-            1. avail_shared_ram is 127 but mapped_ram_size is 128 (typical)
-            2. user has configured adapter for less than avail_shared_ram
-               but is not using paging (she should use paging, I believe)
-        */
-        if (!ti->page_mask) {
-                ti->avail_shared_ram=
-                                min(ti->mapped_ram_size,ti->avail_shared_ram);
-        }
-
-        switch (ti->avail_shared_ram) {
-        case 16:                /* 8KB shared RAM */
-                ti->dhb_size4mb = min(ti->dhb_size4mb, (unsigned short)2048);
-                ti->rbuf_len4 = 1032;
-                ti->rbuf_cnt4=2;
-                ti->dhb_size16mb = min(ti->dhb_size16mb, (unsigned short)2048);
-                ti->rbuf_len16 = 1032;
-                ti->rbuf_cnt16=2;
-                break;
-        case 32:                /* 16KB shared RAM */
-                ti->dhb_size4mb = min(ti->dhb_size4mb, (unsigned short)4464);
-                ti->rbuf_len4 = 1032;
-                ti->rbuf_cnt4=4;
-                ti->dhb_size16mb = min(ti->dhb_size16mb, (unsigned short)4096);
-                ti->rbuf_len16 = 1032;  /*1024 usable */
-                ti->rbuf_cnt16=4;
-                break;
-        case 64:                /* 32KB shared RAM */
-                ti->dhb_size4mb = min(ti->dhb_size4mb, (unsigned short)4464);
-                ti->rbuf_len4 = 1032;
-                ti->rbuf_cnt4=6;
-                ti->dhb_size16mb = min(ti->dhb_size16mb, (unsigned short)10240);
-                ti->rbuf_len16 = 1032;
-                ti->rbuf_cnt16=6;
-                break;
-        case 127:               /* 63.5KB shared RAM */
-                ti->dhb_size4mb = min(ti->dhb_size4mb, (unsigned short)4464);
-                ti->rbuf_len4 = 1032;
-                ti->rbuf_cnt4=6;
-                ti->dhb_size16mb = min(ti->dhb_size16mb, (unsigned short)16384);
-                ti->rbuf_len16 = 1032;
-                ti->rbuf_cnt16=16;
-                break;
-        case 128:               /* 64KB   shared RAM */
-                ti->dhb_size4mb = min(ti->dhb_size4mb, (unsigned short)4464);
-                ti->rbuf_len4 = 1032;
-                ti->rbuf_cnt4=6;
-                ti->dhb_size16mb = min(ti->dhb_size16mb, (unsigned short)17960);
-                ti->rbuf_len16 = 1032;
-                ti->rbuf_cnt16=16;
-                break;
-        default:
-                ti->dhb_size4mb = 2048;
-                ti->rbuf_len4 = 1032;
-                ti->rbuf_cnt4=2;
-                ti->dhb_size16mb = 2048;
-                ti->rbuf_len16 = 1032;
-                ti->rbuf_cnt16=2;
-                break;
-        }
-        /* this formula is not smart enough for the paging case
-        ti->rbuf_cnt<x> = (ti->avail_shared_ram * BLOCKSZ - ADAPT_PRIVATE -
-                        ARBLENGTH - SSBLENGTH - DLC_MAX_SAP * SAPLENGTH -
-                        DLC_MAX_STA * STALENGTH - ti->dhb_size<x>mb * NUM_DHB -
-                        SRBLENGTH - ASBLENGTH) / ti->rbuf_len<x>;
-        */
-        ti->maxmtu16 = (ti->rbuf_len16 - 8) * ti->rbuf_cnt16  - TR_HLEN;
-        ti->maxmtu4 = (ti->rbuf_len4 - 8) * ti->rbuf_cnt4 - TR_HLEN;
-        /*BMS assuming 18 bytes of Routing Information (usually works) */
-        DPRINTK("Maximum Receive Internet Protocol MTU 16Mbps: %d, 4Mbps: %d\n",
-                                                     ti->maxmtu16, ti->maxmtu4);
-
-        dev->base_addr = PIOaddr;       /* set the value for device */
-        dev->mem_start = ti->sram_base << 12;
-        dev->mem_end = dev->mem_start + (ti->mapped_ram_size << 9) - 1;
-        trdev_init(dev);
-        return 0;   /* Return 0 to indicate we have found a Token Ring card. */
-}                               /*ibmtr_probe1() */
-
-/*****************************************************************************/
-
-/* query the adapter for the size of shared RAM  */
-/* the function returns the RAM size in units of 512 bytes */
-
-static unsigned char __devinit get_sram_size(struct tok_info *adapt_info)
-{
-        unsigned char avail_sram_code;
-        static unsigned char size_code[] = { 0, 16, 32, 64, 127, 128 };
-        /* Adapter gives
-           'F' -- use RRR bits 3,2
-           'E' -- 8kb   'D' -- 16kb
-           'C' -- 32kb  'A' -- 64KB
-           'B' - 64KB less 512 bytes at top
-           (WARNING ... must zero top bytes in INIT */
-
-        avail_sram_code = 0xf - readb(adapt_info->mmio + AIPAVAILSHRAM);
-        if (avail_sram_code) return size_code[avail_sram_code];
-        else            /* for code 'F', must compute size from RRR(3,2) bits */
-                return 1 <<
-                 ((readb(adapt_info->mmio+ACA_OFFSET+ACA_RW+RRR_ODD)>>2&3)+4);
-}
-
-/*****************************************************************************/
-
-static const struct net_device_ops trdev_netdev_ops = {
-        .ndo_open               = tok_open,
-        .ndo_stop               = tok_close,
-        .ndo_start_xmit         = tok_send_packet,
-        .ndo_set_rx_mode        = tok_set_multicast_list,
-        .ndo_change_mtu         = ibmtr_change_mtu,
-};
-
-static int __devinit trdev_init(struct net_device *dev)
-{
-        struct tok_info *ti = netdev_priv(dev);
-
-        SET_PAGE(ti->srb_page);
-        ti->open_failure = NO    ;
-        dev->netdev_ops = &trdev_netdev_ops;
-
-        return 0;
-}
-
-/*****************************************************************************/
-
-static int tok_init_card(struct net_device *dev)
-{
-        struct tok_info *ti;
-        short PIOaddr;
-        unsigned long i;
-
-        PIOaddr = dev->base_addr;
-        ti = netdev_priv(dev);
-        /* Special processing for first interrupt after reset */
-        ti->do_tok_int = FIRST_INT;
-        /* Reset adapter */
-        writeb(~INT_ENABLE, ti->mmio + ACA_OFFSET + ACA_RESET + ISRP_EVEN);
-        outb(0, PIOaddr + ADAPTRESET);
-
-        schedule_timeout_uninterruptible(TR_RST_TIME); /* wait 50ms */
-
-        outb(0, PIOaddr + ADAPTRESETREL);
-#ifdef ENABLE_PAGING
-        if (ti->page_mask)
-                writeb(SRPR_ENABLE_PAGING,ti->mmio+ACA_OFFSET+ACA_RW+SRPR_EVEN);
-#endif
-        writeb(INT_ENABLE, ti->mmio + ACA_OFFSET + ACA_SET + ISRP_EVEN);
-        i = sleep_on_timeout(&ti->wait_for_reset, 4 * HZ);
-        return i? 0 : -EAGAIN;
-}
-
-/*****************************************************************************/
-static int tok_open(struct net_device *dev)
-{
-        struct tok_info *ti = netdev_priv(dev);
-        int i;
-
-        /*the case we were left in a failure state during a previous open */
-        if (ti->open_failure == YES) {
-                DPRINTK("Last time you were disconnected, how about now?\n");
-                printk("You can't insert with an ICS connector half-cocked.\n");
-        }
-
-        ti->open_status  = CLOSED; /* CLOSED or OPEN      */
-        ti->sap_status   = CLOSED; /* CLOSED or OPEN      */
-        ti->open_failure =     NO; /* NO     or YES       */
-        ti->open_mode    = MANUAL; /* MANUAL or AUTOMATIC */
-
-        ti->sram_phys &= ~1; /* to reverse what we do in tok_close */
-        /* init the spinlock */
-        spin_lock_init(&ti->lock);
-        init_timer(&ti->tr_timer);
-        
-        i = tok_init_card(dev);
-        if (i) return i;
-
-        while (1){
-                tok_open_adapter((unsigned long) dev);
-                i= interruptible_sleep_on_timeout(&ti->wait_for_reset, 25 * HZ);
-                /* sig catch: estimate opening adapter takes more than .5 sec*/
-                if (i>(245*HZ)/10) break; /* fancier than if (i==25*HZ) */
-                if (i==0) break;
-                if (ti->open_status == OPEN && ti->sap_status==OPEN) {
-                        netif_start_queue(dev);
-                        DPRINTK("Adapter is up and running\n");
-                        return 0;
-                }
-                i=schedule_timeout_interruptible(TR_RETRY_INTERVAL);
-                                                        /* wait 30 seconds */
-                if(i!=0) break; /*prob. a signal, like the i>24*HZ case above */
-        }
-        outb(0, dev->base_addr + ADAPTRESET);/* kill pending interrupts*/
-        DPRINTK("TERMINATED via signal\n");     /*BMS useful */
-        return -EAGAIN;
-}
-
-/*****************************************************************************/
-
-#define COMMAND_OFST             0
-#define OPEN_OPTIONS_OFST        8
-#define NUM_RCV_BUF_OFST        24
-#define RCV_BUF_LEN_OFST        26
-#define DHB_LENGTH_OFST         28
-#define NUM_DHB_OFST            30
-#define DLC_MAX_SAP_OFST        32
-#define DLC_MAX_STA_OFST        33
-
-static void tok_open_adapter(unsigned long dev_addr)
-{
-        struct net_device *dev = (struct net_device *) dev_addr;
-        struct tok_info *ti;
-        int i;
-
-        ti = netdev_priv(dev);
-        SET_PAGE(ti->init_srb_page); 
-        writeb(~SRB_RESP_INT, ti->mmio + ACA_OFFSET + ACA_RESET + ISRP_ODD);
-        for (i = 0; i < sizeof(struct dir_open_adapter); i++)
-                writeb(0, ti->init_srb + i);
-        writeb(DIR_OPEN_ADAPTER, ti->init_srb + COMMAND_OFST);
-        writew(htons(OPEN_PASS_BCON_MAC), ti->init_srb + OPEN_OPTIONS_OFST);
-        if (ti->ring_speed == 16) {
-                writew(htons(ti->dhb_size16mb), ti->init_srb + DHB_LENGTH_OFST);
-                writew(htons(ti->rbuf_cnt16), ti->init_srb + NUM_RCV_BUF_OFST);
-                writew(htons(ti->rbuf_len16), ti->init_srb + RCV_BUF_LEN_OFST);
-        } else {
-                writew(htons(ti->dhb_size4mb), ti->init_srb + DHB_LENGTH_OFST);
-                writew(htons(ti->rbuf_cnt4), ti->init_srb + NUM_RCV_BUF_OFST);
-                writew(htons(ti->rbuf_len4), ti->init_srb + RCV_BUF_LEN_OFST);
-        }
-        writeb(NUM_DHB,         /* always 2 */ ti->init_srb + NUM_DHB_OFST);
-        writeb(DLC_MAX_SAP, ti->init_srb + DLC_MAX_SAP_OFST);
-        writeb(DLC_MAX_STA, ti->init_srb + DLC_MAX_STA_OFST);
-        ti->srb = ti->init_srb; /* We use this one in the interrupt handler */
-        ti->srb_page = ti->init_srb_page;
-        DPRINTK("Opening adapter: Xmit bfrs: %d X %d, Rcv bfrs: %d X %d\n",
-                readb(ti->init_srb + NUM_DHB_OFST),
-                ntohs(readw(ti->init_srb + DHB_LENGTH_OFST)),
-                ntohs(readw(ti->init_srb + NUM_RCV_BUF_OFST)),
-                ntohs(readw(ti->init_srb + RCV_BUF_LEN_OFST)));
-        writeb(INT_ENABLE, ti->mmio + ACA_OFFSET + ACA_SET + ISRP_EVEN);
-        writeb(CMD_IN_SRB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD);
-}
-
-/*****************************************************************************/
-
-static void open_sap(unsigned char type, struct net_device *dev)
-{
-        int i;
-        struct tok_info *ti = netdev_priv(dev);
-
-        SET_PAGE(ti->srb_page);
-        for (i = 0; i < sizeof(struct dlc_open_sap); i++)
-                writeb(0, ti->srb + i);
-
-#define MAX_I_FIELD_OFST        14
-#define SAP_VALUE_OFST          16
-#define SAP_OPTIONS_OFST        17
-#define STATION_COUNT_OFST      18
-
-        writeb(DLC_OPEN_SAP, ti->srb + COMMAND_OFST);
-        writew(htons(MAX_I_FIELD), ti->srb + MAX_I_FIELD_OFST);
-        writeb(SAP_OPEN_IND_SAP | SAP_OPEN_PRIORITY, ti->srb+ SAP_OPTIONS_OFST);
-        writeb(SAP_OPEN_STATION_CNT, ti->srb + STATION_COUNT_OFST);
-        writeb(type, ti->srb + SAP_VALUE_OFST);
-        writeb(CMD_IN_SRB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD);
-}
-
-
-/*****************************************************************************/
-
-static void tok_set_multicast_list(struct net_device *dev)
-{
-        struct tok_info *ti = netdev_priv(dev);
-        struct netdev_hw_addr *ha;
-        unsigned char address[4];
-
-        int i;
-
-        /*BMS the next line is CRUCIAL or you may be sad when you */
-        /*BMS ifconfig tr down or hot unplug a PCMCIA card ??hownowbrowncow*/
-        if (/*BMSHELPdev->start == 0 ||*/ ti->open_status != OPEN) return;
-        address[0] = address[1] = address[2] = address[3] = 0;
-        netdev_for_each_mc_addr(ha, dev) {
-                address[0] |= ha->addr[2];
-                address[1] |= ha->addr[3];
-                address[2] |= ha->addr[4];
-                address[3] |= ha->addr[5];
-        }
-        SET_PAGE(ti->srb_page);
-        for (i = 0; i < sizeof(struct srb_set_funct_addr); i++)
-                writeb(0, ti->srb + i);
-
-#define FUNCT_ADDRESS_OFST 6
-
-        writeb(DIR_SET_FUNC_ADDR, ti->srb + COMMAND_OFST);
-        for (i = 0; i < 4; i++) 
-                writeb(address[i], ti->srb + FUNCT_ADDRESS_OFST + i);
-        writeb(CMD_IN_SRB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD);
-#if TR_VERBOSE
-        DPRINTK("Setting functional address: ");
-        for (i=0;i<4;i++)  printk("%02X ", address[i]);
-        printk("\n");
-#endif
-}
-
-/*****************************************************************************/
-
-#define STATION_ID_OFST 4
-
-static netdev_tx_t tok_send_packet(struct sk_buff *skb,
-                                         struct net_device *dev)
-{
-        struct tok_info *ti;
-        unsigned long flags;
-        ti = netdev_priv(dev);
-
-        netif_stop_queue(dev);
-
-        /* lock against other CPUs */
-        spin_lock_irqsave(&(ti->lock), flags);
-
-        /* Save skb; we'll need it when the adapter asks for the data */
-        ti->current_skb = skb;
-        SET_PAGE(ti->srb_page);
-        writeb(XMIT_UI_FRAME, ti->srb + COMMAND_OFST);
-        writew(ti->exsap_station_id, ti->srb + STATION_ID_OFST);
-        writeb(CMD_IN_SRB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD);
-        spin_unlock_irqrestore(&(ti->lock), flags);
-        return NETDEV_TX_OK;
-}
-
-/*****************************************************************************/
-
-static int tok_close(struct net_device *dev)
-{
-        struct tok_info *ti = netdev_priv(dev);
-
-        /* Important for PCMCIA hot unplug, otherwise, we'll pull the card, */
-        /* unloading the module from memory, and then if a timer pops, ouch */
-        del_timer_sync(&ti->tr_timer);
-        outb(0, dev->base_addr + ADAPTRESET);
-        ti->sram_phys |= 1;
-        ti->open_status = CLOSED;
-
-        netif_stop_queue(dev);
-        DPRINTK("Adapter is closed.\n");
-        return 0;
-}
-
-/*****************************************************************************/
-
-#define RETCODE_OFST            2
-#define OPEN_ERROR_CODE_OFST    6
-#define ASB_ADDRESS_OFST        8
-#define SRB_ADDRESS_OFST        10
-#define ARB_ADDRESS_OFST        12
-#define SSB_ADDRESS_OFST        14
-
-static char *printphase[]= {"Lobe media test","Physical insertion",
-              "Address verification","Roll call poll","Request Parameters"};
-static char *printerror[]={"Function failure","Signal loss","Reserved",
-                "Frequency error","Timeout","Ring failure","Ring beaconing",
-                "Duplicate node address",
-                "Parameter request-retry count exceeded","Remove received",
-                "IMPL force received","Duplicate modifier",
-                "No monitor detected","Monitor contention failed for RPL"};
-
-static void __iomem *map_address(struct tok_info *ti, unsigned index, __u8 *page)
-{
-        if (ti->page_mask) {
-                *page = (index >> 8) & ti->page_mask;
-                index &= ~(ti->page_mask << 8);
-        }
-        return ti->sram_virt + index;
-}
-
-static void dir_open_adapter (struct net_device *dev)
-{
-        struct tok_info *ti = netdev_priv(dev);
-        unsigned char ret_code;
-        __u16 err;
-
-        ti->srb = map_address(ti,
-                ntohs(readw(ti->init_srb + SRB_ADDRESS_OFST)),
-                &ti->srb_page);
-        ti->ssb = map_address(ti,
-                ntohs(readw(ti->init_srb + SSB_ADDRESS_OFST)),
-                &ti->ssb_page);
-        ti->arb = map_address(ti,
-                ntohs(readw(ti->init_srb + ARB_ADDRESS_OFST)),
-                &ti->arb_page);
-        ti->asb = map_address(ti,
-                ntohs(readw(ti->init_srb + ASB_ADDRESS_OFST)),
-                &ti->asb_page);
-        ti->current_skb = NULL;
-        ret_code = readb(ti->init_srb + RETCODE_OFST);
-        err = ntohs(readw(ti->init_srb + OPEN_ERROR_CODE_OFST));
-        if (!ret_code) {
-                ti->open_status = OPEN; /* TR adapter is now available */
-                if (ti->open_mode == AUTOMATIC) {
-                        DPRINTK("Adapter reopened.\n");
-                }
-                writeb(~SRB_RESP_INT, ti->mmio+ACA_OFFSET+ACA_RESET+ISRP_ODD);
-                open_sap(EXTENDED_SAP, dev);
-                return;
-        }
-        ti->open_failure = YES;
-        if (ret_code == 7){
-               if (err == 0x24) {
-                        if (!ti->auto_speedsave) {
-                                DPRINTK("Open failed: Adapter speed must match "
-                                 "ring speed if Automatic Ring Speed Save is "
-                                 "disabled.\n");
-                                ti->open_action = FAIL;
-                        }else
-                                DPRINTK("Retrying open to adjust to "
-                                        "ring speed, ");
-                } else if (err == 0x2d) {
-                        DPRINTK("Physical Insertion: No Monitor Detected, ");
-                        printk("retrying after %ds delay...\n",
-                                        TR_RETRY_INTERVAL/HZ);
-                } else if (err == 0x11) {
-                        DPRINTK("Lobe Media Function Failure (0x11), ");
-                        printk(" retrying after %ds delay...\n",
-                                        TR_RETRY_INTERVAL/HZ);
-                } else {
-                        char **prphase = printphase;
-                        char **prerror = printerror;
-                        int pnr = err / 16 - 1;
-                        int enr = err % 16 - 1;
-                        DPRINTK("TR Adapter misc open failure, error code = ");
-                        if (pnr < 0 || pnr >= ARRAY_SIZE(printphase) ||
-                                        enr < 0 ||
-                                        enr >= ARRAY_SIZE(printerror))
-                                printk("0x%x, invalid Phase/Error.", err);
-                        else
-                                printk("0x%x, Phase: %s, Error: %s\n", err,
-                                                prphase[pnr], prerror[enr]);
-                        printk(" retrying after %ds delay...\n",
-                                        TR_RETRY_INTERVAL/HZ);
-                }
-        } else DPRINTK("open failed: ret_code = %02X..., ", ret_code);
-        if (ti->open_action != FAIL) {
-                if (ti->open_mode==AUTOMATIC){
-                        ti->open_action = REOPEN;
-                        ibmtr_reset_timer(&(ti->tr_timer), dev);
-                        return;
-                }
-                wake_up(&ti->wait_for_reset);
-                return;
-        }
-        DPRINTK("FAILURE, CAPUT\n");
-}
-
-/******************************************************************************/
-
-static irqreturn_t tok_interrupt(int irq, void *dev_id)
-{
-        unsigned char status;
-        /*  unsigned char status_even ; */
-        struct tok_info *ti;
-        struct net_device *dev;
-#ifdef ENABLE_PAGING
-        unsigned char save_srpr;
-#endif
-
-        dev = dev_id;
-#if TR_VERBOSE
-        DPRINTK("Int from tok_driver, dev : %p irq%d\n", dev,irq);
-#endif
-        ti = netdev_priv(dev);
-        if (ti->sram_phys & 1)
-                return IRQ_NONE;         /* PCMCIA card extraction flag */
-        spin_lock(&(ti->lock));
-#ifdef ENABLE_PAGING
-        save_srpr = readb(ti->mmio + ACA_OFFSET + ACA_RW + SRPR_EVEN);
-#endif
-
-        /* Disable interrupts till processing is finished */
-        writeb((~INT_ENABLE), ti->mmio + ACA_OFFSET + ACA_RESET + ISRP_EVEN);
-
-        /* Reset interrupt for ISA boards */
-        if (ti->adapter_int_enable)
-                outb(0, ti->adapter_int_enable);
-        else /* used for PCMCIA cards */
-                outb(0, ti->global_int_enable);
-        if (ti->do_tok_int == FIRST_INT){
-                initial_tok_int(dev);
-#ifdef ENABLE_PAGING
-                writeb(save_srpr, ti->mmio + ACA_OFFSET + ACA_RW + SRPR_EVEN);
-#endif
-                spin_unlock(&(ti->lock));
-                return IRQ_HANDLED;
-        }
-        /*  Begin interrupt handler HERE inline to avoid the extra
-            levels of logic and call depth for the original solution. */
-        status = readb(ti->mmio + ACA_OFFSET + ACA_RW + ISRP_ODD);
-        /*BMSstatus_even = readb (ti->mmio + ACA_OFFSET + ACA_RW + ISRP_EVEN) */
-        /*BMSdebugprintk("tok_interrupt: ISRP_ODD = 0x%x ISRP_EVEN = 0x%x\n", */
-        /*BMS                                       status,status_even);      */
-
-        if (status & ADAP_CHK_INT) {
-                int i;
-                void __iomem *check_reason;
-                __u8 check_reason_page = 0;
-                check_reason = map_address(ti,
-                        ntohs(readw(ti->mmio+ ACA_OFFSET+ACA_RW + WWCR_EVEN)),
-                        &check_reason_page);
-                SET_PAGE(check_reason_page);
-
-                DPRINTK("Adapter check interrupt\n");
-                DPRINTK("8 reason bytes follow: ");
-                for (i = 0; i < 8; i++, check_reason++)
-                        printk("%02X ", (int) readb(check_reason));
-                printk("\n");
-                writeb(~ADAP_CHK_INT, ti->mmio+ ACA_OFFSET+ACA_RESET+ ISRP_ODD);
-                status = readb(ti->mmio + ACA_OFFSET + ACA_RW + ISRA_EVEN);
-                DPRINTK("ISRA_EVEN == 0x02%x\n",status);
-                ti->open_status = CLOSED;
-                ti->sap_status  = CLOSED;
-                ti->open_mode   = AUTOMATIC;
-                netif_carrier_off(dev);
-                netif_stop_queue(dev);
-                ti->open_action = RESTART;
-                outb(0, dev->base_addr + ADAPTRESET);
-                ibmtr_reset_timer(&(ti->tr_timer), dev);/*BMS try to reopen*/
-                spin_unlock(&(ti->lock));
-                return IRQ_HANDLED;
-        }
-        if (readb(ti->mmio + ACA_OFFSET + ACA_RW + ISRP_EVEN)
-                & (TCR_INT | ERR_INT | ACCESS_INT)) {
-                DPRINTK("adapter error: ISRP_EVEN : %02x\n",
-                        (int)readb(ti->mmio+ ACA_OFFSET + ACA_RW + ISRP_EVEN));
-                writeb(~(TCR_INT | ERR_INT | ACCESS_INT),
-                        ti->mmio + ACA_OFFSET + ACA_RESET + ISRP_EVEN);
-                status= readb(ti->mmio+ ACA_OFFSET + ACA_RW + ISRA_EVEN);/*BMS*/
-                DPRINTK("ISRA_EVEN == 0x02%x\n",status);/*BMS*/
-                writeb(INT_ENABLE, ti->mmio + ACA_OFFSET + ACA_SET + ISRP_EVEN);
-#ifdef ENABLE_PAGING
-                writeb(save_srpr, ti->mmio + ACA_OFFSET + ACA_RW + SRPR_EVEN);
-#endif
-                spin_unlock(&(ti->lock));
-                return IRQ_HANDLED;
-        }
-        if (status & SRB_RESP_INT) {    /* SRB response */
-                SET_PAGE(ti->srb_page);
-#if TR_VERBOSE
-                DPRINTK("SRB resp: cmd=%02X rsp=%02X\n",
-                                readb(ti->srb), readb(ti->srb + RETCODE_OFST));
-#endif
-                switch (readb(ti->srb)) {       /* SRB command check */
-                case XMIT_DIR_FRAME:{
-                        unsigned char xmit_ret_code;
-                        xmit_ret_code = readb(ti->srb + RETCODE_OFST);
-                        if (xmit_ret_code == 0xff) break;
-                        DPRINTK("error on xmit_dir_frame request: %02X\n",
-                                                                xmit_ret_code);
-                        if (ti->current_skb) {
-                                dev_kfree_skb_irq(ti->current_skb);
-                                ti->current_skb = NULL;
-                        }
-                        /*dev->tbusy = 0;*/
-                        netif_wake_queue(dev);
-                        if (ti->readlog_pending)
-                                ibmtr_readlog(dev);
-                        break;
-                }
-                case XMIT_UI_FRAME:{
-                        unsigned char xmit_ret_code;
-
-                        xmit_ret_code = readb(ti->srb + RETCODE_OFST);
-                        if (xmit_ret_code == 0xff) break;
-                        DPRINTK("error on xmit_ui_frame request: %02X\n",
-                                                                xmit_ret_code);
-                        if (ti->current_skb) {
-                                dev_kfree_skb_irq(ti->current_skb);
-                                ti->current_skb = NULL;
-                        }
-                        netif_wake_queue(dev);
-                        if (ti->readlog_pending)
-                                ibmtr_readlog(dev);
-                        break;
-                }
-                case DIR_OPEN_ADAPTER:
-                        dir_open_adapter(dev);
-                        break;
-                case DLC_OPEN_SAP:
-                        if (readb(ti->srb + RETCODE_OFST)) {
-                                DPRINTK("open_sap failed: ret_code = %02X, "
-                                        "retrying\n",
-                                        (int) readb(ti->srb + RETCODE_OFST));
-                                ti->open_action = REOPEN;
-                                ibmtr_reset_timer(&(ti->tr_timer), dev);
-                                break;
-                        }
-                        ti->exsap_station_id = readw(ti->srb + STATION_ID_OFST);
-                        ti->sap_status = OPEN;/* TR adapter is now available */
-                        if (ti->open_mode==MANUAL){
-                                wake_up(&ti->wait_for_reset);
-                                break;
-                        }
-                        netif_wake_queue(dev);
-                        netif_carrier_on(dev);
-                        break;
-                case DIR_INTERRUPT:
-                case DIR_MOD_OPEN_PARAMS:
-                case DIR_SET_GRP_ADDR:
-                case DIR_SET_FUNC_ADDR:
-                case DLC_CLOSE_SAP:
-                        if (readb(ti->srb + RETCODE_OFST))
-                                DPRINTK("error on %02X: %02X\n",
-                                        (int) readb(ti->srb + COMMAND_OFST),
-                                        (int) readb(ti->srb + RETCODE_OFST));
-                        break;
-                case DIR_READ_LOG:
-                        if (readb(ti->srb + RETCODE_OFST)){
-                                DPRINTK("error on dir_read_log: %02X\n",
-                                        (int) readb(ti->srb + RETCODE_OFST));
-                                netif_wake_queue(dev);
-                                break;
-                        }
-#if IBMTR_DEBUG_MESSAGES
-
-#define LINE_ERRORS_OFST                 0
-#define INTERNAL_ERRORS_OFST             1
-#define BURST_ERRORS_OFST                2
-#define AC_ERRORS_OFST                   3
-#define ABORT_DELIMITERS_OFST            4
-#define LOST_FRAMES_OFST                 6
-#define RECV_CONGEST_COUNT_OFST          7
-#define FRAME_COPIED_ERRORS_OFST         8
-#define FREQUENCY_ERRORS_OFST            9
-#define TOKEN_ERRORS_OFST               10
-
-                        DPRINTK("Line errors %02X, Internal errors %02X, "
-                        "Burst errors %02X\n" "A/C errors %02X, "
-                        "Abort delimiters %02X, Lost frames %02X\n"
-                        "Receive congestion count %02X, "
-                        "Frame copied errors %02X\nFrequency errors %02X, "
-                        "Token errors %02X\n",
-                        (int) readb(ti->srb + LINE_ERRORS_OFST),
-                        (int) readb(ti->srb + INTERNAL_ERRORS_OFST),
-                        (int) readb(ti->srb + BURST_ERRORS_OFST),
-                        (int) readb(ti->srb + AC_ERRORS_OFST),
-                        (int) readb(ti->srb + ABORT_DELIMITERS_OFST),
-                        (int) readb(ti->srb + LOST_FRAMES_OFST),
-                        (int) readb(ti->srb + RECV_CONGEST_COUNT_OFST),
-                        (int) readb(ti->srb + FRAME_COPIED_ERRORS_OFST),
-                        (int) readb(ti->srb + FREQUENCY_ERRORS_OFST),
-                        (int) readb(ti->srb + TOKEN_ERRORS_OFST));
-#endif
-                        netif_wake_queue(dev);
-                        break;
-                default:
-                        DPRINTK("Unknown command %02X encountered\n",
-                                                (int) readb(ti->srb));
-                }       /* end switch SRB command check */
-                writeb(~SRB_RESP_INT, ti->mmio+ ACA_OFFSET+ACA_RESET+ ISRP_ODD);
-        }       /* if SRB response */
-        if (status & ASB_FREE_INT) {    /* ASB response */
-                SET_PAGE(ti->asb_page);
-#if TR_VERBOSE
-                DPRINTK("ASB resp: cmd=%02X\n", readb(ti->asb));
-#endif
-
-                switch (readb(ti->asb)) {       /* ASB command check */
-                case REC_DATA:
-                case XMIT_UI_FRAME:
-                case XMIT_DIR_FRAME:
-                        break;
-                default:
-                        DPRINTK("unknown command in asb %02X\n",
-                                                (int) readb(ti->asb));
-                }       /* switch ASB command check */
-                if (readb(ti->asb + 2) != 0xff) /* checks ret_code */
-                        DPRINTK("ASB error %02X in cmd %02X\n",
-                                (int) readb(ti->asb + 2), (int) readb(ti->asb));
-                writeb(~ASB_FREE_INT, ti->mmio+ ACA_OFFSET+ACA_RESET+ ISRP_ODD);
-        }       /* if ASB response */
-
-#define STATUS_OFST             6
-#define NETW_STATUS_OFST        6
-
-        if (status & ARB_CMD_INT) {     /* ARB response */
-                SET_PAGE(ti->arb_page);
-#if TR_VERBOSE
-                DPRINTK("ARB resp: cmd=%02X\n", readb(ti->arb));
-#endif
-
-                switch (readb(ti->arb)) {       /* ARB command check */
-                case DLC_STATUS:
-                        DPRINTK("DLC_STATUS new status: %02X on station %02X\n",
-                                ntohs(readw(ti->arb + STATUS_OFST)),
-                                ntohs(readw(ti->arb+ STATION_ID_OFST)));
-                        break;
-                case REC_DATA:
-                        tr_rx(dev);
-                        break;
-                case RING_STAT_CHANGE:{
-                        unsigned short ring_status;
-                        ring_status= ntohs(readw(ti->arb + NETW_STATUS_OFST));
-                        if (ibmtr_debug_trace & TRC_INIT)
-                                DPRINTK("Ring Status Change...(0x%x)\n",
-                                                                ring_status);
-                        if(ring_status& (REMOVE_RECV|AUTO_REMOVAL|LOBE_FAULT)){
-                                netif_stop_queue(dev);
-                                netif_carrier_off(dev);
-                                DPRINTK("Remove received, or Auto-removal error"
-                                        ", or Lobe fault\n");
-                                DPRINTK("We'll try to reopen the closed adapter"
-                                        " after a %d second delay.\n",
-                                                TR_RETRY_INTERVAL/HZ);
-                                /*I was confused: I saw the TR reopening but */
-                                /*forgot:with an RJ45 in an RJ45/ICS adapter */
-                                /*but adapter not in the ring, the TR will   */
-                                /* open, and then soon close and come here.  */
-                                ti->open_mode = AUTOMATIC;
-                                ti->open_status = CLOSED; /*12/2000 BMS*/
-                                ti->open_action = REOPEN;
-                                ibmtr_reset_timer(&(ti->tr_timer), dev);
-                        } else if (ring_status & LOG_OVERFLOW) {
-                                if(netif_queue_stopped(dev))
-                                        ti->readlog_pending = 1;
-                                else
-                                        ibmtr_readlog(dev);
-                        }
-                        break;
-                }
-                case XMIT_DATA_REQ:
-                        tr_tx(dev);
-                        break;
-                default:
-                        DPRINTK("Unknown command %02X in arb\n",
-                                                (int) readb(ti->arb));
-                        break;
-                }       /* switch ARB command check */
-                writeb(~ARB_CMD_INT, ti->mmio+ ACA_OFFSET+ACA_RESET + ISRP_ODD);
-                writeb(ARB_FREE, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD);
-        }       /* if ARB response */
-        if (status & SSB_RESP_INT) {    /* SSB response */
-                unsigned char retcode;
-                SET_PAGE(ti->ssb_page);
-#if TR_VERBOSE
-                DPRINTK("SSB resp: cmd=%02X rsp=%02X\n",
-                                readb(ti->ssb), readb(ti->ssb + 2));
-#endif
-
-                switch (readb(ti->ssb)) {       /* SSB command check */
-                case XMIT_DIR_FRAME:
-                case XMIT_UI_FRAME:
-                        retcode = readb(ti->ssb + 2);
-                        if (retcode && (retcode != 0x22))/* checks ret_code */
-                                DPRINTK("xmit ret_code: %02X xmit error code: "
-                                        "%02X\n",
-                                        (int)retcode, (int)readb(ti->ssb + 6));
-                        else
-                                dev->stats.tx_packets++;
-                        break;
-                case XMIT_XID_CMD:
-                        DPRINTK("xmit xid ret_code: %02X\n",
-                                                (int) readb(ti->ssb + 2));
-                default:
-                        DPRINTK("Unknown command %02X in ssb\n",
-                                                (int) readb(ti->ssb));
-                }       /* SSB command check */
-                writeb(~SSB_RESP_INT, ti->mmio+ ACA_OFFSET+ACA_RESET+ ISRP_ODD);
-                writeb(SSB_FREE, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD);
-        }       /* if SSB response */
-#ifdef ENABLE_PAGING
-        writeb(save_srpr, ti->mmio + ACA_OFFSET + ACA_RW + SRPR_EVEN);
-#endif
-        writeb(INT_ENABLE, ti->mmio + ACA_OFFSET + ACA_SET + ISRP_EVEN);
-        spin_unlock(&(ti->lock));
-        return IRQ_HANDLED;
-}                               /*tok_interrupt */
-
-/*****************************************************************************/
-
-#define INIT_STATUS_OFST        1
-#define INIT_STATUS_2_OFST      2
-#define ENCODED_ADDRESS_OFST    8
-
-static void initial_tok_int(struct net_device *dev)
-{
-
-        __u32 encoded_addr, hw_encoded_addr;
-        struct tok_info *ti;
-        unsigned char init_status; /*BMS 12/2000*/
-
-        ti = netdev_priv(dev);
-
-        ti->do_tok_int = NOT_FIRST;
-
-        /* we assign the shared-ram address for ISA devices */
-        writeb(ti->sram_base, ti->mmio + ACA_OFFSET + ACA_RW + RRR_EVEN);
-#ifndef PCMCIA
-        ti->sram_virt = ioremap(((__u32)ti->sram_base << 12), ti->avail_shared_ram);
-#endif
-        ti->init_srb = map_address(ti,
-                ntohs(readw(ti->mmio + ACA_OFFSET + WRBR_EVEN)),
-                &ti->init_srb_page);
-        if (ti->page_mask && ti->avail_shared_ram == 127) {
-                void __iomem *last_512;
-                __u8 last_512_page=0;
-                int i;
-                last_512 = map_address(ti, 0xfe00, &last_512_page);
-                /* initialize high section of ram (if necessary) */
-                SET_PAGE(last_512_page);
-                for (i = 0; i < 512; i++)
-                        writeb(0, last_512 + i);
-        }
-        SET_PAGE(ti->init_srb_page);
-
-#if TR_VERBOSE
-        {
-        int i;
-
-        DPRINTK("ti->init_srb_page=0x%x\n", ti->init_srb_page);
-        DPRINTK("init_srb(%p):", ti->init_srb );
-        for (i = 0; i < 20; i++)
-                printk("%02X ", (int) readb(ti->init_srb + i));
-        printk("\n");
-        }
-#endif
-
-        hw_encoded_addr = readw(ti->init_srb + ENCODED_ADDRESS_OFST);
-        encoded_addr = ntohs(hw_encoded_addr);
-        init_status= /*BMS 12/2000 check for shallow mode possibility (Turbo)*/
-        readb(ti->init_srb+offsetof(struct srb_init_response,init_status));
-        /*printk("Initial interrupt: init_status= 0x%02x\n",init_status);*/
-        ti->ring_speed = init_status & 0x01 ? 16 : 4;
-        DPRINTK("Initial interrupt : %d Mbps, shared RAM base %08x.\n",
-                                ti->ring_speed, (unsigned int)dev->mem_start);
-        ti->auto_speedsave = (readb(ti->init_srb+INIT_STATUS_2_OFST) & 4) != 0;
-
-        if (ti->open_mode == MANUAL)    wake_up(&ti->wait_for_reset);
-        else                            tok_open_adapter((unsigned long)dev);
-        
-} /*initial_tok_int() */
-
-/*****************************************************************************/
-
-#define CMD_CORRELATE_OFST      1
-#define DHB_ADDRESS_OFST        6
-
-#define FRAME_LENGTH_OFST       6
-#define HEADER_LENGTH_OFST      8
-#define RSAP_VALUE_OFST         9
-
-static void tr_tx(struct net_device *dev)
-{
-        struct tok_info *ti = netdev_priv(dev);
-        struct trh_hdr *trhdr = (struct trh_hdr *) ti->current_skb->data;
-        unsigned int hdr_len;
-        __u32 dhb=0,dhb_base;
-        void __iomem *dhbuf = NULL;
-        unsigned char xmit_command;
-        int i,dhb_len=0x4000,src_len,src_offset;
-        struct trllc *llc;
-        struct srb_xmit xsrb;
-        __u8 dhb_page = 0;
-        __u8 llc_ssap;
-
-        SET_PAGE(ti->asb_page);
-
-        if (readb(ti->asb+RETCODE_OFST) != 0xFF) DPRINTK("ASB not free !!!\n");
-
-        /* in providing the transmit interrupts, is telling us it is ready for
-           data and providing a shared memory address for us to stuff with data.
-           Here we compute the effective address where we will place data.
-        */
-        SET_PAGE(ti->arb_page);
-        dhb=dhb_base=ntohs(readw(ti->arb + DHB_ADDRESS_OFST));
-        if (ti->page_mask) {
-                dhb_page = (dhb_base >> 8) & ti->page_mask;
-                dhb=dhb_base & ~(ti->page_mask << 8);
-        }
-        dhbuf = ti->sram_virt + dhb;
-
-        /* Figure out the size of the 802.5 header */
-        if (!(trhdr->saddr[0] & 0x80))  /* RIF present? */
-                hdr_len = sizeof(struct trh_hdr) - TR_MAXRIFLEN;
-        else
-                hdr_len = ((ntohs(trhdr->rcf) & TR_RCF_LEN_MASK) >> 8)
-                    + sizeof(struct trh_hdr) - TR_MAXRIFLEN;
-
-        llc = (struct trllc *) (ti->current_skb->data + hdr_len);
-
-        llc_ssap = llc->ssap;
-        SET_PAGE(ti->srb_page);
-        memcpy_fromio(&xsrb, ti->srb, sizeof(xsrb));
-        SET_PAGE(ti->asb_page);
-        xmit_command = xsrb.command;
-
-        writeb(xmit_command, ti->asb + COMMAND_OFST);
-        writew(xsrb.station_id, ti->asb + STATION_ID_OFST);
-        writeb(llc_ssap, ti->asb + RSAP_VALUE_OFST);
-        writeb(xsrb.cmd_corr, ti->asb + CMD_CORRELATE_OFST);
-        writeb(0, ti->asb + RETCODE_OFST);
-        if ((xmit_command == XMIT_XID_CMD) || (xmit_command == XMIT_TEST_CMD)) {
-                writew(htons(0x11), ti->asb + FRAME_LENGTH_OFST);
-                writeb(0x0e, ti->asb + HEADER_LENGTH_OFST);
-                SET_PAGE(dhb_page);
-                writeb(AC, dhbuf);
-                writeb(LLC_FRAME, dhbuf + 1);
-                for (i = 0; i < TR_ALEN; i++)
-                        writeb((int) 0x0FF, dhbuf + i + 2);
-                for (i = 0; i < TR_ALEN; i++)
-                        writeb(0, dhbuf + i + TR_ALEN + 2);
-                writeb(RESP_IN_ASB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD);
-                return;
-        }
-        /*
-         *    the token ring packet is copied from sk_buff to the adapter
-         *    buffer identified in the command data received with the interrupt.
-         */
-        writeb(hdr_len, ti->asb + HEADER_LENGTH_OFST);
-        writew(htons(ti->current_skb->len), ti->asb + FRAME_LENGTH_OFST);
-        src_len=ti->current_skb->len;
-        src_offset=0;
-        dhb=dhb_base;
-        while(1) {
-                if (ti->page_mask) {
-                        dhb_page=(dhb >> 8) & ti->page_mask;
-                        dhb=dhb & ~(ti->page_mask << 8);
-                        dhb_len=0x4000-dhb; /* remaining size of this page */
-                }
-                dhbuf = ti->sram_virt + dhb;
-                SET_PAGE(dhb_page);
-                if (src_len > dhb_len) {
-                        memcpy_toio(dhbuf,&ti->current_skb->data[src_offset],
-                                        dhb_len);
-                        src_len -= dhb_len;
-                        src_offset += dhb_len;
-                        dhb_base+=dhb_len;
-                        dhb=dhb_base;
-                        continue;
-                }
-                memcpy_toio(dhbuf, &ti->current_skb->data[src_offset], src_len);
-                break;
-        }
-        writeb(RESP_IN_ASB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD);
-        dev->stats.tx_bytes += ti->current_skb->len;
-        dev_kfree_skb_irq(ti->current_skb);
-        ti->current_skb = NULL;
-        netif_wake_queue(dev);
-        if (ti->readlog_pending)
-                ibmtr_readlog(dev);
-}                               /*tr_tx */
-
-/*****************************************************************************/
-
-
-#define RECEIVE_BUFFER_OFST     6
-#define LAN_HDR_LENGTH_OFST     8
-#define DLC_HDR_LENGTH_OFST     9
-
-#define DSAP_OFST               0
-#define SSAP_OFST               1
-#define LLC_OFST                2
-#define PROTID_OFST             3
-#define ETHERTYPE_OFST          6
-
-static void tr_rx(struct net_device *dev)
-{
-        struct tok_info *ti = netdev_priv(dev);
-        __u32 rbuffer;
-        void __iomem *rbuf, *rbufdata, *llc;
-        __u8 rbuffer_page = 0;
-        unsigned char *data;
-        unsigned int rbuffer_len, lan_hdr_len, hdr_len, ip_len, length;
-        unsigned char dlc_hdr_len;
-        struct sk_buff *skb;
-        unsigned int skb_size = 0;
-        int IPv4_p = 0;
-        unsigned int chksum = 0;
-        struct iphdr *iph;
-        struct arb_rec_req rarb;
-
-        SET_PAGE(ti->arb_page);
-        memcpy_fromio(&rarb, ti->arb, sizeof(rarb));
-        rbuffer = ntohs(rarb.rec_buf_addr) ;
-        rbuf = map_address(ti, rbuffer, &rbuffer_page);
-
-        SET_PAGE(ti->asb_page);
-
-        if (readb(ti->asb + RETCODE_OFST) !=0xFF) DPRINTK("ASB not free !!!\n");
-
-        writeb(REC_DATA, ti->asb + COMMAND_OFST);
-        writew(rarb.station_id, ti->asb + STATION_ID_OFST);
-        writew(rarb.rec_buf_addr, ti->asb + RECEIVE_BUFFER_OFST);
-
-        lan_hdr_len = rarb.lan_hdr_len;
-        if (lan_hdr_len > sizeof(struct trh_hdr)) {
-                DPRINTK("Linux cannot handle greater than 18 bytes RIF\n");
-                return;
-        }                       /*BMS I added this above just to be very safe */
-        dlc_hdr_len = readb(ti->arb + DLC_HDR_LENGTH_OFST);
-        hdr_len = lan_hdr_len + sizeof(struct trllc) + sizeof(struct iphdr);
-
-        SET_PAGE(rbuffer_page);
-        llc = rbuf + offsetof(struct rec_buf, data) + lan_hdr_len;
-
-#if TR_VERBOSE
-        DPRINTK("offsetof data: %02X lan_hdr_len: %02X\n",
-        (__u32) offsetof(struct rec_buf, data), (unsigned int) lan_hdr_len);
-        DPRINTK("llc: %08X rec_buf_addr: %04X dev->mem_start: %lX\n",
-                llc, ntohs(rarb.rec_buf_addr), dev->mem_start);
-        DPRINTK("dsap: %02X, ssap: %02X, llc: %02X, protid: %02X%02X%02X, "
-                "ethertype: %04X\n",
-                (int) readb(llc + DSAP_OFST), (int) readb(llc + SSAP_OFST),
-                (int) readb(llc + LLC_OFST), (int) readb(llc + PROTID_OFST),
-                (int) readb(llc+PROTID_OFST+1),(int)readb(llc+PROTID_OFST + 2),
-                (int) ntohs(readw(llc + ETHERTYPE_OFST)));
-#endif
-        if (readb(llc + offsetof(struct trllc, llc)) != UI_CMD) {
-                SET_PAGE(ti->asb_page);
-                writeb(DATA_LOST, ti->asb + RETCODE_OFST);
-                dev->stats.rx_dropped++;
-                writeb(RESP_IN_ASB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD);
-                return;
-        }
-        length = ntohs(rarb.frame_len);
-        if (readb(llc + DSAP_OFST) == EXTENDED_SAP &&
-           readb(llc + SSAP_OFST) == EXTENDED_SAP &&
-                length >= hdr_len)      IPv4_p = 1;
-#if TR_VERBOSE
-#define SADDR_OFST      8
-#define DADDR_OFST      2
-
-        if (!IPv4_p) {
-
-                void __iomem *trhhdr = rbuf + offsetof(struct rec_buf, data);
-                u8 saddr[6];
-                u8 daddr[6];
-                int i;
-                for (i = 0 ; i < 6 ; i++)
-                        saddr[i] = readb(trhhdr + SADDR_OFST + i);
-                for (i = 0 ; i < 6 ; i++)
-                        daddr[i] = readb(trhhdr + DADDR_OFST + i);
-                DPRINTK("Probably non-IP frame received.\n");
-                DPRINTK("ssap: %02X dsap: %02X "
-                        "saddr: %pM daddr: %pM\n",
-                        readb(llc + SSAP_OFST), readb(llc + DSAP_OFST),
-                        saddr, daddr);
-        }
-#endif
-
-        /*BMS handle the case she comes in with few hops but leaves with many */
-        skb_size=length-lan_hdr_len+sizeof(struct trh_hdr)+sizeof(struct trllc);
-
-        if (!(skb = dev_alloc_skb(skb_size))) {
-                DPRINTK("out of memory. frame dropped.\n");
-                dev->stats.rx_dropped++;
-                SET_PAGE(ti->asb_page);
-                writeb(DATA_LOST, ti->asb + offsetof(struct asb_rec, ret_code));
-                writeb(RESP_IN_ASB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD);
-                return;
-        }
-        /*BMS again, if she comes in with few but leaves with many */
-        skb_reserve(skb, sizeof(struct trh_hdr) - lan_hdr_len);
-        skb_put(skb, length);
-        data = skb->data;
-        rbuffer_len = ntohs(readw(rbuf + offsetof(struct rec_buf, buf_len)));
-        rbufdata = rbuf + offsetof(struct rec_buf, data);
-
-        if (IPv4_p) {
-                /* Copy the headers without checksumming */
-                memcpy_fromio(data, rbufdata, hdr_len);
-
-                /* Watch for padded packets and bogons */
-                iph= (struct iphdr *)(data+ lan_hdr_len + sizeof(struct trllc));
-                ip_len = ntohs(iph->tot_len) - sizeof(struct iphdr);
-                length -= hdr_len;
-                if ((ip_len <= length) && (ip_len > 7))
-                        length = ip_len;
-                data += hdr_len;
-                rbuffer_len -= hdr_len;
-                rbufdata += hdr_len;
-        }
-        /* Copy the payload... */
-#define BUFFER_POINTER_OFST     2
-#define BUFFER_LENGTH_OFST      6
-        for (;;) {
-                if (ibmtr_debug_trace&TRC_INITV && length < rbuffer_len)
-                        DPRINTK("CURIOUS, length=%d < rbuffer_len=%d\n",
-                                                length,rbuffer_len);
-                if (IPv4_p)
-                        chksum=csum_partial_copy_nocheck((void*)rbufdata,
-                            data,length<rbuffer_len?length:rbuffer_len,chksum);
-                else
-                        memcpy_fromio(data, rbufdata, rbuffer_len);
-                rbuffer = ntohs(readw(rbuf+BUFFER_POINTER_OFST)) ;
-                if (!rbuffer)
-                        break;
-                rbuffer -= 2;
-                length -= rbuffer_len;
-                data += rbuffer_len;
-                rbuf = map_address(ti, rbuffer, &rbuffer_page);
-                SET_PAGE(rbuffer_page);
-                rbuffer_len = ntohs(readw(rbuf + BUFFER_LENGTH_OFST));
-                rbufdata = rbuf + offsetof(struct rec_buf, data);
-        }
-
-        SET_PAGE(ti->asb_page);
-        writeb(0, ti->asb + offsetof(struct asb_rec, ret_code));
-
-        writeb(RESP_IN_ASB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD);
-
-        dev->stats.rx_bytes += skb->len;
-        dev->stats.rx_packets++;
-
-        skb->protocol = tr_type_trans(skb, dev);
-        if (IPv4_p) {
-                skb->csum = chksum;
-                skb->ip_summed = CHECKSUM_COMPLETE;
-        }
-        netif_rx(skb);
-}                               /*tr_rx */
-
-/*****************************************************************************/
-
-static void ibmtr_reset_timer(struct timer_list *tmr, struct net_device *dev)
-{
-        tmr->expires = jiffies + TR_RETRY_INTERVAL;
-        tmr->data = (unsigned long) dev;
-        tmr->function = tok_rerun;
-        init_timer(tmr);
-        add_timer(tmr);
-}
-
-/*****************************************************************************/
-
-static void tok_rerun(unsigned long dev_addr)
-{
-        struct net_device *dev = (struct net_device *)dev_addr;
-        struct tok_info *ti = netdev_priv(dev);
-
-        if ( ti->open_action == RESTART){
-                ti->do_tok_int = FIRST_INT;
-                outb(0, dev->base_addr + ADAPTRESETREL);
-#ifdef ENABLE_PAGING
-                if (ti->page_mask)
-                        writeb(SRPR_ENABLE_PAGING,
-                                ti->mmio + ACA_OFFSET + ACA_RW + SRPR_EVEN);
-#endif
-
-                writeb(INT_ENABLE, ti->mmio + ACA_OFFSET + ACA_SET + ISRP_EVEN);
-        } else
-                tok_open_adapter(dev_addr);
-}
-
-/*****************************************************************************/
-
-static void ibmtr_readlog(struct net_device *dev)
-{
-        struct tok_info *ti;
-
-        ti = netdev_priv(dev);
-
-        ti->readlog_pending = 0;
-        SET_PAGE(ti->srb_page);
-        writeb(DIR_READ_LOG, ti->srb);
-        writeb(INT_ENABLE, ti->mmio + ACA_OFFSET + ACA_SET + ISRP_EVEN);
-        writeb(CMD_IN_SRB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD);
-
-        netif_stop_queue(dev);
-
-}
-
-/*****************************************************************************/
-
-static int ibmtr_change_mtu(struct net_device *dev, int mtu)
-{
-        struct tok_info *ti = netdev_priv(dev);
-
-        if (ti->ring_speed == 16 && mtu > ti->maxmtu16)
-                return -EINVAL;
-        if (ti->ring_speed == 4 && mtu > ti->maxmtu4)
-                return -EINVAL;
-        dev->mtu = mtu;
-        return 0;
-}
-
-/*****************************************************************************/
-#ifdef MODULE
-
-/* 3COM 3C619C supports 8 interrupts, 32 I/O ports */
-static struct net_device *dev_ibmtr[IBMTR_MAX_ADAPTERS];
-static int io[IBMTR_MAX_ADAPTERS] = { 0xa20, 0xa24 };
-static int irq[IBMTR_MAX_ADAPTERS];
-static int mem[IBMTR_MAX_ADAPTERS];
-
-MODULE_LICENSE("GPL");
-
-module_param_array(io, int, NULL, 0);
-module_param_array(irq, int, NULL, 0);
-module_param_array(mem, int, NULL, 0);
-
-static int __init ibmtr_init(void)
-{
-        int i;
-        int count=0;
-
-        find_turbo_adapters(io);
-
-        for (i = 0; i < IBMTR_MAX_ADAPTERS && io[i]; i++) {
-                struct net_device *dev;
-                irq[i] = 0;
-                mem[i] = 0;
-                dev = alloc_trdev(sizeof(struct tok_info));
-                if (dev == NULL) { 
-                        if (i == 0)
-                                return -ENOMEM;
-                        break;
-                }
-                dev->base_addr = io[i];
-                dev->irq = irq[i];
-                dev->mem_start = mem[i];
-
-                if (ibmtr_probe_card(dev)) {
-                        free_netdev(dev);
-                        continue;
-                }
-                dev_ibmtr[i] = dev;
-                count++;
-        }
-        if (count) return 0;
-        printk("ibmtr: register_netdev() returned non-zero.\n");
-        return -EIO;
-}
-module_init(ibmtr_init);
-
-static void __exit ibmtr_cleanup(void)
-{
-        int i;
-
-        for (i = 0; i < IBMTR_MAX_ADAPTERS; i++){
-                if (!dev_ibmtr[i])
-                        continue;
-                unregister_netdev(dev_ibmtr[i]);
-                ibmtr_cleanup_card(dev_ibmtr[i]);
-                free_netdev(dev_ibmtr[i]);
-        }
-}
-module_exit(ibmtr_cleanup);
-#endif
diff --git a/drivers/net/tokenring/ibmtr_cs.c b/drivers/net/tokenring/ibmtr_cs.c
deleted file mode 100644
index 356e28e4881b..000000000000
--- a/drivers/net/tokenring/ibmtr_cs.c
+++ /dev/null
@@ -1,370 +0,0 @@
-/*======================================================================
-
-    A PCMCIA token-ring driver for IBM-based cards
-
-    This driver supports the IBM PCMCIA Token-Ring Card.
-    Written by Steve Kipisz, kipisz@vnet.ibm.com or
-                             bungy@ibm.net
-
-    Written 1995,1996.
-
-    This code is based on pcnet_cs.c from David Hinds.
-    
-    V2.2.0 February 1999 - Mike Phillips phillim@amtrak.com
-
-    Linux V2.2.x presented significant changes to the underlying
-    ibmtr.c code.  Mainly the code became a lot more organized and
-    modular.
-
-    This caused the old PCMCIA Token Ring driver to give up and go 
-    home early. Instead of just patching the old code to make it 
-    work, the PCMCIA code has been streamlined, updated and possibly
-    improved.
-
-    This code now only contains code required for the Card Services.
-    All we do here is set the card up enough so that the real ibmtr.c
-    driver can find it and work with it properly.
-
-    i.e. We set up the io port, irq, mmio memory and shared ram
-    memory.  This enables ibmtr_probe in ibmtr.c to find the card and
-    configure it as though it was a normal ISA and/or PnP card.
-
-    CHANGES
-
-    v2.2.5 April 1999 Mike Phillips (phillim@amtrak.com)
-    Obscure bug fix, required changed to ibmtr.c not ibmtr_cs.c
-    
-    v2.2.7 May 1999 Mike Phillips (phillim@amtrak.com)
-    Updated to version 2.2.7 to match the first version of the kernel
-    that the modification to ibmtr.c were incorporated into.
-    
-    v2.2.17 July 2000 Burt Silverman (burts@us.ibm.com)
-    Address translation feature of PCMCIA controller is usable so
-    memory windows can be placed in High memory (meaning above
-    0xFFFFF.)
-
-======================================================================*/
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/ptrace.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/timer.h>
-#include <linux/module.h>
-#include <linux/netdevice.h>
-#include <linux/trdevice.h>
-#include <linux/ibmtr.h>
-
-#include <pcmcia/cistpl.h>
-#include <pcmcia/ds.h>
-
-#include <asm/uaccess.h>
-#include <asm/io.h>
-
-#define PCMCIA
-#include "ibmtr.c"
-
-
-/*====================================================================*/
-
-/* Parameters that can be set with 'insmod' */
-
-/* MMIO base address */
-static u_long mmiobase = 0xce000;
-
-/* SRAM base address */
-static u_long srambase = 0xd0000;
-
-/* SRAM size 8,16,32,64 */
-static u_long sramsize = 64;
-
-/* Ringspeed 4,16 */
-static int ringspeed = 16;
-
-module_param(mmiobase, ulong, 0);
-module_param(srambase, ulong, 0);
-module_param(sramsize, ulong, 0);
-module_param(ringspeed, int, 0);
-MODULE_LICENSE("GPL");
-
-/*====================================================================*/
-
-static int ibmtr_config(struct pcmcia_device *link);
-static void ibmtr_hw_setup(struct net_device *dev, u_int mmiobase);
-static void ibmtr_release(struct pcmcia_device *link);
-static void ibmtr_detach(struct pcmcia_device *p_dev);
-
-/*====================================================================*/
-
-typedef struct ibmtr_dev_t {
-        struct pcmcia_device    *p_dev;
-        struct net_device       *dev;
-        struct tok_info         *ti;
-} ibmtr_dev_t;
-
-static irqreturn_t ibmtr_interrupt(int irq, void *dev_id) {
-        ibmtr_dev_t *info = dev_id;
-        struct net_device *dev = info->dev;
-        return tok_interrupt(irq, dev);
-};
-
-static int __devinit ibmtr_attach(struct pcmcia_device *link)
-{
-    ibmtr_dev_t *info;
-    struct net_device *dev;
-
-    dev_dbg(&link->dev, "ibmtr_attach()\n");
-
-    /* Create new token-ring device */
-    info = kzalloc(sizeof(*info), GFP_KERNEL);
-    if (!info) return -ENOMEM;
-    dev = alloc_trdev(sizeof(struct tok_info));
-    if (!dev) {
-        kfree(info);
-        return -ENOMEM;
-    }
-
-    info->p_dev = link;
-    link->priv = info;
-    info->ti = netdev_priv(dev);
-
-    link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
-    link->resource[0]->end = 4;
-    link->config_flags |= CONF_ENABLE_IRQ;
-    link->config_regs = PRESENT_OPTION;
-
-    info->dev = dev;
-
-    return ibmtr_config(link);
-} /* ibmtr_attach */
-
-static void ibmtr_detach(struct pcmcia_device *link)
-{
-    struct ibmtr_dev_t *info = link->priv;
-    struct net_device *dev = info->dev;
-     struct tok_info *ti = netdev_priv(dev);
-
-    dev_dbg(&link->dev, "ibmtr_detach\n");
-    
-    /* 
-     * When the card removal interrupt hits tok_interrupt(), 
-     * bail out early, so we don't crash the machine 
-     */
-    ti->sram_phys |= 1;
-
-    unregister_netdev(dev);
-    
-    del_timer_sync(&(ti->tr_timer));
-
-    ibmtr_release(link);
-
-    free_netdev(dev);
-    kfree(info);
-} /* ibmtr_detach */
-
-static int __devinit ibmtr_config(struct pcmcia_device *link)
-{
-    ibmtr_dev_t *info = link->priv;
-    struct net_device *dev = info->dev;
-    struct tok_info *ti = netdev_priv(dev);
-    int i, ret;
-
-    dev_dbg(&link->dev, "ibmtr_config\n");
-
-    link->io_lines = 16;
-    link->config_index = 0x61;
-
-    /* Determine if this is PRIMARY or ALTERNATE. */
-
-    /* Try PRIMARY card at 0xA20-0xA23 */
-    link->resource[0]->start = 0xA20;
-    i = pcmcia_request_io(link);
-    if (i != 0) {
-        /* Couldn't get 0xA20-0xA23.  Try ALTERNATE at 0xA24-0xA27. */
-        link->resource[0]->start = 0xA24;
-        ret = pcmcia_request_io(link);
-        if (ret)
-                goto failed;
-    }
-    dev->base_addr = link->resource[0]->start;
-
-    ret = pcmcia_request_exclusive_irq(link, ibmtr_interrupt);
-    if (ret)
-            goto failed;
-    dev->irq = link->irq;
-    ti->irq = link->irq;
-    ti->global_int_enable=GLOBAL_INT_ENABLE+((dev->irq==9) ? 2 : dev->irq);
-
-    /* Allocate the MMIO memory window */
-    link->resource[2]->flags |= WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM|WIN_ENABLE;
-    link->resource[2]->flags |= WIN_USE_WAIT;
-    link->resource[2]->start = 0;
-    link->resource[2]->end = 0x2000;
-    ret = pcmcia_request_window(link, link->resource[2], 250);
-    if (ret)
-            goto failed;
-
-    ret = pcmcia_map_mem_page(link, link->resource[2], mmiobase);
-    if (ret)
-            goto failed;
-    ti->mmio = ioremap(link->resource[2]->start,
-                    resource_size(link->resource[2]));
-
-    /* Allocate the SRAM memory window */
-    link->resource[3]->flags = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM|WIN_ENABLE;
-    link->resource[3]->flags |= WIN_USE_WAIT;
-    link->resource[3]->start = 0;
-    link->resource[3]->end = sramsize * 1024;
-    ret = pcmcia_request_window(link, link->resource[3], 250);
-    if (ret)
-            goto failed;
-
-    ret = pcmcia_map_mem_page(link, link->resource[3], srambase);
-    if (ret)
-            goto failed;
-
-    ti->sram_base = srambase >> 12;
-    ti->sram_virt = ioremap(link->resource[3]->start,
-                    resource_size(link->resource[3]));
-    ti->sram_phys = link->resource[3]->start;
-
-    ret = pcmcia_enable_device(link);
-    if (ret)
-            goto failed;
-
-    /*  Set up the Token-Ring Controller Configuration Register and
-        turn on the card.  Check the "Local Area Network Credit Card
-        Adapters Technical Reference"  SC30-3585 for this info.  */
-    ibmtr_hw_setup(dev, mmiobase);
-
-    SET_NETDEV_DEV(dev, &link->dev);
-
-    i = ibmtr_probe_card(dev);
-    if (i != 0) {
-        pr_notice("register_netdev() failed\n");
-        goto failed;
-    }
-
-    netdev_info(dev, "port %#3lx, irq %d, mmio %#5lx, sram %#5lx, hwaddr=%pM\n",
-                dev->base_addr, dev->irq,
-                (u_long)ti->mmio, (u_long)(ti->sram_base << 12),
-                dev->dev_addr);
-    return 0;
-
-failed:
-    ibmtr_release(link);
-    return -ENODEV;
-} /* ibmtr_config */
-
-static void ibmtr_release(struct pcmcia_device *link)
-{
-        ibmtr_dev_t *info = link->priv;
-        struct net_device *dev = info->dev;
-
-        dev_dbg(&link->dev, "ibmtr_release\n");
-
-        if (link->resource[2]->end) {
-                struct tok_info *ti = netdev_priv(dev);
-                iounmap(ti->mmio);
-        }
-        pcmcia_disable_device(link);
-}
-
-static int ibmtr_suspend(struct pcmcia_device *link)
-{
-        ibmtr_dev_t *info = link->priv;
-        struct net_device *dev = info->dev;
-
-        if (link->open)
-                netif_device_detach(dev);
-
-        return 0;
-}
-
-static int __devinit ibmtr_resume(struct pcmcia_device *link)
-{
-        ibmtr_dev_t *info = link->priv;
-        struct net_device *dev = info->dev;
-
-        if (link->open) {
-                ibmtr_probe(dev);       /* really? */
-                netif_device_attach(dev);
-        }
-
-        return 0;
-}
-
-
-/*====================================================================*/
-
-static void ibmtr_hw_setup(struct net_device *dev, u_int mmiobase)
-{
-    int i;
-
-    /* Bizarre IBM behavior, there are 16 bits of information we
-       need to set, but the card only allows us to send 4 bits at a 
-       time.  For each byte sent to base_addr, bits 7-4 tell the
-       card which part of the 16 bits we are setting, bits 3-0 contain 
-       the actual information */
-
-    /* First nibble provides 4 bits of mmio */
-    i = (mmiobase >> 16) & 0x0F;
-    outb(i, dev->base_addr);
-
-    /* Second nibble provides 3 bits of mmio */
-    i = 0x10 | ((mmiobase >> 12) & 0x0E);
-    outb(i, dev->base_addr);
-
-    /* Third nibble, hard-coded values */
-    i = 0x26;
-    outb(i, dev->base_addr);
-
-    /* Fourth nibble sets shared ram page size */
-
-    /* 8 = 00, 16 = 01, 32 = 10, 64 = 11 */          
-    i = (sramsize >> 4) & 0x07;
-    i = ((i == 4) ? 3 : i) << 2;
-    i |= 0x30;
-
-    if (ringspeed == 16)
-        i |= 2;
-    if (dev->base_addr == 0xA24)
-        i |= 1;
-    outb(i, dev->base_addr);
-
-    /* 0x40 will release the card for use */
-    outb(0x40, dev->base_addr);
-}
-
-static const struct pcmcia_device_id ibmtr_ids[] = {
-        PCMCIA_DEVICE_PROD_ID12("3Com", "TokenLink Velocity PC Card", 0x41240e5b, 0x82c3734e),
-        PCMCIA_DEVICE_PROD_ID12("IBM", "TOKEN RING", 0xb569a6e5, 0xbf8eed47),
-        PCMCIA_DEVICE_NULL,
-};
-MODULE_DEVICE_TABLE(pcmcia, ibmtr_ids);
-
-static struct pcmcia_driver ibmtr_cs_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "ibmtr_cs",
-        .probe          = ibmtr_attach,
-        .remove         = ibmtr_detach,
-        .id_table       = ibmtr_ids,
-        .suspend        = ibmtr_suspend,
-        .resume         = ibmtr_resume,
-};
-
-static int __init init_ibmtr_cs(void)
-{
-        return pcmcia_register_driver(&ibmtr_cs_driver);
-}
-
-static void __exit exit_ibmtr_cs(void)
-{
-        pcmcia_unregister_driver(&ibmtr_cs_driver);
-}
-
-module_init(init_ibmtr_cs);
-module_exit(exit_ibmtr_cs);
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
deleted file mode 100644
index 3e4b4f091113..000000000000
--- a/drivers/net/tokenring/lanstreamer.c
+++ /dev/null
@@ -1,1917 +0,0 @@
-/*
- *   lanstreamer.c -- driver for the IBM Auto LANStreamer PCI Adapter
- *
- *  Written By: Mike Sullivan, IBM Corporation
- *
- *  Copyright (C) 1999 IBM Corporation
- *
- *  Linux driver for IBM PCI tokenring cards based on the LanStreamer MPC
- *  chipset. 
- *
- *  This driver is based on the olympic driver for IBM PCI TokenRing cards (Pit/Pit-Phy/Olympic
- *  chipsets) written  by:
- *      1999 Peter De Schrijver All Rights Reserved
- *      1999 Mike Phillips (phillim@amtrak.com)
- *
- *  Base Driver Skeleton:
- *      Written 1993-94 by Donald Becker.
- *
- *      Copyright 1993 United States Government as represented by the
- *      Director, National Security Agency.
- *
- * This program is free software; you can redistribute it and/or modify      
- * it under the terms of the GNU General Public License as published by      
- * the Free Software Foundation; either version 2 of the License, or         
- * (at your option) any later version.                                       
- *                                                                           
- * This program is distributed in the hope that it will be useful,           
- * but WITHOUT ANY WARRANTY; without even the implied warranty of            
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             
- * GNU General Public License for more details.                              
- *                                                                           
- * NO WARRANTY                                                               
- * THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR        
- * CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT      
- * LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,      
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is    
- * solely responsible for determining the appropriateness of using and       
- * distributing the Program and assumes all risks associated with its        
- * exercise of rights under this Agreement, including but not limited to     
- * the risks and costs of program errors, damage to or loss of data,         
- * programs or equipment, and unavailability or interruption of operations.  
- *                                                                           
- * DISCLAIMER OF LIABILITY                                                   
- * NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY   
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL        
- * DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND   
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR     
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE    
- * USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED  
- * HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES             
- *                                                                           
- * You should have received a copy of the GNU General Public License         
- * along with this program; if not, write to the Free Software               
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
- *                                                                           
- * 
- *  12/10/99 - Alpha Release 0.1.0
- *            First release to the public
- *  03/03/00 - Merged to kernel, indented -kr -i8 -bri0, fixed some missing
- *              malloc free checks, reviewed code. <alan@redhat.com>
- *  03/13/00 - Added spinlocks for smp
- *  03/08/01 - Added support for module_init() and module_exit()
- *  08/15/01 - Added ioctl() functionality for debugging, changed netif_*_queue
- *             calls and other incorrectness - Kent Yoder <yoder1@us.ibm.com>
- *  11/05/01 - Restructured the interrupt function, added delays, reduced the 
- *             the number of TX descriptors to 1, which together can prevent 
- *             the card from locking up the box - <yoder1@us.ibm.com>
- *  09/27/02 - New PCI interface + bug fix. - <yoder1@us.ibm.com>
- *  11/13/02 - Removed free_irq calls which could cause a hang, added
- *             netif_carrier_{on|off} - <yoder1@us.ibm.com>
- *  
- *  To Do:
- *
- *
- *  If Problems do Occur
- *  Most problems can be rectified by either closing and opening the interface
- *  (ifconfig down and up) or rmmod and insmod'ing the driver (a bit difficult
- *  if compiled into the kernel).
- */
-
-/* Change STREAMER_DEBUG to 1 to get verbose, and I mean really verbose, messages */
-
-#define STREAMER_DEBUG 0
-#define STREAMER_DEBUG_PACKETS 0
-
-/* Change STREAMER_NETWORK_MONITOR to receive mac frames through the arb channel.
- * Will also create a /proc/net/streamer_tr entry if proc_fs is compiled into the
- * kernel.
- * Intended to be used to create a ring-error reporting network module 
- * i.e. it will give you the source address of beaconers on the ring 
- */
-
-#define STREAMER_NETWORK_MONITOR 0
-
-/* #define CONFIG_PROC_FS */
-
-/*
- *  Allow or disallow ioctl's for debugging
- */
-
-#define STREAMER_IOCTL 0
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/timer.h>
-#include <linux/in.h>
-#include <linux/ioport.h>
-#include <linux/string.h>
-#include <linux/proc_fs.h>
-#include <linux/ptrace.h>
-#include <linux/skbuff.h>
-#include <linux/interrupt.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/trdevice.h>
-#include <linux/stddef.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/dma-mapping.h>
-#include <linux/spinlock.h>
-#include <linux/bitops.h>
-#include <linux/jiffies.h>
-#include <linux/slab.h>
-
-#include <net/net_namespace.h>
-#include <net/checksum.h>
-
-#include <asm/io.h>
-
-#include "lanstreamer.h"
-
-#if (BITS_PER_LONG == 64)
-#error broken on 64-bit: stores pointer to rx_ring->buffer in 32-bit int
-#endif
-
-
-/* I've got to put some intelligence into the version number so that Peter and I know
- * which version of the code somebody has got. 
- * Version Number = a.b.c.d  where a.b.c is the level of code and d is the latest author.
- * So 0.0.1.pds = Peter, 0.0.1.mlp = Mike
- * 
- * Official releases will only have an a.b.c version number format.
- */
-
-static char version[] = "LanStreamer.c v0.4.0 03/08/01 - Mike Sullivan\n"
-                        "              v0.5.3 11/13/02 - Kent Yoder";
-
-static DEFINE_PCI_DEVICE_TABLE(streamer_pci_tbl) = {
-        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_TR, PCI_ANY_ID, PCI_ANY_ID,},
-        {}      /* terminating entry */
-};
-MODULE_DEVICE_TABLE(pci,streamer_pci_tbl);
-
-
-static char *open_maj_error[] = {
-        "No error", "Lobe Media Test", "Physical Insertion",
-        "Address Verification", "Neighbor Notification (Ring Poll)",
-        "Request Parameters", "FDX Registration Request",
-        "FDX Lobe Media Test", "FDX Duplicate Address Check",
-        "Unknown stage"
-};
-
-static char *open_min_error[] = {
-        "No error", "Function Failure", "Signal Lost", "Wire Fault",
-        "Ring Speed Mismatch", "Timeout", "Ring Failure", "Ring Beaconing",
-        "Duplicate Node Address", "Request Parameters", "Remove Received",
-        "Reserved", "Reserved", "No Monitor Detected for RPL",
-        "Monitor Contention failer for RPL", "FDX Protocol Error"
-};
-
-/* Module parameters */
-
-/* Ring Speed 0,4,16
- * 0 = Autosense         
- * 4,16 = Selected speed only, no autosense
- * This allows the card to be the first on the ring
- * and become the active monitor.
- *
- * WARNING: Some hubs will allow you to insert
- * at the wrong speed
- */
-
-static int ringspeed[STREAMER_MAX_ADAPTERS] = { 0, };
-
-module_param_array(ringspeed, int, NULL, 0);
-
-/* Packet buffer size */
-
-static int pkt_buf_sz[STREAMER_MAX_ADAPTERS] = { 0, };
-
-module_param_array(pkt_buf_sz, int, NULL, 0);
-
-/* Message Level */
-
-static int message_level[STREAMER_MAX_ADAPTERS] = { 1, };
-
-module_param_array(message_level, int, NULL, 0);
-
-#if STREAMER_IOCTL
-static int streamer_ioctl(struct net_device *, struct ifreq *, int);
-#endif
-
-static int streamer_reset(struct net_device *dev);
-static int streamer_open(struct net_device *dev);
-static netdev_tx_t streamer_xmit(struct sk_buff *skb,
-                                       struct net_device *dev);
-static int streamer_close(struct net_device *dev);
-static void streamer_set_rx_mode(struct net_device *dev);
-static irqreturn_t streamer_interrupt(int irq, void *dev_id);
-static int streamer_set_mac_address(struct net_device *dev, void *addr);
-static void streamer_arb_cmd(struct net_device *dev);
-static int streamer_change_mtu(struct net_device *dev, int mtu);
-static void streamer_srb_bh(struct net_device *dev);
-static void streamer_asb_bh(struct net_device *dev);
-#if STREAMER_NETWORK_MONITOR
-#ifdef CONFIG_PROC_FS
-static int streamer_proc_info(char *buffer, char **start, off_t offset,
-                              int length, int *eof, void *data);
-static int sprintf_info(char *buffer, struct net_device *dev);
-struct streamer_private *dev_streamer=NULL;
-#endif
-#endif
-
-static const struct net_device_ops streamer_netdev_ops = {
-        .ndo_open               = streamer_open,
-        .ndo_stop               = streamer_close,
-        .ndo_start_xmit         = streamer_xmit,
-        .ndo_change_mtu         = streamer_change_mtu,
-#if STREAMER_IOCTL
-        .ndo_do_ioctl           = streamer_ioctl,
-#endif
-        .ndo_set_rx_mode        = streamer_set_rx_mode,
-        .ndo_set_mac_address    = streamer_set_mac_address,
-};
-
-static int __devinit streamer_init_one(struct pci_dev *pdev,
-                                       const struct pci_device_id *ent)
-{
-        struct net_device *dev;
-        struct streamer_private *streamer_priv;
-        unsigned long pio_start, pio_end, pio_flags, pio_len;
-        unsigned long mmio_start, mmio_end, mmio_flags, mmio_len;
-        int rc = 0;
-        static int card_no=-1;
-        u16 pcr;
-
-#if STREAMER_DEBUG
-        printk("lanstreamer::streamer_init_one, entry pdev %p\n",pdev);
-#endif
-
-        card_no++;
-        dev = alloc_trdev(sizeof(*streamer_priv));
-        if (dev==NULL) {
-                printk(KERN_ERR "lanstreamer: out of memory.\n");
-                return -ENOMEM;
-        }
-
-        streamer_priv = netdev_priv(dev);
-
-#if STREAMER_NETWORK_MONITOR
-#ifdef CONFIG_PROC_FS
-        if (!dev_streamer)
-                create_proc_read_entry("streamer_tr", 0, init_net.proc_net,
-                                        streamer_proc_info, NULL); 
-        streamer_priv->next = dev_streamer;
-        dev_streamer = streamer_priv;
-#endif
-#endif
-
-        rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
-        if (rc) {
-                printk(KERN_ERR "%s: No suitable PCI mapping available.\n",
-                                dev->name);
-                rc = -ENODEV;
-                goto err_out;
-        }
-
-        rc = pci_enable_device(pdev);
-        if (rc) {
-                printk(KERN_ERR "lanstreamer: unable to enable pci device\n");
-                rc=-EIO;
-                goto err_out;
-        }
-
-        pci_set_master(pdev);
-
-        rc = pci_set_mwi(pdev);
-        if (rc) {
-                printk(KERN_ERR "lanstreamer: unable to enable MWI on pci device\n");
-                goto err_out_disable;
-        }
-
-        pio_start = pci_resource_start(pdev, 0);
-        pio_end = pci_resource_end(pdev, 0);
-        pio_flags = pci_resource_flags(pdev, 0);
-        pio_len = pci_resource_len(pdev, 0);
-
-        mmio_start = pci_resource_start(pdev, 1);
-        mmio_end = pci_resource_end(pdev, 1);
-        mmio_flags = pci_resource_flags(pdev, 1);
-        mmio_len = pci_resource_len(pdev, 1);
-
-#if STREAMER_DEBUG
-        printk("lanstreamer: pio_start %x pio_end %x pio_len %x pio_flags %x\n",
-                pio_start, pio_end, pio_len, pio_flags);
-        printk("lanstreamer: mmio_start %x mmio_end %x mmio_len %x mmio_flags %x\n",
-                mmio_start, mmio_end, mmio_flags, mmio_len);
-#endif
-
-        if (!request_region(pio_start, pio_len, "lanstreamer")) {
-                printk(KERN_ERR "lanstreamer: unable to get pci io addr %lx\n",
-                        pio_start);
-                rc= -EBUSY;
-                goto err_out_mwi;
-        }
-
-        if (!request_mem_region(mmio_start, mmio_len, "lanstreamer")) {
-                printk(KERN_ERR "lanstreamer: unable to get pci mmio addr %lx\n",
-                        mmio_start);
-                rc= -EBUSY;
-                goto err_out_free_pio;
-        }
-
-        streamer_priv->streamer_mmio=ioremap(mmio_start, mmio_len);
-        if (streamer_priv->streamer_mmio == NULL) {
-                printk(KERN_ERR "lanstreamer: unable to remap MMIO %lx\n",
-                        mmio_start);
-                rc= -EIO;
-                goto err_out_free_mmio;
-        }
-
-        init_waitqueue_head(&streamer_priv->srb_wait);
-        init_waitqueue_head(&streamer_priv->trb_wait);
-
-        dev->netdev_ops = &streamer_netdev_ops;
-        dev->irq = pdev->irq;
-        dev->base_addr=pio_start;
-        SET_NETDEV_DEV(dev, &pdev->dev);
-
-        streamer_priv->streamer_card_name = (char *)pdev->resource[0].name;
-        streamer_priv->pci_dev = pdev;
-
-        if ((pkt_buf_sz[card_no] < 100) || (pkt_buf_sz[card_no] > 18000))
-                streamer_priv->pkt_buf_sz = PKT_BUF_SZ;
-        else
-                streamer_priv->pkt_buf_sz = pkt_buf_sz[card_no];
-
-        streamer_priv->streamer_ring_speed = ringspeed[card_no];
-        streamer_priv->streamer_message_level = message_level[card_no];
-
-        pci_set_drvdata(pdev, dev);
-
-        spin_lock_init(&streamer_priv->streamer_lock);
-
-        pci_read_config_word (pdev, PCI_COMMAND, &pcr);
-        pcr |= PCI_COMMAND_SERR;
-        pci_write_config_word (pdev, PCI_COMMAND, pcr);
-
-        printk("%s\n", version);
-        printk("%s: %s. I/O at %hx, MMIO at %p, using irq %d\n",dev->name,
-                streamer_priv->streamer_card_name,
-                (unsigned int) dev->base_addr,
-                streamer_priv->streamer_mmio, 
-                dev->irq);
-
-        if (streamer_reset(dev))
-                goto err_out_unmap;
-
-        rc = register_netdev(dev);
-        if (rc)
-                goto err_out_unmap;
-        return 0;
-
-err_out_unmap:
-        iounmap(streamer_priv->streamer_mmio);
-err_out_free_mmio:
-        release_mem_region(mmio_start, mmio_len);
-err_out_free_pio:
-        release_region(pio_start, pio_len);
-err_out_mwi:
-        pci_clear_mwi(pdev);
-err_out_disable:
-        pci_disable_device(pdev);
-err_out:
-        free_netdev(dev);
-#if STREAMER_DEBUG
-        printk("lanstreamer: Exit error %x\n",rc);
-#endif
-        return rc;
-}
-
-static void __devexit streamer_remove_one(struct pci_dev *pdev)
-{
-        struct net_device *dev=pci_get_drvdata(pdev);
-        struct streamer_private *streamer_priv;
-
-#if STREAMER_DEBUG
-        printk("lanstreamer::streamer_remove_one entry pdev %p\n",pdev);
-#endif
-
-        if (dev == NULL) {
-                printk(KERN_ERR "lanstreamer::streamer_remove_one, ERROR dev is NULL\n");
-                return;
-        }
-
-        streamer_priv=netdev_priv(dev);
-        if (streamer_priv == NULL) {
-                printk(KERN_ERR "lanstreamer::streamer_remove_one, ERROR dev->priv is NULL\n");
-                return;
-        }
-
-#if STREAMER_NETWORK_MONITOR
-#ifdef CONFIG_PROC_FS
-        {
-                struct streamer_private **p, **next;
-
-                for (p = &dev_streamer; *p; p = next) {
-                        next = &(*p)->next;
-                        if (*p == streamer_priv) {
-                                *p = *next;
-                                break;
-                        }
-                }
-                if (!dev_streamer)
-                        remove_proc_entry("streamer_tr", init_net.proc_net);
-        }
-#endif
-#endif
-
-        unregister_netdev(dev);
-        iounmap(streamer_priv->streamer_mmio);
-        release_mem_region(pci_resource_start(pdev, 1), pci_resource_len(pdev,1));
-        release_region(pci_resource_start(pdev, 0), pci_resource_len(pdev,0));
-        pci_clear_mwi(pdev);
-        pci_disable_device(pdev);
-        free_netdev(dev);
-        pci_set_drvdata(pdev, NULL);
-}
-
-
-static int streamer_reset(struct net_device *dev)
-{
-        struct streamer_private *streamer_priv;
-        __u8 __iomem *streamer_mmio;
-        unsigned long t;
-        unsigned int uaa_addr;
-        struct sk_buff *skb = NULL;
-        __u16 misr;
-
-        streamer_priv = netdev_priv(dev);
-        streamer_mmio = streamer_priv->streamer_mmio;
-
-        writew(readw(streamer_mmio + BCTL) | BCTL_SOFTRESET, streamer_mmio + BCTL);
-        t = jiffies;
-        /* Hold soft reset bit for a while */
-        ssleep(1);
-        
-        writew(readw(streamer_mmio + BCTL) & ~BCTL_SOFTRESET,
-               streamer_mmio + BCTL);
-
-#if STREAMER_DEBUG
-        printk("BCTL: %x\n", readw(streamer_mmio + BCTL));
-        printk("GPR: %x\n", readw(streamer_mmio + GPR));
-        printk("SISRMASK: %x\n", readw(streamer_mmio + SISR_MASK));
-#endif
-        writew(readw(streamer_mmio + BCTL) | (BCTL_RX_FIFO_8 | BCTL_TX_FIFO_8), streamer_mmio + BCTL );
-
-        if (streamer_priv->streamer_ring_speed == 0) {  /* Autosense */
-                writew(readw(streamer_mmio + GPR) | GPR_AUTOSENSE,
-                       streamer_mmio + GPR);
-                if (streamer_priv->streamer_message_level)
-                        printk(KERN_INFO "%s: Ringspeed autosense mode on\n",
-                               dev->name);
-        } else if (streamer_priv->streamer_ring_speed == 16) {
-                if (streamer_priv->streamer_message_level)
-                        printk(KERN_INFO "%s: Trying to open at 16 Mbps as requested\n",
-                               dev->name);
-                writew(GPR_16MBPS, streamer_mmio + GPR);
-        } else if (streamer_priv->streamer_ring_speed == 4) {
-                if (streamer_priv->streamer_message_level)
-                        printk(KERN_INFO "%s: Trying to open at 4 Mbps as requested\n",
-                               dev->name);
-                writew(0, streamer_mmio + GPR);
-        }
-
-        skb = dev_alloc_skb(streamer_priv->pkt_buf_sz);
-        if (!skb) {
-                printk(KERN_INFO "%s: skb allocation for diagnostics failed...proceeding\n",
-                       dev->name);
-        } else {
-                struct streamer_rx_desc *rx_ring;
-                u8 *data;
-
-                rx_ring=(struct streamer_rx_desc *)skb->data;
-                data=((u8 *)skb->data)+sizeof(struct streamer_rx_desc);
-                rx_ring->forward=0;
-                rx_ring->status=0;
-                rx_ring->buffer=cpu_to_le32(pci_map_single(streamer_priv->pci_dev, data, 
-                                                        512, PCI_DMA_FROMDEVICE));
-                rx_ring->framelen_buflen=512; 
-                writel(cpu_to_le32(pci_map_single(streamer_priv->pci_dev, rx_ring, 512, PCI_DMA_FROMDEVICE)),
-                        streamer_mmio+RXBDA);
-        }
-
-#if STREAMER_DEBUG
-        printk("GPR = %x\n", readw(streamer_mmio + GPR));
-#endif
-        /* start solo init */
-        writew(SISR_MI, streamer_mmio + SISR_MASK_SUM);
-
-        while (!((readw(streamer_mmio + SISR)) & SISR_SRB_REPLY)) {
-                msleep_interruptible(100);
-                if (time_after(jiffies, t + 40 * HZ)) {
-                        printk(KERN_ERR
-                               "IBM PCI tokenring card not responding\n");
-                        release_region(dev->base_addr, STREAMER_IO_SPACE);
-                        if (skb)
-                                dev_kfree_skb(skb);
-                        return -1;
-                }
-        }
-        writew(~SISR_SRB_REPLY, streamer_mmio + SISR_RUM);
-        misr = readw(streamer_mmio + MISR_RUM);
-        writew(~misr, streamer_mmio + MISR_RUM);
-
-        if (skb)
-                dev_kfree_skb(skb);     /* release skb used for diagnostics */
-
-#if STREAMER_DEBUG
-        printk("LAPWWO: %x, LAPA: %x LAPE:  %x\n",
-               readw(streamer_mmio + LAPWWO), readw(streamer_mmio + LAPA),
-               readw(streamer_mmio + LAPE));
-#endif
-
-#if STREAMER_DEBUG
-        {
-                int i;
-                writew(readw(streamer_mmio + LAPWWO),
-                       streamer_mmio + LAPA);
-                printk("initialization response srb dump: ");
-                for (i = 0; i < 10; i++)
-                        printk("%x:",
-                               ntohs(readw(streamer_mmio + LAPDINC)));
-                printk("\n");
-        }
-#endif
-
-        writew(readw(streamer_mmio + LAPWWO) + 6, streamer_mmio + LAPA);
-        if (readw(streamer_mmio + LAPD)) {
-                printk(KERN_INFO "tokenring card initialization failed. errorcode : %x\n",
-                       ntohs(readw(streamer_mmio + LAPD)));
-                release_region(dev->base_addr, STREAMER_IO_SPACE);
-                return -1;
-        }
-
-        writew(readw(streamer_mmio + LAPWWO) + 8, streamer_mmio + LAPA);
-        uaa_addr = ntohs(readw(streamer_mmio + LAPDINC));
-        readw(streamer_mmio + LAPDINC); /* skip over Level.Addr field */
-        streamer_priv->streamer_addr_table_addr = ntohs(readw(streamer_mmio + LAPDINC));
-        streamer_priv->streamer_parms_addr = ntohs(readw(streamer_mmio + LAPDINC));
-
-#if STREAMER_DEBUG
-        printk("UAA resides at %x\n", uaa_addr);
-#endif
-
-        /* setup uaa area for access with LAPD */
-        {
-                int i;
-                __u16 addr;
-                writew(uaa_addr, streamer_mmio + LAPA);
-                for (i = 0; i < 6; i += 2) {
-                        addr=ntohs(readw(streamer_mmio+LAPDINC));
-                        dev->dev_addr[i]= (addr >> 8) & 0xff;
-                        dev->dev_addr[i+1]= addr & 0xff;
-                }
-#if STREAMER_DEBUG
-                printk("Adapter address: %pM\n", dev->dev_addr);
-#endif
-        }
-        return 0;
-}
-
-static int streamer_open(struct net_device *dev)
-{
-        struct streamer_private *streamer_priv = netdev_priv(dev);
-        __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
-        unsigned long flags;
-        char open_error[255];
-        int i, open_finished = 1;
-        __u16 srb_word;
-        __u16 srb_open;
-        int rc;
-
-        if (readw(streamer_mmio+BMCTL_SUM) & BMCTL_RX_ENABLED) {
-                rc=streamer_reset(dev);
-        }
-
-        if (request_irq(dev->irq, streamer_interrupt, IRQF_SHARED, "lanstreamer", dev)) {
-                return -EAGAIN;
-        }
-#if STREAMER_DEBUG
-        printk("BMCTL: %x\n", readw(streamer_mmio + BMCTL_SUM));
-        printk("pending ints: %x\n", readw(streamer_mmio + SISR));
-#endif
-
-        writew(SISR_MI | SISR_SRB_REPLY, streamer_mmio + SISR_MASK);    /* more ints later, doesn't stop arb cmd interrupt */
-        writew(LISR_LIE, streamer_mmio + LISR); /* more ints later */
-
-        /* adapter is closed, so SRB is pointed to by LAPWWO */
-        writew(readw(streamer_mmio + LAPWWO), streamer_mmio + LAPA);
-
-#if STREAMER_DEBUG
-        printk("LAPWWO: %x, LAPA: %x\n", readw(streamer_mmio + LAPWWO),
-               readw(streamer_mmio + LAPA));
-        printk("LAPE: %x\n", readw(streamer_mmio + LAPE));
-        printk("SISR Mask = %04x\n", readw(streamer_mmio + SISR_MASK));
-#endif
-        do {
-                for (i = 0; i < SRB_COMMAND_SIZE; i += 2) {
-                        writew(0, streamer_mmio + LAPDINC);
-                }
-
-                writew(readw(streamer_mmio+LAPWWO),streamer_mmio+LAPA);
-                writew(htons(SRB_OPEN_ADAPTER<<8),streamer_mmio+LAPDINC) ;      /* open */
-                writew(htons(STREAMER_CLEAR_RET_CODE<<8),streamer_mmio+LAPDINC);
-                writew(STREAMER_CLEAR_RET_CODE, streamer_mmio + LAPDINC);
-
-                writew(readw(streamer_mmio + LAPWWO) + 8, streamer_mmio + LAPA);
-#if STREAMER_NETWORK_MONITOR
-                /* If Network Monitor, instruct card to copy MAC frames through the ARB */
-                writew(htons(OPEN_ADAPTER_ENABLE_FDX | OPEN_ADAPTER_PASS_ADC_MAC | OPEN_ADAPTER_PASS_ATT_MAC | OPEN_ADAPTER_PASS_BEACON), streamer_mmio + LAPDINC);     /* offset 8 word contains open options */
-#else
-                writew(htons(OPEN_ADAPTER_ENABLE_FDX), streamer_mmio + LAPDINC);        /* Offset 8 word contains Open.Options */
-#endif
-
-                if (streamer_priv->streamer_laa[0]) {
-                        writew(readw(streamer_mmio + LAPWWO) + 12, streamer_mmio + LAPA);
-                        writew(htons((streamer_priv->streamer_laa[0] << 8) | 
-                                     streamer_priv->streamer_laa[1]),streamer_mmio+LAPDINC);
-                        writew(htons((streamer_priv->streamer_laa[2] << 8) | 
-                                     streamer_priv->streamer_laa[3]),streamer_mmio+LAPDINC);
-                        writew(htons((streamer_priv->streamer_laa[4] << 8) | 
-                                     streamer_priv->streamer_laa[5]),streamer_mmio+LAPDINC);
-                        memcpy(dev->dev_addr, streamer_priv->streamer_laa, dev->addr_len);
-                }
-
-                /* save off srb open offset */
-                srb_open = readw(streamer_mmio + LAPWWO);
-#if STREAMER_DEBUG
-                writew(readw(streamer_mmio + LAPWWO),
-                       streamer_mmio + LAPA);
-                printk("srb open request:\n");
-                for (i = 0; i < 16; i++) {
-                        printk("%x:", ntohs(readw(streamer_mmio + LAPDINC)));
-                }
-                printk("\n");
-#endif
-                spin_lock_irqsave(&streamer_priv->streamer_lock, flags);
-                streamer_priv->srb_queued = 1;
-
-                /* signal solo that SRB command has been issued */
-                writew(LISR_SRB_CMD, streamer_mmio + LISR_SUM);
-                spin_unlock_irqrestore(&streamer_priv->streamer_lock, flags);
-
-                while (streamer_priv->srb_queued) {
-                        interruptible_sleep_on_timeout(&streamer_priv->srb_wait, 5 * HZ);
-                        if (signal_pending(current)) {
-                                printk(KERN_WARNING "%s: SRB timed out.\n", dev->name);
-                                printk(KERN_WARNING "SISR=%x MISR=%x, LISR=%x\n",
-                                       readw(streamer_mmio + SISR),
-                                       readw(streamer_mmio + MISR_RUM),
-                                       readw(streamer_mmio + LISR));
-                                streamer_priv->srb_queued = 0;
-                                break;
-                        }
-                }
-
-#if STREAMER_DEBUG
-                printk("SISR_MASK: %x\n", readw(streamer_mmio + SISR_MASK));
-                printk("srb open response:\n");
-                writew(srb_open, streamer_mmio + LAPA);
-                for (i = 0; i < 10; i++) {
-                        printk("%x:",
-                               ntohs(readw(streamer_mmio + LAPDINC)));
-                }
-#endif
-
-                /* If we get the same return response as we set, the interrupt wasn't raised and the open
-                 * timed out.
-                 */
-                writew(srb_open + 2, streamer_mmio + LAPA);
-                srb_word = ntohs(readw(streamer_mmio + LAPD)) >> 8;
-                if (srb_word == STREAMER_CLEAR_RET_CODE) {
-                        printk(KERN_WARNING "%s: Adapter Open time out or error.\n",
-                               dev->name);
-                        return -EIO;
-                }
-
-                if (srb_word != 0) {
-                        if (srb_word == 0x07) {
-                                if (!streamer_priv->streamer_ring_speed && open_finished) {     /* Autosense , first time around */
-                                        printk(KERN_WARNING "%s: Retrying at different ring speed\n",
-                                               dev->name);
-                                        open_finished = 0;
-                                } else {
-                                        __u16 error_code;
-
-                                        writew(srb_open + 6, streamer_mmio + LAPA);
-                                        error_code = ntohs(readw(streamer_mmio + LAPD));
-                                        strcpy(open_error, open_maj_error[(error_code & 0xf0) >> 4]);
-                                        strcat(open_error, " - ");
-                                        strcat(open_error, open_min_error[(error_code & 0x0f)]);
-
-                                        if (!streamer_priv->streamer_ring_speed &&
-                                            ((error_code & 0x0f) == 0x0d))
-                                        {
-                                                printk(KERN_WARNING "%s: Tried to autosense ring speed with no monitors present\n", dev->name);
-                                                printk(KERN_WARNING "%s: Please try again with a specified ring speed\n", dev->name);
-                                                free_irq(dev->irq, dev);
-                                                return -EIO;
-                                        }
-
-                                        printk(KERN_WARNING "%s: %s\n",
-                                               dev->name, open_error);
-                                        free_irq(dev->irq, dev);
-                                        return -EIO;
-
-                                }       /* if autosense && open_finished */
-                        } else {
-                                printk(KERN_WARNING "%s: Bad OPEN response: %x\n",
-                                       dev->name, srb_word);
-                                free_irq(dev->irq, dev);
-                                return -EIO;
-                        }
-                } else
-                        open_finished = 1;
-        } while (!(open_finished));     /* Will only loop if ring speed mismatch re-open attempted && autosense is on */
-
-        writew(srb_open + 18, streamer_mmio + LAPA);
-        srb_word=ntohs(readw(streamer_mmio+LAPD)) >> 8;
-        if (srb_word & (1 << 3))
-                if (streamer_priv->streamer_message_level)
-                        printk(KERN_INFO "%s: Opened in FDX Mode\n", dev->name);
-
-        if (srb_word & 1)
-                streamer_priv->streamer_ring_speed = 16;
-        else
-                streamer_priv->streamer_ring_speed = 4;
-
-        if (streamer_priv->streamer_message_level)
-                printk(KERN_INFO "%s: Opened in %d Mbps mode\n", 
-                        dev->name,
-                        streamer_priv->streamer_ring_speed);
-
-        writew(srb_open + 8, streamer_mmio + LAPA);
-        streamer_priv->asb = ntohs(readw(streamer_mmio + LAPDINC));
-        streamer_priv->srb = ntohs(readw(streamer_mmio + LAPDINC));
-        streamer_priv->arb = ntohs(readw(streamer_mmio + LAPDINC));
-        readw(streamer_mmio + LAPDINC); /* offset 14 word is rsvd */
-        streamer_priv->trb = ntohs(readw(streamer_mmio + LAPDINC));
-
-        streamer_priv->streamer_receive_options = 0x00;
-        streamer_priv->streamer_copy_all_options = 0;
-
-        /* setup rx ring */
-        /* enable rx channel */
-        writew(~BMCTL_RX_DIS, streamer_mmio + BMCTL_RUM);
-
-        /* setup rx descriptors */
-        streamer_priv->streamer_rx_ring=
-            kmalloc( sizeof(struct streamer_rx_desc)*
-                     STREAMER_RX_RING_SIZE,GFP_KERNEL);
-        if (!streamer_priv->streamer_rx_ring) {
-            printk(KERN_WARNING "%s ALLOC of streamer rx ring FAILED!!\n",dev->name);
-            return -EIO;
-        }
-
-        for (i = 0; i < STREAMER_RX_RING_SIZE; i++) {
-                struct sk_buff *skb;
-
-                skb = dev_alloc_skb(streamer_priv->pkt_buf_sz);
-                if (skb == NULL)
-                        break;
-
-                skb->dev = dev;
-
-                streamer_priv->streamer_rx_ring[i].forward = 
-                        cpu_to_le32(pci_map_single(streamer_priv->pci_dev, &streamer_priv->streamer_rx_ring[i + 1],
-                                        sizeof(struct streamer_rx_desc), PCI_DMA_FROMDEVICE));
-                streamer_priv->streamer_rx_ring[i].status = 0;
-                streamer_priv->streamer_rx_ring[i].buffer = 
-                        cpu_to_le32(pci_map_single(streamer_priv->pci_dev, skb->data,
-                                              streamer_priv->pkt_buf_sz, PCI_DMA_FROMDEVICE));
-                streamer_priv->streamer_rx_ring[i].framelen_buflen = streamer_priv->pkt_buf_sz;
-                streamer_priv->rx_ring_skb[i] = skb;
-        }
-        streamer_priv->streamer_rx_ring[STREAMER_RX_RING_SIZE - 1].forward =
-                                cpu_to_le32(pci_map_single(streamer_priv->pci_dev, &streamer_priv->streamer_rx_ring[0],
-                                                sizeof(struct streamer_rx_desc), PCI_DMA_FROMDEVICE));
-
-        if (i == 0) {
-                printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers. Adapter disabled\n", dev->name);
-                free_irq(dev->irq, dev);
-                return -EIO;
-        }
-
-        streamer_priv->rx_ring_last_received = STREAMER_RX_RING_SIZE - 1;       /* last processed rx status */
-
-        writel(cpu_to_le32(pci_map_single(streamer_priv->pci_dev, &streamer_priv->streamer_rx_ring[0],
-                                sizeof(struct streamer_rx_desc), PCI_DMA_TODEVICE)), 
-                streamer_mmio + RXBDA);
-        writel(cpu_to_le32(pci_map_single(streamer_priv->pci_dev, &streamer_priv->streamer_rx_ring[STREAMER_RX_RING_SIZE - 1],
-                                sizeof(struct streamer_rx_desc), PCI_DMA_TODEVICE)), 
-                streamer_mmio + RXLBDA);
-
-        /* set bus master interrupt event mask */
-        writew(MISR_RX_NOBUF | MISR_RX_EOF, streamer_mmio + MISR_MASK);
-
-
-        /* setup tx ring */
-        streamer_priv->streamer_tx_ring=kmalloc(sizeof(struct streamer_tx_desc)*
-                                                STREAMER_TX_RING_SIZE,GFP_KERNEL);
-        if (!streamer_priv->streamer_tx_ring) {
-            printk(KERN_WARNING "%s ALLOC of streamer_tx_ring FAILED\n",dev->name);
-            return -EIO;
-        }
-
-        writew(~BMCTL_TX2_DIS, streamer_mmio + BMCTL_RUM);      /* Enables TX channel 2 */
-        for (i = 0; i < STREAMER_TX_RING_SIZE; i++) {
-                streamer_priv->streamer_tx_ring[i].forward = cpu_to_le32(pci_map_single(streamer_priv->pci_dev, 
-                                                                                &streamer_priv->streamer_tx_ring[i + 1],
-                                                                                sizeof(struct streamer_tx_desc),
-                                                                                PCI_DMA_TODEVICE));
-                streamer_priv->streamer_tx_ring[i].status = 0;
-                streamer_priv->streamer_tx_ring[i].bufcnt_framelen = 0;
-                streamer_priv->streamer_tx_ring[i].buffer = 0;
-                streamer_priv->streamer_tx_ring[i].buflen = 0;
-                streamer_priv->streamer_tx_ring[i].rsvd1 = 0;
-                streamer_priv->streamer_tx_ring[i].rsvd2 = 0;
-                streamer_priv->streamer_tx_ring[i].rsvd3 = 0;
-        }
-        streamer_priv->streamer_tx_ring[STREAMER_TX_RING_SIZE - 1].forward =
-                                        cpu_to_le32(pci_map_single(streamer_priv->pci_dev, &streamer_priv->streamer_tx_ring[0],
-                                                        sizeof(struct streamer_tx_desc), PCI_DMA_TODEVICE));
-
-        streamer_priv->free_tx_ring_entries = STREAMER_TX_RING_SIZE;
-        streamer_priv->tx_ring_free = 0;        /* next entry in tx ring to use */
-        streamer_priv->tx_ring_last_status = STREAMER_TX_RING_SIZE - 1;
-
-        /* set Busmaster interrupt event mask (handle receives on interrupt only */
-        writew(MISR_TX2_EOF | MISR_RX_NOBUF | MISR_RX_EOF, streamer_mmio + MISR_MASK);
-        /* set system event interrupt mask */
-        writew(SISR_ADAPTER_CHECK | SISR_ARB_CMD | SISR_TRB_REPLY | SISR_ASB_FREE, streamer_mmio + SISR_MASK_SUM);
-
-#if STREAMER_DEBUG
-        printk("BMCTL: %x\n", readw(streamer_mmio + BMCTL_SUM));
-        printk("SISR MASK: %x\n", readw(streamer_mmio + SISR_MASK));
-#endif
-
-#if STREAMER_NETWORK_MONITOR
-
-        writew(streamer_priv->streamer_addr_table_addr, streamer_mmio + LAPA);
-        printk("%s: Node Address: %04x:%04x:%04x\n", dev->name,
-                ntohs(readw(streamer_mmio + LAPDINC)),
-                ntohs(readw(streamer_mmio + LAPDINC)),
-                ntohs(readw(streamer_mmio + LAPDINC)));
-        readw(streamer_mmio + LAPDINC);
-        readw(streamer_mmio + LAPDINC);
-        printk("%s: Functional Address: %04x:%04x\n", dev->name,
-                ntohs(readw(streamer_mmio + LAPDINC)),
-                ntohs(readw(streamer_mmio + LAPDINC)));
-
-        writew(streamer_priv->streamer_parms_addr + 4,
-                streamer_mmio + LAPA);
-        printk("%s: NAUN Address: %04x:%04x:%04x\n", dev->name,
-                ntohs(readw(streamer_mmio + LAPDINC)),
-                ntohs(readw(streamer_mmio + LAPDINC)),
-                ntohs(readw(streamer_mmio + LAPDINC)));
-#endif
-
-        netif_start_queue(dev);
-        netif_carrier_on(dev);
-        return 0;
-}
-
-/*
- *      When we enter the rx routine we do not know how many frames have been 
- *      queued on the rx channel.  Therefore we start at the next rx status
- *      position and travel around the receive ring until we have completed
- *      all the frames.
- *
- *      This means that we may process the frame before we receive the end
- *      of frame interrupt. This is why we always test the status instead
- *      of blindly processing the next frame.
- *      
- */
-static void streamer_rx(struct net_device *dev)
-{
-        struct streamer_private *streamer_priv =
-            netdev_priv(dev);
-        __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
-        struct streamer_rx_desc *rx_desc;
-        int rx_ring_last_received, length, frame_length, buffer_cnt = 0;
-        struct sk_buff *skb, *skb2;
-
-        /* setup the next rx descriptor to be received */
-        rx_desc = &streamer_priv->streamer_rx_ring[(streamer_priv->rx_ring_last_received + 1) & (STREAMER_RX_RING_SIZE - 1)];
-        rx_ring_last_received = streamer_priv->rx_ring_last_received;
-
-        while (rx_desc->status & 0x01000000) {  /* While processed descriptors are available */
-                if (rx_ring_last_received != streamer_priv->rx_ring_last_received) 
-                {
-                        printk(KERN_WARNING "RX Error 1 rx_ring_last_received not the same %x %x\n",
-                                rx_ring_last_received, streamer_priv->rx_ring_last_received);
-                }
-                streamer_priv->rx_ring_last_received = (streamer_priv->rx_ring_last_received + 1) & (STREAMER_RX_RING_SIZE - 1);
-                rx_ring_last_received = streamer_priv->rx_ring_last_received;
-
-                length = rx_desc->framelen_buflen & 0xffff;     /* buffer length */
-                frame_length = (rx_desc->framelen_buflen >> 16) & 0xffff;
-
-                if (rx_desc->status & 0x7E830000) {     /* errors */
-                        if (streamer_priv->streamer_message_level) {
-                                printk(KERN_WARNING "%s: Rx Error %x\n",
-                                       dev->name, rx_desc->status);
-                        }
-                } else {        /* received without errors */
-                        if (rx_desc->status & 0x80000000) {     /* frame complete */
-                                buffer_cnt = 1;
-                                skb = dev_alloc_skb(streamer_priv->pkt_buf_sz);
-                        } else {
-                                skb = dev_alloc_skb(frame_length);
-                        }
-
-                        if (skb == NULL) 
-                        {
-                                printk(KERN_WARNING "%s: Not enough memory to copy packet to upper layers.\n",  dev->name);
-                                dev->stats.rx_dropped++;
-                        } else {        /* we allocated an skb OK */
-                                if (buffer_cnt == 1) {
-                                        /* release the DMA mapping */
-                                        pci_unmap_single(streamer_priv->pci_dev, 
-                                                le32_to_cpu(streamer_priv->streamer_rx_ring[rx_ring_last_received].buffer),
-                                                streamer_priv->pkt_buf_sz, 
-                                                PCI_DMA_FROMDEVICE);
-                                        skb2 = streamer_priv->rx_ring_skb[rx_ring_last_received];
-#if STREAMER_DEBUG_PACKETS
-                                        {
-                                                int i;
-                                                printk("streamer_rx packet print: skb->data2 %p  skb->head %p\n", skb2->data, skb2->head);
-                                                for (i = 0; i < frame_length; i++) 
-                                                {
-                                                        printk("%x:", skb2->data[i]);
-                                                        if (((i + 1) % 16) == 0)
-                                                                printk("\n");
-                                                }
-                                                printk("\n");
-                                        }
-#endif
-                                        skb_put(skb2, length);
-                                        skb2->protocol = tr_type_trans(skb2, dev);
-                                        /* recycle this descriptor */
-                                        streamer_priv->streamer_rx_ring[rx_ring_last_received].status = 0;
-                                        streamer_priv->streamer_rx_ring[rx_ring_last_received].framelen_buflen = streamer_priv->pkt_buf_sz;
-                                        streamer_priv->streamer_rx_ring[rx_ring_last_received].buffer = 
-                                                cpu_to_le32(pci_map_single(streamer_priv->pci_dev, skb->data, streamer_priv->pkt_buf_sz,
-                                                                PCI_DMA_FROMDEVICE));
-                                        streamer_priv->rx_ring_skb[rx_ring_last_received] = skb;
-                                        /* place recycled descriptor back on the adapter */
-                                        writel(cpu_to_le32(pci_map_single(streamer_priv->pci_dev, 
-                                                                        &streamer_priv->streamer_rx_ring[rx_ring_last_received],
-                                                                        sizeof(struct streamer_rx_desc), PCI_DMA_FROMDEVICE)),
-                                                streamer_mmio + RXLBDA);
-                                        /* pass the received skb up to the protocol */
-                                        netif_rx(skb2);
-                                } else {
-                                        do {    /* Walk the buffers */
-                                                pci_unmap_single(streamer_priv->pci_dev, le32_to_cpu(rx_desc->buffer), length, PCI_DMA_FROMDEVICE), 
-                                                memcpy(skb_put(skb, length), (void *)rx_desc->buffer, length);  /* copy this fragment */
-                                                streamer_priv->streamer_rx_ring[rx_ring_last_received].status = 0;
-                                                streamer_priv->streamer_rx_ring[rx_ring_last_received].framelen_buflen = streamer_priv->pkt_buf_sz;
-                                                
-                                                /* give descriptor back to the adapter */
-                                                writel(cpu_to_le32(pci_map_single(streamer_priv->pci_dev, 
-                                                                        &streamer_priv->streamer_rx_ring[rx_ring_last_received],
-                                                                        length, PCI_DMA_FROMDEVICE)), 
-                                                        streamer_mmio + RXLBDA);
-
-                                                if (rx_desc->status & 0x80000000)
-                                                        break;  /* this descriptor completes the frame */
-
-                                                /* else get the next pending descriptor */
-                                                if (rx_ring_last_received!= streamer_priv->rx_ring_last_received)
-                                                {
-                                                        printk("RX Error rx_ring_last_received not the same %x %x\n",
-                                                                rx_ring_last_received,
-                                                                streamer_priv->rx_ring_last_received);
-                                                }
-                                                rx_desc = &streamer_priv->streamer_rx_ring[(streamer_priv->rx_ring_last_received+1) & (STREAMER_RX_RING_SIZE-1)];
-
-                                                length = rx_desc->framelen_buflen & 0xffff;     /* buffer length */
-                                                streamer_priv->rx_ring_last_received =  (streamer_priv->rx_ring_last_received+1) & (STREAMER_RX_RING_SIZE - 1);
-                                                rx_ring_last_received = streamer_priv->rx_ring_last_received;
-                                        } while (1);
-
-                                        skb->protocol = tr_type_trans(skb, dev);
-                                        /* send up to the protocol */
-                                        netif_rx(skb);
-                                }
-                                dev->stats.rx_packets++;
-                                dev->stats.rx_bytes += length;
-                        }       /* if skb == null */
-                }               /* end received without errors */
-
-                /* try the next one */
-                rx_desc = &streamer_priv->streamer_rx_ring[(rx_ring_last_received + 1) & (STREAMER_RX_RING_SIZE - 1)];
-        }                       /* end for all completed rx descriptors */
-}
-
-static irqreturn_t streamer_interrupt(int irq, void *dev_id)
-{
-        struct net_device *dev = (struct net_device *) dev_id;
-        struct streamer_private *streamer_priv =
-            netdev_priv(dev);
-        __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
-        __u16 sisr;
-        __u16 misr;
-        u8 max_intr = MAX_INTR;
-
-        spin_lock(&streamer_priv->streamer_lock);
-        sisr = readw(streamer_mmio + SISR);
-
-        while((sisr & (SISR_MI | SISR_SRB_REPLY | SISR_ADAPTER_CHECK | SISR_ASB_FREE | 
-                       SISR_ARB_CMD | SISR_TRB_REPLY | SISR_PAR_ERR | SISR_SERR_ERR)) &&
-              (max_intr > 0)) {
-
-                if(sisr & SISR_PAR_ERR) {
-                        writew(~SISR_PAR_ERR, streamer_mmio + SISR_RUM);
-                        (void)readw(streamer_mmio + SISR_RUM);
-                }
-
-                else if(sisr & SISR_SERR_ERR) {
-                        writew(~SISR_SERR_ERR, streamer_mmio + SISR_RUM);
-                        (void)readw(streamer_mmio + SISR_RUM);
-                }
-
-                else if(sisr & SISR_MI) {
-                        misr = readw(streamer_mmio + MISR_RUM);
-
-                if (misr & MISR_TX2_EOF) {
-                                while(streamer_priv->streamer_tx_ring[(streamer_priv->tx_ring_last_status + 1) & (STREAMER_TX_RING_SIZE - 1)].status) {
-                                streamer_priv->tx_ring_last_status = (streamer_priv->tx_ring_last_status + 1) & (STREAMER_TX_RING_SIZE - 1);
-                                streamer_priv->free_tx_ring_entries++;
-                                dev->stats.tx_bytes += streamer_priv->tx_ring_skb[streamer_priv->tx_ring_last_status]->len;
-                                dev->stats.tx_packets++;
-                                dev_kfree_skb_irq(streamer_priv->tx_ring_skb[streamer_priv->tx_ring_last_status]);
-                                streamer_priv->streamer_tx_ring[streamer_priv->tx_ring_last_status].buffer = 0xdeadbeef;
-                                streamer_priv->streamer_tx_ring[streamer_priv->tx_ring_last_status].status = 0;
-                                streamer_priv->streamer_tx_ring[streamer_priv->tx_ring_last_status].bufcnt_framelen = 0;
-                                streamer_priv->streamer_tx_ring[streamer_priv->tx_ring_last_status].buflen = 0;
-                                streamer_priv->streamer_tx_ring[streamer_priv->tx_ring_last_status].rsvd1 = 0;
-                                streamer_priv->streamer_tx_ring[streamer_priv->tx_ring_last_status].rsvd2 = 0;
-                                streamer_priv->streamer_tx_ring[streamer_priv->tx_ring_last_status].rsvd3 = 0;
-                        }
-                        netif_wake_queue(dev);
-                }
-
-                if (misr & MISR_RX_EOF) {
-                        streamer_rx(dev);
-                }
-                /* MISR_RX_EOF */
-
-                        if (misr & MISR_RX_NOBUF) {
-                                /* According to the documentation, we don't have to do anything,  
-                                 * but trapping it keeps it out of /var/log/messages.  
-                                 */
-                        }               /* SISR_RX_NOBUF */
-
-                        writew(~misr, streamer_mmio + MISR_RUM);
-                        (void)readw(streamer_mmio + MISR_RUM);
-                }
-
-                else if (sisr & SISR_SRB_REPLY) {
-                        if (streamer_priv->srb_queued == 1) {
-                                wake_up_interruptible(&streamer_priv->srb_wait);
-                        } else if (streamer_priv->srb_queued == 2) {
-                                streamer_srb_bh(dev);
-                        }
-                        streamer_priv->srb_queued = 0;
-
-                        writew(~SISR_SRB_REPLY, streamer_mmio + SISR_RUM);
-                        (void)readw(streamer_mmio + SISR_RUM);
-                }
-
-                else if (sisr & SISR_ADAPTER_CHECK) {
-                        printk(KERN_WARNING "%s: Adapter Check Interrupt Raised, 8 bytes of information follow:\n", dev->name);
-                        writel(readl(streamer_mmio + LAPWWO), streamer_mmio + LAPA);
-                        printk(KERN_WARNING "%s: Words %x:%x:%x:%x:\n",
-                               dev->name, readw(streamer_mmio + LAPDINC),
-                               ntohs(readw(streamer_mmio + LAPDINC)),
-                               ntohs(readw(streamer_mmio + LAPDINC)),
-                               ntohs(readw(streamer_mmio + LAPDINC)));
-                        netif_stop_queue(dev);
-                        netif_carrier_off(dev);
-                        printk(KERN_WARNING "%s: Adapter must be manually reset.\n", dev->name);
-                }
-
-                /* SISR_ADAPTER_CHECK */
-                else if (sisr & SISR_ASB_FREE) {
-                        /* Wake up anything that is waiting for the asb response */
-                        if (streamer_priv->asb_queued) {
-                                streamer_asb_bh(dev);
-                        }
-                        writew(~SISR_ASB_FREE, streamer_mmio + SISR_RUM);
-                        (void)readw(streamer_mmio + SISR_RUM);
-                }
-                /* SISR_ASB_FREE */
-                else if (sisr & SISR_ARB_CMD) {
-                        streamer_arb_cmd(dev);
-                        writew(~SISR_ARB_CMD, streamer_mmio + SISR_RUM);
-                        (void)readw(streamer_mmio + SISR_RUM);
-                }
-                /* SISR_ARB_CMD */
-                else if (sisr & SISR_TRB_REPLY) {
-                        /* Wake up anything that is waiting for the trb response */
-                        if (streamer_priv->trb_queued) {
-                                wake_up_interruptible(&streamer_priv->
-                                                      trb_wait);
-                        }
-                        streamer_priv->trb_queued = 0;
-                        writew(~SISR_TRB_REPLY, streamer_mmio + SISR_RUM);
-                        (void)readw(streamer_mmio + SISR_RUM);
-                }
-                /* SISR_TRB_REPLY */
-
-                sisr = readw(streamer_mmio + SISR);
-                max_intr--;
-        } /* while() */         
-
-        spin_unlock(&streamer_priv->streamer_lock) ; 
-        return IRQ_HANDLED;
-}
-
-static netdev_tx_t streamer_xmit(struct sk_buff *skb,
-                                       struct net_device *dev)
-{
-        struct streamer_private *streamer_priv =
-            netdev_priv(dev);
-        __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
-        unsigned long flags ;
-
-        spin_lock_irqsave(&streamer_priv->streamer_lock, flags);
-
-        if (streamer_priv->free_tx_ring_entries) {
-                streamer_priv->streamer_tx_ring[streamer_priv->tx_ring_free].status = 0;
-                streamer_priv->streamer_tx_ring[streamer_priv->tx_ring_free].bufcnt_framelen = 0x00020000 | skb->len;
-                streamer_priv->streamer_tx_ring[streamer_priv->tx_ring_free].buffer = 
-                        cpu_to_le32(pci_map_single(streamer_priv->pci_dev, skb->data, skb->len, PCI_DMA_TODEVICE));
-                streamer_priv->streamer_tx_ring[streamer_priv->tx_ring_free].rsvd1 = skb->len;
-                streamer_priv->streamer_tx_ring[streamer_priv->tx_ring_free].rsvd2 = 0;
-                streamer_priv->streamer_tx_ring[streamer_priv->tx_ring_free].rsvd3 = 0;
-                streamer_priv->streamer_tx_ring[streamer_priv->tx_ring_free].buflen = skb->len;
-
-                streamer_priv->tx_ring_skb[streamer_priv->tx_ring_free] = skb;
-                streamer_priv->free_tx_ring_entries--;
-#if STREAMER_DEBUG_PACKETS
-                {
-                        int i;
-                        printk("streamer_xmit packet print:\n");
-                        for (i = 0; i < skb->len; i++) {
-                                printk("%x:", skb->data[i]);
-                                if (((i + 1) % 16) == 0)
-                                        printk("\n");
-                        }
-                        printk("\n");
-                }
-#endif
-
-                writel(cpu_to_le32(pci_map_single(streamer_priv->pci_dev, 
-                                        &streamer_priv->streamer_tx_ring[streamer_priv->tx_ring_free],
-                                        sizeof(struct streamer_tx_desc), PCI_DMA_TODEVICE)),
-                        streamer_mmio + TX2LFDA);
-                (void)readl(streamer_mmio + TX2LFDA);
-
-                streamer_priv->tx_ring_free = (streamer_priv->tx_ring_free + 1) & (STREAMER_TX_RING_SIZE - 1);
-                spin_unlock_irqrestore(&streamer_priv->streamer_lock,flags);
-                return NETDEV_TX_OK;
-        } else {
-                netif_stop_queue(dev);
-                spin_unlock_irqrestore(&streamer_priv->streamer_lock,flags);
-                return NETDEV_TX_BUSY;
-        }
-}
-
-
-static int streamer_close(struct net_device *dev)
-{
-        struct streamer_private *streamer_priv =
-            netdev_priv(dev);
-        __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
-        unsigned long flags;
-        int i;
-
-        netif_stop_queue(dev);
-        netif_carrier_off(dev);
-        writew(streamer_priv->srb, streamer_mmio + LAPA);
-        writew(htons(SRB_CLOSE_ADAPTER << 8),streamer_mmio+LAPDINC);
-        writew(htons(STREAMER_CLEAR_RET_CODE << 8), streamer_mmio+LAPDINC);
-
-        spin_lock_irqsave(&streamer_priv->streamer_lock, flags);
-
-        streamer_priv->srb_queued = 1;
-        writew(LISR_SRB_CMD, streamer_mmio + LISR_SUM);
-
-        spin_unlock_irqrestore(&streamer_priv->streamer_lock, flags);
-
-        while (streamer_priv->srb_queued) 
-        {
-                interruptible_sleep_on_timeout(&streamer_priv->srb_wait,
-                                               jiffies + 60 * HZ);
-                if (signal_pending(current)) 
-                {
-                        printk(KERN_WARNING "%s: SRB timed out.\n", dev->name);
-                        printk(KERN_WARNING "SISR=%x MISR=%x LISR=%x\n",
-                               readw(streamer_mmio + SISR),
-                               readw(streamer_mmio + MISR_RUM),
-                               readw(streamer_mmio + LISR));
-                        streamer_priv->srb_queued = 0;
-                        break;
-                }
-        }
-
-        streamer_priv->rx_ring_last_received = (streamer_priv->rx_ring_last_received + 1) & (STREAMER_RX_RING_SIZE - 1);
-
-        for (i = 0; i < STREAMER_RX_RING_SIZE; i++) {
-                if (streamer_priv->rx_ring_skb[streamer_priv->rx_ring_last_received]) {
-                        dev_kfree_skb(streamer_priv->rx_ring_skb[streamer_priv->rx_ring_last_received]);
-                } 
-                streamer_priv->rx_ring_last_received = (streamer_priv->rx_ring_last_received + 1) & (STREAMER_RX_RING_SIZE - 1);
-        }
-
-        /* reset tx/rx fifo's and busmaster logic */
-
-        /* TBD. Add graceful way to reset the LLC channel without doing a soft reset. 
-           writel(readl(streamer_mmio+BCTL)|(3<<13),streamer_mmio+BCTL);
-           udelay(1);
-           writel(readl(streamer_mmio+BCTL)&~(3<<13),streamer_mmio+BCTL);
-         */
-
-#if STREAMER_DEBUG
-        writew(streamer_priv->srb, streamer_mmio + LAPA);
-        printk("srb): ");
-        for (i = 0; i < 2; i++) {
-                printk("%x ", ntohs(readw(streamer_mmio + LAPDINC)));
-        }
-        printk("\n");
-#endif
-        free_irq(dev->irq, dev);
-        return 0;
-}
-
-static void streamer_set_rx_mode(struct net_device *dev)
-{
-        struct streamer_private *streamer_priv =
-            netdev_priv(dev);
-        __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
-        __u8 options = 0;
-        struct netdev_hw_addr *ha;
-        unsigned char dev_mc_address[5];
-
-        writel(streamer_priv->srb, streamer_mmio + LAPA);
-        options = streamer_priv->streamer_copy_all_options;
-
-        if (dev->flags & IFF_PROMISC)
-                options |= (3 << 5);    /* All LLC and MAC frames, all through the main rx channel */
-        else
-                options &= ~(3 << 5);
-
-        /* Only issue the srb if there is a change in options */
-
-        if ((options ^ streamer_priv->streamer_copy_all_options)) 
-        {
-                /* Now to issue the srb command to alter the copy.all.options */
-                writew(htons(SRB_MODIFY_RECEIVE_OPTIONS << 8), streamer_mmio+LAPDINC);
-                writew(htons(STREAMER_CLEAR_RET_CODE << 8), streamer_mmio+LAPDINC);
-                writew(htons((streamer_priv->streamer_receive_options << 8) | options),streamer_mmio+LAPDINC);
-                writew(htons(0x4a41),streamer_mmio+LAPDINC);
-                writew(htons(0x4d45),streamer_mmio+LAPDINC);
-                writew(htons(0x5320),streamer_mmio+LAPDINC);
-                writew(0x2020, streamer_mmio + LAPDINC);
-
-                streamer_priv->srb_queued = 2;  /* Can't sleep, use srb_bh */
-
-                writel(LISR_SRB_CMD, streamer_mmio + LISR_SUM);
-
-                streamer_priv->streamer_copy_all_options = options;
-                return;
-        }
-
-        /* Set the functional addresses we need for multicast */
-        writel(streamer_priv->srb,streamer_mmio+LAPA);
-        dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ; 
-  
-        netdev_for_each_mc_addr(ha, dev) {
-                dev_mc_address[0] |= ha->addr[2];
-                dev_mc_address[1] |= ha->addr[3];
-                dev_mc_address[2] |= ha->addr[4];
-                dev_mc_address[3] |= ha->addr[5];
-        }
-  
-        writew(htons(SRB_SET_FUNC_ADDRESS << 8),streamer_mmio+LAPDINC);
-        writew(htons(STREAMER_CLEAR_RET_CODE << 8), streamer_mmio+LAPDINC);
-        writew(0,streamer_mmio+LAPDINC);
-        writew(htons( (dev_mc_address[0] << 8) | dev_mc_address[1]),streamer_mmio+LAPDINC);
-        writew(htons( (dev_mc_address[2] << 8) | dev_mc_address[3]),streamer_mmio+LAPDINC);
-        streamer_priv->srb_queued = 2 ; 
-        writel(LISR_SRB_CMD,streamer_mmio+LISR_SUM);
-}
-
-static void streamer_srb_bh(struct net_device *dev)
-{
-        struct streamer_private *streamer_priv = netdev_priv(dev);
-        __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
-        __u16 srb_word;
-
-        writew(streamer_priv->srb, streamer_mmio + LAPA);
-        srb_word=ntohs(readw(streamer_mmio+LAPDINC)) >> 8;
-
-        switch (srb_word) {
-
-                /* SRB_MODIFY_RECEIVE_OPTIONS i.e. set_multicast_list options (promiscuous) 
-                 * At some point we should do something if we get an error, such as
-                 * resetting the IFF_PROMISC flag in dev
-                 */
-
-        case SRB_MODIFY_RECEIVE_OPTIONS:
-                srb_word=ntohs(readw(streamer_mmio+LAPDINC)) >> 8;
-
-                switch (srb_word) {
-                case 0x01:
-                        printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name);
-                        break;
-                case 0x04:
-                        printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
-                        break;
-                default:
-                        if (streamer_priv->streamer_message_level)
-                                printk(KERN_WARNING "%s: Receive Options Modified to %x,%x\n",
-                                       dev->name,
-                                       streamer_priv->streamer_copy_all_options,
-                                       streamer_priv->streamer_receive_options);
-                        break;
-                }               /* switch srb[2] */
-                break;
-
-
-                /* SRB_SET_GROUP_ADDRESS - Multicast group setting 
-                 */
-        case SRB_SET_GROUP_ADDRESS:
-                srb_word=ntohs(readw(streamer_mmio+LAPDINC)) >> 8;
-                switch (srb_word) {
-                case 0x00:
-                        break;
-                case 0x01:
-                        printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
-                        break;
-                case 0x04:
-                        printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
-                        break;
-                case 0x3c:
-                        printk(KERN_WARNING "%s: Group/Functional address indicator bits not set correctly\n", dev->name);
-                        break;
-                case 0x3e:      /* If we ever implement individual multicast addresses, will need to deal with this */
-                        printk(KERN_WARNING "%s: Group address registers full\n", dev->name);
-                        break;
-                case 0x55:
-                        printk(KERN_INFO "%s: Group Address already set.\n", dev->name);
-                        break;
-                default:
-                        break;
-                }               /* switch srb[2] */
-                break;
-
-
-                /* SRB_RESET_GROUP_ADDRESS - Remove a multicast address from group list
-                 */
-        case SRB_RESET_GROUP_ADDRESS:
-                srb_word=ntohs(readw(streamer_mmio+LAPDINC)) >> 8;
-                switch (srb_word) {
-                case 0x00:
-                        break;
-                case 0x01:
-                        printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name);
-                        break;
-                case 0x04:
-                        printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
-                        break;
-                case 0x39:      /* Must deal with this if individual multicast addresses used */
-                        printk(KERN_INFO "%s: Group address not found\n", dev->name);
-                        break;
-                default:
-                        break;
-                }               /* switch srb[2] */
-                break;
-
-
-                /* SRB_SET_FUNC_ADDRESS - Called by the set_rx_mode 
-                 */
-
-        case SRB_SET_FUNC_ADDRESS:
-                srb_word=ntohs(readw(streamer_mmio+LAPDINC)) >> 8;
-                switch (srb_word) {
-                case 0x00:
-                        if (streamer_priv->streamer_message_level)
-                                printk(KERN_INFO "%s: Functional Address Mask Set\n", dev->name);
-                        break;
-                case 0x01:
-                        printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name);
-                        break;
-                case 0x04:
-                        printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
-                        break;
-                default:
-                        break;
-                }               /* switch srb[2] */
-                break;
-
-                /* SRB_READ_LOG - Read and reset the adapter error counters
-                 */
-
-        case SRB_READ_LOG:
-                srb_word=ntohs(readw(streamer_mmio+LAPDINC)) >> 8;
-                switch (srb_word) {
-                case 0x00:
-                        {
-                                int i;
-                                if (streamer_priv->streamer_message_level)
-                                        printk(KERN_INFO "%s: Read Log command complete\n", dev->name);
-                                printk("Read Log statistics: ");
-                                writew(streamer_priv->srb + 6,
-                                       streamer_mmio + LAPA);
-                                for (i = 0; i < 5; i++) {
-                                        printk("%x:", ntohs(readw(streamer_mmio + LAPDINC)));
-                                }
-                                printk("\n");
-                        }
-                        break;
-                case 0x01:
-                        printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name);
-                        break;
-                case 0x04:
-                        printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
-                        break;
-
-                }               /* switch srb[2] */
-                break;
-
-                /* SRB_READ_SR_COUNTERS - Read and reset the source routing bridge related counters */
-
-        case SRB_READ_SR_COUNTERS:
-                srb_word=ntohs(readw(streamer_mmio+LAPDINC)) >> 8;
-                switch (srb_word) {
-                case 0x00:
-                        if (streamer_priv->streamer_message_level)
-                                printk(KERN_INFO "%s: Read Source Routing Counters issued\n", dev->name);
-                        break;
-                case 0x01:
-                        printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name);
-                        break;
-                case 0x04:
-                        printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
-                        break;
-                default:
-                        break;
-                }               /* switch srb[2] */
-                break;
-
-        default:
-                printk(KERN_WARNING "%s: Unrecognized srb bh return value.\n", dev->name);
-                break;
-        }                       /* switch srb[0] */
-}
-
-static int streamer_set_mac_address(struct net_device *dev, void *addr)
-{
-        struct sockaddr *saddr = addr;
-        struct streamer_private *streamer_priv = netdev_priv(dev);
-
-        if (netif_running(dev)) 
-        {
-                printk(KERN_WARNING "%s: Cannot set mac/laa address while card is open\n", dev->name);
-                return -EIO;
-        }
-
-        memcpy(streamer_priv->streamer_laa, saddr->sa_data, dev->addr_len);
-
-        if (streamer_priv->streamer_message_level) {
-                printk(KERN_INFO "%s: MAC/LAA Set to  = %x.%x.%x.%x.%x.%x\n",
-                       dev->name, streamer_priv->streamer_laa[0],
-                       streamer_priv->streamer_laa[1],
-                       streamer_priv->streamer_laa[2],
-                       streamer_priv->streamer_laa[3],
-                       streamer_priv->streamer_laa[4],
-                       streamer_priv->streamer_laa[5]);
-        }
-        return 0;
-}
-
-static void streamer_arb_cmd(struct net_device *dev)
-{
-        struct streamer_private *streamer_priv =
-            netdev_priv(dev);
-        __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
-        __u8 header_len;
-        __u16 frame_len, buffer_len;
-        struct sk_buff *mac_frame;
-        __u8 frame_data[256];
-        __u16 buff_off;
-        __u16 lan_status = 0, lan_status_diff;  /* Initialize to stop compiler warning */
-        __u8 fdx_prot_error;
-        __u16 next_ptr;
-        __u16 arb_word;
-
-#if STREAMER_NETWORK_MONITOR
-        struct trh_hdr *mac_hdr;
-#endif
-
-        writew(streamer_priv->arb, streamer_mmio + LAPA);
-        arb_word=ntohs(readw(streamer_mmio+LAPD)) >> 8;
-        
-        if (arb_word == ARB_RECEIVE_DATA) {     /* Receive.data, MAC frames */
-                writew(streamer_priv->arb + 6, streamer_mmio + LAPA);
-                streamer_priv->mac_rx_buffer = buff_off = ntohs(readw(streamer_mmio + LAPDINC));
-                header_len=ntohs(readw(streamer_mmio+LAPDINC)) >> 8; /* 802.5 Token-Ring Header Length */
-                frame_len = ntohs(readw(streamer_mmio + LAPDINC));
-
-#if STREAMER_DEBUG
-                {
-                        int i;
-                        __u16 next;
-                        __u8 status;
-                        __u16 len;
-
-                        writew(ntohs(buff_off), streamer_mmio + LAPA);  /*setup window to frame data */
-                        next = htons(readw(streamer_mmio + LAPDINC));
-                        status =
-                            ntohs(readw(streamer_mmio + LAPDINC)) & 0xff;
-                        len = ntohs(readw(streamer_mmio + LAPDINC));
-
-                        /* print out 1st 14 bytes of frame data */
-                        for (i = 0; i < 7; i++) {
-                                printk("Loc %d = %04x\n", i,
-                                       ntohs(readw
-                                             (streamer_mmio + LAPDINC)));
-                        }
-
-                        printk("next %04x, fs %02x, len %04x\n", next,
-                               status, len);
-                }
-#endif
-                if (!(mac_frame = dev_alloc_skb(frame_len))) {
-                        printk(KERN_WARNING "%s: Memory squeeze, dropping frame.\n",
-                               dev->name);
-                        goto drop_frame;
-                }
-                /* Walk the buffer chain, creating the frame */
-
-                do {
-                        int i;
-                        __u16 rx_word;
-
-                        writew(htons(buff_off), streamer_mmio + LAPA);  /* setup window to frame data */
-                        next_ptr = ntohs(readw(streamer_mmio + LAPDINC));
-                        readw(streamer_mmio + LAPDINC); /* read thru status word */
-                        buffer_len = ntohs(readw(streamer_mmio + LAPDINC));
-
-                        if (buffer_len > 256)
-                                break;
-
-                        i = 0;
-                        while (i < buffer_len) {
-                                rx_word=ntohs(readw(streamer_mmio+LAPDINC));
-                                frame_data[i]=rx_word >> 8;
-                                frame_data[i+1]=rx_word & 0xff;
-                                i += 2;
-                        }
-
-                        memcpy(skb_put(mac_frame, buffer_len),
-                                      frame_data, buffer_len);
-                } while (next_ptr && (buff_off = next_ptr));
-
-                mac_frame->protocol = tr_type_trans(mac_frame, dev);
-#if STREAMER_NETWORK_MONITOR
-                printk(KERN_WARNING "%s: Received MAC Frame, details:\n",
-                       dev->name);
-                mac_hdr = tr_hdr(mac_frame);
-                printk(KERN_WARNING
-                       "%s: MAC Frame Dest. Addr: %pM\n",
-                       dev->name, mac_hdr->daddr);
-                printk(KERN_WARNING
-                       "%s: MAC Frame Srce. Addr: %pM\n",
-                       dev->name, mac_hdr->saddr);
-#endif
-                netif_rx(mac_frame);
-
-                /* Now tell the card we have dealt with the received frame */
-drop_frame:
-                /* Set LISR Bit 1 */
-                writel(LISR_ARB_FREE, streamer_priv->streamer_mmio + LISR_SUM);
-
-                /* Is the ASB free ? */
-
-                if (!(readl(streamer_priv->streamer_mmio + SISR) & SISR_ASB_FREE)) 
-                {
-                        streamer_priv->asb_queued = 1;
-                        writel(LISR_ASB_FREE_REQ, streamer_priv->streamer_mmio + LISR_SUM);
-                        return;
-                        /* Drop out and wait for the bottom half to be run */
-                }
-
-
-                writew(streamer_priv->asb, streamer_mmio + LAPA);
-                writew(htons(ASB_RECEIVE_DATA << 8), streamer_mmio+LAPDINC);
-                writew(htons(STREAMER_CLEAR_RET_CODE << 8), streamer_mmio+LAPDINC);
-                writew(0, streamer_mmio + LAPDINC);
-                writew(htons(streamer_priv->mac_rx_buffer), streamer_mmio + LAPD);
-
-                writel(LISR_ASB_REPLY | LISR_ASB_FREE_REQ, streamer_priv->streamer_mmio + LISR_SUM);
-
-                streamer_priv->asb_queued = 2;
-                return;
-
-        } else if (arb_word == ARB_LAN_CHANGE_STATUS) { /* Lan.change.status */
-                writew(streamer_priv->arb + 6, streamer_mmio + LAPA);
-                lan_status = ntohs(readw(streamer_mmio + LAPDINC));
-                fdx_prot_error = ntohs(readw(streamer_mmio+LAPD)) >> 8;
-                
-                /* Issue ARB Free */
-                writew(LISR_ARB_FREE, streamer_priv->streamer_mmio + LISR_SUM);
-
-                lan_status_diff = (streamer_priv->streamer_lan_status ^ lan_status) & 
-                    lan_status; 
-
-                if (lan_status_diff & (LSC_LWF | LSC_ARW | LSC_FPE | LSC_RR)) 
-                {
-                        if (lan_status_diff & LSC_LWF)
-                                printk(KERN_WARNING "%s: Short circuit detected on the lobe\n", dev->name);
-                        if (lan_status_diff & LSC_ARW)
-                                printk(KERN_WARNING "%s: Auto removal error\n", dev->name);
-                        if (lan_status_diff & LSC_FPE)
-                                printk(KERN_WARNING "%s: FDX Protocol Error\n", dev->name);
-                        if (lan_status_diff & LSC_RR)
-                                printk(KERN_WARNING "%s: Force remove MAC frame received\n", dev->name);
-
-                        /* Adapter has been closed by the hardware */
-
-                        /* reset tx/rx fifo's and busmaster logic */
-
-                        /* @TBD. no llc reset on autostreamer writel(readl(streamer_mmio+BCTL)|(3<<13),streamer_mmio+BCTL);
-                           udelay(1);
-                           writel(readl(streamer_mmio+BCTL)&~(3<<13),streamer_mmio+BCTL); */
-
-                        netif_stop_queue(dev);
-                        netif_carrier_off(dev);
-                        printk(KERN_WARNING "%s: Adapter must be manually reset.\n", dev->name);
-                }
-                /* If serious error */
-                if (streamer_priv->streamer_message_level) {
-                        if (lan_status_diff & LSC_SIG_LOSS)
-                                printk(KERN_WARNING "%s: No receive signal detected\n", dev->name);
-                        if (lan_status_diff & LSC_HARD_ERR) 
-                                printk(KERN_INFO "%s: Beaconing\n", dev->name);
-                        if (lan_status_diff & LSC_SOFT_ERR)
-                                printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame\n", dev->name);
-                        if (lan_status_diff & LSC_TRAN_BCN)
-                                printk(KERN_INFO "%s: We are transmitting the beacon, aaah\n", dev->name);
-                        if (lan_status_diff & LSC_SS)
-                                printk(KERN_INFO "%s: Single Station on the ring\n", dev->name);
-                        if (lan_status_diff & LSC_RING_REC)
-                                printk(KERN_INFO "%s: Ring recovery ongoing\n", dev->name);
-                        if (lan_status_diff & LSC_FDX_MODE)
-                                printk(KERN_INFO "%s: Operating in FDX mode\n", dev->name);
-                }
-
-                if (lan_status_diff & LSC_CO) {
-                        if (streamer_priv->streamer_message_level)
-                                printk(KERN_INFO "%s: Counter Overflow\n", dev->name);
-
-                        /* Issue READ.LOG command */
-
-                        writew(streamer_priv->srb, streamer_mmio + LAPA);
-                        writew(htons(SRB_READ_LOG << 8),streamer_mmio+LAPDINC);
-                        writew(htons(STREAMER_CLEAR_RET_CODE << 8), streamer_mmio+LAPDINC);
-                        writew(0, streamer_mmio + LAPDINC);
-                        streamer_priv->srb_queued = 2;  /* Can't sleep, use srb_bh */
-
-                        writew(LISR_SRB_CMD, streamer_mmio + LISR_SUM);
-                }
-
-                if (lan_status_diff & LSC_SR_CO) {
-                        if (streamer_priv->streamer_message_level)
-                                printk(KERN_INFO "%s: Source routing counters overflow\n", dev->name);
-
-                        /* Issue a READ.SR.COUNTERS */
-                        writew(streamer_priv->srb, streamer_mmio + LAPA);
-                        writew(htons(SRB_READ_SR_COUNTERS << 8),
-                               streamer_mmio+LAPDINC);
-                        writew(htons(STREAMER_CLEAR_RET_CODE << 8),
-                               streamer_mmio+LAPDINC);
-                        streamer_priv->srb_queued = 2;  /* Can't sleep, use srb_bh */
-                        writew(LISR_SRB_CMD, streamer_mmio + LISR_SUM);
-
-                }
-                streamer_priv->streamer_lan_status = lan_status;
-        } /* Lan.change.status */
-        else
-                printk(KERN_WARNING "%s: Unknown arb command\n", dev->name);
-}
-
-static void streamer_asb_bh(struct net_device *dev)
-{
-        struct streamer_private *streamer_priv =
-            netdev_priv(dev);
-        __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
-
-        if (streamer_priv->asb_queued == 1) 
-        {
-                /* Dropped through the first time */
-
-                writew(streamer_priv->asb, streamer_mmio + LAPA);
-                writew(htons(ASB_RECEIVE_DATA << 8),streamer_mmio+LAPDINC);
-                writew(htons(STREAMER_CLEAR_RET_CODE << 8), streamer_mmio+LAPDINC);
-                writew(0, streamer_mmio + LAPDINC);
-                writew(htons(streamer_priv->mac_rx_buffer), streamer_mmio + LAPD);
-
-                writel(LISR_ASB_REPLY | LISR_ASB_FREE_REQ, streamer_priv->streamer_mmio + LISR_SUM);
-                streamer_priv->asb_queued = 2;
-
-                return;
-        }
-
-        if (streamer_priv->asb_queued == 2) {
-                __u8 rc;
-                writew(streamer_priv->asb + 2, streamer_mmio + LAPA);
-                rc=ntohs(readw(streamer_mmio+LAPD)) >> 8;
-                switch (rc) {
-                case 0x01:
-                        printk(KERN_WARNING "%s: Unrecognized command code\n", dev->name);
-                        break;
-                case 0x26:
-                        printk(KERN_WARNING "%s: Unrecognized buffer address\n", dev->name);
-                        break;
-                case 0xFF:
-                        /* Valid response, everything should be ok again */
-                        break;
-                default:
-                        printk(KERN_WARNING "%s: Invalid return code in asb\n", dev->name);
-                        break;
-                }
-        }
-        streamer_priv->asb_queued = 0;
-}
-
-static int streamer_change_mtu(struct net_device *dev, int mtu)
-{
-        struct streamer_private *streamer_priv =
-            netdev_priv(dev);
-        __u16 max_mtu;
-
-        if (streamer_priv->streamer_ring_speed == 4)
-                max_mtu = 4500;
-        else
-                max_mtu = 18000;
-
-        if (mtu > max_mtu)
-                return -EINVAL;
-        if (mtu < 100)
-                return -EINVAL;
-
-        dev->mtu = mtu;
-        streamer_priv->pkt_buf_sz = mtu + TR_HLEN;
-
-        return 0;
-}
-
-#if STREAMER_NETWORK_MONITOR
-#ifdef CONFIG_PROC_FS
-static int streamer_proc_info(char *buffer, char **start, off_t offset,
-                              int length, int *eof, void *data)
-{
-  struct streamer_private *sdev=NULL;
-        struct pci_dev *pci_device = NULL;
-        int len = 0;
-        off_t begin = 0;
-        off_t pos = 0;
-        int size;
-
-  struct net_device *dev;
-
-        size = sprintf(buffer, "IBM LanStreamer/MPC Chipset Token Ring Adapters\n");
-
-        pos += size;
-        len += size;
-
-  for(sdev=dev_streamer; sdev; sdev=sdev->next) {
-    pci_device=sdev->pci_dev;
-    dev=pci_get_drvdata(pci_device);
-
-                                size = sprintf_info(buffer + len, dev);
-                                len += size;
-                                pos = begin + len;
-
-                                if (pos < offset) {
-                                        len = 0;
-                                        begin = pos;
-                                }
-                                if (pos > offset + length)
-                                        break;
-                }               /* for */
-
-        *start = buffer + (offset - begin);     /* Start of wanted data */
-        len -= (offset - begin);        /* Start slop */
-        if (len > length)
-                len = length;   /* Ending slop */
-        return len;
-}
-
-static int sprintf_info(char *buffer, struct net_device *dev)
-{
-        struct streamer_private *streamer_priv =
-            netdev_priv(dev);
-        __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
-        struct streamer_adapter_addr_table sat;
-        struct streamer_parameters_table spt;
-        int size = 0;
-        int i;
-
-        writew(streamer_priv->streamer_addr_table_addr, streamer_mmio + LAPA);
-        for (i = 0; i < 14; i += 2) {
-                __u16 io_word;
-                __u8 *datap = (__u8 *) & sat;
-                io_word=ntohs(readw(streamer_mmio+LAPDINC));
-                datap[size]=io_word >> 8;
-                datap[size+1]=io_word & 0xff;
-        }
-        writew(streamer_priv->streamer_parms_addr, streamer_mmio + LAPA);
-        for (i = 0; i < 68; i += 2) {
-                __u16 io_word;
-                __u8 *datap = (__u8 *) & spt;
-                io_word=ntohs(readw(streamer_mmio+LAPDINC));
-                datap[size]=io_word >> 8;
-                datap[size+1]=io_word & 0xff;
-        }
-
-        size = sprintf(buffer, "\n%6s: Adapter Address   : Node Address      : Functional Addr\n", dev->name);
-
-        size += sprintf(buffer + size,
-                        "%6s: %pM : %pM : %02x:%02x:%02x:%02x\n",
-                        dev->name, dev->dev_addr, sat.node_addr,
-                        sat.func_addr[0], sat.func_addr[1],
-                        sat.func_addr[2], sat.func_addr[3]);
-
-        size += sprintf(buffer + size, "\n%6s: Token Ring Parameters Table:\n", dev->name);
-
-        size += sprintf(buffer + size, "%6s: Physical Addr : Up Node Address   : Poll Address      : AccPri : Auth Src : Att Code :\n", dev->name);
-
-        size += sprintf(buffer + size,
-                    "%6s: %02x:%02x:%02x:%02x   : %pM : %pM : %04x   : %04x     :  %04x    :\n",
-                    dev->name, spt.phys_addr[0], spt.phys_addr[1],
-                    spt.phys_addr[2], spt.phys_addr[3],
-                    spt.up_node_addr, spt.poll_addr,
-                    ntohs(spt.acc_priority), ntohs(spt.auth_source_class),
-                    ntohs(spt.att_code));
-
-        size += sprintf(buffer + size, "%6s: Source Address    : Bcn T : Maj. V : Lan St : Lcl Rg : Mon Err : Frame Correl : \n", dev->name);
-
-        size += sprintf(buffer + size,
-                    "%6s: %pM : %04x  : %04x   : %04x   : %04x   : %04x    :     %04x     : \n",
-                    dev->name, spt.source_addr,
-                    ntohs(spt.beacon_type), ntohs(spt.major_vector),
-                    ntohs(spt.lan_status), ntohs(spt.local_ring),
-                    ntohs(spt.mon_error), ntohs(spt.frame_correl));
-
-        size += sprintf(buffer + size, "%6s: Beacon Details :  Tx  :  Rx  : NAUN Node Address : NAUN Node Phys : \n",
-                    dev->name);
-
-        size += sprintf(buffer + size,
-                    "%6s:                :  %02x  :  %02x  : %pM : %02x:%02x:%02x:%02x    : \n",
-                    dev->name, ntohs(spt.beacon_transmit),
-                    ntohs(spt.beacon_receive),
-                    spt.beacon_naun,
-                    spt.beacon_phys[0], spt.beacon_phys[1],
-                    spt.beacon_phys[2], spt.beacon_phys[3]);
-        return size;
-}
-#endif
-#endif
-
-static struct pci_driver streamer_pci_driver = {
-  .name     = "lanstreamer",
-  .id_table = streamer_pci_tbl,
-  .probe    = streamer_init_one,
-  .remove   = __devexit_p(streamer_remove_one),
-};
-
-static int __init streamer_init_module(void) {
-  return pci_register_driver(&streamer_pci_driver);
-}
-
-static void __exit streamer_cleanup_module(void) {
-  pci_unregister_driver(&streamer_pci_driver);
-}
-
-module_init(streamer_init_module);
-module_exit(streamer_cleanup_module);
-MODULE_LICENSE("GPL");
diff --git a/drivers/net/tokenring/lanstreamer.h b/drivers/net/tokenring/lanstreamer.h
deleted file mode 100644
index 3c58d6a3fbc9..000000000000
--- a/drivers/net/tokenring/lanstreamer.h
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- *   lanstreamer.h -- driver for the IBM Auto LANStreamer PCI Adapter
- *
- *  Written By: Mike Sullivan, IBM Corporation
- *
- *  Copyright (C) 1999 IBM Corporation
- *
- *  Linux driver for IBM PCI tokenring cards based on the LanStreamer MPC
- *  chipset. 
- *
- *  This driver is based on the olympic driver for IBM PCI TokenRing cards (Pit/Pit-Phy/Olympic
- *  chipsets) written  by:
- *      1999 Peter De Schrijver All Rights Reserved
- *      1999 Mike Phillips (phillim@amtrak.com)
- *
- *  Base Driver Skeleton:
- *      Written 1993-94 by Donald Becker.
- *
- *      Copyright 1993 United States Government as represented by the
- *      Director, National Security Agency.
- *
- * This program is free software; you can redistribute it and/or modify      
- * it under the terms of the GNU General Public License as published by      
- * the Free Software Foundation; either version 2 of the License, or         
- * (at your option) any later version.                                       
- *                                                                           
- * This program is distributed in the hope that it will be useful,           
- * but WITHOUT ANY WARRANTY; without even the implied warranty of            
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             
- * GNU General Public License for more details.                              
- *                                                                           
- * NO WARRANTY                                                               
- * THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR        
- * CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT      
- * LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,      
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is    
- * solely responsible for determining the appropriateness of using and       
- * distributing the Program and assumes all risks associated with its        
- * exercise of rights under this Agreement, including but not limited to     
- * the risks and costs of program errors, damage to or loss of data,         
- * programs or equipment, and unavailability or interruption of operations.  
- *                                                                           
- * DISCLAIMER OF LIABILITY                                                   
- * NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY   
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL        
- * DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND   
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR     
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE    
- * USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED  
- * HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES             
- *                                                                           
- * You should have received a copy of the GNU General Public License         
- * along with this program; if not, write to the Free Software               
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
- *                                                                           
- * 
- *  12/10/99 - Alpha Release 0.1.0
- *            First release to the public
- *  08/15/01 - Added ioctl() definitions and others - Kent Yoder <yoder1@us.ibm.com>
- *
- */
-
-/* MAX_INTR - the maximum number of times we can loop
- * inside the interrupt function before returning
- * control to the OS (maximum value is 256)
- */
-#define MAX_INTR 5
-
-#define CLS 0x0C
-#define MLR 0x86
-#define LTR 0x0D
-
-#define BCTL 0x60
-#define BCTL_SOFTRESET (1<<15)
-#define BCTL_RX_FIFO_8 (1<<1)
-#define BCTL_TX_FIFO_8 (1<<3)
-
-#define GPR 0x4a
-#define GPR_AUTOSENSE (1<<2)
-#define GPR_16MBPS (1<<3)
-
-#define LISR 0x10
-#define LISR_SUM 0x12
-#define LISR_RUM 0x14
-
-#define LISR_LIE (1<<15)
-#define LISR_SLIM (1<<13)
-#define LISR_SLI (1<<12)
-#define LISR_BPEI (1<<9)
-#define LISR_BPE (1<<8)
-#define LISR_SRB_CMD (1<<5)
-#define LISR_ASB_REPLY (1<<4)
-#define LISR_ASB_FREE_REQ (1<<2)
-#define LISR_ARB_FREE (1<<1)
-#define LISR_TRB_FRAME (1<<0)
-
-#define SISR 0x16
-#define SISR_SUM 0x18
-#define SISR_RUM 0x1A
-#define SISR_MASK 0x54
-#define SISR_MASK_SUM 0x56
-#define SISR_MASK_RUM 0x58
-
-#define SISR_MI (1<<15)
-#define SISR_SERR_ERR (1<<14)
-#define SISR_TIMER (1<<11)
-#define SISR_LAP_PAR_ERR (1<<10)
-#define SISR_LAP_ACC_ERR (1<<9)
-#define SISR_PAR_ERR (1<<8)
-#define SISR_ADAPTER_CHECK (1<<6)
-#define SISR_SRB_REPLY (1<<5)
-#define SISR_ASB_FREE (1<<4)
-#define SISR_ARB_CMD (1<<3)
-#define SISR_TRB_REPLY (1<<2)
-
-#define MISR_RUM 0x5A
-#define MISR_MASK 0x5C
-#define MISR_MASK_RUM 0x5E
-
-#define MISR_TX2_IDLE (1<<15)
-#define MISR_TX2_NO_STATUS (1<<14)
-#define MISR_TX2_HALT (1<<13)
-#define MISR_TX2_EOF (1<<12)
-#define MISR_TX1_IDLE (1<<11)
-#define MISR_TX1_NO_STATUS (1<<10)
-#define MISR_TX1_HALT (1<<9)
-#define MISR_TX1_EOF (1<<8)
-#define MISR_RX_NOBUF (1<<5)
-#define MISR_RX_EOB (1<<4)
-#define MISR_RX_NO_STATUS (1<<2)
-#define MISR_RX_HALT (1<<1)
-#define MISR_RX_EOF (1<<0)
-
-#define LAPA 0x62
-#define LAPE 0x64
-#define LAPD 0x66
-#define LAPDINC 0x68
-#define LAPWWO 0x6A
-#define LAPWWC 0x6C
-#define LAPCTL 0x6E
-
-#define TIMER 0x4E4
-
-#define BMCTL_SUM 0x50
-#define BMCTL_RUM 0x52
-#define BMCTL_TX1_DIS (1<<14)
-#define BMCTL_TX2_DIS (1<<10)
-#define BMCTL_RX_DIS (1<<6)
-#define BMCTL_RX_ENABLED  (1<<5)
-
-#define RXLBDA  0x90
-#define RXBDA   0x94
-#define RXSTAT  0x98
-#define RXDBA   0x9C
-
-#define TX1LFDA 0xA0
-#define TX1FDA  0xA4
-#define TX1STAT 0xA8
-#define TX1DBA  0xAC
-#define TX2LFDA 0xB0
-#define TX2FDA  0xB4
-#define TX2STAT 0xB8
-#define TX2DBA  0xBC
-
-#define STREAMER_IO_SPACE 256
-
-#define SRB_COMMAND_SIZE 50
-
-#define STREAMER_MAX_ADAPTERS 8 /* 0x08 __MODULE_STRING can't hand 0xnn */
-
-/* Defines for LAN STATUS CHANGE reports */
-#define LSC_SIG_LOSS 0x8000
-#define LSC_HARD_ERR 0x4000
-#define LSC_SOFT_ERR 0x2000
-#define LSC_TRAN_BCN 0x1000
-#define LSC_LWF      0x0800
-#define LSC_ARW      0x0400
-#define LSC_FPE      0x0200
-#define LSC_RR       0x0100
-#define LSC_CO       0x0080
-#define LSC_SS       0x0040
-#define LSC_RING_REC 0x0020
-#define LSC_SR_CO    0x0010
-#define LSC_FDX_MODE 0x0004
-
-/* Defines for OPEN ADAPTER command */
-
-#define OPEN_ADAPTER_EXT_WRAP (1<<15)
-#define OPEN_ADAPTER_DIS_HARDEE (1<<14)
-#define OPEN_ADAPTER_DIS_SOFTERR (1<<13)
-#define OPEN_ADAPTER_PASS_ADC_MAC (1<<12)
-#define OPEN_ADAPTER_PASS_ATT_MAC (1<<11)
-#define OPEN_ADAPTER_ENABLE_EC (1<<10)
-#define OPEN_ADAPTER_CONTENDER (1<<8)
-#define OPEN_ADAPTER_PASS_BEACON (1<<7)
-#define OPEN_ADAPTER_ENABLE_FDX (1<<6)
-#define OPEN_ADAPTER_ENABLE_RPL (1<<5)
-#define OPEN_ADAPTER_INHIBIT_ETR (1<<4)
-#define OPEN_ADAPTER_INTERNAL_WRAP (1<<3)
-
-
-/* Defines for SRB Commands */
-#define SRB_CLOSE_ADAPTER 0x04
-#define SRB_CONFIGURE_BRIDGE 0x0c
-#define SRB_CONFIGURE_HP_CHANNEL 0x13
-#define SRB_MODIFY_BRIDGE_PARMS 0x15
-#define SRB_MODIFY_OPEN_OPTIONS 0x01
-#define SRB_MODIFY_RECEIVE_OPTIONS 0x17
-#define SRB_NO_OPERATION 0x00
-#define SRB_OPEN_ADAPTER 0x03
-#define SRB_READ_LOG 0x08
-#define SRB_READ_SR_COUNTERS 0x16
-#define SRB_RESET_GROUP_ADDRESS 0x02
-#define SRB_RESET_TARGET_SEGMETN 0x14
-#define SRB_SAVE_CONFIGURATION 0x1b
-#define SRB_SET_BRIDGE_PARMS 0x09
-#define SRB_SET_FUNC_ADDRESS 0x07
-#define SRB_SET_GROUP_ADDRESS 0x06
-#define SRB_SET_TARGET_SEGMENT 0x05
-
-/* Clear return code */
-#define STREAMER_CLEAR_RET_CODE 0xfe
-
-/* ARB Commands */
-#define ARB_RECEIVE_DATA 0x81
-#define ARB_LAN_CHANGE_STATUS 0x84
-
-/* ASB Response commands */
-#define ASB_RECEIVE_DATA 0x81
-
-
-/* Streamer defaults for buffers */
-
-#define STREAMER_RX_RING_SIZE 16        /* should be a power of 2 */
-/* Setting the number of TX descriptors to 1 is a workaround for an
- * undocumented hardware problem with the lanstreamer board. Setting
- * this to something higher may slightly increase the throughput you
- * can get from the card, but at the risk of locking up the box. - 
- * <yoder1@us.ibm.com>
- */
-#define STREAMER_TX_RING_SIZE 1 /* should be a power of 2 */
-
-#define PKT_BUF_SZ 4096         /* Default packet size */
-
-/* Streamer data structures */
-
-struct streamer_tx_desc {
-        __u32 forward;
-        __u32 status;
-        __u32 bufcnt_framelen;
-        __u32 buffer;
-        __u32 buflen;
-        __u32 rsvd1;
-        __u32 rsvd2;
-        __u32 rsvd3;
-};
-
-struct streamer_rx_desc {
-        __u32 forward;
-        __u32 status;
-        __u32 buffer;
-        __u32 framelen_buflen;
-};
-
-struct mac_receive_buffer {
-        __u16 next;
-        __u8 padding;
-        __u8 frame_status;
-        __u16 buffer_length;
-        __u8 frame_data;
-};
-
-struct streamer_private {
-
-        __u16 srb;
-        __u16 trb;
-        __u16 arb;
-        __u16 asb;
-
-        struct streamer_private *next;
-        struct pci_dev *pci_dev;
-        __u8 __iomem *streamer_mmio;
-        char *streamer_card_name;
- 
-        spinlock_t streamer_lock;
-
-        volatile int srb_queued;        /* True if an SRB is still posted */
-        wait_queue_head_t srb_wait;
-
-        volatile int asb_queued;        /* True if an ASB is posted */
-
-        volatile int trb_queued;        /* True if a TRB is posted */
-        wait_queue_head_t trb_wait;
-
-        struct streamer_rx_desc *streamer_rx_ring;
-        struct streamer_tx_desc *streamer_tx_ring;
-        struct sk_buff *tx_ring_skb[STREAMER_TX_RING_SIZE],
-            *rx_ring_skb[STREAMER_RX_RING_SIZE];
-        int tx_ring_free, tx_ring_last_status, rx_ring_last_received,
-            free_tx_ring_entries;
-
-        __u16 streamer_lan_status;
-        __u8 streamer_ring_speed;
-        __u16 pkt_buf_sz;
-        __u8 streamer_receive_options, streamer_copy_all_options,
-            streamer_message_level;
-        __u16 streamer_addr_table_addr, streamer_parms_addr;
-        __u16 mac_rx_buffer;
-        __u8 streamer_laa[6];
-};
-
-struct streamer_adapter_addr_table {
-
-        __u8 node_addr[6];
-        __u8 reserved[4];
-        __u8 func_addr[4];
-};
-
-struct streamer_parameters_table {
-
-        __u8 phys_addr[4];
-        __u8 up_node_addr[6];
-        __u8 up_phys_addr[4];
-        __u8 poll_addr[6];
-        __u16 reserved;
-        __u16 acc_priority;
-        __u16 auth_source_class;
-        __u16 att_code;
-        __u8 source_addr[6];
-        __u16 beacon_type;
-        __u16 major_vector;
-        __u16 lan_status;
-        __u16 soft_error_time;
-        __u16 reserved1;
-        __u16 local_ring;
-        __u16 mon_error;
-        __u16 beacon_transmit;
-        __u16 beacon_receive;
-        __u16 frame_correl;
-        __u8 beacon_naun[6];
-        __u32 reserved2;
-        __u8 beacon_phys[4];
-};
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
deleted file mode 100644
index 28adcdf3b14c..000000000000
--- a/drivers/net/tokenring/madgemc.c
+++ /dev/null
@@ -1,761 +0,0 @@
-/*
- *  madgemc.c: Driver for the Madge Smart 16/4 MC16 MCA token ring card.
- *
- *  Written 2000 by Adam Fritzler
- *
- *  This software may be used and distributed according to the terms
- *  of the GNU General Public License, incorporated herein by reference.
- *
- *  This driver module supports the following cards:
- *      - Madge Smart 16/4 Ringnode MC16
- *      - Madge Smart 16/4 Ringnode MC32 (??)
- *
- *  Maintainer(s):
- *    AF        Adam Fritzler
- *
- *  Modification History:
- *      16-Jan-00       AF      Created
- *
- */
-static const char version[] = "madgemc.c: v0.91 23/01/2000 by Adam Fritzler\n";
-
-#include <linux/module.h>
-#include <linux/mca.h>
-#include <linux/slab.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/netdevice.h>
-#include <linux/trdevice.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-
-#include "tms380tr.h"
-#include "madgemc.h"            /* Madge-specific constants */
-
-#define MADGEMC_IO_EXTENT 32
-#define MADGEMC_SIF_OFFSET 0x08
-
-struct card_info {
-        /*
-         * These are read from the BIA ROM.
-         */
-        unsigned int manid;
-        unsigned int cardtype;
-        unsigned int cardrev;
-        unsigned int ramsize;
-        
-        /*
-         * These are read from the MCA POS registers.  
-         */
-        unsigned int burstmode:2;
-        unsigned int fairness:1; /* 0 = Fair, 1 = Unfair */
-        unsigned int arblevel:4;
-        unsigned int ringspeed:2; /* 0 = 4mb, 1 = 16, 2 = Auto/none */
-        unsigned int cabletype:1; /* 0 = RJ45, 1 = DB9 */
-};
-
-static int madgemc_open(struct net_device *dev);
-static int madgemc_close(struct net_device *dev);
-static int madgemc_chipset_init(struct net_device *dev);
-static void madgemc_read_rom(struct net_device *dev, struct card_info *card);
-static unsigned short madgemc_setnselout_pins(struct net_device *dev);
-static void madgemc_setcabletype(struct net_device *dev, int type);
-
-static int madgemc_mcaproc(char *buf, int slot, void *d);
-
-static void madgemc_setregpage(struct net_device *dev, int page);
-static void madgemc_setsifsel(struct net_device *dev, int val);
-static void madgemc_setint(struct net_device *dev, int val);
-
-static irqreturn_t madgemc_interrupt(int irq, void *dev_id);
-
-/*
- * These work around paging, however they don't guarantee you're on the
- * right page.
- */
-#define SIFREADB(reg) (inb(dev->base_addr + ((reg<0x8)?reg:reg-0x8)))
-#define SIFWRITEB(val, reg) (outb(val, dev->base_addr + ((reg<0x8)?reg:reg-0x8)))
-#define SIFREADW(reg) (inw(dev->base_addr + ((reg<0x8)?reg:reg-0x8)))
-#define SIFWRITEW(val, reg) (outw(val, dev->base_addr + ((reg<0x8)?reg:reg-0x8)))
-
-/*
- * Read a byte-length value from the register.
- */
-static unsigned short madgemc_sifreadb(struct net_device *dev, unsigned short reg)
-{
-        unsigned short ret;
-        if (reg<0x8)    
-                ret = SIFREADB(reg);
-        else {
-                madgemc_setregpage(dev, 1);     
-                ret = SIFREADB(reg);
-                madgemc_setregpage(dev, 0);
-        }
-        return ret;
-}
-
-/*
- * Write a byte-length value to a register.
- */
-static void madgemc_sifwriteb(struct net_device *dev, unsigned short val, unsigned short reg)
-{
-        if (reg<0x8)
-                SIFWRITEB(val, reg);
-        else {
-                madgemc_setregpage(dev, 1);
-                SIFWRITEB(val, reg);
-                madgemc_setregpage(dev, 0);
-        }
-}
-
-/*
- * Read a word-length value from a register
- */
-static unsigned short madgemc_sifreadw(struct net_device *dev, unsigned short reg)
-{
-        unsigned short ret;
-        if (reg<0x8)    
-                ret = SIFREADW(reg);
-        else {
-                madgemc_setregpage(dev, 1);     
-                ret = SIFREADW(reg);
-                madgemc_setregpage(dev, 0);
-        }
-        return ret;
-}
-
-/*
- * Write a word-length value to a register.
- */
-static void madgemc_sifwritew(struct net_device *dev, unsigned short val, unsigned short reg)
-{
-        if (reg<0x8)
-                SIFWRITEW(val, reg);
-        else {
-                madgemc_setregpage(dev, 1);
-                SIFWRITEW(val, reg);
-                madgemc_setregpage(dev, 0);
-        }
-}
-
-static struct net_device_ops madgemc_netdev_ops __read_mostly;
-
-static int __devinit madgemc_probe(struct device *device)
-{       
-        static int versionprinted;
-        struct net_device *dev;
-        struct net_local *tp;
-        struct card_info *card;
-        struct mca_device *mdev = to_mca_device(device);
-        int ret = 0;
-
-        if (versionprinted++ == 0)
-                printk("%s", version);
-
-        if(mca_device_claimed(mdev))
-                return -EBUSY;
-        mca_device_set_claim(mdev, 1);
-
-        dev = alloc_trdev(sizeof(struct net_local));
-        if (!dev) {
-                printk("madgemc: unable to allocate dev space\n");
-                mca_device_set_claim(mdev, 0);
-                ret = -ENOMEM;
-                goto getout;
-        }
-
-        dev->netdev_ops = &madgemc_netdev_ops;
-
-        card = kmalloc(sizeof(struct card_info), GFP_KERNEL);
-        if (card==NULL) {
-                ret = -ENOMEM;
-                goto getout1;
-        }
-
-        /*
-         * Parse configuration information.  This all comes
-         * directly from the publicly available @002d.ADF.
-         * Get it from Madge or your local ADF library.
-         */
-
-        /*
-         * Base address 
-         */
-        dev->base_addr = 0x0a20 + 
-                ((mdev->pos[2] & MC16_POS2_ADDR2)?0x0400:0) +
-                ((mdev->pos[0] & MC16_POS0_ADDR1)?0x1000:0) +
-                ((mdev->pos[3] & MC16_POS3_ADDR3)?0x2000:0);
-
-        /*
-         * Interrupt line
-         */
-        switch(mdev->pos[0] >> 6) { /* upper two bits */
-                case 0x1: dev->irq = 3; break;
-                case 0x2: dev->irq = 9; break; /* IRQ 2 = IRQ 9 */
-                case 0x3: dev->irq = 10; break;
-                default: dev->irq = 0; break;
-        }
-
-        if (dev->irq == 0) {
-                printk("%s: invalid IRQ\n", dev->name);
-                ret = -EBUSY;
-                goto getout2;
-        }
-
-        if (!request_region(dev->base_addr, MADGEMC_IO_EXTENT, 
-                           "madgemc")) {
-                printk(KERN_INFO "madgemc: unable to setup Smart MC in slot %d because of I/O base conflict at 0x%04lx\n", mdev->slot, dev->base_addr);
-                dev->base_addr += MADGEMC_SIF_OFFSET;
-                ret = -EBUSY;
-                goto getout2;
-        }
-        dev->base_addr += MADGEMC_SIF_OFFSET;
-        
-        /*
-         * Arbitration Level
-         */
-        card->arblevel = ((mdev->pos[0] >> 1) & 0x7) + 8;
-
-        /*
-         * Burst mode and Fairness
-         */
-        card->burstmode = ((mdev->pos[2] >> 6) & 0x3);
-        card->fairness = ((mdev->pos[2] >> 4) & 0x1);
-
-        /*
-         * Ring Speed
-         */
-        if ((mdev->pos[1] >> 2)&0x1)
-                card->ringspeed = 2; /* not selected */
-        else if ((mdev->pos[2] >> 5) & 0x1)
-                card->ringspeed = 1; /* 16Mb */
-        else
-                card->ringspeed = 0; /* 4Mb */
-
-        /* 
-         * Cable type
-         */
-        if ((mdev->pos[1] >> 6)&0x1)
-                card->cabletype = 1; /* STP/DB9 */
-        else
-                card->cabletype = 0; /* UTP/RJ-45 */
-
-
-        /* 
-         * ROM Info. This requires us to actually twiddle
-         * bits on the card, so we must ensure above that 
-         * the base address is free of conflict (request_region above).
-         */
-        madgemc_read_rom(dev, card);
-                
-        if (card->manid != 0x4d) { /* something went wrong */
-                printk(KERN_INFO "%s: Madge MC ROM read failed (unknown manufacturer ID %02x)\n", dev->name, card->manid);
-                goto getout3;
-        }
-                
-        if ((card->cardtype != 0x08) && (card->cardtype != 0x0d)) {
-                printk(KERN_INFO "%s: Madge MC ROM read failed (unknown card ID %02x)\n", dev->name, card->cardtype);
-                ret = -EIO;
-                goto getout3;
-        }
-               
-        /* All cards except Rev 0 and 1 MC16's have 256kb of RAM */
-        if ((card->cardtype == 0x08) && (card->cardrev <= 0x01))
-                card->ramsize = 128;
-        else
-                card->ramsize = 256;
-
-        printk("%s: %s Rev %d at 0x%04lx IRQ %d\n", 
-               dev->name, 
-               (card->cardtype == 0x08)?MADGEMC16_CARDNAME:
-               MADGEMC32_CARDNAME, card->cardrev, 
-               dev->base_addr, dev->irq);
-
-        if (card->cardtype == 0x0d)
-                printk("%s:     Warning: MC32 support is experimental and highly untested\n", dev->name);
-        
-        if (card->ringspeed==2) { /* Unknown */
-                printk("%s:     Warning: Ring speed not set in POS -- Please run the reference disk and set it!\n", dev->name);
-                card->ringspeed = 1; /* default to 16mb */
-        }
-                
-        printk("%s:     RAM Size: %dKB\n", dev->name, card->ramsize);
-
-        printk("%s:     Ring Speed: %dMb/sec on %s\n", dev->name, 
-               (card->ringspeed)?16:4, 
-               card->cabletype?"STP/DB9":"UTP/RJ-45");
-        printk("%s:     Arbitration Level: %d\n", dev->name, 
-               card->arblevel);
-
-        printk("%s:     Burst Mode: ", dev->name);
-        switch(card->burstmode) {
-                case 0: printk("Cycle steal"); break;
-                case 1: printk("Limited burst"); break;
-                case 2: printk("Delayed release"); break;
-                case 3: printk("Immediate release"); break;
-        }
-        printk(" (%s)\n", (card->fairness)?"Unfair":"Fair");
-
-
-        /* 
-         * Enable SIF before we assign the interrupt handler,
-         * just in case we get spurious interrupts that need
-         * handling.
-         */ 
-        outb(0, dev->base_addr + MC_CONTROL_REG0); /* sanity */
-        madgemc_setsifsel(dev, 1);
-        if (request_irq(dev->irq, madgemc_interrupt, IRQF_SHARED,
-                       "madgemc", dev)) {
-                ret = -EBUSY;
-                goto getout3;
-        }
-
-        madgemc_chipset_init(dev); /* enables interrupts! */
-        madgemc_setcabletype(dev, card->cabletype);
-
-        /* Setup MCA structures */
-        mca_device_set_name(mdev, (card->cardtype == 0x08)?MADGEMC16_CARDNAME:MADGEMC32_CARDNAME);
-        mca_set_adapter_procfn(mdev->slot, madgemc_mcaproc, dev);
-
-        printk("%s:     Ring Station Address: %pM\n",
-               dev->name, dev->dev_addr);
-
-        if (tmsdev_init(dev, device)) {
-                printk("%s: unable to get memory for dev->priv.\n", 
-                       dev->name);
-                ret = -ENOMEM;
-                goto getout4;
-        }
-        tp = netdev_priv(dev);
-
-        /* 
-         * The MC16 is physically a 32bit card.  However, Madge
-         * insists on calling it 16bit, so I'll assume here that
-         * they know what they're talking about.  Cut off DMA
-         * at 16mb.
-         */
-        tp->setnselout = madgemc_setnselout_pins;
-        tp->sifwriteb = madgemc_sifwriteb;
-        tp->sifreadb = madgemc_sifreadb;
-        tp->sifwritew = madgemc_sifwritew;
-        tp->sifreadw = madgemc_sifreadw;
-        tp->DataRate = (card->ringspeed)?SPEED_16:SPEED_4;
-
-        memcpy(tp->ProductID, "Madge MCA 16/4    ", PROD_ID_SIZE + 1);
-
-        tp->tmspriv = card;
-        dev_set_drvdata(device, dev);
-
-        if (register_netdev(dev) == 0)
-                return 0;
-
-        dev_set_drvdata(device, NULL);
-        ret = -ENOMEM;
-getout4:
-        free_irq(dev->irq, dev);
-getout3:
-        release_region(dev->base_addr-MADGEMC_SIF_OFFSET, 
-                       MADGEMC_IO_EXTENT); 
-getout2:
-        kfree(card);
-getout1:
-        free_netdev(dev);
-getout:
-        mca_device_set_claim(mdev, 0);
-        return ret;
-}
-
-/*
- * Handle interrupts generated by the card
- *
- * The MicroChannel Madge cards need slightly more handling
- * after an interrupt than other TMS380 cards do.
- *
- * First we must make sure it was this card that generated the
- * interrupt (since interrupt sharing is allowed).  Then,
- * because we're using level-triggered interrupts (as is
- * standard on MCA), we must toggle the interrupt line
- * on the card in order to claim and acknowledge the interrupt.
- * Once that is done, the interrupt should be handlable in
- * the normal tms380tr_interrupt() routine.
- *
- * There's two ways we can check to see if the interrupt is ours,
- * both with their own disadvantages...
- *
- * 1)   Read in the SIFSTS register from the TMS controller.  This
- *      is guaranteed to be accurate, however, there's a fairly
- *      large performance penalty for doing so: the Madge chips
- *      must request the register from the Eagle, the Eagle must
- *      read them from its internal bus, and then take the route
- *      back out again, for a 16bit read.  
- *
- * 2)   Use the MC_CONTROL_REG0_SINTR bit from the Madge ASICs.
- *      The major disadvantage here is that the accuracy of the
- *      bit is in question.  However, it cuts out the extra read
- *      cycles it takes to read the Eagle's SIF, as its only an
- *      8bit read, and theoretically the Madge bit is directly
- *      connected to the interrupt latch coming out of the Eagle
- *      hardware (that statement is not verified).  
- *
- * I can't determine which of these methods has the best win.  For now,
- * we make a compromise.  Use the Madge way for the first interrupt,
- * which should be the fast-path, and then once we hit the first 
- * interrupt, keep on trying using the SIF method until we've
- * exhausted all contiguous interrupts.
- *
- */
-static irqreturn_t madgemc_interrupt(int irq, void *dev_id)
-{
-        int pending,reg1;
-        struct net_device *dev;
-
-        if (!dev_id) {
-                printk("madgemc_interrupt: was not passed a dev_id!\n");
-                return IRQ_NONE;
-        }
-
-        dev = dev_id;
-
-        /* Make sure its really us. -- the Madge way */
-        pending = inb(dev->base_addr + MC_CONTROL_REG0);
-        if (!(pending & MC_CONTROL_REG0_SINTR))
-                return IRQ_NONE; /* not our interrupt */
-
-        /*
-         * Since we're level-triggered, we may miss the rising edge
-         * of the next interrupt while we're off handling this one,
-         * so keep checking until the SIF verifies that it has nothing
-         * left for us to do.
-         */
-        pending = STS_SYSTEM_IRQ;
-        do {
-                if (pending & STS_SYSTEM_IRQ) {
-
-                        /* Toggle the interrupt to reset the latch on card */
-                        reg1 = inb(dev->base_addr + MC_CONTROL_REG1);
-                        outb(reg1 ^ MC_CONTROL_REG1_SINTEN, 
-                             dev->base_addr + MC_CONTROL_REG1);
-                        outb(reg1, dev->base_addr + MC_CONTROL_REG1);
-
-                        /* Continue handling as normal */
-                        tms380tr_interrupt(irq, dev_id);
-
-                        pending = SIFREADW(SIFSTS); /* restart - the SIF way */
-
-                } else
-                        return IRQ_HANDLED; 
-        } while (1);
-
-        return IRQ_HANDLED; /* not reachable */
-}
-
-/*
- * Set the card to the preferred ring speed.
- *
- * Unlike newer cards, the MC16/32 have their speed selection
- * circuit connected to the Madge ASICs and not to the TMS380
- * NSELOUT pins. Set the ASIC bits correctly here, and return 
- * zero to leave the TMS NSELOUT bits unaffected.
- *
- */
-static unsigned short madgemc_setnselout_pins(struct net_device *dev)
-{
-        unsigned char reg1;
-        struct net_local *tp = netdev_priv(dev);
-        
-        reg1 = inb(dev->base_addr + MC_CONTROL_REG1);
-
-        if(tp->DataRate == SPEED_16)
-                reg1 |= MC_CONTROL_REG1_SPEED_SEL; /* add for 16mb */
-        else if (reg1 & MC_CONTROL_REG1_SPEED_SEL)
-                reg1 ^= MC_CONTROL_REG1_SPEED_SEL; /* remove for 4mb */
-        outb(reg1, dev->base_addr + MC_CONTROL_REG1);
-
-        return 0; /* no change */
-}
-
-/*
- * Set the register page.  This equates to the SRSX line
- * on the TMS380Cx6.
- *
- * Register selection is normally done via three contiguous
- * bits.  However, some boards (such as the MC16/32) use only
- * two bits, plus a separate bit in the glue chip.  This
- * sets the SRSX bit (the top bit).  See page 4-17 in the
- * Yellow Book for which registers are affected.
- *
- */
-static void madgemc_setregpage(struct net_device *dev, int page)
-{       
-        static int reg1;
-
-        reg1 = inb(dev->base_addr + MC_CONTROL_REG1);
-        if ((page == 0) && (reg1 & MC_CONTROL_REG1_SRSX)) {
-                outb(reg1 ^ MC_CONTROL_REG1_SRSX, 
-                     dev->base_addr + MC_CONTROL_REG1);
-        }
-        else if (page == 1) {
-                outb(reg1 | MC_CONTROL_REG1_SRSX, 
-                     dev->base_addr + MC_CONTROL_REG1);
-        }
-        reg1 = inb(dev->base_addr + MC_CONTROL_REG1);
-}
-
-/*
- * The SIF registers are not mapped into register space by default
- * Set this to 1 to map them, 0 to map the BIA ROM.
- *
- */
-static void madgemc_setsifsel(struct net_device *dev, int val)
-{
-        unsigned int reg0;
-
-        reg0 = inb(dev->base_addr + MC_CONTROL_REG0);
-        if ((val == 0) && (reg0 & MC_CONTROL_REG0_SIFSEL)) {
-                outb(reg0 ^ MC_CONTROL_REG0_SIFSEL, 
-                     dev->base_addr + MC_CONTROL_REG0);
-        } else if (val == 1) {
-                outb(reg0 | MC_CONTROL_REG0_SIFSEL, 
-                     dev->base_addr + MC_CONTROL_REG0);
-        }       
-        reg0 = inb(dev->base_addr + MC_CONTROL_REG0);
-}
-
-/*
- * Enable SIF interrupts
- *
- * This does not enable interrupts in the SIF, but rather
- * enables SIF interrupts to be passed onto the host.
- *
- */
-static void madgemc_setint(struct net_device *dev, int val)
-{
-        unsigned int reg1;
-
-        reg1 = inb(dev->base_addr + MC_CONTROL_REG1);
-        if ((val == 0) && (reg1 & MC_CONTROL_REG1_SINTEN)) {
-                outb(reg1 ^ MC_CONTROL_REG1_SINTEN, 
-                     dev->base_addr + MC_CONTROL_REG1);
-        } else if (val == 1) {
-                outb(reg1 | MC_CONTROL_REG1_SINTEN, 
-                     dev->base_addr + MC_CONTROL_REG1);
-        }
-}
-
-/*
- * Cable type is set via control register 7. Bit zero high
- * for UTP, low for STP.
- */
-static void madgemc_setcabletype(struct net_device *dev, int type)
-{
-        outb((type==0)?MC_CONTROL_REG7_CABLEUTP:MC_CONTROL_REG7_CABLESTP,
-             dev->base_addr + MC_CONTROL_REG7);
-}
-
-/*
- * Enable the functions of the Madge chipset needed for
- * full working order. 
- */
-static int madgemc_chipset_init(struct net_device *dev)
-{
-        outb(0, dev->base_addr + MC_CONTROL_REG1); /* pull SRESET low */
-        tms380tr_wait(100); /* wait for card to reset */
-
-        /* bring back into normal operating mode */
-        outb(MC_CONTROL_REG1_NSRESET, dev->base_addr + MC_CONTROL_REG1);
-
-        /* map SIF registers */
-        madgemc_setsifsel(dev, 1);
-
-        /* enable SIF interrupts */
-        madgemc_setint(dev, 1); 
-
-        return 0;
-}
-
-/*
- * Disable the board, and put back into power-up state.
- */
-static void madgemc_chipset_close(struct net_device *dev)
-{
-        /* disable interrupts */
-        madgemc_setint(dev, 0);
-        /* unmap SIF registers */
-        madgemc_setsifsel(dev, 0);
-}
-
-/*
- * Read the card type (MC16 or MC32) from the card.
- *
- * The configuration registers are stored in two separate
- * pages.  Pages are flipped by clearing bit 3 of CONTROL_REG0 (PAGE)
- * for page zero, or setting bit 3 for page one.
- *
- * Page zero contains the following data:
- *      Byte 0: Manufacturer ID (0x4D -- ASCII "M")
- *      Byte 1: Card type:
- *                      0x08 for MC16
- *                      0x0D for MC32
- *      Byte 2: Card revision
- *      Byte 3: Mirror of POS config register 0
- *      Byte 4: Mirror of POS 1
- *      Byte 5: Mirror of POS 2
- *
- * Page one contains the following data:
- *      Byte 0: Unused
- *      Byte 1-6: BIA, MSB to LSB.
- *
- * Note that to read the BIA, we must unmap the SIF registers
- * by clearing bit 2 of CONTROL_REG0 (SIFSEL), as the data
- * will reside in the same logical location.  For this reason,
- * _never_ read the BIA while the Eagle processor is running!
- * The SIF will be completely inaccessible until the BIA operation
- * is complete.
- *
- */
-static void madgemc_read_rom(struct net_device *dev, struct card_info *card)
-{
-        unsigned long ioaddr;
-        unsigned char reg0, reg1, tmpreg0, i;
-
-        ioaddr = dev->base_addr;
-
-        reg0 = inb(ioaddr + MC_CONTROL_REG0);
-        reg1 = inb(ioaddr + MC_CONTROL_REG1);
-
-        /* Switch to page zero and unmap SIF */
-        tmpreg0 = reg0 & ~(MC_CONTROL_REG0_PAGE + MC_CONTROL_REG0_SIFSEL);
-        outb(tmpreg0, ioaddr + MC_CONTROL_REG0);
-        
-        card->manid = inb(ioaddr + MC_ROM_MANUFACTURERID);
-        card->cardtype = inb(ioaddr + MC_ROM_ADAPTERID);
-        card->cardrev = inb(ioaddr + MC_ROM_REVISION);
-
-        /* Switch to rom page one */
-        outb(tmpreg0 | MC_CONTROL_REG0_PAGE, ioaddr + MC_CONTROL_REG0);
-
-        /* Read BIA */
-        dev->addr_len = 6;
-        for (i = 0; i < 6; i++)
-                dev->dev_addr[i] = inb(ioaddr + MC_ROM_BIA_START + i);
-        
-        /* Restore original register values */
-        outb(reg0, ioaddr + MC_CONTROL_REG0);
-        outb(reg1, ioaddr + MC_CONTROL_REG1);
-}
-
-static int madgemc_open(struct net_device *dev)
-{  
-        /*
-         * Go ahead and reinitialize the chipset again, just to 
-         * make sure we didn't get left in a bad state.
-         */
-        madgemc_chipset_init(dev);
-        tms380tr_open(dev);
-        return 0;
-}
-
-static int madgemc_close(struct net_device *dev)
-{
-        tms380tr_close(dev);
-        madgemc_chipset_close(dev);
-        return 0;
-}
-
-/*
- * Give some details available from /proc/mca/slotX
- */
-static int madgemc_mcaproc(char *buf, int slot, void *d) 
-{       
-        struct net_device *dev = (struct net_device *)d;
-        struct net_local *tp = netdev_priv(dev);
-        struct card_info *curcard = tp->tmspriv;
-        int len = 0;
-        
-        len += sprintf(buf+len, "-------\n");
-        if (curcard) {
-                len += sprintf(buf+len, "Card Revision: %d\n", curcard->cardrev);
-                len += sprintf(buf+len, "RAM Size: %dkb\n", curcard->ramsize);
-                len += sprintf(buf+len, "Cable type: %s\n", (curcard->cabletype)?"STP/DB9":"UTP/RJ-45");
-                len += sprintf(buf+len, "Configured ring speed: %dMb/sec\n", (curcard->ringspeed)?16:4);
-                len += sprintf(buf+len, "Running ring speed: %dMb/sec\n", (tp->DataRate==SPEED_16)?16:4);
-                len += sprintf(buf+len, "Device: %s\n", dev->name);
-                len += sprintf(buf+len, "IO Port: 0x%04lx\n", dev->base_addr);
-                len += sprintf(buf+len, "IRQ: %d\n", dev->irq);
-                len += sprintf(buf+len, "Arbitration Level: %d\n", curcard->arblevel);
-                len += sprintf(buf+len, "Burst Mode: ");
-                switch(curcard->burstmode) {
-                case 0: len += sprintf(buf+len, "Cycle steal"); break;
-                case 1: len += sprintf(buf+len, "Limited burst"); break;
-                case 2: len += sprintf(buf+len, "Delayed release"); break;
-                case 3: len += sprintf(buf+len, "Immediate release"); break;
-                }
-                len += sprintf(buf+len, " (%s)\n", (curcard->fairness)?"Unfair":"Fair");
-                
-                len += sprintf(buf+len, "Ring Station Address: %pM\n",
-                               dev->dev_addr);
-        } else 
-                len += sprintf(buf+len, "Card not configured\n");
-
-        return len;
-}
-
-static int __devexit madgemc_remove(struct device *device)
-{
-        struct net_device *dev = dev_get_drvdata(device);
-        struct net_local *tp;
-        struct card_info *card;
-
-        BUG_ON(!dev);
-
-        tp = netdev_priv(dev);
-        card = tp->tmspriv;
-        kfree(card);
-        tp->tmspriv = NULL;
-
-        unregister_netdev(dev);
-        release_region(dev->base_addr-MADGEMC_SIF_OFFSET, MADGEMC_IO_EXTENT);
-        free_irq(dev->irq, dev);
-        tmsdev_term(dev);
-        free_netdev(dev);
-        dev_set_drvdata(device, NULL);
-
-        return 0;
-}
-
-static short madgemc_adapter_ids[] __initdata = {
-        0x002d,
-        0x0000
-};
-
-static struct mca_driver madgemc_driver = {
-        .id_table = madgemc_adapter_ids,
-        .driver = {
-                .name = "madgemc",
-                .bus = &mca_bus_type,
-                .probe = madgemc_probe,
-                .remove = __devexit_p(madgemc_remove),
-        },
-};
-
-static int __init madgemc_init (void)
-{
-        madgemc_netdev_ops = tms380tr_netdev_ops;
-        madgemc_netdev_ops.ndo_open = madgemc_open;
-        madgemc_netdev_ops.ndo_stop = madgemc_close;
-
-        return mca_register_driver (&madgemc_driver);
-}
-
-static void __exit madgemc_exit (void)
-{
-        mca_unregister_driver (&madgemc_driver);
-}
-
-module_init(madgemc_init);
-module_exit(madgemc_exit);
-
-MODULE_LICENSE("GPL");
-
diff --git a/drivers/net/tokenring/madgemc.h b/drivers/net/tokenring/madgemc.h
deleted file mode 100644
index fe88e272c531..000000000000
--- a/drivers/net/tokenring/madgemc.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* 
- * madgemc.h: Header for the madgemc tms380tr module
- *
- * Authors:
- * - Adam Fritzler
- */
-
-#ifndef __LINUX_MADGEMC_H
-#define __LINUX_MADGEMC_H
-
-#ifdef __KERNEL__
-
-#define MADGEMC16_CARDNAME "Madge Smart 16/4 MC16 Ringnode"
-#define MADGEMC32_CARDNAME "Madge Smart 16/4 MC32 Ringnode"
-
-/* 
- * Bit definitions for the POS config registers
- */
-#define MC16_POS0_ADDR1 0x20
-#define MC16_POS2_ADDR2 0x04
-#define MC16_POS3_ADDR3 0x20
-
-#define MC_CONTROL_REG0         ((long)-8) /* 0x00 */
-#define MC_CONTROL_REG1         ((long)-7) /* 0x01 */
-#define MC_ADAPTER_POS_REG0     ((long)-6) /* 0x02 */
-#define MC_ADAPTER_POS_REG1     ((long)-5) /* 0x03 */
-#define MC_ADAPTER_POS_REG2     ((long)-4) /* 0x04 */
-#define MC_ADAPTER_REG5_UNUSED  ((long)-3) /* 0x05 */
-#define MC_ADAPTER_REG6_UNUSED  ((long)-2) /* 0x06 */
-#define MC_CONTROL_REG7         ((long)-1) /* 0x07 */
-
-#define MC_CONTROL_REG0_UNKNOWN1        0x01
-#define MC_CONTROL_REG0_UNKNOWN2        0x02
-#define MC_CONTROL_REG0_SIFSEL          0x04
-#define MC_CONTROL_REG0_PAGE            0x08
-#define MC_CONTROL_REG0_TESTINTERRUPT   0x10
-#define MC_CONTROL_REG0_UNKNOWN20       0x20
-#define MC_CONTROL_REG0_SINTR           0x40
-#define MC_CONTROL_REG0_UNKNOWN80       0x80
-
-#define MC_CONTROL_REG1_SINTEN          0x01
-#define MC_CONTROL_REG1_BITOFDEATH      0x02
-#define MC_CONTROL_REG1_NSRESET         0x04
-#define MC_CONTROL_REG1_UNKNOWN8        0x08
-#define MC_CONTROL_REG1_UNKNOWN10       0x10
-#define MC_CONTROL_REG1_UNKNOWN20       0x20
-#define MC_CONTROL_REG1_SRSX            0x40
-#define MC_CONTROL_REG1_SPEED_SEL       0x80
-
-#define MC_CONTROL_REG7_CABLESTP        0x00
-#define MC_CONTROL_REG7_CABLEUTP        0x01
-
-/*
- * ROM Page Zero
- */
-#define MC_ROM_MANUFACTURERID           0x00
-#define MC_ROM_ADAPTERID                0x01
-#define MC_ROM_REVISION                 0x02
-#define MC_ROM_CONFIG0                  0x03
-#define MC_ROM_CONFIG1                  0x04
-#define MC_ROM_CONFIG2                  0x05
-
-/*
- * ROM Page One
- */
-#define MC_ROM_UNUSED_BYTE              0x00
-#define MC_ROM_BIA_START                0x01
-
-#endif /* __KERNEL__ */
-#endif /* __LINUX_MADGEMC_H */
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
deleted file mode 100644
index 0e234741cc79..000000000000
--- a/drivers/net/tokenring/olympic.c
+++ /dev/null
@@ -1,1749 +0,0 @@
-/*
- *   olympic.c (c) 1999 Peter De Schrijver All Rights Reserved
- *                 1999/2000 Mike Phillips (mikep@linuxtr.net)
- *
- *  Linux driver for IBM PCI tokenring cards based on the Pit/Pit-Phy/Olympic
- *  chipset. 
- *
- *  Base Driver Skeleton:
- *      Written 1993-94 by Donald Becker.
- *
- *      Copyright 1993 United States Government as represented by the
- *      Director, National Security Agency.
- *
- *  Thanks to Erik De Cock, Adrian Bridgett and Frank Fiene for their 
- *  assistance and perserverance with the testing of this driver.
- *
- *  This software may be used and distributed according to the terms
- *  of the GNU General Public License, incorporated herein by reference.
- * 
- *  4/27/99 - Alpha Release 0.1.0
- *            First release to the public
- *
- *  6/8/99  - Official Release 0.2.0   
- *            Merged into the kernel code 
- *  8/18/99 - Updated driver for 2.3.13 kernel to use new pci
- *            resource. Driver also reports the card name returned by
- *            the pci resource.
- *  1/11/00 - Added spinlocks for smp
- *  2/23/00 - Updated to dev_kfree_irq 
- *  3/10/00 - Fixed FDX enable which triggered other bugs also 
- *            squashed.
- *  5/20/00 - Changes to handle Olympic on LinuxPPC. Endian changes.
- *            The odd thing about the changes is that the fix for
- *            endian issues with the big-endian data in the arb, asb...
- *            was to always swab() the bytes, no matter what CPU.
- *            That's because the read[wl]() functions always swap the
- *            bytes on the way in on PPC.
- *            Fixing the hardware descriptors was another matter,
- *            because they weren't going through read[wl](), there all
- *            the results had to be in memory in le32 values. kdaaker
- *
- * 12/23/00 - Added minimal Cardbus support (Thanks Donald).
- *
- * 03/09/01 - Add new pci api, dev_base_lock, general clean up. 
- *
- * 03/27/01 - Add new dma pci (Thanks to Kyle Lucke) and alloc_trdev
- *            Change proc_fs behaviour, now one entry per adapter.
- *
- * 04/09/01 - Couple of bug fixes to the dma unmaps and ejecting the
- *            adapter when live does not take the system down with it.
- * 
- * 06/02/01 - Clean up, copy skb for small packets
- * 
- * 06/22/01 - Add EISR error handling routines 
- *
- * 07/19/01 - Improve bad LAA reporting, strip out freemem
- *            into a separate function, its called from 3 
- *            different places now. 
- * 02/09/02 - Replaced sleep_on. 
- * 03/01/02 - Replace access to several registers from 32 bit to 
- *            16 bit. Fixes alignment errors on PPC 64 bit machines.
- *            Thanks to Al Trautman for this one.
- * 03/10/02 - Fix BUG in arb_cmd. Bug was there all along but was
- *            silently ignored until the error checking code 
- *            went into version 1.0.0 
- * 06/04/02 - Add correct start up sequence for the cardbus adapters.
- *            Required for strict compliance with pci power mgmt specs.
- *  To Do:
- *
- *           Wake on lan        
- * 
- *  If Problems do Occur
- *  Most problems can be rectified by either closing and opening the interface
- *  (ifconfig down and up) or rmmod and insmod'ing the driver (a bit difficult
- *  if compiled into the kernel).
- */
-
-/* Change OLYMPIC_DEBUG to 1 to get verbose, and I mean really verbose, messages */
-
-#define OLYMPIC_DEBUG 0
-
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/timer.h>
-#include <linux/in.h>
-#include <linux/ioport.h>
-#include <linux/seq_file.h>
-#include <linux/string.h>
-#include <linux/proc_fs.h>
-#include <linux/ptrace.h>
-#include <linux/skbuff.h>
-#include <linux/interrupt.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/trdevice.h>
-#include <linux/stddef.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/spinlock.h>
-#include <linux/bitops.h>
-#include <linux/jiffies.h>
-
-#include <net/checksum.h>
-#include <net/net_namespace.h>
-
-#include <asm/io.h>
-
-#include "olympic.h"
-
-/* I've got to put some intelligence into the version number so that Peter and I know
- * which version of the code somebody has got. 
- * Version Number = a.b.c.d  where a.b.c is the level of code and d is the latest author.
- * So 0.0.1.pds = Peter, 0.0.1.mlp = Mike
- * 
- * Official releases will only have an a.b.c version number format. 
- */
-
-static char version[] =
-"Olympic.c v1.0.5 6/04/02 - Peter De Schrijver & Mike Phillips" ; 
-
-static char *open_maj_error[]  = {"No error", "Lobe Media Test", "Physical Insertion",
-                                   "Address Verification", "Neighbor Notification (Ring Poll)",
-                                   "Request Parameters","FDX Registration Request",
-                                   "FDX Duplicate Address Check", "Station registration Query Wait",
-                                   "Unknown stage"};
-
-static char *open_min_error[] = {"No error", "Function Failure", "Signal Lost", "Wire Fault",
-                                   "Ring Speed Mismatch", "Timeout","Ring Failure","Ring Beaconing",
-                                   "Duplicate Node Address","Request Parameters","Remove Received",
-                                   "Reserved", "Reserved", "No Monitor Detected for RPL", 
-                                   "Monitor Contention failer for RPL", "FDX Protocol Error"};
-
-/* Module parameters */
-
-MODULE_AUTHOR("Mike Phillips <mikep@linuxtr.net>") ; 
-MODULE_DESCRIPTION("Olympic PCI/Cardbus Chipset Driver") ; 
-
-/* Ring Speed 0,4,16,100 
- * 0 = Autosense         
- * 4,16 = Selected speed only, no autosense
- * This allows the card to be the first on the ring
- * and become the active monitor.
- * 100 = Nothing at present, 100mbps is autodetected
- * if FDX is turned on. May be implemented in the future to 
- * fail if 100mpbs is not detected.
- *
- * WARNING: Some hubs will allow you to insert
- * at the wrong speed
- */
-
-static int ringspeed[OLYMPIC_MAX_ADAPTERS] = {0,} ;
-module_param_array(ringspeed, int, NULL, 0);
-
-/* Packet buffer size */
-
-static int pkt_buf_sz[OLYMPIC_MAX_ADAPTERS] = {0,} ;
-module_param_array(pkt_buf_sz, int, NULL, 0) ;
-
-/* Message Level */
-
-static int message_level[OLYMPIC_MAX_ADAPTERS] = {0,} ; 
-module_param_array(message_level, int, NULL, 0) ;
-
-/* Change network_monitor to receive mac frames through the arb channel.
- * Will also create a /proc/net/olympic_tr%d entry, where %d is the tr
- * device, i.e. tr0, tr1 etc. 
- * Intended to be used to create a ring-error reporting network module 
- * i.e. it will give you the source address of beaconers on the ring 
- */
-static int network_monitor[OLYMPIC_MAX_ADAPTERS] = {0,};
-module_param_array(network_monitor, int, NULL, 0);
-
-static DEFINE_PCI_DEVICE_TABLE(olympic_pci_tbl) = {
-        {PCI_VENDOR_ID_IBM,PCI_DEVICE_ID_IBM_TR_WAKE,PCI_ANY_ID,PCI_ANY_ID,},
-        { }     /* Terminating Entry */
-};
-MODULE_DEVICE_TABLE(pci,olympic_pci_tbl) ; 
-
-
-static int olympic_probe(struct pci_dev *pdev, const struct pci_device_id *ent); 
-static int olympic_init(struct net_device *dev);
-static int olympic_open(struct net_device *dev);
-static netdev_tx_t olympic_xmit(struct sk_buff *skb,
-                                      struct net_device *dev);
-static int olympic_close(struct net_device *dev);
-static void olympic_set_rx_mode(struct net_device *dev);
-static void olympic_freemem(struct net_device *dev) ;  
-static irqreturn_t olympic_interrupt(int irq, void *dev_id);
-static int olympic_set_mac_address(struct net_device *dev, void *addr) ; 
-static void olympic_arb_cmd(struct net_device *dev);
-static int olympic_change_mtu(struct net_device *dev, int mtu);
-static void olympic_srb_bh(struct net_device *dev) ; 
-static void olympic_asb_bh(struct net_device *dev) ; 
-static const struct file_operations olympic_proc_ops;
-
-static const struct net_device_ops olympic_netdev_ops = {
-        .ndo_open               = olympic_open,
-        .ndo_stop               = olympic_close,
-        .ndo_start_xmit         = olympic_xmit,
-        .ndo_change_mtu         = olympic_change_mtu,
-        .ndo_set_rx_mode        = olympic_set_rx_mode,
-        .ndo_set_mac_address    = olympic_set_mac_address,
-};
-
-static int __devinit olympic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-        struct net_device *dev ; 
-        struct olympic_private *olympic_priv;
-        static int card_no = -1 ;
-        int i ; 
-
-        card_no++ ; 
-
-        if ((i = pci_enable_device(pdev))) {
-                return i ; 
-        }
-
-        pci_set_master(pdev);
-
-        if ((i = pci_request_regions(pdev,"olympic"))) { 
-                goto op_disable_dev;
-        }
- 
-        dev = alloc_trdev(sizeof(struct olympic_private)) ; 
-        if (!dev) {
-                i = -ENOMEM; 
-                goto op_release_dev;
-        }
-
-        olympic_priv = netdev_priv(dev) ;
-        
-        spin_lock_init(&olympic_priv->olympic_lock) ; 
-
-        init_waitqueue_head(&olympic_priv->srb_wait);
-        init_waitqueue_head(&olympic_priv->trb_wait);
-#if OLYMPIC_DEBUG  
-        printk(KERN_INFO "pci_device: %p, dev:%p, dev->priv: %p\n", pdev, dev, netdev_priv(dev));
-#endif
-        dev->irq=pdev->irq;
-        dev->base_addr=pci_resource_start(pdev, 0);
-        olympic_priv->olympic_card_name = pci_name(pdev);
-        olympic_priv->pdev = pdev; 
-        olympic_priv->olympic_mmio = ioremap(pci_resource_start(pdev,1),256);
-        olympic_priv->olympic_lap = ioremap(pci_resource_start(pdev,2),2048);
-        if (!olympic_priv->olympic_mmio || !olympic_priv->olympic_lap) {
-                goto op_free_iomap;
-        }
-                                
-        if ((pkt_buf_sz[card_no] < 100) || (pkt_buf_sz[card_no] > 18000) )
-                olympic_priv->pkt_buf_sz = PKT_BUF_SZ ; 
-        else
-                olympic_priv->pkt_buf_sz = pkt_buf_sz[card_no] ; 
-
-        dev->mtu = olympic_priv->pkt_buf_sz - TR_HLEN ; 
-        olympic_priv->olympic_ring_speed = ringspeed[card_no] ; 
-        olympic_priv->olympic_message_level = message_level[card_no] ; 
-        olympic_priv->olympic_network_monitor = network_monitor[card_no];
-        
-        if ((i = olympic_init(dev))) {
-                goto op_free_iomap;
-        }                               
-
-        dev->netdev_ops = &olympic_netdev_ops;
-        SET_NETDEV_DEV(dev, &pdev->dev);
-
-        pci_set_drvdata(pdev,dev) ; 
-        register_netdev(dev) ; 
-        printk("Olympic: %s registered as: %s\n",olympic_priv->olympic_card_name,dev->name);
-        if (olympic_priv->olympic_network_monitor) { /* Must go after register_netdev as we need the device name */ 
-                char proc_name[20] ; 
-                strcpy(proc_name,"olympic_") ;
-                strcat(proc_name,dev->name) ; 
-                proc_create_data(proc_name, 0, init_net.proc_net, &olympic_proc_ops, dev);
-                printk("Olympic: Network Monitor information: /proc/%s\n",proc_name); 
-        }
-        return  0 ;
-
-op_free_iomap:
-        if (olympic_priv->olympic_mmio)
-                iounmap(olympic_priv->olympic_mmio); 
-        if (olympic_priv->olympic_lap)
-                iounmap(olympic_priv->olympic_lap);
-
-        free_netdev(dev);
-op_release_dev:
-        pci_release_regions(pdev); 
-
-op_disable_dev:
-        pci_disable_device(pdev);
-        return i;
-}
-
-static int olympic_init(struct net_device *dev)
-{
-        struct olympic_private *olympic_priv;
-        u8 __iomem *olympic_mmio, *init_srb,*adapter_addr;
-        unsigned long t; 
-        unsigned int uaa_addr;
-
-        olympic_priv=netdev_priv(dev);
-        olympic_mmio=olympic_priv->olympic_mmio;
-
-        printk("%s\n", version);
-        printk("%s. I/O at %hx, MMIO at %p, LAP at %p, using irq %d\n", olympic_priv->olympic_card_name, (unsigned int) dev->base_addr,olympic_priv->olympic_mmio, olympic_priv->olympic_lap, dev->irq);
-
-        writel(readl(olympic_mmio+BCTL) | BCTL_SOFTRESET,olympic_mmio+BCTL);
-        t=jiffies;
-        while((readl(olympic_mmio+BCTL)) & BCTL_SOFTRESET) {
-                schedule();             
-                if(time_after(jiffies, t + 40*HZ)) {
-                        printk(KERN_ERR "IBM PCI tokenring card not responding.\n");
-                        return -ENODEV;
-                }
-        }
-
-
-        /* Needed for cardbus */
-        if(!(readl(olympic_mmio+BCTL) & BCTL_MODE_INDICATOR)) {
-                writel(readl(olympic_priv->olympic_mmio+FERMASK)|FERMASK_INT_BIT, olympic_mmio+FERMASK);
-        }
-        
-#if OLYMPIC_DEBUG
-        printk("BCTL: %x\n",readl(olympic_mmio+BCTL));
-        printk("GPR: %x\n",readw(olympic_mmio+GPR));
-        printk("SISRMASK: %x\n",readl(olympic_mmio+SISR_MASK));
-#endif
-        /* Aaaahhh, You have got to be real careful setting GPR, the card
-           holds the previous values from flash memory, including autosense 
-           and ring speed */
-
-        writel(readl(olympic_mmio+BCTL)|BCTL_MIMREB,olympic_mmio+BCTL);
-        
-        if (olympic_priv->olympic_ring_speed  == 0) { /* Autosense */
-                writew(readw(olympic_mmio+GPR)|GPR_AUTOSENSE,olympic_mmio+GPR);
-                if (olympic_priv->olympic_message_level) 
-                        printk(KERN_INFO "%s: Ringspeed autosense mode on\n",olympic_priv->olympic_card_name);
-        } else if (olympic_priv->olympic_ring_speed == 16) {
-                if (olympic_priv->olympic_message_level) 
-                        printk(KERN_INFO "%s: Trying to open at 16 Mbps as requested\n", olympic_priv->olympic_card_name);
-                writew(GPR_16MBPS, olympic_mmio+GPR);
-        } else if (olympic_priv->olympic_ring_speed == 4) {
-                if (olympic_priv->olympic_message_level) 
-                        printk(KERN_INFO "%s: Trying to open at 4 Mbps as requested\n", olympic_priv->olympic_card_name) ; 
-                writew(0, olympic_mmio+GPR);
-        } 
-        
-        writew(readw(olympic_mmio+GPR)|GPR_NEPTUNE_BF,olympic_mmio+GPR);
-
-#if OLYMPIC_DEBUG
-        printk("GPR = %x\n",readw(olympic_mmio + GPR) ) ; 
-#endif
-        /* Solo has been paused to meet the Cardbus power
-         * specs if the adapter is cardbus. Check to 
-         * see its been paused and then restart solo. The
-         * adapter should set the pause bit within 1 second.
-         */
-
-        if(!(readl(olympic_mmio+BCTL) & BCTL_MODE_INDICATOR)) { 
-                t=jiffies;
-                while (!(readl(olympic_mmio+CLKCTL) & CLKCTL_PAUSE)) {
-                        schedule() ; 
-                        if(time_after(jiffies, t + 2*HZ)) {
-                                printk(KERN_ERR "IBM Cardbus tokenring adapter not responsing.\n") ; 
-                                return -ENODEV;
-                        }
-                }
-                writel(readl(olympic_mmio+CLKCTL) & ~CLKCTL_PAUSE, olympic_mmio+CLKCTL) ; 
-        }
-        
-        /* start solo init */
-        writel((1<<15),olympic_mmio+SISR_MASK_SUM);
-
-        t=jiffies;
-        while(!((readl(olympic_mmio+SISR_RR)) & SISR_SRB_REPLY)) {
-                schedule();             
-                if(time_after(jiffies, t + 15*HZ)) {
-                        printk(KERN_ERR "IBM PCI tokenring card not responding.\n");
-                        return -ENODEV;
-                }
-        }
-        
-        writel(readw(olympic_mmio+LAPWWO),olympic_mmio+LAPA);
-
-#if OLYMPIC_DEBUG
-        printk("LAPWWO: %x, LAPA: %x\n",readl(olympic_mmio+LAPWWO), readl(olympic_mmio+LAPA));
-#endif
-
-        init_srb=olympic_priv->olympic_lap + ((readw(olympic_mmio+LAPWWO)) & (~0xf800));
-
-#if OLYMPIC_DEBUG               
-{
-        int i;
-        printk("init_srb(%p): ",init_srb);
-        for(i=0;i<20;i++)
-                printk("%x ",readb(init_srb+i));
-        printk("\n");
-}
-#endif  
-        if(readw(init_srb+6)) {
-                printk(KERN_INFO "tokenring card initialization failed. errorcode : %x\n",readw(init_srb+6));
-                return -ENODEV;
-        }
-
-        if (olympic_priv->olympic_message_level) {
-                if ( readb(init_srb +2) & 0x40) { 
-                        printk(KERN_INFO "Olympic: Adapter is FDX capable.\n") ;
-                } else { 
-                        printk(KERN_INFO "Olympic: Adapter cannot do FDX.\n");
-                }
-        }
-  
-        uaa_addr=swab16(readw(init_srb+8));
-
-#if OLYMPIC_DEBUG
-        printk("UAA resides at %x\n",uaa_addr);
-#endif
-
-        writel(uaa_addr,olympic_mmio+LAPA);
-        adapter_addr=olympic_priv->olympic_lap + (uaa_addr & (~0xf800));
-
-        memcpy_fromio(&dev->dev_addr[0], adapter_addr,6);
-
-#if OLYMPIC_DEBUG
-        printk("adapter address: %pM\n", dev->dev_addr);
-#endif
-
-        olympic_priv->olympic_addr_table_addr = swab16(readw(init_srb + 12)); 
-        olympic_priv->olympic_parms_addr = swab16(readw(init_srb + 14)); 
-
-        return 0;
-
-}
-
-static int olympic_open(struct net_device *dev)
-{
-        struct olympic_private *olympic_priv=netdev_priv(dev);
-        u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio,*init_srb;
-        unsigned long flags, t;
-        int i, open_finished = 1 ;
-        u8 resp, err;
-
-        DECLARE_WAITQUEUE(wait,current) ; 
-
-        olympic_init(dev);
-
-        if (request_irq(dev->irq, olympic_interrupt, IRQF_SHARED , "olympic",
-                        dev))
-                return -EAGAIN;
-
-#if OLYMPIC_DEBUG
-        printk("BMCTL: %x\n",readl(olympic_mmio+BMCTL_SUM));
-        printk("pending ints: %x\n",readl(olympic_mmio+SISR_RR));
-#endif
-
-        writel(SISR_MI,olympic_mmio+SISR_MASK_SUM);
-
-        writel(SISR_MI | SISR_SRB_REPLY, olympic_mmio+SISR_MASK); /* more ints later, doesn't stop arb cmd interrupt */
-
-        writel(LISR_LIE,olympic_mmio+LISR); /* more ints later */
-
-        /* adapter is closed, so SRB is pointed to by LAPWWO */
-
-        writel(readw(olympic_mmio+LAPWWO),olympic_mmio+LAPA);
-        init_srb=olympic_priv->olympic_lap + ((readw(olympic_mmio+LAPWWO)) & (~0xf800));
-        
-#if OLYMPIC_DEBUG
-        printk("LAPWWO: %x, LAPA: %x\n",readw(olympic_mmio+LAPWWO), readl(olympic_mmio+LAPA));
-        printk("SISR Mask = %04x\n", readl(olympic_mmio+SISR_MASK));
-        printk("Before the open command\n");
-#endif  
-        do {
-                memset_io(init_srb,0,SRB_COMMAND_SIZE);
-
-                writeb(SRB_OPEN_ADAPTER,init_srb) ;     /* open */
-                writeb(OLYMPIC_CLEAR_RET_CODE,init_srb+2);
-
-                /* If Network Monitor, instruct card to copy MAC frames through the ARB */
-                if (olympic_priv->olympic_network_monitor) 
-                        writew(swab16(OPEN_ADAPTER_ENABLE_FDX | OPEN_ADAPTER_PASS_ADC_MAC | OPEN_ADAPTER_PASS_ATT_MAC | OPEN_ADAPTER_PASS_BEACON), init_srb+8);
-                else
-                        writew(swab16(OPEN_ADAPTER_ENABLE_FDX), init_srb+8);
-        
-                /* Test OR of first 3 bytes as its totally possible for 
-                 * someone to set the first 2 bytes to be zero, although this 
-                 * is an error, the first byte must have bit 6 set to 1  */
-
-                if (olympic_priv->olympic_laa[0] | olympic_priv->olympic_laa[1] | olympic_priv->olympic_laa[2]) {
-                        writeb(olympic_priv->olympic_laa[0],init_srb+12);
-                        writeb(olympic_priv->olympic_laa[1],init_srb+13);
-                        writeb(olympic_priv->olympic_laa[2],init_srb+14);
-                        writeb(olympic_priv->olympic_laa[3],init_srb+15);
-                        writeb(olympic_priv->olympic_laa[4],init_srb+16);
-                        writeb(olympic_priv->olympic_laa[5],init_srb+17);
-                        memcpy(dev->dev_addr,olympic_priv->olympic_laa,dev->addr_len) ;  
-                }       
-                writeb(1,init_srb+30);
-
-                spin_lock_irqsave(&olympic_priv->olympic_lock,flags);   
-                olympic_priv->srb_queued=1;
-
-                writel(LISR_SRB_CMD,olympic_mmio+LISR_SUM);
-                spin_unlock_irqrestore(&olympic_priv->olympic_lock,flags);
-
-                t = jiffies ; 
-        
-                add_wait_queue(&olympic_priv->srb_wait,&wait) ;
-                set_current_state(TASK_INTERRUPTIBLE) ; 
- 
-                while(olympic_priv->srb_queued) {        
-                        schedule() ; 
-                        if(signal_pending(current))     {            
-                                printk(KERN_WARNING "%s: Signal received in open.\n",
-                                        dev->name);
-                                printk(KERN_WARNING "SISR=%x LISR=%x\n",
-                                        readl(olympic_mmio+SISR),
-                                        readl(olympic_mmio+LISR));
-                                olympic_priv->srb_queued=0;
-                                break;
-                        }
-                        if (time_after(jiffies, t + 10*HZ)) {
-                                printk(KERN_WARNING "%s: SRB timed out.\n",dev->name);
-                                olympic_priv->srb_queued=0;
-                                break ; 
-                        } 
-                        set_current_state(TASK_INTERRUPTIBLE) ; 
-                }
-                remove_wait_queue(&olympic_priv->srb_wait,&wait) ; 
-                set_current_state(TASK_RUNNING) ; 
-                olympic_priv->srb_queued = 0 ; 
-#if OLYMPIC_DEBUG
-                printk("init_srb(%p): ",init_srb);
-                for(i=0;i<20;i++)
-                        printk("%02x ",readb(init_srb+i));
-                printk("\n");
-#endif
-                
-                /* If we get the same return response as we set, the interrupt wasn't raised and the open
-                 * timed out.
-                 */
-
-                switch (resp = readb(init_srb+2)) {
-                case OLYMPIC_CLEAR_RET_CODE:
-                        printk(KERN_WARNING "%s: Adapter Open time out or error.\n", dev->name) ; 
-                        goto out;
-                case 0:
-                        open_finished = 1;
-                        break;
-                case 0x07:
-                        if (!olympic_priv->olympic_ring_speed && open_finished) { /* Autosense , first time around */
-                                printk(KERN_WARNING "%s: Retrying at different ring speed\n", dev->name);
-                                open_finished = 0 ;  
-                                continue;
-                        }
-
-                        err = readb(init_srb+7);
-
-                        if (!olympic_priv->olympic_ring_speed && ((err & 0x0f) == 0x0d)) { 
-                                printk(KERN_WARNING "%s: Tried to autosense ring speed with no monitors present\n",dev->name);
-                                printk(KERN_WARNING "%s: Please try again with a specified ring speed\n",dev->name);
-                        } else {
-                                printk(KERN_WARNING "%s: %s - %s\n", dev->name,
-                                        open_maj_error[(err & 0xf0) >> 4],
-                                        open_min_error[(err & 0x0f)]);
-                        }
-                        goto out;
-
-                case 0x32:
-                        printk(KERN_WARNING "%s: Invalid LAA: %pM\n",
-                               dev->name, olympic_priv->olympic_laa);
-                        goto out;
-
-                default:
-                        printk(KERN_WARNING "%s: Bad OPEN response: %x\n", dev->name, resp);
-                        goto out;
-
-                }
-        } while (!(open_finished)) ; /* Will only loop if ring speed mismatch re-open attempted && autosense is on */   
-
-        if (readb(init_srb+18) & (1<<3)) 
-                if (olympic_priv->olympic_message_level) 
-                        printk(KERN_INFO "%s: Opened in FDX Mode\n",dev->name);
-
-        if (readb(init_srb+18) & (1<<1))
-                olympic_priv->olympic_ring_speed = 100 ; 
-        else if (readb(init_srb+18) & 1)
-                olympic_priv->olympic_ring_speed = 16 ; 
-        else
-                olympic_priv->olympic_ring_speed = 4 ; 
-
-        if (olympic_priv->olympic_message_level) 
-                printk(KERN_INFO "%s: Opened in %d Mbps mode\n",dev->name, olympic_priv->olympic_ring_speed);
-
-        olympic_priv->asb = swab16(readw(init_srb+8));
-        olympic_priv->srb = swab16(readw(init_srb+10));
-        olympic_priv->arb = swab16(readw(init_srb+12));
-        olympic_priv->trb = swab16(readw(init_srb+16));
-
-        olympic_priv->olympic_receive_options = 0x01 ; 
-        olympic_priv->olympic_copy_all_options = 0 ; 
-        
-        /* setup rx ring */
-        
-        writel((3<<16),olympic_mmio+BMCTL_RWM); /* Ensure end of frame generated interrupts */ 
-
-        writel(BMCTL_RX_DIS|3,olympic_mmio+BMCTL_RWM); /* Yes, this the enables RX channel */
-
-        for(i=0;i<OLYMPIC_RX_RING_SIZE;i++) {
-
-                struct sk_buff *skb;
-                
-                skb=dev_alloc_skb(olympic_priv->pkt_buf_sz);
-                if(skb == NULL)
-                        break;
-
-                skb->dev = dev;
-
-                olympic_priv->olympic_rx_ring[i].buffer = cpu_to_le32(pci_map_single(olympic_priv->pdev, 
-                                                          skb->data,olympic_priv->pkt_buf_sz, PCI_DMA_FROMDEVICE)) ; 
-                olympic_priv->olympic_rx_ring[i].res_length = cpu_to_le32(olympic_priv->pkt_buf_sz); 
-                olympic_priv->rx_ring_skb[i]=skb;
-        }
-
-        if (i==0) {
-                printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers. Adapter disabled\n",dev->name);
-                goto out;
-        }
-
-        olympic_priv->rx_ring_dma_addr = pci_map_single(olympic_priv->pdev,olympic_priv->olympic_rx_ring, 
-                                         sizeof(struct olympic_rx_desc) * OLYMPIC_RX_RING_SIZE, PCI_DMA_TODEVICE);
-        writel(olympic_priv->rx_ring_dma_addr, olympic_mmio+RXDESCQ);
-        writel(olympic_priv->rx_ring_dma_addr, olympic_mmio+RXCDA);
-        writew(i, olympic_mmio+RXDESCQCNT);
-                
-        olympic_priv->rx_status_ring_dma_addr = pci_map_single(olympic_priv->pdev, olympic_priv->olympic_rx_status_ring, 
-                                                sizeof(struct olympic_rx_status) * OLYMPIC_RX_RING_SIZE, PCI_DMA_FROMDEVICE);
-        writel(olympic_priv->rx_status_ring_dma_addr, olympic_mmio+RXSTATQ);
-        writel(olympic_priv->rx_status_ring_dma_addr, olympic_mmio+RXCSA);
-        
-        olympic_priv->rx_ring_last_received = OLYMPIC_RX_RING_SIZE - 1; /* last processed rx status */
-        olympic_priv->rx_status_last_received = OLYMPIC_RX_RING_SIZE - 1;  
-
-        writew(i, olympic_mmio+RXSTATQCNT);
-
-#if OLYMPIC_DEBUG 
-        printk("# of rx buffers: %d, RXENQ: %x\n",i, readw(olympic_mmio+RXENQ));
-        printk("RXCSA: %x, rx_status_ring[0]: %p\n",readl(olympic_mmio+RXCSA),&olympic_priv->olympic_rx_status_ring[0]);
-        printk(" stat_ring[1]: %p, stat_ring[2]: %p, stat_ring[3]: %p\n", &(olympic_priv->olympic_rx_status_ring[1]), &(olympic_priv->olympic_rx_status_ring[2]), &(olympic_priv->olympic_rx_status_ring[3]) );
-        printk(" stat_ring[4]: %p, stat_ring[5]: %p, stat_ring[6]: %p\n", &(olympic_priv->olympic_rx_status_ring[4]), &(olympic_priv->olympic_rx_status_ring[5]), &(olympic_priv->olympic_rx_status_ring[6]) );
-        printk(" stat_ring[7]: %p\n", &(olympic_priv->olympic_rx_status_ring[7])  );
-
-        printk("RXCDA: %x, rx_ring[0]: %p\n",readl(olympic_mmio+RXCDA),&olympic_priv->olympic_rx_ring[0]);
-        printk("Rx_ring_dma_addr = %08x, rx_status_dma_addr = %08x\n",
-                olympic_priv->rx_ring_dma_addr,olympic_priv->rx_status_ring_dma_addr) ; 
-#endif
-
-        writew((((readw(olympic_mmio+RXENQ)) & 0x8000) ^ 0x8000) | i,olympic_mmio+RXENQ);
-
-#if OLYMPIC_DEBUG 
-        printk("# of rx buffers: %d, RXENQ: %x\n",i, readw(olympic_mmio+RXENQ));
-        printk("RXCSA: %x, rx_ring[0]: %p\n",readl(olympic_mmio+RXCSA),&olympic_priv->olympic_rx_status_ring[0]);
-        printk("RXCDA: %x, rx_ring[0]: %p\n",readl(olympic_mmio+RXCDA),&olympic_priv->olympic_rx_ring[0]);
-#endif 
-
-        writel(SISR_RX_STATUS | SISR_RX_NOBUF,olympic_mmio+SISR_MASK_SUM);
-
-        /* setup tx ring */
-
-        writel(BMCTL_TX1_DIS,olympic_mmio+BMCTL_RWM); /* Yes, this enables TX channel 1 */
-        for(i=0;i<OLYMPIC_TX_RING_SIZE;i++) 
-                olympic_priv->olympic_tx_ring[i].buffer=cpu_to_le32(0xdeadbeef);
-
-        olympic_priv->free_tx_ring_entries=OLYMPIC_TX_RING_SIZE;
-        olympic_priv->tx_ring_dma_addr = pci_map_single(olympic_priv->pdev,olympic_priv->olympic_tx_ring,
-                                         sizeof(struct olympic_tx_desc) * OLYMPIC_TX_RING_SIZE,PCI_DMA_TODEVICE) ; 
-        writel(olympic_priv->tx_ring_dma_addr, olympic_mmio+TXDESCQ_1);
-        writel(olympic_priv->tx_ring_dma_addr, olympic_mmio+TXCDA_1);
-        writew(OLYMPIC_TX_RING_SIZE, olympic_mmio+TXDESCQCNT_1);
-        
-        olympic_priv->tx_status_ring_dma_addr = pci_map_single(olympic_priv->pdev, olympic_priv->olympic_tx_status_ring,
-                                                sizeof(struct olympic_tx_status) * OLYMPIC_TX_RING_SIZE, PCI_DMA_FROMDEVICE);
-        writel(olympic_priv->tx_status_ring_dma_addr,olympic_mmio+TXSTATQ_1);
-        writel(olympic_priv->tx_status_ring_dma_addr,olympic_mmio+TXCSA_1);
-        writew(OLYMPIC_TX_RING_SIZE,olympic_mmio+TXSTATQCNT_1);
-                
-        olympic_priv->tx_ring_free=0; /* next entry in tx ring to use */
-        olympic_priv->tx_ring_last_status=OLYMPIC_TX_RING_SIZE-1; /* last processed tx status */
-
-        writel(0xffffffff, olympic_mmio+EISR_RWM) ; /* clean the eisr */
-        writel(0,olympic_mmio+EISR) ; 
-        writel(EISR_MASK_OPTIONS,olympic_mmio+EISR_MASK) ; /* enables most of the TX error interrupts */
-        writel(SISR_TX1_EOF | SISR_ADAPTER_CHECK | SISR_ARB_CMD | SISR_TRB_REPLY | SISR_ASB_FREE | SISR_ERR,olympic_mmio+SISR_MASK_SUM);
-
-#if OLYMPIC_DEBUG 
-        printk("BMCTL: %x\n",readl(olympic_mmio+BMCTL_SUM));
-        printk("SISR MASK: %x\n",readl(olympic_mmio+SISR_MASK));
-#endif
-
-        if (olympic_priv->olympic_network_monitor) { 
-                u8 __iomem *oat;
-                u8 __iomem *opt;
-                u8 addr[6];
-                oat = (olympic_priv->olympic_lap + olympic_priv->olympic_addr_table_addr);
-                opt = (olympic_priv->olympic_lap + olympic_priv->olympic_parms_addr);
-
-                for (i = 0; i < 6; i++)
-                        addr[i] = readb(oat+offsetof(struct olympic_adapter_addr_table,node_addr)+i);
-                printk("%s: Node Address: %pM\n", dev->name, addr);
-                printk("%s: Functional Address: %02x:%02x:%02x:%02x\n",dev->name, 
-                        readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)), 
-                        readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)+1),
-                        readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)+2),
-                        readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)+3));
-
-                for (i = 0; i < 6; i++)
-                        addr[i] = readb(opt+offsetof(struct olympic_parameters_table, up_node_addr)+i);
-                printk("%s: NAUN Address: %pM\n", dev->name, addr);
-        }
-        
-        netif_start_queue(dev);
-        return 0;
-
-out:
-        free_irq(dev->irq, dev);
-        return -EIO;
-}       
-
-/*
- *      When we enter the rx routine we do not know how many frames have been 
- *      queued on the rx channel.  Therefore we start at the next rx status
- *      position and travel around the receive ring until we have completed
- *      all the frames.
- *
- *      This means that we may process the frame before we receive the end
- *      of frame interrupt. This is why we always test the status instead
- *      of blindly processing the next frame.
- *
- *      We also remove the last 4 bytes from the packet as well, these are
- *      just token ring trailer info and upset protocols that don't check 
- *      their own length, i.e. SNA. 
- *      
- */
-static void olympic_rx(struct net_device *dev)
-{
-        struct olympic_private *olympic_priv=netdev_priv(dev);
-        u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio;
-        struct olympic_rx_status *rx_status;
-        struct olympic_rx_desc *rx_desc ; 
-        int rx_ring_last_received,length, buffer_cnt, cpy_length, frag_len;
-        struct sk_buff *skb, *skb2;
-        int i;
-
-        rx_status=&(olympic_priv->olympic_rx_status_ring[(olympic_priv->rx_status_last_received + 1) & (OLYMPIC_RX_RING_SIZE - 1)]) ; 
- 
-        while (rx_status->status_buffercnt) { 
-                u32 l_status_buffercnt;
-
-                olympic_priv->rx_status_last_received++ ;
-                olympic_priv->rx_status_last_received &= (OLYMPIC_RX_RING_SIZE -1);
-#if OLYMPIC_DEBUG
-                printk("rx status: %x rx len: %x\n", le32_to_cpu(rx_status->status_buffercnt), le32_to_cpu(rx_status->fragmentcnt_framelen));
-#endif
-                length = le32_to_cpu(rx_status->fragmentcnt_framelen) & 0xffff;
-                buffer_cnt = le32_to_cpu(rx_status->status_buffercnt) & 0xffff; 
-                i = buffer_cnt ; /* Need buffer_cnt later for rxenq update */ 
-                frag_len = le32_to_cpu(rx_status->fragmentcnt_framelen) >> 16; 
-
-#if OLYMPIC_DEBUG 
-                printk("length: %x, frag_len: %x, buffer_cnt: %x\n", length, frag_len, buffer_cnt);
-#endif
-                l_status_buffercnt = le32_to_cpu(rx_status->status_buffercnt);
-                if(l_status_buffercnt & 0xC0000000) {
-                        if (l_status_buffercnt & 0x3B000000) {
-                                if (olympic_priv->olympic_message_level) {
-                                        if (l_status_buffercnt & (1<<29))  /* Rx Frame Truncated */
-                                                printk(KERN_WARNING "%s: Rx Frame Truncated\n",dev->name);
-                                        if (l_status_buffercnt & (1<<28)) /*Rx receive overrun */
-                                                printk(KERN_WARNING "%s: Rx Frame Receive overrun\n",dev->name);
-                                        if (l_status_buffercnt & (1<<27)) /* No receive buffers */
-                                                printk(KERN_WARNING "%s: No receive buffers\n",dev->name);
-                                        if (l_status_buffercnt & (1<<25)) /* Receive frame error detect */
-                                                printk(KERN_WARNING "%s: Receive frame error detect\n",dev->name);
-                                        if (l_status_buffercnt & (1<<24)) /* Received Error Detect */
-                                                printk(KERN_WARNING "%s: Received Error Detect\n",dev->name);
-                                } 
-                                olympic_priv->rx_ring_last_received += i ; 
-                                olympic_priv->rx_ring_last_received &= (OLYMPIC_RX_RING_SIZE -1) ; 
-                                dev->stats.rx_errors++;
-                        } else {        
-                        
-                                if (buffer_cnt == 1) {
-                                        skb = dev_alloc_skb(max_t(int, olympic_priv->pkt_buf_sz,length)) ; 
-                                } else {
-                                        skb = dev_alloc_skb(length) ; 
-                                }
-
-                                if (skb == NULL) {
-                                        printk(KERN_WARNING "%s: Not enough memory to copy packet to upper layers.\n",dev->name) ;
-                                        dev->stats.rx_dropped++;
-                                        /* Update counters even though we don't transfer the frame */
-                                        olympic_priv->rx_ring_last_received += i ; 
-                                        olympic_priv->rx_ring_last_received &= (OLYMPIC_RX_RING_SIZE -1) ;  
-                                } else  {
-                                        /* Optimise based upon number of buffers used. 
-                                           If only one buffer is used we can simply swap the buffers around.
-                                           If more than one then we must use the new buffer and copy the information
-                                           first. Ideally all frames would be in a single buffer, this can be tuned by
-                                           altering the buffer size. If the length of the packet is less than
-                                           1500 bytes we're going to copy it over anyway to stop packets getting
-                                           dropped from sockets with buffers smaller than our pkt_buf_sz. */
-                                
-                                        if (buffer_cnt==1) {
-                                                olympic_priv->rx_ring_last_received++ ; 
-                                                olympic_priv->rx_ring_last_received &= (OLYMPIC_RX_RING_SIZE -1);
-                                                rx_ring_last_received = olympic_priv->rx_ring_last_received ;
-                                                if (length > 1500) { 
-                                                        skb2=olympic_priv->rx_ring_skb[rx_ring_last_received] ; 
-                                                        /* unmap buffer */
-                                                        pci_unmap_single(olympic_priv->pdev,
-                                                                le32_to_cpu(olympic_priv->olympic_rx_ring[rx_ring_last_received].buffer), 
-                                                                olympic_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE) ; 
-                                                        skb_put(skb2,length-4);
-                                                        skb2->protocol = tr_type_trans(skb2,dev);
-                                                        olympic_priv->olympic_rx_ring[rx_ring_last_received].buffer = 
-                                                                cpu_to_le32(pci_map_single(olympic_priv->pdev, skb->data, 
-                                                                olympic_priv->pkt_buf_sz, PCI_DMA_FROMDEVICE));
-                                                        olympic_priv->olympic_rx_ring[rx_ring_last_received].res_length = 
-                                                                cpu_to_le32(olympic_priv->pkt_buf_sz); 
-                                                        olympic_priv->rx_ring_skb[rx_ring_last_received] = skb ; 
-                                                        netif_rx(skb2) ; 
-                                                } else { 
-                                                        pci_dma_sync_single_for_cpu(olympic_priv->pdev,
-                                                                le32_to_cpu(olympic_priv->olympic_rx_ring[rx_ring_last_received].buffer),
-                                                                olympic_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE) ; 
-                                                        skb_copy_from_linear_data(olympic_priv->rx_ring_skb[rx_ring_last_received],
-                                                                      skb_put(skb,length - 4),
-                                                                      length - 4);
-                                                        pci_dma_sync_single_for_device(olympic_priv->pdev,
-                                                                le32_to_cpu(olympic_priv->olympic_rx_ring[rx_ring_last_received].buffer),
-                                                                olympic_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE) ;
-                                                        skb->protocol = tr_type_trans(skb,dev) ; 
-                                                        netif_rx(skb) ; 
-                                                } 
-                                        } else {
-                                                do { /* Walk the buffers */ 
-                                                        olympic_priv->rx_ring_last_received++ ; 
-                                                        olympic_priv->rx_ring_last_received &= (OLYMPIC_RX_RING_SIZE -1);
-                                                        rx_ring_last_received = olympic_priv->rx_ring_last_received ; 
-                                                        pci_dma_sync_single_for_cpu(olympic_priv->pdev,
-                                                                le32_to_cpu(olympic_priv->olympic_rx_ring[rx_ring_last_received].buffer),
-                                                                olympic_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE) ; 
-                                                        rx_desc = &(olympic_priv->olympic_rx_ring[rx_ring_last_received]);
-                                                        cpy_length = (i == 1 ? frag_len : le32_to_cpu(rx_desc->res_length)); 
-                                                        skb_copy_from_linear_data(olympic_priv->rx_ring_skb[rx_ring_last_received],
-                                                                      skb_put(skb, cpy_length),
-                                                                      cpy_length);
-                                                        pci_dma_sync_single_for_device(olympic_priv->pdev,
-                                                                le32_to_cpu(olympic_priv->olympic_rx_ring[rx_ring_last_received].buffer),
-                                                                olympic_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE) ;
-                                                } while (--i) ; 
-                                                skb_trim(skb,skb->len-4) ; 
-                                                skb->protocol = tr_type_trans(skb,dev);
-                                                netif_rx(skb) ; 
-                                        } 
-                                        dev->stats.rx_packets++ ;
-                                        dev->stats.rx_bytes += length ;
-                                } /* if skb == null */
-                        } /* If status & 0x3b */
-
-                } else { /*if buffercnt & 0xC */
-                        olympic_priv->rx_ring_last_received += i ; 
-                        olympic_priv->rx_ring_last_received &= (OLYMPIC_RX_RING_SIZE - 1) ; 
-                } 
-
-                rx_status->fragmentcnt_framelen = 0 ; 
-                rx_status->status_buffercnt = 0 ; 
-                rx_status = &(olympic_priv->olympic_rx_status_ring[(olympic_priv->rx_status_last_received+1) & (OLYMPIC_RX_RING_SIZE -1) ]);
-
-                writew((((readw(olympic_mmio+RXENQ)) & 0x8000) ^ 0x8000) |  buffer_cnt , olympic_mmio+RXENQ); 
-        } /* while */
-
-}
-
-static void olympic_freemem(struct net_device *dev) 
-{ 
-        struct olympic_private *olympic_priv=netdev_priv(dev);
-        int i;
-                        
-        for(i=0;i<OLYMPIC_RX_RING_SIZE;i++) {
-                if (olympic_priv->rx_ring_skb[olympic_priv->rx_status_last_received] != NULL) {
-                        dev_kfree_skb_irq(olympic_priv->rx_ring_skb[olympic_priv->rx_status_last_received]);
-                        olympic_priv->rx_ring_skb[olympic_priv->rx_status_last_received] = NULL;
-                }
-                if (olympic_priv->olympic_rx_ring[olympic_priv->rx_status_last_received].buffer != cpu_to_le32(0xdeadbeef)) {
-                        pci_unmap_single(olympic_priv->pdev, 
-                        le32_to_cpu(olympic_priv->olympic_rx_ring[olympic_priv->rx_status_last_received].buffer),
-                        olympic_priv->pkt_buf_sz, PCI_DMA_FROMDEVICE);
-                }
-                olympic_priv->rx_status_last_received++;
-                olympic_priv->rx_status_last_received&=OLYMPIC_RX_RING_SIZE-1;
-        }
-        /* unmap rings */
-        pci_unmap_single(olympic_priv->pdev, olympic_priv->rx_status_ring_dma_addr, 
-                sizeof(struct olympic_rx_status) * OLYMPIC_RX_RING_SIZE, PCI_DMA_FROMDEVICE);
-        pci_unmap_single(olympic_priv->pdev, olympic_priv->rx_ring_dma_addr,
-                sizeof(struct olympic_rx_desc) * OLYMPIC_RX_RING_SIZE, PCI_DMA_TODEVICE);
-
-        pci_unmap_single(olympic_priv->pdev, olympic_priv->tx_status_ring_dma_addr, 
-                sizeof(struct olympic_tx_status) * OLYMPIC_TX_RING_SIZE, PCI_DMA_FROMDEVICE);
-        pci_unmap_single(olympic_priv->pdev, olympic_priv->tx_ring_dma_addr, 
-                sizeof(struct olympic_tx_desc) * OLYMPIC_TX_RING_SIZE, PCI_DMA_TODEVICE);
-
-        return ; 
-}
- 
-static irqreturn_t olympic_interrupt(int irq, void *dev_id) 
-{
-        struct net_device *dev= (struct net_device *)dev_id;
-        struct olympic_private *olympic_priv=netdev_priv(dev);
-        u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio;
-        u32 sisr;
-        u8 __iomem *adapter_check_area ; 
-        
-        /* 
-         *  Read sisr but don't reset it yet. 
-         *  The indication bit may have been set but the interrupt latch
-         *  bit may not be set, so we'd lose the interrupt later. 
-         */ 
-        sisr=readl(olympic_mmio+SISR) ; 
-        if (!(sisr & SISR_MI)) /* Interrupt isn't for us */ 
-                return IRQ_NONE;
-        sisr=readl(olympic_mmio+SISR_RR) ;  /* Read & Reset sisr */ 
-
-        spin_lock(&olympic_priv->olympic_lock);
-
-        /* Hotswap gives us this on removal */
-        if (sisr == 0xffffffff) { 
-                printk(KERN_WARNING "%s: Hotswap adapter removal.\n",dev->name) ; 
-                spin_unlock(&olympic_priv->olympic_lock) ; 
-                return IRQ_NONE;
-        } 
-                
-        if (sisr & (SISR_SRB_REPLY | SISR_TX1_EOF | SISR_RX_STATUS | SISR_ADAPTER_CHECK |  
-                        SISR_ASB_FREE | SISR_ARB_CMD | SISR_TRB_REPLY | SISR_RX_NOBUF | SISR_ERR)) {  
-        
-                /* If we ever get this the adapter is seriously dead. Only a reset is going to 
-                 * bring it back to life. We're talking pci bus errors and such like :( */ 
-                if((sisr & SISR_ERR) && (readl(olympic_mmio+EISR) & EISR_MASK_OPTIONS)) {
-                        printk(KERN_ERR "Olympic: EISR Error, EISR=%08x\n",readl(olympic_mmio+EISR)) ; 
-                        printk(KERN_ERR "The adapter must be reset to clear this condition.\n") ; 
-                        printk(KERN_ERR "Please report this error to the driver maintainer and/\n") ; 
-                        printk(KERN_ERR "or the linux-tr mailing list.\n") ; 
-                        wake_up_interruptible(&olympic_priv->srb_wait);
-                        spin_unlock(&olympic_priv->olympic_lock) ; 
-                        return IRQ_HANDLED;
-                } /* SISR_ERR */
-
-                if(sisr & SISR_SRB_REPLY) {
-                        if(olympic_priv->srb_queued==1) {
-                                wake_up_interruptible(&olympic_priv->srb_wait);
-                        } else if (olympic_priv->srb_queued==2) { 
-                                olympic_srb_bh(dev) ; 
-                        }
-                        olympic_priv->srb_queued=0;
-                } /* SISR_SRB_REPLY */
-
-                /* We shouldn't ever miss the Tx interrupt, but the you never know, hence the loop to ensure
-                   we get all tx completions. */
-                if (sisr & SISR_TX1_EOF) {
-                        while(olympic_priv->olympic_tx_status_ring[(olympic_priv->tx_ring_last_status + 1) & (OLYMPIC_TX_RING_SIZE-1)].status) { 
-                                olympic_priv->tx_ring_last_status++;
-                                olympic_priv->tx_ring_last_status &= (OLYMPIC_TX_RING_SIZE-1);
-                                olympic_priv->free_tx_ring_entries++;
-                                dev->stats.tx_bytes += olympic_priv->tx_ring_skb[olympic_priv->tx_ring_last_status]->len;
-                                dev->stats.tx_packets++ ;
-                                pci_unmap_single(olympic_priv->pdev, 
-                                        le32_to_cpu(olympic_priv->olympic_tx_ring[olympic_priv->tx_ring_last_status].buffer), 
-                                        olympic_priv->tx_ring_skb[olympic_priv->tx_ring_last_status]->len,PCI_DMA_TODEVICE);
-                                dev_kfree_skb_irq(olympic_priv->tx_ring_skb[olympic_priv->tx_ring_last_status]);
-                                olympic_priv->olympic_tx_ring[olympic_priv->tx_ring_last_status].buffer=cpu_to_le32(0xdeadbeef);
-                                olympic_priv->olympic_tx_status_ring[olympic_priv->tx_ring_last_status].status=0;
-                        }
-                        netif_wake_queue(dev);
-                } /* SISR_TX1_EOF */
-        
-                if (sisr & SISR_RX_STATUS) {
-                        olympic_rx(dev);
-                } /* SISR_RX_STATUS */
-        
-                if (sisr & SISR_ADAPTER_CHECK) {
-                        netif_stop_queue(dev);
-                        printk(KERN_WARNING "%s: Adapter Check Interrupt Raised, 8 bytes of information follow:\n", dev->name);
-                        writel(readl(olympic_mmio+LAPWWC),olympic_mmio+LAPA);
-                        adapter_check_area = olympic_priv->olympic_lap + ((readl(olympic_mmio+LAPWWC)) & (~0xf800)) ;
-                        printk(KERN_WARNING "%s: Bytes %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",dev->name, readb(adapter_check_area+0), readb(adapter_check_area+1), readb(adapter_check_area+2), readb(adapter_check_area+3), readb(adapter_check_area+4), readb(adapter_check_area+5), readb(adapter_check_area+6), readb(adapter_check_area+7)) ; 
-                        spin_unlock(&olympic_priv->olympic_lock) ; 
-                        return IRQ_HANDLED; 
-                } /* SISR_ADAPTER_CHECK */
-        
-                if (sisr & SISR_ASB_FREE) {
-                        /* Wake up anything that is waiting for the asb response */  
-                        if (olympic_priv->asb_queued) {
-                                olympic_asb_bh(dev) ; 
-                        }
-                } /* SISR_ASB_FREE */
-        
-                if (sisr & SISR_ARB_CMD) {
-                        olympic_arb_cmd(dev) ; 
-                } /* SISR_ARB_CMD */
-        
-                if (sisr & SISR_TRB_REPLY) {
-                        /* Wake up anything that is waiting for the trb response */
-                        if (olympic_priv->trb_queued) {
-                                wake_up_interruptible(&olympic_priv->trb_wait);
-                        }
-                        olympic_priv->trb_queued = 0 ; 
-                } /* SISR_TRB_REPLY */  
-        
-                if (sisr & SISR_RX_NOBUF) {
-                        /* According to the documentation, we don't have to do anything, but trapping it keeps it out of
-                                   /var/log/messages.  */
-                } /* SISR_RX_NOBUF */
-        } else { 
-                printk(KERN_WARNING "%s: Unexpected interrupt: %x\n",dev->name, sisr);
-                printk(KERN_WARNING "%s: SISR_MASK: %x\n",dev->name, readl(olympic_mmio+SISR_MASK)) ;
-        } /* One if the interrupts we want */
-        writel(SISR_MI,olympic_mmio+SISR_MASK_SUM);
-        
-        spin_unlock(&olympic_priv->olympic_lock) ; 
-        return IRQ_HANDLED;
-}       
-
-static netdev_tx_t olympic_xmit(struct sk_buff *skb,
-                                      struct net_device *dev)
-{
-        struct olympic_private *olympic_priv=netdev_priv(dev);
-        u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio;
-        unsigned long flags ; 
-
-        spin_lock_irqsave(&olympic_priv->olympic_lock, flags);
-
-        netif_stop_queue(dev);
-        
-        if(olympic_priv->free_tx_ring_entries) {
-                olympic_priv->olympic_tx_ring[olympic_priv->tx_ring_free].buffer = 
-                        cpu_to_le32(pci_map_single(olympic_priv->pdev, skb->data, skb->len,PCI_DMA_TODEVICE));
-                olympic_priv->olympic_tx_ring[olympic_priv->tx_ring_free].status_length = cpu_to_le32(skb->len | (0x80000000));
-                olympic_priv->tx_ring_skb[olympic_priv->tx_ring_free]=skb;
-                olympic_priv->free_tx_ring_entries--;
-
-                olympic_priv->tx_ring_free++;
-                olympic_priv->tx_ring_free &= (OLYMPIC_TX_RING_SIZE-1);
-                writew((((readw(olympic_mmio+TXENQ_1)) & 0x8000) ^ 0x8000) | 1,olympic_mmio+TXENQ_1);
-                netif_wake_queue(dev);
-                spin_unlock_irqrestore(&olympic_priv->olympic_lock,flags);
-                return NETDEV_TX_OK;
-        } else {
-                spin_unlock_irqrestore(&olympic_priv->olympic_lock,flags);
-                return NETDEV_TX_BUSY;
-        } 
-
-}
-        
-
-static int olympic_close(struct net_device *dev) 
-{
-        struct olympic_private *olympic_priv=netdev_priv(dev);
-        u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio,*srb;
-        unsigned long t,flags;
-
-        DECLARE_WAITQUEUE(wait,current) ; 
-
-        netif_stop_queue(dev);
-        
-        writel(olympic_priv->srb,olympic_mmio+LAPA);
-        srb=olympic_priv->olympic_lap + (olympic_priv->srb & (~0xf800));
-        
-        writeb(SRB_CLOSE_ADAPTER,srb+0);
-        writeb(0,srb+1);
-        writeb(OLYMPIC_CLEAR_RET_CODE,srb+2);
-
-        add_wait_queue(&olympic_priv->srb_wait,&wait) ;
-        set_current_state(TASK_INTERRUPTIBLE) ; 
-
-        spin_lock_irqsave(&olympic_priv->olympic_lock,flags);
-        olympic_priv->srb_queued=1;
-
-        writel(LISR_SRB_CMD,olympic_mmio+LISR_SUM);
-        spin_unlock_irqrestore(&olympic_priv->olympic_lock,flags);
-
-        while(olympic_priv->srb_queued) {
-
-                t = schedule_timeout_interruptible(60*HZ);
-
-                if(signal_pending(current))     {            
-                        printk(KERN_WARNING "%s: SRB timed out.\n",dev->name);
-                        printk(KERN_WARNING "SISR=%x MISR=%x\n",readl(olympic_mmio+SISR),readl(olympic_mmio+LISR));
-                        olympic_priv->srb_queued=0;
-                        break;
-                }
-
-                if (t == 0) { 
-                        printk(KERN_WARNING "%s: SRB timed out. May not be fatal.\n",dev->name);
-                } 
-                olympic_priv->srb_queued=0;
-        }
-        remove_wait_queue(&olympic_priv->srb_wait,&wait) ; 
-
-        olympic_priv->rx_status_last_received++;
-        olympic_priv->rx_status_last_received&=OLYMPIC_RX_RING_SIZE-1;
-
-        olympic_freemem(dev) ;  
-
-        /* reset tx/rx fifo's and busmaster logic */
-
-        writel(readl(olympic_mmio+BCTL)|(3<<13),olympic_mmio+BCTL);
-        udelay(1);
-        writel(readl(olympic_mmio+BCTL)&~(3<<13),olympic_mmio+BCTL);
-
-#if OLYMPIC_DEBUG
-        {
-        int i ; 
-        printk("srb(%p): ",srb);
-        for(i=0;i<4;i++)
-                printk("%x ",readb(srb+i));
-        printk("\n");
-        }
-#endif
-        free_irq(dev->irq,dev);
-
-        return 0;
-        
-}
-
-static void olympic_set_rx_mode(struct net_device *dev) 
-{
-        struct olympic_private *olympic_priv = netdev_priv(dev);
-        u8 __iomem *olympic_mmio = olympic_priv->olympic_mmio ; 
-        u8 options = 0; 
-        u8 __iomem *srb;
-        struct netdev_hw_addr *ha;
-        unsigned char dev_mc_address[4] ; 
-
-        writel(olympic_priv->srb,olympic_mmio+LAPA);
-        srb=olympic_priv->olympic_lap + (olympic_priv->srb & (~0xf800));
-        options = olympic_priv->olympic_copy_all_options; 
-
-        if (dev->flags&IFF_PROMISC)  
-                options |= 0x61 ;
-        else
-                options &= ~0x61 ; 
-
-        /* Only issue the srb if there is a change in options */
-
-        if ((options ^ olympic_priv->olympic_copy_all_options)) { 
-        
-                /* Now to issue the srb command to alter the copy.all.options */
-        
-                writeb(SRB_MODIFY_RECEIVE_OPTIONS,srb);
-                writeb(0,srb+1);
-                writeb(OLYMPIC_CLEAR_RET_CODE,srb+2);
-                writeb(0,srb+3);
-                writeb(olympic_priv->olympic_receive_options,srb+4);
-                writeb(options,srb+5);
-
-                olympic_priv->srb_queued=2; /* Can't sleep, use srb_bh */
-
-                writel(LISR_SRB_CMD,olympic_mmio+LISR_SUM);
-
-                olympic_priv->olympic_copy_all_options = options ;
-                
-                return ;  
-        } 
-
-        /* Set the functional addresses we need for multicast */
-
-        dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ; 
-
-        netdev_for_each_mc_addr(ha, dev) {
-                dev_mc_address[0] |= ha->addr[2];
-                dev_mc_address[1] |= ha->addr[3];
-                dev_mc_address[2] |= ha->addr[4];
-                dev_mc_address[3] |= ha->addr[5];
-        }
-
-        writeb(SRB_SET_FUNC_ADDRESS,srb+0);
-        writeb(0,srb+1);
-        writeb(OLYMPIC_CLEAR_RET_CODE,srb+2);
-        writeb(0,srb+3);
-        writeb(0,srb+4);
-        writeb(0,srb+5);
-        writeb(dev_mc_address[0],srb+6);
-        writeb(dev_mc_address[1],srb+7);
-        writeb(dev_mc_address[2],srb+8);
-        writeb(dev_mc_address[3],srb+9);
-
-        olympic_priv->srb_queued = 2 ;
-        writel(LISR_SRB_CMD,olympic_mmio+LISR_SUM);
-
-}
-
-static void olympic_srb_bh(struct net_device *dev) 
-{ 
-        struct olympic_private *olympic_priv = netdev_priv(dev);
-        u8 __iomem *olympic_mmio = olympic_priv->olympic_mmio ; 
-        u8 __iomem *srb;
-
-        writel(olympic_priv->srb,olympic_mmio+LAPA);
-        srb=olympic_priv->olympic_lap + (olympic_priv->srb & (~0xf800));
-
-        switch (readb(srb)) { 
-
-                /* SRB_MODIFY_RECEIVE_OPTIONS i.e. set_multicast_list options (promiscuous) 
-                 * At some point we should do something if we get an error, such as
-                 * resetting the IFF_PROMISC flag in dev
-                 */
-
-                case SRB_MODIFY_RECEIVE_OPTIONS:
-                        switch (readb(srb+2)) { 
-                                case 0x01:
-                                        printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name) ; 
-                                        break ; 
-                                case 0x04:
-                                        printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name);
-                                        break ; 
-                                default:
-                                        if (olympic_priv->olympic_message_level) 
-                                                printk(KERN_WARNING "%s: Receive Options Modified to %x,%x\n",dev->name,olympic_priv->olympic_copy_all_options, olympic_priv->olympic_receive_options) ; 
-                                        break ;         
-                        } /* switch srb[2] */ 
-                        break ;
-                
-                /* SRB_SET_GROUP_ADDRESS - Multicast group setting 
-                 */
-
-                case SRB_SET_GROUP_ADDRESS:
-                        switch (readb(srb+2)) { 
-                                case 0x00:
-                                        break ; 
-                                case 0x01:
-                                        printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
-                                        break ;
-                                case 0x04:
-                                        printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name); 
-                                        break ;
-                                case 0x3c:
-                                        printk(KERN_WARNING "%s: Group/Functional address indicator bits not set correctly\n",dev->name) ; 
-                                        break ;
-                                case 0x3e: /* If we ever implement individual multicast addresses, will need to deal with this */
-                                        printk(KERN_WARNING "%s: Group address registers full\n",dev->name) ; 
-                                        break ;  
-                                case 0x55:
-                                        printk(KERN_INFO "%s: Group Address already set.\n",dev->name) ; 
-                                        break ;
-                                default:
-                                        break ; 
-                        } /* switch srb[2] */ 
-                        break ; 
-
-                /* SRB_RESET_GROUP_ADDRESS - Remove a multicast address from group list
-                 */
-
-                case SRB_RESET_GROUP_ADDRESS:
-                        switch (readb(srb+2)) { 
-                                case 0x00:
-                                        break ; 
-                                case 0x01:
-                                        printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
-                                        break ; 
-                                case 0x04:
-                                        printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ; 
-                                        break ; 
-                                case 0x39: /* Must deal with this if individual multicast addresses used */
-                                        printk(KERN_INFO "%s: Group address not found\n",dev->name);
-                                        break ;
-                                default:
-                                        break ; 
-                        } /* switch srb[2] */
-                        break ; 
-
-                
-                /* SRB_SET_FUNC_ADDRESS - Called by the set_rx_mode 
-                 */
-
-                case SRB_SET_FUNC_ADDRESS:
-                        switch (readb(srb+2)) { 
-                                case 0x00:
-                                        if (olympic_priv->olympic_message_level)
-                                                printk(KERN_INFO "%s: Functional Address Mask Set\n",dev->name);
-                                        break ;
-                                case 0x01:
-                                        printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
-                                        break ; 
-                                case 0x04:
-                                        printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ; 
-                                        break ; 
-                                default:
-                                        break ; 
-                        } /* switch srb[2] */
-                        break ; 
-        
-                /* SRB_READ_LOG - Read and reset the adapter error counters
-                 */
-
-                case SRB_READ_LOG:
-                        switch (readb(srb+2)) { 
-                                case 0x00: 
-                                        if (olympic_priv->olympic_message_level) 
-                                                printk(KERN_INFO "%s: Read Log issued\n",dev->name) ; 
-                                        break ; 
-                                case 0x01:
-                                        printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
-                                        break ; 
-                                case 0x04:
-                                        printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ; 
-                                        break ; 
-                        
-                        } /* switch srb[2] */
-                        break ; 
-                
-                /* SRB_READ_SR_COUNTERS - Read and reset the source routing bridge related counters */
-
-                case SRB_READ_SR_COUNTERS:
-                        switch (readb(srb+2)) { 
-                                case 0x00: 
-                                        if (olympic_priv->olympic_message_level) 
-                                                printk(KERN_INFO "%s: Read Source Routing Counters issued\n",dev->name) ; 
-                                        break ; 
-                                case 0x01:
-                                        printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
-                                        break ; 
-                                case 0x04:
-                                        printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ; 
-                                        break ; 
-                                default:
-                                        break ; 
-                        } /* switch srb[2] */
-                        break ;
- 
-                default:
-                        printk(KERN_WARNING "%s: Unrecognized srb bh return value.\n",dev->name);
-                        break ; 
-        } /* switch srb[0] */
-
-} 
-
-static int olympic_set_mac_address (struct net_device *dev, void *addr) 
-{
-        struct sockaddr *saddr = addr ; 
-        struct olympic_private *olympic_priv = netdev_priv(dev);
-
-        if (netif_running(dev)) { 
-                printk(KERN_WARNING "%s: Cannot set mac/laa address while card is open\n", dev->name) ; 
-                return -EIO ; 
-        }
-
-        memcpy(olympic_priv->olympic_laa, saddr->sa_data,dev->addr_len) ; 
-        
-        if (olympic_priv->olympic_message_level) { 
-                printk(KERN_INFO "%s: MAC/LAA Set to  = %x.%x.%x.%x.%x.%x\n",dev->name, olympic_priv->olympic_laa[0],
-                olympic_priv->olympic_laa[1], olympic_priv->olympic_laa[2],
-                olympic_priv->olympic_laa[3], olympic_priv->olympic_laa[4],
-                olympic_priv->olympic_laa[5]);
-        } 
-
-        return 0 ; 
-}
-
-static void olympic_arb_cmd(struct net_device *dev)
-{
-        struct olympic_private *olympic_priv = netdev_priv(dev);
-        u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio;
-        u8 __iomem *arb_block, *asb_block, *srb  ; 
-        u8 header_len ; 
-        u16 frame_len, buffer_len ;
-        struct sk_buff *mac_frame ;  
-        u8 __iomem *buf_ptr ;
-        u8 __iomem *frame_data ;  
-        u16 buff_off ; 
-        u16 lan_status = 0, lan_status_diff  ; /* Initialize to stop compiler warning */
-        u8 fdx_prot_error ; 
-        u16 next_ptr;
-
-        arb_block = (olympic_priv->olympic_lap + olympic_priv->arb) ; 
-        asb_block = (olympic_priv->olympic_lap + olympic_priv->asb) ; 
-        srb = (olympic_priv->olympic_lap + olympic_priv->srb) ; 
-        
-        if (readb(arb_block+0) == ARB_RECEIVE_DATA) { /* Receive.data, MAC frames */
-
-                header_len = readb(arb_block+8) ; /* 802.5 Token-Ring Header Length */  
-                frame_len = swab16(readw(arb_block + 10)) ; 
-
-                buff_off = swab16(readw(arb_block + 6)) ;
-                
-                buf_ptr = olympic_priv->olympic_lap + buff_off ; 
-
-#if OLYMPIC_DEBUG
-{
-                int i;
-                frame_data = buf_ptr+offsetof(struct mac_receive_buffer,frame_data) ; 
-
-                for (i=0 ;  i < 14 ; i++) { 
-                        printk("Loc %d = %02x\n",i,readb(frame_data + i)); 
-                }
-
-                printk("next %04x, fs %02x, len %04x\n",readw(buf_ptr+offsetof(struct mac_receive_buffer,next)), readb(buf_ptr+offsetof(struct mac_receive_buffer,frame_status)), readw(buf_ptr+offsetof(struct mac_receive_buffer,buffer_length)));
-}
-#endif 
-                mac_frame = dev_alloc_skb(frame_len) ; 
-                if (!mac_frame) {
-                        printk(KERN_WARNING "%s: Memory squeeze, dropping frame.\n", dev->name);
-                        goto drop_frame;
-                }
-
-                /* Walk the buffer chain, creating the frame */
-
-                do {
-                        frame_data = buf_ptr+offsetof(struct mac_receive_buffer,frame_data) ; 
-                        buffer_len = swab16(readw(buf_ptr+offsetof(struct mac_receive_buffer,buffer_length))); 
-                        memcpy_fromio(skb_put(mac_frame, buffer_len), frame_data , buffer_len ) ;
-                        next_ptr=readw(buf_ptr+offsetof(struct mac_receive_buffer,next)); 
-                } while (next_ptr && (buf_ptr=olympic_priv->olympic_lap + swab16(next_ptr)));
-
-                mac_frame->protocol = tr_type_trans(mac_frame, dev);
-
-                if (olympic_priv->olympic_network_monitor) { 
-                        struct trh_hdr *mac_hdr;
-                        printk(KERN_WARNING "%s: Received MAC Frame, details:\n",dev->name);
-                        mac_hdr = tr_hdr(mac_frame);
-                        printk(KERN_WARNING "%s: MAC Frame Dest. Addr: %pM\n",
-                               dev->name, mac_hdr->daddr);
-                        printk(KERN_WARNING "%s: MAC Frame Srce. Addr: %pM\n",
-                               dev->name, mac_hdr->saddr);
-                }
-                netif_rx(mac_frame);
-
-drop_frame:
-                /* Now tell the card we have dealt with the received frame */
-
-                /* Set LISR Bit 1 */
-                writel(LISR_ARB_FREE,olympic_priv->olympic_mmio + LISR_SUM);
-
-                /* Is the ASB free ? */         
-                
-                if (readb(asb_block + 2) != 0xff) { 
-                        olympic_priv->asb_queued = 1 ; 
-                        writel(LISR_ASB_FREE_REQ,olympic_priv->olympic_mmio+LISR_SUM); 
-                        return ;        
-                        /* Drop out and wait for the bottom half to be run */
-                }
-                
-                writeb(ASB_RECEIVE_DATA,asb_block); /* Receive data */
-                writeb(OLYMPIC_CLEAR_RET_CODE,asb_block+2); /* Necessary ?? */
-                writeb(readb(arb_block+6),asb_block+6); /* Must send the address back to the adapter */
-                writeb(readb(arb_block+7),asb_block+7); /* To let it know we have dealt with the data */                
-
-                writel(LISR_ASB_REPLY | LISR_ASB_FREE_REQ,olympic_priv->olympic_mmio+LISR_SUM);
-                
-                olympic_priv->asb_queued = 2 ; 
-        
-                return ;        
-                
-        } else if (readb(arb_block) == ARB_LAN_CHANGE_STATUS) { /* Lan.change.status */
-                lan_status = swab16(readw(arb_block+6));
-                fdx_prot_error = readb(arb_block+8) ; 
-                
-                /* Issue ARB Free */
-                writel(LISR_ARB_FREE,olympic_priv->olympic_mmio+LISR_SUM);
-
-                lan_status_diff = olympic_priv->olympic_lan_status ^ lan_status ; 
-
-                if (lan_status_diff & (LSC_LWF | LSC_ARW | LSC_FPE | LSC_RR) ) { 
-                        if (lan_status_diff & LSC_LWF) 
-                                        printk(KERN_WARNING "%s: Short circuit detected on the lobe\n",dev->name);
-                        if (lan_status_diff & LSC_ARW) 
-                                        printk(KERN_WARNING "%s: Auto removal error\n",dev->name);
-                        if (lan_status_diff & LSC_FPE)
-                                        printk(KERN_WARNING "%s: FDX Protocol Error\n",dev->name);
-                        if (lan_status_diff & LSC_RR) 
-                                        printk(KERN_WARNING "%s: Force remove MAC frame received\n",dev->name);
-                
-                        /* Adapter has been closed by the hardware */
-                
-                        /* reset tx/rx fifo's and busmaster logic */
-
-                        writel(readl(olympic_mmio+BCTL)|(3<<13),olympic_mmio+BCTL);
-                        udelay(1);
-                        writel(readl(olympic_mmio+BCTL)&~(3<<13),olympic_mmio+BCTL);
-                        netif_stop_queue(dev);
-                        olympic_priv->srb = readw(olympic_priv->olympic_lap + LAPWWO) ; 
-                        printk(KERN_WARNING "%s: Adapter has been closed\n", dev->name);
-                } /* If serious error */
-                
-                if (olympic_priv->olympic_message_level) { 
-                        if (lan_status_diff & LSC_SIG_LOSS) 
-                                        printk(KERN_WARNING "%s: No receive signal detected\n", dev->name);
-                        if (lan_status_diff & LSC_HARD_ERR)
-                                        printk(KERN_INFO "%s: Beaconing\n",dev->name);
-                        if (lan_status_diff & LSC_SOFT_ERR)
-                                        printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame\n",dev->name);
-                        if (lan_status_diff & LSC_TRAN_BCN) 
-                                        printk(KERN_INFO "%s: We are transmitting the beacon, aaah\n",dev->name);
-                        if (lan_status_diff & LSC_SS) 
-                                        printk(KERN_INFO "%s: Single Station on the ring\n", dev->name);
-                        if (lan_status_diff & LSC_RING_REC)
-                                        printk(KERN_INFO "%s: Ring recovery ongoing\n",dev->name);
-                        if (lan_status_diff & LSC_FDX_MODE)
-                                        printk(KERN_INFO "%s: Operating in FDX mode\n",dev->name);
-                }       
-                
-                if (lan_status_diff & LSC_CO) { 
-                                        
-                                if (olympic_priv->olympic_message_level) 
-                                        printk(KERN_INFO "%s: Counter Overflow\n", dev->name);
-                                        
-                                /* Issue READ.LOG command */
-
-                                writeb(SRB_READ_LOG, srb);
-                                writeb(0,srb+1);
-                                writeb(OLYMPIC_CLEAR_RET_CODE,srb+2);
-                                writeb(0,srb+3);
-                                writeb(0,srb+4);
-                                writeb(0,srb+5);
-                                        
-                                olympic_priv->srb_queued=2; /* Can't sleep, use srb_bh */
-
-                                writel(LISR_SRB_CMD,olympic_mmio+LISR_SUM);
-                                        
-                }
-
-                if (lan_status_diff & LSC_SR_CO) { 
-
-                                if (olympic_priv->olympic_message_level)
-                                        printk(KERN_INFO "%s: Source routing counters overflow\n", dev->name);
-
-                                /* Issue a READ.SR.COUNTERS */
-                                
-                                writeb(SRB_READ_SR_COUNTERS,srb);
-                                writeb(0,srb+1);
-                                writeb(OLYMPIC_CLEAR_RET_CODE,srb+2);
-                                writeb(0,srb+3);
-                                
-                                olympic_priv->srb_queued=2; /* Can't sleep, use srb_bh */
-
-                                writel(LISR_SRB_CMD,olympic_mmio+LISR_SUM);
-
-                }
-
-                olympic_priv->olympic_lan_status = lan_status ; 
-        
-        }  /* Lan.change.status */
-        else
-                printk(KERN_WARNING "%s: Unknown arb command\n", dev->name);
-}
-
-static void olympic_asb_bh(struct net_device *dev) 
-{
-        struct olympic_private *olympic_priv = netdev_priv(dev);
-        u8 __iomem *arb_block, *asb_block ; 
-
-        arb_block = (olympic_priv->olympic_lap + olympic_priv->arb) ; 
-        asb_block = (olympic_priv->olympic_lap + olympic_priv->asb) ; 
-
-        if (olympic_priv->asb_queued == 1) {   /* Dropped through the first time */
-
-                writeb(ASB_RECEIVE_DATA,asb_block); /* Receive data */
-                writeb(OLYMPIC_CLEAR_RET_CODE,asb_block+2); /* Necessary ?? */
-                writeb(readb(arb_block+6),asb_block+6); /* Must send the address back to the adapter */
-                writeb(readb(arb_block+7),asb_block+7); /* To let it know we have dealt with the data */                
-
-                writel(LISR_ASB_REPLY | LISR_ASB_FREE_REQ,olympic_priv->olympic_mmio+LISR_SUM);
-                olympic_priv->asb_queued = 2 ; 
-
-                return ; 
-        }
-
-        if (olympic_priv->asb_queued == 2) { 
-                switch (readb(asb_block+2)) {
-                        case 0x01:
-                                printk(KERN_WARNING "%s: Unrecognized command code\n", dev->name);
-                                break ;
-                        case 0x26:
-                                printk(KERN_WARNING "%s: Unrecognized buffer address\n", dev->name);
-                                break ;
-                        case 0xFF:
-                                /* Valid response, everything should be ok again */
-                                break ;
-                        default:
-                                printk(KERN_WARNING "%s: Invalid return code in asb\n",dev->name);
-                                break ;
-                }
-        }
-        olympic_priv->asb_queued = 0 ; 
-}
- 
-static int olympic_change_mtu(struct net_device *dev, int mtu) 
-{
-        struct olympic_private *olympic_priv = netdev_priv(dev);
-        u16 max_mtu ; 
-
-        if (olympic_priv->olympic_ring_speed == 4)
-                max_mtu = 4500 ; 
-        else
-                max_mtu = 18000 ; 
-        
-        if (mtu > max_mtu)
-                return -EINVAL ; 
-        if (mtu < 100) 
-                return -EINVAL ; 
-
-        dev->mtu = mtu ; 
-        olympic_priv->pkt_buf_sz = mtu + TR_HLEN ; 
-
-        return 0 ; 
-}
-
-static int olympic_proc_show(struct seq_file *m, void *v)
-{
-        struct net_device *dev = m->private;
-        struct olympic_private *olympic_priv=netdev_priv(dev);
-        u8 __iomem *oat = (olympic_priv->olympic_lap + olympic_priv->olympic_addr_table_addr) ; 
-        u8 __iomem *opt = (olympic_priv->olympic_lap + olympic_priv->olympic_parms_addr) ; 
-        u8 addr[6];
-        u8 addr2[6];
-        int i;
-
-        seq_printf(m,
-                "IBM Pit/Pit-Phy/Olympic Chipset Token Ring Adapter %s\n",dev->name);
-        seq_printf(m, "\n%6s: Adapter Address   : Node Address      : Functional Addr\n",
-           dev->name); 
-
-        for (i = 0 ; i < 6 ; i++)
-                addr[i] = readb(oat+offsetof(struct olympic_adapter_addr_table,node_addr) + i);
-
-        seq_printf(m, "%6s: %pM : %pM : %02x:%02x:%02x:%02x\n",
-           dev->name,
-           dev->dev_addr, addr,
-           readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)), 
-           readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)+1),
-           readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)+2),
-           readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)+3));
-         
-        seq_printf(m, "\n%6s: Token Ring Parameters Table:\n", dev->name);
-
-        seq_printf(m, "%6s: Physical Addr : Up Node Address   : Poll Address      : AccPri : Auth Src : Att Code :\n",
-          dev->name) ; 
-
-        for (i = 0 ; i < 6 ; i++)
-                addr[i] = readb(opt+offsetof(struct olympic_parameters_table, up_node_addr) + i);
-        for (i = 0 ; i < 6 ; i++)
-                addr2[i] =  readb(opt+offsetof(struct olympic_parameters_table, poll_addr) + i);
-
-        seq_printf(m, "%6s: %02x:%02x:%02x:%02x   : %pM : %pM : %04x   : %04x     :  %04x    :\n",
-          dev->name,
-          readb(opt+offsetof(struct olympic_parameters_table, phys_addr)),
-          readb(opt+offsetof(struct olympic_parameters_table, phys_addr)+1),
-          readb(opt+offsetof(struct olympic_parameters_table, phys_addr)+2),
-          readb(opt+offsetof(struct olympic_parameters_table, phys_addr)+3),
-          addr, addr2,
-          swab16(readw(opt+offsetof(struct olympic_parameters_table, acc_priority))),
-          swab16(readw(opt+offsetof(struct olympic_parameters_table, auth_source_class))),
-          swab16(readw(opt+offsetof(struct olympic_parameters_table, att_code))));
-
-        seq_printf(m, "%6s: Source Address    : Bcn T : Maj. V : Lan St : Lcl Rg : Mon Err : Frame Correl : \n",
-          dev->name) ; 
-        
-        for (i = 0 ; i < 6 ; i++)
-                addr[i] = readb(opt+offsetof(struct olympic_parameters_table, source_addr) + i);
-        seq_printf(m, "%6s: %pM : %04x  : %04x   : %04x   : %04x   : %04x    :     %04x     : \n",
-          dev->name, addr,
-          swab16(readw(opt+offsetof(struct olympic_parameters_table, beacon_type))),
-          swab16(readw(opt+offsetof(struct olympic_parameters_table, major_vector))),
-          swab16(readw(opt+offsetof(struct olympic_parameters_table, lan_status))),
-          swab16(readw(opt+offsetof(struct olympic_parameters_table, local_ring))),
-          swab16(readw(opt+offsetof(struct olympic_parameters_table, mon_error))),
-          swab16(readw(opt+offsetof(struct olympic_parameters_table, frame_correl))));
-
-        seq_printf(m, "%6s: Beacon Details :  Tx  :  Rx  : NAUN Node Address : NAUN Node Phys : \n",
-          dev->name) ; 
-
-        for (i = 0 ; i < 6 ; i++)
-                addr[i] = readb(opt+offsetof(struct olympic_parameters_table, beacon_naun) + i);
-        seq_printf(m, "%6s:                :  %02x  :  %02x  : %pM : %02x:%02x:%02x:%02x    : \n",
-          dev->name,
-          swab16(readw(opt+offsetof(struct olympic_parameters_table, beacon_transmit))),
-          swab16(readw(opt+offsetof(struct olympic_parameters_table, beacon_receive))),
-          addr,
-          readb(opt+offsetof(struct olympic_parameters_table, beacon_phys)),
-          readb(opt+offsetof(struct olympic_parameters_table, beacon_phys)+1),
-          readb(opt+offsetof(struct olympic_parameters_table, beacon_phys)+2),
-          readb(opt+offsetof(struct olympic_parameters_table, beacon_phys)+3));
-
-        return 0;
-}
-
-static int olympic_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, olympic_proc_show, PDE(inode)->data);
-}
-
-static const struct file_operations olympic_proc_ops = {
-        .open           = olympic_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-static void __devexit olympic_remove_one(struct pci_dev *pdev) 
-{
-        struct net_device *dev = pci_get_drvdata(pdev) ; 
-        struct olympic_private *olympic_priv=netdev_priv(dev);
-
-        if (olympic_priv->olympic_network_monitor) { 
-                char proc_name[20] ; 
-                strcpy(proc_name,"olympic_") ;
-                strcat(proc_name,dev->name) ;
-                remove_proc_entry(proc_name,init_net.proc_net);
-        }
-        unregister_netdev(dev) ; 
-        iounmap(olympic_priv->olympic_mmio) ; 
-        iounmap(olympic_priv->olympic_lap) ; 
-        pci_release_regions(pdev) ;
-        pci_set_drvdata(pdev,NULL) ;    
-        free_netdev(dev) ; 
-}
-
-static struct pci_driver olympic_driver = { 
-        .name           = "olympic",
-        .id_table       = olympic_pci_tbl,
-        .probe          = olympic_probe,
-        .remove         = __devexit_p(olympic_remove_one),
-};
-
-static int __init olympic_pci_init(void) 
-{
-        return pci_register_driver(&olympic_driver) ;
-}
-
-static void __exit olympic_pci_cleanup(void)
-{
-        pci_unregister_driver(&olympic_driver) ; 
-}       
-
-
-module_init(olympic_pci_init) ; 
-module_exit(olympic_pci_cleanup) ; 
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/net/tokenring/olympic.h b/drivers/net/tokenring/olympic.h
deleted file mode 100644
index 30631bae4c94..000000000000
--- a/drivers/net/tokenring/olympic.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- *  olympic.h (c) 1999 Peter De Schrijver All Rights Reserved
- *                1999,2000 Mike Phillips (mikep@linuxtr.net)
- *
- *  Linux driver for IBM PCI tokenring cards based on the olympic and the PIT/PHY chipset.
- *
- *  Base Driver Skeleton:
- *      Written 1993-94 by Donald Becker.
- *
- *      Copyright 1993 United States Government as represented by the
- *      Director, National Security Agency.
- *
- *  This software may be used and distributed according to the terms
- *  of the GNU General Public License, incorporated herein by reference.
- */
-
-#define CID 0x4e
-
-#define BCTL 0x70
-#define BCTL_SOFTRESET (1<<15)
-#define BCTL_MIMREB (1<<6)
-#define BCTL_MODE_INDICATOR (1<<5)
-
-#define GPR 0x4a
-#define GPR_OPTI_BF (1<<6)
-#define GPR_NEPTUNE_BF (1<<4) 
-#define GPR_AUTOSENSE (1<<2)
-#define GPR_16MBPS (1<<3) 
-
-#define PAG 0x85
-#define LBC 0x8e
-
-#define LISR 0x10
-#define LISR_SUM 0x14
-#define LISR_RWM 0x18
-
-#define LISR_LIE (1<<15)
-#define LISR_SLIM (1<<13)
-#define LISR_SLI (1<<12)
-#define LISR_PCMSRMASK (1<<11)
-#define LISR_PCMSRINT (1<<10)
-#define LISR_WOLMASK (1<<9)
-#define LISR_WOL (1<<8)
-#define LISR_SRB_CMD (1<<5)
-#define LISR_ASB_REPLY (1<<4)
-#define LISR_ASB_FREE_REQ (1<<2)
-#define LISR_ARB_FREE (1<<1)
-#define LISR_TRB_FRAME (1<<0)
-
-#define SISR 0x20
-#define SISR_SUM 0x24
-#define SISR_RWM 0x28
-#define SISR_RR 0x2C
-#define SISR_RESMASK 0x30
-#define SISR_MASK 0x54
-#define SISR_MASK_SUM 0x58
-#define SISR_MASK_RWM 0x5C
-
-#define SISR_TX2_IDLE (1<<31)
-#define SISR_TX2_HALT (1<<29)
-#define SISR_TX2_EOF (1<<28)
-#define SISR_TX1_IDLE (1<<27)
-#define SISR_TX1_HALT (1<<25)
-#define SISR_TX1_EOF (1<<24)
-#define SISR_TIMEOUT (1<<23)
-#define SISR_RX_NOBUF (1<<22)
-#define SISR_RX_STATUS (1<<21)
-#define SISR_RX_HALT (1<<18)
-#define SISR_RX_EOF_EARLY (1<<16)
-#define SISR_MI (1<<15)
-#define SISR_PI (1<<13)
-#define SISR_ERR (1<<9)
-#define SISR_ADAPTER_CHECK (1<<6)
-#define SISR_SRB_REPLY (1<<5)
-#define SISR_ASB_FREE (1<<4)
-#define SISR_ARB_CMD (1<<3)
-#define SISR_TRB_REPLY (1<<2)
-
-#define EISR 0x34
-#define EISR_RWM 0x38
-#define EISR_MASK 0x3c
-#define EISR_MASK_OPTIONS 0x001FFF7F
-
-#define LAPA 0x60
-#define LAPWWO 0x64
-#define LAPWWC 0x68
-#define LAPCTL 0x6C
-#define LAIPD 0x78
-#define LAIPDDINC 0x7C
-
-#define TIMER 0x50
-
-#define CLKCTL 0x74
-#define CLKCTL_PAUSE (1<<15) 
-
-#define PM_CON 0x4
-
-#define BMCTL_SUM 0x40
-#define BMCTL_RWM 0x44
-#define BMCTL_TX2_DIS (1<<30) 
-#define BMCTL_TX1_DIS (1<<26) 
-#define BMCTL_RX_DIS (1<<22) 
-
-#define BMASR 0xcc
-
-#define RXDESCQ 0x90
-#define RXDESCQCNT 0x94
-#define RXCDA 0x98
-#define RXENQ 0x9C
-#define RXSTATQ 0xA0
-#define RXSTATQCNT 0xA4
-#define RXCSA 0xA8
-#define RXCLEN 0xAC
-#define RXHLEN 0xAE
-
-#define TXDESCQ_1 0xb0
-#define TXDESCQ_2 0xd0
-#define TXDESCQCNT_1 0xb4
-#define TXDESCQCNT_2 0xd4
-#define TXCDA_1 0xb8
-#define TXCDA_2 0xd8
-#define TXENQ_1 0xbc
-#define TXENQ_2 0xdc
-#define TXSTATQ_1 0xc0
-#define TXSTATQ_2 0xe0
-#define TXSTATQCNT_1 0xc4
-#define TXSTATQCNT_2 0xe4
-#define TXCSA_1 0xc8
-#define TXCSA_2 0xe8
-/* Cardbus */
-#define FERMASK 0xf4
-#define FERMASK_INT_BIT (1<<15)
-
-#define OLYMPIC_IO_SPACE 256
-
-#define SRB_COMMAND_SIZE 50
-
-#define OLYMPIC_MAX_ADAPTERS 8 /* 0x08 __MODULE_STRING can't hand 0xnn */
-
-/* Defines for LAN STATUS CHANGE reports */
-#define LSC_SIG_LOSS 0x8000
-#define LSC_HARD_ERR 0x4000
-#define LSC_SOFT_ERR 0x2000
-#define LSC_TRAN_BCN 0x1000
-#define LSC_LWF      0x0800
-#define LSC_ARW      0x0400
-#define LSC_FPE      0x0200
-#define LSC_RR       0x0100
-#define LSC_CO       0x0080
-#define LSC_SS       0x0040
-#define LSC_RING_REC 0x0020
-#define LSC_SR_CO    0x0010
-#define LSC_FDX_MODE 0x0004
-
-/* Defines for OPEN ADAPTER command */
-
-#define OPEN_ADAPTER_EXT_WRAP (1<<15)
-#define OPEN_ADAPTER_DIS_HARDEE (1<<14)
-#define OPEN_ADAPTER_DIS_SOFTERR (1<<13)
-#define OPEN_ADAPTER_PASS_ADC_MAC (1<<12)
-#define OPEN_ADAPTER_PASS_ATT_MAC (1<<11)
-#define OPEN_ADAPTER_ENABLE_EC (1<<10)
-#define OPEN_ADAPTER_CONTENDER (1<<8)
-#define OPEN_ADAPTER_PASS_BEACON (1<<7)
-#define OPEN_ADAPTER_ENABLE_FDX (1<<6)
-#define OPEN_ADAPTER_ENABLE_RPL (1<<5)
-#define OPEN_ADAPTER_INHIBIT_ETR (1<<4)
-#define OPEN_ADAPTER_INTERNAL_WRAP (1<<3)
-#define OPEN_ADAPTER_USE_OPTS2 (1<<0)
-
-#define OPEN_ADAPTER_2_ENABLE_ONNOW (1<<15)
-
-/* Defines for SRB Commands */
-
-#define SRB_ACCESS_REGISTER 0x1f
-#define SRB_CLOSE_ADAPTER 0x04
-#define SRB_CONFIGURE_BRIDGE 0x0c
-#define SRB_CONFIGURE_WAKEUP_EVENT 0x1a
-#define SRB_MODIFY_BRIDGE_PARMS 0x15
-#define SRB_MODIFY_OPEN_OPTIONS 0x01
-#define SRB_MODIFY_RECEIVE_OPTIONS 0x17
-#define SRB_NO_OPERATION 0x00
-#define SRB_OPEN_ADAPTER 0x03
-#define SRB_READ_LOG 0x08
-#define SRB_READ_SR_COUNTERS 0x16
-#define SRB_RESET_GROUP_ADDRESS 0x02
-#define SRB_SAVE_CONFIGURATION 0x1b
-#define SRB_SET_BRIDGE_PARMS 0x09
-#define SRB_SET_BRIDGE_TARGETS 0x10
-#define SRB_SET_FUNC_ADDRESS 0x07
-#define SRB_SET_GROUP_ADDRESS 0x06
-#define SRB_SET_GROUP_ADDR_OPTIONS 0x11
-#define SRB_UPDATE_WAKEUP_PATTERN 0x19
-
-/* Clear return code */
-
-#define OLYMPIC_CLEAR_RET_CODE 0xfe 
-
-/* ARB Commands */
-#define ARB_RECEIVE_DATA 0x81
-#define ARB_LAN_CHANGE_STATUS 0x84
-/* ASB Response commands */
-
-#define ASB_RECEIVE_DATA 0x81
-
-
-/* Olympic defaults for buffers */
- 
-#define OLYMPIC_RX_RING_SIZE 16 /* should be a power of 2 */
-#define OLYMPIC_TX_RING_SIZE 8 /* should be a power of 2 */
-
-#define PKT_BUF_SZ 4096 /* Default packet size */
-
-/* Olympic data structures */
-
-/* xxxx These structures are all little endian in hardware. */
-
-struct olympic_tx_desc {
-        __le32 buffer;
-        __le32 status_length;
-};
-
-struct olympic_tx_status {
-        __le32 status;
-};
-
-struct olympic_rx_desc {
-        __le32 buffer;
-        __le32 res_length; 
-};
-
-struct olympic_rx_status {
-        __le32 fragmentcnt_framelen;
-        __le32 status_buffercnt;
-};
-/* xxxx END These structures are all little endian in hardware. */
-/* xxxx There may be more, but I'm pretty sure about these */
-
-struct mac_receive_buffer {
-        __le16 next ; 
-        u8 padding ; 
-        u8 frame_status ;
-        __le16 buffer_length ; 
-        u8 frame_data ; 
-};
-
-struct olympic_private {
-        
-        u16 srb;      /* be16 */
-        u16 trb;      /* be16 */
-        u16 arb;      /* be16 */
-        u16 asb;      /* be16 */
-
-        u8 __iomem *olympic_mmio;
-        u8 __iomem *olympic_lap;
-        struct pci_dev *pdev ; 
-        const char *olympic_card_name;
-
-        spinlock_t olympic_lock ; 
-
-        volatile int srb_queued;    /* True if an SRB is still posted */        
-        wait_queue_head_t srb_wait;
-
-        volatile int asb_queued;    /* True if an ASB is posted */
-
-        volatile int trb_queued;   /* True if a TRB is posted */
-        wait_queue_head_t trb_wait ; 
-
-        /* These must be on a 4 byte boundary. */
-        struct olympic_rx_desc olympic_rx_ring[OLYMPIC_RX_RING_SIZE];
-        struct olympic_tx_desc olympic_tx_ring[OLYMPIC_TX_RING_SIZE];
-        struct olympic_rx_status olympic_rx_status_ring[OLYMPIC_RX_RING_SIZE];  
-        struct olympic_tx_status olympic_tx_status_ring[OLYMPIC_TX_RING_SIZE];  
-
-        struct sk_buff *tx_ring_skb[OLYMPIC_TX_RING_SIZE], *rx_ring_skb[OLYMPIC_RX_RING_SIZE];  
-        int tx_ring_free, tx_ring_last_status, rx_ring_last_received,rx_status_last_received, free_tx_ring_entries;
-
-        u16 olympic_lan_status ;
-        u8 olympic_ring_speed ;
-        u16 pkt_buf_sz ; 
-        u8 olympic_receive_options, olympic_copy_all_options,olympic_message_level, olympic_network_monitor;  
-        u16 olympic_addr_table_addr, olympic_parms_addr ; 
-        u8 olympic_laa[6] ; 
-        u32 rx_ring_dma_addr;
-        u32 rx_status_ring_dma_addr;
-        u32 tx_ring_dma_addr;
-        u32 tx_status_ring_dma_addr;
-};
-
-struct olympic_adapter_addr_table {
-
-        u8 node_addr[6] ; 
-        u8 reserved[4] ; 
-        u8 func_addr[4] ; 
-} ; 
-
-struct olympic_parameters_table { 
-        
-        u8  phys_addr[4] ; 
-        u8  up_node_addr[6] ; 
-        u8  up_phys_addr[4] ; 
-        u8  poll_addr[6] ; 
-        u16 reserved ; 
-        u16 acc_priority ; 
-        u16 auth_source_class ; 
-        u16 att_code ; 
-        u8  source_addr[6] ; 
-        u16 beacon_type ; 
-        u16 major_vector ; 
-        u16 lan_status ; 
-        u16 soft_error_time ; 
-        u16 reserved1 ; 
-        u16 local_ring ; 
-        u16 mon_error ; 
-        u16 beacon_transmit ; 
-        u16 beacon_receive ; 
-        u16 frame_correl ; 
-        u8  beacon_naun[6] ; 
-        u32 reserved2 ; 
-        u8  beacon_phys[4] ;    
-}; 
diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
deleted file mode 100644
index 62d90e40f9ec..000000000000
--- a/drivers/net/tokenring/proteon.c
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- *  proteon.c: A network driver for Proteon ISA token ring cards.
- *
- *  Based on tmspci written 1999 by Adam Fritzler
- *  
- *  Written 2003 by Jochen Friedrich
- *
- *  This software may be used and distributed according to the terms
- *  of the GNU General Public License, incorporated herein by reference.
- *
- *  This driver module supports the following cards:
- *      - Proteon 1392, 1392+
- *
- *  Maintainer(s):
- *    AF        Adam Fritzler
- *    JF        Jochen Friedrich        jochen@scram.de
- *
- *  Modification History:
- *      02-Jan-03       JF      Created
- *
- */
-static const char version[] = "proteon.c: v1.00 02/01/2003 by Jochen Friedrich\n";
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/netdevice.h>
-#include <linux/trdevice.h>
-#include <linux/platform_device.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/pci.h>
-#include <asm/dma.h>
-
-#include "tms380tr.h"
-
-#define PROTEON_IO_EXTENT 32
-
-/* A zero-terminated list of I/O addresses to be probed. */
-static unsigned int portlist[] __initdata = {
-        0x0A20, 0x0E20, 0x1A20, 0x1E20, 0x2A20, 0x2E20, 0x3A20, 0x3E20,// Prot.
-        0x4A20, 0x4E20, 0x5A20, 0x5E20, 0x6A20, 0x6E20, 0x7A20, 0x7E20,// Prot.
-        0x8A20, 0x8E20, 0x9A20, 0x9E20, 0xAA20, 0xAE20, 0xBA20, 0xBE20,// Prot.
-        0xCA20, 0xCE20, 0xDA20, 0xDE20, 0xEA20, 0xEE20, 0xFA20, 0xFE20,// Prot.
-        0
-};
-
-/* A zero-terminated list of IRQs to be probed. */
-static unsigned short irqlist[] = {
-        7, 6, 5, 4, 3, 12, 11, 10, 9,
-        0
-};
-
-/* A zero-terminated list of DMAs to be probed. */
-static int dmalist[] __initdata = {
-        5, 6, 7,
-        0
-};
-
-static char cardname[] = "Proteon 1392\0";
-static u64 dma_mask = ISA_MAX_ADDRESS;
-static int proteon_open(struct net_device *dev);
-static void proteon_read_eeprom(struct net_device *dev);
-static unsigned short proteon_setnselout_pins(struct net_device *dev);
-
-static unsigned short proteon_sifreadb(struct net_device *dev, unsigned short reg)
-{
-        return inb(dev->base_addr + reg);
-}
-
-static unsigned short proteon_sifreadw(struct net_device *dev, unsigned short reg)
-{
-        return inw(dev->base_addr + reg);
-}
-
-static void proteon_sifwriteb(struct net_device *dev, unsigned short val, unsigned short reg)
-{
-        outb(val, dev->base_addr + reg);
-}
-
-static void proteon_sifwritew(struct net_device *dev, unsigned short val, unsigned short reg)
-{
-        outw(val, dev->base_addr + reg);
-}
-
-static int __init proteon_probe1(struct net_device *dev, int ioaddr)
-{
-        unsigned char chk1, chk2;
-        int i;
-
-        if (!request_region(ioaddr, PROTEON_IO_EXTENT, cardname))
-                return -ENODEV;
-                
-
-        chk1 = inb(ioaddr + 0x1f);      /* Get Proteon ID reg 1 */
-        if (chk1 != 0x1f) 
-                goto nodev;
-
-        chk1 = inb(ioaddr + 0x1e) & 0x07;       /* Get Proteon ID reg 0 */
-        for (i=0; i<16; i++) {
-                chk2 = inb(ioaddr + 0x1e) & 0x07;
-                if (((chk1 + 1) & 0x07) != chk2)
-                        goto nodev;
-                chk1 = chk2;
-        }
-
-        dev->base_addr = ioaddr;
-        return 0;
-nodev:
-        release_region(ioaddr, PROTEON_IO_EXTENT); 
-        return -ENODEV;
-}
-
-static struct net_device_ops proteon_netdev_ops __read_mostly;
-
-static int __init setup_card(struct net_device *dev, struct device *pdev)
-{
-        struct net_local *tp;
-        static int versionprinted;
-        const unsigned *port;
-        int j,err = 0;
-
-        if (!dev)
-                return -ENOMEM;
-
-        if (dev->base_addr)     /* probe specific location */
-                err = proteon_probe1(dev, dev->base_addr);
-        else {
-                for (port = portlist; *port; port++) {
-                        err = proteon_probe1(dev, *port);
-                        if (!err)
-                                break;
-                }
-        }
-        if (err)
-                goto out5;
-
-        /* At this point we have found a valid card. */
-
-        if (versionprinted++ == 0)
-                printk(KERN_DEBUG "%s", version);
-
-        err = -EIO;
-        pdev->dma_mask = &dma_mask;
-        if (tmsdev_init(dev, pdev))
-                goto out4;
-
-        dev->base_addr &= ~3; 
-                
-        proteon_read_eeprom(dev);
-
-        printk(KERN_DEBUG "proteon.c:    Ring Station Address: %pM\n",
-               dev->dev_addr);
-                
-        tp = netdev_priv(dev);
-        tp->setnselout = proteon_setnselout_pins;
-                
-        tp->sifreadb = proteon_sifreadb;
-        tp->sifreadw = proteon_sifreadw;
-        tp->sifwriteb = proteon_sifwriteb;
-        tp->sifwritew = proteon_sifwritew;
-        
-        memcpy(tp->ProductID, cardname, PROD_ID_SIZE + 1);
-
-        tp->tmspriv = NULL;
-
-        dev->netdev_ops = &proteon_netdev_ops;
-
-        if (dev->irq == 0)
-        {
-                for(j = 0; irqlist[j] != 0; j++)
-                {
-                        dev->irq = irqlist[j];
-                        if (!request_irq(dev->irq, tms380tr_interrupt, 0, 
-                                cardname, dev))
-                                break;
-                }
-                
-                if(irqlist[j] == 0)
-                {
-                        printk(KERN_INFO "proteon.c: AutoSelect no IRQ available\n");
-                        goto out3;
-                }
-        }
-        else
-        {
-                for(j = 0; irqlist[j] != 0; j++)
-                        if (irqlist[j] == dev->irq)
-                                break;
-                if (irqlist[j] == 0)
-                {
-                        printk(KERN_INFO "proteon.c: Illegal IRQ %d specified\n",
-                                dev->irq);
-                        goto out3;
-                }
-                if (request_irq(dev->irq, tms380tr_interrupt, 0, 
-                        cardname, dev))
-                {
-                        printk(KERN_INFO "proteon.c: Selected IRQ %d not available\n",
-                                dev->irq);
-                        goto out3;
-                }
-        }
-
-        if (dev->dma == 0)
-        {
-                for(j = 0; dmalist[j] != 0; j++)
-                {
-                        dev->dma = dmalist[j];
-                        if (!request_dma(dev->dma, cardname))
-                                break;
-                }
-
-                if(dmalist[j] == 0)
-                {
-                        printk(KERN_INFO "proteon.c: AutoSelect no DMA available\n");
-                        goto out2;
-                }
-        }
-        else
-        {
-                for(j = 0; dmalist[j] != 0; j++)
-                        if (dmalist[j] == dev->dma)
-                                break;
-                if (dmalist[j] == 0)
-                {
-                        printk(KERN_INFO "proteon.c: Illegal DMA %d specified\n",
-                                dev->dma);
-                        goto out2;
-                }
-                if (request_dma(dev->dma, cardname))
-                {
-                        printk(KERN_INFO "proteon.c: Selected DMA %d not available\n",
-                                dev->dma);
-                        goto out2;
-                }
-        }
-
-        err = register_netdev(dev);
-        if (err)
-                goto out;
-
-        printk(KERN_DEBUG "%s:    IO: %#4lx  IRQ: %d  DMA: %d\n",
-               dev->name, dev->base_addr, dev->irq, dev->dma);
-
-        return 0;
-out:
-        free_dma(dev->dma);
-out2:
-        free_irq(dev->irq, dev);
-out3:
-        tmsdev_term(dev);
-out4:
-        release_region(dev->base_addr, PROTEON_IO_EXTENT);
-out5:
-        return err;
-}
-
-/*
- * Reads MAC address from adapter RAM, which should've read it from
- * the onboard ROM.  
- *
- * Calling this on a board that does not support it can be a very
- * dangerous thing.  The Madge board, for instance, will lock your
- * machine hard when this is called.  Luckily, its supported in a
- * separate driver.  --ASF
- */
-static void proteon_read_eeprom(struct net_device *dev)
-{
-        int i;
-        
-        /* Address: 0000:0000 */
-        proteon_sifwritew(dev, 0, SIFADX);
-        proteon_sifwritew(dev, 0, SIFADR);      
-        
-        /* Read six byte MAC address data */
-        dev->addr_len = 6;
-        for(i = 0; i < 6; i++)
-                dev->dev_addr[i] = proteon_sifreadw(dev, SIFINC) >> 8;
-}
-
-static unsigned short proteon_setnselout_pins(struct net_device *dev)
-{
-        return 0;
-}
-
-static int proteon_open(struct net_device *dev)
-{  
-        struct net_local *tp = netdev_priv(dev);
-        unsigned short val = 0;
-        int i;
-
-        /* Proteon reset sequence */
-        outb(0, dev->base_addr + 0x11);
-        mdelay(20);
-        outb(0x04, dev->base_addr + 0x11);
-        mdelay(20);
-        outb(0, dev->base_addr + 0x11);
-        mdelay(100);
-
-        /* set control/status reg */
-        val = inb(dev->base_addr + 0x11);
-        val |= 0x78;
-        val &= 0xf9;
-        if(tp->DataRate == SPEED_4)
-                val |= 0x20;
-        else
-                val &= ~0x20;
-
-        outb(val, dev->base_addr + 0x11);
-        outb(0xff, dev->base_addr + 0x12);
-        for(i = 0; irqlist[i] != 0; i++)
-        {
-                if(irqlist[i] == dev->irq)
-                        break;
-        }
-        val = i;
-        i = (7 - dev->dma) << 4;
-        val |= i;
-        outb(val, dev->base_addr + 0x13);
-
-        return tms380tr_open(dev);
-}
-
-#define ISATR_MAX_ADAPTERS 3
-
-static int io[ISATR_MAX_ADAPTERS];
-static int irq[ISATR_MAX_ADAPTERS];
-static int dma[ISATR_MAX_ADAPTERS];
-
-MODULE_LICENSE("GPL");
-
-module_param_array(io, int, NULL, 0);
-module_param_array(irq, int, NULL, 0);
-module_param_array(dma, int, NULL, 0);
-
-static struct platform_device *proteon_dev[ISATR_MAX_ADAPTERS];
-
-static struct platform_driver proteon_driver = {
-        .driver         = {
-                .name   = "proteon",
-        },
-};
-
-static int __init proteon_init(void)
-{
-        struct net_device *dev;
-        struct platform_device *pdev;
-        int i, num = 0, err = 0;
-
-        proteon_netdev_ops = tms380tr_netdev_ops;
-        proteon_netdev_ops.ndo_open = proteon_open;
-        proteon_netdev_ops.ndo_stop = tms380tr_close;
-
-        err = platform_driver_register(&proteon_driver);
-        if (err)
-                return err;
-
-        for (i = 0; i < ISATR_MAX_ADAPTERS ; i++) {
-                dev = alloc_trdev(sizeof(struct net_local));
-                if (!dev)
-                        continue;
-
-                dev->base_addr = io[i];
-                dev->irq = irq[i];
-                dev->dma = dma[i];
-                pdev = platform_device_register_simple("proteon",
-                        i, NULL, 0);
-                if (IS_ERR(pdev)) {
-                        free_netdev(dev);
-                        continue;
-                }
-                err = setup_card(dev, &pdev->dev);
-                if (!err) {
-                        proteon_dev[i] = pdev;
-                        platform_set_drvdata(pdev, dev);
-                        ++num;
-                } else {
-                        platform_device_unregister(pdev);
-                        free_netdev(dev);
-                }
-        }
-
-        printk(KERN_NOTICE "proteon.c: %d cards found.\n", num);
-        /* Probe for cards. */
-        if (num == 0) {
-                printk(KERN_NOTICE "proteon.c: No cards found.\n");
-                platform_driver_unregister(&proteon_driver);
-                return -ENODEV;
-        }
-        return 0;
-}
-
-static void __exit proteon_cleanup(void)
-{
-        struct net_device *dev;
-        int i;
-
-        for (i = 0; i < ISATR_MAX_ADAPTERS ; i++) {
-                struct platform_device *pdev = proteon_dev[i];
-                
-                if (!pdev)
-                        continue;
-                dev = platform_get_drvdata(pdev);
-                unregister_netdev(dev);
-                release_region(dev->base_addr, PROTEON_IO_EXTENT);
-                free_irq(dev->irq, dev);
-                free_dma(dev->dma);
-                tmsdev_term(dev);
-                free_netdev(dev);
-                platform_set_drvdata(pdev, NULL);
-                platform_device_unregister(pdev);
-        }
-        platform_driver_unregister(&proteon_driver);
-}
-
-module_init(proteon_init);
-module_exit(proteon_cleanup);
diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
deleted file mode 100644
index ee11e93dc30e..000000000000
--- a/drivers/net/tokenring/skisa.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- *  skisa.c: A network driver for SK-NET TMS380-based ISA token ring cards.
- *
- *  Based on tmspci written 1999 by Adam Fritzler
- *  
- *  Written 2000 by Jochen Friedrich
- *  Dedicated to my girlfriend Steffi Bopp
- *
- *  This software may be used and distributed according to the terms
- *  of the GNU General Public License, incorporated herein by reference.
- *
- *  This driver module supports the following cards:
- *      - SysKonnect TR4/16(+) ISA      (SK-4190)
- *
- *  Maintainer(s):
- *    AF        Adam Fritzler
- *    JF        Jochen Friedrich        jochen@scram.de
- *
- *  Modification History:
- *      14-Jan-01       JF      Created
- *      28-Oct-02       JF      Fixed probe of card for static compilation.
- *                              Fixed module init to not make hotplug go wild.
- *      09-Nov-02       JF      Fixed early bail out on out of memory
- *                              situations if multiple cards are found.
- *                              Cleaned up some unnecessary console SPAM.
- *      09-Dec-02       JF      Fixed module reference counting.
- *      02-Jan-03       JF      Renamed to skisa.c
- *
- */
-static const char version[] = "skisa.c: v1.03 09/12/2002 by Jochen Friedrich\n";
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/netdevice.h>
-#include <linux/trdevice.h>
-#include <linux/platform_device.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/pci.h>
-#include <asm/dma.h>
-
-#include "tms380tr.h"
-
-#define SK_ISA_IO_EXTENT 32
-
-/* A zero-terminated list of I/O addresses to be probed. */
-static unsigned int portlist[] __initdata = {
-        0x0A20, 0x1A20, 0x0B20, 0x1B20, 0x0980, 0x1980, 0x0900, 0x1900,// SK
-        0
-};
-
-/* A zero-terminated list of IRQs to be probed. 
- * Used again after initial probe for sktr_chipset_init, called from sktr_open.
- */
-static const unsigned short irqlist[] = {
-        3, 5, 9, 10, 11, 12, 15,
-        0
-};
-
-/* A zero-terminated list of DMAs to be probed. */
-static int dmalist[] __initdata = {
-        5, 6, 7,
-        0
-};
-
-static char isa_cardname[] = "SK NET TR 4/16 ISA\0";
-static u64 dma_mask = ISA_MAX_ADDRESS;
-static int sk_isa_open(struct net_device *dev);
-static void sk_isa_read_eeprom(struct net_device *dev);
-static unsigned short sk_isa_setnselout_pins(struct net_device *dev);
-
-static unsigned short sk_isa_sifreadb(struct net_device *dev, unsigned short reg)
-{
-        return inb(dev->base_addr + reg);
-}
-
-static unsigned short sk_isa_sifreadw(struct net_device *dev, unsigned short reg)
-{
-        return inw(dev->base_addr + reg);
-}
-
-static void sk_isa_sifwriteb(struct net_device *dev, unsigned short val, unsigned short reg)
-{
-        outb(val, dev->base_addr + reg);
-}
-
-static void sk_isa_sifwritew(struct net_device *dev, unsigned short val, unsigned short reg)
-{
-        outw(val, dev->base_addr + reg);
-}
-
-
-static int __init sk_isa_probe1(struct net_device *dev, int ioaddr)
-{
-        unsigned char old, chk1, chk2;
-
-        if (!request_region(ioaddr, SK_ISA_IO_EXTENT, isa_cardname))
-                return -ENODEV;
-
-        old = inb(ioaddr + SIFADR);     /* Get the old SIFADR value */
-
-        chk1 = 0;       /* Begin with check value 0 */
-        do {
-                /* Write new SIFADR value */
-                outb(chk1, ioaddr + SIFADR);
-
-                /* Read, invert and write */
-                chk2 = inb(ioaddr + SIFADD);
-                chk2 ^= 0x0FE;
-                outb(chk2, ioaddr + SIFADR);
-
-                /* Read, invert and compare */
-                chk2 = inb(ioaddr + SIFADD);
-                chk2 ^= 0x0FE;
-
-                if(chk1 != chk2) {
-                        release_region(ioaddr, SK_ISA_IO_EXTENT);
-                        return -ENODEV;
-                }
-
-                chk1 -= 2;
-        } while(chk1 != 0);     /* Repeat 128 times (all byte values) */
-
-        /* Restore the SIFADR value */
-        outb(old, ioaddr + SIFADR);
-
-        dev->base_addr = ioaddr;
-        return 0;
-}
-
-static struct net_device_ops sk_isa_netdev_ops __read_mostly;
-
-static int __init setup_card(struct net_device *dev, struct device *pdev)
-{
-        struct net_local *tp;
-        static int versionprinted;
-        const unsigned *port;
-        int j, err = 0;
-
-        if (!dev)
-                return -ENOMEM;
-
-        if (dev->base_addr)     /* probe specific location */
-                err = sk_isa_probe1(dev, dev->base_addr);
-        else {
-                for (port = portlist; *port; port++) {
-                        err = sk_isa_probe1(dev, *port);
-                        if (!err)
-                                break;
-                }
-        }
-        if (err)
-                goto out5;
-
-        /* At this point we have found a valid card. */
-
-        if (versionprinted++ == 0)
-                printk(KERN_DEBUG "%s", version);
-
-        err = -EIO;
-        pdev->dma_mask = &dma_mask;
-        if (tmsdev_init(dev, pdev))
-                goto out4;
-
-        dev->base_addr &= ~3; 
-                
-        sk_isa_read_eeprom(dev);
-
-        printk(KERN_DEBUG "skisa.c:    Ring Station Address: %pM\n",
-               dev->dev_addr);
-                
-        tp = netdev_priv(dev);
-        tp->setnselout = sk_isa_setnselout_pins;
-                
-        tp->sifreadb = sk_isa_sifreadb;
-        tp->sifreadw = sk_isa_sifreadw;
-        tp->sifwriteb = sk_isa_sifwriteb;
-        tp->sifwritew = sk_isa_sifwritew;
-        
-        memcpy(tp->ProductID, isa_cardname, PROD_ID_SIZE + 1);
-
-        tp->tmspriv = NULL;
-
-        dev->netdev_ops = &sk_isa_netdev_ops;
-
-        if (dev->irq == 0)
-        {
-                for(j = 0; irqlist[j] != 0; j++)
-                {
-                        dev->irq = irqlist[j];
-                        if (!request_irq(dev->irq, tms380tr_interrupt, 0, 
-                                isa_cardname, dev))
-                                break;
-                }
-                
-                if(irqlist[j] == 0)
-                {
-                        printk(KERN_INFO "skisa.c: AutoSelect no IRQ available\n");
-                        goto out3;
-                }
-        }
-        else
-        {
-                for(j = 0; irqlist[j] != 0; j++)
-                        if (irqlist[j] == dev->irq)
-                                break;
-                if (irqlist[j] == 0)
-                {
-                        printk(KERN_INFO "skisa.c: Illegal IRQ %d specified\n",
-                                dev->irq);
-                        goto out3;
-                }
-                if (request_irq(dev->irq, tms380tr_interrupt, 0, 
-                        isa_cardname, dev))
-                {
-                        printk(KERN_INFO "skisa.c: Selected IRQ %d not available\n",
-                                dev->irq);
-                        goto out3;
-                }
-        }
-
-        if (dev->dma == 0)
-        {
-                for(j = 0; dmalist[j] != 0; j++)
-                {
-                        dev->dma = dmalist[j];
-                        if (!request_dma(dev->dma, isa_cardname))
-                                break;
-                }
-
-                if(dmalist[j] == 0)
-                {
-                        printk(KERN_INFO "skisa.c: AutoSelect no DMA available\n");
-                        goto out2;
-                }
-        }
-        else
-        {
-                for(j = 0; dmalist[j] != 0; j++)
-                        if (dmalist[j] == dev->dma)
-                                break;
-                if (dmalist[j] == 0)
-                {
-                        printk(KERN_INFO "skisa.c: Illegal DMA %d specified\n",
-                                dev->dma);
-                        goto out2;
-                }
-                if (request_dma(dev->dma, isa_cardname))
-                {
-                        printk(KERN_INFO "skisa.c: Selected DMA %d not available\n",
-                                dev->dma);
-                        goto out2;
-                }
-        }
-
-        err = register_netdev(dev);
-        if (err)
-                goto out;
-
-        printk(KERN_DEBUG "%s:    IO: %#4lx  IRQ: %d  DMA: %d\n",
-               dev->name, dev->base_addr, dev->irq, dev->dma);
-
-        return 0;
-out:
-        free_dma(dev->dma);
-out2:
-        free_irq(dev->irq, dev);
-out3:
-        tmsdev_term(dev);
-out4:
-        release_region(dev->base_addr, SK_ISA_IO_EXTENT);
-out5:
-        return err;
-}
-
-/*
- * Reads MAC address from adapter RAM, which should've read it from
- * the onboard ROM.  
- *
- * Calling this on a board that does not support it can be a very
- * dangerous thing.  The Madge board, for instance, will lock your
- * machine hard when this is called.  Luckily, its supported in a
- * separate driver.  --ASF
- */
-static void sk_isa_read_eeprom(struct net_device *dev)
-{
-        int i;
-        
-        /* Address: 0000:0000 */
-        sk_isa_sifwritew(dev, 0, SIFADX);
-        sk_isa_sifwritew(dev, 0, SIFADR);       
-        
-        /* Read six byte MAC address data */
-        dev->addr_len = 6;
-        for(i = 0; i < 6; i++)
-                dev->dev_addr[i] = sk_isa_sifreadw(dev, SIFINC) >> 8;
-}
-
-static unsigned short sk_isa_setnselout_pins(struct net_device *dev)
-{
-        return 0;
-}
-
-static int sk_isa_open(struct net_device *dev)
-{  
-        struct net_local *tp = netdev_priv(dev);
-        unsigned short val = 0;
-        unsigned short oldval;
-        int i;
-
-        val = 0;
-        for(i = 0; irqlist[i] != 0; i++)
-        {
-                if(irqlist[i] == dev->irq)
-                        break;
-        }
-
-        val |= CYCLE_TIME << 2;
-        val |= i << 4;
-        i = dev->dma - 5;
-        val |= i;
-        if(tp->DataRate == SPEED_4)
-                val |= LINE_SPEED_BIT;
-        else
-                val &= ~LINE_SPEED_BIT;
-        oldval = sk_isa_sifreadb(dev, POSREG);
-        /* Leave cycle bits alone */
-        oldval |= 0xf3;
-        val &= oldval;
-        sk_isa_sifwriteb(dev, val, POSREG);
-
-        return tms380tr_open(dev);
-}
-
-#define ISATR_MAX_ADAPTERS 3
-
-static int io[ISATR_MAX_ADAPTERS];
-static int irq[ISATR_MAX_ADAPTERS];
-static int dma[ISATR_MAX_ADAPTERS];
-
-MODULE_LICENSE("GPL");
-
-module_param_array(io, int, NULL, 0);
-module_param_array(irq, int, NULL, 0);
-module_param_array(dma, int, NULL, 0);
-
-static struct platform_device *sk_isa_dev[ISATR_MAX_ADAPTERS];
-
-static struct platform_driver sk_isa_driver = {
-        .driver         = {
-                .name   = "skisa",
-        },
-};
-
-static int __init sk_isa_init(void)
-{
-        struct net_device *dev;
-        struct platform_device *pdev;
-        int i, num = 0, err = 0;
-
-        sk_isa_netdev_ops = tms380tr_netdev_ops;
-        sk_isa_netdev_ops.ndo_open = sk_isa_open;
-        sk_isa_netdev_ops.ndo_stop = tms380tr_close;
-
-        err = platform_driver_register(&sk_isa_driver);
-        if (err)
-                return err;
-
-        for (i = 0; i < ISATR_MAX_ADAPTERS ; i++) {
-                dev = alloc_trdev(sizeof(struct net_local));
-                if (!dev)
-                        continue;
-
-                dev->base_addr = io[i];
-                dev->irq = irq[i];
-                dev->dma = dma[i];
-                pdev = platform_device_register_simple("skisa",
-                        i, NULL, 0);
-                if (IS_ERR(pdev)) {
-                        free_netdev(dev);
-                        continue;
-                }
-                err = setup_card(dev, &pdev->dev);
-                if (!err) {
-                        sk_isa_dev[i] = pdev;
-                        platform_set_drvdata(sk_isa_dev[i], dev);
-                        ++num;
-                } else {
-                        platform_device_unregister(pdev);
-                        free_netdev(dev);
-                }
-        }
-
-        printk(KERN_NOTICE "skisa.c: %d cards found.\n", num);
-        /* Probe for cards. */
-        if (num == 0) {
-                printk(KERN_NOTICE "skisa.c: No cards found.\n");
-                platform_driver_unregister(&sk_isa_driver);
-                return -ENODEV;
-        }
-        return 0;
-}
-
-static void __exit sk_isa_cleanup(void)
-{
-        struct net_device *dev;
-        int i;
-
-        for (i = 0; i < ISATR_MAX_ADAPTERS ; i++) {
-                struct platform_device *pdev = sk_isa_dev[i];
-
-                if (!pdev)
-                        continue;
-                dev = platform_get_drvdata(pdev);
-                unregister_netdev(dev);
-                release_region(dev->base_addr, SK_ISA_IO_EXTENT);
-                free_irq(dev->irq, dev);
-                free_dma(dev->dma);
-                tmsdev_term(dev);
-                free_netdev(dev);
-                platform_set_drvdata(pdev, NULL);
-                platform_device_unregister(pdev);
-        }
-        platform_driver_unregister(&sk_isa_driver);
-}
-
-module_init(sk_isa_init);
-module_exit(sk_isa_cleanup);
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
deleted file mode 100644
index cb35fb79e016..000000000000
--- a/drivers/net/tokenring/smctr.c
+++ /dev/null
@@ -1,5717 +0,0 @@
-/*
- *  smctr.c: A network driver for the SMC Token Ring Adapters.
- *
- *  Written by Jay Schulist <jschlst@samba.org>
- *
- *  This software may be used and distributed according to the terms
- *  of the GNU General Public License, incorporated herein by reference.
- *
- *  This device driver works with the following SMC adapters:
- *      - SMC TokenCard Elite   (8115T, chips 825/584)
- *      - SMC TokenCard Elite/A MCA (8115T/A, chips 825/594)
- *
- *  Source(s):
- *      - SMC TokenCard SDK.
- *
- *  Maintainer(s):
- *    JS        Jay Schulist <jschlst@samba.org>
- *
- * Changes:
- *    07102000          JS      Fixed a timing problem in smctr_wait_cmd();
- *                              Also added a bit more discriptive error msgs.
- *    07122000          JS      Fixed problem with detecting a card with
- *                              module io/irq/mem specified.
- *
- *  To do:
- *    1. Multicast support.
- *
- *  Initial 2.5 cleanup Alan Cox <alan@lxorguk.ukuu.org.uk>  2002/10/28
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/fcntl.h>
-#include <linux/interrupt.h>
-#include <linux/ptrace.h>
-#include <linux/ioport.h>
-#include <linux/in.h>
-#include <linux/string.h>
-#include <linux/time.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/mca-legacy.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/trdevice.h>
-#include <linux/bitops.h>
-#include <linux/firmware.h>
-
-#include <asm/io.h>
-#include <asm/dma.h>
-#include <asm/irq.h>
-
-#if BITS_PER_LONG == 64
-#error FIXME: driver does not support 64-bit platforms
-#endif
-
-#include "smctr.h"               /* Our Stuff */
-
-static const char version[] __initdata =
-        KERN_INFO "smctr.c: v1.4 7/12/00 by jschlst@samba.org\n";
-static const char cardname[] = "smctr";
-
-
-#define SMCTR_IO_EXTENT   20
-
-#ifdef CONFIG_MCA_LEGACY
-static unsigned int smctr_posid = 0x6ec6;
-#endif
-
-static int ringspeed;
-
-/* SMC Name of the Adapter. */
-static char smctr_name[] = "SMC TokenCard";
-static char *smctr_model = "Unknown";
-
-/* Use 0 for production, 1 for verification, 2 for debug, and
- * 3 for very verbose debug.
- */
-#ifndef SMCTR_DEBUG
-#define SMCTR_DEBUG 1
-#endif
-static unsigned int smctr_debug = SMCTR_DEBUG;
-
-/* smctr.c prototypes and functions are arranged alphabeticly 
- * for clearity, maintainability and pure old fashion fun. 
- */
-/* A */
-static int smctr_alloc_shared_memory(struct net_device *dev);
-
-/* B */
-static int smctr_bypass_state(struct net_device *dev);
-
-/* C */
-static int smctr_checksum_firmware(struct net_device *dev);
-static int __init smctr_chk_isa(struct net_device *dev);
-static int smctr_chg_rx_mask(struct net_device *dev);
-static int smctr_clear_int(struct net_device *dev);
-static int smctr_clear_trc_reset(int ioaddr);
-static int smctr_close(struct net_device *dev);
-
-/* D */
-static int smctr_decode_firmware(struct net_device *dev,
-                                 const struct firmware *fw);
-static int smctr_disable_16bit(struct net_device *dev);
-static int smctr_disable_adapter_ctrl_store(struct net_device *dev);
-static int smctr_disable_bic_int(struct net_device *dev);
-
-/* E */
-static int smctr_enable_16bit(struct net_device *dev);
-static int smctr_enable_adapter_ctrl_store(struct net_device *dev);
-static int smctr_enable_adapter_ram(struct net_device *dev);
-static int smctr_enable_bic_int(struct net_device *dev);
-
-/* G */
-static int __init smctr_get_boardid(struct net_device *dev, int mca);
-static int smctr_get_group_address(struct net_device *dev);
-static int smctr_get_functional_address(struct net_device *dev);
-static unsigned int smctr_get_num_rx_bdbs(struct net_device *dev);
-static int smctr_get_physical_drop_number(struct net_device *dev);
-static __u8 *smctr_get_rx_pointer(struct net_device *dev, short queue);
-static int smctr_get_station_id(struct net_device *dev);
-static FCBlock *smctr_get_tx_fcb(struct net_device *dev, __u16 queue,
-        __u16 bytes_count);
-static int smctr_get_upstream_neighbor_addr(struct net_device *dev);
-
-/* H */
-static int smctr_hardware_send_packet(struct net_device *dev,
-        struct net_local *tp);
-/* I */
-static int smctr_init_acbs(struct net_device *dev);
-static int smctr_init_adapter(struct net_device *dev);
-static int smctr_init_card_real(struct net_device *dev);
-static int smctr_init_rx_bdbs(struct net_device *dev);
-static int smctr_init_rx_fcbs(struct net_device *dev);
-static int smctr_init_shared_memory(struct net_device *dev);
-static int smctr_init_tx_bdbs(struct net_device *dev);
-static int smctr_init_tx_fcbs(struct net_device *dev);
-static int smctr_internal_self_test(struct net_device *dev);
-static irqreturn_t smctr_interrupt(int irq, void *dev_id);
-static int smctr_issue_enable_int_cmd(struct net_device *dev,
-        __u16 interrupt_enable_mask);
-static int smctr_issue_int_ack(struct net_device *dev, __u16 iack_code,
-        __u16 ibits);
-static int smctr_issue_init_timers_cmd(struct net_device *dev);
-static int smctr_issue_init_txrx_cmd(struct net_device *dev);
-static int smctr_issue_insert_cmd(struct net_device *dev);
-static int smctr_issue_read_ring_status_cmd(struct net_device *dev);
-static int smctr_issue_read_word_cmd(struct net_device *dev, __u16 aword_cnt);
-static int smctr_issue_remove_cmd(struct net_device *dev);
-static int smctr_issue_resume_acb_cmd(struct net_device *dev);
-static int smctr_issue_resume_rx_bdb_cmd(struct net_device *dev, __u16 queue);
-static int smctr_issue_resume_rx_fcb_cmd(struct net_device *dev, __u16 queue);
-static int smctr_issue_resume_tx_fcb_cmd(struct net_device *dev, __u16 queue);
-static int smctr_issue_test_internal_rom_cmd(struct net_device *dev);
-static int smctr_issue_test_hic_cmd(struct net_device *dev);
-static int smctr_issue_test_mac_reg_cmd(struct net_device *dev);
-static int smctr_issue_trc_loopback_cmd(struct net_device *dev);
-static int smctr_issue_tri_loopback_cmd(struct net_device *dev);
-static int smctr_issue_write_byte_cmd(struct net_device *dev,
-        short aword_cnt, void *byte);
-static int smctr_issue_write_word_cmd(struct net_device *dev,
-        short aword_cnt, void *word);
-
-/* J */
-static int smctr_join_complete_state(struct net_device *dev);
-
-/* L */
-static int smctr_link_tx_fcbs_to_bdbs(struct net_device *dev);
-static int smctr_load_firmware(struct net_device *dev);
-static int smctr_load_node_addr(struct net_device *dev);
-static int smctr_lobe_media_test(struct net_device *dev);
-static int smctr_lobe_media_test_cmd(struct net_device *dev);
-static int smctr_lobe_media_test_state(struct net_device *dev);
-
-/* M */
-static int smctr_make_8025_hdr(struct net_device *dev,
-        MAC_HEADER *rmf, MAC_HEADER *tmf, __u16 ac_fc);
-static int smctr_make_access_pri(struct net_device *dev,
-        MAC_SUB_VECTOR *tsv);
-static int smctr_make_addr_mod(struct net_device *dev, MAC_SUB_VECTOR *tsv);
-static int smctr_make_auth_funct_class(struct net_device *dev,
-        MAC_SUB_VECTOR *tsv);
-static int smctr_make_corr(struct net_device *dev,
-        MAC_SUB_VECTOR *tsv, __u16 correlator);
-static int smctr_make_funct_addr(struct net_device *dev,
-        MAC_SUB_VECTOR *tsv);
-static int smctr_make_group_addr(struct net_device *dev,
-        MAC_SUB_VECTOR *tsv);
-static int smctr_make_phy_drop_num(struct net_device *dev,
-        MAC_SUB_VECTOR *tsv);
-static int smctr_make_product_id(struct net_device *dev, MAC_SUB_VECTOR *tsv);
-static int smctr_make_station_id(struct net_device *dev, MAC_SUB_VECTOR *tsv);
-static int smctr_make_ring_station_status(struct net_device *dev,
-        MAC_SUB_VECTOR *tsv);
-static int smctr_make_ring_station_version(struct net_device *dev,
-        MAC_SUB_VECTOR *tsv);
-static int smctr_make_tx_status_code(struct net_device *dev,
-        MAC_SUB_VECTOR *tsv, __u16 tx_fstatus);
-static int smctr_make_upstream_neighbor_addr(struct net_device *dev,
-        MAC_SUB_VECTOR *tsv);
-static int smctr_make_wrap_data(struct net_device *dev,
-        MAC_SUB_VECTOR *tsv);
-
-/* O */
-static int smctr_open(struct net_device *dev);
-static int smctr_open_tr(struct net_device *dev);
-
-/* P */
-struct net_device *smctr_probe(int unit);
-static int __init smctr_probe1(struct net_device *dev, int ioaddr);
-static int smctr_process_rx_packet(MAC_HEADER *rmf, __u16 size,
-        struct net_device *dev, __u16 rx_status);
-
-/* R */
-static int smctr_ram_memory_test(struct net_device *dev);
-static int smctr_rcv_chg_param(struct net_device *dev, MAC_HEADER *rmf,
-        __u16 *correlator);
-static int smctr_rcv_init(struct net_device *dev, MAC_HEADER *rmf,
-        __u16 *correlator);
-static int smctr_rcv_tx_forward(struct net_device *dev, MAC_HEADER *rmf);
-static int smctr_rcv_rq_addr_state_attch(struct net_device *dev,
-        MAC_HEADER *rmf, __u16 *correlator);
-static int smctr_rcv_unknown(struct net_device *dev, MAC_HEADER *rmf,
-        __u16 *correlator);
-static int smctr_reset_adapter(struct net_device *dev);
-static int smctr_restart_tx_chain(struct net_device *dev, short queue);
-static int smctr_ring_status_chg(struct net_device *dev);
-static int smctr_rx_frame(struct net_device *dev);
-
-/* S */
-static int smctr_send_dat(struct net_device *dev);
-static netdev_tx_t smctr_send_packet(struct sk_buff *skb,
-                                           struct net_device *dev);
-static int smctr_send_lobe_media_test(struct net_device *dev);
-static int smctr_send_rpt_addr(struct net_device *dev, MAC_HEADER *rmf,
-        __u16 correlator);
-static int smctr_send_rpt_attch(struct net_device *dev, MAC_HEADER *rmf,
-        __u16 correlator);
-static int smctr_send_rpt_state(struct net_device *dev, MAC_HEADER *rmf,
-        __u16 correlator);
-static int smctr_send_rpt_tx_forward(struct net_device *dev,
-        MAC_HEADER *rmf, __u16 tx_fstatus);
-static int smctr_send_rsp(struct net_device *dev, MAC_HEADER *rmf,
-        __u16 rcode, __u16 correlator);
-static int smctr_send_rq_init(struct net_device *dev);
-static int smctr_send_tx_forward(struct net_device *dev, MAC_HEADER *rmf,
-        __u16 *tx_fstatus);
-static int smctr_set_auth_access_pri(struct net_device *dev,
-        MAC_SUB_VECTOR *rsv);
-static int smctr_set_auth_funct_class(struct net_device *dev,
-        MAC_SUB_VECTOR *rsv);
-static int smctr_set_corr(struct net_device *dev, MAC_SUB_VECTOR *rsv,
-        __u16 *correlator);
-static int smctr_set_error_timer_value(struct net_device *dev,
-        MAC_SUB_VECTOR *rsv);
-static int smctr_set_frame_forward(struct net_device *dev,
-        MAC_SUB_VECTOR *rsv, __u8 dc_sc);
-static int smctr_set_local_ring_num(struct net_device *dev,
-        MAC_SUB_VECTOR *rsv);
-static unsigned short smctr_set_ctrl_attention(struct net_device *dev);
-static void smctr_set_multicast_list(struct net_device *dev);
-static int smctr_set_page(struct net_device *dev, __u8 *buf);
-static int smctr_set_phy_drop(struct net_device *dev,
-        MAC_SUB_VECTOR *rsv);
-static int smctr_set_ring_speed(struct net_device *dev);
-static int smctr_set_rx_look_ahead(struct net_device *dev);
-static int smctr_set_trc_reset(int ioaddr);
-static int smctr_setup_single_cmd(struct net_device *dev,
-        __u16 command, __u16 subcommand);
-static int smctr_setup_single_cmd_w_data(struct net_device *dev,
-        __u16 command, __u16 subcommand);
-static char *smctr_malloc(struct net_device *dev, __u16 size);
-static int smctr_status_chg(struct net_device *dev);
-
-/* T */
-static void smctr_timeout(struct net_device *dev);
-static int smctr_trc_send_packet(struct net_device *dev, FCBlock *fcb,
-        __u16 queue);
-static __u16 smctr_tx_complete(struct net_device *dev, __u16 queue);
-static unsigned short smctr_tx_move_frame(struct net_device *dev,
-        struct sk_buff *skb, __u8 *pbuff, unsigned int bytes);
-
-/* U */
-static int smctr_update_err_stats(struct net_device *dev);
-static int smctr_update_rx_chain(struct net_device *dev, __u16 queue);
-static int smctr_update_tx_chain(struct net_device *dev, FCBlock *fcb,
-        __u16 queue);
-
-/* W */
-static int smctr_wait_cmd(struct net_device *dev);
-static int smctr_wait_while_cbusy(struct net_device *dev);
-
-#define TO_256_BYTE_BOUNDRY(X)  (((X + 0xff) & 0xff00) - X)
-#define TO_PARAGRAPH_BOUNDRY(X) (((X + 0x0f) & 0xfff0) - X)
-#define PARAGRAPH_BOUNDRY(X)    smctr_malloc(dev, TO_PARAGRAPH_BOUNDRY(X))
-
-/* Allocate Adapter Shared Memory.
- * IMPORTANT NOTE: Any changes to this function MUST be mirrored in the
- * function "get_num_rx_bdbs" below!!!
- *
- * Order of memory allocation:
- *
- *       0. Initial System Configuration Block Pointer
- *       1. System Configuration Block
- *       2. System Control Block
- *       3. Action Command Block
- *       4. Interrupt Status Block
- *
- *       5. MAC TX FCB'S
- *       6. NON-MAC TX FCB'S
- *       7. MAC TX BDB'S
- *       8. NON-MAC TX BDB'S
- *       9. MAC RX FCB'S
- *      10. NON-MAC RX FCB'S
- *      11. MAC RX BDB'S
- *      12. NON-MAC RX BDB'S
- *      13. MAC TX Data Buffer( 1, 256 byte buffer)
- *      14. MAC RX Data Buffer( 1, 256 byte buffer)
- *
- *      15. NON-MAC TX Data Buffer
- *      16. NON-MAC RX Data Buffer
- */
-static int smctr_alloc_shared_memory(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_alloc_shared_memory\n", dev->name);
-
-        /* Allocate initial System Control Block pointer.
-         * This pointer is located in the last page, last offset - 4.
-         */
-        tp->iscpb_ptr = (ISCPBlock *)(tp->ram_access + ((__u32)64 * 0x400)
-                - (long)ISCP_BLOCK_SIZE);
-
-        /* Allocate System Control Blocks. */
-        tp->scgb_ptr = (SCGBlock *)smctr_malloc(dev, sizeof(SCGBlock));
-        PARAGRAPH_BOUNDRY(tp->sh_mem_used);
-
-        tp->sclb_ptr = (SCLBlock *)smctr_malloc(dev, sizeof(SCLBlock));
-        PARAGRAPH_BOUNDRY(tp->sh_mem_used);
-
-        tp->acb_head = (ACBlock *)smctr_malloc(dev,
-                sizeof(ACBlock)*tp->num_acbs);
-        PARAGRAPH_BOUNDRY(tp->sh_mem_used);
-
-        tp->isb_ptr = (ISBlock *)smctr_malloc(dev, sizeof(ISBlock));
-        PARAGRAPH_BOUNDRY(tp->sh_mem_used);
-
-        tp->misc_command_data = (__u16 *)smctr_malloc(dev, MISC_DATA_SIZE);
-        PARAGRAPH_BOUNDRY(tp->sh_mem_used);
-
-        /* Allocate transmit FCBs. */
-        tp->tx_fcb_head[MAC_QUEUE] = (FCBlock *)smctr_malloc(dev,
-                sizeof(FCBlock) * tp->num_tx_fcbs[MAC_QUEUE]);
-
-        tp->tx_fcb_head[NON_MAC_QUEUE] = (FCBlock *)smctr_malloc(dev,
-                sizeof(FCBlock) * tp->num_tx_fcbs[NON_MAC_QUEUE]);
-
-        tp->tx_fcb_head[BUG_QUEUE] = (FCBlock *)smctr_malloc(dev,
-                sizeof(FCBlock) * tp->num_tx_fcbs[BUG_QUEUE]);
-
-        /* Allocate transmit BDBs. */
-        tp->tx_bdb_head[MAC_QUEUE] = (BDBlock *)smctr_malloc(dev,
-                sizeof(BDBlock) * tp->num_tx_bdbs[MAC_QUEUE]);
-
-        tp->tx_bdb_head[NON_MAC_QUEUE] = (BDBlock *)smctr_malloc(dev,
-                sizeof(BDBlock) * tp->num_tx_bdbs[NON_MAC_QUEUE]);
-
-        tp->tx_bdb_head[BUG_QUEUE] = (BDBlock *)smctr_malloc(dev,
-                sizeof(BDBlock) * tp->num_tx_bdbs[BUG_QUEUE]);
-
-        /* Allocate receive FCBs. */
-        tp->rx_fcb_head[MAC_QUEUE] = (FCBlock *)smctr_malloc(dev,
-                sizeof(FCBlock) * tp->num_rx_fcbs[MAC_QUEUE]);
-
-        tp->rx_fcb_head[NON_MAC_QUEUE] = (FCBlock *)smctr_malloc(dev,
-                sizeof(FCBlock) * tp->num_rx_fcbs[NON_MAC_QUEUE]);
-
-        /* Allocate receive BDBs. */
-        tp->rx_bdb_head[MAC_QUEUE] = (BDBlock *)smctr_malloc(dev,
-                sizeof(BDBlock) * tp->num_rx_bdbs[MAC_QUEUE]);
-
-        tp->rx_bdb_end[MAC_QUEUE] = (BDBlock *)smctr_malloc(dev, 0);
-
-        tp->rx_bdb_head[NON_MAC_QUEUE] = (BDBlock *)smctr_malloc(dev,
-                sizeof(BDBlock) * tp->num_rx_bdbs[NON_MAC_QUEUE]);
-
-        tp->rx_bdb_end[NON_MAC_QUEUE] = (BDBlock *)smctr_malloc(dev, 0);
-
-        /* Allocate MAC transmit buffers.
-         * MAC Tx Buffers doen't have to be on an ODD Boundary.
-         */
-        tp->tx_buff_head[MAC_QUEUE]
-                = (__u16 *)smctr_malloc(dev, tp->tx_buff_size[MAC_QUEUE]);
-        tp->tx_buff_curr[MAC_QUEUE] = tp->tx_buff_head[MAC_QUEUE];
-        tp->tx_buff_end [MAC_QUEUE] = (__u16 *)smctr_malloc(dev, 0);
-
-        /* Allocate BUG transmit buffers. */
-        tp->tx_buff_head[BUG_QUEUE]
-                = (__u16 *)smctr_malloc(dev, tp->tx_buff_size[BUG_QUEUE]);
-        tp->tx_buff_curr[BUG_QUEUE] = tp->tx_buff_head[BUG_QUEUE];
-        tp->tx_buff_end[BUG_QUEUE] = (__u16 *)smctr_malloc(dev, 0);
-
-        /* Allocate MAC receive data buffers.
-         * MAC Rx buffer doesn't have to be on a 256 byte boundary.
-         */
-        tp->rx_buff_head[MAC_QUEUE] = (__u16 *)smctr_malloc(dev,
-                RX_DATA_BUFFER_SIZE * tp->num_rx_bdbs[MAC_QUEUE]);
-        tp->rx_buff_end[MAC_QUEUE] = (__u16 *)smctr_malloc(dev, 0);
-
-        /* Allocate Non-MAC transmit buffers.
-         * ?? For maximum Netware performance, put Tx Buffers on
-         * ODD Boundary and then restore malloc to Even Boundrys.
-         */
-        smctr_malloc(dev, 1L);
-        tp->tx_buff_head[NON_MAC_QUEUE]
-                = (__u16 *)smctr_malloc(dev, tp->tx_buff_size[NON_MAC_QUEUE]);
-        tp->tx_buff_curr[NON_MAC_QUEUE] = tp->tx_buff_head[NON_MAC_QUEUE];
-        tp->tx_buff_end [NON_MAC_QUEUE] = (__u16 *)smctr_malloc(dev, 0);
-        smctr_malloc(dev, 1L);
-
-        /* Allocate Non-MAC receive data buffers.
-         * To guarantee a minimum of 256 contiguous memory to
-         * UM_Receive_Packet's lookahead pointer, before a page
-         * change or ring end is encountered, place each rx buffer on
-         * a 256 byte boundary.
-         */
-        smctr_malloc(dev, TO_256_BYTE_BOUNDRY(tp->sh_mem_used));
-        tp->rx_buff_head[NON_MAC_QUEUE] = (__u16 *)smctr_malloc(dev,
-                RX_DATA_BUFFER_SIZE * tp->num_rx_bdbs[NON_MAC_QUEUE]);
-        tp->rx_buff_end[NON_MAC_QUEUE] = (__u16 *)smctr_malloc(dev, 0);
-
-        return 0;
-}
-
-/* Enter Bypass state. */
-static int smctr_bypass_state(struct net_device *dev)
-{
-        int err;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_bypass_state\n", dev->name);
-
-        err = smctr_setup_single_cmd(dev, ACB_CMD_CHANGE_JOIN_STATE, JS_BYPASS_STATE);
-
-        return err;
-}
-
-static int smctr_checksum_firmware(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        __u16 i, checksum = 0;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_checksum_firmware\n", dev->name);
-
-        smctr_enable_adapter_ctrl_store(dev);
-
-        for(i = 0; i < CS_RAM_SIZE; i += 2)
-                checksum += *((__u16 *)(tp->ram_access + i));
-
-        tp->microcode_version = *(__u16 *)(tp->ram_access
-                + CS_RAM_VERSION_OFFSET);
-        tp->microcode_version >>= 8;
-
-        smctr_disable_adapter_ctrl_store(dev);
-
-        if(checksum)
-                return checksum;
-
-        return 0;
-}
-
-static int __init smctr_chk_mca(struct net_device *dev)
-{
-#ifdef CONFIG_MCA_LEGACY
-        struct net_local *tp = netdev_priv(dev);
-        int current_slot;
-        __u8 r1, r2, r3, r4, r5;
-
-        current_slot = mca_find_unused_adapter(smctr_posid, 0);
-        if(current_slot == MCA_NOTFOUND)
-                return -ENODEV;
-
-        mca_set_adapter_name(current_slot, smctr_name);
-        mca_mark_as_used(current_slot);
-        tp->slot_num = current_slot;
-
-        r1 = mca_read_stored_pos(tp->slot_num, 2);
-        r2 = mca_read_stored_pos(tp->slot_num, 3);
-
-        if(tp->slot_num)
-                outb(CNFG_POS_CONTROL_REG, (__u8)((tp->slot_num - 1) | CNFG_SLOT_ENABLE_BIT));
-        else
-                outb(CNFG_POS_CONTROL_REG, (__u8)((tp->slot_num) | CNFG_SLOT_ENABLE_BIT));
-
-        r1 = inb(CNFG_POS_REG1);
-        r2 = inb(CNFG_POS_REG0);
-
-        tp->bic_type = BIC_594_CHIP;
-
-        /* IO */
-        r2 = mca_read_stored_pos(tp->slot_num, 2);
-        r2 &= 0xF0;
-        dev->base_addr = ((__u16)r2 << 8) + (__u16)0x800;
-        request_region(dev->base_addr, SMCTR_IO_EXTENT, smctr_name);
-
-        /* IRQ */
-        r5 = mca_read_stored_pos(tp->slot_num, 5);
-        r5 &= 0xC;
-        switch(r5)
-        {
-                case 0:
-                        dev->irq = 3;
-                        break;
-
-                case 0x4:
-                        dev->irq = 4;
-                        break;
-
-                case 0x8:
-                        dev->irq = 10;
-                        break;
-
-                default:
-                        dev->irq = 15;
-                        break;
-        }
-        if (request_irq(dev->irq, smctr_interrupt, IRQF_SHARED, smctr_name, dev)) {
-                release_region(dev->base_addr, SMCTR_IO_EXTENT);
-                return -ENODEV;
-        }
-
-        /* Get RAM base */
-        r3 = mca_read_stored_pos(tp->slot_num, 3);
-        tp->ram_base = ((__u32)(r3 & 0x7) << 13) + 0x0C0000;
-        if (r3 & 0x8)
-                tp->ram_base += 0x010000;
-        if (r3 & 0x80)
-                tp->ram_base += 0xF00000;
-
-        /* Get Ram Size */
-        r3 &= 0x30;
-        r3 >>= 4;
-
-        tp->ram_usable = (__u16)CNFG_SIZE_8KB << r3;
-        tp->ram_size = (__u16)CNFG_SIZE_64KB;
-        tp->board_id |= TOKEN_MEDIA;
-
-        r4 = mca_read_stored_pos(tp->slot_num, 4);
-        tp->rom_base = ((__u32)(r4 & 0x7) << 13) + 0x0C0000;
-        if (r4 & 0x8)
-                tp->rom_base += 0x010000;
-
-        /* Get ROM size. */
-        r4 >>= 4;
-        switch (r4) {
-                case 0:
-                        tp->rom_size = CNFG_SIZE_8KB;
-                        break;
-                case 1:
-                        tp->rom_size = CNFG_SIZE_16KB;
-                        break;
-                case 2:
-                        tp->rom_size = CNFG_SIZE_32KB;
-                        break;
-                default:
-                        tp->rom_size = ROM_DISABLE;
-        }
-
-        /* Get Media Type. */
-        r5 = mca_read_stored_pos(tp->slot_num, 5);
-        r5 &= CNFG_MEDIA_TYPE_MASK;
-        switch(r5)
-        {
-                case (0):
-                        tp->media_type = MEDIA_STP_4;
-                        break;
-
-                case (1):
-                        tp->media_type = MEDIA_STP_16;
-                        break;
-
-                case (3):
-                        tp->media_type = MEDIA_UTP_16;
-                        break;
-
-                default:
-                        tp->media_type = MEDIA_UTP_4;
-                        break;
-        }
-        tp->media_menu = 14;
-
-        r2 = mca_read_stored_pos(tp->slot_num, 2);
-        if(!(r2 & 0x02))
-                tp->mode_bits |= EARLY_TOKEN_REL;
-
-        /* Disable slot */
-        outb(CNFG_POS_CONTROL_REG, 0);
-
-        tp->board_id = smctr_get_boardid(dev, 1);
-        switch(tp->board_id & 0xffff)
-        {
-                case WD8115TA:
-                        smctr_model = "8115T/A";
-                        break;
-
-                case WD8115T:
-                        if(tp->extra_info & CHIP_REV_MASK)
-                                smctr_model = "8115T rev XE";
-                        else
-                                smctr_model = "8115T rev XD";
-                        break;
-
-                default:
-                        smctr_model = "Unknown";
-                        break;
-        }
-
-        return 0;
-#else
-        return -1;
-#endif /* CONFIG_MCA_LEGACY */
-}
-
-static int smctr_chg_rx_mask(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int err = 0;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_chg_rx_mask\n", dev->name);
-
-        smctr_enable_16bit(dev);
-        smctr_set_page(dev, (__u8 *)tp->ram_access);
-
-        if(tp->mode_bits & LOOPING_MODE_MASK)
-                tp->config_word0 |= RX_OWN_BIT;
-        else
-                tp->config_word0 &= ~RX_OWN_BIT;
-
-        if(tp->receive_mask & PROMISCUOUS_MODE)
-                tp->config_word0 |= PROMISCUOUS_BIT;
-        else
-                tp->config_word0 &= ~PROMISCUOUS_BIT;
-
-        if(tp->receive_mask & ACCEPT_ERR_PACKETS)
-                tp->config_word0 |= SAVBAD_BIT;
-        else
-                tp->config_word0 &= ~SAVBAD_BIT;
-
-        if(tp->receive_mask & ACCEPT_ATT_MAC_FRAMES)
-                tp->config_word0 |= RXATMAC;
-        else
-                tp->config_word0 &= ~RXATMAC;
-
-        if(tp->receive_mask & ACCEPT_MULTI_PROM)
-                tp->config_word1 |= MULTICAST_ADDRESS_BIT;
-        else
-                tp->config_word1 &= ~MULTICAST_ADDRESS_BIT;
-
-        if(tp->receive_mask & ACCEPT_SOURCE_ROUTING_SPANNING)
-                tp->config_word1 |= SOURCE_ROUTING_SPANNING_BITS;
-        else
-        {
-                if(tp->receive_mask & ACCEPT_SOURCE_ROUTING)
-                        tp->config_word1 |= SOURCE_ROUTING_EXPLORER_BIT;
-                else
-                        tp->config_word1 &= ~SOURCE_ROUTING_SPANNING_BITS;
-        }
-
-        if((err = smctr_issue_write_word_cmd(dev, RW_CONFIG_REGISTER_0,
-                &tp->config_word0)))
-        {
-                return err;
-        }
-
-        if((err = smctr_issue_write_word_cmd(dev, RW_CONFIG_REGISTER_1,
-                &tp->config_word1)))
-        {
-                return err;
-        }
-
-        smctr_disable_16bit(dev);
-
-        return 0;
-}
-
-static int smctr_clear_int(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        outb((tp->trc_mask | CSR_CLRTINT), dev->base_addr + CSR);
-
-        return 0;
-}
-
-static int smctr_clear_trc_reset(int ioaddr)
-{
-        __u8 r;
-
-        r = inb(ioaddr + MSR);
-        outb(~MSR_RST & r, ioaddr + MSR);
-
-        return 0;
-}
-
-/*
- * The inverse routine to smctr_open().
- */
-static int smctr_close(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        struct sk_buff *skb;
-        int err;
-
-        netif_stop_queue(dev);
-        
-        tp->cleanup = 1;
-
-        /* Check to see if adapter is already in a closed state. */
-        if(tp->status != OPEN)
-                return 0;
-
-        smctr_enable_16bit(dev);
-        smctr_set_page(dev, (__u8 *)tp->ram_access);
-
-        if((err = smctr_issue_remove_cmd(dev)))
-        {
-                smctr_disable_16bit(dev);
-                return err;
-        }
-
-        for(;;)
-        {
-                skb = skb_dequeue(&tp->SendSkbQueue);
-                if(skb == NULL)
-                        break;
-                tp->QueueSkb++;
-                dev_kfree_skb(skb);
-        }
-
-
-        return 0;
-}
-
-static int smctr_decode_firmware(struct net_device *dev,
-                                 const struct firmware *fw)
-{
-        struct net_local *tp = netdev_priv(dev);
-        short bit = 0x80, shift = 12;
-        DECODE_TREE_NODE *tree;
-        short branch, tsize;
-        __u16 buff = 0;
-        long weight;
-        __u8 *ucode;
-        __u16 *mem;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_decode_firmware\n", dev->name);
-
-        weight  = *(long *)(fw->data + WEIGHT_OFFSET);
-        tsize   = *(__u8 *)(fw->data + TREE_SIZE_OFFSET);
-        tree    = (DECODE_TREE_NODE *)(fw->data + TREE_OFFSET);
-        ucode   = (__u8 *)(fw->data + TREE_OFFSET
-                        + (tsize * sizeof(DECODE_TREE_NODE)));
-        mem     = (__u16 *)(tp->ram_access);
-
-        while(weight)
-        {
-                branch = ROOT;
-                while((tree + branch)->tag != LEAF && weight)
-                {
-                        branch = *ucode & bit ? (tree + branch)->llink
-                                : (tree + branch)->rlink;
-
-                        bit >>= 1;
-                        weight--;
-
-                        if(bit == 0)
-                        {
-                                bit = 0x80;
-                                ucode++;
-                        }
-                }
-
-                buff |= (tree + branch)->info << shift;
-                shift -= 4;
-
-                if(shift < 0)
-                {
-                        *(mem++) = SWAP_BYTES(buff);
-                        buff    = 0;
-                        shift   = 12;
-                }
-        }
-
-        /* The following assumes the Control Store Memory has
-         * been initialized to zero. If the last partial word
-         * is zero, it will not be written.
-         */
-        if(buff)
-                *(mem++) = SWAP_BYTES(buff);
-
-        return 0;
-}
-
-static int smctr_disable_16bit(struct net_device *dev)
-{
-        return 0;
-}
-
-/*
- * On Exit, Adapter is:
- * 1. TRC is in a reset state and un-initialized.
- * 2. Adapter memory is enabled.
- * 3. Control Store memory is out of context (-WCSS is 1).
- */
-static int smctr_disable_adapter_ctrl_store(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int ioaddr = dev->base_addr;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_disable_adapter_ctrl_store\n", dev->name);
-
-        tp->trc_mask |= CSR_WCSS;
-        outb(tp->trc_mask, ioaddr + CSR);
-
-        return 0;
-}
-
-static int smctr_disable_bic_int(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int ioaddr = dev->base_addr;
-
-        tp->trc_mask = CSR_MSK_ALL | CSR_MSKCBUSY
-                | CSR_MSKTINT | CSR_WCSS;
-        outb(tp->trc_mask, ioaddr + CSR);
-
-        return 0;
-}
-
-static int smctr_enable_16bit(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        __u8    r;
-
-        if(tp->adapter_bus == BUS_ISA16_TYPE)
-        {
-                r = inb(dev->base_addr + LAAR);
-                outb((r | LAAR_MEM16ENB), dev->base_addr + LAAR);
-        }
-
-        return 0;
-}
-
-/*
- * To enable the adapter control store memory:
- * 1. Adapter must be in a RESET state.
- * 2. Adapter memory must be enabled.
- * 3. Control Store Memory is in context (-WCSS is 0).
- */
-static int smctr_enable_adapter_ctrl_store(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int ioaddr = dev->base_addr;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_enable_adapter_ctrl_store\n", dev->name);
-
-        smctr_set_trc_reset(ioaddr);
-        smctr_enable_adapter_ram(dev);
-
-        tp->trc_mask &= ~CSR_WCSS;
-        outb(tp->trc_mask, ioaddr + CSR);
-
-        return 0;
-}
-
-static int smctr_enable_adapter_ram(struct net_device *dev)
-{
-        int ioaddr = dev->base_addr;
-        __u8 r;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_enable_adapter_ram\n", dev->name);
-
-        r = inb(ioaddr + MSR);
-        outb(MSR_MEMB | r, ioaddr + MSR);
-
-        return 0;
-}
-
-static int smctr_enable_bic_int(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int ioaddr = dev->base_addr;
-        __u8 r;
-
-        switch(tp->bic_type)
-        {
-                case (BIC_584_CHIP):
-                        tp->trc_mask = CSR_MSKCBUSY | CSR_WCSS;
-                        outb(tp->trc_mask, ioaddr + CSR);
-                        r = inb(ioaddr + IRR);
-                        outb(r | IRR_IEN, ioaddr + IRR);
-                        break;
-
-                case (BIC_594_CHIP):
-                        tp->trc_mask = CSR_MSKCBUSY | CSR_WCSS;
-                        outb(tp->trc_mask, ioaddr + CSR);
-                        r = inb(ioaddr + IMCCR);
-                        outb(r | IMCCR_EIL, ioaddr + IMCCR);
-                        break;
-        }
-
-        return 0;
-}
-
-static int __init smctr_chk_isa(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int ioaddr = dev->base_addr;
-        __u8 r1, r2, b, chksum = 0;
-        __u16 r;
-        int i;
-        int err = -ENODEV;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_chk_isa %#4x\n", dev->name, ioaddr);
-
-        if((ioaddr & 0x1F) != 0)
-                goto out;
-
-        /* Grab the region so that no one else tries to probe our ioports. */
-        if (!request_region(ioaddr, SMCTR_IO_EXTENT, smctr_name)) {
-                err = -EBUSY;
-                goto out;
-        }
-
-        /* Checksum SMC node address */
-        for(i = 0; i < 8; i++)
-        {
-                b = inb(ioaddr + LAR0 + i);
-                chksum += b;
-        }
-
-        if (chksum != NODE_ADDR_CKSUM)
-                goto out2;
-
-        b = inb(ioaddr + BDID);
-        if(b != BRD_ID_8115T)
-        {
-                printk(KERN_ERR "%s: The adapter found is not supported\n", dev->name);
-                goto out2;
-        }
-
-        /* Check for 8115T Board ID */
-        r2 = 0;
-        for(r = 0; r < 8; r++)
-        {
-            r1 = inb(ioaddr + 0x8 + r);
-            r2 += r1;
-        }
-
-        /* value of RegF adds up the sum to 0xFF */
-        if((r2 != 0xFF) && (r2 != 0xEE))
-                goto out2;
-
-        /* Get adapter ID */
-        tp->board_id = smctr_get_boardid(dev, 0);
-        switch(tp->board_id & 0xffff)
-        {
-                case WD8115TA:
-                        smctr_model = "8115T/A";
-                        break;
-
-                case WD8115T:
-                        if(tp->extra_info & CHIP_REV_MASK)
-                                smctr_model = "8115T rev XE";
-                        else
-                                smctr_model = "8115T rev XD";
-                        break;
-
-                default:
-                        smctr_model = "Unknown";
-                        break;
-        }
-
-        /* Store BIC type. */
-        tp->bic_type = BIC_584_CHIP;
-        tp->nic_type = NIC_825_CHIP;
-
-        /* Copy Ram Size */
-        tp->ram_usable  = CNFG_SIZE_16KB;
-        tp->ram_size    = CNFG_SIZE_64KB;
-
-        /* Get 58x Ram Base */
-        r1 = inb(ioaddr);
-        r1 &= 0x3F;
-
-        r2 = inb(ioaddr + CNFG_LAAR_584);
-        r2 &= CNFG_LAAR_MASK;
-        r2 <<= 3;
-        r2 |= ((r1 & 0x38) >> 3);
-
-        tp->ram_base = ((__u32)r2 << 16) + (((__u32)(r1 & 0x7)) << 13);
-
-        /* Get 584 Irq */
-        r1 = 0;
-        r1 = inb(ioaddr + CNFG_ICR_583);
-        r1 &= CNFG_ICR_IR2_584;
-
-        r2 = inb(ioaddr + CNFG_IRR_583);
-        r2 &= CNFG_IRR_IRQS;     /* 0x60 */
-        r2 >>= 5;
-
-        switch(r2)
-        {
-                case 0:
-                        if(r1 == 0)
-                                dev->irq = 2;
-                        else
-                                dev->irq = 10;
-                        break;
-
-                case 1:
-                        if(r1 == 0)
-                                dev->irq = 3;
-                        else
-                                dev->irq = 11;
-                        break;
-
-                case 2:
-                        if(r1 == 0)
-                        {
-                                if(tp->extra_info & ALTERNATE_IRQ_BIT)
-                                        dev->irq = 5;
-                                else
-                                        dev->irq = 4;
-                        }
-                        else
-                                dev->irq = 15;
-                        break;
-
-                case 3:
-                        if(r1 == 0)
-                                dev->irq = 7;
-                        else
-                                dev->irq = 4;
-                        break;
-
-                default:
-                        printk(KERN_ERR "%s: No IRQ found aborting\n", dev->name);
-                        goto out2;
-         }
-
-        if (request_irq(dev->irq, smctr_interrupt, IRQF_SHARED, smctr_name, dev))
-                goto out2;
-
-        /* Get 58x Rom Base */
-        r1 = inb(ioaddr + CNFG_BIO_583);
-        r1 &= 0x3E;
-        r1 |= 0x40;
-
-        tp->rom_base = (__u32)r1 << 13;
-
-        /* Get 58x Rom Size */
-        r1 = inb(ioaddr + CNFG_BIO_583);
-        r1 &= 0xC0;
-        if(r1 == 0)
-                tp->rom_size = ROM_DISABLE;
-        else
-        {
-                r1 >>= 6;
-                tp->rom_size = (__u16)CNFG_SIZE_8KB << r1;
-        }
-
-        /* Get 58x Boot Status */
-        r1 = inb(ioaddr + CNFG_GP2);
-
-        tp->mode_bits &= (~BOOT_STATUS_MASK);
-
-        if(r1 & CNFG_GP2_BOOT_NIBBLE)
-                tp->mode_bits |= BOOT_TYPE_1;
-
-        /* Get 58x Zero Wait State */
-        tp->mode_bits &= (~ZERO_WAIT_STATE_MASK);
-
-        r1 = inb(ioaddr + CNFG_IRR_583);
-
-        if(r1 & CNFG_IRR_ZWS)
-                 tp->mode_bits |= ZERO_WAIT_STATE_8_BIT;
-
-        if(tp->board_id & BOARD_16BIT)
-        {
-                r1 = inb(ioaddr + CNFG_LAAR_584);
-
-                if(r1 & CNFG_LAAR_ZWS)
-                        tp->mode_bits |= ZERO_WAIT_STATE_16_BIT;
-        }
-
-        /* Get 584 Media Menu */
-        tp->media_menu = 14;
-        r1 = inb(ioaddr + CNFG_IRR_583);
-
-        tp->mode_bits &= 0xf8ff;       /* (~CNFG_INTERFACE_TYPE_MASK) */
-        if((tp->board_id & TOKEN_MEDIA) == TOKEN_MEDIA)
-        {
-                /* Get Advanced Features */
-                if(((r1 & 0x6) >> 1) == 0x3)
-                        tp->media_type |= MEDIA_UTP_16;
-                else
-                {
-                        if(((r1 & 0x6) >> 1) == 0x2)
-                                tp->media_type |= MEDIA_STP_16;
-                        else
-                        {
-                                if(((r1 & 0x6) >> 1) == 0x1)
-                                        tp->media_type |= MEDIA_UTP_4;
-
-                                else
-                                        tp->media_type |= MEDIA_STP_4;
-                        }
-                }
-
-                r1 = inb(ioaddr + CNFG_GP2);
-                if(!(r1 & 0x2) )           /* GP2_ETRD */
-                        tp->mode_bits |= EARLY_TOKEN_REL;
-
-                /* see if the chip is corrupted
-                if(smctr_read_584_chksum(ioaddr))
-                {
-                        printk(KERN_ERR "%s: EEPROM Checksum Failure\n", dev->name);
-                        free_irq(dev->irq, dev);
-                        goto out2;
-                }
-                */
-        }
-
-        return 0;
-
-out2:
-        release_region(ioaddr, SMCTR_IO_EXTENT);
-out:
-        return err;
-}
-
-static int __init smctr_get_boardid(struct net_device *dev, int mca)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int ioaddr = dev->base_addr;
-        __u8 r, r1, IdByte;
-        __u16 BoardIdMask;
-
-        tp->board_id = BoardIdMask = 0;
-
-        if(mca)
-        {
-                BoardIdMask |= (MICROCHANNEL+INTERFACE_CHIP+TOKEN_MEDIA+PAGED_RAM+BOARD_16BIT);
-                tp->extra_info |= (INTERFACE_594_CHIP+RAM_SIZE_64K+NIC_825_BIT+ALTERNATE_IRQ_BIT+SLOT_16BIT);
-        }
-        else
-        {
-                BoardIdMask|=(INTERFACE_CHIP+TOKEN_MEDIA+PAGED_RAM+BOARD_16BIT);
-                tp->extra_info |= (INTERFACE_584_CHIP + RAM_SIZE_64K
-                        + NIC_825_BIT + ALTERNATE_IRQ_BIT);
-        }
-
-        if(!mca)
-        {
-                r = inb(ioaddr + BID_REG_1);
-                r &= 0x0c;
-                outb(r, ioaddr + BID_REG_1);
-                r = inb(ioaddr + BID_REG_1);
-
-                if(r & BID_SIXTEEN_BIT_BIT)
-                {
-                        tp->extra_info |= SLOT_16BIT;
-                        tp->adapter_bus = BUS_ISA16_TYPE;
-                }
-                else
-                        tp->adapter_bus = BUS_ISA8_TYPE;
-        }
-        else
-                tp->adapter_bus = BUS_MCA_TYPE;
-
-        /* Get Board Id Byte */
-        IdByte = inb(ioaddr + BID_BOARD_ID_BYTE);
-
-        /* if Major version > 1.0 then
-         *      return;
-         */
-        if(IdByte & 0xF8)
-                return -1;
-
-        r1 = inb(ioaddr + BID_REG_1);
-        r1 &= BID_ICR_MASK;
-        r1 |= BID_OTHER_BIT;
-
-        outb(r1, ioaddr + BID_REG_1);
-        r1 = inb(ioaddr + BID_REG_3);
-
-        r1 &= BID_EAR_MASK;
-        r1 |= BID_ENGR_PAGE;
-
-        outb(r1, ioaddr + BID_REG_3);
-        r1 = inb(ioaddr + BID_REG_1);
-        r1 &= BID_ICR_MASK;
-        r1 |= (BID_RLA | BID_OTHER_BIT);
-
-        outb(r1, ioaddr + BID_REG_1);
-
-        r1 = inb(ioaddr + BID_REG_1);
-        while(r1 & BID_RECALL_DONE_MASK)
-                r1 = inb(ioaddr + BID_REG_1);
-
-        r = inb(ioaddr + BID_LAR_0 + BID_REG_6);
-
-        /* clear chip rev bits */
-        tp->extra_info &= ~CHIP_REV_MASK;
-        tp->extra_info |= ((r & BID_EEPROM_CHIP_REV_MASK) << 6);
-
-        r1 = inb(ioaddr + BID_REG_1);
-        r1 &= BID_ICR_MASK;
-        r1 |= BID_OTHER_BIT;
-
-        outb(r1, ioaddr + BID_REG_1);
-        r1 = inb(ioaddr + BID_REG_3);
-
-        r1 &= BID_EAR_MASK;
-        r1 |= BID_EA6;
-
-        outb(r1, ioaddr + BID_REG_3);
-        r1 = inb(ioaddr + BID_REG_1);
-
-        r1 &= BID_ICR_MASK;
-        r1 |= BID_RLA;
-
-        outb(r1, ioaddr + BID_REG_1);
-        r1 = inb(ioaddr + BID_REG_1);
-
-        while(r1 & BID_RECALL_DONE_MASK)
-                r1 = inb(ioaddr + BID_REG_1);
-
-        return BoardIdMask;
-}
-
-static int smctr_get_group_address(struct net_device *dev)
-{
-        smctr_issue_read_word_cmd(dev, RW_INDIVIDUAL_GROUP_ADDR);
-
-        return smctr_wait_cmd(dev);
-}
-
-static int smctr_get_functional_address(struct net_device *dev)
-{
-        smctr_issue_read_word_cmd(dev, RW_FUNCTIONAL_ADDR);
-
-        return smctr_wait_cmd(dev);
-}
-
-/* Calculate number of Non-MAC receive BDB's and data buffers.
- * This function must simulate allocateing shared memory exactly
- * as the allocate_shared_memory function above.
- */
-static unsigned int smctr_get_num_rx_bdbs(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int mem_used = 0;
-
-        /* Allocate System Control Blocks. */
-        mem_used += sizeof(SCGBlock);
-
-        mem_used += TO_PARAGRAPH_BOUNDRY(mem_used);
-        mem_used += sizeof(SCLBlock);
-
-        mem_used += TO_PARAGRAPH_BOUNDRY(mem_used);
-        mem_used += sizeof(ACBlock) * tp->num_acbs;
-
-        mem_used += TO_PARAGRAPH_BOUNDRY(mem_used);
-        mem_used += sizeof(ISBlock);
-
-        mem_used += TO_PARAGRAPH_BOUNDRY(mem_used);
-        mem_used += MISC_DATA_SIZE;
-
-        /* Allocate transmit FCB's. */
-        mem_used += TO_PARAGRAPH_BOUNDRY(mem_used);
-
-        mem_used += sizeof(FCBlock) * tp->num_tx_fcbs[MAC_QUEUE];
-        mem_used += sizeof(FCBlock) * tp->num_tx_fcbs[NON_MAC_QUEUE];
-        mem_used += sizeof(FCBlock) * tp->num_tx_fcbs[BUG_QUEUE];
-
-        /* Allocate transmit BDBs. */
-        mem_used += sizeof(BDBlock) * tp->num_tx_bdbs[MAC_QUEUE];
-        mem_used += sizeof(BDBlock) * tp->num_tx_bdbs[NON_MAC_QUEUE];
-        mem_used += sizeof(BDBlock) * tp->num_tx_bdbs[BUG_QUEUE];
-
-        /* Allocate receive FCBs. */
-        mem_used += sizeof(FCBlock) * tp->num_rx_fcbs[MAC_QUEUE];
-        mem_used += sizeof(FCBlock) * tp->num_rx_fcbs[NON_MAC_QUEUE];
-
-        /* Allocate receive BDBs. */
-        mem_used += sizeof(BDBlock) * tp->num_rx_bdbs[MAC_QUEUE];
-
-        /* Allocate MAC transmit buffers.
-         * MAC transmit buffers don't have to be on an ODD Boundary.
-         */
-        mem_used += tp->tx_buff_size[MAC_QUEUE];
-
-        /* Allocate BUG transmit buffers. */
-        mem_used += tp->tx_buff_size[BUG_QUEUE];
-
-        /* Allocate MAC receive data buffers.
-         * MAC receive buffers don't have to be on a 256 byte boundary.
-         */
-        mem_used += RX_DATA_BUFFER_SIZE * tp->num_rx_bdbs[MAC_QUEUE];
-
-        /* Allocate Non-MAC transmit buffers.
-         * For maximum Netware performance, put Tx Buffers on
-         * ODD Boundary,and then restore malloc to Even Boundrys.
-         */
-        mem_used += 1L;
-        mem_used += tp->tx_buff_size[NON_MAC_QUEUE];
-        mem_used += 1L;
-
-        /* CALCULATE NUMBER OF NON-MAC RX BDB'S
-         * AND NON-MAC RX DATA BUFFERS
-         *
-         * Make sure the mem_used offset at this point is the
-         * same as in allocate_shared memory or the following
-         * boundary adjustment will be incorrect (i.e. not allocating
-         * the non-mac receive buffers above cannot change the 256
-         * byte offset).
-         *
-         * Since this cannot be guaranteed, adding the full 256 bytes
-         * to the amount of shared memory used at this point will guaranteed
-         * that the rx data buffers do not overflow shared memory.
-         */
-        mem_used += 0x100;
-
-        return (0xffff - mem_used) / (RX_DATA_BUFFER_SIZE + sizeof(BDBlock));
-}
-
-static int smctr_get_physical_drop_number(struct net_device *dev)
-{
-        smctr_issue_read_word_cmd(dev, RW_PHYSICAL_DROP_NUMBER);
-
-        return smctr_wait_cmd(dev);
-}
-
-static __u8 * smctr_get_rx_pointer(struct net_device *dev, short queue)
-{
-        struct net_local *tp = netdev_priv(dev);
-        BDBlock *bdb;
-
-        bdb = (BDBlock *)((__u32)tp->ram_access
-                + (__u32)(tp->rx_fcb_curr[queue]->trc_bdb_ptr));
-
-        tp->rx_fcb_curr[queue]->bdb_ptr = bdb;
-
-        return (__u8 *)bdb->data_block_ptr;
-}
-
-static int smctr_get_station_id(struct net_device *dev)
-{
-        smctr_issue_read_word_cmd(dev, RW_INDIVIDUAL_MAC_ADDRESS);
-
-        return smctr_wait_cmd(dev);
-}
-
-/*
- * Get the current statistics. This may be called with the card open
- * or closed.
- */
-static struct net_device_stats *smctr_get_stats(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        return (struct net_device_stats *)&tp->MacStat;
-}
-
-static FCBlock *smctr_get_tx_fcb(struct net_device *dev, __u16 queue,
-        __u16 bytes_count)
-{
-        struct net_local *tp = netdev_priv(dev);
-        FCBlock *pFCB;
-        BDBlock *pbdb;
-        unsigned short alloc_size;
-        unsigned short *temp;
-
-        if(smctr_debug > 20)
-                printk(KERN_DEBUG "smctr_get_tx_fcb\n");
-
-        /* check if there is enough FCB blocks */
-        if(tp->num_tx_fcbs_used[queue] >= tp->num_tx_fcbs[queue])
-                return (FCBlock *)(-1L);
-
-        /* round off the input pkt size to the nearest even number */
-        alloc_size = (bytes_count + 1) & 0xfffe;
-
-        /* check if enough mem */
-        if((tp->tx_buff_used[queue] + alloc_size) > tp->tx_buff_size[queue])
-                return (FCBlock *)(-1L);
-
-        /* check if past the end ;
-         * if exactly enough mem to end of ring, alloc from front.
-         * this avoids update of curr when curr = end
-         */
-        if(((unsigned long)(tp->tx_buff_curr[queue]) + alloc_size)
-                >= (unsigned long)(tp->tx_buff_end[queue]))
-        {
-                /* check if enough memory from ring head */
-                alloc_size = alloc_size +
-                        (__u16)((__u32)tp->tx_buff_end[queue]
-                        - (__u32)tp->tx_buff_curr[queue]);
-
-                if((tp->tx_buff_used[queue] + alloc_size)
-                        > tp->tx_buff_size[queue])
-                {
-                        return (FCBlock *)(-1L);
-                }
-
-                /* ring wrap */
-                tp->tx_buff_curr[queue] = tp->tx_buff_head[queue];
-        }
-
-        tp->tx_buff_used[queue] += alloc_size;
-        tp->num_tx_fcbs_used[queue]++;
-        tp->tx_fcb_curr[queue]->frame_length = bytes_count;
-        tp->tx_fcb_curr[queue]->memory_alloc = alloc_size;
-        temp = tp->tx_buff_curr[queue];
-        tp->tx_buff_curr[queue]
-                = (__u16 *)((__u32)temp + (__u32)((bytes_count + 1) & 0xfffe));
-
-        pbdb = tp->tx_fcb_curr[queue]->bdb_ptr;
-        pbdb->buffer_length = bytes_count;
-        pbdb->data_block_ptr = temp;
-        pbdb->trc_data_block_ptr = TRC_POINTER(temp);
-
-        pFCB = tp->tx_fcb_curr[queue];
-        tp->tx_fcb_curr[queue] = tp->tx_fcb_curr[queue]->next_ptr;
-
-        return pFCB;
-}
-
-static int smctr_get_upstream_neighbor_addr(struct net_device *dev)
-{
-        smctr_issue_read_word_cmd(dev, RW_UPSTREAM_NEIGHBOR_ADDRESS);
-
-        return smctr_wait_cmd(dev);
-}
-
-static int smctr_hardware_send_packet(struct net_device *dev,
-        struct net_local *tp)
-{
-        struct tr_statistics *tstat = &tp->MacStat;
-        struct sk_buff *skb;
-        FCBlock *fcb;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG"%s: smctr_hardware_send_packet\n", dev->name);
-
-        if(tp->status != OPEN)
-                return -1;
-
-        if(tp->monitor_state_ready != 1)
-                return -1;
-
-        for(;;)
-        {
-                /* Send first buffer from queue */
-                skb = skb_dequeue(&tp->SendSkbQueue);
-                if(skb == NULL)
-                        return -1;
-
-                tp->QueueSkb++;
-
-                if(skb->len < SMC_HEADER_SIZE || skb->len > tp->max_packet_size)
-                        return -1;
-
-                smctr_enable_16bit(dev);
-                smctr_set_page(dev, (__u8 *)tp->ram_access);
-
-                if((fcb = smctr_get_tx_fcb(dev, NON_MAC_QUEUE, skb->len))
-                        == (FCBlock *)(-1L))
-                {
-                        smctr_disable_16bit(dev);
-                        return -1;
-                }
-
-                smctr_tx_move_frame(dev, skb,
-                        (__u8 *)fcb->bdb_ptr->data_block_ptr, skb->len);
-
-                smctr_set_page(dev, (__u8 *)fcb);
-
-                smctr_trc_send_packet(dev, fcb, NON_MAC_QUEUE);
-                dev_kfree_skb(skb);
-
-                tstat->tx_packets++;
-
-                smctr_disable_16bit(dev);
-        }
-
-        return 0;
-}
-
-static int smctr_init_acbs(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int i;
-        ACBlock *acb;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_init_acbs\n", dev->name);
-
-        acb                     = tp->acb_head;
-        acb->cmd_done_status    = (ACB_COMMAND_DONE | ACB_COMMAND_SUCCESSFUL);
-        acb->cmd_info           = ACB_CHAIN_END;
-        acb->cmd                = 0;
-        acb->subcmd             = 0;
-        acb->data_offset_lo     = 0;
-        acb->data_offset_hi     = 0;
-        acb->next_ptr
-                = (ACBlock *)(((char *)acb) + sizeof(ACBlock));
-        acb->trc_next_ptr       = TRC_POINTER(acb->next_ptr);
-
-        for(i = 1; i < tp->num_acbs; i++)
-        {
-                acb             = acb->next_ptr;
-                acb->cmd_done_status
-                        = (ACB_COMMAND_DONE | ACB_COMMAND_SUCCESSFUL);
-                acb->cmd_info = ACB_CHAIN_END;
-                acb->cmd        = 0;
-                acb->subcmd     = 0;
-                acb->data_offset_lo = 0;
-                acb->data_offset_hi = 0;
-                acb->next_ptr
-                        = (ACBlock *)(((char *)acb) + sizeof(ACBlock));
-                acb->trc_next_ptr = TRC_POINTER(acb->next_ptr);
-        }
-
-        acb->next_ptr           = tp->acb_head;
-        acb->trc_next_ptr       = TRC_POINTER(tp->acb_head);
-        tp->acb_next            = tp->acb_head->next_ptr;
-        tp->acb_curr            = tp->acb_head->next_ptr;
-        tp->num_acbs_used       = 0;
-
-        return 0;
-}
-
-static int smctr_init_adapter(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int err;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_init_adapter\n", dev->name);
-
-        tp->status              = CLOSED;
-        tp->page_offset_mask    = (tp->ram_usable * 1024) - 1;
-        skb_queue_head_init(&tp->SendSkbQueue);
-        tp->QueueSkb = MAX_TX_QUEUE;
-
-        if(!(tp->group_address_0 & 0x0080))
-                tp->group_address_0 |= 0x00C0;
-
-        if(!(tp->functional_address_0 & 0x00C0))
-                tp->functional_address_0 |= 0x00C0;
-
-        tp->functional_address[0] &= 0xFF7F;
-
-        if(tp->authorized_function_classes == 0)
-                tp->authorized_function_classes = 0x7FFF;
-
-        if(tp->authorized_access_priority == 0)
-                tp->authorized_access_priority = 0x06;
-
-        smctr_disable_bic_int(dev);
-        smctr_set_trc_reset(dev->base_addr);
-
-        smctr_enable_16bit(dev);
-        smctr_set_page(dev, (__u8 *)tp->ram_access);
-
-        if(smctr_checksum_firmware(dev))
-        {
-                printk(KERN_ERR "%s: Previously loaded firmware is missing\n",dev->name);
-                return -ENOENT;
-        }
-
-        if((err = smctr_ram_memory_test(dev)))
-        {
-                printk(KERN_ERR "%s: RAM memory test failed.\n", dev->name);
-                return -EIO;
-        }
-
-        smctr_set_rx_look_ahead(dev);
-        smctr_load_node_addr(dev);
-
-        /* Initialize adapter for Internal Self Test. */
-        smctr_reset_adapter(dev);
-        if((err = smctr_init_card_real(dev)))
-        {
-                printk(KERN_ERR "%s: Initialization of card failed (%d)\n",
-                        dev->name, err);
-                return -EINVAL;
-        }
-
-        /* This routine clobbers the TRC's internal registers. */
-        if((err = smctr_internal_self_test(dev)))
-        {
-                printk(KERN_ERR "%s: Card failed internal self test (%d)\n",
-                        dev->name, err);
-                return -EINVAL;
-        }
-
-        /* Re-Initialize adapter's internal registers */
-        smctr_reset_adapter(dev);
-        if((err = smctr_init_card_real(dev)))
-        {
-                printk(KERN_ERR "%s: Initialization of card failed (%d)\n",
-                        dev->name, err);
-                return -EINVAL;
-        }
-
-        smctr_enable_bic_int(dev);
-
-        if((err = smctr_issue_enable_int_cmd(dev, TRC_INTERRUPT_ENABLE_MASK)))
-                return err;
-
-        smctr_disable_16bit(dev);
-
-        return 0;
-}
-
-static int smctr_init_card_real(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int err = 0;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_init_card_real\n", dev->name);
-
-        tp->sh_mem_used = 0;
-        tp->num_acbs    = NUM_OF_ACBS;
-
-        /* Range Check Max Packet Size */
-        if(tp->max_packet_size < 256)
-                tp->max_packet_size = 256;
-        else
-        {
-                if(tp->max_packet_size > NON_MAC_TX_BUFFER_MEMORY)
-                        tp->max_packet_size = NON_MAC_TX_BUFFER_MEMORY;
-        }
-
-        tp->num_of_tx_buffs = (NON_MAC_TX_BUFFER_MEMORY
-                / tp->max_packet_size) - 1;
-
-        if(tp->num_of_tx_buffs > NUM_NON_MAC_TX_FCBS)
-                tp->num_of_tx_buffs = NUM_NON_MAC_TX_FCBS;
-        else
-        {
-                if(tp->num_of_tx_buffs == 0)
-                        tp->num_of_tx_buffs = 1;
-        }
-
-        /* Tx queue constants */
-        tp->num_tx_fcbs        [BUG_QUEUE]     = NUM_BUG_TX_FCBS;
-        tp->num_tx_bdbs        [BUG_QUEUE]     = NUM_BUG_TX_BDBS;
-        tp->tx_buff_size       [BUG_QUEUE]     = BUG_TX_BUFFER_MEMORY;
-        tp->tx_buff_used       [BUG_QUEUE]     = 0;
-        tp->tx_queue_status    [BUG_QUEUE]     = NOT_TRANSMITING;
-
-        tp->num_tx_fcbs        [MAC_QUEUE]     = NUM_MAC_TX_FCBS;
-        tp->num_tx_bdbs        [MAC_QUEUE]     = NUM_MAC_TX_BDBS;
-        tp->tx_buff_size       [MAC_QUEUE]     = MAC_TX_BUFFER_MEMORY;
-        tp->tx_buff_used       [MAC_QUEUE]     = 0;
-        tp->tx_queue_status    [MAC_QUEUE]     = NOT_TRANSMITING;
-
-        tp->num_tx_fcbs        [NON_MAC_QUEUE] = NUM_NON_MAC_TX_FCBS;
-        tp->num_tx_bdbs        [NON_MAC_QUEUE] = NUM_NON_MAC_TX_BDBS;
-        tp->tx_buff_size       [NON_MAC_QUEUE] = NON_MAC_TX_BUFFER_MEMORY;
-        tp->tx_buff_used       [NON_MAC_QUEUE] = 0;
-        tp->tx_queue_status    [NON_MAC_QUEUE] = NOT_TRANSMITING;
-
-        /* Receive Queue Constants */
-        tp->num_rx_fcbs[MAC_QUEUE] = NUM_MAC_RX_FCBS;
-        tp->num_rx_bdbs[MAC_QUEUE] = NUM_MAC_RX_BDBS;
-
-        if(tp->extra_info & CHIP_REV_MASK)
-                tp->num_rx_fcbs[NON_MAC_QUEUE] = 78;    /* 825 Rev. XE */
-        else
-                tp->num_rx_fcbs[NON_MAC_QUEUE] = 7;     /* 825 Rev. XD */
-
-        tp->num_rx_bdbs[NON_MAC_QUEUE] = smctr_get_num_rx_bdbs(dev);
-
-        smctr_alloc_shared_memory(dev);
-        smctr_init_shared_memory(dev);
-
-        if((err = smctr_issue_init_timers_cmd(dev)))
-                return err;
-
-        if((err = smctr_issue_init_txrx_cmd(dev)))
-        {
-                printk(KERN_ERR "%s: Hardware failure\n", dev->name);
-                return err;
-        }
-
-        return 0;
-}
-
-static int smctr_init_rx_bdbs(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int i, j;
-        BDBlock *bdb;
-        __u16 *buf;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_init_rx_bdbs\n", dev->name);
-
-        for(i = 0; i < NUM_RX_QS_USED; i++)
-        {
-                bdb = tp->rx_bdb_head[i];
-                buf = tp->rx_buff_head[i];
-                bdb->info = (BDB_CHAIN_END | BDB_NO_WARNING);
-                bdb->buffer_length = RX_DATA_BUFFER_SIZE;
-                bdb->next_ptr = (BDBlock *)(((char *)bdb) + sizeof(BDBlock));
-                bdb->data_block_ptr = buf;
-                bdb->trc_next_ptr = TRC_POINTER(bdb->next_ptr);
-
-                if(i == NON_MAC_QUEUE)
-                        bdb->trc_data_block_ptr = RX_BUFF_TRC_POINTER(buf);
-                else
-                        bdb->trc_data_block_ptr = TRC_POINTER(buf);
-
-                for(j = 1; j < tp->num_rx_bdbs[i]; j++)
-                {
-                        bdb->next_ptr->back_ptr = bdb;
-                        bdb = bdb->next_ptr;
-                        buf = (__u16 *)((char *)buf + RX_DATA_BUFFER_SIZE);
-                        bdb->info = (BDB_NOT_CHAIN_END | BDB_NO_WARNING);
-                        bdb->buffer_length = RX_DATA_BUFFER_SIZE;
-                        bdb->next_ptr = (BDBlock *)(((char *)bdb) + sizeof(BDBlock));
-                        bdb->data_block_ptr = buf;
-                        bdb->trc_next_ptr = TRC_POINTER(bdb->next_ptr);
-
-                        if(i == NON_MAC_QUEUE)
-                                bdb->trc_data_block_ptr = RX_BUFF_TRC_POINTER(buf);
-                        else
-                                bdb->trc_data_block_ptr = TRC_POINTER(buf);
-                }
-
-                bdb->next_ptr           = tp->rx_bdb_head[i];
-                bdb->trc_next_ptr       = TRC_POINTER(tp->rx_bdb_head[i]);
-
-                tp->rx_bdb_head[i]->back_ptr    = bdb;
-                tp->rx_bdb_curr[i]              = tp->rx_bdb_head[i]->next_ptr;
-        }
-
-        return 0;
-}
-
-static int smctr_init_rx_fcbs(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int i, j;
-        FCBlock *fcb;
-
-        for(i = 0; i < NUM_RX_QS_USED; i++)
-        {
-                fcb               = tp->rx_fcb_head[i];
-                fcb->frame_status = 0;
-                fcb->frame_length = 0;
-                fcb->info         = FCB_CHAIN_END;
-                fcb->next_ptr     = (FCBlock *)(((char*)fcb) + sizeof(FCBlock));
-                if(i == NON_MAC_QUEUE)
-                        fcb->trc_next_ptr = RX_FCB_TRC_POINTER(fcb->next_ptr);
-                else
-                        fcb->trc_next_ptr = TRC_POINTER(fcb->next_ptr);
-
-                for(j = 1; j < tp->num_rx_fcbs[i]; j++)
-                {
-                        fcb->next_ptr->back_ptr = fcb;
-                        fcb                     = fcb->next_ptr;
-                        fcb->frame_status       = 0;
-                        fcb->frame_length       = 0;
-                        fcb->info               = FCB_WARNING;
-                        fcb->next_ptr
-                                = (FCBlock *)(((char *)fcb) + sizeof(FCBlock));
-
-                        if(i == NON_MAC_QUEUE)
-                                fcb->trc_next_ptr
-                                        = RX_FCB_TRC_POINTER(fcb->next_ptr);
-                        else
-                                fcb->trc_next_ptr
-                                        = TRC_POINTER(fcb->next_ptr);
-                }
-
-                fcb->next_ptr = tp->rx_fcb_head[i];
-
-                if(i == NON_MAC_QUEUE)
-                        fcb->trc_next_ptr = RX_FCB_TRC_POINTER(fcb->next_ptr);
-                else
-                        fcb->trc_next_ptr = TRC_POINTER(fcb->next_ptr);
-
-                tp->rx_fcb_head[i]->back_ptr    = fcb;
-                tp->rx_fcb_curr[i]              = tp->rx_fcb_head[i]->next_ptr;
-        }
-
-        return 0;
-}
-
-static int smctr_init_shared_memory(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int i;
-        __u32 *iscpb;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_init_shared_memory\n", dev->name);
-
-        smctr_set_page(dev, (__u8 *)(unsigned int)tp->iscpb_ptr);
-
-        /* Initialize Initial System Configuration Point. (ISCP) */
-        iscpb = (__u32 *)PAGE_POINTER(&tp->iscpb_ptr->trc_scgb_ptr);
-        *iscpb = (__u32)(SWAP_WORDS(TRC_POINTER(tp->scgb_ptr)));
-
-        smctr_set_page(dev, (__u8 *)tp->ram_access);
-
-        /* Initialize System Configuration Pointers. (SCP) */
-        tp->scgb_ptr->config = (SCGB_ADDRESS_POINTER_FORMAT
-                | SCGB_MULTI_WORD_CONTROL | SCGB_DATA_FORMAT
-                | SCGB_BURST_LENGTH);
-
-        tp->scgb_ptr->trc_sclb_ptr      = TRC_POINTER(tp->sclb_ptr);
-        tp->scgb_ptr->trc_acb_ptr       = TRC_POINTER(tp->acb_head);
-        tp->scgb_ptr->trc_isb_ptr       = TRC_POINTER(tp->isb_ptr);
-        tp->scgb_ptr->isbsiz            = (sizeof(ISBlock)) - 2;
-
-        /* Initialize System Control Block. (SCB) */
-        tp->sclb_ptr->valid_command    = SCLB_VALID | SCLB_CMD_NOP;
-        tp->sclb_ptr->iack_code        = 0;
-        tp->sclb_ptr->resume_control   = 0;
-        tp->sclb_ptr->int_mask_control = 0;
-        tp->sclb_ptr->int_mask_state   = 0;
-
-        /* Initialize Interrupt Status Block. (ISB) */
-        for(i = 0; i < NUM_OF_INTERRUPTS; i++)
-        {
-                tp->isb_ptr->IStatus[i].IType = 0xf0;
-                tp->isb_ptr->IStatus[i].ISubtype = 0;
-        }
-
-        tp->current_isb_index = 0;
-
-        /* Initialize Action Command Block. (ACB) */
-        smctr_init_acbs(dev);
-
-        /* Initialize transmit FCB's and BDB's. */
-        smctr_link_tx_fcbs_to_bdbs(dev);
-        smctr_init_tx_bdbs(dev);
-        smctr_init_tx_fcbs(dev);
-
-        /* Initialize receive FCB's and BDB's. */
-        smctr_init_rx_bdbs(dev);
-        smctr_init_rx_fcbs(dev);
-
-        return 0;
-}
-
-static int smctr_init_tx_bdbs(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int i, j;
-        BDBlock *bdb;
-
-        for(i = 0; i < NUM_TX_QS_USED; i++)
-        {
-                bdb = tp->tx_bdb_head[i];
-                bdb->info = (BDB_NOT_CHAIN_END | BDB_NO_WARNING);
-                bdb->next_ptr = (BDBlock *)(((char *)bdb) + sizeof(BDBlock));
-                bdb->trc_next_ptr = TRC_POINTER(bdb->next_ptr);
-
-                for(j = 1; j < tp->num_tx_bdbs[i]; j++)
-                {
-                        bdb->next_ptr->back_ptr = bdb;
-                        bdb = bdb->next_ptr;
-                        bdb->info = (BDB_NOT_CHAIN_END | BDB_NO_WARNING);
-                        bdb->next_ptr
-                                = (BDBlock *)(((char *)bdb) + sizeof( BDBlock));                        bdb->trc_next_ptr = TRC_POINTER(bdb->next_ptr);
-                }
-
-                bdb->next_ptr = tp->tx_bdb_head[i];
-                bdb->trc_next_ptr = TRC_POINTER(tp->tx_bdb_head[i]);
-                tp->tx_bdb_head[i]->back_ptr = bdb;
-        }
-
-        return 0;
-}
-
-static int smctr_init_tx_fcbs(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int i, j;
-        FCBlock *fcb;
-
-        for(i = 0; i < NUM_TX_QS_USED; i++)
-        {
-                fcb               = tp->tx_fcb_head[i];
-                fcb->frame_status = 0;
-                fcb->frame_length = 0;
-                fcb->info         = FCB_CHAIN_END;
-                fcb->next_ptr = (FCBlock *)(((char *)fcb) + sizeof(FCBlock));
-                fcb->trc_next_ptr = TRC_POINTER(fcb->next_ptr);
-
-                for(j = 1; j < tp->num_tx_fcbs[i]; j++)
-                {
-                        fcb->next_ptr->back_ptr = fcb;
-                        fcb                     = fcb->next_ptr;
-                        fcb->frame_status       = 0;
-                        fcb->frame_length       = 0;
-                        fcb->info               = FCB_CHAIN_END;
-                        fcb->next_ptr
-                                = (FCBlock *)(((char *)fcb) + sizeof(FCBlock));
-                        fcb->trc_next_ptr = TRC_POINTER(fcb->next_ptr);
-                }
-
-                fcb->next_ptr           = tp->tx_fcb_head[i];
-                fcb->trc_next_ptr       = TRC_POINTER(tp->tx_fcb_head[i]);
-
-                tp->tx_fcb_head[i]->back_ptr    = fcb;
-                tp->tx_fcb_end[i]               = tp->tx_fcb_head[i]->next_ptr;
-                tp->tx_fcb_curr[i]              = tp->tx_fcb_head[i]->next_ptr;
-                tp->num_tx_fcbs_used[i]         = 0;
-        }
-
-        return 0;
-}
-
-static int smctr_internal_self_test(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int err;
-
-        if((err = smctr_issue_test_internal_rom_cmd(dev)))
-                return err;
-
-        if((err = smctr_wait_cmd(dev)))
-                return err;
-
-        if(tp->acb_head->cmd_done_status & 0xff)
-                return -1;
-
-        if((err = smctr_issue_test_hic_cmd(dev)))
-                return err;
-
-        if((err = smctr_wait_cmd(dev)))
-                return err;
-
-        if(tp->acb_head->cmd_done_status & 0xff)
-                return -1;
-
-        if((err = smctr_issue_test_mac_reg_cmd(dev)))
-                return err;
-
-        if((err = smctr_wait_cmd(dev)))
-                return err;
-
-        if(tp->acb_head->cmd_done_status & 0xff)
-                return -1;
-
-        return 0;
-}
-
-/*
- * The typical workload of the driver: Handle the network interface interrupts.
- */
-static irqreturn_t smctr_interrupt(int irq, void *dev_id)
-{
-        struct net_device *dev = dev_id;
-        struct net_local *tp;
-        int ioaddr;
-        __u16 interrupt_unmask_bits = 0, interrupt_ack_code = 0xff00;
-        __u16 err1, err = NOT_MY_INTERRUPT;
-        __u8 isb_type, isb_subtype;
-        __u16 isb_index;
-
-        ioaddr = dev->base_addr;
-        tp = netdev_priv(dev);
-
-        if(tp->status == NOT_INITIALIZED)
-                return IRQ_NONE;
-
-        spin_lock(&tp->lock);
-        
-        smctr_disable_bic_int(dev);
-        smctr_enable_16bit(dev);
-
-        smctr_clear_int(dev);
-
-        /* First read the LSB */
-        while((tp->isb_ptr->IStatus[tp->current_isb_index].IType & 0xf0) == 0)
-        {
-                isb_index       = tp->current_isb_index;
-                isb_type        = tp->isb_ptr->IStatus[isb_index].IType;
-                isb_subtype     = tp->isb_ptr->IStatus[isb_index].ISubtype;
-
-                (tp->current_isb_index)++;
-                if(tp->current_isb_index == NUM_OF_INTERRUPTS)
-                        tp->current_isb_index = 0;
-
-                if(isb_type >= 0x10)
-                {
-                        smctr_disable_16bit(dev);
-                        spin_unlock(&tp->lock);
-                        return IRQ_HANDLED;
-                }
-
-                err = HARDWARE_FAILED;
-                interrupt_ack_code = isb_index;
-                tp->isb_ptr->IStatus[isb_index].IType |= 0xf0;
-
-                interrupt_unmask_bits |= (1 << (__u16)isb_type);
-
-                switch(isb_type)
-                {
-                        case ISB_IMC_MAC_TYPE_3:
-                                smctr_disable_16bit(dev);
-
-                                switch(isb_subtype)
-                                {
-                                        case 0:
-                                                tp->monitor_state = MS_MONITOR_FSM_INACTIVE;
-                                               break;
-
-                                        case 1:
-                                                tp->monitor_state = MS_REPEAT_BEACON_STATE;
-                                                break;
-
-                                        case 2:
-                                                tp->monitor_state = MS_REPEAT_CLAIM_TOKEN_STATE;
-                                                break;
-
-                                        case 3:
-                                                tp->monitor_state = MS_TRANSMIT_CLAIM_TOKEN_STATE;                                                break;
-
-                                        case 4:
-                                                tp->monitor_state = MS_STANDBY_MONITOR_STATE;
-                                                break;
-
-                                        case 5:
-                                                tp->monitor_state = MS_TRANSMIT_BEACON_STATE;
-                                                break;
-
-                                        case 6:
-                                                tp->monitor_state = MS_ACTIVE_MONITOR_STATE;
-                                                break;
-
-                                        case 7:
-                                                tp->monitor_state = MS_TRANSMIT_RING_PURGE_STATE;
-                                                break;
-
-                                        case 8:   /* diagnostic state */
-                                                break;
-
-                                        case 9:
-                                                tp->monitor_state = MS_BEACON_TEST_STATE;
-                                                if(smctr_lobe_media_test(dev))
-                                                {
-                                                        tp->ring_status_flags = RING_STATUS_CHANGED;
-                                                        tp->ring_status = AUTO_REMOVAL_ERROR;
-                                                        smctr_ring_status_chg(dev);
-                                                        smctr_bypass_state(dev);
-                                                }
-                                                else
-                                                        smctr_issue_insert_cmd(dev);
-                                                break;
-
-                                        /* case 0x0a-0xff, illegal states */
-                                        default:
-                                                break;
-                                }
-
-                                tp->ring_status_flags = MONITOR_STATE_CHANGED;
-                                err = smctr_ring_status_chg(dev);
-
-                                smctr_enable_16bit(dev);
-                                break;
-
-                        /* Type 0x02 - MAC Error Counters Interrupt
-                         * One or more MAC Error Counter is half full
-                         *      MAC Error Counters
-                         *      Lost_FR_Error_Counter
-                         *      RCV_Congestion_Counter
-                         *      FR_copied_Error_Counter
-                         *      FREQ_Error_Counter
-                         *      Token_Error_Counter
-                         *      Line_Error_Counter
-                         *      Internal_Error_Count
-                         */
-                        case ISB_IMC_MAC_ERROR_COUNTERS:
-                                /* Read 802.5 Error Counters */
-                                err = smctr_issue_read_ring_status_cmd(dev);
-                                break;
-
-                        /* Type 0x04 - MAC Type 2 Interrupt
-                         * HOST needs to enqueue MAC Frame for transmission
-                         * SubType Bit 15 - RQ_INIT_PDU( Request Initialization)                         * Changed from RQ_INIT_PDU to
-                         * TRC_Status_Changed_Indicate
-                         */
-                        case ISB_IMC_MAC_TYPE_2:
-                                err = smctr_issue_read_ring_status_cmd(dev);
-                                break;
-
-
-                        /* Type 0x05 - TX Frame Interrupt (FI). */
-                        case ISB_IMC_TX_FRAME:
-                                /* BUG QUEUE for TRC stuck receive BUG */
-                                if(isb_subtype & TX_PENDING_PRIORITY_2)
-                                {
-                                        if((err = smctr_tx_complete(dev, BUG_QUEUE)) != SUCCESS)
-                                                break;
-                                }
-
-                                /* NON-MAC frames only */
-                                if(isb_subtype & TX_PENDING_PRIORITY_1)
-                                {
-                                        if((err = smctr_tx_complete(dev, NON_MAC_QUEUE)) != SUCCESS)
-                                                break;
-                                }
-
-                                /* MAC frames only */
-                                if(isb_subtype & TX_PENDING_PRIORITY_0)
-                                        err = smctr_tx_complete(dev, MAC_QUEUE);                                break;
-
-                        /* Type 0x06 - TX END OF QUEUE (FE) */
-                        case ISB_IMC_END_OF_TX_QUEUE:
-                                /* BUG queue */
-                                if(isb_subtype & TX_PENDING_PRIORITY_2)
-                                {
-                                        /* ok to clear Receive FIFO overrun
-                                         * imask send_BUG now completes.
-                                         */
-                                        interrupt_unmask_bits |= 0x800;
-
-                                        tp->tx_queue_status[BUG_QUEUE] = NOT_TRANSMITING;
-                                        if((err = smctr_tx_complete(dev, BUG_QUEUE)) != SUCCESS)
-                                                break;
-                                        if((err = smctr_restart_tx_chain(dev, BUG_QUEUE)) != SUCCESS)
-                                                break;
-                                }
-
-                                /* NON-MAC queue only */
-                                if(isb_subtype & TX_PENDING_PRIORITY_1)
-                                {
-                                        tp->tx_queue_status[NON_MAC_QUEUE] = NOT_TRANSMITING;
-                                        if((err = smctr_tx_complete(dev, NON_MAC_QUEUE)) != SUCCESS)
-                                                break;
-                                        if((err = smctr_restart_tx_chain(dev, NON_MAC_QUEUE)) != SUCCESS)
-                                                break;
-                                }
-
-                                /* MAC queue only */
-                                if(isb_subtype & TX_PENDING_PRIORITY_0)
-                                {
-                                        tp->tx_queue_status[MAC_QUEUE] = NOT_TRANSMITING;
-                                        if((err = smctr_tx_complete(dev, MAC_QUEUE)) != SUCCESS)
-                                                break;
-
-                                        err = smctr_restart_tx_chain(dev, MAC_QUEUE);
-                                }
-                                break;
-
-                        /* Type 0x07 - NON-MAC RX Resource Interrupt
-                         *   Subtype bit 12 - (BW) BDB warning
-                         *   Subtype bit 13 - (FW) FCB warning
-                         *   Subtype bit 14 - (BE) BDB End of chain
-                         *   Subtype bit 15 - (FE) FCB End of chain
-                         */
-                        case ISB_IMC_NON_MAC_RX_RESOURCE:
-                                tp->rx_fifo_overrun_count = 0;
-                                tp->receive_queue_number = NON_MAC_QUEUE;
-                                err1 = smctr_rx_frame(dev);
-
-                                if(isb_subtype & NON_MAC_RX_RESOURCE_FE)
-                                {
-                                        if((err = smctr_issue_resume_rx_fcb_cmd(                                                dev, NON_MAC_QUEUE)) != SUCCESS)                                                break;
-
-                                        if(tp->ptr_rx_fcb_overruns)
-                                                (*tp->ptr_rx_fcb_overruns)++;
-                                }
-
-                                if(isb_subtype & NON_MAC_RX_RESOURCE_BE)
-                                {
-                                        if((err = smctr_issue_resume_rx_bdb_cmd(                                                dev, NON_MAC_QUEUE)) != SUCCESS)                                                break;
-
-                                        if(tp->ptr_rx_bdb_overruns)
-                                                (*tp->ptr_rx_bdb_overruns)++;
-                                }
-                                err = err1;
-                                break;
-
-                        /* Type 0x08 - MAC RX Resource Interrupt
-                         *   Subtype bit 12 - (BW) BDB warning
-                         *   Subtype bit 13 - (FW) FCB warning
-                         *   Subtype bit 14 - (BE) BDB End of chain
-                         *   Subtype bit 15 - (FE) FCB End of chain
-                         */
-                        case ISB_IMC_MAC_RX_RESOURCE:
-                                tp->receive_queue_number = MAC_QUEUE;
-                                err1 = smctr_rx_frame(dev);
-
-                                if(isb_subtype & MAC_RX_RESOURCE_FE)
-                                {
-                                        if((err = smctr_issue_resume_rx_fcb_cmd(                                                dev, MAC_QUEUE)) != SUCCESS)
-                                                break;
-
-                                        if(tp->ptr_rx_fcb_overruns)
-                                                (*tp->ptr_rx_fcb_overruns)++;
-                                }
-
-                                if(isb_subtype & MAC_RX_RESOURCE_BE)
-                                {
-                                        if((err = smctr_issue_resume_rx_bdb_cmd(                                                dev, MAC_QUEUE)) != SUCCESS)
-                                                break;
-
-                                        if(tp->ptr_rx_bdb_overruns)
-                                                (*tp->ptr_rx_bdb_overruns)++;
-                                }
-                                err = err1;
-                                break;
-
-                        /* Type 0x09 - NON_MAC RX Frame Interrupt */
-                        case ISB_IMC_NON_MAC_RX_FRAME:
-                                tp->rx_fifo_overrun_count = 0;
-                                tp->receive_queue_number = NON_MAC_QUEUE;
-                                err = smctr_rx_frame(dev);
-                                break;
-
-                        /* Type 0x0A - MAC RX Frame Interrupt */
-                        case ISB_IMC_MAC_RX_FRAME:
-                                tp->receive_queue_number = MAC_QUEUE;
-                                err = smctr_rx_frame(dev);
-                                break;
-
-                        /* Type 0x0B - TRC status
-                         * TRC has encountered an error condition
-                         * subtype bit 14 - transmit FIFO underrun
-                         * subtype bit 15 - receive FIFO overrun
-                         */
-                        case ISB_IMC_TRC_FIFO_STATUS:
-                                if(isb_subtype & TRC_FIFO_STATUS_TX_UNDERRUN)
-                                {
-                                        if(tp->ptr_tx_fifo_underruns)
-                                                (*tp->ptr_tx_fifo_underruns)++;
-                                }
-
-                                if(isb_subtype & TRC_FIFO_STATUS_RX_OVERRUN)
-                                {
-                                        /* update overrun stuck receive counter
-                                         * if >= 3, has to clear it by sending
-                                         * back to back frames. We pick
-                                         * DAT(duplicate address MAC frame)
-                                         */
-                                        tp->rx_fifo_overrun_count++;
-
-                                        if(tp->rx_fifo_overrun_count >= 3)
-                                        {
-                                                tp->rx_fifo_overrun_count = 0;
-
-                                                /* delay clearing fifo overrun
-                                                 * imask till send_BUG tx
-                                                 * complete posted
-                                                 */
-                                                interrupt_unmask_bits &= (~0x800);
-                                                printk(KERN_CRIT "Jay please send bug\n");//                                              smctr_send_bug(dev);
-                                        }
-
-                                        if(tp->ptr_rx_fifo_overruns)
-                                                (*tp->ptr_rx_fifo_overruns)++;
-                                }
-
-                                err = SUCCESS;
-                                break;
-
-                        /* Type 0x0C - Action Command Status Interrupt
-                         * Subtype bit 14 - CB end of command chain (CE)
-                         * Subtype bit 15 - CB command interrupt (CI)
-                         */
-                        case ISB_IMC_COMMAND_STATUS:
-                                err = SUCCESS;
-                                if(tp->acb_head->cmd == ACB_CMD_HIC_NOP)
-                                {
-                                        printk(KERN_ERR "i1\n");
-                                        smctr_disable_16bit(dev);
-
-                                        /* XXXXXXXXXXXXXXXXX */
-                                /*      err = UM_Interrupt(dev); */
-
-                                        smctr_enable_16bit(dev);
-                                }
-                                else
-                                {
-                                        if((tp->acb_head->cmd
-                                            == ACB_CMD_READ_TRC_STATUS) &&
-                                           (tp->acb_head->subcmd
-                                            == RW_TRC_STATUS_BLOCK))
-                                        {
-                                                if(tp->ptr_bcn_type)
-                                                {
-                                                        *(tp->ptr_bcn_type)
-                                                                = (__u32)((SBlock *)tp->misc_command_data)->BCN_Type;
-                                                }
-
-                                                if(((SBlock *)tp->misc_command_data)->Status_CHG_Indicate & ERROR_COUNTERS_CHANGED)
-                                                {
-                                                        smctr_update_err_stats(dev);
-                                                }
-
-                                                if(((SBlock *)tp->misc_command_data)->Status_CHG_Indicate & TI_NDIS_RING_STATUS_CHANGED)
-                                                {
-                                                        tp->ring_status
-                                                                = ((SBlock*)tp->misc_command_data)->TI_NDIS_Ring_Status;
-                                                        smctr_disable_16bit(dev);
-                                                        err = smctr_ring_status_chg(dev);
-                                                        smctr_enable_16bit(dev);
-                                                        if((tp->ring_status & REMOVE_RECEIVED) &&
-                                                           (tp->config_word0 & NO_AUTOREMOVE))
-                                                        {
-                                                                smctr_issue_remove_cmd(dev);
-                                                        }
-
-                                                        if(err != SUCCESS)
-                                                        {
-                                                                tp->acb_pending = 0;
-                                                                break;
-                                                        }
-                                                }
-
-                                                if(((SBlock *)tp->misc_command_data)->Status_CHG_Indicate & UNA_CHANGED)
-                                                {
-                                                        if(tp->ptr_una)
-                                                        {
-                                                                tp->ptr_una[0] = SWAP_BYTES(((SBlock *)tp->misc_command_data)->UNA[0]);
-                                                                tp->ptr_una[1] = SWAP_BYTES(((SBlock *)tp->misc_command_data)->UNA[1]);
-                                                                tp->ptr_una[2] = SWAP_BYTES(((SBlock *)tp->misc_command_data)->UNA[2]);
-                                                        }
-
-                                                }
-
-                                                if(((SBlock *)tp->misc_command_data)->Status_CHG_Indicate & READY_TO_SEND_RQ_INIT)                                                {
-                                                        err = smctr_send_rq_init(dev);
-                                                }
-                                        }
-                                }
-
-                                tp->acb_pending = 0;
-                                break;
-
-                        /* Type 0x0D - MAC Type 1 interrupt
-                         * Subtype -- 00 FR_BCN received at S12
-                         *            01 FR_BCN received at S21
-                         *            02 FR_DAT(DA=MA, A<>0) received at S21
-                         *            03 TSM_EXP at S21
-                         *            04 FR_REMOVE received at S42
-                         *            05 TBR_EXP, BR_FLAG_SET at S42
-                         *            06 TBT_EXP at S53
-                         */
-                        case ISB_IMC_MAC_TYPE_1:
-                                if(isb_subtype > 8)
-                                {
-                                        err = HARDWARE_FAILED;
-                                        break;
-                                }
-
-                                err = SUCCESS;
-                                switch(isb_subtype)
-                                {
-                                        case 0:
-                                                tp->join_state = JS_BYPASS_STATE;
-                                                if(tp->status != CLOSED)
-                                                {
-                                                        tp->status = CLOSED;
-                                                        err = smctr_status_chg(dev);
-                                                }
-                                                break;
-
-                                        case 1:
-                                                tp->join_state = JS_LOBE_TEST_STATE;
-                                                break;
-
-                                        case 2:
-                                                tp->join_state = JS_DETECT_MONITOR_PRESENT_STATE;
-                                                break;
-
-                                        case 3:
-                                                tp->join_state = JS_AWAIT_NEW_MONITOR_STATE;
-                                                break;
-
-                                        case 4:
-                                                tp->join_state = JS_DUPLICATE_ADDRESS_TEST_STATE;
-                                                break;
-
-                                        case 5:
-                                                tp->join_state = JS_NEIGHBOR_NOTIFICATION_STATE;
-                                                break;
-
-                                        case 6:
-                                                tp->join_state = JS_REQUEST_INITIALIZATION_STATE;
-                                                break;
-
-                                        case 7:
-                                                tp->join_state = JS_JOIN_COMPLETE_STATE;
-                                                tp->status = OPEN;
-                                                err = smctr_status_chg(dev);
-                                                break;
-
-                                        case 8:
-                                                tp->join_state = JS_BYPASS_WAIT_STATE;
-                                                break;
-                                }
-                                break ;
-
-                        /* Type 0x0E - TRC Initialization Sequence Interrupt
-                         * Subtype -- 00-FF Initializatin sequence complete
-                         */
-                        case ISB_IMC_TRC_INTRNL_TST_STATUS:
-                                tp->status = INITIALIZED;
-                                smctr_disable_16bit(dev);
-                                err = smctr_status_chg(dev);
-                                smctr_enable_16bit(dev);
-                                break;
-
-                        /* other interrupt types, illegal */
-                        default:
-                                break;
-                }
-
-                if(err != SUCCESS)
-                        break;
-        }
-
-        /* Checking the ack code instead of the unmask bits here is because :
-         * while fixing the stuck receive, DAT frame are sent and mask off
-         * FIFO overrun interrupt temporarily (interrupt_unmask_bits = 0)
-         * but we still want to issue ack to ISB
-         */
-        if(!(interrupt_ack_code & 0xff00))
-                smctr_issue_int_ack(dev, interrupt_ack_code, interrupt_unmask_bits);
-
-        smctr_disable_16bit(dev);
-        smctr_enable_bic_int(dev);
-        spin_unlock(&tp->lock);
-
-        return IRQ_HANDLED;
-}
-
-static int smctr_issue_enable_int_cmd(struct net_device *dev,
-        __u16 interrupt_enable_mask)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int err;
-
-        if((err = smctr_wait_while_cbusy(dev)))
-                return err;
-
-        tp->sclb_ptr->int_mask_control  = interrupt_enable_mask;
-        tp->sclb_ptr->valid_command     = SCLB_VALID | SCLB_CMD_CLEAR_INTERRUPT_MASK;
-
-        smctr_set_ctrl_attention(dev);
-
-        return 0;
-}
-
-static int smctr_issue_int_ack(struct net_device *dev, __u16 iack_code, __u16 ibits)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        if(smctr_wait_while_cbusy(dev))
-                return -1;
-
-        tp->sclb_ptr->int_mask_control = ibits;
-        tp->sclb_ptr->iack_code = iack_code << 1; /* use the offset from base */        tp->sclb_ptr->resume_control = 0;
-        tp->sclb_ptr->valid_command = SCLB_VALID | SCLB_IACK_CODE_VALID | SCLB_CMD_CLEAR_INTERRUPT_MASK;
-
-        smctr_set_ctrl_attention(dev);
-
-        return 0;
-}
-
-static int smctr_issue_init_timers_cmd(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int i;
-        int err;
-        __u16 *pTimer_Struc = (__u16 *)tp->misc_command_data;
-
-        if((err = smctr_wait_while_cbusy(dev)))
-                return err;
-
-        if((err = smctr_wait_cmd(dev)))
-                return err;
-
-        tp->config_word0 = THDREN | DMA_TRIGGER | USETPT | NO_AUTOREMOVE;
-        tp->config_word1 = 0;
-
-        if((tp->media_type == MEDIA_STP_16) ||
-           (tp->media_type == MEDIA_UTP_16) ||
-           (tp->media_type == MEDIA_STP_16_UTP_16))
-        {
-                tp->config_word0 |= FREQ_16MB_BIT;
-        }
-
-        if(tp->mode_bits & EARLY_TOKEN_REL)
-                tp->config_word0 |= ETREN;
-
-        if(tp->mode_bits & LOOPING_MODE_MASK)
-                tp->config_word0 |= RX_OWN_BIT;
-        else
-                tp->config_word0 &= ~RX_OWN_BIT;
-
-        if(tp->receive_mask & PROMISCUOUS_MODE)
-                tp->config_word0 |= PROMISCUOUS_BIT;
-        else
-                tp->config_word0 &= ~PROMISCUOUS_BIT;
-
-        if(tp->receive_mask & ACCEPT_ERR_PACKETS)
-                tp->config_word0 |= SAVBAD_BIT;
-        else
-                tp->config_word0 &= ~SAVBAD_BIT;
-
-        if(tp->receive_mask & ACCEPT_ATT_MAC_FRAMES)
-                tp->config_word0 |= RXATMAC;
-        else
-                tp->config_word0 &= ~RXATMAC;
-
-        if(tp->receive_mask & ACCEPT_MULTI_PROM)
-                tp->config_word1 |= MULTICAST_ADDRESS_BIT;
-        else
-                tp->config_word1 &= ~MULTICAST_ADDRESS_BIT;
-
-        if(tp->receive_mask & ACCEPT_SOURCE_ROUTING_SPANNING)
-                tp->config_word1 |= SOURCE_ROUTING_SPANNING_BITS;
-        else
-        {
-                if(tp->receive_mask & ACCEPT_SOURCE_ROUTING)
-                        tp->config_word1 |= SOURCE_ROUTING_EXPLORER_BIT;
-                else
-                        tp->config_word1 &= ~SOURCE_ROUTING_SPANNING_BITS;
-        }
-
-        if((tp->media_type == MEDIA_STP_16) ||
-           (tp->media_type == MEDIA_UTP_16) ||
-           (tp->media_type == MEDIA_STP_16_UTP_16))
-        {
-                tp->config_word1 |= INTERFRAME_SPACING_16;
-        }
-        else
-                tp->config_word1 |= INTERFRAME_SPACING_4;
-
-        *pTimer_Struc++ = tp->config_word0;
-        *pTimer_Struc++ = tp->config_word1;
-
-        if((tp->media_type == MEDIA_STP_4) ||
-           (tp->media_type == MEDIA_UTP_4) ||
-           (tp->media_type == MEDIA_STP_4_UTP_4))
-        {
-                *pTimer_Struc++ = 0x00FA;       /* prescale */
-                *pTimer_Struc++ = 0x2710;       /* TPT_limit */
-                *pTimer_Struc++ = 0x2710;       /* TQP_limit */
-                *pTimer_Struc++ = 0x0A28;       /* TNT_limit */
-                *pTimer_Struc++ = 0x3E80;       /* TBT_limit */
-                *pTimer_Struc++ = 0x3A98;       /* TSM_limit */
-                *pTimer_Struc++ = 0x1B58;       /* TAM_limit */
-                *pTimer_Struc++ = 0x00C8;       /* TBR_limit */
-                *pTimer_Struc++ = 0x07D0;       /* TER_limit */
-                *pTimer_Struc++ = 0x000A;       /* TGT_limit */
-                *pTimer_Struc++ = 0x1162;       /* THT_limit */
-                *pTimer_Struc++ = 0x07D0;       /* TRR_limit */
-                *pTimer_Struc++ = 0x1388;       /* TVX_limit */
-                *pTimer_Struc++ = 0x0000;       /* reserved */
-        }
-        else
-        {
-                *pTimer_Struc++ = 0x03E8;       /* prescale */
-                *pTimer_Struc++ = 0x9C40;       /* TPT_limit */
-                *pTimer_Struc++ = 0x9C40;       /* TQP_limit */
-                *pTimer_Struc++ = 0x0A28;       /* TNT_limit */
-                *pTimer_Struc++ = 0x3E80;       /* TBT_limit */
-                *pTimer_Struc++ = 0x3A98;       /* TSM_limit */
-                *pTimer_Struc++ = 0x1B58;       /* TAM_limit */
-                *pTimer_Struc++ = 0x00C8;       /* TBR_limit */
-                *pTimer_Struc++ = 0x07D0;       /* TER_limit */
-                *pTimer_Struc++ = 0x000A;       /* TGT_limit */
-                *pTimer_Struc++ = 0x4588;       /* THT_limit */
-                *pTimer_Struc++ = 0x1F40;       /* TRR_limit */
-                *pTimer_Struc++ = 0x4E20;       /* TVX_limit */
-                *pTimer_Struc++ = 0x0000;       /* reserved */
-        }
-
-        /* Set node address. */
-        *pTimer_Struc++ = dev->dev_addr[0] << 8
-                | (dev->dev_addr[1] & 0xFF);
-        *pTimer_Struc++ = dev->dev_addr[2] << 8
-                | (dev->dev_addr[3] & 0xFF);
-        *pTimer_Struc++ = dev->dev_addr[4] << 8
-                | (dev->dev_addr[5] & 0xFF);
-
-        /* Set group address. */
-        *pTimer_Struc++ = tp->group_address_0 << 8
-                | tp->group_address_0 >> 8;
-        *pTimer_Struc++ = tp->group_address[0] << 8
-                | tp->group_address[0] >> 8;
-        *pTimer_Struc++ = tp->group_address[1] << 8
-                | tp->group_address[1] >> 8;
-
-        /* Set functional address. */
-        *pTimer_Struc++ = tp->functional_address_0 << 8
-                | tp->functional_address_0 >> 8;
-        *pTimer_Struc++ = tp->functional_address[0] << 8
-                | tp->functional_address[0] >> 8;
-        *pTimer_Struc++ = tp->functional_address[1] << 8
-                | tp->functional_address[1] >> 8;
-
-        /* Set Bit-Wise group address. */
-        *pTimer_Struc++ = tp->bitwise_group_address[0] << 8
-                | tp->bitwise_group_address[0] >> 8;
-        *pTimer_Struc++ = tp->bitwise_group_address[1] << 8
-                | tp->bitwise_group_address[1] >> 8;
-
-        /* Set ring number address. */
-        *pTimer_Struc++ = tp->source_ring_number;
-        *pTimer_Struc++ = tp->target_ring_number;
-
-        /* Physical drop number. */
-        *pTimer_Struc++ = (unsigned short)0;
-        *pTimer_Struc++ = (unsigned short)0;
-
-        /* Product instance ID. */
-        for(i = 0; i < 9; i++)
-                *pTimer_Struc++ = (unsigned short)0;
-
-        err = smctr_setup_single_cmd_w_data(dev, ACB_CMD_INIT_TRC_TIMERS, 0);
-
-        return err;
-}
-
-static int smctr_issue_init_txrx_cmd(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int i;
-        int err;
-        void **txrx_ptrs = (void *)tp->misc_command_data;
-
-        if((err = smctr_wait_while_cbusy(dev)))
-                return err;
-
-        if((err = smctr_wait_cmd(dev)))
-        {
-                printk(KERN_ERR "%s: Hardware failure\n", dev->name);
-                return err;
-        }
-
-        /* Initialize Transmit Queue Pointers that are used, to point to
-         * a single FCB.
-         */
-        for(i = 0; i < NUM_TX_QS_USED; i++)
-                *txrx_ptrs++ = (void *)TRC_POINTER(tp->tx_fcb_head[i]);
-
-        /* Initialize Transmit Queue Pointers that are NOT used to ZERO. */
-        for(; i < MAX_TX_QS; i++)
-                *txrx_ptrs++ = (void *)0;
-
-        /* Initialize Receive Queue Pointers (MAC and Non-MAC) that are
-         * used, to point to a single FCB and a BDB chain of buffers.
-         */
-        for(i = 0; i < NUM_RX_QS_USED; i++)
-        {
-                *txrx_ptrs++ = (void *)TRC_POINTER(tp->rx_fcb_head[i]);
-                *txrx_ptrs++ = (void *)TRC_POINTER(tp->rx_bdb_head[i]);
-        }
-
-        /* Initialize Receive Queue Pointers that are NOT used to ZERO. */
-        for(; i < MAX_RX_QS; i++)
-        {
-                *txrx_ptrs++ = (void *)0;
-                *txrx_ptrs++ = (void *)0;
-        }
-
-        err = smctr_setup_single_cmd_w_data(dev, ACB_CMD_INIT_TX_RX, 0);
-
-        return err;
-}
-
-static int smctr_issue_insert_cmd(struct net_device *dev)
-{
-        int err;
-
-        err = smctr_setup_single_cmd(dev, ACB_CMD_INSERT, ACB_SUB_CMD_NOP);
-
-        return err;
-}
-
-static int smctr_issue_read_ring_status_cmd(struct net_device *dev)
-{
-        int err;
-
-        if((err = smctr_wait_while_cbusy(dev)))
-                return err;
-
-        if((err = smctr_wait_cmd(dev)))
-                return err;
-
-        err = smctr_setup_single_cmd_w_data(dev, ACB_CMD_READ_TRC_STATUS,
-                RW_TRC_STATUS_BLOCK);
-
-        return err;
-}
-
-static int smctr_issue_read_word_cmd(struct net_device *dev, __u16 aword_cnt)
-{
-        int err;
-
-        if((err = smctr_wait_while_cbusy(dev)))
-                return err;
-
-        if((err = smctr_wait_cmd(dev)))
-                return err;
-
-        err = smctr_setup_single_cmd_w_data(dev, ACB_CMD_MCT_READ_VALUE,
-                aword_cnt);
-
-        return err;
-}
-
-static int smctr_issue_remove_cmd(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int err;
-
-        if((err = smctr_wait_while_cbusy(dev)))
-                return err;
-
-        tp->sclb_ptr->resume_control    = 0;
-        tp->sclb_ptr->valid_command     = SCLB_VALID | SCLB_CMD_REMOVE;
-
-        smctr_set_ctrl_attention(dev);
-
-        return 0;
-}
-
-static int smctr_issue_resume_acb_cmd(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int err;
-
-        if((err = smctr_wait_while_cbusy(dev)))
-                return err;
-
-        tp->sclb_ptr->resume_control = SCLB_RC_ACB;
-        tp->sclb_ptr->valid_command  = SCLB_VALID | SCLB_RESUME_CONTROL_VALID;
-
-        tp->acb_pending = 1;
-
-        smctr_set_ctrl_attention(dev);
-
-        return 0;
-}
-
-static int smctr_issue_resume_rx_bdb_cmd(struct net_device *dev, __u16 queue)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int err;
-
-        if((err = smctr_wait_while_cbusy(dev)))
-                return err;
-
-        if(queue == MAC_QUEUE)
-                tp->sclb_ptr->resume_control = SCLB_RC_RX_MAC_BDB;
-        else
-                tp->sclb_ptr->resume_control = SCLB_RC_RX_NON_MAC_BDB;
-
-        tp->sclb_ptr->valid_command = SCLB_VALID | SCLB_RESUME_CONTROL_VALID;
-
-        smctr_set_ctrl_attention(dev);
-
-        return 0;
-}
-
-static int smctr_issue_resume_rx_fcb_cmd(struct net_device *dev, __u16 queue)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_issue_resume_rx_fcb_cmd\n", dev->name);
-
-        if(smctr_wait_while_cbusy(dev))
-                return -1;
-
-        if(queue == MAC_QUEUE)
-                tp->sclb_ptr->resume_control = SCLB_RC_RX_MAC_FCB;
-        else
-                tp->sclb_ptr->resume_control = SCLB_RC_RX_NON_MAC_FCB;
-
-        tp->sclb_ptr->valid_command = SCLB_VALID | SCLB_RESUME_CONTROL_VALID;
-
-        smctr_set_ctrl_attention(dev);
-
-        return 0;
-}
-
-static int smctr_issue_resume_tx_fcb_cmd(struct net_device *dev, __u16 queue)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_issue_resume_tx_fcb_cmd\n", dev->name);
-
-        if(smctr_wait_while_cbusy(dev))
-                return -1;
-
-        tp->sclb_ptr->resume_control = (SCLB_RC_TFCB0 << queue);
-        tp->sclb_ptr->valid_command = SCLB_RESUME_CONTROL_VALID | SCLB_VALID;
-
-        smctr_set_ctrl_attention(dev);
-
-        return 0;
-}
-
-static int smctr_issue_test_internal_rom_cmd(struct net_device *dev)
-{
-        int err;
-
-        err = smctr_setup_single_cmd(dev, ACB_CMD_MCT_TEST,
-                TRC_INTERNAL_ROM_TEST);
-
-        return err;
-}
-
-static int smctr_issue_test_hic_cmd(struct net_device *dev)
-{
-        int err;
-
-        err = smctr_setup_single_cmd(dev, ACB_CMD_HIC_TEST,
-                TRC_HOST_INTERFACE_REG_TEST);
-
-        return err;
-}
-
-static int smctr_issue_test_mac_reg_cmd(struct net_device *dev)
-{
-        int err;
-
-        err = smctr_setup_single_cmd(dev, ACB_CMD_MCT_TEST,
-                TRC_MAC_REGISTERS_TEST);
-
-        return err;
-}
-
-static int smctr_issue_trc_loopback_cmd(struct net_device *dev)
-{
-        int err;
-
-        err = smctr_setup_single_cmd(dev, ACB_CMD_MCT_TEST,
-                TRC_INTERNAL_LOOPBACK);
-
-        return err;
-}
-
-static int smctr_issue_tri_loopback_cmd(struct net_device *dev)
-{
-        int err;
-
-        err = smctr_setup_single_cmd(dev, ACB_CMD_MCT_TEST,
-                TRC_TRI_LOOPBACK);
-
-        return err;
-}
-
-static int smctr_issue_write_byte_cmd(struct net_device *dev,
-        short aword_cnt, void *byte)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int iword, ibyte;
-        int err;
-
-        if((err = smctr_wait_while_cbusy(dev)))
-                return err;
-
-        if((err = smctr_wait_cmd(dev)))
-                return err;
-
-        for(iword = 0, ibyte = 0; iword < (unsigned int)(aword_cnt & 0xff);
-                iword++, ibyte += 2)
-        {
-                tp->misc_command_data[iword] = (*((__u8 *)byte + ibyte) << 8)
-                        | (*((__u8 *)byte + ibyte + 1));
-        }
-
-        return smctr_setup_single_cmd_w_data(dev, ACB_CMD_MCT_WRITE_VALUE,
-                aword_cnt);
-}
-
-static int smctr_issue_write_word_cmd(struct net_device *dev,
-        short aword_cnt, void *word)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int i, err;
-
-        if((err = smctr_wait_while_cbusy(dev)))
-                return err;
-
-        if((err = smctr_wait_cmd(dev)))
-                return err;
-
-        for(i = 0; i < (unsigned int)(aword_cnt & 0xff); i++)
-                tp->misc_command_data[i] = *((__u16 *)word + i);
-
-        err = smctr_setup_single_cmd_w_data(dev, ACB_CMD_MCT_WRITE_VALUE,
-                aword_cnt);
-
-        return err;
-}
-
-static int smctr_join_complete_state(struct net_device *dev)
-{
-        int err;
-
-        err = smctr_setup_single_cmd(dev, ACB_CMD_CHANGE_JOIN_STATE,
-                JS_JOIN_COMPLETE_STATE);
-
-        return err;
-}
-
-static int smctr_link_tx_fcbs_to_bdbs(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int i, j;
-        FCBlock *fcb;
-        BDBlock *bdb;
-
-        for(i = 0; i < NUM_TX_QS_USED; i++)
-        {
-                fcb = tp->tx_fcb_head[i];
-                bdb = tp->tx_bdb_head[i];
-
-                for(j = 0; j < tp->num_tx_fcbs[i]; j++)
-                {
-                        fcb->bdb_ptr            = bdb;
-                        fcb->trc_bdb_ptr        = TRC_POINTER(bdb);
-                        fcb = (FCBlock *)((char *)fcb + sizeof(FCBlock));
-                        bdb = (BDBlock *)((char *)bdb + sizeof(BDBlock));
-                }
-        }
-
-        return 0;
-}
-
-static int smctr_load_firmware(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        const struct firmware *fw;
-        __u16 i, checksum = 0;
-        int err = 0;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_load_firmware\n", dev->name);
-
-        if (request_firmware(&fw, "tr_smctr.bin", &dev->dev)) {
-                printk(KERN_ERR "%s: firmware not found\n", dev->name);
-                return UCODE_NOT_PRESENT;
-        }
-
-        tp->num_of_tx_buffs     = 4;
-        tp->mode_bits          |= UMAC;
-        tp->receive_mask        = 0;
-        tp->max_packet_size     = 4177;
-
-        /* Can only upload the firmware once per adapter reset. */
-        if (tp->microcode_version != 0) {
-                err = (UCODE_PRESENT);
-                goto out;
-        }
-
-        /* Verify the firmware exists and is there in the right amount. */
-        if (!fw->data ||
-            (*(fw->data + UCODE_VERSION_OFFSET) < UCODE_VERSION))
-        {
-                err = (UCODE_NOT_PRESENT);
-                goto out;
-        }
-
-        /* UCODE_SIZE is not included in Checksum. */
-        for(i = 0; i < *((__u16 *)(fw->data + UCODE_SIZE_OFFSET)); i += 2)
-                checksum += *((__u16 *)(fw->data + 2 + i));
-        if (checksum) {
-                err = (UCODE_NOT_PRESENT);
-                goto out;
-        }
-
-        /* At this point we have a valid firmware image, lets kick it on up. */
-        smctr_enable_adapter_ram(dev);
-        smctr_enable_16bit(dev);
-        smctr_set_page(dev, (__u8 *)tp->ram_access);
-
-        if((smctr_checksum_firmware(dev)) ||
-           (*(fw->data + UCODE_VERSION_OFFSET) > tp->microcode_version))
-        {
-                smctr_enable_adapter_ctrl_store(dev);
-
-                /* Zero out ram space for firmware. */
-                for(i = 0; i < CS_RAM_SIZE; i += 2)
-                        *((__u16 *)(tp->ram_access + i)) = 0;
-
-                smctr_decode_firmware(dev, fw);
-
-                tp->microcode_version = *(fw->data + UCODE_VERSION_OFFSET);                *((__u16 *)(tp->ram_access + CS_RAM_VERSION_OFFSET))
-                        = (tp->microcode_version << 8);
-                *((__u16 *)(tp->ram_access + CS_RAM_CHECKSUM_OFFSET))
-                        = ~(tp->microcode_version << 8) + 1;
-
-                smctr_disable_adapter_ctrl_store(dev);
-
-                if(smctr_checksum_firmware(dev))
-                        err = HARDWARE_FAILED;
-        }
-        else
-                err = UCODE_PRESENT;
-
-        smctr_disable_16bit(dev);
- out:
-        release_firmware(fw);
-        return err;
-}
-
-static int smctr_load_node_addr(struct net_device *dev)
-{
-        int ioaddr = dev->base_addr;
-        unsigned int i;
-        __u8 r;
-
-        for(i = 0; i < 6; i++)
-        {
-                r = inb(ioaddr + LAR0 + i);
-                dev->dev_addr[i] = (char)r;
-        }
-        dev->addr_len = 6;
-
-        return 0;
-}
-
-/* Lobe Media Test.
- * During the transmission of the initial 1500 lobe media MAC frames,
- * the phase lock loop in the 805 chip may lock, and then un-lock, causing
- * the 825 to go into a PURGE state. When performing a PURGE, the MCT
- * microcode will not transmit any frames given to it by the host, and
- * will consequently cause a timeout.
- *
- * NOTE 1: If the monitor_state is MS_BEACON_TEST_STATE, all transmit
- * queues other than the one used for the lobe_media_test should be
- * disabled.!?
- *
- * NOTE 2: If the monitor_state is MS_BEACON_TEST_STATE and the receive_mask
- * has any multi-cast or promiscuous bits set, the receive_mask needs to
- * be changed to clear the multi-cast or promiscuous mode bits, the lobe_test
- * run, and then the receive mask set back to its original value if the test
- * is successful.
- */
-static int smctr_lobe_media_test(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int i, perror = 0;
-        unsigned short saved_rcv_mask;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_lobe_media_test\n", dev->name);
-
-        /* Clear receive mask for lobe test. */
-        saved_rcv_mask          = tp->receive_mask;
-        tp->receive_mask        = 0;
-
-        smctr_chg_rx_mask(dev);
-
-        /* Setup the lobe media test. */
-        smctr_lobe_media_test_cmd(dev);
-        if(smctr_wait_cmd(dev))
-                goto err;
-
-        /* Tx lobe media test frames. */
-        for(i = 0; i < 1500; ++i)
-        {
-                if(smctr_send_lobe_media_test(dev))
-                {
-                        if(perror)
-                                goto err;
-                        else
-                        {
-                                perror = 1;
-                                if(smctr_lobe_media_test_cmd(dev))
-                                        goto err;
-                        }
-                }
-        }
-
-        if(smctr_send_dat(dev))
-        {
-                if(smctr_send_dat(dev))
-                        goto err;
-        }
-
-        /* Check if any frames received during test. */
-        if((tp->rx_fcb_curr[MAC_QUEUE]->frame_status) ||
-           (tp->rx_fcb_curr[NON_MAC_QUEUE]->frame_status))
-                goto err;
-
-        /* Set receive mask to "Promisc" mode. */
-        tp->receive_mask = saved_rcv_mask;
-
-        smctr_chg_rx_mask(dev);
-
-         return 0;
-err:
-        smctr_reset_adapter(dev);
-        tp->status = CLOSED;
-        return LOBE_MEDIA_TEST_FAILED;
-}
-
-static int smctr_lobe_media_test_cmd(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int err;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_lobe_media_test_cmd\n", dev->name);
-
-        /* Change to lobe media test state. */
-        if(tp->monitor_state != MS_BEACON_TEST_STATE)
-        {
-                smctr_lobe_media_test_state(dev);
-                if(smctr_wait_cmd(dev))
-                {
-                        printk(KERN_ERR "Lobe Failed test state\n");
-                        return LOBE_MEDIA_TEST_FAILED;
-                }
-        }
-
-        err = smctr_setup_single_cmd(dev, ACB_CMD_MCT_TEST,
-                TRC_LOBE_MEDIA_TEST);
-
-        return err;
-}
-
-static int smctr_lobe_media_test_state(struct net_device *dev)
-{
-        int err;
-
-        err = smctr_setup_single_cmd(dev, ACB_CMD_CHANGE_JOIN_STATE,
-                JS_LOBE_TEST_STATE);
-
-        return err;
-}
-
-static int smctr_make_8025_hdr(struct net_device *dev,
-        MAC_HEADER *rmf, MAC_HEADER *tmf, __u16 ac_fc)
-{
-        tmf->ac = MSB(ac_fc);                 /* msb is access control */
-        tmf->fc = LSB(ac_fc);                 /* lsb is frame control */
-
-        tmf->sa[0] = dev->dev_addr[0];
-        tmf->sa[1] = dev->dev_addr[1];
-        tmf->sa[2] = dev->dev_addr[2];
-        tmf->sa[3] = dev->dev_addr[3];
-        tmf->sa[4] = dev->dev_addr[4];
-        tmf->sa[5] = dev->dev_addr[5];
-
-        switch(tmf->vc)
-        {
-                /* Send RQ_INIT to RPS */
-                case RQ_INIT:
-                        tmf->da[0] = 0xc0;
-                        tmf->da[1] = 0x00;
-                        tmf->da[2] = 0x00;
-                        tmf->da[3] = 0x00;
-                        tmf->da[4] = 0x00;
-                        tmf->da[5] = 0x02;
-                        break;
-
-                /* Send RPT_TX_FORWARD to CRS */
-                case RPT_TX_FORWARD:
-                        tmf->da[0] = 0xc0;
-                        tmf->da[1] = 0x00;
-                        tmf->da[2] = 0x00;
-                        tmf->da[3] = 0x00;
-                        tmf->da[4] = 0x00;
-                        tmf->da[5] = 0x10;
-                        break;
-
-                /* Everything else goes to sender */
-                default:
-                        tmf->da[0] = rmf->sa[0];
-                        tmf->da[1] = rmf->sa[1];
-                        tmf->da[2] = rmf->sa[2];
-                        tmf->da[3] = rmf->sa[3];
-                        tmf->da[4] = rmf->sa[4];
-                        tmf->da[5] = rmf->sa[5];
-                        break;
-        }
-
-        return 0;
-}
-
-static int smctr_make_access_pri(struct net_device *dev, MAC_SUB_VECTOR *tsv)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        tsv->svi = AUTHORIZED_ACCESS_PRIORITY;
-        tsv->svl = S_AUTHORIZED_ACCESS_PRIORITY;
-
-        tsv->svv[0] = MSB(tp->authorized_access_priority);
-        tsv->svv[1] = LSB(tp->authorized_access_priority);
-
-        return 0;
-}
-
-static int smctr_make_addr_mod(struct net_device *dev, MAC_SUB_VECTOR *tsv)
-{
-        tsv->svi = ADDRESS_MODIFER;
-        tsv->svl = S_ADDRESS_MODIFER;
-
-        tsv->svv[0] = 0;
-        tsv->svv[1] = 0;
-
-        return 0;
-}
-
-static int smctr_make_auth_funct_class(struct net_device *dev,
-        MAC_SUB_VECTOR *tsv)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        tsv->svi = AUTHORIZED_FUNCTION_CLASS;
-        tsv->svl = S_AUTHORIZED_FUNCTION_CLASS;
-
-        tsv->svv[0] = MSB(tp->authorized_function_classes);
-        tsv->svv[1] = LSB(tp->authorized_function_classes);
-
-        return 0;
-}
-
-static int smctr_make_corr(struct net_device *dev,
-        MAC_SUB_VECTOR *tsv, __u16 correlator)
-{
-        tsv->svi = CORRELATOR;
-        tsv->svl = S_CORRELATOR;
-
-        tsv->svv[0] = MSB(correlator);
-        tsv->svv[1] = LSB(correlator);
-
-        return 0;
-}
-
-static int smctr_make_funct_addr(struct net_device *dev, MAC_SUB_VECTOR *tsv)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        smctr_get_functional_address(dev);
-
-        tsv->svi = FUNCTIONAL_ADDRESS;
-        tsv->svl = S_FUNCTIONAL_ADDRESS;
-
-        tsv->svv[0] = MSB(tp->misc_command_data[0]);
-        tsv->svv[1] = LSB(tp->misc_command_data[0]);
-
-        tsv->svv[2] = MSB(tp->misc_command_data[1]);
-        tsv->svv[3] = LSB(tp->misc_command_data[1]);
-
-        return 0;
-}
-
-static int smctr_make_group_addr(struct net_device *dev, MAC_SUB_VECTOR *tsv)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        smctr_get_group_address(dev);
-
-        tsv->svi = GROUP_ADDRESS;
-        tsv->svl = S_GROUP_ADDRESS;
-
-        tsv->svv[0] = MSB(tp->misc_command_data[0]);
-        tsv->svv[1] = LSB(tp->misc_command_data[0]);
-
-        tsv->svv[2] = MSB(tp->misc_command_data[1]);
-        tsv->svv[3] = LSB(tp->misc_command_data[1]);
-
-        /* Set Group Address Sub-vector to all zeros if only the
-         * Group Address/Functional Address Indicator is set.
-         */
-        if(tsv->svv[0] == 0x80 && tsv->svv[1] == 0x00 &&
-           tsv->svv[2] == 0x00 && tsv->svv[3] == 0x00)
-                tsv->svv[0] = 0x00;
-
-        return 0;
-}
-
-static int smctr_make_phy_drop_num(struct net_device *dev,
-        MAC_SUB_VECTOR *tsv)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        smctr_get_physical_drop_number(dev);
-
-        tsv->svi = PHYSICAL_DROP;
-        tsv->svl = S_PHYSICAL_DROP;
-
-        tsv->svv[0] = MSB(tp->misc_command_data[0]);
-        tsv->svv[1] = LSB(tp->misc_command_data[0]);
-
-        tsv->svv[2] = MSB(tp->misc_command_data[1]);
-        tsv->svv[3] = LSB(tp->misc_command_data[1]);
-
-        return 0;
-}
-
-static int smctr_make_product_id(struct net_device *dev, MAC_SUB_VECTOR *tsv)
-{
-        int i;
-
-        tsv->svi = PRODUCT_INSTANCE_ID;
-        tsv->svl = S_PRODUCT_INSTANCE_ID;
-
-        for(i = 0; i < 18; i++)
-                tsv->svv[i] = 0xF0;
-
-        return 0;
-}
-
-static int smctr_make_station_id(struct net_device *dev, MAC_SUB_VECTOR *tsv)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        smctr_get_station_id(dev);
-
-        tsv->svi = STATION_IDENTIFER;
-        tsv->svl = S_STATION_IDENTIFER;
-
-        tsv->svv[0] = MSB(tp->misc_command_data[0]);
-        tsv->svv[1] = LSB(tp->misc_command_data[0]);
-
-        tsv->svv[2] = MSB(tp->misc_command_data[1]);
-        tsv->svv[3] = LSB(tp->misc_command_data[1]);
-
-        tsv->svv[4] = MSB(tp->misc_command_data[2]);
-        tsv->svv[5] = LSB(tp->misc_command_data[2]);
-
-        return 0;
-}
-
-static int smctr_make_ring_station_status(struct net_device *dev,
-        MAC_SUB_VECTOR * tsv)
-{
-        tsv->svi = RING_STATION_STATUS;
-        tsv->svl = S_RING_STATION_STATUS;
-
-        tsv->svv[0] = 0;
-        tsv->svv[1] = 0;
-        tsv->svv[2] = 0;
-        tsv->svv[3] = 0;
-        tsv->svv[4] = 0;
-        tsv->svv[5] = 0;
-
-        return 0;
-}
-
-static int smctr_make_ring_station_version(struct net_device *dev,
-        MAC_SUB_VECTOR *tsv)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        tsv->svi = RING_STATION_VERSION_NUMBER;
-        tsv->svl = S_RING_STATION_VERSION_NUMBER;
-
-        tsv->svv[0] = 0xe2;            /* EBCDIC - S */
-        tsv->svv[1] = 0xd4;            /* EBCDIC - M */
-        tsv->svv[2] = 0xc3;            /* EBCDIC - C */
-        tsv->svv[3] = 0x40;            /* EBCDIC -   */
-        tsv->svv[4] = 0xe5;            /* EBCDIC - V */
-        tsv->svv[5] = 0xF0 + (tp->microcode_version >> 4);
-        tsv->svv[6] = 0xF0 + (tp->microcode_version & 0x0f);
-        tsv->svv[7] = 0x40;            /* EBCDIC -   */
-        tsv->svv[8] = 0xe7;            /* EBCDIC - X */
-
-        if(tp->extra_info & CHIP_REV_MASK)
-                tsv->svv[9] = 0xc5;    /* EBCDIC - E */
-        else
-                tsv->svv[9] = 0xc4;    /* EBCDIC - D */
-
-        return 0;
-}
-
-static int smctr_make_tx_status_code(struct net_device *dev,
-        MAC_SUB_VECTOR *tsv, __u16 tx_fstatus)
-{
-        tsv->svi = TRANSMIT_STATUS_CODE;
-        tsv->svl = S_TRANSMIT_STATUS_CODE;
-
-        tsv->svv[0] = ((tx_fstatus & 0x0100 >> 6) | IBM_PASS_SOURCE_ADDR);
-
-        /* Stripped frame status of Transmitted Frame */
-        tsv->svv[1] = tx_fstatus & 0xff;
-
-        return 0;
-}
-
-static int smctr_make_upstream_neighbor_addr(struct net_device *dev,
-        MAC_SUB_VECTOR *tsv)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        smctr_get_upstream_neighbor_addr(dev);
-
-        tsv->svi = UPSTREAM_NEIGHBOR_ADDRESS;
-        tsv->svl = S_UPSTREAM_NEIGHBOR_ADDRESS;
-
-        tsv->svv[0] = MSB(tp->misc_command_data[0]);
-        tsv->svv[1] = LSB(tp->misc_command_data[0]);
-
-        tsv->svv[2] = MSB(tp->misc_command_data[1]);
-        tsv->svv[3] = LSB(tp->misc_command_data[1]);
-
-        tsv->svv[4] = MSB(tp->misc_command_data[2]);
-        tsv->svv[5] = LSB(tp->misc_command_data[2]);
-
-        return 0;
-}
-
-static int smctr_make_wrap_data(struct net_device *dev, MAC_SUB_VECTOR *tsv)
-{
-        tsv->svi = WRAP_DATA;
-        tsv->svl = S_WRAP_DATA;
-
-        return 0;
-}
-
-/*
- * Open/initialize the board. This is called sometime after
- * booting when the 'ifconfig' program is run.
- *
- * This routine should set everything up anew at each open, even
- * registers that "should" only need to be set once at boot, so that
- * there is non-reboot way to recover if something goes wrong.
- */
-static int smctr_open(struct net_device *dev)
-{
-        int err;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_open\n", dev->name);
-
-        err = smctr_init_adapter(dev);
-        if(err < 0)
-                return err;
-
-        return err;
-}
-
-/* Interrupt driven open of Token card. */
-static int smctr_open_tr(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned long flags;
-        int err;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_open_tr\n", dev->name);
-
-        /* Now we can actually open the adapter. */
-        if(tp->status == OPEN)
-                return 0;
-        if(tp->status != INITIALIZED)
-                return -1;
-
-        /* FIXME: it would work a lot better if we masked the irq sources
-           on the card here, then we could skip the locking and poll nicely */
-        spin_lock_irqsave(&tp->lock, flags);
-        
-        smctr_set_page(dev, (__u8 *)tp->ram_access);
-
-        if((err = smctr_issue_resume_rx_fcb_cmd(dev, (short)MAC_QUEUE)))
-                goto out;
-
-        if((err = smctr_issue_resume_rx_bdb_cmd(dev, (short)MAC_QUEUE)))
-                goto out;
-
-        if((err = smctr_issue_resume_rx_fcb_cmd(dev, (short)NON_MAC_QUEUE)))
-                goto out;
-
-        if((err = smctr_issue_resume_rx_bdb_cmd(dev, (short)NON_MAC_QUEUE)))
-                goto out;
-
-        tp->status = CLOSED;
-
-        /* Insert into the Ring or Enter Loopback Mode. */
-        if((tp->mode_bits & LOOPING_MODE_MASK) == LOOPBACK_MODE_1)
-        {
-                tp->status = CLOSED;
-
-                if(!(err = smctr_issue_trc_loopback_cmd(dev)))
-                {
-                        if(!(err = smctr_wait_cmd(dev)))
-                                tp->status = OPEN;
-                }
-
-                smctr_status_chg(dev);
-        }
-        else
-        {
-                if((tp->mode_bits & LOOPING_MODE_MASK) == LOOPBACK_MODE_2)
-                {
-                        tp->status = CLOSED;
-                        if(!(err = smctr_issue_tri_loopback_cmd(dev)))
-                        {
-                                if(!(err = smctr_wait_cmd(dev)))
-                                        tp->status = OPEN;
-                        }
-
-                        smctr_status_chg(dev);
-                }
-                else
-                {
-                        if((tp->mode_bits & LOOPING_MODE_MASK)
-                                == LOOPBACK_MODE_3)
-                        {
-                                tp->status = CLOSED;
-                                if(!(err = smctr_lobe_media_test_cmd(dev)))
-                                {
-                                        if(!(err = smctr_wait_cmd(dev)))
-                                                tp->status = OPEN;
-                                }
-                                smctr_status_chg(dev);
-                        }
-                        else
-                        {
-                                if(!(err = smctr_lobe_media_test(dev)))
-                                        err = smctr_issue_insert_cmd(dev);
-                                else
-                                {
-                                        if(err == LOBE_MEDIA_TEST_FAILED)
-                                                printk(KERN_WARNING "%s: Lobe Media Test Failure - Check cable?\n", dev->name);
-                                }
-                        }
-                }
-        }
-
-out:
-        spin_unlock_irqrestore(&tp->lock, flags);
-
-        return err;
-}
-
-/* Check for a network adapter of this type, 
- * and return device structure if one exists.
- */
-struct net_device __init *smctr_probe(int unit)
-{
-        struct net_device *dev = alloc_trdev(sizeof(struct net_local));
-        static const unsigned ports[] = {
-                0x200, 0x220, 0x240, 0x260, 0x280, 0x2A0, 0x2C0, 0x2E0, 0x300,
-                0x320, 0x340, 0x360, 0x380, 0
-        };
-        const unsigned *port;
-        int err = 0;
-
-        if (!dev)
-                return ERR_PTR(-ENOMEM);
-
-        if (unit >= 0) {
-                sprintf(dev->name, "tr%d", unit);
-                netdev_boot_setup_check(dev);
-        }
-
-        if (dev->base_addr > 0x1ff)    /* Check a single specified location. */
-                err = smctr_probe1(dev, dev->base_addr);
-        else if(dev->base_addr != 0)  /* Don't probe at all. */
-                err =-ENXIO;
-        else {
-                for (port = ports; *port; port++) {
-                        err = smctr_probe1(dev, *port);
-                        if (!err)
-                                break;
-                }
-        }
-        if (err)
-                goto out;
-        err = register_netdev(dev);
-        if (err)
-                goto out1;
-        return dev;
-out1:
-#ifdef CONFIG_MCA_LEGACY
-        { struct net_local *tp = netdev_priv(dev);
-          if (tp->slot_num)
-                mca_mark_as_unused(tp->slot_num);
-        }
-#endif
-        release_region(dev->base_addr, SMCTR_IO_EXTENT);
-        free_irq(dev->irq, dev);
-out:
-        free_netdev(dev);
-        return ERR_PTR(err);
-}
-
-static const struct net_device_ops smctr_netdev_ops = {
-        .ndo_open          = smctr_open,
-        .ndo_stop          = smctr_close,
-        .ndo_start_xmit    = smctr_send_packet,
-        .ndo_tx_timeout    = smctr_timeout,
-        .ndo_get_stats     = smctr_get_stats,
-        .ndo_set_rx_mode   = smctr_set_multicast_list,
-};
-
-static int __init smctr_probe1(struct net_device *dev, int ioaddr)
-{
-        static unsigned version_printed;
-        struct net_local *tp = netdev_priv(dev);
-        int err;
-        __u32 *ram;
-
-        if(smctr_debug && version_printed++ == 0)
-                printk(version);
-
-        spin_lock_init(&tp->lock);
-        dev->base_addr = ioaddr;
-
-        /* Actually detect an adapter now. */
-        err = smctr_chk_isa(dev);
-        if(err < 0)
-        {
-                if ((err = smctr_chk_mca(dev)) < 0) {
-                        err = -ENODEV;
-                        goto out;
-                }
-        }
-
-        tp = netdev_priv(dev);
-        dev->mem_start = tp->ram_base;
-        dev->mem_end = dev->mem_start + 0x10000;
-        ram = (__u32 *)phys_to_virt(dev->mem_start);
-        tp->ram_access = *(__u32 *)&ram;
-        tp->status = NOT_INITIALIZED;
-
-        err = smctr_load_firmware(dev);
-        if(err != UCODE_PRESENT && err != SUCCESS)
-        {
-                printk(KERN_ERR "%s: Firmware load failed (%d)\n", dev->name, err);
-                err = -EIO;
-                goto out;
-        }
-
-        /* Allow user to specify ring speed on module insert. */
-        if(ringspeed == 4)
-                tp->media_type = MEDIA_UTP_4;
-        else
-                tp->media_type = MEDIA_UTP_16;
-
-        printk(KERN_INFO "%s: %s %s at Io %#4x, Irq %d, Rom %#4x, Ram %#4x.\n",
-                dev->name, smctr_name, smctr_model,
-                (unsigned int)dev->base_addr,
-                dev->irq, tp->rom_base, tp->ram_base);
-
-        dev->netdev_ops = &smctr_netdev_ops;
-        dev->watchdog_timeo     = HZ;
-        return 0;
-
-out:
-        return err;
-}
-
-static int smctr_process_rx_packet(MAC_HEADER *rmf, __u16 size,
-        struct net_device *dev, __u16 rx_status)
-{
-        struct net_local *tp = netdev_priv(dev);
-        struct sk_buff *skb;
-        __u16 rcode, correlator;
-        int err = 0;
-        __u8 xframe = 1;
-
-        rmf->vl = SWAP_BYTES(rmf->vl);
-        if(rx_status & FCB_RX_STATUS_DA_MATCHED)
-        {
-                switch(rmf->vc)
-                {
-                        /* Received MAC Frames Processed by RS. */
-                        case INIT:
-                                if((rcode = smctr_rcv_init(dev, rmf, &correlator)) == HARDWARE_FAILED)
-                                {
-                                        return rcode;
-                                }
-
-                                if((err = smctr_send_rsp(dev, rmf, rcode,
-                                        correlator)))
-                                {
-                                        return err;
-                                }
-                                break;
-
-                        case CHG_PARM:
-                                if((rcode = smctr_rcv_chg_param(dev, rmf,
-                                        &correlator)) ==HARDWARE_FAILED)
-                                {
-                                        return rcode;
-                                }
-
-                                if((err = smctr_send_rsp(dev, rmf, rcode,
-                                        correlator)))
-                                {
-                                        return err;
-                                }
-                                break;
-
-                        case RQ_ADDR:
-                                if((rcode = smctr_rcv_rq_addr_state_attch(dev,
-                                        rmf, &correlator)) != POSITIVE_ACK)
-                                {
-                                        if(rcode == HARDWARE_FAILED)
-                                                return rcode;
-                                        else
-                                                return smctr_send_rsp(dev, rmf,
-                                                        rcode, correlator);
-                                }
-
-                                if((err = smctr_send_rpt_addr(dev, rmf,
-                                        correlator)))
-                                {
-                                        return err;
-                                }
-                                break;
-
-                        case RQ_ATTCH:
-                                if((rcode = smctr_rcv_rq_addr_state_attch(dev,
-                                        rmf, &correlator)) != POSITIVE_ACK)
-                                {
-                                        if(rcode == HARDWARE_FAILED)
-                                                return rcode;
-                                        else
-                                                return smctr_send_rsp(dev, rmf,
-                                                        rcode,
-                                                        correlator);
-                                }
-
-                                if((err = smctr_send_rpt_attch(dev, rmf,
-                                        correlator)))
-                                {
-                                        return err;
-                                }
-                                break;
-
-                        case RQ_STATE:
-                                if((rcode = smctr_rcv_rq_addr_state_attch(dev,
-                                        rmf, &correlator)) != POSITIVE_ACK)
-                                {
-                                        if(rcode == HARDWARE_FAILED)
-                                                return rcode;
-                                        else
-                                                return smctr_send_rsp(dev, rmf,
-                                                        rcode,
-                                                        correlator);
-                                }
-
-                                if((err = smctr_send_rpt_state(dev, rmf,
-                                        correlator)))
-                                {
-                                        return err;
-                                }
-                                break;
-
-                        case TX_FORWARD: {
-                                __u16 uninitialized_var(tx_fstatus);
-
-                                if((rcode = smctr_rcv_tx_forward(dev, rmf))
-                                        != POSITIVE_ACK)
-                                {
-                                        if(rcode == HARDWARE_FAILED)
-                                                return rcode;
-                                        else
-                                                return smctr_send_rsp(dev, rmf,
-                                                        rcode,
-                                                        correlator);
-                                }
-
-                                if((err = smctr_send_tx_forward(dev, rmf,
-                                        &tx_fstatus)) == HARDWARE_FAILED)
-                                {
-                                        return err;
-                                }
-
-                                if(err == A_FRAME_WAS_FORWARDED)
-                                {
-                                        if((err = smctr_send_rpt_tx_forward(dev,
-                                                rmf, tx_fstatus))
-                                                == HARDWARE_FAILED)
-                                        {
-                                                return err;
-                                        }
-                                }
-                                break;
-                        }
-
-                        /* Received MAC Frames Processed by CRS/REM/RPS. */
-                        case RSP:
-                        case RQ_INIT:
-                        case RPT_NEW_MON:
-                        case RPT_SUA_CHG:
-                        case RPT_ACTIVE_ERR:
-                        case RPT_NN_INCMP:
-                        case RPT_ERROR:
-                        case RPT_ATTCH:
-                        case RPT_STATE:
-                        case RPT_ADDR:
-                                break;
-
-                        /* Rcvd Att. MAC Frame (if RXATMAC set) or UNKNOWN */
-                        default:
-                                xframe = 0;
-                                if(!(tp->receive_mask & ACCEPT_ATT_MAC_FRAMES))
-                                {
-                                        rcode = smctr_rcv_unknown(dev, rmf,
-                                                &correlator);
-                                        if((err = smctr_send_rsp(dev, rmf,rcode,
-                                                correlator)))
-                                        {
-                                                return err;
-                                        }
-                                }
-
-                                break;
-                }
-        }
-        else
-        {
-                /* 1. DA doesn't match (Promiscuous Mode).
-                 * 2. Parse for Extended MAC Frame Type.
-                 */
-                switch(rmf->vc)
-                {
-                        case RSP:
-                        case INIT:
-                        case RQ_INIT:
-                        case RQ_ADDR:
-                        case RQ_ATTCH:
-                        case RQ_STATE:
-                        case CHG_PARM:
-                        case RPT_ADDR:
-                        case RPT_ERROR:
-                        case RPT_ATTCH:
-                        case RPT_STATE:
-                        case RPT_NEW_MON:
-                        case RPT_SUA_CHG:
-                        case RPT_NN_INCMP:
-                        case RPT_ACTIVE_ERR:
-                                break;
-
-                        default:
-                                xframe = 0;
-                                break;
-                }
-        }
-
-        /* NOTE: UNKNOWN MAC frames will NOT be passed up unless
-         * ACCEPT_ATT_MAC_FRAMES is set.
-         */
-        if(((tp->receive_mask & ACCEPT_ATT_MAC_FRAMES) &&
-            (xframe == (__u8)0)) ||
-           ((tp->receive_mask & ACCEPT_EXT_MAC_FRAMES) &&
-            (xframe == (__u8)1)))
-        {
-                rmf->vl = SWAP_BYTES(rmf->vl);
-
-                if (!(skb = dev_alloc_skb(size)))
-                        return -ENOMEM;
-                skb->len = size;
-
-                /* Slide data into a sleek skb. */
-                skb_put(skb, skb->len);
-                skb_copy_to_linear_data(skb, rmf, skb->len);
-
-                /* Update Counters */
-                tp->MacStat.rx_packets++;
-                tp->MacStat.rx_bytes += skb->len;
-
-                /* Kick the packet on up. */
-                skb->protocol = tr_type_trans(skb, dev);
-                netif_rx(skb);
-                err = 0;
-        }
-
-        return err;
-}
-
-/* Adapter RAM test. Incremental word ODD boundary data test. */
-static int smctr_ram_memory_test(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        __u16 page, pages_of_ram, start_pattern = 0, word_pattern = 0,
-                word_read = 0, err_word = 0, err_pattern = 0;
-        unsigned int err_offset;
-        __u32 j, pword;
-        __u8 err = 0;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_ram_memory_test\n", dev->name);
-
-        start_pattern   = 0x0001;
-        pages_of_ram    = tp->ram_size / tp->ram_usable;
-        pword           = tp->ram_access;
-
-        /* Incremental word ODD boundary test. */
-        for(page = 0; (page < pages_of_ram) && (~err);
-                page++, start_pattern += 0x8000)
-        {
-                smctr_set_page(dev, (__u8 *)(tp->ram_access
-                        + (page * tp->ram_usable * 1024) + 1));
-                word_pattern = start_pattern;
-
-                for(j = 1; j < (__u32)(tp->ram_usable * 1024) - 1; j += 2)
-                        *(__u16 *)(pword + j) = word_pattern++;
-
-                word_pattern = start_pattern;
-
-                for(j = 1; j < (__u32)(tp->ram_usable * 1024) - 1 && (~err);
-                    j += 2, word_pattern++)
-                {
-                        word_read = *(__u16 *)(pword + j);
-                        if(word_read != word_pattern)
-                        {
-                                err             = (__u8)1;
-                                err_offset      = j;
-                                err_word        = word_read;
-                                err_pattern     = word_pattern;
-                                return RAM_TEST_FAILED;
-                        }
-                }
-        }
-
-        /* Zero out memory. */
-        for(page = 0; page < pages_of_ram && (~err); page++)
-        {
-                smctr_set_page(dev, (__u8 *)(tp->ram_access
-                        + (page * tp->ram_usable * 1024)));
-                word_pattern = 0;
-
-                for(j = 0; j < (__u32)tp->ram_usable * 1024; j +=2)
-                        *(__u16 *)(pword + j) = word_pattern;
-
-                for(j =0; j < (__u32)tp->ram_usable * 1024 && (~err); j += 2)
-                {
-                        word_read = *(__u16 *)(pword + j);
-                        if(word_read != word_pattern)
-                        {
-                                err             = (__u8)1;
-                                err_offset      = j;
-                                err_word        = word_read;
-                                err_pattern     = word_pattern;
-                                return RAM_TEST_FAILED;
-                        }
-                }
-        }
-
-        smctr_set_page(dev, (__u8 *)tp->ram_access);
-
-        return 0;
-}
-
-static int smctr_rcv_chg_param(struct net_device *dev, MAC_HEADER *rmf,
-        __u16 *correlator)
-{
-        MAC_SUB_VECTOR *rsv;
-        signed short vlen;
-        __u16 rcode = POSITIVE_ACK;
-        unsigned int svectors = F_NO_SUB_VECTORS_FOUND;
-
-        /* This Frame can only come from a CRS */
-        if((rmf->dc_sc & SC_MASK) != SC_CRS)
-                return E_INAPPROPRIATE_SOURCE_CLASS;
-
-        /* Remove MVID Length from total length. */
-        vlen = (signed short)rmf->vl - 4;
-
-        /* Point to First SVID */
-        rsv = (MAC_SUB_VECTOR *)((__u32)rmf + sizeof(MAC_HEADER));
-
-        /* Search for Appropriate SVID's. */
-        while((vlen > 0) && (rcode == POSITIVE_ACK))
-        {
-                switch(rsv->svi)
-                {
-                        case CORRELATOR:
-                                svectors |= F_CORRELATOR;
-                                rcode = smctr_set_corr(dev, rsv, correlator);
-                                break;
-
-                        case LOCAL_RING_NUMBER:
-                                svectors |= F_LOCAL_RING_NUMBER;
-                                rcode = smctr_set_local_ring_num(dev, rsv);
-                                break;
-
-                        case ASSIGN_PHYSICAL_DROP:
-                                svectors |= F_ASSIGN_PHYSICAL_DROP;
-                                rcode = smctr_set_phy_drop(dev, rsv);
-                                break;
-
-                        case ERROR_TIMER_VALUE:
-                                svectors |= F_ERROR_TIMER_VALUE;
-                                rcode = smctr_set_error_timer_value(dev, rsv);
-                                break;
-
-                        case AUTHORIZED_FUNCTION_CLASS:
-                                svectors |= F_AUTHORIZED_FUNCTION_CLASS;
-                                rcode = smctr_set_auth_funct_class(dev, rsv);
-                                break;
-
-                        case AUTHORIZED_ACCESS_PRIORITY:
-                                svectors |= F_AUTHORIZED_ACCESS_PRIORITY;
-                                rcode = smctr_set_auth_access_pri(dev, rsv);
-                                break;
-
-                        default:
-                                rcode = E_SUB_VECTOR_UNKNOWN;
-                                break;
-                }
-
-                /* Let Sender Know if SUM of SV length's is
-                 * larger then length in MVID length field
-                 */
-                if((vlen -= rsv->svl) < 0)
-                        rcode = E_VECTOR_LENGTH_ERROR;
-
-                rsv = (MAC_SUB_VECTOR *)((__u32)rsv + rsv->svl);
-        }
-
-        if(rcode == POSITIVE_ACK)
-        {
-                /* Let Sender Know if MVID length field
-                 * is larger then SUM of SV length's
-                 */
-                if(vlen != 0)
-                        rcode = E_VECTOR_LENGTH_ERROR;
-                else
-                {
-                        /* Let Sender Know if Expected SVID Missing */
-                        if((svectors & R_CHG_PARM) ^ R_CHG_PARM)
-                                rcode = E_MISSING_SUB_VECTOR;
-                }
-        }
-
-        return rcode;
-}
-
-static int smctr_rcv_init(struct net_device *dev, MAC_HEADER *rmf,
-        __u16 *correlator)
-{
-        MAC_SUB_VECTOR *rsv;
-        signed short vlen;
-        __u16 rcode = POSITIVE_ACK;
-        unsigned int svectors = F_NO_SUB_VECTORS_FOUND;
-
-        /* This Frame can only come from a RPS */
-        if((rmf->dc_sc & SC_MASK) != SC_RPS)
-                return E_INAPPROPRIATE_SOURCE_CLASS;
-
-        /* Remove MVID Length from total length. */
-        vlen = (signed short)rmf->vl - 4;
-
-        /* Point to First SVID */
-        rsv = (MAC_SUB_VECTOR *)((__u32)rmf + sizeof(MAC_HEADER));
-
-        /* Search for Appropriate SVID's */
-        while((vlen > 0) && (rcode == POSITIVE_ACK))
-        {
-                switch(rsv->svi)
-                {
-                        case CORRELATOR:
-                                svectors |= F_CORRELATOR;
-                                rcode = smctr_set_corr(dev, rsv, correlator);
-                                break;
-
-                        case LOCAL_RING_NUMBER:
-                                svectors |= F_LOCAL_RING_NUMBER;
-                                rcode = smctr_set_local_ring_num(dev, rsv);
-                                break;
-
-                        case ASSIGN_PHYSICAL_DROP:
-                                svectors |= F_ASSIGN_PHYSICAL_DROP;
-                                rcode = smctr_set_phy_drop(dev, rsv);
-                                break;
-
-                        case ERROR_TIMER_VALUE:
-                                svectors |= F_ERROR_TIMER_VALUE;
-                                rcode = smctr_set_error_timer_value(dev, rsv);
-                                break;
-
-                        default:
-                                rcode = E_SUB_VECTOR_UNKNOWN;
-                                break;
-                }
-
-                /* Let Sender Know if SUM of SV length's is
-                 * larger then length in MVID length field
-                 */
-                if((vlen -= rsv->svl) < 0)
-                        rcode = E_VECTOR_LENGTH_ERROR;
-
-                rsv = (MAC_SUB_VECTOR *)((__u32)rsv + rsv->svl);
-        }
-
-        if(rcode == POSITIVE_ACK)
-        {
-                /* Let Sender Know if MVID length field
-                 * is larger then SUM of SV length's
-                 */
-                if(vlen != 0)
-                        rcode = E_VECTOR_LENGTH_ERROR;
-                else
-                {
-                        /* Let Sender Know if Expected SV Missing */
-                        if((svectors & R_INIT) ^ R_INIT)
-                                rcode = E_MISSING_SUB_VECTOR;
-                }
-        }
-
-        return rcode;
-}
-
-static int smctr_rcv_tx_forward(struct net_device *dev, MAC_HEADER *rmf)
-{
-        MAC_SUB_VECTOR *rsv;
-        signed short vlen;
-        __u16 rcode = POSITIVE_ACK;
-        unsigned int svectors = F_NO_SUB_VECTORS_FOUND;
-
-        /* This Frame can only come from a CRS */
-        if((rmf->dc_sc & SC_MASK) != SC_CRS)
-                return E_INAPPROPRIATE_SOURCE_CLASS;
-
-        /* Remove MVID Length from total length */
-        vlen = (signed short)rmf->vl - 4;
-
-        /* Point to First SVID */
-        rsv = (MAC_SUB_VECTOR *)((__u32)rmf + sizeof(MAC_HEADER));
-
-        /* Search for Appropriate SVID's */
-        while((vlen > 0) && (rcode == POSITIVE_ACK))
-        {
-                switch(rsv->svi)
-                {
-                        case FRAME_FORWARD:
-                                svectors |= F_FRAME_FORWARD;
-                                rcode = smctr_set_frame_forward(dev, rsv, 
-                                        rmf->dc_sc);
-                                break;
-
-                        default:
-                                rcode = E_SUB_VECTOR_UNKNOWN;
-                                break;
-                }
-
-                /* Let Sender Know if SUM of SV length's is
-                 * larger then length in MVID length field
-                 */
-                if((vlen -= rsv->svl) < 0)
-                        rcode = E_VECTOR_LENGTH_ERROR;
-
-                rsv = (MAC_SUB_VECTOR *)((__u32)rsv + rsv->svl);
-        }
-
-        if(rcode == POSITIVE_ACK)
-        {
-                /* Let Sender Know if MVID length field
-                 * is larger then SUM of SV length's
-                 */
-                if(vlen != 0)
-                        rcode = E_VECTOR_LENGTH_ERROR;
-                else
-                {
-                        /* Let Sender Know if Expected SV Missing */
-                        if((svectors & R_TX_FORWARD) ^ R_TX_FORWARD)
-                                rcode = E_MISSING_SUB_VECTOR;
-                }
-        }
-
-        return rcode;
-}
-
-static int smctr_rcv_rq_addr_state_attch(struct net_device *dev,
-        MAC_HEADER *rmf, __u16 *correlator)
-{
-        MAC_SUB_VECTOR *rsv;
-        signed short vlen;
-        __u16 rcode = POSITIVE_ACK;
-        unsigned int svectors = F_NO_SUB_VECTORS_FOUND;
-
-        /* Remove MVID Length from total length */
-        vlen = (signed short)rmf->vl - 4;
-
-        /* Point to First SVID */
-        rsv = (MAC_SUB_VECTOR *)((__u32)rmf + sizeof(MAC_HEADER));
-
-        /* Search for Appropriate SVID's */
-        while((vlen > 0) && (rcode == POSITIVE_ACK))
-        {
-                switch(rsv->svi)
-                {
-                        case CORRELATOR:
-                                svectors |= F_CORRELATOR;
-                                rcode = smctr_set_corr(dev, rsv, correlator);
-                                break;
-
-                        default:
-                                rcode = E_SUB_VECTOR_UNKNOWN;
-                                break;
-                }
-
-                /* Let Sender Know if SUM of SV length's is
-                 * larger then length in MVID length field
-                 */
-                if((vlen -= rsv->svl) < 0)
-                        rcode = E_VECTOR_LENGTH_ERROR;
-
-                rsv = (MAC_SUB_VECTOR *)((__u32)rsv + rsv->svl);
-        }
-
-        if(rcode == POSITIVE_ACK)
-        {
-                /* Let Sender Know if MVID length field
-                 * is larger then SUM of SV length's
-                 */
-                if(vlen != 0)
-                        rcode = E_VECTOR_LENGTH_ERROR;
-                else
-                {
-                        /* Let Sender Know if Expected SVID Missing */
-                        if((svectors & R_RQ_ATTCH_STATE_ADDR) 
-                                ^ R_RQ_ATTCH_STATE_ADDR)
-                                rcode = E_MISSING_SUB_VECTOR;
-                        }
-        }
-
-        return rcode;
-}
-
-static int smctr_rcv_unknown(struct net_device *dev, MAC_HEADER *rmf,
-        __u16 *correlator)
-{
-        MAC_SUB_VECTOR *rsv;
-        signed short vlen;
-
-        *correlator = 0;
-
-        /* Remove MVID Length from total length */
-        vlen = (signed short)rmf->vl - 4;
-
-        /* Point to First SVID */
-        rsv = (MAC_SUB_VECTOR *)((__u32)rmf + sizeof(MAC_HEADER));
-
-        /* Search for CORRELATOR for RSP to UNKNOWN */
-        while((vlen > 0) && (*correlator == 0))
-        {
-                switch(rsv->svi)
-                {
-                        case CORRELATOR:
-                                smctr_set_corr(dev, rsv, correlator);
-                                break;
-
-                        default:
-                                break;
-                }
-
-                vlen -= rsv->svl;
-                rsv = (MAC_SUB_VECTOR *)((__u32)rsv + rsv->svl);
-        }
-
-        return E_UNRECOGNIZED_VECTOR_ID;
-}
-
-/*
- * Reset the 825 NIC and exit w:
- * 1. The NIC reset cleared (non-reset state), halted and un-initialized.
- * 2. TINT masked.
- * 3. CBUSY masked.
- * 4. TINT clear.
- * 5. CBUSY clear.
- */
-static int smctr_reset_adapter(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int ioaddr = dev->base_addr;
-
-        /* Reseting the NIC will put it in a halted and un-initialized state. */        smctr_set_trc_reset(ioaddr);
-        mdelay(200); /* ~2 ms */
-
-        smctr_clear_trc_reset(ioaddr);
-        mdelay(200); /* ~2 ms */
-
-        /* Remove any latched interrupts that occurred prior to reseting the
-         * adapter or possibily caused by line glitches due to the reset.
-         */
-        outb(tp->trc_mask | CSR_CLRTINT | CSR_CLRCBUSY, ioaddr + CSR);
-
-        return 0;
-}
-
-static int smctr_restart_tx_chain(struct net_device *dev, short queue)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int err = 0;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_restart_tx_chain\n", dev->name);
-
-        if(tp->num_tx_fcbs_used[queue] != 0 &&
-           tp->tx_queue_status[queue] == NOT_TRANSMITING)
-        {
-                tp->tx_queue_status[queue] = TRANSMITING;
-                err = smctr_issue_resume_tx_fcb_cmd(dev, queue);
-        }
-
-        return err;
-}
-
-static int smctr_ring_status_chg(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_ring_status_chg\n", dev->name);
-
-        /* Check for ring_status_flag: whenever MONITOR_STATE_BIT
-         * Bit is set, check value of monitor_state, only then we
-         * enable and start transmit/receive timeout (if and only
-         * if it is MS_ACTIVE_MONITOR_STATE or MS_STANDBY_MONITOR_STATE)
-         */
-        if(tp->ring_status_flags == MONITOR_STATE_CHANGED)
-        {
-                if((tp->monitor_state == MS_ACTIVE_MONITOR_STATE) ||
-                   (tp->monitor_state == MS_STANDBY_MONITOR_STATE))
-                {
-                        tp->monitor_state_ready = 1;
-                }
-                else
-                {
-                        /* if adapter is NOT in either active monitor
-                         * or standby monitor state => Disable
-                         * transmit/receive timeout.
-                         */
-                        tp->monitor_state_ready = 0;
-
-                        /* Ring speed problem, switching to auto mode. */
-                        if(tp->monitor_state == MS_MONITOR_FSM_INACTIVE &&
-                           !tp->cleanup)
-                        {
-                                printk(KERN_INFO "%s: Incorrect ring speed switching.\n",
-                                        dev->name);
-                                smctr_set_ring_speed(dev);
-                        }
-                }
-        }
-
-        if(!(tp->ring_status_flags & RING_STATUS_CHANGED))
-                return 0;
-
-        switch(tp->ring_status)
-        {
-                case RING_RECOVERY:
-                        printk(KERN_INFO "%s: Ring Recovery\n", dev->name);
-                        break;
-
-                case SINGLE_STATION:
-                        printk(KERN_INFO "%s: Single Statinon\n", dev->name);
-                        break;
-
-                case COUNTER_OVERFLOW:
-                        printk(KERN_INFO "%s: Counter Overflow\n", dev->name);
-                        break;
-
-                case REMOVE_RECEIVED:
-                        printk(KERN_INFO "%s: Remove Received\n", dev->name);
-                        break;
-
-                case AUTO_REMOVAL_ERROR:
-                        printk(KERN_INFO "%s: Auto Remove Error\n", dev->name);
-                        break;
-
-                case LOBE_WIRE_FAULT:
-                        printk(KERN_INFO "%s: Lobe Wire Fault\n", dev->name);
-                        break;
-
-                case TRANSMIT_BEACON:
-                        printk(KERN_INFO "%s: Transmit Beacon\n", dev->name);
-                        break;
-
-                case SOFT_ERROR:
-                        printk(KERN_INFO "%s: Soft Error\n", dev->name);
-                        break;
-
-                case HARD_ERROR:
-                        printk(KERN_INFO "%s: Hard Error\n", dev->name);
-                        break;
-
-                case SIGNAL_LOSS:
-                        printk(KERN_INFO "%s: Signal Loss\n", dev->name);
-                        break;
-
-                default:
-                        printk(KERN_INFO "%s: Unknown ring status change\n",
-                                dev->name);
-                        break;
-        }
-
-        return 0;
-}
-
-static int smctr_rx_frame(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        __u16 queue, status, rx_size, err = 0;
-        __u8 *pbuff;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_rx_frame\n", dev->name);
-
-        queue = tp->receive_queue_number;
-
-        while((status = tp->rx_fcb_curr[queue]->frame_status) != SUCCESS)
-        {
-                err = HARDWARE_FAILED;
-
-                if(((status & 0x007f) == 0) ||
-                   ((tp->receive_mask & ACCEPT_ERR_PACKETS) != 0))
-                {
-                        /* frame length less the CRC (4 bytes) + FS (1 byte) */
-                        rx_size = tp->rx_fcb_curr[queue]->frame_length - 5;
-
-                        pbuff = smctr_get_rx_pointer(dev, queue);
-
-                        smctr_set_page(dev, pbuff);
-                        smctr_disable_16bit(dev);
-
-                        /* pbuff points to addr within one page */
-                        pbuff = (__u8 *)PAGE_POINTER(pbuff);
-
-                        if(queue == NON_MAC_QUEUE)
-                        {
-                                struct sk_buff *skb;
-
-                                skb = dev_alloc_skb(rx_size);
-                                if (skb) {
-                                        skb_put(skb, rx_size);
-
-                                        skb_copy_to_linear_data(skb, pbuff, rx_size);
-
-                                        /* Update Counters */
-                                        tp->MacStat.rx_packets++;
-                                        tp->MacStat.rx_bytes += skb->len;
-
-                                        /* Kick the packet on up. */
-                                        skb->protocol = tr_type_trans(skb, dev);
-                                        netif_rx(skb);
-                                } else {
-                                }
-                        }
-                        else
-                                smctr_process_rx_packet((MAC_HEADER *)pbuff,
-                                        rx_size, dev, status);
-                }
-
-                smctr_enable_16bit(dev);
-                smctr_set_page(dev, (__u8 *)tp->ram_access);
-                smctr_update_rx_chain(dev, queue);
-
-                if(err != SUCCESS)
-                        break;
-        }
-
-        return err;
-}
-
-static int smctr_send_dat(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int i, err;
-        MAC_HEADER *tmf;
-        FCBlock *fcb;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_send_dat\n", dev->name);
-
-        if((fcb = smctr_get_tx_fcb(dev, MAC_QUEUE,
-                sizeof(MAC_HEADER))) == (FCBlock *)(-1L))
-        {
-                return OUT_OF_RESOURCES;
-        }
-
-        /* Initialize DAT Data Fields. */
-        tmf = (MAC_HEADER *)fcb->bdb_ptr->data_block_ptr;
-        tmf->ac = MSB(AC_FC_DAT);
-        tmf->fc = LSB(AC_FC_DAT);
-
-        for(i = 0; i < 6; i++)
-        {
-                tmf->sa[i] = dev->dev_addr[i];
-                tmf->da[i] = dev->dev_addr[i];
-
-        }
-
-        tmf->vc        = DAT;
-        tmf->dc_sc     = DC_RS | SC_RS;
-        tmf->vl        = 4;
-        tmf->vl        = SWAP_BYTES(tmf->vl);
-
-        /* Start Transmit. */
-        if((err = smctr_trc_send_packet(dev, fcb, MAC_QUEUE)))
-                return err;
-
-        /* Wait for Transmit to Complete */
-        for(i = 0; i < 10000; i++)
-        {
-                if(fcb->frame_status & FCB_COMMAND_DONE)
-                        break;
-                mdelay(1);
-        }
-
-        /* Check if GOOD frame Tx'ed. */
-        if(!(fcb->frame_status &  FCB_COMMAND_DONE) ||
-           fcb->frame_status & (FCB_TX_STATUS_E | FCB_TX_AC_BITS))
-        {
-                return INITIALIZE_FAILED;
-        }
-
-        /* De-allocated Tx FCB and Frame Buffer
-         * The FCB must be de-allocated manually if executing with
-         * interrupts disabled, other wise the ISR (LM_Service_Events)
-         * will de-allocate it when the interrupt occurs.
-         */
-        tp->tx_queue_status[MAC_QUEUE] = NOT_TRANSMITING;
-        smctr_update_tx_chain(dev, fcb, MAC_QUEUE);
-
-        return 0;
-}
-
-static void smctr_timeout(struct net_device *dev)
-{
-        /*
-         * If we get here, some higher level has decided we are broken.
-         * There should really be a "kick me" function call instead.
-         *
-         * Resetting the token ring adapter takes a long time so just
-         * fake transmission time and go on trying. Our own timeout
-         * routine is in sktr_timer_chk()
-         */
-        dev->trans_start = jiffies; /* prevent tx timeout */
-        netif_wake_queue(dev);
-}
-
-/*
- * Gets skb from system, queues it and checks if it can be sent
- */
-static netdev_tx_t smctr_send_packet(struct sk_buff *skb,
-                                           struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_send_packet\n", dev->name);
-
-        /*
-         * Block a transmit overlap
-         */
-         
-        netif_stop_queue(dev);
-
-        if(tp->QueueSkb == 0)
-                return NETDEV_TX_BUSY;     /* Return with tbusy set: queue full */
-
-        tp->QueueSkb--;
-        skb_queue_tail(&tp->SendSkbQueue, skb);
-        smctr_hardware_send_packet(dev, tp);
-        if(tp->QueueSkb > 0)
-                netif_wake_queue(dev);
-                
-        return NETDEV_TX_OK;
-}
-
-static int smctr_send_lobe_media_test(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        MAC_SUB_VECTOR *tsv;
-        MAC_HEADER *tmf;
-        FCBlock *fcb;
-        __u32 i;
-        int err;
-
-        if(smctr_debug > 15)
-                printk(KERN_DEBUG "%s: smctr_send_lobe_media_test\n", dev->name);
-
-        if((fcb = smctr_get_tx_fcb(dev, MAC_QUEUE, sizeof(struct trh_hdr)
-                + S_WRAP_DATA + S_WRAP_DATA)) == (FCBlock *)(-1L))
-        {
-                return OUT_OF_RESOURCES;
-        }
-
-        /* Initialize DAT Data Fields. */
-        tmf = (MAC_HEADER *)fcb->bdb_ptr->data_block_ptr;
-        tmf->ac = MSB(AC_FC_LOBE_MEDIA_TEST);
-        tmf->fc = LSB(AC_FC_LOBE_MEDIA_TEST);
-
-        for(i = 0; i < 6; i++)
-        {
-                tmf->da[i] = 0;
-                tmf->sa[i] = dev->dev_addr[i];
-        }
-
-        tmf->vc        = LOBE_MEDIA_TEST;
-        tmf->dc_sc     = DC_RS | SC_RS;
-        tmf->vl        = 4;
-
-        tsv = (MAC_SUB_VECTOR *)((__u32)tmf + sizeof(MAC_HEADER));
-        smctr_make_wrap_data(dev, tsv);
-        tmf->vl += tsv->svl;
-
-        tsv = (MAC_SUB_VECTOR *)((__u32)tsv + tsv->svl);
-        smctr_make_wrap_data(dev, tsv);
-        tmf->vl += tsv->svl;
-
-        /* Start Transmit. */
-        tmf->vl = SWAP_BYTES(tmf->vl);
-        if((err = smctr_trc_send_packet(dev, fcb, MAC_QUEUE)))
-                return err;
-
-        /* Wait for Transmit to Complete. (10 ms). */
-        for(i=0; i < 10000; i++)
-        {
-                if(fcb->frame_status & FCB_COMMAND_DONE)
-                        break;
-                mdelay(1);
-        }
-
-        /* Check if GOOD frame Tx'ed */
-        if(!(fcb->frame_status & FCB_COMMAND_DONE) ||
-           fcb->frame_status & (FCB_TX_STATUS_E | FCB_TX_AC_BITS))
-        {
-                return LOBE_MEDIA_TEST_FAILED;
-        }
-
-        /* De-allocated Tx FCB and Frame Buffer
-         * The FCB must be de-allocated manually if executing with
-         * interrupts disabled, other wise the ISR (LM_Service_Events)
-         * will de-allocate it when the interrupt occurs.
-         */
-        tp->tx_queue_status[MAC_QUEUE] = NOT_TRANSMITING;
-        smctr_update_tx_chain(dev, fcb, MAC_QUEUE);
-
-        return 0;
-}
-
-static int smctr_send_rpt_addr(struct net_device *dev, MAC_HEADER *rmf,
-        __u16 correlator)
-{
-        MAC_HEADER *tmf;
-        MAC_SUB_VECTOR *tsv;
-        FCBlock *fcb;
-
-        if((fcb = smctr_get_tx_fcb(dev, MAC_QUEUE, sizeof(MAC_HEADER)
-                + S_CORRELATOR + S_PHYSICAL_DROP + S_UPSTREAM_NEIGHBOR_ADDRESS
-                + S_ADDRESS_MODIFER + S_GROUP_ADDRESS + S_FUNCTIONAL_ADDRESS))
-                == (FCBlock *)(-1L))
-        {
-                return 0;
-        }
-
-        tmf             = (MAC_HEADER *)fcb->bdb_ptr->data_block_ptr;
-        tmf->vc         = RPT_ADDR;
-        tmf->dc_sc      = (rmf->dc_sc & SC_MASK) << 4;
-        tmf->vl         = 4;
-
-        smctr_make_8025_hdr(dev, rmf, tmf, AC_FC_RPT_ADDR);
-
-        tsv = (MAC_SUB_VECTOR *)((__u32)tmf + sizeof(MAC_HEADER));
-        smctr_make_corr(dev, tsv, correlator);
-
-        tmf->vl += tsv->svl;
-        tsv = (MAC_SUB_VECTOR *)((__u32)tsv + tsv->svl);
-        smctr_make_phy_drop_num(dev, tsv);
-
-        tmf->vl += tsv->svl;
-        tsv = (MAC_SUB_VECTOR *)((__u32)tsv + tsv->svl);
-        smctr_make_upstream_neighbor_addr(dev, tsv);
-
-        tmf->vl += tsv->svl;
-        tsv = (MAC_SUB_VECTOR *)((__u32)tsv + tsv->svl);
-        smctr_make_addr_mod(dev, tsv);
-
-        tmf->vl += tsv->svl;
-        tsv = (MAC_SUB_VECTOR *)((__u32)tsv + tsv->svl);
-        smctr_make_group_addr(dev, tsv);
-
-        tmf->vl += tsv->svl;
-        tsv = (MAC_SUB_VECTOR *)((__u32)tsv + tsv->svl);
-        smctr_make_funct_addr(dev, tsv);
-
-        tmf->vl += tsv->svl;
-
-        /* Subtract out MVID and MVL which is
-         * include in both vl and MAC_HEADER
-         */
-/*      fcb->frame_length           = tmf->vl + sizeof(MAC_HEADER) - 4;
-        fcb->bdb_ptr->buffer_length = tmf->vl + sizeof(MAC_HEADER) - 4;
-*/
-        tmf->vl = SWAP_BYTES(tmf->vl);
-
-        return smctr_trc_send_packet(dev, fcb, MAC_QUEUE);
-}
-
-static int smctr_send_rpt_attch(struct net_device *dev, MAC_HEADER *rmf,
-        __u16 correlator)
-{
-        MAC_HEADER *tmf;
-        MAC_SUB_VECTOR *tsv;
-        FCBlock *fcb;
-
-        if((fcb = smctr_get_tx_fcb(dev, MAC_QUEUE, sizeof(MAC_HEADER)
-                + S_CORRELATOR + S_PRODUCT_INSTANCE_ID + S_FUNCTIONAL_ADDRESS
-                + S_AUTHORIZED_FUNCTION_CLASS + S_AUTHORIZED_ACCESS_PRIORITY))
-                == (FCBlock *)(-1L))
-        {
-                return 0;
-        }
-
-        tmf        = (MAC_HEADER *)fcb->bdb_ptr->data_block_ptr;
-        tmf->vc    = RPT_ATTCH;
-        tmf->dc_sc = (rmf->dc_sc & SC_MASK) << 4;
-        tmf->vl    = 4;
-
-        smctr_make_8025_hdr(dev, rmf, tmf, AC_FC_RPT_ATTCH);
-
-        tsv = (MAC_SUB_VECTOR *)((__u32)tmf + sizeof(MAC_HEADER));
-        smctr_make_corr(dev, tsv, correlator);
-
-        tmf->vl += tsv->svl;
-        tsv = (MAC_SUB_VECTOR *)((__u32)tsv + tsv->svl);
-        smctr_make_product_id(dev, tsv);
-
-        tmf->vl += tsv->svl;
-        tsv = (MAC_SUB_VECTOR *)((__u32)tsv + tsv->svl);
-        smctr_make_funct_addr(dev, tsv);
-
-        tmf->vl += tsv->svl;
-        tsv = (MAC_SUB_VECTOR *)((__u32)tsv + tsv->svl);
-        smctr_make_auth_funct_class(dev, tsv);
-
-        tmf->vl += tsv->svl;
-        tsv = (MAC_SUB_VECTOR *)((__u32)tsv + tsv->svl);
-        smctr_make_access_pri(dev, tsv);
-
-        tmf->vl += tsv->svl;
-
-        /* Subtract out MVID and MVL which is
-         * include in both vl and MAC_HEADER
-         */
-/*      fcb->frame_length           = tmf->vl + sizeof(MAC_HEADER) - 4;
-        fcb->bdb_ptr->buffer_length = tmf->vl + sizeof(MAC_HEADER) - 4;
-*/
-        tmf->vl = SWAP_BYTES(tmf->vl);
-
-        return smctr_trc_send_packet(dev, fcb, MAC_QUEUE);
-}
-
-static int smctr_send_rpt_state(struct net_device *dev, MAC_HEADER *rmf,
-        __u16 correlator)
-{
-        MAC_HEADER *tmf;
-        MAC_SUB_VECTOR *tsv;
-        FCBlock *fcb;
-
-        if((fcb = smctr_get_tx_fcb(dev, MAC_QUEUE, sizeof(MAC_HEADER)
-                + S_CORRELATOR + S_RING_STATION_VERSION_NUMBER
-                + S_RING_STATION_STATUS + S_STATION_IDENTIFER))
-                == (FCBlock *)(-1L))
-        {
-                return 0;
-        }
-
-        tmf        = (MAC_HEADER *)fcb->bdb_ptr->data_block_ptr;
-        tmf->vc    = RPT_STATE;
-        tmf->dc_sc = (rmf->dc_sc & SC_MASK) << 4;
-        tmf->vl    = 4;
-
-        smctr_make_8025_hdr(dev, rmf, tmf, AC_FC_RPT_STATE);
-
-        tsv = (MAC_SUB_VECTOR *)((__u32)tmf + sizeof(MAC_HEADER));
-        smctr_make_corr(dev, tsv, correlator);
-
-        tmf->vl += tsv->svl;
-        tsv = (MAC_SUB_VECTOR *)((__u32)tsv + tsv->svl);
-        smctr_make_ring_station_version(dev, tsv);
-
-        tmf->vl += tsv->svl;
-        tsv = (MAC_SUB_VECTOR *)((__u32)tsv + tsv->svl);
-        smctr_make_ring_station_status(dev, tsv);
-
-        tmf->vl += tsv->svl;
-        tsv = (MAC_SUB_VECTOR *)((__u32)tsv + tsv->svl);
-        smctr_make_station_id(dev, tsv);
-
-        tmf->vl += tsv->svl;
-
-        /* Subtract out MVID and MVL which is
-         * include in both vl and MAC_HEADER
-         */
-/*      fcb->frame_length           = tmf->vl + sizeof(MAC_HEADER) - 4;
-        fcb->bdb_ptr->buffer_length = tmf->vl + sizeof(MAC_HEADER) - 4;
-*/
-        tmf->vl = SWAP_BYTES(tmf->vl);
-
-        return smctr_trc_send_packet(dev, fcb, MAC_QUEUE);
-}
-
-static int smctr_send_rpt_tx_forward(struct net_device *dev,
-        MAC_HEADER *rmf, __u16 tx_fstatus)
-{
-        MAC_HEADER *tmf;
-        MAC_SUB_VECTOR *tsv;
-        FCBlock *fcb;
-
-        if((fcb = smctr_get_tx_fcb(dev, MAC_QUEUE, sizeof(MAC_HEADER)
-                + S_TRANSMIT_STATUS_CODE)) == (FCBlock *)(-1L))
-        {
-                return 0;
-        }
-
-        tmf        = (MAC_HEADER *)fcb->bdb_ptr->data_block_ptr;
-        tmf->vc    = RPT_TX_FORWARD;
-        tmf->dc_sc = (rmf->dc_sc & SC_MASK) << 4;
-        tmf->vl    = 4;
-
-        smctr_make_8025_hdr(dev, rmf, tmf, AC_FC_RPT_TX_FORWARD);
-
-        tsv = (MAC_SUB_VECTOR *)((__u32)tmf + sizeof(MAC_HEADER));
-        smctr_make_tx_status_code(dev, tsv, tx_fstatus);
-
-        tmf->vl += tsv->svl;
-
-        /* Subtract out MVID and MVL which is
-         * include in both vl and MAC_HEADER
-         */
-/*      fcb->frame_length           = tmf->vl + sizeof(MAC_HEADER) - 4;
-        fcb->bdb_ptr->buffer_length = tmf->vl + sizeof(MAC_HEADER) - 4;
-*/
-        tmf->vl = SWAP_BYTES(tmf->vl);
-
-        return smctr_trc_send_packet(dev, fcb, MAC_QUEUE);
-}
-
-static int smctr_send_rsp(struct net_device *dev, MAC_HEADER *rmf,
-        __u16 rcode, __u16 correlator)
-{
-        MAC_HEADER *tmf;
-        MAC_SUB_VECTOR *tsv;
-        FCBlock *fcb;
-
-        if((fcb = smctr_get_tx_fcb(dev, MAC_QUEUE, sizeof(MAC_HEADER)
-                + S_CORRELATOR + S_RESPONSE_CODE)) == (FCBlock *)(-1L))
-        {
-                return 0;
-        }
-
-        tmf        = (MAC_HEADER *)fcb->bdb_ptr->data_block_ptr;
-        tmf->vc    = RSP;
-        tmf->dc_sc = (rmf->dc_sc & SC_MASK) << 4;
-        tmf->vl    = 4;
-
-        smctr_make_8025_hdr(dev, rmf, tmf, AC_FC_RSP);
-
-        tsv = (MAC_SUB_VECTOR *)((__u32)tmf + sizeof(MAC_HEADER));
-        smctr_make_corr(dev, tsv, correlator);
-
-        return 0;
-}
-
-static int smctr_send_rq_init(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        MAC_HEADER *tmf;
-        MAC_SUB_VECTOR *tsv;
-        FCBlock *fcb;
-        unsigned int i, count = 0;
-        __u16 fstatus;
-        int err;
-
-        do {
-                if(((fcb = smctr_get_tx_fcb(dev, MAC_QUEUE, sizeof(MAC_HEADER)
-                        + S_PRODUCT_INSTANCE_ID + S_UPSTREAM_NEIGHBOR_ADDRESS
-                        + S_RING_STATION_VERSION_NUMBER + S_ADDRESS_MODIFER))
-                        == (FCBlock *)(-1L)))
-                {
-                        return 0;
-                }
-
-                tmf        = (MAC_HEADER *)fcb->bdb_ptr->data_block_ptr;
-                tmf->vc    = RQ_INIT;
-                tmf->dc_sc = DC_RPS | SC_RS;
-                tmf->vl    = 4;
-
-                smctr_make_8025_hdr(dev, NULL, tmf, AC_FC_RQ_INIT);
-
-                tsv = (MAC_SUB_VECTOR *)((__u32)tmf + sizeof(MAC_HEADER));
-                smctr_make_product_id(dev, tsv);
-
-                tmf->vl += tsv->svl;
-                tsv = (MAC_SUB_VECTOR *)((__u32)tsv + tsv->svl);
-                smctr_make_upstream_neighbor_addr(dev, tsv);
-
-                tmf->vl += tsv->svl;
-                tsv = (MAC_SUB_VECTOR *)((__u32)tsv + tsv->svl);
-                smctr_make_ring_station_version(dev, tsv);
-
-                tmf->vl += tsv->svl;
-                tsv = (MAC_SUB_VECTOR *)((__u32)tsv + tsv->svl);
-                smctr_make_addr_mod(dev, tsv);
-
-                tmf->vl += tsv->svl;
-
-                /* Subtract out MVID and MVL which is
-                 * include in both vl and MAC_HEADER
-                 */
-/*              fcb->frame_length           = tmf->vl + sizeof(MAC_HEADER) - 4;
-                fcb->bdb_ptr->buffer_length = tmf->vl + sizeof(MAC_HEADER) - 4;
-*/
-                tmf->vl = SWAP_BYTES(tmf->vl);
-
-                if((err = smctr_trc_send_packet(dev, fcb, MAC_QUEUE)))
-                        return err;
-
-                /* Wait for Transmit to Complete */
-                for(i = 0; i < 10000; i++) 
-                {
-                        if(fcb->frame_status & FCB_COMMAND_DONE)
-                                break;
-                        mdelay(1);
-                }
-
-                /* Check if GOOD frame Tx'ed */
-                fstatus = fcb->frame_status;
-
-                if(!(fstatus & FCB_COMMAND_DONE))
-                        return HARDWARE_FAILED;
-
-                if(!(fstatus & FCB_TX_STATUS_E))
-                        count++;
-
-                /* De-allocated Tx FCB and Frame Buffer
-                 * The FCB must be de-allocated manually if executing with
-                 * interrupts disabled, other wise the ISR (LM_Service_Events)
-                 * will de-allocate it when the interrupt occurs.
-                 */
-                tp->tx_queue_status[MAC_QUEUE] = NOT_TRANSMITING;
-                smctr_update_tx_chain(dev, fcb, MAC_QUEUE);
-        } while(count < 4 && ((fstatus & FCB_TX_AC_BITS) ^ FCB_TX_AC_BITS));
-
-        return smctr_join_complete_state(dev);
-}
-
-static int smctr_send_tx_forward(struct net_device *dev, MAC_HEADER *rmf,
-        __u16 *tx_fstatus)
-{
-        struct net_local *tp = netdev_priv(dev);
-        FCBlock *fcb;
-        unsigned int i;
-        int err;
-
-        /* Check if this is the END POINT of the Transmit Forward Chain. */
-        if(rmf->vl <= 18)
-                return 0;
-
-        /* Allocate Transmit FCB only by requesting 0 bytes
-         * of data buffer.
-         */
-        if((fcb = smctr_get_tx_fcb(dev, MAC_QUEUE, 0)) == (FCBlock *)(-1L))
-                return 0;
-
-        /* Set pointer to Transmit Frame Buffer to the data
-         * portion of the received TX Forward frame, making
-         * sure to skip over the Vector Code (vc) and Vector
-         * length (vl).
-         */
-        fcb->bdb_ptr->trc_data_block_ptr = TRC_POINTER((__u32)rmf 
-                + sizeof(MAC_HEADER) + 2);
-        fcb->bdb_ptr->data_block_ptr     = (__u16 *)((__u32)rmf 
-                + sizeof(MAC_HEADER) + 2);
-
-        fcb->frame_length                = rmf->vl - 4 - 2;
-        fcb->bdb_ptr->buffer_length      = rmf->vl - 4 - 2;
-
-        if((err = smctr_trc_send_packet(dev, fcb, MAC_QUEUE)))
-                return err;
-
-        /* Wait for Transmit to Complete */
-        for(i = 0; i < 10000; i++) 
-        {
-                if(fcb->frame_status & FCB_COMMAND_DONE)
-                        break;
-                mdelay(1);
-        }
-
-        /* Check if GOOD frame Tx'ed */
-        if(!(fcb->frame_status & FCB_COMMAND_DONE))
-        {
-                if((err = smctr_issue_resume_tx_fcb_cmd(dev, MAC_QUEUE)))
-                        return err;
-
-                for(i = 0; i < 10000; i++) 
-                {
-                        if(fcb->frame_status & FCB_COMMAND_DONE)
-                                break;
-                        mdelay(1);
-                }
-
-                if(!(fcb->frame_status & FCB_COMMAND_DONE))
-                        return HARDWARE_FAILED;
-        }
-
-        *tx_fstatus = fcb->frame_status;
-
-        return A_FRAME_WAS_FORWARDED;
-}
-
-static int smctr_set_auth_access_pri(struct net_device *dev,
-        MAC_SUB_VECTOR *rsv)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        if(rsv->svl != S_AUTHORIZED_ACCESS_PRIORITY)
-                return E_SUB_VECTOR_LENGTH_ERROR;
-
-        tp->authorized_access_priority = (rsv->svv[0] << 8 | rsv->svv[1]);
-
-        return POSITIVE_ACK;
-}
-
-static int smctr_set_auth_funct_class(struct net_device *dev,
-        MAC_SUB_VECTOR *rsv)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        if(rsv->svl != S_AUTHORIZED_FUNCTION_CLASS)
-                return E_SUB_VECTOR_LENGTH_ERROR;
-
-        tp->authorized_function_classes = (rsv->svv[0] << 8 | rsv->svv[1]);
-
-        return POSITIVE_ACK;
-}
-
-static int smctr_set_corr(struct net_device *dev, MAC_SUB_VECTOR *rsv,
-        __u16 *correlator)
-{
-        if(rsv->svl != S_CORRELATOR)
-                return E_SUB_VECTOR_LENGTH_ERROR;
-
-        *correlator = (rsv->svv[0] << 8 | rsv->svv[1]);
-
-        return POSITIVE_ACK;
-}
-
-static int smctr_set_error_timer_value(struct net_device *dev,
-        MAC_SUB_VECTOR *rsv)
-{
-        __u16 err_tval;
-        int err;
-
-        if(rsv->svl != S_ERROR_TIMER_VALUE)
-                return E_SUB_VECTOR_LENGTH_ERROR;
-
-        err_tval = (rsv->svv[0] << 8 | rsv->svv[1])*10;
-
-        smctr_issue_write_word_cmd(dev, RW_TER_THRESHOLD, &err_tval);
-
-        if((err = smctr_wait_cmd(dev)))
-                return err;
-
-        return POSITIVE_ACK;
-}
-
-static int smctr_set_frame_forward(struct net_device *dev,
-        MAC_SUB_VECTOR *rsv, __u8 dc_sc)
-{
-        if((rsv->svl < 2) || (rsv->svl > S_FRAME_FORWARD))
-                return E_SUB_VECTOR_LENGTH_ERROR;
-
-        if((dc_sc & DC_MASK) != DC_CRS)
-        {
-                if(rsv->svl >= 2 && rsv->svl < 20)
-                        return E_TRANSMIT_FORWARD_INVALID;
-
-                if((rsv->svv[0] != 0) || (rsv->svv[1] != 0))
-                        return E_TRANSMIT_FORWARD_INVALID;
-        }
-
-        return POSITIVE_ACK;
-}
-
-static int smctr_set_local_ring_num(struct net_device *dev,
-        MAC_SUB_VECTOR *rsv)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        if(rsv->svl != S_LOCAL_RING_NUMBER)
-                return E_SUB_VECTOR_LENGTH_ERROR;
-
-        if(tp->ptr_local_ring_num)
-                *(__u16 *)(tp->ptr_local_ring_num) 
-                        = (rsv->svv[0] << 8 | rsv->svv[1]);
-
-        return POSITIVE_ACK;
-}
-
-static unsigned short smctr_set_ctrl_attention(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int ioaddr = dev->base_addr;
-
-        if(tp->bic_type == BIC_585_CHIP)
-                outb((tp->trc_mask | HWR_CA), ioaddr + HWR);
-        else
-        {
-                outb((tp->trc_mask | CSR_CA), ioaddr + CSR);
-                outb(tp->trc_mask, ioaddr + CSR);
-        }
-
-        return 0;
-}
-
-static void smctr_set_multicast_list(struct net_device *dev)
-{
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_set_multicast_list\n", dev->name);
-}
-
-static int smctr_set_page(struct net_device *dev, __u8 *buf)
-{
-        struct net_local *tp = netdev_priv(dev);
-        __u8 amask;
-        __u32 tptr;
-
-        tptr = (__u32)buf - (__u32)tp->ram_access;
-        amask = (__u8)((tptr & PR_PAGE_MASK) >> 8);
-        outb(amask, dev->base_addr + PR);
-
-        return 0;
-}
-
-static int smctr_set_phy_drop(struct net_device *dev, MAC_SUB_VECTOR *rsv)
-{
-        int err;
-
-        if(rsv->svl != S_PHYSICAL_DROP)
-                return E_SUB_VECTOR_LENGTH_ERROR;
-
-        smctr_issue_write_byte_cmd(dev, RW_PHYSICAL_DROP_NUMBER, &rsv->svv[0]);
-        if((err = smctr_wait_cmd(dev)))
-                return err;
-
-        return POSITIVE_ACK;
-}
-
-/* Reset the ring speed to the opposite of what it was. This auto-pilot
- * mode requires a complete reset and re-init of the adapter.
- */
-static int smctr_set_ring_speed(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int err;
-
-        if(tp->media_type == MEDIA_UTP_16)
-                tp->media_type = MEDIA_UTP_4;
-        else
-                tp->media_type = MEDIA_UTP_16;
-
-        smctr_enable_16bit(dev);
-
-        /* Re-Initialize adapter's internal registers */
-        smctr_reset_adapter(dev);
-
-        if((err = smctr_init_card_real(dev)))
-                return err;
-
-        smctr_enable_bic_int(dev);
-
-        if((err = smctr_issue_enable_int_cmd(dev, TRC_INTERRUPT_ENABLE_MASK)))
-                return err;
-
-        smctr_disable_16bit(dev);
-
-        return 0;
-}
-
-static int smctr_set_rx_look_ahead(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        __u16 sword, rword;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_set_rx_look_ahead_flag\n", dev->name);
-
-        tp->adapter_flags &= ~(FORCED_16BIT_MODE);
-        tp->adapter_flags |= RX_VALID_LOOKAHEAD;
-
-        if(tp->adapter_bus == BUS_ISA16_TYPE)
-        {
-                sword = *((__u16 *)(tp->ram_access));
-                *((__u16 *)(tp->ram_access)) = 0x1234;
-
-                smctr_disable_16bit(dev);
-                rword = *((__u16 *)(tp->ram_access));
-                smctr_enable_16bit(dev);
-
-                if(rword != 0x1234)
-                        tp->adapter_flags |= FORCED_16BIT_MODE;
-
-                *((__u16 *)(tp->ram_access)) = sword;
-        }
-
-        return 0;
-}
-
-static int smctr_set_trc_reset(int ioaddr)
-{
-        __u8 r;
-
-        r = inb(ioaddr + MSR);
-        outb(MSR_RST | r, ioaddr + MSR);
-
-        return 0;
-}
-
-/*
- * This function can be called if the adapter is busy or not.
- */
-static int smctr_setup_single_cmd(struct net_device *dev,
-        __u16 command, __u16 subcommand)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int err;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_setup_single_cmd\n", dev->name);
-
-        if((err = smctr_wait_while_cbusy(dev)))
-                return err;
-
-        if((err = (unsigned int)smctr_wait_cmd(dev)))
-                return err;
-
-        tp->acb_head->cmd_done_status   = 0;
-        tp->acb_head->cmd               = command;
-        tp->acb_head->subcmd            = subcommand;
-
-        err = smctr_issue_resume_acb_cmd(dev);
-
-        return err;
-}
-
-/*
- * This function can not be called with the adapter busy.
- */
-static int smctr_setup_single_cmd_w_data(struct net_device *dev,
-        __u16 command, __u16 subcommand)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        tp->acb_head->cmd_done_status   = ACB_COMMAND_NOT_DONE;
-        tp->acb_head->cmd               = command;
-        tp->acb_head->subcmd            = subcommand;
-        tp->acb_head->data_offset_lo
-                = (__u16)TRC_POINTER(tp->misc_command_data);
-
-        return smctr_issue_resume_acb_cmd(dev);
-}
-
-static char *smctr_malloc(struct net_device *dev, __u16 size)
-{
-        struct net_local *tp = netdev_priv(dev);
-        char *m;
-
-        m = (char *)(tp->ram_access + tp->sh_mem_used);
-        tp->sh_mem_used += (__u32)size;
-
-        return m;
-}
-
-static int smctr_status_chg(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_status_chg\n", dev->name);
-
-        switch(tp->status)
-        {
-                case OPEN:
-                        break;
-
-                case CLOSED:
-                        break;
-
-                /* Interrupt driven open() completion. XXX */
-                case INITIALIZED:
-                        tp->group_address_0 = 0;
-                        tp->group_address[0] = 0;
-                        tp->group_address[1] = 0;
-                        tp->functional_address_0 = 0;
-                        tp->functional_address[0] = 0;
-                        tp->functional_address[1] = 0;
-                        smctr_open_tr(dev);
-                        break;
-
-                default:
-                        printk(KERN_INFO "%s: status change unknown %x\n",
-                                dev->name, tp->status);
-                        break;
-        }
-
-        return 0;
-}
-
-static int smctr_trc_send_packet(struct net_device *dev, FCBlock *fcb,
-        __u16 queue)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int err = 0;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_trc_send_packet\n", dev->name);
-
-        fcb->info = FCB_CHAIN_END | FCB_ENABLE_TFS;
-        if(tp->num_tx_fcbs[queue] != 1)
-                fcb->back_ptr->info = FCB_INTERRUPT_ENABLE | FCB_ENABLE_TFS;
-
-        if(tp->tx_queue_status[queue] == NOT_TRANSMITING)
-        {
-                tp->tx_queue_status[queue] = TRANSMITING;
-                err = smctr_issue_resume_tx_fcb_cmd(dev, queue);
-        }
-
-        return err;
-}
-
-static __u16 smctr_tx_complete(struct net_device *dev, __u16 queue)
-{
-        struct net_local *tp = netdev_priv(dev);
-        __u16 status, err = 0;
-        int cstatus;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_tx_complete\n", dev->name);
-
-        while((status = tp->tx_fcb_end[queue]->frame_status) != SUCCESS)
-        {
-                if(status & 0x7e00 )
-                {
-                        err = HARDWARE_FAILED;
-                        break;
-                }
-
-                if((err = smctr_update_tx_chain(dev, tp->tx_fcb_end[queue],
-                        queue)) != SUCCESS)
-                        break;
-
-                smctr_disable_16bit(dev);
-
-                if(tp->mode_bits & UMAC)
-                {
-                        if(!(status & (FCB_TX_STATUS_AR1 | FCB_TX_STATUS_AR2)))
-                                cstatus = NO_SUCH_DESTINATION;
-                        else
-                        {
-                                if(!(status & (FCB_TX_STATUS_CR1 | FCB_TX_STATUS_CR2)))
-                                        cstatus = DEST_OUT_OF_RESOURCES;
-                                else
-                                {
-                                        if(status & FCB_TX_STATUS_E)
-                                                cstatus = MAX_COLLISIONS;
-                                        else
-                                                cstatus = SUCCESS;
-                                }
-                        }
-                }
-                else
-                        cstatus = SUCCESS;
-
-                if(queue == BUG_QUEUE)
-                        err = SUCCESS;
-
-                smctr_enable_16bit(dev);
-                if(err != SUCCESS)
-                        break;
-        }
-
-        return err;
-}
-
-static unsigned short smctr_tx_move_frame(struct net_device *dev,
-        struct sk_buff *skb, __u8 *pbuff, unsigned int bytes)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int ram_usable;
-        __u32 flen, len, offset = 0;
-        __u8 *frag, *page;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_tx_move_frame\n", dev->name);
-
-        ram_usable = ((unsigned int)tp->ram_usable) << 10;
-        frag       = skb->data;
-        flen       = skb->len;
-
-        while(flen > 0 && bytes > 0)
-        {
-                smctr_set_page(dev, pbuff);
-
-                offset = SMC_PAGE_OFFSET(pbuff);
-
-                if(offset + flen > ram_usable)
-                        len = ram_usable - offset;
-                else
-                        len = flen;
-
-                if(len > bytes)
-                        len = bytes;
-
-                page = (char *) (offset + tp->ram_access);
-                memcpy(page, frag, len);
-
-                flen -=len;
-                bytes -= len;
-                frag += len;
-                pbuff += len;
-        }
-
-        return 0;
-}
-
-/* Update the error statistic counters for this adapter. */
-static int smctr_update_err_stats(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        struct tr_statistics *tstat = &tp->MacStat;
-
-        if(tstat->internal_errors)
-                tstat->internal_errors
-                        += *(tp->misc_command_data + 0) & 0x00ff;
-
-        if(tstat->line_errors)
-                tstat->line_errors += *(tp->misc_command_data + 0) >> 8;
-
-        if(tstat->A_C_errors)
-                tstat->A_C_errors += *(tp->misc_command_data + 1) & 0x00ff;
-
-        if(tstat->burst_errors)
-                tstat->burst_errors += *(tp->misc_command_data + 1) >> 8;
-
-        if(tstat->abort_delimiters)
-                tstat->abort_delimiters += *(tp->misc_command_data + 2) >> 8;
-
-        if(tstat->recv_congest_count)
-                tstat->recv_congest_count
-                        += *(tp->misc_command_data + 3) & 0x00ff;
-
-        if(tstat->lost_frames)
-                tstat->lost_frames
-                        += *(tp->misc_command_data + 3) >> 8;
-
-        if(tstat->frequency_errors)
-                tstat->frequency_errors += *(tp->misc_command_data + 4) & 0x00ff;
-
-        if(tstat->frame_copied_errors)
-                 tstat->frame_copied_errors
-                        += *(tp->misc_command_data + 4) >> 8;
-
-        if(tstat->token_errors)
-                tstat->token_errors += *(tp->misc_command_data + 5) >> 8;
-
-        return 0;
-}
-
-static int smctr_update_rx_chain(struct net_device *dev, __u16 queue)
-{
-        struct net_local *tp = netdev_priv(dev);
-        FCBlock *fcb;
-        BDBlock *bdb;
-        __u16 size, len;
-
-        fcb = tp->rx_fcb_curr[queue];
-        len = fcb->frame_length;
-
-        fcb->frame_status = 0;
-        fcb->info = FCB_CHAIN_END;
-        fcb->back_ptr->info = FCB_WARNING;
-
-        tp->rx_fcb_curr[queue] = tp->rx_fcb_curr[queue]->next_ptr;
-
-        /* update RX BDBs */
-        size = (len >> RX_BDB_SIZE_SHIFT);
-        if(len & RX_DATA_BUFFER_SIZE_MASK)
-                size += sizeof(BDBlock);
-        size &= (~RX_BDB_SIZE_MASK);
-
-        /* check if wrap around */
-        bdb = (BDBlock *)((__u32)(tp->rx_bdb_curr[queue]) + (__u32)(size));
-        if((__u32)bdb >= (__u32)tp->rx_bdb_end[queue])
-        {
-                bdb = (BDBlock *)((__u32)(tp->rx_bdb_head[queue])
-                        + (__u32)(bdb) - (__u32)(tp->rx_bdb_end[queue]));
-        }
-
-        bdb->back_ptr->info = BDB_CHAIN_END;
-        tp->rx_bdb_curr[queue]->back_ptr->info = BDB_NOT_CHAIN_END;
-        tp->rx_bdb_curr[queue] = bdb;
-
-        return 0;
-}
-
-static int smctr_update_tx_chain(struct net_device *dev, FCBlock *fcb,
-        __u16 queue)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        if(smctr_debug > 20)
-                printk(KERN_DEBUG "smctr_update_tx_chain\n");
-
-        if(tp->num_tx_fcbs_used[queue] <= 0)
-                return HARDWARE_FAILED;
-        else
-        {
-                if(tp->tx_buff_used[queue] < fcb->memory_alloc)
-                {
-                        tp->tx_buff_used[queue] = 0;
-                        return HARDWARE_FAILED;
-                }
-
-                tp->tx_buff_used[queue] -= fcb->memory_alloc;
-
-                /* if all transmit buffer are cleared
-                 * need to set the tx_buff_curr[] to tx_buff_head[]
-                 * otherwise, tx buffer will be segregate and cannot
-                 * accommodate and buffer greater than (curr - head) and
-                 * (end - curr) since we do not allow wrap around allocation.
-                 */
-                if(tp->tx_buff_used[queue] == 0)
-                        tp->tx_buff_curr[queue] = tp->tx_buff_head[queue];
-
-                tp->num_tx_fcbs_used[queue]--;
-                fcb->frame_status = 0;
-                tp->tx_fcb_end[queue] = fcb->next_ptr;
-                netif_wake_queue(dev);
-                return 0;
-        }
-}
-
-static int smctr_wait_cmd(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int loop_count = 0x20000;
-
-        if(smctr_debug > 10)
-                printk(KERN_DEBUG "%s: smctr_wait_cmd\n", dev->name);
-
-        while(loop_count)
-        {
-                if(tp->acb_head->cmd_done_status & ACB_COMMAND_DONE)
-                        break;
-                udelay(1);
-                loop_count--;
-        }
-
-        if(loop_count == 0)
-                return HARDWARE_FAILED;
-
-        if(tp->acb_head->cmd_done_status & 0xff)
-                return HARDWARE_FAILED;
-
-        return 0;
-}
-
-static int smctr_wait_while_cbusy(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int timeout = 0x20000;
-        int ioaddr = dev->base_addr;
-        __u8 r;
-
-        if(tp->bic_type == BIC_585_CHIP)
-        {
-                while(timeout)
-                {
-                        r = inb(ioaddr + HWR);
-                        if((r & HWR_CBUSY) == 0)
-                                break;
-                        timeout--;
-                }
-        }
-        else
-        {
-                while(timeout)
-                {
-                        r = inb(ioaddr + CSR);
-                        if((r & CSR_CBUSY) == 0)
-                                break;
-                        timeout--;
-                }
-        }
-
-        if(timeout)
-                return 0;
-        else
-                return HARDWARE_FAILED;
-}
-
-#ifdef MODULE
-
-static struct net_device* dev_smctr[SMCTR_MAX_ADAPTERS];
-static int io[SMCTR_MAX_ADAPTERS];
-static int irq[SMCTR_MAX_ADAPTERS];
-
-MODULE_LICENSE("GPL");
-MODULE_FIRMWARE("tr_smctr.bin");
-
-module_param_array(io, int, NULL, 0);
-module_param_array(irq, int, NULL, 0);
-module_param(ringspeed, int, 0);
-
-static struct net_device * __init setup_card(int n)
-{
-        struct net_device *dev = alloc_trdev(sizeof(struct net_local));
-        int err;
-        
-        if (!dev)
-                return ERR_PTR(-ENOMEM);
-
-        dev->irq = irq[n];
-        err = smctr_probe1(dev, io[n]);
-        if (err) 
-                goto out;
-                
-        err = register_netdev(dev);
-        if (err)
-                goto out1;
-        return dev;
- out1:
-#ifdef CONFIG_MCA_LEGACY
-        { struct net_local *tp = netdev_priv(dev);
-          if (tp->slot_num)
-                mca_mark_as_unused(tp->slot_num);
-        }
-#endif
-        release_region(dev->base_addr, SMCTR_IO_EXTENT);
-        free_irq(dev->irq, dev);
-out:
-        free_netdev(dev);
-        return ERR_PTR(err);
-}
-
-int __init init_module(void)
-{
-        int i, found = 0;
-        struct net_device *dev;
-
-        for(i = 0; i < SMCTR_MAX_ADAPTERS; i++) {
-                dev = io[0]? setup_card(i) : smctr_probe(-1);
-                if (!IS_ERR(dev)) {
-                        ++found;
-                        dev_smctr[i] = dev;
-                }
-        }
-
-        return found ? 0 : -ENODEV;
-}
-
-void __exit cleanup_module(void)
-{
-        int i;
-
-        for(i = 0; i < SMCTR_MAX_ADAPTERS; i++) {
-                struct net_device *dev = dev_smctr[i];
-
-                if (dev) {
-
-                        unregister_netdev(dev);
-#ifdef CONFIG_MCA_LEGACY
-                        { struct net_local *tp = netdev_priv(dev);
-                        if (tp->slot_num)
-                                mca_mark_as_unused(tp->slot_num);
-                        }
-#endif
-                        release_region(dev->base_addr, SMCTR_IO_EXTENT);
-                        if (dev->irq)
-                                free_irq(dev->irq, dev);
-
-                        free_netdev(dev);
-                }
-        }
-}
-#endif /* MODULE */
diff --git a/drivers/net/tokenring/smctr.h b/drivers/net/tokenring/smctr.h
deleted file mode 100644
index 6e5700ab4fc3..000000000000
--- a/drivers/net/tokenring/smctr.h
+++ /dev/null
@@ -1,1585 +0,0 @@
-/* smctr.h: SMC Token Ring driver header for Linux
- *
- * Authors:
- *  - Jay Schulist <jschlst@samba.org>
- */
-
-#ifndef __LINUX_SMCTR_H
-#define __LINUX_SMCTR_H
-
-#ifdef __KERNEL__
-
-#define MAX_TX_QUEUE 10
-
-#define SMC_HEADER_SIZE 14
-
-#define SMC_PAGE_OFFSET(X)          (((unsigned long)(X) - tp->ram_access) & tp->page_offset_mask)
-
-#define INIT            0x0D
-#define RQ_ATTCH        0x10
-#define RQ_STATE        0x0F
-#define RQ_ADDR         0x0E
-#define CHG_PARM        0x0C
-#define RSP             0x00
-#define TX_FORWARD      0x09
-
-#define AC_FC_DAT       ((3<<13) | 1)
-#define      DAT             0x07
-
-#define RPT_NEW_MON     0x25
-#define RPT_SUA_CHG     0x26
-#define RPT_ACTIVE_ERR  0x28
-#define RPT_NN_INCMP    0x27
-#define RPT_ERROR       0x29
-
-#define RQ_INIT         0x20
-#define RPT_ATTCH       0x24
-#define RPT_STATE       0x23
-#define RPT_ADDR        0x22
-
-#define POSITIVE_ACK                    0x0001
-#define A_FRAME_WAS_FORWARDED           0x8888
-
-#define      GROUP_ADDRESS                   0x2B
-#define      PHYSICAL_DROP                   0x0B
-#define      AUTHORIZED_ACCESS_PRIORITY      0x07
-#define      AUTHORIZED_FUNCTION_CLASS       0x06
-#define      FUNCTIONAL_ADDRESS              0x2C
-#define      RING_STATION_STATUS             0x29
-#define      TRANSMIT_STATUS_CODE            0x2A
-#define      IBM_PASS_SOURCE_ADDR    0x01
-#define      AC_FC_RPT_TX_FORWARD            ((0<<13) | 0)
-#define      AC_FC_RPT_STATE                 ((0<<13) | 0)
-#define      AC_FC_RPT_ADDR                  ((0<<13) | 0)
-#define      CORRELATOR                      0x09
-
-#define POSITIVE_ACK                    0x0001          /*             */
-#define E_MAC_DATA_INCOMPLETE           0x8001          /* not used    */
-#define E_VECTOR_LENGTH_ERROR           0x8002          /*             */
-#define E_UNRECOGNIZED_VECTOR_ID        0x8003          /*             */
-#define E_INAPPROPRIATE_SOURCE_CLASS    0x8004          /*             */
-#define E_SUB_VECTOR_LENGTH_ERROR       0x8005          /*             */
-#define E_TRANSMIT_FORWARD_INVALID      0x8006          /* def. by IBM */
-#define E_MISSING_SUB_VECTOR            0x8007          /*             */
-#define E_SUB_VECTOR_UNKNOWN            0x8008          /*             */
-#define E_MAC_HEADER_TOO_LONG           0x8009          /*             */
-#define E_FUNCTION_DISABLED             0x800A          /* not used    */
-
-#define A_FRAME_WAS_FORWARDED           0x8888          /* used by send_TX_FORWARD */
-
-#define UPSTREAM_NEIGHBOR_ADDRESS       0x02
-#define LOCAL_RING_NUMBER               0x03
-#define ASSIGN_PHYSICAL_DROP            0x04
-#define ERROR_TIMER_VALUE               0x05
-#define AUTHORIZED_FUNCTION_CLASS       0x06
-#define AUTHORIZED_ACCESS_PRIORITY      0x07
-#define CORRELATOR                      0x09
-#define PHYSICAL_DROP                   0x0B
-#define RESPONSE_CODE                   0x20
-#define ADDRESS_MODIFER                 0x21
-#define PRODUCT_INSTANCE_ID             0x22
-#define RING_STATION_VERSION_NUMBER     0x23
-#define WRAP_DATA                       0x26
-#define FRAME_FORWARD                   0x27
-#define STATION_IDENTIFER               0x28
-#define RING_STATION_STATUS             0x29
-#define TRANSMIT_STATUS_CODE            0x2A
-#define GROUP_ADDRESS                   0x2B
-#define FUNCTIONAL_ADDRESS              0x2C
-
-#define F_NO_SUB_VECTORS_FOUND                  0x0000
-#define F_UPSTREAM_NEIGHBOR_ADDRESS             0x0001
-#define F_LOCAL_RING_NUMBER                     0x0002
-#define F_ASSIGN_PHYSICAL_DROP                  0x0004
-#define F_ERROR_TIMER_VALUE                     0x0008
-#define F_AUTHORIZED_FUNCTION_CLASS             0x0010
-#define F_AUTHORIZED_ACCESS_PRIORITY            0x0020
-#define F_CORRELATOR                            0x0040
-#define F_PHYSICAL_DROP                         0x0080
-#define F_RESPONSE_CODE                         0x0100
-#define F_PRODUCT_INSTANCE_ID                   0x0200
-#define F_RING_STATION_VERSION_NUMBER           0x0400
-#define F_STATION_IDENTIFER                     0x0800
-#define F_RING_STATION_STATUS                   0x1000
-#define F_GROUP_ADDRESS                         0x2000
-#define F_FUNCTIONAL_ADDRESS                    0x4000
-#define F_FRAME_FORWARD                         0x8000
-
-#define R_INIT                                  0x00
-#define R_RQ_ATTCH_STATE_ADDR                   0x00
-#define R_CHG_PARM                              0x00
-#define R_TX_FORWARD                            F_FRAME_FORWARD
-
-
-#define      UPSTREAM_NEIGHBOR_ADDRESS       0x02
-#define      ADDRESS_MODIFER                 0x21
-#define      RING_STATION_VERSION_NUMBER     0x23
-#define      PRODUCT_INSTANCE_ID             0x22
-
-#define      RPT_TX_FORWARD  0x2A
-
-#define AC_FC_INIT                      (3<<13) | 0 /*                     */
-#define AC_FC_RQ_INIT                   ((3<<13) | 0) /*                     */
-#define AC_FC_RQ_ATTCH                  (3<<13) | 0 /* DC = SC of rx frame */
-#define AC_FC_RQ_STATE                  (3<<13) | 0 /* DC = SC of rx frame */
-#define AC_FC_RQ_ADDR                   (3<<13) | 0 /* DC = SC of rx frame */
-#define AC_FC_CHG_PARM                  (3<<13) | 0 /*                     */
-#define AC_FC_RSP                       (0<<13) | 0 /* DC = SC of rx frame */
-#define AC_FC_RPT_ATTCH                 (0<<13) | 0
-
-#define S_UPSTREAM_NEIGHBOR_ADDRESS               6 + 2
-#define S_LOCAL_RING_NUMBER                       2 + 2
-#define S_ASSIGN_PHYSICAL_DROP                    4 + 2
-#define S_ERROR_TIMER_VALUE                       2 + 2
-#define S_AUTHORIZED_FUNCTION_CLASS               2 + 2
-#define S_AUTHORIZED_ACCESS_PRIORITY              2 + 2
-#define S_CORRELATOR                              2 + 2
-#define S_PHYSICAL_DROP                           4 + 2
-#define S_RESPONSE_CODE                           4 + 2
-#define S_ADDRESS_MODIFER                         2 + 2
-#define S_PRODUCT_INSTANCE_ID                    18 + 2
-#define S_RING_STATION_VERSION_NUMBER            10 + 2
-#define S_STATION_IDENTIFER                       6 + 2
-#define S_RING_STATION_STATUS                     6 + 2
-#define S_GROUP_ADDRESS                           4 + 2
-#define S_FUNCTIONAL_ADDRESS                      4 + 2
-#define S_FRAME_FORWARD                         252 + 2
-#define S_TRANSMIT_STATUS_CODE                    2 + 2
-
-#define ISB_IMC_RES0                    0x0000  /* */
-#define ISB_IMC_MAC_TYPE_3              0x0001  /* MAC_ARC_INDICATE */
-#define ISB_IMC_MAC_ERROR_COUNTERS      0x0002  /* */
-#define ISB_IMC_RES1                    0x0003  /* */
-#define ISB_IMC_MAC_TYPE_2              0x0004  /* QUE_MAC_INDICATE */
-#define ISB_IMC_TX_FRAME                0x0005  /* */
-#define ISB_IMC_END_OF_TX_QUEUE         0x0006  /* */
-#define ISB_IMC_NON_MAC_RX_RESOURCE     0x0007  /* */
-#define ISB_IMC_MAC_RX_RESOURCE         0x0008  /* */
-#define ISB_IMC_NON_MAC_RX_FRAME        0x0009  /* */
-#define ISB_IMC_MAC_RX_FRAME            0x000A  /* */
-#define ISB_IMC_TRC_FIFO_STATUS         0x000B  /* */
-#define ISB_IMC_COMMAND_STATUS          0x000C  /* */
-#define ISB_IMC_MAC_TYPE_1              0x000D  /* Self Removed */
-#define ISB_IMC_TRC_INTRNL_TST_STATUS   0x000E  /* */
-#define ISB_IMC_RES2                    0x000F  /* */
-
-#define NON_MAC_RX_RESOURCE_BW          0x10    /* shifted right 8 bits */
-#define NON_MAC_RX_RESOURCE_FW          0x20    /* shifted right 8 bits */
-#define NON_MAC_RX_RESOURCE_BE          0x40    /* shifted right 8 bits */
-#define NON_MAC_RX_RESOURCE_FE          0x80    /* shifted right 8 bits */
-#define RAW_NON_MAC_RX_RESOURCE_BW      0x1000  /* */
-#define RAW_NON_MAC_RX_RESOURCE_FW      0x2000  /* */
-#define RAW_NON_MAC_RX_RESOURCE_BE      0x4000  /* */
-#define RAW_NON_MAC_RX_RESOURCE_FE      0x8000  /* */
-
-#define MAC_RX_RESOURCE_BW              0x10    /* shifted right 8 bits */
-#define MAC_RX_RESOURCE_FW              0x20    /* shifted right 8 bits */
-#define MAC_RX_RESOURCE_BE              0x40    /* shifted right 8 bits */
-#define MAC_RX_RESOURCE_FE              0x80    /* shifted right 8 bits */
-#define RAW_MAC_RX_RESOURCE_BW          0x1000  /* */
-#define RAW_MAC_RX_RESOURCE_FW          0x2000  /* */
-#define RAW_MAC_RX_RESOURCE_BE          0x4000  /* */
-#define RAW_MAC_RX_RESOURCE_FE          0x8000  /* */
-
-#define TRC_FIFO_STATUS_TX_UNDERRUN     0x40    /* shifted right 8 bits */
-#define TRC_FIFO_STATUS_RX_OVERRUN      0x80    /* shifted right 8 bits */
-#define RAW_TRC_FIFO_STATUS_TX_UNDERRUN 0x4000  /* */
-#define RAW_TRC_FIFO_STATUS_RX_OVERRUN  0x8000  /* */
-
-#define       CSR_CLRTINT             0x08
-
-#define MSB(X)                  ((__u8)((__u16) X >> 8))
-#define LSB(X)                  ((__u8)((__u16) X &  0xff))
-
-#define AC_FC_LOBE_MEDIA_TEST           ((3<<13) | 0)
-#define S_WRAP_DATA                             248 + 2 /* 500 + 2 */
-#define      WRAP_DATA                       0x26
-#define LOBE_MEDIA_TEST 0x08
-
-/* Destination Class (dc) */
-
-#define DC_MASK         0xF0
-#define DC_RS           0x00
-#define DC_CRS          0x40
-#define DC_RPS          0x50
-#define DC_REM          0x60
-
-/* Source Classes (sc) */
-
-#define SC_MASK         0x0F
-#define SC_RS           0x00
-#define SC_CRS          0x04
-#define SC_RPS          0x05
-#define SC_REM          0x06
-
-#define PR              0x11
-#define PR_PAGE_MASK    0x0C000
-
-#define MICROCHANNEL    0x0008
-#define INTERFACE_CHIP  0x0010
-#define BOARD_16BIT     0x0040
-#define PAGED_RAM       0x0080
-#define WD8115TA        (TOKEN_MEDIA | MICROCHANNEL | INTERFACE_CHIP | PAGED_RAM)
-#define WD8115T         (TOKEN_MEDIA | INTERFACE_CHIP | BOARD_16BIT | PAGED_RAM)
-
-#define BRD_ID_8316     0x50
-
-#define r587_SER        0x001
-#define SER_DIN         0x80
-#define SER_DOUT        0x40
-#define SER_CLK         0x20
-#define SER_ECS         0x10
-#define SER_E806        0x08
-#define SER_PNP         0x04
-#define SER_BIO         0x02
-#define SER_16B         0x01
-
-#define r587_IDR        0x004
-#define IDR_IRQ_MASK    0x0F0
-#define IDR_DCS_MASK    0x007
-#define IDR_RWS         0x008
-
-
-#define r587_BIO        0x003
-#define BIO_ENB         0x080
-#define BIO_MASK        0x03F
-
-#define r587_PCR        0x005
-#define PCR_RAMS        0x040
-
-
-
-#define NUM_ADDR_BITS   8
-
-#define ISA_MAX_ADDRESS         0x00ffffff
-
-#define SMCTR_MAX_ADAPTERS      7
-
-#define MC_TABLE_ENTRIES      16
-
-#define MAXFRAGMENTS          32
-
-#define CHIP_REV_MASK         0x3000
-
-#define MAX_TX_QS             8
-#define NUM_TX_QS_USED        3
-
-#define MAX_RX_QS             2
-#define NUM_RX_QS_USED        2
-
-#define INTEL_DATA_FORMAT       0x4000
-#define INTEL_ADDRESS_POINTER_FORMAT    0x8000
-#define PAGE_POINTER(X)         ((((unsigned long)(X) - tp->ram_access) & tp->page_offset_mask) + tp->ram_access)
-#define SWAP_WORDS(X)           (((X & 0xFFFF) << 16) | (X >> 16))
-
-#define INTERFACE_CHIP          0x0010          /* Soft Config Adapter */
-#define ADVANCED_FEATURES       0x0020          /* Adv. netw. interface features */
-#define BOARD_16BIT             0x0040          /* 16 bit capability */
-#define PAGED_RAM               0x0080          /* Adapter has paged RAM */
-
-#define PAGED_ROM               0x0100          /* Adapter has paged ROM */
-
-#define RAM_SIZE_UNKNOWN        0x0000          /* Unknown RAM size */
-#define RAM_SIZE_0K             0x0001          /* 0K  RAM */
-#define RAM_SIZE_8K             0x0002          /* 8k  RAM */
-#define RAM_SIZE_16K            0x0003          /* 16k RAM */
-#define RAM_SIZE_32K            0x0004          /* 32k RAM */
-#define RAM_SIZE_64K            0x0005          /* 64k RAM */
-#define RAM_SIZE_RESERVED_6     0x0006          /* Reserved RAM size */
-#define RAM_SIZE_RESERVED_7     0x0007          /* Reserved RAM size */
-#define RAM_SIZE_MASK           0x0007          /* Isolates RAM Size */
-
-#define TOKEN_MEDIA           0x0005
-
-#define BID_REG_0       0x00
-#define BID_REG_1       0x01
-#define BID_REG_2       0x02
-#define BID_REG_3       0x03
-#define BID_REG_4       0x04
-#define BID_REG_5       0x05
-#define BID_REG_6       0x06
-#define BID_REG_7       0x07
-#define BID_LAR_0       0x08
-#define BID_LAR_1       0x09
-#define BID_LAR_2       0x0A
-#define BID_LAR_3       0x0B
-#define BID_LAR_4       0x0C
-#define BID_LAR_5       0x0D
-
-#define BID_BOARD_ID_BYTE       0x0E
-#define BID_CHCKSM_BYTE         0x0F
-#define BID_LAR_OFFSET          0x08  
-
-#define BID_MSZ_583_BIT         0x08
-#define BID_SIXTEEN_BIT_BIT     0x01
-
-#define BID_BOARD_REV_MASK      0x1E
-
-#define BID_MEDIA_TYPE_BIT      0x01
-#define BID_SOFT_CONFIG_BIT     0x20
-#define BID_RAM_SIZE_BIT        0x40
-#define BID_BUS_TYPE_BIT        0x80
-
-#define BID_CR          0x10
-
-#define BID_TXP         0x04            /* Transmit Packet Command */
-
-#define BID_TCR_DIFF    0x0D    /* Transmit Configuration Register */
-
-#define BID_TCR_VAL     0x18            /* Value to Test 8390 or 690 */
-#define BID_PS0         0x00            /* Register Page Select 0 */
-#define BID_PS1         0x40            /* Register Page Select 1 */
-#define BID_PS2         0x80            /* Register Page Select 2 */
-#define BID_PS_MASK     0x3F            /* For Masking Off Page Select Bits */
-
-#define BID_EEPROM_0                    0x08
-#define BID_EEPROM_1                    0x09
-#define BID_EEPROM_2                    0x0A
-#define BID_EEPROM_3                    0x0B
-#define BID_EEPROM_4                    0x0C
-#define BID_EEPROM_5                    0x0D
-#define BID_EEPROM_6                    0x0E
-#define BID_EEPROM_7                    0x0F
-
-#define BID_OTHER_BIT                   0x02
-#define BID_ICR_MASK                    0x0C
-#define BID_EAR_MASK                    0x0F
-#define BID_ENGR_PAGE                   0x0A0
-#define BID_RLA                         0x10
-#define BID_EA6                         0x80
-#define BID_RECALL_DONE_MASK            0x10
-#define BID_BID_EEPROM_OVERRIDE         0xFFB0
-#define BID_EXTRA_EEPROM_OVERRIDE       0xFFD0
-#define BID_EEPROM_MEDIA_MASK           0x07
-#define BID_STARLAN_TYPE                0x00
-#define BID_ETHERNET_TYPE               0x01
-#define BID_TP_TYPE                     0x02
-#define BID_EW_TYPE                     0x03
-#define BID_TOKEN_RING_TYPE             0x04
-#define BID_UTP2_TYPE                   0x05
-#define BID_EEPROM_IRQ_MASK             0x18
-#define BID_PRIMARY_IRQ                 0x00
-#define BID_ALTERNATE_IRQ_1             0x08
-#define BID_ALTERNATE_IRQ_2             0x10
-#define BID_ALTERNATE_IRQ_3             0x18
-#define BID_EEPROM_RAM_SIZE_MASK        0xE0
-#define BID_EEPROM_RAM_SIZE_RES1        0x00
-#define BID_EEPROM_RAM_SIZE_RES2        0x20
-#define BID_EEPROM_RAM_SIZE_8K          0x40
-#define BID_EEPROM_RAM_SIZE_16K         0x60
-#define BID_EEPROM_RAM_SIZE_32K         0x80
-#define BID_EEPROM_RAM_SIZE_64K         0xA0
-#define BID_EEPROM_RAM_SIZE_RES3        0xC0
-#define BID_EEPROM_RAM_SIZE_RES4        0xE0
-#define BID_EEPROM_BUS_TYPE_MASK        0x07
-#define BID_EEPROM_BUS_TYPE_AT          0x00
-#define BID_EEPROM_BUS_TYPE_MCA         0x01
-#define BID_EEPROM_BUS_TYPE_EISA        0x02
-#define BID_EEPROM_BUS_TYPE_NEC         0x03
-#define BID_EEPROM_BUS_SIZE_MASK        0x18
-#define BID_EEPROM_BUS_SIZE_8BIT        0x00
-#define BID_EEPROM_BUS_SIZE_16BIT       0x08
-#define BID_EEPROM_BUS_SIZE_32BIT       0x10
-#define BID_EEPROM_BUS_SIZE_64BIT       0x18
-#define BID_EEPROM_BUS_MASTER           0x20
-#define BID_EEPROM_RAM_PAGING           0x40
-#define BID_EEPROM_ROM_PAGING           0x80
-#define BID_EEPROM_PAGING_MASK          0xC0
-#define BID_EEPROM_LOW_COST             0x08
-#define BID_EEPROM_IO_MAPPED            0x10
-#define BID_EEPROM_HMI                  0x01
-#define BID_EEPROM_AUTO_MEDIA_DETECT    0x01
-#define BID_EEPROM_CHIP_REV_MASK        0x0C
-
-#define BID_EEPROM_LAN_ADDR             0x30
-
-#define BID_EEPROM_MEDIA_OPTION         0x54
-#define BID_EEPROM_MEDIA_UTP            0x01
-#define BID_EEPROM_4MB_RING             0x08
-#define BID_EEPROM_16MB_RING            0x10
-#define BID_EEPROM_MEDIA_STP            0x40
-
-#define BID_EEPROM_MISC_DATA            0x56
-#define BID_EEPROM_EARLY_TOKEN_RELEASE  0x02
-
-#define CNFG_ID_8003E           0x6fc0
-#define CNFG_ID_8003S           0x6fc1
-#define CNFG_ID_8003W           0x6fc2
-#define CNFG_ID_8115TRA         0x6ec6
-#define CNFG_ID_8013E           0x61C8
-#define CNFG_ID_8013W           0x61C9
-#define CNFG_ID_BISTRO03E       0xEFE5
-#define CNFG_ID_BISTRO13E       0xEFD5
-#define CNFG_ID_BISTRO13W       0xEFD4
-#define CNFG_MSR_583    0x0
-#define CNFG_ICR_583    0x1
-#define CNFG_IAR_583    0x2
-#define CNFG_BIO_583    0x3
-#define CNFG_EAR_583    0x3
-#define CNFG_IRR_583    0x4
-#define CNFG_LAAR_584   0x5
-#define CNFG_GP2                0x7
-#define CNFG_LAAR_MASK          0x1F
-#define CNFG_LAAR_ZWS           0x20
-#define CNFG_LAAR_L16E          0x40
-#define CNFG_ICR_IR2_584        0x04
-#define CNFG_ICR_MASK       0x08
-#define CNFG_ICR_MSZ        0x08
-#define CNFG_ICR_RLA        0x10
-#define CNFG_ICR_STO        0x80
-#define CNFG_IRR_IRQS           0x60
-#define CNFG_IRR_IEN            0x80
-#define CNFG_IRR_ZWS            0x01
-#define CNFG_GP2_BOOT_NIBBLE    0x0F
-#define CNFG_IRR_OUT2       0x04
-#define CNFG_IRR_OUT1       0x02
-
-#define CNFG_SIZE_8KB           8
-#define CNFG_SIZE_16KB          16
-#define CNFG_SIZE_32KB          32
-#define CNFG_SIZE_64KB          64
-#define CNFG_SIZE_128KB     128
-#define CNFG_SIZE_256KB     256
-#define ROM_DISABLE             0x0
-
-#define CNFG_SLOT_ENABLE_BIT    0x08
-
-#define CNFG_POS_CONTROL_REG    0x096
-#define CNFG_POS_REG0           0x100
-#define CNFG_POS_REG1           0x101
-#define CNFG_POS_REG2           0x102
-#define CNFG_POS_REG3           0x103
-#define CNFG_POS_REG4           0x104
-#define CNFG_POS_REG5           0x105
-
-#define CNFG_ADAPTER_TYPE_MASK  0x0e
-
-#define SLOT_16BIT              0x0008
-#define INTERFACE_5X3_CHIP      0x0000          /* 0000 = 583 or 593 chips */
-#define NIC_690_BIT                     0x0010          /* NIC is 690 */
-#define ALTERNATE_IRQ_BIT       0x0020          /* Alternate IRQ is used */
-#define INTERFACE_584_CHIP      0x0040          /* 0001 = 584 chip */
-#define INTERFACE_594_CHIP      0x0080          /* 0010 = 594 chip */
-#define INTERFACE_585_CHIP      0x0100          /* 0100 = 585/790 chip */
-#define INTERFACE_CHIP_MASK     0x03C0          /* Isolates Intfc Chip Type */
-
-#define BOARD_16BIT             0x0040
-#define NODE_ADDR_CKSUM         0xEE
-#define BRD_ID_8115T            0x04
-
-#define NIC_825_BIT             0x0400          /* TRC 83C825 NIC */
-#define NIC_790_BIT             0x0800          /* NIC is 83C790 Ethernet */
-
-#define CHIP_REV_MASK           0x3000
-
-#define HWR_CBUSY                       0x02
-#define HWR_CA                          0x01
-
-#define MAC_QUEUE                       0
-#define NON_MAC_QUEUE                   1
-#define BUG_QUEUE                       2       /* NO RECEIVE QUEUE, ONLY TX */
-
-#define NUM_MAC_TX_FCBS                 8
-#define NUM_MAC_TX_BDBS                 NUM_MAC_TX_FCBS
-#define NUM_MAC_RX_FCBS                 7
-#define NUM_MAC_RX_BDBS                 8
-
-#define NUM_NON_MAC_TX_FCBS             6
-#define NUM_NON_MAC_TX_BDBS             NUM_NON_MAC_TX_FCBS
-
-#define NUM_NON_MAC_RX_BDBS             0       /* CALCULATED DYNAMICALLY */
-
-#define NUM_BUG_TX_FCBS                 8
-#define NUM_BUG_TX_BDBS                 NUM_BUG_TX_FCBS
-
-#define MAC_TX_BUFFER_MEMORY            1024
-#define NON_MAC_TX_BUFFER_MEMORY        (20 * 1024)
-#define BUG_TX_BUFFER_MEMORY            (NUM_BUG_TX_FCBS * 32)
-
-#define RX_BUFFER_MEMORY                0       /* CALCULATED DYNAMICALLY */
-#define RX_DATA_BUFFER_SIZE             256
-#define RX_BDB_SIZE_SHIFT               3       /* log2(RX_DATA_BUFFER_SIZE)-log2(sizeof(BDBlock)) */
-#define RX_BDB_SIZE_MASK                (sizeof(BDBlock) - 1)
-#define RX_DATA_BUFFER_SIZE_MASK        (RX_DATA_BUFFER_SIZE-1)
-
-#define NUM_OF_INTERRUPTS               0x20
-
-#define NOT_TRANSMITING                 0
-#define TRANSMITING                     1
-
-#define TRC_INTERRUPT_ENABLE_MASK       0x7FF6
-
-#define UCODE_VERSION                   0x58
-
-#define UCODE_SIZE_OFFSET               0x0000  /* WORD */
-#define UCODE_CHECKSUM_OFFSET           0x0002  /* WORD */
-#define UCODE_VERSION_OFFSET            0x0004  /* BYTE */
-
-#define CS_RAM_SIZE                     0X2000
-#define CS_RAM_CHECKSUM_OFFSET          0x1FFE  /* WORD 1FFE(MSB)-1FFF(LSB)*/
-#define CS_RAM_VERSION_OFFSET           0x1FFC  /* WORD 1FFC(MSB)-1FFD(LSB)*/
-
-#define MISC_DATA_SIZE                  128
-#define NUM_OF_ACBS                     1
-
-#define ACB_COMMAND_NOT_DONE            0x0000  /* Init, command not done */
-#define ACB_COMMAND_DONE                0x8000  /* TRC says command done */
-#define ACB_COMMAND_STATUS_MASK         0x00FF  /* low byte is status */
-#define ACB_COMMAND_SUCCESSFUL          0x0000  /* means cmd was successful */
-#define ACB_NOT_CHAIN_END               0x0000  /* tell TRC more CBs in chain */
-#define ACB_CHAIN_END                   0x8000  /* tell TRC last CB in chain */
-#define ACB_COMMAND_NO_INTERRUPT        0x0000  /* tell TRC no INT after CB */
-#define ACB_COMMAND_INTERRUPT           0x2000  /* tell TRC to INT after CB */
-#define ACB_SUB_CMD_NOP                 0x0000
-#define ACB_CMD_HIC_NOP                 0x0080
-#define ACB_CMD_MCT_NOP                 0x0000
-#define ACB_CMD_MCT_TEST                0x0001
-#define ACB_CMD_HIC_TEST                0x0081
-#define ACB_CMD_INSERT                  0x0002
-#define ACB_CMD_REMOVE                  0x0003
-#define ACB_CMD_MCT_WRITE_VALUE         0x0004
-#define ACB_CMD_HIC_WRITE_VALUE         0x0084
-#define ACB_CMD_MCT_READ_VALUE          0x0005
-#define ACB_CMD_HIC_READ_VALUE          0x0085
-#define ACB_CMD_INIT_TX_RX              0x0086
-#define ACB_CMD_INIT_TRC_TIMERS         0x0006
-#define ACB_CMD_READ_TRC_STATUS         0x0007
-#define ACB_CMD_CHANGE_JOIN_STATE       0x0008
-#define ACB_CMD_RESERVED_9              0x0009
-#define ACB_CMD_RESERVED_A              0x000A
-#define ACB_CMD_RESERVED_B              0x000B
-#define ACB_CMD_RESERVED_C              0x000C
-#define ACB_CMD_RESERVED_D              0x000D
-#define ACB_CMD_RESERVED_E              0x000E
-#define ACB_CMD_RESERVED_F              0x000F
-
-#define TRC_MAC_REGISTERS_TEST          0x0000
-#define TRC_INTERNAL_LOOPBACK           0x0001
-#define TRC_TRI_LOOPBACK                0x0002
-#define TRC_INTERNAL_ROM_TEST           0x0003
-#define TRC_LOBE_MEDIA_TEST             0x0004
-#define TRC_ANALOG_TEST                 0x0005
-#define TRC_HOST_INTERFACE_REG_TEST     0x0003
-
-#define TEST_DMA_1                      0x0000
-#define TEST_DMA_2                      0x0001
-#define TEST_MCT_ROM                    0x0002
-#define HIC_INTERNAL_DIAG               0x0003
-
-#define ABORT_TRANSMIT_PRIORITY_0       0x0001
-#define ABORT_TRANSMIT_PRIORITY_1       0x0002
-#define ABORT_TRANSMIT_PRIORITY_2       0x0004
-#define ABORT_TRANSMIT_PRIORITY_3       0x0008
-#define ABORT_TRANSMIT_PRIORITY_4       0x0010
-#define ABORT_TRANSMIT_PRIORITY_5       0x0020
-#define ABORT_TRANSMIT_PRIORITY_6       0x0040
-#define ABORT_TRANSMIT_PRIORITY_7       0x0080
-
-#define TX_PENDING_PRIORITY_0           0x0001
-#define TX_PENDING_PRIORITY_1           0x0002
-#define TX_PENDING_PRIORITY_2           0x0004
-#define TX_PENDING_PRIORITY_3           0x0008
-#define TX_PENDING_PRIORITY_4           0x0010
-#define TX_PENDING_PRIORITY_5           0x0020
-#define TX_PENDING_PRIORITY_6           0x0040
-#define TX_PENDING_PRIORITY_7           0x0080
-
-#define FCB_FRAME_LENGTH                0x100
-#define FCB_COMMAND_DONE                0x8000  /* FCB Word 0 */
-#define FCB_NOT_CHAIN_END               0x0000  /* FCB Word 1 */
-#define FCB_CHAIN_END                   0x8000
-#define FCB_NO_WARNING                  0x0000
-#define FCB_WARNING                     0x4000
-#define FCB_INTERRUPT_DISABLE           0x0000
-#define FCB_INTERRUPT_ENABLE            0x2000
-
-#define FCB_ENABLE_IMA                  0x0008
-#define FCB_ENABLE_TES                  0x0004  /* Guarantee Tx before Int */
-#define FCB_ENABLE_TFS                  0x0002  /* Post Tx Frame Status */
-#define FCB_ENABLE_NTC                  0x0001  /* No Tx CRC */
-
-#define FCB_TX_STATUS_CR2               0x0004
-#define FCB_TX_STATUS_AR2               0x0008
-#define FCB_TX_STATUS_CR1               0x0040
-#define FCB_TX_STATUS_AR1               0x0080
-#define FCB_TX_AC_BITS                  (FCB_TX_STATUS_AR1+FCB_TX_STATUS_AR2+FCB_TX_STATUS_CR1+FCB_TX_STATUS_CR2)
-#define FCB_TX_STATUS_E                 0x0100
-
-#define FCB_RX_STATUS_ANY_ERROR         0x0001
-#define FCB_RX_STATUS_FCS_ERROR         0x0002
-
-#define FCB_RX_STATUS_IA_MATCHED        0x0400
-#define FCB_RX_STATUS_IGA_BSGA_MATCHED  0x0500
-#define FCB_RX_STATUS_FA_MATCHED        0x0600
-#define FCB_RX_STATUS_BA_MATCHED        0x0700
-#define FCB_RX_STATUS_DA_MATCHED        0x0400
-#define FCB_RX_STATUS_SOURCE_ROUTING    0x0800
-
-#define BDB_BUFFER_SIZE                 0x100
-#define BDB_NOT_CHAIN_END               0x0000
-#define BDB_CHAIN_END                   0x8000
-#define BDB_NO_WARNING                  0x0000
-#define BDB_WARNING                     0x4000
-
-#define ERROR_COUNTERS_CHANGED          0x0001
-#define TI_NDIS_RING_STATUS_CHANGED     0x0002
-#define UNA_CHANGED                     0x0004
-#define READY_TO_SEND_RQ_INIT           0x0008
-
-#define SCGB_ADDRESS_POINTER_FORMAT     INTEL_ADDRESS_POINTER_FORMAT
-#define SCGB_DATA_FORMAT                INTEL_DATA_FORMAT
-#define SCGB_MULTI_WORD_CONTROL         0
-#define SCGB_BURST_LENGTH               0x000E  /* DMA Burst Length */
-
-#define SCGB_CONFIG                     (INTEL_ADDRESS_POINTER_FORMAT+INTEL_DATA_FORMAT+SCGB_BURST_LENGTH)
-
-#define ISCP_BLOCK_SIZE                 0x0A
-#define RAM_SIZE                        0x10000
-#define INIT_SYS_CONFIG_PTR_OFFSET      (RAM_SIZE-ISCP_BLOCK_SIZE)
-#define SCGP_BLOCK_OFFSET               0
-
-#define SCLB_NOT_VALID                  0x0000  /* Initially, SCLB not valid */
-#define SCLB_VALID                      0x8000  /* Host tells TRC SCLB valid */
-#define SCLB_PROCESSED                  0x0000  /* TRC says SCLB processed */
-#define SCLB_RESUME_CONTROL_NOT_VALID   0x0000  /* Initially, RC not valid */
-#define SCLB_RESUME_CONTROL_VALID       0x4000  /* Host tells TRC RC valid */
-#define SCLB_IACK_CODE_NOT_VALID        0x0000  /* Initially, IACK not valid */
-#define SCLB_IACK_CODE_VALID            0x2000  /* Host tells TRC IACK valid */
-#define SCLB_CMD_NOP                    0x0000
-#define SCLB_CMD_REMOVE                 0x0001
-#define SCLB_CMD_SUSPEND_ACB_CHAIN      0x0002
-#define SCLB_CMD_SET_INTERRUPT_MASK     0x0003
-#define SCLB_CMD_CLEAR_INTERRUPT_MASK   0x0004
-#define SCLB_CMD_RESERVED_5             0x0005
-#define SCLB_CMD_RESERVED_6             0x0006
-#define SCLB_CMD_RESERVED_7             0x0007
-#define SCLB_CMD_RESERVED_8             0x0008
-#define SCLB_CMD_RESERVED_9             0x0009
-#define SCLB_CMD_RESERVED_A             0x000A
-#define SCLB_CMD_RESERVED_B             0x000B
-#define SCLB_CMD_RESERVED_C             0x000C
-#define SCLB_CMD_RESERVED_D             0x000D
-#define SCLB_CMD_RESERVED_E             0x000E
-#define SCLB_CMD_RESERVED_F             0x000F
-
-#define SCLB_RC_ACB                     0x0001  /* Action Command Block Chain */
-#define SCLB_RC_RES0                    0x0002  /* Always Zero */
-#define SCLB_RC_RES1                    0x0004  /* Always Zero */
-#define SCLB_RC_RES2                    0x0008  /* Always Zero */
-#define SCLB_RC_RX_MAC_FCB              0x0010  /* RX_MAC_FCB Chain */
-#define SCLB_RC_RX_MAC_BDB              0x0020  /* RX_MAC_BDB Chain */
-#define SCLB_RC_RX_NON_MAC_FCB          0x0040  /* RX_NON_MAC_FCB Chain */
-#define SCLB_RC_RX_NON_MAC_BDB          0x0080  /* RX_NON_MAC_BDB Chain */
-#define SCLB_RC_TFCB0                   0x0100  /* TX Priority 0 FCB Chain */
-#define SCLB_RC_TFCB1                   0x0200  /* TX Priority 1 FCB Chain */
-#define SCLB_RC_TFCB2                   0x0400  /* TX Priority 2 FCB Chain */
-#define SCLB_RC_TFCB3                   0x0800  /* TX Priority 3 FCB Chain */
-#define SCLB_RC_TFCB4                   0x1000  /* TX Priority 4 FCB Chain */
-#define SCLB_RC_TFCB5                   0x2000  /* TX Priority 5 FCB Chain */
-#define SCLB_RC_TFCB6                   0x4000  /* TX Priority 6 FCB Chain */
-#define SCLB_RC_TFCB7                   0x8000  /* TX Priority 7 FCB Chain */
-
-#define SCLB_IMC_RES0                   0x0001  /* */
-#define SCLB_IMC_MAC_TYPE_3             0x0002  /* MAC_ARC_INDICATE */
-#define SCLB_IMC_MAC_ERROR_COUNTERS     0x0004  /* */
-#define SCLB_IMC_RES1                   0x0008  /* */
-#define SCLB_IMC_MAC_TYPE_2             0x0010  /* QUE_MAC_INDICATE */
-#define SCLB_IMC_TX_FRAME               0x0020  /* */
-#define SCLB_IMC_END_OF_TX_QUEUE        0x0040  /* */
-#define SCLB_IMC_NON_MAC_RX_RESOURCE    0x0080  /* */
-#define SCLB_IMC_MAC_RX_RESOURCE        0x0100  /* */
-#define SCLB_IMC_NON_MAC_RX_FRAME       0x0200  /* */
-#define SCLB_IMC_MAC_RX_FRAME           0x0400  /* */
-#define SCLB_IMC_TRC_FIFO_STATUS        0x0800  /* */
-#define SCLB_IMC_COMMAND_STATUS         0x1000  /* */
-#define SCLB_IMC_MAC_TYPE_1             0x2000  /* Self Removed */
-#define SCLB_IMC_TRC_INTRNL_TST_STATUS  0x4000  /* */
-#define SCLB_IMC_RES2                   0x8000  /* */
-
-#define DMA_TRIGGER                     0x0004
-#define FREQ_16MB_BIT                   0x0010
-#define THDREN                          0x0020
-#define CFG0_RSV1                       0x0040
-#define CFG0_RSV2                       0x0080
-#define ETREN                           0x0100
-#define RX_OWN_BIT                      0x0200
-#define RXATMAC                         0x0400
-#define PROMISCUOUS_BIT                 0x0800
-#define USETPT                          0x1000
-#define SAVBAD_BIT                      0x2000
-#define ONEQUE                          0x4000
-#define NO_AUTOREMOVE                   0x8000
-
-#define RX_FCB_AREA_8316        0x00000000
-#define RX_BUFF_AREA_8316       0x00000000
-
-#define TRC_POINTER(X)          ((unsigned long)(X) - tp->ram_access)
-#define RX_FCB_TRC_POINTER(X)   ((unsigned long)(X) - tp->ram_access + RX_FCB_AREA_8316)
-#define RX_BUFF_TRC_POINTER(X) ((unsigned long)(X) - tp->ram_access + RX_BUFF_AREA_8316)
-
-// Offset 0: MSR - Memory Select Register
-//
-#define r587_MSR        0x000   // Register Offset
-//#define       MSR_RST         0x080   // LAN Controller Reset
-#define MSR_MENB        0x040   // Shared Memory Enable
-#define MSR_RA18        0x020   // Ram Address bit 18   (583, 584, 587)
-#define MSR_RA17        0x010   // Ram Address bit 17   (583, 584, 585/790)
-#define MSR_RA16        0x008   // Ram Address bit 16   (583, 584, 585/790)
-#define MSR_RA15        0x004   // Ram Address bit 15   (583, 584, 585/790)
-#define MSR_RA14        0x002   // Ram Address bit 14   (583, 584, 585/790)
-#define MSR_RA13        0x001   // Ram Address bit 13   (583, 584, 585/790)
-
-#define MSR_MASK        0x03F   // Mask for Address bits RA18-RA13 (583, 584, 587)
-
-#define MSR                     0x00
-#define IRR                     0x04
-#define HWR                     0x04
-#define LAAR                    0x05
-#define IMCCR                   0x05
-#define LAR0                    0x08
-#define BDID                    0x0E    // Adapter ID byte register offset
-#define CSR                     0x10
-#define PR                      0x11
-
-#define MSR_RST                 0x80
-#define MSR_MEMB                0x40
-#define MSR_0WS                 0x20
-
-#define FORCED_16BIT_MODE       0x0002
-
-#define INTERFRAME_SPACING_16           0x0003  /* 6 bytes */
-#define INTERFRAME_SPACING_4            0x0001  /* 2 bytes */
-#define MULTICAST_ADDRESS_BIT           0x0010
-#define NON_SRC_ROUTING_BIT             0x0020
-
-#define LOOPING_MODE_MASK       0x0007
-
-/*
- * Decode firmware defines.
- */
-#define SWAP_BYTES(X)           ((X & 0xff) << 8) | (X >> 8)
-#define WEIGHT_OFFSET           5
-#define TREE_SIZE_OFFSET        9
-#define TREE_OFFSET             11
-
-/* The Huffman Encoding Tree is constructed of these nodes. */
-typedef struct {
-        __u8    llink;  /* Short version of above node. */
-        __u8    tag;
-        __u8    info;   /* This node is used on decodes. */
-        __u8    rlink;
-} DECODE_TREE_NODE;
-
-#define ROOT    0       /* Branch value. */
-#define LEAF    0       /* Tag field value. */
-#define BRANCH  1       /* Tag field value. */
-
-/*
- * Multicast Table Structure
- */
-typedef struct {
-        __u8    address[6];
-        __u8    instance_count;
-} McTable;
-
-/*
- * Fragment Descriptor Definition
- */
-typedef struct {
-        __u8  *fragment_ptr;
-        __u32   fragment_length;
-} FragmentStructure;
-
-/*
- * Data Buffer Structure Definition
- */
-typedef struct {
-        __u32 fragment_count;
-        FragmentStructure       fragment_list[MAXFRAGMENTS];
-} DataBufferStructure;
-
-#pragma pack(1)
-typedef struct {
-                __u8    IType;
-                __u8    ISubtype;
-} Interrupt_Status_Word;
-
-#pragma pack(1)
-typedef struct BDBlockType {
-                __u16                   info;                   /* 02 */
-                __u32                   trc_next_ptr;           /* 06 */
-                __u32                   trc_data_block_ptr;     /* 10 */
-                __u16                   buffer_length;          /* 12 */
-
-                __u16                   *data_block_ptr;        /* 16 */
-                struct  BDBlockType     *next_ptr;              /* 20 */
-                struct  BDBlockType     *back_ptr;              /* 24 */
-                __u8                    filler[8];              /* 32 */
-} BDBlock;
-
-#pragma pack(1)
-typedef struct FCBlockType {
-                __u16                   frame_status;           /* 02 */
-                __u16                   info;                   /* 04 */
-                __u32                   trc_next_ptr;           /* 08 */
-                __u32                   trc_bdb_ptr;            /* 12 */
-                __u16                   frame_length;           /* 14 */
-
-                BDBlock                 *bdb_ptr;               /* 18 */
-                struct  FCBlockType     *next_ptr;              /* 22 */
-                struct  FCBlockType     *back_ptr;              /* 26 */
-                __u16                   memory_alloc;           /* 28 */
-                __u8                    filler[4];              /* 32 */
-
-} FCBlock;
-
-#pragma pack(1)
-typedef struct SBlockType{
-                __u8                           Internal_Error_Count;
-                __u8                           Line_Error_Count;
-                __u8                           AC_Error_Count;
-                __u8                           Burst_Error_Count;
-                __u8                            RESERVED_COUNTER_0;
-                __u8                            AD_TRANS_Count;
-                __u8                            RCV_Congestion_Count;
-                __u8                            Lost_FR_Error_Count;
-                __u8                            FREQ_Error_Count;
-                __u8                            FR_Copied_Error_Count;
-                __u8                            RESERVED_COUNTER_1;
-                __u8                            Token_Error_Count;
-
-                __u16                           TI_NDIS_Ring_Status;
-                __u16                           BCN_Type;
-                __u16                           Error_Code;
-                __u16                           SA_of_Last_AMP_SMP[3];
-                __u16                           UNA[3];
-                __u16                           Ucode_Version_Number;
-                __u16                           Status_CHG_Indicate;
-                __u16                           RESERVED_STATUS_0;
-} SBlock;
-
-#pragma pack(1)
-typedef struct ACBlockType {
-                __u16                   cmd_done_status;    /* 02 */
-                __u16                   cmd_info;           /* 04 */
-                __u32                   trc_next_ptr;           /* 08 */
-                __u16                   cmd;                /* 10 */
-                __u16                   subcmd;             /* 12 */
-                __u16                   data_offset_lo;         /* 14 */
-                __u16                   data_offset_hi;         /* 16 */
-
-                struct  ACBlockType     *next_ptr;              /* 20 */
-
-                __u8                    filler[12];             /* 32 */
-} ACBlock;
-
-#define NUM_OF_INTERRUPTS               0x20
-
-#pragma pack(1)
-typedef struct {
-                Interrupt_Status_Word   IStatus[NUM_OF_INTERRUPTS];
-} ISBlock;
-
-#pragma pack(1)
-typedef struct {
-                __u16                   valid_command;          /* 02 */
-                __u16                   iack_code;              /* 04 */
-                __u16                   resume_control;         /* 06 */
-                __u16                   int_mask_control;       /* 08 */
-                __u16                   int_mask_state;         /* 10 */
-
-                __u8                    filler[6];              /* 16 */
-} SCLBlock;
-
-#pragma pack(1)
-typedef struct
-{
-                __u16                   config;                 /* 02 */
-                __u32                   trc_sclb_ptr;           /* 06 */
-                __u32                   trc_acb_ptr;            /* 10 */
-                __u32                   trc_isb_ptr;            /* 14 */
-                __u16                   isbsiz;                 /* 16 */
-
-                SCLBlock                *sclb_ptr;              /* 20 */
-                ACBlock                 *acb_ptr;               /* 24 */
-                ISBlock                 *isb_ptr;               /* 28 */
-
-                __u16                   Non_Mac_Rx_Bdbs;        /* 30 DEBUG */
-                __u8                    filler[2];              /* 32 */
-
-} SCGBlock;
-
-#pragma pack(1)
-typedef struct
-{
-        __u32           trc_scgb_ptr;
-        SCGBlock        *scgb_ptr;
-} ISCPBlock;
-#pragma pack()
-
-typedef struct net_local {
-        ISCPBlock       *iscpb_ptr;
-        SCGBlock        *scgb_ptr;
-        SCLBlock        *sclb_ptr;
-        ISBlock         *isb_ptr;
-
-        ACBlock         *acb_head;
-        ACBlock         *acb_curr;
-        ACBlock         *acb_next;
-
-        __u8            adapter_name[12];
-
-        __u16           num_rx_bdbs     [NUM_RX_QS_USED];
-        __u16           num_rx_fcbs     [NUM_RX_QS_USED];
-
-        __u16           num_tx_bdbs     [NUM_TX_QS_USED];
-        __u16           num_tx_fcbs     [NUM_TX_QS_USED];
-
-        __u16           num_of_tx_buffs;
-
-        __u16           tx_buff_size    [NUM_TX_QS_USED];
-        __u16           tx_buff_used    [NUM_TX_QS_USED];
-        __u16           tx_queue_status [NUM_TX_QS_USED];
-
-        FCBlock         *tx_fcb_head[NUM_TX_QS_USED];
-        FCBlock         *tx_fcb_curr[NUM_TX_QS_USED];
-        FCBlock         *tx_fcb_end[NUM_TX_QS_USED];
-        BDBlock         *tx_bdb_head[NUM_TX_QS_USED];
-        __u16           *tx_buff_head[NUM_TX_QS_USED];
-        __u16           *tx_buff_end[NUM_TX_QS_USED];
-        __u16           *tx_buff_curr[NUM_TX_QS_USED];
-        __u16           num_tx_fcbs_used[NUM_TX_QS_USED];
-
-        FCBlock         *rx_fcb_head[NUM_RX_QS_USED];
-        FCBlock         *rx_fcb_curr[NUM_RX_QS_USED];
-        BDBlock         *rx_bdb_head[NUM_RX_QS_USED];
-        BDBlock         *rx_bdb_curr[NUM_RX_QS_USED];
-        BDBlock         *rx_bdb_end[NUM_RX_QS_USED];
-        __u16           *rx_buff_head[NUM_RX_QS_USED];
-        __u16           *rx_buff_end[NUM_RX_QS_USED];
-
-        __u32           *ptr_local_ring_num;
-
-        __u32           sh_mem_used;
-
-        __u16           page_offset_mask;
-
-        __u16           authorized_function_classes;
-        __u16           authorized_access_priority;
-
-        __u16            num_acbs;
-        __u16            num_acbs_used;
-        __u16            acb_pending;
-
-        __u16           current_isb_index;
-
-        __u8            monitor_state;
-        __u8            monitor_state_ready;
-        __u16           ring_status;
-        __u8            ring_status_flags;
-        __u8            state;
-
-        __u8            join_state;
-
-        __u8            slot_num;
-        __u16           pos_id;
-
-        __u32           *ptr_una;
-        __u32           *ptr_bcn_type;
-        __u32           *ptr_tx_fifo_underruns;
-        __u32           *ptr_rx_fifo_underruns;
-        __u32           *ptr_rx_fifo_overruns;
-        __u32           *ptr_tx_fifo_overruns;
-        __u32           *ptr_tx_fcb_overruns;
-        __u32           *ptr_rx_fcb_overruns;
-        __u32           *ptr_tx_bdb_overruns;
-        __u32           *ptr_rx_bdb_overruns;
-
-        __u16           receive_queue_number;
-
-        __u8            rx_fifo_overrun_count;
-        __u8            tx_fifo_overrun_count;
-
-        __u16            adapter_flags;
-        __u16           adapter_flags1;
-        __u16            *misc_command_data;
-        __u16            max_packet_size;
-
-        __u16            config_word0;
-        __u16            config_word1;
-
-        __u8            trc_mask;
-
-        __u16            source_ring_number;
-        __u16            target_ring_number;
-
-        __u16           microcode_version;
-
-        __u16            bic_type;
-        __u16            nic_type;
-        __u16            board_id;
-
-        __u16            rom_size;
-        __u32           rom_base;
-        __u16            ram_size;
-        __u16            ram_usable;
-        __u32           ram_base;
-        __u32           ram_access;
-
-        __u16            extra_info;
-        __u16            mode_bits;
-        __u16           media_menu;
-        __u16           media_type;
-        __u16           adapter_bus;
-
-        __u16           status;
-        __u16            receive_mask;
-
-        __u16            group_address_0;
-        __u16            group_address[2];
-        __u16            functional_address_0;
-        __u16            functional_address[2];
-        __u16            bitwise_group_address[2];
-
-        __u8            cleanup;
-
-        struct sk_buff_head SendSkbQueue;
-        __u16 QueueSkb;
-
-        struct tr_statistics MacStat;   /* MAC statistics structure */
-        
-        spinlock_t      lock;
-} NET_LOCAL;
-
-/************************************
- * SNMP-ON-BOARD Agent Link Structure
- ************************************/
-
-typedef struct {
-        __u8           LnkSigStr[12]; /* signature string "SmcLinkTable" */
-        __u8           LnkDrvTyp;     /* 1=Redbox ODI, 2=ODI DOS, 3=ODI OS/2, 4=NDIS DOS */
-        __u8           LnkFlg;        /* 0 if no agent linked, 1 if agent linked */
-        void           *LnkNfo;       /* routine which returns pointer to NIC info */
-        void           *LnkAgtRcv;    /* pointer to agent receive trap entry */
-        void           *LnkAgtXmt;            /* pointer to agent transmit trap
-entry  */
-void           *LnkGet;                  /* pointer to NIC receive data
-copy routine */
-        void           *LnkSnd;                  /* pointer to NIC send routine
-*/
-        void           *LnkRst;                  /* pointer to NIC driver reset
-routine */
-        void           *LnkMib;                  /* pointer to MIB data base */
-        void           *LnkMibAct;            /* pointer to MIB action routine list */
-        __u16           LnkCntOffset;  /* offset to error counters */
-        __u16           LnkCntNum;     /* number of error counters */
-        __u16           LnkCntSize;    /* size of error counters i.e. 32 = 32 bits */
-        void           *LnkISR;       /* pointer to interrupt vector */
-        __u8           LnkFrmTyp;     /* 1=Ethernet, 2=Token Ring */
-        __u8           LnkDrvVer1 ;   /* driver major version */
-        __u8           LnkDrvVer2 ;   /* driver minor version */
-} AgentLink;
-
-/*
- * Definitions for pcm_card_flags(bit_mapped)
- */
-#define REG_COMPLETE   0x0001
-#define INSERTED       0x0002
-#define PCC_INSERTED   0x0004         /* 1=currently inserted, 0=cur removed */
-
-/*
- * Adapter RAM test patterns
- */
-#define RAM_PATTERN_1  0x55AA
-#define RAM_PATTERN_2  0x9249
-#define RAM_PATTERN_3  0xDB6D
-
-/*
- * definitions for RAM test
- */
-#define ROM_SIGNATURE  0xAA55
-#define MIN_ROM_SIZE   0x2000
-
-/*
- * Return Codes
- */
-#define SUCCESS                 0x0000
-#define ADAPTER_AND_CONFIG      0x0001
-#define ADAPTER_NO_CONFIG       0x0002
-#define NOT_MY_INTERRUPT        0x0003
-#define FRAME_REJECTED          0x0004
-#define EVENTS_DISABLED         0x0005
-#define OUT_OF_RESOURCES        0x0006
-#define INVALID_PARAMETER       0x0007
-#define INVALID_FUNCTION        0x0008
-#define INITIALIZE_FAILED       0x0009
-#define CLOSE_FAILED            0x000A
-#define MAX_COLLISIONS          0x000B
-#define NO_SUCH_DESTINATION     0x000C
-#define BUFFER_TOO_SMALL_ERROR  0x000D
-#define ADAPTER_CLOSED          0x000E
-#define UCODE_NOT_PRESENT       0x000F
-#define FIFO_UNDERRUN           0x0010
-#define DEST_OUT_OF_RESOURCES   0x0011
-#define ADAPTER_NOT_INITIALIZED 0x0012
-#define PENDING                 0x0013
-#define UCODE_PRESENT           0x0014
-#define NOT_INIT_BY_BRIDGE      0x0015
-
-#define OPEN_FAILED             0x0080
-#define HARDWARE_FAILED         0x0081
-#define SELF_TEST_FAILED        0x0082
-#define RAM_TEST_FAILED         0x0083
-#define RAM_CONFLICT            0x0084
-#define ROM_CONFLICT            0x0085
-#define UNKNOWN_ADAPTER         0x0086
-#define CONFIG_ERROR            0x0087
-#define CONFIG_WARNING          0x0088
-#define NO_FIXED_CNFG           0x0089
-#define EEROM_CKSUM_ERROR       0x008A
-#define ROM_SIGNATURE_ERROR     0x008B
-#define ROM_CHECKSUM_ERROR      0x008C
-#define ROM_SIZE_ERROR          0x008D
-#define UNSUPPORTED_NIC_CHIP    0x008E
-#define NIC_REG_ERROR           0x008F
-#define BIC_REG_ERROR           0x0090
-#define MICROCODE_TEST_ERROR    0x0091
-#define LOBE_MEDIA_TEST_FAILED  0x0092
-
-#define ADAPTER_FOUND_LAN_CORRUPT 0x009B
-
-#define ADAPTER_NOT_FOUND       0xFFFF
-
-#define ILLEGAL_FUNCTION        INVALID_FUNCTION
-
-/* Errors */
-#define IO_BASE_INVALID         0x0001
-#define IO_BASE_RANGE           0x0002
-#define IRQ_INVALID             0x0004
-#define IRQ_RANGE               0x0008
-#define RAM_BASE_INVALID        0x0010
-#define RAM_BASE_RANGE          0x0020
-#define RAM_SIZE_RANGE          0x0040
-#define MEDIA_INVALID           0x0800
-
-/* Warnings */
-#define IRQ_MISMATCH            0x0080
-#define RAM_BASE_MISMATCH       0x0100
-#define RAM_SIZE_MISMATCH       0x0200
-#define BUS_MODE_MISMATCH       0x0400
-
-#define RX_CRC_ERROR                            0x01
-#define RX_ALIGNMENT_ERROR              0x02
-#define RX_HW_FAILED                            0x80
-
-/*
- * Definitions for the field RING_STATUS_FLAGS
- */
-#define RING_STATUS_CHANGED                     0X01
-#define MONITOR_STATE_CHANGED                   0X02
-#define JOIN_STATE_CHANGED                      0X04
-
-/*
- * Definitions for the field JOIN_STATE
- */
-#define JS_BYPASS_STATE                         0x00
-#define JS_LOBE_TEST_STATE                      0x01
-#define JS_DETECT_MONITOR_PRESENT_STATE         0x02
-#define JS_AWAIT_NEW_MONITOR_STATE              0x03
-#define JS_DUPLICATE_ADDRESS_TEST_STATE         0x04
-#define JS_NEIGHBOR_NOTIFICATION_STATE          0x05
-#define JS_REQUEST_INITIALIZATION_STATE         0x06
-#define JS_JOIN_COMPLETE_STATE                  0x07
-#define JS_BYPASS_WAIT_STATE                    0x08
-
-/*
- * Definitions for the field MONITOR_STATE
- */
-#define MS_MONITOR_FSM_INACTIVE                 0x00
-#define MS_REPEAT_BEACON_STATE                  0x01
-#define MS_REPEAT_CLAIM_TOKEN_STATE             0x02
-#define MS_TRANSMIT_CLAIM_TOKEN_STATE           0x03
-#define MS_STANDBY_MONITOR_STATE                0x04
-#define MS_TRANSMIT_BEACON_STATE                0x05
-#define MS_ACTIVE_MONITOR_STATE                 0x06
-#define MS_TRANSMIT_RING_PURGE_STATE            0x07
-#define MS_BEACON_TEST_STATE                    0x09
-
-/*
- * Definitions for the bit-field RING_STATUS
- */
-#define SIGNAL_LOSS                             0x8000
-#define HARD_ERROR                              0x4000
-#define SOFT_ERROR                              0x2000
-#define TRANSMIT_BEACON                         0x1000
-#define LOBE_WIRE_FAULT                         0x0800
-#define AUTO_REMOVAL_ERROR                      0x0400
-#define REMOVE_RECEIVED                         0x0100
-#define COUNTER_OVERFLOW                        0x0080
-#define SINGLE_STATION                          0x0040
-#define RING_RECOVERY                           0x0020
-
-/*
- * Definitions for the field BUS_TYPE
- */
-#define AT_BUS                  0x00
-#define MCA_BUS                 0x01
-#define EISA_BUS                0x02
-#define PCI_BUS                 0x03
-#define PCMCIA_BUS              0x04
-
-/*
- * Definitions for adapter_flags
- */
-#define RX_VALID_LOOKAHEAD      0x0001
-#define FORCED_16BIT_MODE       0x0002
-#define ADAPTER_DISABLED        0x0004
-#define TRANSMIT_CHAIN_INT      0x0008
-#define EARLY_RX_FRAME          0x0010
-#define EARLY_TX                0x0020
-#define EARLY_RX_COPY           0x0040
-#define USES_PHYSICAL_ADDR      0x0080          /* Rsvd for DEC PCI and 9232 */
-#define NEEDS_PHYSICAL_ADDR     0x0100          /* Reserved*/
-#define RX_STATUS_PENDING       0x0200
-#define ERX_DISABLED            0x0400          /* EARLY_RX_ENABLE rcv_mask */
-#define ENABLE_TX_PENDING       0x0800
-#define ENABLE_RX_PENDING       0x1000
-#define PERM_CLOSE              0x2000  
-#define IO_MAPPED               0x4000          /* IOmapped bus interface 795 */
-#define ETX_DISABLED            0x8000
-
-
-/*
- * Definitions for adapter_flags1
- */
-#define TX_PHY_RX_VIRT          0x0001 
-#define NEEDS_HOST_RAM          0x0002
-#define NEEDS_MEDIA_TYPE        0x0004
-#define EARLY_RX_DONE           0x0008
-#define PNP_BOOT_BIT            0x0010  /* activates PnP & config on power-up */
-                                        /* clear => regular PnP operation */
-#define PNP_ENABLE              0x0020  /* regular PnP operation clear => */
-                                        /* no PnP, overrides PNP_BOOT_BIT */
-#define SATURN_ENABLE           0x0040
-
-#define ADAPTER_REMOVABLE       0x0080  /* adapter is hot swappable */
-#define TX_PHY                  0x0100  /* Uses physical address for tx bufs */
-#define RX_PHY                  0x0200  /* Uses physical address for rx bufs */
-#define TX_VIRT                 0x0400  /* Uses virtual addr for tx bufs */
-#define RX_VIRT                 0x0800 
-#define NEEDS_SERVICE           0x1000 
-
-/*
- * Adapter Status Codes
- */
-#define OPEN                    0x0001
-#define INITIALIZED             0x0002
-#define CLOSED                  0x0003
-#define FAILED                  0x0005
-#define NOT_INITIALIZED         0x0006
-#define IO_CONFLICT             0x0007
-#define CARD_REMOVED            0x0008
-#define CARD_INSERTED           0x0009
-
-/*
- * Mode Bit Definitions
- */
-#define INTERRUPT_STATUS_BIT    0x8000  /* PC Interrupt Line: 0 = Not Enabled */
-#define BOOT_STATUS_MASK        0x6000  /* Mask to isolate BOOT_STATUS */
-#define BOOT_INHIBIT            0x0000  /* BOOT_STATUS is 'inhibited' */
-#define BOOT_TYPE_1             0x2000  /* Unused BOOT_STATUS value */
-#define BOOT_TYPE_2             0x4000  /* Unused BOOT_STATUS value */
-#define BOOT_TYPE_3             0x6000  /* Unused BOOT_STATUS value */
-#define ZERO_WAIT_STATE_MASK    0x1800  /* Mask to isolate Wait State flags */
-#define ZERO_WAIT_STATE_8_BIT   0x1000  /* 0 = Disabled (Inserts Wait States) */
-#define ZERO_WAIT_STATE_16_BIT  0x0800  /* 0 = Disabled (Inserts Wait States) */
-#define LOOPING_MODE_MASK       0x0007
-#define LOOPBACK_MODE_0         0x0000
-#define LOOPBACK_MODE_1         0x0001
-#define LOOPBACK_MODE_2         0x0002
-#define LOOPBACK_MODE_3         0x0003
-#define LOOPBACK_MODE_4         0x0004
-#define LOOPBACK_MODE_5         0x0005
-#define LOOPBACK_MODE_6         0x0006
-#define LOOPBACK_MODE_7         0x0007
-#define AUTO_MEDIA_DETECT       0x0008
-#define MANUAL_CRC              0x0010
-#define EARLY_TOKEN_REL         0x0020  /* Early Token Release for Token Ring */
-#define UMAC               0x0040 
-#define UTP2_PORT               0x0080  /* For 8216T2, 0=port A, 1=Port B. */
-#define BNC_10BT_INTERFACE      0x0600  /* BNC and UTP current media set */
-#define UTP_INTERFACE           0x0500  /* Ethernet UTP Only. */
-#define BNC_INTERFACE           0x0400
-#define AUI_INTERFACE           0x0300
-#define AUI_10BT_INTERFACE      0x0200
-#define STARLAN_10_INTERFACE    0x0100
-#define INTERFACE_TYPE_MASK     0x0700
-
-/*
- * Media Type Bit Definitions
- *
- * legend:      TP = Twisted Pair
- *              STP = Shielded twisted pair
- *              UTP = Unshielded twisted pair
- */
-
-#define CNFG_MEDIA_TYPE_MASK    0x001e  /* POS Register 3 Mask         */
-
-#define MEDIA_S10               0x0000  /* Ethernet adapter, TP.        */
-#define MEDIA_AUI_UTP           0x0001  /* Ethernet adapter, AUI/UTP media */
-#define MEDIA_BNC               0x0002  /* Ethernet adapter, BNC media. */
-#define MEDIA_AUI               0x0003  /* Ethernet Adapter, AUI media. */
-#define MEDIA_STP_16            0x0004  /* TokenRing adap, 16Mbit STP.  */
-#define MEDIA_STP_4             0x0005  /* TokenRing adap, 4Mbit STP.   */
-#define MEDIA_UTP_16            0x0006  /* TokenRing adap, 16Mbit UTP.  */
-#define MEDIA_UTP_4             0x0007  /* TokenRing adap, 4Mbit UTP.   */
-#define MEDIA_UTP               0x0008  /* Ethernet adapter, UTP media (no AUI)
-*/
-#define MEDIA_BNC_UTP           0x0010  /* Ethernet adapter, BNC/UTP media */
-#define MEDIA_UTPFD             0x0011  /* Ethernet adapter, TP full duplex */
-#define MEDIA_UTPNL             0x0012  /* Ethernet adapter, TP with link integrity test disabled */
-#define MEDIA_AUI_BNC           0x0013  /* Ethernet adapter, AUI/BNC media */
-#define MEDIA_AUI_BNC_UTP       0x0014  /* Ethernet adapter, AUI_BNC/UTP */
-#define MEDIA_UTPA              0x0015  /* Ethernet UTP-10Mbps Ports A */
-#define MEDIA_UTPB              0x0016  /* Ethernet UTP-10Mbps Ports B */
-#define MEDIA_STP_16_UTP_16     0x0017  /* Token Ring STP-16Mbps/UTP-16Mbps */
-#define MEDIA_STP_4_UTP_4       0x0018  /* Token Ring STP-4Mbps/UTP-4Mbps */
-
-#define MEDIA_STP100_UTP100     0x0020  /* Ethernet STP-100Mbps/UTP-100Mbps */
-#define MEDIA_UTP100FD          0x0021  /* Ethernet UTP-100Mbps, full duplex */
-#define MEDIA_UTP100            0x0022  /* Ethernet UTP-100Mbps */
-
-
-#define MEDIA_UNKNOWN           0xFFFF  /* Unknown adapter/media type   */
-
-/*
- * Definitions for the field:
- * media_type2
- */
-#define MEDIA_TYPE_MII              0x0001
-#define MEDIA_TYPE_UTP              0x0002
-#define MEDIA_TYPE_BNC              0x0004
-#define MEDIA_TYPE_AUI              0x0008
-#define MEDIA_TYPE_S10              0x0010
-#define MEDIA_TYPE_AUTO_SENSE       0x1000
-#define MEDIA_TYPE_AUTO_DETECT      0x4000
-#define MEDIA_TYPE_AUTO_NEGOTIATE   0x8000
-
-/*
- * Definitions for the field:
- * line_speed
- */
-#define LINE_SPEED_UNKNOWN          0x0000
-#define LINE_SPEED_4                0x0001
-#define LINE_SPEED_10               0x0002
-#define LINE_SPEED_16               0x0004
-#define LINE_SPEED_100              0x0008
-#define LINE_SPEED_T4               0x0008  /* 100BaseT4 aliased for 9332BVT */
-#define LINE_SPEED_FULL_DUPLEX      0x8000
-
-/*
- * Definitions for the field:
- * bic_type (Bus interface chip type)
- */
-#define BIC_NO_CHIP             0x0000  /* Bus interface chip not implemented */
-#define BIC_583_CHIP            0x0001  /* 83C583 bus interface chip */
-#define BIC_584_CHIP            0x0002  /* 83C584 bus interface chip */
-#define BIC_585_CHIP            0x0003  /* 83C585 bus interface chip */
-#define BIC_593_CHIP            0x0004  /* 83C593 bus interface chip */
-#define BIC_594_CHIP            0x0005  /* 83C594 bus interface chip */
-#define BIC_564_CHIP            0x0006  /* PCMCIA Bus interface chip */
-#define BIC_790_CHIP            0x0007  /* 83C790 bus i-face/Ethernet NIC chip */
-#define BIC_571_CHIP            0x0008  /* 83C571 EISA bus master i-face */
-#define BIC_587_CHIP            0x0009  /* Token Ring AT bus master i-face */
-#define BIC_574_CHIP            0x0010  /* FEAST bus interface chip */
-#define BIC_8432_CHIP           0x0011  /* 8432 bus i-face/Ethernet NIC(DEC PCI) */
-#define BIC_9332_CHIP           0x0012  /* 9332 bus i-face/100Mbps Ether NIC(DEC PCI) */
-#define BIC_8432E_CHIP          0x0013  /* 8432 Enhanced bus iface/Ethernet NIC(DEC) */
-#define BIC_EPIC100_CHIP        0x0014  /* EPIC/100 10/100 Mbps Ethernet BIC/NIC */
-#define BIC_C94_CHIP            0x0015  /* 91C94 bus i-face in PCMCIA mode */
-#define BIC_X8020_CHIP          0x0016  /* Xilinx PCMCIA multi-func i-face */
-
-/*
- * Definitions for the field:
- * nic_type (Bus interface chip type)
- */
-#define NIC_UNK_CHIP            0x0000  /* Unknown NIC chip      */
-#define NIC_8390_CHIP           0x0001  /* DP8390 Ethernet NIC   */
-#define NIC_690_CHIP            0x0002  /* 83C690 Ethernet NIC   */
-#define NIC_825_CHIP            0x0003  /* 83C825 Token Ring NIC */
-/*      #define NIC_???_CHIP    0x0004  */ /* Not used           */
-/*      #define NIC_???_CHIP    0x0005  */ /* Not used           */
-/*      #define NIC_???_CHIP    0x0006  */ /* Not used           */
-#define NIC_790_CHIP            0x0007  /* 83C790 bus i-face/Ethernet NIC chip */
-#define NIC_C100_CHIP           0x0010  /* FEAST 100Mbps Ethernet NIC */
-#define NIC_8432_CHIP           0x0011  /* 8432 bus i-face/Ethernet NIC(DEC PCI) */
-#define NIC_9332_CHIP           0x0012  /* 9332 bus i-face/100Mbps Ether NIC(DEC PCI) */
-#define NIC_8432E_CHIP          0x0013  /* 8432 enhanced bus iface/Ethernet NIC(DEC) */
-#define NIC_EPIC100_CHIP        0x0014   /* EPIC/100 10/100 Mbps Ethernet BIC/NIC */
-#define NIC_C94_CHIP            0x0015  /* 91C94 PC Card with multi func */
-
-/*
- * Definitions for the field:
- * adapter_type The adapter_type field describes the adapter/bus
- *              configuration.
- */
-#define BUS_ISA16_TYPE          0x0001  /* 16 bit adap in 16 bit (E)ISA slot  */
-#define BUS_ISA8_TYPE           0x0002  /* 8/16b adap in 8 bit XT/(E)ISA slot */
-#define BUS_MCA_TYPE            0x0003  /* Micro Channel adapter              */
-
-/*
- * Receive Mask definitions
- */
-#define ACCEPT_MULTICAST                0x0001
-#define ACCEPT_BROADCAST                0x0002
-#define PROMISCUOUS_MODE                0x0004
-#define ACCEPT_SOURCE_ROUTING           0x0008
-#define ACCEPT_ERR_PACKETS              0x0010
-#define ACCEPT_ATT_MAC_FRAMES           0x0020
-#define ACCEPT_MULTI_PROM               0x0040
-#define TRANSMIT_ONLY                   0x0080
-#define ACCEPT_EXT_MAC_FRAMES           0x0100
-#define EARLY_RX_ENABLE                 0x0200
-#define PKT_SIZE_NOT_NEEDED             0x0400
-#define ACCEPT_SOURCE_ROUTING_SPANNING  0x0808
-
-#define ACCEPT_ALL_MAC_FRAMES           0x0120
-
-/*
- * config_mode defs
- */
-#define STORE_EEROM             0x0001  /* Store config in EEROM. */
-#define STORE_REGS              0x0002  /* Store config in register set. */
-
-/*
- * equates for lmac_flags in adapter structure (Ethernet)
- */
-#define         MEM_DISABLE     0x0001
-#define         RX_STATUS_POLL  0x0002
-#define         USE_RE_BIT      0x0004
-/*#define       RESERVED        0x0008 */
-/*#define       RESERVED        0x0010 */
-/*#define       RESERVED        0x0020 */
-/*#define       RESERVED        0x0040 */
-/*#define       RESERVED        0x0080 */
-/*#define       RESERVED        0x0100 */
-/*#define       RESERVED        0x0200 */
-/*#define       RESERVED        0x0400 */
-/*#define       RESERVED        0x0800 */
-/*#define       RESERVED        0x1000 */
-/*#define       RESERVED        0x2000 */
-/*#define       RESERVED        0x4000 */
-/*#define       RESERVED        0x8000 */
-
-/* media_opts & media_set Fields bit defs for Ethernet ... */
-#define         MED_OPT_BNC     0x01
-#define         MED_OPT_UTP     0x02
-#define         MED_OPT_AUI     0x04
-#define         MED_OPT_10MB    0x08
-#define         MED_OPT_100MB   0x10
-#define         MED_OPT_S10     0x20
-
-/* media_opts & media_set Fields bit defs for Token Ring ... */
-#define         MED_OPT_4MB     0x08
-#define         MED_OPT_16MB    0x10
-#define         MED_OPT_STP     0x40
-
-#define MAX_8023_SIZE           1500    /* Max 802.3 size of frame. */
-#define DEFAULT_ERX_VALUE       4       /* Number of 16-byte blocks for 790B early Rx. */
-#define DEFAULT_ETX_VALUE       32      /* Number of bytes for 790B early Tx. */
-#define DEFAULT_TX_RETRIES      3       /* Number of transmit retries */
-#define LPBK_FRAME_SIZE         1024    /* Default loopback frame for Rx calibration test. */
-#define MAX_LOOKAHEAD_SIZE      252     /* Max lookahead size for ethernet. */
-
-#define RW_MAC_STATE                    0x1101
-#define RW_SA_OF_LAST_AMP_OR_SMP        0x2803
-#define RW_PHYSICAL_DROP_NUMBER         0x3B02
-#define RW_UPSTREAM_NEIGHBOR_ADDRESS    0x3E03
-#define RW_PRODUCT_INSTANCE_ID          0x4B09
-
-#define RW_TRC_STATUS_BLOCK             0x5412
-
-#define RW_MAC_ERROR_COUNTERS_NO_CLEAR  0x8006
-#define RW_MAC_ERROR_COUNTER_CLEAR      0x7A06
-#define RW_CONFIG_REGISTER_0            0xA001
-#define RW_CONFIG_REGISTER_1            0xA101
-#define RW_PRESCALE_TIMER_THRESHOLD     0xA201
-#define RW_TPT_THRESHOLD                0xA301
-#define RW_TQP_THRESHOLD                0xA401
-#define RW_TNT_THRESHOLD                0xA501
-#define RW_TBT_THRESHOLD                0xA601
-#define RW_TSM_THRESHOLD                0xA701
-#define RW_TAM_THRESHOLD                0xA801
-#define RW_TBR_THRESHOLD                0xA901
-#define RW_TER_THRESHOLD                0xAA01
-#define RW_TGT_THRESHOLD                0xAB01
-#define RW_THT_THRESHOLD                0xAC01
-#define RW_TRR_THRESHOLD                0xAD01
-#define RW_TVX_THRESHOLD                0xAE01
-#define RW_INDIVIDUAL_MAC_ADDRESS       0xB003
-
-#define RW_INDIVIDUAL_GROUP_ADDRESS     0xB303  /* all of group addr */
-#define RW_INDIVIDUAL_GROUP_ADDR_WORD_0 0xB301  /* 1st word of group addr */
-#define RW_INDIVIDUAL_GROUP_ADDR        0xB402  /* 2nd-3rd word of group addr */
-#define RW_FUNCTIONAL_ADDRESS           0xB603  /* all of functional addr */
-#define RW_FUNCTIONAL_ADDR_WORD_0       0xB601  /* 1st word of func  addr */
-#define RW_FUNCTIONAL_ADDR              0xB702  /* 2nd-3rd word func addr */
-
-#define RW_BIT_SIGNIFICANT_GROUP_ADDR   0xB902
-#define RW_SOURCE_RING_BRIDGE_NUMBER    0xBB01
-#define RW_TARGET_RING_NUMBER           0xBC01
-
-#define RW_HIC_INTERRUPT_MASK           0xC601
-
-#define SOURCE_ROUTING_SPANNING_BITS    0x00C0  /* Spanning Tree Frames */
-#define SOURCE_ROUTING_EXPLORER_BIT     0x0040  /* Explorer and Single Route */
-
-        /* write */
-
-#define CSR_MSK_ALL             0x80    // Bic 587 Only
-#define CSR_MSKTINT             0x20
-#define CSR_MSKCBUSY            0x10
-#define CSR_CLRTINT             0x08
-#define CSR_CLRCBUSY            0x04
-#define CSR_WCSS                0x02
-#define CSR_CA                  0x01
-
-        /* read */
-
-#define CSR_TINT                0x20
-#define CSR_CINT                0x10
-#define CSR_TSTAT               0x08
-#define CSR_CSTAT               0x04
-#define CSR_FAULT               0x02
-#define CSR_CBUSY               0x01
-
-#define LAAR_MEM16ENB           0x80
-#define Zws16                   0x20
-
-#define IRR_IEN                 0x80
-#define Zws8                    0x01
-
-#define IMCCR_EIL               0x04
-
-typedef struct {
-        __u8            ac;                             /* Access Control */
-        __u8            fc;                             /* Frame Control */
-        __u8            da[6];                          /* Dest Addr */
-        __u8            sa[6];                          /* Source Addr */
-
-        __u16            vl;                             /* Vector Length */
-        __u8            dc_sc;                          /* Dest/Source Class */
-        __u8            vc;                             /* Vector Code */
-        } MAC_HEADER;
-
-#define MAX_SUB_VECTOR_INFO     (RX_DATA_BUFFER_SIZE - sizeof(MAC_HEADER) - 2)
-
-typedef struct
-        {
-        __u8            svl;                            /* Sub-vector Length */
-        __u8            svi;                            /* Sub-vector Code */
-        __u8            svv[MAX_SUB_VECTOR_INFO];       /* Sub-vector Info */
-        } MAC_SUB_VECTOR;
-
-#endif  /* __KERNEL__ */
-#endif  /* __LINUX_SMCTR_H */
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
deleted file mode 100644
index be4813e0366c..000000000000
--- a/drivers/net/tokenring/tms380tr.c
+++ /dev/null
@@ -1,2306 +0,0 @@
-/*
- *  tms380tr.c: A network driver library for Texas Instruments TMS380-based
- *              Token Ring Adapters.
- *
- *  Originally sktr.c: Written 1997 by Christoph Goos
- *
- *  A fine result of the Linux Systems Network Architecture Project.
- *  http://www.vanheusden.com/sna/ 
- *
- *  This software may be used and distributed according to the terms
- *  of the GNU General Public License, incorporated herein by reference.
- *
- *  The following modules are currently available for card support:
- *      - tmspci (Generic PCI card support)
- *      - abyss (Madge PCI support)
- *      - tmsisa (SysKonnect TR4/16 ISA)
- *
- *  Sources:
- *      - The hardware related parts of this driver are take from
- *        the SysKonnect Token Ring driver for Windows NT.
- *      - I used the IBM Token Ring driver 'ibmtr.c' as a base for this
- *        driver, as well as the 'skeleton.c' driver by Donald Becker.
- *      - Also various other drivers in the linux source tree were taken
- *        as samples for some tasks.
- *      - TI TMS380 Second-Generation Token Ring User's Guide
- *      - TI datasheets for respective chips
- *      - David Hein at Texas Instruments 
- *      - Various Madge employees
- *
- *  Maintainer(s):
- *    JS        Jay Schulist            jschlst@samba.org
- *    CG        Christoph Goos          cgoos@syskonnect.de
- *    AF        Adam Fritzler
- *    MLP       Mike Phillips           phillim@amtrak.com
- *    JF        Jochen Friedrich        jochen@scram.de
- *     
- *  Modification History:
- *      29-Aug-97       CG      Created
- *      04-Apr-98       CG      Fixed problems caused by tok_timer_check
- *      10-Apr-98       CG      Fixed lockups at cable disconnection
- *      27-May-98       JS      Formated to Linux Kernel Format
- *      31-May-98       JS      Hacked in PCI support
- *      16-Jun-98       JS      Modulized for multiple cards with one driver
- *         Sep-99       AF      Renamed to tms380tr (supports more than SK's)
- *      23-Sep-99       AF      Added Compaq and Thomas-Conrad PCI support
- *                              Fixed a bug causing double copies on PCI
- *                              Fixed for new multicast stuff (2.2/2.3)
- *      25-Sep-99       AF      Uped TPL_NUM from 3 to 9
- *                              Removed extraneous 'No free TPL'
- *      22-Dec-99       AF      Added Madge PCI Mk2 support and generalized
- *                              parts of the initilization procedure.
- *      30-Dec-99       AF      Turned tms380tr into a library ala 8390.
- *                              Madge support is provided in the abyss module
- *                              Generic PCI support is in the tmspci module.
- *      30-Nov-00       JF      Updated PCI code to support IO MMU via
- *                              pci_map_static(). Alpha uses this MMU for ISA
- *                              as well.
- *      14-Jan-01       JF      Fix DMA on ifdown/ifup sequences. Some 
- *                              cleanup.
- *      13-Jan-02       JF      Add spinlock to fix race condition.
- *      09-Nov-02       JF      Fixed printks to not SPAM the console during
- *                              normal operation.
- *      30-Dec-02       JF      Removed incorrect __init from 
- *                              tms380tr_init_card.
- *      22-Jul-05       JF      Converted to dma-mapping.
- *                              
- *  To do:
- *    1. Multi/Broadcast packet handling (this may have fixed itself)
- *    2. Write a sktrisa module that includes the old ISA support (done)
- *    3. Allow modules to load their own microcode
- *    4. Speed up the BUD process -- freezing the kernel for 3+sec is
- *         quite unacceptable.
- *    5. Still a few remaining stalls when the cable is unplugged.
- */
-
-#ifdef MODULE
-static const char version[] = "tms380tr.c: v1.10 30/12/2002 by Christoph Goos, Adam Fritzler\n";
-#endif
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/fcntl.h>
-#include <linux/interrupt.h>
-#include <linux/ptrace.h>
-#include <linux/ioport.h>
-#include <linux/in.h>
-#include <linux/string.h>
-#include <linux/time.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/dma-mapping.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/trdevice.h>
-#include <linux/firmware.h>
-#include <linux/bitops.h>
-
-#include <asm/io.h>
-#include <asm/dma.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-
-#include "tms380tr.h"           /* Our Stuff */
-
-/* Use 0 for production, 1 for verification, 2 for debug, and
- * 3 for very verbose debug.
- */
-#ifndef TMS380TR_DEBUG
-#define TMS380TR_DEBUG 0
-#endif
-static unsigned int tms380tr_debug = TMS380TR_DEBUG;
-
-/* Index to functions, as function prototypes.
- * Alphabetical by function name.
- */
-
-/* "A" */
-/* "B" */
-static int      tms380tr_bringup_diags(struct net_device *dev);
-/* "C" */
-static void     tms380tr_cancel_tx_queue(struct net_local* tp);
-static int      tms380tr_chipset_init(struct net_device *dev);
-static void     tms380tr_chk_irq(struct net_device *dev);
-static void     tms380tr_chk_outstanding_cmds(struct net_device *dev);
-static void     tms380tr_chk_src_addr(unsigned char *frame, unsigned char *hw_addr);
-static unsigned char tms380tr_chk_ssb(struct net_local *tp, unsigned short IrqType);
-int             tms380tr_close(struct net_device *dev);
-static void     tms380tr_cmd_status_irq(struct net_device *dev);
-/* "D" */
-static void     tms380tr_disable_interrupts(struct net_device *dev);
-#if TMS380TR_DEBUG > 0
-static void     tms380tr_dump(unsigned char *Data, int length);
-#endif
-/* "E" */
-static void     tms380tr_enable_interrupts(struct net_device *dev);
-static void     tms380tr_exec_cmd(struct net_device *dev, unsigned short Command);
-static void     tms380tr_exec_sifcmd(struct net_device *dev, unsigned int WriteValue);
-/* "F" */
-/* "G" */
-static struct net_device_stats *tms380tr_get_stats(struct net_device *dev);
-/* "H" */
-static netdev_tx_t tms380tr_hardware_send_packet(struct sk_buff *skb,
-                                                       struct net_device *dev);
-/* "I" */
-static int      tms380tr_init_adapter(struct net_device *dev);
-static void     tms380tr_init_ipb(struct net_local *tp);
-static void     tms380tr_init_net_local(struct net_device *dev);
-static void     tms380tr_init_opb(struct net_device *dev);
-/* "M" */
-/* "O" */
-int             tms380tr_open(struct net_device *dev);
-static void     tms380tr_open_adapter(struct net_device *dev);
-/* "P" */
-/* "R" */
-static void     tms380tr_rcv_status_irq(struct net_device *dev);
-static int      tms380tr_read_ptr(struct net_device *dev);
-static void     tms380tr_read_ram(struct net_device *dev, unsigned char *Data,
-                        unsigned short Address, int Length);
-static int      tms380tr_reset_adapter(struct net_device *dev);
-static void     tms380tr_reset_interrupt(struct net_device *dev);
-static void     tms380tr_ring_status_irq(struct net_device *dev);
-/* "S" */
-static netdev_tx_t tms380tr_send_packet(struct sk_buff *skb,
-                                              struct net_device *dev);
-static void     tms380tr_set_multicast_list(struct net_device *dev);
-static int      tms380tr_set_mac_address(struct net_device *dev, void *addr);
-/* "T" */
-static void     tms380tr_timer_chk(unsigned long data);
-static void     tms380tr_timer_end_wait(unsigned long data);
-static void     tms380tr_tx_status_irq(struct net_device *dev);
-/* "U" */
-static void     tms380tr_update_rcv_stats(struct net_local *tp,
-                        unsigned char DataPtr[], unsigned int Length);
-/* "W" */
-void            tms380tr_wait(unsigned long time);
-static void     tms380tr_write_rpl_status(RPL *rpl, unsigned int Status);
-static void     tms380tr_write_tpl_status(TPL *tpl, unsigned int Status);
-
-#define SIFREADB(reg) \
-        (((struct net_local *)netdev_priv(dev))->sifreadb(dev, reg))
-#define SIFWRITEB(val, reg) \
-        (((struct net_local *)netdev_priv(dev))->sifwriteb(dev, val, reg))
-#define SIFREADW(reg) \
-        (((struct net_local *)netdev_priv(dev))->sifreadw(dev, reg))
-#define SIFWRITEW(val, reg) \
-        (((struct net_local *)netdev_priv(dev))->sifwritew(dev, val, reg))
-
-
-
-#if 0 /* TMS380TR_DEBUG > 0 */
-static int madgemc_sifprobe(struct net_device *dev)
-{
-        unsigned char old, chk1, chk2;
-        
-        old = SIFREADB(SIFADR);  /* Get the old SIFADR value */
-
-        chk1 = 0;       /* Begin with check value 0 */
-        do {
-                madgemc_setregpage(dev, 0);
-                /* Write new SIFADR value */
-                SIFWRITEB(chk1, SIFADR);
-                chk2 = SIFREADB(SIFADR);
-                if (chk2 != chk1)
-                        return -1;
-                
-                madgemc_setregpage(dev, 1);
-                /* Read, invert and write */
-                chk2 = SIFREADB(SIFADD);
-                if (chk2 != chk1)
-                        return -1;
-
-                madgemc_setregpage(dev, 0);
-                chk2 ^= 0x0FE;
-                SIFWRITEB(chk2, SIFADR);
-
-                /* Read, invert and compare */
-                madgemc_setregpage(dev, 1);
-                chk2 = SIFREADB(SIFADD);
-                madgemc_setregpage(dev, 0);
-                chk2 ^= 0x0FE;
-
-                if(chk1 != chk2)
-                        return -1;    /* No adapter */
-                chk1 -= 2;
-        } while(chk1 != 0);     /* Repeat 128 times (all byte values) */
-
-        madgemc_setregpage(dev, 0); /* sanity */
-        /* Restore the SIFADR value */
-        SIFWRITEB(old, SIFADR);
-
-        return 0;
-}
-#endif
-
-/*
- * Open/initialize the board. This is called sometime after
- * booting when the 'ifconfig' program is run.
- *
- * This routine should set everything up anew at each open, even
- * registers that "should" only need to be set once at boot, so that
- * there is non-reboot way to recover if something goes wrong.
- */
-int tms380tr_open(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int err;
-        
-        /* init the spinlock */
-        spin_lock_init(&tp->lock);
-        init_timer(&tp->timer);
-
-        /* Reset the hardware here. Don't forget to set the station address. */
-
-#ifdef CONFIG_ISA
-        if(dev->dma > 0) 
-        {
-                unsigned long flags=claim_dma_lock();
-                disable_dma(dev->dma);
-                set_dma_mode(dev->dma, DMA_MODE_CASCADE);
-                enable_dma(dev->dma);
-                release_dma_lock(flags);
-        }
-#endif
-        
-        err = tms380tr_chipset_init(dev);
-        if(err)
-        {
-                printk(KERN_INFO "%s: Chipset initialization error\n", 
-                        dev->name);
-                return -1;
-        }
-
-        tp->timer.expires       = jiffies + 30*HZ;
-        tp->timer.function      = tms380tr_timer_end_wait;
-        tp->timer.data          = (unsigned long)dev;
-        add_timer(&tp->timer);
-
-        printk(KERN_DEBUG "%s: Adapter RAM size: %dK\n", 
-               dev->name, tms380tr_read_ptr(dev));
-
-        tms380tr_enable_interrupts(dev);
-        tms380tr_open_adapter(dev);
-
-        netif_start_queue(dev);
-        
-        /* Wait for interrupt from hardware. If interrupt does not come,
-         * there will be a timeout from the timer.
-         */
-        tp->Sleeping = 1;
-        interruptible_sleep_on(&tp->wait_for_tok_int);
-        del_timer(&tp->timer);
-
-        /* If AdapterVirtOpenFlag is 1, the adapter is now open for use */
-        if(tp->AdapterVirtOpenFlag == 0)
-        {
-                tms380tr_disable_interrupts(dev);
-                return -1;
-        }
-
-        tp->StartTime = jiffies;
-
-        /* Start function control timer */
-        tp->timer.expires       = jiffies + 2*HZ;
-        tp->timer.function      = tms380tr_timer_chk;
-        tp->timer.data          = (unsigned long)dev;
-        add_timer(&tp->timer);
-
-        return 0;
-}
-
-/*
- * Timeout function while waiting for event
- */
-static void tms380tr_timer_end_wait(unsigned long data)
-{
-        struct net_device *dev = (struct net_device*)data;
-        struct net_local *tp = netdev_priv(dev);
-
-        if(tp->Sleeping)
-        {
-                tp->Sleeping = 0;
-                wake_up_interruptible(&tp->wait_for_tok_int);
-        }
-}
-
-/*
- * Initialize the chipset
- */
-static int tms380tr_chipset_init(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int err;
-
-        tms380tr_init_ipb(tp);
-        tms380tr_init_opb(dev);
-        tms380tr_init_net_local(dev);
-
-        if(tms380tr_debug > 3)
-                printk(KERN_DEBUG "%s: Resetting adapter...\n", dev->name);
-        err = tms380tr_reset_adapter(dev);
-        if(err < 0)
-                return -1;
-
-        if(tms380tr_debug > 3)
-                printk(KERN_DEBUG "%s: Bringup diags...\n", dev->name);
-        err = tms380tr_bringup_diags(dev);
-        if(err < 0)
-                return -1;
-
-        if(tms380tr_debug > 3)
-                printk(KERN_DEBUG "%s: Init adapter...\n", dev->name);
-        err = tms380tr_init_adapter(dev);
-        if(err < 0)
-                return -1;
-
-        if(tms380tr_debug > 3)
-                printk(KERN_DEBUG "%s: Done!\n", dev->name);
-        return 0;
-}
-
-/*
- * Initializes the net_local structure.
- */
-static void tms380tr_init_net_local(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        int i;
-        dma_addr_t dmabuf;
-
-        tp->scb.CMD     = 0;
-        tp->scb.Parm[0] = 0;
-        tp->scb.Parm[1] = 0;
-
-        tp->ssb.STS     = 0;
-        tp->ssb.Parm[0] = 0;
-        tp->ssb.Parm[1] = 0;
-        tp->ssb.Parm[2] = 0;
-
-        tp->CMDqueue    = 0;
-
-        tp->AdapterOpenFlag     = 0;
-        tp->AdapterVirtOpenFlag = 0;
-        tp->ScbInUse            = 0;
-        tp->OpenCommandIssued   = 0;
-        tp->ReOpenInProgress    = 0;
-        tp->HaltInProgress      = 0;
-        tp->TransmitHaltScheduled = 0;
-        tp->LobeWireFaultLogged = 0;
-        tp->LastOpenStatus      = 0;
-        tp->MaxPacketSize       = DEFAULT_PACKET_SIZE;
-
-        /* Create circular chain of transmit lists */
-        for (i = 0; i < TPL_NUM; i++)
-        {
-                tp->Tpl[i].NextTPLAddr = htonl(((char *)(&tp->Tpl[(i+1) % TPL_NUM]) - (char *)tp) + tp->dmabuffer); /* DMA buffer may be MMU driven */
-                tp->Tpl[i].Status       = 0;
-                tp->Tpl[i].FrameSize    = 0;
-                tp->Tpl[i].FragList[0].DataCount        = 0;
-                tp->Tpl[i].FragList[0].DataAddr         = 0;
-                tp->Tpl[i].NextTPLPtr   = &tp->Tpl[(i+1) % TPL_NUM];
-                tp->Tpl[i].MData        = NULL;
-                tp->Tpl[i].TPLIndex     = i;
-                tp->Tpl[i].DMABuff      = 0;
-                tp->Tpl[i].BusyFlag     = 0;
-        }
-
-        tp->TplFree = tp->TplBusy = &tp->Tpl[0];
-
-        /* Create circular chain of receive lists */
-        for (i = 0; i < RPL_NUM; i++)
-        {
-                tp->Rpl[i].NextRPLAddr = htonl(((char *)(&tp->Rpl[(i+1) % RPL_NUM]) - (char *)tp) + tp->dmabuffer); /* DMA buffer may be MMU driven */
-                tp->Rpl[i].Status = (RX_VALID | RX_START_FRAME | RX_END_FRAME | RX_FRAME_IRQ);
-                tp->Rpl[i].FrameSize = 0;
-                tp->Rpl[i].FragList[0].DataCount = cpu_to_be16((unsigned short)tp->MaxPacketSize);
-
-                /* Alloc skb and point adapter to data area */
-                tp->Rpl[i].Skb = dev_alloc_skb(tp->MaxPacketSize);
-                        tp->Rpl[i].DMABuff = 0;
-
-                /* skb == NULL ? then use local buffer */
-                if(tp->Rpl[i].Skb == NULL)
-                {
-                        tp->Rpl[i].SkbStat = SKB_UNAVAILABLE;
-                        tp->Rpl[i].FragList[0].DataAddr = htonl(((char *)tp->LocalRxBuffers[i] - (char *)tp) + tp->dmabuffer);
-                        tp->Rpl[i].MData = tp->LocalRxBuffers[i];
-                }
-                else    /* SKB != NULL */
-                {
-                        tp->Rpl[i].Skb->dev = dev;
-                        skb_put(tp->Rpl[i].Skb, tp->MaxPacketSize);
-
-                        /* data unreachable for DMA ? then use local buffer */
-                        dmabuf = dma_map_single(tp->pdev, tp->Rpl[i].Skb->data, tp->MaxPacketSize, DMA_FROM_DEVICE);
-                        if(tp->dmalimit && (dmabuf + tp->MaxPacketSize > tp->dmalimit))
-                        {
-                                tp->Rpl[i].SkbStat = SKB_DATA_COPY;
-                                tp->Rpl[i].FragList[0].DataAddr = htonl(((char *)tp->LocalRxBuffers[i] - (char *)tp) + tp->dmabuffer);
-                                tp->Rpl[i].MData = tp->LocalRxBuffers[i];
-                        }
-                        else    /* DMA directly in skb->data */
-                        {
-                                tp->Rpl[i].SkbStat = SKB_DMA_DIRECT;
-                                tp->Rpl[i].FragList[0].DataAddr = htonl(dmabuf);
-                                tp->Rpl[i].MData = tp->Rpl[i].Skb->data;
-                                tp->Rpl[i].DMABuff = dmabuf;
-                        }
-                }
-
-                tp->Rpl[i].NextRPLPtr = &tp->Rpl[(i+1) % RPL_NUM];
-                tp->Rpl[i].RPLIndex = i;
-        }
-
-        tp->RplHead = &tp->Rpl[0];
-        tp->RplTail = &tp->Rpl[RPL_NUM-1];
-        tp->RplTail->Status = (RX_START_FRAME | RX_END_FRAME | RX_FRAME_IRQ);
-}
-
-/*
- * Initializes the initialisation parameter block.
- */
-static void tms380tr_init_ipb(struct net_local *tp)
-{
-        tp->ipb.Init_Options    = BURST_MODE;
-        tp->ipb.CMD_Status_IV   = 0;
-        tp->ipb.TX_IV           = 0;
-        tp->ipb.RX_IV           = 0;
-        tp->ipb.Ring_Status_IV  = 0;
-        tp->ipb.SCB_Clear_IV    = 0;
-        tp->ipb.Adapter_CHK_IV  = 0;
-        tp->ipb.RX_Burst_Size   = BURST_SIZE;
-        tp->ipb.TX_Burst_Size   = BURST_SIZE;
-        tp->ipb.DMA_Abort_Thrhld = DMA_RETRIES;
-        tp->ipb.SCB_Addr        = 0;
-        tp->ipb.SSB_Addr        = 0;
-}
-
-/*
- * Initializes the open parameter block.
- */
-static void tms380tr_init_opb(struct net_device *dev)
-{
-        struct net_local *tp;
-        unsigned long Addr;
-        unsigned short RplSize    = RPL_SIZE;
-        unsigned short TplSize    = TPL_SIZE;
-        unsigned short BufferSize = BUFFER_SIZE;
-        int i;
-
-        tp = netdev_priv(dev);
-
-        tp->ocpl.OPENOptions     = 0;
-        tp->ocpl.OPENOptions    |= ENABLE_FULL_DUPLEX_SELECTION;
-        tp->ocpl.FullDuplex      = 0;
-        tp->ocpl.FullDuplex     |= OPEN_FULL_DUPLEX_OFF;
-
-        /* 
-         * Set node address 
-         *
-         * We go ahead and put it in the OPB even though on
-         * most of the generic adapters this isn't required.
-         * Its simpler this way.  -- ASF
-         */
-        for (i=0;i<6;i++)
-                tp->ocpl.NodeAddr[i] = ((unsigned char *)dev->dev_addr)[i];
-
-        tp->ocpl.GroupAddr       = 0;
-        tp->ocpl.FunctAddr       = 0;
-        tp->ocpl.RxListSize      = cpu_to_be16((unsigned short)RplSize);
-        tp->ocpl.TxListSize      = cpu_to_be16((unsigned short)TplSize);
-        tp->ocpl.BufSize         = cpu_to_be16((unsigned short)BufferSize);
-        tp->ocpl.Reserved        = 0;
-        tp->ocpl.TXBufMin        = TX_BUF_MIN;
-        tp->ocpl.TXBufMax        = TX_BUF_MAX;
-
-        Addr = htonl(((char *)tp->ProductID - (char *)tp) + tp->dmabuffer);
-
-        tp->ocpl.ProdIDAddr[0]   = LOWORD(Addr);
-        tp->ocpl.ProdIDAddr[1]   = HIWORD(Addr);
-}
-
-/*
- * Send OPEN command to adapter
- */
-static void tms380tr_open_adapter(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        if(tp->OpenCommandIssued)
-                return;
-
-        tp->OpenCommandIssued = 1;
-        tms380tr_exec_cmd(dev, OC_OPEN);
-}
-
-/*
- * Clear the adapter's interrupt flag. Clear system interrupt enable
- * (SINTEN): disable adapter to system interrupts.
- */
-static void tms380tr_disable_interrupts(struct net_device *dev)
-{
-        SIFWRITEB(0, SIFACL);
-}
-
-/*
- * Set the adapter's interrupt flag. Set system interrupt enable
- * (SINTEN): enable adapter to system interrupts.
- */
-static void tms380tr_enable_interrupts(struct net_device *dev)
-{
-        SIFWRITEB(ACL_SINTEN, SIFACL);
-}
-
-/*
- * Put command in command queue, try to execute it.
- */
-static void tms380tr_exec_cmd(struct net_device *dev, unsigned short Command)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        tp->CMDqueue |= Command;
-        tms380tr_chk_outstanding_cmds(dev);
-}
-
-static void tms380tr_timeout(struct net_device *dev)
-{
-        /*
-         * If we get here, some higher level has decided we are broken.
-         * There should really be a "kick me" function call instead.
-         *
-         * Resetting the token ring adapter takes a long time so just
-         * fake transmission time and go on trying. Our own timeout
-         * routine is in tms380tr_timer_chk()
-         */
-        dev->trans_start = jiffies; /* prevent tx timeout */
-        netif_wake_queue(dev);
-}
-
-/*
- * Gets skb from system, queues it and checks if it can be sent
- */
-static netdev_tx_t tms380tr_send_packet(struct sk_buff *skb,
-                                              struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        netdev_tx_t rc;
-
-        rc = tms380tr_hardware_send_packet(skb, dev);
-        if(tp->TplFree->NextTPLPtr->BusyFlag)
-                netif_stop_queue(dev);
-        return rc;
-}
-
-/*
- * Move frames into adapter tx queue
- */
-static netdev_tx_t tms380tr_hardware_send_packet(struct sk_buff *skb,
-                                                       struct net_device *dev)
-{
-        TPL *tpl;
-        short length;
-        unsigned char *buf;
-        unsigned long flags;
-        int i;
-        dma_addr_t dmabuf, newbuf;
-        struct net_local *tp = netdev_priv(dev);
-   
-        /* Try to get a free TPL from the chain.
-         *
-         * NOTE: We *must* always leave one unused TPL in the chain,
-         * because otherwise the adapter might send frames twice.
-         */
-        spin_lock_irqsave(&tp->lock, flags);
-        if(tp->TplFree->NextTPLPtr->BusyFlag)  { /* No free TPL */
-                if (tms380tr_debug > 0)
-                        printk(KERN_DEBUG "%s: No free TPL\n", dev->name);
-                spin_unlock_irqrestore(&tp->lock, flags);
-                return NETDEV_TX_BUSY;
-        }
-
-        dmabuf = 0;
-
-        /* Is buffer reachable for Busmaster-DMA? */
-
-        length  = skb->len;
-        dmabuf = dma_map_single(tp->pdev, skb->data, length, DMA_TO_DEVICE);
-        if(tp->dmalimit && (dmabuf + length > tp->dmalimit)) {
-                /* Copy frame to local buffer */
-                dma_unmap_single(tp->pdev, dmabuf, length, DMA_TO_DEVICE);
-                dmabuf  = 0;
-                i       = tp->TplFree->TPLIndex;
-                buf     = tp->LocalTxBuffers[i];
-                skb_copy_from_linear_data(skb, buf, length);
-                newbuf  = ((char *)buf - (char *)tp) + tp->dmabuffer;
-        }
-        else {
-                /* Send direct from skb->data */
-                newbuf  = dmabuf;
-                buf     = skb->data;
-        }
-        /* Source address in packet? */
-        tms380tr_chk_src_addr(buf, dev->dev_addr);
-        tp->LastSendTime        = jiffies;
-        tpl                     = tp->TplFree;  /* Get the "free" TPL */
-        tpl->BusyFlag           = 1;            /* Mark TPL as busy */
-        tp->TplFree             = tpl->NextTPLPtr;
-    
-        /* Save the skb for delayed return of skb to system */
-        tpl->Skb = skb;
-        tpl->DMABuff = dmabuf;
-        tpl->FragList[0].DataCount = cpu_to_be16((unsigned short)length);
-        tpl->FragList[0].DataAddr  = htonl(newbuf);
-
-        /* Write the data length in the transmit list. */
-        tpl->FrameSize  = cpu_to_be16((unsigned short)length);
-        tpl->MData      = buf;
-
-        /* Transmit the frame and set the status values. */
-        tms380tr_write_tpl_status(tpl, TX_VALID | TX_START_FRAME
-                                | TX_END_FRAME | TX_PASS_SRC_ADDR
-                                | TX_FRAME_IRQ);
-
-        /* Let adapter send the frame. */
-        tms380tr_exec_sifcmd(dev, CMD_TX_VALID);
-        spin_unlock_irqrestore(&tp->lock, flags);
-
-        return NETDEV_TX_OK;
-}
-
-/*
- * Write the given value to the 'Status' field of the specified TPL.
- * NOTE: This function should be used whenever the status of any TPL must be
- * modified by the driver, because the compiler may otherwise change the
- * order of instructions such that writing the TPL status may be executed at
- * an undesirable time. When this function is used, the status is always
- * written when the function is called.
- */
-static void tms380tr_write_tpl_status(TPL *tpl, unsigned int Status)
-{
-        tpl->Status = Status;
-}
-
-static void tms380tr_chk_src_addr(unsigned char *frame, unsigned char *hw_addr)
-{
-        unsigned char SRBit;
-
-        if((((unsigned long)frame[8]) & ~0x80) != 0)    /* Compare 4 bytes */
-                return;
-        if((unsigned short)frame[12] != 0)              /* Compare 2 bytes */
-                return;
-
-        SRBit = frame[8] & 0x80;
-        memcpy(&frame[8], hw_addr, 6);
-        frame[8] |= SRBit;
-}
-
-/*
- * The timer routine: Check if adapter still open and working, reopen if not. 
- */
-static void tms380tr_timer_chk(unsigned long data)
-{
-        struct net_device *dev = (struct net_device*)data;
-        struct net_local *tp = netdev_priv(dev);
-
-        if(tp->HaltInProgress)
-                return;
-
-        tms380tr_chk_outstanding_cmds(dev);
-        if(time_before(tp->LastSendTime + SEND_TIMEOUT, jiffies) &&
-           (tp->TplFree != tp->TplBusy))
-        {
-                /* Anything to send, but stalled too long */
-                tp->LastSendTime = jiffies;
-                tms380tr_exec_cmd(dev, OC_CLOSE);       /* Does reopen automatically */
-        }
-
-        tp->timer.expires = jiffies + 2*HZ;
-        add_timer(&tp->timer);
-
-        if(tp->AdapterOpenFlag || tp->ReOpenInProgress)
-                return;
-        tp->ReOpenInProgress = 1;
-        tms380tr_open_adapter(dev);
-}
-
-/*
- * The typical workload of the driver: Handle the network interface interrupts.
- */
-irqreturn_t tms380tr_interrupt(int irq, void *dev_id)
-{
-        struct net_device *dev = dev_id;
-        struct net_local *tp;
-        unsigned short irq_type;
-        int handled = 0;
-
-        tp = netdev_priv(dev);
-
-        irq_type = SIFREADW(SIFSTS);
-
-        while(irq_type & STS_SYSTEM_IRQ) {
-                handled = 1;
-                irq_type &= STS_IRQ_MASK;
-
-                if(!tms380tr_chk_ssb(tp, irq_type)) {
-                        printk(KERN_DEBUG "%s: DATA LATE occurred\n", dev->name);
-                        break;
-                }
-
-                switch(irq_type) {
-                case STS_IRQ_RECEIVE_STATUS:
-                        tms380tr_reset_interrupt(dev);
-                        tms380tr_rcv_status_irq(dev);
-                        break;
-
-                case STS_IRQ_TRANSMIT_STATUS:
-                        /* Check if TRANSMIT.HALT command is complete */
-                        if(tp->ssb.Parm[0] & COMMAND_COMPLETE) {
-                                tp->TransmitCommandActive = 0;
-                                        tp->TransmitHaltScheduled = 0;
-
-                                        /* Issue a new transmit command. */
-                                        tms380tr_exec_cmd(dev, OC_TRANSMIT);
-                                }
-
-                                tms380tr_reset_interrupt(dev);
-                                tms380tr_tx_status_irq(dev);
-                                break;
-
-                case STS_IRQ_COMMAND_STATUS:
-                        /* The SSB contains status of last command
-                         * other than receive/transmit.
-                         */
-                        tms380tr_cmd_status_irq(dev);
-                        break;
-                        
-                case STS_IRQ_SCB_CLEAR:
-                        /* The SCB is free for another command. */
-                        tp->ScbInUse = 0;
-                        tms380tr_chk_outstanding_cmds(dev);
-                        break;
-                        
-                case STS_IRQ_RING_STATUS:
-                        tms380tr_ring_status_irq(dev);
-                        break;
-
-                case STS_IRQ_ADAPTER_CHECK:
-                        tms380tr_chk_irq(dev);
-                        break;
-
-                case STS_IRQ_LLC_STATUS:
-                        printk(KERN_DEBUG "tms380tr: unexpected LLC status IRQ\n");
-                        break;
-                        
-                case STS_IRQ_TIMER:
-                        printk(KERN_DEBUG "tms380tr: unexpected Timer IRQ\n");
-                        break;
-                        
-                case STS_IRQ_RECEIVE_PENDING:
-                        printk(KERN_DEBUG "tms380tr: unexpected Receive Pending IRQ\n");
-                        break;
-                        
-                default:
-                        printk(KERN_DEBUG "Unknown Token Ring IRQ (0x%04x)\n", irq_type);
-                        break;
-                }
-
-                /* Reset system interrupt if not already done. */
-                if(irq_type != STS_IRQ_TRANSMIT_STATUS &&
-                   irq_type != STS_IRQ_RECEIVE_STATUS) {
-                        tms380tr_reset_interrupt(dev);
-                }
-
-                irq_type = SIFREADW(SIFSTS);
-        }
-
-        return IRQ_RETVAL(handled);
-}
-
-/*
- *  Reset the INTERRUPT SYSTEM bit and issue SSB CLEAR command.
- */
-static void tms380tr_reset_interrupt(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        SSB *ssb = &tp->ssb;
-
-        /*
-         * [Workaround for "Data Late"]
-         * Set all fields of the SSB to well-defined values so we can
-         * check if the adapter has written the SSB.
-         */
-
-        ssb->STS        = (unsigned short) -1;
-        ssb->Parm[0]    = (unsigned short) -1;
-        ssb->Parm[1]    = (unsigned short) -1;
-        ssb->Parm[2]    = (unsigned short) -1;
-
-        /* Free SSB by issuing SSB_CLEAR command after reading IRQ code
-         * and clear STS_SYSTEM_IRQ bit: enable adapter for further interrupts.
-         */
-        tms380tr_exec_sifcmd(dev, CMD_SSB_CLEAR | CMD_CLEAR_SYSTEM_IRQ);
-}
-
-/*
- * Check if the SSB has actually been written by the adapter.
- */
-static unsigned char tms380tr_chk_ssb(struct net_local *tp, unsigned short IrqType)
-{
-        SSB *ssb = &tp->ssb;    /* The address of the SSB. */
-
-        /* C 0 1 2 INTERRUPT CODE
-         * - - - - --------------
-         * 1 1 1 1 TRANSMIT STATUS
-         * 1 1 1 1 RECEIVE STATUS
-         * 1 ? ? 0 COMMAND STATUS
-         * 0 0 0 0 SCB CLEAR
-         * 1 1 0 0 RING STATUS
-         * 0 0 0 0 ADAPTER CHECK
-         *
-         * 0 = SSB field not affected by interrupt
-         * 1 = SSB field is affected by interrupt
-         *
-         * C = SSB ADDRESS +0: COMMAND
-         * 0 = SSB ADDRESS +2: STATUS 0
-         * 1 = SSB ADDRESS +4: STATUS 1
-         * 2 = SSB ADDRESS +6: STATUS 2
-         */
-
-        /* Check if this interrupt does use the SSB. */
-
-        if(IrqType != STS_IRQ_TRANSMIT_STATUS &&
-           IrqType != STS_IRQ_RECEIVE_STATUS &&
-           IrqType != STS_IRQ_COMMAND_STATUS &&
-           IrqType != STS_IRQ_RING_STATUS)
-        {
-                return 1;       /* SSB not involved. */
-        }
-
-        /* Note: All fields of the SSB have been set to all ones (-1) after it
-         * has last been used by the software (see DriverIsr()).
-         *
-         * Check if the affected SSB fields are still unchanged.
-         */
-
-        if(ssb->STS == (unsigned short) -1)
-                return 0;       /* Command field not yet available. */
-        if(IrqType == STS_IRQ_COMMAND_STATUS)
-                return 1;       /* Status fields not always affected. */
-        if(ssb->Parm[0] == (unsigned short) -1)
-                return 0;       /* Status 1 field not yet available. */
-        if(IrqType == STS_IRQ_RING_STATUS)
-                return 1;       /* Status 2 & 3 fields not affected. */
-
-        /* Note: At this point, the interrupt is either TRANSMIT or RECEIVE. */
-        if(ssb->Parm[1] == (unsigned short) -1)
-                return 0;       /* Status 2 field not yet available. */
-        if(ssb->Parm[2] == (unsigned short) -1)
-                return 0;       /* Status 3 field not yet available. */
-
-        return 1;       /* All SSB fields have been written by the adapter. */
-}
-
-/*
- * Evaluates the command results status in the SSB status field.
- */
-static void tms380tr_cmd_status_irq(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned short ssb_cmd, ssb_parm_0;
-        unsigned short ssb_parm_1;
-        char *open_err = "Open error -";
-        char *code_err = "Open code -";
-
-        /* Copy the ssb values to local variables */
-        ssb_cmd    = tp->ssb.STS;
-        ssb_parm_0 = tp->ssb.Parm[0];
-        ssb_parm_1 = tp->ssb.Parm[1];
-
-        if(ssb_cmd == OPEN)
-        {
-                tp->Sleeping = 0;
-                if(!tp->ReOpenInProgress)
-                        wake_up_interruptible(&tp->wait_for_tok_int);
-
-                tp->OpenCommandIssued = 0;
-                tp->ScbInUse = 0;
-
-                if((ssb_parm_0 & 0x00FF) == GOOD_COMPLETION)
-                {
-                        /* Success, the adapter is open. */
-                        tp->LobeWireFaultLogged = 0;
-                        tp->AdapterOpenFlag     = 1;
-                        tp->AdapterVirtOpenFlag = 1;
-                        tp->TransmitCommandActive = 0;
-                        tms380tr_exec_cmd(dev, OC_TRANSMIT);
-                        tms380tr_exec_cmd(dev, OC_RECEIVE);
-
-                        if(tp->ReOpenInProgress)
-                                tp->ReOpenInProgress = 0;
-
-                        return;
-                }
-                else    /* The adapter did not open. */
-                {
-                        if(ssb_parm_0 & NODE_ADDR_ERROR)
-                                printk(KERN_INFO "%s: Node address error\n",
-                                        dev->name);
-                        if(ssb_parm_0 & LIST_SIZE_ERROR)
-                                printk(KERN_INFO "%s: List size error\n",
-                                        dev->name);
-                        if(ssb_parm_0 & BUF_SIZE_ERROR)
-                                printk(KERN_INFO "%s: Buffer size error\n",
-                                        dev->name);
-                        if(ssb_parm_0 & TX_BUF_COUNT_ERROR)
-                                printk(KERN_INFO "%s: Tx buffer count error\n",
-                                        dev->name);
-                        if(ssb_parm_0 & INVALID_OPEN_OPTION)
-                                printk(KERN_INFO "%s: Invalid open option\n",
-                                        dev->name);
-                        if(ssb_parm_0 & OPEN_ERROR)
-                        {
-                                /* Show the open phase. */
-                                switch(ssb_parm_0 & OPEN_PHASES_MASK)
-                                {
-                                        case LOBE_MEDIA_TEST:
-                                                if(!tp->LobeWireFaultLogged)
-                                                {
-                                                        tp->LobeWireFaultLogged = 1;
-                                                        printk(KERN_INFO "%s: %s Lobe wire fault (check cable !).\n", dev->name, open_err);
-                                                }
-                                                tp->ReOpenInProgress    = 1;
-                                                tp->AdapterOpenFlag     = 0;
-                                                tp->AdapterVirtOpenFlag = 1;
-                                                tms380tr_open_adapter(dev);
-                                                return;
-
-                                        case PHYSICAL_INSERTION:
-                                                printk(KERN_INFO "%s: %s Physical insertion.\n", dev->name, open_err);
-                                                break;
-
-                                        case ADDRESS_VERIFICATION:
-                                                printk(KERN_INFO "%s: %s Address verification.\n", dev->name, open_err);
-                                                break;
-
-                                        case PARTICIPATION_IN_RING_POLL:
-                                                printk(KERN_INFO "%s: %s Participation in ring poll.\n", dev->name, open_err);
-                                                break;
-
-                                        case REQUEST_INITIALISATION:
-                                                printk(KERN_INFO "%s: %s Request initialisation.\n", dev->name, open_err);
-                                                break;
-
-                                        case FULLDUPLEX_CHECK:
-                                                printk(KERN_INFO "%s: %s Full duplex check.\n", dev->name, open_err);
-                                                break;
-
-                                        default:
-                                                printk(KERN_INFO "%s: %s Unknown open phase\n", dev->name, open_err);
-                                                break;
-                                }
-
-                                /* Show the open errors. */
-                                switch(ssb_parm_0 & OPEN_ERROR_CODES_MASK)
-                                {
-                                        case OPEN_FUNCTION_FAILURE:
-                                                printk(KERN_INFO "%s: %s OPEN_FUNCTION_FAILURE", dev->name, code_err);
-                                                tp->LastOpenStatus =
-                                                        OPEN_FUNCTION_FAILURE;
-                                                break;
-
-                                        case OPEN_SIGNAL_LOSS:
-                                                printk(KERN_INFO "%s: %s OPEN_SIGNAL_LOSS\n", dev->name, code_err);
-                                                tp->LastOpenStatus =
-                                                        OPEN_SIGNAL_LOSS;
-                                                break;
-
-                                        case OPEN_TIMEOUT:
-                                                printk(KERN_INFO "%s: %s OPEN_TIMEOUT\n", dev->name, code_err);
-                                                tp->LastOpenStatus =
-                                                        OPEN_TIMEOUT;
-                                                break;
-
-                                        case OPEN_RING_FAILURE:
-                                                printk(KERN_INFO "%s: %s OPEN_RING_FAILURE\n", dev->name, code_err);
-                                                tp->LastOpenStatus =
-                                                        OPEN_RING_FAILURE;
-                                                break;
-
-                                        case OPEN_RING_BEACONING:
-                                                printk(KERN_INFO "%s: %s OPEN_RING_BEACONING\n", dev->name, code_err);
-                                                tp->LastOpenStatus =
-                                                        OPEN_RING_BEACONING;
-                                                break;
-
-                                        case OPEN_DUPLICATE_NODEADDR:
-                                                printk(KERN_INFO "%s: %s OPEN_DUPLICATE_NODEADDR\n", dev->name, code_err);
-                                                tp->LastOpenStatus =
-                                                        OPEN_DUPLICATE_NODEADDR;
-                                                break;
-
-                                        case OPEN_REQUEST_INIT:
-                                                printk(KERN_INFO "%s: %s OPEN_REQUEST_INIT\n", dev->name, code_err);
-                                                tp->LastOpenStatus =
-                                                        OPEN_REQUEST_INIT;
-                                                break;
-
-                                        case OPEN_REMOVE_RECEIVED:
-                                                printk(KERN_INFO "%s: %s OPEN_REMOVE_RECEIVED", dev->name, code_err);
-                                                tp->LastOpenStatus =
-                                                        OPEN_REMOVE_RECEIVED;
-                                                break;
-
-                                        case OPEN_FULLDUPLEX_SET:
-                                                printk(KERN_INFO "%s: %s OPEN_FULLDUPLEX_SET\n", dev->name, code_err);
-                                                tp->LastOpenStatus =
-                                                        OPEN_FULLDUPLEX_SET;
-                                                break;
-
-                                        default:
-                                                printk(KERN_INFO "%s: %s Unknown open err code", dev->name, code_err);
-                                                tp->LastOpenStatus =
-                                                        OPEN_FUNCTION_FAILURE;
-                                                break;
-                                }
-                        }
-
-                        tp->AdapterOpenFlag     = 0;
-                        tp->AdapterVirtOpenFlag = 0;
-
-                        return;
-                }
-        }
-        else
-        {
-                if(ssb_cmd != READ_ERROR_LOG)
-                        return;
-
-                /* Add values from the error log table to the MAC
-                 * statistics counters and update the errorlogtable
-                 * memory.
-                 */
-                tp->MacStat.line_errors += tp->errorlogtable.Line_Error;
-                tp->MacStat.burst_errors += tp->errorlogtable.Burst_Error;
-                tp->MacStat.A_C_errors += tp->errorlogtable.ARI_FCI_Error;
-                tp->MacStat.lost_frames += tp->errorlogtable.Lost_Frame_Error;
-                tp->MacStat.recv_congest_count += tp->errorlogtable.Rx_Congest_Error;
-                tp->MacStat.rx_errors += tp->errorlogtable.Rx_Congest_Error;
-                tp->MacStat.frame_copied_errors += tp->errorlogtable.Frame_Copied_Error;
-                tp->MacStat.token_errors += tp->errorlogtable.Token_Error;
-                tp->MacStat.dummy1 += tp->errorlogtable.DMA_Bus_Error;
-                tp->MacStat.dummy1 += tp->errorlogtable.DMA_Parity_Error;
-                tp->MacStat.abort_delimiters += tp->errorlogtable.AbortDelimeters;
-                tp->MacStat.frequency_errors += tp->errorlogtable.Frequency_Error;
-                tp->MacStat.internal_errors += tp->errorlogtable.Internal_Error;
-        }
-}
-
-/*
- * The inverse routine to tms380tr_open().
- */
-int tms380tr_close(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        netif_stop_queue(dev);
-        
-        del_timer(&tp->timer);
-
-        /* Flush the Tx and disable Rx here. */
-
-        tp->HaltInProgress      = 1;
-        tms380tr_exec_cmd(dev, OC_CLOSE);
-        tp->timer.expires       = jiffies + 1*HZ;
-        tp->timer.function      = tms380tr_timer_end_wait;
-        tp->timer.data          = (unsigned long)dev;
-        add_timer(&tp->timer);
-
-        tms380tr_enable_interrupts(dev);
-
-        tp->Sleeping = 1;
-        interruptible_sleep_on(&tp->wait_for_tok_int);
-        tp->TransmitCommandActive = 0;
-    
-        del_timer(&tp->timer);
-        tms380tr_disable_interrupts(dev);
-   
-#ifdef CONFIG_ISA
-        if(dev->dma > 0) 
-        {
-                unsigned long flags=claim_dma_lock();
-                disable_dma(dev->dma);
-                release_dma_lock(flags);
-        }
-#endif
-        
-        SIFWRITEW(0xFF00, SIFCMD);
-#if 0
-        if(dev->dma > 0) /* what the? */
-                SIFWRITEB(0xff, POSREG);
-#endif
-        tms380tr_cancel_tx_queue(tp);
-
-        return 0;
-}
-
-/*
- * Get the current statistics. This may be called with the card open
- * or closed.
- */
-static struct net_device_stats *tms380tr_get_stats(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        return (struct net_device_stats *)&tp->MacStat;
-}
-
-/*
- * Set or clear the multicast filter for this adapter.
- */
-static void tms380tr_set_multicast_list(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned int OpenOptions;
-        
-        OpenOptions = tp->ocpl.OPENOptions &
-                ~(PASS_ADAPTER_MAC_FRAMES
-                  | PASS_ATTENTION_FRAMES
-                  | PASS_BEACON_MAC_FRAMES
-                  | COPY_ALL_MAC_FRAMES
-                  | COPY_ALL_NON_MAC_FRAMES);
-        
-        tp->ocpl.FunctAddr = 0;
-        
-        if(dev->flags & IFF_PROMISC)
-                /* Enable promiscuous mode */
-                OpenOptions |= COPY_ALL_NON_MAC_FRAMES |
-                        COPY_ALL_MAC_FRAMES;
-        else
-        {
-                if(dev->flags & IFF_ALLMULTI)
-                {
-                        /* Disable promiscuous mode, use normal mode. */
-                        tp->ocpl.FunctAddr = 0xFFFFFFFF;
-                }
-                else
-                {
-                        struct netdev_hw_addr *ha;
-
-                        netdev_for_each_mc_addr(ha, dev) {
-                                ((char *)(&tp->ocpl.FunctAddr))[0] |=
-                                        ha->addr[2];
-                                ((char *)(&tp->ocpl.FunctAddr))[1] |=
-                                        ha->addr[3];
-                                ((char *)(&tp->ocpl.FunctAddr))[2] |=
-                                        ha->addr[4];
-                                ((char *)(&tp->ocpl.FunctAddr))[3] |=
-                                        ha->addr[5];
-                        }
-                }
-                tms380tr_exec_cmd(dev, OC_SET_FUNCT_ADDR);
-        }
-        
-        tp->ocpl.OPENOptions = OpenOptions;
-        tms380tr_exec_cmd(dev, OC_MODIFY_OPEN_PARMS);
-}
-
-/*
- * Wait for some time (microseconds)
- */
-void tms380tr_wait(unsigned long time)
-{
-#if 0
-        long tmp;
-        
-        tmp = jiffies + time/(1000000/HZ);
-        do {
-                tmp = schedule_timeout_interruptible(tmp);
-        } while(time_after(tmp, jiffies));
-#else
-        mdelay(time / 1000);
-#endif
-}
-
-/*
- * Write a command value to the SIFCMD register
- */
-static void tms380tr_exec_sifcmd(struct net_device *dev, unsigned int WriteValue)
-{
-        unsigned short cmd;
-        unsigned short SifStsValue;
-        unsigned long loop_counter;
-
-        WriteValue = ((WriteValue ^ CMD_SYSTEM_IRQ) | CMD_INTERRUPT_ADAPTER);
-        cmd = (unsigned short)WriteValue;
-        loop_counter = 0,5 * 800000;
-        do {
-                SifStsValue = SIFREADW(SIFSTS);
-        } while((SifStsValue & CMD_INTERRUPT_ADAPTER) && loop_counter--);
-        SIFWRITEW(cmd, SIFCMD);
-}
-
-/*
- * Processes adapter hardware reset, halts adapter and downloads firmware,
- * clears the halt bit.
- */
-static int tms380tr_reset_adapter(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned short *fw_ptr;
-        unsigned short count, c, count2;
-        const struct firmware *fw_entry = NULL;
-
-        if (request_firmware(&fw_entry, "tms380tr.bin", tp->pdev) != 0) {
-                printk(KERN_ALERT "%s: firmware %s is missing, cannot start.\n",
-                        dev->name, "tms380tr.bin");
-                return -1;
-        }
-
-        fw_ptr = (unsigned short *)fw_entry->data;
-        count2 = fw_entry->size / 2;
-
-        /* Hardware adapter reset */
-        SIFWRITEW(ACL_ARESET, SIFACL);
-        tms380tr_wait(40);
-        
-        c = SIFREADW(SIFACL);
-        tms380tr_wait(20);
-
-        if(dev->dma == 0)       /* For PCI adapters */
-        {
-                c &= ~(ACL_NSELOUT0 | ACL_NSELOUT1);    /* Clear bits */
-                if(tp->setnselout)
-                  c |= (*tp->setnselout)(dev);
-        }
-
-        /* In case a command is pending - forget it */
-        tp->ScbInUse = 0;
-
-        c &= ~ACL_ARESET;               /* Clear adapter reset bit */
-        c |=  ACL_CPHALT;               /* Halt adapter CPU, allow download */
-        c |= ACL_BOOT;
-        c |= ACL_SINTEN;
-        c &= ~ACL_PSDMAEN;              /* Clear pseudo dma bit */
-        SIFWRITEW(c, SIFACL);
-        tms380tr_wait(40);
-
-        count = 0;
-        /* Download firmware via DIO interface: */
-        do {
-                if (count2 < 3) continue;
-
-                /* Download first address part */
-                SIFWRITEW(*fw_ptr, SIFADX);
-                fw_ptr++;
-                count2--;
-                /* Download second address part */
-                SIFWRITEW(*fw_ptr, SIFADD);
-                fw_ptr++;
-                count2--;
-
-                if((count = *fw_ptr) != 0)      /* Load loop counter */
-                {
-                        fw_ptr++;       /* Download block data */
-                        count2--;
-                        if (count > count2) continue;
-
-                        for(; count > 0; count--)
-                        {
-                                SIFWRITEW(*fw_ptr, SIFINC);
-                                fw_ptr++;
-                                count2--;
-                        }
-                }
-                else    /* Stop, if last block downloaded */
-                {
-                        c = SIFREADW(SIFACL);
-                        c &= (~ACL_CPHALT | ACL_SINTEN);
-
-                        /* Clear CPHALT and start BUD */
-                        SIFWRITEW(c, SIFACL);
-                        release_firmware(fw_entry);
-                        return 1;
-                }
-        } while(count == 0);
-
-        release_firmware(fw_entry);
-        printk(KERN_INFO "%s: Adapter Download Failed\n", dev->name);
-        return -1;
-}
-
-MODULE_FIRMWARE("tms380tr.bin");
-
-/*
- * Starts bring up diagnostics of token ring adapter and evaluates
- * diagnostic results.
- */
-static int tms380tr_bringup_diags(struct net_device *dev)
-{
-        int loop_cnt, retry_cnt;
-        unsigned short Status;
-
-        tms380tr_wait(HALF_SECOND);
-        tms380tr_exec_sifcmd(dev, EXEC_SOFT_RESET);
-        tms380tr_wait(HALF_SECOND);
-
-        retry_cnt = BUD_MAX_RETRIES;    /* maximal number of retrys */
-
-        do {
-                retry_cnt--;
-                if(tms380tr_debug > 3)
-                        printk(KERN_DEBUG "BUD-Status: ");
-                loop_cnt = BUD_MAX_LOOPCNT;     /* maximum: three seconds*/
-                do {                    /* Inspect BUD results */
-                        loop_cnt--;
-                        tms380tr_wait(HALF_SECOND);
-                        Status = SIFREADW(SIFSTS);
-                        Status &= STS_MASK;
-
-                        if(tms380tr_debug > 3)
-                                printk(KERN_DEBUG " %04X\n", Status);
-                        /* BUD successfully completed */
-                        if(Status == STS_INITIALIZE)
-                                return 1;
-                /* Unrecoverable hardware error, BUD not completed? */
-                } while((loop_cnt > 0) && ((Status & (STS_ERROR | STS_TEST))
-                        != (STS_ERROR | STS_TEST)));
-
-                /* Error preventing completion of BUD */
-                if(retry_cnt > 0)
-                {
-                        printk(KERN_INFO "%s: Adapter Software Reset.\n", 
-                                dev->name);
-                        tms380tr_exec_sifcmd(dev, EXEC_SOFT_RESET);
-                        tms380tr_wait(HALF_SECOND);
-                }
-        } while(retry_cnt > 0);
-
-        Status = SIFREADW(SIFSTS);
-        
-        printk(KERN_INFO "%s: Hardware error\n", dev->name);
-        /* Hardware error occurred! */
-        Status &= 0x001f;
-        if (Status & 0x0010)
-                printk(KERN_INFO "%s: BUD Error: Timeout\n", dev->name);
-        else if ((Status & 0x000f) > 6)
-                printk(KERN_INFO "%s: BUD Error: Illegal Failure\n", dev->name);
-        else
-                printk(KERN_INFO "%s: Bring Up Diagnostics Error (%04X) occurred\n", dev->name, Status & 0x000f);
-
-        return -1;
-}
-
-/*
- * Copy initialisation data to adapter memory, beginning at address
- * 1:0A00; Starting DMA test and evaluating result bits.
- */
-static int tms380tr_init_adapter(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        const unsigned char SCB_Test[6] = {0x00, 0x00, 0xC1, 0xE2, 0xD4, 0x8B};
-        const unsigned char SSB_Test[8] = {0xFF, 0xFF, 0xD1, 0xD7,
-                                                0xC5, 0xD9, 0xC3, 0xD4};
-        void *ptr = (void *)&tp->ipb;
-        unsigned short *ipb_ptr = (unsigned short *)ptr;
-        unsigned char *cb_ptr = (unsigned char *) &tp->scb;
-        unsigned char *sb_ptr = (unsigned char *) &tp->ssb;
-        unsigned short Status;
-        int i, loop_cnt, retry_cnt;
-
-        /* Normalize: byte order low/high, word order high/low! (only IPB!) */
-        tp->ipb.SCB_Addr = SWAPW(((char *)&tp->scb - (char *)tp) + tp->dmabuffer);
-        tp->ipb.SSB_Addr = SWAPW(((char *)&tp->ssb - (char *)tp) + tp->dmabuffer);
-
-        if(tms380tr_debug > 3)
-        {
-                printk(KERN_DEBUG "%s: buffer (real): %lx\n", dev->name, (long) &tp->scb);
-                printk(KERN_DEBUG "%s: buffer (virt): %lx\n", dev->name, (long) ((char *)&tp->scb - (char *)tp) + (long) tp->dmabuffer);
-                printk(KERN_DEBUG "%s: buffer (DMA) : %lx\n", dev->name, (long) tp->dmabuffer);
-                printk(KERN_DEBUG "%s: buffer (tp)  : %lx\n", dev->name, (long) tp);
-        }
-        /* Maximum: three initialization retries */
-        retry_cnt = INIT_MAX_RETRIES;
-
-        do {
-                retry_cnt--;
-
-                /* Transfer initialization block */
-                SIFWRITEW(0x0001, SIFADX);
-
-                /* To address 0001:0A00 of adapter RAM */
-                SIFWRITEW(0x0A00, SIFADD);
-
-                /* Write 11 words to adapter RAM */
-                for(i = 0; i < 11; i++)
-                        SIFWRITEW(ipb_ptr[i], SIFINC);
-
-                /* Execute SCB adapter command */
-                tms380tr_exec_sifcmd(dev, CMD_EXECUTE);
-
-                loop_cnt = INIT_MAX_LOOPCNT;    /* Maximum: 11 seconds */
-
-                /* While remaining retries, no error and not completed */
-                do {
-                        Status = 0;
-                        loop_cnt--;
-                        tms380tr_wait(HALF_SECOND);
-
-                        /* Mask interesting status bits */
-                        Status = SIFREADW(SIFSTS);
-                        Status &= STS_MASK;
-                } while(((Status &(STS_INITIALIZE | STS_ERROR | STS_TEST)) != 0) &&
-                        ((Status & STS_ERROR) == 0) && (loop_cnt != 0));
-
-                if((Status & (STS_INITIALIZE | STS_ERROR | STS_TEST)) == 0)
-                {
-                        /* Initialization completed without error */
-                        i = 0;
-                        do {    /* Test if contents of SCB is valid */
-                                if(SCB_Test[i] != *(cb_ptr + i))
-                                {
-                                        printk(KERN_INFO "%s: DMA failed\n", dev->name);
-                                        /* DMA data error: wrong data in SCB */
-                                        return -1;
-                                }
-                                i++;
-                        } while(i < 6);
-
-                        i = 0;
-                        do {    /* Test if contents of SSB is valid */
-                                if(SSB_Test[i] != *(sb_ptr + i))
-                                        /* DMA data error: wrong data in SSB */
-                                        return -1;
-                                i++;
-                        } while (i < 8);
-
-                        return 1;       /* Adapter successfully initialized */
-                }
-                else
-                {
-                        if((Status & STS_ERROR) != 0)
-                        {
-                                /* Initialization error occurred */
-                                Status = SIFREADW(SIFSTS);
-                                Status &= STS_ERROR_MASK;
-                                /* ShowInitialisationErrorCode(Status); */
-                                printk(KERN_INFO "%s: Status error: %d\n", dev->name, Status);
-                                return -1; /* Unrecoverable error */
-                        }
-                        else
-                        {
-                                if(retry_cnt > 0)
-                                {
-                                        /* Reset adapter and try init again */
-                                        tms380tr_exec_sifcmd(dev, EXEC_SOFT_RESET);
-                                        tms380tr_wait(HALF_SECOND);
-                                }
-                        }
-                }
-        } while(retry_cnt > 0);
-
-        printk(KERN_INFO "%s: Retry exceeded\n", dev->name);
-        return -1;
-}
-
-/*
- * Check for outstanding commands in command queue and tries to execute
- * command immediately. Corresponding command flag in command queue is cleared.
- */
-static void tms380tr_chk_outstanding_cmds(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned long Addr = 0;
-
-        if(tp->CMDqueue == 0)
-                return;         /* No command execution */
-
-        /* If SCB in use: no command */
-        if(tp->ScbInUse == 1)
-                return;
-
-        /* Check if adapter is opened, avoiding COMMAND_REJECT
-         * interrupt by the adapter!
-         */
-        if (tp->AdapterOpenFlag == 0) {
-                if (tp->CMDqueue & OC_OPEN) {
-                        /* Execute OPEN command */
-                        tp->CMDqueue ^= OC_OPEN;
-
-                        Addr = htonl(((char *)&tp->ocpl - (char *)tp) + tp->dmabuffer);
-                        tp->scb.Parm[0] = LOWORD(Addr);
-                        tp->scb.Parm[1] = HIWORD(Addr);
-                        tp->scb.CMD = OPEN;
-                } else
-                        /* No OPEN command queued, but adapter closed. Note:
-                         * We'll try to re-open the adapter in DriverPoll()
-                         */
-                        return;         /* No adapter command issued */
-        } else {
-                /* Adapter is open; evaluate command queue: try to execute
-                 * outstanding commands (depending on priority!) CLOSE
-                 * command queued
-                 */
-                if (tp->CMDqueue & OC_CLOSE) {
-                        tp->CMDqueue ^= OC_CLOSE;
-                        tp->AdapterOpenFlag = 0;
-                        tp->scb.Parm[0] = 0; /* Parm[0], Parm[1] are ignored */
-                        tp->scb.Parm[1] = 0; /* but should be set to zero! */
-                        tp->scb.CMD = CLOSE;
-                        if(!tp->HaltInProgress)
-                                tp->CMDqueue |= OC_OPEN; /* re-open adapter */
-                        else
-                                tp->CMDqueue = 0;       /* no more commands */
-                } else if (tp->CMDqueue & OC_RECEIVE) {
-                        tp->CMDqueue ^= OC_RECEIVE;
-                        Addr = htonl(((char *)tp->RplHead - (char *)tp) + tp->dmabuffer);
-                        tp->scb.Parm[0] = LOWORD(Addr);
-                        tp->scb.Parm[1] = HIWORD(Addr);
-                        tp->scb.CMD = RECEIVE;
-                } else if (tp->CMDqueue & OC_TRANSMIT_HALT) {
-                        /* NOTE: TRANSMIT.HALT must be checked
-                         * before TRANSMIT.
-                         */
-                        tp->CMDqueue ^= OC_TRANSMIT_HALT;
-                        tp->scb.CMD = TRANSMIT_HALT;
-
-                        /* Parm[0] and Parm[1] are ignored
-                         * but should be set to zero!
-                         */
-                        tp->scb.Parm[0] = 0;
-                        tp->scb.Parm[1] = 0;
-                } else if (tp->CMDqueue & OC_TRANSMIT) {
-                        /* NOTE: TRANSMIT must be
-                         * checked after TRANSMIT.HALT
-                         */
-                        if (tp->TransmitCommandActive) {
-                                if (!tp->TransmitHaltScheduled) {
-                                        tp->TransmitHaltScheduled = 1;
-                                        tms380tr_exec_cmd(dev, OC_TRANSMIT_HALT);
-                                }
-                                tp->TransmitCommandActive = 0;
-                                return;
-                        }
-
-                        tp->CMDqueue ^= OC_TRANSMIT;
-                        tms380tr_cancel_tx_queue(tp);
-                        Addr = htonl(((char *)tp->TplBusy - (char *)tp) + tp->dmabuffer);
-                        tp->scb.Parm[0] = LOWORD(Addr);
-                        tp->scb.Parm[1] = HIWORD(Addr);
-                        tp->scb.CMD = TRANSMIT;
-                        tp->TransmitCommandActive = 1;
-                } else if (tp->CMDqueue & OC_MODIFY_OPEN_PARMS) {
-                        tp->CMDqueue ^= OC_MODIFY_OPEN_PARMS;
-                        tp->scb.Parm[0] = tp->ocpl.OPENOptions; /* new OPEN options*/
-                        tp->scb.Parm[0] |= ENABLE_FULL_DUPLEX_SELECTION;
-                        tp->scb.Parm[1] = 0; /* is ignored but should be zero */
-                        tp->scb.CMD = MODIFY_OPEN_PARMS;
-                } else if (tp->CMDqueue & OC_SET_FUNCT_ADDR) {
-                        tp->CMDqueue ^= OC_SET_FUNCT_ADDR;
-                        tp->scb.Parm[0] = LOWORD(tp->ocpl.FunctAddr);
-                        tp->scb.Parm[1] = HIWORD(tp->ocpl.FunctAddr);
-                        tp->scb.CMD = SET_FUNCT_ADDR;
-                } else if (tp->CMDqueue & OC_SET_GROUP_ADDR) {
-                        tp->CMDqueue ^= OC_SET_GROUP_ADDR;
-                        tp->scb.Parm[0] = LOWORD(tp->ocpl.GroupAddr);
-                        tp->scb.Parm[1] = HIWORD(tp->ocpl.GroupAddr);
-                        tp->scb.CMD = SET_GROUP_ADDR;
-                } else if (tp->CMDqueue & OC_READ_ERROR_LOG) {
-                        tp->CMDqueue ^= OC_READ_ERROR_LOG;
-                        Addr = htonl(((char *)&tp->errorlogtable - (char *)tp) + tp->dmabuffer);
-                        tp->scb.Parm[0] = LOWORD(Addr);
-                        tp->scb.Parm[1] = HIWORD(Addr);
-                        tp->scb.CMD = READ_ERROR_LOG;
-                } else {
-                        printk(KERN_WARNING "CheckForOutstandingCommand: unknown Command\n");
-                        tp->CMDqueue = 0;
-                        return;
-                }
-        }
-
-        tp->ScbInUse = 1;       /* Set semaphore: SCB in use. */
-
-        /* Execute SCB and generate IRQ when done. */
-        tms380tr_exec_sifcmd(dev, CMD_EXECUTE | CMD_SCB_REQUEST);
-}
-
-/*
- * IRQ conditions: signal loss on the ring, transmit or receive of beacon
- * frames (disabled if bit 1 of OPEN option is set); report error MAC
- * frame transmit (disabled if bit 2 of OPEN option is set); open or short
- * circuit fault on the lobe is detected; remove MAC frame received;
- * error counter overflow (255); opened adapter is the only station in ring.
- * After some of the IRQs the adapter is closed!
- */
-static void tms380tr_ring_status_irq(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-
-        tp->CurrentRingStatus = be16_to_cpu((unsigned short)tp->ssb.Parm[0]);
-
-        /* First: fill up statistics */
-        if(tp->ssb.Parm[0] & SIGNAL_LOSS)
-        {
-                printk(KERN_INFO "%s: Signal Loss\n", dev->name);
-                tp->MacStat.line_errors++;
-        }
-
-        /* Adapter is closed, but initialized */
-        if(tp->ssb.Parm[0] & LOBE_WIRE_FAULT)
-        {
-                printk(KERN_INFO "%s: Lobe Wire Fault, Reopen Adapter\n", 
-                        dev->name);
-                tp->MacStat.line_errors++;
-        }
-
-        if(tp->ssb.Parm[0] & RING_RECOVERY)
-                printk(KERN_INFO "%s: Ring Recovery\n", dev->name);
-
-        /* Counter overflow: read error log */
-        if(tp->ssb.Parm[0] & COUNTER_OVERFLOW)
-        {
-                printk(KERN_INFO "%s: Counter Overflow\n", dev->name);
-                tms380tr_exec_cmd(dev, OC_READ_ERROR_LOG);
-        }
-
-        /* Adapter is closed, but initialized */
-        if(tp->ssb.Parm[0] & REMOVE_RECEIVED)
-                printk(KERN_INFO "%s: Remove Received, Reopen Adapter\n", 
-                        dev->name);
-
-        /* Adapter is closed, but initialized */
-        if(tp->ssb.Parm[0] & AUTO_REMOVAL_ERROR)
-                printk(KERN_INFO "%s: Auto Removal Error, Reopen Adapter\n", 
-                        dev->name);
-
-        if(tp->ssb.Parm[0] & HARD_ERROR)
-                printk(KERN_INFO "%s: Hard Error\n", dev->name);
-
-        if(tp->ssb.Parm[0] & SOFT_ERROR)
-                printk(KERN_INFO "%s: Soft Error\n", dev->name);
-
-        if(tp->ssb.Parm[0] & TRANSMIT_BEACON)
-                printk(KERN_INFO "%s: Transmit Beacon\n", dev->name);
-
-        if(tp->ssb.Parm[0] & SINGLE_STATION)
-                printk(KERN_INFO "%s: Single Station\n", dev->name);
-
-        /* Check if adapter has been closed */
-        if(tp->ssb.Parm[0] & ADAPTER_CLOSED)
-        {
-                printk(KERN_INFO "%s: Adapter closed (Reopening)," 
-                        "CurrentRingStat %x\n",
-                        dev->name, tp->CurrentRingStatus);
-                tp->AdapterOpenFlag = 0;
-                tms380tr_open_adapter(dev);
-        }
-}
-
-/*
- * Issued if adapter has encountered an unrecoverable hardware
- * or software error.
- */
-static void tms380tr_chk_irq(struct net_device *dev)
-{
-        int i;
-        unsigned short AdapterCheckBlock[4];
-        struct net_local *tp = netdev_priv(dev);
-
-        tp->AdapterOpenFlag = 0;        /* Adapter closed now */
-
-        /* Page number of adapter memory */
-        SIFWRITEW(0x0001, SIFADX);
-        /* Address offset */
-        SIFWRITEW(CHECKADDR, SIFADR);
-
-        /* Reading 8 byte adapter check block. */
-        for(i = 0; i < 4; i++)
-                AdapterCheckBlock[i] = SIFREADW(SIFINC);
-
-        if(tms380tr_debug > 3)
-        {
-                printk(KERN_DEBUG "%s: AdapterCheckBlock: ", dev->name);
-                for (i = 0; i < 4; i++)
-                        printk("%04X", AdapterCheckBlock[i]);
-                printk("\n");
-        }
-
-        switch(AdapterCheckBlock[0])
-        {
-                case DIO_PARITY:
-                        printk(KERN_INFO "%s: DIO parity error\n", dev->name);
-                        break;
-
-                case DMA_READ_ABORT:
-                        printk(KERN_INFO "%s DMA read operation aborted:\n",
-                                dev->name);
-                        switch (AdapterCheckBlock[1])
-                        {
-                                case 0:
-                                        printk(KERN_INFO "Timeout\n");
-                                        printk(KERN_INFO "Address: %04X %04X\n",
-                                                AdapterCheckBlock[2],
-                                                AdapterCheckBlock[3]);
-                                        break;
-
-                                case 1:
-                                        printk(KERN_INFO "Parity error\n");
-                                        printk(KERN_INFO "Address: %04X %04X\n",
-                                                AdapterCheckBlock[2], 
-                                                AdapterCheckBlock[3]);
-                                        break;
-
-                                case 2: 
-                                        printk(KERN_INFO "Bus error\n");
-                                        printk(KERN_INFO "Address: %04X %04X\n",
-                                                AdapterCheckBlock[2], 
-                                                AdapterCheckBlock[3]);
-                                        break;
-
-                                default:
-                                        printk(KERN_INFO "Unknown error.\n");
-                                        break;
-                        }
-                        break;
-
-                case DMA_WRITE_ABORT:
-                        printk(KERN_INFO "%s: DMA write operation aborted:\n",
-                                dev->name);
-                        switch (AdapterCheckBlock[1])
-                        {
-                                case 0: 
-                                        printk(KERN_INFO "Timeout\n");
-                                        printk(KERN_INFO "Address: %04X %04X\n",
-                                                AdapterCheckBlock[2], 
-                                                AdapterCheckBlock[3]);
-                                        break;
-
-                                case 1: 
-                                        printk(KERN_INFO "Parity error\n");
-                                        printk(KERN_INFO "Address: %04X %04X\n",
-                                                AdapterCheckBlock[2], 
-                                                AdapterCheckBlock[3]);
-                                        break;
-
-                                case 2: 
-                                        printk(KERN_INFO "Bus error\n");
-                                        printk(KERN_INFO "Address: %04X %04X\n",
-                                                AdapterCheckBlock[2], 
-                                                AdapterCheckBlock[3]);
-                                        break;
-
-                                default:
-                                        printk(KERN_INFO "Unknown error.\n");
-                                        break;
-                        }
-                        break;
-
-                case ILLEGAL_OP_CODE:
-                        printk(KERN_INFO "%s: Illegal operation code in firmware\n",
-                                dev->name);
-                        /* Parm[0-3]: adapter internal register R13-R15 */
-                        break;
-
-                case PARITY_ERRORS:
-                        printk(KERN_INFO "%s: Adapter internal bus parity error\n",
-                                dev->name);
-                        /* Parm[0-3]: adapter internal register R13-R15 */
-                        break;
-
-                case RAM_DATA_ERROR:
-                        printk(KERN_INFO "%s: RAM data error\n", dev->name);
-                        /* Parm[0-1]: MSW/LSW address of RAM location. */
-                        break;
-
-                case RAM_PARITY_ERROR:
-                        printk(KERN_INFO "%s: RAM parity error\n", dev->name);
-                        /* Parm[0-1]: MSW/LSW address of RAM location. */
-                        break;
-
-                case RING_UNDERRUN:
-                        printk(KERN_INFO "%s: Internal DMA underrun detected\n",
-                                dev->name);
-                        break;
-
-                case INVALID_IRQ:
-                        printk(KERN_INFO "%s: Unrecognized interrupt detected\n",
-                                dev->name);
-                        /* Parm[0-3]: adapter internal register R13-R15 */
-                        break;
-
-                case INVALID_ERROR_IRQ:
-                        printk(KERN_INFO "%s: Unrecognized error interrupt detected\n",
-                                dev->name);
-                        /* Parm[0-3]: adapter internal register R13-R15 */
-                        break;
-
-                case INVALID_XOP:
-                        printk(KERN_INFO "%s: Unrecognized XOP request detected\n",
-                                dev->name);
-                        /* Parm[0-3]: adapter internal register R13-R15 */
-                        break;
-
-                default:
-                        printk(KERN_INFO "%s: Unknown status", dev->name);
-                        break;
-        }
-
-        if(tms380tr_chipset_init(dev) == 1)
-        {
-                /* Restart of firmware successful */
-                tp->AdapterOpenFlag = 1;
-        }
-}
-
-/*
- * Internal adapter pointer to RAM data are copied from adapter into
- * host system.
- */
-static int tms380tr_read_ptr(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned short adapterram;
-
-        tms380tr_read_ram(dev, (unsigned char *)&tp->intptrs.BurnedInAddrPtr,
-                        ADAPTER_INT_PTRS, 16);
-        tms380tr_read_ram(dev, (unsigned char *)&adapterram,
-                        cpu_to_be16((unsigned short)tp->intptrs.AdapterRAMPtr), 2);
-        return be16_to_cpu(adapterram); 
-}
-
-/*
- * Reads a number of bytes from adapter to system memory.
- */
-static void tms380tr_read_ram(struct net_device *dev, unsigned char *Data,
-                                unsigned short Address, int Length)
-{
-        int i;
-        unsigned short old_sifadx, old_sifadr, InWord;
-
-        /* Save the current values */
-        old_sifadx = SIFREADW(SIFADX);
-        old_sifadr = SIFREADW(SIFADR);
-
-        /* Page number of adapter memory */
-        SIFWRITEW(0x0001, SIFADX);
-        /* Address offset in adapter RAM */
-        SIFWRITEW(Address, SIFADR);
-
-        /* Copy len byte from adapter memory to system data area. */
-        i = 0;
-        for(;;)
-        {
-                InWord = SIFREADW(SIFINC);
-
-                *(Data + i) = HIBYTE(InWord);   /* Write first byte */
-                if(++i == Length)               /* All is done break */
-                        break;
-
-                *(Data + i) = LOBYTE(InWord);   /* Write second byte */
-                if (++i == Length)              /* All is done break */
-                        break;
-        }
-
-        /* Restore original values */
-        SIFWRITEW(old_sifadx, SIFADX);
-        SIFWRITEW(old_sifadr, SIFADR);
-}
-
-/*
- * Cancel all queued packets in the transmission queue.
- */
-static void tms380tr_cancel_tx_queue(struct net_local* tp)
-{
-        TPL *tpl;
-
-        /*
-         * NOTE: There must not be an active TRANSMIT command pending, when
-         * this function is called.
-         */
-        if(tp->TransmitCommandActive)
-                return;
-
-        for(;;)
-        {
-                tpl = tp->TplBusy;
-                if(!tpl->BusyFlag)
-                        break;
-                /* "Remove" TPL from busy list. */
-                tp->TplBusy = tpl->NextTPLPtr;
-                tms380tr_write_tpl_status(tpl, 0);      /* Clear VALID bit */
-                tpl->BusyFlag = 0;              /* "free" TPL */
-
-                printk(KERN_INFO "Cancel tx (%08lXh).\n", (unsigned long)tpl);
-                if (tpl->DMABuff)
-                        dma_unmap_single(tp->pdev, tpl->DMABuff, tpl->Skb->len, DMA_TO_DEVICE);
-                dev_kfree_skb_any(tpl->Skb);
-        }
-}
-
-/*
- * This function is called whenever a transmit interrupt is generated by the
- * adapter. For a command complete interrupt, it is checked if we have to
- * issue a new transmit command or not.
- */
-static void tms380tr_tx_status_irq(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned char HighByte, HighAc, LowAc;
-        TPL *tpl;
-
-        /* NOTE: At this point the SSB from TRANSMIT STATUS is no longer
-         * available, because the CLEAR SSB command has already been issued.
-         *
-         * Process all complete transmissions.
-         */
-
-        for(;;)
-        {
-                tpl = tp->TplBusy;
-                if(!tpl->BusyFlag || (tpl->Status
-                        & (TX_VALID | TX_FRAME_COMPLETE))
-                        != TX_FRAME_COMPLETE)
-                {
-                        break;
-                }
-
-                /* "Remove" TPL from busy list. */
-                tp->TplBusy = tpl->NextTPLPtr ;
-
-                /* Check the transmit status field only for directed frames*/
-                if(DIRECTED_FRAME(tpl) && (tpl->Status & TX_ERROR) == 0)
-                {
-                        HighByte = GET_TRANSMIT_STATUS_HIGH_BYTE(tpl->Status);
-                        HighAc   = GET_FRAME_STATUS_HIGH_AC(HighByte);
-                        LowAc    = GET_FRAME_STATUS_LOW_AC(HighByte);
-
-                        if((HighAc != LowAc) || (HighAc == AC_NOT_RECOGNIZED))
-                        {
-                                printk(KERN_DEBUG "%s: (DA=%08lX not recognized)\n",
-                                        dev->name,
-                                        *(unsigned long *)&tpl->MData[2+2]);
-                        }
-                        else
-                        {
-                                if(tms380tr_debug > 3)
-                                        printk(KERN_DEBUG "%s: Directed frame tx'd\n", 
-                                                dev->name);
-                        }
-                }
-                else
-                {
-                        if(!DIRECTED_FRAME(tpl))
-                        {
-                                if(tms380tr_debug > 3)
-                                        printk(KERN_DEBUG "%s: Broadcast frame tx'd\n",
-                                                dev->name);
-                        }
-                }
-
-                tp->MacStat.tx_packets++;
-                if (tpl->DMABuff)
-                        dma_unmap_single(tp->pdev, tpl->DMABuff, tpl->Skb->len, DMA_TO_DEVICE);
-                dev_kfree_skb_irq(tpl->Skb);
-                tpl->BusyFlag = 0;      /* "free" TPL */
-        }
-
-        if(!tp->TplFree->NextTPLPtr->BusyFlag)
-                netif_wake_queue(dev);
-}
-
-/*
- * Called if a frame receive interrupt is generated by the adapter.
- * Check if the frame is valid and indicate it to system.
- */
-static void tms380tr_rcv_status_irq(struct net_device *dev)
-{
-        struct net_local *tp = netdev_priv(dev);
-        unsigned char *ReceiveDataPtr;
-        struct sk_buff *skb;
-        unsigned int Length, Length2;
-        RPL *rpl;
-        RPL *SaveHead;
-        dma_addr_t dmabuf;
-
-        /* NOTE: At this point the SSB from RECEIVE STATUS is no longer
-         * available, because the CLEAR SSB command has already been issued.
-         *
-         * Process all complete receives.
-         */
-
-        for(;;)
-        {
-                rpl = tp->RplHead;
-                if(rpl->Status & RX_VALID)
-                        break;          /* RPL still in use by adapter */
-
-                /* Forward RPLHead pointer to next list. */
-                SaveHead = tp->RplHead;
-                tp->RplHead = rpl->NextRPLPtr;
-
-                /* Get the frame size (Byte swap for Intel).
-                 * Do this early (see workaround comment below)
-                 */
-                Length = be16_to_cpu(rpl->FrameSize);
-
-                /* Check if the Frame_Start, Frame_End and
-                 * Frame_Complete bits are set.
-                 */
-                if((rpl->Status & VALID_SINGLE_BUFFER_FRAME)
-                        == VALID_SINGLE_BUFFER_FRAME)
-                {
-                        ReceiveDataPtr = rpl->MData;
-
-                        /* Workaround for delayed write of FrameSize on ISA
-                         * (FrameSize is false but valid-bit is reset)
-                         * Frame size is set to zero when the RPL is freed.
-                         * Length2 is there because there have also been
-                         * cases where the FrameSize was partially written
-                         */
-                        Length2 = be16_to_cpu(rpl->FrameSize);
-
-                        if(Length == 0 || Length != Length2)
-                        {
-                                tp->RplHead = SaveHead;
-                                break;  /* Return to tms380tr_interrupt */
-                        }
-                        tms380tr_update_rcv_stats(tp,ReceiveDataPtr,Length);
-                          
-                        if(tms380tr_debug > 3)
-                                printk(KERN_DEBUG "%s: Packet Length %04X (%d)\n",
-                                        dev->name, Length, Length);
-                          
-                        /* Indicate the received frame to system the
-                         * adapter does the Source-Routing padding for 
-                         * us. See: OpenOptions in tms380tr_init_opb()
-                         */
-                        skb = rpl->Skb;
-                        if(rpl->SkbStat == SKB_UNAVAILABLE)
-                        {
-                                /* Try again to allocate skb */
-                                skb = dev_alloc_skb(tp->MaxPacketSize);
-                                if(skb == NULL)
-                                {
-                                        /* Update Stats ?? */
-                                }
-                                else
-                                {
-                                        skb_put(skb, tp->MaxPacketSize);
-                                        rpl->SkbStat    = SKB_DATA_COPY;
-                                        ReceiveDataPtr  = rpl->MData;
-                                }
-                        }
-
-                        if(skb && (rpl->SkbStat == SKB_DATA_COPY ||
-                                   rpl->SkbStat == SKB_DMA_DIRECT))
-                        {
-                                if(rpl->SkbStat == SKB_DATA_COPY)
-                                        skb_copy_to_linear_data(skb, ReceiveDataPtr,
-                                                       Length);
-
-                                /* Deliver frame to system */
-                                rpl->Skb = NULL;
-                                skb_trim(skb,Length);
-                                skb->protocol = tr_type_trans(skb,dev);
-                                netif_rx(skb);
-                        }
-                }
-                else    /* Invalid frame */
-                {
-                        if(rpl->Skb != NULL)
-                                dev_kfree_skb_irq(rpl->Skb);
-
-                        /* Skip list. */
-                        if(rpl->Status & RX_START_FRAME)
-                                /* Frame start bit is set -> overflow. */
-                                tp->MacStat.rx_errors++;
-                }
-                if (rpl->DMABuff)
-                        dma_unmap_single(tp->pdev, rpl->DMABuff, tp->MaxPacketSize, DMA_TO_DEVICE);
-                rpl->DMABuff = 0;
-
-                /* Allocate new skb for rpl */
-                rpl->Skb = dev_alloc_skb(tp->MaxPacketSize);
-                /* skb == NULL ? then use local buffer */
-                if(rpl->Skb == NULL)
-                {
-                        rpl->SkbStat = SKB_UNAVAILABLE;
-                        rpl->FragList[0].DataAddr = htonl(((char *)tp->LocalRxBuffers[rpl->RPLIndex] - (char *)tp) + tp->dmabuffer);
-                        rpl->MData = tp->LocalRxBuffers[rpl->RPLIndex];
-                }
-                else    /* skb != NULL */
-                {
-                        rpl->Skb->dev = dev;
-                        skb_put(rpl->Skb, tp->MaxPacketSize);
-
-                        /* Data unreachable for DMA ? then use local buffer */
-                        dmabuf = dma_map_single(tp->pdev, rpl->Skb->data, tp->MaxPacketSize, DMA_FROM_DEVICE);
-                        if(tp->dmalimit && (dmabuf + tp->MaxPacketSize > tp->dmalimit))
-                        {
-                                rpl->SkbStat = SKB_DATA_COPY;
-                                rpl->FragList[0].DataAddr = htonl(((char *)tp->LocalRxBuffers[rpl->RPLIndex] - (char *)tp) + tp->dmabuffer);
-                                rpl->MData = tp->LocalRxBuffers[rpl->RPLIndex];
-                        }
-                        else
-                        {
-                                /* DMA directly in skb->data */
-                                rpl->SkbStat = SKB_DMA_DIRECT;
-                                rpl->FragList[0].DataAddr = htonl(dmabuf);
-                                rpl->MData = rpl->Skb->data;
-                                rpl->DMABuff = dmabuf;
-                        }
-                }
-
-                rpl->FragList[0].DataCount = cpu_to_be16((unsigned short)tp->MaxPacketSize);
-                rpl->FrameSize = 0;
-
-                /* Pass the last RPL back to the adapter */
-                tp->RplTail->FrameSize = 0;
-
-                /* Reset the CSTAT field in the list. */
-                tms380tr_write_rpl_status(tp->RplTail, RX_VALID | RX_FRAME_IRQ);
-
-                /* Current RPL becomes last one in list. */
-                tp->RplTail = tp->RplTail->NextRPLPtr;
-
-                /* Inform adapter about RPL valid. */
-                tms380tr_exec_sifcmd(dev, CMD_RX_VALID);
-        }
-}
-
-/*
- * This function should be used whenever the status of any RPL must be
- * modified by the driver, because the compiler may otherwise change the
- * order of instructions such that writing the RPL status may be executed
- * at an undesirable time. When this function is used, the status is
- * always written when the function is called.
- */
-static void tms380tr_write_rpl_status(RPL *rpl, unsigned int Status)
-{
-        rpl->Status = Status;
-}
-
-/*
- * The function updates the statistic counters in mac->MacStat.
- * It differtiates between directed and broadcast/multicast ( ==functional)
- * frames.
- */
-static void tms380tr_update_rcv_stats(struct net_local *tp, unsigned char DataPtr[],
-                                        unsigned int Length)
-{
-        tp->MacStat.rx_packets++;
-        tp->MacStat.rx_bytes += Length;
-        
-        /* Test functional bit */
-        if(DataPtr[2] & GROUP_BIT)
-                tp->MacStat.multicast++;
-}
-
-static int tms380tr_set_mac_address(struct net_device *dev, void *addr)
-{
-        struct net_local *tp = netdev_priv(dev);
-        struct sockaddr *saddr = addr;
-        
-        if (tp->AdapterOpenFlag || tp->AdapterVirtOpenFlag) {
-                printk(KERN_WARNING "%s: Cannot set MAC/LAA address while card is open\n", dev->name);
-                return -EIO;
-        }
-        memcpy(dev->dev_addr, saddr->sa_data, dev->addr_len);
-        return 0;
-}
-
-#if TMS380TR_DEBUG > 0
-/*
- * Dump Packet (data)
- */
-static void tms380tr_dump(unsigned char *Data, int length)
-{
-        int i, j;
-
-        for (i = 0, j = 0; i < length / 8; i++, j += 8)
-        {
-                printk(KERN_DEBUG "%02x %02x %02x %02x %02x %02x %02x %02x\n",
-                       Data[j+0],Data[j+1],Data[j+2],Data[j+3],
-                       Data[j+4],Data[j+5],Data[j+6],Data[j+7]);
-        }
-}
-#endif
-
-void tmsdev_term(struct net_device *dev)
-{
-        struct net_local *tp;
-
-        tp = netdev_priv(dev);
-        dma_unmap_single(tp->pdev, tp->dmabuffer, sizeof(struct net_local),
-                DMA_BIDIRECTIONAL);
-}
-
-const struct net_device_ops tms380tr_netdev_ops = {
-        .ndo_open               = tms380tr_open,
-        .ndo_stop               = tms380tr_close,
-        .ndo_start_xmit         = tms380tr_send_packet,
-        .ndo_tx_timeout         = tms380tr_timeout,
-        .ndo_get_stats          = tms380tr_get_stats,
-        .ndo_set_rx_mode        = tms380tr_set_multicast_list,
-        .ndo_set_mac_address    = tms380tr_set_mac_address,
-};
-EXPORT_SYMBOL(tms380tr_netdev_ops);
-
-int tmsdev_init(struct net_device *dev, struct device *pdev)
-{
-        struct net_local *tms_local;
-
-        memset(netdev_priv(dev), 0, sizeof(struct net_local));
-        tms_local = netdev_priv(dev);
-        init_waitqueue_head(&tms_local->wait_for_tok_int);
-        if (pdev->dma_mask)
-                tms_local->dmalimit = *pdev->dma_mask;
-        else
-                return -ENOMEM;
-        tms_local->pdev = pdev;
-        tms_local->dmabuffer = dma_map_single(pdev, (void *)tms_local,
-            sizeof(struct net_local), DMA_BIDIRECTIONAL);
-        if (tms_local->dmabuffer + sizeof(struct net_local) > 
-                        tms_local->dmalimit)
-        {
-                printk(KERN_INFO "%s: Memory not accessible for DMA\n",
-                        dev->name);
-                tmsdev_term(dev);
-                return -ENOMEM;
-        }
-        
-        dev->netdev_ops         = &tms380tr_netdev_ops;
-        dev->watchdog_timeo     = HZ;
-
-        return 0;
-}
-
-EXPORT_SYMBOL(tms380tr_open);
-EXPORT_SYMBOL(tms380tr_close);
-EXPORT_SYMBOL(tms380tr_interrupt);
-EXPORT_SYMBOL(tmsdev_init);
-EXPORT_SYMBOL(tmsdev_term);
-EXPORT_SYMBOL(tms380tr_wait);
-
-#ifdef MODULE
-
-static struct module *TMS380_module = NULL;
-
-int init_module(void)
-{
-        printk(KERN_DEBUG "%s", version);
-        
-        TMS380_module = &__this_module;
-        return 0;
-}
-
-void cleanup_module(void)
-{
-        TMS380_module = NULL;
-}
-#endif
-
-MODULE_LICENSE("GPL");
-
diff --git a/drivers/net/tokenring/tms380tr.h b/drivers/net/tokenring/tms380tr.h
deleted file mode 100644
index e5a617c586c2..000000000000
--- a/drivers/net/tokenring/tms380tr.h
+++ /dev/null
@@ -1,1141 +0,0 @@
-/* 
- * tms380tr.h: TI TMS380 Token Ring driver for Linux
- *
- * Authors:
- * - Christoph Goos <cgoos@syskonnect.de>
- * - Adam Fritzler
- */
-
-#ifndef __LINUX_TMS380TR_H
-#define __LINUX_TMS380TR_H
-
-#ifdef __KERNEL__
-
-#include <linux/interrupt.h>
-
-/* module prototypes */
-extern const struct net_device_ops tms380tr_netdev_ops;
-int tms380tr_open(struct net_device *dev);
-int tms380tr_close(struct net_device *dev);
-irqreturn_t tms380tr_interrupt(int irq, void *dev_id);
-int tmsdev_init(struct net_device *dev, struct device *pdev);
-void tmsdev_term(struct net_device *dev);
-void tms380tr_wait(unsigned long time);
-
-#define TMS380TR_MAX_ADAPTERS 7
-
-#define SEND_TIMEOUT 10*HZ
-
-#define TR_RCF_LONGEST_FRAME_MASK 0x0070
-#define TR_RCF_FRAME4K 0x0030
-
-/*------------------------------------------------------------------*/
-/*  Bit order for adapter communication with DMA                    */
-/*  --------------------------------------------------------------  */
-/*  Bit  8 | 9| 10| 11|| 12| 13| 14| 15|| 0| 1| 2| 3|| 4| 5| 6| 7|  */
-/*  --------------------------------------------------------------  */
-/*  The bytes in a word must be byte swapped. Also, if a double     */
-/*  word is used for storage, then the words, as well as the bytes, */
-/*  must be swapped.                                                */
-/*  Bit order for adapter communication with DIO                    */
-/*  --------------------------------------------------------------  */
-/*  Bit  0 | 1| 2| 3|| 4| 5| 6| 7|| 8| 9| 10| 11|| 12| 13| 14| 15|  */
-/*  --------------------------------------------------------------  */
-/*------------------------------------------------------------------*/
-
-/* Swap words of a long.                        */
-#define SWAPW(x) (((x) << 16) | ((x) >> 16))
-
-/* Get the low byte of a word.                      */
-#define LOBYTE(w)       ((unsigned char)(w))
-
-/* Get the high byte of a word.                     */
-#define HIBYTE(w)       ((unsigned char)((unsigned short)(w) >> 8))
-
-/* Get the low word of a long.                      */
-#define LOWORD(l)       ((unsigned short)(l))
-
-/* Get the high word of a long.                     */
-#define HIWORD(l)       ((unsigned short)((unsigned long)(l) >> 16))
-
-
-
-/* Token ring adapter I/O addresses for normal mode. */
-
-/*
- * The SIF registers.  Common to all adapters.
- */
-/* Basic SIF (SRSX = 0) */
-#define SIFDAT                  0x00    /* SIF/DMA data. */
-#define SIFINC                  0x02    /* IO Word data with auto increment. */
-#define SIFINH                  0x03    /* IO Byte data with auto increment. */
-#define SIFADR                  0x04    /* SIF/DMA Address. */
-#define SIFCMD                  0x06    /* SIF Command. */
-#define SIFSTS                  0x06    /* SIF Status. */
-
-/* "Extended" SIF (SRSX = 1) */
-#define SIFACL                  0x08    /* SIF Adapter Control Register. */
-#define SIFADD                  0x0a    /* SIF/DMA Address. -- 0x0a */
-#define SIFADX                  0x0c     /* 0x0c */
-#define DMALEN                  0x0e    /* SIF DMA length. -- 0x0e */
-
-/*
- * POS Registers.  Only for ISA Adapters.
- */
-#define POSREG                  0x10    /* Adapter Program Option Select (POS)
-                                         * Register: base IO address + 16 byte.
-                                         */
-#define POSREG_2                24L     /* only for TR4/16+ adapter
-                                         * base IO address + 24 byte. -- 0x18
-                                         */
-
-/* SIFCMD command codes (high-low) */
-#define CMD_INTERRUPT_ADAPTER   0x8000  /* Cause internal adapter interrupt */
-#define CMD_ADAPTER_RESET       0x4000  /* Hardware reset of adapter */
-#define CMD_SSB_CLEAR           0x2000  /* Acknowledge to adapter to
-                                         * system interrupts.
-                                         */
-#define CMD_EXECUTE             0x1000  /* Execute SCB command */
-#define CMD_SCB_REQUEST         0x0800  /* Request adapter to interrupt
-                                         * system when SCB is available for
-                                         * another command.
-                                         */
-#define CMD_RX_CONTINUE         0x0400  /* Continue receive after odd pointer
-                                         * stop. (odd pointer receive method)
-                                         */
-#define CMD_RX_VALID            0x0200  /* Now actual RPL is valid. */
-#define CMD_TX_VALID            0x0100  /* Now actual TPL is valid. (valid
-                                         * bit receive/transmit method)
-                                         */
-#define CMD_SYSTEM_IRQ          0x0080  /* Adapter-to-attached-system
-                                         * interrupt is reset.
-                                         */
-#define CMD_CLEAR_SYSTEM_IRQ    0x0080  /* Clear SYSTEM_INTERRUPT bit.
-                                         * (write: 1=ignore, 0=reset)
-                                         */
-#define EXEC_SOFT_RESET         0xFF00  /* adapter soft reset. (restart
-                                         * adapter after hardware reset)
-                                         */
-
-
-/* ACL commands (high-low) */
-#define ACL_SWHLDA              0x0800  /* Software hold acknowledge. */
-#define ACL_SWDDIR              0x0400  /* Data transfer direction. */
-#define ACL_SWHRQ               0x0200  /* Pseudo DMA operation. */
-#define ACL_PSDMAEN             0x0100  /* Enable pseudo system DMA. */
-#define ACL_ARESET              0x0080  /* Adapter hardware reset command.
-                                         * (held in reset condition as
-                                         * long as bit is set)
-                                         */
-#define ACL_CPHALT              0x0040  /* Communication processor halt.
-                                         * (can only be set while ACL_ARESET
-                                         * bit is set; prevents adapter
-                                         * processor from executing code while
-                                         * downloading firmware)
-                                         */
-#define ACL_BOOT                0x0020
-#define ACL_SINTEN              0x0008  /* System interrupt enable/disable
-                                         * (1/0): can be written if ACL_ARESET
-                                         * is zero.
-                                         */
-#define ACL_PEN                 0x0004
-
-#define ACL_NSELOUT0            0x0002 
-#define ACL_NSELOUT1            0x0001  /* NSELOUTx have a card-specific
-                                         * meaning for setting ring speed.
-                                         */
-
-#define PS_DMA_MASK             (ACL_SWHRQ | ACL_PSDMAEN)
-
-
-/* SIFSTS register return codes (high-low) */
-#define STS_SYSTEM_IRQ          0x0080  /* Adapter-to-attached-system
-                                         * interrupt is valid.
-                                         */
-#define STS_INITIALIZE          0x0040  /* INITIALIZE status. (ready to
-                                         * initialize)
-                                         */
-#define STS_TEST                0x0020  /* TEST status. (BUD not completed) */
-#define STS_ERROR               0x0010  /* ERROR status. (unrecoverable
-                                         * HW error occurred)
-                                         */
-#define STS_MASK                0x00F0  /* Mask interesting status bits. */
-#define STS_ERROR_MASK          0x000F  /* Get Error Code by masking the
-                                         * interrupt code bits.
-                                         */
-#define ADAPTER_INT_PTRS        0x0A00  /* Address offset of adapter internal
-                                         * pointers 01:0a00 (high-low) have to
-                                         * be read after init and before open.
-                                         */
-
-
-/* Interrupt Codes (only MAC IRQs) */
-#define STS_IRQ_ADAPTER_CHECK   0x0000  /* unrecoverable hardware or
-                                         * software error.
-                                         */ 
-#define STS_IRQ_RING_STATUS     0x0004  /* SSB is updated with ring status. */
-#define STS_IRQ_LLC_STATUS      0x0005  /* Not used in MAC-only microcode */
-#define STS_IRQ_SCB_CLEAR       0x0006  /* SCB clear, following an
-                                         * SCB_REQUEST IRQ.
-                                         */
-#define STS_IRQ_TIMER           0x0007  /* Not normally used in MAC ucode */
-#define STS_IRQ_COMMAND_STATUS  0x0008  /* SSB is updated with command 
-                                         * status.
-                                         */ 
-#define STS_IRQ_RECEIVE_STATUS  0x000A  /* SSB is updated with receive
-                                         * status.
-                                         */
-#define STS_IRQ_TRANSMIT_STATUS 0x000C  /* SSB is updated with transmit
-                                         * status
-                                         */
-#define STS_IRQ_RECEIVE_PENDING 0x000E  /* Not used in MAC-only microcode */
-#define STS_IRQ_MASK            0x000F  /* = STS_ERROR_MASK. */
-
-
-/* TRANSMIT_STATUS completion code: (SSB.Parm[0]) */
-#define COMMAND_COMPLETE        0x0080  /* TRANSMIT command completed
-                                         * (avoid this!) issue another transmit
-                                         * to send additional frames.
-                                         */
-#define FRAME_COMPLETE          0x0040  /* Frame has been transmitted;
-                                         * INTERRUPT_FRAME bit was set in the
-                                         * CSTAT request; indication of possibly
-                                         * more than one frame transmissions!
-                                         * SSB.Parm[0-1]: 32 bit pointer to
-                                         * TPL of last frame.
-                                         */
-#define LIST_ERROR              0x0020  /* Error in one of the TPLs that
-                                         * compose the frame; TRANSMIT
-                                         * terminated; Parm[1-2]: 32bit pointer
-                                         * to TPL which starts the error
-                                         * frame; error details in bits 8-13.
-                                         * (14?)
-                                         */
-#define FRAME_SIZE_ERROR        0x8000  /* FRAME_SIZE does not equal the sum of
-                                         * the valid DATA_COUNT fields;
-                                         * FRAME_SIZE less than header plus
-                                         * information field. (15 bytes +
-                                         * routing field) Or if FRAME_SIZE
-                                         * was specified as zero in one list.
-                                         */
-#define TX_THRESHOLD            0x4000  /* FRAME_SIZE greater than (BUFFER_SIZE
-                                         * - 9) * TX_BUF_MAX.
-                                         */
-#define ODD_ADDRESS             0x2000  /* Odd forward pointer value is
-                                         * read on a list without END_FRAME
-                                         * indication.
-                                         */
-#define FRAME_ERROR             0x1000  /* START_FRAME bit (not) anticipated,
-                                         * but (not) set.
-                                         */
-#define ACCESS_PRIORITY_ERROR   0x0800  /* Access priority requested has not
-                                         * been allowed.
-                                         */
-#define UNENABLED_MAC_FRAME     0x0400  /* MAC frame has source class of zero
-                                         * or MAC frame PCF ATTN field is
-                                         * greater than one.
-                                         */
-#define ILLEGAL_FRAME_FORMAT    0x0200  /* Bit 0 or FC field was set to one. */
-
-
-/*
- * Since we need to support some functions even if the adapter is in a
- * CLOSED state, we have a (pseudo-) command queue which holds commands
- * that are outstandig to be executed.
- *
- * Each time a command completes, an interrupt occurs and the next
- * command is executed. The command queue is actually a simple word with 
- * a bit for each outstandig command. Therefore the commands will not be
- * executed in the order they have been queued.
- *
- * The following defines the command code bits and the command queue:
- */
-#define OC_OPEN                 0x0001  /* OPEN command */
-#define OC_TRANSMIT             0x0002  /* TRANSMIT command */
-#define OC_TRANSMIT_HALT        0x0004  /* TRANSMIT_HALT command */
-#define OC_RECEIVE              0x0008  /* RECEIVE command */
-#define OC_CLOSE                0x0010  /* CLOSE command */
-#define OC_SET_GROUP_ADDR       0x0020  /* SET_GROUP_ADDR command */
-#define OC_SET_FUNCT_ADDR       0x0040  /* SET_FUNCT_ADDR command */
-#define OC_READ_ERROR_LOG       0x0080  /* READ_ERROR_LOG command */
-#define OC_READ_ADAPTER         0x0100  /* READ_ADAPTER command */
-#define OC_MODIFY_OPEN_PARMS    0x0400  /* MODIFY_OPEN_PARMS command */
-#define OC_RESTORE_OPEN_PARMS   0x0800  /* RESTORE_OPEN_PARMS command */
-#define OC_SET_FIRST_16_GROUP   0x1000  /* SET_FIRST_16_GROUP command */
-#define OC_SET_BRIDGE_PARMS     0x2000  /* SET_BRIDGE_PARMS command */
-#define OC_CONFIG_BRIDGE_PARMS  0x4000  /* CONFIG_BRIDGE_PARMS command */
-
-#define OPEN                    0x0300  /* C: open command. S: completion. */
-#define TRANSMIT                0x0400  /* C: transmit command. S: completion
-                                         * status. (reject: COMMAND_REJECT if
-                                         * adapter not opened, TRANSMIT already
-                                         * issued or address passed in the SCB
-                                         * not word aligned)
-                                         */
-#define TRANSMIT_HALT           0x0500  /* C: interrupt TX TPL chain; if no
-                                         * TRANSMIT command issued, the command
-                                         * is ignored (completion with TRANSMIT
-                                         * status (0x0400)!)
-                                         */
-#define RECEIVE                 0x0600  /* C: receive command. S: completion
-                                         * status. (reject: COMMAND_REJECT if
-                                         * adapter not opened, RECEIVE already
-                                         * issued or address passed in the SCB 
-                                         * not word aligned)
-                                         */
-#define CLOSE                   0x0700  /* C: close adapter. S: completion.
-                                         * (COMMAND_REJECT if adapter not open)
-                                         */
-#define SET_GROUP_ADDR          0x0800  /* C: alter adapter group address after
-                                         * OPEN. S: completion. (COMMAND_REJECT
-                                         * if adapter not open)
-                                         */
-#define SET_FUNCT_ADDR          0x0900  /* C: alter adapter functional address
-                                         * after OPEN. S: completion.
-                                         * (COMMAND_REJECT if adapter not open)
-                                         */
-#define READ_ERROR_LOG          0x0A00  /* C: read adapter error counters.
-                                         * S: completion. (command ignored
-                                         * if adapter not open!)
-                                         */
-#define READ_ADAPTER            0x0B00  /* C: read data from adapter memory.
-                                         * (important: after init and before
-                                         * open!) S: completion. (ADAPTER_CHECK
-                                         * interrupt if undefined storage area
-                                         * read)
-                                         */
-#define MODIFY_OPEN_PARMS       0x0D00  /* C: modify some adapter operational
-                                         * parameters. (bit correspondend to
-                                         * WRAP_INTERFACE is ignored)
-                                         * S: completion. (reject: 
-                                         * COMMAND_REJECT)
-                                         */
-#define RESTORE_OPEN_PARMS      0x0E00  /* C: modify some adapter operational
-                                         * parameters. (bit correspondend
-                                         * to WRAP_INTERFACE is ignored)
-                                         * S: completion. (reject:
-                                         * COMMAND_REJECT)
-                                         */
-#define SET_FIRST_16_GROUP      0x0F00  /* C: alter the first two bytes in
-                                         * adapter group address.
-                                         * S: completion. (reject:
-                                         * COMMAND_REJECT)
-                                         */
-#define SET_BRIDGE_PARMS        0x1000  /* C: values and conditions for the
-                                         * adapter hardware to use when frames
-                                         * are copied for forwarding.
-                                         * S: completion. (reject:
-                                         * COMMAND_REJECT)
-                                         */
-#define CONFIG_BRIDGE_PARMS     0x1100  /* C: ..
-                                         * S: completion. (reject:
-                                         * COMMAND_REJECT)
-                                         */
-
-#define SPEED_4                 4
-#define SPEED_16                16      /* Default transmission speed  */
-
-
-/* Initialization Parameter Block (IPB); word alignment necessary! */
-#define BURST_SIZE      0x0018  /* Default burst size */
-#define BURST_MODE      0x9F00  /* Burst mode enable */
-#define DMA_RETRIES     0x0505  /* Magic DMA retry number... */
-
-#define CYCLE_TIME      3       /* Default AT-bus cycle time: 500 ns
-                                 * (later adapter version: fix  cycle time!)
-                                 */
-#define LINE_SPEED_BIT  0x80
-
-/* Macro definition for the wait function. */
-#define ONE_SECOND_TICKS        1000000
-#define HALF_SECOND             (ONE_SECOND_TICKS / 2)
-#define ONE_SECOND              (ONE_SECOND_TICKS)
-#define TWO_SECONDS             (ONE_SECOND_TICKS * 2)
-#define THREE_SECONDS           (ONE_SECOND_TICKS * 3)
-#define FOUR_SECONDS            (ONE_SECOND_TICKS * 4)
-#define FIVE_SECONDS            (ONE_SECOND_TICKS * 5)
-
-#define BUFFER_SIZE             2048    /* Buffers on Adapter */
-
-#pragma pack(1)
-typedef struct {
-        unsigned short Init_Options;    /* Initialize with burst mode;
-                                         * LLC disabled. (MAC only)
-                                         */
-
-        /* Interrupt vectors the adapter places on attached system bus. */
-        u_int8_t  CMD_Status_IV;    /* Interrupt vector: command status. */
-        u_int8_t  TX_IV;            /* Interrupt vector: transmit. */
-        u_int8_t  RX_IV;            /* Interrupt vector: receive. */
-        u_int8_t  Ring_Status_IV;   /* Interrupt vector: ring status. */
-        u_int8_t  SCB_Clear_IV;     /* Interrupt vector: SCB clear. */
-        u_int8_t  Adapter_CHK_IV;   /* Interrupt vector: adapter check. */
-
-        u_int16_t RX_Burst_Size;    /* Max. number of transfer cycles. */
-        u_int16_t TX_Burst_Size;    /* During DMA burst; even value! */
-        u_int16_t DMA_Abort_Thrhld; /* Number of DMA retries. */
-
-        u_int32_t SCB_Addr;   /* SCB address: even, word aligned, high-low */
-        u_int32_t SSB_Addr;   /* SSB address: even, word aligned, high-low */
-} IPB, *IPB_Ptr;
-#pragma pack()
-
-/*
- * OPEN Command Parameter List (OCPL) (can be reused, if the adapter has to
- * be reopened)
- */
-#define BUFFER_SIZE     2048            /* Buffers on Adapter. */
-#define TPL_SIZE        8+6*TX_FRAG_NUM /* Depending on fragments per TPL. */
-#define RPL_SIZE        14              /* (with TI firmware v2.26 handling
-                                         * up to nine fragments possible)
-                                         */
-#define TX_BUF_MIN      20              /* ??? (Stephan: calculation with */
-#define TX_BUF_MAX      40              /* BUFFER_SIZE and MAX_FRAME_SIZE) ??? 
-                                         */
-#define DISABLE_EARLY_TOKEN_RELEASE     0x1000
-
-/* OPEN Options (high-low) */
-#define WRAP_INTERFACE          0x0080  /* Inserting omitted for test
-                                         * purposes; transmit data appears
-                                         * as receive data. (useful for
-                                         * testing; change: CLOSE necessary)
-                                         */
-#define DISABLE_HARD_ERROR      0x0040  /* On HARD_ERROR & TRANSMIT_BEACON
-                                         * no RING.STATUS interrupt.
-                                         */
-#define DISABLE_SOFT_ERROR      0x0020  /* On SOFT_ERROR, no RING.STATUS
-                                         * interrupt.
-                                         */
-#define PASS_ADAPTER_MAC_FRAMES 0x0010  /* Passing unsupported MAC frames
-                                         * to system.
-                                         */
-#define PASS_ATTENTION_FRAMES   0x0008  /* All changed attention MAC frames are
-                                         * passed to the system.
-                                         */
-#define PAD_ROUTING_FIELD       0x0004  /* Routing field is padded to 18
-                                         * bytes.
-                                         */
-#define FRAME_HOLD              0x0002  /*Adapter waits for entire frame before
-                                         * initiating DMA transfer; otherwise:
-                                         * DMA transfer initiation if internal
-                                         * buffer filled.
-                                         */
-#define CONTENDER               0x0001  /* Adapter participates in the monitor
-                                         * contention process.
-                                         */
-#define PASS_BEACON_MAC_FRAMES  0x8000  /* Adapter passes beacon MAC frames
-                                         * to the system.
-                                         */
-#define EARLY_TOKEN_RELEASE     0x1000  /* Only valid in 16 Mbps operation;
-                                         * 0 = ETR. (no effect in 4 Mbps
-                                         * operation)
-                                         */
-#define COPY_ALL_MAC_FRAMES     0x0400  /* All MAC frames are copied to
-                                         * the system. (after OPEN: duplicate
-                                         * address test (DAT) MAC frame is 
-                                         * first received frame copied to the
-                                         * system)
-                                         */
-#define COPY_ALL_NON_MAC_FRAMES 0x0200  /* All non MAC frames are copied to
-                                         * the system.
-                                         */
-#define PASS_FIRST_BUF_ONLY     0x0100  /* Passes only first internal buffer
-                                         * of each received frame; FrameSize
-                                         * of RPLs must contain internal
-                                         * BUFFER_SIZE bits for promiscuous mode.
-                                         */
-#define ENABLE_FULL_DUPLEX_SELECTION    0x2000 
-                                        /* Enable the use of full-duplex
-                                         * settings with bits in byte 22 in
-                                         * ocpl. (new feature in firmware
-                                         * version 3.09)
-                                         */
-
-/* Full-duplex settings */
-#define OPEN_FULL_DUPLEX_OFF    0x0000
-#define OPEN_FULL_DUPLEX_ON     0x00c0
-#define OPEN_FULL_DUPLEX_AUTO   0x0080
-
-#define PROD_ID_SIZE    18      /* Length of product ID. */
-
-#define TX_FRAG_NUM     3        /* Number of fragments used in one TPL. */
-#define TX_MORE_FRAGMENTS 0x8000 /* Bit set in DataCount to indicate more
-                                  * fragments following.
-                                  */
-
-/* XXX is there some better way to do this? */
-#define ISA_MAX_ADDRESS         0x00ffffff
-#define PCI_MAX_ADDRESS         0xffffffff
-
-#pragma pack(1)
-typedef struct {
-        u_int16_t OPENOptions;
-        u_int8_t  NodeAddr[6];  /* Adapter node address; use ROM 
-                                 * address
-                                 */
-        u_int32_t GroupAddr;    /* Multicast: high order
-                                 * bytes = 0xC000
-                                 */
-        u_int32_t FunctAddr;    /* High order bytes = 0xC000 */
-        __be16 RxListSize;      /* RPL size: 0 (=26), 14, 20 or
-                                 * 26 bytes read by the adapter.
-                                 * (Depending on the number of 
-                                 * fragments/list)
-                                 */
-        __be16 TxListSize;      /* TPL size */
-        __be16 BufSize;         /* Is automatically rounded up to the
-                                 * nearest nK boundary.
-                                 */
-        u_int16_t FullDuplex;
-        u_int16_t Reserved;
-        u_int8_t  TXBufMin;     /* Number of adapter buffers reserved
-                                 * for transmission a minimum of 2
-                                 * buffers must be allocated.
-                                 */
-        u_int8_t  TXBufMax;     /* Maximum number of adapter buffers
-                                 * for transmit; a minimum of 2 buffers
-                                 * must be available for receive.
-                                 * Default: 6
-                                 */
-        u_int16_t ProdIDAddr[2];/* Pointer to product ID. */
-} OPB, *OPB_Ptr;
-#pragma pack()
-
-/*
- * SCB: adapter commands enabled by the host system started by writing
- * CMD_INTERRUPT_ADAPTER | CMD_EXECUTE (|SCB_REQUEST) to the SIFCMD IO
- * register. (special case: | CMD_SYSTEM_IRQ for initialization)
- */
-#pragma pack(1)
-typedef struct {
-        u_int16_t CMD;          /* Command code */
-        u_int16_t Parm[2];      /* Pointer to Command Parameter Block */
-} SCB;  /* System Command Block (32 bit physical address; big endian)*/
-#pragma pack()
-
-/*
- * SSB: adapter command return status can be evaluated after COMMAND_STATUS
- * adapter to system interrupt after reading SSB, the availability of the SSB
- * has to be told the adapter by writing CMD_INTERRUPT_ADAPTER | CMD_SSB_CLEAR
- * in the SIFCMD IO register.
- */
-#pragma pack(1)
-typedef struct {
-        u_int16_t STS;          /* Status code */
-        u_int16_t Parm[3];      /* Parameter or pointer to Status Parameter
-                                 * Block.
-                                 */
-} SSB;  /* System Status Block (big endian - physical address)  */
-#pragma pack()
-
-typedef struct {
-        unsigned short BurnedInAddrPtr; /* Pointer to adapter burned in
-                                         * address. (BIA)
-                                         */
-        unsigned short SoftwareLevelPtr;/* Pointer to software level data. */
-        unsigned short AdapterAddrPtr;  /* Pointer to adapter addresses. */
-        unsigned short AdapterParmsPtr; /* Pointer to adapter parameters. */
-        unsigned short MACBufferPtr;    /* Pointer to MAC buffer. (internal) */
-        unsigned short LLCCountersPtr;  /* Pointer to LLC counters.  */
-        unsigned short SpeedFlagPtr;    /* Pointer to data rate flag.
-                                         * (4/16 Mbps)
-                                         */
-        unsigned short AdapterRAMPtr;   /* Pointer to adapter RAM found. (KB) */
-} INTPTRS;      /* Adapter internal pointers */
-
-#pragma pack(1)
-typedef struct {
-        u_int8_t  Line_Error;           /* Line error: code violation in
-                                         * frame or in a token, or FCS error.
-                                         */
-        u_int8_t  Internal_Error;       /* IBM specific. (Reserved_1) */
-        u_int8_t  Burst_Error;
-        u_int8_t  ARI_FCI_Error;        /* ARI/FCI bit zero in AMP or
-                                         * SMP MAC frame.
-                                         */
-        u_int8_t  AbortDelimeters;      /* IBM specific. (Reserved_2) */
-        u_int8_t  Reserved_3;
-        u_int8_t  Lost_Frame_Error;     /* Receive of end of transmitted
-                                         * frame failed.
-                                         */
-        u_int8_t  Rx_Congest_Error;     /* Adapter in repeat mode has not
-                                         * enough buffer space to copy incoming
-                                         * frame.
-                                         */
-        u_int8_t  Frame_Copied_Error;   /* ARI bit not zero in frame
-                                         * addressed to adapter.
-                                         */
-        u_int8_t  Frequency_Error;      /* IBM specific. (Reserved_4) */
-        u_int8_t  Token_Error;          /* (active only in monitor station) */
-        u_int8_t  Reserved_5;
-        u_int8_t  DMA_Bus_Error;        /* DMA bus errors not exceeding the
-                                         * abort thresholds.
-                                         */
-        u_int8_t  DMA_Parity_Error;     /* DMA parity errors not exceeding
-                                         * the abort thresholds.
-                                         */
-} ERRORTAB;     /* Adapter error counters */
-#pragma pack()
-
-
-/*--------------------- Send and Receive definitions -------------------*/
-#pragma pack(1)
-typedef struct {
-        __be16 DataCount;       /* Value 0, even and odd values are
-                                 * permitted; value is unaltered most
-                                 * significant bit set: following
-                                 * fragments last fragment: most
-                                 * significant bit is not evaluated.
-                                 * (???)
-                                 */
-        __be32 DataAddr;        /* Pointer to frame data fragment;
-                                 * even or odd.
-                                 */
-} Fragment;
-#pragma pack()
-
-#define MAX_FRAG_NUMBERS    9   /* Maximal number of fragments possible to use
-                                 * in one RPL/TPL. (depending on TI firmware 
-                                 * version)
-                                 */
-
-/*
- * AC (1), FC (1), Dst (6), Src (6), RIF (18), Data (4472) = 4504
- * The packet size can be one of the follows: 548, 1502, 2084, 4504, 8176,
- * 11439, 17832. Refer to TMS380 Second Generation Token Ring User's Guide
- * Page 2-27.
- */
-#define HEADER_SIZE             (1 + 1 + 6 + 6)
-#define SRC_SIZE                18
-#define MIN_DATA_SIZE           516
-#define DEFAULT_DATA_SIZE       4472
-#define MAX_DATA_SIZE           17800
-
-#define DEFAULT_PACKET_SIZE (HEADER_SIZE + SRC_SIZE + DEFAULT_DATA_SIZE)
-#define MIN_PACKET_SIZE     (HEADER_SIZE + SRC_SIZE + MIN_DATA_SIZE)
-#define MAX_PACKET_SIZE     (HEADER_SIZE + SRC_SIZE + MAX_DATA_SIZE)
-
-/*
- * Macros to deal with the frame status field.
- */
-#define AC_NOT_RECOGNIZED       0x00
-#define GROUP_BIT               0x80
-#define GET_TRANSMIT_STATUS_HIGH_BYTE(Ts) ((unsigned char)((Ts) >> 8))
-#define GET_FRAME_STATUS_HIGH_AC(Fs)      ((unsigned char)(((Fs) & 0xC0) >> 6))
-#define GET_FRAME_STATUS_LOW_AC(Fs)       ((unsigned char)(((Fs) & 0x0C) >> 2))
-#define DIRECTED_FRAME(Context)           (!((Context)->MData[2] & GROUP_BIT))
-
-
-/*--------------------- Send Functions ---------------------------------*/
-/* define TX_CSTAT _REQUEST (R) and _COMPLETE (C) values (high-low) */
-
-#define TX_VALID                0x0080  /* R: set via TRANSMIT.VALID interrupt.
-                                         * C: always reset to zero!
-                                         */
-#define TX_FRAME_COMPLETE       0x0040  /* R: must be reset to zero.
-                                         * C: set to one.
-                                         */
-#define TX_START_FRAME          0x0020  /* R: start of a frame: 1 
-                                         * C: unchanged.
-                                         */
-#define TX_END_FRAME            0x0010  /* R: end of a frame: 1
-                                         * C: unchanged.
-                                         */
-#define TX_FRAME_IRQ            0x0008  /* R: request interrupt generation
-                                         * after transmission.
-                                         * C: unchanged.
-                                         */
-#define TX_ERROR                0x0004  /* R: reserved.
-                                         * C: set to one if Error occurred.
-                                         */
-#define TX_INTERFRAME_WAIT      0x0004
-#define TX_PASS_CRC             0x0002  /* R: set if CRC value is already
-                                         * calculated. (valid only in
-                                         * FRAME_START TPL)
-                                         * C: unchanged.
-                                         */
-#define TX_PASS_SRC_ADDR        0x0001  /* R: adapter uses explicit frame
-                                         * source address and does not overwrite
-                                         * with the adapter node address.
-                                         * (valid only in FRAME_START TPL)
-                                         *
-                                         * C: unchanged.
-                                         */
-#define TX_STRIP_FS             0xFF00  /* R: reserved.
-                                         * C: if no Transmission Error,
-                                         * field contains copy of FS byte after
-                                         * stripping of frame.
-                                         */
-
-/*
- * Structure of Transmit Parameter Lists (TPLs) (only one frame every TPL,
- * but possibly multiple TPLs for one frame) the length of the TPLs has to be
- * initialized in the OPL. (OPEN parameter list)
- */
-#define TPL_NUM         3       /* Number of Transmit Parameter Lists.
-                                 * !! MUST BE >= 3 !!
-                                 */
-
-#pragma pack(1)
-typedef struct s_TPL TPL;
-
-struct s_TPL {  /* Transmit Parameter List (align on even word boundaries) */
-        __be32 NextTPLAddr;             /* Pointer to next TPL in chain; if
-                                         * pointer is odd: this is the last
-                                         * TPL. Pointing to itself can cause
-                                         * problems!
-                                         */
-        volatile u_int16_t Status;      /* Initialized by the adapter:
-                                         * CSTAT_REQUEST important: update least
-                                         * significant bit first! Set by the
-                                         * adapter: CSTAT_COMPLETE status.
-                                         */
-        __be16 FrameSize;               /* Number of bytes to be transmitted
-                                         * as a frame including AC/FC,
-                                         * Destination, Source, Routing field
-                                         * not including CRC, FS, End Delimiter
-                                         * (valid only if START_FRAME bit in 
-                                         * CSTAT nonzero) must not be zero in
-                                         * any list; maximum value: (BUFFER_SIZE
-                                         * - 8) * TX_BUF_MAX sum of DataCount
-                                         * values in FragmentList must equal
-                                         * Frame_Size value in START_FRAME TPL!
-                                         * frame data fragment list.
-                                         */
-
-        /* TPL/RPL size in OPEN parameter list depending on maximal
-         * numbers of fragments used in one parameter list.
-         */
-        Fragment FragList[TX_FRAG_NUM]; /* Maximum: nine frame fragments in one
-                                         * TPL actual version of firmware: 9
-                                         * fragments possible.
-                                         */
-#pragma pack()
-
-        /* Special proprietary data and precalculations */
-
-        TPL *NextTPLPtr;                /* Pointer to next TPL in chain. */
-        unsigned char *MData;
-        struct sk_buff *Skb;
-        unsigned char TPLIndex;
-        volatile unsigned char BusyFlag;/* Flag: TPL busy? */
-        dma_addr_t DMABuff;             /* DMA IO bus address from dma_map */
-};
-
-/* ---------------------Receive Functions-------------------------------*
- * define RECEIVE_CSTAT_REQUEST (R) and RECEIVE_CSTAT_COMPLETE (C) values.
- * (high-low)
- */
-#define RX_VALID                0x0080  /* R: set; tell adapter with
-                                         * RECEIVE.VALID interrupt.
-                                         * C: reset to zero.
-                                         */
-#define RX_FRAME_COMPLETE       0x0040  /* R: must be reset to zero,
-                                         * C: set to one.
-                                         */
-#define RX_START_FRAME          0x0020  /* R: must be reset to zero.
-                                         * C: set to one on the list.
-                                         */
-#define RX_END_FRAME            0x0010  /* R: must be reset to zero.
-                                         * C: set to one on the list
-                                         * that ends the frame.
-                                         */
-#define RX_FRAME_IRQ            0x0008  /* R: request interrupt generation
-                                         * after receive.
-                                         * C: unchanged.
-                                         */
-#define RX_INTERFRAME_WAIT      0x0004  /* R: after receiving a frame:
-                                         * interrupt and wait for a
-                                         * RECEIVE.CONTINUE.
-                                         * C: unchanged.
-                                         */
-#define RX_PASS_CRC             0x0002  /* R: if set, the adapter includes
-                                         * the CRC in data passed. (last four 
-                                         * bytes; valid only if FRAME_START is
-                                         * set)
-                                         * C: set, if CRC is included in
-                                         * received data.
-                                         */
-#define RX_PASS_SRC_ADDR        0x0001  /* R: adapter uses explicit frame
-                                         * source address and does not
-                                         * overwrite with the adapter node
-                                         * address. (valid only if FRAME_START
-                                         * is set)
-                                         * C: unchanged.
-                                         */
-#define RX_RECEIVE_FS           0xFC00  /* R: reserved; must be reset to zero.
-                                         * C: on lists with START_FRAME, field
-                                         * contains frame status field from
-                                         * received frame; otherwise cleared.
-                                         */
-#define RX_ADDR_MATCH           0x0300  /* R: reserved; must be reset to zero.
-                                         * C: address match code mask.
-                                         */ 
-#define RX_STATUS_MASK          0x00FF  /* Mask for receive status bits. */
-
-#define RX_INTERN_ADDR_MATCH    0x0100  /* C: internally address match. */
-#define RX_EXTERN_ADDR_MATCH    0x0200  /* C: externally matched via
-                                         * XMATCH/XFAIL interface.
-                                         */
-#define RX_INTEXT_ADDR_MATCH    0x0300  /* C: internally and externally
-                                         * matched.
-                                         */
-#define RX_READY (RX_VALID | RX_FRAME_IRQ) /* Ready for receive. */
-
-/* Constants for Command Status Interrupt.
- * COMMAND_REJECT status field bit functions (SSB.Parm[0])
- */
-#define ILLEGAL_COMMAND         0x0080  /* Set if an unknown command
-                                         * is issued to the adapter
-                                         */
-#define ADDRESS_ERROR           0x0040  /* Set if any address field in
-                                         * the SCB is odd. (not word aligned)
-                                         */
-#define ADAPTER_OPEN            0x0020  /* Command issued illegal with
-                                         * open adapter.
-                                         */
-#define ADAPTER_CLOSE           0x0010  /* Command issued illegal with
-                                         * closed adapter.
-                                         */
-#define SAME_COMMAND            0x0008  /* Command issued with same command
-                                         * already executing.
-                                         */
-
-/* OPEN_COMPLETION values (SSB.Parm[0], MSB) */
-#define NODE_ADDR_ERROR         0x0040  /* Wrong address or BIA read
-                                         * zero address.
-                                         */
-#define LIST_SIZE_ERROR         0x0020  /* If List_Size value not in 0,
-                                         * 14, 20, 26.
-                                         */
-#define BUF_SIZE_ERROR          0x0010  /* Not enough available memory for
-                                         * two buffers.
-                                         */
-#define TX_BUF_COUNT_ERROR      0x0004  /* Remaining receive buffers less than
-                                         * two.
-                                         */
-#define OPEN_ERROR              0x0002  /* Error during ring insertion; more
-                                         * information in bits 8-15.
-                                         */
-
-/* Standard return codes */
-#define GOOD_COMPLETION         0x0080  /* =OPEN_SUCCESSFULL */
-#define INVALID_OPEN_OPTION     0x0001  /* OPEN options are not supported by
-                                         * the adapter.
-                                         */
-
-/* OPEN phases; details of OPEN_ERROR (SSB.Parm[0], LSB)            */
-#define OPEN_PHASES_MASK            0xF000  /* Check only the bits 8-11. */
-#define LOBE_MEDIA_TEST             0x1000
-#define PHYSICAL_INSERTION          0x2000
-#define ADDRESS_VERIFICATION        0x3000
-#define PARTICIPATION_IN_RING_POLL  0x4000
-#define REQUEST_INITIALISATION      0x5000
-#define FULLDUPLEX_CHECK            0x6000
-
-/* OPEN error codes; details of OPEN_ERROR (SSB.Parm[0], LSB) */
-#define OPEN_ERROR_CODES_MASK   0x0F00  /* Check only the bits 12-15. */
-#define OPEN_FUNCTION_FAILURE   0x0100  /* Unable to transmit to itself or
-                                         * frames received before insertion.
-                                         */
-#define OPEN_SIGNAL_LOSS        0x0200  /* Signal loss condition detected at
-                                         * receiver.
-                                         */
-#define OPEN_TIMEOUT            0x0500  /* Insertion timer expired before
-                                         * logical insertion.
-                                         */
-#define OPEN_RING_FAILURE       0x0600  /* Unable to receive own ring purge
-                                         * MAC frames.
-                                         */
-#define OPEN_RING_BEACONING     0x0700  /* Beacon MAC frame received after
-                                         * ring insertion.
-                                         */
-#define OPEN_DUPLICATE_NODEADDR 0x0800  /* Other station in ring found
-                                         * with the same address.
-                                         */
-#define OPEN_REQUEST_INIT       0x0900  /* RPS present but does not respond. */
-#define OPEN_REMOVE_RECEIVED    0x0A00  /* Adapter received a remove adapter
-                                         * MAC frame.
-                                         */
-#define OPEN_FULLDUPLEX_SET     0x0D00  /* Got this with full duplex on when
-                                         * trying to connect to a normal ring.
-                                         */
-
-/* SET_BRIDGE_PARMS return codes: */
-#define BRIDGE_INVALID_MAX_LEN  0x4000  /* MAX_ROUTING_FIELD_LENGTH odd,
-                                         * less than 6 or > 30.
-                                         */
-#define BRIDGE_INVALID_SRC_RING 0x2000  /* SOURCE_RING number zero, too large
-                                         * or = TARGET_RING.
-                                         */
-#define BRIDGE_INVALID_TRG_RING 0x1000  /* TARGET_RING number zero, too large
-                                         * or = SOURCE_RING.
-                                         */
-#define BRIDGE_INVALID_BRDGE_NO 0x0800  /* BRIDGE_NUMBER too large. */
-#define BRIDGE_INVALID_OPTIONS  0x0400  /* Invalid bridge options. */
-#define BRIDGE_DIAGS_FAILED     0x0200  /* Diagnostics of TMS380SRA failed. */
-#define BRIDGE_NO_SRA           0x0100  /* The TMS380SRA does not exist in HW
-                                         * configuration.
-                                         */
-
-/*
- * Bring Up Diagnostics error codes.
- */
-#define BUD_INITIAL_ERROR       0x0
-#define BUD_CHECKSUM_ERROR      0x1
-#define BUD_ADAPTER_RAM_ERROR   0x2
-#define BUD_INSTRUCTION_ERROR   0x3
-#define BUD_CONTEXT_ERROR       0x4
-#define BUD_PROTOCOL_ERROR      0x5
-#define BUD_INTERFACE_ERROR     0x6
-
-/* BUD constants */
-#define BUD_MAX_RETRIES         3
-#define BUD_MAX_LOOPCNT         6
-#define BUD_TIMEOUT             3000
-
-/* Initialization constants */
-#define INIT_MAX_RETRIES        3       /* Maximum three retries. */
-#define INIT_MAX_LOOPCNT        22      /* Maximum loop counts. */
-
-/* RING STATUS field values (high/low) */
-#define SIGNAL_LOSS             0x0080  /* Loss of signal on the ring
-                                         * detected.
-                                         */
-#define HARD_ERROR              0x0040  /* Transmitting or receiving beacon
-                                         * frames.
-                                         */
-#define SOFT_ERROR              0x0020  /* Report error MAC frame
-                                         * transmitted.
-                                         */
-#define TRANSMIT_BEACON         0x0010  /* Transmitting beacon frames on the
-                                         * ring.
-                                         */
-#define LOBE_WIRE_FAULT         0x0008  /* Open or short circuit in the
-                                         * cable to concentrator; adapter
-                                         * closed.
-                                         */
-#define AUTO_REMOVAL_ERROR      0x0004  /* Lobe wrap test failed, deinserted;
-                                         * adapter closed.
-                                         */
-#define REMOVE_RECEIVED         0x0001  /* Received a remove ring station MAC
-                                         * MAC frame request; adapter closed.
-                                         */
-#define COUNTER_OVERFLOW        0x8000  /* Overflow of one of the adapters
-                                         * error counters; READ.ERROR.LOG.
-                                         */
-#define SINGLE_STATION          0x4000  /* Adapter is the only station on the
-                                         * ring.
-                                         */
-#define RING_RECOVERY           0x2000  /* Claim token MAC frames on the ring;
-                                         * reset after ring purge frame.
-                                         */
-
-#define ADAPTER_CLOSED (LOBE_WIRE_FAULT | AUTO_REMOVAL_ERROR |\
-                        REMOVE_RECEIVED)
-
-/* Adapter_check_block.Status field bit assignments: */
-#define DIO_PARITY              0x8000  /* Adapter detects bad parity
-                                         * through direct I/O access.
-                                         */
-#define DMA_READ_ABORT          0x4000  /* Aborting DMA read operation
-                                         * from system Parm[0]: 0=timeout,
-                                         * 1=parity error, 2=bus error;
-                                         * Parm[1]: 32 bit pointer to host
-                                         * system address at failure.
-                                         */
-#define DMA_WRITE_ABORT         0x2000  /* Aborting DMA write operation
-                                         * to system. (parameters analogous to
-                                         * DMA_READ_ABORT)
-                                         */
-#define ILLEGAL_OP_CODE         0x1000  /* Illegal operation code in the
-                                         * the adapters firmware Parm[0]-2:
-                                         * communications processor registers
-                                         * R13-R15.
-                                         */
-#define PARITY_ERRORS           0x0800  /* Adapter detects internal bus
-                                         * parity error.
-                                         */
-#define RAM_DATA_ERROR          0x0080  /* Valid only during RAM testing;
-                                         * RAM data error Parm[0-1]: 32 bit
-                                         * pointer to RAM location.
-                                         */
-#define RAM_PARITY_ERROR        0x0040  /* Valid only during RAM testing;
-                                         * RAM parity error Parm[0-1]: 32 bit
-                                         * pointer to RAM location.
-                                         */
-#define RING_UNDERRUN           0x0020  /* Internal DMA underrun when
-                                         * transmitting onto ring.
-                                         */
-#define INVALID_IRQ             0x0008  /* Unrecognized interrupt generated
-                                         * internal to adapter Parm[0-2]:
-                                         * adapter register R13-R15.
-                                         */
-#define INVALID_ERROR_IRQ       0x0004  /* Unrecognized error interrupt
-                                         * generated Parm[0-2]: adapter register
-                                         * R13-R15.
-                                         */
-#define INVALID_XOP             0x0002  /* Unrecognized XOP request in
-                                         * communication processor Parm[0-2]:
-                                         * adapter register R13-R15.
-                                         */
-#define CHECKADDR               0x05E0  /* Adapter check status information
-                                         * address offset.
-                                         */
-#define ROM_PAGE_0              0x0000  /* Adapter ROM page 0. */
-
-/*
- * RECEIVE.STATUS interrupt result SSB values: (high-low)
- * (RECEIVE_COMPLETE field bit definitions in SSB.Parm[0])
- */
-#define RX_COMPLETE             0x0080  /* SSB.Parm[0]; SSB.Parm[1]: 32
-                                         * bit pointer to last RPL.
-                                         */
-#define RX_SUSPENDED            0x0040  /* SSB.Parm[0]; SSB.Parm[1]: 32
-                                         * bit pointer to RPL with odd
-                                         * forward pointer.
-                                         */
-
-/* Valid receive CSTAT: */
-#define RX_FRAME_CONTROL_BITS (RX_VALID | RX_START_FRAME | RX_END_FRAME | \
-                               RX_FRAME_COMPLETE)
-#define VALID_SINGLE_BUFFER_FRAME (RX_START_FRAME | RX_END_FRAME | \
-                                   RX_FRAME_COMPLETE)
-
-typedef enum SKB_STAT SKB_STAT;
-enum SKB_STAT {
-        SKB_UNAVAILABLE,
-        SKB_DMA_DIRECT,
-        SKB_DATA_COPY
-};
-
-/* Receive Parameter List (RPL) The length of the RPLs has to be initialized 
- * in the OPL. (OPEN parameter list)
- */
-#define RPL_NUM         3
-
-#define RX_FRAG_NUM     1       /* Maximal number of used fragments in one RPL.
-                                 * (up to firmware v2.24: 3, now: up to 9)
-                                 */
-
-#pragma pack(1)
-typedef struct s_RPL RPL;
-struct s_RPL {  /* Receive Parameter List */
-        __be32 NextRPLAddr;             /* Pointer to next RPL in chain
-                                         * (normalized = physical 32 bit
-                                         * address) if pointer is odd: this
-                                         * is last RPL. Pointing to itself can
-                                         * cause problems!
-                                         */
-        volatile u_int16_t Status;      /* Set by creation of Receive Parameter
-                                         * List RECEIVE_CSTAT_COMPLETE set by
-                                         * adapter in lists that start or end
-                                         * a frame.
-                                         */
-        volatile __be16 FrameSize;       /* Number of bytes received as a
-                                         * frame including AC/FC, Destination,
-                                         * Source, Routing field not including 
-                                         * CRC, FS (Frame Status), End Delimiter
-                                         * (valid only if START_FRAME bit in 
-                                         * CSTAT nonzero) must not be zero in
-                                         * any list; maximum value: (BUFFER_SIZE
-                                         * - 8) * TX_BUF_MAX sum of DataCount
-                                         * values in FragmentList must equal
-                                         * Frame_Size value in START_FRAME TPL!
-                                         * frame data fragment list
-                                         */
-
-        /* TPL/RPL size in OPEN parameter list depending on maximal numbers
-         * of fragments used in one parameter list.
-         */
-        Fragment FragList[RX_FRAG_NUM]; /* Maximum: nine frame fragments in
-                                         * one TPL. Actual version of firmware:
-                                         * 9 fragments possible.
-                                         */
-#pragma pack()
-
-        /* Special proprietary data and precalculations. */
-        RPL *NextRPLPtr;        /* Logical pointer to next RPL in chain. */
-        unsigned char *MData;
-        struct sk_buff *Skb;
-        SKB_STAT SkbStat;
-        int RPLIndex;
-        dma_addr_t DMABuff;             /* DMA IO bus address from dma_map */
-};
-
-/* Information that need to be kept for each board. */
-typedef struct net_local {
-#pragma pack(1)
-        IPB ipb;        /* Initialization Parameter Block. */
-        SCB scb;        /* System Command Block: system to adapter 
-                         * communication.
-                         */
-        SSB ssb;        /* System Status Block: adapter to system 
-                         * communication.
-                         */
-        OPB ocpl;       /* Open Options Parameter Block. */
-
-        ERRORTAB errorlogtable; /* Adapter statistic error counters.
-                                 * (read from adapter memory)
-                                 */
-        unsigned char ProductID[PROD_ID_SIZE + 1]; /* Product ID */
-#pragma pack()
-
-        TPL Tpl[TPL_NUM];
-        TPL *TplFree;
-        TPL *TplBusy;
-        unsigned char LocalTxBuffers[TPL_NUM][DEFAULT_PACKET_SIZE];
-
-        RPL Rpl[RPL_NUM];
-        RPL *RplHead;
-        RPL *RplTail;
-        unsigned char LocalRxBuffers[RPL_NUM][DEFAULT_PACKET_SIZE];
-
-        struct device *pdev;
-        int DataRate;
-        unsigned char ScbInUse;
-        unsigned short CMDqueue;
-
-        unsigned long AdapterOpenFlag:1;
-        unsigned long AdapterVirtOpenFlag:1;
-        unsigned long OpenCommandIssued:1;
-        unsigned long TransmitCommandActive:1;
-        unsigned long TransmitHaltScheduled:1;
-        unsigned long HaltInProgress:1;
-        unsigned long LobeWireFaultLogged:1;
-        unsigned long ReOpenInProgress:1;
-        unsigned long Sleeping:1;
-
-        unsigned long LastOpenStatus;
-        unsigned short CurrentRingStatus;
-        unsigned long MaxPacketSize;
-        
-        unsigned long StartTime;
-        unsigned long LastSendTime;
-
-        struct tr_statistics MacStat;   /* MAC statistics structure */
-
-        unsigned long dmalimit; /* the max DMA address (ie, ISA) */
-        dma_addr_t    dmabuffer; /* the DMA bus address corresponding to
-                                    priv. Might be different from virt_to_bus()
-                                    for architectures with IO MMU (Alpha) */
-
-        struct timer_list timer;
-
-        wait_queue_head_t  wait_for_tok_int;
-
-        INTPTRS intptrs;        /* Internal adapter pointer. Must be read
-                                 * before OPEN command.
-                                 */
-        unsigned short (*setnselout)(struct net_device *);
-        unsigned short (*sifreadb)(struct net_device *, unsigned short);
-        void (*sifwriteb)(struct net_device *, unsigned short, unsigned short);
-        unsigned short (*sifreadw)(struct net_device *, unsigned short);
-        void (*sifwritew)(struct net_device *, unsigned short, unsigned short);
-
-        spinlock_t lock;                /* SMP protection */
-        void *tmspriv;
-} NET_LOCAL;
-
-#endif  /* __KERNEL__ */
-#endif  /* __LINUX_TMS380TR_H */
diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
deleted file mode 100644
index fb9918da5792..000000000000
--- a/drivers/net/tokenring/tmspci.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- *  tmspci.c: A generic network driver for TMS380-based PCI token ring cards.
- *
- *  Written 1999 by Adam Fritzler
- *
- *  This software may be used and distributed according to the terms
- *  of the GNU General Public License, incorporated herein by reference.
- *
- *  This driver module supports the following cards:
- *      - SysKonnect TR4/16(+) PCI      (SK-4590)
- *      - SysKonnect TR4/16 PCI         (SK-4591)
- *      - Compaq TR 4/16 PCI
- *      - Thomas-Conrad TC4048 4/16 PCI 
- *      - 3Com 3C339 Token Link Velocity
- *
- *  Maintainer(s):
- *    AF        Adam Fritzler
- *
- *  Modification History:
- *      30-Dec-99       AF      Split off from the tms380tr driver.
- *      22-Jan-00       AF      Updated to use indirect read/writes
- *      23-Nov-00       JG      New PCI API, cleanups
- *
- *  TODO:
- *      1. See if we can use MMIO instead of port accesses
- *
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/netdevice.h>
-#include <linux/trdevice.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-
-#include "tms380tr.h"
-
-static char version[] __devinitdata =
-"tmspci.c: v1.02 23/11/2000 by Adam Fritzler\n";
-
-#define TMS_PCI_IO_EXTENT 32
-
-struct card_info {
-        unsigned char nselout[2]; /* NSELOUT vals for 4mb([0]) and 16mb([1]) */
-        char *name;
-};
-
-static struct card_info card_info_table[] = {
-        { {0x03, 0x01}, "Compaq 4/16 TR PCI"},
-        { {0x03, 0x01}, "SK NET TR 4/16 PCI"},
-        { {0x03, 0x01}, "Thomas-Conrad TC4048 PCI 4/16"},
-        { {0x03, 0x01}, "3Com Token Link Velocity"},
-};
-
-static DEFINE_PCI_DEVICE_TABLE(tmspci_pci_tbl) = {
-        { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_TOKENRING, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-        { PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_TR, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
-        { PCI_VENDOR_ID_TCONRAD, PCI_DEVICE_ID_TCONRAD_TOKENRING, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },
-        { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3C339, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3 },
-        { }                     /* Terminating entry */
-};
-MODULE_DEVICE_TABLE(pci, tmspci_pci_tbl);
-
-MODULE_LICENSE("GPL");
-
-static void tms_pci_read_eeprom(struct net_device *dev);
-static unsigned short tms_pci_setnselout_pins(struct net_device *dev);
-
-static unsigned short tms_pci_sifreadb(struct net_device *dev, unsigned short reg)
-{
-        return inb(dev->base_addr + reg);
-}
-
-static unsigned short tms_pci_sifreadw(struct net_device *dev, unsigned short reg)
-{
-        return inw(dev->base_addr + reg);
-}
-
-static void tms_pci_sifwriteb(struct net_device *dev, unsigned short val, unsigned short reg)
-{
-        outb(val, dev->base_addr + reg);
-}
-
-static void tms_pci_sifwritew(struct net_device *dev, unsigned short val, unsigned short reg)
-{
-        outw(val, dev->base_addr + reg);
-}
-
-static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_device_id *ent)
-{       
-        static int versionprinted;
-        struct net_device *dev;
-        struct net_local *tp;
-        int ret;
-        unsigned int pci_irq_line;
-        unsigned long pci_ioaddr;
-        struct card_info *cardinfo = &card_info_table[ent->driver_data];
-
-        if (versionprinted++ == 0)
-                printk("%s", version);
-
-        if (pci_enable_device(pdev))
-                return -EIO;
-
-        /* Remove I/O space marker in bit 0. */
-        pci_irq_line = pdev->irq;
-        pci_ioaddr = pci_resource_start (pdev, 0);
-
-        /* At this point we have found a valid card. */
-        dev = alloc_trdev(sizeof(struct net_local));
-        if (!dev)
-                return -ENOMEM;
-
-        if (!request_region(pci_ioaddr, TMS_PCI_IO_EXTENT, dev->name)) {
-                ret = -EBUSY;
-                goto err_out_trdev;
-        }
-
-        dev->base_addr  = pci_ioaddr;
-        dev->irq        = pci_irq_line;
-        dev->dma        = 0;
-
-        dev_info(&pdev->dev, "%s\n", cardinfo->name);
-        dev_info(&pdev->dev, "    IO: %#4lx  IRQ: %d\n", dev->base_addr, dev->irq);
-                
-        tms_pci_read_eeprom(dev);
-
-        dev_info(&pdev->dev, "    Ring Station Address: %pM\n", dev->dev_addr);
-                
-        ret = tmsdev_init(dev, &pdev->dev);
-        if (ret) {
-                dev_info(&pdev->dev, "unable to get memory for dev->priv.\n");
-                goto err_out_region;
-        }
-
-        tp = netdev_priv(dev);
-        tp->setnselout = tms_pci_setnselout_pins;
-                
-        tp->sifreadb = tms_pci_sifreadb;
-        tp->sifreadw = tms_pci_sifreadw;
-        tp->sifwriteb = tms_pci_sifwriteb;
-        tp->sifwritew = tms_pci_sifwritew;
-                
-        memcpy(tp->ProductID, cardinfo->name, PROD_ID_SIZE + 1);
-
-        tp->tmspriv = cardinfo;
-
-        dev->netdev_ops = &tms380tr_netdev_ops;
-
-        ret = request_irq(pdev->irq, tms380tr_interrupt, IRQF_SHARED,
-                          dev->name, dev);
-        if (ret)
-                goto err_out_tmsdev;
-
-        pci_set_drvdata(pdev, dev);
-        SET_NETDEV_DEV(dev, &pdev->dev);
-
-        ret = register_netdev(dev);
-        if (ret)
-                goto err_out_irq;
-        
-        return 0;
-
-err_out_irq:
-        free_irq(pdev->irq, dev);
-err_out_tmsdev:
-        pci_set_drvdata(pdev, NULL);
-        tmsdev_term(dev);
-err_out_region:
-        release_region(pci_ioaddr, TMS_PCI_IO_EXTENT);
-err_out_trdev:
-        free_netdev(dev);
-        return ret;
-}
-
-/*
- * Reads MAC address from adapter RAM, which should've read it from
- * the onboard ROM.  
- *
- * Calling this on a board that does not support it can be a very
- * dangerous thing.  The Madge board, for instance, will lock your
- * machine hard when this is called.  Luckily, its supported in a
- * separate driver.  --ASF
- */
-static void tms_pci_read_eeprom(struct net_device *dev)
-{
-        int i;
-        
-        /* Address: 0000:0000 */
-        tms_pci_sifwritew(dev, 0, SIFADX);
-        tms_pci_sifwritew(dev, 0, SIFADR);      
-        
-        /* Read six byte MAC address data */
-        dev->addr_len = 6;
-        for(i = 0; i < 6; i++)
-                dev->dev_addr[i] = tms_pci_sifreadw(dev, SIFINC) >> 8;
-}
-
-static unsigned short tms_pci_setnselout_pins(struct net_device *dev)
-{
-        unsigned short val = 0;
-        struct net_local *tp = netdev_priv(dev);
-        struct card_info *cardinfo = tp->tmspriv;
-  
-        if(tp->DataRate == SPEED_4)
-                val |= cardinfo->nselout[0];    /* Set 4Mbps */
-        else
-                val |= cardinfo->nselout[1];    /* Set 16Mbps */
-        return val;
-}
-
-static void __devexit tms_pci_detach (struct pci_dev *pdev)
-{
-        struct net_device *dev = pci_get_drvdata(pdev);
-
-        BUG_ON(!dev);
-        unregister_netdev(dev);
-        release_region(dev->base_addr, TMS_PCI_IO_EXTENT);
-        free_irq(dev->irq, dev);
-        tmsdev_term(dev);
-        free_netdev(dev);
-        pci_set_drvdata(pdev, NULL);
-}
-
-static struct pci_driver tms_pci_driver = {
-        .name           = "tmspci",
-        .id_table       = tmspci_pci_tbl,
-        .probe          = tms_pci_attach,
-        .remove         = __devexit_p(tms_pci_detach),
-};
-
-static int __init tms_pci_init (void)
-{
-        return pci_register_driver(&tms_pci_driver);
-}
-
-static void __exit tms_pci_rmmod (void)
-{
-        pci_unregister_driver (&tms_pci_driver);
-}
-
-module_init(tms_pci_init);
-module_exit(tms_pci_rmmod);
-
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index bb8c72c79c6f..987aeefbc774 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -313,7 +313,7 @@ static int run_filter(struct tap_filter *filter, const struct sk_buff *skb)
 
         /* Exact match */
         for (i = 0; i < filter->count; i++)
-                if (!compare_ether_addr(eh->h_dest, filter->addr[i]))
+                if (ether_addr_equal(eh->h_dest, filter->addr[i]))
                         return 1;
 
         /* Inexact match (multicast only) */
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 5ee032cafade..42b5151aa78a 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -355,7 +355,7 @@ static struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
         u32 packet_len;
         u32 padbytes = 0xffff0000;
 
-        padlen = ((skb->len + 4) % 512) ? 0 : 4;
+        padlen = ((skb->len + 4) & (dev->maxpacket - 1)) ? 0 : 4;
 
         if ((!skb_cloned(skb)) &&
             ((headroom + tailroom) >= (4 + padlen))) {
@@ -377,7 +377,7 @@ static struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
         cpu_to_le32s(&packet_len);
         skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len));
 
-        if ((skb->len % 512) == 0) {
+        if (padlen) {
                 cpu_to_le32s(&padbytes);
                 memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));
                 skb_put(skb, sizeof(padbytes));
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 90a30026a931..fffee6aee8bb 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -83,6 +83,7 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf)
         struct cdc_state                *info = (void *) &dev->data;
         int                             status;
         int                             rndis;
+        bool                            android_rndis_quirk = false;
         struct usb_driver               *driver = driver_of(intf);
         struct usb_cdc_mdlm_desc        *desc = NULL;
         struct usb_cdc_mdlm_detail_desc *detail = NULL;
@@ -195,6 +196,11 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf)
                                         info->control,
                                         info->u->bSlaveInterface0,
                                         info->data);
+                                /* fall back to hard-wiring for RNDIS */
+                                if (rndis) {
+                                        android_rndis_quirk = true;
+                                        goto next_desc;
+                                }
                                 goto bad_desc;
                         }
                         if (info->control != intf) {
@@ -271,11 +277,15 @@ next_desc:
         /* Microsoft ActiveSync based and some regular RNDIS devices lack the
          * CDC descriptors, so we'll hard-wire the interfaces and not check
          * for descriptors.
+         *
+         * Some Android RNDIS devices have a CDC Union descriptor pointing
+         * to non-existing interfaces.  Ignore that and attempt the same
+         * hard-wired 0 and 1 interfaces.
          */
-        if (rndis && !info->u) {
+        if (rndis && (!info->u || android_rndis_quirk)) {
                 info->control = usb_ifnum_to_if(dev->udev, 0);
                 info->data = usb_ifnum_to_if(dev->udev, 1);
-                if (!info->control || !info->data) {
+                if (!info->control || !info->data || info->control != intf) {
                         dev_dbg(&intf->dev,
                                 "rndis: master #0/%p slave #1/%p\n",
                                 info->control,
@@ -475,6 +485,8 @@ static const struct driver_info wwan_info = {
 /*-------------------------------------------------------------------------*/
 
 #define HUAWEI_VENDOR_ID        0x12D1
+#define NOVATEL_VENDOR_ID       0x1410
+#define ZTE_VENDOR_ID           0x19D2
 
 static const struct usb_device_id       products [] = {
 /*
@@ -592,6 +604,76 @@ static const struct usb_device_id	products [] = {
  * because of bugs/quirks in a given product (like Zaurus, above).
  */
 {
+        /* Novatel USB551L */
+        /* This match must come *before* the generic CDC-ETHER match so that
+         * we get FLAG_WWAN set on the device, since it's descriptors are
+         * generic CDC-ETHER.
+         */
+        .match_flags    =   USB_DEVICE_ID_MATCH_VENDOR
+                 | USB_DEVICE_ID_MATCH_PRODUCT
+                 | USB_DEVICE_ID_MATCH_INT_INFO,
+        .idVendor               = NOVATEL_VENDOR_ID,
+        .idProduct              = 0xB001,
+        .bInterfaceClass        = USB_CLASS_COMM,
+        .bInterfaceSubClass     = USB_CDC_SUBCLASS_ETHERNET,
+        .bInterfaceProtocol     = USB_CDC_PROTO_NONE,
+        .driver_info = (unsigned long)&wwan_info,
+}, {
+        /* ZTE (Vodafone) K3805-Z */
+        .match_flags    =   USB_DEVICE_ID_MATCH_VENDOR
+                 | USB_DEVICE_ID_MATCH_PRODUCT
+                 | USB_DEVICE_ID_MATCH_INT_INFO,
+        .idVendor               = ZTE_VENDOR_ID,
+        .idProduct              = 0x1003,
+        .bInterfaceClass        = USB_CLASS_COMM,
+        .bInterfaceSubClass     = USB_CDC_SUBCLASS_ETHERNET,
+        .bInterfaceProtocol     = USB_CDC_PROTO_NONE,
+        .driver_info = (unsigned long)&wwan_info,
+}, {
+        /* ZTE (Vodafone) K3806-Z */
+        .match_flags    =   USB_DEVICE_ID_MATCH_VENDOR
+                 | USB_DEVICE_ID_MATCH_PRODUCT
+                 | USB_DEVICE_ID_MATCH_INT_INFO,
+        .idVendor               = ZTE_VENDOR_ID,
+        .idProduct              = 0x1015,
+        .bInterfaceClass        = USB_CLASS_COMM,
+        .bInterfaceSubClass     = USB_CDC_SUBCLASS_ETHERNET,
+        .bInterfaceProtocol     = USB_CDC_PROTO_NONE,
+        .driver_info = (unsigned long)&wwan_info,
+}, {
+        /* ZTE (Vodafone) K4510-Z */
+        .match_flags    =   USB_DEVICE_ID_MATCH_VENDOR
+                 | USB_DEVICE_ID_MATCH_PRODUCT
+                 | USB_DEVICE_ID_MATCH_INT_INFO,
+        .idVendor               = ZTE_VENDOR_ID,
+        .idProduct              = 0x1173,
+        .bInterfaceClass        = USB_CLASS_COMM,
+        .bInterfaceSubClass     = USB_CDC_SUBCLASS_ETHERNET,
+        .bInterfaceProtocol     = USB_CDC_PROTO_NONE,
+        .driver_info = (unsigned long)&wwan_info,
+}, {
+        /* ZTE (Vodafone) K3770-Z */
+        .match_flags    =   USB_DEVICE_ID_MATCH_VENDOR
+                 | USB_DEVICE_ID_MATCH_PRODUCT
+                 | USB_DEVICE_ID_MATCH_INT_INFO,
+        .idVendor               = ZTE_VENDOR_ID,
+        .idProduct              = 0x1177,
+        .bInterfaceClass        = USB_CLASS_COMM,
+        .bInterfaceSubClass     = USB_CDC_SUBCLASS_ETHERNET,
+        .bInterfaceProtocol     = USB_CDC_PROTO_NONE,
+        .driver_info = (unsigned long)&wwan_info,
+}, {
+        /* ZTE (Vodafone) K3772-Z */
+        .match_flags    =   USB_DEVICE_ID_MATCH_VENDOR
+                 | USB_DEVICE_ID_MATCH_PRODUCT
+                 | USB_DEVICE_ID_MATCH_INT_INFO,
+        .idVendor               = ZTE_VENDOR_ID,
+        .idProduct              = 0x1181,
+        .bInterfaceClass        = USB_CLASS_COMM,
+        .bInterfaceSubClass     = USB_CDC_SUBCLASS_ETHERNET,
+        .bInterfaceProtocol     = USB_CDC_PROTO_NONE,
+        .driver_info = (unsigned long)&wwan_info,
+}, {
         USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ETHERNET,
                         USB_CDC_PROTO_NONE),
         .driver_info = (unsigned long) &cdc_info,
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 552d24bf862e..63cfd0b2c31a 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -356,15 +356,45 @@ static const struct driver_info	qmi_wwan_gobi = {
 };
 
 /* ZTE suck at making USB descriptors */
+static const struct driver_info qmi_wwan_force_int1 = {
+        .description    = "Qualcomm WWAN/QMI device",
+        .flags          = FLAG_WWAN,
+        .bind           = qmi_wwan_bind_shared,
+        .unbind         = qmi_wwan_unbind_shared,
+        .manage_power   = qmi_wwan_manage_power,
+        .data           = BIT(1), /* interface whitelist bitmap */
+};
+
 static const struct driver_info qmi_wwan_force_int4 = {
-        .description    = "Qualcomm Gobi wwan/QMI device",
+        .description    = "Qualcomm WWAN/QMI device",
         .flags          = FLAG_WWAN,
-        .bind           = qmi_wwan_bind_gobi,
+        .bind           = qmi_wwan_bind_shared,
         .unbind         = qmi_wwan_unbind_shared,
         .manage_power   = qmi_wwan_manage_power,
         .data           = BIT(4), /* interface whitelist bitmap */
 };
 
+/* Sierra Wireless provide equally useless interface descriptors
+ * Devices in QMI mode can be switched between two different
+ * configurations:
+ *   a) USB interface #8 is QMI/wwan
+ *   b) USB interfaces #8, #19 and #20 are QMI/wwan
+ *
+ * Both configurations provide a number of other interfaces (serial++),
+ * some of which have the same endpoint configuration as we expect, so
+ * a whitelist or blacklist is necessary.
+ *
+ * FIXME: The below whitelist should include BIT(20).  It does not
+ * because I cannot get it to work...
+ */
+static const struct driver_info qmi_wwan_sierra = {
+        .description    = "Sierra Wireless wwan/QMI device",
+        .flags          = FLAG_WWAN,
+        .bind           = qmi_wwan_bind_gobi,
+        .unbind         = qmi_wwan_unbind_shared,
+        .manage_power   = qmi_wwan_manage_power,
+        .data           = BIT(8) | BIT(19), /* interface whitelist bitmap */
+};
 
 #define HUAWEI_VENDOR_ID        0x12D1
 #define QMI_GOBI_DEVICE(vend, prod) \
@@ -380,6 +410,14 @@ static const struct usb_device_id products[] = {
                 .bInterfaceProtocol = 8, /* NOTE: This is the *slave* interface of the CDC Union! */
                 .driver_info        = (unsigned long)&qmi_wwan_info,
         },
+        {       /* Vodafone/Huawei K5005 (12d1:14c8) and similar modems */
+                .match_flags        = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_INT_INFO,
+                .idVendor           = HUAWEI_VENDOR_ID,
+                .bInterfaceClass    = USB_CLASS_VENDOR_SPEC,
+                .bInterfaceSubClass = 1,
+                .bInterfaceProtocol = 56, /* NOTE: This is the *slave* interface of the CDC Union! */
+                .driver_info        = (unsigned long)&qmi_wwan_info,
+        },
         {       /* Huawei E392, E398 and possibly others in "Windows mode"
                  * using a combined control and data interface without any CDC
                  * functional descriptors
@@ -409,6 +447,15 @@ static const struct usb_device_id products[] = {
                 .bInterfaceProtocol = 0xff,
                 .driver_info        = (unsigned long)&qmi_wwan_force_int4,
         },
+        {       /* ZTE (Vodafone) K3520-Z */
+                .match_flags        = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
+                .idVendor           = 0x19d2,
+                .idProduct          = 0x0055,
+                .bInterfaceClass    = 0xff,
+                .bInterfaceSubClass = 0xff,
+                .bInterfaceProtocol = 0xff,
+                .driver_info        = (unsigned long)&qmi_wwan_force_int1,
+        },
         {       /* ZTE (Vodafone) K3565-Z */
                 .match_flags        = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
                 .idVendor           = 0x19d2,
@@ -436,6 +483,15 @@ static const struct usb_device_id products[] = {
                 .bInterfaceProtocol = 0xff,
                 .driver_info        = (unsigned long)&qmi_wwan_force_int4,
         },
+        {       /* ZTE (Vodafone) K3765-Z */
+                .match_flags        = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
+                .idVendor           = 0x19d2,
+                .idProduct          = 0x2002,
+                .bInterfaceClass    = 0xff,
+                .bInterfaceSubClass = 0xff,
+                .bInterfaceProtocol = 0xff,
+                .driver_info        = (unsigned long)&qmi_wwan_force_int4,
+        },
         {       /* ZTE (Vodafone) K4505-Z */
                 .match_flags        = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
                 .idVendor           = 0x19d2,
@@ -445,6 +501,15 @@ static const struct usb_device_id products[] = {
                 .bInterfaceProtocol = 0xff,
                 .driver_info        = (unsigned long)&qmi_wwan_force_int4,
         },
+        {       /* Sierra Wireless MC77xx in QMI mode */
+                .match_flags        = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
+                .idVendor           = 0x1199,
+                .idProduct          = 0x68a2,
+                .bInterfaceClass    = 0xff,
+                .bInterfaceSubClass = 0xff,
+                .bInterfaceProtocol = 0xff,
+                .driver_info        = (unsigned long)&qmi_wwan_sierra,
+        },
         {QMI_GOBI_DEVICE(0x05c6, 0x9212)},      /* Acer Gobi Modem Device */
         {QMI_GOBI_DEVICE(0x03f0, 0x1f1d)},      /* HP un2400 Gobi Modem Device */
         {QMI_GOBI_DEVICE(0x03f0, 0x371d)},      /* HP un2430 Mobile Broadband Module */
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
index c8f1b5b3aff3..0d746b3fdef1 100644
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -77,7 +77,9 @@ static void rndis_msg_indicate(struct usbnet *dev, struct rndis_indicate *msg,
         if (dev->driver_info->indication) {
                 dev->driver_info->indication(dev, msg, buflen);
         } else {
-                switch (msg->status) {
+                u32 status = le32_to_cpu(msg->status);
+
+                switch (status) {
                 case RNDIS_STATUS_MEDIA_CONNECT:
                         dev_info(udev, "rndis media connect\n");
                         break;
@@ -85,8 +87,7 @@ static void rndis_msg_indicate(struct usbnet *dev, struct rndis_indicate *msg,
                         dev_info(udev, "rndis media disconnect\n");
                         break;
                 default:
-                        dev_info(udev, "rndis indication: 0x%08x\n",
-                                        le32_to_cpu(msg->status));
+                        dev_info(udev, "rndis indication: 0x%08x\n", status);
                 }
         }
 }
@@ -109,16 +110,17 @@ int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf, int buflen)
         int                     retval;
         int                     partial;
         unsigned                count;
-        __le32                  rsp;
-        u32                     xid = 0, msg_len, request_id;
+        u32                     xid = 0, msg_len, request_id, msg_type, rsp,
+                                status;
 
         /* REVISIT when this gets called from contexts other than probe() or
          * disconnect(): either serialize, or dispatch responses on xid
          */
 
+        msg_type = le32_to_cpu(buf->msg_type);
+
         /* Issue the request; xid is unique, don't bother byteswapping it */
-        if (likely(buf->msg_type != RNDIS_MSG_HALT &&
-                   buf->msg_type != RNDIS_MSG_RESET)) {
+        if (likely(msg_type != RNDIS_MSG_HALT && msg_type != RNDIS_MSG_RESET)) {
                 xid = dev->xid++;
                 if (!xid)
                         xid = dev->xid++;
@@ -149,7 +151,7 @@ int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf, int buflen)
         }
 
         /* Poll the control channel; the request probably completed immediately */
-        rsp = buf->msg_type | RNDIS_MSG_COMPLETION;
+        rsp = le32_to_cpu(buf->msg_type) | RNDIS_MSG_COMPLETION;
         for (count = 0; count < 10; count++) {
                 memset(buf, 0, CONTROL_BUFFER_SIZE);
                 retval = usb_control_msg(dev->udev,
@@ -160,35 +162,36 @@ int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf, int buflen)
                         buf, buflen,
                         RNDIS_CONTROL_TIMEOUT_MS);
                 if (likely(retval >= 8)) {
+                        msg_type = le32_to_cpu(buf->msg_type);
                         msg_len = le32_to_cpu(buf->msg_len);
+                        status = le32_to_cpu(buf->status);
                         request_id = (__force u32) buf->request_id;
-                        if (likely(buf->msg_type == rsp)) {
+                        if (likely(msg_type == rsp)) {
                                 if (likely(request_id == xid)) {
                                         if (unlikely(rsp == RNDIS_MSG_RESET_C))
                                                 return 0;
-                                        if (likely(RNDIS_STATUS_SUCCESS
-                                                        == buf->status))
+                                        if (likely(RNDIS_STATUS_SUCCESS ==
+                                                        status))
                                                 return 0;
                                         dev_dbg(&info->control->dev,
                                                 "rndis reply status %08x\n",
-                                                le32_to_cpu(buf->status));
+                                                status);
                                         return -EL3RST;
                                 }
                                 dev_dbg(&info->control->dev,
                                         "rndis reply id %d expected %d\n",
                                         request_id, xid);
                                 /* then likely retry */
-                        } else switch (buf->msg_type) {
-                        case RNDIS_MSG_INDICATE:        /* fault/event */
+                        } else switch (msg_type) {
+                        case RNDIS_MSG_INDICATE: /* fault/event */
                                 rndis_msg_indicate(dev, (void *)buf, buflen);
-
                                 break;
-                        case RNDIS_MSG_KEEPALIVE: {     /* ping */
+                        case RNDIS_MSG_KEEPALIVE: { /* ping */
                                 struct rndis_keepalive_c *msg = (void *)buf;
 
-                                msg->msg_type = RNDIS_MSG_KEEPALIVE_C;
+                                msg->msg_type = cpu_to_le32(RNDIS_MSG_KEEPALIVE_C);
                                 msg->msg_len = cpu_to_le32(sizeof *msg);
-                                msg->status = RNDIS_STATUS_SUCCESS;
+                                msg->status = cpu_to_le32(RNDIS_STATUS_SUCCESS);
                                 retval = usb_control_msg(dev->udev,
                                         usb_sndctrlpipe(dev->udev, 0),
                                         USB_CDC_SEND_ENCAPSULATED_COMMAND,
@@ -236,7 +239,7 @@ EXPORT_SYMBOL_GPL(rndis_command);
  * ActiveSync 4.1 Windows driver.
  */
 static int rndis_query(struct usbnet *dev, struct usb_interface *intf,
-                void *buf, __le32 oid, u32 in_len,
+                void *buf, u32 oid, u32 in_len,
                 void **reply, int *reply_len)
 {
         int retval;
@@ -251,9 +254,9 @@ static int rndis_query(struct usbnet *dev, struct usb_interface *intf,
         u.buf = buf;
 
         memset(u.get, 0, sizeof *u.get + in_len);
-        u.get->msg_type = RNDIS_MSG_QUERY;
+        u.get->msg_type = cpu_to_le32(RNDIS_MSG_QUERY);
         u.get->msg_len = cpu_to_le32(sizeof *u.get + in_len);
-        u.get->oid = oid;
+        u.get->oid = cpu_to_le32(oid);
         u.get->len = cpu_to_le32(in_len);
         u.get->offset = cpu_to_le32(20);
 
@@ -324,7 +327,7 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
         if (retval < 0)
                 goto fail;
 
-        u.init->msg_type = RNDIS_MSG_INIT;
+        u.init->msg_type = cpu_to_le32(RNDIS_MSG_INIT);
         u.init->msg_len = cpu_to_le32(sizeof *u.init);
         u.init->major_version = cpu_to_le32(1);
         u.init->minor_version = cpu_to_le32(0);
@@ -395,22 +398,23 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
         /* Check physical medium */
         phym = NULL;
         reply_len = sizeof *phym;
-        retval = rndis_query(dev, intf, u.buf, OID_GEN_PHYSICAL_MEDIUM,
-                        0, (void **) &phym, &reply_len);
+        retval = rndis_query(dev, intf, u.buf,
+                             RNDIS_OID_GEN_PHYSICAL_MEDIUM,
+                             0, (void **) &phym, &reply_len);
         if (retval != 0 || !phym) {
                 /* OID is optional so don't fail here. */
-                phym_unspec = RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED;
+                phym_unspec = cpu_to_le32(RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED);
                 phym = &phym_unspec;
         }
         if ((flags & FLAG_RNDIS_PHYM_WIRELESS) &&
-                        *phym != RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) {
+            le32_to_cpup(phym) != RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) {
                 netif_dbg(dev, probe, dev->net,
                           "driver requires wireless physical medium, but device is not\n");
                 retval = -ENODEV;
                 goto halt_fail_and_release;
         }
         if ((flags & FLAG_RNDIS_PHYM_NOT_WIRELESS) &&
-                        *phym == RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) {
+            le32_to_cpup(phym) == RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) {
                 netif_dbg(dev, probe, dev->net,
                           "driver requires non-wireless physical medium, but device is wireless.\n");
                 retval = -ENODEV;
@@ -419,8 +423,9 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
 
         /* Get designated host ethernet address */
         reply_len = ETH_ALEN;
-        retval = rndis_query(dev, intf, u.buf, OID_802_3_PERMANENT_ADDRESS,
-                        48, (void **) &bp, &reply_len);
+        retval = rndis_query(dev, intf, u.buf,
+                             RNDIS_OID_802_3_PERMANENT_ADDRESS,
+                             48, (void **) &bp, &reply_len);
         if (unlikely(retval< 0)) {
                 dev_err(&intf->dev, "rndis get ethaddr, %d\n", retval);
                 goto halt_fail_and_release;
@@ -430,12 +435,12 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
 
         /* set a nonzero filter to enable data transfers */
         memset(u.set, 0, sizeof *u.set);
-        u.set->msg_type = RNDIS_MSG_SET;
+        u.set->msg_type = cpu_to_le32(RNDIS_MSG_SET);
         u.set->msg_len = cpu_to_le32(4 + sizeof *u.set);
-        u.set->oid = OID_GEN_CURRENT_PACKET_FILTER;
+        u.set->oid = cpu_to_le32(RNDIS_OID_GEN_CURRENT_PACKET_FILTER);
         u.set->len = cpu_to_le32(4);
         u.set->offset = cpu_to_le32((sizeof *u.set) - 8);
-        *(__le32 *)(u.buf + sizeof *u.set) = RNDIS_DEFAULT_FILTER;
+        *(__le32 *)(u.buf + sizeof *u.set) = cpu_to_le32(RNDIS_DEFAULT_FILTER);
 
         retval = rndis_command(dev, u.header, CONTROL_BUFFER_SIZE);
         if (unlikely(retval < 0)) {
@@ -450,7 +455,7 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
 
 halt_fail_and_release:
         memset(u.halt, 0, sizeof *u.halt);
-        u.halt->msg_type = RNDIS_MSG_HALT;
+        u.halt->msg_type = cpu_to_le32(RNDIS_MSG_HALT);
         u.halt->msg_len = cpu_to_le32(sizeof *u.halt);
         (void) rndis_command(dev, (void *)u.halt, CONTROL_BUFFER_SIZE);
 fail_and_release:
@@ -475,7 +480,7 @@ void rndis_unbind(struct usbnet *dev, struct usb_interface *intf)
         /* try to clear any rndis state/activity (no i/o from stack!) */
         halt = kzalloc(CONTROL_BUFFER_SIZE, GFP_KERNEL);
         if (halt) {
-                halt->msg_type = RNDIS_MSG_HALT;
+                halt->msg_type = cpu_to_le32(RNDIS_MSG_HALT);
                 halt->msg_len = cpu_to_le32(sizeof *halt);
                 (void) rndis_command(dev, (void *)halt, CONTROL_BUFFER_SIZE);
                 kfree(halt);
@@ -494,16 +499,16 @@ int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
         while (likely(skb->len)) {
                 struct rndis_data_hdr   *hdr = (void *)skb->data;
                 struct sk_buff          *skb2;
-                u32                     msg_len, data_offset, data_len;
+                u32                     msg_type, msg_len, data_offset, data_len;
 
+                msg_type = le32_to_cpu(hdr->msg_type);
                 msg_len = le32_to_cpu(hdr->msg_len);
                 data_offset = le32_to_cpu(hdr->data_offset);
                 data_len = le32_to_cpu(hdr->data_len);
 
                 /* don't choke if we see oob, per-packet data, etc */
-                if (unlikely(hdr->msg_type != RNDIS_MSG_PACKET ||
-                             skb->len < msg_len ||
-                             (data_offset + data_len + 8) > msg_len)) {
+                if (unlikely(msg_type != RNDIS_MSG_PACKET || skb->len < msg_len
+                                || (data_offset + data_len + 8) > msg_len)) {
                         dev->net->stats.rx_frame_errors++;
                         netdev_dbg(dev->net, "bad rndis message %d/%d/%d/%d, len %d\n",
                                    le32_to_cpu(hdr->msg_type),
@@ -569,7 +574,7 @@ rndis_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
 fill:
         hdr = (void *) __skb_push(skb, sizeof *hdr);
         memset(hdr, 0, sizeof *hdr);
-        hdr->msg_type = RNDIS_MSG_PACKET;
+        hdr->msg_type = cpu_to_le32(RNDIS_MSG_PACKET);
         hdr->msg_len = cpu_to_le32(skb->len);
         hdr->data_offset = cpu_to_le32(sizeof(*hdr) - 8);
         hdr->data_len = cpu_to_le32(len);
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 187d01ccb973..fb1a087b101d 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -98,7 +98,7 @@ static int __must_check smsc75xx_read_reg(struct usbnet *dev, u32 index,
 
         if (unlikely(ret < 0))
                 netdev_warn(dev->net,
-                        "Failed to read register index 0x%08x", index);
+                        "Failed to read reg index 0x%08x: %d", index, ret);
 
         le32_to_cpus(buf);
         *data = *buf;
@@ -128,7 +128,7 @@ static int __must_check smsc75xx_write_reg(struct usbnet *dev, u32 index,
 
         if (unlikely(ret < 0))
                 netdev_warn(dev->net,
-                        "Failed to write register index 0x%08x", index);
+                        "Failed to write reg index 0x%08x: %d", index, ret);
 
         kfree(buf);
 
@@ -171,7 +171,7 @@ static int smsc75xx_mdio_read(struct net_device *netdev, int phy_id, int idx)
         idx &= dev->mii.reg_num_mask;
         addr = ((phy_id << MII_ACCESS_PHY_ADDR_SHIFT) & MII_ACCESS_PHY_ADDR)
                 | ((idx << MII_ACCESS_REG_ADDR_SHIFT) & MII_ACCESS_REG_ADDR)
-                | MII_ACCESS_READ;
+                | MII_ACCESS_READ | MII_ACCESS_BUSY;
         ret = smsc75xx_write_reg(dev, MII_ACCESS, addr);
         check_warn_goto_done(ret, "Error writing MII_ACCESS");
 
@@ -210,7 +210,7 @@ static void smsc75xx_mdio_write(struct net_device *netdev, int phy_id, int idx,
         idx &= dev->mii.reg_num_mask;
         addr = ((phy_id << MII_ACCESS_PHY_ADDR_SHIFT) & MII_ACCESS_PHY_ADDR)
                 | ((idx << MII_ACCESS_REG_ADDR_SHIFT) & MII_ACCESS_REG_ADDR)
-                | MII_ACCESS_WRITE;
+                | MII_ACCESS_WRITE | MII_ACCESS_BUSY;
         ret = smsc75xx_write_reg(dev, MII_ACCESS, addr);
         check_warn_goto_done(ret, "Error writing MII_ACCESS");
 
@@ -508,9 +508,9 @@ static int smsc75xx_link_reset(struct usbnet *dev)
         u16 lcladv, rmtadv;
         int ret;
 
-        /* clear interrupt status */
-        ret = smsc75xx_mdio_read(dev->net, mii->phy_id, PHY_INT_SRC);
-        check_warn_return(ret, "Error reading PHY_INT_SRC");
+        /* write to clear phy interrupt status */
+        smsc75xx_mdio_write(dev->net, mii->phy_id, PHY_INT_SRC,
+                PHY_INT_SRC_CLEAR_ALL);
 
         ret = smsc75xx_write_reg(dev, INT_STS, INT_STS_CLEAR_ALL);
         check_warn_return(ret, "Error writing INT_STS");
@@ -643,7 +643,7 @@ static int smsc75xx_set_mac_address(struct usbnet *dev)
 
 static int smsc75xx_phy_initialize(struct usbnet *dev)
 {
-        int bmcr, timeout = 0;
+        int bmcr, ret, timeout = 0;
 
         /* Initialize MII structure */
         dev->mii.dev = dev->net;
@@ -651,6 +651,7 @@ static int smsc75xx_phy_initialize(struct usbnet *dev)
         dev->mii.mdio_write = smsc75xx_mdio_write;
         dev->mii.phy_id_mask = 0x1f;
         dev->mii.reg_num_mask = 0x1f;
+        dev->mii.supports_gmii = 1;
         dev->mii.phy_id = SMSC75XX_INTERNAL_PHY_ID;
 
         /* reset phy and wait for reset to complete */
@@ -661,7 +662,7 @@ static int smsc75xx_phy_initialize(struct usbnet *dev)
                 bmcr = smsc75xx_mdio_read(dev->net, dev->mii.phy_id, MII_BMCR);
                 check_warn_return(bmcr, "Error reading MII_BMCR");
                 timeout++;
-        } while ((bmcr & MII_BMCR) && (timeout < 100));
+        } while ((bmcr & BMCR_RESET) && (timeout < 100));
 
         if (timeout >= 100) {
                 netdev_warn(dev->net, "timeout on PHY Reset");
@@ -671,10 +672,13 @@ static int smsc75xx_phy_initialize(struct usbnet *dev)
         smsc75xx_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
                 ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP |
                 ADVERTISE_PAUSE_ASYM);
+        smsc75xx_mdio_write(dev->net, dev->mii.phy_id, MII_CTRL1000,
+                ADVERTISE_1000FULL);
 
-        /* read to clear */
-        smsc75xx_mdio_read(dev->net, dev->mii.phy_id, PHY_INT_SRC);
-        check_warn_return(bmcr, "Error reading PHY_INT_SRC");
+        /* read and write to clear phy interrupt status */
+        ret = smsc75xx_mdio_read(dev->net, dev->mii.phy_id, PHY_INT_SRC);
+        check_warn_return(ret, "Error reading PHY_INT_SRC");
+        smsc75xx_mdio_write(dev->net, dev->mii.phy_id, PHY_INT_SRC, 0xffff);
 
         smsc75xx_mdio_write(dev->net, dev->mii.phy_id, PHY_INT_MASK,
                 PHY_INT_MASK_DEFAULT);
@@ -899,15 +903,20 @@ static int smsc75xx_reset(struct usbnet *dev)
 
         netif_dbg(dev, ifup, dev->net, "ID_REV = 0x%08x", buf);
 
-        /* Configure GPIO pins as LED outputs */
-        ret = smsc75xx_read_reg(dev, LED_GPIO_CFG, &buf);
-        check_warn_return(ret, "Failed to read LED_GPIO_CFG: %d", ret);
+        ret = smsc75xx_read_reg(dev, E2P_CMD, &buf);
+        check_warn_return(ret, "Failed to read E2P_CMD: %d", ret);
+
+        /* only set default GPIO/LED settings if no EEPROM is detected */
+        if (!(buf & E2P_CMD_LOADED)) {
+                ret = smsc75xx_read_reg(dev, LED_GPIO_CFG, &buf);
+                check_warn_return(ret, "Failed to read LED_GPIO_CFG: %d", ret);
 
-        buf &= ~(LED_GPIO_CFG_LED2_FUN_SEL | LED_GPIO_CFG_LED10_FUN_SEL);
-        buf |= LED_GPIO_CFG_LEDGPIO_EN | LED_GPIO_CFG_LED2_FUN_SEL;
+                buf &= ~(LED_GPIO_CFG_LED2_FUN_SEL | LED_GPIO_CFG_LED10_FUN_SEL);
+                buf |= LED_GPIO_CFG_LEDGPIO_EN | LED_GPIO_CFG_LED2_FUN_SEL;
 
-        ret = smsc75xx_write_reg(dev, LED_GPIO_CFG, buf);
-        check_warn_return(ret, "Failed to write LED_GPIO_CFG: %d", ret);
+                ret = smsc75xx_write_reg(dev, LED_GPIO_CFG, buf);
+                check_warn_return(ret, "Failed to write LED_GPIO_CFG: %d", ret);
+        }
 
         ret = smsc75xx_write_reg(dev, FLOW, 0);
         check_warn_return(ret, "Failed to write FLOW: %d", ret);
@@ -946,6 +955,14 @@ static int smsc75xx_reset(struct usbnet *dev)
         ret = smsc75xx_write_reg(dev, INT_EP_CTL, buf);
         check_warn_return(ret, "Failed to write INT_EP_CTL: %d", ret);
 
+        /* allow mac to detect speed and duplex from phy */
+        ret = smsc75xx_read_reg(dev, MAC_CR, &buf);
+        check_warn_return(ret, "Failed to read MAC_CR: %d", ret);
+
+        buf |= (MAC_CR_ADD | MAC_CR_ASD);
+        ret = smsc75xx_write_reg(dev, MAC_CR, buf);
+        check_warn_return(ret, "Failed to write MAC_CR: %d", ret);
+
         ret = smsc75xx_read_reg(dev, MAC_TX, &buf);
         check_warn_return(ret, "Failed to read MAC_TX: %d", ret);
 
@@ -1051,6 +1068,7 @@ static int smsc75xx_bind(struct usbnet *dev, struct usb_interface *intf)
         dev->net->ethtool_ops = &smsc75xx_ethtool_ops;
         dev->net->flags |= IFF_MULTICAST;
         dev->net->hard_header_len += SMSC75XX_TX_OVERHEAD;
+        dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
         return 0;
 }
 
@@ -1211,7 +1229,7 @@ static const struct driver_info smsc75xx_info = {
         .rx_fixup       = smsc75xx_rx_fixup,
         .tx_fixup       = smsc75xx_tx_fixup,
         .status         = smsc75xx_status,
-        .flags          = FLAG_ETHER | FLAG_SEND_ZLP,
+        .flags          = FLAG_ETHER | FLAG_SEND_ZLP | FLAG_LINK_INTR,
 };
 
 static const struct usb_device_id products[] = {
diff --git a/drivers/net/usb/smsc75xx.h b/drivers/net/usb/smsc75xx.h
index 16e98c778344..67eba39e6ee2 100644
--- a/drivers/net/usb/smsc75xx.h
+++ b/drivers/net/usb/smsc75xx.h
@@ -388,6 +388,7 @@
 #define PHY_INT_SRC_ANEG_COMP           ((u16)0x0040)
 #define PHY_INT_SRC_REMOTE_FAULT        ((u16)0x0020)
 #define PHY_INT_SRC_LINK_DOWN           ((u16)0x0010)
+#define PHY_INT_SRC_CLEAR_ALL           ((u16)0xffff)
 
 #define PHY_INT_MASK                    (30)
 #define PHY_INT_MASK_ENERGY_ON          ((u16)0x0080)
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 5f19f84d3494..94ae66999f59 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -1017,6 +1017,7 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf)
         dev->net->ethtool_ops = &smsc95xx_ethtool_ops;
         dev->net->flags |= IFF_MULTICAST;
         dev->net->hard_header_len += SMSC95XX_TX_OVERHEAD_CSUM;
+        dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
         return 0;
 }
 
@@ -1191,7 +1192,7 @@ static const struct driver_info smsc95xx_info = {
         .rx_fixup       = smsc95xx_rx_fixup,
         .tx_fixup       = smsc95xx_tx_fixup,
         .status         = smsc95xx_status,
-        .flags          = FLAG_ETHER | FLAG_SEND_ZLP,
+        .flags          = FLAG_ETHER | FLAG_SEND_ZLP | FLAG_LINK_INTR,
 };
 
 static const struct usb_device_id products[] = {
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index b7b3f5b0d406..9f58330f1312 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -210,6 +210,7 @@ static int init_status (struct usbnet *dev, struct usb_interface *intf)
                 } else {
                         usb_fill_int_urb(dev->interrupt, dev->udev, pipe,
                                 buf, maxp, intr_complete, dev, period);
+                        dev->interrupt->transfer_flags |= URB_FREE_BUFFER;
                         dev_dbg(&intf->dev,
                                 "status ep%din, %d bytes period %d\n",
                                 usb_pipeendpoint(pipe), maxp, period);
@@ -281,17 +282,32 @@ int usbnet_change_mtu (struct net_device *net, int new_mtu)
 }
 EXPORT_SYMBOL_GPL(usbnet_change_mtu);
 
+/* The caller must hold list->lock */
+static void __usbnet_queue_skb(struct sk_buff_head *list,
+                        struct sk_buff *newsk, enum skb_state state)
+{
+        struct skb_data *entry = (struct skb_data *) newsk->cb;
+
+        __skb_queue_tail(list, newsk);
+        entry->state = state;
+}
+
 /*-------------------------------------------------------------------------*/
 
 /* some LK 2.4 HCDs oopsed if we freed or resubmitted urbs from
  * completion callbacks.  2.5 should have fixed those bugs...
  */
 
-static void defer_bh(struct usbnet *dev, struct sk_buff *skb, struct sk_buff_head *list)
+static enum skb_state defer_bh(struct usbnet *dev, struct sk_buff *skb,
+                struct sk_buff_head *list, enum skb_state state)
 {
         unsigned long           flags;
+        enum skb_state          old_state;
+        struct skb_data *entry = (struct skb_data *) skb->cb;
 
         spin_lock_irqsave(&list->lock, flags);
+        old_state = entry->state;
+        entry->state = state;
         __skb_unlink(skb, list);
         spin_unlock(&list->lock);
         spin_lock(&dev->done.lock);
@@ -299,6 +315,7 @@ static void defer_bh(struct usbnet *dev, struct sk_buff *skb, struct sk_buff_hea
         if (dev->done.qlen == 1)
                 tasklet_schedule(&dev->bh);
         spin_unlock_irqrestore(&dev->done.lock, flags);
+        return old_state;
 }
 
 /* some work can't be done in tasklets, so we use keventd
@@ -339,7 +356,6 @@ static int rx_submit (struct usbnet *dev, struct urb *urb, gfp_t flags)
         entry = (struct skb_data *) skb->cb;
         entry->urb = urb;
         entry->dev = dev;
-        entry->state = rx_start;
         entry->length = 0;
 
         usb_fill_bulk_urb (urb, dev->udev, dev->in,
@@ -371,7 +387,7 @@ static int rx_submit (struct usbnet *dev, struct urb *urb, gfp_t flags)
                         tasklet_schedule (&dev->bh);
                         break;
                 case 0:
-                        __skb_queue_tail (&dev->rxq, skb);
+                        __usbnet_queue_skb(&dev->rxq, skb, rx_start);
                 }
         } else {
                 netif_dbg(dev, ifdown, dev->net, "rx: stopped\n");
@@ -422,16 +438,17 @@ static void rx_complete (struct urb *urb)
         struct skb_data         *entry = (struct skb_data *) skb->cb;
         struct usbnet           *dev = entry->dev;
         int                     urb_status = urb->status;
+        enum skb_state          state;
 
         skb_put (skb, urb->actual_length);
-        entry->state = rx_done;
+        state = rx_done;
         entry->urb = NULL;
 
         switch (urb_status) {
         /* success */
         case 0:
                 if (skb->len < dev->net->hard_header_len) {
-                        entry->state = rx_cleanup;
+                        state = rx_cleanup;
                         dev->net->stats.rx_errors++;
                         dev->net->stats.rx_length_errors++;
                         netif_dbg(dev, rx_err, dev->net,
@@ -470,7 +487,7 @@ static void rx_complete (struct urb *urb)
                                   "rx throttle %d\n", urb_status);
                 }
 block:
-                entry->state = rx_cleanup;
+                state = rx_cleanup;
                 entry->urb = urb;
                 urb = NULL;
                 break;
@@ -481,17 +498,18 @@ block:
                 // FALLTHROUGH
 
         default:
-                entry->state = rx_cleanup;
+                state = rx_cleanup;
                 dev->net->stats.rx_errors++;
                 netif_dbg(dev, rx_err, dev->net, "rx status %d\n", urb_status);
                 break;
         }
 
-        defer_bh(dev, skb, &dev->rxq);
+        state = defer_bh(dev, skb, &dev->rxq, state);
 
         if (urb) {
                 if (netif_running (dev->net) &&
-                    !test_bit (EVENT_RX_HALT, &dev->flags)) {
+                    !test_bit (EVENT_RX_HALT, &dev->flags) &&
+                    state != unlink_start) {
                         rx_submit (dev, urb, GFP_ATOMIC);
                         usb_mark_last_busy(dev->udev);
                         return;
@@ -578,16 +596,23 @@ EXPORT_SYMBOL_GPL(usbnet_purge_paused_rxq);
 static int unlink_urbs (struct usbnet *dev, struct sk_buff_head *q)
 {
         unsigned long           flags;
-        struct sk_buff          *skb, *skbnext;
+        struct sk_buff          *skb;
         int                     count = 0;
 
         spin_lock_irqsave (&q->lock, flags);
-        skb_queue_walk_safe(q, skb, skbnext) {
+        while (!skb_queue_empty(q)) {
                 struct skb_data         *entry;
                 struct urb              *urb;
                 int                     retval;
 
-                entry = (struct skb_data *) skb->cb;
+                skb_queue_walk(q, skb) {
+                        entry = (struct skb_data *) skb->cb;
+                        if (entry->state != unlink_start)
+                                goto found;
+                }
+                break;
+found:
+                entry->state = unlink_start;
                 urb = entry->urb;
 
                 /*
@@ -884,6 +909,7 @@ static const struct ethtool_ops usbnet_ethtool_ops = {
         .get_drvinfo            = usbnet_get_drvinfo,
         .get_msglevel           = usbnet_get_msglevel,
         .set_msglevel           = usbnet_set_msglevel,
+        .get_ts_info            = ethtool_op_get_ts_info,
 };
 
 /*-------------------------------------------------------------------------*/
@@ -1038,8 +1064,7 @@ static void tx_complete (struct urb *urb)
         }
 
         usb_autopm_put_interface_async(dev->intf);
-        entry->state = tx_done;
-        defer_bh(dev, skb, &dev->txq);
+        (void) defer_bh(dev, skb, &dev->txq, tx_done);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -1095,7 +1120,6 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
         entry = (struct skb_data *) skb->cb;
         entry->urb = urb;
         entry->dev = dev;
-        entry->state = tx_start;
         entry->length = length;
 
         usb_fill_bulk_urb (urb, dev->udev, dev->out,
@@ -1154,7 +1178,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
                 break;
         case 0:
                 net->trans_start = jiffies;
-                __skb_queue_tail (&dev->txq, skb);
+                __usbnet_queue_skb(&dev->txq, skb, tx_start);
                 if (dev->txq.qlen >= TX_QLEN (dev))
                         netif_stop_queue (net);
         }
@@ -1443,7 +1467,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
 
         status = register_netdev (net);
         if (status)
-                goto out3;
+                goto out4;
         netif_info(dev, probe, dev->net,
                    "register '%s' at usb-%s-%s, %s, %pM\n",
                    udev->dev.driver->name,
@@ -1461,6 +1485,8 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
 
         return 0;
 
+out4:
+        usb_free_urb(dev->interrupt);
 out3:
         if (info->unbind)
                 info->unbind (dev, udev);
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 4de2760c5937..9ce6995e8d08 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -66,12 +66,21 @@ struct virtnet_info {
         /* Host will merge rx buffers for big packets (shake it! shake it!) */
         bool mergeable_rx_bufs;
 
+        /* enable config space updates */
+        bool config_enable;
+
         /* Active statistics */
         struct virtnet_stats __percpu *stats;
 
         /* Work struct for refilling if we run low on memory. */
         struct delayed_work refill;
 
+        /* Work struct for config space updates */
+        struct work_struct config_work;
+
+        /* Lock for config space updates */
+        struct mutex config_lock;
+
         /* Chain pages by the private ptr. */
         struct page *pages;
 
@@ -492,7 +501,9 @@ static void virtnet_napi_enable(struct virtnet_info *vi)
          * We synchronize against interrupts via NAPI_STATE_SCHED */
         if (napi_schedule_prep(&vi->napi)) {
                 virtqueue_disable_cb(vi->rvq);
+                local_bh_disable();
                 __napi_schedule(&vi->napi);
+                local_bh_enable();
         }
 }
 
@@ -626,16 +637,15 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
         /* This can happen with OOM and indirect buffers. */
         if (unlikely(capacity < 0)) {
                 if (likely(capacity == -ENOMEM)) {
-                        if (net_ratelimit()) {
+                        if (net_ratelimit())
                                 dev_warn(&dev->dev,
                                          "TX queue failure: out of memory\n");
-                        } else {
+                } else {
                         dev->stats.tx_fifo_errors++;
                         if (net_ratelimit())
                                 dev_warn(&dev->dev,
                                          "Unexpected TX queue failure: %d\n",
                                          capacity);
-                        }
                 }
                 dev->stats.tx_dropped++;
                 kfree_skb(skb);
@@ -781,6 +791,16 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,
         return status == VIRTIO_NET_OK;
 }
 
+static void virtnet_ack_link_announce(struct virtnet_info *vi)
+{
+        rtnl_lock();
+        if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_ANNOUNCE,
+                                  VIRTIO_NET_CTRL_ANNOUNCE_ACK, NULL,
+                                  0, 0))
+                dev_warn(&vi->dev->dev, "Failed to ack link announce.\n");
+        rtnl_unlock();
+}
+
 static int virtnet_close(struct net_device *dev)
 {
         struct virtnet_info *vi = netdev_priv(dev);
@@ -952,20 +972,31 @@ static const struct net_device_ops virtnet_netdev = {
 #endif
 };
 
-static void virtnet_update_status(struct virtnet_info *vi)
+static void virtnet_config_changed_work(struct work_struct *work)
 {
+        struct virtnet_info *vi =
+                container_of(work, struct virtnet_info, config_work);
         u16 v;
 
+        mutex_lock(&vi->config_lock);
+        if (!vi->config_enable)
+                goto done;
+
         if (virtio_config_val(vi->vdev, VIRTIO_NET_F_STATUS,
                               offsetof(struct virtio_net_config, status),
                               &v) < 0)
-                return;
+                goto done;
+
+        if (v & VIRTIO_NET_S_ANNOUNCE) {
+                netif_notify_peers(vi->dev);
+                virtnet_ack_link_announce(vi);
+        }
 
         /* Ignore unknown (future) status bits */
         v &= VIRTIO_NET_S_LINK_UP;
 
         if (vi->status == v)
-                return;
+                goto done;
 
         vi->status = v;
 
@@ -976,13 +1007,15 @@ static void virtnet_update_status(struct virtnet_info *vi)
                 netif_carrier_off(vi->dev);
                 netif_stop_queue(vi->dev);
         }
+done:
+        mutex_unlock(&vi->config_lock);
 }
 
 static void virtnet_config_changed(struct virtio_device *vdev)
 {
         struct virtnet_info *vi = vdev->priv;
 
-        virtnet_update_status(vi);
+        queue_work(system_nrt_wq, &vi->config_work);
 }
 
 static int init_vqs(struct virtnet_info *vi)
@@ -1076,6 +1109,9 @@ static int virtnet_probe(struct virtio_device *vdev)
                 goto free;
 
         INIT_DELAYED_WORK(&vi->refill, refill_work);
+        mutex_init(&vi->config_lock);
+        vi->config_enable = true;
+        INIT_WORK(&vi->config_work, virtnet_config_changed_work);
         sg_init_table(vi->rx_sg, ARRAY_SIZE(vi->rx_sg));
         sg_init_table(vi->tx_sg, ARRAY_SIZE(vi->tx_sg));
 
@@ -1111,7 +1147,7 @@ static int virtnet_probe(struct virtio_device *vdev)
            otherwise get link status from config. */
         if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS)) {
                 netif_carrier_off(dev);
-                virtnet_update_status(vi);
+                queue_work(system_nrt_wq, &vi->config_work);
         } else {
                 vi->status = VIRTIO_NET_S_LINK_UP;
                 netif_carrier_on(dev);
@@ -1170,10 +1206,17 @@ static void __devexit virtnet_remove(struct virtio_device *vdev)
 {
         struct virtnet_info *vi = vdev->priv;
 
+        /* Prevent config work handler from accessing the device. */
+        mutex_lock(&vi->config_lock);
+        vi->config_enable = false;
+        mutex_unlock(&vi->config_lock);
+
         unregister_netdev(vi->dev);
 
         remove_vq_common(vi);
 
+        flush_work(&vi->config_work);
+
         free_percpu(vi->stats);
         free_netdev(vi->dev);
 }
@@ -1183,6 +1226,11 @@ static int virtnet_freeze(struct virtio_device *vdev)
 {
         struct virtnet_info *vi = vdev->priv;
 
+        /* Prevent config work handler from accessing the device */
+        mutex_lock(&vi->config_lock);
+        vi->config_enable = false;
+        mutex_unlock(&vi->config_lock);
+
         virtqueue_disable_cb(vi->rvq);
         virtqueue_disable_cb(vi->svq);
         if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ))
@@ -1196,6 +1244,8 @@ static int virtnet_freeze(struct virtio_device *vdev)
 
         remove_vq_common(vi);
 
+        flush_work(&vi->config_work);
+
         return 0;
 }
 
@@ -1216,6 +1266,10 @@ static int virtnet_restore(struct virtio_device *vdev)
         if (!try_fill_recv(vi, GFP_KERNEL))
                 queue_delayed_work(system_nrt_wq, &vi->refill, 0);
 
+        mutex_lock(&vi->config_lock);
+        vi->config_enable = true;
+        mutex_unlock(&vi->config_lock);
+
         return 0;
 }
 #endif
@@ -1233,6 +1287,7 @@ static unsigned int features[] = {
         VIRTIO_NET_F_GUEST_ECN, VIRTIO_NET_F_GUEST_UFO,
         VIRTIO_NET_F_MRG_RXBUF, VIRTIO_NET_F_STATUS, VIRTIO_NET_F_CTRL_VQ,
         VIRTIO_NET_F_CTRL_RX, VIRTIO_NET_F_CTRL_VLAN,
+        VIRTIO_NET_F_GUEST_ANNOUNCE,
 };
 
 static struct virtio_driver virtio_net_driver = {
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index c676de7de024..9eb6479306d6 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -2055,15 +2055,4 @@ static struct pci_driver dscc4_driver = {
         .remove         = __devexit_p(dscc4_remove_one),
 };
 
-static int __init dscc4_init_module(void)
-{
-        return pci_register_driver(&dscc4_driver);
-}
-
-static void __exit dscc4_cleanup_module(void)
-{
-        pci_unregister_driver(&dscc4_driver);
-}
-
-module_init(dscc4_init_module);
-module_exit(dscc4_cleanup_module);
+module_pci_driver(dscc4_driver);
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index ebb9f24eefb5..1a623183cbe5 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -2483,6 +2483,7 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 pr_err("Control memory remap failed\n");
                 pci_release_regions(pdev);
                 pci_disable_device(pdev);
+                iounmap(card->mem);
                 kfree(card);
                 return -ENODEV;
         }
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 76a8a4a522e9..f5d533a706ea 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -1120,7 +1120,7 @@ static void lmc_running_reset (struct net_device *dev) /*fold00*/
 {
     lmc_softc_t *sc = dev_to_sc(dev);
 
-    lmc_trace(dev, "lmc_runnig_reset in");
+    lmc_trace(dev, "lmc_running_reset in");
 
     /* stop interrupts */
     /* Clear the interrupt mask */
@@ -1736,18 +1736,7 @@ static struct pci_driver lmc_driver = {
         .remove         = __devexit_p(lmc_remove_one),
 };
 
-static int __init init_lmc(void)
-{
-    return pci_register_driver(&lmc_driver);
-}
-
-static void __exit exit_lmc(void)
-{
-    pci_unregister_driver(&lmc_driver);
-}
-
-module_init(init_lmc);
-module_exit(exit_lmc);
+module_pci_driver(lmc_driver);
 
 unsigned lmc_mii_readreg (lmc_softc_t * const sc, unsigned devaddr, unsigned regno) /*fold00*/
 {
diff --git a/drivers/net/wimax/i2400m/Kconfig b/drivers/net/wimax/i2400m/Kconfig
index 3f703384295e..672de18a776c 100644
--- a/drivers/net/wimax/i2400m/Kconfig
+++ b/drivers/net/wimax/i2400m/Kconfig
@@ -32,8 +32,9 @@ config WIMAX_I2400M_SDIO
           If unsure, it is safe to select M (module).
 
 config WIMAX_IWMC3200_SDIO
-        bool "Intel Wireless Multicom WiMAX Connection 3200 over SDIO"
+        bool "Intel Wireless Multicom WiMAX Connection 3200 over SDIO (EXPERIMENTAL)"
         depends on WIMAX_I2400M_SDIO
+        depends on EXPERIMENTAL
         select IWMC3200TOP
         help
           Select if you have a device based on the Intel Multicom WiMAX
diff --git a/drivers/net/wimax/i2400m/usb-rx.c b/drivers/net/wimax/i2400m/usb-rx.c
index e3257681e360..b78ee676e102 100644
--- a/drivers/net/wimax/i2400m/usb-rx.c
+++ b/drivers/net/wimax/i2400m/usb-rx.c
@@ -277,7 +277,7 @@ retry:
                 d_printf(1, dev, "RX: size changed to %d, received %d, "
                          "copied %d, capacity %ld\n",
                          rx_size, read_size, rx_skb->len,
-                         (long) (skb_end_pointer(new_skb) - new_skb->head));
+                         (long) skb_end_offset(new_skb));
                 goto retry;
         }
                 /* In most cases, it happens due to the hardware scheduling a
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
index 29b1e033a10b..713d033891e6 100644
--- a/drivers/net/wimax/i2400m/usb.c
+++ b/drivers/net/wimax/i2400m/usb.c
@@ -695,7 +695,7 @@ int i2400mu_resume(struct usb_interface *iface)
         d_fnstart(3, dev, "(iface %p)\n", iface);
         rmb();          /* see i2400m->updown's documentation  */
         if (i2400m->updown == 0) {
-                d_printf(1, dev, "fw was down, no resume neeed\n");
+                d_printf(1, dev, "fw was down, no resume needed\n");
                 goto out;
         }
         d_printf(1, dev, "fw was up, resuming\n");
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index abd3b71cd4ab..5f58fa53238c 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -282,8 +282,7 @@ source "drivers/net/wireless/orinoco/Kconfig"
 source "drivers/net/wireless/p54/Kconfig"
 source "drivers/net/wireless/rt2x00/Kconfig"
 source "drivers/net/wireless/rtlwifi/Kconfig"
-source "drivers/net/wireless/wl1251/Kconfig"
-source "drivers/net/wireless/wl12xx/Kconfig"
+source "drivers/net/wireless/ti/Kconfig"
 source "drivers/net/wireless/zd1211rw/Kconfig"
 source "drivers/net/wireless/mwifiex/Kconfig"
 
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 98db76196b59..0ce218b931d4 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -51,9 +51,7 @@ obj-$(CONFIG_ATH_COMMON)	+= ath/
 
 obj-$(CONFIG_MAC80211_HWSIM)    += mac80211_hwsim.o
 
-obj-$(CONFIG_WL1251)    += wl1251/
-obj-$(CONFIG_WL12XX)    += wl12xx/
-obj-$(CONFIG_WL12XX_PLATFORM_DATA)      += wl12xx/
+obj-$(CONFIG_WL_TI)     += ti/
 
 obj-$(CONFIG_IWM)       += iwmc3200wifi/
 
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index f5ce5623da99..0ac09a2bd144 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -1991,19 +1991,4 @@ static struct pci_driver adm8211_driver = {
 #endif /* CONFIG_PM */
 };
 
-
-
-static int __init adm8211_init(void)
-{
-        return pci_register_driver(&adm8211_driver);
-}
-
-
-static void __exit adm8211_exit(void)
-{
-        pci_unregister_driver(&adm8211_driver);
-}
-
-
-module_init(adm8211_init);
-module_exit(adm8211_exit);
+module_pci_driver(adm8211_driver);
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 4045e5ab0555..3df0146b797e 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -1122,12 +1122,12 @@ exit:
 static void at76_dump_mib_local(struct at76_priv *priv)
 {
         int ret;
-        struct mib_local *m = kmalloc(sizeof(struct mib_phy), GFP_KERNEL);
+        struct mib_local *m = kmalloc(sizeof(*m), GFP_KERNEL);
 
         if (!m)
                 return;
 
-        ret = at76_get_mib(priv->udev, MIB_LOCAL, m, sizeof(struct mib_local));
+        ret = at76_get_mib(priv->udev, MIB_LOCAL, m, sizeof(*m));
         if (ret < 0) {
                 wiphy_err(priv->hw->wiphy,
                           "at76_get_mib (LOCAL) failed: %d\n", ret);
@@ -1751,7 +1751,7 @@ static void at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
          * following workaround is necessary. If the TX frame is an
          * authentication frame extract the bssid and send the CMD_JOIN. */
         if (mgmt->frame_control & cpu_to_le16(IEEE80211_STYPE_AUTH)) {
-                if (compare_ether_addr(priv->bssid, mgmt->bssid)) {
+                if (!ether_addr_equal(priv->bssid, mgmt->bssid)) {
                         memcpy(priv->bssid, mgmt->bssid, ETH_ALEN);
                         ieee80211_queue_work(hw, &priv->work_join_bssid);
                         dev_kfree_skb_any(skb);
@@ -2512,10 +2512,8 @@ static void __exit at76_mod_exit(void)
 
         printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION " unloading\n");
         usb_deregister(&at76_driver);
-        for (i = 0; i < ARRAY_SIZE(firmwares); i++) {
-                if (firmwares[i].fw)
-                        release_firmware(firmwares[i].fw);
-        }
+        for (i = 0; i < ARRAY_SIZE(firmwares); i++)
+                release_firmware(firmwares[i].fw);
         led_trigger_unregister_simple(ledtrig_tx);
 }
 
diff --git a/drivers/net/wireless/ath/ath5k/ahb.c b/drivers/net/wireless/ath/ath5k/ahb.c
index 8faa129da5a0..aec33cc207fd 100644
--- a/drivers/net/wireless/ath/ath5k/ahb.c
+++ b/drivers/net/wireless/ath/ath5k/ahb.c
@@ -19,6 +19,7 @@
 #include <linux/nl80211.h>
 #include <linux/platform_device.h>
 #include <linux/etherdevice.h>
+#include <linux/export.h>
 #include <ar231x_platform.h>
 #include "ath5k.h"
 #include "debug.h"
@@ -119,7 +120,7 @@ static int ath_ahb_probe(struct platform_device *pdev)
         if (res == NULL) {
                 dev_err(&pdev->dev, "no IRQ resource found\n");
                 ret = -ENXIO;
-                goto err_out;
+                goto err_iounmap;
         }
 
         irq = res->start;
@@ -128,7 +129,7 @@ static int ath_ahb_probe(struct platform_device *pdev)
         if (hw == NULL) {
                 dev_err(&pdev->dev, "no memory for ieee80211_hw\n");
                 ret = -ENOMEM;
-                goto err_out;
+                goto err_iounmap;
         }
 
         ah = hw->priv;
@@ -185,6 +186,8 @@ static int ath_ahb_probe(struct platform_device *pdev)
  err_free_hw:
         ieee80211_free_hw(hw);
         platform_set_drvdata(pdev, NULL);
+ err_iounmap:
+        iounmap(mem);
  err_out:
         return ret;
 }
@@ -217,6 +220,7 @@ static int ath_ahb_remove(struct platform_device *pdev)
         }
 
         ath5k_deinit_ah(ah);
+        iounmap(ah->iobase);
         platform_set_drvdata(pdev, NULL);
         ieee80211_free_hw(hw);
 
diff --git a/drivers/net/wireless/ath/ath5k/ani.c b/drivers/net/wireless/ath/ath5k/ani.c
index 35e93704c4ef..5c008757662b 100644
--- a/drivers/net/wireless/ath/ath5k/ani.c
+++ b/drivers/net/wireless/ath/ath5k/ani.c
@@ -14,6 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "ath5k.h"
 #include "reg.h"
 #include "debug.h"
@@ -728,33 +730,25 @@ void
 ath5k_ani_print_counters(struct ath5k_hw *ah)
 {
         /* clears too */
-        printk(KERN_NOTICE "ACK fail\t%d\n",
-                ath5k_hw_reg_read(ah, AR5K_ACK_FAIL));
-        printk(KERN_NOTICE "RTS fail\t%d\n",
-                ath5k_hw_reg_read(ah, AR5K_RTS_FAIL));
-        printk(KERN_NOTICE "RTS success\t%d\n",
-                ath5k_hw_reg_read(ah, AR5K_RTS_OK));
-        printk(KERN_NOTICE "FCS error\t%d\n",
-                ath5k_hw_reg_read(ah, AR5K_FCS_FAIL));
+        pr_notice("ACK fail\t%d\n", ath5k_hw_reg_read(ah, AR5K_ACK_FAIL));
+        pr_notice("RTS fail\t%d\n", ath5k_hw_reg_read(ah, AR5K_RTS_FAIL));
+        pr_notice("RTS success\t%d\n", ath5k_hw_reg_read(ah, AR5K_RTS_OK));
+        pr_notice("FCS error\t%d\n", ath5k_hw_reg_read(ah, AR5K_FCS_FAIL));
 
         /* no clear */
-        printk(KERN_NOTICE "tx\t%d\n",
-                ath5k_hw_reg_read(ah, AR5K_PROFCNT_TX));
-        printk(KERN_NOTICE "rx\t%d\n",
-                ath5k_hw_reg_read(ah, AR5K_PROFCNT_RX));
-        printk(KERN_NOTICE "busy\t%d\n",
-                ath5k_hw_reg_read(ah, AR5K_PROFCNT_RXCLR));
-        printk(KERN_NOTICE "cycles\t%d\n",
-                ath5k_hw_reg_read(ah, AR5K_PROFCNT_CYCLE));
-
-        printk(KERN_NOTICE "AR5K_PHYERR_CNT1\t%d\n",
-                ath5k_hw_reg_read(ah, AR5K_PHYERR_CNT1));
-        printk(KERN_NOTICE "AR5K_PHYERR_CNT2\t%d\n",
-                ath5k_hw_reg_read(ah, AR5K_PHYERR_CNT2));
-        printk(KERN_NOTICE "AR5K_OFDM_FIL_CNT\t%d\n",
-                ath5k_hw_reg_read(ah, AR5K_OFDM_FIL_CNT));
-        printk(KERN_NOTICE "AR5K_CCK_FIL_CNT\t%d\n",
-                ath5k_hw_reg_read(ah, AR5K_CCK_FIL_CNT));
+        pr_notice("tx\t%d\n", ath5k_hw_reg_read(ah, AR5K_PROFCNT_TX));
+        pr_notice("rx\t%d\n", ath5k_hw_reg_read(ah, AR5K_PROFCNT_RX));
+        pr_notice("busy\t%d\n", ath5k_hw_reg_read(ah, AR5K_PROFCNT_RXCLR));
+        pr_notice("cycles\t%d\n", ath5k_hw_reg_read(ah, AR5K_PROFCNT_CYCLE));
+
+        pr_notice("AR5K_PHYERR_CNT1\t%d\n",
+                  ath5k_hw_reg_read(ah, AR5K_PHYERR_CNT1));
+        pr_notice("AR5K_PHYERR_CNT2\t%d\n",
+                  ath5k_hw_reg_read(ah, AR5K_PHYERR_CNT2));
+        pr_notice("AR5K_OFDM_FIL_CNT\t%d\n",
+                  ath5k_hw_reg_read(ah, AR5K_OFDM_FIL_CNT));
+        pr_notice("AR5K_CCK_FIL_CNT\t%d\n",
+                  ath5k_hw_reg_read(ah, AR5K_CCK_FIL_CNT));
 }
 
 #endif
diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h
index 8d434b8f5855..64a453a6dfe4 100644
--- a/drivers/net/wireless/ath/ath5k/ath5k.h
+++ b/drivers/net/wireless/ath/ath5k/ath5k.h
@@ -76,26 +76,29 @@
   GENERIC DRIVER DEFINITIONS
 \****************************/
 
-#define ATH5K_PRINTF(fmt, ...) \
-        printk(KERN_WARNING "%s: " fmt, __func__, ##__VA_ARGS__)
+#define ATH5K_PRINTF(fmt, ...)                                          \
+        pr_warn("%s: " fmt, __func__, ##__VA_ARGS__)
 
-#define ATH5K_PRINTK(_sc, _level, _fmt, ...) \
-        printk(_level "ath5k %s: " _fmt, \
-                ((_sc) && (_sc)->hw) ? wiphy_name((_sc)->hw->wiphy) : "", \
-                ##__VA_ARGS__)
+void __printf(3, 4)
+_ath5k_printk(const struct ath5k_hw *ah, const char *level,
+              const char *fmt, ...);
 
-#define ATH5K_PRINTK_LIMIT(_sc, _level, _fmt, ...) do { \
-        if (net_ratelimit()) \
-                ATH5K_PRINTK(_sc, _level, _fmt, ##__VA_ARGS__); \
-        } while (0)
+#define ATH5K_PRINTK(_sc, _level, _fmt, ...)                            \
+        _ath5k_printk(_sc, _level, _fmt, ##__VA_ARGS__)
 
-#define ATH5K_INFO(_sc, _fmt, ...) \
+#define ATH5K_PRINTK_LIMIT(_sc, _level, _fmt, ...)                      \
+do {                                                                    \
+        if (net_ratelimit())                                            \
+                ATH5K_PRINTK(_sc, _level, _fmt, ##__VA_ARGS__);         \
+} while (0)
+
+#define ATH5K_INFO(_sc, _fmt, ...)                                      \
         ATH5K_PRINTK(_sc, KERN_INFO, _fmt, ##__VA_ARGS__)
 
-#define ATH5K_WARN(_sc, _fmt, ...) \
+#define ATH5K_WARN(_sc, _fmt, ...)                                      \
         ATH5K_PRINTK_LIMIT(_sc, KERN_WARNING, _fmt, ##__VA_ARGS__)
 
-#define ATH5K_ERR(_sc, _fmt, ...) \
+#define ATH5K_ERR(_sc, _fmt, ...)                                       \
         ATH5K_PRINTK_LIMIT(_sc, KERN_ERR, _fmt, ##__VA_ARGS__)
 
 /*
@@ -1524,7 +1527,7 @@ void ath5k_eeprom_detach(struct ath5k_hw *ah);
 
 /* Protocol Control Unit Functions */
 /* Helpers */
-int ath5k_hw_get_frame_duration(struct ath5k_hw *ah,
+int ath5k_hw_get_frame_duration(struct ath5k_hw *ah, enum ieee80211_band band,
                 int len, struct ieee80211_rate *rate, bool shortpre);
 unsigned int ath5k_hw_get_default_slottime(struct ath5k_hw *ah);
 unsigned int ath5k_hw_get_default_sifs(struct ath5k_hw *ah);
diff --git a/drivers/net/wireless/ath/ath5k/attach.c b/drivers/net/wireless/ath/ath5k/attach.c
index d7114c75fe9b..7106547a14dd 100644
--- a/drivers/net/wireless/ath/ath5k/attach.c
+++ b/drivers/net/wireless/ath/ath5k/attach.c
@@ -20,6 +20,8 @@
 * Attach/Detach Functions and helpers *
 \*************************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include "ath5k.h"
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 0e643b016b32..0ba81a66061f 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -40,6 +40,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
@@ -460,7 +462,7 @@ void ath5k_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
         }
 
         if (iter_data->need_set_hw_addr && iter_data->hw_macaddr)
-                if (compare_ether_addr(iter_data->hw_macaddr, mac) == 0)
+                if (ether_addr_equal(iter_data->hw_macaddr, mac))
                         iter_data->need_set_hw_addr = false;
 
         if (!iter_data->any_assoc) {
@@ -1168,7 +1170,7 @@ ath5k_check_ibss_tsf(struct ath5k_hw *ah, struct sk_buff *skb,
 
         if (ieee80211_is_beacon(mgmt->frame_control) &&
             le16_to_cpu(mgmt->u.beacon.capab_info) & WLAN_CAPABILITY_IBSS &&
-            memcmp(mgmt->bssid, common->curbssid, ETH_ALEN) == 0) {
+            ether_addr_equal(mgmt->bssid, common->curbssid)) {
                 /*
                  * Received an IBSS beacon with the same BSSID. Hardware *must*
                  * have updated the local TSF. We have to work around various
@@ -1232,7 +1234,7 @@ ath5k_update_beacon_rssi(struct ath5k_hw *ah, struct sk_buff *skb, int rssi)
 
         /* only beacons from our BSSID */
         if (!ieee80211_is_beacon(mgmt->frame_control) ||
-            memcmp(mgmt->bssid, common->curbssid, ETH_ALEN) != 0)
+            !ether_addr_equal(mgmt->bssid, common->curbssid))
                 return;
 
         ewma_add(&ah->ah_beacon_rssi_avg, rssi);
@@ -3038,3 +3040,23 @@ ath5k_set_beacon_filter(struct ieee80211_hw *hw, bool enable)
         ath5k_hw_set_rx_filter(ah, rfilt);
         ah->filter_flags = rfilt;
 }
+
+void _ath5k_printk(const struct ath5k_hw *ah, const char *level,
+                   const char *fmt, ...)
+{
+        struct va_format vaf;
+        va_list args;
+
+        va_start(args, fmt);
+
+        vaf.fmt = fmt;
+        vaf.va = &args;
+
+        if (ah && ah->hw)
+                printk("%s" pr_fmt("%s: %pV"),
+                       level, wiphy_name(ah->hw->wiphy), &vaf);
+        else
+                printk("%s" pr_fmt("%pV"), level, &vaf);
+
+        va_end(args);
+}
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index e5e8f45d86ac..9d00dab666a8 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -57,6 +57,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/export.h>
 #include <linux/moduleparam.h>
 
@@ -247,10 +250,10 @@ static ssize_t write_file_beacon(struct file *file,
 
         if (strncmp(buf, "disable", 7) == 0) {
                 AR5K_REG_DISABLE_BITS(ah, AR5K_BEACON, AR5K_BEACON_ENABLE);
-                printk(KERN_INFO "debugfs disable beacons\n");
+                pr_info("debugfs disable beacons\n");
         } else if (strncmp(buf, "enable", 6) == 0) {
                 AR5K_REG_ENABLE_BITS(ah, AR5K_BEACON, AR5K_BEACON_ENABLE);
-                printk(KERN_INFO "debugfs enable beacons\n");
+                pr_info("debugfs enable beacons\n");
         }
         return count;
 }
@@ -450,19 +453,19 @@ static ssize_t write_file_antenna(struct file *file,
 
         if (strncmp(buf, "diversity", 9) == 0) {
                 ath5k_hw_set_antenna_mode(ah, AR5K_ANTMODE_DEFAULT);
-                printk(KERN_INFO "ath5k debug: enable diversity\n");
+                pr_info("debug: enable diversity\n");
         } else if (strncmp(buf, "fixed-a", 7) == 0) {
                 ath5k_hw_set_antenna_mode(ah, AR5K_ANTMODE_FIXED_A);
-                printk(KERN_INFO "ath5k debugfs: fixed antenna A\n");
+                pr_info("debug: fixed antenna A\n");
         } else if (strncmp(buf, "fixed-b", 7) == 0) {
                 ath5k_hw_set_antenna_mode(ah, AR5K_ANTMODE_FIXED_B);
-                printk(KERN_INFO "ath5k debug: fixed antenna B\n");
+                pr_info("debug: fixed antenna B\n");
         } else if (strncmp(buf, "clear", 5) == 0) {
                 for (i = 0; i < ARRAY_SIZE(ah->stats.antenna_rx); i++) {
                         ah->stats.antenna_rx[i] = 0;
                         ah->stats.antenna_tx[i] = 0;
                 }
-                printk(KERN_INFO "ath5k debug: cleared antenna stats\n");
+                pr_info("debug: cleared antenna stats\n");
         }
         return count;
 }
@@ -632,7 +635,7 @@ static ssize_t write_file_frameerrors(struct file *file,
                 st->txerr_fifo = 0;
                 st->txerr_filt = 0;
                 st->tx_all_count = 0;
-                printk(KERN_INFO "ath5k debug: cleared frameerrors stats\n");
+                pr_info("debug: cleared frameerrors stats\n");
         }
         return count;
 }
diff --git a/drivers/net/wireless/ath/ath5k/desc.c b/drivers/net/wireless/ath/ath5k/desc.c
index f8bfa3ac2af0..bd8d4392d68b 100644
--- a/drivers/net/wireless/ath/ath5k/desc.c
+++ b/drivers/net/wireless/ath/ath5k/desc.c
@@ -21,6 +21,8 @@
  Hardware Descriptor Functions
 \******************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "ath5k.h"
 #include "reg.h"
 #include "debug.h"
@@ -441,10 +443,8 @@ ath5k_hw_proc_2word_tx_status(struct ath5k_hw *ah,
                                 struct ath5k_desc *desc,
                                 struct ath5k_tx_status *ts)
 {
-        struct ath5k_hw_2w_tx_ctl *tx_ctl;
         struct ath5k_hw_tx_status *tx_status;
 
-        tx_ctl = &desc->ud.ds_tx5210.tx_ctl;
         tx_status = &desc->ud.ds_tx5210.tx_stat;
 
         /* No frame has been send or error */
@@ -495,11 +495,9 @@ ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,
                                 struct ath5k_desc *desc,
                                 struct ath5k_tx_status *ts)
 {
-        struct ath5k_hw_4w_tx_ctl *tx_ctl;
         struct ath5k_hw_tx_status *tx_status;
         u32 txstat0, txstat1;
 
-        tx_ctl = &desc->ud.ds_tx5212.tx_ctl;
         tx_status = &desc->ud.ds_tx5212.tx_stat;
 
         txstat1 = ACCESS_ONCE(tx_status->tx_status_1);
diff --git a/drivers/net/wireless/ath/ath5k/dma.c b/drivers/net/wireless/ath/ath5k/dma.c
index 5cc9aa814697..ce86f158423b 100644
--- a/drivers/net/wireless/ath/ath5k/dma.c
+++ b/drivers/net/wireless/ath/ath5k/dma.c
@@ -29,6 +29,8 @@
  * status registers (ISR).
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "ath5k.h"
 #include "reg.h"
 #include "debug.h"
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c
index cd708c15b774..4026c906cc7b 100644
--- a/drivers/net/wireless/ath/ath5k/eeprom.c
+++ b/drivers/net/wireless/ath/ath5k/eeprom.c
@@ -21,6 +21,8 @@
 * EEPROM access functions and helpers *
 \*************************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/slab.h>
 
 #include "ath5k.h"
diff --git a/drivers/net/wireless/ath/ath5k/initvals.c b/drivers/net/wireless/ath/ath5k/initvals.c
index a1ea78e05b47..ee1c2fa8b591 100644
--- a/drivers/net/wireless/ath/ath5k/initvals.c
+++ b/drivers/net/wireless/ath/ath5k/initvals.c
@@ -19,6 +19,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "ath5k.h"
 #include "reg.h"
 #include "debug.h"
@@ -1574,8 +1576,7 @@ ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool skip_pcu)
 
                 /* AR5K_MODE_11B */
                 if (mode > 2) {
-                        ATH5K_ERR(ah,
-                                "unsupported channel mode: %d\n", mode);
+                        ATH5K_ERR(ah, "unsupported channel mode: %d\n", mode);
                         return -EINVAL;
                 }
 
diff --git a/drivers/net/wireless/ath/ath5k/led.c b/drivers/net/wireless/ath/ath5k/led.c
index c1151c723711..b9f708a45f4e 100644
--- a/drivers/net/wireless/ath/ath5k/led.c
+++ b/drivers/net/wireless/ath/ath5k/led.c
@@ -39,6 +39,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci.h>
 #include "ath5k.h"
 
diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
index 5c5329955414..22b80af0f47c 100644
--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
@@ -41,6 +41,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <net/mac80211.h>
 #include <asm/unaligned.h>
 
diff --git a/drivers/net/wireless/ath/ath5k/pci.c b/drivers/net/wireless/ath/ath5k/pci.c
index 849fa060ebc4..dff48fbc63bf 100644
--- a/drivers/net/wireless/ath/ath5k/pci.c
+++ b/drivers/net/wireless/ath/ath5k/pci.c
@@ -14,6 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/nl80211.h>
 #include <linux/pci.h>
 #include <linux/pci-aspm.h>
@@ -45,6 +47,7 @@ static DEFINE_PCI_DEVICE_TABLE(ath5k_pci_id_table) = {
         { PCI_VDEVICE(ATHEROS, 0x001b) }, /* 5413 Eagle */
         { PCI_VDEVICE(ATHEROS, 0x001c) }, /* PCI-E cards */
         { PCI_VDEVICE(ATHEROS, 0x001d) }, /* 2417 Nala */
+        { PCI_VDEVICE(ATHEROS, 0xff1b) }, /* AR5BXB63 */
         { 0 }
 };
 MODULE_DEVICE_TABLE(pci, ath5k_pci_id_table);
@@ -337,28 +340,4 @@ static struct pci_driver ath5k_pci_driver = {
         .driver.pm      = ATH5K_PM_OPS,
 };
 
-/*
- * Module init/exit functions
- */
-static int __init
-init_ath5k_pci(void)
-{
-        int ret;
-
-        ret = pci_register_driver(&ath5k_pci_driver);
-        if (ret) {
-                printk(KERN_ERR "ath5k_pci: can't register pci driver\n");
-                return ret;
-        }
-
-        return 0;
-}
-
-static void __exit
-exit_ath5k_pci(void)
-{
-        pci_unregister_driver(&ath5k_pci_driver);
-}
-
-module_init(init_ath5k_pci);
-module_exit(exit_ath5k_pci);
+module_pci_driver(ath5k_pci_driver);
diff --git a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c
index cebfd6fd31d3..1f16b4227d8f 100644
--- a/drivers/net/wireless/ath/ath5k/pcu.c
+++ b/drivers/net/wireless/ath/ath5k/pcu.c
@@ -110,7 +110,7 @@ static const unsigned int ack_rates_high[] =
  * bwmodes.
  */
 int
-ath5k_hw_get_frame_duration(struct ath5k_hw *ah,
+ath5k_hw_get_frame_duration(struct ath5k_hw *ah, enum ieee80211_band band,
                 int len, struct ieee80211_rate *rate, bool shortpre)
 {
         int sifs, preamble, plcp_bits, sym_time;
@@ -120,7 +120,7 @@ ath5k_hw_get_frame_duration(struct ath5k_hw *ah,
         /* Fallback */
         if (!ah->ah_bwmode) {
                 __le16 raw_dur = ieee80211_generic_frame_duration(ah->hw,
-                                        NULL, len, rate);
+                                        NULL, band, len, rate);
 
                 /* subtract difference between long and short preamble */
                 dur = le16_to_cpu(raw_dur);
@@ -302,14 +302,15 @@ ath5k_hw_write_rate_duration(struct ath5k_hw *ah)
                  * actual rate for this rate. See mac80211 tx.c
                  * ieee80211_duration() for a brief description of
                  * what rate we should choose to TX ACKs. */
-                tx_time = ath5k_hw_get_frame_duration(ah, 10, rate, false);
+                tx_time = ath5k_hw_get_frame_duration(ah, band, 10,
+                                        rate, false);
 
                 ath5k_hw_reg_write(ah, tx_time, reg);
 
                 if (!(rate->flags & IEEE80211_RATE_SHORT_PREAMBLE))
                         continue;
 
-                tx_time = ath5k_hw_get_frame_duration(ah, 10, rate, true);
+                tx_time = ath5k_hw_get_frame_duration(ah, band, 10, rate, true);
                 ath5k_hw_reg_write(ah, tx_time,
                         reg + (AR5K_SET_SHORT_PREAMBLE << 2));
         }
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c
index 3a2845489a1b..8b71a2d947e0 100644
--- a/drivers/net/wireless/ath/ath5k/phy.c
+++ b/drivers/net/wireless/ath/ath5k/phy.c
@@ -22,6 +22,8 @@
 * PHY related functions *
 \***********************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <asm/unaligned.h>
diff --git a/drivers/net/wireless/ath/ath5k/qcu.c b/drivers/net/wireless/ath/ath5k/qcu.c
index 30b50f934172..65fe929529a8 100644
--- a/drivers/net/wireless/ath/ath5k/qcu.c
+++ b/drivers/net/wireless/ath/ath5k/qcu.c
@@ -20,6 +20,8 @@
 Queue Control Unit, DCF Control Unit Functions
 \********************************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "ath5k.h"
 #include "reg.h"
 #include "debug.h"
@@ -563,6 +565,7 @@ ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)
 int ath5k_hw_set_ifs_intervals(struct ath5k_hw *ah, unsigned int slot_time)
 {
         struct ieee80211_channel *channel = ah->ah_current_channel;
+        enum ieee80211_band band;
         struct ieee80211_rate *rate;
         u32 ack_tx_time, eifs, eifs_clock, sifs, sifs_clock;
         u32 slot_time_clock = ath5k_hw_htoclock(ah, slot_time);
@@ -598,11 +601,12 @@ int ath5k_hw_set_ifs_intervals(struct ath5k_hw *ah, unsigned int slot_time)
          * Also we have different lowest rate for 802.11a
          */
         if (channel->band == IEEE80211_BAND_5GHZ)
-                rate = &ah->sbands[IEEE80211_BAND_5GHZ].bitrates[0];
+                band = IEEE80211_BAND_5GHZ;
         else
-                rate = &ah->sbands[IEEE80211_BAND_2GHZ].bitrates[0];
+                band = IEEE80211_BAND_2GHZ;
 
-        ack_tx_time = ath5k_hw_get_frame_duration(ah, 10, rate, false);
+        rate = &ah->sbands[band].bitrates[0];
+        ack_tx_time = ath5k_hw_get_frame_duration(ah, band, 10, rate, false);
 
         /* ack_tx_time includes an SIFS already */
         eifs = ack_tx_time + sifs + 2 * slot_time;
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c
index 200f165c0c6d..0c2dd4771c36 100644
--- a/drivers/net/wireless/ath/ath5k/reset.c
+++ b/drivers/net/wireless/ath/ath5k/reset.c
@@ -23,6 +23,8 @@
   Reset function and helpers
 \****************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <asm/unaligned.h>
 
 #include <linux/pci.h>          /* To determine if a card is pci-e */
diff --git a/drivers/net/wireless/ath/ath5k/sysfs.c b/drivers/net/wireless/ath/ath5k/sysfs.c
index 9364da7bd131..04cf0ca72610 100644
--- a/drivers/net/wireless/ath/ath5k/sysfs.c
+++ b/drivers/net/wireless/ath/ath5k/sysfs.c
@@ -1,3 +1,5 @@
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/device.h>
 #include <linux/pci.h>
 
diff --git a/drivers/net/wireless/ath/ath6kl/Makefile b/drivers/net/wireless/ath/ath6kl/Makefile
index 85746c3eb027..8cae8886f17d 100644
--- a/drivers/net/wireless/ath/ath6kl/Makefile
+++ b/drivers/net/wireless/ath/ath6kl/Makefile
@@ -25,7 +25,8 @@
 obj-$(CONFIG_ATH6KL) += ath6kl_core.o
 ath6kl_core-y += debug.o
 ath6kl_core-y += hif.o
-ath6kl_core-y += htc.o
+ath6kl_core-y += htc_mbox.o
+ath6kl_core-y += htc_pipe.o
 ath6kl_core-y += bmi.o
 ath6kl_core-y += cfg80211.o
 ath6kl_core-y += init.o
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 00d38952b5fb..28a65d3a03d0 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -15,6 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/moduleparam.h>
 #include <linux/inetdevice.h>
 #include <linux/export.h>
@@ -49,6 +51,8 @@
         .max_power      = 30,                       \
 }
 
+#define DEFAULT_BG_SCAN_PERIOD 60
+
 static struct ieee80211_rate ath6kl_rates[] = {
         RATETAB_ENT(10, 0x1, 0),
         RATETAB_ENT(20, 0x2, 0),
@@ -69,7 +73,8 @@ static struct ieee80211_rate ath6kl_rates[] = {
 #define ath6kl_g_rates     (ath6kl_rates + 0)
 #define ath6kl_g_rates_size    12
 
-#define ath6kl_g_htcap (IEEE80211_HT_CAP_SUP_WIDTH_20_40 | \
+#define ath6kl_g_htcap IEEE80211_HT_CAP_SGI_20
+#define ath6kl_a_htcap (IEEE80211_HT_CAP_SUP_WIDTH_20_40 | \
                         IEEE80211_HT_CAP_SGI_20          | \
                         IEEE80211_HT_CAP_SGI_40)
 
@@ -126,7 +131,7 @@ static struct ieee80211_supported_band ath6kl_band_5ghz = {
         .channels = ath6kl_5ghz_a_channels,
         .n_bitrates = ath6kl_a_rates_size,
         .bitrates = ath6kl_a_rates,
-        .ht_cap.cap = ath6kl_g_htcap,
+        .ht_cap.cap = ath6kl_a_htcap,
         .ht_cap.ht_supported = true,
 };
 
@@ -607,6 +612,17 @@ static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
                                         vif->req_bssid, vif->ch_hint,
                                         ar->connect_ctrl_flags, nw_subtype);
 
+        /* disable background scan if period is 0 */
+        if (sme->bg_scan_period == 0)
+                sme->bg_scan_period = 0xffff;
+
+        /* configure default value if not specified */
+        if (sme->bg_scan_period == -1)
+                sme->bg_scan_period = DEFAULT_BG_SCAN_PERIOD;
+
+        ath6kl_wmi_scanparams_cmd(ar->wmi, vif->fw_vif_idx, 0, 0,
+                                  sme->bg_scan_period, 0, 0, 0, 3, 0, 0, 0);
+
         up(&ar->sem);
 
         if (status == -EINVAL) {
@@ -941,6 +957,8 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
         if (test_bit(CONNECTED, &vif->flags))
                 force_fg_scan = 1;
 
+        vif->scan_req = request;
+
         if (test_bit(ATH6KL_FW_CAPABILITY_STA_P2PDEV_DUPLEX,
                      ar->fw_capabilities)) {
                 /*
@@ -963,10 +981,10 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
                                                 ATH6KL_FG_SCAN_INTERVAL,
                                                 n_channels, channels);
         }
-        if (ret)
+        if (ret) {
                 ath6kl_err("wmi_startscan_cmd failed\n");
-        else
-                vif->scan_req = request;
+                vif->scan_req = NULL;
+        }
 
         kfree(channels);
 
@@ -1436,9 +1454,38 @@ static int ath6kl_cfg80211_change_iface(struct wiphy *wiphy,
                                         struct vif_params *params)
 {
         struct ath6kl_vif *vif = netdev_priv(ndev);
+        int i;
 
         ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: type %u\n", __func__, type);
 
+        /*
+         * Don't bring up p2p on an interface which is not initialized
+         * for p2p operation where fw does not have capability to switch
+         * dynamically between non-p2p and p2p type interface.
+         */
+        if (!test_bit(ATH6KL_FW_CAPABILITY_STA_P2PDEV_DUPLEX,
+                      vif->ar->fw_capabilities) &&
+            (type == NL80211_IFTYPE_P2P_CLIENT ||
+             type == NL80211_IFTYPE_P2P_GO)) {
+                if (vif->ar->vif_max == 1) {
+                        if (vif->fw_vif_idx != 0)
+                                return -EINVAL;
+                        else
+                                goto set_iface_type;
+                }
+
+                for (i = vif->ar->max_norm_iface; i < vif->ar->vif_max; i++) {
+                        if (i == vif->fw_vif_idx)
+                                break;
+                }
+
+                if (i == vif->ar->vif_max) {
+                        ath6kl_err("Invalid interface to bring up P2P\n");
+                        return -EINVAL;
+                }
+        }
+
+set_iface_type:
         switch (type) {
         case NL80211_IFTYPE_STATION:
                 vif->next_mode = INFRA_NETWORK;
@@ -1924,12 +1971,61 @@ static int ath6kl_wow_sta(struct ath6kl *ar, struct ath6kl_vif *vif)
         return 0;
 }
 
+static int is_hsleep_mode_procsed(struct ath6kl_vif *vif)
+{
+        return test_bit(HOST_SLEEP_MODE_CMD_PROCESSED, &vif->flags);
+}
+
+static bool is_ctrl_ep_empty(struct ath6kl *ar)
+{
+        return !ar->tx_pending[ar->ctrl_ep];
+}
+
+static int ath6kl_cfg80211_host_sleep(struct ath6kl *ar, struct ath6kl_vif *vif)
+{
+        int ret, left;
+
+        clear_bit(HOST_SLEEP_MODE_CMD_PROCESSED, &vif->flags);
+
+        ret = ath6kl_wmi_set_host_sleep_mode_cmd(ar->wmi, vif->fw_vif_idx,
+                                                 ATH6KL_HOST_MODE_ASLEEP);
+        if (ret)
+                return ret;
+
+        left = wait_event_interruptible_timeout(ar->event_wq,
+                                                is_hsleep_mode_procsed(vif),
+                                                WMI_TIMEOUT);
+        if (left == 0) {
+                ath6kl_warn("timeout, didn't get host sleep cmd processed event\n");
+                ret = -ETIMEDOUT;
+        } else if (left < 0) {
+                ath6kl_warn("error while waiting for host sleep cmd processed event %d\n",
+                            left);
+                ret = left;
+        }
+
+        if (ar->tx_pending[ar->ctrl_ep]) {
+                left = wait_event_interruptible_timeout(ar->event_wq,
+                                                        is_ctrl_ep_empty(ar),
+                                                        WMI_TIMEOUT);
+                if (left == 0) {
+                        ath6kl_warn("clear wmi ctrl data timeout\n");
+                        ret = -ETIMEDOUT;
+                } else if (left < 0) {
+                        ath6kl_warn("clear wmi ctrl data failed: %d\n", left);
+                        ret = left;
+                }
+        }
+
+        return ret;
+}
+
 static int ath6kl_wow_suspend(struct ath6kl *ar, struct cfg80211_wowlan *wow)
 {
         struct in_device *in_dev;
         struct in_ifaddr *ifa;
         struct ath6kl_vif *vif;
-        int ret, left;
+        int ret;
         u32 filter = 0;
         u16 i, bmiss_time;
         u8 index = 0;
@@ -2030,39 +2126,11 @@ skip_arp:
         if (ret)
                 return ret;
 
-        clear_bit(HOST_SLEEP_MODE_CMD_PROCESSED, &vif->flags);
-
-        ret = ath6kl_wmi_set_host_sleep_mode_cmd(ar->wmi, vif->fw_vif_idx,
-                                                 ATH6KL_HOST_MODE_ASLEEP);
+        ret = ath6kl_cfg80211_host_sleep(ar, vif);
         if (ret)
                 return ret;
 
-        left = wait_event_interruptible_timeout(ar->event_wq,
-                        test_bit(HOST_SLEEP_MODE_CMD_PROCESSED, &vif->flags),
-                        WMI_TIMEOUT);
-        if (left == 0) {
-                ath6kl_warn("timeout, didn't get host sleep cmd "
-                            "processed event\n");
-                ret = -ETIMEDOUT;
-        } else if (left < 0) {
-                ath6kl_warn("error while waiting for host sleep cmd "
-                            "processed event %d\n", left);
-                ret = left;
-        }
-
-        if (ar->tx_pending[ar->ctrl_ep]) {
-                left = wait_event_interruptible_timeout(ar->event_wq,
-                                ar->tx_pending[ar->ctrl_ep] == 0, WMI_TIMEOUT);
-                if (left == 0) {
-                        ath6kl_warn("clear wmi ctrl data timeout\n");
-                        ret = -ETIMEDOUT;
-                } else if (left < 0) {
-                        ath6kl_warn("clear wmi ctrl data failed: %d\n", left);
-                        ret = left;
-                }
-        }
-
-        return ret;
+        return 0;
 }
 
 static int ath6kl_wow_resume(struct ath6kl *ar)
@@ -2109,10 +2177,82 @@ static int ath6kl_wow_resume(struct ath6kl *ar)
         return 0;
 }
 
+static int ath6kl_cfg80211_deepsleep_suspend(struct ath6kl *ar)
+{
+        struct ath6kl_vif *vif;
+        int ret;
+
+        vif = ath6kl_vif_first(ar);
+        if (!vif)
+                return -EIO;
+
+        if (!ath6kl_cfg80211_ready(vif))
+                return -EIO;
+
+        ath6kl_cfg80211_stop_all(ar);
+
+        /* Save the current power mode before enabling power save */
+        ar->wmi->saved_pwr_mode = ar->wmi->pwr_mode;
+
+        ret = ath6kl_wmi_powermode_cmd(ar->wmi, 0, REC_POWER);
+        if (ret)
+                return ret;
+
+        /* Disable WOW mode */
+        ret = ath6kl_wmi_set_wow_mode_cmd(ar->wmi, vif->fw_vif_idx,
+                                          ATH6KL_WOW_MODE_DISABLE,
+                                          0, 0);
+        if (ret)
+                return ret;
+
+        /* Flush all non control pkts in TX path */
+        ath6kl_tx_data_cleanup(ar);
+
+        ret = ath6kl_cfg80211_host_sleep(ar, vif);
+        if (ret)
+                return ret;
+
+        return 0;
+}
+
+static int ath6kl_cfg80211_deepsleep_resume(struct ath6kl *ar)
+{
+        struct ath6kl_vif *vif;
+        int ret;
+
+        vif = ath6kl_vif_first(ar);
+
+        if (!vif)
+                return -EIO;
+
+        if (ar->wmi->pwr_mode != ar->wmi->saved_pwr_mode) {
+                ret = ath6kl_wmi_powermode_cmd(ar->wmi, 0,
+                                               ar->wmi->saved_pwr_mode);
+                if (ret)
+                        return ret;
+        }
+
+        ret = ath6kl_wmi_set_host_sleep_mode_cmd(ar->wmi, vif->fw_vif_idx,
+                                                 ATH6KL_HOST_MODE_AWAKE);
+        if (ret)
+                return ret;
+
+        ar->state = ATH6KL_STATE_ON;
+
+        /* Reset scan parameter to default values */
+        ret = ath6kl_wmi_scanparams_cmd(ar->wmi, vif->fw_vif_idx,
+                                        0, 0, 0, 0, 0, 0, 3, 0, 0, 0);
+        if (ret)
+                return ret;
+
+        return 0;
+}
+
 int ath6kl_cfg80211_suspend(struct ath6kl *ar,
                             enum ath6kl_cfg_suspend_mode mode,
                             struct cfg80211_wowlan *wow)
 {
+        struct ath6kl_vif *vif;
         enum ath6kl_state prev_state;
         int ret;
 
@@ -2137,15 +2277,12 @@ int ath6kl_cfg80211_suspend(struct ath6kl *ar,
 
         case ATH6KL_CFG_SUSPEND_DEEPSLEEP:
 
-                ath6kl_cfg80211_stop_all(ar);
-
-                /* save the current power mode before enabling power save */
-                ar->wmi->saved_pwr_mode = ar->wmi->pwr_mode;
+                ath6kl_dbg(ATH6KL_DBG_SUSPEND, "deep sleep suspend\n");
 
-                ret = ath6kl_wmi_powermode_cmd(ar->wmi, 0, REC_POWER);
+                ret = ath6kl_cfg80211_deepsleep_suspend(ar);
                 if (ret) {
-                        ath6kl_warn("wmi powermode command failed during suspend: %d\n",
-                                    ret);
+                        ath6kl_err("deepsleep suspend failed: %d\n", ret);
+                        return ret;
                 }
 
                 ar->state = ATH6KL_STATE_DEEPSLEEP;
@@ -2185,6 +2322,9 @@ int ath6kl_cfg80211_suspend(struct ath6kl *ar,
                 break;
         }
 
+        list_for_each_entry(vif, &ar->vif_list, list)
+                ath6kl_cfg80211_scan_complete_event(vif, true);
+
         return 0;
 }
 EXPORT_SYMBOL(ath6kl_cfg80211_suspend);
@@ -2206,17 +2346,13 @@ int ath6kl_cfg80211_resume(struct ath6kl *ar)
                 break;
 
         case ATH6KL_STATE_DEEPSLEEP:
-                if (ar->wmi->pwr_mode != ar->wmi->saved_pwr_mode) {
-                        ret = ath6kl_wmi_powermode_cmd(ar->wmi, 0,
-                                                       ar->wmi->saved_pwr_mode);
-                        if (ret) {
-                                ath6kl_warn("wmi powermode command failed during resume: %d\n",
-                                            ret);
-                        }
-                }
-
-                ar->state = ATH6KL_STATE_ON;
+                ath6kl_dbg(ATH6KL_DBG_SUSPEND, "deep sleep resume\n");
 
+                ret = ath6kl_cfg80211_deepsleep_resume(ar);
+                if (ret) {
+                        ath6kl_warn("deep sleep resume failed: %d\n", ret);
+                        return ret;
+                }
                 break;
 
         case ATH6KL_STATE_CUTPOWER:
@@ -2290,31 +2426,25 @@ void ath6kl_check_wow_status(struct ath6kl *ar)
 }
 #endif
 
-static int ath6kl_set_channel(struct wiphy *wiphy, struct net_device *dev,
-                              struct ieee80211_channel *chan,
-                              enum nl80211_channel_type channel_type)
+static int ath6kl_set_htcap(struct ath6kl_vif *vif, enum ieee80211_band band,
+                            bool ht_enable)
 {
-        struct ath6kl_vif *vif;
-
-        /*
-         * 'dev' could be NULL if a channel change is required for the hardware
-         * device itself, instead of a particular VIF.
-         *
-         * FIXME: To be handled properly when monitor mode is supported.
-         */
-        if (!dev)
-                return -EBUSY;
-
-        vif = netdev_priv(dev);
+        struct ath6kl_htcap *htcap = &vif->htcap;
 
-        if (!ath6kl_cfg80211_ready(vif))
-                return -EIO;
+        if (htcap->ht_enable == ht_enable)
+                return 0;
 
-        ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: center_freq=%u hw_value=%u\n",
-                   __func__, chan->center_freq, chan->hw_value);
-        vif->next_chan = chan->center_freq;
+        if (ht_enable) {
+                /* Set default ht capabilities */
+                htcap->ht_enable = true;
+                htcap->cap_info = (band == IEEE80211_BAND_2GHZ) ?
+                                   ath6kl_g_htcap : ath6kl_a_htcap;
+                htcap->ampdu_factor = IEEE80211_HT_MAX_AMPDU_16K;
+        } else /* Disable ht */
+                memset(htcap, 0, sizeof(*htcap));
 
-        return 0;
+        return ath6kl_wmi_set_htcap_cmd(vif->ar->wmi, vif->fw_vif_idx,
+                                        band, htcap);
 }
 
 static bool ath6kl_is_p2p_ie(const u8 *pos)
@@ -2391,6 +2521,81 @@ static int ath6kl_set_ies(struct ath6kl_vif *vif,
         return 0;
 }
 
+static int ath6kl_set_channel(struct wiphy *wiphy, struct net_device *dev,
+                              struct ieee80211_channel *chan,
+                              enum nl80211_channel_type channel_type)
+{
+        struct ath6kl_vif *vif;
+
+        /*
+         * 'dev' could be NULL if a channel change is required for the hardware
+         * device itself, instead of a particular VIF.
+         *
+         * FIXME: To be handled properly when monitor mode is supported.
+         */
+        if (!dev)
+                return -EBUSY;
+
+        vif = netdev_priv(dev);
+
+        if (!ath6kl_cfg80211_ready(vif))
+                return -EIO;
+
+        ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: center_freq=%u hw_value=%u\n",
+                   __func__, chan->center_freq, chan->hw_value);
+        vif->next_chan = chan->center_freq;
+        vif->next_ch_type = channel_type;
+        vif->next_ch_band = chan->band;
+
+        return 0;
+}
+
+static int ath6kl_get_rsn_capab(struct cfg80211_beacon_data *beacon,
+                                u8 *rsn_capab)
+{
+        const u8 *rsn_ie;
+        size_t rsn_ie_len;
+        u16 cnt;
+
+        if (!beacon->tail)
+                return -EINVAL;
+
+        rsn_ie = cfg80211_find_ie(WLAN_EID_RSN, beacon->tail, beacon->tail_len);
+        if (!rsn_ie)
+                return -EINVAL;
+
+        rsn_ie_len = *(rsn_ie + 1);
+        /* skip element id and length */
+        rsn_ie += 2;
+
+        /* skip version, group cipher */
+        if (rsn_ie_len < 6)
+                return -EINVAL;
+        rsn_ie +=  6;
+        rsn_ie_len -= 6;
+
+        /* skip pairwise cipher suite */
+        if (rsn_ie_len < 2)
+                return -EINVAL;
+        cnt = *((u16 *) rsn_ie);
+        rsn_ie += (2 + cnt * 4);
+        rsn_ie_len -= (2 + cnt * 4);
+
+        /* skip akm suite */
+        if (rsn_ie_len < 2)
+                return -EINVAL;
+        cnt = *((u16 *) rsn_ie);
+        rsn_ie += (2 + cnt * 4);
+        rsn_ie_len -= (2 + cnt * 4);
+
+        if (rsn_ie_len < 2)
+                return -EINVAL;
+
+        memcpy(rsn_capab, rsn_ie, 2);
+
+        return 0;
+}
+
 static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev,
                            struct cfg80211_ap_settings *info)
 {
@@ -2403,6 +2608,7 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev,
         struct wmi_connect_cmd p;
         int res;
         int i, ret;
+        u16 rsn_capab = 0;
 
         ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s:\n", __func__);
 
@@ -2532,6 +2738,34 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev,
                 p.nw_subtype = SUBTYPE_NONE;
         }
 
+        if (info->inactivity_timeout) {
+                res = ath6kl_wmi_set_inact_period(ar->wmi, vif->fw_vif_idx,
+                                                  info->inactivity_timeout);
+                if (res < 0)
+                        return res;
+        }
+
+        if (ath6kl_set_htcap(vif, vif->next_ch_band,
+                             vif->next_ch_type != NL80211_CHAN_NO_HT))
+                return -EIO;
+
+        /*
+         * Get the PTKSA replay counter in the RSN IE. Supplicant
+         * will use the RSN IE in M3 message and firmware has to
+         * advertise the same in beacon/probe response. Send
+         * the complete RSN IE capability field to firmware
+         */
+        if (!ath6kl_get_rsn_capab(&info->beacon, (u8 *) &rsn_capab) &&
+            test_bit(ATH6KL_FW_CAPABILITY_RSN_CAP_OVERRIDE,
+                     ar->fw_capabilities)) {
+                res = ath6kl_wmi_set_ie_cmd(ar->wmi, vif->fw_vif_idx,
+                                            WLAN_EID_RSN, WMI_RSN_IE_CAPB,
+                                            (const u8 *) &rsn_capab,
+                                            sizeof(rsn_capab));
+                if (res < 0)
+                        return res;
+        }
+
         res = ath6kl_wmi_ap_profile_commit(ar->wmi, vif->fw_vif_idx, &p);
         if (res < 0)
                 return res;
@@ -2566,6 +2800,13 @@ static int ath6kl_stop_ap(struct wiphy *wiphy, struct net_device *dev)
         ath6kl_wmi_disconnect_cmd(ar->wmi, vif->fw_vif_idx);
         clear_bit(CONNECTED, &vif->flags);
 
+        /* Restore ht setting in firmware */
+        if (ath6kl_set_htcap(vif, IEEE80211_BAND_2GHZ, true))
+                return -EIO;
+
+        if (ath6kl_set_htcap(vif, IEEE80211_BAND_5GHZ, true))
+                return -EIO;
+
         return 0;
 }
 
@@ -2747,6 +2988,21 @@ static bool ath6kl_mgmt_powersave_ap(struct ath6kl_vif *vif,
         return false;
 }
 
+/* Check if SSID length is greater than DIRECT- */
+static bool ath6kl_is_p2p_go_ssid(const u8 *buf, size_t len)
+{
+        const struct ieee80211_mgmt *mgmt;
+        mgmt = (const struct ieee80211_mgmt *) buf;
+
+        /* variable[1] contains the SSID tag length */
+        if (buf + len >= &mgmt->u.probe_resp.variable[1] &&
+            (mgmt->u.probe_resp.variable[1] > P2P_WILDCARD_SSID_LEN)) {
+                return true;
+        }
+
+        return false;
+}
+
 static int ath6kl_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,
                           struct ieee80211_channel *chan, bool offchan,
                           enum nl80211_channel_type channel_type,
@@ -2761,11 +3017,11 @@ static int ath6kl_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,
         bool more_data, queued;
 
         mgmt = (const struct ieee80211_mgmt *) buf;
-        if (buf + len >= mgmt->u.probe_resp.variable &&
-            vif->nw_type == AP_NETWORK && test_bit(CONNECTED, &vif->flags) &&
-            ieee80211_is_probe_resp(mgmt->frame_control)) {
+        if (vif->nw_type == AP_NETWORK && test_bit(CONNECTED, &vif->flags) &&
+            ieee80211_is_probe_resp(mgmt->frame_control) &&
+            ath6kl_is_p2p_go_ssid(buf, len)) {
                 /*
-                 * Send Probe Response frame in AP mode using a separate WMI
+                 * Send Probe Response frame in GO mode using a separate WMI
                  * command to allow the target to fill in the generic IEs.
                  */
                 *cookie = 0; /* TX status not supported */
@@ -2833,6 +3089,8 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy,
         if (vif->sme_state != SME_DISCONNECTED)
                 return -EBUSY;
 
+        ath6kl_cfg80211_scan_complete_event(vif, true);
+
         for (i = 0; i < ar->wiphy->max_sched_scan_ssids; i++) {
                 ath6kl_wmi_probedssid_cmd(ar->wmi, vif->fw_vif_idx,
                                           i, DISABLE_SSID_FLAG,
@@ -3094,6 +3352,7 @@ struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name,
         vif->next_mode = nw_type;
         vif->listen_intvl_t = ATH6KL_DEFAULT_LISTEN_INTVAL;
         vif->bmiss_time_t = ATH6KL_DEFAULT_BMISS_TIME;
+        vif->htcap.ht_enable = true;
 
         memcpy(ndev->dev_addr, ar->mac_addr, ETH_ALEN);
         if (fw_vif_idx != 0)
@@ -3181,6 +3440,10 @@ int ath6kl_cfg80211_init(struct ath6kl *ar)
         if (test_bit(ATH6KL_FW_CAPABILITY_SCHED_SCAN, ar->fw_capabilities))
                 ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
 
+        if (test_bit(ATH6KL_FW_CAPABILITY_INACTIVITY_TIMEOUT,
+                     ar->fw_capabilities))
+                ar->wiphy->features = NL80211_FEATURE_INACTIVITY_TIMER;
+
         ar->wiphy->probe_resp_offload =
                 NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS |
                 NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2 |
diff --git a/drivers/net/wireless/ath/ath6kl/common.h b/drivers/net/wireless/ath/ath6kl/common.h
index a60e78c0472f..98a886154d9c 100644
--- a/drivers/net/wireless/ath/ath6kl/common.h
+++ b/drivers/net/wireless/ath/ath6kl/common.h
@@ -22,7 +22,8 @@
 
 #define ATH6KL_MAX_IE                   256
 
-extern int ath6kl_printk(const char *level, const char *fmt, ...);
+extern __printf(2, 3)
+int ath6kl_printk(const char *level, const char *fmt, ...);
 
 /*
  * Reflects the version of binary interface exposed by ATH6KL target
@@ -77,6 +78,7 @@ enum crypto_type {
 
 struct htc_endpoint_credit_dist;
 struct ath6kl;
+struct ath6kl_htcap;
 enum htc_credit_dist_reason;
 struct ath6kl_htc_credit_info;
 
diff --git a/drivers/net/wireless/ath/ath6kl/core.c b/drivers/net/wireless/ath/ath6kl/core.c
index 45e641f3a41b..fdb3b1decc76 100644
--- a/drivers/net/wireless/ath/ath6kl/core.c
+++ b/drivers/net/wireless/ath/ath6kl/core.c
@@ -20,9 +20,11 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/export.h>
+#include <linux/vmalloc.h>
 
 #include "debug.h"
 #include "hif-ops.h"
+#include "htc-ops.h"
 #include "cfg80211.h"
 
 unsigned int debug_mask;
@@ -39,12 +41,36 @@ module_param(uart_debug, uint, 0644);
 module_param(ath6kl_p2p, uint, 0644);
 module_param(testmode, uint, 0644);
 
-int ath6kl_core_init(struct ath6kl *ar)
+void ath6kl_core_tx_complete(struct ath6kl *ar, struct sk_buff *skb)
+{
+        ath6kl_htc_tx_complete(ar, skb);
+}
+EXPORT_SYMBOL(ath6kl_core_tx_complete);
+
+void ath6kl_core_rx_complete(struct ath6kl *ar, struct sk_buff *skb, u8 pipe)
+{
+        ath6kl_htc_rx_complete(ar, skb, pipe);
+}
+EXPORT_SYMBOL(ath6kl_core_rx_complete);
+
+int ath6kl_core_init(struct ath6kl *ar, enum ath6kl_htc_type htc_type)
 {
         struct ath6kl_bmi_target_info targ_info;
         struct net_device *ndev;
         int ret = 0, i;
 
+        switch (htc_type) {
+        case ATH6KL_HTC_TYPE_MBOX:
+                ath6kl_htc_mbox_attach(ar);
+                break;
+        case ATH6KL_HTC_TYPE_PIPE:
+                ath6kl_htc_pipe_attach(ar);
+                break;
+        default:
+                WARN_ON(1);
+                return -ENOMEM;
+        }
+
         ar->ath6kl_wq = create_singlethread_workqueue("ath6kl");
         if (!ar->ath6kl_wq)
                 return -ENOMEM;
@@ -280,7 +306,7 @@ void ath6kl_core_cleanup(struct ath6kl *ar)
 
         kfree(ar->fw_board);
         kfree(ar->fw_otp);
-        kfree(ar->fw);
+        vfree(ar->fw);
         kfree(ar->fw_patch);
         kfree(ar->fw_testscript);
 
diff --git a/drivers/net/wireless/ath/ath6kl/core.h b/drivers/net/wireless/ath/ath6kl/core.h
index f1dd8906be45..9d67964a51dd 100644
--- a/drivers/net/wireless/ath/ath6kl/core.h
+++ b/drivers/net/wireless/ath/ath6kl/core.h
@@ -91,6 +91,15 @@ enum ath6kl_fw_capability {
          */
         ATH6KL_FW_CAPABILITY_STA_P2PDEV_DUPLEX,
 
+        /*
+         * Firmware has support to cleanup inactive stations
+         * in AP mode.
+         */
+        ATH6KL_FW_CAPABILITY_INACTIVITY_TIMEOUT,
+
+        /* Firmware has support to override rsn cap of rsn ie */
+        ATH6KL_FW_CAPABILITY_RSN_CAP_OVERRIDE,
+
         /* this needs to be last */
         ATH6KL_FW_CAPABILITY_MAX,
 };
@@ -205,6 +214,8 @@ struct ath6kl_fw_ie {
 #define ATH6KL_CONF_ENABLE_TX_BURST             BIT(3)
 #define ATH6KL_CONF_UART_DEBUG                  BIT(4)
 
+#define P2P_WILDCARD_SSID_LEN                   7 /* DIRECT- */
+
 enum wlan_low_pwr_state {
         WLAN_POWER_STATE_ON,
         WLAN_POWER_STATE_CUT_PWR,
@@ -454,6 +465,11 @@ enum ath6kl_hif_type {
         ATH6KL_HIF_TYPE_USB,
 };
 
+enum ath6kl_htc_type {
+        ATH6KL_HTC_TYPE_MBOX,
+        ATH6KL_HTC_TYPE_PIPE,
+};
+
 /* Max number of filters that hw supports */
 #define ATH6K_MAX_MC_FILTERS_PER_LIST 7
 struct ath6kl_mc_filter {
@@ -461,6 +477,12 @@ struct ath6kl_mc_filter {
         char hw_addr[ATH6KL_MCAST_FILTER_MAC_ADDR_SIZE];
 };
 
+struct ath6kl_htcap {
+        bool ht_enable;
+        u8 ampdu_factor;
+        unsigned short cap_info;
+};
+
 /*
  * Driver's maximum limit, note that some firmwares support only one vif
  * and the runtime (current) limit must be checked from ar->vif_max.
@@ -509,6 +531,7 @@ struct ath6kl_vif {
         struct ath6kl_wep_key wep_key_list[WMI_MAX_KEY_INDEX + 1];
         struct ath6kl_key keys[WMI_MAX_KEY_INDEX + 1];
         struct aggr_info *aggr_cntxt;
+        struct ath6kl_htcap htcap;
 
         struct timer_list disconnect_timer;
         struct timer_list sched_scan_timer;
@@ -521,6 +544,8 @@ struct ath6kl_vif {
         u32 send_action_id;
         bool probe_req_report;
         u16 next_chan;
+        enum nl80211_channel_type next_ch_type;
+        enum ieee80211_band next_ch_band;
         u16 assoc_bss_beacon_int;
         u16 listen_intvl_t;
         u16 bmiss_time_t;
@@ -568,6 +593,7 @@ struct ath6kl {
 
         struct ath6kl_bmi bmi;
         const struct ath6kl_hif_ops *hif_ops;
+        const struct ath6kl_htc_ops *htc_ops;
         struct wmi *wmi;
         int tx_pending[ENDPOINT_MAX];
         int total_tx_data_pend;
@@ -746,7 +772,8 @@ void init_netdev(struct net_device *dev);
 void ath6kl_cookie_init(struct ath6kl *ar);
 void ath6kl_cookie_cleanup(struct ath6kl *ar);
 void ath6kl_rx(struct htc_target *target, struct htc_packet *packet);
-void ath6kl_tx_complete(void *context, struct list_head *packet_queue);
+void ath6kl_tx_complete(struct htc_target *context,
+                        struct list_head *packet_queue);
 enum htc_send_full_action ath6kl_tx_queue_full(struct htc_target *target,
                                                struct htc_packet *packet);
 void ath6kl_stop_txrx(struct ath6kl *ar);
@@ -821,8 +848,11 @@ int ath6kl_init_hw_params(struct ath6kl *ar);
 
 void ath6kl_check_wow_status(struct ath6kl *ar);
 
+void ath6kl_core_tx_complete(struct ath6kl *ar, struct sk_buff *skb);
+void ath6kl_core_rx_complete(struct ath6kl *ar, struct sk_buff *skb, u8 pipe);
+
 struct ath6kl *ath6kl_core_create(struct device *dev);
-int ath6kl_core_init(struct ath6kl *ar);
+int ath6kl_core_init(struct ath6kl *ar, enum ath6kl_htc_type htc_type);
 void ath6kl_core_cleanup(struct ath6kl *ar);
 void ath6kl_core_destroy(struct ath6kl *ar);
 
diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c
index d01403a263ff..1b76aff78508 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.c
+++ b/drivers/net/wireless/ath/ath6kl/debug.c
@@ -616,6 +616,12 @@ static ssize_t read_file_tgt_stats(struct file *file, char __user *user_buf,
                          "Num disconnects", tgt_stats->cs_discon_cnt);
         len += scnprintf(buf + len, buf_len - len, "%20s %10d\n",
                          "Beacon avg rssi", tgt_stats->cs_ave_beacon_rssi);
+        len += scnprintf(buf + len, buf_len - len, "%20s %10d\n",
+                         "ARP pkt received", tgt_stats->arp_received);
+        len += scnprintf(buf + len, buf_len - len, "%20s %10d\n",
+                         "ARP pkt matched", tgt_stats->arp_matched);
+        len += scnprintf(buf + len, buf_len - len, "%20s %10d\n",
+                         "ARP pkt replied", tgt_stats->arp_replied);
 
         if (len > buf_len)
                 len = buf_len;
diff --git a/drivers/net/wireless/ath/ath6kl/debug.h b/drivers/net/wireless/ath/ath6kl/debug.h
index 1803a0baae82..49639d8266c2 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.h
+++ b/drivers/net/wireless/ath/ath6kl/debug.h
@@ -43,6 +43,7 @@ enum ATH6K_DEBUG_MASK {
         ATH6KL_DBG_WMI_DUMP     = BIT(19),
         ATH6KL_DBG_SUSPEND      = BIT(20),
         ATH6KL_DBG_USB          = BIT(21),
+        ATH6KL_DBG_USB_BULK     = BIT(22),
         ATH6KL_DBG_ANY          = 0xffffffff  /* enable all logs */
 };
 
diff --git a/drivers/net/wireless/ath/ath6kl/hif-ops.h b/drivers/net/wireless/ath/ath6kl/hif-ops.h
index fd84086638e3..8c9e72d5250d 100644
--- a/drivers/net/wireless/ath/ath6kl/hif-ops.h
+++ b/drivers/net/wireless/ath/ath6kl/hif-ops.h
@@ -150,4 +150,38 @@ static inline void ath6kl_hif_stop(struct ath6kl *ar)
         ar->hif_ops->stop(ar);
 }
 
+static inline int ath6kl_hif_pipe_send(struct ath6kl *ar,
+                                       u8 pipe, struct sk_buff *hdr_buf,
+                                       struct sk_buff *buf)
+{
+        ath6kl_dbg(ATH6KL_DBG_HIF, "hif pipe send\n");
+
+        return ar->hif_ops->pipe_send(ar, pipe, hdr_buf, buf);
+}
+
+static inline void ath6kl_hif_pipe_get_default(struct ath6kl *ar,
+                                               u8 *ul_pipe, u8 *dl_pipe)
+{
+        ath6kl_dbg(ATH6KL_DBG_HIF, "hif pipe get default\n");
+
+        ar->hif_ops->pipe_get_default(ar, ul_pipe, dl_pipe);
+}
+
+static inline int ath6kl_hif_pipe_map_service(struct ath6kl *ar,
+                                              u16 service_id, u8 *ul_pipe,
+                                              u8 *dl_pipe)
+{
+        ath6kl_dbg(ATH6KL_DBG_HIF, "hif pipe get default\n");
+
+        return ar->hif_ops->pipe_map_service(ar, service_id, ul_pipe, dl_pipe);
+}
+
+static inline u16 ath6kl_hif_pipe_get_free_queue_number(struct ath6kl *ar,
+                                                        u8 pipe)
+{
+        ath6kl_dbg(ATH6KL_DBG_HIF, "hif pipe get free queue number\n");
+
+        return ar->hif_ops->pipe_get_free_queue_number(ar, pipe);
+}
+
 #endif
diff --git a/drivers/net/wireless/ath/ath6kl/hif.h b/drivers/net/wireless/ath/ath6kl/hif.h
index 20ed6b73517b..61f6b21fb0ae 100644
--- a/drivers/net/wireless/ath/ath6kl/hif.h
+++ b/drivers/net/wireless/ath/ath6kl/hif.h
@@ -256,6 +256,12 @@ struct ath6kl_hif_ops {
         int (*power_on)(struct ath6kl *ar);
         int (*power_off)(struct ath6kl *ar);
         void (*stop)(struct ath6kl *ar);
+        int (*pipe_send)(struct ath6kl *ar, u8 pipe, struct sk_buff *hdr_buf,
+                         struct sk_buff *buf);
+        void (*pipe_get_default)(struct ath6kl *ar, u8 *pipe_ul, u8 *pipe_dl);
+        int (*pipe_map_service)(struct ath6kl *ar, u16 service_id, u8 *pipe_ul,
+                                u8 *pipe_dl);
+        u16 (*pipe_get_free_queue_number)(struct ath6kl *ar, u8 pipe);
 };
 
 int ath6kl_hif_setup(struct ath6kl_device *dev);
diff --git a/drivers/net/wireless/ath/ath6kl/htc-ops.h b/drivers/net/wireless/ath/ath6kl/htc-ops.h
new file mode 100644
index 000000000000..2d4eed55cfd1
--- /dev/null
+++ b/drivers/net/wireless/ath/ath6kl/htc-ops.h
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2004-2011 Atheros Communications Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef HTC_OPS_H
+#define HTC_OPS_H
+
+#include "htc.h"
+#include "debug.h"
+
+static inline void *ath6kl_htc_create(struct ath6kl *ar)
+{
+        return ar->htc_ops->create(ar);
+}
+
+static inline int ath6kl_htc_wait_target(struct htc_target *target)
+{
+        return target->dev->ar->htc_ops->wait_target(target);
+}
+
+static inline int ath6kl_htc_start(struct htc_target *target)
+{
+        return target->dev->ar->htc_ops->start(target);
+}
+
+static inline int ath6kl_htc_conn_service(struct htc_target *target,
+                                          struct htc_service_connect_req *req,
+                                          struct htc_service_connect_resp *resp)
+{
+        return target->dev->ar->htc_ops->conn_service(target, req, resp);
+}
+
+static inline int ath6kl_htc_tx(struct htc_target *target,
+                                struct htc_packet *packet)
+{
+        return target->dev->ar->htc_ops->tx(target, packet);
+}
+
+static inline void ath6kl_htc_stop(struct htc_target *target)
+{
+        return target->dev->ar->htc_ops->stop(target);
+}
+
+static inline void ath6kl_htc_cleanup(struct htc_target *target)
+{
+        return target->dev->ar->htc_ops->cleanup(target);
+}
+
+static inline void ath6kl_htc_flush_txep(struct htc_target *target,
+                                         enum htc_endpoint_id endpoint,
+                                         u16 tag)
+{
+        return target->dev->ar->htc_ops->flush_txep(target, endpoint, tag);
+}
+
+static inline void ath6kl_htc_flush_rx_buf(struct htc_target *target)
+{
+        return target->dev->ar->htc_ops->flush_rx_buf(target);
+}
+
+static inline void ath6kl_htc_activity_changed(struct htc_target *target,
+                                               enum htc_endpoint_id endpoint,
+                                               bool active)
+{
+        return target->dev->ar->htc_ops->activity_changed(target, endpoint,
+                                                          active);
+}
+
+static inline int ath6kl_htc_get_rxbuf_num(struct htc_target *target,
+                                           enum htc_endpoint_id endpoint)
+{
+        return target->dev->ar->htc_ops->get_rxbuf_num(target, endpoint);
+}
+
+static inline int ath6kl_htc_add_rxbuf_multiple(struct htc_target *target,
+                                                struct list_head *pktq)
+{
+        return target->dev->ar->htc_ops->add_rxbuf_multiple(target, pktq);
+}
+
+static inline int ath6kl_htc_credit_setup(struct htc_target *target,
+                                          struct ath6kl_htc_credit_info *info)
+{
+        return target->dev->ar->htc_ops->credit_setup(target, info);
+}
+
+static inline void ath6kl_htc_tx_complete(struct ath6kl *ar,
+                                          struct sk_buff *skb)
+{
+        ar->htc_ops->tx_complete(ar, skb);
+}
+
+
+static inline void ath6kl_htc_rx_complete(struct ath6kl *ar,
+                                          struct sk_buff *skb, u8 pipe)
+{
+        ar->htc_ops->rx_complete(ar, skb, pipe);
+}
+
+
+#endif
diff --git a/drivers/net/wireless/ath/ath6kl/htc.h b/drivers/net/wireless/ath/ath6kl/htc.h
index 5027ccc36b62..a2c8ff809793 100644
--- a/drivers/net/wireless/ath/ath6kl/htc.h
+++ b/drivers/net/wireless/ath/ath6kl/htc.h
@@ -25,6 +25,7 @@
 /* send direction */
 #define HTC_FLAGS_NEED_CREDIT_UPDATE (1 << 0)
 #define HTC_FLAGS_SEND_BUNDLE        (1 << 1)
+#define HTC_FLAGS_TX_FIXUP_NETBUF    (1 << 2)
 
 /* receive direction */
 #define HTC_FLG_RX_UNUSED        (1 << 0)
@@ -56,6 +57,10 @@
 #define HTC_CONN_FLGS_THRESH_LVL_THREE_QUAT     0x2
 #define HTC_CONN_FLGS_REDUCE_CRED_DRIB          0x4
 #define HTC_CONN_FLGS_THRESH_MASK               0x3
+/* disable credit flow control on a specific service */
+#define HTC_CONN_FLGS_DISABLE_CRED_FLOW_CTRL          (1 << 3)
+#define HTC_CONN_FLGS_SET_RECV_ALLOC_SHIFT    8
+#define HTC_CONN_FLGS_SET_RECV_ALLOC_MASK     0xFF00
 
 /* connect response status codes */
 #define HTC_SERVICE_SUCCESS      0
@@ -75,6 +80,7 @@
 #define HTC_RECORD_LOOKAHEAD_BUNDLE 3
 
 #define HTC_SETUP_COMP_FLG_RX_BNDL_EN     (1 << 0)
+#define HTC_SETUP_COMP_FLG_DISABLE_TX_CREDIT_FLOW (1 << 1)
 
 #define MAKE_SERVICE_ID(group, index) \
         (int)(((int)group << 8) | (int)(index))
@@ -109,6 +115,8 @@
 
 /* HTC operational parameters */
 #define HTC_TARGET_RESPONSE_TIMEOUT        2000 /* in ms */
+#define HTC_TARGET_RESPONSE_POLL_WAIT      10
+#define HTC_TARGET_RESPONSE_POLL_COUNT     200
 #define HTC_TARGET_DEBUG_INTR_MASK         0x01
 #define HTC_TARGET_CREDIT_INTR_MASK        0xF0
 
@@ -128,6 +136,7 @@
 
 #define HTC_RECV_WAIT_BUFFERS        (1 << 0)
 #define HTC_OP_STATE_STOPPING        (1 << 0)
+#define HTC_OP_STATE_SETUP_COMPLETE  (1 << 1)
 
 /*
  * The frame header length and message formats defined herein were selected
@@ -311,6 +320,14 @@ struct htc_packet {
 
         void (*completion) (struct htc_target *, struct htc_packet *);
         struct htc_target *context;
+
+        /*
+         * optimization for network-oriented data, the HTC packet
+         * can pass the network buffer corresponding to the HTC packet
+         * lower layers may optimized the transfer knowing this is
+         * a network buffer
+         */
+        struct sk_buff *skb;
 };
 
 enum htc_send_full_action {
@@ -319,12 +336,14 @@ enum htc_send_full_action {
 };
 
 struct htc_ep_callbacks {
+        void (*tx_complete) (struct htc_target *, struct htc_packet *);
         void (*rx) (struct htc_target *, struct htc_packet *);
         void (*rx_refill) (struct htc_target *, enum htc_endpoint_id endpoint);
         enum htc_send_full_action (*tx_full) (struct htc_target *,
                                               struct htc_packet *);
         struct htc_packet *(*rx_allocthresh) (struct htc_target *,
                                               enum htc_endpoint_id, int);
+        void (*tx_comp_multi) (struct htc_target *, struct list_head *);
         int rx_alloc_thresh;
         int rx_refill_thresh;
 };
@@ -502,6 +521,13 @@ struct htc_endpoint {
         u32 conn_flags;
         struct htc_endpoint_stats ep_st;
         u16 tx_drop_packet_threshold;
+
+        struct {
+                u8 pipeid_ul;
+                u8 pipeid_dl;
+                struct list_head tx_lookup_queue;
+                bool tx_credit_flow_enabled;
+        } pipe;
 };
 
 struct htc_control_buffer {
@@ -509,6 +535,42 @@ struct htc_control_buffer {
         u8 *buf;
 };
 
+struct htc_pipe_txcredit_alloc {
+        u16 service_id;
+        u8 credit_alloc;
+};
+
+enum htc_send_queue_result {
+        HTC_SEND_QUEUE_OK = 0,  /* packet was queued */
+        HTC_SEND_QUEUE_DROP = 1,        /* this packet should be dropped */
+};
+
+struct ath6kl_htc_ops {
+        void* (*create)(struct ath6kl *ar);
+        int (*wait_target)(struct htc_target *target);
+        int (*start)(struct htc_target *target);
+        int (*conn_service)(struct htc_target *target,
+                            struct htc_service_connect_req *req,
+                            struct htc_service_connect_resp *resp);
+        int  (*tx)(struct htc_target *target, struct htc_packet *packet);
+        void (*stop)(struct htc_target *target);
+        void (*cleanup)(struct htc_target *target);
+        void (*flush_txep)(struct htc_target *target,
+                           enum htc_endpoint_id endpoint, u16 tag);
+        void (*flush_rx_buf)(struct htc_target *target);
+        void (*activity_changed)(struct htc_target *target,
+                                 enum htc_endpoint_id endpoint,
+                                 bool active);
+        int (*get_rxbuf_num)(struct htc_target *target,
+                             enum htc_endpoint_id endpoint);
+        int (*add_rxbuf_multiple)(struct htc_target *target,
+                                  struct list_head *pktq);
+        int (*credit_setup)(struct htc_target *target,
+                            struct ath6kl_htc_credit_info *cred_info);
+        int (*tx_complete)(struct ath6kl *ar, struct sk_buff *skb);
+        int (*rx_complete)(struct ath6kl *ar, struct sk_buff *skb, u8 pipe);
+};
+
 struct ath6kl_device;
 
 /* our HTC target state */
@@ -557,36 +619,19 @@ struct htc_target {
 
         /* counts the number of Tx without bundling continously per AC */
         u32 ac_tx_count[WMM_NUM_AC];
+
+        struct {
+                struct htc_packet *htc_packet_pool;
+                u8 ctrl_response_buf[HTC_MAX_CTRL_MSG_LEN];
+                int ctrl_response_len;
+                bool ctrl_response_valid;
+                struct htc_pipe_txcredit_alloc txcredit_alloc[ENDPOINT_MAX];
+        } pipe;
 };
 
-void *ath6kl_htc_create(struct ath6kl *ar);
-void ath6kl_htc_set_credit_dist(struct htc_target *target,
-                                struct ath6kl_htc_credit_info *cred_info,
-                                u16 svc_pri_order[], int len);
-int ath6kl_htc_wait_target(struct htc_target *target);
-int ath6kl_htc_start(struct htc_target *target);
-int ath6kl_htc_conn_service(struct htc_target *target,
-                            struct htc_service_connect_req *req,
-                            struct htc_service_connect_resp *resp);
-int ath6kl_htc_tx(struct htc_target *target, struct htc_packet *packet);
-void ath6kl_htc_stop(struct htc_target *target);
-void ath6kl_htc_cleanup(struct htc_target *target);
-void ath6kl_htc_flush_txep(struct htc_target *target,
-                           enum htc_endpoint_id endpoint, u16 tag);
-void ath6kl_htc_flush_rx_buf(struct htc_target *target);
-void ath6kl_htc_indicate_activity_change(struct htc_target *target,
-                                         enum htc_endpoint_id endpoint,
-                                         bool active);
-int ath6kl_htc_get_rxbuf_num(struct htc_target *target,
-                             enum htc_endpoint_id endpoint);
-int ath6kl_htc_add_rxbuf_multiple(struct htc_target *target,
-                                  struct list_head *pktq);
 int ath6kl_htc_rxmsg_pending_handler(struct htc_target *target,
                                      u32 msg_look_ahead, int *n_pkts);
 
-int ath6kl_credit_setup(void *htc_handle,
-                        struct ath6kl_htc_credit_info *cred_info);
-
 static inline void set_htc_pkt_info(struct htc_packet *packet, void *context,
                                     u8 *buf, unsigned int len,
                                     enum htc_endpoint_id eid, u16 tag)
@@ -626,4 +671,7 @@ static inline int get_queue_depth(struct list_head *queue)
         return depth;
 }
 
+void ath6kl_htc_pipe_attach(struct ath6kl *ar);
+void ath6kl_htc_mbox_attach(struct ath6kl *ar);
+
 #endif
diff --git a/drivers/net/wireless/ath/ath6kl/htc.c b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
index 4849d99cce77..065e61516d7a 100644
--- a/drivers/net/wireless/ath/ath6kl/htc.c
+++ b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
@@ -23,6 +23,14 @@
 
 #define CALC_TXRX_PADDED_LEN(dev, len)  (__ALIGN_MASK((len), (dev)->block_mask))
 
+static void ath6kl_htc_mbox_cleanup(struct htc_target *target);
+static void ath6kl_htc_mbox_stop(struct htc_target *target);
+static int ath6kl_htc_mbox_add_rxbuf_multiple(struct htc_target *target,
+                                              struct list_head *pkt_queue);
+static void ath6kl_htc_set_credit_dist(struct htc_target *target,
+                                       struct ath6kl_htc_credit_info *cred_info,
+                                       u16 svc_pri_order[], int len);
+
 /* threshold to re-enable Tx bundling for an AC*/
 #define TX_RESUME_BUNDLE_THRESHOLD      1500
 
@@ -130,8 +138,8 @@ static void ath6kl_credit_init(struct ath6kl_htc_credit_info *cred_info,
 }
 
 /* initialize and setup credit distribution */
-int ath6kl_credit_setup(void *htc_handle,
-                        struct ath6kl_htc_credit_info *cred_info)
+static int ath6kl_htc_mbox_credit_setup(struct htc_target *htc_target,
+                               struct ath6kl_htc_credit_info *cred_info)
 {
         u16 servicepriority[5];
 
@@ -144,7 +152,7 @@ int ath6kl_credit_setup(void *htc_handle,
         servicepriority[4] = WMI_DATA_BK_SVC; /* lowest */
 
         /* set priority list */
-        ath6kl_htc_set_credit_dist(htc_handle, cred_info, servicepriority, 5);
+        ath6kl_htc_set_credit_dist(htc_target, cred_info, servicepriority, 5);
 
         return 0;
 }
@@ -432,7 +440,7 @@ static void htc_tx_complete(struct htc_endpoint *endpoint,
                    "htc tx complete ep %d pkts %d\n",
                    endpoint->eid, get_queue_depth(txq));
 
-        ath6kl_tx_complete(endpoint->target->dev->ar, txq);
+        ath6kl_tx_complete(endpoint->target, txq);
 }
 
 static void htc_tx_comp_handler(struct htc_target *target,
@@ -1065,7 +1073,7 @@ static int htc_setup_tx_complete(struct htc_target *target)
         return status;
 }
 
-void ath6kl_htc_set_credit_dist(struct htc_target *target,
+static void ath6kl_htc_set_credit_dist(struct htc_target *target,
                                 struct ath6kl_htc_credit_info *credit_info,
                                 u16 srvc_pri_order[], int list_len)
 {
@@ -1093,7 +1101,8 @@ void ath6kl_htc_set_credit_dist(struct htc_target *target,
         }
 }
 
-int ath6kl_htc_tx(struct htc_target *target, struct htc_packet *packet)
+static int ath6kl_htc_mbox_tx(struct htc_target *target,
+                              struct htc_packet *packet)
 {
         struct htc_endpoint *endpoint;
         struct list_head queue;
@@ -1121,7 +1130,7 @@ int ath6kl_htc_tx(struct htc_target *target, struct htc_packet *packet)
 }
 
 /* flush endpoint TX queue */
-void ath6kl_htc_flush_txep(struct htc_target *target,
+static void ath6kl_htc_mbox_flush_txep(struct htc_target *target,
                            enum htc_endpoint_id eid, u16 tag)
 {
         struct htc_packet *packet, *tmp_pkt;
@@ -1173,12 +1182,13 @@ static void ath6kl_htc_flush_txep_all(struct htc_target *target)
                 if (endpoint->svc_id == 0)
                         /* not in use.. */
                         continue;
-                ath6kl_htc_flush_txep(target, i, HTC_TX_PACKET_TAG_ALL);
+                ath6kl_htc_mbox_flush_txep(target, i, HTC_TX_PACKET_TAG_ALL);
         }
 }
 
-void ath6kl_htc_indicate_activity_change(struct htc_target *target,
-                                         enum htc_endpoint_id eid, bool active)
+static void ath6kl_htc_mbox_activity_changed(struct htc_target *target,
+                                             enum htc_endpoint_id eid,
+                                             bool active)
 {
         struct htc_endpoint *endpoint = &target->endpoint[eid];
         bool dist = false;
@@ -1246,7 +1256,7 @@ static int htc_add_rxbuf(struct htc_target *target, struct htc_packet *packet)
 
         INIT_LIST_HEAD(&queue);
         list_add_tail(&packet->list, &queue);
-        return ath6kl_htc_add_rxbuf_multiple(target, &queue);
+        return ath6kl_htc_mbox_add_rxbuf_multiple(target, &queue);
 }
 
 static void htc_reclaim_rxbuf(struct htc_target *target,
@@ -1353,7 +1363,9 @@ static int ath6kl_htc_rx_setup(struct htc_target *target,
                                         sizeof(*htc_hdr));
 
         if (!htc_valid_rx_frame_len(target, ep->eid, full_len)) {
-                ath6kl_warn("Rx buffer requested with invalid length\n");
+                ath6kl_warn("Rx buffer requested with invalid length htc_hdr:eid %d, flags 0x%x, len %d\n",
+                            htc_hdr->eid, htc_hdr->flags,
+                            le16_to_cpu(htc_hdr->payld_len));
                 return -EINVAL;
         }
 
@@ -2288,7 +2300,7 @@ fail_ctrl_rx:
         return NULL;
 }
 
-int ath6kl_htc_add_rxbuf_multiple(struct htc_target *target,
+static int ath6kl_htc_mbox_add_rxbuf_multiple(struct htc_target *target,
                                   struct list_head *pkt_queue)
 {
         struct htc_endpoint *endpoint;
@@ -2350,7 +2362,7 @@ int ath6kl_htc_add_rxbuf_multiple(struct htc_target *target,
         return status;
 }
 
-void ath6kl_htc_flush_rx_buf(struct htc_target *target)
+static void ath6kl_htc_mbox_flush_rx_buf(struct htc_target *target)
 {
         struct htc_endpoint *endpoint;
         struct htc_packet *packet, *tmp_pkt;
@@ -2392,7 +2404,7 @@ void ath6kl_htc_flush_rx_buf(struct htc_target *target)
         }
 }
 
-int ath6kl_htc_conn_service(struct htc_target *target,
+static int ath6kl_htc_mbox_conn_service(struct htc_target *target,
                             struct htc_service_connect_req *conn_req,
                             struct htc_service_connect_resp *conn_resp)
 {
@@ -2564,7 +2576,7 @@ static void reset_ep_state(struct htc_target *target)
         INIT_LIST_HEAD(&target->cred_dist_list);
 }
 
-int ath6kl_htc_get_rxbuf_num(struct htc_target *target,
+static int ath6kl_htc_mbox_get_rxbuf_num(struct htc_target *target,
                              enum htc_endpoint_id endpoint)
 {
         int num;
@@ -2624,7 +2636,7 @@ static void htc_setup_msg_bndl(struct htc_target *target)
         }
 }
 
-int ath6kl_htc_wait_target(struct htc_target *target)
+static int ath6kl_htc_mbox_wait_target(struct htc_target *target)
 {
         struct htc_packet *packet = NULL;
         struct htc_ready_ext_msg *rdy_msg;
@@ -2693,12 +2705,12 @@ int ath6kl_htc_wait_target(struct htc_target *target)
         connect.svc_id = HTC_CTRL_RSVD_SVC;
 
         /* connect fake service */
-        status = ath6kl_htc_conn_service((void *)target, &connect, &resp);
+        status = ath6kl_htc_mbox_conn_service((void *)target, &connect, &resp);
 
         if (status)
                 /*
                  * FIXME: this call doesn't make sense, the caller should
-                 * call ath6kl_htc_cleanup() when it wants remove htc
+                 * call ath6kl_htc_mbox_cleanup() when it wants remove htc
                  */
                 ath6kl_hif_cleanup_scatter(target->dev->ar);
 
@@ -2715,7 +2727,7 @@ fail_wait_target:
  * Start HTC, enable interrupts and let the target know
  * host has finished setup.
  */
-int ath6kl_htc_start(struct htc_target *target)
+static int ath6kl_htc_mbox_start(struct htc_target *target)
 {
         struct htc_packet *packet;
         int status;
@@ -2752,7 +2764,7 @@ int ath6kl_htc_start(struct htc_target *target)
         status = ath6kl_hif_unmask_intrs(target->dev);
 
         if (status)
-                ath6kl_htc_stop(target);
+                ath6kl_htc_mbox_stop(target);
 
         return status;
 }
@@ -2796,7 +2808,7 @@ static int ath6kl_htc_reset(struct htc_target *target)
 }
 
 /* htc_stop: stop interrupt reception, and flush all queued buffers */
-void ath6kl_htc_stop(struct htc_target *target)
+static void ath6kl_htc_mbox_stop(struct htc_target *target)
 {
         spin_lock_bh(&target->htc_lock);
         target->htc_flags |= HTC_OP_STATE_STOPPING;
@@ -2811,12 +2823,12 @@ void ath6kl_htc_stop(struct htc_target *target)
 
         ath6kl_htc_flush_txep_all(target);
 
-        ath6kl_htc_flush_rx_buf(target);
+        ath6kl_htc_mbox_flush_rx_buf(target);
 
         ath6kl_htc_reset(target);
 }
 
-void *ath6kl_htc_create(struct ath6kl *ar)
+static void *ath6kl_htc_mbox_create(struct ath6kl *ar)
 {
         struct htc_target *target = NULL;
         int status = 0;
@@ -2857,13 +2869,13 @@ void *ath6kl_htc_create(struct ath6kl *ar)
         return target;
 
 err_htc_cleanup:
-        ath6kl_htc_cleanup(target);
+        ath6kl_htc_mbox_cleanup(target);
 
         return NULL;
 }
 
 /* cleanup the HTC instance */
-void ath6kl_htc_cleanup(struct htc_target *target)
+static void ath6kl_htc_mbox_cleanup(struct htc_target *target)
 {
         struct htc_packet *packet, *tmp_packet;
 
@@ -2888,3 +2900,24 @@ void ath6kl_htc_cleanup(struct htc_target *target)
         kfree(target->dev);
         kfree(target);
 }
+
+static const struct ath6kl_htc_ops ath6kl_htc_mbox_ops = {
+        .create = ath6kl_htc_mbox_create,
+        .wait_target = ath6kl_htc_mbox_wait_target,
+        .start = ath6kl_htc_mbox_start,
+        .conn_service = ath6kl_htc_mbox_conn_service,
+        .tx = ath6kl_htc_mbox_tx,
+        .stop = ath6kl_htc_mbox_stop,
+        .cleanup = ath6kl_htc_mbox_cleanup,
+        .flush_txep = ath6kl_htc_mbox_flush_txep,
+        .flush_rx_buf = ath6kl_htc_mbox_flush_rx_buf,
+        .activity_changed = ath6kl_htc_mbox_activity_changed,
+        .get_rxbuf_num = ath6kl_htc_mbox_get_rxbuf_num,
+        .add_rxbuf_multiple = ath6kl_htc_mbox_add_rxbuf_multiple,
+        .credit_setup = ath6kl_htc_mbox_credit_setup,
+};
+
+void ath6kl_htc_mbox_attach(struct ath6kl *ar)
+{
+        ar->htc_ops = &ath6kl_htc_mbox_ops;
+}
diff --git a/drivers/net/wireless/ath/ath6kl/htc_pipe.c b/drivers/net/wireless/ath/ath6kl/htc_pipe.c
new file mode 100644
index 000000000000..b277b3446882
--- /dev/null
+++ b/drivers/net/wireless/ath/ath6kl/htc_pipe.c
@@ -0,0 +1,1713 @@
+/*
+ * Copyright (c) 2007-2011 Atheros Communications Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "core.h"
+#include "debug.h"
+#include "hif-ops.h"
+
+#define HTC_PACKET_CONTAINER_ALLOCATION 32
+#define HTC_CONTROL_BUFFER_SIZE (HTC_MAX_CTRL_MSG_LEN + HTC_HDR_LENGTH)
+
+static int ath6kl_htc_pipe_tx(struct htc_target *handle,
+                              struct htc_packet *packet);
+static void ath6kl_htc_pipe_cleanup(struct htc_target *handle);
+
+/* htc pipe tx path */
+static inline void restore_tx_packet(struct htc_packet *packet)
+{
+        if (packet->info.tx.flags & HTC_FLAGS_TX_FIXUP_NETBUF) {
+                skb_pull(packet->skb, sizeof(struct htc_frame_hdr));
+                packet->info.tx.flags &= ~HTC_FLAGS_TX_FIXUP_NETBUF;
+        }
+}
+
+static void do_send_completion(struct htc_endpoint *ep,
+                               struct list_head *queue_to_indicate)
+{
+        struct htc_packet *packet;
+
+        if (list_empty(queue_to_indicate)) {
+                /* nothing to indicate */
+                return;
+        }
+
+        if (ep->ep_cb.tx_comp_multi != NULL) {
+                ath6kl_dbg(ATH6KL_DBG_HTC,
+                           "%s: calling ep %d, send complete multiple callback (%d pkts)\n",
+                           __func__, ep->eid,
+                           get_queue_depth(queue_to_indicate));
+                /*
+                 * a multiple send complete handler is being used,
+                 * pass the queue to the handler
+                 */
+                ep->ep_cb.tx_comp_multi(ep->target, queue_to_indicate);
+                /*
+                 * all packets are now owned by the callback,
+                 * reset queue to be safe
+                 */
+                INIT_LIST_HEAD(queue_to_indicate);
+        } else {
+                /* using legacy EpTxComplete */
+                do {
+                        packet = list_first_entry(queue_to_indicate,
+                                                  struct htc_packet, list);
+
+                        list_del(&packet->list);
+                        ath6kl_dbg(ATH6KL_DBG_HTC,
+                                   "%s: calling ep %d send complete callback on packet 0x%p\n",
+                                   __func__, ep->eid, packet);
+                        ep->ep_cb.tx_complete(ep->target, packet);
+                } while (!list_empty(queue_to_indicate));
+        }
+}
+
+static void send_packet_completion(struct htc_target *target,
+                                   struct htc_packet *packet)
+{
+        struct htc_endpoint *ep = &target->endpoint[packet->endpoint];
+        struct list_head container;
+
+        restore_tx_packet(packet);
+        INIT_LIST_HEAD(&container);
+        list_add_tail(&packet->list, &container);
+
+        /* do completion */
+        do_send_completion(ep, &container);
+}
+
+static void get_htc_packet_credit_based(struct htc_target *target,
+                                        struct htc_endpoint *ep,
+                                        struct list_head *queue)
+{
+        int credits_required;
+        int remainder;
+        u8 send_flags;
+        struct htc_packet *packet;
+        unsigned int transfer_len;
+
+        /* NOTE : the TX lock is held when this function is called */
+
+        /* loop until we can grab as many packets out of the queue as we can */
+        while (true) {
+                send_flags = 0;
+                if (list_empty(&ep->txq))
+                        break;
+
+                /* get packet at head, but don't remove it */
+                packet = list_first_entry(&ep->txq, struct htc_packet, list);
+                if (packet == NULL)
+                        break;
+
+                ath6kl_dbg(ATH6KL_DBG_HTC,
+                           "%s: got head packet:0x%p , queue depth: %d\n",
+                           __func__, packet, get_queue_depth(&ep->txq));
+
+                transfer_len = packet->act_len + HTC_HDR_LENGTH;
+
+                if (transfer_len <= target->tgt_cred_sz) {
+                        credits_required = 1;
+                } else {
+                        /* figure out how many credits this message requires */
+                        credits_required = transfer_len / target->tgt_cred_sz;
+                        remainder = transfer_len % target->tgt_cred_sz;
+
+                        if (remainder)
+                                credits_required++;
+                }
+
+                ath6kl_dbg(ATH6KL_DBG_HTC, "%s: creds required:%d got:%d\n",
+                           __func__, credits_required, ep->cred_dist.credits);
+
+                if (ep->eid == ENDPOINT_0) {
+                        /*
+                         * endpoint 0 is special, it always has a credit and
+                         * does not require credit based flow control
+                         */
+                        credits_required = 0;
+
+                } else {
+
+                        if (ep->cred_dist.credits < credits_required)
+                                break;
+
+                        ep->cred_dist.credits -= credits_required;
+                        ep->ep_st.cred_cosumd += credits_required;
+
+                        /* check if we need credits back from the target */
+                        if (ep->cred_dist.credits <
+                                        ep->cred_dist.cred_per_msg) {
+                                /* tell the target we need credits ASAP! */
+                                send_flags |= HTC_FLAGS_NEED_CREDIT_UPDATE;
+                                ep->ep_st.cred_low_indicate += 1;
+                                ath6kl_dbg(ATH6KL_DBG_HTC,
+                                           "%s: host needs credits\n",
+                                           __func__);
+                        }
+                }
+
+                /* now we can fully dequeue */
+                packet = list_first_entry(&ep->txq, struct htc_packet, list);
+
+                list_del(&packet->list);
+                /* save the number of credits this packet consumed */
+                packet->info.tx.cred_used = credits_required;
+                /* save send flags */
+                packet->info.tx.flags = send_flags;
+                packet->info.tx.seqno = ep->seqno;
+                ep->seqno++;
+                /* queue this packet into the caller's queue */
+                list_add_tail(&packet->list, queue);
+        }
+
+}
+
+static void get_htc_packet(struct htc_target *target,
+                           struct htc_endpoint *ep,
+                           struct list_head *queue, int resources)
+{
+        struct htc_packet *packet;
+
+        /* NOTE : the TX lock is held when this function is called */
+
+        /* loop until we can grab as many packets out of the queue as we can */
+        while (resources) {
+                if (list_empty(&ep->txq))
+                        break;
+
+                packet = list_first_entry(&ep->txq, struct htc_packet, list);
+                list_del(&packet->list);
+
+                ath6kl_dbg(ATH6KL_DBG_HTC,
+                           "%s: got packet:0x%p , new queue depth: %d\n",
+                           __func__, packet, get_queue_depth(&ep->txq));
+                packet->info.tx.seqno = ep->seqno;
+                packet->info.tx.flags = 0;
+                packet->info.tx.cred_used = 0;
+                ep->seqno++;
+
+                /* queue this packet into the caller's queue */
+                list_add_tail(&packet->list, queue);
+                resources--;
+        }
+}
+
+static int htc_issue_packets(struct htc_target *target,
+                             struct htc_endpoint *ep,
+                             struct list_head *pkt_queue)
+{
+        int status = 0;
+        u16 payload_len;
+        struct sk_buff *skb;
+        struct htc_frame_hdr *htc_hdr;
+        struct htc_packet *packet;
+
+        ath6kl_dbg(ATH6KL_DBG_HTC,
+                   "%s: queue: 0x%p, pkts %d\n", __func__,
+                   pkt_queue, get_queue_depth(pkt_queue));
+
+        while (!list_empty(pkt_queue)) {
+                packet = list_first_entry(pkt_queue, struct htc_packet, list);
+                list_del(&packet->list);
+
+                skb = packet->skb;
+                if (!skb) {
+                        WARN_ON_ONCE(1);
+                        status = -EINVAL;
+                        break;
+                }
+
+                payload_len = packet->act_len;
+
+                /* setup HTC frame header */
+                htc_hdr = (struct htc_frame_hdr *) skb_push(skb,
+                                                            sizeof(*htc_hdr));
+                if (!htc_hdr) {
+                        WARN_ON_ONCE(1);
+                        status = -EINVAL;
+                        break;
+                }
+
+                packet->info.tx.flags |= HTC_FLAGS_TX_FIXUP_NETBUF;
+
+                /* Endianess? */
+                put_unaligned((u16) payload_len, &htc_hdr->payld_len);
+                htc_hdr->flags = packet->info.tx.flags;
+                htc_hdr->eid = (u8) packet->endpoint;
+                htc_hdr->ctrl[0] = 0;
+                htc_hdr->ctrl[1] = (u8) packet->info.tx.seqno;
+
+                spin_lock_bh(&target->tx_lock);
+
+                /* store in look up queue to match completions */
+                list_add_tail(&packet->list, &ep->pipe.tx_lookup_queue);
+                ep->ep_st.tx_issued += 1;
+                spin_unlock_bh(&target->tx_lock);
+
+                status = ath6kl_hif_pipe_send(target->dev->ar,
+                                              ep->pipe.pipeid_ul, NULL, skb);
+
+                if (status != 0) {
+                        if (status != -ENOMEM) {
+                                /* TODO: if more than 1 endpoint maps to the
+                                 * same PipeID, it is possible to run out of
+                                 * resources in the HIF layer.
+                                 * Don't emit the error
+                                 */
+                                ath6kl_dbg(ATH6KL_DBG_HTC,
+                                           "%s: failed status:%d\n",
+                                           __func__, status);
+                        }
+                        spin_lock_bh(&target->tx_lock);
+                        list_del(&packet->list);
+
+                        /* reclaim credits */
+                        ep->cred_dist.credits += packet->info.tx.cred_used;
+                        spin_unlock_bh(&target->tx_lock);
+
+                        /* put it back into the callers queue */
+                        list_add(&packet->list, pkt_queue);
+                        break;
+                }
+
+        }
+
+        if (status != 0) {
+                while (!list_empty(pkt_queue)) {
+                        if (status != -ENOMEM) {
+                                ath6kl_dbg(ATH6KL_DBG_HTC,
+                                           "%s: failed pkt:0x%p status:%d\n",
+                                           __func__, packet, status);
+                        }
+
+                        packet = list_first_entry(pkt_queue,
+                                                  struct htc_packet, list);
+                        list_del(&packet->list);
+                        packet->status = status;
+                        send_packet_completion(target, packet);
+                }
+        }
+
+        return status;
+}
+
+static enum htc_send_queue_result htc_try_send(struct htc_target *target,
+                                               struct htc_endpoint *ep,
+                                               struct list_head *txq)
+{
+        struct list_head send_queue;    /* temp queue to hold packets */
+        struct htc_packet *packet, *tmp_pkt;
+        struct ath6kl *ar = target->dev->ar;
+        enum htc_send_full_action action;
+        int tx_resources, overflow, txqueue_depth, i, good_pkts;
+        u8 pipeid;
+
+        ath6kl_dbg(ATH6KL_DBG_HTC, "%s: (queue:0x%p depth:%d)\n",
+                   __func__, txq,
+                   (txq == NULL) ? 0 : get_queue_depth(txq));
+
+        /* init the local send queue */
+        INIT_LIST_HEAD(&send_queue);
+
+        /*
+         * txq equals to NULL means
+         * caller didn't provide a queue, just wants us to
+         * check queues and send
+         */
+        if (txq != NULL) {
+                if (list_empty(txq)) {
+                        /* empty queue */
+                        return HTC_SEND_QUEUE_DROP;
+                }
+
+                spin_lock_bh(&target->tx_lock);
+                txqueue_depth = get_queue_depth(&ep->txq);
+                spin_unlock_bh(&target->tx_lock);
+
+                if (txqueue_depth >= ep->max_txq_depth) {
+                        /* we've already overflowed */
+                        overflow = get_queue_depth(txq);
+                } else {
+                        /* get how much we will overflow by */
+                        overflow = txqueue_depth;
+                        overflow += get_queue_depth(txq);
+                        /* get how much we will overflow the TX queue by */
+                        overflow -= ep->max_txq_depth;
+                }
+
+                /* if overflow is negative or zero, we are okay */
+                if (overflow > 0) {
+                        ath6kl_dbg(ATH6KL_DBG_HTC,
+                                   "%s: Endpoint %d, TX queue will overflow :%d, Tx Depth:%d, Max:%d\n",
+                                   __func__, ep->eid, overflow, txqueue_depth,
+                                   ep->max_txq_depth);
+                }
+                if ((overflow <= 0) ||
+                    (ep->ep_cb.tx_full == NULL)) {
+                        /*
+                         * all packets will fit or caller did not provide send
+                         * full indication handler -- just move all of them
+                         * to the local send_queue object
+                         */
+                        list_splice_tail_init(txq, &send_queue);
+                } else {
+                        good_pkts = get_queue_depth(txq) - overflow;
+                        if (good_pkts < 0) {
+                                WARN_ON_ONCE(1);
+                                return HTC_SEND_QUEUE_DROP;
+                        }
+
+                        /* we have overflowed, and a callback is provided */
+                        /* dequeue all non-overflow packets to the sendqueue */
+                        for (i = 0; i < good_pkts; i++) {
+                                /* pop off caller's queue */
+                                packet = list_first_entry(txq,
+                                                          struct htc_packet,
+                                                          list);
+                                list_del(&packet->list);
+                                /* insert into local queue */
+                                list_add_tail(&packet->list, &send_queue);
+                        }
+
+                        /*
+                         * the caller's queue has all the packets that won't fit
+                         * walk through the caller's queue and indicate each to
+                         * the send full handler
+                         */
+                        list_for_each_entry_safe(packet, tmp_pkt,
+                                                 txq, list) {
+
+                                ath6kl_dbg(ATH6KL_DBG_HTC,
+                                           "%s: Indicat overflowed TX pkts: %p\n",
+                                           __func__, packet);
+                                action = ep->ep_cb.tx_full(ep->target, packet);
+                                if (action == HTC_SEND_FULL_DROP) {
+                                        /* callback wants the packet dropped */
+                                        ep->ep_st.tx_dropped += 1;
+
+                                        /* leave this one in the caller's queue
+                                         * for cleanup */
+                                } else {
+                                        /* callback wants to keep this packet,
+                                         * remove from caller's queue */
+                                        list_del(&packet->list);
+                                        /* put it in the send queue */
+                                        list_add_tail(&packet->list,
+                                                      &send_queue);
+                                }
+
+                        }
+
+                        if (list_empty(&send_queue)) {
+                                /* no packets made it in, caller will cleanup */
+                                return HTC_SEND_QUEUE_DROP;
+                        }
+                }
+        }
+
+        if (!ep->pipe.tx_credit_flow_enabled) {
+                tx_resources =
+                    ath6kl_hif_pipe_get_free_queue_number(ar,
+                                                          ep->pipe.pipeid_ul);
+        } else {
+                tx_resources = 0;
+        }
+
+        spin_lock_bh(&target->tx_lock);
+        if (!list_empty(&send_queue)) {
+                /* transfer packets to tail */
+                list_splice_tail_init(&send_queue, &ep->txq);
+                if (!list_empty(&send_queue)) {
+                        WARN_ON_ONCE(1);
+                        spin_unlock_bh(&target->tx_lock);
+                        return HTC_SEND_QUEUE_DROP;
+                }
+                INIT_LIST_HEAD(&send_queue);
+        }
+
+        /* increment tx processing count on entry */
+        ep->tx_proc_cnt++;
+
+        if (ep->tx_proc_cnt > 1) {
+                /*
+                 * Another thread or task is draining the TX queues on this
+                 * endpoint that thread will reset the tx processing count
+                 * when the queue is drained.
+                 */
+                ep->tx_proc_cnt--;
+                spin_unlock_bh(&target->tx_lock);
+                return HTC_SEND_QUEUE_OK;
+        }
+
+        /***** beyond this point only 1 thread may enter ******/
+
+        /*
+         * Now drain the endpoint TX queue for transmission as long as we have
+         * enough transmit resources.
+         */
+        while (true) {
+
+                if (get_queue_depth(&ep->txq) == 0)
+                        break;
+
+                if (ep->pipe.tx_credit_flow_enabled) {
+                        /*
+                         * Credit based mechanism provides flow control
+                         * based on target transmit resource availability,
+                         * we assume that the HIF layer will always have
+                         * bus resources greater than target transmit
+                         * resources.
+                         */
+                        get_htc_packet_credit_based(target, ep, &send_queue);
+                } else {
+                        /*
+                         * Get all packets for this endpoint that we can
+                         * for this pass.
+                         */
+                        get_htc_packet(target, ep, &send_queue, tx_resources);
+                }
+
+                if (get_queue_depth(&send_queue) == 0) {
+                        /*
+                         * Didn't get packets due to out of resources or TX
+                         * queue was drained.
+                         */
+                        break;
+                }
+
+                spin_unlock_bh(&target->tx_lock);
+
+                /* send what we can */
+                htc_issue_packets(target, ep, &send_queue);
+
+                if (!ep->pipe.tx_credit_flow_enabled) {
+                        pipeid = ep->pipe.pipeid_ul;
+                        tx_resources =
+                            ath6kl_hif_pipe_get_free_queue_number(ar, pipeid);
+                }
+
+                spin_lock_bh(&target->tx_lock);
+
+        }
+        /* done with this endpoint, we can clear the count */
+        ep->tx_proc_cnt = 0;
+        spin_unlock_bh(&target->tx_lock);
+
+        return HTC_SEND_QUEUE_OK;
+}
+
+/* htc control packet manipulation */
+static void destroy_htc_txctrl_packet(struct htc_packet *packet)
+{
+        struct sk_buff *skb;
+        skb = packet->skb;
+        if (skb != NULL)
+                dev_kfree_skb(skb);
+
+        kfree(packet);
+}
+
+static struct htc_packet *build_htc_txctrl_packet(void)
+{
+        struct htc_packet *packet = NULL;
+        struct sk_buff *skb;
+
+        packet = kzalloc(sizeof(struct htc_packet), GFP_KERNEL);
+        if (packet == NULL)
+                return NULL;
+
+        skb = __dev_alloc_skb(HTC_CONTROL_BUFFER_SIZE, GFP_KERNEL);
+
+        if (skb == NULL) {
+                kfree(packet);
+                return NULL;
+        }
+        packet->skb = skb;
+
+        return packet;
+}
+
+static void htc_free_txctrl_packet(struct htc_target *target,
+                                   struct htc_packet *packet)
+{
+        destroy_htc_txctrl_packet(packet);
+}
+
+static struct htc_packet *htc_alloc_txctrl_packet(struct htc_target *target)
+{
+        return build_htc_txctrl_packet();
+}
+
+static void htc_txctrl_complete(struct htc_target *target,
+                                struct htc_packet *packet)
+{
+        htc_free_txctrl_packet(target, packet);
+}
+
+#define MAX_MESSAGE_SIZE 1536
+
+static int htc_setup_target_buffer_assignments(struct htc_target *target)
+{
+        int status, credits, credit_per_maxmsg, i;
+        struct htc_pipe_txcredit_alloc *entry;
+        unsigned int hif_usbaudioclass = 0;
+
+        credit_per_maxmsg = MAX_MESSAGE_SIZE / target->tgt_cred_sz;
+        if (MAX_MESSAGE_SIZE % target->tgt_cred_sz)
+                credit_per_maxmsg++;
+
+        /* TODO, this should be configured by the caller! */
+
+        credits = target->tgt_creds;
+        entry = &target->pipe.txcredit_alloc[0];
+
+        status = -ENOMEM;
+
+        /* FIXME: hif_usbaudioclass is always zero */
+        if (hif_usbaudioclass) {
+                ath6kl_dbg(ATH6KL_DBG_HTC,
+                           "%s: For USB Audio Class- Total:%d\n",
+                           __func__, credits);
+                entry++;
+                entry++;
+                /* Setup VO Service To have Max Credits */
+                entry->service_id = WMI_DATA_VO_SVC;
+                entry->credit_alloc = (credits - 6);
+                if (entry->credit_alloc == 0)
+                        entry->credit_alloc++;
+
+                credits -= (int) entry->credit_alloc;
+                if (credits <= 0)
+                        return status;
+
+                entry++;
+                entry->service_id = WMI_CONTROL_SVC;
+                entry->credit_alloc = credit_per_maxmsg;
+                credits -= (int) entry->credit_alloc;
+                if (credits <= 0)
+                        return status;
+
+                /* leftovers go to best effort */
+                entry++;
+                entry++;
+                entry->service_id = WMI_DATA_BE_SVC;
+                entry->credit_alloc = (u8) credits;
+                status = 0;
+        } else {
+                entry++;
+                entry->service_id = WMI_DATA_VI_SVC;
+                entry->credit_alloc = credits / 4;
+                if (entry->credit_alloc == 0)
+                        entry->credit_alloc++;
+
+                credits -= (int) entry->credit_alloc;
+                if (credits <= 0)
+                        return status;
+
+                entry++;
+                entry->service_id = WMI_DATA_VO_SVC;
+                entry->credit_alloc = credits / 4;
+                if (entry->credit_alloc == 0)
+                        entry->credit_alloc++;
+
+                credits -= (int) entry->credit_alloc;
+                if (credits <= 0)
+                        return status;
+
+                entry++;
+                entry->service_id = WMI_CONTROL_SVC;
+                entry->credit_alloc = credit_per_maxmsg;
+                credits -= (int) entry->credit_alloc;
+                if (credits <= 0)
+                        return status;
+
+                entry++;
+                entry->service_id = WMI_DATA_BK_SVC;
+                entry->credit_alloc = credit_per_maxmsg;
+                credits -= (int) entry->credit_alloc;
+                if (credits <= 0)
+                        return status;
+
+                /* leftovers go to best effort */
+                entry++;
+                entry->service_id = WMI_DATA_BE_SVC;
+                entry->credit_alloc = (u8) credits;
+                status = 0;
+        }
+
+        if (status == 0) {
+                for (i = 0; i < ENDPOINT_MAX; i++) {
+                        if (target->pipe.txcredit_alloc[i].service_id != 0) {
+                                ath6kl_dbg(ATH6KL_DBG_HTC,
+                                           "HTC Service Index : %d TX : 0x%2.2X : alloc:%d\n",
+                                           i,
+                                           target->pipe.txcredit_alloc[i].
+                                           service_id,
+                                           target->pipe.txcredit_alloc[i].
+                                           credit_alloc);
+                        }
+                }
+        }
+        return status;
+}
+
+/* process credit reports and call distribution function */
+static void htc_process_credit_report(struct htc_target *target,
+                                      struct htc_credit_report *rpt,
+                                      int num_entries,
+                                      enum htc_endpoint_id from_ep)
+{
+        int total_credits = 0, i;
+        struct htc_endpoint *ep;
+
+        /* lock out TX while we update credits */
+        spin_lock_bh(&target->tx_lock);
+
+        for (i = 0; i < num_entries; i++, rpt++) {
+                if (rpt->eid >= ENDPOINT_MAX) {
+                        WARN_ON_ONCE(1);
+                        spin_unlock_bh(&target->tx_lock);
+                        return;
+                }
+
+                ep = &target->endpoint[rpt->eid];
+                ep->cred_dist.credits += rpt->credits;
+
+                if (ep->cred_dist.credits && get_queue_depth(&ep->txq)) {
+                        spin_unlock_bh(&target->tx_lock);
+                        htc_try_send(target, ep, NULL);
+                        spin_lock_bh(&target->tx_lock);
+                }
+
+                total_credits += rpt->credits;
+        }
+        ath6kl_dbg(ATH6KL_DBG_HTC,
+                   "Report indicated %d credits to distribute\n",
+                   total_credits);
+
+        spin_unlock_bh(&target->tx_lock);
+}
+
+/* flush endpoint TX queue */
+static void htc_flush_tx_endpoint(struct htc_target *target,
+                                  struct htc_endpoint *ep, u16 tag)
+{
+        struct htc_packet *packet;
+
+        spin_lock_bh(&target->tx_lock);
+        while (get_queue_depth(&ep->txq)) {
+                packet = list_first_entry(&ep->txq, struct htc_packet, list);
+                list_del(&packet->list);
+                packet->status = 0;
+                send_packet_completion(target, packet);
+        }
+        spin_unlock_bh(&target->tx_lock);
+}
+
+/*
+ * In the adapted HIF layer, struct sk_buff * are passed between HIF and HTC,
+ * since upper layers expects struct htc_packet containers we use the completed
+ * skb and lookup it's corresponding HTC packet buffer from a lookup list.
+ * This is extra overhead that can be fixed by re-aligning HIF interfaces with
+ * HTC.
+ */
+static struct htc_packet *htc_lookup_tx_packet(struct htc_target *target,
+                                               struct htc_endpoint *ep,
+                                               struct sk_buff *skb)
+{
+        struct htc_packet *packet, *tmp_pkt, *found_packet = NULL;
+
+        spin_lock_bh(&target->tx_lock);
+
+        /*
+         * interate from the front of tx lookup queue
+         * this lookup should be fast since lower layers completes in-order and
+         * so the completed packet should be at the head of the list generally
+         */
+        list_for_each_entry_safe(packet, tmp_pkt, &ep->pipe.tx_lookup_queue,
+                                 list) {
+                /* check for removal */
+                if (skb == packet->skb) {
+                        /* found it */
+                        list_del(&packet->list);
+                        found_packet = packet;
+                        break;
+                }
+        }
+
+        spin_unlock_bh(&target->tx_lock);
+
+        return found_packet;
+}
+
+static int ath6kl_htc_pipe_tx_complete(struct ath6kl *ar, struct sk_buff *skb)
+{
+        struct htc_target *target = ar->htc_target;
+        struct htc_frame_hdr *htc_hdr;
+        struct htc_endpoint *ep;
+        struct htc_packet *packet;
+        u8 ep_id, *netdata;
+        u32 netlen;
+
+        netdata = skb->data;
+        netlen = skb->len;
+
+        htc_hdr = (struct htc_frame_hdr *) netdata;
+
+        ep_id = htc_hdr->eid;
+        ep = &target->endpoint[ep_id];
+
+        packet = htc_lookup_tx_packet(target, ep, skb);
+        if (packet == NULL) {
+                /* may have already been flushed and freed */
+                ath6kl_err("HTC TX lookup failed!\n");
+        } else {
+                /* will be giving this buffer back to upper layers */
+                packet->status = 0;
+                send_packet_completion(target, packet);
+        }
+        skb = NULL;
+
+        if (!ep->pipe.tx_credit_flow_enabled) {
+                /*
+                 * note: when using TX credit flow, the re-checking of queues
+                 * happens when credits flow back from the target. in the
+                 * non-TX credit case, we recheck after the packet completes
+                 */
+                htc_try_send(target, ep, NULL);
+        }
+
+        return 0;
+}
+
+static int htc_send_packets_multiple(struct htc_target *target,
+                                     struct list_head *pkt_queue)
+{
+        struct htc_endpoint *ep;
+        struct htc_packet *packet, *tmp_pkt;
+
+        if (list_empty(pkt_queue))
+                return -EINVAL;
+
+        /* get first packet to find out which ep the packets will go into */
+        packet = list_first_entry(pkt_queue, struct htc_packet, list);
+        if (packet == NULL)
+                return -EINVAL;
+
+        if (packet->endpoint >= ENDPOINT_MAX) {
+                WARN_ON_ONCE(1);
+                return -EINVAL;
+        }
+        ep = &target->endpoint[packet->endpoint];
+
+        htc_try_send(target, ep, pkt_queue);
+
+        /* do completion on any packets that couldn't get in */
+        if (!list_empty(pkt_queue)) {
+                list_for_each_entry_safe(packet, tmp_pkt, pkt_queue, list) {
+                        packet->status = -ENOMEM;
+                }
+
+                do_send_completion(ep, pkt_queue);
+        }
+
+        return 0;
+}
+
+/* htc pipe rx path */
+static struct htc_packet *alloc_htc_packet_container(struct htc_target *target)
+{
+        struct htc_packet *packet;
+        spin_lock_bh(&target->rx_lock);
+
+        if (target->pipe.htc_packet_pool == NULL) {
+                spin_unlock_bh(&target->rx_lock);
+                return NULL;
+        }
+
+        packet = target->pipe.htc_packet_pool;
+        target->pipe.htc_packet_pool = (struct htc_packet *) packet->list.next;
+
+        spin_unlock_bh(&target->rx_lock);
+
+        packet->list.next = NULL;
+        return packet;
+}
+
+static void free_htc_packet_container(struct htc_target *target,
+                                      struct htc_packet *packet)
+{
+        struct list_head *lh;
+
+        spin_lock_bh(&target->rx_lock);
+
+        if (target->pipe.htc_packet_pool == NULL) {
+                target->pipe.htc_packet_pool = packet;
+                packet->list.next = NULL;
+        } else {
+                lh = (struct list_head *) target->pipe.htc_packet_pool;
+                packet->list.next = lh;
+                target->pipe.htc_packet_pool = packet;
+        }
+
+        spin_unlock_bh(&target->rx_lock);
+}
+
+static int htc_process_trailer(struct htc_target *target, u8 *buffer,
+                               int len, enum htc_endpoint_id from_ep)
+{
+        struct htc_credit_report *report;
+        struct htc_record_hdr *record;
+        u8 *record_buf, *orig_buf;
+        int orig_len, status;
+
+        orig_buf = buffer;
+        orig_len = len;
+        status = 0;
+
+        while (len > 0) {
+                if (len < sizeof(struct htc_record_hdr)) {
+                        status = -EINVAL;
+                        break;
+                }
+
+                /* these are byte aligned structs */
+                record = (struct htc_record_hdr *) buffer;
+                len -= sizeof(struct htc_record_hdr);
+                buffer += sizeof(struct htc_record_hdr);
+
+                if (record->len > len) {
+                        /* no room left in buffer for record */
+                        ath6kl_dbg(ATH6KL_DBG_HTC,
+                                   "invalid length: %d (id:%d) buffer has: %d bytes left\n",
+                                   record->len, record->rec_id, len);
+                        status = -EINVAL;
+                        break;
+                }
+
+                /* start of record follows the header */
+                record_buf = buffer;
+
+                switch (record->rec_id) {
+                case HTC_RECORD_CREDITS:
+                        if (record->len < sizeof(struct htc_credit_report)) {
+                                WARN_ON_ONCE(1);
+                                return -EINVAL;
+                        }
+
+                        report = (struct htc_credit_report *) record_buf;
+                        htc_process_credit_report(target, report,
+                                                  record->len / sizeof(*report),
+                                                  from_ep);
+                        break;
+                default:
+                        ath6kl_dbg(ATH6KL_DBG_HTC,
+                                   "unhandled record: id:%d length:%d\n",
+                                   record->rec_id, record->len);
+                        break;
+                }
+
+                if (status != 0)
+                        break;
+
+                /* advance buffer past this record for next time around */
+                buffer += record->len;
+                len -= record->len;
+        }
+
+        return status;
+}
+
+static void do_recv_completion(struct htc_endpoint *ep,
+                               struct list_head *queue_to_indicate)
+{
+        struct htc_packet *packet;
+
+        if (list_empty(queue_to_indicate)) {
+                /* nothing to indicate */
+                return;
+        }
+
+        /* using legacy EpRecv */
+        while (!list_empty(queue_to_indicate)) {
+                packet = list_first_entry(queue_to_indicate,
+                                          struct htc_packet, list);
+                list_del(&packet->list);
+                ep->ep_cb.rx(ep->target, packet);
+        }
+
+        return;
+}
+
+static void recv_packet_completion(struct htc_target *target,
+                                   struct htc_endpoint *ep,
+                                   struct htc_packet *packet)
+{
+        struct list_head container;
+        INIT_LIST_HEAD(&container);
+        list_add_tail(&packet->list, &container);
+
+        /* do completion */
+        do_recv_completion(ep, &container);
+}
+
+static int ath6kl_htc_pipe_rx_complete(struct ath6kl *ar, struct sk_buff *skb,
+                                       u8 pipeid)
+{
+        struct htc_target *target = ar->htc_target;
+        u8 *netdata, *trailer, hdr_info;
+        struct htc_frame_hdr *htc_hdr;
+        u32 netlen, trailerlen = 0;
+        struct htc_packet *packet;
+        struct htc_endpoint *ep;
+        u16 payload_len;
+        int status = 0;
+
+        netdata = skb->data;
+        netlen = skb->len;
+
+        htc_hdr = (struct htc_frame_hdr *) netdata;
+
+        ep = &target->endpoint[htc_hdr->eid];
+
+        if (htc_hdr->eid >= ENDPOINT_MAX) {
+                ath6kl_dbg(ATH6KL_DBG_HTC,
+                           "HTC Rx: invalid EndpointID=%d\n",
+                           htc_hdr->eid);
+                status = -EINVAL;
+                goto free_skb;
+        }
+
+        payload_len = le16_to_cpu(get_unaligned(&htc_hdr->payld_len));
+
+        if (netlen < (payload_len + HTC_HDR_LENGTH)) {
+                ath6kl_dbg(ATH6KL_DBG_HTC,
+                           "HTC Rx: insufficient length, got:%d expected =%u\n",
+                           netlen, payload_len + HTC_HDR_LENGTH);
+                status = -EINVAL;
+                goto free_skb;
+        }
+
+        /* get flags to check for trailer */
+        hdr_info = htc_hdr->flags;
+        if (hdr_info & HTC_FLG_RX_TRAILER) {
+                /* extract the trailer length */
+                hdr_info = htc_hdr->ctrl[0];
+                if ((hdr_info < sizeof(struct htc_record_hdr)) ||
+                    (hdr_info > payload_len)) {
+                        ath6kl_dbg(ATH6KL_DBG_HTC,
+                                   "invalid header: payloadlen should be %d, CB[0]: %d\n",
+                                   payload_len, hdr_info);
+                        status = -EINVAL;
+                        goto free_skb;
+                }
+
+                trailerlen = hdr_info;
+                /* process trailer after hdr/apps payload */
+                trailer = (u8 *) htc_hdr + HTC_HDR_LENGTH +
+                        payload_len - hdr_info;
+                status = htc_process_trailer(target, trailer, hdr_info,
+                                             htc_hdr->eid);
+                if (status != 0)
+                        goto free_skb;
+        }
+
+        if (((int) payload_len - (int) trailerlen) <= 0) {
+                /* zero length packet with trailer, just drop these */
+                goto free_skb;
+        }
+
+        if (htc_hdr->eid == ENDPOINT_0) {
+                /* handle HTC control message */
+                if (target->htc_flags & HTC_OP_STATE_SETUP_COMPLETE) {
+                        /*
+                         * fatal: target should not send unsolicited
+                         * messageson the endpoint 0
+                         */
+                        ath6kl_dbg(ATH6KL_DBG_HTC,
+                                   "HTC ignores Rx Ctrl after setup complete\n");
+                        status = -EINVAL;
+                        goto free_skb;
+                }
+
+                /* remove HTC header */
+                skb_pull(skb, HTC_HDR_LENGTH);
+
+                netdata = skb->data;
+                netlen = skb->len;
+
+                spin_lock_bh(&target->rx_lock);
+
+                target->pipe.ctrl_response_valid = true;
+                target->pipe.ctrl_response_len = min_t(int, netlen,
+                                                       HTC_MAX_CTRL_MSG_LEN);
+                memcpy(target->pipe.ctrl_response_buf, netdata,
+                       target->pipe.ctrl_response_len);
+
+                spin_unlock_bh(&target->rx_lock);
+
+                dev_kfree_skb(skb);
+                skb = NULL;
+                goto free_skb;
+        }
+
+        /*
+         * TODO: the message based HIF architecture allocates net bufs
+         * for recv packets since it bridges that HIF to upper layers,
+         * which expects HTC packets, we form the packets here
+         */
+        packet = alloc_htc_packet_container(target);
+        if (packet == NULL) {
+                status = -ENOMEM;
+                goto free_skb;
+        }
+
+        packet->status = 0;
+        packet->endpoint = htc_hdr->eid;
+        packet->pkt_cntxt = skb;
+
+        /* TODO: for backwards compatibility */
+        packet->buf = skb_push(skb, 0) + HTC_HDR_LENGTH;
+        packet->act_len = netlen - HTC_HDR_LENGTH - trailerlen;
+
+        /*
+         * TODO: this is a hack because the driver layer will set the
+         * actual len of the skb again which will just double the len
+         */
+        skb_trim(skb, 0);
+
+        recv_packet_completion(target, ep, packet);
+
+        /* recover the packet container */
+        free_htc_packet_container(target, packet);
+        skb = NULL;
+
+free_skb:
+        if (skb != NULL)
+                dev_kfree_skb(skb);
+
+        return status;
+
+}
+
+static void htc_flush_rx_queue(struct htc_target *target,
+                               struct htc_endpoint *ep)
+{
+        struct list_head container;
+        struct htc_packet *packet;
+
+        spin_lock_bh(&target->rx_lock);
+
+        while (1) {
+                if (list_empty(&ep->rx_bufq))
+                        break;
+
+                packet = list_first_entry(&ep->rx_bufq,
+                                          struct htc_packet, list);
+                list_del(&packet->list);
+
+                spin_unlock_bh(&target->rx_lock);
+                packet->status = -ECANCELED;
+                packet->act_len = 0;
+
+                ath6kl_dbg(ATH6KL_DBG_HTC,
+                           "Flushing RX packet:0x%p, length:%d, ep:%d\n",
+                           packet, packet->buf_len,
+                           packet->endpoint);
+
+                INIT_LIST_HEAD(&container);
+                list_add_tail(&packet->list, &container);
+
+                /* give the packet back */
+                do_recv_completion(ep, &container);
+                spin_lock_bh(&target->rx_lock);
+        }
+
+        spin_unlock_bh(&target->rx_lock);
+}
+
+/* polling routine to wait for a control packet to be received */
+static int htc_wait_recv_ctrl_message(struct htc_target *target)
+{
+        int count = HTC_TARGET_RESPONSE_POLL_COUNT;
+
+        while (count > 0) {
+                spin_lock_bh(&target->rx_lock);
+
+                if (target->pipe.ctrl_response_valid) {
+                        target->pipe.ctrl_response_valid = false;
+                        spin_unlock_bh(&target->rx_lock);
+                        break;
+                }
+
+                spin_unlock_bh(&target->rx_lock);
+
+                count--;
+
+                msleep_interruptible(HTC_TARGET_RESPONSE_POLL_WAIT);
+        }
+
+        if (count <= 0) {
+                ath6kl_dbg(ATH6KL_DBG_HTC, "%s: Timeout!\n", __func__);
+                return -ECOMM;
+        }
+
+        return 0;
+}
+
+static void htc_rxctrl_complete(struct htc_target *context,
+                                struct htc_packet *packet)
+{
+        /* TODO, can't really receive HTC control messages yet.... */
+        ath6kl_dbg(ATH6KL_DBG_HTC, "%s: invalid call function\n", __func__);
+}
+
+/* htc pipe initialization */
+static void reset_endpoint_states(struct htc_target *target)
+{
+        struct htc_endpoint *ep;
+        int i;
+
+        for (i = ENDPOINT_0; i < ENDPOINT_MAX; i++) {
+                ep = &target->endpoint[i];
+                ep->svc_id = 0;
+                ep->len_max = 0;
+                ep->max_txq_depth = 0;
+                ep->eid = i;
+                INIT_LIST_HEAD(&ep->txq);
+                INIT_LIST_HEAD(&ep->pipe.tx_lookup_queue);
+                INIT_LIST_HEAD(&ep->rx_bufq);
+                ep->target = target;
+                ep->pipe.tx_credit_flow_enabled = (bool) 1; /* FIXME */
+        }
+}
+
+/* start HTC, this is called after all services are connected */
+static int htc_config_target_hif_pipe(struct htc_target *target)
+{
+        return 0;
+}
+
+/* htc service functions */
+static u8 htc_get_credit_alloc(struct htc_target *target, u16 service_id)
+{
+        u8 allocation = 0;
+        int i;
+
+        for (i = 0; i < ENDPOINT_MAX; i++) {
+                if (target->pipe.txcredit_alloc[i].service_id == service_id)
+                        allocation =
+                                target->pipe.txcredit_alloc[i].credit_alloc;
+        }
+
+        if (allocation == 0) {
+                ath6kl_dbg(ATH6KL_DBG_HTC,
+                           "HTC Service TX : 0x%2.2X : allocation is zero!\n",
+                           service_id);
+        }
+
+        return allocation;
+}
+
+static int ath6kl_htc_pipe_conn_service(struct htc_target *target,
+                     struct htc_service_connect_req *conn_req,
+                     struct htc_service_connect_resp *conn_resp)
+{
+        struct ath6kl *ar = target->dev->ar;
+        struct htc_packet *packet = NULL;
+        struct htc_conn_service_resp *resp_msg;
+        struct htc_conn_service_msg *conn_msg;
+        enum htc_endpoint_id assigned_epid = ENDPOINT_MAX;
+        bool disable_credit_flowctrl = false;
+        unsigned int max_msg_size = 0;
+        struct htc_endpoint *ep;
+        int length, status = 0;
+        struct sk_buff *skb;
+        u8 tx_alloc;
+        u16 flags;
+
+        if (conn_req->svc_id == 0) {
+                WARN_ON_ONCE(1);
+                status = -EINVAL;
+                goto free_packet;
+        }
+
+        if (conn_req->svc_id == HTC_CTRL_RSVD_SVC) {
+                /* special case for pseudo control service */
+                assigned_epid = ENDPOINT_0;
+                max_msg_size = HTC_MAX_CTRL_MSG_LEN;
+                tx_alloc = 0;
+
+        } else {
+
+                tx_alloc = htc_get_credit_alloc(target, conn_req->svc_id);
+                if (tx_alloc == 0) {
+                        status = -ENOMEM;
+                        goto free_packet;
+                }
+
+                /* allocate a packet to send to the target */
+                packet = htc_alloc_txctrl_packet(target);
+
+                if (packet == NULL) {
+                        WARN_ON_ONCE(1);
+                        status = -ENOMEM;
+                        goto free_packet;
+                }
+
+                skb = packet->skb;
+                length = sizeof(struct htc_conn_service_msg);
+
+                /* assemble connect service message */
+                conn_msg = (struct htc_conn_service_msg *) skb_put(skb,
+                                                                   length);
+                if (conn_msg == NULL) {
+                        WARN_ON_ONCE(1);
+                        status = -EINVAL;
+                        goto free_packet;
+                }
+
+                memset(conn_msg, 0,
+                       sizeof(struct htc_conn_service_msg));
+                conn_msg->msg_id = cpu_to_le16(HTC_MSG_CONN_SVC_ID);
+                conn_msg->svc_id = cpu_to_le16(conn_req->svc_id);
+                conn_msg->conn_flags = cpu_to_le16(conn_req->conn_flags &
+                                        ~HTC_CONN_FLGS_SET_RECV_ALLOC_MASK);
+
+                /* tell target desired recv alloc for this ep */
+                flags = tx_alloc << HTC_CONN_FLGS_SET_RECV_ALLOC_SHIFT;
+                conn_msg->conn_flags |= cpu_to_le16(flags);
+
+                if (conn_req->conn_flags &
+                    HTC_CONN_FLGS_DISABLE_CRED_FLOW_CTRL) {
+                        disable_credit_flowctrl = true;
+                }
+
+                set_htc_pkt_info(packet, NULL, (u8 *) conn_msg,
+                                 length,
+                                 ENDPOINT_0, HTC_SERVICE_TX_PACKET_TAG);
+
+                status = ath6kl_htc_pipe_tx(target, packet);
+
+                /* we don't own it anymore */
+                packet = NULL;
+                if (status != 0)
+                        goto free_packet;
+
+                /* wait for response */
+                status = htc_wait_recv_ctrl_message(target);
+                if (status != 0)
+                        goto free_packet;
+
+                /* we controlled the buffer creation so it has to be
+                 * properly aligned
+                 */
+                resp_msg = (struct htc_conn_service_resp *)
+                    target->pipe.ctrl_response_buf;
+
+                if (resp_msg->msg_id != cpu_to_le16(HTC_MSG_CONN_SVC_RESP_ID) ||
+                    (target->pipe.ctrl_response_len < sizeof(*resp_msg))) {
+                        /* this message is not valid */
+                        WARN_ON_ONCE(1);
+                        status = -EINVAL;
+                        goto free_packet;
+                }
+
+                ath6kl_dbg(ATH6KL_DBG_TRC,
+                           "%s: service 0x%X conn resp: status: %d ep: %d\n",
+                           __func__, resp_msg->svc_id, resp_msg->status,
+                           resp_msg->eid);
+
+                conn_resp->resp_code = resp_msg->status;
+                /* check response status */
+                if (resp_msg->status != HTC_SERVICE_SUCCESS) {
+                        ath6kl_dbg(ATH6KL_DBG_HTC,
+                                   "Target failed service 0x%X connect request (status:%d)\n",
+                                   resp_msg->svc_id, resp_msg->status);
+                        status = -EINVAL;
+                        goto free_packet;
+                }
+
+                assigned_epid = (enum htc_endpoint_id) resp_msg->eid;
+                max_msg_size = le16_to_cpu(resp_msg->max_msg_sz);
+        }
+
+        /* the rest are parameter checks so set the error status */
+        status = -EINVAL;
+
+        if (assigned_epid >= ENDPOINT_MAX) {
+                WARN_ON_ONCE(1);
+                goto free_packet;
+        }
+
+        if (max_msg_size == 0) {
+                WARN_ON_ONCE(1);
+                goto free_packet;
+        }
+
+        ep = &target->endpoint[assigned_epid];
+        ep->eid = assigned_epid;
+        if (ep->svc_id != 0) {
+                /* endpoint already in use! */
+                WARN_ON_ONCE(1);
+                goto free_packet;
+        }
+
+        /* return assigned endpoint to caller */
+        conn_resp->endpoint = assigned_epid;
+        conn_resp->len_max = max_msg_size;
+
+        /* setup the endpoint */
+        ep->svc_id = conn_req->svc_id; /* this marks ep in use */
+        ep->max_txq_depth = conn_req->max_txq_depth;
+        ep->len_max = max_msg_size;
+        ep->cred_dist.credits = tx_alloc;
+        ep->cred_dist.cred_sz = target->tgt_cred_sz;
+        ep->cred_dist.cred_per_msg = max_msg_size / target->tgt_cred_sz;
+        if (max_msg_size % target->tgt_cred_sz)
+                ep->cred_dist.cred_per_msg++;
+
+        /* copy all the callbacks */
+        ep->ep_cb = conn_req->ep_cb;
+
+        status = ath6kl_hif_pipe_map_service(ar, ep->svc_id,
+                                             &ep->pipe.pipeid_ul,
+                                             &ep->pipe.pipeid_dl);
+        if (status != 0)
+                goto free_packet;
+
+        ath6kl_dbg(ATH6KL_DBG_HTC,
+                   "SVC Ready: 0x%4.4X: ULpipe:%d DLpipe:%d id:%d\n",
+                   ep->svc_id, ep->pipe.pipeid_ul,
+                   ep->pipe.pipeid_dl, ep->eid);
+
+        if (disable_credit_flowctrl && ep->pipe.tx_credit_flow_enabled) {
+                ep->pipe.tx_credit_flow_enabled = false;
+                ath6kl_dbg(ATH6KL_DBG_HTC,
+                           "SVC: 0x%4.4X ep:%d TX flow control off\n",
+                           ep->svc_id, assigned_epid);
+        }
+
+free_packet:
+        if (packet != NULL)
+                htc_free_txctrl_packet(target, packet);
+        return status;
+}
+
+/* htc export functions */
+static void *ath6kl_htc_pipe_create(struct ath6kl *ar)
+{
+        int status = 0;
+        struct htc_endpoint *ep = NULL;
+        struct htc_target *target = NULL;
+        struct htc_packet *packet;
+        int i;
+
+        target = kzalloc(sizeof(struct htc_target), GFP_KERNEL);
+        if (target == NULL) {
+                ath6kl_err("htc create unable to allocate memory\n");
+                status = -ENOMEM;
+                goto fail_htc_create;
+        }
+
+        spin_lock_init(&target->htc_lock);
+        spin_lock_init(&target->rx_lock);
+        spin_lock_init(&target->tx_lock);
+
+        reset_endpoint_states(target);
+
+        for (i = 0; i < HTC_PACKET_CONTAINER_ALLOCATION; i++) {
+                packet = kzalloc(sizeof(struct htc_packet), GFP_KERNEL);
+
+                if (packet != NULL)
+                        free_htc_packet_container(target, packet);
+        }
+
+        target->dev = kzalloc(sizeof(*target->dev), GFP_KERNEL);
+        if (!target->dev) {
+                ath6kl_err("unable to allocate memory\n");
+                status = -ENOMEM;
+                goto fail_htc_create;
+        }
+        target->dev->ar = ar;
+        target->dev->htc_cnxt = target;
+
+        /* Get HIF default pipe for HTC message exchange */
+        ep = &target->endpoint[ENDPOINT_0];
+
+        ath6kl_hif_pipe_get_default(ar, &ep->pipe.pipeid_ul,
+                                    &ep->pipe.pipeid_dl);
+
+        return target;
+
+fail_htc_create:
+        if (status != 0) {
+                if (target != NULL)
+                        ath6kl_htc_pipe_cleanup(target);
+
+                target = NULL;
+        }
+        return target;
+}
+
+/* cleanup the HTC instance */
+static void ath6kl_htc_pipe_cleanup(struct htc_target *target)
+{
+        struct htc_packet *packet;
+
+        while (true) {
+                packet = alloc_htc_packet_container(target);
+                if (packet == NULL)
+                        break;
+                kfree(packet);
+        }
+
+        kfree(target->dev);
+
+        /* kfree our instance */
+        kfree(target);
+}
+
+static int ath6kl_htc_pipe_start(struct htc_target *target)
+{
+        struct sk_buff *skb;
+        struct htc_setup_comp_ext_msg *setup;
+        struct htc_packet *packet;
+
+        htc_config_target_hif_pipe(target);
+
+        /* allocate a buffer to send */
+        packet = htc_alloc_txctrl_packet(target);
+        if (packet == NULL) {
+                WARN_ON_ONCE(1);
+                return -ENOMEM;
+        }
+
+        skb = packet->skb;
+
+        /* assemble setup complete message */
+        setup = (struct htc_setup_comp_ext_msg *) skb_put(skb,
+                                                          sizeof(*setup));
+        memset(setup, 0, sizeof(struct htc_setup_comp_ext_msg));
+        setup->msg_id = cpu_to_le16(HTC_MSG_SETUP_COMPLETE_EX_ID);
+
+        ath6kl_dbg(ATH6KL_DBG_HTC, "HTC using TX credit flow control\n");
+
+        set_htc_pkt_info(packet, NULL, (u8 *) setup,
+                         sizeof(struct htc_setup_comp_ext_msg),
+                         ENDPOINT_0, HTC_SERVICE_TX_PACKET_TAG);
+
+        target->htc_flags |= HTC_OP_STATE_SETUP_COMPLETE;
+
+        return ath6kl_htc_pipe_tx(target, packet);
+}
+
+static void ath6kl_htc_pipe_stop(struct htc_target *target)
+{
+        int i;
+        struct htc_endpoint *ep;
+
+        /* cleanup endpoints */
+        for (i = 0; i < ENDPOINT_MAX; i++) {
+                ep = &target->endpoint[i];
+                htc_flush_rx_queue(target, ep);
+                htc_flush_tx_endpoint(target, ep, HTC_TX_PACKET_TAG_ALL);
+        }
+
+        reset_endpoint_states(target);
+        target->htc_flags &= ~HTC_OP_STATE_SETUP_COMPLETE;
+}
+
+static int ath6kl_htc_pipe_get_rxbuf_num(struct htc_target *target,
+                                         enum htc_endpoint_id endpoint)
+{
+        int num;
+
+        spin_lock_bh(&target->rx_lock);
+        num = get_queue_depth(&(target->endpoint[endpoint].rx_bufq));
+        spin_unlock_bh(&target->rx_lock);
+
+        return num;
+}
+
+static int ath6kl_htc_pipe_tx(struct htc_target *target,
+                              struct htc_packet *packet)
+{
+        struct list_head queue;
+
+        ath6kl_dbg(ATH6KL_DBG_HTC,
+                   "%s: endPointId: %d, buffer: 0x%p, length: %d\n",
+                   __func__, packet->endpoint, packet->buf,
+                   packet->act_len);
+
+        INIT_LIST_HEAD(&queue);
+        list_add_tail(&packet->list, &queue);
+
+        return htc_send_packets_multiple(target, &queue);
+}
+
+static int ath6kl_htc_pipe_wait_target(struct htc_target *target)
+{
+        struct htc_ready_ext_msg *ready_msg;
+        struct htc_service_connect_req connect;
+        struct htc_service_connect_resp resp;
+        int status = 0;
+
+        status = htc_wait_recv_ctrl_message(target);
+
+        if (status != 0)
+                return status;
+
+        if (target->pipe.ctrl_response_len < sizeof(*ready_msg)) {
+                ath6kl_dbg(ATH6KL_DBG_HTC, "invalid htc ready msg len:%d!\n",
+                           target->pipe.ctrl_response_len);
+                return -ECOMM;
+        }
+
+        ready_msg = (struct htc_ready_ext_msg *) target->pipe.ctrl_response_buf;
+
+        if (ready_msg->ver2_0_info.msg_id != cpu_to_le16(HTC_MSG_READY_ID)) {
+                ath6kl_dbg(ATH6KL_DBG_HTC, "invalid htc ready msg : 0x%X !\n",
+                           ready_msg->ver2_0_info.msg_id);
+                return -ECOMM;
+        }
+
+        ath6kl_dbg(ATH6KL_DBG_HTC,
+                   "Target Ready! : transmit resources : %d size:%d\n",
+                   ready_msg->ver2_0_info.cred_cnt,
+                   ready_msg->ver2_0_info.cred_sz);
+
+        target->tgt_creds = le16_to_cpu(ready_msg->ver2_0_info.cred_cnt);
+        target->tgt_cred_sz = le16_to_cpu(ready_msg->ver2_0_info.cred_sz);
+
+        if ((target->tgt_creds == 0) || (target->tgt_cred_sz == 0))
+                return -ECOMM;
+
+        htc_setup_target_buffer_assignments(target);
+
+        /* setup our pseudo HTC control endpoint connection */
+        memset(&connect, 0, sizeof(connect));
+        memset(&resp, 0, sizeof(resp));
+        connect.ep_cb.tx_complete = htc_txctrl_complete;
+        connect.ep_cb.rx = htc_rxctrl_complete;
+        connect.max_txq_depth = NUM_CONTROL_TX_BUFFERS;
+        connect.svc_id = HTC_CTRL_RSVD_SVC;
+
+        /* connect fake service */
+        status = ath6kl_htc_pipe_conn_service(target, &connect, &resp);
+
+        return status;
+}
+
+static void ath6kl_htc_pipe_flush_txep(struct htc_target *target,
+                                       enum htc_endpoint_id endpoint, u16 tag)
+{
+        struct htc_endpoint *ep = &target->endpoint[endpoint];
+
+        if (ep->svc_id == 0) {
+                WARN_ON_ONCE(1);
+                /* not in use.. */
+                return;
+        }
+
+        htc_flush_tx_endpoint(target, ep, tag);
+}
+
+static int ath6kl_htc_pipe_add_rxbuf_multiple(struct htc_target *target,
+                                              struct list_head *pkt_queue)
+{
+        struct htc_packet *packet, *tmp_pkt, *first;
+        struct htc_endpoint *ep;
+        int status = 0;
+
+        if (list_empty(pkt_queue))
+                return -EINVAL;
+
+        first = list_first_entry(pkt_queue, struct htc_packet, list);
+        if (first == NULL) {
+                WARN_ON_ONCE(1);
+                return -EINVAL;
+        }
+
+        if (first->endpoint >= ENDPOINT_MAX) {
+                WARN_ON_ONCE(1);
+                return -EINVAL;
+        }
+
+        ath6kl_dbg(ATH6KL_DBG_HTC, "%s: epid: %d, cnt:%d, len: %d\n",
+                   __func__, first->endpoint, get_queue_depth(pkt_queue),
+                   first->buf_len);
+
+        ep = &target->endpoint[first->endpoint];
+
+        spin_lock_bh(&target->rx_lock);
+
+        /* store receive packets */
+        list_splice_tail_init(pkt_queue, &ep->rx_bufq);
+
+        spin_unlock_bh(&target->rx_lock);
+
+        if (status != 0) {
+                /* walk through queue and mark each one canceled */
+                list_for_each_entry_safe(packet, tmp_pkt, pkt_queue, list) {
+                        packet->status = -ECANCELED;
+                }
+
+                do_recv_completion(ep, pkt_queue);
+        }
+
+        return status;
+}
+
+static void ath6kl_htc_pipe_activity_changed(struct htc_target *target,
+                                             enum htc_endpoint_id ep,
+                                             bool active)
+{
+        /* TODO */
+}
+
+static void ath6kl_htc_pipe_flush_rx_buf(struct htc_target *target)
+{
+        /* TODO */
+}
+
+static int ath6kl_htc_pipe_credit_setup(struct htc_target *target,
+                                        struct ath6kl_htc_credit_info *info)
+{
+        return 0;
+}
+
+static const struct ath6kl_htc_ops ath6kl_htc_pipe_ops = {
+        .create = ath6kl_htc_pipe_create,
+        .wait_target = ath6kl_htc_pipe_wait_target,
+        .start = ath6kl_htc_pipe_start,
+        .conn_service = ath6kl_htc_pipe_conn_service,
+        .tx = ath6kl_htc_pipe_tx,
+        .stop = ath6kl_htc_pipe_stop,
+        .cleanup = ath6kl_htc_pipe_cleanup,
+        .flush_txep = ath6kl_htc_pipe_flush_txep,
+        .flush_rx_buf = ath6kl_htc_pipe_flush_rx_buf,
+        .activity_changed = ath6kl_htc_pipe_activity_changed,
+        .get_rxbuf_num = ath6kl_htc_pipe_get_rxbuf_num,
+        .add_rxbuf_multiple = ath6kl_htc_pipe_add_rxbuf_multiple,
+        .credit_setup = ath6kl_htc_pipe_credit_setup,
+        .tx_complete = ath6kl_htc_pipe_tx_complete,
+        .rx_complete = ath6kl_htc_pipe_rx_complete,
+};
+
+void ath6kl_htc_pipe_attach(struct ath6kl *ar)
+{
+        ar->htc_ops = &ath6kl_htc_pipe_ops;
+}
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 03cae142f178..29ef50ea07d5 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -16,17 +16,21 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/moduleparam.h>
 #include <linux/errno.h>
 #include <linux/export.h>
 #include <linux/of.h>
 #include <linux/mmc/sdio_func.h>
+#include <linux/vmalloc.h>
 
 #include "core.h"
 #include "cfg80211.h"
 #include "target.h"
 #include "debug.h"
 #include "hif-ops.h"
+#include "htc-ops.h"
 
 static const struct ath6kl_hw hw_list[] = {
         {
@@ -256,6 +260,7 @@ static int ath6kl_init_service_ep(struct ath6kl *ar)
         memset(&connect, 0, sizeof(connect));
 
         /* these fields are the same for all service endpoints */
+        connect.ep_cb.tx_comp_multi = ath6kl_tx_complete;
         connect.ep_cb.rx = ath6kl_rx;
         connect.ep_cb.rx_refill = ath6kl_rx_refill;
         connect.ep_cb.tx_full = ath6kl_tx_queue_full;
@@ -485,22 +490,31 @@ int ath6kl_configure_target(struct ath6kl *ar)
                 fw_mode |= fw_iftype << (i * HI_OPTION_FW_MODE_BITS);
 
         /*
-         * By default, submodes :
+         * Submodes when fw does not support dynamic interface
+         * switching:
          *              vif[0] - AP/STA/IBSS
          *              vif[1] - "P2P dev"/"P2P GO"/"P2P Client"
          *              vif[2] - "P2P dev"/"P2P GO"/"P2P Client"
+         * Otherwise, All the interface are initialized to p2p dev.
          */
 
-        for (i = 0; i < ar->max_norm_iface; i++)
-                fw_submode |= HI_OPTION_FW_SUBMODE_NONE <<
-                              (i * HI_OPTION_FW_SUBMODE_BITS);
+        if (test_bit(ATH6KL_FW_CAPABILITY_STA_P2PDEV_DUPLEX,
+                     ar->fw_capabilities)) {
+                for (i = 0; i < ar->vif_max; i++)
+                        fw_submode |= HI_OPTION_FW_SUBMODE_P2PDEV <<
+                                (i * HI_OPTION_FW_SUBMODE_BITS);
+        } else {
+                for (i = 0; i < ar->max_norm_iface; i++)
+                        fw_submode |= HI_OPTION_FW_SUBMODE_NONE <<
+                                (i * HI_OPTION_FW_SUBMODE_BITS);
 
-        for (i = ar->max_norm_iface; i < ar->vif_max; i++)
-                fw_submode |= HI_OPTION_FW_SUBMODE_P2PDEV <<
-                              (i * HI_OPTION_FW_SUBMODE_BITS);
+                for (i = ar->max_norm_iface; i < ar->vif_max; i++)
+                        fw_submode |= HI_OPTION_FW_SUBMODE_P2PDEV <<
+                                (i * HI_OPTION_FW_SUBMODE_BITS);
 
-        if (ar->p2p && ar->vif_max == 1)
-                fw_submode = HI_OPTION_FW_SUBMODE_P2PDEV;
+                if (ar->p2p && ar->vif_max == 1)
+                        fw_submode = HI_OPTION_FW_SUBMODE_P2PDEV;
+        }
 
         if (ath6kl_bmi_write_hi32(ar, hi_app_host_interest,
                                   HTC_PROTOCOL_VERSION) != 0) {
@@ -539,18 +553,20 @@ int ath6kl_configure_target(struct ath6kl *ar)
          * but possible in theory.
          */
 
-        param = ar->hw.board_ext_data_addr;
-        ram_reserved_size = ar->hw.reserved_ram_size;
+        if (ar->target_type == TARGET_TYPE_AR6003) {
+                param = ar->hw.board_ext_data_addr;
+                ram_reserved_size = ar->hw.reserved_ram_size;
 
-        if (ath6kl_bmi_write_hi32(ar, hi_board_ext_data, param) != 0) {
-                ath6kl_err("bmi_write_memory for hi_board_ext_data failed\n");
-                return -EIO;
-        }
+                if (ath6kl_bmi_write_hi32(ar, hi_board_ext_data, param) != 0) {
+                        ath6kl_err("bmi_write_memory for hi_board_ext_data failed\n");
+                        return -EIO;
+                }
 
-        if (ath6kl_bmi_write_hi32(ar, hi_end_ram_reserve_sz,
-                                  ram_reserved_size) != 0) {
-                ath6kl_err("bmi_write_memory for hi_end_ram_reserve_sz failed\n");
-                return -EIO;
+                if (ath6kl_bmi_write_hi32(ar, hi_end_ram_reserve_sz,
+                                          ram_reserved_size) != 0) {
+                        ath6kl_err("bmi_write_memory for hi_end_ram_reserve_sz failed\n");
+                        return -EIO;
+                }
         }
 
         /* set the block size for the target */
@@ -924,13 +940,14 @@ static int ath6kl_fetch_fw_apin(struct ath6kl *ar, const char *name)
                         if (ar->fw != NULL)
                                 break;
 
-                        ar->fw = kmemdup(data, ie_len, GFP_KERNEL);
+                        ar->fw = vmalloc(ie_len);
 
                         if (ar->fw == NULL) {
                                 ret = -ENOMEM;
                                 goto out;
                         }
 
+                        memcpy(ar->fw, data, ie_len);
                         ar->fw_len = ie_len;
                         break;
                 case ATH6KL_FW_IE_PATCH_IMAGE:
@@ -1507,7 +1524,7 @@ int ath6kl_init_hw_start(struct ath6kl *ar)
         }
 
         /* setup credit distribution */
-        ath6kl_credit_setup(ar->htc_target, &ar->credit_state_info);
+        ath6kl_htc_credit_setup(ar->htc_target, &ar->credit_state_info);
 
         /* start HTC */
         ret = ath6kl_htc_start(ar->htc_target);
diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c
index 229e1922ebe4..4d818f96c415 100644
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
@@ -15,6 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "core.h"
 #include "hif-ops.h"
 #include "cfg80211.h"
@@ -756,6 +758,10 @@ static void ath6kl_update_target_stats(struct ath6kl_vif *vif, u8 *ptr, u32 len)
         stats->wow_evt_discarded +=
                 le16_to_cpu(tgt_stats->wow_stats.wow_evt_discarded);
 
+        stats->arp_received = le32_to_cpu(tgt_stats->arp_stats.arp_received);
+        stats->arp_replied = le32_to_cpu(tgt_stats->arp_stats.arp_replied);
+        stats->arp_matched = le32_to_cpu(tgt_stats->arp_stats.arp_matched);
+
         if (test_bit(STATS_UPDATE_PEND, &vif->flags)) {
                 clear_bit(STATS_UPDATE_PEND, &vif->flags);
                 wake_up(&ar->event_wq);
diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c
index 53528648b425..44ea7a742101 100644
--- a/drivers/net/wireless/ath/ath6kl/sdio.c
+++ b/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -1362,7 +1362,7 @@ static int ath6kl_sdio_probe(struct sdio_func *func,
                 goto err_core_alloc;
         }
 
-        ret = ath6kl_core_init(ar);
+        ret = ath6kl_core_init(ar, ATH6KL_HTC_TYPE_MBOX);
         if (ret) {
                 ath6kl_err("Failed to init ath6kl core\n");
                 goto err_core_alloc;
diff --git a/drivers/net/wireless/ath/ath6kl/testmode.c b/drivers/net/wireless/ath/ath6kl/testmode.c
index 6675c92b542b..acc9aa832f76 100644
--- a/drivers/net/wireless/ath/ath6kl/testmode.c
+++ b/drivers/net/wireless/ath/ath6kl/testmode.c
@@ -55,8 +55,9 @@ void ath6kl_tm_rx_event(struct ath6kl *ar, void *buf, size_t buf_len)
                 ath6kl_warn("failed to allocate testmode rx skb!\n");
                 return;
         }
-        NLA_PUT_U32(skb, ATH6KL_TM_ATTR_CMD, ATH6KL_TM_CMD_TCMD);
-        NLA_PUT(skb, ATH6KL_TM_ATTR_DATA, buf_len, buf);
+        if (nla_put_u32(skb, ATH6KL_TM_ATTR_CMD, ATH6KL_TM_CMD_TCMD) ||
+            nla_put(skb, ATH6KL_TM_ATTR_DATA, buf_len, buf))
+                goto nla_put_failure;
         cfg80211_testmode_event(skb, GFP_KERNEL);
         return;
 
diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c
index f85353fd1792..82f2f5cb475b 100644
--- a/drivers/net/wireless/ath/ath6kl/txrx.c
+++ b/drivers/net/wireless/ath/ath6kl/txrx.c
@@ -15,8 +15,11 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "core.h"
 #include "debug.h"
+#include "htc-ops.h"
 
 /*
  * tid - tid_mux0..tid_mux3
@@ -322,6 +325,7 @@ int ath6kl_control_tx(void *devt, struct sk_buff *skb,
         cookie->map_no = 0;
         set_htc_pkt_info(&cookie->htc_pkt, cookie, skb->data, skb->len,
                          eid, ATH6KL_CONTROL_PKT_TAG);
+        cookie->htc_pkt.skb = skb;
 
         /*
          * This interface is asynchronous, if there is an error, cleanup
@@ -490,6 +494,7 @@ int ath6kl_data_tx(struct sk_buff *skb, struct net_device *dev)
         cookie->map_no = map_no;
         set_htc_pkt_info(&cookie->htc_pkt, cookie, skb->data, skb->len,
                          eid, htc_tag);
+        cookie->htc_pkt.skb = skb;
 
         ath6kl_dbg_dump(ATH6KL_DBG_RAW_BYTES, __func__, "tx ",
                         skb->data, skb->len);
@@ -570,7 +575,7 @@ void ath6kl_indicate_tx_activity(void *devt, u8 traffic_class, bool active)
 
 notify_htc:
         /* notify HTC, this may cause credit distribution changes */
-        ath6kl_htc_indicate_activity_change(ar->htc_target, eid, active);
+        ath6kl_htc_activity_changed(ar->htc_target, eid, active);
 }
 
 enum htc_send_full_action ath6kl_tx_queue_full(struct htc_target *target,
@@ -666,9 +671,10 @@ static void ath6kl_tx_clear_node_map(struct ath6kl_vif *vif,
         }
 }
 
-void ath6kl_tx_complete(void *context, struct list_head *packet_queue)
+void ath6kl_tx_complete(struct htc_target *target,
+                        struct list_head *packet_queue)
 {
-        struct ath6kl *ar = context;
+        struct ath6kl *ar = target->dev->ar;
         struct sk_buff_head skb_queue;
         struct htc_packet *packet;
         struct sk_buff *skb;
@@ -887,6 +893,7 @@ void ath6kl_rx_refill(struct htc_target *target, enum htc_endpoint_id endpoint)
                         skb->data = PTR_ALIGN(skb->data - 4, 4);
                 set_htc_rxpkt_info(packet, skb, skb->data,
                                    ATH6KL_BUFFER_SIZE, endpoint);
+                packet->skb = skb;
                 list_add_tail(&packet->list, &queue);
         }
 
@@ -909,6 +916,8 @@ void ath6kl_refill_amsdu_rxbufs(struct ath6kl *ar, int count)
                         skb->data = PTR_ALIGN(skb->data - 4, 4);
                 set_htc_rxpkt_info(packet, skb, skb->data,
                                    ATH6KL_AMSDU_BUFFER_SIZE, 0);
+                packet->skb = skb;
+
                 spin_lock_bh(&ar->lock);
                 list_add_tail(&packet->list, &ar->amsdu_rx_buffer_queue);
                 spin_unlock_bh(&ar->lock);
@@ -1281,6 +1290,7 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)
         struct wmi_data_hdr *dhdr;
         int min_hdr_len;
         u8 meta_type, dot11_hdr = 0;
+        u8 pad_before_data_start;
         int status = packet->status;
         enum htc_endpoint_id ept = packet->endpoint;
         bool is_amsdu, prev_ps, ps_state = false;
@@ -1492,6 +1502,10 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)
         seq_no = wmi_data_hdr_get_seqno(dhdr);
         meta_type = wmi_data_hdr_get_meta(dhdr);
         dot11_hdr = wmi_data_hdr_get_dot11(dhdr);
+        pad_before_data_start =
+                (le16_to_cpu(dhdr->info3) >> WMI_DATA_HDR_PAD_BEFORE_DATA_SHIFT)
+                        & WMI_DATA_HDR_PAD_BEFORE_DATA_MASK;
+
         skb_pull(skb, sizeof(struct wmi_data_hdr));
 
         switch (meta_type) {
@@ -1510,6 +1524,8 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)
                 break;
         }
 
+        skb_pull(skb, pad_before_data_start);
+
         if (dot11_hdr)
                 status = ath6kl_wmi_dot11_hdr_remove(ar->wmi, skb);
         else if (!is_amsdu)
@@ -1579,7 +1595,8 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)
                         /* aggregation code will handle the skb */
                         return;
                 }
-        }
+        } else if (!is_broadcast_ether_addr(datap->h_dest))
+                vif->net_stats.multicast++;
 
         ath6kl_deliver_frames_to_nw_stack(vif->ndev, skb);
 }
diff --git a/drivers/net/wireless/ath/ath6kl/usb.c b/drivers/net/wireless/ath/ath6kl/usb.c
index 325b1224c2b1..ec7f1f5fd1ca 100644
--- a/drivers/net/wireless/ath/ath6kl/usb.c
+++ b/drivers/net/wireless/ath/ath6kl/usb.c
@@ -21,15 +21,77 @@
 #include "debug.h"
 #include "core.h"
 
+/* constants */
+#define TX_URB_COUNT            32
+#define RX_URB_COUNT            32
+#define ATH6KL_USB_RX_BUFFER_SIZE  1700
+
+/* tx/rx pipes for usb */
+enum ATH6KL_USB_PIPE_ID {
+        ATH6KL_USB_PIPE_TX_CTRL = 0,
+        ATH6KL_USB_PIPE_TX_DATA_LP,
+        ATH6KL_USB_PIPE_TX_DATA_MP,
+        ATH6KL_USB_PIPE_TX_DATA_HP,
+        ATH6KL_USB_PIPE_RX_CTRL,
+        ATH6KL_USB_PIPE_RX_DATA,
+        ATH6KL_USB_PIPE_RX_DATA2,
+        ATH6KL_USB_PIPE_RX_INT,
+        ATH6KL_USB_PIPE_MAX
+};
+
+#define ATH6KL_USB_PIPE_INVALID ATH6KL_USB_PIPE_MAX
+
+struct ath6kl_usb_pipe {
+        struct list_head urb_list_head;
+        struct usb_anchor urb_submitted;
+        u32 urb_alloc;
+        u32 urb_cnt;
+        u32 urb_cnt_thresh;
+        unsigned int usb_pipe_handle;
+        u32 flags;
+        u8 ep_address;
+        u8 logical_pipe_num;
+        struct ath6kl_usb *ar_usb;
+        u16 max_packet_size;
+        struct work_struct io_complete_work;
+        struct sk_buff_head io_comp_queue;
+        struct usb_endpoint_descriptor *ep_desc;
+};
+
+#define ATH6KL_USB_PIPE_FLAG_TX    (1 << 0)
+
 /* usb device object */
 struct ath6kl_usb {
+        /* protects pipe->urb_list_head and  pipe->urb_cnt */
+        spinlock_t cs_lock;
+
         struct usb_device *udev;
         struct usb_interface *interface;
+        struct ath6kl_usb_pipe pipes[ATH6KL_USB_PIPE_MAX];
         u8 *diag_cmd_buffer;
         u8 *diag_resp_buffer;
         struct ath6kl *ar;
 };
 
+/* usb urb object */
+struct ath6kl_urb_context {
+        struct list_head link;
+        struct ath6kl_usb_pipe *pipe;
+        struct sk_buff *skb;
+        struct ath6kl *ar;
+};
+
+/* USB endpoint definitions */
+#define ATH6KL_USB_EP_ADDR_APP_CTRL_IN          0x81
+#define ATH6KL_USB_EP_ADDR_APP_DATA_IN          0x82
+#define ATH6KL_USB_EP_ADDR_APP_DATA2_IN         0x83
+#define ATH6KL_USB_EP_ADDR_APP_INT_IN           0x84
+
+#define ATH6KL_USB_EP_ADDR_APP_CTRL_OUT         0x01
+#define ATH6KL_USB_EP_ADDR_APP_DATA_LP_OUT      0x02
+#define ATH6KL_USB_EP_ADDR_APP_DATA_MP_OUT      0x03
+#define ATH6KL_USB_EP_ADDR_APP_DATA_HP_OUT      0x04
+
 /* diagnostic command defnitions */
 #define ATH6KL_USB_CONTROL_REQ_SEND_BMI_CMD        1
 #define ATH6KL_USB_CONTROL_REQ_RECV_BMI_RESP       2
@@ -55,11 +117,493 @@ struct ath6kl_usb_ctrl_diag_resp_read {
         __le32 value;
 } __packed;
 
+/* function declarations */
+static void ath6kl_usb_recv_complete(struct urb *urb);
+
+#define ATH6KL_USB_IS_BULK_EP(attr) (((attr) & 3) == 0x02)
+#define ATH6KL_USB_IS_INT_EP(attr)  (((attr) & 3) == 0x03)
+#define ATH6KL_USB_IS_ISOC_EP(attr)  (((attr) & 3) == 0x01)
+#define ATH6KL_USB_IS_DIR_IN(addr)  ((addr) & 0x80)
+
+/* pipe/urb operations */
+static struct ath6kl_urb_context *
+ath6kl_usb_alloc_urb_from_pipe(struct ath6kl_usb_pipe *pipe)
+{
+        struct ath6kl_urb_context *urb_context = NULL;
+        unsigned long flags;
+
+        spin_lock_irqsave(&pipe->ar_usb->cs_lock, flags);
+        if (!list_empty(&pipe->urb_list_head)) {
+                urb_context =
+                    list_first_entry(&pipe->urb_list_head,
+                                     struct ath6kl_urb_context, link);
+                list_del(&urb_context->link);
+                pipe->urb_cnt--;
+        }
+        spin_unlock_irqrestore(&pipe->ar_usb->cs_lock, flags);
+
+        return urb_context;
+}
+
+static void ath6kl_usb_free_urb_to_pipe(struct ath6kl_usb_pipe *pipe,
+                                        struct ath6kl_urb_context *urb_context)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&pipe->ar_usb->cs_lock, flags);
+        pipe->urb_cnt++;
+
+        list_add(&urb_context->link, &pipe->urb_list_head);
+        spin_unlock_irqrestore(&pipe->ar_usb->cs_lock, flags);
+}
+
+static void ath6kl_usb_cleanup_recv_urb(struct ath6kl_urb_context *urb_context)
+{
+        if (urb_context->skb != NULL) {
+                dev_kfree_skb(urb_context->skb);
+                urb_context->skb = NULL;
+        }
+
+        ath6kl_usb_free_urb_to_pipe(urb_context->pipe, urb_context);
+}
+
+static inline struct ath6kl_usb *ath6kl_usb_priv(struct ath6kl *ar)
+{
+        return ar->hif_priv;
+}
+
+/* pipe resource allocation/cleanup */
+static int ath6kl_usb_alloc_pipe_resources(struct ath6kl_usb_pipe *pipe,
+                                           int urb_cnt)
+{
+        struct ath6kl_urb_context *urb_context;
+        int status = 0, i;
+
+        INIT_LIST_HEAD(&pipe->urb_list_head);
+        init_usb_anchor(&pipe->urb_submitted);
+
+        for (i = 0; i < urb_cnt; i++) {
+                urb_context = kzalloc(sizeof(struct ath6kl_urb_context),
+                                      GFP_KERNEL);
+                if (urb_context == NULL)
+                        /* FIXME: set status to -ENOMEM */
+                        break;
+
+                urb_context->pipe = pipe;
+
+                /*
+                 * we are only allocate the urb contexts here, the actual URB
+                 * is allocated from the kernel as needed to do a transaction
+                 */
+                pipe->urb_alloc++;
+                ath6kl_usb_free_urb_to_pipe(pipe, urb_context);
+        }
+
+        ath6kl_dbg(ATH6KL_DBG_USB,
+                   "ath6kl usb: alloc resources lpipe:%d hpipe:0x%X urbs:%d\n",
+                   pipe->logical_pipe_num, pipe->usb_pipe_handle,
+                   pipe->urb_alloc);
+
+        return status;
+}
+
+static void ath6kl_usb_free_pipe_resources(struct ath6kl_usb_pipe *pipe)
+{
+        struct ath6kl_urb_context *urb_context;
+
+        if (pipe->ar_usb == NULL) {
+                /* nothing allocated for this pipe */
+                return;
+        }
+
+        ath6kl_dbg(ATH6KL_DBG_USB,
+                   "ath6kl usb: free resources lpipe:%d"
+                   "hpipe:0x%X urbs:%d avail:%d\n",
+                   pipe->logical_pipe_num, pipe->usb_pipe_handle,
+                   pipe->urb_alloc, pipe->urb_cnt);
+
+        if (pipe->urb_alloc != pipe->urb_cnt) {
+                ath6kl_dbg(ATH6KL_DBG_USB,
+                           "ath6kl usb: urb leak! lpipe:%d"
+                           "hpipe:0x%X urbs:%d avail:%d\n",
+                           pipe->logical_pipe_num, pipe->usb_pipe_handle,
+                           pipe->urb_alloc, pipe->urb_cnt);
+        }
+
+        while (true) {
+                urb_context = ath6kl_usb_alloc_urb_from_pipe(pipe);
+                if (urb_context == NULL)
+                        break;
+                kfree(urb_context);
+        }
+
+}
+
+static void ath6kl_usb_cleanup_pipe_resources(struct ath6kl_usb *ar_usb)
+{
+        int i;
+
+        for (i = 0; i < ATH6KL_USB_PIPE_MAX; i++)
+                ath6kl_usb_free_pipe_resources(&ar_usb->pipes[i]);
+
+}
+
+static u8 ath6kl_usb_get_logical_pipe_num(struct ath6kl_usb *ar_usb,
+                                          u8 ep_address, int *urb_count)
+{
+        u8 pipe_num = ATH6KL_USB_PIPE_INVALID;
+
+        switch (ep_address) {
+        case ATH6KL_USB_EP_ADDR_APP_CTRL_IN:
+                pipe_num = ATH6KL_USB_PIPE_RX_CTRL;
+                *urb_count = RX_URB_COUNT;
+                break;
+        case ATH6KL_USB_EP_ADDR_APP_DATA_IN:
+                pipe_num = ATH6KL_USB_PIPE_RX_DATA;
+                *urb_count = RX_URB_COUNT;
+                break;
+        case ATH6KL_USB_EP_ADDR_APP_INT_IN:
+                pipe_num = ATH6KL_USB_PIPE_RX_INT;
+                *urb_count = RX_URB_COUNT;
+                break;
+        case ATH6KL_USB_EP_ADDR_APP_DATA2_IN:
+                pipe_num = ATH6KL_USB_PIPE_RX_DATA2;
+                *urb_count = RX_URB_COUNT;
+                break;
+        case ATH6KL_USB_EP_ADDR_APP_CTRL_OUT:
+                pipe_num = ATH6KL_USB_PIPE_TX_CTRL;
+                *urb_count = TX_URB_COUNT;
+                break;
+        case ATH6KL_USB_EP_ADDR_APP_DATA_LP_OUT:
+                pipe_num = ATH6KL_USB_PIPE_TX_DATA_LP;
+                *urb_count = TX_URB_COUNT;
+                break;
+        case ATH6KL_USB_EP_ADDR_APP_DATA_MP_OUT:
+                pipe_num = ATH6KL_USB_PIPE_TX_DATA_MP;
+                *urb_count = TX_URB_COUNT;
+                break;
+        case ATH6KL_USB_EP_ADDR_APP_DATA_HP_OUT:
+                pipe_num = ATH6KL_USB_PIPE_TX_DATA_HP;
+                *urb_count = TX_URB_COUNT;
+                break;
+        default:
+                /* note: there may be endpoints not currently used */
+                break;
+        }
+
+        return pipe_num;
+}
+
+static int ath6kl_usb_setup_pipe_resources(struct ath6kl_usb *ar_usb)
+{
+        struct usb_interface *interface = ar_usb->interface;
+        struct usb_host_interface *iface_desc = interface->cur_altsetting;
+        struct usb_endpoint_descriptor *endpoint;
+        struct ath6kl_usb_pipe *pipe;
+        int i, urbcount, status = 0;
+        u8 pipe_num;
+
+        ath6kl_dbg(ATH6KL_DBG_USB, "setting up USB Pipes using interface\n");
+
+        /* walk decriptors and setup pipes */
+        for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
+                endpoint = &iface_desc->endpoint[i].desc;
+
+                if (ATH6KL_USB_IS_BULK_EP(endpoint->bmAttributes)) {
+                        ath6kl_dbg(ATH6KL_DBG_USB,
+                                   "%s Bulk Ep:0x%2.2X maxpktsz:%d\n",
+                                   ATH6KL_USB_IS_DIR_IN
+                                   (endpoint->bEndpointAddress) ?
+                                   "RX" : "TX", endpoint->bEndpointAddress,
+                                   le16_to_cpu(endpoint->wMaxPacketSize));
+                } else if (ATH6KL_USB_IS_INT_EP(endpoint->bmAttributes)) {
+                        ath6kl_dbg(ATH6KL_DBG_USB,
+                                   "%s Int Ep:0x%2.2X maxpktsz:%d interval:%d\n",
+                                   ATH6KL_USB_IS_DIR_IN
+                                   (endpoint->bEndpointAddress) ?
+                                   "RX" : "TX", endpoint->bEndpointAddress,
+                                   le16_to_cpu(endpoint->wMaxPacketSize),
+                                   endpoint->bInterval);
+                } else if (ATH6KL_USB_IS_ISOC_EP(endpoint->bmAttributes)) {
+                        /* TODO for ISO */
+                        ath6kl_dbg(ATH6KL_DBG_USB,
+                                   "%s ISOC Ep:0x%2.2X maxpktsz:%d interval:%d\n",
+                                   ATH6KL_USB_IS_DIR_IN
+                                   (endpoint->bEndpointAddress) ?
+                                   "RX" : "TX", endpoint->bEndpointAddress,
+                                   le16_to_cpu(endpoint->wMaxPacketSize),
+                                   endpoint->bInterval);
+                }
+                urbcount = 0;
+
+                pipe_num =
+                    ath6kl_usb_get_logical_pipe_num(ar_usb,
+                                                    endpoint->bEndpointAddress,
+                                                    &urbcount);
+                if (pipe_num == ATH6KL_USB_PIPE_INVALID)
+                        continue;
+
+                pipe = &ar_usb->pipes[pipe_num];
+                if (pipe->ar_usb != NULL) {
+                        /* hmmm..pipe was already setup */
+                        continue;
+                }
+
+                pipe->ar_usb = ar_usb;
+                pipe->logical_pipe_num = pipe_num;
+                pipe->ep_address = endpoint->bEndpointAddress;
+                pipe->max_packet_size = le16_to_cpu(endpoint->wMaxPacketSize);
+
+                if (ATH6KL_USB_IS_BULK_EP(endpoint->bmAttributes)) {
+                        if (ATH6KL_USB_IS_DIR_IN(pipe->ep_address)) {
+                                pipe->usb_pipe_handle =
+                                    usb_rcvbulkpipe(ar_usb->udev,
+                                                    pipe->ep_address);
+                        } else {
+                                pipe->usb_pipe_handle =
+                                    usb_sndbulkpipe(ar_usb->udev,
+                                                    pipe->ep_address);
+                        }
+                } else if (ATH6KL_USB_IS_INT_EP(endpoint->bmAttributes)) {
+                        if (ATH6KL_USB_IS_DIR_IN(pipe->ep_address)) {
+                                pipe->usb_pipe_handle =
+                                    usb_rcvintpipe(ar_usb->udev,
+                                                   pipe->ep_address);
+                        } else {
+                                pipe->usb_pipe_handle =
+                                    usb_sndintpipe(ar_usb->udev,
+                                                   pipe->ep_address);
+                        }
+                } else if (ATH6KL_USB_IS_ISOC_EP(endpoint->bmAttributes)) {
+                        /* TODO for ISO */
+                        if (ATH6KL_USB_IS_DIR_IN(pipe->ep_address)) {
+                                pipe->usb_pipe_handle =
+                                    usb_rcvisocpipe(ar_usb->udev,
+                                                    pipe->ep_address);
+                        } else {
+                                pipe->usb_pipe_handle =
+                                    usb_sndisocpipe(ar_usb->udev,
+                                                    pipe->ep_address);
+                        }
+                }
+
+                pipe->ep_desc = endpoint;
+
+                if (!ATH6KL_USB_IS_DIR_IN(pipe->ep_address))
+                        pipe->flags |= ATH6KL_USB_PIPE_FLAG_TX;
+
+                status = ath6kl_usb_alloc_pipe_resources(pipe, urbcount);
+                if (status != 0)
+                        break;
+        }
+
+        return status;
+}
+
+/* pipe operations */
+static void ath6kl_usb_post_recv_transfers(struct ath6kl_usb_pipe *recv_pipe,
+                                           int buffer_length)
+{
+        struct ath6kl_urb_context *urb_context;
+        struct urb *urb;
+        int usb_status;
+
+        while (true) {
+                urb_context = ath6kl_usb_alloc_urb_from_pipe(recv_pipe);
+                if (urb_context == NULL)
+                        break;
+
+                urb_context->skb = dev_alloc_skb(buffer_length);
+                if (urb_context->skb == NULL)
+                        goto err_cleanup_urb;
+
+                urb = usb_alloc_urb(0, GFP_ATOMIC);
+                if (urb == NULL)
+                        goto err_cleanup_urb;
+
+                usb_fill_bulk_urb(urb,
+                                  recv_pipe->ar_usb->udev,
+                                  recv_pipe->usb_pipe_handle,
+                                  urb_context->skb->data,
+                                  buffer_length,
+                                  ath6kl_usb_recv_complete, urb_context);
+
+                ath6kl_dbg(ATH6KL_DBG_USB_BULK,
+                           "ath6kl usb: bulk recv submit:%d, 0x%X (ep:0x%2.2X), %d bytes buf:0x%p\n",
+                           recv_pipe->logical_pipe_num,
+                           recv_pipe->usb_pipe_handle, recv_pipe->ep_address,
+                           buffer_length, urb_context->skb);
+
+                usb_anchor_urb(urb, &recv_pipe->urb_submitted);
+                usb_status = usb_submit_urb(urb, GFP_ATOMIC);
+
+                if (usb_status) {
+                        ath6kl_dbg(ATH6KL_DBG_USB_BULK,
+                                   "ath6kl usb : usb bulk recv failed %d\n",
+                                   usb_status);
+                        usb_unanchor_urb(urb);
+                        usb_free_urb(urb);
+                        goto err_cleanup_urb;
+                }
+                usb_free_urb(urb);
+        }
+        return;
+
+err_cleanup_urb:
+        ath6kl_usb_cleanup_recv_urb(urb_context);
+        return;
+}
+
+static void ath6kl_usb_flush_all(struct ath6kl_usb *ar_usb)
+{
+        int i;
+
+        for (i = 0; i < ATH6KL_USB_PIPE_MAX; i++) {
+                if (ar_usb->pipes[i].ar_usb != NULL)
+                        usb_kill_anchored_urbs(&ar_usb->pipes[i].urb_submitted);
+        }
+
+        /*
+         * Flushing any pending I/O may schedule work this call will block
+         * until all scheduled work runs to completion.
+         */
+        flush_scheduled_work();
+}
+
+static void ath6kl_usb_start_recv_pipes(struct ath6kl_usb *ar_usb)
+{
+        /*
+         * note: control pipe is no longer used
+         * ar_usb->pipes[ATH6KL_USB_PIPE_RX_CTRL].urb_cnt_thresh =
+         *      ar_usb->pipes[ATH6KL_USB_PIPE_RX_CTRL].urb_alloc/2;
+         * ath6kl_usb_post_recv_transfers(&ar_usb->
+         *              pipes[ATH6KL_USB_PIPE_RX_CTRL],
+         *              ATH6KL_USB_RX_BUFFER_SIZE);
+         */
+
+        ar_usb->pipes[ATH6KL_USB_PIPE_RX_DATA].urb_cnt_thresh =
+            ar_usb->pipes[ATH6KL_USB_PIPE_RX_DATA].urb_alloc / 2;
+        ath6kl_usb_post_recv_transfers(&ar_usb->pipes[ATH6KL_USB_PIPE_RX_DATA],
+                                       ATH6KL_USB_RX_BUFFER_SIZE);
+}
+
+/* hif usb rx/tx completion functions */
+static void ath6kl_usb_recv_complete(struct urb *urb)
+{
+        struct ath6kl_urb_context *urb_context = urb->context;
+        struct ath6kl_usb_pipe *pipe = urb_context->pipe;
+        struct sk_buff *skb = NULL;
+        int status = 0;
+
+        ath6kl_dbg(ATH6KL_DBG_USB_BULK,
+                   "%s: recv pipe: %d, stat:%d, len:%d urb:0x%p\n", __func__,
+                   pipe->logical_pipe_num, urb->status, urb->actual_length,
+                   urb);
+
+        if (urb->status != 0) {
+                status = -EIO;
+                switch (urb->status) {
+                case -ECONNRESET:
+                case -ENOENT:
+                case -ESHUTDOWN:
+                        /*
+                         * no need to spew these errors when device
+                         * removed or urb killed due to driver shutdown
+                         */
+                        status = -ECANCELED;
+                        break;
+                default:
+                        ath6kl_dbg(ATH6KL_DBG_USB_BULK,
+                                   "%s recv pipe: %d (ep:0x%2.2X), failed:%d\n",
+                                   __func__, pipe->logical_pipe_num,
+                                   pipe->ep_address, urb->status);
+                        break;
+                }
+                goto cleanup_recv_urb;
+        }
+
+        if (urb->actual_length == 0)
+                goto cleanup_recv_urb;
+
+        skb = urb_context->skb;
+
+        /* we are going to pass it up */
+        urb_context->skb = NULL;
+        skb_put(skb, urb->actual_length);
+
+        /* note: queue implements a lock */
+        skb_queue_tail(&pipe->io_comp_queue, skb);
+        schedule_work(&pipe->io_complete_work);
+
+cleanup_recv_urb:
+        ath6kl_usb_cleanup_recv_urb(urb_context);
+
+        if (status == 0 &&
+            pipe->urb_cnt >= pipe->urb_cnt_thresh) {
+                /* our free urbs are piling up, post more transfers */
+                ath6kl_usb_post_recv_transfers(pipe, ATH6KL_USB_RX_BUFFER_SIZE);
+        }
+}
+
+static void ath6kl_usb_usb_transmit_complete(struct urb *urb)
+{
+        struct ath6kl_urb_context *urb_context = urb->context;
+        struct ath6kl_usb_pipe *pipe = urb_context->pipe;
+        struct sk_buff *skb;
+
+        ath6kl_dbg(ATH6KL_DBG_USB_BULK,
+                   "%s: pipe: %d, stat:%d, len:%d\n",
+                   __func__, pipe->logical_pipe_num, urb->status,
+                   urb->actual_length);
+
+        if (urb->status != 0) {
+                ath6kl_dbg(ATH6KL_DBG_USB_BULK,
+                           "%s:  pipe: %d, failed:%d\n",
+                           __func__, pipe->logical_pipe_num, urb->status);
+        }
+
+        skb = urb_context->skb;
+        urb_context->skb = NULL;
+        ath6kl_usb_free_urb_to_pipe(urb_context->pipe, urb_context);
+
+        /* note: queue implements a lock */
+        skb_queue_tail(&pipe->io_comp_queue, skb);
+        schedule_work(&pipe->io_complete_work);
+}
+
+static void ath6kl_usb_io_comp_work(struct work_struct *work)
+{
+        struct ath6kl_usb_pipe *pipe = container_of(work,
+                                                    struct ath6kl_usb_pipe,
+                                                    io_complete_work);
+        struct ath6kl_usb *ar_usb;
+        struct sk_buff *skb;
+
+        ar_usb = pipe->ar_usb;
+
+        while ((skb = skb_dequeue(&pipe->io_comp_queue))) {
+                if (pipe->flags & ATH6KL_USB_PIPE_FLAG_TX) {
+                        ath6kl_dbg(ATH6KL_DBG_USB_BULK,
+                                   "ath6kl usb xmit callback buf:0x%p\n", skb);
+                        ath6kl_core_tx_complete(ar_usb->ar, skb);
+                } else {
+                        ath6kl_dbg(ATH6KL_DBG_USB_BULK,
+                                   "ath6kl usb recv callback buf:0x%p\n", skb);
+                        ath6kl_core_rx_complete(ar_usb->ar, skb,
+                                                pipe->logical_pipe_num);
+                }
+        }
+}
+
 #define ATH6KL_USB_MAX_DIAG_CMD (sizeof(struct ath6kl_usb_ctrl_diag_cmd_write))
 #define ATH6KL_USB_MAX_DIAG_RESP (sizeof(struct ath6kl_usb_ctrl_diag_resp_read))
 
 static void ath6kl_usb_destroy(struct ath6kl_usb *ar_usb)
 {
+        ath6kl_usb_flush_all(ar_usb);
+
+        ath6kl_usb_cleanup_pipe_resources(ar_usb);
+
         usb_set_intfdata(ar_usb->interface, NULL);
 
         kfree(ar_usb->diag_cmd_buffer);
@@ -70,19 +614,28 @@ static void ath6kl_usb_destroy(struct ath6kl_usb *ar_usb)
 
 static struct ath6kl_usb *ath6kl_usb_create(struct usb_interface *interface)
 {
-        struct ath6kl_usb *ar_usb = NULL;
         struct usb_device *dev = interface_to_usbdev(interface);
+        struct ath6kl_usb *ar_usb;
+        struct ath6kl_usb_pipe *pipe;
         int status = 0;
+        int i;
 
         ar_usb = kzalloc(sizeof(struct ath6kl_usb), GFP_KERNEL);
         if (ar_usb == NULL)
                 goto fail_ath6kl_usb_create;
 
-        memset(ar_usb, 0, sizeof(struct ath6kl_usb));
         usb_set_intfdata(interface, ar_usb);
+        spin_lock_init(&(ar_usb->cs_lock));
         ar_usb->udev = dev;
         ar_usb->interface = interface;
 
+        for (i = 0; i < ATH6KL_USB_PIPE_MAX; i++) {
+                pipe = &ar_usb->pipes[i];
+                INIT_WORK(&pipe->io_complete_work,
+                          ath6kl_usb_io_comp_work);
+                skb_queue_head_init(&pipe->io_comp_queue);
+        }
+
         ar_usb->diag_cmd_buffer = kzalloc(ATH6KL_USB_MAX_DIAG_CMD, GFP_KERNEL);
         if (ar_usb->diag_cmd_buffer == NULL) {
                 status = -ENOMEM;
@@ -96,6 +649,8 @@ static struct ath6kl_usb *ath6kl_usb_create(struct usb_interface *interface)
                 goto fail_ath6kl_usb_create;
         }
 
+        status = ath6kl_usb_setup_pipe_resources(ar_usb);
+
 fail_ath6kl_usb_create:
         if (status != 0) {
                 ath6kl_usb_destroy(ar_usb);
@@ -114,11 +669,177 @@ static void ath6kl_usb_device_detached(struct usb_interface *interface)
 
         ath6kl_stop_txrx(ar_usb->ar);
 
+        /* Delay to wait for the target to reboot */
+        mdelay(20);
         ath6kl_core_cleanup(ar_usb->ar);
-
         ath6kl_usb_destroy(ar_usb);
 }
 
+/* exported hif usb APIs for htc pipe */
+static void hif_start(struct ath6kl *ar)
+{
+        struct ath6kl_usb *device = ath6kl_usb_priv(ar);
+        int i;
+
+        ath6kl_usb_start_recv_pipes(device);
+
+        /* set the TX resource avail threshold for each TX pipe */
+        for (i = ATH6KL_USB_PIPE_TX_CTRL;
+             i <= ATH6KL_USB_PIPE_TX_DATA_HP; i++) {
+                device->pipes[i].urb_cnt_thresh =
+                    device->pipes[i].urb_alloc / 2;
+        }
+}
+
+static int ath6kl_usb_send(struct ath6kl *ar, u8 PipeID,
+                           struct sk_buff *hdr_skb, struct sk_buff *skb)
+{
+        struct ath6kl_usb *device = ath6kl_usb_priv(ar);
+        struct ath6kl_usb_pipe *pipe = &device->pipes[PipeID];
+        struct ath6kl_urb_context *urb_context;
+        int usb_status, status = 0;
+        struct urb *urb;
+        u8 *data;
+        u32 len;
+
+        ath6kl_dbg(ATH6KL_DBG_USB_BULK, "+%s pipe : %d, buf:0x%p\n",
+                   __func__, PipeID, skb);
+
+        urb_context = ath6kl_usb_alloc_urb_from_pipe(pipe);
+
+        if (urb_context == NULL) {
+                /*
+                 * TODO: it is possible to run out of urbs if
+                 * 2 endpoints map to the same pipe ID
+                 */
+                ath6kl_dbg(ATH6KL_DBG_USB_BULK,
+                           "%s pipe:%d no urbs left. URB Cnt : %d\n",
+                           __func__, PipeID, pipe->urb_cnt);
+                status = -ENOMEM;
+                goto fail_hif_send;
+        }
+
+        urb_context->skb = skb;
+
+        data = skb->data;
+        len = skb->len;
+
+        urb = usb_alloc_urb(0, GFP_ATOMIC);
+        if (urb == NULL) {
+                status = -ENOMEM;
+                ath6kl_usb_free_urb_to_pipe(urb_context->pipe,
+                                            urb_context);
+                goto fail_hif_send;
+        }
+
+        usb_fill_bulk_urb(urb,
+                          device->udev,
+                          pipe->usb_pipe_handle,
+                          data,
+                          len,
+                          ath6kl_usb_usb_transmit_complete, urb_context);
+
+        if ((len % pipe->max_packet_size) == 0) {
+                /* hit a max packet boundary on this pipe */
+                urb->transfer_flags |= URB_ZERO_PACKET;
+        }
+
+        ath6kl_dbg(ATH6KL_DBG_USB_BULK,
+                   "athusb bulk send submit:%d, 0x%X (ep:0x%2.2X), %d bytes\n",
+                   pipe->logical_pipe_num, pipe->usb_pipe_handle,
+                   pipe->ep_address, len);
+
+        usb_anchor_urb(urb, &pipe->urb_submitted);
+        usb_status = usb_submit_urb(urb, GFP_ATOMIC);
+
+        if (usb_status) {
+                ath6kl_dbg(ATH6KL_DBG_USB_BULK,
+                           "ath6kl usb : usb bulk transmit failed %d\n",
+                           usb_status);
+                usb_unanchor_urb(urb);
+                ath6kl_usb_free_urb_to_pipe(urb_context->pipe,
+                                            urb_context);
+                status = -EINVAL;
+        }
+        usb_free_urb(urb);
+
+fail_hif_send:
+        return status;
+}
+
+static void hif_stop(struct ath6kl *ar)
+{
+        struct ath6kl_usb *device = ath6kl_usb_priv(ar);
+
+        ath6kl_usb_flush_all(device);
+}
+
+static void ath6kl_usb_get_default_pipe(struct ath6kl *ar,
+                                        u8 *ul_pipe, u8 *dl_pipe)
+{
+        *ul_pipe = ATH6KL_USB_PIPE_TX_CTRL;
+        *dl_pipe = ATH6KL_USB_PIPE_RX_CTRL;
+}
+
+static int ath6kl_usb_map_service_pipe(struct ath6kl *ar, u16 svc_id,
+                                       u8 *ul_pipe, u8 *dl_pipe)
+{
+        int status = 0;
+
+        switch (svc_id) {
+        case HTC_CTRL_RSVD_SVC:
+        case WMI_CONTROL_SVC:
+                *ul_pipe = ATH6KL_USB_PIPE_TX_CTRL;
+                /* due to large control packets, shift to data pipe */
+                *dl_pipe = ATH6KL_USB_PIPE_RX_DATA;
+                break;
+        case WMI_DATA_BE_SVC:
+        case WMI_DATA_BK_SVC:
+                *ul_pipe = ATH6KL_USB_PIPE_TX_DATA_LP;
+                /*
+                * Disable rxdata2 directly, it will be enabled
+                * if FW enable rxdata2
+                */
+                *dl_pipe = ATH6KL_USB_PIPE_RX_DATA;
+                break;
+        case WMI_DATA_VI_SVC:
+                *ul_pipe = ATH6KL_USB_PIPE_TX_DATA_MP;
+                /*
+                * Disable rxdata2 directly, it will be enabled
+                * if FW enable rxdata2
+                */
+                *dl_pipe = ATH6KL_USB_PIPE_RX_DATA;
+                break;
+        case WMI_DATA_VO_SVC:
+                *ul_pipe = ATH6KL_USB_PIPE_TX_DATA_HP;
+                /*
+                * Disable rxdata2 directly, it will be enabled
+                * if FW enable rxdata2
+                */
+                *dl_pipe = ATH6KL_USB_PIPE_RX_DATA;
+                break;
+        default:
+                status = -EPERM;
+                break;
+        }
+
+        return status;
+}
+
+static u16 ath6kl_usb_get_free_queue_number(struct ath6kl *ar, u8 pipe_id)
+{
+        struct ath6kl_usb *device = ath6kl_usb_priv(ar);
+
+        return device->pipes[pipe_id].urb_cnt;
+}
+
+static void hif_detach_htc(struct ath6kl *ar)
+{
+        struct ath6kl_usb *device = ath6kl_usb_priv(ar);
+
+        ath6kl_usb_flush_all(device);
+}
+
 static int ath6kl_usb_submit_ctrl_out(struct ath6kl_usb *ar_usb,
                                    u8 req, u16 value, u16 index, void *data,
                                    u32 size)
@@ -301,14 +1022,21 @@ static int ath6kl_usb_bmi_write(struct ath6kl *ar, u8 *buf, u32 len)
 
 static int ath6kl_usb_power_on(struct ath6kl *ar)
 {
+        hif_start(ar);
         return 0;
 }
 
 static int ath6kl_usb_power_off(struct ath6kl *ar)
 {
+        hif_detach_htc(ar);
         return 0;
 }
 
+static void ath6kl_usb_stop(struct ath6kl *ar)
+{
+        hif_stop(ar);
+}
+
 static const struct ath6kl_hif_ops ath6kl_usb_ops = {
         .diag_read32 = ath6kl_usb_diag_read32,
         .diag_write32 = ath6kl_usb_diag_write32,
@@ -316,6 +1044,11 @@ static const struct ath6kl_hif_ops ath6kl_usb_ops = {
         .bmi_write = ath6kl_usb_bmi_write,
         .power_on = ath6kl_usb_power_on,
         .power_off = ath6kl_usb_power_off,
+        .stop = ath6kl_usb_stop,
+        .pipe_send = ath6kl_usb_send,
+        .pipe_get_default = ath6kl_usb_get_default_pipe,
+        .pipe_map_service = ath6kl_usb_map_service_pipe,
+        .pipe_get_free_queue_number = ath6kl_usb_get_free_queue_number,
 };
 
 /* ath6kl usb driver registered functions */
@@ -368,7 +1101,7 @@ static int ath6kl_usb_probe(struct usb_interface *interface,
 
         ar_usb->ar = ar;
 
-        ret = ath6kl_core_init(ar);
+        ret = ath6kl_core_init(ar, ATH6KL_HTC_TYPE_PIPE);
         if (ret) {
                 ath6kl_err("Failed to init ath6kl core: %d\n", ret);
                 goto err_core_free;
@@ -392,6 +1125,46 @@ static void ath6kl_usb_remove(struct usb_interface *interface)
         ath6kl_usb_device_detached(interface);
 }
 
+#ifdef CONFIG_PM
+
+static int ath6kl_usb_suspend(struct usb_interface *interface,
+                              pm_message_t message)
+{
+        struct ath6kl_usb *device;
+        device = usb_get_intfdata(interface);
+
+        ath6kl_usb_flush_all(device);
+        return 0;
+}
+
+static int ath6kl_usb_resume(struct usb_interface *interface)
+{
+        struct ath6kl_usb *device;
+        device = usb_get_intfdata(interface);
+
+        ath6kl_usb_post_recv_transfers(&device->pipes[ATH6KL_USB_PIPE_RX_DATA],
+                                       ATH6KL_USB_RX_BUFFER_SIZE);
+        ath6kl_usb_post_recv_transfers(&device->pipes[ATH6KL_USB_PIPE_RX_DATA2],
+                                       ATH6KL_USB_RX_BUFFER_SIZE);
+
+        return 0;
+}
+
+static int ath6kl_usb_reset_resume(struct usb_interface *intf)
+{
+        if (usb_get_intfdata(intf))
+                ath6kl_usb_remove(intf);
+        return 0;
+}
+
+#else
+
+#define ath6kl_usb_suspend NULL
+#define ath6kl_usb_resume NULL
+#define ath6kl_usb_reset_resume NULL
+
+#endif
+
 /* table of devices that work with this driver */
 static struct usb_device_id ath6kl_usb_ids[] = {
         {USB_DEVICE(0x0cf3, 0x9374)},
@@ -403,8 +1176,12 @@ MODULE_DEVICE_TABLE(usb, ath6kl_usb_ids);
 static struct usb_driver ath6kl_usb_driver = {
         .name = "ath6kl_usb",
         .probe = ath6kl_usb_probe,
+        .suspend = ath6kl_usb_suspend,
+        .resume = ath6kl_usb_resume,
+        .reset_resume = ath6kl_usb_reset_resume,
         .disconnect = ath6kl_usb_remove,
         .id_table = ath6kl_usb_ids,
+        .supports_autosuspend = true,
 };
 
 static int ath6kl_usb_init(void)
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index 2b442332cd0f..7c8a9977faf5 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -2882,6 +2882,43 @@ int ath6kl_wmi_set_keepalive_cmd(struct wmi *wmi, u8 if_idx,
         return ret;
 }
 
+int ath6kl_wmi_set_htcap_cmd(struct wmi *wmi, u8 if_idx,
+                             enum ieee80211_band band,
+                             struct ath6kl_htcap *htcap)
+{
+        struct sk_buff *skb;
+        struct wmi_set_htcap_cmd *cmd;
+
+        skb = ath6kl_wmi_get_new_buf(sizeof(*cmd));
+        if (!skb)
+                return -ENOMEM;
+
+        cmd = (struct wmi_set_htcap_cmd *) skb->data;
+
+        /*
+         * NOTE: Band in firmware matches enum ieee80211_band, it is unlikely
+         * this will be changed in firmware. If at all there is any change in
+         * band value, the host needs to be fixed.
+         */
+        cmd->band = band;
+        cmd->ht_enable = !!htcap->ht_enable;
+        cmd->ht20_sgi = !!(htcap->cap_info & IEEE80211_HT_CAP_SGI_20);
+        cmd->ht40_supported =
+                !!(htcap->cap_info & IEEE80211_HT_CAP_SUP_WIDTH_20_40);
+        cmd->ht40_sgi = !!(htcap->cap_info & IEEE80211_HT_CAP_SGI_40);
+        cmd->intolerant_40mhz =
+                !!(htcap->cap_info & IEEE80211_HT_CAP_40MHZ_INTOLERANT);
+        cmd->max_ampdu_len_exp = htcap->ampdu_factor;
+
+        ath6kl_dbg(ATH6KL_DBG_WMI,
+                   "Set htcap: band:%d ht_enable:%d 40mhz:%d sgi_20mhz:%d sgi_40mhz:%d 40mhz_intolerant:%d ampdu_len_exp:%d\n",
+                   cmd->band, cmd->ht_enable, cmd->ht40_supported,
+                   cmd->ht20_sgi, cmd->ht40_sgi, cmd->intolerant_40mhz,
+                   cmd->max_ampdu_len_exp);
+        return ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SET_HT_CAP_CMDID,
+                                   NO_SYNC_WMIFLAG);
+}
+
 int ath6kl_wmi_test_cmd(struct wmi *wmi, void *buf, size_t len)
 {
         struct sk_buff *skb;
@@ -3032,6 +3069,9 @@ int ath6kl_wmi_ap_set_mlme(struct wmi *wmip, u8 if_idx, u8 cmd, const u8 *mac,
         cm->reason = cpu_to_le16(reason);
         cm->cmd = cmd;
 
+        ath6kl_dbg(ATH6KL_DBG_WMI, "ap_set_mlme: cmd=%d reason=%d\n", cm->cmd,
+                   cm->reason);
+
         return ath6kl_wmi_cmd_send(wmip, if_idx, skb, WMI_AP_SET_MLME_CMDID,
                                    NO_SYNC_WMIFLAG);
 }
@@ -3181,6 +3221,29 @@ int ath6kl_wmi_set_appie_cmd(struct wmi *wmi, u8 if_idx, u8 mgmt_frm_type,
                                    NO_SYNC_WMIFLAG);
 }
 
+int ath6kl_wmi_set_ie_cmd(struct wmi *wmi, u8 if_idx, u8 ie_id, u8 ie_field,
+                          const u8 *ie_info, u8 ie_len)
+{
+        struct sk_buff *skb;
+        struct wmi_set_ie_cmd *p;
+
+        skb = ath6kl_wmi_get_new_buf(sizeof(*p) + ie_len);
+        if (!skb)
+                return -ENOMEM;
+
+        ath6kl_dbg(ATH6KL_DBG_WMI, "set_ie_cmd: ie_id=%u ie_ie_field=%u ie_len=%u\n",
+                   ie_id, ie_field, ie_len);
+        p = (struct wmi_set_ie_cmd *) skb->data;
+        p->ie_id = ie_id;
+        p->ie_field = ie_field;
+        p->ie_len = ie_len;
+        if (ie_info && ie_len > 0)
+                memcpy(p->ie_info, ie_info, ie_len);
+
+        return ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SET_IE_CMDID,
+                                   NO_SYNC_WMIFLAG);
+}
+
 int ath6kl_wmi_disable_11b_rates_cmd(struct wmi *wmi, bool disable)
 {
         struct sk_buff *skb;
@@ -3392,6 +3455,23 @@ int ath6kl_wmi_cancel_remain_on_chnl_cmd(struct wmi *wmi, u8 if_idx)
                                      WMI_CANCEL_REMAIN_ON_CHNL_CMDID);
 }
 
+int ath6kl_wmi_set_inact_period(struct wmi *wmi, u8 if_idx, int inact_timeout)
+{
+        struct sk_buff *skb;
+        struct wmi_set_inact_period_cmd *cmd;
+
+        skb = ath6kl_wmi_get_new_buf(sizeof(*cmd));
+        if (!skb)
+                return -ENOMEM;
+
+        cmd = (struct wmi_set_inact_period_cmd *) skb->data;
+        cmd->inact_period = cpu_to_le32(inact_timeout);
+        cmd->num_null_func = 0;
+
+        return ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_AP_CONN_INACT_CMDID,
+                                   NO_SYNC_WMIFLAG);
+}
+
 static int ath6kl_wmi_control_rx_xtnd(struct wmi *wmi, struct sk_buff *skb)
 {
         struct wmix_cmd_hdr *cmd;
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h
index 4092e3e80790..d3d2ab5c1689 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.h
+++ b/drivers/net/wireless/ath/ath6kl/wmi.h
@@ -182,6 +182,9 @@ enum wmi_data_hdr_flags {
 #define WMI_DATA_HDR_META_MASK      0x7
 #define WMI_DATA_HDR_META_SHIFT     13
 
+#define WMI_DATA_HDR_PAD_BEFORE_DATA_MASK               0xFF
+#define WMI_DATA_HDR_PAD_BEFORE_DATA_SHIFT              0x8
+
 /* Macros for operating on WMI_DATA_HDR (info3) field */
 #define WMI_DATA_HDR_IF_IDX_MASK    0xF
 
@@ -423,6 +426,7 @@ enum wmi_cmd_id {
         WMI_SET_FRAMERATES_CMDID,
         WMI_SET_AP_PS_CMDID,
         WMI_SET_QOS_SUPP_CMDID,
+        WMI_SET_IE_CMDID,
 
         /* WMI_THIN_RESERVED_... mark the start and end
          * values for WMI_THIN_RESERVED command IDs. These
@@ -629,6 +633,11 @@ enum wmi_mgmt_frame_type {
         WMI_NUM_MGMT_FRAME
 };
 
+enum wmi_ie_field_type {
+        WMI_RSN_IE_CAPB = 0x1,
+        WMI_IE_FULL     = 0xFF,  /* indicats full IE */
+};
+
 /* WMI_CONNECT_CMDID  */
 enum network_type {
         INFRA_NETWORK = 0x01,
@@ -1268,6 +1277,16 @@ struct wmi_mcast_filter_add_del_cmd {
         u8 mcast_mac[ATH6KL_MCAST_FILTER_MAC_ADDR_SIZE];
 } __packed;
 
+struct wmi_set_htcap_cmd {
+        u8 band;
+        u8 ht_enable;
+        u8 ht40_supported;
+        u8 ht20_sgi;
+        u8 ht40_sgi;
+        u8 intolerant_40mhz;
+        u8 max_ampdu_len_exp;
+} __packed;
+
 /* Command Replies */
 
 /* WMI_GET_CHANNEL_LIST_CMDID reply */
@@ -1913,6 +1932,14 @@ struct wmi_set_appie_cmd {
         u8 ie_info[0];
 } __packed;
 
+struct wmi_set_ie_cmd {
+        u8 ie_id;
+        u8 ie_field;    /* enum wmi_ie_field_type */
+        u8 ie_len;
+        u8 reserved;
+        u8 ie_info[0];
+} __packed;
+
 /* Notify the WSC registration status to the target */
 #define WSC_REG_ACTIVE     1
 #define WSC_REG_INACTIVE   0
@@ -2141,6 +2168,11 @@ struct wmi_ap_hidden_ssid_cmd {
         u8 hidden_ssid;
 } __packed;
 
+struct wmi_set_inact_period_cmd {
+        __le32 inact_period;
+        u8 num_null_func;
+} __packed;
+
 /* AP mode events */
 struct wmi_ap_set_apsd_cmd {
         u8 enable;
@@ -2465,6 +2497,9 @@ int ath6kl_wmi_get_roam_tbl_cmd(struct wmi *wmi);
 int ath6kl_wmi_set_wmm_txop(struct wmi *wmi, u8 if_idx, enum wmi_txop_cfg cfg);
 int ath6kl_wmi_set_keepalive_cmd(struct wmi *wmi, u8 if_idx,
                                  u8 keep_alive_intvl);
+int ath6kl_wmi_set_htcap_cmd(struct wmi *wmi, u8 if_idx,
+                             enum ieee80211_band band,
+                             struct ath6kl_htcap *htcap);
 int ath6kl_wmi_test_cmd(struct wmi *wmi, void *buf, size_t len);
 
 s32 ath6kl_wmi_get_rate(s8 rate_index);
@@ -2515,6 +2550,9 @@ int ath6kl_wmi_set_rx_frame_format_cmd(struct wmi *wmi, u8 if_idx,
 int ath6kl_wmi_set_appie_cmd(struct wmi *wmi, u8 if_idx, u8 mgmt_frm_type,
                              const u8 *ie, u8 ie_len);
 
+int ath6kl_wmi_set_ie_cmd(struct wmi *wmi, u8 if_idx, u8 ie_id, u8 ie_field,
+                          const u8 *ie_info, u8 ie_len);
+
 /* P2P */
 int ath6kl_wmi_disable_11b_rates_cmd(struct wmi *wmi, bool disable);
 
@@ -2538,6 +2576,8 @@ int ath6kl_wmi_cancel_remain_on_chnl_cmd(struct wmi *wmi, u8 if_idx);
 int ath6kl_wmi_set_appie_cmd(struct wmi *wmi, u8 if_idx, u8 mgmt_frm_type,
                              const u8 *ie, u8 ie_len);
 
+int ath6kl_wmi_set_inact_period(struct wmi *wmi, u8 if_idx, int inact_timeout);
+
 void ath6kl_wmi_sscan_timer(unsigned long ptr);
 
 struct ath6kl_vif *ath6kl_get_vif_by_index(struct ath6kl *ar, u8 if_idx);
diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile
index 27d95fe5ade0..3f0b84723789 100644
--- a/drivers/net/wireless/ath/ath9k/Makefile
+++ b/drivers/net/wireless/ath/ath9k/Makefile
@@ -11,7 +11,10 @@ ath9k-$(CONFIG_ATH9K_PCI) += pci.o
 ath9k-$(CONFIG_ATH9K_AHB) += ahb.o
 ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o
 ath9k-$(CONFIG_ATH9K_DFS_DEBUGFS) += dfs_debug.o
-ath9k-$(CONFIG_ATH9K_DFS_CERTIFIED) += dfs.o
+ath9k-$(CONFIG_ATH9K_DFS_CERTIFIED) += \
+                dfs.o \
+                dfs_pattern_detector.o \
+                dfs_pri_detector.o
 
 obj-$(CONFIG_ATH9K) += ath9k.o
 
diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c
index 7e0ea4e98334..b4c77f9d7470 100644
--- a/drivers/net/wireless/ath/ath9k/ani.c
+++ b/drivers/net/wireless/ath/ath9k/ani.c
@@ -46,8 +46,8 @@ static const struct ani_ofdm_level_entry ofdm_level_table[] = {
         {  5,  4,  1  }, /* lvl 5 */
         {  6,  5,  1  }, /* lvl 6 */
         {  7,  6,  1  }, /* lvl 7 */
-        {  7,  7,  1  }, /* lvl 8 */
-        {  7,  8,  0  }  /* lvl 9 */
+        {  7,  6,  0  }, /* lvl 8 */
+        {  7,  7,  0  }  /* lvl 9 */
 };
 #define ATH9K_ANI_OFDM_NUM_LEVEL \
         ARRAY_SIZE(ofdm_level_table)
@@ -91,8 +91,8 @@ static const struct ani_cck_level_entry cck_level_table[] = {
         {  4,  0  }, /* lvl 4 */
         {  5,  0  }, /* lvl 5 */
         {  6,  0  }, /* lvl 6 */
-        {  7,  0  }, /* lvl 7 (only for high rssi) */
-        {  8,  0  }  /* lvl 8 (only for high rssi) */
+        {  6,  0  }, /* lvl 7 (only for high rssi) */
+        {  7,  0  }  /* lvl 8 (only for high rssi) */
 };
 
 #define ATH9K_ANI_CCK_NUM_LEVEL \
@@ -274,7 +274,9 @@ static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel)
                 aniState->rssiThrLow, aniState->rssiThrHigh);
 
         if (aniState->update_ani)
-                aniState->ofdmNoiseImmunityLevel = immunityLevel;
+                aniState->ofdmNoiseImmunityLevel =
+                        (immunityLevel > ATH9K_ANI_OFDM_DEF_LEVEL) ?
+                        immunityLevel : ATH9K_ANI_OFDM_DEF_LEVEL;
 
         entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel];
         entry_cck = &cck_level_table[aniState->cckNoiseImmunityLevel];
@@ -290,16 +292,9 @@ static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel)
                                      ATH9K_ANI_FIRSTEP_LEVEL,
                                      entry_ofdm->fir_step_level);
 
-        if ((ah->opmode != NL80211_IFTYPE_STATION &&
-             ah->opmode != NL80211_IFTYPE_ADHOC) ||
-            aniState->noiseFloor <= aniState->rssiThrHigh) {
-                if (aniState->ofdmWeakSigDetectOff)
-                        /* force on ofdm weak sig detect */
-                        ath9k_hw_ani_control(ah,
-                                ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
-                                             true);
-                else if (aniState->ofdmWeakSigDetectOff ==
-                         entry_ofdm->ofdm_weak_signal_on)
+        if ((aniState->noiseFloor >= aniState->rssiThrHigh) &&
+            (!aniState->ofdmWeakSigDetectOff !=
+             entry_ofdm->ofdm_weak_signal_on)) {
                         ath9k_hw_ani_control(ah,
                                 ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
                                 entry_ofdm->ofdm_weak_signal_on);
@@ -347,7 +342,9 @@ static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel)
                 immunityLevel = ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI;
 
         if (aniState->update_ani)
-                aniState->cckNoiseImmunityLevel = immunityLevel;
+                aniState->cckNoiseImmunityLevel =
+                        (immunityLevel > ATH9K_ANI_CCK_DEF_LEVEL) ?
+                        immunityLevel : ATH9K_ANI_CCK_DEF_LEVEL;
 
         entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel];
         entry_cck = &cck_level_table[aniState->cckNoiseImmunityLevel];
@@ -717,26 +714,30 @@ void ath9k_hw_ani_monitor(struct ath_hw *ah, struct ath9k_channel *chan)
                 ofdmPhyErrRate, aniState->cckNoiseImmunityLevel,
                 cckPhyErrRate, aniState->ofdmsTurn);
 
-        if (aniState->listenTime > 5 * ah->aniperiod) {
-                if (ofdmPhyErrRate <= ah->config.ofdm_trig_low &&
-                    cckPhyErrRate <= ah->config.cck_trig_low) {
+        if (aniState->listenTime > ah->aniperiod) {
+                if (cckPhyErrRate < ah->config.cck_trig_low &&
+                    ((ofdmPhyErrRate < ah->config.ofdm_trig_low &&
+                      aniState->ofdmNoiseImmunityLevel <
+                      ATH9K_ANI_OFDM_DEF_LEVEL) ||
+                     (ofdmPhyErrRate < ATH9K_ANI_OFDM_TRIG_LOW_ABOVE_INI &&
+                      aniState->ofdmNoiseImmunityLevel >=
+                      ATH9K_ANI_OFDM_DEF_LEVEL))) {
                         ath9k_hw_ani_lower_immunity(ah);
                         aniState->ofdmsTurn = !aniState->ofdmsTurn;
-                }
-                ath9k_ani_restart(ah);
-        } else if (aniState->listenTime > ah->aniperiod) {
-                /* check to see if need to raise immunity */
-                if (ofdmPhyErrRate > ah->config.ofdm_trig_high &&
-                    (cckPhyErrRate <= ah->config.cck_trig_high ||
-                     aniState->ofdmsTurn)) {
+                } else if ((ofdmPhyErrRate > ah->config.ofdm_trig_high &&
+                            aniState->ofdmNoiseImmunityLevel >=
+                            ATH9K_ANI_OFDM_DEF_LEVEL) ||
+                           (ofdmPhyErrRate >
+                            ATH9K_ANI_OFDM_TRIG_HIGH_BELOW_INI &&
+                            aniState->ofdmNoiseImmunityLevel <
+                            ATH9K_ANI_OFDM_DEF_LEVEL)) {
                         ath9k_hw_ani_ofdm_err_trigger(ah);
-                        ath9k_ani_restart(ah);
                         aniState->ofdmsTurn = false;
                 } else if (cckPhyErrRate > ah->config.cck_trig_high) {
                         ath9k_hw_ani_cck_err_trigger(ah);
-                        ath9k_ani_restart(ah);
                         aniState->ofdmsTurn = true;
                 }
+                ath9k_ani_restart(ah);
         }
 }
 EXPORT_SYMBOL(ath9k_hw_ani_monitor);
diff --git a/drivers/net/wireless/ath/ath9k/ani.h b/drivers/net/wireless/ath/ath9k/ani.h
index 83029d6c7b22..72e2b874e179 100644
--- a/drivers/net/wireless/ath/ath9k/ani.h
+++ b/drivers/net/wireless/ath/ath9k/ani.h
@@ -25,11 +25,13 @@
 
 /* units are errors per second */
 #define ATH9K_ANI_OFDM_TRIG_HIGH_OLD      500
-#define ATH9K_ANI_OFDM_TRIG_HIGH_NEW      1000
+#define ATH9K_ANI_OFDM_TRIG_HIGH_NEW      3500
+#define ATH9K_ANI_OFDM_TRIG_HIGH_BELOW_INI 1000
 
 /* units are errors per second */
 #define ATH9K_ANI_OFDM_TRIG_LOW_OLD       200
 #define ATH9K_ANI_OFDM_TRIG_LOW_NEW       400
+#define ATH9K_ANI_OFDM_TRIG_LOW_ABOVE_INI 900
 
 /* units are errors per second */
 #define ATH9K_ANI_CCK_TRIG_HIGH_OLD       200
@@ -53,7 +55,7 @@
 #define ATH9K_ANI_RSSI_THR_LOW            7
 
 #define ATH9K_ANI_PERIOD_OLD              100
-#define ATH9K_ANI_PERIOD_NEW              1000
+#define ATH9K_ANI_PERIOD_NEW              300
 
 /* in ms */
 #define ATH9K_ANI_POLLINTERVAL_OLD        100
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index d7d8e9199140..c7492c6a2519 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -245,7 +245,6 @@ static int ar5008_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
         REG_WRITE(ah, AR_PHY(0x37), reg32);
 
         ah->curchan = chan;
-        ah->curchan_rad_index = -1;
 
         return 0;
 }
@@ -619,19 +618,10 @@ static void ar5008_hw_init_bb(struct ath_hw *ah,
         u32 synthDelay;
 
         synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) & AR_PHY_RX_DELAY_DELAY;
-        if (IS_CHAN_B(chan))
-                synthDelay = (4 * synthDelay) / 22;
-        else
-                synthDelay /= 10;
-
-        if (IS_CHAN_HALF_RATE(chan))
-                synthDelay *= 2;
-        else if (IS_CHAN_QUARTER_RATE(chan))
-                synthDelay *= 4;
 
         REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
 
-        udelay(synthDelay + BASE_ACTIVATE_DELAY);
+        ath9k_hw_synth_delay(ah, chan, synthDelay);
 }
 
 static void ar5008_hw_init_chain_masks(struct ath_hw *ah)
@@ -869,7 +859,7 @@ static int ar5008_hw_process_ini(struct ath_hw *ah,
         ar5008_hw_set_channel_regs(ah, chan);
         ar5008_hw_init_chain_masks(ah);
         ath9k_olc_init(ah);
-        ath9k_hw_apply_txpower(ah, chan);
+        ath9k_hw_apply_txpower(ah, chan, false);
 
         /* Write analog registers */
         if (!ath9k_hw_set_rf_regs(ah, chan, freqIndex)) {
@@ -949,12 +939,8 @@ static bool ar5008_hw_rfbus_req(struct ath_hw *ah)
 static void ar5008_hw_rfbus_done(struct ath_hw *ah)
 {
         u32 synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) & AR_PHY_RX_DELAY_DELAY;
-        if (IS_CHAN_B(ah->curchan))
-                synthDelay = (4 * synthDelay) / 22;
-        else
-                synthDelay /= 10;
 
-        udelay(synthDelay + BASE_ACTIVATE_DELAY);
+        ath9k_hw_synth_delay(ah, ah->curchan, synthDelay);
 
         REG_WRITE(ah, AR_PHY_RFBUS_REQ, 0);
 }
@@ -1047,46 +1033,8 @@ static bool ar5008_hw_ani_control_old(struct ath_hw *ah,
                 break;
         }
         case ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION:{
-                static const int m1ThreshLow[] = { 127, 50 };
-                static const int m2ThreshLow[] = { 127, 40 };
-                static const int m1Thresh[] = { 127, 0x4d };
-                static const int m2Thresh[] = { 127, 0x40 };
-                static const int m2CountThr[] = { 31, 16 };
-                static const int m2CountThrLow[] = { 63, 48 };
                 u32 on = param ? 1 : 0;
 
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
-                              AR_PHY_SFCORR_LOW_M1_THRESH_LOW,
-                              m1ThreshLow[on]);
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
-                              AR_PHY_SFCORR_LOW_M2_THRESH_LOW,
-                              m2ThreshLow[on]);
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR,
-                              AR_PHY_SFCORR_M1_THRESH,
-                              m1Thresh[on]);
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR,
-                              AR_PHY_SFCORR_M2_THRESH,
-                              m2Thresh[on]);
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR,
-                              AR_PHY_SFCORR_M2COUNT_THR,
-                              m2CountThr[on]);
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
-                              AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW,
-                              m2CountThrLow[on]);
-
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
-                              AR_PHY_SFCORR_EXT_M1_THRESH_LOW,
-                              m1ThreshLow[on]);
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
-                              AR_PHY_SFCORR_EXT_M2_THRESH_LOW,
-                              m2ThreshLow[on]);
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
-                              AR_PHY_SFCORR_EXT_M1_THRESH,
-                              m1Thresh[on]);
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
-                              AR_PHY_SFCORR_EXT_M2_THRESH,
-                              m2Thresh[on]);
-
                 if (on)
                         REG_SET_BIT(ah, AR_PHY_SFCORR_LOW,
                                     AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
index aa2abaf31cba..8d78253c26ce 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
@@ -136,6 +136,7 @@ static bool ar9002_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked)
         }
 
         if (sync_cause) {
+                ath9k_debug_sync_cause(common, sync_cause);
                 fatal_int =
                         (sync_cause &
                          (AR_INTR_SYNC_HOST1_FATAL | AR_INTR_SYNC_HOST1_PERR))
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_phy.c b/drivers/net/wireless/ath/ath9k/ar9002_phy.c
index 3cbbb033fcea..846dd7974eb8 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.c
@@ -152,7 +152,6 @@ static int ar9002_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
         REG_WRITE(ah, AR_PHY_SYNTH_CONTROL, reg32);
 
         ah->curchan = chan;
-        ah->curchan_rad_index = -1;
 
         return 0;
 }
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
index 46c79a3d4737..952cb2b4656b 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
@@ -777,11 +777,11 @@ static const u32 ar9300Common_rx_gain_table_2p2[][2] = {
         {0x0000a074, 0x00000000},
         {0x0000a078, 0x00000000},
         {0x0000a07c, 0x00000000},
-        {0x0000a080, 0x22222229},
-        {0x0000a084, 0x1d1d1d1d},
-        {0x0000a088, 0x1d1d1d1d},
-        {0x0000a08c, 0x1d1d1d1d},
-        {0x0000a090, 0x171d1d1d},
+        {0x0000a080, 0x1a1a1a1a},
+        {0x0000a084, 0x1a1a1a1a},
+        {0x0000a088, 0x1a1a1a1a},
+        {0x0000a08c, 0x1a1a1a1a},
+        {0x0000a090, 0x171a1a1a},
         {0x0000a094, 0x11111717},
         {0x0000a098, 0x00030311},
         {0x0000a09c, 0x00000000},
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
index 63089cc1fafd..a0387a027db0 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
@@ -1000,10 +1000,12 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,
         if (mci && IS_CHAN_2GHZ(chan) && run_agc_cal)
                 ar9003_mci_init_cal_req(ah, &is_reusable);
 
-        txiqcal_done = ar9003_hw_tx_iq_cal_run(ah);
-        REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);
-        udelay(5);
-        REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
+        if (!(IS_CHAN_HALF_RATE(chan) || IS_CHAN_QUARTER_RATE(chan))) {
+                txiqcal_done = ar9003_hw_tx_iq_cal_run(ah);
+                REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);
+                udelay(5);
+                REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
+        }
 
 skip_tx_iqcal:
         if (run_agc_cal || !(ah->ah_flags & AH_FASTCC)) {
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index 6bb4db052bb0..ac53d901801d 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -30,11 +30,6 @@
 #define CTL_11A_EXT (CTL_11A | EXT_ADDITIVE)
 #define CTL_11G_EXT (CTL_11G | EXT_ADDITIVE)
 #define CTL_11B_EXT (CTL_11B | EXT_ADDITIVE)
-#define REDUCE_SCALED_POWER_BY_TWO_CHAIN     6  /* 10*log10(2)*2 */
-#define REDUCE_SCALED_POWER_BY_THREE_CHAIN   9  /* 10*log10(3)*2 */
-#define PWRINCR_3_TO_1_CHAIN      9             /* 10*log(3)*2 */
-#define PWRINCR_3_TO_2_CHAIN      3             /* floor(10*log(3/2)*2) */
-#define PWRINCR_2_TO_1_CHAIN      6             /* 10*log(2)*2 */
 
 #define SUB_NUM_CTL_MODES_AT_5G_40 2    /* excluding HT40, EXT-OFDM */
 #define SUB_NUM_CTL_MODES_AT_2G_40 3    /* excluding HT40, EXT-OFDM, EXT-CCK */
@@ -2936,15 +2931,6 @@ static const struct ar9300_eeprom *ar9003_eeprom_struct_find_by_id(int id)
 #undef N_LOOP
 }
 
-
-static u16 ath9k_hw_fbin2freq(u8 fbin, bool is2GHz)
-{
-        if (fbin == AR5416_BCHAN_UNUSED)
-                return fbin;
-
-        return (u16) ((is2GHz) ? (2300 + fbin) : (4800 + 5 * fbin));
-}
-
 static int ath9k_hw_ar9300_check_eeprom(struct ath_hw *ah)
 {
         return 0;
@@ -4070,7 +4056,7 @@ static u8 ar9003_hw_eeprom_get_tgt_pwr(struct ath_hw *ah,
          * targetpower piers stored on eeprom
          */
         for (i = 0; i < numPiers; i++) {
-                freqArray[i] = FBIN2FREQ(pFreqBin[i], is2GHz);
+                freqArray[i] = ath9k_hw_fbin2freq(pFreqBin[i], is2GHz);
                 targetPowerArray[i] = pEepromTargetPwr[i].tPow2x[rateIndex];
         }
 
@@ -4106,7 +4092,7 @@ static u8 ar9003_hw_eeprom_get_ht20_tgt_pwr(struct ath_hw *ah,
          * from targetpower piers stored on eeprom
          */
         for (i = 0; i < numPiers; i++) {
-                freqArray[i] = FBIN2FREQ(pFreqBin[i], is2GHz);
+                freqArray[i] = ath9k_hw_fbin2freq(pFreqBin[i], is2GHz);
                 targetPowerArray[i] = pEepromTargetPwr[i].tPow2x[rateIndex];
         }
 
@@ -4142,7 +4128,7 @@ static u8 ar9003_hw_eeprom_get_ht40_tgt_pwr(struct ath_hw *ah,
          * targetpower piers stored on eeprom
          */
         for (i = 0; i < numPiers; i++) {
-                freqArray[i] = FBIN2FREQ(pFreqBin[i], is2GHz);
+                freqArray[i] = ath9k_hw_fbin2freq(pFreqBin[i], is2GHz);
                 targetPowerArray[i] = pEepromTargetPwr[i].tPow2x[rateIndex];
         }
 
@@ -4167,7 +4153,7 @@ static u8 ar9003_hw_eeprom_get_cck_tgt_pwr(struct ath_hw *ah,
          * targetpower piers stored on eeprom
          */
         for (i = 0; i < numPiers; i++) {
-                freqArray[i] = FBIN2FREQ(pFreqBin[i], 1);
+                freqArray[i] = ath9k_hw_fbin2freq(pFreqBin[i], 1);
                 targetPowerArray[i] = pEepromTargetPwr[i].tPow2x[rateIndex];
         }
 
@@ -4295,18 +4281,10 @@ static int ar9003_hw_tx_power_regwrite(struct ath_hw *ah, u8 * pPwrArray)
 #undef POW_SM
 }
 
-static void ar9003_hw_set_target_power_eeprom(struct ath_hw *ah, u16 freq,
-                                              u8 *targetPowerValT2)
+static void ar9003_hw_get_legacy_target_powers(struct ath_hw *ah, u16 freq,
+                                               u8 *targetPowerValT2,
+                                               bool is2GHz)
 {
-        /* XXX: hard code for now, need to get from eeprom struct */
-        u8 ht40PowerIncForPdadc = 0;
-        bool is2GHz = false;
-        unsigned int i = 0;
-        struct ath_common *common = ath9k_hw_common(ah);
-
-        if (freq < 4000)
-                is2GHz = true;
-
         targetPowerValT2[ALL_TARGET_LEGACY_6_24] =
             ar9003_hw_eeprom_get_tgt_pwr(ah, LEGACY_TARGET_RATE_6_24, freq,
                                          is2GHz);
@@ -4319,6 +4297,11 @@ static void ar9003_hw_set_target_power_eeprom(struct ath_hw *ah, u16 freq,
         targetPowerValT2[ALL_TARGET_LEGACY_54] =
             ar9003_hw_eeprom_get_tgt_pwr(ah, LEGACY_TARGET_RATE_54, freq,
                                          is2GHz);
+}
+
+static void ar9003_hw_get_cck_target_powers(struct ath_hw *ah, u16 freq,
+                                            u8 *targetPowerValT2)
+{
         targetPowerValT2[ALL_TARGET_LEGACY_1L_5L] =
             ar9003_hw_eeprom_get_cck_tgt_pwr(ah, LEGACY_TARGET_RATE_1L_5L,
                                              freq);
@@ -4328,6 +4311,11 @@ static void ar9003_hw_set_target_power_eeprom(struct ath_hw *ah, u16 freq,
             ar9003_hw_eeprom_get_cck_tgt_pwr(ah, LEGACY_TARGET_RATE_11L, freq);
         targetPowerValT2[ALL_TARGET_LEGACY_11S] =
             ar9003_hw_eeprom_get_cck_tgt_pwr(ah, LEGACY_TARGET_RATE_11S, freq);
+}
+
+static void ar9003_hw_get_ht20_target_powers(struct ath_hw *ah, u16 freq,
+                                             u8 *targetPowerValT2, bool is2GHz)
+{
         targetPowerValT2[ALL_TARGET_HT20_0_8_16] =
             ar9003_hw_eeprom_get_ht20_tgt_pwr(ah, HT_TARGET_RATE_0_8_16, freq,
                                               is2GHz);
@@ -4370,6 +4358,16 @@ static void ar9003_hw_set_target_power_eeprom(struct ath_hw *ah, u16 freq,
         targetPowerValT2[ALL_TARGET_HT20_23] =
             ar9003_hw_eeprom_get_ht20_tgt_pwr(ah, HT_TARGET_RATE_23, freq,
                                               is2GHz);
+}
+
+static void ar9003_hw_get_ht40_target_powers(struct ath_hw *ah,
+                                                   u16 freq,
+                                                   u8 *targetPowerValT2,
+                                                   bool is2GHz)
+{
+        /* XXX: hard code for now, need to get from eeprom struct */
+        u8 ht40PowerIncForPdadc = 0;
+
         targetPowerValT2[ALL_TARGET_HT40_0_8_16] =
             ar9003_hw_eeprom_get_ht40_tgt_pwr(ah, HT_TARGET_RATE_0_8_16, freq,
                                               is2GHz) + ht40PowerIncForPdadc;
@@ -4413,6 +4411,26 @@ static void ar9003_hw_set_target_power_eeprom(struct ath_hw *ah, u16 freq,
         targetPowerValT2[ALL_TARGET_HT40_23] =
             ar9003_hw_eeprom_get_ht40_tgt_pwr(ah, HT_TARGET_RATE_23, freq,
                                               is2GHz) + ht40PowerIncForPdadc;
+}
+
+static void ar9003_hw_get_target_power_eeprom(struct ath_hw *ah,
+                                              struct ath9k_channel *chan,
+                                              u8 *targetPowerValT2)
+{
+        bool is2GHz = IS_CHAN_2GHZ(chan);
+        unsigned int i = 0;
+        struct ath_common *common = ath9k_hw_common(ah);
+        u16 freq = chan->channel;
+
+        if (is2GHz)
+                ar9003_hw_get_cck_target_powers(ah, freq, targetPowerValT2);
+
+        ar9003_hw_get_legacy_target_powers(ah, freq, targetPowerValT2, is2GHz);
+        ar9003_hw_get_ht20_target_powers(ah, freq, targetPowerValT2, is2GHz);
+
+        if (IS_CHAN_HT40(chan))
+                ar9003_hw_get_ht40_target_powers(ah, freq, targetPowerValT2,
+                                                 is2GHz);
 
         for (i = 0; i < ar9300RateSize; i++) {
                 ath_dbg(common, EEPROM, "TPC[%02d] 0x%08x\n",
@@ -4464,7 +4482,7 @@ static int ar9003_hw_cal_pier_get(struct ath_hw *ah,
                 is2GHz = 1;
         }
 
-        *pfrequency = FBIN2FREQ(*pCalPier, is2GHz);
+        *pfrequency = ath9k_hw_fbin2freq(*pCalPier, is2GHz);
         *pcorrection = pCalPierStruct->refPower;
         *ptemperature = pCalPierStruct->tempMeas;
         *pvoltage = pCalPierStruct->voltMeas;
@@ -4789,34 +4807,9 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah,
         bool is2ghz = IS_CHAN_2GHZ(chan);
 
         ath9k_hw_get_channel_centers(ah, chan, &centers);
-        scaledPower = powerLimit - antenna_reduction;
-
-        /*
-         * Reduce scaled Power by number of chains active to get
-         * to per chain tx power level
-         */
-        switch (ar5416_get_ntxchains(ah->txchainmask)) {
-        case 1:
-                break;
-        case 2:
-                if (scaledPower > REDUCE_SCALED_POWER_BY_TWO_CHAIN)
-                        scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;
-                else
-                        scaledPower = 0;
-                break;
-        case 3:
-                if (scaledPower > REDUCE_SCALED_POWER_BY_THREE_CHAIN)
-                        scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN;
-                else
-                        scaledPower = 0;
-                break;
-        }
+        scaledPower = ath9k_hw_get_scaled_power(ah, powerLimit,
+                                                antenna_reduction);
 
-        scaledPower = max((u16)0, scaledPower);
-
-        /*
-         * Get target powers from EEPROM - our baseline for TX Power
-         */
         if (is2ghz) {
                 /* Setup for CTL modes */
                 /* CTL_11B, CTL_11G, CTL_2GHT20 */
@@ -4988,7 +4981,12 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah,
         unsigned int i = 0, paprd_scale_factor = 0;
         u8 pwr_idx, min_pwridx = 0;
 
-        ar9003_hw_set_target_power_eeprom(ah, chan->channel, targetPowerValT2);
+        memset(targetPowerValT2, 0 , sizeof(targetPowerValT2));
+
+        /*
+         * Get target powers from EEPROM - our baseline for TX Power
+         */
+        ar9003_hw_get_target_power_eeprom(ah, chan, targetPowerValT2);
 
         if (ah->eep_ops->get_eeprom(ah, EEP_PAPRD)) {
                 if (IS_CHAN_2GHZ(chan))
@@ -5060,8 +5058,6 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah,
                         i, targetPowerValT2[i]);
         }
 
-        ah->txpower_limit = regulatory->max_power_level;
-
         /* Write target power array to registers */
         ar9003_hw_tx_power_regwrite(ah, targetPowerValT2);
         ar9003_hw_calibration_apply(ah, chan->channel);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
index bb223fe82816..2505ac44f0c1 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
@@ -42,7 +42,6 @@
 #define AR9300_EEPMISC_WOW           0x02
 #define AR9300_CUSTOMER_DATA_SIZE    20
 
-#define FBIN2FREQ(x, y) ((y) ? (2300 + x) : (4800 + 5 * x))
 #define AR9300_MAX_CHAINS            3
 #define AR9300_ANT_16S               25
 #define AR9300_FUTURE_MODAL_SZ       6
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_hw.c b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
index 0f56e322dd3b..a0e3394b10dc 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
@@ -305,11 +305,6 @@ static void ar9003_hw_init_mode_regs(struct ath_hw *ah)
                                 ar9462_common_rx_gain_table_2p0,
                                 ARRAY_SIZE(ar9462_common_rx_gain_table_2p0), 2);
 
-                INIT_INI_ARRAY(&ah->ini_BTCOEX_MAX_TXPWR,
-                                ar9462_2p0_BTCOEX_MAX_TXPWR_table,
-                                ARRAY_SIZE(ar9462_2p0_BTCOEX_MAX_TXPWR_table),
-                                2);
-
                 /* Awake -> Sleep Setting */
                 INIT_INI_ARRAY(&ah->iniPcieSerdes,
                                 PCIE_PLL_ON_CREQ_DIS_L1_2P0,
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
index a66a13b76848..d9e0824af093 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -306,6 +306,8 @@ static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked)
                 ar9003_mci_get_isr(ah, masked);
 
         if (sync_cause) {
+                ath9k_debug_sync_cause(common, sync_cause);
+
                 if (sync_cause & AR_INTR_SYNC_RADM_CPL_TIMEOUT) {
                         REG_WRITE(ah, AR_RC, AR_RC_HOSTIF);
                         REG_WRITE(ah, AR_RC, 0);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
index 59647a3ceb7f..3d400e8d6535 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
@@ -54,7 +54,7 @@ void ar9003_paprd_enable(struct ath_hw *ah, bool val)
 
         if (val) {
                 ah->paprd_table_write_done = true;
-                ath9k_hw_apply_txpower(ah, chan);
+                ath9k_hw_apply_txpower(ah, chan, false);
         }
 
         REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL0_B0,
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index bc992b237ae5..11abb972be1f 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -152,7 +152,6 @@ static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
         REG_WRITE(ah, AR_PHY_65NM_CH0_SYNTH7, reg32);
 
         ah->curchan = chan;
-        ah->curchan_rad_index = -1;
 
         return 0;
 }
@@ -209,11 +208,12 @@ static void ar9003_hw_spur_mitigate_mrc_cck(struct ath_hw *ah,
                         continue;
                 negative = 0;
                 if (AR_SREV_9485(ah) || AR_SREV_9340(ah) || AR_SREV_9330(ah))
-                        cur_bb_spur = FBIN2FREQ(spur_fbin_ptr[i],
-                                        IS_CHAN_2GHZ(chan)) - synth_freq;
+                        cur_bb_spur = ath9k_hw_fbin2freq(spur_fbin_ptr[i],
+                                                         IS_CHAN_2GHZ(chan));
                 else
-                        cur_bb_spur = spur_freq[i] - synth_freq;
+                        cur_bb_spur = spur_freq[i];
 
+                cur_bb_spur -= synth_freq;
                 if (cur_bb_spur < 0) {
                         negative = 1;
                         cur_bb_spur = -cur_bb_spur;
@@ -373,7 +373,7 @@ static void ar9003_hw_spur_ofdm_work(struct ath_hw *ah,
                         else
                                 spur_subchannel_sd = 0;
 
-                        spur_freq_sd = (freq_offset << 9) / 11;
+                        spur_freq_sd = ((freq_offset + 10) << 9) / 11;
 
                 } else {
                         if (REG_READ_FIELD(ah, AR_PHY_GEN_CTRL,
@@ -382,7 +382,7 @@ static void ar9003_hw_spur_ofdm_work(struct ath_hw *ah,
                         else
                                 spur_subchannel_sd = 1;
 
-                        spur_freq_sd = (freq_offset << 9) / 11;
+                        spur_freq_sd = ((freq_offset - 10) << 9) / 11;
 
                 }
 
@@ -443,7 +443,8 @@ static void ar9003_hw_spur_mitigate_ofdm(struct ath_hw *ah,
         ar9003_hw_spur_ofdm_clear(ah);
 
         for (i = 0; i < AR_EEPROM_MODAL_SPURS && spurChansPtr[i]; i++) {
-                freq_offset = FBIN2FREQ(spurChansPtr[i], mode) - synth_freq;
+                freq_offset = ath9k_hw_fbin2freq(spurChansPtr[i], mode);
+                freq_offset -= synth_freq;
                 if (abs(freq_offset) < range) {
                         ar9003_hw_spur_ofdm_work(ah, chan, freq_offset);
                         break;
@@ -525,22 +526,10 @@ static void ar9003_hw_init_bb(struct ath_hw *ah,
          * Value is in 100ns increments.
          */
         synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) & AR_PHY_RX_DELAY_DELAY;
-        if (IS_CHAN_B(chan))
-                synthDelay = (4 * synthDelay) / 22;
-        else
-                synthDelay /= 10;
 
         /* Activate the PHY (includes baseband activate + synthesizer on) */
         REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
-
-        /*
-         * There is an issue if the AP starts the calibration before
-         * the base band timeout completes.  This could result in the
-         * rx_clear false triggering.  As a workaround we add delay an
-         * extra BASE_ACTIVATE_DELAY usecs to ensure this condition
-         * does not happen.
-         */
-        udelay(synthDelay + BASE_ACTIVATE_DELAY);
+        ath9k_hw_synth_delay(ah, chan, synthDelay);
 }
 
 static void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)
@@ -684,9 +673,6 @@ static int ar9003_hw_process_ini(struct ath_hw *ah,
 
         REG_WRITE_ARRAY(&ah->iniAdditional, 1, regWrites);
 
-        if (AR_SREV_9462(ah))
-                ar9003_hw_prog_ini(ah, &ah->ini_BTCOEX_MAX_TXPWR, 1);
-
         if (chan->channel == 2484)
                 ar9003_hw_prog_ini(ah, &ah->ini_japan2484, 1);
 
@@ -694,7 +680,7 @@ static int ar9003_hw_process_ini(struct ath_hw *ah,
         ar9003_hw_override_ini(ah);
         ar9003_hw_set_channel_regs(ah, chan);
         ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
-        ath9k_hw_apply_txpower(ah, chan);
+        ath9k_hw_apply_txpower(ah, chan, false);
 
         if (AR_SREV_9462(ah)) {
                 if (REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_0,
@@ -725,6 +711,14 @@ static void ar9003_hw_set_rfmode(struct ath_hw *ah,
 
         if (IS_CHAN_A_FAST_CLOCK(ah, chan))
                 rfMode |= (AR_PHY_MODE_DYNAMIC | AR_PHY_MODE_DYN_CCK_DISABLE);
+        if (IS_CHAN_QUARTER_RATE(chan))
+                rfMode |= AR_PHY_MODE_QUARTER;
+        if (IS_CHAN_HALF_RATE(chan))
+                rfMode |= AR_PHY_MODE_HALF;
+
+        if (rfMode & (AR_PHY_MODE_QUARTER | AR_PHY_MODE_HALF))
+                REG_RMW_FIELD(ah, AR_PHY_FRAME_CTL,
+                              AR_PHY_FRAME_CTL_CF_OVERLAP_WINDOW, 3);
 
         REG_WRITE(ah, AR_PHY_MODE, rfMode);
 }
@@ -795,12 +789,8 @@ static bool ar9003_hw_rfbus_req(struct ath_hw *ah)
 static void ar9003_hw_rfbus_done(struct ath_hw *ah)
 {
         u32 synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) & AR_PHY_RX_DELAY_DELAY;
-        if (IS_CHAN_B(ah->curchan))
-                synthDelay = (4 * synthDelay) / 22;
-        else
-                synthDelay /= 10;
 
-        udelay(synthDelay + BASE_ACTIVATE_DELAY);
+        ath9k_hw_synth_delay(ah, ah->curchan, synthDelay);
 
         REG_WRITE(ah, AR_PHY_RFBUS_REQ, 0);
 }
@@ -823,55 +813,6 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                  * on == 0 means more noise imm
                  */
                 u32 on = param ? 1 : 0;
-                /*
-                 * make register setting for default
-                 * (weak sig detect ON) come from INI file
-                 */
-                int m1ThreshLow = on ?
-                        aniState->iniDef.m1ThreshLow : m1ThreshLow_off;
-                int m2ThreshLow = on ?
-                        aniState->iniDef.m2ThreshLow : m2ThreshLow_off;
-                int m1Thresh = on ?
-                        aniState->iniDef.m1Thresh : m1Thresh_off;
-                int m2Thresh = on ?
-                        aniState->iniDef.m2Thresh : m2Thresh_off;
-                int m2CountThr = on ?
-                        aniState->iniDef.m2CountThr : m2CountThr_off;
-                int m2CountThrLow = on ?
-                        aniState->iniDef.m2CountThrLow : m2CountThrLow_off;
-                int m1ThreshLowExt = on ?
-                        aniState->iniDef.m1ThreshLowExt : m1ThreshLowExt_off;
-                int m2ThreshLowExt = on ?
-                        aniState->iniDef.m2ThreshLowExt : m2ThreshLowExt_off;
-                int m1ThreshExt = on ?
-                        aniState->iniDef.m1ThreshExt : m1ThreshExt_off;
-                int m2ThreshExt = on ?
-                        aniState->iniDef.m2ThreshExt : m2ThreshExt_off;
-
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
-                              AR_PHY_SFCORR_LOW_M1_THRESH_LOW,
-                              m1ThreshLow);
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
-                              AR_PHY_SFCORR_LOW_M2_THRESH_LOW,
-                              m2ThreshLow);
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR,
-                              AR_PHY_SFCORR_M1_THRESH, m1Thresh);
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR,
-                              AR_PHY_SFCORR_M2_THRESH, m2Thresh);
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR,
-                              AR_PHY_SFCORR_M2COUNT_THR, m2CountThr);
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
-                              AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW,
-                              m2CountThrLow);
-
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
-                              AR_PHY_SFCORR_EXT_M1_THRESH_LOW, m1ThreshLowExt);
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
-                              AR_PHY_SFCORR_EXT_M2_THRESH_LOW, m2ThreshLowExt);
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
-                              AR_PHY_SFCORR_EXT_M1_THRESH, m1ThreshExt);
-                REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
-                              AR_PHY_SFCORR_EXT_M2_THRESH, m2ThreshExt);
 
                 if (on)
                         REG_SET_BIT(ah, AR_PHY_SFCORR_LOW,
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
index d834d97fe727..7268a48a92a1 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
@@ -468,6 +468,9 @@
 #define AR_PHY_ADDAC_PARA_CTL    (AR_SM_BASE + 0x150)
 #define AR_PHY_XPA_CFG           (AR_SM_BASE + 0x158)
 
+#define AR_PHY_FRAME_CTL_CF_OVERLAP_WINDOW  3
+#define AR_PHY_FRAME_CTL_CF_OVERLAP_WINDOW_S    0
+
 #define AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_IDX_A           0x0001FC00
 #define AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_IDX_A_S         10
 #define AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_A                       0x3FF
diff --git a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
index b6ba1e8149be..1d6658e139b5 100644
--- a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
@@ -1115,9 +1115,9 @@ static const u32 ar9462_2p0_mac_core[][2] = {
         {0x000081f8, 0x00000000},
         {0x000081fc, 0x00000000},
         {0x00008240, 0x00100000},
-        {0x00008244, 0x0010f400},
+        {0x00008244, 0x0010f424},
         {0x00008248, 0x00000800},
-        {0x0000824c, 0x0001e800},
+        {0x0000824c, 0x0001e848},
         {0x00008250, 0x00000000},
         {0x00008254, 0x00000000},
         {0x00008258, 0x00000000},
@@ -1448,16 +1448,4 @@ static const u32 ar9462_common_mixed_rx_gain_table_2p0[][2] = {
         {0x0000b1fc, 0x00000196},
 };
 
-static const u32 ar9462_2p0_BTCOEX_MAX_TXPWR_table[][2] = {
-        /* Addr      allmodes  */
-        {0x000018c0, 0x10101010},
-        {0x000018c4, 0x10101010},
-        {0x000018c8, 0x10101010},
-        {0x000018cc, 0x10101010},
-        {0x000018d0, 0x10101010},
-        {0x000018d4, 0x10101010},
-        {0x000018d8, 0x10101010},
-        {0x000018dc, 0x10101010},
-};
-
 #endif /* INITVALS_9462_2P0_H */
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 8c84049682ab..a277cf6f339d 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -26,6 +26,7 @@
 #include "debug.h"
 #include "common.h"
 #include "mci.h"
+#include "dfs.h"
 
 /*
  * Header for the ath9k.ko driver core *only* -- hw code nor any other driver
@@ -369,7 +370,7 @@ struct ath_vif {
  * number of beacon intervals, the game's up.
  */
 #define BSTUCK_THRESH                   9
-#define ATH_BCBUF                       4
+#define ATH_BCBUF                       8
 #define ATH_DEFAULT_BINTVAL             100 /* TU */
 #define ATH_DEFAULT_BMISS_LIMIT         10
 #define IEEE80211_MS_TO_TU(x)           (((x) * 1000) / 1024)
@@ -430,6 +431,8 @@ void ath9k_set_beaconing_status(struct ath_softc *sc, bool status);
 void ath_reset_work(struct work_struct *work);
 void ath_hw_check(struct work_struct *work);
 void ath_hw_pll_work(struct work_struct *work);
+void ath_rx_poll(unsigned long data);
+void ath_start_rx_poll(struct ath_softc *sc, u8 nbeacon);
 void ath_paprd_calibrate(struct work_struct *work);
 void ath_ani_calibrate(unsigned long data);
 void ath_start_ani(struct ath_common *common);
@@ -670,6 +673,7 @@ struct ath_softc {
         struct ath_beacon_config cur_beacon_conf;
         struct delayed_work tx_complete_work;
         struct delayed_work hw_pll_work;
+        struct timer_list rx_poll_timer;
 
 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
         struct ath_btcoex btcoex;
@@ -680,6 +684,7 @@ struct ath_softc {
 
         struct ath_ant_comb ant_comb;
         u8 ant_tx, ant_rx;
+        struct dfs_pattern_detector *dfs_detector;
 };
 
 void ath9k_tasklet(unsigned long data);
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index 626418222c85..11bc55e3d697 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -91,7 +91,7 @@ static void ath_beacon_setup(struct ath_softc *sc, struct ieee80211_vif *vif,
         info.txpower = MAX_RATE_POWER;
         info.keyix = ATH9K_TXKEYIX_INVALID;
         info.keytype = ATH9K_KEY_TYPE_CLEAR;
-        info.flags = ATH9K_TXDESC_NOACK | ATH9K_TXDESC_INTREQ;
+        info.flags = ATH9K_TXDESC_NOACK | ATH9K_TXDESC_CLRDMASK;
 
         info.buf_addr[0] = bf->bf_buf_addr;
         info.buf_len[0] = roundup(skb->len, 4);
@@ -359,6 +359,11 @@ void ath_beacon_tasklet(unsigned long data)
         int slot;
         u32 bfaddr, bc = 0;
 
+        if (work_pending(&sc->hw_reset_work)) {
+                ath_dbg(common, RESET,
+                        "reset work is pending, skip beaconing now\n");
+                return;
+        }
         /*
          * Check if the previous beacon has gone out.  If
          * not don't try to post another, skip this period
@@ -369,6 +374,9 @@ void ath_beacon_tasklet(unsigned long data)
         if (ath9k_hw_numtxpending(ah, sc->beacon.beaconq) != 0) {
                 sc->beacon.bmisscnt++;
 
+                if (!ath9k_hw_check_alive(ah))
+                        ieee80211_queue_work(sc->hw, &sc->hw_check_work);
+
                 if (sc->beacon.bmisscnt < BSTUCK_THRESH * sc->nbcnvifs) {
                         ath_dbg(common, BSTUCK,
                                 "missed %u consecutive beacons\n",
@@ -378,6 +386,7 @@ void ath_beacon_tasklet(unsigned long data)
                                 ath9k_hw_bstuck_nfcal(ah);
                 } else if (sc->beacon.bmisscnt >= BSTUCK_THRESH) {
                         ath_dbg(common, BSTUCK, "beacon is officially stuck\n");
+                        sc->beacon.bmisscnt = 0;
                         sc->sc_flags |= SC_OP_TSF_RESET;
                         ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
                 }
@@ -650,6 +659,8 @@ static void ath_beacon_config_adhoc(struct ath_softc *sc,
         u32 tsf, intval, nexttbtt;
 
         ath9k_reset_beacon_status(sc);
+        if (!(sc->sc_flags & SC_OP_BEACONS))
+                ath9k_hw_settsf64(ah, sc->beacon.bc_tstamp);
 
         intval = TU_TO_USEC(conf->beacon_interval);
         tsf = roundup(ath9k_hw_gettsf32(ah) + TU_TO_USEC(FUDGE), intval);
@@ -806,8 +817,10 @@ void ath9k_set_beaconing_status(struct ath_softc *sc, bool status)
 {
         struct ath_hw *ah = sc->sc_ah;
 
-        if (!ath_has_valid_bslot(sc))
+        if (!ath_has_valid_bslot(sc)) {
+                sc->sc_flags &= ~SC_OP_BEACONS;
                 return;
+        }
 
         ath9k_ps_wakeup(sc);
         if (status) {
diff --git a/drivers/net/wireless/ath/ath9k/btcoex.c b/drivers/net/wireless/ath/ath9k/btcoex.c
index ec3271993411..1ca6da80d4ad 100644
--- a/drivers/net/wireless/ath/ath9k/btcoex.c
+++ b/drivers/net/wireless/ath/ath9k/btcoex.c
@@ -108,9 +108,7 @@ void ath9k_hw_btcoex_init_scheme(struct ath_hw *ah)
                 return;
         }
 
-        if (AR_SREV_9462(ah)) {
-                btcoex_hw->scheme = ATH_BTCOEX_CFG_MCI;
-        } else if (AR_SREV_9300_20_OR_LATER(ah)) {
+        if (AR_SREV_9300_20_OR_LATER(ah)) {
                 btcoex_hw->scheme = ATH_BTCOEX_CFG_3WIRE;
                 btcoex_hw->btactive_gpio = ATH_BTACTIVE_GPIO_9300;
                 btcoex_hw->wlanactive_gpio = ATH_WLANACTIVE_GPIO_9300;
@@ -284,11 +282,12 @@ void ath9k_hw_btcoex_enable(struct ath_hw *ah)
                 ath9k_hw_btcoex_enable_2wire(ah);
                 break;
         case ATH_BTCOEX_CFG_3WIRE:
+                if (AR_SREV_9462(ah)) {
+                        ath9k_hw_btcoex_enable_mci(ah);
+                        return;
+                }
                 ath9k_hw_btcoex_enable_3wire(ah);
                 break;
-        case ATH_BTCOEX_CFG_MCI:
-                ath9k_hw_btcoex_enable_mci(ah);
-                return;
         }
 
         REG_RMW(ah, AR_GPIO_PDPU,
@@ -305,11 +304,12 @@ void ath9k_hw_btcoex_disable(struct ath_hw *ah)
         int i;
 
         btcoex_hw->enabled = false;
-        if (btcoex_hw->scheme == ATH_BTCOEX_CFG_MCI) {
+        if (AR_SREV_9462(ah)) {
                 ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_NONE);
                 for (i = 0; i < AR9300_NUM_BT_WEIGHTS; i++)
                         REG_WRITE(ah, AR_MCI_COEX_WL_WEIGHTS(i),
                                   btcoex_hw->wlan_weight[i]);
+                return;
         }
         ath9k_hw_set_gpio(ah, btcoex_hw->wlanactive_gpio, 0);
 
diff --git a/drivers/net/wireless/ath/ath9k/btcoex.h b/drivers/net/wireless/ath/ath9k/btcoex.h
index 8f93aef4414f..3a1e1cfabd5e 100644
--- a/drivers/net/wireless/ath/ath9k/btcoex.h
+++ b/drivers/net/wireless/ath/ath9k/btcoex.h
@@ -51,7 +51,6 @@ enum ath_btcoex_scheme {
         ATH_BTCOEX_CFG_NONE,
         ATH_BTCOEX_CFG_2WIRE,
         ATH_BTCOEX_CFG_3WIRE,
-        ATH_BTCOEX_CFG_MCI,
 };
 
 struct ath9k_hw_mci {
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index ff47b32ecaf4..fde700c4e490 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -380,63 +380,75 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
                                    size_t count, loff_t *ppos)
 {
         struct ath_softc *sc = file->private_data;
-        char buf[512];
         unsigned int len = 0;
+        int rv;
+        int mxlen = 4000;
+        char *buf = kmalloc(mxlen, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+#define PR_IS(a, s)                                             \
+        do {                                                    \
+                len += snprintf(buf + len, mxlen - len,         \
+                                "%21s: %10u\n", a,              \
+                                sc->debug.stats.istats.s);      \
+        } while (0)
 
         if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
-                len += snprintf(buf + len, sizeof(buf) - len,
-                        "%8s: %10u\n", "RXLP", sc->debug.stats.istats.rxlp);
-                len += snprintf(buf + len, sizeof(buf) - len,
-                        "%8s: %10u\n", "RXHP", sc->debug.stats.istats.rxhp);
-                len += snprintf(buf + len, sizeof(buf) - len,
-                        "%8s: %10u\n", "WATCHDOG",
-                        sc->debug.stats.istats.bb_watchdog);
+                PR_IS("RXLP", rxlp);
+                PR_IS("RXHP", rxhp);
+                PR_IS("WATHDOG", bb_watchdog);
         } else {
-                len += snprintf(buf + len, sizeof(buf) - len,
-                        "%8s: %10u\n", "RX", sc->debug.stats.istats.rxok);
+                PR_IS("RX", rxok);
         }
-        len += snprintf(buf + len, sizeof(buf) - len,
-                "%8s: %10u\n", "RXEOL", sc->debug.stats.istats.rxeol);
-        len += snprintf(buf + len, sizeof(buf) - len,
-                "%8s: %10u\n", "RXORN", sc->debug.stats.istats.rxorn);
-        len += snprintf(buf + len, sizeof(buf) - len,
-                "%8s: %10u\n", "TX", sc->debug.stats.istats.txok);
-        len += snprintf(buf + len, sizeof(buf) - len,
-                "%8s: %10u\n", "TXURN", sc->debug.stats.istats.txurn);
-        len += snprintf(buf + len, sizeof(buf) - len,
-                "%8s: %10u\n", "MIB", sc->debug.stats.istats.mib);
-        len += snprintf(buf + len, sizeof(buf) - len,
-                "%8s: %10u\n", "RXPHY", sc->debug.stats.istats.rxphyerr);
-        len += snprintf(buf + len, sizeof(buf) - len,
-                "%8s: %10u\n", "RXKCM", sc->debug.stats.istats.rx_keycache_miss);
-        len += snprintf(buf + len, sizeof(buf) - len,
-                "%8s: %10u\n", "SWBA", sc->debug.stats.istats.swba);
-        len += snprintf(buf + len, sizeof(buf) - len,
-                "%8s: %10u\n", "BMISS", sc->debug.stats.istats.bmiss);
-        len += snprintf(buf + len, sizeof(buf) - len,
-                "%8s: %10u\n", "BNR", sc->debug.stats.istats.bnr);
-        len += snprintf(buf + len, sizeof(buf) - len,
-                "%8s: %10u\n", "CST", sc->debug.stats.istats.cst);
-        len += snprintf(buf + len, sizeof(buf) - len,
-                "%8s: %10u\n", "GTT", sc->debug.stats.istats.gtt);
-        len += snprintf(buf + len, sizeof(buf) - len,
-                "%8s: %10u\n", "TIM", sc->debug.stats.istats.tim);
-        len += snprintf(buf + len, sizeof(buf) - len,
-                "%8s: %10u\n", "CABEND", sc->debug.stats.istats.cabend);
-        len += snprintf(buf + len, sizeof(buf) - len,
-                "%8s: %10u\n", "DTIMSYNC", sc->debug.stats.istats.dtimsync);
-        len += snprintf(buf + len, sizeof(buf) - len,
-                "%8s: %10u\n", "DTIM", sc->debug.stats.istats.dtim);
-        len += snprintf(buf + len, sizeof(buf) - len,
-                "%8s: %10u\n", "TSFOOR", sc->debug.stats.istats.tsfoor);
-        len += snprintf(buf + len, sizeof(buf) - len,
-                "%8s: %10u\n", "TOTAL", sc->debug.stats.istats.total);
-
-
-        if (len > sizeof(buf))
-                len = sizeof(buf);
-
-        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+        PR_IS("RXEOL", rxeol);
+        PR_IS("RXORN", rxorn);
+        PR_IS("TX", txok);
+        PR_IS("TXURN", txurn);
+        PR_IS("MIB", mib);
+        PR_IS("RXPHY", rxphyerr);
+        PR_IS("RXKCM", rx_keycache_miss);
+        PR_IS("SWBA", swba);
+        PR_IS("BMISS", bmiss);
+        PR_IS("BNR", bnr);
+        PR_IS("CST", cst);
+        PR_IS("GTT", gtt);
+        PR_IS("TIM", tim);
+        PR_IS("CABEND", cabend);
+        PR_IS("DTIMSYNC", dtimsync);
+        PR_IS("DTIM", dtim);
+        PR_IS("TSFOOR", tsfoor);
+        PR_IS("TOTAL", total);
+
+        len += snprintf(buf + len, mxlen - len,
+                        "SYNC_CAUSE stats:\n");
+
+        PR_IS("Sync-All", sync_cause_all);
+        PR_IS("RTC-IRQ", sync_rtc_irq);
+        PR_IS("MAC-IRQ", sync_mac_irq);
+        PR_IS("EEPROM-Illegal-Access", eeprom_illegal_access);
+        PR_IS("APB-Timeout", apb_timeout);
+        PR_IS("PCI-Mode-Conflict", pci_mode_conflict);
+        PR_IS("HOST1-Fatal", host1_fatal);
+        PR_IS("HOST1-Perr", host1_perr);
+        PR_IS("TRCV-FIFO-Perr", trcv_fifo_perr);
+        PR_IS("RADM-CPL-EP", radm_cpl_ep);
+        PR_IS("RADM-CPL-DLLP-Abort", radm_cpl_dllp_abort);
+        PR_IS("RADM-CPL-TLP-Abort", radm_cpl_tlp_abort);
+        PR_IS("RADM-CPL-ECRC-Err", radm_cpl_ecrc_err);
+        PR_IS("RADM-CPL-Timeout", radm_cpl_timeout);
+        PR_IS("Local-Bus-Timeout", local_timeout);
+        PR_IS("PM-Access", pm_access);
+        PR_IS("MAC-Awake", mac_awake);
+        PR_IS("MAC-Asleep", mac_asleep);
+        PR_IS("MAC-Sleep-Access", mac_sleep_access);
+
+        if (len > mxlen)
+                len = mxlen;
+
+        rv = simple_read_from_buffer(user_buf, count, ppos, buf, len);
+        kfree(buf);
+        return rv;
 }
 
 static const struct file_operations fops_interrupt = {
@@ -524,6 +536,7 @@ static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
         PR("hw-put-tx-buf:   ", puttxbuf);
         PR("hw-tx-start:     ", txstart);
         PR("hw-tx-proc-desc: ", txprocdesc);
+        PR("TX-Failed:       ", txfailed);
         len += snprintf(buf + len, size - len,
                         "%s%11p%11p%10p%10p\n", "txq-memory-address:",
                         sc->tx.txq_map[WME_AC_BE],
@@ -880,6 +893,13 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf,
         len += snprintf(buf + len, size - len, "%22s : %10u\n", s, \
                         sc->debug.stats.rxstats.phy_err_stats[p]);
 
+#define RXS_ERR(s, e)                                       \
+        do {                                                \
+                len += snprintf(buf + len, size - len,      \
+                                "%22s : %10u\n", s,         \
+                                sc->debug.stats.rxstats.e); \
+        } while (0)
+
         struct ath_softc *sc = file->private_data;
         char *buf;
         unsigned int len = 0, size = 1600;
@@ -889,27 +909,18 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf,
         if (buf == NULL)
                 return -ENOMEM;
 
-        len += snprintf(buf + len, size - len,
-                        "%22s : %10u\n", "CRC ERR",
-                        sc->debug.stats.rxstats.crc_err);
-        len += snprintf(buf + len, size - len,
-                        "%22s : %10u\n", "DECRYPT CRC ERR",
-                        sc->debug.stats.rxstats.decrypt_crc_err);
-        len += snprintf(buf + len, size - len,
-                        "%22s : %10u\n", "PHY ERR",
-                        sc->debug.stats.rxstats.phy_err);
-        len += snprintf(buf + len, size - len,
-                        "%22s : %10u\n", "MIC ERR",
-                        sc->debug.stats.rxstats.mic_err);
-        len += snprintf(buf + len, size - len,
-                        "%22s : %10u\n", "PRE-DELIM CRC ERR",
-                        sc->debug.stats.rxstats.pre_delim_crc_err);
-        len += snprintf(buf + len, size - len,
-                        "%22s : %10u\n", "POST-DELIM CRC ERR",
-                        sc->debug.stats.rxstats.post_delim_crc_err);
-        len += snprintf(buf + len, size - len,
-                        "%22s : %10u\n", "DECRYPT BUSY ERR",
-                        sc->debug.stats.rxstats.decrypt_busy_err);
+        RXS_ERR("CRC ERR", crc_err);
+        RXS_ERR("DECRYPT CRC ERR", decrypt_crc_err);
+        RXS_ERR("PHY ERR", phy_err);
+        RXS_ERR("MIC ERR", mic_err);
+        RXS_ERR("PRE-DELIM CRC ERR", pre_delim_crc_err);
+        RXS_ERR("POST-DELIM CRC ERR", post_delim_crc_err);
+        RXS_ERR("DECRYPT BUSY ERR", decrypt_busy_err);
+        RXS_ERR("RX-LENGTH-ERR", rx_len_err);
+        RXS_ERR("RX-OOM-ERR", rx_oom_err);
+        RXS_ERR("RX-RATE-ERR", rx_rate_err);
+        RXS_ERR("RX-DROP-RXFLUSH", rx_drop_rxflush);
+        RXS_ERR("RX-TOO-MANY-FRAGS", rx_too_many_frags_err);
 
         PHY_ERR("UNDERRUN ERR", ATH9K_PHYERR_UNDERRUN);
         PHY_ERR("TIMING ERR", ATH9K_PHYERR_TIMING);
@@ -938,12 +949,10 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf,
         PHY_ERR("HT-LENGTH ERR", ATH9K_PHYERR_HT_LENGTH_ILLEGAL);
         PHY_ERR("HT-RATE ERR", ATH9K_PHYERR_HT_RATE_ILLEGAL);
 
-        len += snprintf(buf + len, size - len,
-                        "%22s : %10u\n", "RX-Pkts-All",
-                        sc->debug.stats.rxstats.rx_pkts_all);
-        len += snprintf(buf + len, size - len,
-                        "%22s : %10u\n", "RX-Bytes-All",
-                        sc->debug.stats.rxstats.rx_bytes_all);
+        RXS_ERR("RX-Pkts-All", rx_pkts_all);
+        RXS_ERR("RX-Bytes-All", rx_bytes_all);
+        RXS_ERR("RX-Beacons", rx_beacons);
+        RXS_ERR("RX-Frags", rx_frags);
 
         if (len > size)
                 len = size;
@@ -953,12 +962,12 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf,
 
         return retval;
 
+#undef RXS_ERR
 #undef PHY_ERR
 }
 
 void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs)
 {
-#define RX_STAT_INC(c) sc->debug.stats.rxstats.c++
 #define RX_PHY_ERR_INC(c) sc->debug.stats.rxstats.phy_err_stats[c]++
 #define RX_SAMP_DBG(c) (sc->debug.bb_mac_samp[sc->debug.sampidx].rs\
                         [sc->debug.rsidx].c)
@@ -1004,7 +1013,6 @@ void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs)
 
 #endif
 
-#undef RX_STAT_INC
 #undef RX_PHY_ERR_INC
 #undef RX_SAMP_DBG
 }
diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h
index 64fcfad467bf..c34da09d9103 100644
--- a/drivers/net/wireless/ath/ath9k/debug.h
+++ b/drivers/net/wireless/ath/ath9k/debug.h
@@ -60,6 +60,7 @@ struct ath_buf;
  * @tsfoor: TSF out of range, indicates that the corrected TSF received
  * from a beacon differs from the PCU's internal TSF by more than a
  * (programmable) threshold
+ * @local_timeout: Internal bus timeout.
  */
 struct ath_interrupt_stats {
         u32 total;
@@ -85,8 +86,30 @@ struct ath_interrupt_stats {
         u32 dtim;
         u32 bb_watchdog;
         u32 tsfoor;
+
+        /* Sync-cause stats */
+        u32 sync_cause_all;
+        u32 sync_rtc_irq;
+        u32 sync_mac_irq;
+        u32 eeprom_illegal_access;
+        u32 apb_timeout;
+        u32 pci_mode_conflict;
+        u32 host1_fatal;
+        u32 host1_perr;
+        u32 trcv_fifo_perr;
+        u32 radm_cpl_ep;
+        u32 radm_cpl_dllp_abort;
+        u32 radm_cpl_tlp_abort;
+        u32 radm_cpl_ecrc_err;
+        u32 radm_cpl_timeout;
+        u32 local_timeout;
+        u32 pm_access;
+        u32 mac_awake;
+        u32 mac_asleep;
+        u32 mac_sleep_access;
 };
 
+
 /**
  * struct ath_tx_stats - Statistics about TX
  * @tx_pkts_all:  No. of total frames transmitted, including ones that
@@ -113,6 +136,7 @@ struct ath_interrupt_stats {
  * @puttxbuf: Number of times hardware was given txbuf to write.
  * @txstart:  Number of times hardware was told to start tx.
  * @txprocdesc:  Number of times tx descriptor was processed
+ * @txfailed:  Out-of-memory or other errors in xmit path.
  */
 struct ath_tx_stats {
         u32 tx_pkts_all;
@@ -135,8 +159,11 @@ struct ath_tx_stats {
         u32 puttxbuf;
         u32 txstart;
         u32 txprocdesc;
+        u32 txfailed;
 };
 
+#define RX_STAT_INC(c) (sc->debug.stats.rxstats.c++)
+
 /**
  * struct ath_rx_stats - RX Statistics
  * @rx_pkts_all:  No. of total frames received, including ones that
@@ -153,6 +180,13 @@ struct ath_tx_stats {
  * @post_delim_crc_err: Post-Frame delimiter CRC error detections
  * @decrypt_busy_err: Decryption interruptions counter
  * @phy_err_stats: Individual PHY error statistics
+ * @rx_len_err:  No. of frames discarded due to bad length.
+ * @rx_oom_err:  No. of frames dropped due to OOM issues.
+ * @rx_rate_err:  No. of frames dropped due to rate errors.
+ * @rx_too_many_frags_err:  Frames dropped due to too-many-frags received.
+ * @rx_drop_rxflush: No. of frames dropped due to RX-FLUSH.
+ * @rx_beacons:  No. of beacons received.
+ * @rx_frags:  No. of rx-fragements received.
  */
 struct ath_rx_stats {
         u32 rx_pkts_all;
@@ -165,6 +199,13 @@ struct ath_rx_stats {
         u32 post_delim_crc_err;
         u32 decrypt_busy_err;
         u32 phy_err_stats[ATH9K_PHYERR_MAX];
+        u32 rx_len_err;
+        u32 rx_oom_err;
+        u32 rx_rate_err;
+        u32 rx_too_many_frags_err;
+        u32 rx_drop_rxflush;
+        u32 rx_beacons;
+        u32 rx_frags;
 };
 
 enum ath_reset_type {
@@ -174,6 +215,7 @@ enum ath_reset_type {
         RESET_TYPE_TX_ERROR,
         RESET_TYPE_TX_HANG,
         RESET_TYPE_PLL_HANG,
+        RESET_TYPE_MAC_HANG,
         __RESET_TYPE_MAX
 };
 
@@ -247,6 +289,8 @@ void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs);
 
 #else
 
+#define RX_STAT_INC(c) /* NOP */
+
 static inline int ath9k_init_debug(struct ath_hw *ah)
 {
         return 0;
diff --git a/drivers/net/wireless/ath/ath9k/dfs.c b/drivers/net/wireless/ath/ath9k/dfs.c
index f4f56aff1e9d..ecc81792f2dc 100644
--- a/drivers/net/wireless/ath/ath9k/dfs.c
+++ b/drivers/net/wireless/ath/ath9k/dfs.c
@@ -21,17 +21,6 @@
 #include "dfs.h"
 #include "dfs_debug.h"
 
-/*
- * TODO: move into or synchronize this with generic header
- *       as soon as IF is defined
- */
-struct dfs_radar_pulse {
-        u16 freq;
-        u64 ts;
-        u32 width;
-        u8 rssi;
-};
-
 /* internal struct to pass radar data */
 struct ath_radar_data {
         u8 pulse_bw_info;
@@ -60,44 +49,44 @@ static u32 dur_to_usecs(struct ath_hw *ah, u32 dur)
 #define EXT_CH_RADAR_FOUND 0x02
 static bool
 ath9k_postprocess_radar_event(struct ath_softc *sc,
-                              struct ath_radar_data *are,
-                              struct dfs_radar_pulse *drp)
+                              struct ath_radar_data *ard,
+                              struct pulse_event *pe)
 {
         u8 rssi;
         u16 dur;
 
         ath_dbg(ath9k_hw_common(sc->sc_ah), DFS,
                 "pulse_bw_info=0x%x, pri,ext len/rssi=(%u/%u, %u/%u)\n",
-                are->pulse_bw_info,
-                are->pulse_length_pri, are->rssi,
-                are->pulse_length_ext, are->ext_rssi);
+                ard->pulse_bw_info,
+                ard->pulse_length_pri, ard->rssi,
+                ard->pulse_length_ext, ard->ext_rssi);
 
         /*
          * Only the last 2 bits of the BW info are relevant, they indicate
          * which channel the radar was detected in.
          */
-        are->pulse_bw_info &= 0x03;
+        ard->pulse_bw_info &= 0x03;
 
-        switch (are->pulse_bw_info) {
+        switch (ard->pulse_bw_info) {
         case PRI_CH_RADAR_FOUND:
                 /* radar in ctrl channel */
-                dur = are->pulse_length_pri;
+                dur = ard->pulse_length_pri;
                 DFS_STAT_INC(sc, pri_phy_errors);
                 /*
                  * cannot use ctrl channel RSSI
                  * if extension channel is stronger
                  */
-                rssi = (are->ext_rssi >= (are->rssi + 3)) ? 0 : are->rssi;
+                rssi = (ard->ext_rssi >= (ard->rssi + 3)) ? 0 : ard->rssi;
                 break;
         case EXT_CH_RADAR_FOUND:
                 /* radar in extension channel */
-                dur = are->pulse_length_ext;
+                dur = ard->pulse_length_ext;
                 DFS_STAT_INC(sc, ext_phy_errors);
                 /*
                  * cannot use extension channel RSSI
                  * if control channel is stronger
                  */
-                rssi = (are->rssi >= (are->ext_rssi + 12)) ? 0 : are->ext_rssi;
+                rssi = (ard->rssi >= (ard->ext_rssi + 12)) ? 0 : ard->ext_rssi;
                 break;
         case (PRI_CH_RADAR_FOUND | EXT_CH_RADAR_FOUND):
                 /*
@@ -107,14 +96,14 @@ ath9k_postprocess_radar_event(struct ath_softc *sc,
                  * Radiated testing, when pulse is on DC, different pri and
                  * ext durations are reported, so take the larger of the two
                  */
-                if (are->pulse_length_ext >= are->pulse_length_pri)
-                        dur = are->pulse_length_ext;
+                if (ard->pulse_length_ext >= ard->pulse_length_pri)
+                        dur = ard->pulse_length_ext;
                 else
-                        dur = are->pulse_length_pri;
+                        dur = ard->pulse_length_pri;
                 DFS_STAT_INC(sc, dc_phy_errors);
 
                 /* when both are present use stronger one */
-                rssi = (are->rssi < are->ext_rssi) ? are->ext_rssi : are->rssi;
+                rssi = (ard->rssi < ard->ext_rssi) ? ard->ext_rssi : ard->rssi;
                 break;
         default:
                 /*
@@ -137,8 +126,8 @@ ath9k_postprocess_radar_event(struct ath_softc *sc,
          */
 
         /* convert duration to usecs */
-        drp->width = dur_to_usecs(sc->sc_ah, dur);
-        drp->rssi = rssi;
+        pe->width = dur_to_usecs(sc->sc_ah, dur);
+        pe->rssi = rssi;
 
         DFS_STAT_INC(sc, pulses_detected);
         return true;
@@ -155,15 +144,17 @@ void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data,
         struct ath_radar_data ard;
         u16 datalen;
         char *vdata_end;
-        struct dfs_radar_pulse drp;
+        struct pulse_event pe;
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(ah);
 
-        if ((!(rs->rs_phyerr != ATH9K_PHYERR_RADAR)) &&
-            (!(rs->rs_phyerr != ATH9K_PHYERR_FALSE_RADAR_EXT))) {
+        DFS_STAT_INC(sc, pulses_total);
+        if ((rs->rs_phyerr != ATH9K_PHYERR_RADAR) &&
+            (rs->rs_phyerr != ATH9K_PHYERR_FALSE_RADAR_EXT)) {
                 ath_dbg(common, DFS,
                         "Error: rs_phyer=0x%x not a radar error\n",
                         rs->rs_phyerr);
+                DFS_STAT_INC(sc, pulses_no_dfs);
                 return;
         }
 
@@ -189,27 +180,22 @@ void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data,
         ard.pulse_bw_info = vdata_end[-1];
         ard.pulse_length_ext = vdata_end[-2];
         ard.pulse_length_pri = vdata_end[-3];
-
-        ath_dbg(common, DFS,
-                "bw_info=%d, length_pri=%d, length_ext=%d, "
-                "rssi_pri=%d, rssi_ext=%d\n",
-                ard.pulse_bw_info, ard.pulse_length_pri, ard.pulse_length_ext,
-                ard.rssi, ard.ext_rssi);
-
-        drp.freq = ah->curchan->channel;
-        drp.ts = mactime;
-        if (ath9k_postprocess_radar_event(sc, &ard, &drp)) {
+        pe.freq = ah->curchan->channel;
+        pe.ts = mactime;
+        if (ath9k_postprocess_radar_event(sc, &ard, &pe)) {
+                struct dfs_pattern_detector *pd = sc->dfs_detector;
                 static u64 last_ts;
                 ath_dbg(common, DFS,
                         "ath9k_dfs_process_phyerr: channel=%d, ts=%llu, "
                         "width=%d, rssi=%d, delta_ts=%llu\n",
-                        drp.freq, drp.ts, drp.width, drp.rssi, drp.ts-last_ts);
-                last_ts = drp.ts;
-                /*
-                 * TODO: forward pulse to pattern detector
-                 *
-                 * ieee80211_add_radar_pulse(drp.freq, drp.ts,
-                 *                           drp.width, drp.rssi);
-                 */
+                        pe.freq, pe.ts, pe.width, pe.rssi, pe.ts-last_ts);
+                last_ts = pe.ts;
+                DFS_STAT_INC(sc, pulses_processed);
+                if (pd != NULL && pd->add_pulse(pd, &pe)) {
+                        DFS_STAT_INC(sc, radar_detected);
+                        /*
+                         * TODO: forward radar event to DFS management layer
+                         */
+                }
         }
 }
diff --git a/drivers/net/wireless/ath/ath9k/dfs.h b/drivers/net/wireless/ath/ath9k/dfs.h
index c2412857f122..3c839f06a06a 100644
--- a/drivers/net/wireless/ath/ath9k/dfs.h
+++ b/drivers/net/wireless/ath/ath9k/dfs.h
@@ -17,6 +17,7 @@
 
 #ifndef ATH9K_DFS_H
 #define ATH9K_DFS_H
+#include "dfs_pattern_detector.h"
 
 #if defined(CONFIG_ATH9K_DFS_CERTIFIED)
 /**
@@ -31,13 +32,14 @@
  *
  * The radar information provided as raw payload data is validated and
  * filtered for false pulses. Events passing all tests are forwarded to
- * the upper layer for pattern detection.
+ * the DFS detector for pattern detection.
  */
 void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data,
                               struct ath_rx_status *rs, u64 mactime);
 #else
-static inline void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data,
-                                            struct ath_rx_status *rs, u64 mactime) { }
+static inline void
+ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data,
+                         struct ath_rx_status *rs, u64 mactime) { }
 #endif
 
 #endif /* ATH9K_DFS_H */
diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.c b/drivers/net/wireless/ath/ath9k/dfs_debug.c
index 4364c103ed33..55d28072adeb 100644
--- a/drivers/net/wireless/ath/ath9k/dfs_debug.c
+++ b/drivers/net/wireless/ath/ath9k/dfs_debug.c
@@ -21,9 +21,15 @@
 #include "ath9k.h"
 #include "dfs_debug.h"
 
+
+struct ath_dfs_pool_stats global_dfs_pool_stats = { 0 };
+
 #define ATH9K_DFS_STAT(s, p) \
         len += snprintf(buf + len, size - len, "%28s : %10u\n", s, \
                         sc->debug.stats.dfs_stats.p);
+#define ATH9K_DFS_POOL_STAT(s, p) \
+        len += snprintf(buf + len, size - len, "%28s : %10u\n", s, \
+                        global_dfs_pool_stats.p);
 
 static ssize_t read_file_dfs(struct file *file, char __user *user_buf,
                              size_t count, loff_t *ppos)
@@ -43,6 +49,9 @@ static ssize_t read_file_dfs(struct file *file, char __user *user_buf,
                         hw_ver->macVersion, hw_ver->macRev,
                         (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_DFS) ?
                                         "enabled" : "disabled");
+        len += snprintf(buf + len, size - len, "Pulse detector statistics:\n");
+        ATH9K_DFS_STAT("pulse events reported   ", pulses_total);
+        ATH9K_DFS_STAT("invalid pulse events    ", pulses_no_dfs);
         ATH9K_DFS_STAT("DFS pulses detected     ", pulses_detected);
         ATH9K_DFS_STAT("Datalen discards        ", datalen_discards);
         ATH9K_DFS_STAT("RSSI discards           ", rssi_discards);
@@ -50,6 +59,18 @@ static ssize_t read_file_dfs(struct file *file, char __user *user_buf,
         ATH9K_DFS_STAT("Primary channel pulses  ", pri_phy_errors);
         ATH9K_DFS_STAT("Secondary channel pulses", ext_phy_errors);
         ATH9K_DFS_STAT("Dual channel pulses     ", dc_phy_errors);
+        len += snprintf(buf + len, size - len, "Radar detector statistics "
+                        "(current DFS region: %d)\n", sc->dfs_detector->region);
+        ATH9K_DFS_STAT("Pulse events processed  ", pulses_processed);
+        ATH9K_DFS_STAT("Radars detected         ", radar_detected);
+        len += snprintf(buf + len, size - len, "Global Pool statistics:\n");
+        ATH9K_DFS_POOL_STAT("Pool references         ", pool_reference);
+        ATH9K_DFS_POOL_STAT("Pulses allocated        ", pulse_allocated);
+        ATH9K_DFS_POOL_STAT("Pulses alloc error      ", pulse_alloc_error);
+        ATH9K_DFS_POOL_STAT("Pulses in use           ", pulse_used);
+        ATH9K_DFS_POOL_STAT("Seqs. allocated         ", pseq_allocated);
+        ATH9K_DFS_POOL_STAT("Seqs. alloc error       ", pseq_alloc_error);
+        ATH9K_DFS_POOL_STAT("Seqs. in use            ", pseq_used);
 
         if (len > size)
                 len = size;
@@ -60,8 +81,33 @@ static ssize_t read_file_dfs(struct file *file, char __user *user_buf,
         return retval;
 }
 
+/* magic number to prevent accidental reset of DFS statistics */
+#define DFS_STATS_RESET_MAGIC   0x80000000
+static ssize_t write_file_dfs(struct file *file, const char __user *user_buf,
+                              size_t count, loff_t *ppos)
+{
+        struct ath_softc *sc = file->private_data;
+        unsigned long val;
+        char buf[32];
+        ssize_t len;
+
+        len = min(count, sizeof(buf) - 1);
+        if (copy_from_user(buf, user_buf, len))
+                return -EFAULT;
+
+        buf[len] = '\0';
+        if (strict_strtoul(buf, 0, &val))
+                return -EINVAL;
+
+        if (val == DFS_STATS_RESET_MAGIC)
+                memset(&sc->debug.stats.dfs_stats, 0,
+                       sizeof(sc->debug.stats.dfs_stats));
+        return count;
+}
+
 static const struct file_operations fops_dfs_stats = {
         .read = read_file_dfs,
+        .write = write_file_dfs,
         .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.h b/drivers/net/wireless/ath/ath9k/dfs_debug.h
index 4911724cb445..e36810a4b585 100644
--- a/drivers/net/wireless/ath/ath9k/dfs_debug.h
+++ b/drivers/net/wireless/ath/ath9k/dfs_debug.h
@@ -22,17 +22,23 @@
 #include "hw.h"
 
 /**
- * struct ath_dfs_stats - DFS Statistics
- *
- * @pulses_detected:  No. of pulses detected so far
- * @datalen_discards: No. of pulses discarded due to invalid datalen
- * @rssi_discards:    No. of pulses discarded due to invalid RSSI
- * @bwinfo_discards:  No. of pulses discarded due to invalid BW info
- * @pri_phy_errors:   No. of pulses reported for primary channel
- * @ext_phy_errors:   No. of pulses reported for extension channel
- * @dc_phy_errors:    No. of pulses reported for primary + extension channel
+ * struct ath_dfs_stats - DFS Statistics per wiphy
+ * @pulses_total:     pulses reported by HW
+ * @pulses_no_dfs:    pulses wrongly reported as DFS
+ * @pulses_detected:  pulses detected so far
+ * @datalen_discards: pulses discarded due to invalid datalen
+ * @rssi_discards:    pulses discarded due to invalid RSSI
+ * @bwinfo_discards:  pulses discarded due to invalid BW info
+ * @pri_phy_errors:   pulses reported for primary channel
+ * @ext_phy_errors:   pulses reported for extension channel
+ * @dc_phy_errors:    pulses reported for primary + extension channel
+ * @pulses_processed: pulses forwarded to detector
+ * @radar_detected:   radars detected
  */
 struct ath_dfs_stats {
+        /* pulse stats */
+        u32 pulses_total;
+        u32 pulses_no_dfs;
         u32 pulses_detected;
         u32 datalen_discards;
         u32 rssi_discards;
@@ -40,18 +46,39 @@ struct ath_dfs_stats {
         u32 pri_phy_errors;
         u32 ext_phy_errors;
         u32 dc_phy_errors;
+        /* pattern detection stats */
+        u32 pulses_processed;
+        u32 radar_detected;
 };
 
+/**
+ * struct ath_dfs_pool_stats - DFS Statistics for global pools
+ */
+struct ath_dfs_pool_stats {
+        u32 pool_reference;
+        u32 pulse_allocated;
+        u32 pulse_alloc_error;
+        u32 pulse_used;
+        u32 pseq_allocated;
+        u32 pseq_alloc_error;
+        u32 pseq_used;
+};
 #if defined(CONFIG_ATH9K_DFS_DEBUGFS)
 
 #define DFS_STAT_INC(sc, c) (sc->debug.stats.dfs_stats.c++)
 void ath9k_dfs_init_debug(struct ath_softc *sc);
 
+#define DFS_POOL_STAT_INC(c) (global_dfs_pool_stats.c++)
+#define DFS_POOL_STAT_DEC(c) (global_dfs_pool_stats.c--)
+extern struct ath_dfs_pool_stats global_dfs_pool_stats;
+
 #else
 
 #define DFS_STAT_INC(sc, c) do { } while (0)
 static inline void ath9k_dfs_init_debug(struct ath_softc *sc) { }
 
+#define DFS_POOL_STAT_INC(c) do { } while (0)
+#define DFS_POOL_STAT_DEC(c) do { } while (0)
 #endif /* CONFIG_ATH9K_DFS_DEBUGFS */
 
 #endif /* ATH9K_DFS_DEBUG_H */
diff --git a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
new file mode 100644
index 000000000000..ea2a6cf7ef23
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
@@ -0,0 +1,300 @@
+/*
+ * Copyright (c) 2012 Neratec Solutions AG
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <linux/slab.h>
+#include <linux/export.h>
+
+#include "dfs_pattern_detector.h"
+#include "dfs_pri_detector.h"
+
+/*
+ * tolerated deviation of radar time stamp in usecs on both sides
+ * TODO: this might need to be HW-dependent
+ */
+#define PRI_TOLERANCE   16
+
+/**
+ * struct radar_types - contains array of patterns defined for one DFS domain
+ * @domain: DFS regulatory domain
+ * @num_radar_types: number of radar types to follow
+ * @radar_types: radar types array
+ */
+struct radar_types {
+        enum nl80211_dfs_regions region;
+        u32 num_radar_types;
+        const struct radar_detector_specs *radar_types;
+};
+
+/* percentage on ppb threshold to trigger detection */
+#define MIN_PPB_THRESH  50
+#define PPB_THRESH(PPB) ((PPB * MIN_PPB_THRESH + 50) / 100)
+#define PRF2PRI(PRF) ((1000000 + PRF / 2) / PRF)
+
+#define ETSI_PATTERN(ID, WMIN, WMAX, PMIN, PMAX, PRF, PPB)      \
+{                                                               \
+        ID, WMIN, WMAX, (PRF2PRI(PMAX) - PRI_TOLERANCE),        \
+        (PRF2PRI(PMIN) * PRF + PRI_TOLERANCE), PRF, PPB * PRF,  \
+        PPB_THRESH(PPB), PRI_TOLERANCE,                         \
+}
+
+/* radar types as defined by ETSI EN-301-893 v1.5.1 */
+static const struct radar_detector_specs etsi_radar_ref_types_v15[] = {
+        ETSI_PATTERN(0,  0,  1,  700,  700, 1, 18),
+        ETSI_PATTERN(1,  0,  5,  200, 1000, 1, 10),
+        ETSI_PATTERN(2,  0, 15,  200, 1600, 1, 15),
+        ETSI_PATTERN(3,  0, 15, 2300, 4000, 1, 25),
+        ETSI_PATTERN(4, 20, 30, 2000, 4000, 1, 20),
+        ETSI_PATTERN(5,  0,  2,  300,  400, 3, 10),
+        ETSI_PATTERN(6,  0,  2,  400, 1200, 3, 15),
+};
+
+static const struct radar_types etsi_radar_types_v15 = {
+        .region                 = NL80211_DFS_ETSI,
+        .num_radar_types        = ARRAY_SIZE(etsi_radar_ref_types_v15),
+        .radar_types            = etsi_radar_ref_types_v15,
+};
+
+/* for now, we support ETSI radar types, FCC and JP are TODO */
+static const struct radar_types *dfs_domains[] = {
+        &etsi_radar_types_v15,
+};
+
+/**
+ * get_dfs_domain_radar_types() - get radar types for a given DFS domain
+ * @param domain DFS domain
+ * @return radar_types ptr on success, NULL if DFS domain is not supported
+ */
+static const struct radar_types *
+get_dfs_domain_radar_types(enum nl80211_dfs_regions region)
+{
+        u32 i;
+        for (i = 0; i < ARRAY_SIZE(dfs_domains); i++) {
+                if (dfs_domains[i]->region == region)
+                        return dfs_domains[i];
+        }
+        return NULL;
+}
+
+/**
+ * struct channel_detector - detector elements for a DFS channel
+ * @head: list_head
+ * @freq: frequency for this channel detector in MHz
+ * @detectors: array of dynamically created detector elements for this freq
+ *
+ * Channel detectors are required to provide multi-channel DFS detection, e.g.
+ * to support off-channel scanning. A pattern detector has a list of channels
+ * radar pulses have been reported for in the past.
+ */
+struct channel_detector {
+        struct list_head head;
+        u16 freq;
+        struct pri_detector **detectors;
+};
+
+/* channel_detector_reset() - reset detector lines for a given channel */
+static void channel_detector_reset(struct dfs_pattern_detector *dpd,
+                                   struct channel_detector *cd)
+{
+        u32 i;
+        if (cd == NULL)
+                return;
+        for (i = 0; i < dpd->num_radar_types; i++)
+                cd->detectors[i]->reset(cd->detectors[i], dpd->last_pulse_ts);
+}
+
+/* channel_detector_exit() - destructor */
+static void channel_detector_exit(struct dfs_pattern_detector *dpd,
+                                  struct channel_detector *cd)
+{
+        u32 i;
+        if (cd == NULL)
+                return;
+        list_del(&cd->head);
+        for (i = 0; i < dpd->num_radar_types; i++) {
+                struct pri_detector *de = cd->detectors[i];
+                if (de != NULL)
+                        de->exit(de);
+        }
+        kfree(cd->detectors);
+        kfree(cd);
+}
+
+static struct channel_detector *
+channel_detector_create(struct dfs_pattern_detector *dpd, u16 freq)
+{
+        u32 sz, i;
+        struct channel_detector *cd;
+
+        cd = kmalloc(sizeof(*cd), GFP_KERNEL);
+        if (cd == NULL)
+                goto fail;
+
+        INIT_LIST_HEAD(&cd->head);
+        cd->freq = freq;
+        sz = sizeof(cd->detectors) * dpd->num_radar_types;
+        cd->detectors = kzalloc(sz, GFP_KERNEL);
+        if (cd->detectors == NULL)
+                goto fail;
+
+        for (i = 0; i < dpd->num_radar_types; i++) {
+                const struct radar_detector_specs *rs = &dpd->radar_spec[i];
+                struct pri_detector *de = pri_detector_init(rs);
+                if (de == NULL)
+                        goto fail;
+                cd->detectors[i] = de;
+        }
+        list_add(&cd->head, &dpd->channel_detectors);
+        return cd;
+
+fail:
+        pr_err("failed to allocate channel_detector for freq=%d\n", freq);
+        channel_detector_exit(dpd, cd);
+        return NULL;
+}
+
+/**
+ * channel_detector_get() - get channel detector for given frequency
+ * @param dpd instance pointer
+ * @param freq frequency in MHz
+ * @return pointer to channel detector on success, NULL otherwise
+ *
+ * Return existing channel detector for the given frequency or return a
+ * newly create one.
+ */
+static struct channel_detector *
+channel_detector_get(struct dfs_pattern_detector *dpd, u16 freq)
+{
+        struct channel_detector *cd;
+        list_for_each_entry(cd, &dpd->channel_detectors, head) {
+                if (cd->freq == freq)
+                        return cd;
+        }
+        return channel_detector_create(dpd, freq);
+}
+
+/*
+ * DFS Pattern Detector
+ */
+
+/* dpd_reset(): reset all channel detectors */
+static void dpd_reset(struct dfs_pattern_detector *dpd)
+{
+        struct channel_detector *cd;
+        if (!list_empty(&dpd->channel_detectors))
+                list_for_each_entry(cd, &dpd->channel_detectors, head)
+                        channel_detector_reset(dpd, cd);
+
+}
+static void dpd_exit(struct dfs_pattern_detector *dpd)
+{
+        struct channel_detector *cd, *cd0;
+        if (!list_empty(&dpd->channel_detectors))
+                list_for_each_entry_safe(cd, cd0, &dpd->channel_detectors, head)
+                        channel_detector_exit(dpd, cd);
+        kfree(dpd);
+}
+
+static bool
+dpd_add_pulse(struct dfs_pattern_detector *dpd, struct pulse_event *event)
+{
+        u32 i;
+        bool ts_wraparound;
+        struct channel_detector *cd;
+
+        if (dpd->region == NL80211_DFS_UNSET) {
+                /*
+                 * pulses received for a non-supported or un-initialized
+                 * domain are treated as detected radars
+                 */
+                return true;
+        }
+
+        cd = channel_detector_get(dpd, event->freq);
+        if (cd == NULL)
+                return false;
+
+        ts_wraparound = (event->ts < dpd->last_pulse_ts);
+        dpd->last_pulse_ts = event->ts;
+        if (ts_wraparound) {
+                /*
+                 * reset detector on time stamp wraparound
+                 * with monotonic time stamps, this should never happen
+                 */
+                pr_warn("DFS: time stamp wraparound detected, resetting\n");
+                dpd_reset(dpd);
+        }
+        /* do type individual pattern matching */
+        for (i = 0; i < dpd->num_radar_types; i++) {
+                if (cd->detectors[i]->add_pulse(cd->detectors[i], event) != 0) {
+                        channel_detector_reset(dpd, cd);
+                        return true;
+                }
+        }
+        return false;
+}
+
+static bool dpd_set_domain(struct dfs_pattern_detector *dpd,
+                           enum nl80211_dfs_regions region)
+{
+        const struct radar_types *rt;
+        struct channel_detector *cd, *cd0;
+
+        if (dpd->region == region)
+                return true;
+
+        dpd->region = NL80211_DFS_UNSET;
+
+        rt = get_dfs_domain_radar_types(region);
+        if (rt == NULL)
+                return false;
+
+        /* delete all channel detectors for previous DFS domain */
+        if (!list_empty(&dpd->channel_detectors))
+                list_for_each_entry_safe(cd, cd0, &dpd->channel_detectors, head)
+                        channel_detector_exit(dpd, cd);
+        dpd->radar_spec = rt->radar_types;
+        dpd->num_radar_types = rt->num_radar_types;
+
+        dpd->region = region;
+        return true;
+}
+
+static struct dfs_pattern_detector default_dpd = {
+        .exit           = dpd_exit,
+        .set_domain     = dpd_set_domain,
+        .add_pulse      = dpd_add_pulse,
+        .region         = NL80211_DFS_UNSET,
+};
+
+struct dfs_pattern_detector *
+dfs_pattern_detector_init(enum nl80211_dfs_regions region)
+{
+        struct dfs_pattern_detector *dpd;
+        dpd = kmalloc(sizeof(*dpd), GFP_KERNEL);
+        if (dpd == NULL) {
+                pr_err("allocation of dfs_pattern_detector failed\n");
+                return NULL;
+        }
+        *dpd = default_dpd;
+        INIT_LIST_HEAD(&dpd->channel_detectors);
+
+        if (dpd->set_domain(dpd, region))
+                return dpd;
+
+        pr_err("Could not set DFS domain to %d. ", region);
+        return NULL;
+}
+EXPORT_SYMBOL(dfs_pattern_detector_init);
diff --git a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.h b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.h
new file mode 100644
index 000000000000..fd0328a30995
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.h
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2012 Neratec Solutions AG
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef DFS_PATTERN_DETECTOR_H
+#define DFS_PATTERN_DETECTOR_H
+
+#include <linux/types.h>
+#include <linux/list.h>
+#include <linux/nl80211.h>
+
+/**
+ * struct pulse_event - describing pulses reported by PHY
+ * @ts: pulse time stamp in us
+ * @freq: channel frequency in MHz
+ * @width: pulse duration in us
+ * @rssi: rssi of radar event
+ */
+struct pulse_event {
+        u64 ts;
+        u16 freq;
+        u8 width;
+        u8 rssi;
+};
+
+/**
+ * struct radar_detector_specs - detector specs for a radar pattern type
+ * @type_id: pattern type, as defined by regulatory
+ * @width_min: minimum radar pulse width in [us]
+ * @width_max: maximum radar pulse width in [us]
+ * @pri_min: minimum pulse repetition interval in [us] (including tolerance)
+ * @pri_max: minimum pri in [us] (including tolerance)
+ * @num_pri: maximum number of different pri for this type
+ * @ppb: pulses per bursts for this type
+ * @ppb_thresh: number of pulses required to trigger detection
+ * @max_pri_tolerance: pulse time stamp tolerance on both sides [us]
+ */
+struct radar_detector_specs {
+        u8 type_id;
+        u8 width_min;
+        u8 width_max;
+        u16 pri_min;
+        u16 pri_max;
+        u8 num_pri;
+        u8 ppb;
+        u8 ppb_thresh;
+        u8 max_pri_tolerance;
+};
+
+/**
+ * struct dfs_pattern_detector - DFS pattern detector
+ * @exit(): destructor
+ * @set_domain(): set DFS domain, resets detector lines upon domain changes
+ * @add_pulse(): add radar pulse to detector, returns true on detection
+ * @region: active DFS region, NL80211_DFS_UNSET until set
+ * @num_radar_types: number of different radar types
+ * @last_pulse_ts: time stamp of last valid pulse in usecs
+ * @radar_detector_specs: array of radar detection specs
+ * @channel_detectors: list connecting channel_detector elements
+ */
+struct dfs_pattern_detector {
+        void (*exit)(struct dfs_pattern_detector *dpd);
+        bool (*set_domain)(struct dfs_pattern_detector *dpd,
+                           enum nl80211_dfs_regions region);
+        bool (*add_pulse)(struct dfs_pattern_detector *dpd,
+                          struct pulse_event *pe);
+
+        enum nl80211_dfs_regions region;
+        u8 num_radar_types;
+        u64 last_pulse_ts;
+
+        const struct radar_detector_specs *radar_spec;
+        struct list_head channel_detectors;
+};
+
+/**
+ * dfs_pattern_detector_init() - constructor for pattern detector class
+ * @param region: DFS domain to be used, can be NL80211_DFS_UNSET at creation
+ * @return instance pointer on success, NULL otherwise
+ */
+#if defined(CONFIG_ATH9K_DFS_CERTIFIED)
+extern struct dfs_pattern_detector *
+dfs_pattern_detector_init(enum nl80211_dfs_regions region);
+#else
+static inline struct dfs_pattern_detector *
+dfs_pattern_detector_init(enum nl80211_dfs_regions region)
+{
+        return NULL;
+}
+#endif /* CONFIG_ATH9K_DFS_CERTIFIED */
+
+#endif /* DFS_PATTERN_DETECTOR_H */
diff --git a/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c b/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c
new file mode 100644
index 000000000000..91b8dceeadb1
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c
@@ -0,0 +1,452 @@
+/*
+ * Copyright (c) 2012 Neratec Solutions AG
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+
+#include "ath9k.h"
+#include "dfs_pattern_detector.h"
+#include "dfs_pri_detector.h"
+#include "dfs_debug.h"
+
+/**
+ * struct pri_sequence - sequence of pulses matching one PRI
+ * @head: list_head
+ * @pri: pulse repetition interval (PRI) in usecs
+ * @dur: duration of sequence in usecs
+ * @count: number of pulses in this sequence
+ * @count_falses: number of not matching pulses in this sequence
+ * @first_ts: time stamp of first pulse in usecs
+ * @last_ts: time stamp of last pulse in usecs
+ * @deadline_ts: deadline when this sequence becomes invalid (first_ts + dur)
+ */
+struct pri_sequence {
+        struct list_head head;
+        u32 pri;
+        u32 dur;
+        u32 count;
+        u32 count_falses;
+        u64 first_ts;
+        u64 last_ts;
+        u64 deadline_ts;
+};
+
+/**
+ * struct pulse_elem - elements in pulse queue
+ * @ts: time stamp in usecs
+ */
+struct pulse_elem {
+        struct list_head head;
+        u64 ts;
+};
+
+/**
+ * pde_get_multiple() - get number of multiples considering a given tolerance
+ * @return factor if abs(val - factor*fraction) <= tolerance, 0 otherwise
+ */
+static u32 pde_get_multiple(u32 val, u32 fraction, u32 tolerance)
+{
+        u32 remainder;
+        u32 factor;
+        u32 delta;
+
+        if (fraction == 0)
+                return 0;
+
+        delta = (val < fraction) ? (fraction - val) : (val - fraction);
+
+        if (delta <= tolerance)
+                /* val and fraction are within tolerance */
+                return 1;
+
+        factor = val / fraction;
+        remainder = val % fraction;
+        if (remainder > tolerance) {
+                /* no exact match */
+                if ((fraction - remainder) <= tolerance)
+                        /* remainder is within tolerance */
+                        factor++;
+                else
+                        factor = 0;
+        }
+        return factor;
+}
+
+/**
+ * DOC: Singleton Pulse and Sequence Pools
+ *
+ * Instances of pri_sequence and pulse_elem are kept in singleton pools to
+ * reduce the number of dynamic allocations. They are shared between all
+ * instances and grow up to the peak number of simultaneously used objects.
+ *
+ * Memory is freed after all references to the pools are released.
+ */
+static u32 singleton_pool_references;
+static LIST_HEAD(pulse_pool);
+static LIST_HEAD(pseq_pool);
+static DEFINE_SPINLOCK(pool_lock);
+
+static void pool_register_ref(void)
+{
+        spin_lock_bh(&pool_lock);
+        singleton_pool_references++;
+        DFS_POOL_STAT_INC(pool_reference);
+        spin_unlock_bh(&pool_lock);
+}
+
+static void pool_deregister_ref(void)
+{
+        spin_lock_bh(&pool_lock);
+        singleton_pool_references--;
+        DFS_POOL_STAT_DEC(pool_reference);
+        if (singleton_pool_references == 0) {
+                /* free singleton pools with no references left */
+                struct pri_sequence *ps, *ps0;
+                struct pulse_elem *p, *p0;
+
+                list_for_each_entry_safe(p, p0, &pulse_pool, head) {
+                        list_del(&p->head);
+                        DFS_POOL_STAT_DEC(pulse_allocated);
+                        kfree(p);
+                }
+                list_for_each_entry_safe(ps, ps0, &pseq_pool, head) {
+                        list_del(&ps->head);
+                        DFS_POOL_STAT_DEC(pseq_allocated);
+                        kfree(ps);
+                }
+        }
+        spin_unlock_bh(&pool_lock);
+}
+
+static void pool_put_pulse_elem(struct pulse_elem *pe)
+{
+        spin_lock_bh(&pool_lock);
+        list_add(&pe->head, &pulse_pool);
+        DFS_POOL_STAT_DEC(pulse_used);
+        spin_unlock_bh(&pool_lock);
+}
+
+static void pool_put_pseq_elem(struct pri_sequence *pse)
+{
+        spin_lock_bh(&pool_lock);
+        list_add(&pse->head, &pseq_pool);
+        DFS_POOL_STAT_DEC(pseq_used);
+        spin_unlock_bh(&pool_lock);
+}
+
+static struct pri_sequence *pool_get_pseq_elem(void)
+{
+        struct pri_sequence *pse = NULL;
+        spin_lock_bh(&pool_lock);
+        if (!list_empty(&pseq_pool)) {
+                pse = list_first_entry(&pseq_pool, struct pri_sequence, head);
+                list_del(&pse->head);
+                DFS_POOL_STAT_INC(pseq_used);
+        }
+        spin_unlock_bh(&pool_lock);
+        return pse;
+}
+
+static struct pulse_elem *pool_get_pulse_elem(void)
+{
+        struct pulse_elem *pe = NULL;
+        spin_lock_bh(&pool_lock);
+        if (!list_empty(&pulse_pool)) {
+                pe = list_first_entry(&pulse_pool, struct pulse_elem, head);
+                list_del(&pe->head);
+                DFS_POOL_STAT_INC(pulse_used);
+        }
+        spin_unlock_bh(&pool_lock);
+        return pe;
+}
+
+static struct pulse_elem *pulse_queue_get_tail(struct pri_detector *pde)
+{
+        struct list_head *l = &pde->pulses;
+        if (list_empty(l))
+                return NULL;
+        return list_entry(l->prev, struct pulse_elem, head);
+}
+
+static bool pulse_queue_dequeue(struct pri_detector *pde)
+{
+        struct pulse_elem *p = pulse_queue_get_tail(pde);
+        if (p != NULL) {
+                list_del_init(&p->head);
+                pde->count--;
+                /* give it back to pool */
+                pool_put_pulse_elem(p);
+        }
+        return (pde->count > 0);
+}
+
+/* remove pulses older than window */
+static void pulse_queue_check_window(struct pri_detector *pde)
+{
+        u64 min_valid_ts;
+        struct pulse_elem *p;
+
+        /* there is no delta time with less than 2 pulses */
+        if (pde->count < 2)
+                return;
+
+        if (pde->last_ts <= pde->window_size)
+                return;
+
+        min_valid_ts = pde->last_ts - pde->window_size;
+        while ((p = pulse_queue_get_tail(pde)) != NULL) {
+                if (p->ts >= min_valid_ts)
+                        return;
+                pulse_queue_dequeue(pde);
+        }
+}
+
+static bool pulse_queue_enqueue(struct pri_detector *pde, u64 ts)
+{
+        struct pulse_elem *p = pool_get_pulse_elem();
+        if (p == NULL) {
+                p = kmalloc(sizeof(*p), GFP_KERNEL);
+                if (p == NULL) {
+                        DFS_POOL_STAT_INC(pulse_alloc_error);
+                        return false;
+                }
+                DFS_POOL_STAT_INC(pulse_allocated);
+                DFS_POOL_STAT_INC(pulse_used);
+        }
+        INIT_LIST_HEAD(&p->head);
+        p->ts = ts;
+        list_add(&p->head, &pde->pulses);
+        pde->count++;
+        pde->last_ts = ts;
+        pulse_queue_check_window(pde);
+        if (pde->count >= pde->max_count)
+                pulse_queue_dequeue(pde);
+        return true;
+}
+
+static bool pseq_handler_create_sequences(struct pri_detector *pde,
+                                          u64 ts, u32 min_count)
+{
+        struct pulse_elem *p;
+        list_for_each_entry(p, &pde->pulses, head) {
+                struct pri_sequence ps, *new_ps;
+                struct pulse_elem *p2;
+                u32 tmp_false_count;
+                u64 min_valid_ts;
+                u32 delta_ts = ts - p->ts;
+
+                if (delta_ts < pde->rs->pri_min)
+                        /* ignore too small pri */
+                        continue;
+
+                if (delta_ts > pde->rs->pri_max)
+                        /* stop on too large pri (sorted list) */
+                        break;
+
+                /* build a new sequence with new potential pri */
+                ps.count = 2;
+                ps.count_falses = 0;
+                ps.first_ts = p->ts;
+                ps.last_ts = ts;
+                ps.pri = ts - p->ts;
+                ps.dur = ps.pri * (pde->rs->ppb - 1)
+                                + 2 * pde->rs->max_pri_tolerance;
+
+                p2 = p;
+                tmp_false_count = 0;
+                min_valid_ts = ts - ps.dur;
+                /* check which past pulses are candidates for new sequence */
+                list_for_each_entry_continue(p2, &pde->pulses, head) {
+                        u32 factor;
+                        if (p2->ts < min_valid_ts)
+                                /* stop on crossing window border */
+                                break;
+                        /* check if pulse match (multi)PRI */
+                        factor = pde_get_multiple(ps.last_ts - p2->ts, ps.pri,
+                                                  pde->rs->max_pri_tolerance);
+                        if (factor > 0) {
+                                ps.count++;
+                                ps.first_ts = p2->ts;
+                                /*
+                                 * on match, add the intermediate falses
+                                 * and reset counter
+                                 */
+                                ps.count_falses += tmp_false_count;
+                                tmp_false_count = 0;
+                        } else {
+                                /* this is a potential false one */
+                                tmp_false_count++;
+                        }
+                }
+                if (ps.count < min_count)
+                        /* did not reach minimum count, drop sequence */
+                        continue;
+
+                /* this is a valid one, add it */
+                ps.deadline_ts = ps.first_ts + ps.dur;
+                new_ps = pool_get_pseq_elem();
+                if (new_ps == NULL) {
+                        new_ps = kmalloc(sizeof(*new_ps), GFP_KERNEL);
+                        if (new_ps == NULL) {
+                                DFS_POOL_STAT_INC(pseq_alloc_error);
+                                return false;
+                        }
+                        DFS_POOL_STAT_INC(pseq_allocated);
+                        DFS_POOL_STAT_INC(pseq_used);
+                }
+                memcpy(new_ps, &ps, sizeof(ps));
+                INIT_LIST_HEAD(&new_ps->head);
+                list_add(&new_ps->head, &pde->sequences);
+        }
+        return true;
+}
+
+/* check new ts and add to all matching existing sequences */
+static u32
+pseq_handler_add_to_existing_seqs(struct pri_detector *pde, u64 ts)
+{
+        u32 max_count = 0;
+        struct pri_sequence *ps, *ps2;
+        list_for_each_entry_safe(ps, ps2, &pde->sequences, head) {
+                u32 delta_ts;
+                u32 factor;
+
+                /* first ensure that sequence is within window */
+                if (ts > ps->deadline_ts) {
+                        list_del_init(&ps->head);
+                        pool_put_pseq_elem(ps);
+                        continue;
+                }
+
+                delta_ts = ts - ps->last_ts;
+                factor = pde_get_multiple(delta_ts, ps->pri,
+                                          pde->rs->max_pri_tolerance);
+                if (factor > 0) {
+                        ps->last_ts = ts;
+                        ps->count++;
+
+                        if (max_count < ps->count)
+                                max_count = ps->count;
+                } else {
+                        ps->count_falses++;
+                }
+        }
+        return max_count;
+}
+
+static struct pri_sequence *
+pseq_handler_check_detection(struct pri_detector *pde)
+{
+        struct pri_sequence *ps;
+
+        if (list_empty(&pde->sequences))
+                return NULL;
+
+        list_for_each_entry(ps, &pde->sequences, head) {
+                /*
+                 * we assume to have enough matching confidence if we
+                 * 1) have enough pulses
+                 * 2) have more matching than false pulses
+                 */
+                if ((ps->count >= pde->rs->ppb_thresh) &&
+                    (ps->count * pde->rs->num_pri >= ps->count_falses))
+                        return ps;
+        }
+        return NULL;
+}
+
+
+/* free pulse queue and sequences list and give objects back to pools */
+static void pri_detector_reset(struct pri_detector *pde, u64 ts)
+{
+        struct pri_sequence *ps, *ps0;
+        struct pulse_elem *p, *p0;
+        list_for_each_entry_safe(ps, ps0, &pde->sequences, head) {
+                list_del_init(&ps->head);
+                pool_put_pseq_elem(ps);
+        }
+        list_for_each_entry_safe(p, p0, &pde->pulses, head) {
+                list_del_init(&p->head);
+                pool_put_pulse_elem(p);
+        }
+        pde->count = 0;
+        pde->last_ts = ts;
+}
+
+static void pri_detector_exit(struct pri_detector *de)
+{
+        pri_detector_reset(de, 0);
+        pool_deregister_ref();
+        kfree(de);
+}
+
+static bool pri_detector_add_pulse(struct pri_detector *de,
+                                   struct pulse_event *event)
+{
+        u32 max_updated_seq;
+        struct pri_sequence *ps;
+        u64 ts = event->ts;
+        const struct radar_detector_specs *rs = de->rs;
+
+        /* ignore pulses not within width range */
+        if ((rs->width_min > event->width) || (rs->width_max < event->width))
+                return false;
+
+        if ((ts - de->last_ts) < rs->max_pri_tolerance)
+                /* if delta to last pulse is too short, don't use this pulse */
+                return false;
+        de->last_ts = ts;
+
+        max_updated_seq = pseq_handler_add_to_existing_seqs(de, ts);
+
+        if (!pseq_handler_create_sequences(de, ts, max_updated_seq)) {
+                pr_err("failed to create pulse sequences\n");
+                pri_detector_reset(de, ts);
+                return false;
+        }
+
+        ps = pseq_handler_check_detection(de);
+
+        if (ps != NULL) {
+                pr_info("DFS: radar found: pri=%d, count=%d, count_false=%d\n",
+                         ps->pri, ps->count, ps->count_falses);
+                pri_detector_reset(de, ts);
+                return true;
+        }
+        pulse_queue_enqueue(de, ts);
+        return false;
+}
+
+struct pri_detector *
+pri_detector_init(const struct radar_detector_specs *rs)
+{
+        struct pri_detector *de;
+        de = kzalloc(sizeof(*de), GFP_KERNEL);
+        if (de == NULL)
+                return NULL;
+        de->exit = pri_detector_exit;
+        de->add_pulse = pri_detector_add_pulse;
+        de->reset = pri_detector_reset;
+
+        INIT_LIST_HEAD(&de->sequences);
+        INIT_LIST_HEAD(&de->pulses);
+        de->window_size = rs->pri_max * rs->ppb * rs->num_pri;
+        de->max_count = rs->ppb * 2;
+        de->rs = rs;
+
+        pool_register_ref();
+        return de;
+}
diff --git a/drivers/net/wireless/ath/ath9k/dfs_pri_detector.h b/drivers/net/wireless/ath/ath9k/dfs_pri_detector.h
new file mode 100644
index 000000000000..81cde9f28e44
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/dfs_pri_detector.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2012 Neratec Solutions AG
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef DFS_PRI_DETECTOR_H
+#define DFS_PRI_DETECTOR_H
+
+#include <linux/list.h>
+
+/**
+ * struct pri_detector - PRI detector element for a dedicated radar type
+ * @exit(): destructor
+ * @add_pulse(): add pulse event, returns true if pattern was detected
+ * @reset(): clear states and reset to given time stamp
+ * @rs: detector specs for this detector element
+ * @last_ts: last pulse time stamp considered for this element in usecs
+ * @sequences: list_head holding potential pulse sequences
+ * @pulses: list connecting pulse_elem objects
+ * @count: number of pulses in queue
+ * @max_count: maximum number of pulses to be queued
+ * @window_size: window size back from newest pulse time stamp in usecs
+ */
+struct pri_detector {
+        void (*exit)     (struct pri_detector *de);
+        bool (*add_pulse)(struct pri_detector *de, struct pulse_event *e);
+        void (*reset)    (struct pri_detector *de, u64 ts);
+
+/* private: internal use only */
+        const struct radar_detector_specs *rs;
+        u64 last_ts;
+        struct list_head sequences;
+        struct list_head pulses;
+        u32 count;
+        u32 max_count;
+        u32 window_size;
+};
+
+struct pri_detector *pri_detector_init(const struct radar_detector_specs *rs);
+
+#endif /* DFS_PRI_DETECTOR_H */
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c
index c43523233319..0512397a293c 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom.c
@@ -16,14 +16,6 @@
 
 #include "hw.h"
 
-static inline u16 ath9k_hw_fbin2freq(u8 fbin, bool is2GHz)
-{
-        if (fbin == AR5416_BCHAN_UNUSED)
-                return fbin;
-
-        return (u16) ((is2GHz) ? (2300 + fbin) : (4800 + 5 * fbin));
-}
-
 void ath9k_hw_analog_shift_regwrite(struct ath_hw *ah, u32 reg, u32 val)
 {
         REG_WRITE(ah, reg, val);
@@ -290,6 +282,34 @@ u16 ath9k_hw_get_max_edge_power(u16 freq, struct cal_ctl_edges *pRdEdgesPower,
         return twiceMaxEdgePower;
 }
 
+u16 ath9k_hw_get_scaled_power(struct ath_hw *ah, u16 power_limit,
+                              u8 antenna_reduction)
+{
+        u16 reduction = antenna_reduction;
+
+        /*
+         * Reduce scaled Power by number of chains active
+         * to get the per chain tx power level.
+         */
+        switch (ar5416_get_ntxchains(ah->txchainmask)) {
+        case 1:
+                break;
+        case 2:
+                reduction += POWER_CORRECTION_FOR_TWO_CHAIN;
+                break;
+        case 3:
+                reduction += POWER_CORRECTION_FOR_THREE_CHAIN;
+                break;
+        }
+
+        if (power_limit > reduction)
+                power_limit -= reduction;
+        else
+                power_limit = 0;
+
+        return power_limit;
+}
+
 void ath9k_hw_update_regulatory_maxpower(struct ath_hw *ah)
 {
         struct ath_common *common = ath9k_hw_common(ah);
@@ -299,10 +319,10 @@ void ath9k_hw_update_regulatory_maxpower(struct ath_hw *ah)
         case 1:
                 break;
         case 2:
-                regulatory->max_power_level += INCREASE_MAXPOW_BY_TWO_CHAIN;
+                regulatory->max_power_level += POWER_CORRECTION_FOR_TWO_CHAIN;
                 break;
         case 3:
-                regulatory->max_power_level += INCREASE_MAXPOW_BY_THREE_CHAIN;
+                regulatory->max_power_level += POWER_CORRECTION_FOR_THREE_CHAIN;
                 break;
         default:
                 ath_dbg(common, EEPROM, "Invalid chainmask configuration\n");
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.h b/drivers/net/wireless/ath/ath9k/eeprom.h
index 5ff7ab965120..33acb920ed3f 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom.h
+++ b/drivers/net/wireless/ath/ath9k/eeprom.h
@@ -79,8 +79,8 @@
 #define SUB_NUM_CTL_MODES_AT_5G_40 2
 #define SUB_NUM_CTL_MODES_AT_2G_40 3
 
-#define INCREASE_MAXPOW_BY_TWO_CHAIN     6  /* 10*log10(2)*2 */
-#define INCREASE_MAXPOW_BY_THREE_CHAIN   10 /* 10*log10(3)*2 */
+#define POWER_CORRECTION_FOR_TWO_CHAIN          6  /* 10*log10(2)*2 */
+#define POWER_CORRECTION_FOR_THREE_CHAIN        10 /* 10*log10(3)*2 */
 
 /*
  * For AR9285 and later chipsets, the following bits are not being programmed
@@ -686,6 +686,8 @@ void ath9k_hw_get_target_powers(struct ath_hw *ah,
                                 u16 numRates, bool isHt40Target);
 u16 ath9k_hw_get_max_edge_power(u16 freq, struct cal_ctl_edges *pRdEdgesPower,
                                 bool is2GHz, int num_band_edges);
+u16 ath9k_hw_get_scaled_power(struct ath_hw *ah, u16 power_limit,
+                              u8 antenna_reduction);
 void ath9k_hw_update_regulatory_maxpower(struct ath_hw *ah);
 int ath9k_hw_eeprom_init(struct ath_hw *ah);
 
@@ -697,6 +699,14 @@ void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah,
                                 u16 *pPdGainBoundaries, u8 *pPDADCValues,
                                 u16 numXpdGains);
 
+static inline u16 ath9k_hw_fbin2freq(u8 fbin, bool is2GHz)
+{
+        if (fbin == AR5416_BCHAN_UNUSED)
+                return fbin;
+
+        return (u16) ((is2GHz) ? (2300 + fbin) : (4800 + 5 * fbin));
+}
+
 #define ar5416_get_ntxchains(_txchainmask)                      \
         (((_txchainmask >> 2) & 1) +                            \
          ((_txchainmask >> 1) & 1) + (_txchainmask & 1))
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
index f272236d8053..aa614767adff 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
@@ -564,9 +564,6 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah,
         (((cfgCtl & ~CTL_MODE_M) | (pCtlMode[ctlMode] & CTL_MODE_M)) == \
          ((pEepData->ctlIndex[i] & CTL_MODE_M) | SD_NO_CTL))
 
-#define REDUCE_SCALED_POWER_BY_TWO_CHAIN     6
-#define REDUCE_SCALED_POWER_BY_THREE_CHAIN   10
-
         u16 twiceMaxEdgePower;
         int i;
         struct cal_ctl_data_ar9287 *rep;
@@ -591,29 +588,8 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah,
         tx_chainmask = ah->txchainmask;
 
         ath9k_hw_get_channel_centers(ah, chan, &centers);
-        scaledPower = powerLimit - antenna_reduction;
-
-        /*
-         * Reduce scaled Power by number of chains active
-         * to get the per chain tx power level.
-         */
-        switch (ar5416_get_ntxchains(tx_chainmask)) {
-        case 1:
-                break;
-        case 2:
-                if (scaledPower > REDUCE_SCALED_POWER_BY_TWO_CHAIN)
-                        scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;
-                else
-                        scaledPower = 0;
-                break;
-        case 3:
-                if (scaledPower > REDUCE_SCALED_POWER_BY_THREE_CHAIN)
-                        scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN;
-                else
-                        scaledPower = 0;
-                break;
-        }
-        scaledPower = max((u16)0, scaledPower);
+        scaledPower = ath9k_hw_get_scaled_power(ah, powerLimit,
+                                                antenna_reduction);
 
         /*
          * Get TX power from EEPROM.
@@ -786,8 +762,6 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah,
 
 #undef CMP_CTL
 #undef CMP_NO_CTL
-#undef REDUCE_SCALED_POWER_BY_TWO_CHAIN
-#undef REDUCE_SCALED_POWER_BY_THREE_CHAIN
 }
 
 static void ath9k_hw_ar9287_set_txpower(struct ath_hw *ah,
@@ -824,6 +798,8 @@ static void ath9k_hw_ar9287_set_txpower(struct ath_hw *ah,
                         regulatory->max_power_level = ratesArray[i];
         }
 
+        ath9k_hw_update_regulatory_maxpower(ah);
+
         if (test)
                 return;
 
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c
index 619b95d764ff..b5fba8b18b8b 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
@@ -991,9 +991,6 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah,
                                                   u16 antenna_reduction,
                                                   u16 powerLimit)
 {
-#define REDUCE_SCALED_POWER_BY_TWO_CHAIN     6  /* 10*log10(2)*2 */
-#define REDUCE_SCALED_POWER_BY_THREE_CHAIN   9 /* 10*log10(3)*2 */
-
         struct ar5416_eeprom_def *pEepData = &ah->eeprom.def;
         u16 twiceMaxEdgePower;
         int i;
@@ -1027,24 +1024,8 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah,
 
         ath9k_hw_get_channel_centers(ah, chan, &centers);
 
-        scaledPower = powerLimit - antenna_reduction;
-
-        switch (ar5416_get_ntxchains(tx_chainmask)) {
-        case 1:
-                break;
-        case 2:
-                if (scaledPower > REDUCE_SCALED_POWER_BY_TWO_CHAIN)
-                        scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;
-                else
-                        scaledPower = 0;
-                break;
-        case 3:
-                if (scaledPower > REDUCE_SCALED_POWER_BY_THREE_CHAIN)
-                        scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN;
-                else
-                        scaledPower = 0;
-                break;
-        }
+        scaledPower = ath9k_hw_get_scaled_power(ah, powerLimit,
+                                                antenna_reduction);
 
         if (IS_CHAN_2GHZ(chan)) {
                 numCtlModes = ARRAY_SIZE(ctlModesFor11g) -
@@ -1263,20 +1244,7 @@ static void ath9k_hw_def_set_txpower(struct ath_hw *ah,
                         regulatory->max_power_level = ratesArray[i];
         }
 
-        switch(ar5416_get_ntxchains(ah->txchainmask)) {
-        case 1:
-                break;
-        case 2:
-                regulatory->max_power_level += INCREASE_MAXPOW_BY_TWO_CHAIN;
-                break;
-        case 3:
-                regulatory->max_power_level += INCREASE_MAXPOW_BY_THREE_CHAIN;
-                break;
-        default:
-                ath_dbg(ath9k_hw_common(ah), EEPROM,
-                        "Invalid chainmask configuration\n");
-                break;
-        }
+        ath9k_hw_update_regulatory_maxpower(ah);
 
         if (test)
                 return;
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index fbe23de1297f..281a9af0f1b6 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -41,6 +41,9 @@ void ath_init_leds(struct ath_softc *sc)
 {
         int ret;
 
+        if (AR_SREV_9100(sc->sc_ah))
+                return;
+
         if (sc->sc_ah->led_pin < 0) {
                 if (AR_SREV_9287(sc->sc_ah))
                         sc->sc_ah->led_pin = ATH_LED_PIN_9287;
@@ -362,7 +365,7 @@ void ath9k_stop_btcoex(struct ath_softc *sc)
                 ath9k_hw_btcoex_disable(ah);
                 if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_3WIRE)
                         ath9k_btcoex_timer_pause(sc);
-                if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_MCI)
+                if (AR_SREV_9462(ah))
                         ath_mci_flush_profile(&sc->btcoex.mci);
         }
 }
@@ -373,7 +376,7 @@ void ath9k_deinit_btcoex(struct ath_softc *sc)
             ath9k_hw_get_btcoex_scheme(sc->sc_ah) == ATH_BTCOEX_CFG_3WIRE)
                 ath_gen_timer_free(sc->sc_ah, sc->btcoex.no_stomp_timer);
 
-        if (ath9k_hw_get_btcoex_scheme(sc->sc_ah) == ATH_BTCOEX_CFG_MCI)
+        if (AR_SREV_9462(sc->sc_ah))
                 ath_mci_cleanup(sc);
 }
 
@@ -399,17 +402,16 @@ int ath9k_init_btcoex(struct ath_softc *sc)
                 txq = sc->tx.txq_map[WME_AC_BE];
                 ath9k_hw_init_btcoex_hw(sc->sc_ah, txq->axq_qnum);
                 sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
-                break;
-        case ATH_BTCOEX_CFG_MCI:
-                sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
-                sc->btcoex.duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE;
-                INIT_LIST_HEAD(&sc->btcoex.mci.info);
+                if (AR_SREV_9462(ah)) {
+                        sc->btcoex.duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE;
+                        INIT_LIST_HEAD(&sc->btcoex.mci.info);
 
-                r = ath_mci_setup(sc);
-                if (r)
-                        return r;
+                        r = ath_mci_setup(sc);
+                        if (r)
+                                return r;
 
-                ath9k_hw_btcoex_init_mci(ah);
+                        ath9k_hw_btcoex_init_mci(ah);
+                }
 
                 break;
         default:
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index 424aabb2c730..f67cd952e741 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -53,6 +53,8 @@ static struct usb_device_id ath9k_hif_usb_ids[] = {
           .driver_info = AR9280_USB },  /* SMC Networks */
         { USB_DEVICE(0x0411, 0x017f),
           .driver_info = AR9280_USB },  /* Sony UWA-BR100 */
+        { USB_DEVICE(0x04da, 0x3904),
+          .driver_info = AR9280_USB },
 
         { USB_DEVICE(0x0cf3, 0x20ff),
           .driver_info = STORAGE_DEVICE },
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index de5ee15ee639..25213d521bc2 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -14,6 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "htc.h"
 
 MODULE_AUTHOR("Atheros Communications");
@@ -711,7 +713,8 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv,
 
         hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
 
-        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN |
+                            WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
 
         hw->queues = 4;
         hw->channel_change_time = 5000;
@@ -966,9 +969,7 @@ int ath9k_htc_resume(struct htc_target *htc_handle)
 static int __init ath9k_htc_init(void)
 {
         if (ath9k_hif_usb_init() < 0) {
-                printk(KERN_ERR
-                        "ath9k_htc: No USB devices found,"
-                        " driver not installed.\n");
+                pr_err("No USB devices found, driver not installed\n");
                 return -ENODEV;
         }
 
@@ -979,6 +980,6 @@ module_init(ath9k_htc_init);
 static void __exit ath9k_htc_exit(void)
 {
         ath9k_hif_usb_exit();
-        printk(KERN_INFO "ath9k_htc: Driver unloaded\n");
+        pr_info("Driver unloaded\n");
 }
 module_exit(ath9k_htc_exit);
diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c
index c25226a32ddc..4a9570dfba72 100644
--- a/drivers/net/wireless/ath/ath9k/htc_hst.c
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
@@ -14,6 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "htc.h"
 
 static int htc_issue_send(struct htc_target *target, struct sk_buff* skb,
@@ -461,7 +463,7 @@ int ath9k_htc_hw_init(struct htc_target *target,
                       char *product, u32 drv_info)
 {
         if (ath9k_htc_probe_device(target, dev, devid, product, drv_info)) {
-                printk(KERN_ERR "Failed to initialize the device\n");
+                pr_err("Failed to initialize the device\n");
                 return -ENODEV;
         }
 
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 6c69e4e8b1cb..f84477c5ebb1 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -24,6 +24,8 @@
 #include "rc.h"
 #include "ar9003_mac.h"
 #include "ar9003_mci.h"
+#include "debug.h"
+#include "ath9k.h"
 
 static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type);
 
@@ -83,6 +85,53 @@ static void ath9k_hw_ani_cache_ini_regs(struct ath_hw *ah)
 /* Helper Functions */
 /********************/
 
+#ifdef CONFIG_ATH9K_DEBUGFS
+
+void ath9k_debug_sync_cause(struct ath_common *common, u32 sync_cause)
+{
+        struct ath_softc *sc = common->priv;
+        if (sync_cause)
+                sc->debug.stats.istats.sync_cause_all++;
+        if (sync_cause & AR_INTR_SYNC_RTC_IRQ)
+                sc->debug.stats.istats.sync_rtc_irq++;
+        if (sync_cause & AR_INTR_SYNC_MAC_IRQ)
+                sc->debug.stats.istats.sync_mac_irq++;
+        if (sync_cause & AR_INTR_SYNC_EEPROM_ILLEGAL_ACCESS)
+                sc->debug.stats.istats.eeprom_illegal_access++;
+        if (sync_cause & AR_INTR_SYNC_APB_TIMEOUT)
+                sc->debug.stats.istats.apb_timeout++;
+        if (sync_cause & AR_INTR_SYNC_PCI_MODE_CONFLICT)
+                sc->debug.stats.istats.pci_mode_conflict++;
+        if (sync_cause & AR_INTR_SYNC_HOST1_FATAL)
+                sc->debug.stats.istats.host1_fatal++;
+        if (sync_cause & AR_INTR_SYNC_HOST1_PERR)
+                sc->debug.stats.istats.host1_perr++;
+        if (sync_cause & AR_INTR_SYNC_TRCV_FIFO_PERR)
+                sc->debug.stats.istats.trcv_fifo_perr++;
+        if (sync_cause & AR_INTR_SYNC_RADM_CPL_EP)
+                sc->debug.stats.istats.radm_cpl_ep++;
+        if (sync_cause & AR_INTR_SYNC_RADM_CPL_DLLP_ABORT)
+                sc->debug.stats.istats.radm_cpl_dllp_abort++;
+        if (sync_cause & AR_INTR_SYNC_RADM_CPL_TLP_ABORT)
+                sc->debug.stats.istats.radm_cpl_tlp_abort++;
+        if (sync_cause & AR_INTR_SYNC_RADM_CPL_ECRC_ERR)
+                sc->debug.stats.istats.radm_cpl_ecrc_err++;
+        if (sync_cause & AR_INTR_SYNC_RADM_CPL_TIMEOUT)
+                sc->debug.stats.istats.radm_cpl_timeout++;
+        if (sync_cause & AR_INTR_SYNC_LOCAL_TIMEOUT)
+                sc->debug.stats.istats.local_timeout++;
+        if (sync_cause & AR_INTR_SYNC_PM_ACCESS)
+                sc->debug.stats.istats.pm_access++;
+        if (sync_cause & AR_INTR_SYNC_MAC_AWAKE)
+                sc->debug.stats.istats.mac_awake++;
+        if (sync_cause & AR_INTR_SYNC_MAC_ASLEEP)
+                sc->debug.stats.istats.mac_asleep++;
+        if (sync_cause & AR_INTR_SYNC_MAC_SLEEP_ACCESS)
+                sc->debug.stats.istats.mac_sleep_access++;
+}
+#endif
+
+
 static void ath9k_hw_set_clockrate(struct ath_hw *ah)
 {
         struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
@@ -142,6 +191,22 @@ bool ath9k_hw_wait(struct ath_hw *ah, u32 reg, u32 mask, u32 val, u32 timeout)
 }
 EXPORT_SYMBOL(ath9k_hw_wait);
 
+void ath9k_hw_synth_delay(struct ath_hw *ah, struct ath9k_channel *chan,
+                          int hw_delay)
+{
+        if (IS_CHAN_B(chan))
+                hw_delay = (4 * hw_delay) / 22;
+        else
+                hw_delay /= 10;
+
+        if (IS_CHAN_HALF_RATE(chan))
+                hw_delay *= 2;
+        else if (IS_CHAN_QUARTER_RATE(chan))
+                hw_delay *= 4;
+
+        udelay(hw_delay + BASE_ACTIVATE_DELAY);
+}
+
 void ath9k_hw_write_array(struct ath_hw *ah, struct ar5416IniArray *array,
                           int column, unsigned int *writecnt)
 {
@@ -388,8 +453,8 @@ static void ath9k_hw_init_config(struct ath_hw *ah)
 {
         int i;
 
-        ah->config.dma_beacon_response_time = 2;
-        ah->config.sw_beacon_response_time = 10;
+        ah->config.dma_beacon_response_time = 1;
+        ah->config.sw_beacon_response_time = 6;
         ah->config.additional_swba_backoff = 0;
         ah->config.ack_6mb = 0x0;
         ah->config.cwm_ignore_extcca = 0;
@@ -445,7 +510,6 @@ static void ath9k_hw_init_defaults(struct ath_hw *ah)
                 AR_STA_ID1_MCAST_KSRCH;
         if (AR_SREV_9100(ah))
                 ah->sta_id1_defaults |= AR_STA_ID1_AR9100_BA_FIX;
-        ah->enable_32kHz_clock = DONT_USE_32KHZ;
         ah->slottime = ATH9K_SLOT_TIME_9;
         ah->globaltxtimeout = (u32) -1;
         ah->power_mode = ATH9K_PM_UNDEFINED;
@@ -972,7 +1036,7 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah)
         struct ath_common *common = ath9k_hw_common(ah);
         struct ieee80211_conf *conf = &common->hw->conf;
         const struct ath9k_channel *chan = ah->curchan;
-        int acktimeout, ctstimeout;
+        int acktimeout, ctstimeout, ack_offset = 0;
         int slottime;
         int sifstime;
         int rx_lat = 0, tx_lat = 0, eifs = 0;
@@ -993,6 +1057,11 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah)
                 rx_lat = 37;
         tx_lat = 54;
 
+        if (IS_CHAN_5GHZ(chan))
+                sifstime = 16;
+        else
+                sifstime = 10;
+
         if (IS_CHAN_HALF_RATE(chan)) {
                 eifs = 175;
                 rx_lat *= 2;
@@ -1000,8 +1069,9 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah)
                 if (IS_CHAN_A_FAST_CLOCK(ah, chan))
                     tx_lat += 11;
 
+                sifstime *= 2;
+                ack_offset = 16;
                 slottime = 13;
-                sifstime = 32;
         } else if (IS_CHAN_QUARTER_RATE(chan)) {
                 eifs = 340;
                 rx_lat = (rx_lat * 4) - 1;
@@ -1009,8 +1079,9 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah)
                 if (IS_CHAN_A_FAST_CLOCK(ah, chan))
                     tx_lat += 22;
 
+                sifstime *= 4;
+                ack_offset = 32;
                 slottime = 21;
-                sifstime = 64;
         } else {
                 if (AR_SREV_9287(ah) && AR_SREV_9287_13_OR_LATER(ah)) {
                         eifs = AR_D_GBL_IFS_EIFS_ASYNC_FIFO;
@@ -1024,14 +1095,10 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah)
                 tx_lat = MS(reg, AR_USEC_TX_LAT);
 
                 slottime = ah->slottime;
-                if (IS_CHAN_5GHZ(chan))
-                        sifstime = 16;
-                else
-                        sifstime = 10;
         }
 
         /* As defined by IEEE 802.11-2007 17.3.8.6 */
-        acktimeout = slottime + sifstime + 3 * ah->coverage_class;
+        acktimeout = slottime + sifstime + 3 * ah->coverage_class + ack_offset;
         ctstimeout = acktimeout;
 
         /*
@@ -1041,7 +1108,8 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah)
          * BA frames in some implementations, but it has been found to fix ACK
          * timeout issues in other cases as well.
          */
-        if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ) {
+        if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ &&
+            !IS_CHAN_HALF_RATE(chan) && !IS_CHAN_QUARTER_RATE(chan)) {
                 acktimeout += 64 - sifstime - ah->slottime;
                 ctstimeout += 48 - sifstime - ah->slottime;
         }
@@ -1454,7 +1522,7 @@ static bool ath9k_hw_channel_change(struct ath_hw *ah,
                 return false;
         }
         ath9k_hw_set_clockrate(ah);
-        ath9k_hw_apply_txpower(ah, chan);
+        ath9k_hw_apply_txpower(ah, chan, false);
         ath9k_hw_rfbus_done(ah);
 
         if (IS_CHAN_OFDM(chan) || IS_CHAN_HT(chan))
@@ -1491,11 +1559,84 @@ static void ath9k_hw_apply_gpio_override(struct ath_hw *ah)
         }
 }
 
+static bool ath9k_hw_check_dcs(u32 dma_dbg, u32 num_dcu_states,
+                               int *hang_state, int *hang_pos)
+{
+        static u32 dcu_chain_state[] = {5, 6, 9}; /* DCU chain stuck states */
+        u32 chain_state, dcs_pos, i;
+
+        for (dcs_pos = 0; dcs_pos < num_dcu_states; dcs_pos++) {
+                chain_state = (dma_dbg >> (5 * dcs_pos)) & 0x1f;
+                for (i = 0; i < 3; i++) {
+                        if (chain_state == dcu_chain_state[i]) {
+                                *hang_state = chain_state;
+                                *hang_pos = dcs_pos;
+                                return true;
+                        }
+                }
+        }
+        return false;
+}
+
+#define DCU_COMPLETE_STATE        1
+#define DCU_COMPLETE_STATE_MASK 0x3
+#define NUM_STATUS_READS         50
+static bool ath9k_hw_detect_mac_hang(struct ath_hw *ah)
+{
+        u32 chain_state, comp_state, dcs_reg = AR_DMADBG_4;
+        u32 i, hang_pos, hang_state, num_state = 6;
+
+        comp_state = REG_READ(ah, AR_DMADBG_6);
+
+        if ((comp_state & DCU_COMPLETE_STATE_MASK) != DCU_COMPLETE_STATE) {
+                ath_dbg(ath9k_hw_common(ah), RESET,
+                        "MAC Hang signature not found at DCU complete\n");
+                return false;
+        }
+
+        chain_state = REG_READ(ah, dcs_reg);
+        if (ath9k_hw_check_dcs(chain_state, num_state, &hang_state, &hang_pos))
+                goto hang_check_iter;
+
+        dcs_reg = AR_DMADBG_5;
+        num_state = 4;
+        chain_state = REG_READ(ah, dcs_reg);
+        if (ath9k_hw_check_dcs(chain_state, num_state, &hang_state, &hang_pos))
+                goto hang_check_iter;
+
+        ath_dbg(ath9k_hw_common(ah), RESET,
+                "MAC Hang signature 1 not found\n");
+        return false;
+
+hang_check_iter:
+        ath_dbg(ath9k_hw_common(ah), RESET,
+                "DCU registers: chain %08x complete %08x Hang: state %d pos %d\n",
+                chain_state, comp_state, hang_state, hang_pos);
+
+        for (i = 0; i < NUM_STATUS_READS; i++) {
+                chain_state = REG_READ(ah, dcs_reg);
+                chain_state = (chain_state >> (5 * hang_pos)) & 0x1f;
+                comp_state = REG_READ(ah, AR_DMADBG_6);
+
+                if (((comp_state & DCU_COMPLETE_STATE_MASK) !=
+                                        DCU_COMPLETE_STATE) ||
+                    (chain_state != hang_state))
+                        return false;
+        }
+
+        ath_dbg(ath9k_hw_common(ah), RESET, "MAC Hang signature 1 found\n");
+
+        return true;
+}
+
 bool ath9k_hw_check_alive(struct ath_hw *ah)
 {
         int count = 50;
         u32 reg;
 
+        if (AR_SREV_9300(ah))
+                return !ath9k_hw_detect_mac_hang(ah);
+
         if (AR_SREV_9285_12_OR_LATER(ah))
                 return true;
 
@@ -1546,6 +1687,10 @@ static int ath9k_hw_do_fastcc(struct ath_hw *ah, struct ath9k_channel *chan)
         if (chan->channel == ah->curchan->channel)
                 goto fail;
 
+        if ((ah->curchan->channelFlags | chan->channelFlags) &
+            (CHANNEL_HALF | CHANNEL_QUARTER))
+                goto fail;
+
         if ((chan->channelFlags & CHANNEL_ALL) !=
             (ah->curchan->channelFlags & CHANNEL_ALL))
                 goto fail;
@@ -2652,7 +2797,8 @@ static int get_antenna_gain(struct ath_hw *ah, struct ath9k_channel *chan)
         return ah->eep_ops->get_eeprom(ah, gain_param);
 }
 
-void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan)
+void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan,
+                            bool test)
 {
         struct ath_regulatory *reg = ath9k_hw_regulatory(ah);
         struct ieee80211_channel *channel;
@@ -2673,7 +2819,7 @@ void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan)
 
         ah->eep_ops->set_txpower(ah, chan,
                                  ath9k_regd_get_ctl(reg, chan),
-                                 ant_reduction, new_pwr, false);
+                                 ant_reduction, new_pwr, test);
 }
 
 void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit, bool test)
@@ -2686,7 +2832,7 @@ void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit, bool test)
         if (test)
                 channel->max_power = MAX_RATE_POWER / 2;
 
-        ath9k_hw_apply_txpower(ah, chan);
+        ath9k_hw_apply_txpower(ah, chan, test);
 
         if (test)
                 channel->max_power = DIV_ROUND_UP(reg->max_power_level, 2);
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index aa1680a0c7fd..828b9bbc456d 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -708,7 +708,6 @@ struct ath_hw {
         struct ar5416Stats stats;
         struct ath9k_tx_queue_info txq[ATH9K_NUM_TX_QUEUES];
 
-        int16_t curchan_rad_index;
         enum ath9k_int imask;
         u32 imrs2_reg;
         u32 txok_interrupt_mask;
@@ -762,11 +761,6 @@ struct ath_hw {
 
         u32 sta_id1_defaults;
         u32 misc_mode;
-        enum {
-                AUTO_32KHZ,
-                USE_32KHZ,
-                DONT_USE_32KHZ,
-        } enable_32kHz_clock;
 
         /* Private to hardware code */
         struct ath_hw_private_ops private_ops;
@@ -783,7 +777,6 @@ struct ath_hw {
         u32 *analogBank7Data;
         u32 *bank6Temp;
 
-        u8 txpower_limit;
         int coverage_class;
         u32 slottime;
         u32 globaltxtimeout;
@@ -848,7 +841,6 @@ struct ath_hw {
         struct ath_gen_timer_table hw_gen_timers;
 
         struct ar9003_txs *ts_ring;
-        void *ts_start;
         u32 ts_paddr_start;
         u32 ts_paddr_end;
         u16 ts_tail;
@@ -915,7 +907,6 @@ static inline u8 get_streams(int mask)
 }
 
 /* Initialization, Detach, Reset */
-const char *ath9k_hw_probe(u16 vendorid, u16 devid);
 void ath9k_hw_deinit(struct ath_hw *ah);
 int ath9k_hw_init(struct ath_hw *ah);
 int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
@@ -932,6 +923,8 @@ void ath9k_hw_set_gpio(struct ath_hw *ah, u32 gpio, u32 val);
 void ath9k_hw_setantenna(struct ath_hw *ah, u32 antenna);
 
 /* General Operation */
+void ath9k_hw_synth_delay(struct ath_hw *ah, struct ath9k_channel *chan,
+                          int hw_delay);
 bool ath9k_hw_wait(struct ath_hw *ah, u32 reg, u32 mask, u32 val, u32 timeout);
 void ath9k_hw_write_array(struct ath_hw *ah, struct ar5416IniArray *array,
                           int column, unsigned int *writecnt);
@@ -965,6 +958,13 @@ bool ath9k_hw_check_alive(struct ath_hw *ah);
 
 bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode);
 
+#ifdef CONFIG_ATH9K_DEBUGFS
+void ath9k_debug_sync_cause(struct ath_common *common, u32 sync_cause);
+#else
+static inline void ath9k_debug_sync_cause(struct ath_common *common,
+                                          u32 sync_cause) {}
+#endif
+
 /* Generic hw timer primitives */
 struct ath_gen_timer *ath_gen_timer_alloc(struct ath_hw *ah,
                                           void (*trigger)(void *),
@@ -985,7 +985,8 @@ void ath9k_hw_name(struct ath_hw *ah, char *hw_name, size_t len);
 /* PHY */
 void ath9k_hw_get_delta_slope_vals(struct ath_hw *ah, u32 coef_scaled,
                                    u32 *coef_mantissa, u32 *coef_exponent);
-void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan);
+void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan,
+                            bool test);
 
 /*
  * Code Specific to AR5008, AR9001 or AR9002,
@@ -1011,7 +1012,6 @@ int ar9003_paprd_create_curve(struct ath_hw *ah,
 int ar9003_paprd_setup_gain_table(struct ath_hw *ah, int chain);
 int ar9003_paprd_init_table(struct ath_hw *ah);
 bool ar9003_paprd_is_done(struct ath_hw *ah);
-void ar9003_hw_set_paprd_txdesc(struct ath_hw *ah, void *ds, u8 chains);
 
 /* Hardware family op attach helpers */
 void ar5008_hw_attach_phy_ops(struct ath_hw *ah);
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index cb006458fc4b..dee9e092449a 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -14,6 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/ath9k_platform.h>
@@ -519,6 +521,8 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
         atomic_set(&ah->intr_ref_cnt, -1);
         sc->sc_ah = ah;
 
+        sc->dfs_detector = dfs_pattern_detector_init(NL80211_DFS_UNSET);
+
         if (!pdata) {
                 ah->ah_flags |= AH_USE_EEPROM;
                 sc->sc_ah->led_pin = -1;
@@ -642,6 +646,24 @@ void ath9k_reload_chainmask_settings(struct ath_softc *sc)
                 setup_ht_cap(sc, &sc->sbands[IEEE80211_BAND_5GHZ].ht_cap);
 }
 
+static const struct ieee80211_iface_limit if_limits[] = {
+        { .max = 2048,  .types = BIT(NL80211_IFTYPE_STATION) |
+                                 BIT(NL80211_IFTYPE_P2P_CLIENT) |
+                                 BIT(NL80211_IFTYPE_WDS) },
+        { .max = 8,     .types =
+#ifdef CONFIG_MAC80211_MESH
+                                 BIT(NL80211_IFTYPE_MESH_POINT) |
+#endif
+                                 BIT(NL80211_IFTYPE_AP) |
+                                 BIT(NL80211_IFTYPE_P2P_GO) },
+};
+
+static const struct ieee80211_iface_combination if_comb = {
+        .limits = if_limits,
+        .n_limits = ARRAY_SIZE(if_limits),
+        .max_interfaces = 2048,
+        .num_different_channels = 1,
+};
 
 void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
 {
@@ -671,11 +693,15 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
                 BIT(NL80211_IFTYPE_ADHOC) |
                 BIT(NL80211_IFTYPE_MESH_POINT);
 
+        hw->wiphy->iface_combinations = &if_comb;
+        hw->wiphy->n_iface_combinations = 1;
+
         if (AR_SREV_5416(sc->sc_ah))
                 hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
 
         hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
         hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS;
+        hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
 
         hw->queues = 4;
         hw->max_rates = 4;
@@ -779,6 +805,7 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc,
                         goto error_world;
         }
 
+        setup_timer(&sc->rx_poll_timer, ath_rx_poll, (unsigned long)sc);
         sc->last_rssi = ATH_RSSI_DUMMY_MARKER;
 
         ath_init_leds(sc);
@@ -821,6 +848,8 @@ static void ath9k_deinit_softc(struct ath_softc *sc)
                         ath_tx_cleanupq(sc, &sc->tx.txq[i]);
 
         ath9k_hw_deinit(sc->sc_ah);
+        if (sc->dfs_detector != NULL)
+                sc->dfs_detector->exit(sc->dfs_detector);
 
         kfree(sc->sc_ah);
         sc->sc_ah = NULL;
@@ -866,17 +895,14 @@ static int __init ath9k_init(void)
         /* Register rate control algorithm */
         error = ath_rate_control_register();
         if (error != 0) {
-                printk(KERN_ERR
-                        "ath9k: Unable to register rate control "
-                        "algorithm: %d\n",
-                        error);
+                pr_err("Unable to register rate control algorithm: %d\n",
+                       error);
                 goto err_out;
         }
 
         error = ath_pci_init();
         if (error < 0) {
-                printk(KERN_ERR
-                        "ath9k: No PCI devices found, driver not installed.\n");
+                pr_err("No PCI devices found, driver not installed\n");
                 error = -ENODEV;
                 goto err_rate_unregister;
         }
@@ -905,6 +931,6 @@ static void __exit ath9k_exit(void)
         ath_ahb_exit();
         ath_pci_exit();
         ath_rate_control_unregister();
-        printk(KERN_INFO "%s: Driver unloaded\n", dev_info);
+        pr_info("%s: Driver unloaded\n", dev_info);
 }
 module_exit(ath9k_exit);
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
index f7bd2532269c..04ef775ccee1 100644
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -133,8 +133,16 @@ EXPORT_SYMBOL(ath9k_hw_updatetxtriglevel);
 
 void ath9k_hw_abort_tx_dma(struct ath_hw *ah)
 {
+        int maxdelay = 1000;
         int i, q;
 
+        if (ah->curchan) {
+                if (IS_CHAN_HALF_RATE(ah->curchan))
+                        maxdelay *= 2;
+                else if (IS_CHAN_QUARTER_RATE(ah->curchan))
+                        maxdelay *= 4;
+        }
+
         REG_WRITE(ah, AR_Q_TXD, AR_Q_TXD_M);
 
         REG_SET_BIT(ah, AR_PCU_MISC, AR_PCU_FORCE_QUIET_COLL | AR_PCU_CLEAR_VMF);
@@ -142,7 +150,7 @@ void ath9k_hw_abort_tx_dma(struct ath_hw *ah)
         REG_SET_BIT(ah, AR_D_GBL_IFS_MISC, AR_D_GBL_IFS_MISC_IGNORE_BACKOFF);
 
         for (q = 0; q < AR_NUM_QCU; q++) {
-                for (i = 0; i < 1000; i++) {
+                for (i = 0; i < maxdelay; i++) {
                         if (i)
                                 udelay(5);
 
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 2504ab005589..dfa78e8b6470 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -113,21 +113,25 @@ void ath9k_ps_restore(struct ath_softc *sc)
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         enum ath9k_power_mode mode;
         unsigned long flags;
+        bool reset;
 
         spin_lock_irqsave(&sc->sc_pm_lock, flags);
         if (--sc->ps_usecount != 0)
                 goto unlock;
 
-        if (sc->ps_idle && (sc->ps_flags & PS_WAIT_FOR_TX_ACK))
+        if (sc->ps_idle) {
+                ath9k_hw_setrxabort(sc->sc_ah, 1);
+                ath9k_hw_stopdmarecv(sc->sc_ah, &reset);
                 mode = ATH9K_PM_FULL_SLEEP;
-        else if (sc->ps_enabled &&
-                 !(sc->ps_flags & (PS_WAIT_FOR_BEACON |
-                              PS_WAIT_FOR_CAB |
-                              PS_WAIT_FOR_PSPOLL_DATA |
-                              PS_WAIT_FOR_TX_ACK)))
+        } else if (sc->ps_enabled &&
+                   !(sc->ps_flags & (PS_WAIT_FOR_BEACON |
+                                     PS_WAIT_FOR_CAB |
+                                     PS_WAIT_FOR_PSPOLL_DATA |
+                                     PS_WAIT_FOR_TX_ACK))) {
                 mode = ATH9K_PM_NETWORK_SLEEP;
-        else
+        } else {
                 goto unlock;
+        }
 
         spin_lock(&common->cc_lock);
         ath_hw_cycle_counters_update(common);
@@ -241,6 +245,7 @@ static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
 
         sc->hw_busy_count = 0;
         del_timer_sync(&common->ani.timer);
+        del_timer_sync(&sc->rx_poll_timer);
 
         ath9k_debug_samp_bb_mac(sc);
         ath9k_hw_disable_interrupts(ah);
@@ -282,6 +287,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)
 
                 ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
                 ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work, HZ/2);
+                ath_start_rx_poll(sc, 3);
                 if (!common->disable_ani)
                         ath_start_ani(common);
         }
@@ -690,17 +696,6 @@ void ath9k_tasklet(unsigned long data)
                 goto out;
         }
 
-        /*
-         * Only run the baseband hang check if beacons stop working in AP or
-         * IBSS mode, because it has a high false positive rate. For station
-         * mode it should not be necessary, since the upper layers will detect
-         * this through a beacon miss automatically and the following channel
-         * change will trigger a hardware reset anyway
-         */
-        if (ath9k_hw_numtxpending(ah, sc->beacon.beaconq) != 0 &&
-            !ath9k_hw_check_alive(ah))
-                ieee80211_queue_work(sc->hw, &sc->hw_check_work);
-
         if ((status & ATH9K_INT_TSFOOR) && sc->ps_enabled) {
                 /*
                  * TSF sync does not look correct; remain awake to sync with
@@ -912,10 +907,19 @@ void ath_hw_check(struct work_struct *work)
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         unsigned long flags;
         int busy;
+        u8 is_alive, nbeacon = 1;
 
         ath9k_ps_wakeup(sc);
-        if (ath9k_hw_check_alive(sc->sc_ah))
+        is_alive = ath9k_hw_check_alive(sc->sc_ah);
+
+        if (is_alive && !AR_SREV_9300(sc->sc_ah))
                 goto out;
+        else if (!is_alive && AR_SREV_9300(sc->sc_ah)) {
+                ath_dbg(common, RESET,
+                        "DCU stuck is detected. Schedule chip reset\n");
+                RESET_STAT_INC(sc, RESET_TYPE_MAC_HANG);
+                goto sched_reset;
+        }
 
         spin_lock_irqsave(&common->cc_lock, flags);
         busy = ath_update_survey_stats(sc);
@@ -926,12 +930,18 @@ void ath_hw_check(struct work_struct *work)
         if (busy >= 99) {
                 if (++sc->hw_busy_count >= 3) {
                         RESET_STAT_INC(sc, RESET_TYPE_BB_HANG);
-                        ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
+                        goto sched_reset;
                 }
-
-        } else if (busy >= 0)
+        } else if (busy >= 0) {
                 sc->hw_busy_count = 0;
+                nbeacon = 3;
+        }
+
+        ath_start_rx_poll(sc, nbeacon);
+        goto out;
 
+sched_reset:
+        ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
 out:
         ath9k_ps_restore(sc);
 }
@@ -1094,14 +1104,7 @@ static void ath9k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
                 }
         }
 
-        /*
-         * Cannot tx while the hardware is in full sleep, it first needs a full
-         * chip reset to recover from that
-         */
-        if (unlikely(sc->sc_ah->power_mode == ATH9K_PM_FULL_SLEEP))
-                goto exit;
-
-        if (unlikely(sc->sc_ah->power_mode != ATH9K_PM_AWAKE)) {
+        if (unlikely(sc->sc_ah->power_mode == ATH9K_PM_NETWORK_SLEEP)) {
                 /*
                  * We are using PS-Poll and mac80211 can request TX while in
                  * power save mode. Need to wake up hardware for the TX to be
@@ -1120,12 +1123,21 @@ static void ath9k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
                 }
                 /*
                  * The actual restore operation will happen only after
-                 * the sc_flags bit is cleared. We are just dropping
+                 * the ps_flags bit is cleared. We are just dropping
                  * the ps_usecount here.
                  */
                 ath9k_ps_restore(sc);
         }
 
+        /*
+         * Cannot tx while the hardware is in full sleep, it first needs a full
+         * chip reset to recover from that
+         */
+        if (unlikely(sc->sc_ah->power_mode == ATH9K_PM_FULL_SLEEP)) {
+                ath_err(common, "TX while HW is in FULL_SLEEP mode\n");
+                goto exit;
+        }
+
         memset(&txctl, 0, sizeof(struct ath_tx_control));
         txctl.txq = sc->tx.txq_map[skb_get_queue_mapping(skb)];
 
@@ -1133,6 +1145,7 @@ static void ath9k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 
         if (ath_tx_start(hw, skb, &txctl) != 0) {
                 ath_dbg(common, XMIT, "TX failed\n");
+                TX_STAT_INC(txctl.txq->axq_qnum, txfailed);
                 goto exit;
         }
 
@@ -1151,6 +1164,7 @@ static void ath9k_stop(struct ieee80211_hw *hw)
         mutex_lock(&sc->mutex);
 
         ath_cancel_work(sc);
+        del_timer_sync(&sc->rx_poll_timer);
 
         if (sc->sc_flags & SC_OP_INVALID) {
                 ath_dbg(common, ANY, "Device not present\n");
@@ -1237,7 +1251,6 @@ static void ath9k_reclaim_beacon(struct ath_softc *sc,
         ath9k_set_beaconing_status(sc, false);
         ath_beacon_return(sc, avp);
         ath9k_set_beaconing_status(sc, true);
-        sc->sc_flags &= ~SC_OP_BEACONS;
 }
 
 static void ath9k_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
@@ -1368,21 +1381,31 @@ static void ath9k_do_vif_add_setup(struct ieee80211_hw *hw,
         ath9k_calculate_summary_state(hw, vif);
 
         if (ath9k_uses_beacons(vif->type)) {
-                int error;
-                /* This may fail because upper levels do not have beacons
-                 * properly configured yet.  That's OK, we assume it
-                 * will be properly configured and then we will be notified
-                 * in the info_changed method and set up beacons properly
-                 * there.
-                 */
+                /* Reserve a beacon slot for the vif */
                 ath9k_set_beaconing_status(sc, false);
-                error = ath_beacon_alloc(sc, vif);
-                if (!error)
-                        ath_beacon_config(sc, vif);
+                ath_beacon_alloc(sc, vif);
                 ath9k_set_beaconing_status(sc, true);
         }
 }
 
+void ath_start_rx_poll(struct ath_softc *sc, u8 nbeacon)
+{
+        if (!AR_SREV_9300(sc->sc_ah))
+                return;
+
+        if (!(sc->sc_flags & SC_OP_PRIM_STA_VIF))
+                return;
+
+        mod_timer(&sc->rx_poll_timer, jiffies + msecs_to_jiffies
+                        (nbeacon * sc->cur_beacon_conf.beacon_interval));
+}
+
+void ath_rx_poll(unsigned long data)
+{
+        struct ath_softc *sc = (struct ath_softc *)data;
+
+        ieee80211_queue_work(sc->hw, &sc->hw_check_work);
+}
 
 static int ath9k_add_interface(struct ieee80211_hw *hw,
                                struct ieee80211_vif *vif)
@@ -1511,6 +1534,7 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,
 static void ath9k_enable_ps(struct ath_softc *sc)
 {
         struct ath_hw *ah = sc->sc_ah;
+        struct ath_common *common = ath9k_hw_common(ah);
 
         sc->ps_enabled = true;
         if (!(ah->caps.hw_caps & ATH9K_HW_CAP_AUTOSLEEP)) {
@@ -1520,11 +1544,13 @@ static void ath9k_enable_ps(struct ath_softc *sc)
                 }
                 ath9k_hw_setrxabort(ah, 1);
         }
+        ath_dbg(common, PS, "PowerSave enabled\n");
 }
 
 static void ath9k_disable_ps(struct ath_softc *sc)
 {
         struct ath_hw *ah = sc->sc_ah;
+        struct ath_common *common = ath9k_hw_common(ah);
 
         sc->ps_enabled = false;
         ath9k_hw_setpower(ah, ATH9K_PM_AWAKE);
@@ -1539,7 +1565,7 @@ static void ath9k_disable_ps(struct ath_softc *sc)
                         ath9k_hw_set_interrupts(ah);
                 }
         }
-
+        ath_dbg(common, PS, "PowerSave disabled\n");
 }
 
 static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
@@ -1548,6 +1574,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(ah);
         struct ieee80211_conf *conf = &hw->conf;
+        bool reset_channel = false;
 
         ath9k_ps_wakeup(sc);
         mutex_lock(&sc->mutex);
@@ -1556,6 +1583,12 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
                 sc->ps_idle = !!(conf->flags & IEEE80211_CONF_IDLE);
                 if (sc->ps_idle)
                         ath_cancel_work(sc);
+                else
+                        /*
+                         * The chip needs a reset to properly wake up from
+                         * full sleep
+                         */
+                        reset_channel = ah->chip_fullsleep;
         }
 
         /*
@@ -1584,7 +1617,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
                 }
         }
 
-        if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
+        if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) {
                 struct ieee80211_channel *curchan = hw->conf.channel;
                 int pos = curchan->hw_value;
                 int old_pos = -1;
@@ -1904,6 +1937,8 @@ static void ath9k_bss_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
                 sc->last_rssi = ATH_RSSI_DUMMY_MARKER;
                 sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;
 
+                ath_start_rx_poll(sc, 3);
+
                 if (!common->disable_ani) {
                         sc->sc_flags |= SC_OP_ANI_RUN;
                         ath_start_ani(common);
@@ -1943,6 +1978,7 @@ static void ath9k_config_bss(struct ath_softc *sc, struct ieee80211_vif *vif)
                 /* Stop ANI */
                 sc->sc_flags &= ~SC_OP_ANI_RUN;
                 del_timer_sync(&common->ani.timer);
+                del_timer_sync(&sc->rx_poll_timer);
                 memset(&sc->caldata, 0, sizeof(sc->caldata));
         }
 }
@@ -1957,7 +1993,6 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
         struct ath_common *common = ath9k_hw_common(ah);
         struct ath_vif *avp = (void *)vif->drv_priv;
         int slottime;
-        int error;
 
         ath9k_ps_wakeup(sc);
         mutex_lock(&sc->mutex);
@@ -1986,16 +2021,29 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
                 } else {
                         sc->sc_flags &= ~SC_OP_ANI_RUN;
                         del_timer_sync(&common->ani.timer);
+                        del_timer_sync(&sc->rx_poll_timer);
                 }
         }
 
-        /* Enable transmission of beacons (AP, IBSS, MESH) */
-        if ((changed & BSS_CHANGED_BEACON) ||
-            ((changed & BSS_CHANGED_BEACON_ENABLED) && bss_conf->enable_beacon)) {
+        /*
+         * In case of AP mode, the HW TSF has to be reset
+         * when the beacon interval changes.
+         */
+        if ((changed & BSS_CHANGED_BEACON_INT) &&
+            (vif->type == NL80211_IFTYPE_AP))
+                sc->sc_flags |= SC_OP_TSF_RESET;
+
+        /* Configure beaconing (AP, IBSS, MESH) */
+        if (ath9k_uses_beacons(vif->type) &&
+            ((changed & BSS_CHANGED_BEACON) ||
+             (changed & BSS_CHANGED_BEACON_ENABLED) ||
+             (changed & BSS_CHANGED_BEACON_INT))) {
                 ath9k_set_beaconing_status(sc, false);
-                error = ath_beacon_alloc(sc, vif);
-                if (!error)
-                        ath_beacon_config(sc, vif);
+                if (bss_conf->enable_beacon)
+                        ath_beacon_alloc(sc, vif);
+                else
+                        avp->is_bslot_active = false;
+                ath_beacon_config(sc, vif);
                 ath9k_set_beaconing_status(sc, true);
         }
 
@@ -2018,30 +2066,6 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
                 }
         }
 
-        /* Disable transmission of beacons */
-        if ((changed & BSS_CHANGED_BEACON_ENABLED) &&
-            !bss_conf->enable_beacon) {
-                ath9k_set_beaconing_status(sc, false);
-                avp->is_bslot_active = false;
-                ath9k_set_beaconing_status(sc, true);
-        }
-
-        if (changed & BSS_CHANGED_BEACON_INT) {
-                /*
-                 * In case of AP mode, the HW TSF has to be reset
-                 * when the beacon interval changes.
-                 */
-                if (vif->type == NL80211_IFTYPE_AP) {
-                        sc->sc_flags |= SC_OP_TSF_RESET;
-                        ath9k_set_beaconing_status(sc, false);
-                        error = ath_beacon_alloc(sc, vif);
-                        if (!error)
-                                ath_beacon_config(sc, vif);
-                        ath9k_set_beaconing_status(sc, true);
-                } else
-                        ath_beacon_config(sc, vif);
-        }
-
         mutex_unlock(&sc->mutex);
         ath9k_ps_restore(sc);
 }
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index 77dc327def8d..a856b51255f4 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -14,6 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/nl80211.h>
 #include <linux/pci.h>
 #include <linux/pci-aspm.h>
@@ -171,14 +173,13 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
         ret =  pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
         if (ret) {
-                printk(KERN_ERR "ath9k: 32-bit DMA not available\n");
+                pr_err("32-bit DMA not available\n");
                 goto err_dma;
         }
 
         ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
         if (ret) {
-                printk(KERN_ERR "ath9k: 32-bit DMA consistent "
-                        "DMA enable failed\n");
+                pr_err("32-bit DMA consistent DMA enable failed\n");
                 goto err_dma;
         }
 
@@ -224,7 +225,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
         mem = pci_iomap(pdev, 0, 0);
         if (!mem) {
-                printk(KERN_ERR "PCI memory map error\n") ;
+                pr_err("PCI memory map error\n") ;
                 ret = -EIO;
                 goto err_iomap;
         }
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 08bb45532701..92a6c0a87f89 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -1436,7 +1436,7 @@ static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband,
 
 static void ath_rate_update(void *priv, struct ieee80211_supported_band *sband,
                             struct ieee80211_sta *sta, void *priv_sta,
-                            u32 changed, enum nl80211_channel_type oper_chan_type)
+                            u32 changed)
 {
         struct ath_softc *sc = priv;
         struct ath_rate_priv *ath_rc_priv = priv_sta;
@@ -1447,12 +1447,11 @@ static void ath_rate_update(void *priv, struct ieee80211_supported_band *sband,
 
         /* FIXME: Handle AP mode later when we support CWM */
 
-        if (changed & IEEE80211_RC_HT_CHANGED) {
+        if (changed & IEEE80211_RC_BW_CHANGED) {
                 if (sc->sc_ah->opmode != NL80211_IFTYPE_STATION)
                         return;
 
-                if (oper_chan_type == NL80211_CHAN_HT40MINUS ||
-                    oper_chan_type == NL80211_CHAN_HT40PLUS)
+                if (sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)
                         oper_cw40 = true;
 
                 if (oper_cw40)
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index 1c4583c7ff7c..e1fcc68124dc 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -812,6 +812,7 @@ static bool ath9k_rx_accept(struct ath_common *common,
         is_valid_tkip = rx_stats->rs_keyix != ATH9K_RXKEYIX_INVALID &&
                 test_bit(rx_stats->rs_keyix, common->tkip_keymap);
         strip_mic = is_valid_tkip && ieee80211_is_data(fc) &&
+                ieee80211_has_protected(fc) &&
                 !(rx_stats->rs_status &
                 (ATH9K_RXERR_DECRYPT | ATH9K_RXERR_CRC | ATH9K_RXERR_MIC |
                  ATH9K_RXERR_KEYMISS));
@@ -824,15 +825,20 @@ static bool ath9k_rx_accept(struct ath_common *common,
         if (rx_stats->rs_keyix == ATH9K_RXKEYIX_INVALID)
                 rx_stats->rs_status &= ~ATH9K_RXERR_KEYMISS;
 
-        if (!rx_stats->rs_datalen)
+        if (!rx_stats->rs_datalen) {
+                RX_STAT_INC(rx_len_err);
                 return false;
+        }
+
         /*
          * rs_status follows rs_datalen so if rs_datalen is too large
          * we can take a hint that hardware corrupted it, so ignore
          * those frames.
          */
-        if (rx_stats->rs_datalen > (common->rx_bufsize - rx_status_len))
+        if (rx_stats->rs_datalen > (common->rx_bufsize - rx_status_len)) {
+                RX_STAT_INC(rx_len_err);
                 return false;
+        }
 
         /* Only use error bits from the last fragment */
         if (rx_stats->rs_more)
@@ -902,6 +908,7 @@ static int ath9k_process_rate(struct ath_common *common,
         struct ieee80211_supported_band *sband;
         enum ieee80211_band band;
         unsigned int i = 0;
+        struct ath_softc __maybe_unused *sc = common->priv;
 
         band = hw->conf.channel->band;
         sband = hw->wiphy->bands[band];
@@ -936,7 +943,7 @@ static int ath9k_process_rate(struct ath_common *common,
         ath_dbg(common, ANY,
                 "unsupported hw bitrate detected 0x%02x using 1 Mbit\n",
                 rx_stats->rs_rate);
-
+        RX_STAT_INC(rx_rate_err);
         return -EINVAL;
 }
 
@@ -1823,10 +1830,14 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
 
                 hdr = (struct ieee80211_hdr *) (hdr_skb->data + rx_status_len);
                 rxs = IEEE80211_SKB_RXCB(hdr_skb);
-                if (ieee80211_is_beacon(hdr->frame_control) &&
-                    !is_zero_ether_addr(common->curbssid) &&
-                    !compare_ether_addr(hdr->addr3, common->curbssid))
-                        rs.is_mybeacon = true;
+                if (ieee80211_is_beacon(hdr->frame_control)) {
+                        RX_STAT_INC(rx_beacons);
+                        if (!is_zero_ether_addr(common->curbssid) &&
+                            ether_addr_equal(hdr->addr3, common->curbssid))
+                                rs.is_mybeacon = true;
+                        else
+                                rs.is_mybeacon = false;
+                }
                 else
                         rs.is_mybeacon = false;
 
@@ -1836,8 +1847,10 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                  * If we're asked to flush receive queue, directly
                  * chain it back at the queue without processing it.
                  */
-                if (sc->sc_flags & SC_OP_RXFLUSH)
+                if (sc->sc_flags & SC_OP_RXFLUSH) {
+                        RX_STAT_INC(rx_drop_rxflush);
                         goto requeue_drop_frag;
+                }
 
                 memset(rxs, 0, sizeof(struct ieee80211_rx_status));
 
@@ -1855,6 +1868,10 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                 if (retval)
                         goto requeue_drop_frag;
 
+                if (rs.is_mybeacon) {
+                        sc->hw_busy_count = 0;
+                        ath_start_rx_poll(sc, 3);
+                }
                 /* Ensure we always have an skb to requeue once we are done
                  * processing the current buffer's skb */
                 requeue_skb = ath_rxbuf_alloc(common, common->rx_bufsize, GFP_ATOMIC);
@@ -1863,8 +1880,10 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                  * tell hardware it can give us a new frame using the old
                  * skb and put it at the tail of the sc->rx.rxbuf list for
                  * processing. */
-                if (!requeue_skb)
+                if (!requeue_skb) {
+                        RX_STAT_INC(rx_oom_err);
                         goto requeue_drop_frag;
+                }
 
                 /* Unmap the frame */
                 dma_unmap_single(sc->dev, bf->bf_buf_addr,
@@ -1895,6 +1914,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                 }
 
                 if (rs.rs_more) {
+                        RX_STAT_INC(rx_frags);
                         /*
                          * rs_more indicates chained descriptors which can be
                          * used to link buffers together for a sort of
@@ -1904,6 +1924,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                                 /* too many fragments - cannot handle frame */
                                 dev_kfree_skb_any(sc->rx.frag);
                                 dev_kfree_skb_any(skb);
+                                RX_STAT_INC(rx_too_many_frags_err);
                                 skb = NULL;
                         }
                         sc->rx.frag = skb;
@@ -1915,6 +1936,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
 
                         if (pskb_expand_head(hdr_skb, 0, space, GFP_ATOMIC) < 0) {
                                 dev_kfree_skb(skb);
+                                RX_STAT_INC(rx_oom_err);
                                 goto requeue_drop_frag;
                         }
 
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 834e6bc45e8b..23eaa1b26ebe 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1820,6 +1820,7 @@ static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc,
         struct ath_frame_info *fi = get_frame_info(skb);
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
         struct ath_buf *bf;
+        int fragno;
         u16 seqno;
 
         bf = ath_tx_get_buffer(sc);
@@ -1831,9 +1832,16 @@ static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc,
         ATH_TXBUF_RESET(bf);
 
         if (tid) {
+                fragno = le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG;
                 seqno = tid->seq_next;
                 hdr->seq_ctrl = cpu_to_le16(tid->seq_next << IEEE80211_SEQ_SEQ_SHIFT);
-                INCR(tid->seq_next, IEEE80211_SEQ_MAX);
+
+                if (fragno)
+                        hdr->seq_ctrl |= cpu_to_le16(fragno);
+
+                if (!ieee80211_has_morefrags(hdr->frame_control))
+                        INCR(tid->seq_next, IEEE80211_SEQ_MAX);
+
                 bf->bf_state.seqno = seqno;
         }
 
diff --git a/drivers/net/wireless/ath/carl9170/cmd.h b/drivers/net/wireless/ath/carl9170/cmd.h
index 885c42778b8b..65919c902f55 100644
--- a/drivers/net/wireless/ath/carl9170/cmd.h
+++ b/drivers/net/wireless/ath/carl9170/cmd.h
@@ -114,7 +114,7 @@ __regwrite_out :							\
 
 #define carl9170_regwrite_result()                                      \
         __err;                                                          \
-} while (0);
+} while (0)
 
 
 #define carl9170_async_regwrite_get_buf()                               \
@@ -126,7 +126,7 @@ do {									\
                 __err = -ENOMEM;                                        \
                 goto __async_regwrite_out;                              \
         }                                                               \
-} while (0);
+} while (0)
 
 #define carl9170_async_regwrite_begin(carl)                             \
 do {                                                                    \
@@ -169,6 +169,6 @@ __async_regwrite_out:							\
 
 #define carl9170_async_regwrite_result()                                \
         __err;                                                          \
-} while (0);
+} while (0)
 
 #endif /* __CMD_H */
diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c
index cffde8d9a521..5c73c03872f3 100644
--- a/drivers/net/wireless/ath/carl9170/fw.c
+++ b/drivers/net/wireless/ath/carl9170/fw.c
@@ -355,6 +355,8 @@ static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len)
 
         ar->hw->wiphy->interface_modes |= if_comb_types;
 
+        ar->hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
+
 #undef SUPPORTED
         return carl9170_fw_tx_sequence(ar);
 }
diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c
index dc99030ea8b6..84b22eec7abd 100644
--- a/drivers/net/wireless/ath/carl9170/rx.c
+++ b/drivers/net/wireless/ath/carl9170/rx.c
@@ -538,7 +538,7 @@ static void carl9170_ps_beacon(struct ar9170 *ar, void *data, unsigned int len)
                 return;
 
         /* and only beacons from the associated BSSID, please */
-        if (compare_ether_addr(hdr->addr3, ar->common.curbssid) ||
+        if (!ether_addr_equal(hdr->addr3, ar->common.curbssid) ||
             !ar->common.curaid)
                 return;
 
diff --git a/drivers/net/wireless/ath/main.c b/drivers/net/wireless/ath/main.c
index ea2c737138d3..8e99540cd90e 100644
--- a/drivers/net/wireless/ath/main.c
+++ b/drivers/net/wireless/ath/main.c
@@ -14,6 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 
@@ -49,7 +51,7 @@ struct sk_buff *ath_rxbuf_alloc(struct ath_common *common,
                 if (off != 0)
                         skb_reserve(skb, common->cachelsz - off);
         } else {
-                printk(KERN_ERR "skbuff alloc of size %u failed\n", len);
+                pr_err("skbuff alloc of size %u failed\n", len);
                 return NULL;
         }
 
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
index 10dea37431b3..d81698015bf7 100644
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -14,6 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/export.h>
 #include <net/cfg80211.h>
@@ -562,7 +564,7 @@ static int __ath_regd_init(struct ath_regulatory *reg)
         printk(KERN_DEBUG "ath: EEPROM regdomain: 0x%0x\n", reg->current_rd);
 
         if (!ath_regd_is_eeprom_valid(reg)) {
-                printk(KERN_ERR "ath: Invalid EEPROM contents\n");
+                pr_err("Invalid EEPROM contents\n");
                 return -EINVAL;
         }
 
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 6c87a823f5a9..d07c0301da6a 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -3989,8 +3989,7 @@ static int reset_atmel_card(struct net_device *dev)
                         atmel_copy_to_card(priv->dev, 0x8000, &fw[0x6000], len - 0x6000);
                 }
 
-                if (fw_entry)
-                        release_firmware(fw_entry);
+                release_firmware(fw_entry);
         }
 
         err = atmel_wakeup_firmware(priv);
diff --git a/drivers/net/wireless/atmel_pci.c b/drivers/net/wireless/atmel_pci.c
index 9ab1192004c0..51e33b53386e 100644
--- a/drivers/net/wireless/atmel_pci.c
+++ b/drivers/net/wireless/atmel_pci.c
@@ -74,15 +74,4 @@ static void __devexit atmel_pci_remove(struct pci_dev *pdev)
         stop_atmel_card(pci_get_drvdata(pdev));
 }
 
-static int __init atmel_init_module(void)
-{
-        return pci_register_driver(&atmel_driver);
-}
-
-static void __exit atmel_cleanup_module(void)
-{
-        pci_unregister_driver(&atmel_driver);
-}
-
-module_init(atmel_init_module);
-module_exit(atmel_cleanup_module);
+module_pci_driver(atmel_driver);
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index c79e6638c88d..617afc8211b2 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4010,6 +4010,20 @@ static int b43_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         if (modparam_nohwcrypt)
                 return -ENOSPC; /* User disabled HW-crypto */
 
+        if ((vif->type == NL80211_IFTYPE_ADHOC ||
+             vif->type == NL80211_IFTYPE_MESH_POINT) &&
+            (key->cipher == WLAN_CIPHER_SUITE_TKIP ||
+             key->cipher == WLAN_CIPHER_SUITE_CCMP) &&
+            !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
+                /*
+                 * For now, disable hw crypto for the RSN IBSS group keys. This
+                 * could be optimized in the future, but until that gets
+                 * implemented, use of software crypto for group addressed
+                 * frames is a acceptable to allow RSN IBSS to be used.
+                 */
+                return -EOPNOTSUPP;
+        }
+
         mutex_lock(&wl->mutex);
 
         dev = wl->current_dev;
@@ -4827,8 +4841,14 @@ static int b43_op_start(struct ieee80211_hw *hw)
  out_mutex_unlock:
         mutex_unlock(&wl->mutex);
 
-        /* reload configuration */
-        b43_op_config(hw, ~0);
+        /*
+         * Configuration may have been overwritten during initialization.
+         * Reload the configuration, but only if initialization was
+         * successful. Reloading the configuration after a failed init
+         * may hang the system.
+         */
+        if (!err)
+                b43_op_config(hw, ~0);
 
         return err;
 }
@@ -5275,6 +5295,8 @@ static struct b43_wl *b43_wireless_init(struct b43_bus_dev *dev)
                 BIT(NL80211_IFTYPE_WDS) |
                 BIT(NL80211_IFTYPE_ADHOC);
 
+        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+
         hw->queues = modparam_qos ? B43_QOS_QUEUE_NUM : 1;
         wl->mac80211_initially_registered_queues = hw->queues;
         hw->max_rates = 2;
diff --git a/drivers/net/wireless/b43/sdio.c b/drivers/net/wireless/b43/sdio.c
index 80b0755ed3af..a54fb2d29089 100644
--- a/drivers/net/wireless/b43/sdio.c
+++ b/drivers/net/wireless/b43/sdio.c
@@ -193,7 +193,7 @@ static struct sdio_driver b43_sdio_driver = {
         .name           = "b43-sdio",
         .id_table       = b43_sdio_ids,
         .probe          = b43_sdio_probe,
-        .remove         = b43_sdio_remove,
+        .remove         = __devexit_p(b43_sdio_remove),
 };
 
 int b43_sdio_init(void)
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
index 2c5367884b3f..b31ccc02fa21 100644
--- a/drivers/net/wireless/b43/xmit.c
+++ b/drivers/net/wireless/b43/xmit.c
@@ -290,7 +290,8 @@ int b43_generate_txhdr(struct b43_wldev *dev,
                 txhdr->dur_fb = wlhdr->duration_id;
         } else {
                 txhdr->dur_fb = ieee80211_generic_frame_duration(
-                        dev->wl->hw, info->control.vif, fragment_len, fbrate);
+                        dev->wl->hw, info->control.vif, info->band,
+                        fragment_len, fbrate);
         }
 
         plcp_fragment_len = fragment_len + FCS_LEN;
@@ -378,7 +379,7 @@ int b43_generate_txhdr(struct b43_wldev *dev,
         if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)
                 phy_ctl |= B43_TXH_PHY_SHORTPRMBL;
 
-        switch (b43_ieee80211_antenna_sanitize(dev, info->antenna_sel_tx)) {
+        switch (b43_ieee80211_antenna_sanitize(dev, 0)) {
         case 0: /* Default */
                 phy_ctl |= B43_TXH_PHY_ANT01AUTO;
                 break;
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index df7e16dfb36c..1be214b815fb 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -1056,6 +1056,7 @@ static void b43legacy_write_probe_resp_plcp(struct b43legacy_wldev *dev,
         b43legacy_generate_plcp_hdr(&plcp, size + FCS_LEN, rate->hw_value);
         dur = ieee80211_generic_frame_duration(dev->wl->hw,
                                                dev->wl->vif,
+                                               IEEE80211_BAND_2GHZ,
                                                size,
                                                rate);
         /* Write PLCP in two parts and timing for packet transfer */
@@ -1121,6 +1122,7 @@ static const u8 *b43legacy_generate_probe_resp(struct b43legacy_wldev *dev,
                                          IEEE80211_STYPE_PROBE_RESP);
         dur = ieee80211_generic_frame_duration(dev->wl->hw,
                                                dev->wl->vif,
+                                               IEEE80211_BAND_2GHZ,
                                                *dest_size,
                                                rate);
         hdr->duration_id = dur;
diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c
index 5188fab0b377..a8012f2749ee 100644
--- a/drivers/net/wireless/b43legacy/xmit.c
+++ b/drivers/net/wireless/b43legacy/xmit.c
@@ -228,6 +228,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
         } else {
                 txhdr->dur_fb = ieee80211_generic_frame_duration(dev->wl->hw,
                                                          info->control.vif,
+                                                         info->band,
                                                          fragment_len,
                                                          rate_fb);
         }
@@ -277,19 +278,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
                 phy_ctl |= B43legacy_TX4_PHY_ENC_OFDM;
         if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)
                 phy_ctl |= B43legacy_TX4_PHY_SHORTPRMBL;
-        switch (info->antenna_sel_tx) {
-        case 0:
-                phy_ctl |= B43legacy_TX4_PHY_ANTLAST;
-                break;
-        case 1:
-                phy_ctl |= B43legacy_TX4_PHY_ANT0;
-                break;
-        case 2:
-                phy_ctl |= B43legacy_TX4_PHY_ANT1;
-                break;
-        default:
-                B43legacy_BUG_ON(1);
-        }
+        phy_ctl |= B43legacy_TX4_PHY_ANTLAST;
 
         /* MAC control */
         rates = info->control.rates;
diff --git a/drivers/net/wireless/brcm80211/Kconfig b/drivers/net/wireless/brcm80211/Kconfig
index c5104533e24e..b480088b3dbe 100644
--- a/drivers/net/wireless/brcm80211/Kconfig
+++ b/drivers/net/wireless/brcm80211/Kconfig
@@ -36,6 +36,15 @@ config BRCMFMAC_SDIO
           IEEE802.11n embedded FullMAC WLAN driver. Say Y if you want to
           use the driver for a SDIO wireless card.
 
+config BRCMFMAC_SDIO_OOB
+        bool "Out of band interrupt support for SDIO interface chipset"
+        depends on BRCMFMAC_SDIO
+        ---help---
+          This option enables out-of-band interrupt support for Broadcom
+          SDIO Wifi chipset using fullmac in order to gain better
+          performance and deep sleep wake up capability on certain
+          platforms. Say N if you are unsure.
+
 config BRCMFMAC_USB
         bool "USB bus interface support for FullMAC driver"
         depends on USB
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index e925290b432b..4add7da24681 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -39,37 +39,113 @@
 
 #define SDIOH_API_ACCESS_RETRY_LIMIT    2
 
-static void brcmf_sdioh_irqhandler(struct sdio_func *func)
+#ifdef CONFIG_BRCMFMAC_SDIO_OOB
+static irqreturn_t brcmf_sdio_irqhandler(int irq, void *dev_id)
 {
-        struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(&func->card->dev);
+        struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(dev_id);
 
-        brcmf_dbg(TRACE, "***IRQHandler\n");
+        brcmf_dbg(INTR, "oob intr triggered\n");
 
-        sdio_release_host(func);
+        /*
+         * out-of-band interrupt is level-triggered which won't
+         * be cleared until dpc
+         */
+        if (sdiodev->irq_en) {
+                disable_irq_nosync(irq);
+                sdiodev->irq_en = false;
+        }
 
         brcmf_sdbrcm_isr(sdiodev->bus);
 
-        sdio_claim_host(func);
+        return IRQ_HANDLED;
+}
+
+int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev)
+{
+        int ret = 0;
+        u8 data;
+        unsigned long flags;
+
+        brcmf_dbg(TRACE, "Entering\n");
+
+        brcmf_dbg(ERROR, "requesting irq %d\n", sdiodev->irq);
+        ret = request_irq(sdiodev->irq, brcmf_sdio_irqhandler,
+                          sdiodev->irq_flags, "brcmf_oob_intr",
+                          &sdiodev->func[1]->card->dev);
+        if (ret != 0)
+                return ret;
+        spin_lock_init(&sdiodev->irq_en_lock);
+        spin_lock_irqsave(&sdiodev->irq_en_lock, flags);
+        sdiodev->irq_en = true;
+        spin_unlock_irqrestore(&sdiodev->irq_en_lock, flags);
+
+        ret = enable_irq_wake(sdiodev->irq);
+        if (ret != 0)
+                return ret;
+        sdiodev->irq_wake = true;
+
+        /* must configure SDIO_CCCR_IENx to enable irq */
+        data = brcmf_sdcard_cfg_read(sdiodev, SDIO_FUNC_0,
+                                     SDIO_CCCR_IENx, &ret);
+        data |= 1 << SDIO_FUNC_1 | 1 << SDIO_FUNC_2 | 1;
+        brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_0, SDIO_CCCR_IENx,
+                               data, &ret);
+
+        /* redirect, configure ane enable io for interrupt signal */
+        data = SDIO_SEPINT_MASK | SDIO_SEPINT_OE;
+        if (sdiodev->irq_flags | IRQF_TRIGGER_HIGH)
+                data |= SDIO_SEPINT_ACT_HI;
+        brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_0, SDIO_CCCR_BRCM_SEPINT,
+                               data, &ret);
+
+        return 0;
+}
+
+int brcmf_sdio_intr_unregister(struct brcmf_sdio_dev *sdiodev)
+{
+        brcmf_dbg(TRACE, "Entering\n");
+
+        brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_0, SDIO_CCCR_BRCM_SEPINT,
+                               0, NULL);
+        brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_0, SDIO_CCCR_IENx, 0, NULL);
+
+        if (sdiodev->irq_wake) {
+                disable_irq_wake(sdiodev->irq);
+                sdiodev->irq_wake = false;
+        }
+        free_irq(sdiodev->irq, &sdiodev->func[1]->card->dev);
+        sdiodev->irq_en = false;
+
+        return 0;
+}
+#else           /* CONFIG_BRCMFMAC_SDIO_OOB */
+static void brcmf_sdio_irqhandler(struct sdio_func *func)
+{
+        struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(&func->card->dev);
+
+        brcmf_dbg(INTR, "ib intr triggered\n");
+
+        brcmf_sdbrcm_isr(sdiodev->bus);
 }
 
 /* dummy handler for SDIO function 2 interrupt */
-static void brcmf_sdioh_dummy_irq_handler(struct sdio_func *func)
+static void brcmf_sdio_dummy_irqhandler(struct sdio_func *func)
 {
 }
 
-int brcmf_sdcard_intr_reg(struct brcmf_sdio_dev *sdiodev)
+int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev)
 {
         brcmf_dbg(TRACE, "Entering\n");
 
         sdio_claim_host(sdiodev->func[1]);
-        sdio_claim_irq(sdiodev->func[1], brcmf_sdioh_irqhandler);
-        sdio_claim_irq(sdiodev->func[2], brcmf_sdioh_dummy_irq_handler);
+        sdio_claim_irq(sdiodev->func[1], brcmf_sdio_irqhandler);
+        sdio_claim_irq(sdiodev->func[2], brcmf_sdio_dummy_irqhandler);
         sdio_release_host(sdiodev->func[1]);
 
         return 0;
 }
 
-int brcmf_sdcard_intr_dereg(struct brcmf_sdio_dev *sdiodev)
+int brcmf_sdio_intr_unregister(struct brcmf_sdio_dev *sdiodev)
 {
         brcmf_dbg(TRACE, "Entering\n");
 
@@ -80,6 +156,7 @@ int brcmf_sdcard_intr_dereg(struct brcmf_sdio_dev *sdiodev)
 
         return 0;
 }
+#endif          /* CONFIG_BRCMFMAC_SDIO_OOB */
 
 u8 brcmf_sdcard_cfg_read(struct brcmf_sdio_dev *sdiodev, uint fnc_num, u32 addr,
                          int *err)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index 4688904908ec..dd07d33a927c 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -27,6 +27,7 @@
 #include <linux/errno.h>
 #include <linux/sched.h>        /* request_irq() */
 #include <linux/module.h>
+#include <linux/platform_device.h>
 #include <net/cfg80211.h>
 
 #include <defs.h>
@@ -55,6 +56,15 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = {
 };
 MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);
 
+#ifdef CONFIG_BRCMFMAC_SDIO_OOB
+static struct list_head oobirq_lh;
+struct brcmf_sdio_oobirq {
+        unsigned int irq;
+        unsigned long flags;
+        struct list_head list;
+};
+#endif          /* CONFIG_BRCMFMAC_SDIO_OOB */
+
 static bool
 brcmf_pm_resume_error(struct brcmf_sdio_dev *sdiodev)
 {
@@ -107,10 +117,17 @@ static inline int brcmf_sdioh_f0_write_byte(struct brcmf_sdio_dev *sdiodev,
                         }
                         sdio_release_host(sdfunc);
                 }
-        } else if (regaddr == SDIO_CCCR_ABORT) {
+        } else if ((regaddr == SDIO_CCCR_ABORT) ||
+                   (regaddr == SDIO_CCCR_IENx)) {
+                sdfunc = kmemdup(sdiodev->func[0], sizeof(struct sdio_func),
+                                 GFP_KERNEL);
+                if (!sdfunc)
+                        return -ENOMEM;
+                sdfunc->num = 0;
                 sdio_claim_host(sdfunc);
                 sdio_writeb(sdfunc, *byte, regaddr, &err_ret);
                 sdio_release_host(sdfunc);
+                kfree(sdfunc);
         } else if (regaddr < 0xF0) {
                 brcmf_dbg(ERROR, "F0 Wr:0x%02x: write disallowed\n", regaddr);
                 err_ret = -EPERM;
@@ -461,12 +478,40 @@ void brcmf_sdioh_detach(struct brcmf_sdio_dev *sdiodev)
 
 }
 
+#ifdef CONFIG_BRCMFMAC_SDIO_OOB
+static int brcmf_sdio_getintrcfg(struct brcmf_sdio_dev *sdiodev)
+{
+        struct brcmf_sdio_oobirq *oobirq_entry;
+
+        if (list_empty(&oobirq_lh)) {
+                brcmf_dbg(ERROR, "no valid oob irq resource\n");
+                return -ENXIO;
+        }
+
+        oobirq_entry = list_first_entry(&oobirq_lh, struct brcmf_sdio_oobirq,
+                                        list);
+
+        sdiodev->irq = oobirq_entry->irq;
+        sdiodev->irq_flags = oobirq_entry->flags;
+        list_del(&oobirq_entry->list);
+        kfree(oobirq_entry);
+
+        return 0;
+}
+#else
+static inline int brcmf_sdio_getintrcfg(struct brcmf_sdio_dev *sdiodev)
+{
+        return 0;
+}
+#endif          /* CONFIG_BRCMFMAC_SDIO_OOB */
+
 static int brcmf_ops_sdio_probe(struct sdio_func *func,
                               const struct sdio_device_id *id)
 {
         int ret = 0;
         struct brcmf_sdio_dev *sdiodev;
         struct brcmf_bus *bus_if;
+
         brcmf_dbg(TRACE, "Enter\n");
         brcmf_dbg(TRACE, "func->class=%x\n", func->class);
         brcmf_dbg(TRACE, "sdio_vendor: 0x%04x\n", func->vendor);
@@ -486,7 +531,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
                         kfree(bus_if);
                         return -ENOMEM;
                 }
-                sdiodev->func[0] = func->card->sdio_func[0];
+                sdiodev->func[0] = func;
                 sdiodev->func[1] = func;
                 sdiodev->bus_if = bus_if;
                 bus_if->bus_priv.sdio = sdiodev;
@@ -505,6 +550,10 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
                 sdiodev = dev_get_drvdata(&func->card->dev);
                 if ((!sdiodev) || (sdiodev->func[1]->card != func->card))
                         return -ENODEV;
+
+                ret = brcmf_sdio_getintrcfg(sdiodev);
+                if (ret)
+                        return ret;
                 sdiodev->func[2] = func;
 
                 bus_if = sdiodev->bus_if;
@@ -597,6 +646,65 @@ static struct sdio_driver brcmf_sdmmc_driver = {
 #endif  /* CONFIG_PM_SLEEP */
 };
 
+#ifdef CONFIG_BRCMFMAC_SDIO_OOB
+static int brcmf_sdio_pd_probe(struct platform_device *pdev)
+{
+        struct resource *res;
+        struct brcmf_sdio_oobirq *oobirq_entry;
+        int i, ret;
+
+        INIT_LIST_HEAD(&oobirq_lh);
+
+        for (i = 0; ; i++) {
+                res = platform_get_resource(pdev, IORESOURCE_IRQ, i);
+                if (!res)
+                        break;
+
+                oobirq_entry = kzalloc(sizeof(struct brcmf_sdio_oobirq),
+                                       GFP_KERNEL);
+                oobirq_entry->irq = res->start;
+                oobirq_entry->flags = res->flags & IRQF_TRIGGER_MASK;
+                list_add_tail(&oobirq_entry->list, &oobirq_lh);
+        }
+        if (i == 0)
+                return -ENXIO;
+
+        ret = sdio_register_driver(&brcmf_sdmmc_driver);
+
+        if (ret)
+                brcmf_dbg(ERROR, "sdio_register_driver failed: %d\n", ret);
+
+        return ret;
+}
+
+static struct platform_driver brcmf_sdio_pd = {
+        .probe          = brcmf_sdio_pd_probe,
+        .driver         = {
+                .name   = "brcmf_sdio_pd"
+        }
+};
+
+void brcmf_sdio_exit(void)
+{
+        brcmf_dbg(TRACE, "Enter\n");
+
+        sdio_unregister_driver(&brcmf_sdmmc_driver);
+
+        platform_driver_unregister(&brcmf_sdio_pd);
+}
+
+void brcmf_sdio_init(void)
+{
+        int ret;
+
+        brcmf_dbg(TRACE, "Enter\n");
+
+        ret = platform_driver_register(&brcmf_sdio_pd);
+
+        if (ret)
+                brcmf_dbg(ERROR, "platform_driver_register failed: %d\n", ret);
+}
+#else
 void brcmf_sdio_exit(void)
 {
         brcmf_dbg(TRACE, "Enter\n");
@@ -615,3 +723,4 @@ void brcmf_sdio_init(void)
         if (ret)
                 brcmf_dbg(ERROR, "sdio_register_driver failed: %d\n", ret);
 }
+#endif          /* CONFIG_BRCMFMAC_SDIO_OOB */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index 07686a748d3c..9f637014486e 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -632,7 +632,6 @@ extern const struct bcmevent_name bcmevent_names[];
 extern uint brcmf_c_mkiovar(char *name, char *data, uint datalen,
                           char *buf, uint len);
 
-extern int brcmf_net_attach(struct brcmf_pub *drvr, int idx);
 extern int brcmf_netdev_wait_pend8021x(struct net_device *ndev);
 
 extern s32 brcmf_exec_dcmd(struct net_device *dev, u32 cmd, void *arg, u32 len);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
index b3e3b7f25d82..a5c15cac5e7d 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
@@ -421,6 +421,7 @@ int brcmf_proto_hdrpull(struct device *dev, int *ifidx,
         pktbuf->priority = h->priority & BDC_PRIORITY_MASK;
 
         skb_pull(pktbuf, BDC_HEADER_LEN);
+        skb_pull(pktbuf, h->data_offset << 2);
 
         return 0;
 }
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
index 4187435220f3..236cb9fa460c 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -799,7 +799,6 @@ int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr)
 {
         char iovbuf[BRCMF_EVENTING_MASK_LEN + 12];      /*  Room for
                                  "event_msgs" + '\0' + bitvec  */
-        uint up = 0;
         char buf[128], *ptr;
         u32 dongle_align = drvr->bus_if->align;
         u32 glom = 0;
@@ -853,9 +852,6 @@ int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr)
         brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR, iovbuf,
                                   sizeof(iovbuf));
 
-        /* Force STA UP */
-        brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_UP, (char *)&up, sizeof(up));
-
         /* Setup event_msgs */
         brcmf_c_mkiovar("event_msgs", drvr->eventmask, BRCMF_EVENTING_MASK_LEN,
                       iovbuf, sizeof(iovbuf));
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 2a1e5ae0c402..8933f9b31a9a 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -799,6 +799,7 @@ static int brcmf_netdev_open(struct net_device *ndev)
         struct brcmf_bus *bus_if = drvr->bus_if;
         u32 toe_ol;
         s32 ret = 0;
+        uint up = 0;
 
         brcmf_dbg(TRACE, "ifidx %d\n", ifp->idx);
 
@@ -822,6 +823,10 @@ static int brcmf_netdev_open(struct net_device *ndev)
                         drvr->iflist[ifp->idx]->ndev->features &=
                                 ~NETIF_F_IP_CSUM;
         }
+
+        /* make sure RF is ready for work */
+        brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_UP, (char *)&up, sizeof(up));
+
         /* Allow transmit calls */
         netif_start_queue(ndev);
         drvr->bus_if->drvr_up = true;
@@ -843,6 +848,63 @@ static const struct net_device_ops brcmf_netdev_ops_pri = {
         .ndo_set_rx_mode = brcmf_netdev_set_multicast_list
 };
 
+static int brcmf_net_attach(struct brcmf_if *ifp)
+{
+        struct brcmf_pub *drvr = ifp->drvr;
+        struct net_device *ndev;
+        u8 temp_addr[ETH_ALEN];
+
+        brcmf_dbg(TRACE, "ifidx %d\n", ifp->idx);
+
+        ndev = drvr->iflist[ifp->idx]->ndev;
+        ndev->netdev_ops = &brcmf_netdev_ops_pri;
+
+        /*
+         * determine mac address to use
+         */
+        if (is_valid_ether_addr(ifp->mac_addr))
+                memcpy(temp_addr, ifp->mac_addr, ETH_ALEN);
+        else
+                memcpy(temp_addr, drvr->mac, ETH_ALEN);
+
+        if (ifp->idx == 1) {
+                brcmf_dbg(TRACE, "ACCESS POINT MAC:\n");
+                /*  ACCESSPOINT INTERFACE CASE */
+                temp_addr[0] |= 0X02;   /* set bit 2 ,
+                         - Locally Administered address  */
+
+        }
+        ndev->hard_header_len = ETH_HLEN + drvr->hdrlen;
+        ndev->ethtool_ops = &brcmf_ethtool_ops;
+
+        drvr->rxsz = ndev->mtu + ndev->hard_header_len +
+                              drvr->hdrlen;
+
+        memcpy(ndev->dev_addr, temp_addr, ETH_ALEN);
+
+        /* attach to cfg80211 for primary interface */
+        if (!ifp->idx) {
+                drvr->config = brcmf_cfg80211_attach(ndev, drvr->dev, drvr);
+                if (drvr->config == NULL) {
+                        brcmf_dbg(ERROR, "wl_cfg80211_attach failed\n");
+                        goto fail;
+                }
+        }
+
+        if (register_netdev(ndev) != 0) {
+                brcmf_dbg(ERROR, "couldn't register the net device\n");
+                goto fail;
+        }
+
+        brcmf_dbg(INFO, "%s: Broadcom Dongle Host Driver\n", ndev->name);
+
+        return 0;
+
+fail:
+        ndev->netdev_ops = NULL;
+        return -EBADE;
+}
+
 int
 brcmf_add_if(struct device *dev, int ifidx, char *name, u8 *mac_addr)
 {
@@ -882,7 +944,7 @@ brcmf_add_if(struct device *dev, int ifidx, char *name, u8 *mac_addr)
         if (mac_addr != NULL)
                 memcpy(&ifp->mac_addr, mac_addr, ETH_ALEN);
 
-        if (brcmf_net_attach(drvr, ifp->idx)) {
+        if (brcmf_net_attach(ifp)) {
                 brcmf_dbg(ERROR, "brcmf_net_attach failed");
                 free_netdev(ifp->ndev);
                 drvr->iflist[ifidx] = NULL;
@@ -1016,69 +1078,16 @@ int brcmf_bus_start(struct device *dev)
         if (ret < 0)
                 return ret;
 
+        /* add primary networking interface */
+        ret = brcmf_add_if(dev, 0, "wlan%d", drvr->mac);
+        if (ret < 0)
+                return ret;
+
         /* signal bus ready */
         bus_if->state = BRCMF_BUS_DATA;
         return 0;
 }
 
-int brcmf_net_attach(struct brcmf_pub *drvr, int ifidx)
-{
-        struct net_device *ndev;
-        u8 temp_addr[ETH_ALEN] = {
-                0x00, 0x90, 0x4c, 0x11, 0x22, 0x33};
-
-        brcmf_dbg(TRACE, "ifidx %d\n", ifidx);
-
-        ndev = drvr->iflist[ifidx]->ndev;
-        ndev->netdev_ops = &brcmf_netdev_ops_pri;
-
-        /*
-         * We have to use the primary MAC for virtual interfaces
-         */
-        if (ifidx != 0) {
-                /* for virtual interfaces use the primary MAC  */
-                memcpy(temp_addr, drvr->mac, ETH_ALEN);
-
-        }
-
-        if (ifidx == 1) {
-                brcmf_dbg(TRACE, "ACCESS POINT MAC:\n");
-                /*  ACCESSPOINT INTERFACE CASE */
-                temp_addr[0] |= 0X02;   /* set bit 2 ,
-                         - Locally Administered address  */
-
-        }
-        ndev->hard_header_len = ETH_HLEN + drvr->hdrlen;
-        ndev->ethtool_ops = &brcmf_ethtool_ops;
-
-        drvr->rxsz = ndev->mtu + ndev->hard_header_len +
-                              drvr->hdrlen;
-
-        memcpy(ndev->dev_addr, temp_addr, ETH_ALEN);
-
-        /* attach to cfg80211 for primary interface */
-        if (!ifidx) {
-                drvr->config = brcmf_cfg80211_attach(ndev, drvr->dev, drvr);
-                if (drvr->config == NULL) {
-                        brcmf_dbg(ERROR, "wl_cfg80211_attach failed\n");
-                        goto fail;
-                }
-        }
-
-        if (register_netdev(ndev) != 0) {
-                brcmf_dbg(ERROR, "couldn't register the net device\n");
-                goto fail;
-        }
-
-        brcmf_dbg(INFO, "%s: Broadcom Dongle Host Driver\n", ndev->name);
-
-        return 0;
-
-fail:
-        ndev->netdev_ops = NULL;
-        return -EBADE;
-}
-
 static void brcmf_bus_detach(struct brcmf_pub *drvr)
 {
         brcmf_dbg(TRACE, "Enter\n");
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 2bf5dda29291..149ee67beb2e 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -574,6 +574,8 @@ struct brcmf_sdio {
 
         struct task_struct *dpc_tsk;
         struct completion dpc_wait;
+        struct list_head dpc_tsklst;
+        spinlock_t dpc_tl_lock;
 
         struct semaphore sdsem;
 
@@ -2350,6 +2352,24 @@ static void brcmf_sdbrcm_bus_stop(struct device *dev)
         up(&bus->sdsem);
 }
 
+#ifdef CONFIG_BRCMFMAC_SDIO_OOB
+static inline void brcmf_sdbrcm_clrintr(struct brcmf_sdio *bus)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&bus->sdiodev->irq_en_lock, flags);
+        if (!bus->sdiodev->irq_en && !bus->ipend) {
+                enable_irq(bus->sdiodev->irq);
+                bus->sdiodev->irq_en = true;
+        }
+        spin_unlock_irqrestore(&bus->sdiodev->irq_en_lock, flags);
+}
+#else
+static inline void brcmf_sdbrcm_clrintr(struct brcmf_sdio *bus)
+{
+}
+#endif          /* CONFIG_BRCMFMAC_SDIO_OOB */
+
 static bool brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)
 {
         u32 intstatus, newstatus = 0;
@@ -2507,6 +2527,8 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)
         bus->intstatus = intstatus;
 
 clkwait:
+        brcmf_sdbrcm_clrintr(bus);
+
         if (data_ok(bus) && bus->ctrl_frame_stat &&
                 (bus->clkstate == CLK_AVAIL)) {
                 int ret, i;
@@ -2594,29 +2616,59 @@ clkwait:
         return resched;
 }
 
+static inline void brcmf_sdbrcm_adddpctsk(struct brcmf_sdio *bus)
+{
+        struct list_head *new_hd;
+        unsigned long flags;
+
+        if (in_interrupt())
+                new_hd = kzalloc(sizeof(struct list_head), GFP_ATOMIC);
+        else
+                new_hd = kzalloc(sizeof(struct list_head), GFP_KERNEL);
+        if (new_hd == NULL)
+                return;
+
+        spin_lock_irqsave(&bus->dpc_tl_lock, flags);
+        list_add_tail(new_hd, &bus->dpc_tsklst);
+        spin_unlock_irqrestore(&bus->dpc_tl_lock, flags);
+}
+
 static int brcmf_sdbrcm_dpc_thread(void *data)
 {
         struct brcmf_sdio *bus = (struct brcmf_sdio *) data;
+        struct list_head *cur_hd, *tmp_hd;
+        unsigned long flags;
 
         allow_signal(SIGTERM);
         /* Run until signal received */
         while (1) {
                 if (kthread_should_stop())
                         break;
-                if (!wait_for_completion_interruptible(&bus->dpc_wait)) {
-                        /* Call bus dpc unless it indicated down
-                        (then clean stop) */
-                        if (bus->sdiodev->bus_if->state != BRCMF_BUS_DOWN) {
-                                if (brcmf_sdbrcm_dpc(bus))
-                                        complete(&bus->dpc_wait);
-                        } else {
+
+                if (list_empty(&bus->dpc_tsklst))
+                        if (wait_for_completion_interruptible(&bus->dpc_wait))
+                                break;
+
+                spin_lock_irqsave(&bus->dpc_tl_lock, flags);
+                list_for_each_safe(cur_hd, tmp_hd, &bus->dpc_tsklst) {
+                        spin_unlock_irqrestore(&bus->dpc_tl_lock, flags);
+
+                        if (bus->sdiodev->bus_if->state == BRCMF_BUS_DOWN) {
                                 /* after stopping the bus, exit thread */
                                 brcmf_sdbrcm_bus_stop(bus->sdiodev->dev);
                                 bus->dpc_tsk = NULL;
+                                spin_lock_irqsave(&bus->dpc_tl_lock, flags);
                                 break;
                         }
-                } else
-                        break;
+
+                        if (brcmf_sdbrcm_dpc(bus))
+                                brcmf_sdbrcm_adddpctsk(bus);
+
+                        spin_lock_irqsave(&bus->dpc_tl_lock, flags);
+                        list_del(cur_hd);
+                        kfree(cur_hd);
+                }
+                spin_unlock_irqrestore(&bus->dpc_tl_lock, flags);
         }
         return 0;
 }
@@ -2669,8 +2721,10 @@ static int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)
         /* Schedule DPC if needed to send queued packet(s) */
         if (!bus->dpc_sched) {
                 bus->dpc_sched = true;
-                if (bus->dpc_tsk)
+                if (bus->dpc_tsk) {
+                        brcmf_sdbrcm_adddpctsk(bus);
                         complete(&bus->dpc_wait);
+                }
         }
 
         return ret;
@@ -3474,8 +3528,14 @@ static int brcmf_sdbrcm_bus_init(struct device *dev)
         brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
                                SBSDIO_FUNC1_CHIPCLKCSR, saveclk, &err);
 
+        if (ret == 0) {
+                ret = brcmf_sdio_intr_register(bus->sdiodev);
+                if (ret != 0)
+                        brcmf_dbg(ERROR, "intr register failed:%d\n", ret);
+        }
+
         /* If we didn't come up, turn off backplane clock */
-        if (!ret)
+        if (bus_if->state != BRCMF_BUS_DATA)
                 brcmf_sdbrcm_clkctl(bus, CLK_NONE, false);
 
 exit:
@@ -3514,8 +3574,10 @@ void brcmf_sdbrcm_isr(void *arg)
                 brcmf_dbg(ERROR, "isr w/o interrupt configured!\n");
 
         bus->dpc_sched = true;
-        if (bus->dpc_tsk)
+        if (bus->dpc_tsk) {
+                brcmf_sdbrcm_adddpctsk(bus);
                 complete(&bus->dpc_wait);
+        }
 }
 
 static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)
@@ -3559,8 +3621,10 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)
                                 bus->ipend = true;
 
                                 bus->dpc_sched = true;
-                                if (bus->dpc_tsk)
+                                if (bus->dpc_tsk) {
+                                        brcmf_sdbrcm_adddpctsk(bus);
                                         complete(&bus->dpc_wait);
+                                }
                         }
                 }
 
@@ -3829,7 +3893,7 @@ static void brcmf_sdbrcm_release(struct brcmf_sdio *bus)
 
         if (bus) {
                 /* De-register interrupt handler */
-                brcmf_sdcard_intr_dereg(bus->sdiodev);
+                brcmf_sdio_intr_unregister(bus->sdiodev);
 
                 if (bus->sdiodev->bus_if->drvr) {
                         brcmf_detach(bus->sdiodev->dev);
@@ -3897,6 +3961,8 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)
         }
         /* Initialize DPC thread */
         init_completion(&bus->dpc_wait);
+        INIT_LIST_HEAD(&bus->dpc_tsklst);
+        spin_lock_init(&bus->dpc_tl_lock);
         bus->dpc_tsk = kthread_run(brcmf_sdbrcm_dpc_thread,
                                    bus, "brcmf_dpc");
         if (IS_ERR(bus->dpc_tsk)) {
@@ -3928,15 +3994,6 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)
                 goto fail;
         }
 
-        /* Register interrupt callback, but mask it (not operational yet). */
-        brcmf_dbg(INTR, "disable SDIO interrupts (not interested yet)\n");
-        ret = brcmf_sdcard_intr_reg(bus->sdiodev);
-        if (ret != 0) {
-                brcmf_dbg(ERROR, "FAILED: sdcard_intr_reg returned %d\n", ret);
-                goto fail;
-        }
-        brcmf_dbg(INTR, "registered SDIO interrupt function ok\n");
-
         brcmf_dbg(INFO, "completed!!\n");
 
         /* if firmware path present try to download and bring up bus */
@@ -3948,12 +4005,6 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)
                 }
         }
 
-        /* add interface and open for business */
-        if (brcmf_add_if(bus->sdiodev->dev, 0, "wlan%d", NULL)) {
-                brcmf_dbg(ERROR, "Add primary net device interface failed!!\n");
-                goto fail;
-        }
-
         return bus;
 
 fail:
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
index 0281d207d998..7010eaf71f99 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
@@ -43,6 +43,13 @@
 /* as of sdiod rev 0, supports 3 functions */
 #define SBSDIO_NUM_FUNCTION             3
 
+/* function 0 vendor specific CCCR registers */
+#define SDIO_CCCR_BRCM_SEPINT           0xf2
+
+#define  SDIO_SEPINT_MASK               0x01
+#define  SDIO_SEPINT_OE                 0x02
+#define  SDIO_SEPINT_ACT_HI             0x04
+
 /* function 1 miscellaneous registers */
 
 /* sprom command and status */
@@ -144,13 +151,18 @@ struct brcmf_sdio_dev {
         wait_queue_head_t request_buffer_wait;
         struct device *dev;
         struct brcmf_bus *bus_if;
+#ifdef CONFIG_BRCMFMAC_SDIO_OOB
+        unsigned int irq;               /* oob interrupt number */
+        unsigned long irq_flags;        /* board specific oob flags */
+        bool irq_en;                    /* irq enable flags */
+        spinlock_t irq_en_lock;
+        bool irq_wake;                  /* irq wake enable flags */
+#endif          /* CONFIG_BRCMFMAC_SDIO_OOB */
 };
 
-/* Register/deregister device interrupt handler. */
-extern int
-brcmf_sdcard_intr_reg(struct brcmf_sdio_dev *sdiodev);
-
-extern int brcmf_sdcard_intr_dereg(struct brcmf_sdio_dev *sdiodev);
+/* Register/deregister interrupt handler. */
+extern int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev);
+extern int brcmf_sdio_intr_unregister(struct brcmf_sdio_dev *sdiodev);
 
 /* Access SDIO address space (e.g. CCCR) using CMD52 (single-byte interface).
  *   fn:   function number
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index 82364223e817..1d67ecf681b7 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -1383,14 +1383,6 @@ static int brcmf_usb_probe_cb(struct device *dev, const char *desc,
                 goto fail;
         }
 
-        /* add interface and open for business */
-        ret = brcmf_add_if(dev, 0, "wlan%d", NULL);
-        if (ret) {
-                brcmf_dbg(ERROR, "Add primary net device interface failed!!\n");
-                brcmf_detach(dev);
-                goto fail;
-        }
-
         return 0;
 fail:
         /* Release resources in reverse order */
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
index 55e9f45fce22..0efe88e25a9a 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
@@ -628,6 +628,40 @@ brcms_c_country_aggregate_map(struct brcms_cm_info *wlc_cm, const char *ccode,
         return false;
 }
 
+/*
+ * Indicates whether the country provided is valid to pass
+ * to cfg80211 or not.
+ *
+ * returns true if valid; false if not.
+ */
+static bool brcms_c_country_valid(const char *ccode)
+{
+        /*
+         * only allow ascii alpha uppercase for the first 2
+         * chars.
+         */
+        if (!((0x80 & ccode[0]) == 0 && ccode[0] >= 0x41 && ccode[0] <= 0x5A &&
+              (0x80 & ccode[1]) == 0 && ccode[1] >= 0x41 && ccode[1] <= 0x5A &&
+              ccode[2] == '\0'))
+                return false;
+
+        /*
+         * do not match ISO 3166-1 user assigned country codes
+         * that may be in the driver table
+         */
+        if (!strcmp("AA", ccode) ||        /* AA */
+            !strcmp("ZZ", ccode) ||        /* ZZ */
+            ccode[0] == 'X' ||             /* XA - XZ */
+            (ccode[0] == 'Q' &&            /* QM - QZ */
+             (ccode[1] >= 'M' && ccode[1] <= 'Z')))
+                return false;
+
+        if (!strcmp("NA", ccode))
+                return false;
+
+        return true;
+}
+
 /* Lookup a country info structure from a null terminated country
  * abbreviation and regrev directly with no translation.
  */
@@ -1089,7 +1123,7 @@ struct brcms_cm_info *brcms_c_channel_mgr_attach(struct brcms_c_info *wlc)
 
         /* store the country code for passing up as a regulatory hint */
         ccode = getvar(wlc->hw->sih, BRCMS_SROM_CCODE);
-        if (ccode)
+        if (ccode && brcms_c_country_valid(ccode))
                 strncpy(wlc->pub->srom_ccode, ccode, BRCM_CNTRY_BUF_SZ - 1);
 
         /*
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/d11.h b/drivers/net/wireless/brcm80211/brcmsmac/d11.h
index 1948cb2771e9..3f659e09f1cc 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/d11.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/d11.h
@@ -733,7 +733,7 @@ struct cck_phy_hdr {
         do { \
                 plcp[1] = len & 0xff; \
                 plcp[2] = ((len >> 8) & 0xff); \
-        } while (0);
+        } while (0)
 
 #define BRCMS_SET_MIMO_PLCP_AMPDU(plcp) (plcp[3] |= MIMO_PLCP_AMPDU)
 #define BRCMS_CLR_MIMO_PLCP_AMPDU(plcp) (plcp[3] &= ~MIMO_PLCP_AMPDU)
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index 569ab8abd2a1..aa15558f75c8 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -1069,11 +1069,7 @@ static struct brcms_info *brcms_attach(struct bcma_device *pdev)
                 wiphy_err(wl->wiphy, "%s: ieee80211_register_hw failed, status"
                           "%d\n", __func__, err);
 
-        if (wl->pub->srom_ccode[0])
-                err = brcms_set_hint(wl, wl->pub->srom_ccode);
-        else
-                err = brcms_set_hint(wl, "US");
-        if (err)
+        if (wl->pub->srom_ccode[0] && brcms_set_hint(wl, wl->pub->srom_ccode))
                 wiphy_err(wl->wiphy, "%s: regulatory_hint failed, status %d\n",
                           __func__, err);
 
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 231ddf4a674f..b4d92792c502 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -847,8 +847,7 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs)
          */
         if (!(txs->status & TX_STATUS_AMPDU)
             && (txs->status & TX_STATUS_INTERMEDIATE)) {
-                wiphy_err(wlc->wiphy, "%s: INTERMEDIATE but not AMPDU\n",
-                          __func__);
+                BCMMSG(wlc->wiphy, "INTERMEDIATE but not AMPDU\n");
                 return false;
         }
 
@@ -7614,6 +7613,7 @@ brcms_c_recvctl(struct brcms_c_info *wlc, struct d11rxhdr *rxh,
 {
         int len_mpdu;
         struct ieee80211_rx_status rx_status;
+        struct ieee80211_hdr *hdr;
 
         memset(&rx_status, 0, sizeof(rx_status));
         prep_mac80211_status(wlc, rxh, p, &rx_status);
@@ -7623,6 +7623,13 @@ brcms_c_recvctl(struct brcms_c_info *wlc, struct d11rxhdr *rxh,
         skb_pull(p, D11_PHY_HDR_LEN);
         __skb_trim(p, len_mpdu);
 
+        /* unmute transmit */
+        if (wlc->hw->suspended_fifos) {
+                hdr = (struct ieee80211_hdr *)p->data;
+                if (ieee80211_is_beacon(hdr->frame_control))
+                        brcms_b_mute(wlc->hw, false);
+        }
+
         memcpy(IEEE80211_SKB_RXCB(p), &rx_status, sizeof(rx_status));
         ieee80211_rx_irqsafe(wlc->pub->ieee_hw, p);
 }
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
index ce8562aa5db0..0fce56235f38 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
@@ -207,8 +207,7 @@ static const iqcal_gain_params_lcnphy *tbl_iqcal_gainparams_lcnphy[1] = {
 };
 
 static const u16 iqcal_gainparams_numgains_lcnphy[1] = {
-        sizeof(tbl_iqcal_gainparams_lcnphy_2G) /
-        sizeof(*tbl_iqcal_gainparams_lcnphy_2G),
+        ARRAY_SIZE(tbl_iqcal_gainparams_lcnphy_2G),
 };
 
 static const struct lcnphy_sfo_cfg lcnphy_sfo_cfg[] = {
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
index 39095741fd05..812b6e38526e 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
@@ -16353,11 +16353,7 @@ static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
                         wlc_phy_set_rfseq_nphy(pi, NPHY_RFSEQ_RX2TX,
                                                rfseq_rx2tx_events_rev3_ipa,
                                                rfseq_rx2tx_dlys_rev3_ipa,
-                                               sizeof
-                                               (rfseq_rx2tx_events_rev3_ipa) /
-                                               sizeof
-                                               (rfseq_rx2tx_events_rev3_ipa
-                                                [0]));
+                                               ARRAY_SIZE(rfseq_rx2tx_events_rev3_ipa));
 
                 mod_phy_reg(pi, 0x299, (0x3 << 14), (0x1 << 14));
                 mod_phy_reg(pi, 0x29d, (0x3 << 14), (0x1 << 14));
@@ -16858,18 +16854,13 @@ static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
                 wlc_phy_set_rfseq_nphy(pi, NPHY_RFSEQ_TX2RX,
                                        rfseq_tx2rx_events_rev3,
                                        rfseq_tx2rx_dlys_rev3,
-                                       sizeof(rfseq_tx2rx_events_rev3) /
-                                       sizeof(rfseq_tx2rx_events_rev3[0]));
+                                       ARRAY_SIZE(rfseq_tx2rx_events_rev3));
 
                 if (PHY_IPA(pi))
                         wlc_phy_set_rfseq_nphy(pi, NPHY_RFSEQ_RX2TX,
                                                rfseq_rx2tx_events_rev3_ipa,
                                                rfseq_rx2tx_dlys_rev3_ipa,
-                                               sizeof
-                                               (rfseq_rx2tx_events_rev3_ipa) /
-                                               sizeof
-                                               (rfseq_rx2tx_events_rev3_ipa
-                                                [0]));
+                                               ARRAY_SIZE(rfseq_rx2tx_events_rev3_ipa));
 
                 if ((pi->sh->hw_phyrxchain != 0x3) &&
                     (pi->sh->hw_phyrxchain != pi->sh->hw_phytxchain)) {
@@ -16885,8 +16876,7 @@ static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
                                 pi, NPHY_RFSEQ_RX2TX,
                                 rfseq_rx2tx_events_rev3,
                                 rfseq_rx2tx_dlys_rev3,
-                                sizeof(rfseq_rx2tx_events_rev3) /
-                                sizeof(rfseq_rx2tx_events_rev3[0]));
+                                ARRAY_SIZE(rfseq_rx2tx_events_rev3));
                 }
 
                 if (CHSPEC_IS2G(pi->radio_chanspec))
@@ -17209,13 +17199,11 @@ static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
 
                 wlc_phy_set_rfseq_nphy(pi, NPHY_RFSEQ_RX2TX, rfseq_rx2tx_events,
                                        rfseq_rx2tx_dlys,
-                                       sizeof(rfseq_rx2tx_events) /
-                                       sizeof(rfseq_rx2tx_events[0]));
+                                       ARRAY_SIZE(rfseq_rx2tx_events));
 
                 wlc_phy_set_rfseq_nphy(pi, NPHY_RFSEQ_TX2RX, rfseq_tx2rx_events,
                                        rfseq_tx2rx_dlys,
-                                       sizeof(rfseq_tx2rx_events) /
-                                       sizeof(rfseq_tx2rx_events[0]));
+                                       ARRAY_SIZE(rfseq_tx2rx_events));
 
                 wlc_phy_workarounds_nphy_gainctrl(pi);
 
@@ -19357,8 +19345,7 @@ static void wlc_phy_spurwar_nphy(struct brcms_phy *pi)
                         }
 
                         if (isAdjustNoiseVar) {
-                                numTonesAdjust = sizeof(nphy_adj_tone_id_buf) /
-                                                sizeof(nphy_adj_tone_id_buf[0]);
+                                numTonesAdjust = ARRAY_SIZE(nphy_adj_tone_id_buf);
 
                                 wlc_phy_adjust_min_noisevar_nphy(
                                         pi,
@@ -25204,32 +25191,26 @@ static u8 wlc_phy_a3_nphy(struct brcms_phy *pi, u8 start_gain, u8 core)
 
                                 phy_a15 = pad_gain_codes_used_2057rev5;
                                 phy_a13 =
-                                        sizeof(pad_gain_codes_used_2057rev5) /
-                                        sizeof(pad_gain_codes_used_2057rev5
-                                                [0]) - 1;
+                                        ARRAY_SIZE(pad_gain_codes_used_2057rev5) - 1;
 
                         } else if ((pi->pubpi.radiorev == 7)
                                    || (pi->pubpi.radiorev == 8)) {
 
                                 phy_a15 = pad_gain_codes_used_2057rev7;
                                 phy_a13 =
-                                        sizeof(pad_gain_codes_used_2057rev7) /
-                                        sizeof(pad_gain_codes_used_2057rev7
-                                                [0]) - 1;
+                                        ARRAY_SIZE(pad_gain_codes_used_2057rev7) - 1;
 
                         } else {
 
                                 phy_a15 = pad_all_gain_codes_2057;
-                                phy_a13 = sizeof(pad_all_gain_codes_2057) /
-                                          sizeof(pad_all_gain_codes_2057[0]) -
+                                phy_a13 = ARRAY_SIZE(pad_all_gain_codes_2057) -
                                           1;
                         }
 
                 } else {
 
                         phy_a15 = pga_all_gain_codes_2057;
-                        phy_a13 = sizeof(pga_all_gain_codes_2057) /
-                                  sizeof(pga_all_gain_codes_2057[0]) - 1;
+                        phy_a13 = ARRAY_SIZE(pga_all_gain_codes_2057) - 1;
                 }
 
                 phy_a14 = 0;
diff --git a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
index 5fb17d53c9b2..333193f20e1c 100644
--- a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
+++ b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
@@ -17,17 +17,7 @@
 #ifndef _BRCM_HW_IDS_H_
 #define _BRCM_HW_IDS_H_
 
-#define BCM4325_D11DUAL_ID      0x431b
-#define BCM4325_D11G_ID         0x431c
-#define BCM4325_D11A_ID         0x431d
-
-#define BCM4329_D11N2G_ID       0x432f  /* 4329 802.11n 2.4G device */
-#define BCM4329_D11N5G_ID       0x4330  /* 4329 802.11n 5G device */
-#define BCM4329_D11NDUAL_ID     0x432e
-
-#define BCM4319_D11N_ID         0x4337  /* 4319 802.11n dualband device */
-#define BCM4319_D11N2G_ID       0x4338  /* 4319 802.11n 2.4G device */
-#define BCM4319_D11N5G_ID       0x4339  /* 4319 802.11n 5G device */
+#define BCM4313_D11N2G_ID       0x4727  /* 4313 802.11n 2.4G device */
 
 #define BCM43224_D11N_ID        0x4353  /* 43224 802.11n dualband device */
 #define BCM43224_D11N_ID_VEN1   0x0576  /* Vendor specific 43224 802.11n db */
@@ -37,23 +27,15 @@
 #define BCM43236_D11N_ID        0x4346  /* 43236 802.11n dualband device */
 #define BCM43236_D11N2G_ID      0x4347  /* 43236 802.11n 2.4GHz device */
 
-#define BCM4313_D11N2G_ID       0x4727  /* 4313 802.11n 2.4G device */
-
-/* Chip IDs */
-#define BCM4313_CHIP_ID         0x4313  /* 4313 chip id */
-#define BCM4319_CHIP_ID         0x4319  /* 4319 chip id */
-
-#define BCM43224_CHIP_ID        43224   /* 43224 chipcommon chipid */
-#define BCM43225_CHIP_ID        43225   /* 43225 chipcommon chipid */
-#define BCM43421_CHIP_ID        43421   /* 43421 chipcommon chipid */
-#define BCM43235_CHIP_ID        43235   /* 43235 chipcommon chipid */
-#define BCM43236_CHIP_ID        43236   /* 43236 chipcommon chipid */
-#define BCM43238_CHIP_ID        43238   /* 43238 chipcommon chipid */
-#define BCM4329_CHIP_ID         0x4329  /* 4329 chipcommon chipid */
-#define BCM4325_CHIP_ID         0x4325  /* 4325 chipcommon chipid */
-#define BCM4331_CHIP_ID         0x4331  /* 4331 chipcommon chipid */
-#define BCM4336_CHIP_ID         0x4336  /* 4336 chipcommon chipid */
-#define BCM4330_CHIP_ID         0x4330  /* 4330 chipcommon chipid */
-#define BCM6362_CHIP_ID         0x6362  /* 6362 chipcommon chipid */
+/* Chipcommon Core Chip IDs */
+#define BCM4313_CHIP_ID         0x4313
+#define BCM43224_CHIP_ID        43224
+#define BCM43225_CHIP_ID        43225
+#define BCM43235_CHIP_ID        43235
+#define BCM43236_CHIP_ID        43236
+#define BCM43238_CHIP_ID        43238
+#define BCM4329_CHIP_ID         0x4329
+#define BCM4330_CHIP_ID         0x4330
+#define BCM4331_CHIP_ID         0x4331
 
 #endif                          /* _BRCM_HW_IDS_H_ */
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index bfa0d54221e8..627bc12074c7 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -244,8 +244,7 @@ u16 hostap_tx_callback_register(local_info_t *local,
         unsigned long flags;
         struct hostap_tx_callback_info *entry;
 
-        entry = kmalloc(sizeof(*entry),
-                                                           GFP_ATOMIC);
+        entry = kmalloc(sizeof(*entry), GFP_KERNEL);
         if (entry == NULL)
                 return 0;
 
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index 972a9c3af39e..05ca3402dca7 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -457,18 +457,4 @@ static struct pci_driver prism2_pci_driver = {
 #endif /* CONFIG_PM */
 };
 
-
-static int __init init_prism2_pci(void)
-{
-        return pci_register_driver(&prism2_pci_driver);
-}
-
-
-static void __exit exit_prism2_pci(void)
-{
-        pci_unregister_driver(&prism2_pci_driver);
-}
-
-
-module_init(init_prism2_pci);
-module_exit(exit_prism2_pci);
+module_pci_driver(prism2_pci_driver);
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
index 33e79037770b..c3d067ee4db9 100644
--- a/drivers/net/wireless/hostap/hostap_plx.c
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -616,18 +616,4 @@ static struct pci_driver prism2_plx_driver = {
         .remove         = prism2_plx_remove,
 };
 
-
-static int __init init_prism2_plx(void)
-{
-        return pci_register_driver(&prism2_plx_driver);
-}
-
-
-static void __exit exit_prism2_plx(void)
-{
-        pci_unregister_driver(&prism2_plx_driver);
-}
-
-
-module_init(init_prism2_plx);
-module_exit(exit_prism2_plx);
+module_pci_driver(prism2_plx_driver);
diff --git a/drivers/net/wireless/ipw2x00/ipw.h b/drivers/net/wireless/ipw2x00/ipw.h
new file mode 100644
index 000000000000..4007bf5ed6f3
--- /dev/null
+++ b/drivers/net/wireless/ipw2x00/ipw.h
@@ -0,0 +1,23 @@
+/*
+ * Intel Pro/Wireless 2100, 2200BG, 2915ABG network connection driver
+ *
+ * Copyright 2012 Stanislav Yakovlev <stas.yakovlev@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __IPW_H__
+#define __IPW_H__
+
+#include <linux/ieee80211.h>
+
+static const u32 ipw_cipher_suites[] = {
+        WLAN_CIPHER_SUITE_WEP40,
+        WLAN_CIPHER_SUITE_WEP104,
+        WLAN_CIPHER_SUITE_TKIP,
+        WLAN_CIPHER_SUITE_CCMP,
+};
+
+#endif
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index f0551f807f69..9cfae0c08707 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -166,6 +166,7 @@ that only one external action is invoked at a time.
 #include <net/lib80211.h>
 
 #include "ipw2100.h"
+#include "ipw.h"
 
 #define IPW2100_VERSION "git-1.2.2"
 
@@ -343,38 +344,50 @@ static struct iw_handler_def ipw2100_wx_handler_def;
 
 static inline void read_register(struct net_device *dev, u32 reg, u32 * val)
 {
-        *val = readl((void __iomem *)(dev->base_addr + reg));
+        struct ipw2100_priv *priv = libipw_priv(dev);
+
+        *val = ioread32(priv->ioaddr + reg);
         IPW_DEBUG_IO("r: 0x%08X => 0x%08X\n", reg, *val);
 }
 
 static inline void write_register(struct net_device *dev, u32 reg, u32 val)
 {
-        writel(val, (void __iomem *)(dev->base_addr + reg));
+        struct ipw2100_priv *priv = libipw_priv(dev);
+
+        iowrite32(val, priv->ioaddr + reg);
         IPW_DEBUG_IO("w: 0x%08X <= 0x%08X\n", reg, val);
 }
 
 static inline void read_register_word(struct net_device *dev, u32 reg,
                                       u16 * val)
 {
-        *val = readw((void __iomem *)(dev->base_addr + reg));
+        struct ipw2100_priv *priv = libipw_priv(dev);
+
+        *val = ioread16(priv->ioaddr + reg);
         IPW_DEBUG_IO("r: 0x%08X => %04X\n", reg, *val);
 }
 
 static inline void read_register_byte(struct net_device *dev, u32 reg, u8 * val)
 {
-        *val = readb((void __iomem *)(dev->base_addr + reg));
+        struct ipw2100_priv *priv = libipw_priv(dev);
+
+        *val = ioread8(priv->ioaddr + reg);
         IPW_DEBUG_IO("r: 0x%08X => %02X\n", reg, *val);
 }
 
 static inline void write_register_word(struct net_device *dev, u32 reg, u16 val)
 {
-        writew(val, (void __iomem *)(dev->base_addr + reg));
+        struct ipw2100_priv *priv = libipw_priv(dev);
+
+        iowrite16(val, priv->ioaddr + reg);
         IPW_DEBUG_IO("w: 0x%08X <= %04X\n", reg, val);
 }
 
 static inline void write_register_byte(struct net_device *dev, u32 reg, u8 val)
 {
-        writeb(val, (void __iomem *)(dev->base_addr + reg));
+        struct ipw2100_priv *priv = libipw_priv(dev);
+
+        iowrite8(val, priv->ioaddr + reg);
         IPW_DEBUG_IO("w: 0x%08X =< %02X\n", reg, val);
 }
 
@@ -506,13 +519,13 @@ static void read_nic_memory(struct net_device *dev, u32 addr, u32 len,
                 read_register_byte(dev, IPW_REG_INDIRECT_ACCESS_DATA + i, buf);
 }
 
-static inline int ipw2100_hw_is_adapter_in_system(struct net_device *dev)
+static bool ipw2100_hw_is_adapter_in_system(struct net_device *dev)
 {
-        return (dev->base_addr &&
-                (readl
-                 ((void __iomem *)(dev->base_addr +
-                                   IPW_REG_DOA_DEBUG_AREA_START))
-                 == IPW_DATA_DOA_DEBUG_VALUE));
+        u32 dbg;
+
+        read_register(dev, IPW_REG_DOA_DEBUG_AREA_START, &dbg);
+
+        return dbg == IPW_DATA_DOA_DEBUG_VALUE;
 }
 
 static int ipw2100_get_ordinal(struct ipw2100_priv *priv, u32 ord,
@@ -1946,11 +1959,12 @@ static int ipw2100_wdev_init(struct net_device *dev)
                 wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = bg_band;
         }
 
+        wdev->wiphy->cipher_suites = ipw_cipher_suites;
+        wdev->wiphy->n_cipher_suites = ARRAY_SIZE(ipw_cipher_suites);
+
         set_wiphy_dev(wdev->wiphy, &priv->pci_dev->dev);
-        if (wiphy_register(wdev->wiphy)) {
-                ipw2100_down(priv);
+        if (wiphy_register(wdev->wiphy))
                 return -EIO;
-        }
         return 0;
 }
 
@@ -3773,7 +3787,7 @@ IPW2100_ORD(STAT_TX_HOST_REQUESTS, "requested Host Tx's (MSDU)"),
             IPW2100_ORD(COUNTRY_CODE,
                                 "IEEE country code as recv'd from beacon"),
             IPW2100_ORD(COUNTRY_CHANNELS,
-                                "channels suported by country"),
+                                "channels supported by country"),
             IPW2100_ORD(RESET_CNT, "adapter resets (warm)"),
             IPW2100_ORD(BEACON_INTERVAL, "Beacon interval"),
             IPW2100_ORD(ANTENNA_DIVERSITY,
@@ -4062,7 +4076,7 @@ static int ipw2100_switch_mode(struct ipw2100_priv *priv, u32 mode)
         ipw2100_firmware.version = 0;
 #endif
 
-        printk(KERN_INFO "%s: Reseting on mode change.\n", priv->net_dev->name);
+        printk(KERN_INFO "%s: Resetting on mode change.\n", priv->net_dev->name);
         priv->reset_backoff = 0;
         schedule_reset(priv);
 
@@ -6082,9 +6096,7 @@ static const struct net_device_ops ipw2100_netdev_ops = {
 /* Look into using netdev destructor to shutdown libipw? */
 
 static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
-                                               void __iomem * base_addr,
-                                               unsigned long mem_start,
-                                               unsigned long mem_len)
+                                               void __iomem * ioaddr)
 {
         struct ipw2100_priv *priv;
         struct net_device *dev;
@@ -6096,6 +6108,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
         priv->ieee = netdev_priv(dev);
         priv->pci_dev = pci_dev;
         priv->net_dev = dev;
+        priv->ioaddr = ioaddr;
 
         priv->ieee->hard_start_xmit = ipw2100_tx;
         priv->ieee->set_security = shim__set_security;
@@ -6111,10 +6124,6 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
         dev->watchdog_timeo = 3 * HZ;
         dev->irq = 0;
 
-        dev->base_addr = (unsigned long)base_addr;
-        dev->mem_start = mem_start;
-        dev->mem_end = dev->mem_start + mem_len - 1;
-
         /* NOTE: We don't use the wireless_handlers hook
          * in dev as the system will start throwing WX requests
          * to us before we're actually initialized and it just
@@ -6215,8 +6224,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
 static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
                                 const struct pci_device_id *ent)
 {
-        unsigned long mem_start, mem_len, mem_flags;
-        void __iomem *base_addr = NULL;
+        void __iomem *ioaddr;
         struct net_device *dev = NULL;
         struct ipw2100_priv *priv = NULL;
         int err = 0;
@@ -6225,18 +6233,14 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
 
         IPW_DEBUG_INFO("enter\n");
 
-        mem_start = pci_resource_start(pci_dev, 0);
-        mem_len = pci_resource_len(pci_dev, 0);
-        mem_flags = pci_resource_flags(pci_dev, 0);
-
-        if ((mem_flags & IORESOURCE_MEM) != IORESOURCE_MEM) {
+        if (!(pci_resource_flags(pci_dev, 0) & IORESOURCE_MEM)) {
                 IPW_DEBUG_INFO("weird - resource type is not memory\n");
                 err = -ENODEV;
-                goto fail;
+                goto out;
         }
 
-        base_addr = ioremap_nocache(mem_start, mem_len);
-        if (!base_addr) {
+        ioaddr = pci_iomap(pci_dev, 0, 0);
+        if (!ioaddr) {
                 printk(KERN_WARNING DRV_NAME
                        "Error calling ioremap_nocache.\n");
                 err = -EIO;
@@ -6244,7 +6248,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
         }
 
         /* allocate and initialize our net_device */
-        dev = ipw2100_alloc_device(pci_dev, base_addr, mem_start, mem_len);
+        dev = ipw2100_alloc_device(pci_dev, ioaddr);
         if (!dev) {
                 printk(KERN_WARNING DRV_NAME
                        "Error calling ipw2100_alloc_device.\n");
@@ -6325,6 +6329,11 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
         printk(KERN_INFO DRV_NAME
                ": Detected Intel PRO/Wireless 2100 Network Connection\n");
 
+        err = ipw2100_wdev_init(dev);
+        if (err)
+                goto fail;
+        registered = 1;
+
         /* Bring up the interface.  Pre 0.46, after we registered the
          * network device we would call ipw2100_up.  This introduced a race
          * condition with newer hotplug configurations (network was coming
@@ -6341,11 +6350,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
                        "Error calling register_netdev.\n");
                 goto fail;
         }
-        registered = 1;
-
-        err = ipw2100_wdev_init(dev);
-        if (err)
-                goto fail;
+        registered = 2;
 
         mutex_lock(&priv->action_mutex);
 
@@ -6379,18 +6384,21 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
         priv->status |= STATUS_INITIALIZED;
 
         mutex_unlock(&priv->action_mutex);
-
-        return 0;
+out:
+        return err;
 
       fail_unlock:
         mutex_unlock(&priv->action_mutex);
-        wiphy_unregister(priv->ieee->wdev.wiphy);
-        kfree(priv->ieee->bg_band.channels);
       fail:
         if (dev) {
-                if (registered)
+                if (registered >= 2)
                         unregister_netdev(dev);
 
+                if (registered) {
+                        wiphy_unregister(priv->ieee->wdev.wiphy);
+                        kfree(priv->ieee->bg_band.channels);
+                }
+
                 ipw2100_hw_stop_adapter(priv);
 
                 ipw2100_disable_interrupts(priv);
@@ -6409,63 +6417,56 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
                 pci_set_drvdata(pci_dev, NULL);
         }
 
-        if (base_addr)
-                iounmap(base_addr);
+        pci_iounmap(pci_dev, ioaddr);
 
         pci_release_regions(pci_dev);
         pci_disable_device(pci_dev);
-
-        return err;
+        goto out;
 }
 
 static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev)
 {
         struct ipw2100_priv *priv = pci_get_drvdata(pci_dev);
-        struct net_device *dev;
+        struct net_device *dev = priv->net_dev;
 
-        if (priv) {
-                mutex_lock(&priv->action_mutex);
+        mutex_lock(&priv->action_mutex);
 
-                priv->status &= ~STATUS_INITIALIZED;
+        priv->status &= ~STATUS_INITIALIZED;
 
-                dev = priv->net_dev;
-                sysfs_remove_group(&pci_dev->dev.kobj,
-                                   &ipw2100_attribute_group);
+        sysfs_remove_group(&pci_dev->dev.kobj, &ipw2100_attribute_group);
 
 #ifdef CONFIG_PM
-                if (ipw2100_firmware.version)
-                        ipw2100_release_firmware(priv, &ipw2100_firmware);
+        if (ipw2100_firmware.version)
+                ipw2100_release_firmware(priv, &ipw2100_firmware);
 #endif
-                /* Take down the hardware */
-                ipw2100_down(priv);
+        /* Take down the hardware */
+        ipw2100_down(priv);
 
-                /* Release the mutex so that the network subsystem can
-                 * complete any needed calls into the driver... */
-                mutex_unlock(&priv->action_mutex);
+        /* Release the mutex so that the network subsystem can
+         * complete any needed calls into the driver... */
+        mutex_unlock(&priv->action_mutex);
 
-                /* Unregister the device first - this results in close()
-                 * being called if the device is open.  If we free storage
-                 * first, then close() will crash. */
-                unregister_netdev(dev);
+        /* Unregister the device first - this results in close()
+         * being called if the device is open.  If we free storage
+         * first, then close() will crash.
+         * FIXME: remove the comment above. */
+        unregister_netdev(dev);
 
-                ipw2100_kill_works(priv);
+        ipw2100_kill_works(priv);
 
-                ipw2100_queues_free(priv);
+        ipw2100_queues_free(priv);
 
-                /* Free potential debugging firmware snapshot */
-                ipw2100_snapshot_free(priv);
+        /* Free potential debugging firmware snapshot */
+        ipw2100_snapshot_free(priv);
 
-                if (dev->irq)
-                        free_irq(dev->irq, priv);
+        free_irq(dev->irq, priv);
 
-                if (dev->base_addr)
-                        iounmap((void __iomem *)dev->base_addr);
+        pci_iounmap(pci_dev, priv->ioaddr);
 
-                /* wiphy_unregister needs to be here, before free_libipw */
-                wiphy_unregister(priv->ieee->wdev.wiphy);
-                kfree(priv->ieee->bg_band.channels);
-                free_libipw(dev, 0);
-        }
+        /* wiphy_unregister needs to be here, before free_libipw */
+        wiphy_unregister(priv->ieee->wdev.wiphy);
+        kfree(priv->ieee->bg_band.channels);
+        free_libipw(dev, 0);
 
         pci_release_regions(pci_dev);
         pci_disable_device(pci_dev);
@@ -8508,8 +8509,7 @@ static void ipw2100_release_firmware(struct ipw2100_priv *priv,
                                      struct ipw2100_fw *fw)
 {
         fw->version = 0;
-        if (fw->fw_entry)
-                release_firmware(fw->fw_entry);
+        release_firmware(fw->fw_entry);
         fw->fw_entry = NULL;
 }
 
@@ -8609,7 +8609,7 @@ static int ipw2100_ucode_download(struct ipw2100_priv *priv,
         struct net_device *dev = priv->net_dev;
         const unsigned char *microcode_data = fw->uc.data;
         unsigned int microcode_data_left = fw->uc.size;
-        void __iomem *reg = (void __iomem *)dev->base_addr;
+        void __iomem *reg = priv->ioaddr;
 
         struct symbol_alive_response response;
         int i, j;
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.h b/drivers/net/wireless/ipw2x00/ipw2100.h
index 99cba968aa58..973125242490 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.h
+++ b/drivers/net/wireless/ipw2x00/ipw2100.h
@@ -135,15 +135,6 @@ enum {
         IPW_HW_STATE_ENABLED = 0
 };
 
-struct ssid_context {
-        char ssid[IW_ESSID_MAX_SIZE + 1];
-        int ssid_len;
-        unsigned char bssid[ETH_ALEN];
-        int port_type;
-        int channel;
-
-};
-
 extern const char *port_type_str[];
 extern const char *band_str[];
 
@@ -488,6 +479,7 @@ enum {
 #define CAP_PRIVACY_ON          (1<<1)  /* Off = No privacy */
 
 struct ipw2100_priv {
+        void __iomem *ioaddr;
 
         int stop_hang_check;    /* Set 1 when shutting down to kill hang_check */
         int stop_rf_kill;       /* Set 1 when shutting down to kill rf_kill */
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 2b022571a859..0036737fe8e3 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -34,6 +34,7 @@
 #include <linux/slab.h>
 #include <net/cfg80211-wext.h>
 #include "ipw2200.h"
+#include "ipw.h"
 
 
 #ifndef KBUILD_EXTMOD
@@ -2191,6 +2192,7 @@ static int __ipw_send_cmd(struct ipw_priv *priv, struct host_cmd *cmd)
 {
         int rc = 0;
         unsigned long flags;
+        unsigned long now, end;
 
         spin_lock_irqsave(&priv->lock, flags);
         if (priv->status & STATUS_HCMD_ACTIVE) {
@@ -2232,10 +2234,20 @@ static int __ipw_send_cmd(struct ipw_priv *priv, struct host_cmd *cmd)
         }
         spin_unlock_irqrestore(&priv->lock, flags);
 
+        now = jiffies;
+        end = now + HOST_COMPLETE_TIMEOUT;
+again:
         rc = wait_event_interruptible_timeout(priv->wait_command_queue,
                                               !(priv->
                                                 status & STATUS_HCMD_ACTIVE),
-                                              HOST_COMPLETE_TIMEOUT);
+                                              end - now);
+        if (rc < 0) {
+                now = jiffies;
+                if (time_before(now, end))
+                        goto again;
+                rc = 0;
+        }
+
         if (rc == 0) {
                 spin_lock_irqsave(&priv->lock, flags);
                 if (priv->status & STATUS_HCMD_ACTIVE) {
@@ -3657,8 +3669,7 @@ static int ipw_load(struct ipw_priv *priv)
                 priv->rxq = NULL;
         }
         ipw_tx_queue_free(priv);
-        if (raw)
-                release_firmware(raw);
+        release_firmware(raw);
 #ifdef CONFIG_PM
         fw_loaded = 0;
         raw = NULL;
@@ -7024,7 +7035,7 @@ static int ipw_qos_activate(struct ipw_priv *priv,
                             cpu_to_le16(burst_duration);
         } else if (priv->ieee->iw_mode == IW_MODE_ADHOC) {
                 if (type == IEEE_B) {
-                        IPW_DEBUG_QOS("QoS activate IBSS nework mode %d\n",
+                        IPW_DEBUG_QOS("QoS activate IBSS network mode %d\n",
                                       type);
                         if (priv->qos_data.qos_enable == 0)
                                 active_one = &def_parameters_CCK;
@@ -11432,20 +11443,6 @@ static void ipw_bg_down(struct work_struct *work)
         mutex_unlock(&priv->mutex);
 }
 
-/* Called by register_netdev() */
-static int ipw_net_init(struct net_device *dev)
-{
-        int rc = 0;
-        struct ipw_priv *priv = libipw_priv(dev);
-
-        mutex_lock(&priv->mutex);
-        if (ipw_up(priv))
-                rc = -EIO;
-        mutex_unlock(&priv->mutex);
-
-        return rc;
-}
-
 static int ipw_wdev_init(struct net_device *dev)
 {
         int i, rc = 0;
@@ -11533,6 +11530,9 @@ static int ipw_wdev_init(struct net_device *dev)
                 wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = a_band;
         }
 
+        wdev->wiphy->cipher_suites = ipw_cipher_suites;
+        wdev->wiphy->n_cipher_suites = ARRAY_SIZE(ipw_cipher_suites);
+
         set_wiphy_dev(wdev->wiphy, &priv->pci_dev->dev);
 
         /* With that information in place, we can now register the wiphy... */
@@ -11711,7 +11711,6 @@ static void ipw_prom_free(struct ipw_priv *priv)
 #endif
 
 static const struct net_device_ops ipw_netdev_ops = {
-        .ndo_init               = ipw_net_init,
         .ndo_open               = ipw_net_open,
         .ndo_stop               = ipw_net_stop,
         .ndo_set_rx_mode        = ipw_net_set_multicast_list,
@@ -11826,10 +11825,6 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
         net_dev->wireless_data = &priv->wireless_data;
         net_dev->wireless_handlers = &ipw_wx_handler_def;
         net_dev->ethtool_ops = &ipw_ethtool_ops;
-        net_dev->irq = pdev->irq;
-        net_dev->base_addr = (unsigned long)priv->hw_base;
-        net_dev->mem_start = pci_resource_start(pdev, 0);
-        net_dev->mem_end = net_dev->mem_start + pci_resource_len(pdev, 0) - 1;
 
         err = sysfs_create_group(&pdev->dev.kobj, &ipw_attribute_group);
         if (err) {
@@ -11838,17 +11833,24 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
                 goto out_release_irq;
         }
 
-        mutex_unlock(&priv->mutex);
-        err = register_netdev(net_dev);
-        if (err) {
-                IPW_ERROR("failed to register network device\n");
+        if (ipw_up(priv)) {
+                mutex_unlock(&priv->mutex);
+                err = -EIO;
                 goto out_remove_sysfs;
         }
 
+        mutex_unlock(&priv->mutex);
+
         err = ipw_wdev_init(net_dev);
         if (err) {
                 IPW_ERROR("failed to register wireless device\n");
-                goto out_unregister_netdev;
+                goto out_remove_sysfs;
+        }
+
+        err = register_netdev(net_dev);
+        if (err) {
+                IPW_ERROR("failed to register network device\n");
+                goto out_unregister_wiphy;
         }
 
 #ifdef CONFIG_IPW2200_PROMISCUOUS
@@ -11857,10 +11859,8 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
                 if (err) {
                         IPW_ERROR("Failed to register promiscuous network "
                                   "device (error %d).\n", err);
-                        wiphy_unregister(priv->ieee->wdev.wiphy);
-                        kfree(priv->ieee->a_band.channels);
-                        kfree(priv->ieee->bg_band.channels);
-                        goto out_unregister_netdev;
+                        unregister_netdev(priv->net_dev);
+                        goto out_unregister_wiphy;
                 }
         }
 #endif
@@ -11872,8 +11872,10 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
 
         return 0;
 
-      out_unregister_netdev:
-        unregister_netdev(priv->net_dev);
+      out_unregister_wiphy:
+        wiphy_unregister(priv->ieee->wdev.wiphy);
+        kfree(priv->ieee->a_band.channels);
+        kfree(priv->ieee->bg_band.channels);
       out_remove_sysfs:
         sysfs_remove_group(&pdev->dev.kobj, &ipw_attribute_group);
       out_release_irq:
diff --git a/drivers/net/wireless/ipw2x00/libipw.h b/drivers/net/wireless/ipw2x00/libipw.h
index 8874588fb929..0b22fb421735 100644
--- a/drivers/net/wireless/ipw2x00/libipw.h
+++ b/drivers/net/wireless/ipw2x00/libipw.h
@@ -584,61 +584,6 @@ struct libipw_tim_parameters {
 
 /*******************************************************/
 
-enum {                          /* libipw_basic_report.map */
-        LIBIPW_BASIC_MAP_BSS = (1 << 0),
-        LIBIPW_BASIC_MAP_OFDM = (1 << 1),
-        LIBIPW_BASIC_MAP_UNIDENTIFIED = (1 << 2),
-        LIBIPW_BASIC_MAP_RADAR = (1 << 3),
-        LIBIPW_BASIC_MAP_UNMEASURED = (1 << 4),
-        /* Bits 5-7 are reserved */
-
-};
-struct libipw_basic_report {
-        u8 channel;
-        __le64 start_time;
-        __le16 duration;
-        u8 map;
-} __packed;
-
-enum {                          /* libipw_measurement_request.mode */
-        /* Bit 0 is reserved */
-        LIBIPW_MEASUREMENT_ENABLE = (1 << 1),
-        LIBIPW_MEASUREMENT_REQUEST = (1 << 2),
-        LIBIPW_MEASUREMENT_REPORT = (1 << 3),
-        /* Bits 4-7 are reserved */
-};
-
-enum {
-        LIBIPW_REPORT_BASIC = 0,        /* required */
-        LIBIPW_REPORT_CCA = 1,  /* optional */
-        LIBIPW_REPORT_RPI = 2,  /* optional */
-        /* 3-255 reserved */
-};
-
-struct libipw_measurement_params {
-        u8 channel;
-        __le64 start_time;
-        __le16 duration;
-} __packed;
-
-struct libipw_measurement_request {
-        struct libipw_info_element ie;
-        u8 token;
-        u8 mode;
-        u8 type;
-        struct libipw_measurement_params params[0];
-} __packed;
-
-struct libipw_measurement_report {
-        struct libipw_info_element ie;
-        u8 token;
-        u8 mode;
-        u8 type;
-        union {
-                struct libipw_basic_report basic[0];
-        } u;
-} __packed;
-
 struct libipw_tpc_report {
         u8 transmit_power;
         u8 link_margin;
diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c
index c4955d25a19a..02e057923236 100644
--- a/drivers/net/wireless/ipw2x00/libipw_rx.c
+++ b/drivers/net/wireless/ipw2x00/libipw_rx.c
@@ -77,8 +77,8 @@ static struct libipw_frag_entry *libipw_frag_cache_find(struct
 
                 if (entry->skb != NULL && entry->seq == seq &&
                     (entry->last_frag + 1 == frag || frag == -1) &&
-                    !compare_ether_addr(entry->src_addr, src) &&
-                    !compare_ether_addr(entry->dst_addr, dst))
+                    ether_addr_equal(entry->src_addr, src) &&
+                    ether_addr_equal(entry->dst_addr, dst))
                         return entry;
         }
 
@@ -245,12 +245,12 @@ static int libipw_is_eapol_frame(struct libipw_device *ieee,
         /* check that the frame is unicast frame to us */
         if ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
             IEEE80211_FCTL_TODS &&
-            !compare_ether_addr(hdr->addr1, dev->dev_addr) &&
-            !compare_ether_addr(hdr->addr3, dev->dev_addr)) {
+            ether_addr_equal(hdr->addr1, dev->dev_addr) &&
+            ether_addr_equal(hdr->addr3, dev->dev_addr)) {
                 /* ToDS frame with own addr BSSID and DA */
         } else if ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
                    IEEE80211_FCTL_FROMDS &&
-                   !compare_ether_addr(hdr->addr1, dev->dev_addr)) {
+                   ether_addr_equal(hdr->addr1, dev->dev_addr)) {
                 /* FromDS frame with own addr as DA */
         } else
                 return 0;
@@ -523,8 +523,8 @@ int libipw_rx(struct libipw_device *ieee, struct sk_buff *skb,
 
         if (ieee->iw_mode == IW_MODE_MASTER && !wds &&
             (fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
-            IEEE80211_FCTL_FROMDS && ieee->stadev
-            && !compare_ether_addr(hdr->addr2, ieee->assoc_ap_addr)) {
+            IEEE80211_FCTL_FROMDS && ieee->stadev &&
+            ether_addr_equal(hdr->addr2, ieee->assoc_ap_addr)) {
                 /* Frame from BSSID of the AP for which we are a client */
                 skb->dev = dev = ieee->stadev;
                 stats = hostap_get_stats(dev);
@@ -1468,7 +1468,7 @@ static inline int is_same_network(struct libipw_network *src,
          * as one network */
         return ((src->ssid_len == dst->ssid_len) &&
                 (src->channel == dst->channel) &&
-                !compare_ether_addr(src->bssid, dst->bssid) &&
+                ether_addr_equal(src->bssid, dst->bssid) &&
                 !memcmp(src->ssid, dst->ssid, src->ssid_len));
 }
 
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c
index b25c01be0d90..87e539894330 100644
--- a/drivers/net/wireless/iwlegacy/3945.c
+++ b/drivers/net/wireless/iwlegacy/3945.c
@@ -453,10 +453,10 @@ il3945_is_network_packet(struct il_priv *il, struct ieee80211_hdr *header)
         switch (il->iw_mode) {
         case NL80211_IFTYPE_ADHOC:      /* Header: Dest. | Source    | BSSID */
                 /* packets to our IBSS update information */
-                return !compare_ether_addr(header->addr3, il->bssid);
+                return ether_addr_equal(header->addr3, il->bssid);
         case NL80211_IFTYPE_STATION:    /* Header: Dest. | AP{BSSID} | Source */
                 /* packets to our IBSS update information */
-                return !compare_ether_addr(header->addr2, il->bssid);
+                return ether_addr_equal(header->addr2, il->bssid);
         default:
                 return 1;
         }
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index c46275a92565..509301a5e7e2 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -2565,7 +2565,7 @@ il4965_find_station(struct il_priv *il, const u8 *addr)
         spin_lock_irqsave(&il->sta_lock, flags);
         for (i = start; i < il->hw_params.max_stations; i++)
                 if (il->stations[i].used &&
-                    (!compare_ether_addr(il->stations[i].sta.sta.addr, addr))) {
+                    ether_addr_equal(il->stations[i].sta.sta.addr, addr)) {
                         ret = i;
                         goto out;
                 }
@@ -2850,9 +2850,9 @@ void
 il4965_hwrate_to_tx_control(struct il_priv *il, u32 rate_n_flags,
                             struct ieee80211_tx_info *info)
 {
-        struct ieee80211_tx_rate *r = &info->control.rates[0];
+        struct ieee80211_tx_rate *r = &info->status.rates[0];
 
-        info->antenna_sel_tx =
+        info->status.antenna =
             ((rate_n_flags & RATE_MCS_ANT_ABC_MSK) >> RATE_MCS_ANT_POS);
         if (rate_n_flags & RATE_MCS_HT_MSK)
                 r->flags |= IEEE80211_TX_RC_MCS;
diff --git a/drivers/net/wireless/iwlegacy/4965-rs.c b/drivers/net/wireless/iwlegacy/4965-rs.c
index 11ab1247fae1..f3b8e91aa3dc 100644
--- a/drivers/net/wireless/iwlegacy/4965-rs.c
+++ b/drivers/net/wireless/iwlegacy/4965-rs.c
@@ -873,7 +873,7 @@ il4965_rs_tx_status(void *il_r, struct ieee80211_supported_band *sband,
             tbl_type.is_SGI != !!(mac_flags & IEEE80211_TX_RC_SHORT_GI) ||
             tbl_type.is_ht40 != !!(mac_flags & IEEE80211_TX_RC_40_MHZ_WIDTH) ||
             tbl_type.is_dup != !!(mac_flags & IEEE80211_TX_RC_DUP_DATA) ||
-            tbl_type.ant_type != info->antenna_sel_tx ||
+            tbl_type.ant_type != info->status.antenna ||
             !!(tx_rate & RATE_MCS_HT_MSK) != !!(mac_flags & IEEE80211_TX_RC_MCS)
             || !!(tx_rate & RATE_MCS_GF_MSK) !=
             !!(mac_flags & IEEE80211_TX_RC_GREEN_FIELD) || rs_idx != mac_idx) {
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index eaf249452e51..cbf2dc18341f 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -1896,8 +1896,8 @@ il_prep_station(struct il_priv *il, const u8 *addr, bool is_ap,
                 sta_id = il->hw_params.bcast_id;
         else
                 for (i = IL_STA_ID; i < il->hw_params.max_stations; i++) {
-                        if (!compare_ether_addr
-                            (il->stations[i].sta.sta.addr, addr)) {
+                        if (ether_addr_equal(il->stations[i].sta.sta.addr,
+                                             addr)) {
                                 sta_id = i;
                                 break;
                         }
@@ -1926,7 +1926,7 @@ il_prep_station(struct il_priv *il, const u8 *addr, bool is_ap,
 
         if ((il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE) &&
             (il->stations[sta_id].used & IL_STA_UCODE_ACTIVE) &&
-            !compare_ether_addr(il->stations[sta_id].sta.sta.addr, addr)) {
+            ether_addr_equal(il->stations[sta_id].sta.sta.addr, addr)) {
                 D_ASSOC("STA %d (%pM) already added, not adding again.\n",
                         sta_id, addr);
                 return sta_id;
@@ -3744,10 +3744,10 @@ il_full_rxon_required(struct il_priv *il)
 
         /* These items are only settable from the full RXON command */
         CHK(!il_is_associated(il));
-        CHK(compare_ether_addr(staging->bssid_addr, active->bssid_addr));
-        CHK(compare_ether_addr(staging->node_addr, active->node_addr));
-        CHK(compare_ether_addr
-            (staging->wlap_bssid_addr, active->wlap_bssid_addr));
+        CHK(!ether_addr_equal(staging->bssid_addr, active->bssid_addr));
+        CHK(!ether_addr_equal(staging->node_addr, active->node_addr));
+        CHK(!ether_addr_equal(staging->wlap_bssid_addr,
+                              active->wlap_bssid_addr));
         CHK_NEQ(staging->dev_type, active->dev_type);
         CHK_NEQ(staging->channel, active->channel);
         CHK_NEQ(staging->air_propagation, active->air_propagation);
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index 2fe62730dddd..db6c6e528022 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -113,20 +113,21 @@ config IWLWIFI_DEVICE_TESTMODE
           generic netlink message via NL80211_TESTMODE channel.
 
 config IWLWIFI_P2P
-       bool "iwlwifi experimental P2P support"
-       depends on IWLWIFI
-       help
-         This option enables experimental P2P support for some devices
-         based on microcode support. Since P2P support is still under
-         development, this option may even enable it for some devices
-         now that turn out to not support it in the future due to
-         microcode restrictions.
+        def_bool y
+        bool "iwlwifi experimental P2P support"
+        depends on IWLWIFI
+        help
+          This option enables experimental P2P support for some devices
+          based on microcode support. Since P2P support is still under
+          development, this option may even enable it for some devices
+          now that turn out to not support it in the future due to
+          microcode restrictions.
 
-         To determine if your microcode supports the experimental P2P
-         offered by this option, check if the driver advertises AP
-         support when it is loaded.
+          To determine if your microcode supports the experimental P2P
+          offered by this option, check if the driver advertises AP
+          support when it is loaded.
 
-         Say Y only if you want to experiment with P2P.
+          Say Y only if you want to experiment with P2P.
 
 config IWLWIFI_EXPERIMENTAL_MFP
         bool "support MFP (802.11w) even if uCode doesn't advertise"
@@ -136,3 +137,11 @@ config IWLWIFI_EXPERIMENTAL_MFP
           even if the microcode doesn't advertise it.
 
           Say Y only if you want to experiment with MFP.
+
+config IWLWIFI_UCODE16
+        bool "support uCode 16.0"
+        depends on IWLWIFI
+        help
+          This option enables support for uCode version 16.0.
+
+          Say Y if you want to use 16.0 microcode.
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 85d163ed3db1..406f297a9a56 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -5,9 +5,9 @@ iwlwifi-objs		+= iwl-ucode.o iwl-agn-tx.o iwl-debug.o
 iwlwifi-objs            += iwl-agn-lib.o iwl-agn-calib.o iwl-io.o
 iwlwifi-objs            += iwl-agn-tt.o iwl-agn-sta.o iwl-agn-rx.o
 
-iwlwifi-objs            += iwl-core.o iwl-eeprom.o iwl-power.o
+iwlwifi-objs            += iwl-eeprom.o iwl-power.o
 iwlwifi-objs            += iwl-scan.o iwl-led.o
-iwlwifi-objs            += iwl-agn-rxon.o
+iwlwifi-objs            += iwl-agn-rxon.o iwl-agn-devices.o
 iwlwifi-objs            += iwl-5000.o
 iwlwifi-objs            += iwl-6000.o
 iwlwifi-objs            += iwl-1000.o
@@ -17,6 +17,8 @@ iwlwifi-objs		+= iwl-drv.o
 iwlwifi-objs            += iwl-notif-wait.o
 iwlwifi-objs            += iwl-trans-pcie.o iwl-trans-pcie-rx.o iwl-trans-pcie-tx.o
 
+
+iwlwifi-$(CONFIG_IWLWIFI_UCODE16) += iwl-phy-db.o
 iwlwifi-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
 iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
 iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += iwl-testmode.o
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index 5b0d888f746b..2629a6602dfa 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -24,30 +24,16 @@
  *
  *****************************************************************************/
 
-#include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <net/mac80211.h>
-#include <linux/etherdevice.h>
-#include <asm/unaligned.h>
 #include <linux/stringify.h>
-
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-io.h"
-#include "iwl-agn.h"
-#include "iwl-agn-hw.h"
-#include "iwl-shared.h"
+#include "iwl-config.h"
 #include "iwl-cfg.h"
-#include "iwl-prph.h"
+#include "iwl-csr.h"
+#include "iwl-agn-hw.h"
 
 /* Highest firmware API version supported */
-#define IWL1000_UCODE_API_MAX 6
-#define IWL100_UCODE_API_MAX 6
+#define IWL1000_UCODE_API_MAX 5
+#define IWL100_UCODE_API_MAX 5
 
 /* Oldest version we won't warn about */
 #define IWL1000_UCODE_API_OK 5
@@ -57,6 +43,10 @@
 #define IWL1000_UCODE_API_MIN 1
 #define IWL100_UCODE_API_MIN 5
 
+/* EEPROM version */
+#define EEPROM_1000_TX_POWER_VERSION    (4)
+#define EEPROM_1000_EEPROM_VERSION      (0x15C)
+
 #define IWL1000_FW_PRE "iwlwifi-1000-"
 #define IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE __stringify(api) ".ucode"
 
@@ -64,100 +54,8 @@
 #define IWL100_MODULE_FIRMWARE(api) IWL100_FW_PRE __stringify(api) ".ucode"
 
 
-/*
- * For 1000, use advance thermal throttling critical temperature threshold,
- * but legacy thermal management implementation for now.
- * This is for the reason of 1000 uCode using advance thermal throttling API
- * but not implement ct_kill_exit based on ct_kill exit temperature
- * so the thermal throttling will still based on legacy thermal throttling
- * management.
- * The code here need to be modified once 1000 uCode has the advanced thermal
- * throttling algorithm in place
- */
-static void iwl1000_set_ct_threshold(struct iwl_priv *priv)
-{
-        /* want Celsius */
-        hw_params(priv).ct_kill_threshold = CT_KILL_THRESHOLD_LEGACY;
-        hw_params(priv).ct_kill_exit_threshold = CT_KILL_EXIT_THRESHOLD;
-}
-
-/* NIC configuration for 1000 series */
-static void iwl1000_nic_config(struct iwl_priv *priv)
-{
-        /* set CSR_HW_CONFIG_REG for uCode use */
-        iwl_set_bit(trans(priv), CSR_HW_IF_CONFIG_REG,
-                    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
-                    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
-
-        /* Setting digital SVR for 1000 card to 1.32V */
-        /* locking is acquired in iwl_set_bits_mask_prph() function */
-        iwl_set_bits_mask_prph(trans(priv), APMG_DIGITAL_SVR_REG,
-                                APMG_SVR_DIGITAL_VOLTAGE_1_32,
-                                ~APMG_SVR_VOLTAGE_CONFIG_BIT_MSK);
-}
-
-static const struct iwl_sensitivity_ranges iwl1000_sensitivity = {
-        .min_nrg_cck = 95,
-        .auto_corr_min_ofdm = 90,
-        .auto_corr_min_ofdm_mrc = 170,
-        .auto_corr_min_ofdm_x1 = 120,
-        .auto_corr_min_ofdm_mrc_x1 = 240,
-
-        .auto_corr_max_ofdm = 120,
-        .auto_corr_max_ofdm_mrc = 210,
-        .auto_corr_max_ofdm_x1 = 155,
-        .auto_corr_max_ofdm_mrc_x1 = 290,
-
-        .auto_corr_min_cck = 125,
-        .auto_corr_max_cck = 200,
-        .auto_corr_min_cck_mrc = 170,
-        .auto_corr_max_cck_mrc = 400,
-        .nrg_th_cck = 95,
-        .nrg_th_ofdm = 95,
-
-        .barker_corr_th_min = 190,
-        .barker_corr_th_min_mrc = 390,
-        .nrg_th_cca = 62,
-};
-
-static void iwl1000_hw_set_hw_params(struct iwl_priv *priv)
-{
-        hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ);
-
-        hw_params(priv).tx_chains_num =
-                num_of_ant(hw_params(priv).valid_tx_ant);
-        if (cfg(priv)->rx_with_siso_diversity)
-                hw_params(priv).rx_chains_num = 1;
-        else
-                hw_params(priv).rx_chains_num =
-                        num_of_ant(hw_params(priv).valid_rx_ant);
-
-        iwl1000_set_ct_threshold(priv);
-
-        /* Set initial sensitivity parameters */
-        hw_params(priv).sens = &iwl1000_sensitivity;
-}
-
-static struct iwl_lib_ops iwl1000_lib = {
-        .set_hw_params = iwl1000_hw_set_hw_params,
-        .nic_config = iwl1000_nic_config,
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REG_BAND_1_CHANNELS,
-                        EEPROM_REG_BAND_2_CHANNELS,
-                        EEPROM_REG_BAND_3_CHANNELS,
-                        EEPROM_REG_BAND_4_CHANNELS,
-                        EEPROM_REG_BAND_5_CHANNELS,
-                        EEPROM_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REGULATORY_BAND_NO_HT40,
-                },
-        },
-        .temperature = iwlagn_temperature,
-};
-
 static const struct iwl_base_params iwl1000_base_params = {
         .num_of_queues = IWLAGN_NUM_QUEUES,
-        .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
         .eeprom_size = OTP_LOW_IMAGE_SIZE,
         .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
         .max_ll_items = OTP_MAX_LL_ITEMS_1000,
@@ -166,15 +64,13 @@ static const struct iwl_base_params iwl1000_base_params = {
         .support_ct_kill_exit = true,
         .plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,
         .chain_noise_scale = 1000,
-        .wd_timeout = IWL_DEF_WD_TIMEOUT,
+        .wd_timeout = IWL_WATCHHDOG_DISABLED,
         .max_event_log_size = 128,
-        .wd_disable = true,
 };
 
 static const struct iwl_ht_params iwl1000_ht_params = {
         .ht_greenfield_support = true,
         .use_rts_for_aggregation = true, /* use rts/cts protection */
-        .smps_mode = IEEE80211_SMPS_DYNAMIC,
 };
 
 #define IWL_DEVICE_1000                                         \
@@ -182,11 +78,11 @@ static const struct iwl_ht_params iwl1000_ht_params = {
         .ucode_api_max = IWL1000_UCODE_API_MAX,                 \
         .ucode_api_ok = IWL1000_UCODE_API_OK,                   \
         .ucode_api_min = IWL1000_UCODE_API_MIN,                 \
+        .device_family = IWL_DEVICE_FAMILY_1000,                \
         .max_inst_size = IWLAGN_RTC_INST_SIZE,                  \
         .max_data_size = IWLAGN_RTC_DATA_SIZE,                  \
         .eeprom_ver = EEPROM_1000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,       \
-        .lib = &iwl1000_lib,                                    \
         .base_params = &iwl1000_base_params,                    \
         .led_mode = IWL_LED_BLINK
 
@@ -206,11 +102,11 @@ const struct iwl_cfg iwl1000_bg_cfg = {
         .ucode_api_max = IWL100_UCODE_API_MAX,                  \
         .ucode_api_ok = IWL100_UCODE_API_OK,                    \
         .ucode_api_min = IWL100_UCODE_API_MIN,                  \
+        .device_family = IWL_DEVICE_FAMILY_100,                 \
         .max_inst_size = IWLAGN_RTC_INST_SIZE,                  \
         .max_data_size = IWLAGN_RTC_DATA_SIZE,                  \
         .eeprom_ver = EEPROM_1000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,       \
-        .lib = &iwl1000_lib,                                    \
         .base_params = &iwl1000_base_params,                    \
         .led_mode = IWL_LED_RF_STATE,                           \
         .rx_with_siso_diversity = true
@@ -226,5 +122,5 @@ const struct iwl_cfg iwl100_bg_cfg = {
         IWL_DEVICE_100,
 };
 
-MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));
-MODULE_FIRMWARE(IWL100_MODULE_FIRMWARE(IWL100_UCODE_API_MAX));
+MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_OK));
+MODULE_FIRMWARE(IWL100_MODULE_FIRMWARE(IWL100_UCODE_API_OK));
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
index 5635b9e2c69e..7f793417c787 100644
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@ -24,25 +24,12 @@
  *
  *****************************************************************************/
 
-#include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <net/mac80211.h>
-#include <linux/etherdevice.h>
-#include <asm/unaligned.h>
 #include <linux/stringify.h>
-
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-io.h"
-#include "iwl-agn.h"
-#include "iwl-agn-hw.h"
-#include "iwl-shared.h"
+#include "iwl-config.h"
 #include "iwl-cfg.h"
+#include "iwl-agn-hw.h"
+#include "iwl-commands.h" /* needed for BT for now */
 
 /* Highest firmware API version supported */
 #define IWL2030_UCODE_API_MAX 6
@@ -51,10 +38,10 @@
 #define IWL135_UCODE_API_MAX 6
 
 /* Oldest version we won't warn about */
-#define IWL2030_UCODE_API_OK 5
-#define IWL2000_UCODE_API_OK 5
-#define IWL105_UCODE_API_OK 5
-#define IWL135_UCODE_API_OK 5
+#define IWL2030_UCODE_API_OK 6
+#define IWL2000_UCODE_API_OK 6
+#define IWL105_UCODE_API_OK 6
+#define IWL135_UCODE_API_OK 6
 
 /* Lowest firmware API version supported */
 #define IWL2030_UCODE_API_MIN 5
@@ -62,6 +49,11 @@
 #define IWL105_UCODE_API_MIN 5
 #define IWL135_UCODE_API_MIN 5
 
+/* EEPROM version */
+#define EEPROM_2000_TX_POWER_VERSION    (6)
+#define EEPROM_2000_EEPROM_VERSION      (0x805)
+
+
 #define IWL2030_FW_PRE "iwlwifi-2030-"
 #define IWL2030_MODULE_FIRMWARE(api) IWL2030_FW_PRE __stringify(api) ".ucode"
 
@@ -74,105 +66,9 @@
 #define IWL135_FW_PRE "iwlwifi-135-"
 #define IWL135_MODULE_FIRMWARE(api) IWL135_FW_PRE __stringify(api) ".ucode"
 
-static void iwl2000_set_ct_threshold(struct iwl_priv *priv)
-{
-        /* want Celsius */
-        hw_params(priv).ct_kill_threshold = CT_KILL_THRESHOLD;
-        hw_params(priv).ct_kill_exit_threshold = CT_KILL_EXIT_THRESHOLD;
-}
-
-/* NIC configuration for 2000 series */
-static void iwl2000_nic_config(struct iwl_priv *priv)
-{
-        iwl_rf_config(priv);
-
-        if (cfg(priv)->iq_invert)
-                iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,
-                            CSR_GP_DRIVER_REG_BIT_RADIO_IQ_INVER);
-}
-
-static const struct iwl_sensitivity_ranges iwl2000_sensitivity = {
-        .min_nrg_cck = 97,
-        .auto_corr_min_ofdm = 80,
-        .auto_corr_min_ofdm_mrc = 128,
-        .auto_corr_min_ofdm_x1 = 105,
-        .auto_corr_min_ofdm_mrc_x1 = 192,
-
-        .auto_corr_max_ofdm = 145,
-        .auto_corr_max_ofdm_mrc = 232,
-        .auto_corr_max_ofdm_x1 = 110,
-        .auto_corr_max_ofdm_mrc_x1 = 232,
-
-        .auto_corr_min_cck = 125,
-        .auto_corr_max_cck = 175,
-        .auto_corr_min_cck_mrc = 160,
-        .auto_corr_max_cck_mrc = 310,
-        .nrg_th_cck = 97,
-        .nrg_th_ofdm = 100,
-
-        .barker_corr_th_min = 190,
-        .barker_corr_th_min_mrc = 390,
-        .nrg_th_cca = 62,
-};
-
-static void iwl2000_hw_set_hw_params(struct iwl_priv *priv)
-{
-        hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ);
-
-        hw_params(priv).tx_chains_num =
-                num_of_ant(hw_params(priv).valid_tx_ant);
-        if (cfg(priv)->rx_with_siso_diversity)
-                hw_params(priv).rx_chains_num = 1;
-        else
-                hw_params(priv).rx_chains_num =
-                        num_of_ant(hw_params(priv).valid_rx_ant);
-
-        iwl2000_set_ct_threshold(priv);
-
-        /* Set initial sensitivity parameters */
-        hw_params(priv).sens = &iwl2000_sensitivity;
-}
-
-static struct iwl_lib_ops iwl2000_lib = {
-        .set_hw_params = iwl2000_hw_set_hw_params,
-        .nic_config = iwl2000_nic_config,
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REG_BAND_1_CHANNELS,
-                        EEPROM_REG_BAND_2_CHANNELS,
-                        EEPROM_REG_BAND_3_CHANNELS,
-                        EEPROM_REG_BAND_4_CHANNELS,
-                        EEPROM_REG_BAND_5_CHANNELS,
-                        EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REGULATORY_BAND_NO_HT40,
-                },
-                .enhanced_txpower = true,
-        },
-        .temperature = iwlagn_temperature,
-};
-
-static struct iwl_lib_ops iwl2030_lib = {
-        .set_hw_params = iwl2000_hw_set_hw_params,
-        .nic_config = iwl2000_nic_config,
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REG_BAND_1_CHANNELS,
-                        EEPROM_REG_BAND_2_CHANNELS,
-                        EEPROM_REG_BAND_3_CHANNELS,
-                        EEPROM_REG_BAND_4_CHANNELS,
-                        EEPROM_REG_BAND_5_CHANNELS,
-                        EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REGULATORY_BAND_NO_HT40,
-                },
-                .enhanced_txpower = true,
-        },
-        .temperature = iwlagn_temperature,
-};
-
 static const struct iwl_base_params iwl2000_base_params = {
         .eeprom_size = OTP_LOW_IMAGE_SIZE,
         .num_of_queues = IWLAGN_NUM_QUEUES,
-        .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
         .pll_cfg_val = 0,
         .max_ll_items = OTP_MAX_LL_ITEMS_2x00,
         .shadow_ram_support = true,
@@ -191,7 +87,6 @@ static const struct iwl_base_params iwl2000_base_params = {
 static const struct iwl_base_params iwl2030_base_params = {
         .eeprom_size = OTP_LOW_IMAGE_SIZE,
         .num_of_queues = IWLAGN_NUM_QUEUES,
-        .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
         .pll_cfg_val = 0,
         .max_ll_items = OTP_MAX_LL_ITEMS_2x00,
         .shadow_ram_support = true,
@@ -226,16 +121,15 @@ static const struct iwl_bt_params iwl2030_bt_params = {
         .ucode_api_max = IWL2000_UCODE_API_MAX,                 \
         .ucode_api_ok = IWL2000_UCODE_API_OK,                   \
         .ucode_api_min = IWL2000_UCODE_API_MIN,                 \
+        .device_family = IWL_DEVICE_FAMILY_2000,                \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
         .eeprom_ver = EEPROM_2000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,       \
-        .lib = &iwl2000_lib,                                    \
         .base_params = &iwl2000_base_params,                    \
         .need_temp_offset_calib = true,                         \
         .temp_offset_v2 = true,                                 \
-        .led_mode = IWL_LED_RF_STATE,                           \
-        .iq_invert = true                                       \
+        .led_mode = IWL_LED_RF_STATE
 
 const struct iwl_cfg iwl2000_2bgn_cfg = {
         .name = "Intel(R) Centrino(R) Wireless-N 2200 BGN",
@@ -254,18 +148,17 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = {
         .ucode_api_max = IWL2030_UCODE_API_MAX,                 \
         .ucode_api_ok = IWL2030_UCODE_API_OK,                   \
         .ucode_api_min = IWL2030_UCODE_API_MIN,                 \
+        .device_family = IWL_DEVICE_FAMILY_2030,                \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
         .eeprom_ver = EEPROM_2000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,       \
-        .lib = &iwl2030_lib,                                    \
         .base_params = &iwl2030_base_params,                    \
         .bt_params = &iwl2030_bt_params,                        \
         .need_temp_offset_calib = true,                         \
         .temp_offset_v2 = true,                                 \
         .led_mode = IWL_LED_RF_STATE,                           \
-        .adv_pm = true,                                         \
-        .iq_invert = true                                       \
+        .adv_pm = true
 
 const struct iwl_cfg iwl2030_2bgn_cfg = {
         .name = "Intel(R) Centrino(R) Wireless-N 2230 BGN",
@@ -278,18 +171,17 @@ const struct iwl_cfg iwl2030_2bgn_cfg = {
         .ucode_api_max = IWL105_UCODE_API_MAX,                  \
         .ucode_api_ok = IWL105_UCODE_API_OK,                    \
         .ucode_api_min = IWL105_UCODE_API_MIN,                  \
+        .device_family = IWL_DEVICE_FAMILY_105,                 \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
         .eeprom_ver = EEPROM_2000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,       \
-        .lib = &iwl2000_lib,                                    \
         .base_params = &iwl2000_base_params,                    \
         .need_temp_offset_calib = true,                         \
         .temp_offset_v2 = true,                                 \
         .led_mode = IWL_LED_RF_STATE,                           \
         .adv_pm = true,                                         \
-        .rx_with_siso_diversity = true,                         \
-        .iq_invert = true                                       \
+        .rx_with_siso_diversity = true
 
 const struct iwl_cfg iwl105_bgn_cfg = {
         .name = "Intel(R) Centrino(R) Wireless-N 105 BGN",
@@ -308,19 +200,18 @@ const struct iwl_cfg iwl105_bgn_d_cfg = {
         .ucode_api_max = IWL135_UCODE_API_MAX,                  \
         .ucode_api_ok = IWL135_UCODE_API_OK,                    \
         .ucode_api_min = IWL135_UCODE_API_MIN,                  \
+        .device_family = IWL_DEVICE_FAMILY_135,                 \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
         .eeprom_ver = EEPROM_2000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,       \
-        .lib = &iwl2030_lib,                                    \
         .base_params = &iwl2030_base_params,                    \
         .bt_params = &iwl2030_bt_params,                        \
         .need_temp_offset_calib = true,                         \
         .temp_offset_v2 = true,                                 \
         .led_mode = IWL_LED_RF_STATE,                           \
         .adv_pm = true,                                         \
-        .rx_with_siso_diversity = true,                         \
-        .iq_invert = true                                       \
+        .rx_with_siso_diversity = true
 
 const struct iwl_cfg iwl135_bgn_cfg = {
         .name = "Intel(R) Centrino(R) Wireless-N 135 BGN",
@@ -328,7 +219,7 @@ const struct iwl_cfg iwl135_bgn_cfg = {
         .ht_params = &iwl2000_ht_params,
 };
 
-MODULE_FIRMWARE(IWL2000_MODULE_FIRMWARE(IWL2000_UCODE_API_MAX));
-MODULE_FIRMWARE(IWL2030_MODULE_FIRMWARE(IWL2030_UCODE_API_MAX));
-MODULE_FIRMWARE(IWL105_MODULE_FIRMWARE(IWL105_UCODE_API_MAX));
-MODULE_FIRMWARE(IWL135_MODULE_FIRMWARE(IWL135_UCODE_API_MAX));
+MODULE_FIRMWARE(IWL2000_MODULE_FIRMWARE(IWL2000_UCODE_API_OK));
+MODULE_FIRMWARE(IWL2030_MODULE_FIRMWARE(IWL2030_UCODE_API_OK));
+MODULE_FIRMWARE(IWL105_MODULE_FIRMWARE(IWL105_UCODE_API_OK));
+MODULE_FIRMWARE(IWL135_MODULE_FIRMWARE(IWL135_UCODE_API_OK));
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index a805e97b89af..8e26bc825f23 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -24,299 +24,47 @@
  *
  *****************************************************************************/
 
-#include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/sched.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <net/mac80211.h>
-#include <linux/etherdevice.h>
-#include <asm/unaligned.h>
 #include <linux/stringify.h>
-
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-io.h"
-#include "iwl-agn.h"
-#include "iwl-agn-hw.h"
-#include "iwl-trans.h"
-#include "iwl-shared.h"
+#include "iwl-config.h"
 #include "iwl-cfg.h"
-#include "iwl-prph.h"
+#include "iwl-agn-hw.h"
+#include "iwl-csr.h"
 
 /* Highest firmware API version supported */
 #define IWL5000_UCODE_API_MAX 5
 #define IWL5150_UCODE_API_MAX 2
 
+/* Oldest version we won't warn about */
+#define IWL5000_UCODE_API_OK 5
+#define IWL5150_UCODE_API_OK 2
+
 /* Lowest firmware API version supported */
 #define IWL5000_UCODE_API_MIN 1
 #define IWL5150_UCODE_API_MIN 1
 
+/* EEPROM versions */
+#define EEPROM_5000_TX_POWER_VERSION    (4)
+#define EEPROM_5000_EEPROM_VERSION      (0x11A)
+#define EEPROM_5050_TX_POWER_VERSION    (4)
+#define EEPROM_5050_EEPROM_VERSION      (0x21E)
+
 #define IWL5000_FW_PRE "iwlwifi-5000-"
 #define IWL5000_MODULE_FIRMWARE(api) IWL5000_FW_PRE __stringify(api) ".ucode"
 
 #define IWL5150_FW_PRE "iwlwifi-5150-"
 #define IWL5150_MODULE_FIRMWARE(api) IWL5150_FW_PRE __stringify(api) ".ucode"
 
-/* NIC configuration for 5000 series */
-static void iwl5000_nic_config(struct iwl_priv *priv)
-{
-        iwl_rf_config(priv);
-
-        /* W/A : NIC is stuck in a reset state after Early PCIe power off
-         * (PCIe power is lost before PERST# is asserted),
-         * causing ME FW to lose ownership and not being able to obtain it back.
-         */
-        iwl_set_bits_mask_prph(trans(priv), APMG_PS_CTRL_REG,
-                                APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS,
-                                ~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);
-}
-
-static const struct iwl_sensitivity_ranges iwl5000_sensitivity = {
-        .min_nrg_cck = 100,
-        .auto_corr_min_ofdm = 90,
-        .auto_corr_min_ofdm_mrc = 170,
-        .auto_corr_min_ofdm_x1 = 105,
-        .auto_corr_min_ofdm_mrc_x1 = 220,
-
-        .auto_corr_max_ofdm = 120,
-        .auto_corr_max_ofdm_mrc = 210,
-        .auto_corr_max_ofdm_x1 = 120,
-        .auto_corr_max_ofdm_mrc_x1 = 240,
-
-        .auto_corr_min_cck = 125,
-        .auto_corr_max_cck = 200,
-        .auto_corr_min_cck_mrc = 200,
-        .auto_corr_max_cck_mrc = 400,
-        .nrg_th_cck = 100,
-        .nrg_th_ofdm = 100,
-
-        .barker_corr_th_min = 190,
-        .barker_corr_th_min_mrc = 390,
-        .nrg_th_cca = 62,
-};
-
-static struct iwl_sensitivity_ranges iwl5150_sensitivity = {
-        .min_nrg_cck = 95,
-        .auto_corr_min_ofdm = 90,
-        .auto_corr_min_ofdm_mrc = 170,
-        .auto_corr_min_ofdm_x1 = 105,
-        .auto_corr_min_ofdm_mrc_x1 = 220,
-
-        .auto_corr_max_ofdm = 120,
-        .auto_corr_max_ofdm_mrc = 210,
-        /* max = min for performance bug in 5150 DSP */
-        .auto_corr_max_ofdm_x1 = 105,
-        .auto_corr_max_ofdm_mrc_x1 = 220,
-
-        .auto_corr_min_cck = 125,
-        .auto_corr_max_cck = 200,
-        .auto_corr_min_cck_mrc = 170,
-        .auto_corr_max_cck_mrc = 400,
-        .nrg_th_cck = 95,
-        .nrg_th_ofdm = 95,
-
-        .barker_corr_th_min = 190,
-        .barker_corr_th_min_mrc = 390,
-        .nrg_th_cca = 62,
-};
-
-#define IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF   (-5)
-
-static s32 iwl_temp_calib_to_offset(struct iwl_shared *shrd)
-{
-        u16 temperature, voltage;
-        __le16 *temp_calib = (__le16 *)iwl_eeprom_query_addr(shrd,
-                                EEPROM_KELVIN_TEMPERATURE);
-
-        temperature = le16_to_cpu(temp_calib[0]);
-        voltage = le16_to_cpu(temp_calib[1]);
-
-        /* offset = temp - volt / coeff */
-        return (s32)(temperature - voltage / IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF);
-}
-
-static void iwl5150_set_ct_threshold(struct iwl_priv *priv)
-{
-        const s32 volt2temp_coef = IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF;
-        s32 threshold = (s32)CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD_LEGACY) -
-                        iwl_temp_calib_to_offset(priv->shrd);
-
-        hw_params(priv).ct_kill_threshold = threshold * volt2temp_coef;
-}
-
-static void iwl5000_set_ct_threshold(struct iwl_priv *priv)
-{
-        /* want Celsius */
-        hw_params(priv).ct_kill_threshold = CT_KILL_THRESHOLD_LEGACY;
-}
-
-static void iwl5000_hw_set_hw_params(struct iwl_priv *priv)
-{
-        hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
-                                        BIT(IEEE80211_BAND_5GHZ);
-
-        hw_params(priv).tx_chains_num =
-                num_of_ant(hw_params(priv).valid_tx_ant);
-        hw_params(priv).rx_chains_num =
-                num_of_ant(hw_params(priv).valid_rx_ant);
-
-        iwl5000_set_ct_threshold(priv);
-
-        /* Set initial sensitivity parameters */
-        hw_params(priv).sens = &iwl5000_sensitivity;
-}
-
-static void iwl5150_hw_set_hw_params(struct iwl_priv *priv)
-{
-        hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
-                                        BIT(IEEE80211_BAND_5GHZ);
-
-        hw_params(priv).tx_chains_num =
-                num_of_ant(hw_params(priv).valid_tx_ant);
-        hw_params(priv).rx_chains_num =
-                num_of_ant(hw_params(priv).valid_rx_ant);
-
-        iwl5150_set_ct_threshold(priv);
-
-        /* Set initial sensitivity parameters */
-        hw_params(priv).sens = &iwl5150_sensitivity;
-}
-
-static void iwl5150_temperature(struct iwl_priv *priv)
-{
-        u32 vt = 0;
-        s32 offset =  iwl_temp_calib_to_offset(priv->shrd);
-
-        vt = le32_to_cpu(priv->statistics.common.temperature);
-        vt = vt / IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF + offset;
-        /* now vt hold the temperature in Kelvin */
-        priv->temperature = KELVIN_TO_CELSIUS(vt);
-        iwl_tt_handler(priv);
-}
-
-static int iwl5000_hw_channel_switch(struct iwl_priv *priv,
-                                     struct ieee80211_channel_switch *ch_switch)
-{
-        /*
-         * MULTI-FIXME
-         * See iwlagn_mac_channel_switch.
-         */
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        struct iwl5000_channel_switch_cmd cmd;
-        const struct iwl_channel_info *ch_info;
-        u32 switch_time_in_usec, ucode_switch_time;
-        u16 ch;
-        u32 tsf_low;
-        u8 switch_count;
-        u16 beacon_interval = le16_to_cpu(ctx->timing.beacon_interval);
-        struct ieee80211_vif *vif = ctx->vif;
-        struct iwl_host_cmd hcmd = {
-                .id = REPLY_CHANNEL_SWITCH,
-                .len = { sizeof(cmd), },
-                .flags = CMD_SYNC,
-                .data = { &cmd, },
-        };
-
-        cmd.band = priv->band == IEEE80211_BAND_2GHZ;
-        ch = ch_switch->channel->hw_value;
-        IWL_DEBUG_11H(priv, "channel switch from %d to %d\n",
-                      ctx->active.channel, ch);
-        cmd.channel = cpu_to_le16(ch);
-        cmd.rxon_flags = ctx->staging.flags;
-        cmd.rxon_filter_flags = ctx->staging.filter_flags;
-        switch_count = ch_switch->count;
-        tsf_low = ch_switch->timestamp & 0x0ffffffff;
-        /*
-         * calculate the ucode channel switch time
-         * adding TSF as one of the factor for when to switch
-         */
-        if ((priv->ucode_beacon_time > tsf_low) && beacon_interval) {
-                if (switch_count > ((priv->ucode_beacon_time - tsf_low) /
-                    beacon_interval)) {
-                        switch_count -= (priv->ucode_beacon_time -
-                                tsf_low) / beacon_interval;
-                } else
-                        switch_count = 0;
-        }
-        if (switch_count <= 1)
-                cmd.switch_time = cpu_to_le32(priv->ucode_beacon_time);
-        else {
-                switch_time_in_usec =
-                        vif->bss_conf.beacon_int * switch_count * TIME_UNIT;
-                ucode_switch_time = iwl_usecs_to_beacons(priv,
-                                                         switch_time_in_usec,
-                                                         beacon_interval);
-                cmd.switch_time = iwl_add_beacon_time(priv,
-                                                      priv->ucode_beacon_time,
-                                                      ucode_switch_time,
-                                                      beacon_interval);
-        }
-        IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n",
-                      cmd.switch_time);
-        ch_info = iwl_get_channel_info(priv, priv->band, ch);
-        if (ch_info)
-                cmd.expect_beacon = is_channel_radar(ch_info);
-        else {
-                IWL_ERR(priv, "invalid channel switch from %u to %u\n",
-                        ctx->active.channel, ch);
-                return -EFAULT;
-        }
-
-        return iwl_dvm_send_cmd(priv, &hcmd);
-}
-
-static struct iwl_lib_ops iwl5000_lib = {
-        .set_hw_params = iwl5000_hw_set_hw_params,
-        .set_channel_switch = iwl5000_hw_channel_switch,
-        .nic_config = iwl5000_nic_config,
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REG_BAND_1_CHANNELS,
-                        EEPROM_REG_BAND_2_CHANNELS,
-                        EEPROM_REG_BAND_3_CHANNELS,
-                        EEPROM_REG_BAND_4_CHANNELS,
-                        EEPROM_REG_BAND_5_CHANNELS,
-                        EEPROM_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REG_BAND_52_HT40_CHANNELS
-                },
-        },
-        .temperature = iwlagn_temperature,
-};
-
-static struct iwl_lib_ops iwl5150_lib = {
-        .set_hw_params = iwl5150_hw_set_hw_params,
-        .set_channel_switch = iwl5000_hw_channel_switch,
-        .nic_config = iwl5000_nic_config,
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REG_BAND_1_CHANNELS,
-                        EEPROM_REG_BAND_2_CHANNELS,
-                        EEPROM_REG_BAND_3_CHANNELS,
-                        EEPROM_REG_BAND_4_CHANNELS,
-                        EEPROM_REG_BAND_5_CHANNELS,
-                        EEPROM_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REG_BAND_52_HT40_CHANNELS
-                },
-        },
-        .temperature = iwl5150_temperature,
-};
-
 static const struct iwl_base_params iwl5000_base_params = {
         .eeprom_size = IWLAGN_EEPROM_IMG_SIZE,
         .num_of_queues = IWLAGN_NUM_QUEUES,
-        .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
         .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
         .led_compensation = 51,
         .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
         .chain_noise_scale = 1000,
-        .wd_timeout = IWL_LONG_WD_TIMEOUT,
+        .wd_timeout = IWL_WATCHHDOG_DISABLED,
         .max_event_log_size = 512,
         .no_idle_support = true,
-        .wd_disable = true,
 };
 
 static const struct iwl_ht_params iwl5000_ht_params = {
@@ -326,12 +74,13 @@ static const struct iwl_ht_params iwl5000_ht_params = {
 #define IWL_DEVICE_5000                                         \
         .fw_name_pre = IWL5000_FW_PRE,                          \
         .ucode_api_max = IWL5000_UCODE_API_MAX,                 \
+        .ucode_api_ok = IWL5000_UCODE_API_OK,                   \
         .ucode_api_min = IWL5000_UCODE_API_MIN,                 \
+        .device_family = IWL_DEVICE_FAMILY_5000,                \
         .max_inst_size = IWLAGN_RTC_INST_SIZE,                  \
         .max_data_size = IWLAGN_RTC_DATA_SIZE,                  \
         .eeprom_ver = EEPROM_5000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,       \
-        .lib = &iwl5000_lib,                                    \
         .base_params = &iwl5000_base_params,                    \
         .led_mode = IWL_LED_BLINK
 
@@ -371,12 +120,13 @@ const struct iwl_cfg iwl5350_agn_cfg = {
         .name = "Intel(R) WiMAX/WiFi Link 5350 AGN",
         .fw_name_pre = IWL5000_FW_PRE,
         .ucode_api_max = IWL5000_UCODE_API_MAX,
+        .ucode_api_ok = IWL5000_UCODE_API_OK,
         .ucode_api_min = IWL5000_UCODE_API_MIN,
+        .device_family = IWL_DEVICE_FAMILY_5000,
         .max_inst_size = IWLAGN_RTC_INST_SIZE,
         .max_data_size = IWLAGN_RTC_DATA_SIZE,
         .eeprom_ver = EEPROM_5050_EEPROM_VERSION,
         .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,
-        .lib = &iwl5000_lib,
         .base_params = &iwl5000_base_params,
         .ht_params = &iwl5000_ht_params,
         .led_mode = IWL_LED_BLINK,
@@ -386,12 +136,13 @@ const struct iwl_cfg iwl5350_agn_cfg = {
 #define IWL_DEVICE_5150                                         \
         .fw_name_pre = IWL5150_FW_PRE,                          \
         .ucode_api_max = IWL5150_UCODE_API_MAX,                 \
+        .ucode_api_ok = IWL5150_UCODE_API_OK,                   \
         .ucode_api_min = IWL5150_UCODE_API_MIN,                 \
+        .device_family = IWL_DEVICE_FAMILY_5150,                \
         .max_inst_size = IWLAGN_RTC_INST_SIZE,                  \
         .max_data_size = IWLAGN_RTC_DATA_SIZE,                  \
         .eeprom_ver = EEPROM_5050_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,       \
-        .lib = &iwl5150_lib,                                    \
         .base_params = &iwl5000_base_params,                    \
         .no_xtal_calib = true,                                  \
         .led_mode = IWL_LED_BLINK,                              \
@@ -409,5 +160,5 @@ const struct iwl_cfg iwl5150_abg_cfg = {
         IWL_DEVICE_5150,
 };
 
-MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX));
-MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX));
+MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_OK));
+MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_OK));
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 64060cd738b5..381b02cf339c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -24,26 +24,12 @@
  *
  *****************************************************************************/
 
-#include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <net/mac80211.h>
-#include <linux/etherdevice.h>
-#include <asm/unaligned.h>
 #include <linux/stringify.h>
-
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-io.h"
-#include "iwl-agn.h"
-#include "iwl-agn-hw.h"
-#include "iwl-trans.h"
-#include "iwl-shared.h"
+#include "iwl-config.h"
 #include "iwl-cfg.h"
+#include "iwl-agn-hw.h"
+#include "iwl-commands.h" /* needed for BT for now */
 
 /* Highest firmware API version supported */
 #define IWL6000_UCODE_API_MAX 6
@@ -53,12 +39,28 @@
 /* Oldest version we won't warn about */
 #define IWL6000_UCODE_API_OK 4
 #define IWL6000G2_UCODE_API_OK 5
+#define IWL6050_UCODE_API_OK 5
+#define IWL6000G2B_UCODE_API_OK 6
 
 /* Lowest firmware API version supported */
 #define IWL6000_UCODE_API_MIN 4
 #define IWL6050_UCODE_API_MIN 4
 #define IWL6000G2_UCODE_API_MIN 4
 
+/* EEPROM versions */
+#define EEPROM_6000_TX_POWER_VERSION    (4)
+#define EEPROM_6000_EEPROM_VERSION      (0x423)
+#define EEPROM_6050_TX_POWER_VERSION    (4)
+#define EEPROM_6050_EEPROM_VERSION      (0x532)
+#define EEPROM_6150_TX_POWER_VERSION    (6)
+#define EEPROM_6150_EEPROM_VERSION      (0x553)
+#define EEPROM_6005_TX_POWER_VERSION    (6)
+#define EEPROM_6005_EEPROM_VERSION      (0x709)
+#define EEPROM_6030_TX_POWER_VERSION    (6)
+#define EEPROM_6030_EEPROM_VERSION      (0x709)
+#define EEPROM_6035_TX_POWER_VERSION    (6)
+#define EEPROM_6035_EEPROM_VERSION      (0x753)
+
 #define IWL6000_FW_PRE "iwlwifi-6000-"
 #define IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE __stringify(api) ".ucode"
 
@@ -71,205 +73,9 @@
 #define IWL6030_FW_PRE "iwlwifi-6000g2b-"
 #define IWL6030_MODULE_FIRMWARE(api) IWL6030_FW_PRE __stringify(api) ".ucode"
 
-static void iwl6000_set_ct_threshold(struct iwl_priv *priv)
-{
-        /* want Celsius */
-        hw_params(priv).ct_kill_threshold = CT_KILL_THRESHOLD;
-        hw_params(priv).ct_kill_exit_threshold = CT_KILL_EXIT_THRESHOLD;
-}
-
-static void iwl6050_additional_nic_config(struct iwl_priv *priv)
-{
-        /* Indicate calibration version to uCode. */
-        if (iwl_eeprom_calib_version(priv->shrd) >= 6)
-                iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,
-                                CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
-}
-
-static void iwl6150_additional_nic_config(struct iwl_priv *priv)
-{
-        /* Indicate calibration version to uCode. */
-        if (iwl_eeprom_calib_version(priv->shrd) >= 6)
-                iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,
-                                CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
-        iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,
-                    CSR_GP_DRIVER_REG_BIT_6050_1x2);
-}
-
-static void iwl6000i_additional_nic_config(struct iwl_priv *priv)
-{
-        /* 2x2 IPA phy type */
-        iwl_write32(trans(priv), CSR_GP_DRIVER_REG,
-                     CSR_GP_DRIVER_REG_BIT_RADIO_SKU_2x2_IPA);
-}
-
-/* NIC configuration for 6000 series */
-static void iwl6000_nic_config(struct iwl_priv *priv)
-{
-        iwl_rf_config(priv);
-
-        /* do additional nic configuration if needed */
-        if (cfg(priv)->additional_nic_config)
-                cfg(priv)->additional_nic_config(priv);
-}
-
-static const struct iwl_sensitivity_ranges iwl6000_sensitivity = {
-        .min_nrg_cck = 110,
-        .auto_corr_min_ofdm = 80,
-        .auto_corr_min_ofdm_mrc = 128,
-        .auto_corr_min_ofdm_x1 = 105,
-        .auto_corr_min_ofdm_mrc_x1 = 192,
-
-        .auto_corr_max_ofdm = 145,
-        .auto_corr_max_ofdm_mrc = 232,
-        .auto_corr_max_ofdm_x1 = 110,
-        .auto_corr_max_ofdm_mrc_x1 = 232,
-
-        .auto_corr_min_cck = 125,
-        .auto_corr_max_cck = 175,
-        .auto_corr_min_cck_mrc = 160,
-        .auto_corr_max_cck_mrc = 310,
-        .nrg_th_cck = 110,
-        .nrg_th_ofdm = 110,
-
-        .barker_corr_th_min = 190,
-        .barker_corr_th_min_mrc = 336,
-        .nrg_th_cca = 62,
-};
-
-static void iwl6000_hw_set_hw_params(struct iwl_priv *priv)
-{
-        hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
-                                        BIT(IEEE80211_BAND_5GHZ);
-
-        hw_params(priv).tx_chains_num =
-                num_of_ant(hw_params(priv).valid_tx_ant);
-        if (cfg(priv)->rx_with_siso_diversity)
-                hw_params(priv).rx_chains_num = 1;
-        else
-                hw_params(priv).rx_chains_num =
-                        num_of_ant(hw_params(priv).valid_rx_ant);
-
-        iwl6000_set_ct_threshold(priv);
-
-        /* Set initial sensitivity parameters */
-        hw_params(priv).sens = &iwl6000_sensitivity;
-
-}
-
-static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
-                                     struct ieee80211_channel_switch *ch_switch)
-{
-        /*
-         * MULTI-FIXME
-         * See iwlagn_mac_channel_switch.
-         */
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        struct iwl6000_channel_switch_cmd cmd;
-        const struct iwl_channel_info *ch_info;
-        u32 switch_time_in_usec, ucode_switch_time;
-        u16 ch;
-        u32 tsf_low;
-        u8 switch_count;
-        u16 beacon_interval = le16_to_cpu(ctx->timing.beacon_interval);
-        struct ieee80211_vif *vif = ctx->vif;
-        struct iwl_host_cmd hcmd = {
-                .id = REPLY_CHANNEL_SWITCH,
-                .len = { sizeof(cmd), },
-                .flags = CMD_SYNC,
-                .data = { &cmd, },
-        };
-
-        cmd.band = priv->band == IEEE80211_BAND_2GHZ;
-        ch = ch_switch->channel->hw_value;
-        IWL_DEBUG_11H(priv, "channel switch from %u to %u\n",
-                      ctx->active.channel, ch);
-        cmd.channel = cpu_to_le16(ch);
-        cmd.rxon_flags = ctx->staging.flags;
-        cmd.rxon_filter_flags = ctx->staging.filter_flags;
-        switch_count = ch_switch->count;
-        tsf_low = ch_switch->timestamp & 0x0ffffffff;
-        /*
-         * calculate the ucode channel switch time
-         * adding TSF as one of the factor for when to switch
-         */
-        if ((priv->ucode_beacon_time > tsf_low) && beacon_interval) {
-                if (switch_count > ((priv->ucode_beacon_time - tsf_low) /
-                    beacon_interval)) {
-                        switch_count -= (priv->ucode_beacon_time -
-                                tsf_low) / beacon_interval;
-                } else
-                        switch_count = 0;
-        }
-        if (switch_count <= 1)
-                cmd.switch_time = cpu_to_le32(priv->ucode_beacon_time);
-        else {
-                switch_time_in_usec =
-                        vif->bss_conf.beacon_int * switch_count * TIME_UNIT;
-                ucode_switch_time = iwl_usecs_to_beacons(priv,
-                                                         switch_time_in_usec,
-                                                         beacon_interval);
-                cmd.switch_time = iwl_add_beacon_time(priv,
-                                                      priv->ucode_beacon_time,
-                                                      ucode_switch_time,
-                                                      beacon_interval);
-        }
-        IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n",
-                      cmd.switch_time);
-        ch_info = iwl_get_channel_info(priv, priv->band, ch);
-        if (ch_info)
-                cmd.expect_beacon = is_channel_radar(ch_info);
-        else {
-                IWL_ERR(priv, "invalid channel switch from %u to %u\n",
-                        ctx->active.channel, ch);
-                return -EFAULT;
-        }
-
-        return iwl_dvm_send_cmd(priv, &hcmd);
-}
-
-static struct iwl_lib_ops iwl6000_lib = {
-        .set_hw_params = iwl6000_hw_set_hw_params,
-        .set_channel_switch = iwl6000_hw_channel_switch,
-        .nic_config = iwl6000_nic_config,
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REG_BAND_1_CHANNELS,
-                        EEPROM_REG_BAND_2_CHANNELS,
-                        EEPROM_REG_BAND_3_CHANNELS,
-                        EEPROM_REG_BAND_4_CHANNELS,
-                        EEPROM_REG_BAND_5_CHANNELS,
-                        EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REG_BAND_52_HT40_CHANNELS
-                },
-                .enhanced_txpower = true,
-        },
-        .temperature = iwlagn_temperature,
-};
-
-static struct iwl_lib_ops iwl6030_lib = {
-        .set_hw_params = iwl6000_hw_set_hw_params,
-        .set_channel_switch = iwl6000_hw_channel_switch,
-        .nic_config = iwl6000_nic_config,
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REG_BAND_1_CHANNELS,
-                        EEPROM_REG_BAND_2_CHANNELS,
-                        EEPROM_REG_BAND_3_CHANNELS,
-                        EEPROM_REG_BAND_4_CHANNELS,
-                        EEPROM_REG_BAND_5_CHANNELS,
-                        EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REG_BAND_52_HT40_CHANNELS
-                },
-                .enhanced_txpower = true,
-        },
-        .temperature = iwlagn_temperature,
-};
-
 static const struct iwl_base_params iwl6000_base_params = {
         .eeprom_size = OTP_LOW_IMAGE_SIZE,
         .num_of_queues = IWLAGN_NUM_QUEUES,
-        .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
         .pll_cfg_val = 0,
         .max_ll_items = OTP_MAX_LL_ITEMS_6x00,
         .shadow_ram_support = true,
@@ -286,7 +92,6 @@ static const struct iwl_base_params iwl6000_base_params = {
 static const struct iwl_base_params iwl6050_base_params = {
         .eeprom_size = OTP_LOW_IMAGE_SIZE,
         .num_of_queues = IWLAGN_NUM_QUEUES,
-        .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
         .pll_cfg_val = 0,
         .max_ll_items = OTP_MAX_LL_ITEMS_6x50,
         .shadow_ram_support = true,
@@ -303,7 +108,6 @@ static const struct iwl_base_params iwl6050_base_params = {
 static const struct iwl_base_params iwl6000_g2_base_params = {
         .eeprom_size = OTP_LOW_IMAGE_SIZE,
         .num_of_queues = IWLAGN_NUM_QUEUES,
-        .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
         .pll_cfg_val = 0,
         .max_ll_items = OTP_MAX_LL_ITEMS_6x00,
         .shadow_ram_support = true,
@@ -336,11 +140,11 @@ static const struct iwl_bt_params iwl6000_bt_params = {
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,               \
         .ucode_api_ok = IWL6000G2_UCODE_API_OK,                 \
         .ucode_api_min = IWL6000G2_UCODE_API_MIN,               \
+        .device_family = IWL_DEVICE_FAMILY_6005,                \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
         .eeprom_ver = EEPROM_6005_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6005_TX_POWER_VERSION,       \
-        .lib = &iwl6000_lib,                                    \
         .base_params = &iwl6000_g2_base_params,                 \
         .need_temp_offset_calib = true,                         \
         .led_mode = IWL_LED_RF_STATE
@@ -388,13 +192,13 @@ const struct iwl_cfg iwl6005_2agn_mow2_cfg = {
 #define IWL_DEVICE_6030                                         \
         .fw_name_pre = IWL6030_FW_PRE,                          \
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,               \
-        .ucode_api_ok = IWL6000G2_UCODE_API_OK,                 \
+        .ucode_api_ok = IWL6000G2B_UCODE_API_OK,                \
         .ucode_api_min = IWL6000G2_UCODE_API_MIN,               \
+        .device_family = IWL_DEVICE_FAMILY_6030,                \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
         .eeprom_ver = EEPROM_6030_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6030_TX_POWER_VERSION,       \
-        .lib = &iwl6030_lib,                                    \
         .base_params = &iwl6000_g2_base_params,                 \
         .bt_params = &iwl6000_bt_params,                        \
         .need_temp_offset_calib = true,                         \
@@ -461,14 +265,13 @@ const struct iwl_cfg iwl130_bg_cfg = {
         .ucode_api_max = IWL6000_UCODE_API_MAX,                 \
         .ucode_api_ok = IWL6000_UCODE_API_OK,                   \
         .ucode_api_min = IWL6000_UCODE_API_MIN,                 \
+        .device_family = IWL_DEVICE_FAMILY_6000i,               \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
         .valid_tx_ant = ANT_BC,         /* .cfg overwrite */    \
         .valid_rx_ant = ANT_BC,         /* .cfg overwrite */    \
         .eeprom_ver = EEPROM_6000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,       \
-        .lib = &iwl6000_lib,                                    \
-        .additional_nic_config = iwl6000i_additional_nic_config,\
         .base_params = &iwl6000_base_params,                    \
         .led_mode = IWL_LED_BLINK
 
@@ -492,12 +295,11 @@ const struct iwl_cfg iwl6000i_2bg_cfg = {
         .fw_name_pre = IWL6050_FW_PRE,                          \
         .ucode_api_max = IWL6050_UCODE_API_MAX,                 \
         .ucode_api_min = IWL6050_UCODE_API_MIN,                 \
+        .device_family = IWL_DEVICE_FAMILY_6050,                \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
         .valid_tx_ant = ANT_AB,         /* .cfg overwrite */    \
         .valid_rx_ant = ANT_AB,         /* .cfg overwrite */    \
-        .lib = &iwl6000_lib,                                    \
-        .additional_nic_config = iwl6050_additional_nic_config, \
         .eeprom_ver = EEPROM_6050_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,       \
         .base_params = &iwl6050_base_params,                    \
@@ -519,10 +321,9 @@ const struct iwl_cfg iwl6050_2abg_cfg = {
         .fw_name_pre = IWL6050_FW_PRE,                          \
         .ucode_api_max = IWL6050_UCODE_API_MAX,                 \
         .ucode_api_min = IWL6050_UCODE_API_MIN,                 \
+        .device_family = IWL_DEVICE_FAMILY_6150,                \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
-        .lib = &iwl6000_lib,                                    \
-        .additional_nic_config = iwl6150_additional_nic_config, \
         .eeprom_ver = EEPROM_6150_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6150_TX_POWER_VERSION,       \
         .base_params = &iwl6050_base_params,                    \
@@ -546,17 +347,17 @@ const struct iwl_cfg iwl6000_3agn_cfg = {
         .ucode_api_max = IWL6000_UCODE_API_MAX,
         .ucode_api_ok = IWL6000_UCODE_API_OK,
         .ucode_api_min = IWL6000_UCODE_API_MIN,
+        .device_family = IWL_DEVICE_FAMILY_6000,
         .max_inst_size = IWL60_RTC_INST_SIZE,
         .max_data_size = IWL60_RTC_DATA_SIZE,
         .eeprom_ver = EEPROM_6000_EEPROM_VERSION,
         .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,
-        .lib = &iwl6000_lib,
         .base_params = &iwl6000_base_params,
         .ht_params = &iwl6000_ht_params,
         .led_mode = IWL_LED_BLINK,
 };
 
 MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_OK));
-MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));
-MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));
-MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));
+MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_OK));
+MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_OK));
+MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2B_UCODE_API_OK));
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
index 84cbe7bb504c..95f27f1a423b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
@@ -64,7 +64,6 @@
 #include <net/mac80211.h>
 
 #include "iwl-dev.h"
-#include "iwl-core.h"
 #include "iwl-agn-calib.h"
 #include "iwl-trans.h"
 #include "iwl-agn.h"
@@ -190,7 +189,7 @@ static int iwl_sens_energy_cck(struct iwl_priv *priv,
         u32 max_false_alarms = MAX_FA_CCK * rx_enable_time;
         u32 min_false_alarms = MIN_FA_CCK * rx_enable_time;
         struct iwl_sensitivity_data *data = NULL;
-        const struct iwl_sensitivity_ranges *ranges = hw_params(priv).sens;
+        const struct iwl_sensitivity_ranges *ranges = priv->hw_params.sens;
 
         data = &(priv->sensitivity_data);
 
@@ -373,7 +372,7 @@ static int iwl_sens_auto_corr_ofdm(struct iwl_priv *priv,
         u32 max_false_alarms = MAX_FA_OFDM * rx_enable_time;
         u32 min_false_alarms = MIN_FA_OFDM * rx_enable_time;
         struct iwl_sensitivity_data *data = NULL;
-        const struct iwl_sensitivity_ranges *ranges = hw_params(priv).sens;
+        const struct iwl_sensitivity_ranges *ranges = priv->hw_params.sens;
 
         data = &(priv->sensitivity_data);
 
@@ -521,7 +520,7 @@ static int iwl_enhance_sensitivity_write(struct iwl_priv *priv)
 
         iwl_prepare_legacy_sensitivity_tbl(priv, data, &cmd.enhance_table[0]);
 
-        if (cfg(priv)->base_params->hd_v2) {
+        if (priv->cfg->base_params->hd_v2) {
                 cmd.enhance_table[HD_INA_NON_SQUARE_DET_OFDM_INDEX] =
                         HD_INA_NON_SQUARE_DET_OFDM_DATA_V2;
                 cmd.enhance_table[HD_INA_NON_SQUARE_DET_CCK_INDEX] =
@@ -597,9 +596,9 @@ void iwl_init_sensitivity(struct iwl_priv *priv)
         int ret = 0;
         int i;
         struct iwl_sensitivity_data *data = NULL;
-        const struct iwl_sensitivity_ranges *ranges = hw_params(priv).sens;
+        const struct iwl_sensitivity_ranges *ranges = priv->hw_params.sens;
 
-        if (priv->disable_sens_cal)
+        if (priv->calib_disabled & IWL_SENSITIVITY_CALIB_DISABLED)
                 return;
 
         IWL_DEBUG_CALIB(priv, "Start iwl_init_sensitivity\n");
@@ -663,7 +662,7 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv)
         struct statistics_rx_phy *ofdm, *cck;
         struct statistics_general_data statis;
 
-        if (priv->disable_sens_cal)
+        if (priv->calib_disabled & IWL_SENSITIVITY_CALIB_DISABLED)
                 return;
 
         data = &(priv->sensitivity_data);
@@ -833,28 +832,28 @@ static void iwl_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,
          * To be safe, simply mask out any chains that we know
          * are not on the device.
          */
-        active_chains &= hw_params(priv).valid_rx_ant;
+        active_chains &= priv->hw_params.valid_rx_ant;
 
         num_tx_chains = 0;
         for (i = 0; i < NUM_RX_CHAINS; i++) {
                 /* loops on all the bits of
                  * priv->hw_setting.valid_tx_ant */
                 u8 ant_msk = (1 << i);
-                if (!(hw_params(priv).valid_tx_ant & ant_msk))
+                if (!(priv->hw_params.valid_tx_ant & ant_msk))
                         continue;
 
                 num_tx_chains++;
                 if (data->disconn_array[i] == 0)
                         /* there is a Tx antenna connected */
                         break;
-                if (num_tx_chains == hw_params(priv).tx_chains_num &&
+                if (num_tx_chains == priv->hw_params.tx_chains_num &&
                     data->disconn_array[i]) {
                         /*
                          * If all chains are disconnected
                          * connect the first valid tx chain
                          */
                         first_chain =
-                                find_first_chain(hw_params(priv).valid_tx_ant);
+                                find_first_chain(priv->hw_params.valid_tx_ant);
                         data->disconn_array[first_chain] = 0;
                         active_chains |= BIT(first_chain);
                         IWL_DEBUG_CALIB(priv,
@@ -864,13 +863,13 @@ static void iwl_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,
                 }
         }
 
-        if (active_chains != hw_params(priv).valid_rx_ant &&
+        if (active_chains != priv->hw_params.valid_rx_ant &&
             active_chains != priv->chain_noise_data.active_chains)
                 IWL_DEBUG_CALIB(priv,
                                 "Detected that not all antennas are connected! "
                                 "Connected: %#x, valid: %#x.\n",
                                 active_chains,
-                                hw_params(priv).valid_rx_ant);
+                                priv->hw_params.valid_rx_ant);
 
         /* Save for use within RXON, TX, SCAN commands, etc. */
         data->active_chains = active_chains;
@@ -895,7 +894,7 @@ static void iwlagn_gain_computation(struct iwl_priv *priv,
                         continue;
                 }
 
-                delta_g = (cfg(priv)->base_params->chain_noise_scale *
+                delta_g = (priv->cfg->base_params->chain_noise_scale *
                         ((s32)average_noise[default_chain] -
                         (s32)average_noise[i])) / 1500;
 
@@ -970,7 +969,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv)
          */
         struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
 
-        if (priv->disable_chain_noise_cal)
+        if (priv->calib_disabled & IWL_CHAIN_NOISE_CALIB_DISABLED)
                 return;
 
         data = &(priv->chain_noise_data);
@@ -1051,11 +1050,11 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv)
                 return;
 
         /* Analyze signal for disconnected antenna */
-        if (cfg(priv)->bt_params &&
-            cfg(priv)->bt_params->advanced_bt_coexist) {
+        if (priv->cfg->bt_params &&
+            priv->cfg->bt_params->advanced_bt_coexist) {
                 /* Disable disconnected antenna algorithm for advanced
                    bt coex, assuming valid antennas are connected */
-                data->active_chains = hw_params(priv).valid_rx_ant;
+                data->active_chains = priv->hw_params.valid_rx_ant;
                 for (i = 0; i < NUM_RX_CHAINS; i++)
                         if (!(data->active_chains & (1<<i)))
                                 data->disconn_array[i] = 1;
@@ -1085,7 +1084,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv)
                         min_average_noise, min_average_noise_antenna_i);
 
         iwlagn_gain_computation(priv, average_noise,
-                                find_first_chain(hw_params(priv).valid_rx_ant));
+                                find_first_chain(priv->hw_params.valid_rx_ant));
 
         /* Some power changes may have been made during the calibration.
          * Update and commit the RXON
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-calib.h b/drivers/net/wireless/iwlwifi/iwl-agn-calib.h
index 9ed6683314a7..dbe13787f272 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-calib.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-calib.h
@@ -63,7 +63,6 @@
 #define __iwl_calib_h__
 
 #include "iwl-dev.h"
-#include "iwl-core.h"
 #include "iwl-commands.h"
 
 void iwl_chain_noise_calibration(struct iwl_priv *priv);
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-devices.c b/drivers/net/wireless/iwlwifi/iwl-agn-devices.c
new file mode 100644
index 000000000000..48533b3a0f9a
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-devices.c
@@ -0,0 +1,755 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ *****************************************************************************/
+
+/*
+ * DVM device-specific data & functions
+ */
+#include "iwl-agn.h"
+#include "iwl-dev.h"
+#include "iwl-commands.h"
+#include "iwl-io.h"
+#include "iwl-prph.h"
+
+/*
+ * 1000 series
+ * ===========
+ */
+
+/*
+ * For 1000, use advance thermal throttling critical temperature threshold,
+ * but legacy thermal management implementation for now.
+ * This is for the reason of 1000 uCode using advance thermal throttling API
+ * but not implement ct_kill_exit based on ct_kill exit temperature
+ * so the thermal throttling will still based on legacy thermal throttling
+ * management.
+ * The code here need to be modified once 1000 uCode has the advanced thermal
+ * throttling algorithm in place
+ */
+static void iwl1000_set_ct_threshold(struct iwl_priv *priv)
+{
+        /* want Celsius */
+        priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD_LEGACY;
+        priv->hw_params.ct_kill_exit_threshold = CT_KILL_EXIT_THRESHOLD;
+}
+
+/* NIC configuration for 1000 series */
+static void iwl1000_nic_config(struct iwl_priv *priv)
+{
+        /* set CSR_HW_CONFIG_REG for uCode use */
+        iwl_set_bit(priv->trans, CSR_HW_IF_CONFIG_REG,
+                    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
+                    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
+
+        /* Setting digital SVR for 1000 card to 1.32V */
+        /* locking is acquired in iwl_set_bits_mask_prph() function */
+        iwl_set_bits_mask_prph(priv->trans, APMG_DIGITAL_SVR_REG,
+                                APMG_SVR_DIGITAL_VOLTAGE_1_32,
+                                ~APMG_SVR_VOLTAGE_CONFIG_BIT_MSK);
+}
+
+/**
+ * iwl_beacon_time_mask_low - mask of lower 32 bit of beacon time
+ * @priv -- pointer to iwl_priv data structure
+ * @tsf_bits -- number of bits need to shift for masking)
+ */
+static inline u32 iwl_beacon_time_mask_low(struct iwl_priv *priv,
+                                           u16 tsf_bits)
+{
+        return (1 << tsf_bits) - 1;
+}
+
+/**
+ * iwl_beacon_time_mask_high - mask of higher 32 bit of beacon time
+ * @priv -- pointer to iwl_priv data structure
+ * @tsf_bits -- number of bits need to shift for masking)
+ */
+static inline u32 iwl_beacon_time_mask_high(struct iwl_priv *priv,
+                                            u16 tsf_bits)
+{
+        return ((1 << (32 - tsf_bits)) - 1) << tsf_bits;
+}
+
+/*
+ * extended beacon time format
+ * time in usec will be changed into a 32-bit value in extended:internal format
+ * the extended part is the beacon counts
+ * the internal part is the time in usec within one beacon interval
+ */
+static u32 iwl_usecs_to_beacons(struct iwl_priv *priv, u32 usec,
+                                u32 beacon_interval)
+{
+        u32 quot;
+        u32 rem;
+        u32 interval = beacon_interval * TIME_UNIT;
+
+        if (!interval || !usec)
+                return 0;
+
+        quot = (usec / interval) &
+                (iwl_beacon_time_mask_high(priv, IWLAGN_EXT_BEACON_TIME_POS) >>
+                IWLAGN_EXT_BEACON_TIME_POS);
+        rem = (usec % interval) & iwl_beacon_time_mask_low(priv,
+                                   IWLAGN_EXT_BEACON_TIME_POS);
+
+        return (quot << IWLAGN_EXT_BEACON_TIME_POS) + rem;
+}
+
+/* base is usually what we get from ucode with each received frame,
+ * the same as HW timer counter counting down
+ */
+static __le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base,
+                           u32 addon, u32 beacon_interval)
+{
+        u32 base_low = base & iwl_beacon_time_mask_low(priv,
+                                IWLAGN_EXT_BEACON_TIME_POS);
+        u32 addon_low = addon & iwl_beacon_time_mask_low(priv,
+                                IWLAGN_EXT_BEACON_TIME_POS);
+        u32 interval = beacon_interval * TIME_UNIT;
+        u32 res = (base & iwl_beacon_time_mask_high(priv,
+                                IWLAGN_EXT_BEACON_TIME_POS)) +
+                                (addon & iwl_beacon_time_mask_high(priv,
+                                IWLAGN_EXT_BEACON_TIME_POS));
+
+        if (base_low > addon_low)
+                res += base_low - addon_low;
+        else if (base_low < addon_low) {
+                res += interval + base_low - addon_low;
+                res += (1 << IWLAGN_EXT_BEACON_TIME_POS);
+        } else
+                res += (1 << IWLAGN_EXT_BEACON_TIME_POS);
+
+        return cpu_to_le32(res);
+}
+
+static const struct iwl_sensitivity_ranges iwl1000_sensitivity = {
+        .min_nrg_cck = 95,
+        .auto_corr_min_ofdm = 90,
+        .auto_corr_min_ofdm_mrc = 170,
+        .auto_corr_min_ofdm_x1 = 120,
+        .auto_corr_min_ofdm_mrc_x1 = 240,
+
+        .auto_corr_max_ofdm = 120,
+        .auto_corr_max_ofdm_mrc = 210,
+        .auto_corr_max_ofdm_x1 = 155,
+        .auto_corr_max_ofdm_mrc_x1 = 290,
+
+        .auto_corr_min_cck = 125,
+        .auto_corr_max_cck = 200,
+        .auto_corr_min_cck_mrc = 170,
+        .auto_corr_max_cck_mrc = 400,
+        .nrg_th_cck = 95,
+        .nrg_th_ofdm = 95,
+
+        .barker_corr_th_min = 190,
+        .barker_corr_th_min_mrc = 390,
+        .nrg_th_cca = 62,
+};
+
+static void iwl1000_hw_set_hw_params(struct iwl_priv *priv)
+{
+        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ);
+
+        priv->hw_params.tx_chains_num =
+                num_of_ant(priv->hw_params.valid_tx_ant);
+        if (priv->cfg->rx_with_siso_diversity)
+                priv->hw_params.rx_chains_num = 1;
+        else
+                priv->hw_params.rx_chains_num =
+                        num_of_ant(priv->hw_params.valid_rx_ant);
+
+        iwl1000_set_ct_threshold(priv);
+
+        /* Set initial sensitivity parameters */
+        priv->hw_params.sens = &iwl1000_sensitivity;
+}
+
+struct iwl_lib_ops iwl1000_lib = {
+        .set_hw_params = iwl1000_hw_set_hw_params,
+        .nic_config = iwl1000_nic_config,
+        .eeprom_ops = {
+                .regulatory_bands = {
+                        EEPROM_REG_BAND_1_CHANNELS,
+                        EEPROM_REG_BAND_2_CHANNELS,
+                        EEPROM_REG_BAND_3_CHANNELS,
+                        EEPROM_REG_BAND_4_CHANNELS,
+                        EEPROM_REG_BAND_5_CHANNELS,
+                        EEPROM_REG_BAND_24_HT40_CHANNELS,
+                        EEPROM_REGULATORY_BAND_NO_HT40,
+                },
+        },
+        .temperature = iwlagn_temperature,
+};
+
+
+/*
+ * 2000 series
+ * ===========
+ */
+
+static void iwl2000_set_ct_threshold(struct iwl_priv *priv)
+{
+        /* want Celsius */
+        priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD;
+        priv->hw_params.ct_kill_exit_threshold = CT_KILL_EXIT_THRESHOLD;
+}
+
+/* NIC configuration for 2000 series */
+static void iwl2000_nic_config(struct iwl_priv *priv)
+{
+        iwl_rf_config(priv);
+
+        iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG,
+                    CSR_GP_DRIVER_REG_BIT_RADIO_IQ_INVER);
+}
+
+static const struct iwl_sensitivity_ranges iwl2000_sensitivity = {
+        .min_nrg_cck = 97,
+        .auto_corr_min_ofdm = 80,
+        .auto_corr_min_ofdm_mrc = 128,
+        .auto_corr_min_ofdm_x1 = 105,
+        .auto_corr_min_ofdm_mrc_x1 = 192,
+
+        .auto_corr_max_ofdm = 145,
+        .auto_corr_max_ofdm_mrc = 232,
+        .auto_corr_max_ofdm_x1 = 110,
+        .auto_corr_max_ofdm_mrc_x1 = 232,
+
+        .auto_corr_min_cck = 125,
+        .auto_corr_max_cck = 175,
+        .auto_corr_min_cck_mrc = 160,
+        .auto_corr_max_cck_mrc = 310,
+        .nrg_th_cck = 97,
+        .nrg_th_ofdm = 100,
+
+        .barker_corr_th_min = 190,
+        .barker_corr_th_min_mrc = 390,
+        .nrg_th_cca = 62,
+};
+
+static void iwl2000_hw_set_hw_params(struct iwl_priv *priv)
+{
+        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ);
+
+        priv->hw_params.tx_chains_num =
+                num_of_ant(priv->hw_params.valid_tx_ant);
+        if (priv->cfg->rx_with_siso_diversity)
+                priv->hw_params.rx_chains_num = 1;
+        else
+                priv->hw_params.rx_chains_num =
+                        num_of_ant(priv->hw_params.valid_rx_ant);
+
+        iwl2000_set_ct_threshold(priv);
+
+        /* Set initial sensitivity parameters */
+        priv->hw_params.sens = &iwl2000_sensitivity;
+}
+
+struct iwl_lib_ops iwl2000_lib = {
+        .set_hw_params = iwl2000_hw_set_hw_params,
+        .nic_config = iwl2000_nic_config,
+        .eeprom_ops = {
+                .regulatory_bands = {
+                        EEPROM_REG_BAND_1_CHANNELS,
+                        EEPROM_REG_BAND_2_CHANNELS,
+                        EEPROM_REG_BAND_3_CHANNELS,
+                        EEPROM_REG_BAND_4_CHANNELS,
+                        EEPROM_REG_BAND_5_CHANNELS,
+                        EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
+                        EEPROM_REGULATORY_BAND_NO_HT40,
+                },
+                .enhanced_txpower = true,
+        },
+        .temperature = iwlagn_temperature,
+};
+
+struct iwl_lib_ops iwl2030_lib = {
+        .set_hw_params = iwl2000_hw_set_hw_params,
+        .nic_config = iwl2000_nic_config,
+        .eeprom_ops = {
+                .regulatory_bands = {
+                        EEPROM_REG_BAND_1_CHANNELS,
+                        EEPROM_REG_BAND_2_CHANNELS,
+                        EEPROM_REG_BAND_3_CHANNELS,
+                        EEPROM_REG_BAND_4_CHANNELS,
+                        EEPROM_REG_BAND_5_CHANNELS,
+                        EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
+                        EEPROM_REGULATORY_BAND_NO_HT40,
+                },
+                .enhanced_txpower = true,
+        },
+        .temperature = iwlagn_temperature,
+};
+
+/*
+ * 5000 series
+ * ===========
+ */
+
+/* NIC configuration for 5000 series */
+static void iwl5000_nic_config(struct iwl_priv *priv)
+{
+        iwl_rf_config(priv);
+
+        /* W/A : NIC is stuck in a reset state after Early PCIe power off
+         * (PCIe power is lost before PERST# is asserted),
+         * causing ME FW to lose ownership and not being able to obtain it back.
+         */
+        iwl_set_bits_mask_prph(priv->trans, APMG_PS_CTRL_REG,
+                                APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS,
+                                ~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);
+}
+
+static const struct iwl_sensitivity_ranges iwl5000_sensitivity = {
+        .min_nrg_cck = 100,
+        .auto_corr_min_ofdm = 90,
+        .auto_corr_min_ofdm_mrc = 170,
+        .auto_corr_min_ofdm_x1 = 105,
+        .auto_corr_min_ofdm_mrc_x1 = 220,
+
+        .auto_corr_max_ofdm = 120,
+        .auto_corr_max_ofdm_mrc = 210,
+        .auto_corr_max_ofdm_x1 = 120,
+        .auto_corr_max_ofdm_mrc_x1 = 240,
+
+        .auto_corr_min_cck = 125,
+        .auto_corr_max_cck = 200,
+        .auto_corr_min_cck_mrc = 200,
+        .auto_corr_max_cck_mrc = 400,
+        .nrg_th_cck = 100,
+        .nrg_th_ofdm = 100,
+
+        .barker_corr_th_min = 190,
+        .barker_corr_th_min_mrc = 390,
+        .nrg_th_cca = 62,
+};
+
+static struct iwl_sensitivity_ranges iwl5150_sensitivity = {
+        .min_nrg_cck = 95,
+        .auto_corr_min_ofdm = 90,
+        .auto_corr_min_ofdm_mrc = 170,
+        .auto_corr_min_ofdm_x1 = 105,
+        .auto_corr_min_ofdm_mrc_x1 = 220,
+
+        .auto_corr_max_ofdm = 120,
+        .auto_corr_max_ofdm_mrc = 210,
+        /* max = min for performance bug in 5150 DSP */
+        .auto_corr_max_ofdm_x1 = 105,
+        .auto_corr_max_ofdm_mrc_x1 = 220,
+
+        .auto_corr_min_cck = 125,
+        .auto_corr_max_cck = 200,
+        .auto_corr_min_cck_mrc = 170,
+        .auto_corr_max_cck_mrc = 400,
+        .nrg_th_cck = 95,
+        .nrg_th_ofdm = 95,
+
+        .barker_corr_th_min = 190,
+        .barker_corr_th_min_mrc = 390,
+        .nrg_th_cca = 62,
+};
+
+#define IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF   (-5)
+
+static s32 iwl_temp_calib_to_offset(struct iwl_priv *priv)
+{
+        u16 temperature, voltage;
+        __le16 *temp_calib = (__le16 *)iwl_eeprom_query_addr(priv,
+                                EEPROM_KELVIN_TEMPERATURE);
+
+        temperature = le16_to_cpu(temp_calib[0]);
+        voltage = le16_to_cpu(temp_calib[1]);
+
+        /* offset = temp - volt / coeff */
+        return (s32)(temperature -
+                        voltage / IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF);
+}
+
+static void iwl5150_set_ct_threshold(struct iwl_priv *priv)
+{
+        const s32 volt2temp_coef = IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF;
+        s32 threshold = (s32)CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD_LEGACY) -
+                        iwl_temp_calib_to_offset(priv);
+
+        priv->hw_params.ct_kill_threshold = threshold * volt2temp_coef;
+}
+
+static void iwl5000_set_ct_threshold(struct iwl_priv *priv)
+{
+        /* want Celsius */
+        priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD_LEGACY;
+}
+
+static void iwl5000_hw_set_hw_params(struct iwl_priv *priv)
+{
+        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
+                                        BIT(IEEE80211_BAND_5GHZ);
+
+        priv->hw_params.tx_chains_num =
+                num_of_ant(priv->hw_params.valid_tx_ant);
+        priv->hw_params.rx_chains_num =
+                num_of_ant(priv->hw_params.valid_rx_ant);
+
+        iwl5000_set_ct_threshold(priv);
+
+        /* Set initial sensitivity parameters */
+        priv->hw_params.sens = &iwl5000_sensitivity;
+}
+
+static void iwl5150_hw_set_hw_params(struct iwl_priv *priv)
+{
+        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
+                                        BIT(IEEE80211_BAND_5GHZ);
+
+        priv->hw_params.tx_chains_num =
+                num_of_ant(priv->hw_params.valid_tx_ant);
+        priv->hw_params.rx_chains_num =
+                num_of_ant(priv->hw_params.valid_rx_ant);
+
+        iwl5150_set_ct_threshold(priv);
+
+        /* Set initial sensitivity parameters */
+        priv->hw_params.sens = &iwl5150_sensitivity;
+}
+
+static void iwl5150_temperature(struct iwl_priv *priv)
+{
+        u32 vt = 0;
+        s32 offset =  iwl_temp_calib_to_offset(priv);
+
+        vt = le32_to_cpu(priv->statistics.common.temperature);
+        vt = vt / IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF + offset;
+        /* now vt hold the temperature in Kelvin */
+        priv->temperature = KELVIN_TO_CELSIUS(vt);
+        iwl_tt_handler(priv);
+}
+
+static int iwl5000_hw_channel_switch(struct iwl_priv *priv,
+                                     struct ieee80211_channel_switch *ch_switch)
+{
+        /*
+         * MULTI-FIXME
+         * See iwlagn_mac_channel_switch.
+         */
+        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
+        struct iwl5000_channel_switch_cmd cmd;
+        const struct iwl_channel_info *ch_info;
+        u32 switch_time_in_usec, ucode_switch_time;
+        u16 ch;
+        u32 tsf_low;
+        u8 switch_count;
+        u16 beacon_interval = le16_to_cpu(ctx->timing.beacon_interval);
+        struct ieee80211_vif *vif = ctx->vif;
+        struct iwl_host_cmd hcmd = {
+                .id = REPLY_CHANNEL_SWITCH,
+                .len = { sizeof(cmd), },
+                .flags = CMD_SYNC,
+                .data = { &cmd, },
+        };
+
+        cmd.band = priv->band == IEEE80211_BAND_2GHZ;
+        ch = ch_switch->channel->hw_value;
+        IWL_DEBUG_11H(priv, "channel switch from %d to %d\n",
+                      ctx->active.channel, ch);
+        cmd.channel = cpu_to_le16(ch);
+        cmd.rxon_flags = ctx->staging.flags;
+        cmd.rxon_filter_flags = ctx->staging.filter_flags;
+        switch_count = ch_switch->count;
+        tsf_low = ch_switch->timestamp & 0x0ffffffff;
+        /*
+         * calculate the ucode channel switch time
+         * adding TSF as one of the factor for when to switch
+         */
+        if ((priv->ucode_beacon_time > tsf_low) && beacon_interval) {
+                if (switch_count > ((priv->ucode_beacon_time - tsf_low) /
+                    beacon_interval)) {
+                        switch_count -= (priv->ucode_beacon_time -
+                                tsf_low) / beacon_interval;
+                } else
+                        switch_count = 0;
+        }
+        if (switch_count <= 1)
+                cmd.switch_time = cpu_to_le32(priv->ucode_beacon_time);
+        else {
+                switch_time_in_usec =
+                        vif->bss_conf.beacon_int * switch_count * TIME_UNIT;
+                ucode_switch_time = iwl_usecs_to_beacons(priv,
+                                                         switch_time_in_usec,
+                                                         beacon_interval);
+                cmd.switch_time = iwl_add_beacon_time(priv,
+                                                      priv->ucode_beacon_time,
+                                                      ucode_switch_time,
+                                                      beacon_interval);
+        }
+        IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n",
+                      cmd.switch_time);
+        ch_info = iwl_get_channel_info(priv, priv->band, ch);
+        if (ch_info)
+                cmd.expect_beacon = is_channel_radar(ch_info);
+        else {
+                IWL_ERR(priv, "invalid channel switch from %u to %u\n",
+                        ctx->active.channel, ch);
+                return -EFAULT;
+        }
+
+        return iwl_dvm_send_cmd(priv, &hcmd);
+}
+
+struct iwl_lib_ops iwl5000_lib = {
+        .set_hw_params = iwl5000_hw_set_hw_params,
+        .set_channel_switch = iwl5000_hw_channel_switch,
+        .nic_config = iwl5000_nic_config,
+        .eeprom_ops = {
+                .regulatory_bands = {
+                        EEPROM_REG_BAND_1_CHANNELS,
+                        EEPROM_REG_BAND_2_CHANNELS,
+                        EEPROM_REG_BAND_3_CHANNELS,
+                        EEPROM_REG_BAND_4_CHANNELS,
+                        EEPROM_REG_BAND_5_CHANNELS,
+                        EEPROM_REG_BAND_24_HT40_CHANNELS,
+                        EEPROM_REG_BAND_52_HT40_CHANNELS
+                },
+        },
+        .temperature = iwlagn_temperature,
+};
+
+struct iwl_lib_ops iwl5150_lib = {
+        .set_hw_params = iwl5150_hw_set_hw_params,
+        .set_channel_switch = iwl5000_hw_channel_switch,
+        .nic_config = iwl5000_nic_config,
+        .eeprom_ops = {
+                .regulatory_bands = {
+                        EEPROM_REG_BAND_1_CHANNELS,
+                        EEPROM_REG_BAND_2_CHANNELS,
+                        EEPROM_REG_BAND_3_CHANNELS,
+                        EEPROM_REG_BAND_4_CHANNELS,
+                        EEPROM_REG_BAND_5_CHANNELS,
+                        EEPROM_REG_BAND_24_HT40_CHANNELS,
+                        EEPROM_REG_BAND_52_HT40_CHANNELS
+                },
+        },
+        .temperature = iwl5150_temperature,
+};
+
+
+
+/*
+ * 6000 series
+ * ===========
+ */
+
+static void iwl6000_set_ct_threshold(struct iwl_priv *priv)
+{
+        /* want Celsius */
+        priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD;
+        priv->hw_params.ct_kill_exit_threshold = CT_KILL_EXIT_THRESHOLD;
+}
+
+/* NIC configuration for 6000 series */
+static void iwl6000_nic_config(struct iwl_priv *priv)
+{
+        iwl_rf_config(priv);
+
+        switch (priv->cfg->device_family) {
+        case IWL_DEVICE_FAMILY_6005:
+        case IWL_DEVICE_FAMILY_6030:
+        case IWL_DEVICE_FAMILY_6000:
+                break;
+        case IWL_DEVICE_FAMILY_6000i:
+                /* 2x2 IPA phy type */
+                iwl_write32(priv->trans, CSR_GP_DRIVER_REG,
+                             CSR_GP_DRIVER_REG_BIT_RADIO_SKU_2x2_IPA);
+                break;
+        case IWL_DEVICE_FAMILY_6050:
+                /* Indicate calibration version to uCode. */
+                if (iwl_eeprom_calib_version(priv) >= 6)
+                        iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG,
+                                        CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
+                break;
+        case IWL_DEVICE_FAMILY_6150:
+                /* Indicate calibration version to uCode. */
+                if (iwl_eeprom_calib_version(priv) >= 6)
+                        iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG,
+                                        CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
+                iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG,
+                            CSR_GP_DRIVER_REG_BIT_6050_1x2);
+                break;
+        default:
+                WARN_ON(1);
+        }
+}
+
+static const struct iwl_sensitivity_ranges iwl6000_sensitivity = {
+        .min_nrg_cck = 110,
+        .auto_corr_min_ofdm = 80,
+        .auto_corr_min_ofdm_mrc = 128,
+        .auto_corr_min_ofdm_x1 = 105,
+        .auto_corr_min_ofdm_mrc_x1 = 192,
+
+        .auto_corr_max_ofdm = 145,
+        .auto_corr_max_ofdm_mrc = 232,
+        .auto_corr_max_ofdm_x1 = 110,
+        .auto_corr_max_ofdm_mrc_x1 = 232,
+
+        .auto_corr_min_cck = 125,
+        .auto_corr_max_cck = 175,
+        .auto_corr_min_cck_mrc = 160,
+        .auto_corr_max_cck_mrc = 310,
+        .nrg_th_cck = 110,
+        .nrg_th_ofdm = 110,
+
+        .barker_corr_th_min = 190,
+        .barker_corr_th_min_mrc = 336,
+        .nrg_th_cca = 62,
+};
+
+static void iwl6000_hw_set_hw_params(struct iwl_priv *priv)
+{
+        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
+                                        BIT(IEEE80211_BAND_5GHZ);
+
+        priv->hw_params.tx_chains_num =
+                num_of_ant(priv->hw_params.valid_tx_ant);
+        if (priv->cfg->rx_with_siso_diversity)
+                priv->hw_params.rx_chains_num = 1;
+        else
+                priv->hw_params.rx_chains_num =
+                        num_of_ant(priv->hw_params.valid_rx_ant);
+
+        iwl6000_set_ct_threshold(priv);
+
+        /* Set initial sensitivity parameters */
+        priv->hw_params.sens = &iwl6000_sensitivity;
+
+}
+
+static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
+                                     struct ieee80211_channel_switch *ch_switch)
+{
+        /*
+         * MULTI-FIXME
+         * See iwlagn_mac_channel_switch.
+         */
+        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
+        struct iwl6000_channel_switch_cmd cmd;
+        const struct iwl_channel_info *ch_info;
+        u32 switch_time_in_usec, ucode_switch_time;
+        u16 ch;
+        u32 tsf_low;
+        u8 switch_count;
+        u16 beacon_interval = le16_to_cpu(ctx->timing.beacon_interval);
+        struct ieee80211_vif *vif = ctx->vif;
+        struct iwl_host_cmd hcmd = {
+                .id = REPLY_CHANNEL_SWITCH,
+                .len = { sizeof(cmd), },
+                .flags = CMD_SYNC,
+                .data = { &cmd, },
+        };
+
+        cmd.band = priv->band == IEEE80211_BAND_2GHZ;
+        ch = ch_switch->channel->hw_value;
+        IWL_DEBUG_11H(priv, "channel switch from %u to %u\n",
+                      ctx->active.channel, ch);
+        cmd.channel = cpu_to_le16(ch);
+        cmd.rxon_flags = ctx->staging.flags;
+        cmd.rxon_filter_flags = ctx->staging.filter_flags;
+        switch_count = ch_switch->count;
+        tsf_low = ch_switch->timestamp & 0x0ffffffff;
+        /*
+         * calculate the ucode channel switch time
+         * adding TSF as one of the factor for when to switch
+         */
+        if ((priv->ucode_beacon_time > tsf_low) && beacon_interval) {
+                if (switch_count > ((priv->ucode_beacon_time - tsf_low) /
+                    beacon_interval)) {
+                        switch_count -= (priv->ucode_beacon_time -
+                                tsf_low) / beacon_interval;
+                } else
+                        switch_count = 0;
+        }
+        if (switch_count <= 1)
+                cmd.switch_time = cpu_to_le32(priv->ucode_beacon_time);
+        else {
+                switch_time_in_usec =
+                        vif->bss_conf.beacon_int * switch_count * TIME_UNIT;
+                ucode_switch_time = iwl_usecs_to_beacons(priv,
+                                                         switch_time_in_usec,
+                                                         beacon_interval);
+                cmd.switch_time = iwl_add_beacon_time(priv,
+                                                      priv->ucode_beacon_time,
+                                                      ucode_switch_time,
+                                                      beacon_interval);
+        }
+        IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n",
+                      cmd.switch_time);
+        ch_info = iwl_get_channel_info(priv, priv->band, ch);
+        if (ch_info)
+                cmd.expect_beacon = is_channel_radar(ch_info);
+        else {
+                IWL_ERR(priv, "invalid channel switch from %u to %u\n",
+                        ctx->active.channel, ch);
+                return -EFAULT;
+        }
+
+        return iwl_dvm_send_cmd(priv, &hcmd);
+}
+
+struct iwl_lib_ops iwl6000_lib = {
+        .set_hw_params = iwl6000_hw_set_hw_params,
+        .set_channel_switch = iwl6000_hw_channel_switch,
+        .nic_config = iwl6000_nic_config,
+        .eeprom_ops = {
+                .regulatory_bands = {
+                        EEPROM_REG_BAND_1_CHANNELS,
+                        EEPROM_REG_BAND_2_CHANNELS,
+                        EEPROM_REG_BAND_3_CHANNELS,
+                        EEPROM_REG_BAND_4_CHANNELS,
+                        EEPROM_REG_BAND_5_CHANNELS,
+                        EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
+                        EEPROM_REG_BAND_52_HT40_CHANNELS
+                },
+                .enhanced_txpower = true,
+        },
+        .temperature = iwlagn_temperature,
+};
+
+struct iwl_lib_ops iwl6030_lib = {
+        .set_hw_params = iwl6000_hw_set_hw_params,
+        .set_channel_switch = iwl6000_hw_channel_switch,
+        .nic_config = iwl6000_nic_config,
+        .eeprom_ops = {
+                .regulatory_bands = {
+                        EEPROM_REG_BAND_1_CHANNELS,
+                        EEPROM_REG_BAND_2_CHANNELS,
+                        EEPROM_REG_BAND_3_CHANNELS,
+                        EEPROM_REG_BAND_4_CHANNELS,
+                        EEPROM_REG_BAND_5_CHANNELS,
+                        EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
+                        EEPROM_REG_BAND_52_HT40_CHANNELS
+                },
+                .enhanced_txpower = true,
+        },
+        .temperature = iwlagn_temperature,
+};
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-hw.h b/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
index d0ec0abd3c89..7960a52f6ad4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
@@ -102,10 +102,18 @@
 
 /* EEPROM */
 #define IWLAGN_EEPROM_IMG_SIZE          2048
+/* OTP */
+/* lower blocks contain EEPROM image and calibration data */
+#define OTP_LOW_IMAGE_SIZE              (2 * 512 * sizeof(u16)) /* 2 KB */
+/* high blocks contain PAPD data */
+#define OTP_HIGH_IMAGE_SIZE_6x00        (6 * 512 * sizeof(u16)) /* 6 KB */
+#define OTP_HIGH_IMAGE_SIZE_1000        (0x200 * sizeof(u16)) /* 1024 bytes */
+#define OTP_MAX_LL_ITEMS_1000           (3)     /* OTP blocks for 1000 */
+#define OTP_MAX_LL_ITEMS_6x00           (4)     /* OTP blocks for 6x00 */
+#define OTP_MAX_LL_ITEMS_6x50           (7)     /* OTP blocks for 6x50 */
+#define OTP_MAX_LL_ITEMS_2x00           (4)     /* OTP blocks for 2x00 */
+
 
-#define IWLAGN_CMD_FIFO_NUM             7
 #define IWLAGN_NUM_QUEUES               20
-#define IWLAGN_NUM_AMPDU_QUEUES         9
-#define IWLAGN_FIRST_AMPDU_QUEUE        11
 
 #endif /* __iwl_agn_hw_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 56f41c9409d1..01dc44267317 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -33,12 +33,11 @@
 #include <linux/sched.h>
 
 #include "iwl-dev.h"
-#include "iwl-core.h"
 #include "iwl-io.h"
 #include "iwl-agn-hw.h"
 #include "iwl-agn.h"
 #include "iwl-trans.h"
-#include "iwl-shared.h"
+#include "iwl-modparams.h"
 
 int iwlagn_hw_valid_rtc_data_addr(u32 addr)
 {
@@ -94,81 +93,6 @@ void iwlagn_temperature(struct iwl_priv *priv)
         iwl_tt_handler(priv);
 }
 
-u16 iwl_eeprom_calib_version(struct iwl_shared *shrd)
-{
-        struct iwl_eeprom_calib_hdr *hdr;
-
-        hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(shrd,
-                                                        EEPROM_CALIB_ALL);
-        return hdr->version;
-
-}
-
-/*
- * EEPROM
- */
-static u32 eeprom_indirect_address(const struct iwl_shared *shrd, u32 address)
-{
-        u16 offset = 0;
-
-        if ((address & INDIRECT_ADDRESS) == 0)
-                return address;
-
-        switch (address & INDIRECT_TYPE_MSK) {
-        case INDIRECT_HOST:
-                offset = iwl_eeprom_query16(shrd, EEPROM_LINK_HOST);
-                break;
-        case INDIRECT_GENERAL:
-                offset = iwl_eeprom_query16(shrd, EEPROM_LINK_GENERAL);
-                break;
-        case INDIRECT_REGULATORY:
-                offset = iwl_eeprom_query16(shrd, EEPROM_LINK_REGULATORY);
-                break;
-        case INDIRECT_TXP_LIMIT:
-                offset = iwl_eeprom_query16(shrd, EEPROM_LINK_TXP_LIMIT);
-                break;
-        case INDIRECT_TXP_LIMIT_SIZE:
-                offset = iwl_eeprom_query16(shrd, EEPROM_LINK_TXP_LIMIT_SIZE);
-                break;
-        case INDIRECT_CALIBRATION:
-                offset = iwl_eeprom_query16(shrd, EEPROM_LINK_CALIBRATION);
-                break;
-        case INDIRECT_PROCESS_ADJST:
-                offset = iwl_eeprom_query16(shrd, EEPROM_LINK_PROCESS_ADJST);
-                break;
-        case INDIRECT_OTHERS:
-                offset = iwl_eeprom_query16(shrd, EEPROM_LINK_OTHERS);
-                break;
-        default:
-                IWL_ERR(shrd->trans, "illegal indirect type: 0x%X\n",
-                address & INDIRECT_TYPE_MSK);
-                break;
-        }
-
-        /* translate the offset from words to byte */
-        return (address & ADDRESS_MSK) + (offset << 1);
-}
-
-const u8 *iwl_eeprom_query_addr(const struct iwl_shared *shrd, size_t offset)
-{
-        u32 address = eeprom_indirect_address(shrd, offset);
-        BUG_ON(address >= shrd->cfg->base_params->eeprom_size);
-        return &shrd->eeprom[address];
-}
-
-struct iwl_mod_params iwlagn_mod_params = {
-        .amsdu_size_8K = 1,
-        .restart_fw = 1,
-        .plcp_check = true,
-        .bt_coex_active = true,
-        .no_sleep_autoadjust = true,
-        .power_level = IWL_POWER_INDEX_1,
-        .bt_ch_announce = true,
-        .wanted_ucode_alternative = 1,
-        .auto_agg = true,
-        /* the rest are 0 by default */
-};
-
 int iwlagn_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band)
 {
         int idx = 0;
@@ -228,13 +152,13 @@ int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control)
                                  IWL_SCD_BE_MSK | IWL_SCD_BK_MSK |
                                  IWL_SCD_MGMT_MSK;
         if ((flush_control & BIT(IWL_RXON_CTX_PAN)) &&
-            (priv->shrd->valid_contexts != BIT(IWL_RXON_CTX_BSS)))
+            (priv->valid_contexts != BIT(IWL_RXON_CTX_BSS)))
                 flush_cmd.fifo_control |= IWL_PAN_SCD_VO_MSK |
                                 IWL_PAN_SCD_VI_MSK | IWL_PAN_SCD_BE_MSK |
                                 IWL_PAN_SCD_BK_MSK | IWL_PAN_SCD_MGMT_MSK |
                                 IWL_PAN_SCD_MULTICAST_MSK;
 
-        if (hw_params(priv).sku & EEPROM_SKU_CAP_11N_ENABLE)
+        if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE)
                 flush_cmd.fifo_control |= IWL_AGG_TX_QUEUE_MSK;
 
         IWL_DEBUG_INFO(priv, "fifo queue control: 0X%x\n",
@@ -253,7 +177,7 @@ void iwlagn_dev_txfifo_flush(struct iwl_priv *priv, u16 flush_control)
                 goto done;
         }
         IWL_DEBUG_INFO(priv, "wait transmit/flush all frames\n");
-        iwl_trans_wait_tx_queue_empty(trans(priv));
+        iwl_trans_wait_tx_queue_empty(priv->trans);
 done:
         ieee80211_wake_queues(priv->hw);
         mutex_unlock(&priv->mutex);
@@ -262,76 +186,8 @@ done:
 /*
  * BT coex
  */
-/*
- * Macros to access the lookup table.
- *
- * The lookup table has 7 inputs: bt3_prio, bt3_txrx, bt_rf_act, wifi_req,
-* wifi_prio, wifi_txrx and wifi_sh_ant_req.
- *
- * It has three outputs: WLAN_ACTIVE, WLAN_KILL and ANT_SWITCH
- *
- * The format is that "registers" 8 through 11 contain the WLAN_ACTIVE bits
- * one after another in 32-bit registers, and "registers" 0 through 7 contain
- * the WLAN_KILL and ANT_SWITCH bits interleaved (in that order).
- *
- * These macros encode that format.
- */
-#define LUT_VALUE(bt3_prio, bt3_txrx, bt_rf_act, wifi_req, wifi_prio, \
-                  wifi_txrx, wifi_sh_ant_req) \
-        (bt3_prio | (bt3_txrx << 1) | (bt_rf_act << 2) | (wifi_req << 3) | \
-        (wifi_prio << 4) | (wifi_txrx << 5) | (wifi_sh_ant_req << 6))
-
-#define LUT_PTA_WLAN_ACTIVE_OP(lut, op, val) \
-        lut[8 + ((val) >> 5)] op (cpu_to_le32(BIT((val) & 0x1f)))
-#define LUT_TEST_PTA_WLAN_ACTIVE(lut, bt3_prio, bt3_txrx, bt_rf_act, wifi_req, \
-                                 wifi_prio, wifi_txrx, wifi_sh_ant_req) \
-        (!!(LUT_PTA_WLAN_ACTIVE_OP(lut, &, LUT_VALUE(bt3_prio, bt3_txrx, \
-                                   bt_rf_act, wifi_req, wifi_prio, wifi_txrx, \
-                                   wifi_sh_ant_req))))
-#define LUT_SET_PTA_WLAN_ACTIVE(lut, bt3_prio, bt3_txrx, bt_rf_act, wifi_req, \
-                                wifi_prio, wifi_txrx, wifi_sh_ant_req) \
-        LUT_PTA_WLAN_ACTIVE_OP(lut, |=, LUT_VALUE(bt3_prio, bt3_txrx, \
-                               bt_rf_act, wifi_req, wifi_prio, wifi_txrx, \
-                               wifi_sh_ant_req))
-#define LUT_CLEAR_PTA_WLAN_ACTIVE(lut, bt3_prio, bt3_txrx, bt_rf_act, \
-                                  wifi_req, wifi_prio, wifi_txrx, \
-                                  wifi_sh_ant_req) \
-        LUT_PTA_WLAN_ACTIVE_OP(lut, &= ~, LUT_VALUE(bt3_prio, bt3_txrx, \
-                               bt_rf_act, wifi_req, wifi_prio, wifi_txrx, \
-                               wifi_sh_ant_req))
-
-#define LUT_WLAN_KILL_OP(lut, op, val) \
-        lut[(val) >> 4] op (cpu_to_le32(BIT(((val) << 1) & 0x1e)))
-#define LUT_TEST_WLAN_KILL(lut, bt3_prio, bt3_txrx, bt_rf_act, wifi_req, \
-                           wifi_prio, wifi_txrx, wifi_sh_ant_req) \
-        (!!(LUT_WLAN_KILL_OP(lut, &, LUT_VALUE(bt3_prio, bt3_txrx, bt_rf_act, \
-                             wifi_req, wifi_prio, wifi_txrx, wifi_sh_ant_req))))
-#define LUT_SET_WLAN_KILL(lut, bt3_prio, bt3_txrx, bt_rf_act, wifi_req, \
-                          wifi_prio, wifi_txrx, wifi_sh_ant_req) \
-        LUT_WLAN_KILL_OP(lut, |=, LUT_VALUE(bt3_prio, bt3_txrx, bt_rf_act, \
-                         wifi_req, wifi_prio, wifi_txrx, wifi_sh_ant_req))
-#define LUT_CLEAR_WLAN_KILL(lut, bt3_prio, bt3_txrx, bt_rf_act, wifi_req, \
-                            wifi_prio, wifi_txrx, wifi_sh_ant_req) \
-        LUT_WLAN_KILL_OP(lut, &= ~, LUT_VALUE(bt3_prio, bt3_txrx, bt_rf_act, \
-                         wifi_req, wifi_prio, wifi_txrx, wifi_sh_ant_req))
-
-#define LUT_ANT_SWITCH_OP(lut, op, val) \
-        lut[(val) >> 4] op (cpu_to_le32(BIT((((val) << 1) & 0x1e) + 1)))
-#define LUT_TEST_ANT_SWITCH(lut, bt3_prio, bt3_txrx, bt_rf_act, wifi_req, \
-                            wifi_prio, wifi_txrx, wifi_sh_ant_req) \
-        (!!(LUT_ANT_SWITCH_OP(lut, &, LUT_VALUE(bt3_prio, bt3_txrx, bt_rf_act, \
-                              wifi_req, wifi_prio, wifi_txrx, \
-                              wifi_sh_ant_req))))
-#define LUT_SET_ANT_SWITCH(lut, bt3_prio, bt3_txrx, bt_rf_act, wifi_req, \
-                           wifi_prio, wifi_txrx, wifi_sh_ant_req) \
-        LUT_ANT_SWITCH_OP(lut, |=, LUT_VALUE(bt3_prio, bt3_txrx, bt_rf_act, \
-                          wifi_req, wifi_prio, wifi_txrx, wifi_sh_ant_req))
-#define LUT_CLEAR_ANT_SWITCH(lut, bt3_prio, bt3_txrx, bt_rf_act, wifi_req, \
-                             wifi_prio, wifi_txrx, wifi_sh_ant_req) \
-        LUT_ANT_SWITCH_OP(lut, &= ~, LUT_VALUE(bt3_prio, bt3_txrx, bt_rf_act, \
-                          wifi_req, wifi_prio, wifi_txrx, wifi_sh_ant_req))
-
-static const __le32 iwlagn_def_3w_lookup[12] = {
+/* Notmal TDM */
+static const __le32 iwlagn_def_3w_lookup[IWLAGN_BT_DECISION_LUT_SIZE] = {
         cpu_to_le32(0xaaaaaaaa),
         cpu_to_le32(0xaaaaaaaa),
         cpu_to_le32(0xaeaaaaaa),
@@ -346,7 +202,25 @@ static const __le32 iwlagn_def_3w_lookup[12] = {
         cpu_to_le32(0xf0005000),
 };
 
-static const __le32 iwlagn_concurrent_lookup[12] = {
+
+/* Loose Coex */
+static const __le32 iwlagn_loose_lookup[IWLAGN_BT_DECISION_LUT_SIZE] = {
+        cpu_to_le32(0xaaaaaaaa),
+        cpu_to_le32(0xaaaaaaaa),
+        cpu_to_le32(0xaeaaaaaa),
+        cpu_to_le32(0xaaaaaaaa),
+        cpu_to_le32(0xcc00ff28),
+        cpu_to_le32(0x0000aaaa),
+        cpu_to_le32(0xcc00aaaa),
+        cpu_to_le32(0x0000aaaa),
+        cpu_to_le32(0x00000000),
+        cpu_to_le32(0x00000000),
+        cpu_to_le32(0xf0005000),
+        cpu_to_le32(0xf0005000),
+};
+
+/* Full concurrency */
+static const __le32 iwlagn_concurrent_lookup[IWLAGN_BT_DECISION_LUT_SIZE] = {
         cpu_to_le32(0xaaaaaaaa),
         cpu_to_le32(0xaaaaaaaa),
         cpu_to_le32(0xaaaaaaaa),
@@ -369,24 +243,30 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv)
                 .bt3_prio_sample_time = IWLAGN_BT3_PRIO_SAMPLE_DEFAULT,
                 .bt3_timer_t2_value = IWLAGN_BT3_T2_DEFAULT,
         };
-        struct iwl6000_bt_cmd bt_cmd_6000;
-        struct iwl2000_bt_cmd bt_cmd_2000;
+        struct iwl_bt_cmd_v1 bt_cmd_v1;
+        struct iwl_bt_cmd_v2 bt_cmd_v2;
         int ret;
 
         BUILD_BUG_ON(sizeof(iwlagn_def_3w_lookup) !=
                         sizeof(basic.bt3_lookup_table));
 
-        if (cfg(priv)->bt_params) {
-                if (cfg(priv)->bt_params->bt_session_2) {
-                        bt_cmd_2000.prio_boost = cpu_to_le32(
-                                cfg(priv)->bt_params->bt_prio_boost);
-                        bt_cmd_2000.tx_prio_boost = 0;
-                        bt_cmd_2000.rx_prio_boost = 0;
+        if (priv->cfg->bt_params) {
+                /*
+                 * newer generation of devices (2000 series and newer)
+                 * use the version 2 of the bt command
+                 * we need to make sure sending the host command
+                 * with correct data structure to avoid uCode assert
+                 */
+                if (priv->cfg->bt_params->bt_session_2) {
+                        bt_cmd_v2.prio_boost = cpu_to_le32(
+                                priv->cfg->bt_params->bt_prio_boost);
+                        bt_cmd_v2.tx_prio_boost = 0;
+                        bt_cmd_v2.rx_prio_boost = 0;
                 } else {
-                        bt_cmd_6000.prio_boost =
-                                cfg(priv)->bt_params->bt_prio_boost;
-                        bt_cmd_6000.tx_prio_boost = 0;
-                        bt_cmd_6000.rx_prio_boost = 0;
+                        bt_cmd_v1.prio_boost =
+                                priv->cfg->bt_params->bt_prio_boost;
+                        bt_cmd_v1.tx_prio_boost = 0;
+                        bt_cmd_v1.rx_prio_boost = 0;
                 }
         } else {
                 IWL_ERR(priv, "failed to construct BT Coex Config\n");
@@ -395,6 +275,7 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv)
 
         basic.kill_ack_mask = priv->kill_ack_mask;
         basic.kill_cts_mask = priv->kill_cts_mask;
+        basic.reduce_txpower = priv->reduced_txpower;
         basic.valid = priv->bt_valid;
 
         /*
@@ -403,7 +284,7 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv)
          * (might be in monitor mode), or the interface is in
          * IBSS mode (no proper uCode support for coex then).
          */
-        if (!iwlagn_mod_params.bt_coex_active ||
+        if (!iwlwifi_mod_params.bt_coex_active ||
             priv->iw_mode == NL80211_IFTYPE_ADHOC) {
                 basic.flags = IWLAGN_BT_FLAG_COEX_MODE_DISABLED;
         } else {
@@ -432,16 +313,16 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv)
                        priv->bt_full_concurrent ?
                        "full concurrency" : "3-wire");
 
-        if (cfg(priv)->bt_params->bt_session_2) {
-                memcpy(&bt_cmd_2000.basic, &basic,
+        if (priv->cfg->bt_params->bt_session_2) {
+                memcpy(&bt_cmd_v2.basic, &basic,
                         sizeof(basic));
                 ret = iwl_dvm_send_cmd_pdu(priv, REPLY_BT_CONFIG,
-                        CMD_SYNC, sizeof(bt_cmd_2000), &bt_cmd_2000);
+                        CMD_SYNC, sizeof(bt_cmd_v2), &bt_cmd_v2);
         } else {
-                memcpy(&bt_cmd_6000.basic, &basic,
+                memcpy(&bt_cmd_v1.basic, &basic,
                         sizeof(basic));
                 ret = iwl_dvm_send_cmd_pdu(priv, REPLY_BT_CONFIG,
-                        CMD_SYNC, sizeof(bt_cmd_6000), &bt_cmd_6000);
+                        CMD_SYNC, sizeof(bt_cmd_v1), &bt_cmd_v1);
         }
         if (ret)
                 IWL_ERR(priv, "failed to send BT Coex Config\n");
@@ -615,7 +496,7 @@ static void iwlagn_print_uartmsg(struct iwl_priv *priv,
                                 struct iwl_bt_uart_msg *uart_msg)
 {
         IWL_DEBUG_COEX(priv, "Message Type = 0x%X, SSN = 0x%X, "
-                        "Update Req = 0x%X",
+                        "Update Req = 0x%X\n",
                 (BT_UART_MSG_FRAME1MSGTYPE_MSK & uart_msg->frame1) >>
                         BT_UART_MSG_FRAME1MSGTYPE_POS,
                 (BT_UART_MSG_FRAME1SSN_MSK & uart_msg->frame1) >>
@@ -624,7 +505,7 @@ static void iwlagn_print_uartmsg(struct iwl_priv *priv,
                         BT_UART_MSG_FRAME1UPDATEREQ_POS);
 
         IWL_DEBUG_COEX(priv, "Open connections = 0x%X, Traffic load = 0x%X, "
-                        "Chl_SeqN = 0x%X, In band = 0x%X",
+                        "Chl_SeqN = 0x%X, In band = 0x%X\n",
                 (BT_UART_MSG_FRAME2OPENCONNECTIONS_MSK & uart_msg->frame2) >>
                         BT_UART_MSG_FRAME2OPENCONNECTIONS_POS,
                 (BT_UART_MSG_FRAME2TRAFFICLOAD_MSK & uart_msg->frame2) >>
@@ -635,7 +516,7 @@ static void iwlagn_print_uartmsg(struct iwl_priv *priv,
                         BT_UART_MSG_FRAME2INBAND_POS);
 
         IWL_DEBUG_COEX(priv, "SCO/eSCO = 0x%X, Sniff = 0x%X, A2DP = 0x%X, "
-                        "ACL = 0x%X, Master = 0x%X, OBEX = 0x%X",
+                        "ACL = 0x%X, Master = 0x%X, OBEX = 0x%X\n",
                 (BT_UART_MSG_FRAME3SCOESCO_MSK & uart_msg->frame3) >>
                         BT_UART_MSG_FRAME3SCOESCO_POS,
                 (BT_UART_MSG_FRAME3SNIFF_MSK & uart_msg->frame3) >>
@@ -649,12 +530,12 @@ static void iwlagn_print_uartmsg(struct iwl_priv *priv,
                 (BT_UART_MSG_FRAME3OBEX_MSK & uart_msg->frame3) >>
                         BT_UART_MSG_FRAME3OBEX_POS);
 
-        IWL_DEBUG_COEX(priv, "Idle duration = 0x%X",
+        IWL_DEBUG_COEX(priv, "Idle duration = 0x%X\n",
                 (BT_UART_MSG_FRAME4IDLEDURATION_MSK & uart_msg->frame4) >>
                         BT_UART_MSG_FRAME4IDLEDURATION_POS);
 
         IWL_DEBUG_COEX(priv, "Tx Activity = 0x%X, Rx Activity = 0x%X, "
-                        "eSCO Retransmissions = 0x%X",
+                        "eSCO Retransmissions = 0x%X\n",
                 (BT_UART_MSG_FRAME5TXACTIVITY_MSK & uart_msg->frame5) >>
                         BT_UART_MSG_FRAME5TXACTIVITY_POS,
                 (BT_UART_MSG_FRAME5RXACTIVITY_MSK & uart_msg->frame5) >>
@@ -662,14 +543,14 @@ static void iwlagn_print_uartmsg(struct iwl_priv *priv,
                 (BT_UART_MSG_FRAME5ESCORETRANSMIT_MSK & uart_msg->frame5) >>
                         BT_UART_MSG_FRAME5ESCORETRANSMIT_POS);
 
-        IWL_DEBUG_COEX(priv, "Sniff Interval = 0x%X, Discoverable = 0x%X",
+        IWL_DEBUG_COEX(priv, "Sniff Interval = 0x%X, Discoverable = 0x%X\n",
                 (BT_UART_MSG_FRAME6SNIFFINTERVAL_MSK & uart_msg->frame6) >>
                         BT_UART_MSG_FRAME6SNIFFINTERVAL_POS,
                 (BT_UART_MSG_FRAME6DISCOVERABLE_MSK & uart_msg->frame6) >>
                         BT_UART_MSG_FRAME6DISCOVERABLE_POS);
 
         IWL_DEBUG_COEX(priv, "Sniff Activity = 0x%X, Page = "
-                        "0x%X, Inquiry = 0x%X, Connectable = 0x%X",
+                        "0x%X, Inquiry = 0x%X, Connectable = 0x%X\n",
                 (BT_UART_MSG_FRAME7SNIFFACTIVITY_MSK & uart_msg->frame7) >>
                         BT_UART_MSG_FRAME7SNIFFACTIVITY_POS,
                 (BT_UART_MSG_FRAME7PAGE_MSK & uart_msg->frame7) >>
@@ -680,29 +561,62 @@ static void iwlagn_print_uartmsg(struct iwl_priv *priv,
                         BT_UART_MSG_FRAME7CONNECTABLE_POS);
 }
 
-static void iwlagn_set_kill_msk(struct iwl_priv *priv,
+static bool iwlagn_set_kill_msk(struct iwl_priv *priv,
                                 struct iwl_bt_uart_msg *uart_msg)
 {
-        u8 kill_msk;
-        static const __le32 bt_kill_ack_msg[2] = {
+        bool need_update = false;
+        u8 kill_msk = IWL_BT_KILL_REDUCE;
+        static const __le32 bt_kill_ack_msg[3] = {
                 IWLAGN_BT_KILL_ACK_MASK_DEFAULT,
-                IWLAGN_BT_KILL_ACK_CTS_MASK_SCO };
-        static const __le32 bt_kill_cts_msg[2] = {
+                IWLAGN_BT_KILL_ACK_CTS_MASK_SCO,
+                IWLAGN_BT_KILL_ACK_CTS_MASK_REDUCE};
+        static const __le32 bt_kill_cts_msg[3] = {
                 IWLAGN_BT_KILL_CTS_MASK_DEFAULT,
-                IWLAGN_BT_KILL_ACK_CTS_MASK_SCO };
+                IWLAGN_BT_KILL_ACK_CTS_MASK_SCO,
+                IWLAGN_BT_KILL_ACK_CTS_MASK_REDUCE};
 
-        kill_msk = (BT_UART_MSG_FRAME3SCOESCO_MSK & uart_msg->frame3)
-                ? 1 : 0;
+        if (!priv->reduced_txpower)
+                kill_msk = (BT_UART_MSG_FRAME3SCOESCO_MSK & uart_msg->frame3)
+                        ? IWL_BT_KILL_OVERRIDE : IWL_BT_KILL_DEFAULT;
         if (priv->kill_ack_mask != bt_kill_ack_msg[kill_msk] ||
             priv->kill_cts_mask != bt_kill_cts_msg[kill_msk]) {
                 priv->bt_valid |= IWLAGN_BT_VALID_KILL_ACK_MASK;
                 priv->kill_ack_mask = bt_kill_ack_msg[kill_msk];
                 priv->bt_valid |= IWLAGN_BT_VALID_KILL_CTS_MASK;
                 priv->kill_cts_mask = bt_kill_cts_msg[kill_msk];
+                need_update = true;
+        }
+        return need_update;
+}
 
-                /* schedule to send runtime bt_config */
-                queue_work(priv->workqueue, &priv->bt_runtime_config);
+static bool iwlagn_fill_txpower_mode(struct iwl_priv *priv,
+                                struct iwl_bt_uart_msg *uart_msg)
+{
+        bool need_update = false;
+
+        if (!priv->reduced_txpower &&
+            !iwl_is_associated(priv, IWL_RXON_CTX_PAN) &&
+            (uart_msg->frame3 & (BT_UART_MSG_FRAME3ACL_MSK |
+            BT_UART_MSG_FRAME3OBEX_MSK)) &&
+            !(uart_msg->frame3 & (BT_UART_MSG_FRAME3SCOESCO_MSK |
+            BT_UART_MSG_FRAME3SNIFF_MSK | BT_UART_MSG_FRAME3A2DP_MSK))) {
+                /* enabling reduced tx power */
+                priv->reduced_txpower = true;
+                priv->bt_valid |= IWLAGN_BT_VALID_REDUCED_TX_PWR;
+                need_update = true;
+        } else if (priv->reduced_txpower &&
+                   (iwl_is_associated(priv, IWL_RXON_CTX_PAN) ||
+                   (uart_msg->frame3 & (BT_UART_MSG_FRAME3SCOESCO_MSK |
+                   BT_UART_MSG_FRAME3SNIFF_MSK | BT_UART_MSG_FRAME3A2DP_MSK)) ||
+                   !(uart_msg->frame3 & (BT_UART_MSG_FRAME3ACL_MSK |
+                   BT_UART_MSG_FRAME3OBEX_MSK)))) {
+                /* disable reduced tx power */
+                priv->reduced_txpower = false;
+                priv->bt_valid &= ~IWLAGN_BT_VALID_REDUCED_TX_PWR;
+                need_update = true;
         }
+
+        return need_update;
 }
 
 int iwlagn_bt_coex_profile_notif(struct iwl_priv *priv,
@@ -750,7 +664,12 @@ int iwlagn_bt_coex_profile_notif(struct iwl_priv *priv,
                 }
         }
 
-        iwlagn_set_kill_msk(priv, uart_msg);
+        /* schedule to send runtime bt_config */
+        /* check reduce power before change ack/cts kill mask */
+        if (iwlagn_fill_txpower_mode(priv, uart_msg) ||
+            iwlagn_set_kill_msk(priv, uart_msg))
+                queue_work(priv->workqueue, &priv->bt_runtime_config);
+
 
         /* FIXME: based on notification, adjust the prio_boost */
 
@@ -798,8 +717,8 @@ static bool is_single_rx_stream(struct iwl_priv *priv)
  */
 static int iwl_get_active_rx_chain_count(struct iwl_priv *priv)
 {
-        if (cfg(priv)->bt_params &&
-            cfg(priv)->bt_params->advanced_bt_coexist &&
+        if (priv->cfg->bt_params &&
+            priv->cfg->bt_params->advanced_bt_coexist &&
             (priv->bt_full_concurrent ||
              priv->bt_traffic_load >= IWL_BT_COEX_TRAFFIC_LOAD_HIGH)) {
                 /*
@@ -856,7 +775,7 @@ static u8 iwl_count_chain_bitmap(u32 chain_bitmap)
 void iwlagn_set_rxon_chain(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
 {
         bool is_single = is_single_rx_stream(priv);
-        bool is_cam = !test_bit(STATUS_POWER_PMI, &priv->shrd->status);
+        bool is_cam = !test_bit(STATUS_POWER_PMI, &priv->status);
         u8 idle_rx_cnt, active_rx_cnt, valid_rx_cnt;
         u32 active_chains;
         u16 rx_chain;
@@ -868,10 +787,10 @@ void iwlagn_set_rxon_chain(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
         if (priv->chain_noise_data.active_chains)
                 active_chains = priv->chain_noise_data.active_chains;
         else
-                active_chains = hw_params(priv).valid_rx_ant;
+                active_chains = priv->hw_params.valid_rx_ant;
 
-        if (cfg(priv)->bt_params &&
-            cfg(priv)->bt_params->advanced_bt_coexist &&
+        if (priv->cfg->bt_params &&
+            priv->cfg->bt_params->advanced_bt_coexist &&
             (priv->bt_full_concurrent ||
              priv->bt_traffic_load >= IWL_BT_COEX_TRAFFIC_LOAD_HIGH)) {
                 /*
@@ -1190,7 +1109,7 @@ int iwlagn_suspend(struct iwl_priv *priv, struct cfg80211_wowlan *wowlan)
         memcpy(&rxon, &ctx->active, sizeof(rxon));
 
         priv->ucode_loaded = false;
-        iwl_trans_stop_device(trans(priv));
+        iwl_trans_stop_device(priv->trans);
 
         priv->wowlan = true;
 
@@ -1212,7 +1131,7 @@ int iwlagn_suspend(struct iwl_priv *priv, struct cfg80211_wowlan *wowlan)
         if (ret)
                 goto out;
 
-        if (!iwlagn_mod_params.sw_crypto) {
+        if (!iwlwifi_mod_params.sw_crypto) {
                 /* mark all keys clear */
                 priv->ucode_key_table = 0;
                 ctx->key_mapping_keys = 0;
@@ -1298,6 +1217,12 @@ int iwl_dvm_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
                 return -EIO;
         }
 
+        if (test_bit(STATUS_FW_ERROR, &priv->status)) {
+                IWL_ERR(priv, "Command %s failed: FW Error\n",
+                        iwl_dvm_get_cmd_string(cmd->id));
+                return -EIO;
+        }
+
         /*
          * Synchronous commands from this op-mode must hold
          * the mutex, this ensures we don't try to send two
@@ -1312,7 +1237,7 @@ int iwl_dvm_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
                 return -EIO;
         }
 
-        return iwl_trans_send_cmd(trans(priv), cmd);
+        return iwl_trans_send_cmd(priv->trans, cmd);
 }
 
 int iwl_dvm_send_cmd_pdu(struct iwl_priv *priv, u8 id,
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index 7e590b349dd7..51e1a69ffdda 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -36,9 +36,9 @@
 #include <linux/workqueue.h>
 
 #include "iwl-dev.h"
-#include "iwl-core.h"
 #include "iwl-agn.h"
 #include "iwl-op-mode.h"
+#include "iwl-modparams.h"
 
 #define RS_NAME "iwl-agn-rs"
 
@@ -420,7 +420,7 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
 
         load = rs_tl_get_load(lq_data, tid);
 
-        if ((iwlagn_mod_params.auto_agg) || (load > IWL_AGG_LOAD_THRESHOLD)) {
+        if ((iwlwifi_mod_params.auto_agg) || (load > IWL_AGG_LOAD_THRESHOLD)) {
                 IWL_DEBUG_HT(priv, "Starting Tx agg: STA: %pM tid: %d\n",
                                 sta->addr, tid);
                 ret = ieee80211_start_tx_ba_session(sta, tid, 5000);
@@ -819,7 +819,7 @@ static u32 rs_get_lower_rate(struct iwl_lq_sta *lq_sta,
 
                 if (num_of_ant(tbl->ant_type) > 1)
                         tbl->ant_type =
-                            first_antenna(hw_params(priv).valid_tx_ant);
+                            first_antenna(priv->hw_params.valid_tx_ant);
 
                 tbl->is_ht40 = 0;
                 tbl->is_SGI = 0;
@@ -969,7 +969,7 @@ static void rs_tx_status(void *priv_r, struct ieee80211_supported_band *sband,
             (tbl_type.is_SGI != !!(mac_flags & IEEE80211_TX_RC_SHORT_GI)) ||
             (tbl_type.is_ht40 != !!(mac_flags & IEEE80211_TX_RC_40_MHZ_WIDTH)) ||
             (tbl_type.is_dup != !!(mac_flags & IEEE80211_TX_RC_DUP_DATA)) ||
-            (tbl_type.ant_type != info->antenna_sel_tx) ||
+            (tbl_type.ant_type != info->status.antenna) ||
             (!!(tx_rate & RATE_MCS_HT_MSK) != !!(mac_flags & IEEE80211_TX_RC_MCS)) ||
             (!!(tx_rate & RATE_MCS_GF_MSK) != !!(mac_flags & IEEE80211_TX_RC_GREEN_FIELD)) ||
             (rs_index != mac_index)) {
@@ -1085,7 +1085,7 @@ done:
             (priv->tm_fixed_rate != lq_sta->dbg_fixed_rate))
                 rs_program_fix_rate(priv, lq_sta);
 #endif
-        if (cfg(priv)->bt_params && cfg(priv)->bt_params->advanced_bt_coexist)
+        if (priv->cfg->bt_params && priv->cfg->bt_params->advanced_bt_coexist)
                 rs_bt_update_lq(priv, ctx, lq_sta);
 }
 
@@ -1291,7 +1291,7 @@ static int rs_switch_to_mimo2(struct iwl_priv *priv,
                 return -1;
 
         /* Need both Tx chains/antennas to support MIMO */
-        if (hw_params(priv).tx_chains_num < 2)
+        if (priv->hw_params.tx_chains_num < 2)
                 return -1;
 
         IWL_DEBUG_RATE(priv, "LQ: try to switch to MIMO2\n");
@@ -1347,7 +1347,7 @@ static int rs_switch_to_mimo3(struct iwl_priv *priv,
                 return -1;
 
         /* Need both Tx chains/antennas to support MIMO */
-        if (hw_params(priv).tx_chains_num < 3)
+        if (priv->hw_params.tx_chains_num < 3)
                 return -1;
 
         IWL_DEBUG_RATE(priv, "LQ: try to switch to MIMO3\n");
@@ -1446,8 +1446,8 @@ static int rs_move_legacy_other(struct iwl_priv *priv,
         u32 sz = (sizeof(struct iwl_scale_tbl_info) -
                   (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
         u8 start_action;
-        u8 valid_tx_ant = hw_params(priv).valid_tx_ant;
-        u8 tx_chains_num = hw_params(priv).tx_chains_num;
+        u8 valid_tx_ant = priv->hw_params.valid_tx_ant;
+        u8 tx_chains_num = priv->hw_params.tx_chains_num;
         int ret = 0;
         u8 update_search_tbl_counter = 0;
 
@@ -1464,7 +1464,7 @@ static int rs_move_legacy_other(struct iwl_priv *priv,
         case IWL_BT_COEX_TRAFFIC_LOAD_CONTINUOUS:
                 /* avoid antenna B and MIMO */
                 valid_tx_ant =
-                        first_antenna(hw_params(priv).valid_tx_ant);
+                        first_antenna(priv->hw_params.valid_tx_ant);
                 if (tbl->action >= IWL_LEGACY_SWITCH_ANTENNA2 &&
                     tbl->action != IWL_LEGACY_SWITCH_SISO)
                         tbl->action = IWL_LEGACY_SWITCH_SISO;
@@ -1488,7 +1488,7 @@ static int rs_move_legacy_other(struct iwl_priv *priv,
                 else if (tbl->action >= IWL_LEGACY_SWITCH_ANTENNA2)
                         tbl->action = IWL_LEGACY_SWITCH_SISO;
                 valid_tx_ant =
-                        first_antenna(hw_params(priv).valid_tx_ant);
+                        first_antenna(priv->hw_params.valid_tx_ant);
         }
 
         start_action = tbl->action;
@@ -1622,8 +1622,8 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,
         u32 sz = (sizeof(struct iwl_scale_tbl_info) -
                   (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
         u8 start_action;
-        u8 valid_tx_ant = hw_params(priv).valid_tx_ant;
-        u8 tx_chains_num = hw_params(priv).tx_chains_num;
+        u8 valid_tx_ant = priv->hw_params.valid_tx_ant;
+        u8 tx_chains_num = priv->hw_params.tx_chains_num;
         u8 update_search_tbl_counter = 0;
         int ret;
 
@@ -1640,7 +1640,7 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,
         case IWL_BT_COEX_TRAFFIC_LOAD_CONTINUOUS:
                 /* avoid antenna B and MIMO */
                 valid_tx_ant =
-                        first_antenna(hw_params(priv).valid_tx_ant);
+                        first_antenna(priv->hw_params.valid_tx_ant);
                 if (tbl->action != IWL_SISO_SWITCH_ANTENNA1)
                         tbl->action = IWL_SISO_SWITCH_ANTENNA1;
                 break;
@@ -1658,7 +1658,7 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,
         /* configure as 1x1 if bt full concurrency */
         if (priv->bt_full_concurrent) {
                 valid_tx_ant =
-                        first_antenna(hw_params(priv).valid_tx_ant);
+                        first_antenna(priv->hw_params.valid_tx_ant);
                 if (tbl->action >= IWL_LEGACY_SWITCH_ANTENNA2)
                         tbl->action = IWL_SISO_SWITCH_ANTENNA1;
         }
@@ -1794,8 +1794,8 @@ static int rs_move_mimo2_to_other(struct iwl_priv *priv,
         u32 sz = (sizeof(struct iwl_scale_tbl_info) -
                   (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
         u8 start_action;
-        u8 valid_tx_ant = hw_params(priv).valid_tx_ant;
-        u8 tx_chains_num = hw_params(priv).tx_chains_num;
+        u8 valid_tx_ant = priv->hw_params.valid_tx_ant;
+        u8 tx_chains_num = priv->hw_params.tx_chains_num;
         u8 update_search_tbl_counter = 0;
         int ret;
 
@@ -1964,8 +1964,8 @@ static int rs_move_mimo3_to_other(struct iwl_priv *priv,
         u32 sz = (sizeof(struct iwl_scale_tbl_info) -
                   (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
         u8 start_action;
-        u8 valid_tx_ant = hw_params(priv).valid_tx_ant;
-        u8 tx_chains_num = hw_params(priv).tx_chains_num;
+        u8 valid_tx_ant = priv->hw_params.valid_tx_ant;
+        u8 tx_chains_num = priv->hw_params.tx_chains_num;
         int ret;
         u8 update_search_tbl_counter = 0;
 
@@ -2166,7 +2166,7 @@ static void rs_stay_in_table(struct iwl_lq_sta *lq_sta, bool force_search)
                     (lq_sta->total_success > lq_sta->max_success_limit) ||
                     ((!lq_sta->search_better_tbl) && (lq_sta->flush_timer)
                      && (flush_interval_passed))) {
-                        IWL_DEBUG_RATE(priv, "LQ: stay is expired %d %d %d\n:",
+                        IWL_DEBUG_RATE(priv, "LQ: stay is expired %d %d %d\n",
                                      lq_sta->total_failed,
                                      lq_sta->total_success,
                                      flush_interval_passed);
@@ -2698,7 +2698,7 @@ static void rs_initialize_lq(struct iwl_priv *priv,
 
         i = lq_sta->last_txrate_idx;
 
-        valid_tx_ant = hw_params(priv).valid_tx_ant;
+        valid_tx_ant = priv->hw_params.valid_tx_ant;
 
         if (!lq_sta->search_better_tbl)
                 active_tbl = lq_sta->active_tbl;
@@ -2826,6 +2826,7 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i
         struct iwl_station_priv *sta_priv;
         struct iwl_lq_sta *lq_sta;
         struct ieee80211_supported_band *sband;
+        unsigned long supp; /* must be unsigned long for for_each_set_bit */
 
         sta_priv = (struct iwl_station_priv *) sta->drv_priv;
         lq_sta = &sta_priv->lq_sta;
@@ -2855,8 +2856,15 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i
         lq_sta->max_rate_idx = -1;
         lq_sta->missed_rate_counter = IWL_MISSED_RATE_MAX;
         lq_sta->is_green = rs_use_green(sta);
-        lq_sta->active_legacy_rate = priv->active_rate & ~(0x1000);
-        lq_sta->band = priv->band;
+        lq_sta->band = sband->band;
+        /*
+         * active legacy rates as per supported rates bitmap
+         */
+        supp = sta->supp_rates[sband->band];
+        lq_sta->active_legacy_rate = 0;
+        for_each_set_bit(i, &supp, BITS_PER_LONG)
+                lq_sta->active_legacy_rate |= BIT(sband->bitrates[i].hw_value);
+
         /*
          * active_siso_rate mask includes 9 MBits (bit 5), and CCK (bits 0-3),
          * supp_rates[] does not; shift to convert format, force 9 MBits off.
@@ -2884,15 +2892,15 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i
 
         /* These values will be overridden later */
         lq_sta->lq.general_params.single_stream_ant_msk =
-                first_antenna(hw_params(priv).valid_tx_ant);
+                first_antenna(priv->hw_params.valid_tx_ant);
         lq_sta->lq.general_params.dual_stream_ant_msk =
-                hw_params(priv).valid_tx_ant &
-                ~first_antenna(hw_params(priv).valid_tx_ant);
+                priv->hw_params.valid_tx_ant &
+                ~first_antenna(priv->hw_params.valid_tx_ant);
         if (!lq_sta->lq.general_params.dual_stream_ant_msk) {
                 lq_sta->lq.general_params.dual_stream_ant_msk = ANT_AB;
-        } else if (num_of_ant(hw_params(priv).valid_tx_ant) == 2) {
+        } else if (num_of_ant(priv->hw_params.valid_tx_ant) == 2) {
                 lq_sta->lq.general_params.dual_stream_ant_msk =
-                        hw_params(priv).valid_tx_ant;
+                        priv->hw_params.valid_tx_ant;
         }
 
         /* as default allow aggregation for all tids */
@@ -2938,7 +2946,7 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,
         if (priv && priv->bt_full_concurrent) {
                 /* 1x1 only */
                 tbl_type.ant_type =
-                        first_antenna(hw_params(priv).valid_tx_ant);
+                        first_antenna(priv->hw_params.valid_tx_ant);
         }
 
         /* How many times should we repeat the initial rate? */
@@ -2970,7 +2978,7 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,
                 if (priv->bt_full_concurrent)
                         valid_tx_ant = ANT_A;
                 else
-                        valid_tx_ant = hw_params(priv).valid_tx_ant;
+                        valid_tx_ant = priv->hw_params.valid_tx_ant;
         }
 
         /* Fill rest of rate table */
@@ -3004,7 +3012,7 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,
                 if (priv && priv->bt_full_concurrent) {
                         /* 1x1 only */
                         tbl_type.ant_type =
-                            first_antenna(hw_params(priv).valid_tx_ant);
+                            first_antenna(priv->hw_params.valid_tx_ant);
                 }
 
                 /* Indicate to uCode which entries might be MIMO.
@@ -3055,11 +3063,11 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,
          * overwrite if needed, pass aggregation time limit
          * to uCode in uSec
          */
-        if (priv && cfg(priv)->bt_params &&
-            cfg(priv)->bt_params->agg_time_limit &&
+        if (priv && priv->cfg->bt_params &&
+            priv->cfg->bt_params->agg_time_limit &&
             priv->bt_traffic_load >= IWL_BT_COEX_TRAFFIC_LOAD_HIGH)
                 lq_cmd->agg_params.agg_time_limit =
-                        cpu_to_le16(cfg(priv)->bt_params->agg_time_limit);
+                        cpu_to_le16(priv->cfg->bt_params->agg_time_limit);
 }
 
 static void *rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
@@ -3091,7 +3099,7 @@ static void rs_dbgfs_set_mcs(struct iwl_lq_sta *lq_sta,
         u8 ant_sel_tx;
 
         priv = lq_sta->drv;
-        valid_tx_ant = hw_params(priv).valid_tx_ant;
+        valid_tx_ant = priv->hw_params.valid_tx_ant;
         if (lq_sta->dbg_fixed_rate) {
                 ant_sel_tx =
                   ((lq_sta->dbg_fixed_rate & RATE_MCS_ANT_ABC_MSK)
@@ -3162,9 +3170,9 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
         desc += sprintf(buff+desc, "fixed rate 0x%X\n",
                         lq_sta->dbg_fixed_rate);
         desc += sprintf(buff+desc, "valid_tx_ant %s%s%s\n",
-            (hw_params(priv).valid_tx_ant & ANT_A) ? "ANT_A," : "",
-            (hw_params(priv).valid_tx_ant & ANT_B) ? "ANT_B," : "",
-            (hw_params(priv).valid_tx_ant & ANT_C) ? "ANT_C" : "");
+            (priv->hw_params.valid_tx_ant & ANT_A) ? "ANT_A," : "",
+            (priv->hw_params.valid_tx_ant & ANT_B) ? "ANT_B," : "",
+            (priv->hw_params.valid_tx_ant & ANT_C) ? "ANT_C" : "");
         desc += sprintf(buff+desc, "lq type %s\n",
            (is_legacy(tbl->lq_type)) ? "legacy" : "HT");
         if (is_Ht(tbl->lq_type)) {
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
index 203b1c13c491..82d02e1ae89f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
@@ -30,6 +30,7 @@
 #include <net/mac80211.h>
 
 #include "iwl-commands.h"
+#include "iwl-config.h"
 
 struct iwl_rate_info {
         u8 plcp;        /* uCode API:  IWL_RATE_6M_PLCP, etc. */
@@ -174,32 +175,6 @@ enum {
         IWL_RATE_11M_IEEE = 22,
 };
 
-#define IWL_CCK_BASIC_RATES_MASK    \
-       (IWL_RATE_1M_MASK          | \
-        IWL_RATE_2M_MASK)
-
-#define IWL_CCK_RATES_MASK          \
-       (IWL_CCK_BASIC_RATES_MASK  | \
-        IWL_RATE_5M_MASK          | \
-        IWL_RATE_11M_MASK)
-
-#define IWL_OFDM_BASIC_RATES_MASK   \
-        (IWL_RATE_6M_MASK         | \
-        IWL_RATE_12M_MASK         | \
-        IWL_RATE_24M_MASK)
-
-#define IWL_OFDM_RATES_MASK         \
-       (IWL_OFDM_BASIC_RATES_MASK | \
-        IWL_RATE_9M_MASK          | \
-        IWL_RATE_18M_MASK         | \
-        IWL_RATE_36M_MASK         | \
-        IWL_RATE_48M_MASK         | \
-        IWL_RATE_54M_MASK)
-
-#define IWL_BASIC_RATES_MASK         \
-        (IWL_OFDM_BASIC_RATES_MASK | \
-         IWL_CCK_BASIC_RATES_MASK)
-
 #define IWL_RATES_MASK ((1 << IWL_RATE_COUNT) - 1)
 
 #define IWL_INVALID_VALUE    -1
@@ -306,15 +281,6 @@ enum iwl_table_type {
 #define is_a_band(tbl) ((tbl) == LQ_A)
 #define is_g_and(tbl) ((tbl) == LQ_G)
 
-#define ANT_NONE        0x0
-#define ANT_A           BIT(0)
-#define ANT_B           BIT(1)
-#define ANT_AB          (ANT_A | ANT_B)
-#define ANT_C           BIT(2)
-#define ANT_AC          (ANT_A | ANT_C)
-#define ANT_BC          (ANT_B | ANT_C)
-#define ANT_ABC         (ANT_AB | ANT_C)
-
 #define IWL_MAX_MCS_DISPLAY_SIZE        12
 
 struct iwl_rate_mcs_info {
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
index f4b84d1596e3..403de96f9747 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
@@ -34,95 +34,91 @@
 #include <asm/unaligned.h>
 #include "iwl-eeprom.h"
 #include "iwl-dev.h"
-#include "iwl-core.h"
 #include "iwl-io.h"
 #include "iwl-agn-calib.h"
 #include "iwl-agn.h"
-#include "iwl-shared.h"
-
-const char *get_cmd_string(u8 cmd)
-{
-        switch (cmd) {
-                IWL_CMD(REPLY_ALIVE);
-                IWL_CMD(REPLY_ERROR);
-                IWL_CMD(REPLY_ECHO);
-                IWL_CMD(REPLY_RXON);
-                IWL_CMD(REPLY_RXON_ASSOC);
-                IWL_CMD(REPLY_QOS_PARAM);
-                IWL_CMD(REPLY_RXON_TIMING);
-                IWL_CMD(REPLY_ADD_STA);
-                IWL_CMD(REPLY_REMOVE_STA);
-                IWL_CMD(REPLY_REMOVE_ALL_STA);
-                IWL_CMD(REPLY_TXFIFO_FLUSH);
-                IWL_CMD(REPLY_WEPKEY);
-                IWL_CMD(REPLY_TX);
-                IWL_CMD(REPLY_LEDS_CMD);
-                IWL_CMD(REPLY_TX_LINK_QUALITY_CMD);
-                IWL_CMD(COEX_PRIORITY_TABLE_CMD);
-                IWL_CMD(COEX_MEDIUM_NOTIFICATION);
-                IWL_CMD(COEX_EVENT_CMD);
-                IWL_CMD(REPLY_QUIET_CMD);
-                IWL_CMD(REPLY_CHANNEL_SWITCH);
-                IWL_CMD(CHANNEL_SWITCH_NOTIFICATION);
-                IWL_CMD(REPLY_SPECTRUM_MEASUREMENT_CMD);
-                IWL_CMD(SPECTRUM_MEASURE_NOTIFICATION);
-                IWL_CMD(POWER_TABLE_CMD);
-                IWL_CMD(PM_SLEEP_NOTIFICATION);
-                IWL_CMD(PM_DEBUG_STATISTIC_NOTIFIC);
-                IWL_CMD(REPLY_SCAN_CMD);
-                IWL_CMD(REPLY_SCAN_ABORT_CMD);
-                IWL_CMD(SCAN_START_NOTIFICATION);
-                IWL_CMD(SCAN_RESULTS_NOTIFICATION);
-                IWL_CMD(SCAN_COMPLETE_NOTIFICATION);
-                IWL_CMD(BEACON_NOTIFICATION);
-                IWL_CMD(REPLY_TX_BEACON);
-                IWL_CMD(WHO_IS_AWAKE_NOTIFICATION);
-                IWL_CMD(QUIET_NOTIFICATION);
-                IWL_CMD(REPLY_TX_PWR_TABLE_CMD);
-                IWL_CMD(MEASURE_ABORT_NOTIFICATION);
-                IWL_CMD(REPLY_BT_CONFIG);
-                IWL_CMD(REPLY_STATISTICS_CMD);
-                IWL_CMD(STATISTICS_NOTIFICATION);
-                IWL_CMD(REPLY_CARD_STATE_CMD);
-                IWL_CMD(CARD_STATE_NOTIFICATION);
-                IWL_CMD(MISSED_BEACONS_NOTIFICATION);
-                IWL_CMD(REPLY_CT_KILL_CONFIG_CMD);
-                IWL_CMD(SENSITIVITY_CMD);
-                IWL_CMD(REPLY_PHY_CALIBRATION_CMD);
-                IWL_CMD(REPLY_RX_PHY_CMD);
-                IWL_CMD(REPLY_RX_MPDU_CMD);
-                IWL_CMD(REPLY_RX);
-                IWL_CMD(REPLY_COMPRESSED_BA);
-                IWL_CMD(CALIBRATION_CFG_CMD);
-                IWL_CMD(CALIBRATION_RES_NOTIFICATION);
-                IWL_CMD(CALIBRATION_COMPLETE_NOTIFICATION);
-                IWL_CMD(REPLY_TX_POWER_DBM_CMD);
-                IWL_CMD(TEMPERATURE_NOTIFICATION);
-                IWL_CMD(TX_ANT_CONFIGURATION_CMD);
-                IWL_CMD(REPLY_BT_COEX_PROFILE_NOTIF);
-                IWL_CMD(REPLY_BT_COEX_PRIO_TABLE);
-                IWL_CMD(REPLY_BT_COEX_PROT_ENV);
-                IWL_CMD(REPLY_WIPAN_PARAMS);
-                IWL_CMD(REPLY_WIPAN_RXON);
-                IWL_CMD(REPLY_WIPAN_RXON_TIMING);
-                IWL_CMD(REPLY_WIPAN_RXON_ASSOC);
-                IWL_CMD(REPLY_WIPAN_QOS_PARAM);
-                IWL_CMD(REPLY_WIPAN_WEPKEY);
-                IWL_CMD(REPLY_WIPAN_P2P_CHANNEL_SWITCH);
-                IWL_CMD(REPLY_WIPAN_NOA_NOTIFICATION);
-                IWL_CMD(REPLY_WIPAN_DEACTIVATION_COMPLETE);
-                IWL_CMD(REPLY_WOWLAN_PATTERNS);
-                IWL_CMD(REPLY_WOWLAN_WAKEUP_FILTER);
-                IWL_CMD(REPLY_WOWLAN_TSC_RSC_PARAMS);
-                IWL_CMD(REPLY_WOWLAN_TKIP_PARAMS);
-                IWL_CMD(REPLY_WOWLAN_KEK_KCK_MATERIAL);
-                IWL_CMD(REPLY_WOWLAN_GET_STATUS);
-                IWL_CMD(REPLY_D3_CONFIG);
-        default:
-                return "UNKNOWN";
-
-        }
-}
+#include "iwl-modparams.h"
+
+#define IWL_CMD_ENTRY(x) [x] = #x
+
+const char *iwl_dvm_cmd_strings[REPLY_MAX] = {
+        IWL_CMD_ENTRY(REPLY_ALIVE),
+        IWL_CMD_ENTRY(REPLY_ERROR),
+        IWL_CMD_ENTRY(REPLY_ECHO),
+        IWL_CMD_ENTRY(REPLY_RXON),
+        IWL_CMD_ENTRY(REPLY_RXON_ASSOC),
+        IWL_CMD_ENTRY(REPLY_QOS_PARAM),
+        IWL_CMD_ENTRY(REPLY_RXON_TIMING),
+        IWL_CMD_ENTRY(REPLY_ADD_STA),
+        IWL_CMD_ENTRY(REPLY_REMOVE_STA),
+        IWL_CMD_ENTRY(REPLY_REMOVE_ALL_STA),
+        IWL_CMD_ENTRY(REPLY_TXFIFO_FLUSH),
+        IWL_CMD_ENTRY(REPLY_WEPKEY),
+        IWL_CMD_ENTRY(REPLY_TX),
+        IWL_CMD_ENTRY(REPLY_LEDS_CMD),
+        IWL_CMD_ENTRY(REPLY_TX_LINK_QUALITY_CMD),
+        IWL_CMD_ENTRY(COEX_PRIORITY_TABLE_CMD),
+        IWL_CMD_ENTRY(COEX_MEDIUM_NOTIFICATION),
+        IWL_CMD_ENTRY(COEX_EVENT_CMD),
+        IWL_CMD_ENTRY(REPLY_QUIET_CMD),
+        IWL_CMD_ENTRY(REPLY_CHANNEL_SWITCH),
+        IWL_CMD_ENTRY(CHANNEL_SWITCH_NOTIFICATION),
+        IWL_CMD_ENTRY(REPLY_SPECTRUM_MEASUREMENT_CMD),
+        IWL_CMD_ENTRY(SPECTRUM_MEASURE_NOTIFICATION),
+        IWL_CMD_ENTRY(POWER_TABLE_CMD),
+        IWL_CMD_ENTRY(PM_SLEEP_NOTIFICATION),
+        IWL_CMD_ENTRY(PM_DEBUG_STATISTIC_NOTIFIC),
+        IWL_CMD_ENTRY(REPLY_SCAN_CMD),
+        IWL_CMD_ENTRY(REPLY_SCAN_ABORT_CMD),
+        IWL_CMD_ENTRY(SCAN_START_NOTIFICATION),
+        IWL_CMD_ENTRY(SCAN_RESULTS_NOTIFICATION),
+        IWL_CMD_ENTRY(SCAN_COMPLETE_NOTIFICATION),
+        IWL_CMD_ENTRY(BEACON_NOTIFICATION),
+        IWL_CMD_ENTRY(REPLY_TX_BEACON),
+        IWL_CMD_ENTRY(WHO_IS_AWAKE_NOTIFICATION),
+        IWL_CMD_ENTRY(QUIET_NOTIFICATION),
+        IWL_CMD_ENTRY(REPLY_TX_PWR_TABLE_CMD),
+        IWL_CMD_ENTRY(MEASURE_ABORT_NOTIFICATION),
+        IWL_CMD_ENTRY(REPLY_BT_CONFIG),
+        IWL_CMD_ENTRY(REPLY_STATISTICS_CMD),
+        IWL_CMD_ENTRY(STATISTICS_NOTIFICATION),
+        IWL_CMD_ENTRY(REPLY_CARD_STATE_CMD),
+        IWL_CMD_ENTRY(CARD_STATE_NOTIFICATION),
+        IWL_CMD_ENTRY(MISSED_BEACONS_NOTIFICATION),
+        IWL_CMD_ENTRY(REPLY_CT_KILL_CONFIG_CMD),
+        IWL_CMD_ENTRY(SENSITIVITY_CMD),
+        IWL_CMD_ENTRY(REPLY_PHY_CALIBRATION_CMD),
+        IWL_CMD_ENTRY(REPLY_RX_PHY_CMD),
+        IWL_CMD_ENTRY(REPLY_RX_MPDU_CMD),
+        IWL_CMD_ENTRY(REPLY_RX),
+        IWL_CMD_ENTRY(REPLY_COMPRESSED_BA),
+        IWL_CMD_ENTRY(CALIBRATION_CFG_CMD),
+        IWL_CMD_ENTRY(CALIBRATION_RES_NOTIFICATION),
+        IWL_CMD_ENTRY(CALIBRATION_COMPLETE_NOTIFICATION),
+        IWL_CMD_ENTRY(REPLY_TX_POWER_DBM_CMD),
+        IWL_CMD_ENTRY(TEMPERATURE_NOTIFICATION),
+        IWL_CMD_ENTRY(TX_ANT_CONFIGURATION_CMD),
+        IWL_CMD_ENTRY(REPLY_BT_COEX_PROFILE_NOTIF),
+        IWL_CMD_ENTRY(REPLY_BT_COEX_PRIO_TABLE),
+        IWL_CMD_ENTRY(REPLY_BT_COEX_PROT_ENV),
+        IWL_CMD_ENTRY(REPLY_WIPAN_PARAMS),
+        IWL_CMD_ENTRY(REPLY_WIPAN_RXON),
+        IWL_CMD_ENTRY(REPLY_WIPAN_RXON_TIMING),
+        IWL_CMD_ENTRY(REPLY_WIPAN_RXON_ASSOC),
+        IWL_CMD_ENTRY(REPLY_WIPAN_QOS_PARAM),
+        IWL_CMD_ENTRY(REPLY_WIPAN_WEPKEY),
+        IWL_CMD_ENTRY(REPLY_WIPAN_P2P_CHANNEL_SWITCH),
+        IWL_CMD_ENTRY(REPLY_WIPAN_NOA_NOTIFICATION),
+        IWL_CMD_ENTRY(REPLY_WIPAN_DEACTIVATION_COMPLETE),
+        IWL_CMD_ENTRY(REPLY_WOWLAN_PATTERNS),
+        IWL_CMD_ENTRY(REPLY_WOWLAN_WAKEUP_FILTER),
+        IWL_CMD_ENTRY(REPLY_WOWLAN_TSC_RSC_PARAMS),
+        IWL_CMD_ENTRY(REPLY_WOWLAN_TKIP_PARAMS),
+        IWL_CMD_ENTRY(REPLY_WOWLAN_KEK_KCK_MATERIAL),
+        IWL_CMD_ENTRY(REPLY_WOWLAN_GET_STATUS),
+        IWL_CMD_ENTRY(REPLY_D3_CONFIG),
+};
+#undef IWL_CMD_ENTRY
 
 /******************************************************************************
  *
@@ -137,10 +133,9 @@ static int iwlagn_rx_reply_error(struct iwl_priv *priv,
         struct iwl_rx_packet *pkt = rxb_addr(rxb);
         struct iwl_error_resp *err_resp = (void *)pkt->data;
 
-        IWL_ERR(priv, "Error Reply type 0x%08X cmd %s (0x%02X) "
+        IWL_ERR(priv, "Error Reply type 0x%08X cmd REPLY_ERROR (0x%02X) "
                 "seq 0x%04X ser 0x%08X\n",
                 le32_to_cpu(err_resp->error_type),
-                get_cmd_string(err_resp->cmd_id),
                 err_resp->cmd_id,
                 le16_to_cpu(err_resp->bad_cmd_seq_num),
                 le32_to_cpu(err_resp->error_info));
@@ -216,8 +211,7 @@ static int iwlagn_rx_pm_debug_statistics_notif(struct iwl_priv *priv,
         u32 __maybe_unused len =
                 le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
         IWL_DEBUG_RADIO(priv, "Dumping %d bytes of unhandled "
-                        "notification for %s:\n", len,
-                        get_cmd_string(pkt->hdr.cmd));
+                        "notification for PM_DEBUG_STATISTIC_NOTIFIC:\n", len);
         iwl_print_hex_dump(priv, IWL_DL_RADIO, pkt->data, len);
         return 0;
 }
@@ -246,69 +240,6 @@ static int iwlagn_rx_beacon_notif(struct iwl_priv *priv,
         return 0;
 }
 
-/* the threshold ratio of actual_ack_cnt to expected_ack_cnt in percent */
-#define ACK_CNT_RATIO (50)
-#define BA_TIMEOUT_CNT (5)
-#define BA_TIMEOUT_MAX (16)
-
-/**
- * iwl_good_ack_health - checks for ACK count ratios, BA timeout retries.
- *
- * When the ACK count ratio is low and aggregated BA timeout retries exceeding
- * the BA_TIMEOUT_MAX, reload firmware and bring system back to normal
- * operation state.
- */
-static bool iwlagn_good_ack_health(struct iwl_priv *priv,
-                                struct statistics_tx *cur)
-{
-        int actual_delta, expected_delta, ba_timeout_delta;
-        struct statistics_tx *old;
-
-        if (priv->agg_tids_count)
-                return true;
-
-        lockdep_assert_held(&priv->statistics.lock);
-
-        old = &priv->statistics.tx;
-
-        actual_delta = le32_to_cpu(cur->actual_ack_cnt) -
-                       le32_to_cpu(old->actual_ack_cnt);
-        expected_delta = le32_to_cpu(cur->expected_ack_cnt) -
-                         le32_to_cpu(old->expected_ack_cnt);
-
-        /* Values should not be negative, but we do not trust the firmware */
-        if (actual_delta <= 0 || expected_delta <= 0)
-                return true;
-
-        ba_timeout_delta = le32_to_cpu(cur->agg.ba_timeout) -
-                           le32_to_cpu(old->agg.ba_timeout);
-
-        if ((actual_delta * 100 / expected_delta) < ACK_CNT_RATIO &&
-            ba_timeout_delta > BA_TIMEOUT_CNT) {
-                IWL_DEBUG_RADIO(priv,
-                        "deltas: actual %d expected %d ba_timeout %d\n",
-                        actual_delta, expected_delta, ba_timeout_delta);
-
-#ifdef CONFIG_IWLWIFI_DEBUGFS
-                /*
-                 * This is ifdef'ed on DEBUGFS because otherwise the
-                 * statistics aren't available. If DEBUGFS is set but
-                 * DEBUG is not, these will just compile out.
-                 */
-                IWL_DEBUG_RADIO(priv, "rx_detected_cnt delta %d\n",
-                                priv->delta_stats.tx.rx_detected_cnt);
-                IWL_DEBUG_RADIO(priv,
-                                "ack_or_ba_timeout_collision delta %d\n",
-                                priv->delta_stats.tx.ack_or_ba_timeout_collision);
-#endif
-
-                if (ba_timeout_delta >= BA_TIMEOUT_MAX)
-                        return false;
-        }
-
-        return true;
-}
-
 /**
  * iwl_good_plcp_health - checks for plcp error.
  *
@@ -347,6 +278,45 @@ static bool iwlagn_good_plcp_health(struct iwl_priv *priv,
         return true;
 }
 
+int iwl_force_rf_reset(struct iwl_priv *priv, bool external)
+{
+        struct iwl_rf_reset *rf_reset;
+
+        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
+                return -EAGAIN;
+
+        if (!iwl_is_any_associated(priv)) {
+                IWL_DEBUG_SCAN(priv, "force reset rejected: not associated\n");
+                return -ENOLINK;
+        }
+
+        rf_reset = &priv->rf_reset;
+        rf_reset->reset_request_count++;
+        if (!external && rf_reset->last_reset_jiffies &&
+            time_after(rf_reset->last_reset_jiffies +
+                       IWL_DELAY_NEXT_FORCE_RF_RESET, jiffies)) {
+                IWL_DEBUG_INFO(priv, "RF reset rejected\n");
+                rf_reset->reset_reject_count++;
+                return -EAGAIN;
+        }
+        rf_reset->reset_success_count++;
+        rf_reset->last_reset_jiffies = jiffies;
+
+        /*
+         * There is no easy and better way to force reset the radio,
+         * the only known method is switching channel which will force to
+         * reset and tune the radio.
+         * Use internal short scan (single channel) operation to should
+         * achieve this objective.
+         * Driver should reset the radio when number of consecutive missed
+         * beacon, or any other uCode error condition detected.
+         */
+        IWL_DEBUG_INFO(priv, "perform radio reset.\n");
+        iwl_internal_short_hw_scan(priv);
+        return 0;
+}
+
+
 static void iwlagn_recover_from_statistics(struct iwl_priv *priv,
                                 struct statistics_rx_phy *cur_ofdm,
                                 struct statistics_rx_ht_phy *cur_ofdm_ht,
@@ -368,15 +338,9 @@ static void iwlagn_recover_from_statistics(struct iwl_priv *priv,
         if (msecs < 99)
                 return;
 
-        if (iwlagn_mod_params.ack_check && !iwlagn_good_ack_health(priv, tx)) {
-                IWL_ERR(priv, "low ack count detected, restart firmware\n");
-                if (!iwl_force_reset(priv, IWL_FW_RESET, false))
-                        return;
-        }
-
-        if (iwlagn_mod_params.plcp_check &&
+        if (iwlwifi_mod_params.plcp_check &&
             !iwlagn_good_plcp_health(priv, cur_ofdm, cur_ofdm_ht, msecs))
-                iwl_force_reset(priv, IWL_RF_RESET, false);
+                iwl_force_rf_reset(priv, false);
 }
 
 /* Calculate noise level, based on measurements during network silence just
@@ -589,8 +553,8 @@ static int iwlagn_rx_statistics(struct iwl_priv *priv,
                 iwlagn_rx_calc_noise(priv);
                 queue_work(priv->workqueue, &priv->run_time_calib_work);
         }
-        if (cfg(priv)->lib->temperature && change)
-                cfg(priv)->lib->temperature(priv);
+        if (priv->lib->temperature && change)
+                priv->lib->temperature(priv);
 
         spin_unlock(&priv->statistics.lock);
 
@@ -639,16 +603,16 @@ static int iwlagn_rx_card_state_notif(struct iwl_priv *priv,
         if (flags & (SW_CARD_DISABLED | HW_CARD_DISABLED |
                      CT_CARD_DISABLED)) {
 
-                iwl_write32(trans(priv), CSR_UCODE_DRV_GP1_SET,
+                iwl_write32(priv->trans, CSR_UCODE_DRV_GP1_SET,
                             CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);
 
-                iwl_write_direct32(trans(priv), HBUS_TARG_MBX_C,
+                iwl_write_direct32(priv->trans, HBUS_TARG_MBX_C,
                                         HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED);
 
                 if (!(flags & RXON_CARD_DISABLED)) {
-                        iwl_write32(trans(priv), CSR_UCODE_DRV_GP1_CLR,
+                        iwl_write32(priv->trans, CSR_UCODE_DRV_GP1_CLR,
                                     CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);
-                        iwl_write_direct32(trans(priv), HBUS_TARG_MBX_C,
+                        iwl_write_direct32(priv->trans, HBUS_TARG_MBX_C,
                                         HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED);
                 }
                 if (flags & CT_CARD_DISABLED)
@@ -671,7 +635,7 @@ static int iwlagn_rx_card_state_notif(struct iwl_priv *priv,
                 wiphy_rfkill_set_hw_state(priv->hw->wiphy,
                         test_bit(STATUS_RF_KILL_HW, &priv->status));
         else
-                wake_up(&trans(priv)->wait_command_queue);
+                wake_up(&priv->trans->wait_command_queue);
         return 0;
 }
 
@@ -773,8 +737,7 @@ static void iwlagn_pass_packet_to_mac80211(struct iwl_priv *priv,
         struct sk_buff *skb;
         __le16 fc = hdr->frame_control;
         struct iwl_rxon_context *ctx;
-        struct page *p;
-        int offset;
+        unsigned int hdrlen, fraglen;
 
         /* We only process data packets if the interface is open */
         if (unlikely(!priv->is_open)) {
@@ -784,21 +747,34 @@ static void iwlagn_pass_packet_to_mac80211(struct iwl_priv *priv,
         }
 
         /* In case of HW accelerated crypto and bad decryption, drop */
-        if (!iwlagn_mod_params.sw_crypto &&
+        if (!iwlwifi_mod_params.sw_crypto &&
             iwlagn_set_decrypted_flag(priv, hdr, ampdu_status, stats))
                 return;
 
-        skb = dev_alloc_skb(128);
+        /* Dont use dev_alloc_skb(), we'll have enough headroom once
+         * ieee80211_hdr pulled.
+         */
+        skb = alloc_skb(128, GFP_ATOMIC);
         if (!skb) {
-                IWL_ERR(priv, "dev_alloc_skb failed\n");
+                IWL_ERR(priv, "alloc_skb failed\n");
                 return;
         }
+        /* If frame is small enough to fit in skb->head, pull it completely.
+         * If not, only pull ieee80211_hdr so that splice() or TCP coalesce
+         * are more efficient.
+         */
+        hdrlen = (len <= skb_tailroom(skb)) ? len : sizeof(*hdr);
+
+        memcpy(skb_put(skb, hdrlen), hdr, hdrlen);
+        fraglen = len - hdrlen;
 
-        offset = (void *)hdr - rxb_addr(rxb);
-        p = rxb_steal_page(rxb);
-        skb_add_rx_frag(skb, 0, p, offset, len, len);
+        if (fraglen) {
+                int offset = (void *)hdr + hdrlen -
+                             rxb_addr(rxb) + rxb_offset(rxb);
 
-        iwl_update_stats(priv, false, fc, len);
+                skb_add_rx_frag(skb, 0, rxb_steal_page(rxb), offset,
+                                fraglen, rxb->truesize);
+        }
 
         /*
         * Wake any queues that were stopped due to a passive channel tx
@@ -809,8 +785,8 @@ static void iwlagn_pass_packet_to_mac80211(struct iwl_priv *priv,
         */
         if (unlikely(ieee80211_is_beacon(fc) && priv->passive_no_rx)) {
                 for_each_context(priv, ctx) {
-                        if (compare_ether_addr(hdr->addr3,
-                                               ctx->active.bssid_addr))
+                        if (!ether_addr_equal(hdr->addr3,
+                                              ctx->active.bssid_addr))
                                 continue;
                         iwlagn_lift_passive_no_rx(priv);
                 }
@@ -970,7 +946,7 @@ static int iwlagn_rx_reply_rx(struct iwl_priv *priv,
         }
 
         if ((unlikely(phy_res->cfg_phy_cnt > 20))) {
-                IWL_DEBUG_DROP(priv, "dsp size out of range [0,20]: %d/n",
+                IWL_DEBUG_DROP(priv, "dsp size out of range [0,20]: %d\n",
                                 phy_res->cfg_phy_cnt);
                 return 0;
         }
@@ -1005,7 +981,6 @@ static int iwlagn_rx_reply_rx(struct iwl_priv *priv,
         /* Find max signal strength (dBm) among 3 antenna/receiver chains */
         rx_status.signal = iwlagn_calc_rssi(priv, phy_res);
 
-        iwl_dbg_log_rx_data_frame(priv, len, header);
         IWL_DEBUG_STATS_LIMIT(priv, "Rssi %d, TSF %llu\n",
                 rx_status.signal, (unsigned long long)rx_status.mactime);
 
@@ -1134,16 +1109,13 @@ void iwl_setup_rx_handlers(struct iwl_priv *priv)
         handlers[REPLY_COMPRESSED_BA]           =
                 iwlagn_rx_reply_compressed_ba;
 
-        /* init calibration handlers */
-        priv->rx_handlers[CALIBRATION_RES_NOTIFICATION] =
-                                        iwlagn_rx_calib_result;
         priv->rx_handlers[REPLY_TX] = iwlagn_rx_reply_tx;
 
         /* set up notification wait support */
         iwl_notification_wait_init(&priv->notif_wait);
 
         /* Set up BT Rx handlers */
-        if (cfg(priv)->bt_params)
+        if (priv->cfg->bt_params)
                 iwlagn_bt_rx_handler_setup(priv);
 }
 
@@ -1185,9 +1157,9 @@ int iwl_rx_dispatch(struct iwl_op_mode *op_mode, struct iwl_rx_cmd_buffer *rxb,
                         err = priv->rx_handlers[pkt->hdr.cmd] (priv, rxb, cmd);
                 } else {
                         /* No handling needed */
-                        IWL_DEBUG_RX(priv,
-                                "No handler needed for %s, 0x%02x\n",
-                                get_cmd_string(pkt->hdr.cmd), pkt->hdr.cmd);
+                        IWL_DEBUG_RX(priv, "No handler needed for %s, 0x%02x\n",
+                                     iwl_dvm_get_cmd_string(pkt->hdr.cmd),
+                                     pkt->hdr.cmd);
                 }
         }
         return err;
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 2e1a31797a9e..74fbee627306 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -24,12 +24,79 @@
  *
  *****************************************************************************/
 
+#include <linux/etherdevice.h>
 #include "iwl-dev.h"
 #include "iwl-agn.h"
-#include "iwl-core.h"
 #include "iwl-agn-calib.h"
 #include "iwl-trans.h"
-#include "iwl-shared.h"
+#include "iwl-modparams.h"
+
+/*
+ * initialize rxon structure with default values from eeprom
+ */
+void iwl_connection_init_rx_config(struct iwl_priv *priv,
+                                   struct iwl_rxon_context *ctx)
+{
+        const struct iwl_channel_info *ch_info;
+
+        memset(&ctx->staging, 0, sizeof(ctx->staging));
+
+        if (!ctx->vif) {
+                ctx->staging.dev_type = ctx->unused_devtype;
+        } else
+        switch (ctx->vif->type) {
+        case NL80211_IFTYPE_AP:
+                ctx->staging.dev_type = ctx->ap_devtype;
+                break;
+
+        case NL80211_IFTYPE_STATION:
+                ctx->staging.dev_type = ctx->station_devtype;
+                ctx->staging.filter_flags = RXON_FILTER_ACCEPT_GRP_MSK;
+                break;
+
+        case NL80211_IFTYPE_ADHOC:
+                ctx->staging.dev_type = ctx->ibss_devtype;
+                ctx->staging.flags = RXON_FLG_SHORT_PREAMBLE_MSK;
+                ctx->staging.filter_flags = RXON_FILTER_BCON_AWARE_MSK |
+                                                  RXON_FILTER_ACCEPT_GRP_MSK;
+                break;
+
+        default:
+                IWL_ERR(priv, "Unsupported interface type %d\n",
+                        ctx->vif->type);
+                break;
+        }
+
+#if 0
+        /* TODO:  Figure out when short_preamble would be set and cache from
+         * that */
+        if (!hw_to_local(priv->hw)->short_preamble)
+                ctx->staging.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
+        else
+                ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
+#endif
+
+        ch_info = iwl_get_channel_info(priv, priv->band,
+                                       le16_to_cpu(ctx->active.channel));
+
+        if (!ch_info)
+                ch_info = &priv->channel_info[0];
+
+        ctx->staging.channel = cpu_to_le16(ch_info->channel);
+        priv->band = ch_info->band;
+
+        iwl_set_flags_for_band(priv, ctx, priv->band, ctx->vif);
+
+        /* clear both MIX and PURE40 mode flag */
+        ctx->staging.flags &= ~(RXON_FLG_CHANNEL_MODE_MIXED |
+                                        RXON_FLG_CHANNEL_MODE_PURE_40);
+        if (ctx->vif)
+                memcpy(ctx->staging.node_addr, ctx->vif->addr, ETH_ALEN);
+
+        ctx->staging.ofdm_ht_single_stream_basic_rates = 0xff;
+        ctx->staging.ofdm_ht_dual_stream_basic_rates = 0xff;
+        ctx->staging.ofdm_ht_triple_stream_basic_rates = 0xff;
+}
 
 static int iwlagn_disable_bss(struct iwl_priv *priv,
                               struct iwl_rxon_context *ctx,
@@ -59,9 +126,12 @@ static int iwlagn_disable_pan(struct iwl_priv *priv,
         __le32 old_filter = send->filter_flags;
         u8 old_dev_type = send->dev_type;
         int ret;
+        static const u8 deactivate_cmd[] = {
+                REPLY_WIPAN_DEACTIVATION_COMPLETE
+        };
 
         iwl_init_notification_wait(&priv->notif_wait, &disable_wait,
-                                   REPLY_WIPAN_DEACTIVATION_COMPLETE,
+                                   deactivate_cmd, ARRAY_SIZE(deactivate_cmd),
                                    NULL, NULL);
 
         send->filter_flags &= ~RXON_FILTER_ASSOC_MSK;
@@ -101,8 +171,7 @@ static int iwlagn_disconn_pan(struct iwl_priv *priv,
         return ret;
 }
 
-static void iwlagn_update_qos(struct iwl_priv *priv,
-                              struct iwl_rxon_context *ctx)
+void iwlagn_update_qos(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
 {
         int ret;
 
@@ -129,8 +198,8 @@ static void iwlagn_update_qos(struct iwl_priv *priv,
                 IWL_DEBUG_QUIET_RFKILL(priv, "Failed to update QoS\n");
 }
 
-static int iwlagn_update_beacon(struct iwl_priv *priv,
-                                struct ieee80211_vif *vif)
+int iwlagn_update_beacon(struct iwl_priv *priv,
+                         struct ieee80211_vif *vif)
 {
         lockdep_assert_held(&priv->mutex);
 
@@ -186,6 +255,109 @@ static int iwlagn_send_rxon_assoc(struct iwl_priv *priv,
         return ret;
 }
 
+static u16 iwl_adjust_beacon_interval(u16 beacon_val, u16 max_beacon_val)
+{
+        u16 new_val;
+        u16 beacon_factor;
+
+        /*
+         * If mac80211 hasn't given us a beacon interval, program
+         * the default into the device (not checking this here
+         * would cause the adjustment below to return the maximum
+         * value, which may break PAN.)
+         */
+        if (!beacon_val)
+                return DEFAULT_BEACON_INTERVAL;
+
+        /*
+         * If the beacon interval we obtained from the peer
+         * is too large, we'll have to wake up more often
+         * (and in IBSS case, we'll beacon too much)
+         *
+         * For example, if max_beacon_val is 4096, and the
+         * requested beacon interval is 7000, we'll have to
+         * use 3500 to be able to wake up on the beacons.
+         *
+         * This could badly influence beacon detection stats.
+         */
+
+        beacon_factor = (beacon_val + max_beacon_val) / max_beacon_val;
+        new_val = beacon_val / beacon_factor;
+
+        if (!new_val)
+                new_val = max_beacon_val;
+
+        return new_val;
+}
+
+static int iwl_send_rxon_timing(struct iwl_priv *priv,
+                                struct iwl_rxon_context *ctx)
+{
+        u64 tsf;
+        s32 interval_tm, rem;
+        struct ieee80211_conf *conf = NULL;
+        u16 beacon_int;
+        struct ieee80211_vif *vif = ctx->vif;
+
+        conf = &priv->hw->conf;
+
+        lockdep_assert_held(&priv->mutex);
+
+        memset(&ctx->timing, 0, sizeof(struct iwl_rxon_time_cmd));
+
+        ctx->timing.timestamp = cpu_to_le64(priv->timestamp);
+        ctx->timing.listen_interval = cpu_to_le16(conf->listen_interval);
+
+        beacon_int = vif ? vif->bss_conf.beacon_int : 0;
+
+        /*
+         * TODO: For IBSS we need to get atim_window from mac80211,
+         *       for now just always use 0
+         */
+        ctx->timing.atim_window = 0;
+
+        if (ctx->ctxid == IWL_RXON_CTX_PAN &&
+            (!ctx->vif || ctx->vif->type != NL80211_IFTYPE_STATION) &&
+            iwl_is_associated(priv, IWL_RXON_CTX_BSS) &&
+            priv->contexts[IWL_RXON_CTX_BSS].vif &&
+            priv->contexts[IWL_RXON_CTX_BSS].vif->bss_conf.beacon_int) {
+                ctx->timing.beacon_interval =
+                        priv->contexts[IWL_RXON_CTX_BSS].timing.beacon_interval;
+                beacon_int = le16_to_cpu(ctx->timing.beacon_interval);
+        } else if (ctx->ctxid == IWL_RXON_CTX_BSS &&
+                   iwl_is_associated(priv, IWL_RXON_CTX_PAN) &&
+                   priv->contexts[IWL_RXON_CTX_PAN].vif &&
+                   priv->contexts[IWL_RXON_CTX_PAN].vif->bss_conf.beacon_int &&
+                   (!iwl_is_associated_ctx(ctx) || !ctx->vif ||
+                    !ctx->vif->bss_conf.beacon_int)) {
+                ctx->timing.beacon_interval =
+                        priv->contexts[IWL_RXON_CTX_PAN].timing.beacon_interval;
+                beacon_int = le16_to_cpu(ctx->timing.beacon_interval);
+        } else {
+                beacon_int = iwl_adjust_beacon_interval(beacon_int,
+                        IWL_MAX_UCODE_BEACON_INTERVAL * TIME_UNIT);
+                ctx->timing.beacon_interval = cpu_to_le16(beacon_int);
+        }
+
+        ctx->beacon_int = beacon_int;
+
+        tsf = priv->timestamp; /* tsf is modifed by do_div: copy it */
+        interval_tm = beacon_int * TIME_UNIT;
+        rem = do_div(tsf, interval_tm);
+        ctx->timing.beacon_init_val = cpu_to_le32(interval_tm - rem);
+
+        ctx->timing.dtim_period = vif ? (vif->bss_conf.dtim_period ?: 1) : 1;
+
+        IWL_DEBUG_ASSOC(priv,
+                        "beacon interval %d beacon timer %d beacon tim %d\n",
+                        le16_to_cpu(ctx->timing.beacon_interval),
+                        le32_to_cpu(ctx->timing.beacon_init_val),
+                        le16_to_cpu(ctx->timing.atim_window));
+
+        return iwl_dvm_send_cmd_pdu(priv, ctx->rxon_timing_cmd,
+                                CMD_SYNC, sizeof(ctx->timing), &ctx->timing);
+}
+
 static int iwlagn_rxon_disconn(struct iwl_priv *priv,
                                struct iwl_rxon_context *ctx)
 {
@@ -228,6 +400,64 @@ static int iwlagn_rxon_disconn(struct iwl_priv *priv,
         return 0;
 }
 
+static int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)
+{
+        int ret;
+        s8 prev_tx_power;
+        bool defer;
+        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
+
+        if (priv->calib_disabled & IWL_TX_POWER_CALIB_DISABLED)
+                return 0;
+
+        lockdep_assert_held(&priv->mutex);
+
+        if (priv->tx_power_user_lmt == tx_power && !force)
+                return 0;
+
+        if (tx_power < IWLAGN_TX_POWER_TARGET_POWER_MIN) {
+                IWL_WARN(priv,
+                         "Requested user TXPOWER %d below lower limit %d.\n",
+                         tx_power,
+                         IWLAGN_TX_POWER_TARGET_POWER_MIN);
+                return -EINVAL;
+        }
+
+        if (tx_power > priv->tx_power_device_lmt) {
+                IWL_WARN(priv,
+                        "Requested user TXPOWER %d above upper limit %d.\n",
+                         tx_power, priv->tx_power_device_lmt);
+                return -EINVAL;
+        }
+
+        if (!iwl_is_ready_rf(priv))
+                return -EIO;
+
+        /* scan complete and commit_rxon use tx_power_next value,
+         * it always need to be updated for newest request */
+        priv->tx_power_next = tx_power;
+
+        /* do not set tx power when scanning or channel changing */
+        defer = test_bit(STATUS_SCANNING, &priv->status) ||
+                memcmp(&ctx->active, &ctx->staging, sizeof(ctx->staging));
+        if (defer && !force) {
+                IWL_DEBUG_INFO(priv, "Deferring tx power set\n");
+                return 0;
+        }
+
+        prev_tx_power = priv->tx_power_user_lmt;
+        priv->tx_power_user_lmt = tx_power;
+
+        ret = iwlagn_send_tx_power(priv);
+
+        /* if fail to set tx_power, restore the orig. tx power */
+        if (ret) {
+                priv->tx_power_user_lmt = prev_tx_power;
+                priv->tx_power_next = prev_tx_power;
+        }
+        return ret;
+}
+
 static int iwlagn_rxon_connect(struct iwl_priv *priv,
                                struct iwl_rxon_context *ctx)
 {
@@ -295,9 +525,9 @@ static int iwlagn_rxon_connect(struct iwl_priv *priv,
         }
 
         if (ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION &&
-            cfg(priv)->ht_params && cfg(priv)->ht_params->smps_mode)
+            priv->cfg->ht_params && priv->cfg->ht_params->smps_mode)
                 ieee80211_request_smps(ctx->vif,
-                                       cfg(priv)->ht_params->smps_mode);
+                                       priv->cfg->ht_params->smps_mode);
 
         return 0;
 }
@@ -309,7 +539,7 @@ int iwlagn_set_pan_params(struct iwl_priv *priv)
         int slot0 = 300, slot1 = 0;
         int ret;
 
-        if (priv->shrd->valid_contexts == BIT(IWL_RXON_CTX_BSS))
+        if (priv->valid_contexts == BIT(IWL_RXON_CTX_BSS))
                 return 0;
 
         BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);
@@ -394,6 +624,414 @@ int iwlagn_set_pan_params(struct iwl_priv *priv)
         return ret;
 }
 
+static void _iwl_set_rxon_ht(struct iwl_priv *priv,
+                             struct iwl_ht_config *ht_conf,
+                             struct iwl_rxon_context *ctx)
+{
+        struct iwl_rxon_cmd *rxon = &ctx->staging;
+
+        if (!ctx->ht.enabled) {
+                rxon->flags &= ~(RXON_FLG_CHANNEL_MODE_MSK |
+                        RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK |
+                        RXON_FLG_HT40_PROT_MSK |
+                        RXON_FLG_HT_PROT_MSK);
+                return;
+        }
+
+        /* FIXME: if the definition of ht.protection changed, the "translation"
+         * will be needed for rxon->flags
+         */
+        rxon->flags |= cpu_to_le32(ctx->ht.protection <<
+                                   RXON_FLG_HT_OPERATING_MODE_POS);
+
+        /* Set up channel bandwidth:
+         * 20 MHz only, 20/40 mixed or pure 40 if ht40 ok */
+        /* clear the HT channel mode before set the mode */
+        rxon->flags &= ~(RXON_FLG_CHANNEL_MODE_MSK |
+                         RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK);
+        if (iwl_is_ht40_tx_allowed(priv, ctx, NULL)) {
+                /* pure ht40 */
+                if (ctx->ht.protection ==
+                    IEEE80211_HT_OP_MODE_PROTECTION_20MHZ) {
+                        rxon->flags |= RXON_FLG_CHANNEL_MODE_PURE_40;
+                        /*
+                         * Note: control channel is opposite of extension
+                         * channel
+                         */
+                        switch (ctx->ht.extension_chan_offset) {
+                        case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
+                                rxon->flags &=
+                                        ~RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;
+                                break;
+                        case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
+                                rxon->flags |=
+                                        RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;
+                                break;
+                        }
+                } else {
+                        /*
+                         * Note: control channel is opposite of extension
+                         * channel
+                         */
+                        switch (ctx->ht.extension_chan_offset) {
+                        case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
+                                rxon->flags &=
+                                        ~(RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK);
+                                rxon->flags |= RXON_FLG_CHANNEL_MODE_MIXED;
+                                break;
+                        case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
+                                rxon->flags |= RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;
+                                rxon->flags |= RXON_FLG_CHANNEL_MODE_MIXED;
+                                break;
+                        case IEEE80211_HT_PARAM_CHA_SEC_NONE:
+                        default:
+                                /*
+                                 * channel location only valid if in Mixed
+                                 * mode
+                                 */
+                                IWL_ERR(priv,
+                                        "invalid extension channel offset\n");
+                                break;
+                        }
+                }
+        } else {
+                rxon->flags |= RXON_FLG_CHANNEL_MODE_LEGACY;
+        }
+
+        iwlagn_set_rxon_chain(priv, ctx);
+
+        IWL_DEBUG_ASSOC(priv, "rxon flags 0x%X operation mode :0x%X "
+                        "extension channel offset 0x%x\n",
+                        le32_to_cpu(rxon->flags), ctx->ht.protection,
+                        ctx->ht.extension_chan_offset);
+}
+
+void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_config *ht_conf)
+{
+        struct iwl_rxon_context *ctx;
+
+        for_each_context(priv, ctx)
+                _iwl_set_rxon_ht(priv, ht_conf, ctx);
+}
+
+/**
+ * iwl_set_rxon_channel - Set the band and channel values in staging RXON
+ * @ch: requested channel as a pointer to struct ieee80211_channel
+
+ * NOTE:  Does not commit to the hardware; it sets appropriate bit fields
+ * in the staging RXON flag structure based on the ch->band
+ */
+void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch,
+                         struct iwl_rxon_context *ctx)
+{
+        enum ieee80211_band band = ch->band;
+        u16 channel = ch->hw_value;
+
+        if ((le16_to_cpu(ctx->staging.channel) == channel) &&
+            (priv->band == band))
+                return;
+
+        ctx->staging.channel = cpu_to_le16(channel);
+        if (band == IEEE80211_BAND_5GHZ)
+                ctx->staging.flags &= ~RXON_FLG_BAND_24G_MSK;
+        else
+                ctx->staging.flags |= RXON_FLG_BAND_24G_MSK;
+
+        priv->band = band;
+
+        IWL_DEBUG_INFO(priv, "Staging channel set to %d [%d]\n", channel, band);
+
+}
+
+void iwl_set_flags_for_band(struct iwl_priv *priv,
+                            struct iwl_rxon_context *ctx,
+                            enum ieee80211_band band,
+                            struct ieee80211_vif *vif)
+{
+        if (band == IEEE80211_BAND_5GHZ) {
+                ctx->staging.flags &=
+                    ~(RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK
+                      | RXON_FLG_CCK_MSK);
+                ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
+        } else {
+                /* Copied from iwl_post_associate() */
+                if (vif && vif->bss_conf.use_short_slot)
+                        ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
+                else
+                        ctx->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
+
+                ctx->staging.flags |= RXON_FLG_BAND_24G_MSK;
+                ctx->staging.flags |= RXON_FLG_AUTO_DETECT_MSK;
+                ctx->staging.flags &= ~RXON_FLG_CCK_MSK;
+        }
+}
+
+static void iwl_set_rxon_hwcrypto(struct iwl_priv *priv,
+                                  struct iwl_rxon_context *ctx, int hw_decrypt)
+{
+        struct iwl_rxon_cmd *rxon = &ctx->staging;
+
+        if (hw_decrypt)
+                rxon->filter_flags &= ~RXON_FILTER_DIS_DECRYPT_MSK;
+        else
+                rxon->filter_flags |= RXON_FILTER_DIS_DECRYPT_MSK;
+
+}
+
+/* validate RXON structure is valid */
+static int iwl_check_rxon_cmd(struct iwl_priv *priv,
+                              struct iwl_rxon_context *ctx)
+{
+        struct iwl_rxon_cmd *rxon = &ctx->staging;
+        u32 errors = 0;
+
+        if (rxon->flags & RXON_FLG_BAND_24G_MSK) {
+                if (rxon->flags & RXON_FLG_TGJ_NARROW_BAND_MSK) {
+                        IWL_WARN(priv, "check 2.4G: wrong narrow\n");
+                        errors |= BIT(0);
+                }
+                if (rxon->flags & RXON_FLG_RADAR_DETECT_MSK) {
+                        IWL_WARN(priv, "check 2.4G: wrong radar\n");
+                        errors |= BIT(1);
+                }
+        } else {
+                if (!(rxon->flags & RXON_FLG_SHORT_SLOT_MSK)) {
+                        IWL_WARN(priv, "check 5.2G: not short slot!\n");
+                        errors |= BIT(2);
+                }
+                if (rxon->flags & RXON_FLG_CCK_MSK) {
+                        IWL_WARN(priv, "check 5.2G: CCK!\n");
+                        errors |= BIT(3);
+                }
+        }
+        if ((rxon->node_addr[0] | rxon->bssid_addr[0]) & 0x1) {
+                IWL_WARN(priv, "mac/bssid mcast!\n");
+                errors |= BIT(4);
+        }
+
+        /* make sure basic rates 6Mbps and 1Mbps are supported */
+        if ((rxon->ofdm_basic_rates & IWL_RATE_6M_MASK) == 0 &&
+            (rxon->cck_basic_rates & IWL_RATE_1M_MASK) == 0) {
+                IWL_WARN(priv, "neither 1 nor 6 are basic\n");
+                errors |= BIT(5);
+        }
+
+        if (le16_to_cpu(rxon->assoc_id) > 2007) {
+                IWL_WARN(priv, "aid > 2007\n");
+                errors |= BIT(6);
+        }
+
+        if ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK))
+                        == (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)) {
+                IWL_WARN(priv, "CCK and short slot\n");
+                errors |= BIT(7);
+        }
+
+        if ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK))
+                        == (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)) {
+                IWL_WARN(priv, "CCK and auto detect");
+                errors |= BIT(8);
+        }
+
+        if ((rxon->flags & (RXON_FLG_AUTO_DETECT_MSK |
+                            RXON_FLG_TGG_PROTECT_MSK)) ==
+                            RXON_FLG_TGG_PROTECT_MSK) {
+                IWL_WARN(priv, "TGg but no auto-detect\n");
+                errors |= BIT(9);
+        }
+
+        if (rxon->channel == 0) {
+                IWL_WARN(priv, "zero channel is invalid\n");
+                errors |= BIT(10);
+        }
+
+        WARN(errors, "Invalid RXON (%#x), channel %d",
+             errors, le16_to_cpu(rxon->channel));
+
+        return errors ? -EINVAL : 0;
+}
+
+/**
+ * iwl_full_rxon_required - check if full RXON (vs RXON_ASSOC) cmd is needed
+ * @priv: staging_rxon is compared to active_rxon
+ *
+ * If the RXON structure is changing enough to require a new tune,
+ * or is clearing the RXON_FILTER_ASSOC_MSK, then return 1 to indicate that
+ * a new tune (full RXON command, rather than RXON_ASSOC cmd) is required.
+ */
+int iwl_full_rxon_required(struct iwl_priv *priv,
+                           struct iwl_rxon_context *ctx)
+{
+        const struct iwl_rxon_cmd *staging = &ctx->staging;
+        const struct iwl_rxon_cmd *active = &ctx->active;
+
+#define CHK(cond)                                                       \
+        if ((cond)) {                                                   \
+                IWL_DEBUG_INFO(priv, "need full RXON - " #cond "\n");   \
+                return 1;                                               \
+        }
+
+#define CHK_NEQ(c1, c2)                                         \
+        if ((c1) != (c2)) {                                     \
+                IWL_DEBUG_INFO(priv, "need full RXON - "        \
+                               #c1 " != " #c2 " - %d != %d\n",  \
+                               (c1), (c2));                     \
+                return 1;                                       \
+        }
+
+        /* These items are only settable from the full RXON command */
+        CHK(!iwl_is_associated_ctx(ctx));
+        CHK(!ether_addr_equal(staging->bssid_addr, active->bssid_addr));
+        CHK(!ether_addr_equal(staging->node_addr, active->node_addr));
+        CHK(!ether_addr_equal(staging->wlap_bssid_addr,
+                              active->wlap_bssid_addr));
+        CHK_NEQ(staging->dev_type, active->dev_type);
+        CHK_NEQ(staging->channel, active->channel);
+        CHK_NEQ(staging->air_propagation, active->air_propagation);
+        CHK_NEQ(staging->ofdm_ht_single_stream_basic_rates,
+                active->ofdm_ht_single_stream_basic_rates);
+        CHK_NEQ(staging->ofdm_ht_dual_stream_basic_rates,
+                active->ofdm_ht_dual_stream_basic_rates);
+        CHK_NEQ(staging->ofdm_ht_triple_stream_basic_rates,
+                active->ofdm_ht_triple_stream_basic_rates);
+        CHK_NEQ(staging->assoc_id, active->assoc_id);
+
+        /* flags, filter_flags, ofdm_basic_rates, and cck_basic_rates can
+         * be updated with the RXON_ASSOC command -- however only some
+         * flag transitions are allowed using RXON_ASSOC */
+
+        /* Check if we are not switching bands */
+        CHK_NEQ(staging->flags & RXON_FLG_BAND_24G_MSK,
+                active->flags & RXON_FLG_BAND_24G_MSK);
+
+        /* Check if we are switching association toggle */
+        CHK_NEQ(staging->filter_flags & RXON_FILTER_ASSOC_MSK,
+                active->filter_flags & RXON_FILTER_ASSOC_MSK);
+
+#undef CHK
+#undef CHK_NEQ
+
+        return 0;
+}
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+void iwl_print_rx_config_cmd(struct iwl_priv *priv,
+                             enum iwl_rxon_context_id ctxid)
+{
+        struct iwl_rxon_context *ctx = &priv->contexts[ctxid];
+        struct iwl_rxon_cmd *rxon = &ctx->staging;
+
+        IWL_DEBUG_RADIO(priv, "RX CONFIG:\n");
+        iwl_print_hex_dump(priv, IWL_DL_RADIO, (u8 *) rxon, sizeof(*rxon));
+        IWL_DEBUG_RADIO(priv, "u16 channel: 0x%x\n",
+                        le16_to_cpu(rxon->channel));
+        IWL_DEBUG_RADIO(priv, "u32 flags: 0x%08X\n",
+                        le32_to_cpu(rxon->flags));
+        IWL_DEBUG_RADIO(priv, "u32 filter_flags: 0x%08x\n",
+                        le32_to_cpu(rxon->filter_flags));
+        IWL_DEBUG_RADIO(priv, "u8 dev_type: 0x%x\n", rxon->dev_type);
+        IWL_DEBUG_RADIO(priv, "u8 ofdm_basic_rates: 0x%02x\n",
+                        rxon->ofdm_basic_rates);
+        IWL_DEBUG_RADIO(priv, "u8 cck_basic_rates: 0x%02x\n",
+                        rxon->cck_basic_rates);
+        IWL_DEBUG_RADIO(priv, "u8[6] node_addr: %pM\n", rxon->node_addr);
+        IWL_DEBUG_RADIO(priv, "u8[6] bssid_addr: %pM\n", rxon->bssid_addr);
+        IWL_DEBUG_RADIO(priv, "u16 assoc_id: 0x%x\n",
+                        le16_to_cpu(rxon->assoc_id));
+}
+#endif
+
+static void iwl_calc_basic_rates(struct iwl_priv *priv,
+                                 struct iwl_rxon_context *ctx)
+{
+        int lowest_present_ofdm = 100;
+        int lowest_present_cck = 100;
+        u8 cck = 0;
+        u8 ofdm = 0;
+
+        if (ctx->vif) {
+                struct ieee80211_supported_band *sband;
+                unsigned long basic = ctx->vif->bss_conf.basic_rates;
+                int i;
+
+                sband = priv->hw->wiphy->bands[priv->hw->conf.channel->band];
+
+                for_each_set_bit(i, &basic, BITS_PER_LONG) {
+                        int hw = sband->bitrates[i].hw_value;
+                        if (hw >= IWL_FIRST_OFDM_RATE) {
+                                ofdm |= BIT(hw - IWL_FIRST_OFDM_RATE);
+                                if (lowest_present_ofdm > hw)
+                                        lowest_present_ofdm = hw;
+                        } else {
+                                BUILD_BUG_ON(IWL_FIRST_CCK_RATE != 0);
+
+                                cck |= BIT(hw);
+                                if (lowest_present_cck > hw)
+                                        lowest_present_cck = hw;
+                        }
+                }
+        }
+
+        /*
+         * Now we've got the basic rates as bitmaps in the ofdm and cck
+         * variables. This isn't sufficient though, as there might not
+         * be all the right rates in the bitmap. E.g. if the only basic
+         * rates are 5.5 Mbps and 11 Mbps, we still need to add 1 Mbps
+         * and 6 Mbps because the 802.11-2007 standard says in 9.6:
+         *
+         *    [...] a STA responding to a received frame shall transmit
+         *    its Control Response frame [...] at the highest rate in the
+         *    BSSBasicRateSet parameter that is less than or equal to the
+         *    rate of the immediately previous frame in the frame exchange
+         *    sequence ([...]) and that is of the same modulation class
+         *    ([...]) as the received frame. If no rate contained in the
+         *    BSSBasicRateSet parameter meets these conditions, then the
+         *    control frame sent in response to a received frame shall be
+         *    transmitted at the highest mandatory rate of the PHY that is
+         *    less than or equal to the rate of the received frame, and
+         *    that is of the same modulation class as the received frame.
+         *
+         * As a consequence, we need to add all mandatory rates that are
+         * lower than all of the basic rates to these bitmaps.
+         */
+
+        if (IWL_RATE_24M_INDEX < lowest_present_ofdm)
+                ofdm |= IWL_RATE_24M_MASK >> IWL_FIRST_OFDM_RATE;
+        if (IWL_RATE_12M_INDEX < lowest_present_ofdm)
+                ofdm |= IWL_RATE_12M_MASK >> IWL_FIRST_OFDM_RATE;
+        /* 6M already there or needed so always add */
+        ofdm |= IWL_RATE_6M_MASK >> IWL_FIRST_OFDM_RATE;
+
+        /*
+         * CCK is a bit more complex with DSSS vs. HR/DSSS vs. ERP.
+         * Note, however:
+         *  - if no CCK rates are basic, it must be ERP since there must
+         *    be some basic rates at all, so they're OFDM => ERP PHY
+         *    (or we're in 5 GHz, and the cck bitmap will never be used)
+         *  - if 11M is a basic rate, it must be ERP as well, so add 5.5M
+         *  - if 5.5M is basic, 1M and 2M are mandatory
+         *  - if 2M is basic, 1M is mandatory
+         *  - if 1M is basic, that's the only valid ACK rate.
+         * As a consequence, it's not as complicated as it sounds, just add
+         * any lower rates to the ACK rate bitmap.
+         */
+        if (IWL_RATE_11M_INDEX < lowest_present_ofdm)
+                ofdm |= IWL_RATE_11M_MASK >> IWL_FIRST_CCK_RATE;
+        if (IWL_RATE_5M_INDEX < lowest_present_ofdm)
+                ofdm |= IWL_RATE_5M_MASK >> IWL_FIRST_CCK_RATE;
+        if (IWL_RATE_2M_INDEX < lowest_present_ofdm)
+                ofdm |= IWL_RATE_2M_MASK >> IWL_FIRST_CCK_RATE;
+        /* 1M already there or needed so always add */
+        cck |= IWL_RATE_1M_MASK >> IWL_FIRST_CCK_RATE;
+
+        IWL_DEBUG_RATE(priv, "Set basic rates cck:0x%.2x ofdm:0x%.2x\n",
+                       cck, ofdm);
+
+        /* "basic_rates" is a misnomer here -- should be called ACK rates */
+        ctx->staging.cck_basic_rates = cck;
+        ctx->staging.ofdm_basic_rates = ofdm;
+}
+
 /**
  * iwlagn_commit_rxon - commit staging_rxon to hardware
  *
@@ -433,11 +1071,14 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
         /* always get timestamp with Rx frame */
         ctx->staging.flags |= RXON_FLG_TSF2HOST_MSK;
 
+        /* recalculate basic rates */
+        iwl_calc_basic_rates(priv, ctx);
+
         /*
          * force CTS-to-self frames protection if RTS-CTS is not preferred
          * one aggregation protection method
          */
-        if (!hw_params(priv).use_rts_for_aggregation)
+        if (!priv->hw_params.use_rts_for_aggregation)
                 ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
 
         if ((ctx->vif && ctx->vif->bss_conf.use_short_slot) ||
@@ -489,7 +1130,7 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
                 return 0;
         }
 
-        iwl_set_rxon_hwcrypto(priv, ctx, !iwlagn_mod_params.sw_crypto);
+        iwl_set_rxon_hwcrypto(priv, ctx, !iwlwifi_mod_params.sw_crypto);
 
         IWL_DEBUG_INFO(priv,
                        "Going to commit RXON\n"
@@ -547,7 +1188,7 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
         const struct iwl_channel_info *ch_info;
         int ret = 0;
 
-        IWL_DEBUG_MAC80211(priv, "enter: changed %#x", changed);
+        IWL_DEBUG_MAC80211(priv, "enter: changed %#x\n", changed);
 
         mutex_lock(&priv->mutex);
 
@@ -621,13 +1262,6 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
                 }
 
                 iwl_update_bcast_stations(priv);
-
-                /*
-                 * The list of supported rates and rate mask can be different
-                 * for each band; since the band may have changed, reset
-                 * the rate mask to what mac80211 lists.
-                 */
-                iwl_set_rate(priv);
         }
 
         if (changed & (IEEE80211_CONF_CHANGE_PS |
@@ -656,9 +1290,9 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
         return ret;
 }
 
-static void iwlagn_check_needed_chains(struct iwl_priv *priv,
-                                       struct iwl_rxon_context *ctx,
-                                       struct ieee80211_bss_conf *bss_conf)
+void iwlagn_check_needed_chains(struct iwl_priv *priv,
+                                struct iwl_rxon_context *ctx,
+                                struct ieee80211_bss_conf *bss_conf)
 {
         struct ieee80211_vif *vif = ctx->vif;
         struct iwl_rxon_context *tmp;
@@ -750,11 +1384,14 @@ static void iwlagn_check_needed_chains(struct iwl_priv *priv,
         ht_conf->single_chain_sufficient = !need_multiple;
 }
 
-static void iwlagn_chain_noise_reset(struct iwl_priv *priv)
+void iwlagn_chain_noise_reset(struct iwl_priv *priv)
 {
         struct iwl_chain_noise_data *data = &priv->chain_noise_data;
         int ret;
 
+        if (!(priv->calib_disabled & IWL_CHAIN_NOISE_CALIB_DISABLED))
+                return;
+
         if ((data->state == IWL_CHAIN_NOISE_ALIVE) &&
             iwl_is_any_associated(priv)) {
                 struct iwl_calib_chain_noise_reset_cmd cmd;
@@ -907,8 +1544,7 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
                         iwl_power_update_mode(priv, false);
 
                 /* Enable RX differential gain and sensitivity calibrations */
-                if (!priv->disable_chain_noise_cal)
-                        iwlagn_chain_noise_reset(priv);
+                iwlagn_chain_noise_reset(priv);
                 priv->start_calib = 1;
         }
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
index c4175603864b..b31584e87bc7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
@@ -30,10 +30,11 @@
 #include <net/mac80211.h>
 
 #include "iwl-dev.h"
-#include "iwl-core.h"
 #include "iwl-agn.h"
 #include "iwl-trans.h"
 
+const u8 iwl_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+
 static int iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
 {
         lockdep_assert_held(&priv->sta_lock);
@@ -170,6 +171,50 @@ int iwl_send_add_sta(struct iwl_priv *priv,
         return cmd.handler_status;
 }
 
+static bool iwl_is_channel_extension(struct iwl_priv *priv,
+                                     enum ieee80211_band band,
+                                     u16 channel, u8 extension_chan_offset)
+{
+        const struct iwl_channel_info *ch_info;
+
+        ch_info = iwl_get_channel_info(priv, band, channel);
+        if (!is_channel_valid(ch_info))
+                return false;
+
+        if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_ABOVE)
+                return !(ch_info->ht40_extension_channel &
+                                        IEEE80211_CHAN_NO_HT40PLUS);
+        else if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_BELOW)
+                return !(ch_info->ht40_extension_channel &
+                                        IEEE80211_CHAN_NO_HT40MINUS);
+
+        return false;
+}
+
+bool iwl_is_ht40_tx_allowed(struct iwl_priv *priv,
+                            struct iwl_rxon_context *ctx,
+                            struct ieee80211_sta_ht_cap *ht_cap)
+{
+        if (!ctx->ht.enabled || !ctx->ht.is_40mhz)
+                return false;
+
+        /*
+         * We do not check for IEEE80211_HT_CAP_SUP_WIDTH_20_40
+         * the bit will not set if it is pure 40MHz case
+         */
+        if (ht_cap && !ht_cap->ht_supported)
+                return false;
+
+#ifdef CONFIG_IWLWIFI_DEBUGFS
+        if (priv->disable_ht40)
+                return false;
+#endif
+
+        return iwl_is_channel_extension(priv, priv->band,
+                        le16_to_cpu(ctx->staging.channel),
+                        ctx->ht.extension_chan_offset);
+}
+
 static void iwl_sta_calc_ht_flags(struct iwl_priv *priv,
                                   struct ieee80211_sta *sta,
                                   struct iwl_rxon_context *ctx,
@@ -277,8 +322,8 @@ u8 iwl_prep_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
                 sta_id = ctx->bcast_sta_id;
         else
                 for (i = IWL_STA_ID; i < IWLAGN_STATION_COUNT; i++) {
-                        if (!compare_ether_addr(priv->stations[i].sta.sta.addr,
-                                                addr)) {
+                        if (ether_addr_equal(priv->stations[i].sta.sta.addr,
+                                             addr)) {
                                 sta_id = i;
                                 break;
                         }
@@ -308,7 +353,7 @@ u8 iwl_prep_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
 
         if ((priv->stations[sta_id].used & IWL_STA_DRIVER_ACTIVE) &&
             (priv->stations[sta_id].used & IWL_STA_UCODE_ACTIVE) &&
-            !compare_ether_addr(priv->stations[sta_id].sta.sta.addr, addr)) {
+            ether_addr_equal(priv->stations[sta_id].sta.sta.addr, addr)) {
                 IWL_DEBUG_ASSOC(priv, "STA %d (%pM) already added, not "
                                 "adding again.\n", sta_id, addr);
                 return sta_id;
@@ -581,6 +626,56 @@ void iwl_deactivate_station(struct iwl_priv *priv, const u8 sta_id,
         spin_unlock_bh(&priv->sta_lock);
 }
 
+static void iwl_sta_fill_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
+                            u8 sta_id, struct iwl_link_quality_cmd *link_cmd)
+{
+        int i, r;
+        u32 rate_flags = 0;
+        __le32 rate_n_flags;
+
+        lockdep_assert_held(&priv->mutex);
+
+        memset(link_cmd, 0, sizeof(*link_cmd));
+
+        /* Set up the rate scaling to start at selected rate, fall back
+         * all the way down to 1M in IEEE order, and then spin on 1M */
+        if (priv->band == IEEE80211_BAND_5GHZ)
+                r = IWL_RATE_6M_INDEX;
+        else if (ctx && ctx->vif && ctx->vif->p2p)
+                r = IWL_RATE_6M_INDEX;
+        else
+                r = IWL_RATE_1M_INDEX;
+
+        if (r >= IWL_FIRST_CCK_RATE && r <= IWL_LAST_CCK_RATE)
+                rate_flags |= RATE_MCS_CCK_MSK;
+
+        rate_flags |= first_antenna(priv->hw_params.valid_tx_ant) <<
+                                RATE_MCS_ANT_POS;
+        rate_n_flags = iwl_hw_set_rate_n_flags(iwl_rates[r].plcp, rate_flags);
+        for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++)
+                link_cmd->rs_table[i].rate_n_flags = rate_n_flags;
+
+        link_cmd->general_params.single_stream_ant_msk =
+                        first_antenna(priv->hw_params.valid_tx_ant);
+
+        link_cmd->general_params.dual_stream_ant_msk =
+                priv->hw_params.valid_tx_ant &
+                ~first_antenna(priv->hw_params.valid_tx_ant);
+        if (!link_cmd->general_params.dual_stream_ant_msk) {
+                link_cmd->general_params.dual_stream_ant_msk = ANT_AB;
+        } else if (num_of_ant(priv->hw_params.valid_tx_ant) == 2) {
+                link_cmd->general_params.dual_stream_ant_msk =
+                        priv->hw_params.valid_tx_ant;
+        }
+
+        link_cmd->agg_params.agg_dis_start_th =
+                LINK_QUAL_AGG_DISABLE_START_DEF;
+        link_cmd->agg_params.agg_time_limit =
+                cpu_to_le16(LINK_QUAL_AGG_TIME_LIMIT_DEF);
+
+        link_cmd->sta_id = sta_id;
+}
+
 /**
  * iwl_clear_ucode_stations - clear ucode station table bits
  *
@@ -841,56 +936,6 @@ int iwl_send_lq_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
 }
 
 
-void iwl_sta_fill_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
-                     u8 sta_id, struct iwl_link_quality_cmd *link_cmd)
-{
-        int i, r;
-        u32 rate_flags = 0;
-        __le32 rate_n_flags;
-
-        lockdep_assert_held(&priv->mutex);
-
-        memset(link_cmd, 0, sizeof(*link_cmd));
-
-        /* Set up the rate scaling to start at selected rate, fall back
-         * all the way down to 1M in IEEE order, and then spin on 1M */
-        if (priv->band == IEEE80211_BAND_5GHZ)
-                r = IWL_RATE_6M_INDEX;
-        else if (ctx && ctx->vif && ctx->vif->p2p)
-                r = IWL_RATE_6M_INDEX;
-        else
-                r = IWL_RATE_1M_INDEX;
-
-        if (r >= IWL_FIRST_CCK_RATE && r <= IWL_LAST_CCK_RATE)
-                rate_flags |= RATE_MCS_CCK_MSK;
-
-        rate_flags |= first_antenna(hw_params(priv).valid_tx_ant) <<
-                                RATE_MCS_ANT_POS;
-        rate_n_flags = iwl_hw_set_rate_n_flags(iwl_rates[r].plcp, rate_flags);
-        for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++)
-                link_cmd->rs_table[i].rate_n_flags = rate_n_flags;
-
-        link_cmd->general_params.single_stream_ant_msk =
-                        first_antenna(hw_params(priv).valid_tx_ant);
-
-        link_cmd->general_params.dual_stream_ant_msk =
-                hw_params(priv).valid_tx_ant &
-                ~first_antenna(hw_params(priv).valid_tx_ant);
-        if (!link_cmd->general_params.dual_stream_ant_msk) {
-                link_cmd->general_params.dual_stream_ant_msk = ANT_AB;
-        } else if (num_of_ant(hw_params(priv).valid_tx_ant) == 2) {
-                link_cmd->general_params.dual_stream_ant_msk =
-                        hw_params(priv).valid_tx_ant;
-        }
-
-        link_cmd->agg_params.agg_dis_start_th =
-                LINK_QUAL_AGG_DISABLE_START_DEF;
-        link_cmd->agg_params.agg_time_limit =
-                cpu_to_le16(LINK_QUAL_AGG_TIME_LIMIT_DEF);
-
-        link_cmd->sta_id = sta_id;
-}
-
 static struct iwl_link_quality_cmd *
 iwl_sta_alloc_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
                  u8 sta_id)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tt.c b/drivers/net/wireless/iwlwifi/iwl-agn-tt.c
index baaf5ba2fc38..a5cfe0aceedb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tt.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tt.c
@@ -37,11 +37,11 @@
 #include "iwl-agn.h"
 #include "iwl-eeprom.h"
 #include "iwl-dev.h"
-#include "iwl-core.h"
 #include "iwl-io.h"
 #include "iwl-commands.h"
 #include "iwl-debug.h"
 #include "iwl-agn-tt.h"
+#include "iwl-modparams.h"
 
 /* default Thermal Throttling transaction table
  * Current state   |         Throttling Down               |  Throttling Up
@@ -179,19 +179,19 @@ static void iwl_tt_check_exit_ct_kill(unsigned long data)
 
         if (tt->state == IWL_TI_CT_KILL) {
                 if (priv->thermal_throttle.ct_kill_toggle) {
-                        iwl_write32(trans(priv), CSR_UCODE_DRV_GP1_CLR,
+                        iwl_write32(priv->trans, CSR_UCODE_DRV_GP1_CLR,
                                     CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);
                         priv->thermal_throttle.ct_kill_toggle = false;
                 } else {
-                        iwl_write32(trans(priv), CSR_UCODE_DRV_GP1_SET,
+                        iwl_write32(priv->trans, CSR_UCODE_DRV_GP1_SET,
                                     CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);
                         priv->thermal_throttle.ct_kill_toggle = true;
                 }
-                iwl_read32(trans(priv), CSR_UCODE_DRV_GP1);
-                spin_lock_irqsave(&trans(priv)->reg_lock, flags);
-                if (likely(iwl_grab_nic_access(trans(priv))))
-                        iwl_release_nic_access(trans(priv));
-                spin_unlock_irqrestore(&trans(priv)->reg_lock, flags);
+                iwl_read32(priv->trans, CSR_UCODE_DRV_GP1);
+                spin_lock_irqsave(&priv->trans->reg_lock, flags);
+                if (likely(iwl_grab_nic_access(priv->trans)))
+                        iwl_release_nic_access(priv->trans);
+                spin_unlock_irqrestore(&priv->trans->reg_lock, flags);
 
                 /* Reschedule the ct_kill timer to occur in
                  * CT_KILL_EXIT_DURATION seconds to ensure we get a
@@ -632,7 +632,7 @@ void iwl_tt_initialize(struct iwl_priv *priv)
         INIT_WORK(&priv->ct_enter, iwl_bg_ct_enter);
         INIT_WORK(&priv->ct_exit, iwl_bg_ct_exit);
 
-        if (cfg(priv)->base_params->adv_thermal_throttle) {
+        if (priv->cfg->base_params->adv_thermal_throttle) {
                 IWL_DEBUG_TEMP(priv, "Advanced Thermal Throttling\n");
                 tt->restriction = kcalloc(IWL_TI_STATE_MAX,
                                           sizeof(struct iwl_tt_restriction),
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index 34adedc74d35..f2e9f298a947 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
@@ -34,12 +34,22 @@
 #include <linux/ieee80211.h>
 
 #include "iwl-dev.h"
-#include "iwl-core.h"
 #include "iwl-io.h"
 #include "iwl-agn-hw.h"
 #include "iwl-agn.h"
 #include "iwl-trans.h"
 
+static const u8 tid_to_ac[] = {
+        IEEE80211_AC_BE,
+        IEEE80211_AC_BK,
+        IEEE80211_AC_BK,
+        IEEE80211_AC_BE,
+        IEEE80211_AC_VI,
+        IEEE80211_AC_VI,
+        IEEE80211_AC_VO,
+        IEEE80211_AC_VO,
+};
+
 static void iwlagn_tx_cmd_protection(struct iwl_priv *priv,
                                      struct ieee80211_tx_info *info,
                                      __le16 fc, __le32 *tx_flags)
@@ -74,8 +84,8 @@ static void iwlagn_tx_cmd_build_basic(struct iwl_priv *priv,
         else if (ieee80211_is_back_req(fc))
                 tx_flags |= TX_CMD_FLG_ACK_MSK | TX_CMD_FLG_IMM_BA_RSP_MASK;
         else if (info->band == IEEE80211_BAND_2GHZ &&
-                 cfg(priv)->bt_params &&
-                 cfg(priv)->bt_params->advanced_bt_coexist &&
+                 priv->cfg->bt_params &&
+                 priv->cfg->bt_params->advanced_bt_coexist &&
                  (ieee80211_is_auth(fc) || ieee80211_is_assoc_req(fc) ||
                  ieee80211_is_reassoc_req(fc) ||
                  skb->protocol == cpu_to_be16(ETH_P_PAE)))
@@ -192,15 +202,15 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv,
                 rate_flags |= RATE_MCS_CCK_MSK;
 
         /* Set up antennas */
-         if (cfg(priv)->bt_params &&
-             cfg(priv)->bt_params->advanced_bt_coexist &&
+         if (priv->cfg->bt_params &&
+             priv->cfg->bt_params->advanced_bt_coexist &&
              priv->bt_full_concurrent) {
                 /* operated as 1x1 in full concurrency mode */
                 priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant,
-                                first_antenna(hw_params(priv).valid_tx_ant));
+                                first_antenna(priv->hw_params.valid_tx_ant));
         } else
                 priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant,
-                                                hw_params(priv).valid_tx_ant);
+                                                priv->hw_params.valid_tx_ant);
         rate_flags |= iwl_ant_idx_to_flags(priv->mgmt_tx_ant);
 
         /* Set the rate in the TX cmd */
@@ -293,6 +303,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         u16 len, seq_number = 0;
         u8 sta_id, tid = IWL_MAX_TID_COUNT;
         bool is_agg = false;
+        int txq_id;
 
         if (info->control.vif)
                 ctx = iwl_rxon_ctx_from_vif(info->control.vif);
@@ -384,12 +395,9 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
 
         /* TODO need this for burst mode later on */
         iwlagn_tx_cmd_build_basic(priv, skb, tx_cmd, info, hdr, sta_id);
-        iwl_dbg_log_tx_data_frame(priv, len, hdr);
 
         iwlagn_tx_cmd_build_rate(priv, tx_cmd, info, fc);
 
-        iwl_update_stats(priv, true, fc, len);
-
         memset(&info->status, 0, sizeof(info->status));
 
         info->driver_data[0] = ctx;
@@ -435,7 +443,31 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         /* Copy MAC header from skb into command buffer */
         memcpy(tx_cmd->hdr, hdr, hdr_len);
 
-        if (iwl_trans_tx(trans(priv), skb, dev_cmd, ctx->ctxid, sta_id, tid))
+        if (is_agg)
+                txq_id = priv->tid_data[sta_id][tid].agg.txq_id;
+        else if (info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM) {
+                /*
+                 * Send this frame after DTIM -- there's a special queue
+                 * reserved for this for contexts that support AP mode.
+                 */
+                txq_id = ctx->mcast_queue;
+
+                /*
+                 * The microcode will clear the more data
+                 * bit in the last frame it transmits.
+                 */
+                hdr->frame_control |=
+                        cpu_to_le16(IEEE80211_FCTL_MOREDATA);
+        } else if (info->flags & IEEE80211_TX_CTL_TX_OFFCHAN)
+                txq_id = IWL_AUX_QUEUE;
+        else
+                txq_id = ctx->ac_to_queue[skb_get_queue_mapping(skb)];
+
+        WARN_ON_ONCE(!is_agg && txq_id != info->hw_queue);
+        WARN_ON_ONCE(is_agg &&
+                     priv->queue_to_mac80211[txq_id] != info->hw_queue);
+
+        if (iwl_trans_tx(priv->trans, skb, dev_cmd, txq_id))
                 goto drop_unlock_sta;
 
         if (ieee80211_is_data_qos(fc) && !ieee80211_is_qos_nullfunc(fc) &&
@@ -464,11 +496,33 @@ drop_unlock_priv:
         return -1;
 }
 
+static int iwlagn_alloc_agg_txq(struct iwl_priv *priv, int mq)
+{
+        int q;
+
+        for (q = IWLAGN_FIRST_AMPDU_QUEUE;
+             q < priv->cfg->base_params->num_of_queues; q++) {
+                if (!test_and_set_bit(q, priv->agg_q_alloc)) {
+                        priv->queue_to_mac80211[q] = mq;
+                        return q;
+                }
+        }
+
+        return -ENOSPC;
+}
+
+static void iwlagn_dealloc_agg_txq(struct iwl_priv *priv, int q)
+{
+        clear_bit(q, priv->agg_q_alloc);
+        priv->queue_to_mac80211[q] = IWL_INVALID_MAC80211_QUEUE;
+}
+
 int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,
                         struct ieee80211_sta *sta, u16 tid)
 {
         struct iwl_tid_data *tid_data;
-        int sta_id;
+        int sta_id, txq_id;
+        enum iwl_agg_state agg_state;
 
         sta_id = iwl_sta_id(sta);
 
@@ -480,6 +534,7 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,
         spin_lock_bh(&priv->sta_lock);
 
         tid_data = &priv->tid_data[sta_id][tid];
+        txq_id = priv->tid_data[sta_id][tid].agg.txq_id;
 
         switch (priv->tid_data[sta_id][tid].agg.state) {
         case IWL_EMPTYING_HW_QUEUE_ADDBA:
@@ -491,6 +546,13 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,
                 */
                 IWL_DEBUG_HT(priv, "AGG stop before setup done\n");
                 goto turn_off;
+        case IWL_AGG_STARTING:
+                /*
+                 * This can happen when the session is stopped before
+                 * we receive ADDBA response
+                 */
+                IWL_DEBUG_HT(priv, "AGG stop before AGG became operational\n");
+                goto turn_off;
         case IWL_AGG_ON:
                 break;
         default:
@@ -504,9 +566,13 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,
         tid_data->agg.ssn = SEQ_TO_SN(tid_data->seq_number);
 
         /* There are still packets for this RA / TID in the HW */
-        if (tid_data->agg.ssn != tid_data->next_reclaimed) {
+        if (!test_bit(txq_id, priv->agg_q_alloc)) {
+                IWL_DEBUG_TX_QUEUES(priv,
+                        "stopping AGG on STA/TID %d/%d but hwq %d not used\n",
+                        sta_id, tid, txq_id);
+        } else if (tid_data->agg.ssn != tid_data->next_reclaimed) {
                 IWL_DEBUG_TX_QUEUES(priv, "Can't proceed: ssn %d, "
-                                    "next_recl = %d",
+                                    "next_recl = %d\n",
                                     tid_data->agg.ssn,
                                     tid_data->next_reclaimed);
                 priv->tid_data[sta_id][tid].agg.state =
@@ -515,14 +581,22 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,
                 return 0;
         }
 
-        IWL_DEBUG_TX_QUEUES(priv, "Can proceed: ssn = next_recl = %d",
+        IWL_DEBUG_TX_QUEUES(priv, "Can proceed: ssn = next_recl = %d\n",
                             tid_data->agg.ssn);
 turn_off:
+        agg_state = priv->tid_data[sta_id][tid].agg.state;
         priv->tid_data[sta_id][tid].agg.state = IWL_AGG_OFF;
 
         spin_unlock_bh(&priv->sta_lock);
 
-        iwl_trans_tx_agg_disable(trans(priv), sta_id, tid);
+        if (test_bit(txq_id, priv->agg_q_alloc)) {
+                /* If the transport didn't know that we wanted to start
+                 * agreggation, don't tell it that we want to stop them
+                 */
+                if (agg_state != IWL_AGG_STARTING)
+                        iwl_trans_tx_agg_disable(priv->trans, txq_id);
+                iwlagn_dealloc_agg_txq(priv, txq_id);
+        }
 
         ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
 
@@ -532,9 +606,9 @@ turn_off:
 int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,
                         struct ieee80211_sta *sta, u16 tid, u16 *ssn)
 {
+        struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);
         struct iwl_tid_data *tid_data;
-        int sta_id;
-        int ret;
+        int sta_id, txq_id, ret;
 
         IWL_DEBUG_HT(priv, "TX AGG request on ra = %pM tid = %d\n",
                      sta->addr, tid);
@@ -552,36 +626,37 @@ int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,
                 return -ENXIO;
         }
 
+        txq_id = iwlagn_alloc_agg_txq(priv, ctx->ac_to_queue[tid_to_ac[tid]]);
+        if (txq_id < 0) {
+                IWL_DEBUG_TX_QUEUES(priv,
+                        "No free aggregation queue for %pM/%d\n",
+                        sta->addr, tid);
+                return txq_id;
+        }
+
         ret = iwl_sta_tx_modify_enable_tid(priv, sta_id, tid);
         if (ret)
                 return ret;
 
         spin_lock_bh(&priv->sta_lock);
-
         tid_data = &priv->tid_data[sta_id][tid];
         tid_data->agg.ssn = SEQ_TO_SN(tid_data->seq_number);
+        tid_data->agg.txq_id = txq_id;
 
         *ssn = tid_data->agg.ssn;
 
-        ret = iwl_trans_tx_agg_alloc(trans(priv), sta_id, tid);
-        if (ret) {
-                spin_unlock_bh(&priv->sta_lock);
-                return ret;
-        }
-
         if (*ssn == tid_data->next_reclaimed) {
-                IWL_DEBUG_TX_QUEUES(priv, "Can proceed: ssn = next_recl = %d",
+                IWL_DEBUG_TX_QUEUES(priv, "Can proceed: ssn = next_recl = %d\n",
                                     tid_data->agg.ssn);
-                tid_data->agg.state = IWL_AGG_ON;
+                tid_data->agg.state = IWL_AGG_STARTING;
                 ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
         } else {
                 IWL_DEBUG_TX_QUEUES(priv, "Can't proceed: ssn %d, "
-                                    "next_reclaimed = %d",
+                                    "next_reclaimed = %d\n",
                                     tid_data->agg.ssn,
                                     tid_data->next_reclaimed);
                 tid_data->agg.state = IWL_EMPTYING_HW_QUEUE_ADDBA;
         }
-
         spin_unlock_bh(&priv->sta_lock);
 
         return ret;
@@ -592,15 +667,21 @@ int iwlagn_tx_agg_oper(struct iwl_priv *priv, struct ieee80211_vif *vif,
 {
         struct iwl_station_priv *sta_priv = (void *) sta->drv_priv;
         struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);
+        int q, fifo;
         u16 ssn;
 
         buf_size = min_t(int, buf_size, LINK_QUAL_AGG_FRAME_LIMIT_DEF);
 
         spin_lock_bh(&priv->sta_lock);
         ssn = priv->tid_data[sta_priv->sta_id][tid].agg.ssn;
+        q = priv->tid_data[sta_priv->sta_id][tid].agg.txq_id;
+        priv->tid_data[sta_priv->sta_id][tid].agg.state = IWL_AGG_ON;
         spin_unlock_bh(&priv->sta_lock);
 
-        iwl_trans_tx_agg_setup(trans(priv), ctx->ctxid, sta_priv->sta_id, tid,
+        fifo = ctx->ac_to_fifo[tid_to_ac[tid]];
+
+        iwl_trans_tx_agg_setup(priv->trans, q, fifo,
+                               sta_priv->sta_id, tid,
                                buf_size, ssn);
 
         /*
@@ -623,7 +704,7 @@ int iwlagn_tx_agg_oper(struct iwl_priv *priv, struct ieee80211_vif *vif,
         sta_priv->max_agg_bufsize =
                 min(sta_priv->max_agg_bufsize, buf_size);
 
-        if (hw_params(priv).use_rts_for_aggregation) {
+        if (priv->hw_params.use_rts_for_aggregation) {
                 /*
                  * switch to RTS/CTS if it is the prefer protection
                  * method for HT traffic
@@ -666,7 +747,9 @@ static void iwlagn_check_ratid_empty(struct iwl_priv *priv, int sta_id, u8 tid)
                         IWL_DEBUG_TX_QUEUES(priv,
                                 "Can continue DELBA flow ssn = next_recl ="
                                 " %d", tid_data->next_reclaimed);
-                        iwl_trans_tx_agg_disable(trans(priv), sta_id, tid);
+                        iwl_trans_tx_agg_disable(priv->trans,
+                                                 tid_data->agg.txq_id);
+                        iwlagn_dealloc_agg_txq(priv, tid_data->agg.txq_id);
                         tid_data->agg.state = IWL_AGG_OFF;
                         ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid);
                 }
@@ -677,7 +760,7 @@ static void iwlagn_check_ratid_empty(struct iwl_priv *priv, int sta_id, u8 tid)
                         IWL_DEBUG_TX_QUEUES(priv,
                                 "Can continue ADDBA flow ssn = next_recl ="
                                 " %d", tid_data->next_reclaimed);
-                        tid_data->agg.state = IWL_AGG_ON;
+                        tid_data->agg.state = IWL_AGG_STARTING;
                         ieee80211_start_tx_ba_cb_irqsafe(vif, addr, tid);
                 }
                 break;
@@ -711,9 +794,9 @@ static void iwlagn_non_agg_tx_status(struct iwl_priv *priv,
 static void iwlagn_hwrate_to_tx_control(struct iwl_priv *priv, u32 rate_n_flags,
                                   struct ieee80211_tx_info *info)
 {
-        struct ieee80211_tx_rate *r = &info->control.rates[0];
+        struct ieee80211_tx_rate *r = &info->status.rates[0];
 
-        info->antenna_sel_tx =
+        info->status.antenna =
                 ((rate_n_flags & RATE_MCS_ANT_ABC_MSK) >> RATE_MCS_ANT_POS);
         if (rate_n_flags & RATE_MCS_HT_MSK)
                 r->flags |= IEEE80211_TX_RC_MCS;
@@ -841,8 +924,8 @@ static void iwl_rx_reply_tx_agg(struct iwl_priv *priv,
          * notification again.
          */
         if (tx_resp->bt_kill_count && tx_resp->frame_count == 1 &&
-            cfg(priv)->bt_params &&
-            cfg(priv)->bt_params->advanced_bt_coexist) {
+            priv->cfg->bt_params &&
+            priv->cfg->bt_params->advanced_bt_coexist) {
                 IWL_DEBUG_COEX(priv, "receive reply tx w/ bt_kill\n");
         }
 
@@ -1005,6 +1088,29 @@ static void iwl_check_abort_status(struct iwl_priv *priv,
         }
 }
 
+static int iwl_reclaim(struct iwl_priv *priv, int sta_id, int tid,
+                       int txq_id, int ssn, struct sk_buff_head *skbs)
+{
+        if (unlikely(txq_id >= IWLAGN_FIRST_AMPDU_QUEUE &&
+                     tid != IWL_TID_NON_QOS &&
+                     txq_id != priv->tid_data[sta_id][tid].agg.txq_id)) {
+                /*
+                 * FIXME: this is a uCode bug which need to be addressed,
+                 * log the information and return for now.
+                 * Since it is can possibly happen very often and in order
+                 * not to fill the syslog, don't use IWL_ERR or IWL_WARN
+                 */
+                IWL_DEBUG_TX_QUEUES(priv,
+                        "Bad queue mapping txq_id=%d, agg_txq[sta:%d,tid:%d]=%d\n",
+                        txq_id, sta_id, tid,
+                        priv->tid_data[sta_id][tid].agg.txq_id);
+                return 1;
+        }
+
+        iwl_trans_reclaim(priv->trans, txq_id, ssn, skbs);
+        return 0;
+}
+
 int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
                                struct iwl_device_cmd *cmd)
 {
@@ -1059,13 +1165,12 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
                 if (tid != IWL_TID_NON_QOS) {
                         priv->tid_data[sta_id][tid].next_reclaimed =
                                 next_reclaimed;
-                        IWL_DEBUG_TX_REPLY(priv, "Next reclaimed packet:%d",
+                        IWL_DEBUG_TX_REPLY(priv, "Next reclaimed packet:%d\n",
                                                   next_reclaimed);
                 }
 
                 /*we can free until ssn % q.n_bd not inclusive */
-                WARN_ON(iwl_trans_reclaim(trans(priv), sta_id, tid,
-                                          txq_id, ssn, &skbs));
+                WARN_ON(iwl_reclaim(priv, sta_id, tid, txq_id, ssn, &skbs));
                 iwlagn_check_ratid_empty(priv, sta_id, tid);
                 freed = 0;
 
@@ -1159,7 +1264,7 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
          * (in Tx queue's circular buffer) of first TFD/frame in window */
         u16 ba_resp_scd_ssn = le16_to_cpu(ba_resp->scd_ssn);
 
-        if (scd_flow >= cfg(priv)->base_params->num_of_queues) {
+        if (scd_flow >= priv->cfg->base_params->num_of_queues) {
                 IWL_ERR(priv,
                         "BUG_ON scd_flow is bigger than number of queues\n");
                 return 0;
@@ -1183,8 +1288,8 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
         /* Release all TFDs before the SSN, i.e. all TFDs in front of
          * block-ack window (we assume that they've been successfully
          * transmitted ... if not, it's too late anyway). */
-        if (iwl_trans_reclaim(trans(priv), sta_id, tid, scd_flow,
-                              ba_resp_scd_ssn, &reclaimed_skbs)) {
+        if (iwl_reclaim(priv, sta_id, tid, scd_flow,
+                        ba_resp_scd_ssn, &reclaimed_skbs)) {
                 spin_unlock(&priv->sta_lock);
                 return 0;
         }
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index f1226dbf789d..8d7637083fcf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -26,6 +26,9 @@
  * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  *
  *****************************************************************************/
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -43,13 +46,13 @@
 
 #include "iwl-eeprom.h"
 #include "iwl-dev.h"
-#include "iwl-core.h"
 #include "iwl-io.h"
 #include "iwl-agn-calib.h"
 #include "iwl-agn.h"
-#include "iwl-shared.h"
 #include "iwl-trans.h"
 #include "iwl-op-mode.h"
+#include "iwl-drv.h"
+#include "iwl-modparams.h"
 
 /******************************************************************************
  *
@@ -177,7 +180,7 @@ int iwlagn_send_beacon_cmd(struct iwl_priv *priv)
                 rate = info->control.rates[0].idx;
 
         priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant,
-                                              hw_params(priv).valid_tx_ant);
+                                              priv->hw_params.valid_tx_ant);
         rate_flags = iwl_ant_idx_to_flags(priv->mgmt_tx_ant);
 
         /* In mac80211, rates for 5 GHz start at 0 */
@@ -286,6 +289,25 @@ out:
         mutex_unlock(&priv->mutex);
 }
 
+int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags, bool clear)
+{
+        struct iwl_statistics_cmd statistics_cmd = {
+                .configuration_flags =
+                        clear ? IWL_STATS_CONF_CLEAR_STATS : 0,
+        };
+
+        if (flags & CMD_ASYNC)
+                return iwl_dvm_send_cmd_pdu(priv, REPLY_STATISTICS_CMD,
+                                        CMD_ASYNC,
+                                        sizeof(struct iwl_statistics_cmd),
+                                        &statistics_cmd);
+        else
+                return iwl_dvm_send_cmd_pdu(priv, REPLY_STATISTICS_CMD,
+                                        CMD_SYNC,
+                                        sizeof(struct iwl_statistics_cmd),
+                                        &statistics_cmd);
+}
+
 /**
  * iwl_bg_statistics_periodic - Timer callback to queue statistics
  *
@@ -326,14 +348,14 @@ static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base,
                 ptr = base + (4 * sizeof(u32)) + (start_idx * 3 * sizeof(u32));
 
         /* Make sure device is powered up for SRAM reads */
-        spin_lock_irqsave(&trans(priv)->reg_lock, reg_flags);
-        if (unlikely(!iwl_grab_nic_access(trans(priv)))) {
-                spin_unlock_irqrestore(&trans(priv)->reg_lock, reg_flags);
+        spin_lock_irqsave(&priv->trans->reg_lock, reg_flags);
+        if (unlikely(!iwl_grab_nic_access(priv->trans))) {
+                spin_unlock_irqrestore(&priv->trans->reg_lock, reg_flags);
                 return;
         }
 
         /* Set starting address; reads will auto-increment */
-        iwl_write32(trans(priv), HBUS_TARG_MEM_RADDR, ptr);
+        iwl_write32(priv->trans, HBUS_TARG_MEM_RADDR, ptr);
 
         /*
          * Refuse to read more than would have fit into the log from
@@ -349,20 +371,20 @@ static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base,
          * place event id # at far right for easier visual parsing.
          */
         for (i = 0; i < num_events; i++) {
-                ev = iwl_read32(trans(priv), HBUS_TARG_MEM_RDAT);
-                time = iwl_read32(trans(priv), HBUS_TARG_MEM_RDAT);
+                ev = iwl_read32(priv->trans, HBUS_TARG_MEM_RDAT);
+                time = iwl_read32(priv->trans, HBUS_TARG_MEM_RDAT);
                 if (mode == 0) {
                         trace_iwlwifi_dev_ucode_cont_event(
-                                        trans(priv)->dev, 0, time, ev);
+                                        priv->trans->dev, 0, time, ev);
                 } else {
-                        data = iwl_read32(trans(priv), HBUS_TARG_MEM_RDAT);
+                        data = iwl_read32(priv->trans, HBUS_TARG_MEM_RDAT);
                         trace_iwlwifi_dev_ucode_cont_event(
-                                        trans(priv)->dev, time, data, ev);
+                                        priv->trans->dev, time, data, ev);
                 }
         }
         /* Allow device to power down */
-        iwl_release_nic_access(trans(priv));
-        spin_unlock_irqrestore(&trans(priv)->reg_lock, reg_flags);
+        iwl_release_nic_access(priv->trans);
+        spin_unlock_irqrestore(&priv->trans->reg_lock, reg_flags);
 }
 
 static void iwl_continuous_event_trace(struct iwl_priv *priv)
@@ -379,10 +401,9 @@ static void iwl_continuous_event_trace(struct iwl_priv *priv)
         u32 num_wraps;  /* # times uCode wrapped to top of log */
         u32 next_entry; /* index of next entry to be written by uCode */
 
-        base = priv->shrd->device_pointers.log_event_table;
+        base = priv->device_pointers.log_event_table;
         if (iwlagn_hw_valid_rtc_data_addr(base)) {
-                iwl_read_targ_mem_words(trans(priv), base, &read, sizeof(read));
-
+                iwl_read_targ_mem_words(priv->trans, base, &read, sizeof(read));
                 capacity = read.capacity;
                 mode = read.mode;
                 num_wraps = read.wrap_counter;
@@ -422,7 +443,7 @@ static void iwl_continuous_event_trace(struct iwl_priv *priv)
                 else
                         priv->event_log.wraps_once_count++;
 
-                trace_iwlwifi_dev_ucode_wrap_event(trans(priv)->dev,
+                trace_iwlwifi_dev_ucode_wrap_event(priv->trans->dev,
                                 num_wraps - priv->event_log.num_wraps,
                                 next_entry, priv->event_log.next_entry);
 
@@ -488,7 +509,76 @@ static void iwl_bg_tx_flush(struct work_struct *work)
         iwlagn_dev_txfifo_flush(priv, IWL_DROP_ALL);
 }
 
-static void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)
+/*
+ * queue/FIFO/AC mapping definitions
+ */
+
+#define IWL_TX_FIFO_BK          0       /* shared */
+#define IWL_TX_FIFO_BE          1
+#define IWL_TX_FIFO_VI          2       /* shared */
+#define IWL_TX_FIFO_VO          3
+#define IWL_TX_FIFO_BK_IPAN     IWL_TX_FIFO_BK
+#define IWL_TX_FIFO_BE_IPAN     4
+#define IWL_TX_FIFO_VI_IPAN     IWL_TX_FIFO_VI
+#define IWL_TX_FIFO_VO_IPAN     5
+/* re-uses the VO FIFO, uCode will properly flush/schedule */
+#define IWL_TX_FIFO_AUX         5
+#define IWL_TX_FIFO_UNUSED      -1
+
+#define IWLAGN_CMD_FIFO_NUM     7
+
+/*
+ * This queue number is required for proper operation
+ * because the ucode will stop/start the scheduler as
+ * required.
+ */
+#define IWL_IPAN_MCAST_QUEUE    8
+
+static const u8 iwlagn_default_queue_to_tx_fifo[] = {
+        IWL_TX_FIFO_VO,
+        IWL_TX_FIFO_VI,
+        IWL_TX_FIFO_BE,
+        IWL_TX_FIFO_BK,
+        IWLAGN_CMD_FIFO_NUM,
+};
+
+static const u8 iwlagn_ipan_queue_to_tx_fifo[] = {
+        IWL_TX_FIFO_VO,
+        IWL_TX_FIFO_VI,
+        IWL_TX_FIFO_BE,
+        IWL_TX_FIFO_BK,
+        IWL_TX_FIFO_BK_IPAN,
+        IWL_TX_FIFO_BE_IPAN,
+        IWL_TX_FIFO_VI_IPAN,
+        IWL_TX_FIFO_VO_IPAN,
+        IWL_TX_FIFO_BE_IPAN,
+        IWLAGN_CMD_FIFO_NUM,
+        IWL_TX_FIFO_AUX,
+};
+
+static const u8 iwlagn_bss_ac_to_fifo[] = {
+        IWL_TX_FIFO_VO,
+        IWL_TX_FIFO_VI,
+        IWL_TX_FIFO_BE,
+        IWL_TX_FIFO_BK,
+};
+
+static const u8 iwlagn_bss_ac_to_queue[] = {
+        0, 1, 2, 3,
+};
+
+static const u8 iwlagn_pan_ac_to_fifo[] = {
+        IWL_TX_FIFO_VO_IPAN,
+        IWL_TX_FIFO_VI_IPAN,
+        IWL_TX_FIFO_BE_IPAN,
+        IWL_TX_FIFO_BK_IPAN,
+};
+
+static const u8 iwlagn_pan_ac_to_queue[] = {
+        7, 6, 5, 4,
+};
+
+void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)
 {
         int i;
 
@@ -496,9 +586,9 @@ static void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)
          * The default context is always valid,
          * the PAN context depends on uCode.
          */
-        priv->shrd->valid_contexts = BIT(IWL_RXON_CTX_BSS);
+        priv->valid_contexts = BIT(IWL_RXON_CTX_BSS);
         if (ucode_flags & IWL_UCODE_TLV_FLAGS_PAN)
-                priv->shrd->valid_contexts |= BIT(IWL_RXON_CTX_PAN);
+                priv->valid_contexts |= BIT(IWL_RXON_CTX_PAN);
 
         for (i = 0; i < NUM_IWL_RXON_CTX; i++)
                 priv->contexts[i].ctxid = i;
@@ -520,6 +610,10 @@ static void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)
         priv->contexts[IWL_RXON_CTX_BSS].ibss_devtype = RXON_DEV_TYPE_IBSS;
         priv->contexts[IWL_RXON_CTX_BSS].station_devtype = RXON_DEV_TYPE_ESS;
         priv->contexts[IWL_RXON_CTX_BSS].unused_devtype = RXON_DEV_TYPE_ESS;
+        memcpy(priv->contexts[IWL_RXON_CTX_BSS].ac_to_queue,
+               iwlagn_bss_ac_to_queue, sizeof(iwlagn_bss_ac_to_queue));
+        memcpy(priv->contexts[IWL_RXON_CTX_BSS].ac_to_fifo,
+               iwlagn_bss_ac_to_fifo, sizeof(iwlagn_bss_ac_to_fifo));
 
         priv->contexts[IWL_RXON_CTX_PAN].rxon_cmd = REPLY_WIPAN_RXON;
         priv->contexts[IWL_RXON_CTX_PAN].rxon_timing_cmd =
@@ -542,26 +636,31 @@ static void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)
         priv->contexts[IWL_RXON_CTX_PAN].ap_devtype = RXON_DEV_TYPE_CP;
         priv->contexts[IWL_RXON_CTX_PAN].station_devtype = RXON_DEV_TYPE_2STA;
         priv->contexts[IWL_RXON_CTX_PAN].unused_devtype = RXON_DEV_TYPE_P2P;
+        memcpy(priv->contexts[IWL_RXON_CTX_PAN].ac_to_queue,
+               iwlagn_pan_ac_to_queue, sizeof(iwlagn_pan_ac_to_queue));
+        memcpy(priv->contexts[IWL_RXON_CTX_PAN].ac_to_fifo,
+               iwlagn_pan_ac_to_fifo, sizeof(iwlagn_pan_ac_to_fifo));
+        priv->contexts[IWL_RXON_CTX_PAN].mcast_queue = IWL_IPAN_MCAST_QUEUE;
 
         BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);
 }
 
-static void iwl_rf_kill_ct_config(struct iwl_priv *priv)
+void iwl_rf_kill_ct_config(struct iwl_priv *priv)
 {
         struct iwl_ct_kill_config cmd;
         struct iwl_ct_kill_throttling_config adv_cmd;
         int ret = 0;
 
-        iwl_write32(trans(priv), CSR_UCODE_DRV_GP1_CLR,
+        iwl_write32(priv->trans, CSR_UCODE_DRV_GP1_CLR,
                     CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);
 
         priv->thermal_throttle.ct_kill_toggle = false;
 
-        if (cfg(priv)->base_params->support_ct_kill_exit) {
+        if (priv->cfg->base_params->support_ct_kill_exit) {
                 adv_cmd.critical_temperature_enter =
-                        cpu_to_le32(hw_params(priv).ct_kill_threshold);
+                        cpu_to_le32(priv->hw_params.ct_kill_threshold);
                 adv_cmd.critical_temperature_exit =
-                        cpu_to_le32(hw_params(priv).ct_kill_exit_threshold);
+                        cpu_to_le32(priv->hw_params.ct_kill_exit_threshold);
 
                 ret = iwl_dvm_send_cmd_pdu(priv,
                                        REPLY_CT_KILL_CONFIG_CMD,
@@ -572,11 +671,11 @@ static void iwl_rf_kill_ct_config(struct iwl_priv *priv)
                         IWL_DEBUG_INFO(priv, "REPLY_CT_KILL_CONFIG_CMD "
                                 "succeeded, critical temperature enter is %d,"
                                 "exit is %d\n",
-                                hw_params(priv).ct_kill_threshold,
-                                hw_params(priv).ct_kill_exit_threshold);
+                                priv->hw_params.ct_kill_threshold,
+                                priv->hw_params.ct_kill_exit_threshold);
         } else {
                 cmd.critical_temperature_R =
-                        cpu_to_le32(hw_params(priv).ct_kill_threshold);
+                        cpu_to_le32(priv->hw_params.ct_kill_threshold);
 
                 ret = iwl_dvm_send_cmd_pdu(priv,
                                        REPLY_CT_KILL_CONFIG_CMD,
@@ -587,7 +686,7 @@ static void iwl_rf_kill_ct_config(struct iwl_priv *priv)
                         IWL_DEBUG_INFO(priv, "REPLY_CT_KILL_CONFIG_CMD "
                                 "succeeded, "
                                 "critical temperature is %d\n",
-                                hw_params(priv).ct_kill_threshold);
+                                priv->hw_params.ct_kill_threshold);
         }
 }
 
@@ -627,6 +726,29 @@ static int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant)
         }
 }
 
+void iwl_send_bt_config(struct iwl_priv *priv)
+{
+        struct iwl_bt_cmd bt_cmd = {
+                .lead_time = BT_LEAD_TIME_DEF,
+                .max_kill = BT_MAX_KILL_DEF,
+                .kill_ack_mask = 0,
+                .kill_cts_mask = 0,
+        };
+
+        if (!iwlwifi_mod_params.bt_coex_active)
+                bt_cmd.flags = BT_COEX_DISABLE;
+        else
+                bt_cmd.flags = BT_COEX_ENABLE;
+
+        priv->bt_enable_flag = bt_cmd.flags;
+        IWL_DEBUG_INFO(priv, "BT coex %s\n",
+                (bt_cmd.flags == BT_COEX_DISABLE) ? "disable" : "active");
+
+        if (iwl_dvm_send_cmd_pdu(priv, REPLY_BT_CONFIG,
+                             CMD_SYNC, sizeof(struct iwl_bt_cmd), &bt_cmd))
+                IWL_ERR(priv, "failed to send BT Coex Config\n");
+}
+
 /**
  * iwl_alive_start - called after REPLY_ALIVE notification received
  *                   from protocol/runtime uCode (initialization uCode's
@@ -642,9 +764,6 @@ int iwl_alive_start(struct iwl_priv *priv)
         /* After the ALIVE response, we can send host commands to the uCode */
         set_bit(STATUS_ALIVE, &priv->status);
 
-        /* Enable watchdog to monitor the driver tx queues */
-        iwl_setup_watchdog(priv);
-
         if (iwl_is_rfkill(priv))
                 return -ERFKILL;
 
@@ -654,10 +773,10 @@ int iwl_alive_start(struct iwl_priv *priv)
         }
 
         /* download priority table before any calibration request */
-        if (cfg(priv)->bt_params &&
-            cfg(priv)->bt_params->advanced_bt_coexist) {
+        if (priv->cfg->bt_params &&
+            priv->cfg->bt_params->advanced_bt_coexist) {
                 /* Configure Bluetooth device coexistence support */
-                if (cfg(priv)->bt_params->bt_sco_disable)
+                if (priv->cfg->bt_params->bt_sco_disable)
                         priv->bt_enable_pspoll = false;
                 else
                         priv->bt_enable_pspoll = true;
@@ -694,10 +813,8 @@ int iwl_alive_start(struct iwl_priv *priv)
 
         ieee80211_wake_queues(priv->hw);
 
-        priv->active_rate = IWL_RATES_MASK;
-
         /* Configure Tx antenna selection based on H/W config */
-        iwlagn_send_tx_ant_config(priv, hw_params(priv).valid_tx_ant);
+        iwlagn_send_tx_ant_config(priv, priv->hw_params.valid_tx_ant);
 
         if (iwl_is_associated_ctx(ctx) && !priv->wowlan) {
                 struct iwl_rxon_cmd *active_rxon =
@@ -788,10 +905,6 @@ void iwl_down(struct iwl_priv *priv)
         exit_pending =
                 test_and_set_bit(STATUS_EXIT_PENDING, &priv->status);
 
-        /* Stop TX queues watchdog. We need to have STATUS_EXIT_PENDING bit set
-         * to prevent rearm timer */
-        del_timer_sync(&priv->watchdog);
-
         iwl_clear_ucode_stations(priv, NULL);
         iwl_dealloc_bcast_stations(priv);
         iwl_clear_driver_stations(priv);
@@ -800,9 +913,9 @@ void iwl_down(struct iwl_priv *priv)
         priv->bt_status = 0;
         priv->cur_rssi_ctx = NULL;
         priv->bt_is_sco = 0;
-        if (cfg(priv)->bt_params)
+        if (priv->cfg->bt_params)
                 priv->bt_traffic_load =
-                         cfg(priv)->bt_params->bt_init_traffic_load;
+                         priv->cfg->bt_params->bt_init_traffic_load;
         else
                 priv->bt_traffic_load = 0;
         priv->bt_full_concurrent = false;
@@ -817,18 +930,17 @@ void iwl_down(struct iwl_priv *priv)
                 ieee80211_stop_queues(priv->hw);
 
         priv->ucode_loaded = false;
-        iwl_trans_stop_device(trans(priv));
+        iwl_trans_stop_device(priv->trans);
 
         /* Clear out all status bits but a few that are stable across reset */
         priv->status &= test_bit(STATUS_RF_KILL_HW, &priv->status) <<
                                 STATUS_RF_KILL_HW |
                         test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<
                                 STATUS_GEO_CONFIGURED |
+                        test_bit(STATUS_FW_ERROR, &priv->status) <<
+                                STATUS_FW_ERROR |
                         test_bit(STATUS_EXIT_PENDING, &priv->status) <<
                                 STATUS_EXIT_PENDING;
-        priv->shrd->status &=
-                        test_bit(STATUS_FW_ERROR, &priv->shrd->status) <<
-                                STATUS_FW_ERROR;
 
         dev_kfree_skb(priv->beacon_skb);
         priv->beacon_skb = NULL;
@@ -863,17 +975,15 @@ static void iwl_bg_run_time_calib_work(struct work_struct *work)
 
 void iwlagn_prepare_restart(struct iwl_priv *priv)
 {
-        struct iwl_rxon_context *ctx;
         bool bt_full_concurrent;
         u8 bt_ci_compliance;
         u8 bt_load;
         u8 bt_status;
         bool bt_is_sco;
+        int i;
 
         lockdep_assert_held(&priv->mutex);
 
-        for_each_context(priv, ctx)
-                ctx->vif = NULL;
         priv->is_open = 0;
 
         /*
@@ -898,6 +1008,15 @@ void iwlagn_prepare_restart(struct iwl_priv *priv)
         priv->bt_traffic_load = bt_load;
         priv->bt_status = bt_status;
         priv->bt_is_sco = bt_is_sco;
+
+        /* reset aggregation queues */
+        for (i = IWLAGN_FIRST_AMPDU_QUEUE; i < IWL_MAX_HW_QUEUES; i++)
+                priv->queue_to_mac80211[i] = IWL_INVALID_MAC80211_QUEUE;
+        /* and stop counts */
+        for (i = 0; i < IWL_MAX_HW_QUEUES; i++)
+                atomic_set(&priv->queue_stop_count[i], 0);
+
+        memset(priv->agg_q_alloc, 0, sizeof(priv->agg_q_alloc));
 }
 
 static void iwl_bg_restart(struct work_struct *data)
@@ -907,7 +1026,7 @@ static void iwl_bg_restart(struct work_struct *data)
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                 return;
 
-        if (test_and_clear_bit(STATUS_FW_ERROR, &priv->shrd->status)) {
+        if (test_and_clear_bit(STATUS_FW_ERROR, &priv->status)) {
                 mutex_lock(&priv->mutex);
                 iwlagn_prepare_restart(priv);
                 mutex_unlock(&priv->mutex);
@@ -959,7 +1078,7 @@ static void iwlagn_disable_roc_work(struct work_struct *work)
  *
  *****************************************************************************/
 
-static void iwl_setup_deferred_work(struct iwl_priv *priv)
+void iwl_setup_deferred_work(struct iwl_priv *priv)
 {
         priv->workqueue = create_singlethread_workqueue(DRV_NAME);
 
@@ -974,7 +1093,7 @@ static void iwl_setup_deferred_work(struct iwl_priv *priv)
 
         iwl_setup_scan_deferred_work(priv);
 
-        if (cfg(priv)->bt_params)
+        if (priv->cfg->bt_params)
                 iwlagn_bt_setup_deferred_work(priv);
 
         init_timer(&priv->statistics_periodic);
@@ -984,15 +1103,11 @@ static void iwl_setup_deferred_work(struct iwl_priv *priv)
         init_timer(&priv->ucode_trace);
         priv->ucode_trace.data = (unsigned long)priv;
         priv->ucode_trace.function = iwl_bg_ucode_trace;
-
-        init_timer(&priv->watchdog);
-        priv->watchdog.data = (unsigned long)priv;
-        priv->watchdog.function = iwl_bg_watchdog;
 }
 
 void iwl_cancel_deferred_work(struct iwl_priv *priv)
 {
-        if (cfg(priv)->bt_params)
+        if (priv->cfg->bt_params)
                 iwlagn_bt_cancel_deferred_work(priv);
 
         cancel_work_sync(&priv->run_time_calib_work);
@@ -1028,7 +1143,193 @@ static void iwl_init_hw_rates(struct ieee80211_rate *rates)
         }
 }
 
-static int iwl_init_drv(struct iwl_priv *priv)
+#define MAX_BIT_RATE_40_MHZ 150 /* Mbps */
+#define MAX_BIT_RATE_20_MHZ 72 /* Mbps */
+static void iwl_init_ht_hw_capab(const struct iwl_priv *priv,
+                              struct ieee80211_sta_ht_cap *ht_info,
+                              enum ieee80211_band band)
+{
+        u16 max_bit_rate = 0;
+        u8 rx_chains_num = priv->hw_params.rx_chains_num;
+        u8 tx_chains_num = priv->hw_params.tx_chains_num;
+
+        ht_info->cap = 0;
+        memset(&ht_info->mcs, 0, sizeof(ht_info->mcs));
+
+        ht_info->ht_supported = true;
+
+        if (priv->cfg->ht_params &&
+            priv->cfg->ht_params->ht_greenfield_support)
+                ht_info->cap |= IEEE80211_HT_CAP_GRN_FLD;
+        ht_info->cap |= IEEE80211_HT_CAP_SGI_20;
+        max_bit_rate = MAX_BIT_RATE_20_MHZ;
+        if (priv->hw_params.ht40_channel & BIT(band)) {
+                ht_info->cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+                ht_info->cap |= IEEE80211_HT_CAP_SGI_40;
+                ht_info->mcs.rx_mask[4] = 0x01;
+                max_bit_rate = MAX_BIT_RATE_40_MHZ;
+        }
+
+        if (iwlwifi_mod_params.amsdu_size_8K)
+                ht_info->cap |= IEEE80211_HT_CAP_MAX_AMSDU;
+
+        ht_info->ampdu_factor = CFG_HT_RX_AMPDU_FACTOR_DEF;
+        ht_info->ampdu_density = CFG_HT_MPDU_DENSITY_DEF;
+
+        ht_info->mcs.rx_mask[0] = 0xFF;
+        if (rx_chains_num >= 2)
+                ht_info->mcs.rx_mask[1] = 0xFF;
+        if (rx_chains_num >= 3)
+                ht_info->mcs.rx_mask[2] = 0xFF;
+
+        /* Highest supported Rx data rate */
+        max_bit_rate *= rx_chains_num;
+        WARN_ON(max_bit_rate & ~IEEE80211_HT_MCS_RX_HIGHEST_MASK);
+        ht_info->mcs.rx_highest = cpu_to_le16(max_bit_rate);
+
+        /* Tx MCS capabilities */
+        ht_info->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
+        if (tx_chains_num != rx_chains_num) {
+                ht_info->mcs.tx_params |= IEEE80211_HT_MCS_TX_RX_DIFF;
+                ht_info->mcs.tx_params |= ((tx_chains_num - 1) <<
+                                IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT);
+        }
+}
+
+/**
+ * iwl_init_geos - Initialize mac80211's geo/channel info based from eeprom
+ */
+static int iwl_init_geos(struct iwl_priv *priv)
+{
+        struct iwl_channel_info *ch;
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_channel *channels;
+        struct ieee80211_channel *geo_ch;
+        struct ieee80211_rate *rates;
+        int i = 0;
+        s8 max_tx_power = IWLAGN_TX_POWER_TARGET_POWER_MIN;
+
+        if (priv->bands[IEEE80211_BAND_2GHZ].n_bitrates ||
+            priv->bands[IEEE80211_BAND_5GHZ].n_bitrates) {
+                IWL_DEBUG_INFO(priv, "Geography modes already initialized.\n");
+                set_bit(STATUS_GEO_CONFIGURED, &priv->status);
+                return 0;
+        }
+
+        channels = kcalloc(priv->channel_count,
+                           sizeof(struct ieee80211_channel), GFP_KERNEL);
+        if (!channels)
+                return -ENOMEM;
+
+        rates = kcalloc(IWL_RATE_COUNT_LEGACY, sizeof(struct ieee80211_rate),
+                        GFP_KERNEL);
+        if (!rates) {
+                kfree(channels);
+                return -ENOMEM;
+        }
+
+        /* 5.2GHz channels start after the 2.4GHz channels */
+        sband = &priv->bands[IEEE80211_BAND_5GHZ];
+        sband->channels = &channels[ARRAY_SIZE(iwl_eeprom_band_1)];
+        /* just OFDM */
+        sband->bitrates = &rates[IWL_FIRST_OFDM_RATE];
+        sband->n_bitrates = IWL_RATE_COUNT_LEGACY - IWL_FIRST_OFDM_RATE;
+
+        if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE)
+                iwl_init_ht_hw_capab(priv, &sband->ht_cap,
+                                         IEEE80211_BAND_5GHZ);
+
+        sband = &priv->bands[IEEE80211_BAND_2GHZ];
+        sband->channels = channels;
+        /* OFDM & CCK */
+        sband->bitrates = rates;
+        sband->n_bitrates = IWL_RATE_COUNT_LEGACY;
+
+        if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE)
+                iwl_init_ht_hw_capab(priv, &sband->ht_cap,
+                                         IEEE80211_BAND_2GHZ);
+
+        priv->ieee_channels = channels;
+        priv->ieee_rates = rates;
+
+        for (i = 0;  i < priv->channel_count; i++) {
+                ch = &priv->channel_info[i];
+
+                /* FIXME: might be removed if scan is OK */
+                if (!is_channel_valid(ch))
+                        continue;
+
+                sband =  &priv->bands[ch->band];
+
+                geo_ch = &sband->channels[sband->n_channels++];
+
+                geo_ch->center_freq =
+                        ieee80211_channel_to_frequency(ch->channel, ch->band);
+                geo_ch->max_power = ch->max_power_avg;
+                geo_ch->max_antenna_gain = 0xff;
+                geo_ch->hw_value = ch->channel;
+
+                if (is_channel_valid(ch)) {
+                        if (!(ch->flags & EEPROM_CHANNEL_IBSS))
+                                geo_ch->flags |= IEEE80211_CHAN_NO_IBSS;
+
+                        if (!(ch->flags & EEPROM_CHANNEL_ACTIVE))
+                                geo_ch->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
+
+                        if (ch->flags & EEPROM_CHANNEL_RADAR)
+                                geo_ch->flags |= IEEE80211_CHAN_RADAR;
+
+                        geo_ch->flags |= ch->ht40_extension_channel;
+
+                        if (ch->max_power_avg > max_tx_power)
+                                max_tx_power = ch->max_power_avg;
+                } else {
+                        geo_ch->flags |= IEEE80211_CHAN_DISABLED;
+                }
+
+                IWL_DEBUG_INFO(priv, "Channel %d Freq=%d[%sGHz] %s flag=0x%X\n",
+                                ch->channel, geo_ch->center_freq,
+                                is_channel_a_band(ch) ?  "5.2" : "2.4",
+                                geo_ch->flags & IEEE80211_CHAN_DISABLED ?
+                                "restricted" : "valid",
+                                 geo_ch->flags);
+        }
+
+        priv->tx_power_device_lmt = max_tx_power;
+        priv->tx_power_user_lmt = max_tx_power;
+        priv->tx_power_next = max_tx_power;
+
+        if ((priv->bands[IEEE80211_BAND_5GHZ].n_channels == 0) &&
+             priv->hw_params.sku & EEPROM_SKU_CAP_BAND_52GHZ) {
+                IWL_INFO(priv, "Incorrectly detected BG card as ABG. "
+                        "Please send your %s to maintainer.\n",
+                        priv->trans->hw_id_str);
+                priv->hw_params.sku &= ~EEPROM_SKU_CAP_BAND_52GHZ;
+        }
+
+        if (iwlwifi_mod_params.disable_5ghz)
+                priv->bands[IEEE80211_BAND_5GHZ].n_channels = 0;
+
+        IWL_INFO(priv, "Tunable channels: %d 802.11bg, %d 802.11a channels\n",
+                   priv->bands[IEEE80211_BAND_2GHZ].n_channels,
+                   priv->bands[IEEE80211_BAND_5GHZ].n_channels);
+
+        set_bit(STATUS_GEO_CONFIGURED, &priv->status);
+
+        return 0;
+}
+
+/*
+ * iwl_free_geos - undo allocations in iwl_init_geos
+ */
+static void iwl_free_geos(struct iwl_priv *priv)
+{
+        kfree(priv->ieee_channels);
+        kfree(priv->ieee_rates);
+        clear_bit(STATUS_GEO_CONFIGURED, &priv->status);
+}
+
+int iwl_init_drv(struct iwl_priv *priv)
 {
         int ret;
 
@@ -1043,7 +1344,7 @@ static int iwl_init_drv(struct iwl_priv *priv)
         priv->band = IEEE80211_BAND_2GHZ;
 
         priv->plcp_delta_threshold =
-                cfg(priv)->base_params->plcp_delta_threshold;
+                priv->cfg->base_params->plcp_delta_threshold;
 
         priv->iw_mode = NL80211_IFTYPE_STATION;
         priv->current_ht_config.smps = IEEE80211_SMPS_STATIC;
@@ -1052,12 +1353,6 @@ static int iwl_init_drv(struct iwl_priv *priv)
 
         priv->ucode_owner = IWL_OWNERSHIP_DRIVER;
 
-        /* initialize force reset */
-        priv->force_reset[IWL_RF_RESET].reset_duration =
-                IWL_DELAY_NEXT_FORCE_RF_RESET;
-        priv->force_reset[IWL_FW_RESET].reset_duration =
-                IWL_DELAY_NEXT_FORCE_FW_RELOAD;
-
         priv->rx_statistics_jiffies = jiffies;
 
         /* Choose which receivers/antennas to use */
@@ -1066,8 +1361,8 @@ static int iwl_init_drv(struct iwl_priv *priv)
         iwl_init_scan_params(priv);
 
         /* init bt coex */
-        if (cfg(priv)->bt_params &&
-            cfg(priv)->bt_params->advanced_bt_coexist) {
+        if (priv->cfg->bt_params &&
+            priv->cfg->bt_params->advanced_bt_coexist) {
                 priv->kill_ack_mask = IWLAGN_BT_KILL_ACK_MASK_DEFAULT;
                 priv->kill_cts_mask = IWLAGN_BT_KILL_CTS_MASK_DEFAULT;
                 priv->bt_valid = IWLAGN_BT_ALL_VALID_MSK;
@@ -1097,7 +1392,7 @@ err:
         return ret;
 }
 
-static void iwl_uninit_drv(struct iwl_priv *priv)
+void iwl_uninit_drv(struct iwl_priv *priv)
 {
         iwl_free_geos(priv);
         iwl_free_channel_map(priv);
@@ -1110,75 +1405,59 @@ static void iwl_uninit_drv(struct iwl_priv *priv)
 #endif
 }
 
-/* Size of one Rx buffer in host DRAM */
-#define IWL_RX_BUF_SIZE_4K (4 * 1024)
-#define IWL_RX_BUF_SIZE_8K (8 * 1024)
-
-static void iwl_set_hw_params(struct iwl_priv *priv)
+void iwl_set_hw_params(struct iwl_priv *priv)
 {
-        if (cfg(priv)->ht_params)
-                hw_params(priv).use_rts_for_aggregation =
-                        cfg(priv)->ht_params->use_rts_for_aggregation;
-
-        if (iwlagn_mod_params.amsdu_size_8K)
-                hw_params(priv).rx_page_order =
-                        get_order(IWL_RX_BUF_SIZE_8K);
-        else
-                hw_params(priv).rx_page_order =
-                        get_order(IWL_RX_BUF_SIZE_4K);
+        if (priv->cfg->ht_params)
+                priv->hw_params.use_rts_for_aggregation =
+                        priv->cfg->ht_params->use_rts_for_aggregation;
 
-        if (iwlagn_mod_params.disable_11n & IWL_DISABLE_HT_ALL)
-                hw_params(priv).sku &= ~EEPROM_SKU_CAP_11N_ENABLE;
-
-        hw_params(priv).num_ampdu_queues =
-                cfg(priv)->base_params->num_of_ampdu_queues;
-        hw_params(priv).wd_timeout = cfg(priv)->base_params->wd_timeout;
+        if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_ALL)
+                priv->hw_params.sku &= ~EEPROM_SKU_CAP_11N_ENABLE;
 
         /* Device-specific setup */
-        cfg(priv)->lib->set_hw_params(priv);
+        priv->lib->set_hw_params(priv);
 }
 
 
 
-static void iwl_debug_config(struct iwl_priv *priv)
+/* show what optional capabilities we have */
+void iwl_option_config(struct iwl_priv *priv)
 {
-        dev_printk(KERN_INFO, trans(priv)->dev, "CONFIG_IWLWIFI_DEBUG "
 #ifdef CONFIG_IWLWIFI_DEBUG
-                "enabled\n");
+        IWL_INFO(priv, "CONFIG_IWLWIFI_DEBUG enabled\n");
 #else
-                "disabled\n");
+        IWL_INFO(priv, "CONFIG_IWLWIFI_DEBUG disabled\n");
 #endif
-        dev_printk(KERN_INFO, trans(priv)->dev, "CONFIG_IWLWIFI_DEBUGFS "
+
 #ifdef CONFIG_IWLWIFI_DEBUGFS
-                "enabled\n");
+        IWL_INFO(priv, "CONFIG_IWLWIFI_DEBUGFS enabled\n");
 #else
-                "disabled\n");
+        IWL_INFO(priv, "CONFIG_IWLWIFI_DEBUGFS disabled\n");
 #endif
-        dev_printk(KERN_INFO, trans(priv)->dev, "CONFIG_IWLWIFI_DEVICE_TRACING "
+
 #ifdef CONFIG_IWLWIFI_DEVICE_TRACING
-                "enabled\n");
+        IWL_INFO(priv, "CONFIG_IWLWIFI_DEVICE_TRACING enabled\n");
 #else
-                "disabled\n");
+        IWL_INFO(priv, "CONFIG_IWLWIFI_DEVICE_TRACING disabled\n");
 #endif
 
-        dev_printk(KERN_INFO, trans(priv)->dev, "CONFIG_IWLWIFI_DEVICE_TESTMODE "
 #ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE
-                "enabled\n");
+        IWL_INFO(priv, "CONFIG_IWLWIFI_DEVICE_TESTMODE enabled\n");
 #else
-                "disabled\n");
+        IWL_INFO(priv, "CONFIG_IWLWIFI_DEVICE_TESTMODE disabled\n");
 #endif
-        dev_printk(KERN_INFO, trans(priv)->dev, "CONFIG_IWLWIFI_P2P "
+
 #ifdef CONFIG_IWLWIFI_P2P
-                "enabled\n");
+        IWL_INFO(priv, "CONFIG_IWLWIFI_P2P enabled\n");
 #else
-                "disabled\n");
+        IWL_INFO(priv, "CONFIG_IWLWIFI_P2P disabled\n");
 #endif
 }
 
 static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
+                                                 const struct iwl_cfg *cfg,
                                                  const struct iwl_fw *fw)
 {
-        int err = 0;
         struct iwl_priv *priv;
         struct ieee80211_hw *hw;
         struct iwl_op_mode *op_mode;
@@ -1193,25 +1472,60 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
                 STATISTICS_NOTIFICATION,
                 REPLY_TX,
         };
+        int i;
 
         /************************
          * 1. Allocating HW data
          ************************/
         hw = iwl_alloc_all();
         if (!hw) {
-                pr_err("%s: Cannot allocate network device\n",
-                                cfg(trans)->name);
-                err = -ENOMEM;
+                pr_err("%s: Cannot allocate network device\n", cfg->name);
                 goto out;
         }
 
         op_mode = hw->priv;
         op_mode->ops = &iwl_dvm_ops;
         priv = IWL_OP_MODE_GET_DVM(op_mode);
-        priv->shrd = trans->shrd;
+        priv->trans = trans;
+        priv->dev = trans->dev;
+        priv->cfg = cfg;
         priv->fw = fw;
-        /* TODO: remove fw from shared data later */
-        priv->shrd->fw = fw;
+
+        switch (priv->cfg->device_family) {
+        case IWL_DEVICE_FAMILY_1000:
+        case IWL_DEVICE_FAMILY_100:
+                priv->lib = &iwl1000_lib;
+                break;
+        case IWL_DEVICE_FAMILY_2000:
+        case IWL_DEVICE_FAMILY_105:
+                priv->lib = &iwl2000_lib;
+                break;
+        case IWL_DEVICE_FAMILY_2030:
+        case IWL_DEVICE_FAMILY_135:
+                priv->lib = &iwl2030_lib;
+                break;
+        case IWL_DEVICE_FAMILY_5000:
+                priv->lib = &iwl5000_lib;
+                break;
+        case IWL_DEVICE_FAMILY_5150:
+                priv->lib = &iwl5150_lib;
+                break;
+        case IWL_DEVICE_FAMILY_6000:
+        case IWL_DEVICE_FAMILY_6005:
+        case IWL_DEVICE_FAMILY_6000i:
+        case IWL_DEVICE_FAMILY_6050:
+        case IWL_DEVICE_FAMILY_6150:
+                priv->lib = &iwl6000_lib;
+                break;
+        case IWL_DEVICE_FAMILY_6030:
+                priv->lib = &iwl6030_lib;
+                break;
+        default:
+                break;
+        }
+
+        if (WARN_ON(!priv->lib))
+                goto out_free_hw;
 
         /*
          * Populate the state variables that the transport layer needs
@@ -1220,87 +1534,90 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
         trans_cfg.op_mode = op_mode;
         trans_cfg.no_reclaim_cmds = no_reclaim_cmds;
         trans_cfg.n_no_reclaim_cmds = ARRAY_SIZE(no_reclaim_cmds);
+        trans_cfg.rx_buf_size_8k = iwlwifi_mod_params.amsdu_size_8K;
+        if (!iwlwifi_mod_params.wd_disable)
+                trans_cfg.queue_watchdog_timeout =
+                        priv->cfg->base_params->wd_timeout;
+        else
+                trans_cfg.queue_watchdog_timeout = IWL_WATCHHDOG_DISABLED;
+        trans_cfg.command_names = iwl_dvm_cmd_strings;
 
         ucode_flags = fw->ucode_capa.flags;
 
 #ifndef CONFIG_IWLWIFI_P2P
-        ucode_flags &= ~IWL_UCODE_TLV_FLAGS_PAN;
+        ucode_flags &= ~IWL_UCODE_TLV_FLAGS_P2P;
 #endif
 
         if (ucode_flags & IWL_UCODE_TLV_FLAGS_PAN) {
                 priv->sta_key_max_num = STA_KEY_MAX_NUM_PAN;
                 trans_cfg.cmd_queue = IWL_IPAN_CMD_QUEUE_NUM;
+                trans_cfg.queue_to_fifo = iwlagn_ipan_queue_to_tx_fifo;
+                trans_cfg.n_queue_to_fifo =
+                        ARRAY_SIZE(iwlagn_ipan_queue_to_tx_fifo);
         } else {
                 priv->sta_key_max_num = STA_KEY_MAX_NUM;
                 trans_cfg.cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;
+                trans_cfg.queue_to_fifo = iwlagn_default_queue_to_tx_fifo;
+                trans_cfg.n_queue_to_fifo =
+                        ARRAY_SIZE(iwlagn_default_queue_to_tx_fifo);
         }
 
         /* Configure transport layer */
-        iwl_trans_configure(trans(priv), &trans_cfg);
+        iwl_trans_configure(priv->trans, &trans_cfg);
 
         /* At this point both hw and priv are allocated. */
 
-        SET_IEEE80211_DEV(priv->hw, trans(priv)->dev);
+        SET_IEEE80211_DEV(priv->hw, priv->trans->dev);
 
-        /* show what debugging capabilities we have */
-        iwl_debug_config(priv);
+        iwl_option_config(priv);
 
         IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
 
         /* is antenna coupling more than 35dB ? */
         priv->bt_ant_couple_ok =
-                (iwlagn_mod_params.ant_coupling >
+                (iwlwifi_mod_params.ant_coupling >
                         IWL_BT_ANTENNA_COUPLING_THRESHOLD) ?
                         true : false;
 
         /* enable/disable bt channel inhibition */
-        priv->bt_ch_announce = iwlagn_mod_params.bt_ch_announce;
+        priv->bt_ch_announce = iwlwifi_mod_params.bt_ch_announce;
         IWL_DEBUG_INFO(priv, "BT channel inhibition is %s\n",
                        (priv->bt_ch_announce) ? "On" : "Off");
 
-        if (iwl_alloc_traffic_mem(priv))
-                IWL_ERR(priv, "Not enough memory to generate traffic log\n");
-
         /* these spin locks will be used in apm_ops.init and EEPROM access
          * we should init now
          */
-        spin_lock_init(&trans(priv)->reg_lock);
         spin_lock_init(&priv->statistics.lock);
 
         /***********************
          * 2. Read REV register
          ***********************/
         IWL_INFO(priv, "Detected %s, REV=0x%X\n",
-                cfg(priv)->name, trans(priv)->hw_rev);
+                priv->cfg->name, priv->trans->hw_rev);
 
-        err = iwl_trans_start_hw(trans(priv));
-        if (err)
-                goto out_free_traffic_mem;
+        if (iwl_trans_start_hw(priv->trans))
+                goto out_free_hw;
 
-        /*****************
-         * 3. Read EEPROM
-         *****************/
-        err = iwl_eeprom_init(trans(priv), trans(priv)->hw_rev);
-        /* Reset chip to save power until we load uCode during "up". */
-        iwl_trans_stop_hw(trans(priv));
-        if (err) {
+        /* Read the EEPROM */
+        if (iwl_eeprom_init(priv, priv->trans->hw_rev)) {
                 IWL_ERR(priv, "Unable to init EEPROM\n");
-                goto out_free_traffic_mem;
+                goto out_free_hw;
         }
-        err = iwl_eeprom_check_version(priv);
-        if (err)
+        /* Reset chip to save power until we load uCode during "up". */
+        iwl_trans_stop_hw(priv->trans, false);
+
+        if (iwl_eeprom_check_version(priv))
                 goto out_free_eeprom;
 
-        err = iwl_eeprom_init_hw_params(priv);
-        if (err)
+        if (iwl_eeprom_init_hw_params(priv))
                 goto out_free_eeprom;
 
         /* extract MAC Address */
-        iwl_eeprom_get_mac(priv->shrd, priv->addresses[0].addr);
+        iwl_eeprom_get_mac(priv, priv->addresses[0].addr);
         IWL_DEBUG_INFO(priv, "MAC address: %pM\n", priv->addresses[0].addr);
         priv->hw->wiphy->addresses = priv->addresses;
         priv->hw->wiphy->n_addresses = 1;
-        num_mac = iwl_eeprom_query16(priv->shrd, EEPROM_NUM_MAC_ADDRESS);
+        num_mac = iwl_eeprom_query16(priv, EEPROM_NUM_MAC_ADDRESS);
         if (num_mac > 1) {
                 memcpy(priv->addresses[1].addr, priv->addresses[0].addr,
                        ETH_ALEN);
@@ -1313,7 +1630,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
          ************************/
         iwl_set_hw_params(priv);
 
-        if (!(hw_params(priv).sku & EEPROM_SKU_CAP_IPAN_ENABLE)) {
+        if (!(priv->hw_params.sku & EEPROM_SKU_CAP_IPAN_ENABLE)) {
                 IWL_DEBUG_INFO(priv, "Your EEPROM disabled PAN");
                 ucode_flags &= ~IWL_UCODE_TLV_FLAGS_PAN;
                 /*
@@ -1323,18 +1640,32 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
                 ucode_flags &= ~IWL_UCODE_TLV_FLAGS_P2P;
                 priv->sta_key_max_num = STA_KEY_MAX_NUM;
                 trans_cfg.cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;
+                trans_cfg.queue_to_fifo = iwlagn_default_queue_to_tx_fifo;
+                trans_cfg.n_queue_to_fifo =
+                        ARRAY_SIZE(iwlagn_default_queue_to_tx_fifo);
 
                 /* Configure transport layer again*/
-                iwl_trans_configure(trans(priv), &trans_cfg);
+                iwl_trans_configure(priv->trans, &trans_cfg);
         }
 
         /*******************
          * 5. Setup priv
          *******************/
+        for (i = 0; i < IWL_MAX_HW_QUEUES; i++) {
+                priv->queue_to_mac80211[i] = IWL_INVALID_MAC80211_QUEUE;
+                if (i < IWLAGN_FIRST_AMPDU_QUEUE &&
+                    i != IWL_DEFAULT_CMD_QUEUE_NUM &&
+                    i != IWL_IPAN_CMD_QUEUE_NUM)
+                        priv->queue_to_mac80211[i] = i;
+                atomic_set(&priv->queue_stop_count[i], 0);
+        }
 
-        err = iwl_init_drv(priv);
-        if (err)
+        WARN_ON(trans_cfg.queue_to_fifo[trans_cfg.cmd_queue] !=
+                                                IWLAGN_CMD_FIFO_NUM);
+
+        if (iwl_init_drv(priv))
                 goto out_free_eeprom;
+
         /* At this point both hw and priv are initialized. */
 
         /********************
@@ -1367,15 +1698,12 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
          *
          * 7. Setup and register with mac80211 and debugfs
          **************************************************/
-        err = iwlagn_mac_setup_register(priv, &fw->ucode_capa);
-        if (err)
+        if (iwlagn_mac_setup_register(priv, &fw->ucode_capa))
                 goto out_destroy_workqueue;
 
-        err = iwl_dbgfs_register(priv, DRV_NAME);
-        if (err)
+        if (iwl_dbgfs_register(priv, DRV_NAME))
                 IWL_ERR(priv,
-                        "failed to create debugfs files. Ignoring error: %d\n",
-                        err);
+                        "failed to create debugfs files. Ignoring error\n");
 
         return op_mode;
 
@@ -1384,16 +1712,15 @@ out_destroy_workqueue:
         priv->workqueue = NULL;
         iwl_uninit_drv(priv);
 out_free_eeprom:
-        iwl_eeprom_free(priv->shrd);
-out_free_traffic_mem:
-        iwl_free_traffic_mem(priv);
+        iwl_eeprom_free(priv);
+out_free_hw:
         ieee80211_free_hw(priv->hw);
 out:
         op_mode = NULL;
         return op_mode;
 }
 
-static void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode)
+void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
 
@@ -1408,9 +1735,9 @@ static void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode)
 
         /*This will stop the queues, move the device to low power state */
         priv->ucode_loaded = false;
-        iwl_trans_stop_device(trans(priv));
+        iwl_trans_stop_device(priv->trans);
 
-        iwl_eeprom_free(priv->shrd);
+        iwl_eeprom_free(priv);
 
         /*netif_stop_queue(dev); */
         flush_workqueue(priv->workqueue);
@@ -1420,69 +1747,562 @@ static void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode)
          * until now... */
         destroy_workqueue(priv->workqueue);
         priv->workqueue = NULL;
-        iwl_free_traffic_mem(priv);
 
         iwl_uninit_drv(priv);
 
         dev_kfree_skb(priv->beacon_skb);
 
+        iwl_trans_stop_hw(priv->trans, true);
         ieee80211_free_hw(priv->hw);
 }
 
-static void iwl_cmd_queue_full(struct iwl_op_mode *op_mode)
+static const char * const desc_lookup_text[] = {
+        "OK",
+        "FAIL",
+        "BAD_PARAM",
+        "BAD_CHECKSUM",
+        "NMI_INTERRUPT_WDG",
+        "SYSASSERT",
+        "FATAL_ERROR",
+        "BAD_COMMAND",
+        "HW_ERROR_TUNE_LOCK",
+        "HW_ERROR_TEMPERATURE",
+        "ILLEGAL_CHAN_FREQ",
+        "VCC_NOT_STABLE",
+        "FH_ERROR",
+        "NMI_INTERRUPT_HOST",
+        "NMI_INTERRUPT_ACTION_PT",
+        "NMI_INTERRUPT_UNKNOWN",
+        "UCODE_VERSION_MISMATCH",
+        "HW_ERROR_ABS_LOCK",
+        "HW_ERROR_CAL_LOCK_FAIL",
+        "NMI_INTERRUPT_INST_ACTION_PT",
+        "NMI_INTERRUPT_DATA_ACTION_PT",
+        "NMI_TRM_HW_ER",
+        "NMI_INTERRUPT_TRM",
+        "NMI_INTERRUPT_BREAK_POINT",
+        "DEBUG_0",
+        "DEBUG_1",
+        "DEBUG_2",
+        "DEBUG_3",
+};
+
+static struct { char *name; u8 num; } advanced_lookup[] = {
+        { "NMI_INTERRUPT_WDG", 0x34 },
+        { "SYSASSERT", 0x35 },
+        { "UCODE_VERSION_MISMATCH", 0x37 },
+        { "BAD_COMMAND", 0x38 },
+        { "NMI_INTERRUPT_DATA_ACTION_PT", 0x3C },
+        { "FATAL_ERROR", 0x3D },
+        { "NMI_TRM_HW_ERR", 0x46 },
+        { "NMI_INTERRUPT_TRM", 0x4C },
+        { "NMI_INTERRUPT_BREAK_POINT", 0x54 },
+        { "NMI_INTERRUPT_WDG_RXF_FULL", 0x5C },
+        { "NMI_INTERRUPT_WDG_NO_RBD_RXF_FULL", 0x64 },
+        { "NMI_INTERRUPT_HOST", 0x66 },
+        { "NMI_INTERRUPT_ACTION_PT", 0x7C },
+        { "NMI_INTERRUPT_UNKNOWN", 0x84 },
+        { "NMI_INTERRUPT_INST_ACTION_PT", 0x86 },
+        { "ADVANCED_SYSASSERT", 0 },
+};
+
+static const char *desc_lookup(u32 num)
+{
+        int i;
+        int max = ARRAY_SIZE(desc_lookup_text);
+
+        if (num < max)
+                return desc_lookup_text[num];
+
+        max = ARRAY_SIZE(advanced_lookup) - 1;
+        for (i = 0; i < max; i++) {
+                if (advanced_lookup[i].num == num)
+                        break;
+        }
+        return advanced_lookup[i].name;
+}
+
+#define ERROR_START_OFFSET  (1 * sizeof(u32))
+#define ERROR_ELEM_SIZE     (7 * sizeof(u32))
+
+static void iwl_dump_nic_error_log(struct iwl_priv *priv)
+{
+        struct iwl_trans *trans = priv->trans;
+        u32 base;
+        struct iwl_error_event_table table;
+
+        base = priv->device_pointers.error_event_table;
+        if (priv->cur_ucode == IWL_UCODE_INIT) {
+                if (!base)
+                        base = priv->fw->init_errlog_ptr;
+        } else {
+                if (!base)
+                        base = priv->fw->inst_errlog_ptr;
+        }
+
+        if (!iwlagn_hw_valid_rtc_data_addr(base)) {
+                IWL_ERR(priv,
+                        "Not valid error log pointer 0x%08X for %s uCode\n",
+                        base,
+                        (priv->cur_ucode == IWL_UCODE_INIT)
+                                        ? "Init" : "RT");
+                return;
+        }
+
+        /*TODO: Update dbgfs with ISR error stats obtained below */
+        iwl_read_targ_mem_words(trans, base, &table, sizeof(table));
+
+        if (ERROR_START_OFFSET <= table.valid * ERROR_ELEM_SIZE) {
+                IWL_ERR(trans, "Start IWL Error Log Dump:\n");
+                IWL_ERR(trans, "Status: 0x%08lX, count: %d\n",
+                        priv->status, table.valid);
+        }
+
+        trace_iwlwifi_dev_ucode_error(trans->dev, table.error_id, table.tsf_low,
+                                      table.data1, table.data2, table.line,
+                                      table.blink1, table.blink2, table.ilink1,
+                                      table.ilink2, table.bcon_time, table.gp1,
+                                      table.gp2, table.gp3, table.ucode_ver,
+                                      table.hw_ver, table.brd_ver);
+        IWL_ERR(priv, "0x%08X | %-28s\n", table.error_id,
+                desc_lookup(table.error_id));
+        IWL_ERR(priv, "0x%08X | uPc\n", table.pc);
+        IWL_ERR(priv, "0x%08X | branchlink1\n", table.blink1);
+        IWL_ERR(priv, "0x%08X | branchlink2\n", table.blink2);
+        IWL_ERR(priv, "0x%08X | interruptlink1\n", table.ilink1);
+        IWL_ERR(priv, "0x%08X | interruptlink2\n", table.ilink2);
+        IWL_ERR(priv, "0x%08X | data1\n", table.data1);
+        IWL_ERR(priv, "0x%08X | data2\n", table.data2);
+        IWL_ERR(priv, "0x%08X | line\n", table.line);
+        IWL_ERR(priv, "0x%08X | beacon time\n", table.bcon_time);
+        IWL_ERR(priv, "0x%08X | tsf low\n", table.tsf_low);
+        IWL_ERR(priv, "0x%08X | tsf hi\n", table.tsf_hi);
+        IWL_ERR(priv, "0x%08X | time gp1\n", table.gp1);
+        IWL_ERR(priv, "0x%08X | time gp2\n", table.gp2);
+        IWL_ERR(priv, "0x%08X | time gp3\n", table.gp3);
+        IWL_ERR(priv, "0x%08X | uCode version\n", table.ucode_ver);
+        IWL_ERR(priv, "0x%08X | hw version\n", table.hw_ver);
+        IWL_ERR(priv, "0x%08X | board version\n", table.brd_ver);
+        IWL_ERR(priv, "0x%08X | hcmd\n", table.hcmd);
+        IWL_ERR(priv, "0x%08X | isr0\n", table.isr0);
+        IWL_ERR(priv, "0x%08X | isr1\n", table.isr1);
+        IWL_ERR(priv, "0x%08X | isr2\n", table.isr2);
+        IWL_ERR(priv, "0x%08X | isr3\n", table.isr3);
+        IWL_ERR(priv, "0x%08X | isr4\n", table.isr4);
+        IWL_ERR(priv, "0x%08X | isr_pref\n", table.isr_pref);
+        IWL_ERR(priv, "0x%08X | wait_event\n", table.wait_event);
+        IWL_ERR(priv, "0x%08X | l2p_control\n", table.l2p_control);
+        IWL_ERR(priv, "0x%08X | l2p_duration\n", table.l2p_duration);
+        IWL_ERR(priv, "0x%08X | l2p_mhvalid\n", table.l2p_mhvalid);
+        IWL_ERR(priv, "0x%08X | l2p_addr_match\n", table.l2p_addr_match);
+        IWL_ERR(priv, "0x%08X | lmpm_pmg_sel\n", table.lmpm_pmg_sel);
+        IWL_ERR(priv, "0x%08X | timestamp\n", table.u_timestamp);
+        IWL_ERR(priv, "0x%08X | flow_handler\n", table.flow_handler);
+}
+
+#define EVENT_START_OFFSET  (4 * sizeof(u32))
+
+/**
+ * iwl_print_event_log - Dump error event log to syslog
+ *
+ */
+static int iwl_print_event_log(struct iwl_priv *priv, u32 start_idx,
+                               u32 num_events, u32 mode,
+                               int pos, char **buf, size_t bufsz)
+{
+        u32 i;
+        u32 base;       /* SRAM byte address of event log header */
+        u32 event_size; /* 2 u32s, or 3 u32s if timestamp recorded */
+        u32 ptr;        /* SRAM byte address of log data */
+        u32 ev, time, data; /* event log data */
+        unsigned long reg_flags;
+
+        struct iwl_trans *trans = priv->trans;
+
+        if (num_events == 0)
+                return pos;
+
+        base = priv->device_pointers.log_event_table;
+        if (priv->cur_ucode == IWL_UCODE_INIT) {
+                if (!base)
+                        base = priv->fw->init_evtlog_ptr;
+        } else {
+                if (!base)
+                        base = priv->fw->inst_evtlog_ptr;
+        }
+
+        if (mode == 0)
+                event_size = 2 * sizeof(u32);
+        else
+                event_size = 3 * sizeof(u32);
+
+        ptr = base + EVENT_START_OFFSET + (start_idx * event_size);
+
+        /* Make sure device is powered up for SRAM reads */
+        spin_lock_irqsave(&trans->reg_lock, reg_flags);
+        if (unlikely(!iwl_grab_nic_access(trans)))
+                goto out_unlock;
+
+        /* Set starting address; reads will auto-increment */
+        iwl_write32(trans, HBUS_TARG_MEM_RADDR, ptr);
+
+        /* "time" is actually "data" for mode 0 (no timestamp).
+        * place event id # at far right for easier visual parsing. */
+        for (i = 0; i < num_events; i++) {
+                ev = iwl_read32(trans, HBUS_TARG_MEM_RDAT);
+                time = iwl_read32(trans, HBUS_TARG_MEM_RDAT);
+                if (mode == 0) {
+                        /* data, ev */
+                        if (bufsz) {
+                                pos += scnprintf(*buf + pos, bufsz - pos,
+                                                "EVT_LOG:0x%08x:%04u\n",
+                                                time, ev);
+                        } else {
+                                trace_iwlwifi_dev_ucode_event(trans->dev, 0,
+                                        time, ev);
+                                IWL_ERR(priv, "EVT_LOG:0x%08x:%04u\n",
+                                        time, ev);
+                        }
+                } else {
+                        data = iwl_read32(trans, HBUS_TARG_MEM_RDAT);
+                        if (bufsz) {
+                                pos += scnprintf(*buf + pos, bufsz - pos,
+                                                "EVT_LOGT:%010u:0x%08x:%04u\n",
+                                                 time, data, ev);
+                        } else {
+                                IWL_ERR(priv, "EVT_LOGT:%010u:0x%08x:%04u\n",
+                                        time, data, ev);
+                                trace_iwlwifi_dev_ucode_event(trans->dev, time,
+                                        data, ev);
+                        }
+                }
+        }
+
+        /* Allow device to power down */
+        iwl_release_nic_access(trans);
+out_unlock:
+        spin_unlock_irqrestore(&trans->reg_lock, reg_flags);
+        return pos;
+}
+
+/**
+ * iwl_print_last_event_logs - Dump the newest # of event log to syslog
+ */
+static int iwl_print_last_event_logs(struct iwl_priv *priv, u32 capacity,
+                                    u32 num_wraps, u32 next_entry,
+                                    u32 size, u32 mode,
+                                    int pos, char **buf, size_t bufsz)
+{
+        /*
+         * display the newest DEFAULT_LOG_ENTRIES entries
+         * i.e the entries just before the next ont that uCode would fill.
+         */
+        if (num_wraps) {
+                if (next_entry < size) {
+                        pos = iwl_print_event_log(priv,
+                                                capacity - (size - next_entry),
+                                                size - next_entry, mode,
+                                                pos, buf, bufsz);
+                        pos = iwl_print_event_log(priv, 0,
+                                                  next_entry, mode,
+                                                  pos, buf, bufsz);
+                } else
+                        pos = iwl_print_event_log(priv, next_entry - size,
+                                                  size, mode, pos, buf, bufsz);
+        } else {
+                if (next_entry < size) {
+                        pos = iwl_print_event_log(priv, 0, next_entry,
+                                                  mode, pos, buf, bufsz);
+                } else {
+                        pos = iwl_print_event_log(priv, next_entry - size,
+                                                  size, mode, pos, buf, bufsz);
+                }
+        }
+        return pos;
+}
+
+#define DEFAULT_DUMP_EVENT_LOG_ENTRIES (20)
+
+int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
+                            char **buf, bool display)
+{
+        u32 base;       /* SRAM byte address of event log header */
+        u32 capacity;   /* event log capacity in # entries */
+        u32 mode;       /* 0 - no timestamp, 1 - timestamp recorded */
+        u32 num_wraps;  /* # times uCode wrapped to top of log */
+        u32 next_entry; /* index of next entry to be written by uCode */
+        u32 size;       /* # entries that we'll print */
+        u32 logsize;
+        int pos = 0;
+        size_t bufsz = 0;
+        struct iwl_trans *trans = priv->trans;
+
+        base = priv->device_pointers.log_event_table;
+        if (priv->cur_ucode == IWL_UCODE_INIT) {
+                logsize = priv->fw->init_evtlog_size;
+                if (!base)
+                        base = priv->fw->init_evtlog_ptr;
+        } else {
+                logsize = priv->fw->inst_evtlog_size;
+                if (!base)
+                        base = priv->fw->inst_evtlog_ptr;
+        }
+
+        if (!iwlagn_hw_valid_rtc_data_addr(base)) {
+                IWL_ERR(priv,
+                        "Invalid event log pointer 0x%08X for %s uCode\n",
+                        base,
+                        (priv->cur_ucode == IWL_UCODE_INIT)
+                                        ? "Init" : "RT");
+                return -EINVAL;
+        }
+
+        /* event log header */
+        capacity = iwl_read_targ_mem(trans, base);
+        mode = iwl_read_targ_mem(trans, base + (1 * sizeof(u32)));
+        num_wraps = iwl_read_targ_mem(trans, base + (2 * sizeof(u32)));
+        next_entry = iwl_read_targ_mem(trans, base + (3 * sizeof(u32)));
+
+        if (capacity > logsize) {
+                IWL_ERR(priv, "Log capacity %d is bogus, limit to %d "
+                        "entries\n", capacity, logsize);
+                capacity = logsize;
+        }
+
+        if (next_entry > logsize) {
+                IWL_ERR(priv, "Log write index %d is bogus, limit to %d\n",
+                        next_entry, logsize);
+                next_entry = logsize;
+        }
+
+        size = num_wraps ? capacity : next_entry;
+
+        /* bail out if nothing in log */
+        if (size == 0) {
+                IWL_ERR(trans, "Start IWL Event Log Dump: nothing in log\n");
+                return pos;
+        }
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+        if (!(iwl_have_debug_level(IWL_DL_FW_ERRORS)) && !full_log)
+                size = (size > DEFAULT_DUMP_EVENT_LOG_ENTRIES)
+                        ? DEFAULT_DUMP_EVENT_LOG_ENTRIES : size;
+#else
+        size = (size > DEFAULT_DUMP_EVENT_LOG_ENTRIES)
+                ? DEFAULT_DUMP_EVENT_LOG_ENTRIES : size;
+#endif
+        IWL_ERR(priv, "Start IWL Event Log Dump: display last %u entries\n",
+                size);
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+        if (display) {
+                if (full_log)
+                        bufsz = capacity * 48;
+                else
+                        bufsz = size * 48;
+                *buf = kmalloc(bufsz, GFP_KERNEL);
+                if (!*buf)
+                        return -ENOMEM;
+        }
+        if (iwl_have_debug_level(IWL_DL_FW_ERRORS) || full_log) {
+                /*
+                 * if uCode has wrapped back to top of log,
+                 * start at the oldest entry,
+                 * i.e the next one that uCode would fill.
+                 */
+                if (num_wraps)
+                        pos = iwl_print_event_log(priv, next_entry,
+                                                capacity - next_entry, mode,
+                                                pos, buf, bufsz);
+                /* (then/else) start at top of log */
+                pos = iwl_print_event_log(priv, 0,
+                                          next_entry, mode, pos, buf, bufsz);
+        } else
+                pos = iwl_print_last_event_logs(priv, capacity, num_wraps,
+                                                next_entry, size, mode,
+                                                pos, buf, bufsz);
+#else
+        pos = iwl_print_last_event_logs(priv, capacity, num_wraps,
+                                        next_entry, size, mode,
+                                        pos, buf, bufsz);
+#endif
+        return pos;
+}
+
+static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)
+{
+        unsigned int reload_msec;
+        unsigned long reload_jiffies;
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+        if (iwl_have_debug_level(IWL_DL_FW_ERRORS))
+                iwl_print_rx_config_cmd(priv, IWL_RXON_CTX_BSS);
+#endif
+
+        /* uCode is no longer loaded. */
+        priv->ucode_loaded = false;
+
+        /* Set the FW error flag -- cleared on iwl_down */
+        set_bit(STATUS_FW_ERROR, &priv->status);
+
+        iwl_abort_notification_waits(&priv->notif_wait);
+
+        /* Keep the restart process from trying to send host
+         * commands by clearing the ready bit */
+        clear_bit(STATUS_READY, &priv->status);
+
+        wake_up(&priv->trans->wait_command_queue);
+
+        if (!ondemand) {
+                /*
+                 * If firmware keep reloading, then it indicate something
+                 * serious wrong and firmware having problem to recover
+                 * from it. Instead of keep trying which will fill the syslog
+                 * and hang the system, let's just stop it
+                 */
+                reload_jiffies = jiffies;
+                reload_msec = jiffies_to_msecs((long) reload_jiffies -
+                                        (long) priv->reload_jiffies);
+                priv->reload_jiffies = reload_jiffies;
+                if (reload_msec <= IWL_MIN_RELOAD_DURATION) {
+                        priv->reload_count++;
+                        if (priv->reload_count >= IWL_MAX_CONTINUE_RELOAD_CNT) {
+                                IWL_ERR(priv, "BUG_ON, Stop restarting\n");
+                                return;
+                        }
+                } else
+                        priv->reload_count = 0;
+        }
+
+        if (!test_bit(STATUS_EXIT_PENDING, &priv->status)) {
+                if (iwlwifi_mod_params.restart_fw) {
+                        IWL_DEBUG_FW_ERRORS(priv,
+                                  "Restarting adapter due to uCode error.\n");
+                        queue_work(priv->workqueue, &priv->restart);
+                } else
+                        IWL_DEBUG_FW_ERRORS(priv,
+                                  "Detected FW error, but not restarting\n");
+        }
+}
+
+void iwl_nic_error(struct iwl_op_mode *op_mode)
+{
+        struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
+
+        IWL_ERR(priv, "Loaded firmware version: %s\n",
+                priv->fw->fw_version);
+
+        iwl_dump_nic_error_log(priv);
+        iwl_dump_nic_event_log(priv, false, NULL, false);
+
+        iwlagn_fw_error(priv, false);
+}
+
+void iwl_cmd_queue_full(struct iwl_op_mode *op_mode)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
 
         if (!iwl_check_for_ct_kill(priv)) {
                 IWL_ERR(priv, "Restarting adapter queue is full\n");
-                iwl_nic_error(op_mode);
+                iwlagn_fw_error(priv, false);
         }
 }
 
-static void iwl_nic_config(struct iwl_op_mode *op_mode)
+void iwl_nic_config(struct iwl_op_mode *op_mode)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
 
-        cfg(priv)->lib->nic_config(priv);
+        priv->lib->nic_config(priv);
 }
 
-static void iwl_stop_sw_queue(struct iwl_op_mode *op_mode, u8 ac)
+static void iwl_wimax_active(struct iwl_op_mode *op_mode)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
 
-        set_bit(ac, &priv->transport_queue_stop);
-        ieee80211_stop_queue(priv->hw, ac);
+        clear_bit(STATUS_READY, &priv->status);
+        IWL_ERR(priv, "RF is used by WiMAX\n");
+}
+
+void iwl_stop_sw_queue(struct iwl_op_mode *op_mode, int queue)
+{
+        struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
+        int mq = priv->queue_to_mac80211[queue];
+
+        if (WARN_ON_ONCE(mq == IWL_INVALID_MAC80211_QUEUE))
+                return;
+
+        if (atomic_inc_return(&priv->queue_stop_count[mq]) > 1) {
+                IWL_DEBUG_TX_QUEUES(priv,
+                        "queue %d (mac80211 %d) already stopped\n",
+                        queue, mq);
+                return;
+        }
+
+        set_bit(mq, &priv->transport_queue_stop);
+        ieee80211_stop_queue(priv->hw, mq);
 }
 
-static void iwl_wake_sw_queue(struct iwl_op_mode *op_mode, u8 ac)
+void iwl_wake_sw_queue(struct iwl_op_mode *op_mode, int queue)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
+        int mq = priv->queue_to_mac80211[queue];
 
-        clear_bit(ac, &priv->transport_queue_stop);
+        if (WARN_ON_ONCE(mq == IWL_INVALID_MAC80211_QUEUE))
+                return;
+
+        if (atomic_dec_return(&priv->queue_stop_count[mq]) > 0) {
+                IWL_DEBUG_TX_QUEUES(priv,
+                        "queue %d (mac80211 %d) already awake\n",
+                        queue, mq);
+                return;
+        }
+
+        clear_bit(mq, &priv->transport_queue_stop);
 
         if (!priv->passive_no_rx)
-                ieee80211_wake_queue(priv->hw, ac);
+                ieee80211_wake_queue(priv->hw, mq);
 }
 
 void iwlagn_lift_passive_no_rx(struct iwl_priv *priv)
 {
-        int ac;
+        int mq;
 
         if (!priv->passive_no_rx)
                 return;
 
-        for (ac = IEEE80211_AC_VO; ac < IEEE80211_NUM_ACS; ac++) {
-                if (!test_bit(ac, &priv->transport_queue_stop)) {
-                        IWL_DEBUG_TX_QUEUES(priv, "Wake queue %d");
-                        ieee80211_wake_queue(priv->hw, ac);
+        for (mq = 0; mq < IWLAGN_FIRST_AMPDU_QUEUE; mq++) {
+                if (!test_bit(mq, &priv->transport_queue_stop)) {
+                        IWL_DEBUG_TX_QUEUES(priv, "Wake queue %d", mq);
+                        ieee80211_wake_queue(priv->hw, mq);
                 } else {
-                        IWL_DEBUG_TX_QUEUES(priv, "Don't wake queue %d");
+                        IWL_DEBUG_TX_QUEUES(priv, "Don't wake queue %d", mq);
                 }
         }
 
         priv->passive_no_rx = false;
 }
 
+void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb)
+{
+        struct ieee80211_tx_info *info;
+
+        info = IEEE80211_SKB_CB(skb);
+        kmem_cache_free(iwl_tx_cmd_pool, (info->driver_data[1]));
+        dev_kfree_skb_any(skb);
+}
+
+void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)
+{
+        struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
+
+        if (state)
+                set_bit(STATUS_RF_KILL_HW, &priv->status);
+        else
+                clear_bit(STATUS_RF_KILL_HW, &priv->status);
+
+        wiphy_rfkill_set_hw_state(priv->hw->wiphy, state);
+}
+
 const struct iwl_op_mode_ops iwl_dvm_ops = {
         .start = iwl_op_mode_dvm_start,
         .stop = iwl_op_mode_dvm_stop,
@@ -1494,6 +2314,7 @@ const struct iwl_op_mode_ops iwl_dvm_ops = {
         .nic_error = iwl_nic_error,
         .cmd_queue_full = iwl_cmd_queue_full,
         .nic_config = iwl_nic_config,
+        .wimax_active = iwl_wimax_active,
 };
 
 /*****************************************************************************
@@ -1544,96 +2365,3 @@ static void __exit iwl_exit(void)
 
 module_exit(iwl_exit);
 module_init(iwl_init);
-
-#ifdef CONFIG_IWLWIFI_DEBUG
-module_param_named(debug, iwlagn_mod_params.debug_level, uint,
-                   S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(debug, "debug output mask");
-#endif
-
-module_param_named(swcrypto, iwlagn_mod_params.sw_crypto, int, S_IRUGO);
-MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])");
-module_param_named(11n_disable, iwlagn_mod_params.disable_11n, uint, S_IRUGO);
-MODULE_PARM_DESC(11n_disable,
-        "disable 11n functionality, bitmap: 1: full, 2: agg TX, 4: agg RX");
-module_param_named(amsdu_size_8K, iwlagn_mod_params.amsdu_size_8K,
-                   int, S_IRUGO);
-MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size");
-module_param_named(fw_restart, iwlagn_mod_params.restart_fw, int, S_IRUGO);
-MODULE_PARM_DESC(fw_restart, "restart firmware in case of error");
-
-module_param_named(ucode_alternative,
-                   iwlagn_mod_params.wanted_ucode_alternative,
-                   int, S_IRUGO);
-MODULE_PARM_DESC(ucode_alternative,
-                 "specify ucode alternative to use from ucode file");
-
-module_param_named(antenna_coupling, iwlagn_mod_params.ant_coupling,
-                   int, S_IRUGO);
-MODULE_PARM_DESC(antenna_coupling,
-                 "specify antenna coupling in dB (defualt: 0 dB)");
-
-module_param_named(bt_ch_inhibition, iwlagn_mod_params.bt_ch_announce,
-                   bool, S_IRUGO);
-MODULE_PARM_DESC(bt_ch_inhibition,
-                 "Enable BT channel inhibition (default: enable)");
-
-module_param_named(plcp_check, iwlagn_mod_params.plcp_check, bool, S_IRUGO);
-MODULE_PARM_DESC(plcp_check, "Check plcp health (default: 1 [enabled])");
-
-module_param_named(ack_check, iwlagn_mod_params.ack_check, bool, S_IRUGO);
-MODULE_PARM_DESC(ack_check, "Check ack health (default: 0 [disabled])");
-
-module_param_named(wd_disable, iwlagn_mod_params.wd_disable, int, S_IRUGO);
-MODULE_PARM_DESC(wd_disable,
-                "Disable stuck queue watchdog timer 0=system default, "
-                "1=disable, 2=enable (default: 0)");
-
-/*
- * set bt_coex_active to true, uCode will do kill/defer
- * every time the priority line is asserted (BT is sending signals on the
- * priority line in the PCIx).
- * set bt_coex_active to false, uCode will ignore the BT activity and
- * perform the normal operation
- *
- * User might experience transmit issue on some platform due to WiFi/BT
- * co-exist problem. The possible behaviors are:
- *   Able to scan and finding all the available AP
- *   Not able to associate with any AP
- * On those platforms, WiFi communication can be restored by set
- * "bt_coex_active" module parameter to "false"
- *
- * default: bt_coex_active = true (BT_COEX_ENABLE)
- */
-module_param_named(bt_coex_active, iwlagn_mod_params.bt_coex_active,
-                bool, S_IRUGO);
-MODULE_PARM_DESC(bt_coex_active, "enable wifi/bt co-exist (default: enable)");
-
-module_param_named(led_mode, iwlagn_mod_params.led_mode, int, S_IRUGO);
-MODULE_PARM_DESC(led_mode, "0=system default, "
-                "1=On(RF On)/Off(RF Off), 2=blinking, 3=Off (default: 0)");
-
-module_param_named(power_save, iwlagn_mod_params.power_save,
-                bool, S_IRUGO);
-MODULE_PARM_DESC(power_save,
-                 "enable WiFi power management (default: disable)");
-
-module_param_named(power_level, iwlagn_mod_params.power_level,
-                int, S_IRUGO);
-MODULE_PARM_DESC(power_level,
-                 "default power save level (range from 1 - 5, default: 1)");
-
-module_param_named(auto_agg, iwlagn_mod_params.auto_agg,
-                bool, S_IRUGO);
-MODULE_PARM_DESC(auto_agg,
-                 "enable agg w/o check traffic load (default: enable)");
-
-/*
- * For now, keep using power level 1 instead of automatically
- * adjusting ...
- */
-module_param_named(no_sleep_autoadjust, iwlagn_mod_params.no_sleep_autoadjust,
-                bool, S_IRUGO);
-MODULE_PARM_DESC(no_sleep_autoadjust,
-                 "don't automatically adjust sleep level "
-                 "according to maximum network latency (default: true)");
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h
index 3780a03f2716..79c0fe06f4db 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.h
@@ -64,6 +64,43 @@
 #define __iwl_agn_h__
 
 #include "iwl-dev.h"
+#include "iwl-config.h"
+
+/* The first 11 queues (0-10) are used otherwise */
+#define IWLAGN_FIRST_AMPDU_QUEUE        11
+
+/* AUX (TX during scan dwell) queue */
+#define IWL_AUX_QUEUE           10
+
+/* device operations */
+extern struct iwl_lib_ops iwl1000_lib;
+extern struct iwl_lib_ops iwl2000_lib;
+extern struct iwl_lib_ops iwl2030_lib;
+extern struct iwl_lib_ops iwl5000_lib;
+extern struct iwl_lib_ops iwl5150_lib;
+extern struct iwl_lib_ops iwl6000_lib;
+extern struct iwl_lib_ops iwl6030_lib;
+
+
+#define TIME_UNIT               1024
+
+/*****************************************************
+* DRIVER STATUS FUNCTIONS
+******************************************************/
+#define STATUS_RF_KILL_HW       0
+#define STATUS_CT_KILL          1
+#define STATUS_ALIVE            2
+#define STATUS_READY            3
+#define STATUS_GEO_CONFIGURED   4
+#define STATUS_EXIT_PENDING     5
+#define STATUS_STATISTICS       6
+#define STATUS_SCANNING         7
+#define STATUS_SCAN_ABORTING    8
+#define STATUS_SCAN_HW          9
+#define STATUS_FW_ERROR         10
+#define STATUS_CHANNEL_SWITCH_PENDING 11
+#define STATUS_SCAN_COMPLETE    12
+#define STATUS_POWER_PMI        13
 
 struct iwl_ucode_capabilities;
 
@@ -80,12 +117,9 @@ static inline void iwl_set_calib_hdr(struct iwl_calib_hdr *hdr, u8 cmd)
 void iwl_down(struct iwl_priv *priv);
 void iwl_cancel_deferred_work(struct iwl_priv *priv);
 void iwlagn_prepare_restart(struct iwl_priv *priv);
-void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb);
 int __must_check iwl_rx_dispatch(struct iwl_op_mode *op_mode,
                                  struct iwl_rx_cmd_buffer *rxb,
                                  struct iwl_device_cmd *cmd);
-void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state);
-void iwl_nic_error(struct iwl_op_mode *op_mode);
 
 bool iwl_check_for_ct_kill(struct iwl_priv *priv);
 
@@ -103,6 +137,8 @@ int iwl_dvm_send_cmd_pdu(struct iwl_priv *priv, u8 id,
                          u32 flags, u16 len, const void *data);
 
 /* RXON */
+void iwl_connection_init_rx_config(struct iwl_priv *priv,
+                                   struct iwl_rxon_context *ctx);
 int iwlagn_set_pan_params(struct iwl_priv *priv);
 int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
 void iwlagn_set_rxon_chain(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
@@ -113,11 +149,15 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
                              u32 changes);
 void iwlagn_config_ht40(struct ieee80211_conf *conf,
                         struct iwl_rxon_context *ctx);
+void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_config *ht_conf);
+void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch,
+                         struct iwl_rxon_context *ctx);
+void iwl_set_flags_for_band(struct iwl_priv *priv,
+                            struct iwl_rxon_context *ctx,
+                            enum ieee80211_band band,
+                            struct ieee80211_vif *vif);
 
 /* uCode */
-int iwlagn_rx_calib_result(struct iwl_priv *priv,
-                            struct iwl_rx_cmd_buffer *rxb,
-                            struct iwl_device_cmd *cmd);
 int iwl_send_bt_env(struct iwl_priv *priv, u8 action, u8 type);
 void iwl_send_prio_tbl(struct iwl_priv *priv);
 int iwl_init_alive_start(struct iwl_priv *priv);
@@ -128,14 +168,25 @@ int iwl_send_calib_results(struct iwl_priv *priv);
 int iwl_calib_set(struct iwl_priv *priv,
                   const struct iwl_calib_hdr *cmd, int len);
 void iwl_calib_free_results(struct iwl_priv *priv);
+int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
+                            char **buf, bool display);
+int iwlagn_hw_valid_rtc_data_addr(u32 addr);
 
 /* lib */
 int iwlagn_send_tx_power(struct iwl_priv *priv);
 void iwlagn_temperature(struct iwl_priv *priv);
-u16 iwl_eeprom_calib_version(struct iwl_shared *shrd);
 int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control);
 void iwlagn_dev_txfifo_flush(struct iwl_priv *priv, u16 flush_control);
 int iwlagn_send_beacon_cmd(struct iwl_priv *priv);
+int iwl_send_statistics_request(struct iwl_priv *priv,
+                                u8 flags, bool clear);
+
+static inline const struct ieee80211_supported_band *iwl_get_hw_mode(
+                        struct iwl_priv *priv, enum ieee80211_band band)
+{
+        return priv->hw->wiphy->bands[band];
+}
+
 #ifdef CONFIG_PM_SLEEP
 int iwlagn_send_patterns(struct iwl_priv *priv,
                          struct cfg80211_wowlan *wowlan);
@@ -145,6 +196,7 @@ int iwlagn_suspend(struct iwl_priv *priv, struct cfg80211_wowlan *wowlan);
 /* rx */
 int iwlagn_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band);
 void iwl_setup_rx_handlers(struct iwl_priv *priv);
+void iwl_chswitch_done(struct iwl_priv *priv, bool is_success);
 
 
 /* tx */
@@ -189,6 +241,31 @@ u8 iwl_toggle_tx_ant(struct iwl_priv *priv, u8 ant_idx, u8 valid);
 /* scan */
 void iwlagn_post_scan(struct iwl_priv *priv);
 void iwlagn_disable_roc(struct iwl_priv *priv);
+int iwl_force_rf_reset(struct iwl_priv *priv, bool external);
+void iwl_init_scan_params(struct iwl_priv *priv);
+int iwl_scan_cancel(struct iwl_priv *priv);
+void iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms);
+void iwl_force_scan_end(struct iwl_priv *priv);
+void iwl_internal_short_hw_scan(struct iwl_priv *priv);
+void iwl_setup_rx_scan_handlers(struct iwl_priv *priv);
+void iwl_setup_scan_deferred_work(struct iwl_priv *priv);
+void iwl_cancel_scan_deferred_work(struct iwl_priv *priv);
+int __must_check iwl_scan_initiate(struct iwl_priv *priv,
+                                   struct ieee80211_vif *vif,
+                                   enum iwl_scan_type scan_type,
+                                   enum ieee80211_band band);
+
+/* For faster active scanning, scan will move to the next channel if fewer than
+ * PLCP_QUIET_THRESH packets are heard on this channel within
+ * ACTIVE_QUIET_TIME after sending probe request.  This shortens the dwell
+ * time if it's a quiet channel (nothing responded to our probe, and there's
+ * no other traffic).
+ * Disable "quiet" feature by setting PLCP_QUIET_THRESH to 0. */
+#define IWL_ACTIVE_QUIET_TIME       cpu_to_le16(10)  /* msec */
+#define IWL_PLCP_QUIET_THRESH       cpu_to_le16(1)  /* packets */
+
+#define IWL_SCAN_CHECK_WATCHDOG         (HZ * 7)
+
 
 /* bt coex */
 void iwlagn_send_advance_bt_config(struct iwl_priv *priv);
@@ -201,6 +278,12 @@ void iwlagn_bt_cancel_deferred_work(struct iwl_priv *priv);
 void iwlagn_bt_coex_rssi_monitor(struct iwl_priv *priv);
 void iwlagn_bt_adjust_rssi_monitor(struct iwl_priv *priv, bool rssi_ena);
 
+static inline bool iwl_advanced_bt_coexist(struct iwl_priv *priv)
+{
+        return priv->cfg->bt_params &&
+               priv->cfg->bt_params->advanced_bt_coexist;
+}
+
 #ifdef CONFIG_IWLWIFI_DEBUG
 const char *iwl_get_tx_fail_reason(u32 status);
 const char *iwl_get_agg_tx_fail_reason(u16 status);
@@ -239,8 +322,6 @@ void iwl_deactivate_station(struct iwl_priv *priv, const u8 sta_id,
 u8 iwl_prep_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
                     const u8 *addr, bool is_ap, struct ieee80211_sta *sta);
 
-void iwl_sta_fill_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
-                     u8 sta_id, struct iwl_link_quality_cmd *link_cmd);
 int iwl_send_lq_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
                     struct iwl_link_quality_cmd *lq, u8 flags, bool init);
 int iwl_add_sta_callback(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
@@ -248,6 +329,9 @@ int iwl_add_sta_callback(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
 int iwl_sta_update_ht(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
                       struct ieee80211_sta *sta);
 
+bool iwl_is_ht40_tx_allowed(struct iwl_priv *priv,
+                            struct iwl_rxon_context *ctx,
+                            struct ieee80211_sta_ht_cap *ht_cap);
 
 static inline int iwl_sta_id(struct ieee80211_sta *sta)
 {
@@ -305,9 +389,6 @@ static inline __le32 iwl_hw_set_rate_n_flags(u8 rate, u32 flags)
         return cpu_to_le32(flags|(u32)rate);
 }
 
-/* eeprom */
-void iwl_eeprom_get_mac(const struct iwl_shared *shrd, u8 *mac);
-
 extern int iwl_alive_start(struct iwl_priv *priv);
 /* svtool */
 #ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE
@@ -386,13 +467,35 @@ static inline int iwl_is_ready_rf(struct iwl_priv *priv)
         return iwl_is_ready(priv);
 }
 
+static inline void iwl_dvm_set_pmi(struct iwl_priv *priv, bool state)
+{
+        if (state)
+                set_bit(STATUS_POWER_PMI, &priv->status);
+        else
+                clear_bit(STATUS_POWER_PMI, &priv->status);
+        iwl_trans_set_pmi(priv->trans, state);
+}
+
+#ifdef CONFIG_IWLWIFI_DEBUGFS
+int iwl_dbgfs_register(struct iwl_priv *priv, const char *name);
+void iwl_dbgfs_unregister(struct iwl_priv *priv);
+#else
+static inline int iwl_dbgfs_register(struct iwl_priv *priv, const char *name)
+{
+        return 0;
+}
+static inline void iwl_dbgfs_unregister(struct iwl_priv *priv)
+{
+}
+#endif /* CONFIG_IWLWIFI_DEBUGFS */
+
 #ifdef CONFIG_IWLWIFI_DEBUG
 #define IWL_DEBUG_QUIET_RFKILL(m, fmt, args...) \
 do {                                                                    \
         if (!iwl_is_rfkill((m)))                                        \
                 IWL_ERR(m, fmt, ##args);                                \
         else                                                            \
-                __iwl_err(trans(m)->dev, true,                          \
+                __iwl_err((m)->dev, true,                               \
                           !iwl_have_debug_level(IWL_DL_RADIO),          \
                           fmt, ##args);                                 \
 } while (0)
@@ -402,8 +505,98 @@ do {									\
         if (!iwl_is_rfkill((m)))                                        \
                 IWL_ERR(m, fmt, ##args);                                \
         else                                                            \
-                __iwl_err(trans(m)->dev, true, true, fmt, ##args);      \
+                __iwl_err((m)->dev, true, true, fmt, ##args);   \
 } while (0)
 #endif                          /* CONFIG_IWLWIFI_DEBUG */
 
+extern const char *iwl_dvm_cmd_strings[REPLY_MAX];
+
+static inline const char *iwl_dvm_get_cmd_string(u8 cmd)
+{
+        const char *s = iwl_dvm_cmd_strings[cmd];
+        if (s)
+                return s;
+        return "UNKNOWN";
+}
+
+/* API method exported for mvm hybrid state */
+void iwl_setup_deferred_work(struct iwl_priv *priv);
+int iwl_send_wimax_coex(struct iwl_priv *priv);
+int iwl_send_bt_env(struct iwl_priv *priv, u8 action, u8 type);
+void iwl_option_config(struct iwl_priv *priv);
+void iwl_set_hw_params(struct iwl_priv *priv);
+void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags);
+int iwl_init_drv(struct iwl_priv *priv);
+void iwl_uninit_drv(struct iwl_priv *priv);
+void iwl_send_bt_config(struct iwl_priv *priv);
+void iwl_rf_kill_ct_config(struct iwl_priv *priv);
+int iwl_setup_interface(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
+void iwl_teardown_interface(struct iwl_priv *priv,
+                            struct ieee80211_vif *vif,
+                            bool mode_change);
+int iwl_full_rxon_required(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
+void iwlagn_update_qos(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
+void iwlagn_check_needed_chains(struct iwl_priv *priv,
+                                struct iwl_rxon_context *ctx,
+                                struct ieee80211_bss_conf *bss_conf);
+void iwlagn_chain_noise_reset(struct iwl_priv *priv);
+int iwlagn_update_beacon(struct iwl_priv *priv,
+                         struct ieee80211_vif *vif);
+void iwl_tt_handler(struct iwl_priv *priv);
+void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode);
+void iwl_stop_sw_queue(struct iwl_op_mode *op_mode, int queue);
+void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state);
+void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb);
+void iwl_nic_error(struct iwl_op_mode *op_mode);
+void iwl_cmd_queue_full(struct iwl_op_mode *op_mode);
+void iwl_nic_config(struct iwl_op_mode *op_mode);
+int iwlagn_mac_set_tim(struct ieee80211_hw *hw,
+                       struct ieee80211_sta *sta, bool set);
+void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,
+                              enum ieee80211_rssi_event rssi_event);
+int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw);
+int iwlagn_mac_tx_last_beacon(struct ieee80211_hw *hw);
+void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop);
+void iwl_wake_sw_queue(struct iwl_op_mode *op_mode, int queue);
+void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
+                               struct ieee80211_channel_switch *ch_switch);
+int iwlagn_mac_sta_state(struct ieee80211_hw *hw,
+                         struct ieee80211_vif *vif,
+                         struct ieee80211_sta *sta,
+                         enum ieee80211_sta_state old_state,
+                         enum ieee80211_sta_state new_state);
+int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
+                            struct ieee80211_vif *vif,
+                            enum ieee80211_ampdu_mlme_action action,
+                            struct ieee80211_sta *sta, u16 tid, u16 *ssn,
+                            u8 buf_size);
+int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,
+                       struct ieee80211_vif *vif,
+                       struct cfg80211_scan_request *req);
+void iwlagn_mac_sta_notify(struct ieee80211_hw *hw,
+                           struct ieee80211_vif *vif,
+                           enum sta_notify_cmd cmd,
+                           struct ieee80211_sta *sta);
+void iwlagn_configure_filter(struct ieee80211_hw *hw,
+                             unsigned int changed_flags,
+                             unsigned int *total_flags,
+                             u64 multicast);
+int iwlagn_mac_conf_tx(struct ieee80211_hw *hw,
+                       struct ieee80211_vif *vif, u16 queue,
+                       const struct ieee80211_tx_queue_params *params);
+void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw,
+                               struct ieee80211_vif *vif,
+                               struct cfg80211_gtk_rekey_data *data);
+void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,
+                                struct ieee80211_vif *vif,
+                                struct ieee80211_key_conf *keyconf,
+                                struct ieee80211_sta *sta,
+                                u32 iv32, u16 *phase1key);
+int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
+                       struct ieee80211_vif *vif,
+                       struct ieee80211_sta *sta,
+                       struct ieee80211_key_conf *key);
+void iwlagn_mac_stop(struct ieee80211_hw *hw);
+void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb);
+int iwlagn_mac_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan);
 #endif /* __iwl_agn_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index 9ed73e5154be..83a6930f3658 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -1877,9 +1877,16 @@ struct iwl_bt_cmd {
 
 #define IWLAGN_BT3_T7_DEFAULT           1
 
+enum iwl_bt_kill_idx {
+        IWL_BT_KILL_DEFAULT = 0,
+        IWL_BT_KILL_OVERRIDE = 1,
+        IWL_BT_KILL_REDUCE = 2,
+};
+
 #define IWLAGN_BT_KILL_ACK_MASK_DEFAULT cpu_to_le32(0xffff0000)
 #define IWLAGN_BT_KILL_CTS_MASK_DEFAULT cpu_to_le32(0xffff0000)
 #define IWLAGN_BT_KILL_ACK_CTS_MASK_SCO cpu_to_le32(0xffffffff)
+#define IWLAGN_BT_KILL_ACK_CTS_MASK_REDUCE      cpu_to_le32(0)
 
 #define IWLAGN_BT3_PRIO_SAMPLE_DEFAULT  2
 
@@ -1891,7 +1898,7 @@ struct iwl_bt_cmd {
 #define IWLAGN_BT_VALID_3W_TIMERS       cpu_to_le16(BIT(3))
 #define IWLAGN_BT_VALID_KILL_ACK_MASK   cpu_to_le16(BIT(4))
 #define IWLAGN_BT_VALID_KILL_CTS_MASK   cpu_to_le16(BIT(5))
-#define IWLAGN_BT_VALID_BT4_TIMES       cpu_to_le16(BIT(6))
+#define IWLAGN_BT_VALID_REDUCED_TX_PWR  cpu_to_le16(BIT(6))
 #define IWLAGN_BT_VALID_3W_LUT          cpu_to_le16(BIT(7))
 
 #define IWLAGN_BT_ALL_VALID_MSK         (IWLAGN_BT_VALID_ENABLE_FLAGS | \
@@ -1900,9 +1907,11 @@ struct iwl_bt_cmd {
                                         IWLAGN_BT_VALID_3W_TIMERS | \
                                         IWLAGN_BT_VALID_KILL_ACK_MASK | \
                                         IWLAGN_BT_VALID_KILL_CTS_MASK | \
-                                        IWLAGN_BT_VALID_BT4_TIMES | \
+                                        IWLAGN_BT_VALID_REDUCED_TX_PWR | \
                                         IWLAGN_BT_VALID_3W_LUT)
 
+#define IWLAGN_BT_DECISION_LUT_SIZE     12
+
 struct iwl_basic_bt_cmd {
         u8 flags;
         u8 ledtime; /* unused */
@@ -1913,12 +1922,13 @@ struct iwl_basic_bt_cmd {
         u8 bt3_prio_sample_time;
         u8 bt3_timer_t2_value;
         __le16 bt4_reaction_time; /* unused */
-        __le32 bt3_lookup_table[12];
-        __le16 bt4_decision_time; /* unused */
+        __le32 bt3_lookup_table[IWLAGN_BT_DECISION_LUT_SIZE];
+        u8 reduce_txpower;
+        u8 reserved;
         __le16 valid;
 };
 
-struct iwl6000_bt_cmd {
+struct iwl_bt_cmd_v1 {
         struct iwl_basic_bt_cmd basic;
         u8 prio_boost;
         /*
@@ -1929,7 +1939,7 @@ struct iwl6000_bt_cmd {
         __le16 rx_prio_boost;   /* SW boost of WiFi rx priority */
 };
 
-struct iwl2000_bt_cmd {
+struct iwl_bt_cmd_v2 {
         struct iwl_basic_bt_cmd basic;
         __le32 prio_boost;
         /*
@@ -3634,6 +3644,9 @@ enum iwl_bt_coex_profile_traffic_load {
                 (0x3<<BT_UART_MSG_2_FRAME7RESERVED_POS)
 
 
+#define BT_ENABLE_REDUCED_TXPOWER_THRESHOLD     (-62)
+#define BT_DISABLE_REDUCED_TXPOWER_THRESHOLD    (-65)
+
 struct iwl_bt_uart_msg {
         u8 header;
         u8 frame1;
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-config.h
index b515d657a0ad..67b28aa7f9be 100644
--- a/drivers/net/wireless/iwlwifi/iwl-shared.h
+++ b/drivers/net/wireless/iwlwifi/iwl-config.h
@@ -60,136 +60,29 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *****************************************************************************/
-#ifndef __iwl_shared_h__
-#define __iwl_shared_h__
+#ifndef __IWL_CONFIG_H__
+#define __IWL_CONFIG_H__
 
 #include <linux/types.h>
-#include <linux/spinlock.h>
-#include <linux/gfp.h>
 #include <net/mac80211.h>
 
-#include "iwl-commands.h"
-#include "iwl-fw.h"
 
-/**
- * DOC: shared area - role and goal
- *
- * The shared area contains all the data exported by the upper layer to the
- * other layers. Since the bus and transport layer shouldn't dereference
- * iwl_priv, all the data needed by the upper layer and the transport / bus
- * layer must be here.
- * The shared area also holds pointer to all the other layers. This allows a
- * layer to call a function from another layer.
- *
- * NOTE: All the layers hold a pointer to the shared area which must be shrd.
- *      A few macros assume that (_m)->shrd points to the shared area no matter
- *      what _m is.
- *
- * gets notifications about enumeration, suspend, resume.
- * For the moment, the bus layer is not a linux kernel module as itself, and
- * the module_init function of the driver must call the bus specific
- * registration functions. These functions are listed at the end of this file.
- * For the moment, there is only one implementation of this interface: PCI-e.
- * This implementation is iwl-pci.c
- */
-
-struct iwl_priv;
-struct iwl_trans;
-struct iwl_sensitivity_ranges;
-struct iwl_trans_ops;
-
-#define DRV_NAME        "iwlwifi"
-#define IWLWIFI_VERSION "in-tree:"
-#define DRV_COPYRIGHT   "Copyright(c) 2003-2012 Intel Corporation"
-#define DRV_AUTHOR     "<ilw@linux.intel.com>"
-
-extern struct iwl_mod_params iwlagn_mod_params;
-
-#define IWL_DISABLE_HT_ALL      BIT(0)
-#define IWL_DISABLE_HT_TXAGG    BIT(1)
-#define IWL_DISABLE_HT_RXAGG    BIT(2)
-
-/**
- * struct iwl_mod_params
- *
- * Holds the module parameters
- *
- * @sw_crypto: using hardware encryption, default = 0
- * @disable_11n: disable 11n capabilities, default = 0,
- *      use IWL_DISABLE_HT_* constants
- * @amsdu_size_8K: enable 8K amsdu size, default = 1
- * @antenna: both antennas (use diversity), default = 0
- * @restart_fw: restart firmware, default = 1
- * @plcp_check: enable plcp health check, default = true
- * @ack_check: disable ack health check, default = false
- * @wd_disable: enable stuck queue check, default = 0
- * @bt_coex_active: enable bt coex, default = true
- * @led_mode: system default, default = 0
- * @no_sleep_autoadjust: disable autoadjust, default = true
- * @power_save: disable power save, default = false
- * @power_level: power level, default = 1
- * @debug_level: levels are IWL_DL_*
- * @ant_coupling: antenna coupling in dB, default = 0
- * @bt_ch_announce: BT channel inhibition, default = enable
- * @wanted_ucode_alternative: ucode alternative to use, default = 1
- * @auto_agg: enable agg. without check, default = true
- */
-struct iwl_mod_params {
-        int sw_crypto;
-        unsigned int disable_11n;
-        int amsdu_size_8K;
-        int antenna;
-        int restart_fw;
-        bool plcp_check;
-        bool ack_check;
-        int  wd_disable;
-        bool bt_coex_active;
-        int led_mode;
-        bool no_sleep_autoadjust;
-        bool power_save;
-        int power_level;
-        u32 debug_level;
-        int ant_coupling;
-        bool bt_ch_announce;
-        int wanted_ucode_alternative;
-        bool auto_agg;
-};
-
-/**
- * struct iwl_hw_params
- *
- * Holds the module parameters
- *
- * @num_ampdu_queues: num of ampdu queues
- * @tx_chains_num: Number of TX chains
- * @rx_chains_num: Number of RX chains
- * @valid_tx_ant: usable antennas for TX
- * @valid_rx_ant: usable antennas for RX
- * @ht40_channel: is 40MHz width possible: BIT(IEEE80211_BAND_XXX)
- * @sku: sku read from EEPROM
- * @rx_page_order: Rx buffer page order
- * @ct_kill_threshold: temperature threshold - in hw dependent unit
- * @ct_kill_exit_threshold: when to reeable the device - in hw dependent unit
- *      relevant for 1000, 6000 and up
- * @wd_timeout: TX queues watchdog timeout
- * @struct iwl_sensitivity_ranges: range of sensitivity values
- * @use_rts_for_aggregation: use rts/cts protection for HT traffic
- */
-struct iwl_hw_params {
-        u8  num_ampdu_queues;
-        u8  tx_chains_num;
-        u8  rx_chains_num;
-        u8  valid_tx_ant;
-        u8  valid_rx_ant;
-        u8  ht40_channel;
-        bool use_rts_for_aggregation;
-        u16 sku;
-        u32 rx_page_order;
-        u32 ct_kill_threshold;
-        u32 ct_kill_exit_threshold;
-        unsigned int wd_timeout;
-
-        const struct iwl_sensitivity_ranges *sens;
+enum iwl_device_family {
+        IWL_DEVICE_FAMILY_UNDEFINED,
+        IWL_DEVICE_FAMILY_1000,
+        IWL_DEVICE_FAMILY_100,
+        IWL_DEVICE_FAMILY_2000,
+        IWL_DEVICE_FAMILY_2030,
+        IWL_DEVICE_FAMILY_105,
+        IWL_DEVICE_FAMILY_135,
+        IWL_DEVICE_FAMILY_5000,
+        IWL_DEVICE_FAMILY_5150,
+        IWL_DEVICE_FAMILY_6000,
+        IWL_DEVICE_FAMILY_6000i,
+        IWL_DEVICE_FAMILY_6005,
+        IWL_DEVICE_FAMILY_6030,
+        IWL_DEVICE_FAMILY_6050,
+        IWL_DEVICE_FAMILY_6150,
 };
 
 /*
@@ -209,6 +102,34 @@ enum iwl_led_mode {
 };
 
 /*
+ * This is the threshold value of plcp error rate per 100mSecs.  It is
+ * used to set and check for the validity of plcp_delta.
+ */
+#define IWL_MAX_PLCP_ERR_THRESHOLD_MIN          1
+#define IWL_MAX_PLCP_ERR_THRESHOLD_DEF          50
+#define IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF     100
+#define IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF 200
+#define IWL_MAX_PLCP_ERR_THRESHOLD_MAX          255
+#define IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE      0
+
+/* TX queue watchdog timeouts in mSecs */
+#define IWL_WATCHHDOG_DISABLED  0
+#define IWL_DEF_WD_TIMEOUT      2000
+#define IWL_LONG_WD_TIMEOUT     10000
+#define IWL_MAX_WD_TIMEOUT      120000
+
+/* Antenna presence definitions */
+#define ANT_NONE        0x0
+#define ANT_A           BIT(0)
+#define ANT_B           BIT(1)
+#define ANT_C           BIT(2)
+#define ANT_AB          (ANT_A | ANT_B)
+#define ANT_AC          (ANT_A | ANT_C)
+#define ANT_BC          (ANT_B | ANT_C)
+#define ANT_ABC         (ANT_A | ANT_B | ANT_C)
+
+
+/*
  * @max_ll_items: max number of OTP blocks
  * @shadow_ram_support: shadow support for OTP memory
  * @led_compensation: compensate on the led on/off time per HW according
@@ -217,7 +138,6 @@ enum iwl_led_mode {
  * @chain_noise_num_beacons: number of beacons used to compute chain noise
  * @adv_thermal_throttle: support advance thermal throttle
  * @support_ct_kill_exit: support ct kill exit condition
- * @support_wimax_coexist: support wimax/wifi co-exist
  * @plcp_delta_threshold: plcp error rate threshold used to trigger
  *      radio tuning when there is a high receiving plcp error rate
  * @chain_noise_scale: default chain noise scale used for gain computation
@@ -226,12 +146,10 @@ enum iwl_led_mode {
  * @shadow_reg_enable: HW shadhow register bit
  * @hd_v2: v2 of enhanced sensitivity value, used for 2000 series and up
  * @no_idle_support: do not support idle mode
- * wd_disable: disable watchdog timer
  */
 struct iwl_base_params {
         int eeprom_size;
         int num_of_queues;      /* def: HW dependent */
-        int num_of_ampdu_queues;/* def: HW dependent */
         /* for iwl_apm_init() */
         u32 pll_cfg_val;
 
@@ -240,7 +158,6 @@ struct iwl_base_params {
         u16 led_compensation;
         bool adv_thermal_throttle;
         bool support_ct_kill_exit;
-        const bool support_wimax_coexist;
         u8 plcp_delta_threshold;
         s32 chain_noise_scale;
         unsigned int wd_timeout;
@@ -248,7 +165,6 @@ struct iwl_base_params {
         const bool shadow_reg_enable;
         const bool hd_v2;
         const bool no_idle_support;
-        const bool wd_disable;
 };
 
 /*
@@ -292,28 +208,21 @@ struct iwl_ht_params {
  * @eeprom_ver: EEPROM version
  * @eeprom_calib_ver: EEPROM calibration version
  * @lib: pointer to the lib ops
- * @additional_nic_config: additional nic configuration
  * @base_params: pointer to basic parameters
  * @ht_params: point to ht patameters
  * @bt_params: pointer to bt parameters
  * @need_temp_offset_calib: need to perform temperature offset calibration
  * @no_xtal_calib: some devices do not need crystal calibration data,
  *      don't send it to those
- * @scan_rx_antennas: available antenna for scan operation
  * @led_mode: 0=blinking, 1=On(RF On)/Off(RF Off)
  * @adv_pm: advance power management
  * @rx_with_siso_diversity: 1x1 device with rx antenna diversity
  * @internal_wimax_coex: internal wifi/wimax combo device
- * @iq_invert: I/Q inversion
  * @temp_offset_v2: support v2 of temperature offset calibration
  *
- * We enable the driver to be backward compatible wrt API version. The
- * driver specifies which APIs it supports (with @ucode_api_max being the
- * highest and @ucode_api_min the lowest). Firmware will only be loaded if
- * it has a supported API version.
- *
- * The ideal usage of this infrastructure is to treat a new ucode API
- * release as a new hardware revision.
+ * We enable the driver to be backward compatible wrt. hardware features.
+ * API differences in uCode shouldn't be handled here but through TLVs
+ * and/or the uCode API version instead.
  */
 struct iwl_cfg {
         /* params specific to an individual device within a device family */
@@ -322,14 +231,13 @@ struct iwl_cfg {
         const unsigned int ucode_api_max;
         const unsigned int ucode_api_ok;
         const unsigned int ucode_api_min;
+        const enum iwl_device_family device_family;
         const u32 max_data_size;
         const u32 max_inst_size;
         u8   valid_tx_ant;
         u8   valid_rx_ant;
         u16  eeprom_ver;
         u16  eeprom_calib_ver;
-        const struct iwl_lib_ops *lib;
-        void (*additional_nic_config)(struct iwl_priv *priv);
         /* params not likely to change within a device family */
         const struct iwl_base_params *base_params;
         /* params likely to change within a device family */
@@ -337,99 +245,11 @@ struct iwl_cfg {
         const struct iwl_bt_params *bt_params;
         const bool need_temp_offset_calib; /* if used set to true */
         const bool no_xtal_calib;
-        u8 scan_rx_antennas[IEEE80211_NUM_BANDS];
         enum iwl_led_mode led_mode;
         const bool adv_pm;
         const bool rx_with_siso_diversity;
         const bool internal_wimax_coex;
-        const bool iq_invert;
         const bool temp_offset_v2;
 };
 
-/**
- * struct iwl_shared - shared fields for all the layers of the driver
- *
- * @status: STATUS_*
- * @wowlan: are we running wowlan uCode
- * @valid_contexts: microcode/device supports multiple contexts
- * @bus: pointer to the bus layer data
- * @cfg: see struct iwl_cfg
- * @priv: pointer to the upper layer data
- * @trans: pointer to the transport layer data
- * @nic: pointer to the nic data
- * @hw_params: see struct iwl_hw_params
- * @lock: protect general shared data
- * @eeprom: pointer to the eeprom/OTP image
- * @ucode_type: indicator of loaded ucode image
- * @device_pointers: pointers to ucode event tables
- */
-struct iwl_shared {
-        unsigned long status;
-        u8 valid_contexts;
-
-        const struct iwl_cfg *cfg;
-        struct iwl_trans *trans;
-        void *drv;
-        struct iwl_hw_params hw_params;
-        const struct iwl_fw *fw;
-
-        /* eeprom -- this is in the card's little endian byte order */
-        u8 *eeprom;
-
-        /* ucode related variables */
-        enum iwl_ucode_type ucode_type;
-
-        struct {
-                u32 error_event_table;
-                u32 log_event_table;
-        } device_pointers;
-
-};
-
-/*Whatever _m is (iwl_trans, iwl_priv, these macros will work */
-#define cfg(_m)         ((_m)->shrd->cfg)
-#define trans(_m)       ((_m)->shrd->trans)
-#define hw_params(_m)   ((_m)->shrd->hw_params)
-
-static inline bool iwl_have_debug_level(u32 level)
-{
-        return iwlagn_mod_params.debug_level & level;
-}
-
-enum iwl_rxon_context_id {
-        IWL_RXON_CTX_BSS,
-        IWL_RXON_CTX_PAN,
-
-        NUM_IWL_RXON_CTX
-};
-
-int iwlagn_hw_valid_rtc_data_addr(u32 addr);
-const char *get_cmd_string(u8 cmd);
-
-#define IWL_CMD(x) case x: return #x
-
-/*****************************************************
-* DRIVER STATUS FUNCTIONS
-******************************************************/
-#define STATUS_HCMD_ACTIVE      0       /* host command in progress */
-/* 1 is unused (used to be STATUS_HCMD_SYNC_ACTIVE) */
-#define STATUS_INT_ENABLED      2
-#define STATUS_RF_KILL_HW       3
-#define STATUS_CT_KILL          4
-#define STATUS_INIT             5
-#define STATUS_ALIVE            6
-#define STATUS_READY            7
-#define STATUS_TEMPERATURE      8
-#define STATUS_GEO_CONFIGURED   9
-#define STATUS_EXIT_PENDING     10
-#define STATUS_STATISTICS       12
-#define STATUS_SCANNING         13
-#define STATUS_SCAN_ABORTING    14
-#define STATUS_SCAN_HW          15
-#define STATUS_POWER_PMI        16
-#define STATUS_FW_ERROR         17
-#define STATUS_DEVICE_ENABLED   18
-#define STATUS_CHANNEL_SWITCH_PENDING 19
-#define STATUS_SCAN_COMPLETE    20
-
-#endif /* #__iwl_shared_h__ */
+#endif /* __IWL_CONFIG_H__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
deleted file mode 100644
index 46490d3b95b9..000000000000
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ /dev/null
@@ -1,1480 +0,0 @@
-/******************************************************************************
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
- * USA
- *
- * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
- *
- * Contact Information:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *****************************************************************************/
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/etherdevice.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <net/mac80211.h>
-
-#include "iwl-eeprom.h"
-#include "iwl-debug.h"
-#include "iwl-core.h"
-#include "iwl-io.h"
-#include "iwl-power.h"
-#include "iwl-shared.h"
-#include "iwl-agn.h"
-#include "iwl-trans.h"
-
-const u8 iwl_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-
-#define MAX_BIT_RATE_40_MHZ 150 /* Mbps */
-#define MAX_BIT_RATE_20_MHZ 72 /* Mbps */
-static void iwl_init_ht_hw_capab(const struct iwl_priv *priv,
-                              struct ieee80211_sta_ht_cap *ht_info,
-                              enum ieee80211_band band)
-{
-        u16 max_bit_rate = 0;
-        u8 rx_chains_num = hw_params(priv).rx_chains_num;
-        u8 tx_chains_num = hw_params(priv).tx_chains_num;
-
-        ht_info->cap = 0;
-        memset(&ht_info->mcs, 0, sizeof(ht_info->mcs));
-
-        ht_info->ht_supported = true;
-
-        if (cfg(priv)->ht_params &&
-            cfg(priv)->ht_params->ht_greenfield_support)
-                ht_info->cap |= IEEE80211_HT_CAP_GRN_FLD;
-        ht_info->cap |= IEEE80211_HT_CAP_SGI_20;
-        max_bit_rate = MAX_BIT_RATE_20_MHZ;
-        if (hw_params(priv).ht40_channel & BIT(band)) {
-                ht_info->cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;
-                ht_info->cap |= IEEE80211_HT_CAP_SGI_40;
-                ht_info->mcs.rx_mask[4] = 0x01;
-                max_bit_rate = MAX_BIT_RATE_40_MHZ;
-        }
-
-        if (iwlagn_mod_params.amsdu_size_8K)
-                ht_info->cap |= IEEE80211_HT_CAP_MAX_AMSDU;
-
-        ht_info->ampdu_factor = CFG_HT_RX_AMPDU_FACTOR_DEF;
-        ht_info->ampdu_density = CFG_HT_MPDU_DENSITY_DEF;
-
-        ht_info->mcs.rx_mask[0] = 0xFF;
-        if (rx_chains_num >= 2)
-                ht_info->mcs.rx_mask[1] = 0xFF;
-        if (rx_chains_num >= 3)
-                ht_info->mcs.rx_mask[2] = 0xFF;
-
-        /* Highest supported Rx data rate */
-        max_bit_rate *= rx_chains_num;
-        WARN_ON(max_bit_rate & ~IEEE80211_HT_MCS_RX_HIGHEST_MASK);
-        ht_info->mcs.rx_highest = cpu_to_le16(max_bit_rate);
-
-        /* Tx MCS capabilities */
-        ht_info->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
-        if (tx_chains_num != rx_chains_num) {
-                ht_info->mcs.tx_params |= IEEE80211_HT_MCS_TX_RX_DIFF;
-                ht_info->mcs.tx_params |= ((tx_chains_num - 1) <<
-                                IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT);
-        }
-}
-
-/**
- * iwl_init_geos - Initialize mac80211's geo/channel info based from eeprom
- */
-int iwl_init_geos(struct iwl_priv *priv)
-{
-        struct iwl_channel_info *ch;
-        struct ieee80211_supported_band *sband;
-        struct ieee80211_channel *channels;
-        struct ieee80211_channel *geo_ch;
-        struct ieee80211_rate *rates;
-        int i = 0;
-        s8 max_tx_power = IWLAGN_TX_POWER_TARGET_POWER_MIN;
-
-        if (priv->bands[IEEE80211_BAND_2GHZ].n_bitrates ||
-            priv->bands[IEEE80211_BAND_5GHZ].n_bitrates) {
-                IWL_DEBUG_INFO(priv, "Geography modes already initialized.\n");
-                set_bit(STATUS_GEO_CONFIGURED, &priv->status);
-                return 0;
-        }
-
-        channels = kcalloc(priv->channel_count,
-                           sizeof(struct ieee80211_channel), GFP_KERNEL);
-        if (!channels)
-                return -ENOMEM;
-
-        rates = kcalloc(IWL_RATE_COUNT_LEGACY, sizeof(struct ieee80211_rate),
-                        GFP_KERNEL);
-        if (!rates) {
-                kfree(channels);
-                return -ENOMEM;
-        }
-
-        /* 5.2GHz channels start after the 2.4GHz channels */
-        sband = &priv->bands[IEEE80211_BAND_5GHZ];
-        sband->channels = &channels[ARRAY_SIZE(iwl_eeprom_band_1)];
-        /* just OFDM */
-        sband->bitrates = &rates[IWL_FIRST_OFDM_RATE];
-        sband->n_bitrates = IWL_RATE_COUNT_LEGACY - IWL_FIRST_OFDM_RATE;
-
-        if (hw_params(priv).sku & EEPROM_SKU_CAP_11N_ENABLE)
-                iwl_init_ht_hw_capab(priv, &sband->ht_cap,
-                                         IEEE80211_BAND_5GHZ);
-
-        sband = &priv->bands[IEEE80211_BAND_2GHZ];
-        sband->channels = channels;
-        /* OFDM & CCK */
-        sband->bitrates = rates;
-        sband->n_bitrates = IWL_RATE_COUNT_LEGACY;
-
-        if (hw_params(priv).sku & EEPROM_SKU_CAP_11N_ENABLE)
-                iwl_init_ht_hw_capab(priv, &sband->ht_cap,
-                                         IEEE80211_BAND_2GHZ);
-
-        priv->ieee_channels = channels;
-        priv->ieee_rates = rates;
-
-        for (i = 0;  i < priv->channel_count; i++) {
-                ch = &priv->channel_info[i];
-
-                /* FIXME: might be removed if scan is OK */
-                if (!is_channel_valid(ch))
-                        continue;
-
-                sband =  &priv->bands[ch->band];
-
-                geo_ch = &sband->channels[sband->n_channels++];
-
-                geo_ch->center_freq =
-                        ieee80211_channel_to_frequency(ch->channel, ch->band);
-                geo_ch->max_power = ch->max_power_avg;
-                geo_ch->max_antenna_gain = 0xff;
-                geo_ch->hw_value = ch->channel;
-
-                if (is_channel_valid(ch)) {
-                        if (!(ch->flags & EEPROM_CHANNEL_IBSS))
-                                geo_ch->flags |= IEEE80211_CHAN_NO_IBSS;
-
-                        if (!(ch->flags & EEPROM_CHANNEL_ACTIVE))
-                                geo_ch->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
-
-                        if (ch->flags & EEPROM_CHANNEL_RADAR)
-                                geo_ch->flags |= IEEE80211_CHAN_RADAR;
-
-                        geo_ch->flags |= ch->ht40_extension_channel;
-
-                        if (ch->max_power_avg > max_tx_power)
-                                max_tx_power = ch->max_power_avg;
-                } else {
-                        geo_ch->flags |= IEEE80211_CHAN_DISABLED;
-                }
-
-                IWL_DEBUG_INFO(priv, "Channel %d Freq=%d[%sGHz] %s flag=0x%X\n",
-                                ch->channel, geo_ch->center_freq,
-                                is_channel_a_band(ch) ?  "5.2" : "2.4",
-                                geo_ch->flags & IEEE80211_CHAN_DISABLED ?
-                                "restricted" : "valid",
-                                 geo_ch->flags);
-        }
-
-        priv->tx_power_device_lmt = max_tx_power;
-        priv->tx_power_user_lmt = max_tx_power;
-        priv->tx_power_next = max_tx_power;
-
-        if ((priv->bands[IEEE80211_BAND_5GHZ].n_channels == 0) &&
-             hw_params(priv).sku & EEPROM_SKU_CAP_BAND_52GHZ) {
-                IWL_INFO(priv, "Incorrectly detected BG card as ABG. "
-                        "Please send your %s to maintainer.\n",
-                        trans(priv)->hw_id_str);
-                hw_params(priv).sku &= ~EEPROM_SKU_CAP_BAND_52GHZ;
-        }
-
-        IWL_INFO(priv, "Tunable channels: %d 802.11bg, %d 802.11a channels\n",
-                   priv->bands[IEEE80211_BAND_2GHZ].n_channels,
-                   priv->bands[IEEE80211_BAND_5GHZ].n_channels);
-
-        set_bit(STATUS_GEO_CONFIGURED, &priv->status);
-
-        return 0;
-}
-
-/*
- * iwl_free_geos - undo allocations in iwl_init_geos
- */
-void iwl_free_geos(struct iwl_priv *priv)
-{
-        kfree(priv->ieee_channels);
-        kfree(priv->ieee_rates);
-        clear_bit(STATUS_GEO_CONFIGURED, &priv->status);
-}
-
-static bool iwl_is_channel_extension(struct iwl_priv *priv,
-                                     enum ieee80211_band band,
-                                     u16 channel, u8 extension_chan_offset)
-{
-        const struct iwl_channel_info *ch_info;
-
-        ch_info = iwl_get_channel_info(priv, band, channel);
-        if (!is_channel_valid(ch_info))
-                return false;
-
-        if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_ABOVE)
-                return !(ch_info->ht40_extension_channel &
-                                        IEEE80211_CHAN_NO_HT40PLUS);
-        else if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_BELOW)
-                return !(ch_info->ht40_extension_channel &
-                                        IEEE80211_CHAN_NO_HT40MINUS);
-
-        return false;
-}
-
-bool iwl_is_ht40_tx_allowed(struct iwl_priv *priv,
-                            struct iwl_rxon_context *ctx,
-                            struct ieee80211_sta_ht_cap *ht_cap)
-{
-        if (!ctx->ht.enabled || !ctx->ht.is_40mhz)
-                return false;
-
-        /*
-         * We do not check for IEEE80211_HT_CAP_SUP_WIDTH_20_40
-         * the bit will not set if it is pure 40MHz case
-         */
-        if (ht_cap && !ht_cap->ht_supported)
-                return false;
-
-#ifdef CONFIG_IWLWIFI_DEBUGFS
-        if (priv->disable_ht40)
-                return false;
-#endif
-
-        return iwl_is_channel_extension(priv, priv->band,
-                        le16_to_cpu(ctx->staging.channel),
-                        ctx->ht.extension_chan_offset);
-}
-
-static u16 iwl_adjust_beacon_interval(u16 beacon_val, u16 max_beacon_val)
-{
-        u16 new_val;
-        u16 beacon_factor;
-
-        /*
-         * If mac80211 hasn't given us a beacon interval, program
-         * the default into the device (not checking this here
-         * would cause the adjustment below to return the maximum
-         * value, which may break PAN.)
-         */
-        if (!beacon_val)
-                return DEFAULT_BEACON_INTERVAL;
-
-        /*
-         * If the beacon interval we obtained from the peer
-         * is too large, we'll have to wake up more often
-         * (and in IBSS case, we'll beacon too much)
-         *
-         * For example, if max_beacon_val is 4096, and the
-         * requested beacon interval is 7000, we'll have to
-         * use 3500 to be able to wake up on the beacons.
-         *
-         * This could badly influence beacon detection stats.
-         */
-
-        beacon_factor = (beacon_val + max_beacon_val) / max_beacon_val;
-        new_val = beacon_val / beacon_factor;
-
-        if (!new_val)
-                new_val = max_beacon_val;
-
-        return new_val;
-}
-
-int iwl_send_rxon_timing(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
-{
-        u64 tsf;
-        s32 interval_tm, rem;
-        struct ieee80211_conf *conf = NULL;
-        u16 beacon_int;
-        struct ieee80211_vif *vif = ctx->vif;
-
-        conf = &priv->hw->conf;
-
-        lockdep_assert_held(&priv->mutex);
-
-        memset(&ctx->timing, 0, sizeof(struct iwl_rxon_time_cmd));
-
-        ctx->timing.timestamp = cpu_to_le64(priv->timestamp);
-        ctx->timing.listen_interval = cpu_to_le16(conf->listen_interval);
-
-        beacon_int = vif ? vif->bss_conf.beacon_int : 0;
-
-        /*
-         * TODO: For IBSS we need to get atim_window from mac80211,
-         *       for now just always use 0
-         */
-        ctx->timing.atim_window = 0;
-
-        if (ctx->ctxid == IWL_RXON_CTX_PAN &&
-            (!ctx->vif || ctx->vif->type != NL80211_IFTYPE_STATION) &&
-            iwl_is_associated(priv, IWL_RXON_CTX_BSS) &&
-            priv->contexts[IWL_RXON_CTX_BSS].vif &&
-            priv->contexts[IWL_RXON_CTX_BSS].vif->bss_conf.beacon_int) {
-                ctx->timing.beacon_interval =
-                        priv->contexts[IWL_RXON_CTX_BSS].timing.beacon_interval;
-                beacon_int = le16_to_cpu(ctx->timing.beacon_interval);
-        } else if (ctx->ctxid == IWL_RXON_CTX_BSS &&
-                   iwl_is_associated(priv, IWL_RXON_CTX_PAN) &&
-                   priv->contexts[IWL_RXON_CTX_PAN].vif &&
-                   priv->contexts[IWL_RXON_CTX_PAN].vif->bss_conf.beacon_int &&
-                   (!iwl_is_associated_ctx(ctx) || !ctx->vif ||
-                    !ctx->vif->bss_conf.beacon_int)) {
-                ctx->timing.beacon_interval =
-                        priv->contexts[IWL_RXON_CTX_PAN].timing.beacon_interval;
-                beacon_int = le16_to_cpu(ctx->timing.beacon_interval);
-        } else {
-                beacon_int = iwl_adjust_beacon_interval(beacon_int,
-                        IWL_MAX_UCODE_BEACON_INTERVAL * TIME_UNIT);
-                ctx->timing.beacon_interval = cpu_to_le16(beacon_int);
-        }
-
-        ctx->beacon_int = beacon_int;
-
-        tsf = priv->timestamp; /* tsf is modifed by do_div: copy it */
-        interval_tm = beacon_int * TIME_UNIT;
-        rem = do_div(tsf, interval_tm);
-        ctx->timing.beacon_init_val = cpu_to_le32(interval_tm - rem);
-
-        ctx->timing.dtim_period = vif ? (vif->bss_conf.dtim_period ?: 1) : 1;
-
-        IWL_DEBUG_ASSOC(priv,
-                        "beacon interval %d beacon timer %d beacon tim %d\n",
-                        le16_to_cpu(ctx->timing.beacon_interval),
-                        le32_to_cpu(ctx->timing.beacon_init_val),
-                        le16_to_cpu(ctx->timing.atim_window));
-
-        return iwl_dvm_send_cmd_pdu(priv, ctx->rxon_timing_cmd,
-                                CMD_SYNC, sizeof(ctx->timing), &ctx->timing);
-}
-
-void iwl_set_rxon_hwcrypto(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
-                           int hw_decrypt)
-{
-        struct iwl_rxon_cmd *rxon = &ctx->staging;
-
-        if (hw_decrypt)
-                rxon->filter_flags &= ~RXON_FILTER_DIS_DECRYPT_MSK;
-        else
-                rxon->filter_flags |= RXON_FILTER_DIS_DECRYPT_MSK;
-
-}
-
-/* validate RXON structure is valid */
-int iwl_check_rxon_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
-{
-        struct iwl_rxon_cmd *rxon = &ctx->staging;
-        u32 errors = 0;
-
-        if (rxon->flags & RXON_FLG_BAND_24G_MSK) {
-                if (rxon->flags & RXON_FLG_TGJ_NARROW_BAND_MSK) {
-                        IWL_WARN(priv, "check 2.4G: wrong narrow\n");
-                        errors |= BIT(0);
-                }
-                if (rxon->flags & RXON_FLG_RADAR_DETECT_MSK) {
-                        IWL_WARN(priv, "check 2.4G: wrong radar\n");
-                        errors |= BIT(1);
-                }
-        } else {
-                if (!(rxon->flags & RXON_FLG_SHORT_SLOT_MSK)) {
-                        IWL_WARN(priv, "check 5.2G: not short slot!\n");
-                        errors |= BIT(2);
-                }
-                if (rxon->flags & RXON_FLG_CCK_MSK) {
-                        IWL_WARN(priv, "check 5.2G: CCK!\n");
-                        errors |= BIT(3);
-                }
-        }
-        if ((rxon->node_addr[0] | rxon->bssid_addr[0]) & 0x1) {
-                IWL_WARN(priv, "mac/bssid mcast!\n");
-                errors |= BIT(4);
-        }
-
-        /* make sure basic rates 6Mbps and 1Mbps are supported */
-        if ((rxon->ofdm_basic_rates & IWL_RATE_6M_MASK) == 0 &&
-            (rxon->cck_basic_rates & IWL_RATE_1M_MASK) == 0) {
-                IWL_WARN(priv, "neither 1 nor 6 are basic\n");
-                errors |= BIT(5);
-        }
-
-        if (le16_to_cpu(rxon->assoc_id) > 2007) {
-                IWL_WARN(priv, "aid > 2007\n");
-                errors |= BIT(6);
-        }
-
-        if ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK))
-                        == (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)) {
-                IWL_WARN(priv, "CCK and short slot\n");
-                errors |= BIT(7);
-        }
-
-        if ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK))
-                        == (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)) {
-                IWL_WARN(priv, "CCK and auto detect");
-                errors |= BIT(8);
-        }
-
-        if ((rxon->flags & (RXON_FLG_AUTO_DETECT_MSK |
-                            RXON_FLG_TGG_PROTECT_MSK)) ==
-                            RXON_FLG_TGG_PROTECT_MSK) {
-                IWL_WARN(priv, "TGg but no auto-detect\n");
-                errors |= BIT(9);
-        }
-
-        if (rxon->channel == 0) {
-                IWL_WARN(priv, "zero channel is invalid\n");
-                errors |= BIT(10);
-        }
-
-        WARN(errors, "Invalid RXON (%#x), channel %d",
-             errors, le16_to_cpu(rxon->channel));
-
-        return errors ? -EINVAL : 0;
-}
-
-/**
- * iwl_full_rxon_required - check if full RXON (vs RXON_ASSOC) cmd is needed
- * @priv: staging_rxon is compared to active_rxon
- *
- * If the RXON structure is changing enough to require a new tune,
- * or is clearing the RXON_FILTER_ASSOC_MSK, then return 1 to indicate that
- * a new tune (full RXON command, rather than RXON_ASSOC cmd) is required.
- */
-int iwl_full_rxon_required(struct iwl_priv *priv,
-                           struct iwl_rxon_context *ctx)
-{
-        const struct iwl_rxon_cmd *staging = &ctx->staging;
-        const struct iwl_rxon_cmd *active = &ctx->active;
-
-#define CHK(cond)                                                       \
-        if ((cond)) {                                                   \
-                IWL_DEBUG_INFO(priv, "need full RXON - " #cond "\n");   \
-                return 1;                                               \
-        }
-
-#define CHK_NEQ(c1, c2)                                         \
-        if ((c1) != (c2)) {                                     \
-                IWL_DEBUG_INFO(priv, "need full RXON - "        \
-                               #c1 " != " #c2 " - %d != %d\n",  \
-                               (c1), (c2));                     \
-                return 1;                                       \
-        }
-
-        /* These items are only settable from the full RXON command */
-        CHK(!iwl_is_associated_ctx(ctx));
-        CHK(compare_ether_addr(staging->bssid_addr, active->bssid_addr));
-        CHK(compare_ether_addr(staging->node_addr, active->node_addr));
-        CHK(compare_ether_addr(staging->wlap_bssid_addr,
-                                active->wlap_bssid_addr));
-        CHK_NEQ(staging->dev_type, active->dev_type);
-        CHK_NEQ(staging->channel, active->channel);
-        CHK_NEQ(staging->air_propagation, active->air_propagation);
-        CHK_NEQ(staging->ofdm_ht_single_stream_basic_rates,
-                active->ofdm_ht_single_stream_basic_rates);
-        CHK_NEQ(staging->ofdm_ht_dual_stream_basic_rates,
-                active->ofdm_ht_dual_stream_basic_rates);
-        CHK_NEQ(staging->ofdm_ht_triple_stream_basic_rates,
-                active->ofdm_ht_triple_stream_basic_rates);
-        CHK_NEQ(staging->assoc_id, active->assoc_id);
-
-        /* flags, filter_flags, ofdm_basic_rates, and cck_basic_rates can
-         * be updated with the RXON_ASSOC command -- however only some
-         * flag transitions are allowed using RXON_ASSOC */
-
-        /* Check if we are not switching bands */
-        CHK_NEQ(staging->flags & RXON_FLG_BAND_24G_MSK,
-                active->flags & RXON_FLG_BAND_24G_MSK);
-
-        /* Check if we are switching association toggle */
-        CHK_NEQ(staging->filter_flags & RXON_FILTER_ASSOC_MSK,
-                active->filter_flags & RXON_FILTER_ASSOC_MSK);
-
-#undef CHK
-#undef CHK_NEQ
-
-        return 0;
-}
-
-static void _iwl_set_rxon_ht(struct iwl_priv *priv,
-                             struct iwl_ht_config *ht_conf,
-                             struct iwl_rxon_context *ctx)
-{
-        struct iwl_rxon_cmd *rxon = &ctx->staging;
-
-        if (!ctx->ht.enabled) {
-                rxon->flags &= ~(RXON_FLG_CHANNEL_MODE_MSK |
-                        RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK |
-                        RXON_FLG_HT40_PROT_MSK |
-                        RXON_FLG_HT_PROT_MSK);
-                return;
-        }
-
-        /* FIXME: if the definition of ht.protection changed, the "translation"
-         * will be needed for rxon->flags
-         */
-        rxon->flags |= cpu_to_le32(ctx->ht.protection << RXON_FLG_HT_OPERATING_MODE_POS);
-
-        /* Set up channel bandwidth:
-         * 20 MHz only, 20/40 mixed or pure 40 if ht40 ok */
-        /* clear the HT channel mode before set the mode */
-        rxon->flags &= ~(RXON_FLG_CHANNEL_MODE_MSK |
-                         RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK);
-        if (iwl_is_ht40_tx_allowed(priv, ctx, NULL)) {
-                /* pure ht40 */
-                if (ctx->ht.protection == IEEE80211_HT_OP_MODE_PROTECTION_20MHZ) {
-                        rxon->flags |= RXON_FLG_CHANNEL_MODE_PURE_40;
-                        /* Note: control channel is opposite of extension channel */
-                        switch (ctx->ht.extension_chan_offset) {
-                        case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
-                                rxon->flags &= ~RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;
-                                break;
-                        case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
-                                rxon->flags |= RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;
-                                break;
-                        }
-                } else {
-                        /* Note: control channel is opposite of extension channel */
-                        switch (ctx->ht.extension_chan_offset) {
-                        case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
-                                rxon->flags &= ~(RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK);
-                                rxon->flags |= RXON_FLG_CHANNEL_MODE_MIXED;
-                                break;
-                        case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
-                                rxon->flags |= RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;
-                                rxon->flags |= RXON_FLG_CHANNEL_MODE_MIXED;
-                                break;
-                        case IEEE80211_HT_PARAM_CHA_SEC_NONE:
-                        default:
-                                /* channel location only valid if in Mixed mode */
-                                IWL_ERR(priv, "invalid extension channel offset\n");
-                                break;
-                        }
-                }
-        } else {
-                rxon->flags |= RXON_FLG_CHANNEL_MODE_LEGACY;
-        }
-
-        iwlagn_set_rxon_chain(priv, ctx);
-
-        IWL_DEBUG_ASSOC(priv, "rxon flags 0x%X operation mode :0x%X "
-                        "extension channel offset 0x%x\n",
-                        le32_to_cpu(rxon->flags), ctx->ht.protection,
-                        ctx->ht.extension_chan_offset);
-}
-
-void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_config *ht_conf)
-{
-        struct iwl_rxon_context *ctx;
-
-        for_each_context(priv, ctx)
-                _iwl_set_rxon_ht(priv, ht_conf, ctx);
-}
-
-/* Return valid, unused, channel for a passive scan to reset the RF */
-u8 iwl_get_single_channel_number(struct iwl_priv *priv,
-                                 enum ieee80211_band band)
-{
-        const struct iwl_channel_info *ch_info;
-        int i;
-        u8 channel = 0;
-        u8 min, max;
-        struct iwl_rxon_context *ctx;
-
-        if (band == IEEE80211_BAND_5GHZ) {
-                min = 14;
-                max = priv->channel_count;
-        } else {
-                min = 0;
-                max = 14;
-        }
-
-        for (i = min; i < max; i++) {
-                bool busy = false;
-
-                for_each_context(priv, ctx) {
-                        busy = priv->channel_info[i].channel ==
-                                le16_to_cpu(ctx->staging.channel);
-                        if (busy)
-                                break;
-                }
-
-                if (busy)
-                        continue;
-
-                channel = priv->channel_info[i].channel;
-                ch_info = iwl_get_channel_info(priv, band, channel);
-                if (is_channel_valid(ch_info))
-                        break;
-        }
-
-        return channel;
-}
-
-/**
- * iwl_set_rxon_channel - Set the band and channel values in staging RXON
- * @ch: requested channel as a pointer to struct ieee80211_channel
-
- * NOTE:  Does not commit to the hardware; it sets appropriate bit fields
- * in the staging RXON flag structure based on the ch->band
- */
-void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch,
-                         struct iwl_rxon_context *ctx)
-{
-        enum ieee80211_band band = ch->band;
-        u16 channel = ch->hw_value;
-
-        if ((le16_to_cpu(ctx->staging.channel) == channel) &&
-            (priv->band == band))
-                return;
-
-        ctx->staging.channel = cpu_to_le16(channel);
-        if (band == IEEE80211_BAND_5GHZ)
-                ctx->staging.flags &= ~RXON_FLG_BAND_24G_MSK;
-        else
-                ctx->staging.flags |= RXON_FLG_BAND_24G_MSK;
-
-        priv->band = band;
-
-        IWL_DEBUG_INFO(priv, "Staging channel set to %d [%d]\n", channel, band);
-
-}
-
-void iwl_set_flags_for_band(struct iwl_priv *priv,
-                            struct iwl_rxon_context *ctx,
-                            enum ieee80211_band band,
-                            struct ieee80211_vif *vif)
-{
-        if (band == IEEE80211_BAND_5GHZ) {
-                ctx->staging.flags &=
-                    ~(RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK
-                      | RXON_FLG_CCK_MSK);
-                ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
-        } else {
-                /* Copied from iwl_post_associate() */
-                if (vif && vif->bss_conf.use_short_slot)
-                        ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
-                else
-                        ctx->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
-
-                ctx->staging.flags |= RXON_FLG_BAND_24G_MSK;
-                ctx->staging.flags |= RXON_FLG_AUTO_DETECT_MSK;
-                ctx->staging.flags &= ~RXON_FLG_CCK_MSK;
-        }
-}
-
-/*
- * initialize rxon structure with default values from eeprom
- */
-void iwl_connection_init_rx_config(struct iwl_priv *priv,
-                                   struct iwl_rxon_context *ctx)
-{
-        const struct iwl_channel_info *ch_info;
-
-        memset(&ctx->staging, 0, sizeof(ctx->staging));
-
-        if (!ctx->vif) {
-                ctx->staging.dev_type = ctx->unused_devtype;
-        } else switch (ctx->vif->type) {
-        case NL80211_IFTYPE_AP:
-                ctx->staging.dev_type = ctx->ap_devtype;
-                break;
-
-        case NL80211_IFTYPE_STATION:
-                ctx->staging.dev_type = ctx->station_devtype;
-                ctx->staging.filter_flags = RXON_FILTER_ACCEPT_GRP_MSK;
-                break;
-
-        case NL80211_IFTYPE_ADHOC:
-                ctx->staging.dev_type = ctx->ibss_devtype;
-                ctx->staging.flags = RXON_FLG_SHORT_PREAMBLE_MSK;
-                ctx->staging.filter_flags = RXON_FILTER_BCON_AWARE_MSK |
-                                                  RXON_FILTER_ACCEPT_GRP_MSK;
-                break;
-
-        default:
-                IWL_ERR(priv, "Unsupported interface type %d\n",
-                        ctx->vif->type);
-                break;
-        }
-
-#if 0
-        /* TODO:  Figure out when short_preamble would be set and cache from
-         * that */
-        if (!hw_to_local(priv->hw)->short_preamble)
-                ctx->staging.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
-        else
-                ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
-#endif
-
-        ch_info = iwl_get_channel_info(priv, priv->band,
-                                       le16_to_cpu(ctx->active.channel));
-
-        if (!ch_info)
-                ch_info = &priv->channel_info[0];
-
-        ctx->staging.channel = cpu_to_le16(ch_info->channel);
-        priv->band = ch_info->band;
-
-        iwl_set_flags_for_band(priv, ctx, priv->band, ctx->vif);
-
-        ctx->staging.ofdm_basic_rates =
-            (IWL_OFDM_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
-        ctx->staging.cck_basic_rates =
-            (IWL_CCK_RATES_MASK >> IWL_FIRST_CCK_RATE) & 0xF;
-
-        /* clear both MIX and PURE40 mode flag */
-        ctx->staging.flags &= ~(RXON_FLG_CHANNEL_MODE_MIXED |
-                                        RXON_FLG_CHANNEL_MODE_PURE_40);
-        if (ctx->vif)
-                memcpy(ctx->staging.node_addr, ctx->vif->addr, ETH_ALEN);
-
-        ctx->staging.ofdm_ht_single_stream_basic_rates = 0xff;
-        ctx->staging.ofdm_ht_dual_stream_basic_rates = 0xff;
-        ctx->staging.ofdm_ht_triple_stream_basic_rates = 0xff;
-}
-
-void iwl_set_rate(struct iwl_priv *priv)
-{
-        const struct ieee80211_supported_band *hw = NULL;
-        struct ieee80211_rate *rate;
-        struct iwl_rxon_context *ctx;
-        int i;
-
-        hw = iwl_get_hw_mode(priv, priv->band);
-        if (!hw) {
-                IWL_ERR(priv, "Failed to set rate: unable to get hw mode\n");
-                return;
-        }
-
-        priv->active_rate = 0;
-
-        for (i = 0; i < hw->n_bitrates; i++) {
-                rate = &(hw->bitrates[i]);
-                if (rate->hw_value < IWL_RATE_COUNT_LEGACY)
-                        priv->active_rate |= (1 << rate->hw_value);
-        }
-
-        IWL_DEBUG_RATE(priv, "Set active_rate = %0x\n", priv->active_rate);
-
-        for_each_context(priv, ctx) {
-                ctx->staging.cck_basic_rates =
-                    (IWL_CCK_BASIC_RATES_MASK >> IWL_FIRST_CCK_RATE) & 0xF;
-
-                ctx->staging.ofdm_basic_rates =
-                   (IWL_OFDM_BASIC_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
-        }
-}
-
-void iwl_chswitch_done(struct iwl_priv *priv, bool is_success)
-{
-        /*
-         * MULTI-FIXME
-         * See iwlagn_mac_channel_switch.
-         */
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
-
-        if (test_and_clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status))
-                ieee80211_chswitch_done(ctx->vif, is_success);
-}
-
-#ifdef CONFIG_IWLWIFI_DEBUG
-void iwl_print_rx_config_cmd(struct iwl_priv *priv,
-                             enum iwl_rxon_context_id ctxid)
-{
-        struct iwl_rxon_context *ctx = &priv->contexts[ctxid];
-        struct iwl_rxon_cmd *rxon = &ctx->staging;
-
-        IWL_DEBUG_RADIO(priv, "RX CONFIG:\n");
-        iwl_print_hex_dump(priv, IWL_DL_RADIO, (u8 *) rxon, sizeof(*rxon));
-        IWL_DEBUG_RADIO(priv, "u16 channel: 0x%x\n", le16_to_cpu(rxon->channel));
-        IWL_DEBUG_RADIO(priv, "u32 flags: 0x%08X\n", le32_to_cpu(rxon->flags));
-        IWL_DEBUG_RADIO(priv, "u32 filter_flags: 0x%08x\n",
-                        le32_to_cpu(rxon->filter_flags));
-        IWL_DEBUG_RADIO(priv, "u8 dev_type: 0x%x\n", rxon->dev_type);
-        IWL_DEBUG_RADIO(priv, "u8 ofdm_basic_rates: 0x%02x\n",
-                        rxon->ofdm_basic_rates);
-        IWL_DEBUG_RADIO(priv, "u8 cck_basic_rates: 0x%02x\n", rxon->cck_basic_rates);
-        IWL_DEBUG_RADIO(priv, "u8[6] node_addr: %pM\n", rxon->node_addr);
-        IWL_DEBUG_RADIO(priv, "u8[6] bssid_addr: %pM\n", rxon->bssid_addr);
-        IWL_DEBUG_RADIO(priv, "u16 assoc_id: 0x%x\n", le16_to_cpu(rxon->assoc_id));
-}
-#endif
-
-static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)
-{
-        unsigned int reload_msec;
-        unsigned long reload_jiffies;
-
-#ifdef CONFIG_IWLWIFI_DEBUG
-        if (iwl_have_debug_level(IWL_DL_FW_ERRORS))
-                iwl_print_rx_config_cmd(priv, IWL_RXON_CTX_BSS);
-#endif
-
-        /* uCode is no longer loaded. */
-        priv->ucode_loaded = false;
-
-        /* Set the FW error flag -- cleared on iwl_down */
-        set_bit(STATUS_FW_ERROR, &priv->shrd->status);
-
-        /* Cancel currently queued command. */
-        clear_bit(STATUS_HCMD_ACTIVE, &priv->shrd->status);
-
-        iwl_abort_notification_waits(&priv->notif_wait);
-
-        /* Keep the restart process from trying to send host
-         * commands by clearing the ready bit */
-        clear_bit(STATUS_READY, &priv->status);
-
-        wake_up(&trans(priv)->wait_command_queue);
-
-        if (!ondemand) {
-                /*
-                 * If firmware keep reloading, then it indicate something
-                 * serious wrong and firmware having problem to recover
-                 * from it. Instead of keep trying which will fill the syslog
-                 * and hang the system, let's just stop it
-                 */
-                reload_jiffies = jiffies;
-                reload_msec = jiffies_to_msecs((long) reload_jiffies -
-                                        (long) priv->reload_jiffies);
-                priv->reload_jiffies = reload_jiffies;
-                if (reload_msec <= IWL_MIN_RELOAD_DURATION) {
-                        priv->reload_count++;
-                        if (priv->reload_count >= IWL_MAX_CONTINUE_RELOAD_CNT) {
-                                IWL_ERR(priv, "BUG_ON, Stop restarting\n");
-                                return;
-                        }
-                } else
-                        priv->reload_count = 0;
-        }
-
-        if (!test_bit(STATUS_EXIT_PENDING, &priv->status)) {
-                if (iwlagn_mod_params.restart_fw) {
-                        IWL_DEBUG_FW_ERRORS(priv,
-                                  "Restarting adapter due to uCode error.\n");
-                        queue_work(priv->workqueue, &priv->restart);
-                } else
-                        IWL_DEBUG_FW_ERRORS(priv,
-                                  "Detected FW error, but not restarting\n");
-        }
-}
-
-int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)
-{
-        int ret;
-        s8 prev_tx_power;
-        bool defer;
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-
-        lockdep_assert_held(&priv->mutex);
-
-        if (priv->tx_power_user_lmt == tx_power && !force)
-                return 0;
-
-        if (tx_power < IWLAGN_TX_POWER_TARGET_POWER_MIN) {
-                IWL_WARN(priv,
-                         "Requested user TXPOWER %d below lower limit %d.\n",
-                         tx_power,
-                         IWLAGN_TX_POWER_TARGET_POWER_MIN);
-                return -EINVAL;
-        }
-
-        if (tx_power > priv->tx_power_device_lmt) {
-                IWL_WARN(priv,
-                        "Requested user TXPOWER %d above upper limit %d.\n",
-                         tx_power, priv->tx_power_device_lmt);
-                return -EINVAL;
-        }
-
-        if (!iwl_is_ready_rf(priv))
-                return -EIO;
-
-        /* scan complete and commit_rxon use tx_power_next value,
-         * it always need to be updated for newest request */
-        priv->tx_power_next = tx_power;
-
-        /* do not set tx power when scanning or channel changing */
-        defer = test_bit(STATUS_SCANNING, &priv->status) ||
-                memcmp(&ctx->active, &ctx->staging, sizeof(ctx->staging));
-        if (defer && !force) {
-                IWL_DEBUG_INFO(priv, "Deferring tx power set\n");
-                return 0;
-        }
-
-        prev_tx_power = priv->tx_power_user_lmt;
-        priv->tx_power_user_lmt = tx_power;
-
-        ret = iwlagn_send_tx_power(priv);
-
-        /* if fail to set tx_power, restore the orig. tx power */
-        if (ret) {
-                priv->tx_power_user_lmt = prev_tx_power;
-                priv->tx_power_next = prev_tx_power;
-        }
-        return ret;
-}
-
-void iwl_send_bt_config(struct iwl_priv *priv)
-{
-        struct iwl_bt_cmd bt_cmd = {
-                .lead_time = BT_LEAD_TIME_DEF,
-                .max_kill = BT_MAX_KILL_DEF,
-                .kill_ack_mask = 0,
-                .kill_cts_mask = 0,
-        };
-
-        if (!iwlagn_mod_params.bt_coex_active)
-                bt_cmd.flags = BT_COEX_DISABLE;
-        else
-                bt_cmd.flags = BT_COEX_ENABLE;
-
-        priv->bt_enable_flag = bt_cmd.flags;
-        IWL_DEBUG_INFO(priv, "BT coex %s\n",
-                (bt_cmd.flags == BT_COEX_DISABLE) ? "disable" : "active");
-
-        if (iwl_dvm_send_cmd_pdu(priv, REPLY_BT_CONFIG,
-                             CMD_SYNC, sizeof(struct iwl_bt_cmd), &bt_cmd))
-                IWL_ERR(priv, "failed to send BT Coex Config\n");
-}
-
-int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags, bool clear)
-{
-        struct iwl_statistics_cmd statistics_cmd = {
-                .configuration_flags =
-                        clear ? IWL_STATS_CONF_CLEAR_STATS : 0,
-        };
-
-        if (flags & CMD_ASYNC)
-                return iwl_dvm_send_cmd_pdu(priv, REPLY_STATISTICS_CMD,
-                                              CMD_ASYNC,
-                                               sizeof(struct iwl_statistics_cmd),
-                                               &statistics_cmd);
-        else
-                return iwl_dvm_send_cmd_pdu(priv, REPLY_STATISTICS_CMD,
-                                        CMD_SYNC,
-                                        sizeof(struct iwl_statistics_cmd),
-                                        &statistics_cmd);
-}
-
-
-
-
-#ifdef CONFIG_IWLWIFI_DEBUGFS
-
-#define IWL_TRAFFIC_DUMP_SIZE   (IWL_TRAFFIC_ENTRY_SIZE * IWL_TRAFFIC_ENTRIES)
-
-void iwl_reset_traffic_log(struct iwl_priv *priv)
-{
-        priv->tx_traffic_idx = 0;
-        priv->rx_traffic_idx = 0;
-        if (priv->tx_traffic)
-                memset(priv->tx_traffic, 0, IWL_TRAFFIC_DUMP_SIZE);
-        if (priv->rx_traffic)
-                memset(priv->rx_traffic, 0, IWL_TRAFFIC_DUMP_SIZE);
-}
-
-int iwl_alloc_traffic_mem(struct iwl_priv *priv)
-{
-        u32 traffic_size = IWL_TRAFFIC_DUMP_SIZE;
-
-        if (iwl_have_debug_level(IWL_DL_TX)) {
-                if (!priv->tx_traffic) {
-                        priv->tx_traffic =
-                                kzalloc(traffic_size, GFP_KERNEL);
-                        if (!priv->tx_traffic)
-                                return -ENOMEM;
-                }
-        }
-        if (iwl_have_debug_level(IWL_DL_RX)) {
-                if (!priv->rx_traffic) {
-                        priv->rx_traffic =
-                                kzalloc(traffic_size, GFP_KERNEL);
-                        if (!priv->rx_traffic)
-                                return -ENOMEM;
-                }
-        }
-        iwl_reset_traffic_log(priv);
-        return 0;
-}
-
-void iwl_free_traffic_mem(struct iwl_priv *priv)
-{
-        kfree(priv->tx_traffic);
-        priv->tx_traffic = NULL;
-
-        kfree(priv->rx_traffic);
-        priv->rx_traffic = NULL;
-}
-
-void iwl_dbg_log_tx_data_frame(struct iwl_priv *priv,
-                      u16 length, struct ieee80211_hdr *header)
-{
-        __le16 fc;
-        u16 len;
-
-        if (likely(!iwl_have_debug_level(IWL_DL_TX)))
-                return;
-
-        if (!priv->tx_traffic)
-                return;
-
-        fc = header->frame_control;
-        if (ieee80211_is_data(fc)) {
-                len = (length > IWL_TRAFFIC_ENTRY_SIZE)
-                       ? IWL_TRAFFIC_ENTRY_SIZE : length;
-                memcpy((priv->tx_traffic +
-                       (priv->tx_traffic_idx * IWL_TRAFFIC_ENTRY_SIZE)),
-                       header, len);
-                priv->tx_traffic_idx =
-                        (priv->tx_traffic_idx + 1) % IWL_TRAFFIC_ENTRIES;
-        }
-}
-
-void iwl_dbg_log_rx_data_frame(struct iwl_priv *priv,
-                      u16 length, struct ieee80211_hdr *header)
-{
-        __le16 fc;
-        u16 len;
-
-        if (likely(!iwl_have_debug_level(IWL_DL_RX)))
-                return;
-
-        if (!priv->rx_traffic)
-                return;
-
-        fc = header->frame_control;
-        if (ieee80211_is_data(fc)) {
-                len = (length > IWL_TRAFFIC_ENTRY_SIZE)
-                       ? IWL_TRAFFIC_ENTRY_SIZE : length;
-                memcpy((priv->rx_traffic +
-                       (priv->rx_traffic_idx * IWL_TRAFFIC_ENTRY_SIZE)),
-                       header, len);
-                priv->rx_traffic_idx =
-                        (priv->rx_traffic_idx + 1) % IWL_TRAFFIC_ENTRIES;
-        }
-}
-
-const char *get_mgmt_string(int cmd)
-{
-        switch (cmd) {
-                IWL_CMD(MANAGEMENT_ASSOC_REQ);
-                IWL_CMD(MANAGEMENT_ASSOC_RESP);
-                IWL_CMD(MANAGEMENT_REASSOC_REQ);
-                IWL_CMD(MANAGEMENT_REASSOC_RESP);
-                IWL_CMD(MANAGEMENT_PROBE_REQ);
-                IWL_CMD(MANAGEMENT_PROBE_RESP);
-                IWL_CMD(MANAGEMENT_BEACON);
-                IWL_CMD(MANAGEMENT_ATIM);
-                IWL_CMD(MANAGEMENT_DISASSOC);
-                IWL_CMD(MANAGEMENT_AUTH);
-                IWL_CMD(MANAGEMENT_DEAUTH);
-                IWL_CMD(MANAGEMENT_ACTION);
-        default:
-                return "UNKNOWN";
-
-        }
-}
-
-const char *get_ctrl_string(int cmd)
-{
-        switch (cmd) {
-                IWL_CMD(CONTROL_BACK_REQ);
-                IWL_CMD(CONTROL_BACK);
-                IWL_CMD(CONTROL_PSPOLL);
-                IWL_CMD(CONTROL_RTS);
-                IWL_CMD(CONTROL_CTS);
-                IWL_CMD(CONTROL_ACK);
-                IWL_CMD(CONTROL_CFEND);
-                IWL_CMD(CONTROL_CFENDACK);
-        default:
-                return "UNKNOWN";
-
-        }
-}
-
-void iwl_clear_traffic_stats(struct iwl_priv *priv)
-{
-        memset(&priv->tx_stats, 0, sizeof(struct traffic_stats));
-        memset(&priv->rx_stats, 0, sizeof(struct traffic_stats));
-}
-
-/*
- * if CONFIG_IWLWIFI_DEBUGFS defined, iwl_update_stats function will
- * record all the MGMT, CTRL and DATA pkt for both TX and Rx pass.
- * Use debugFs to display the rx/rx_statistics
- * if CONFIG_IWLWIFI_DEBUGFS not being defined, then no MGMT and CTRL
- * information will be recorded, but DATA pkt still will be recorded
- * for the reason of iwl_led.c need to control the led blinking based on
- * number of tx and rx data.
- *
- */
-void iwl_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc, u16 len)
-{
-        struct traffic_stats    *stats;
-
-        if (is_tx)
-                stats = &priv->tx_stats;
-        else
-                stats = &priv->rx_stats;
-
-        if (ieee80211_is_mgmt(fc)) {
-                switch (fc & cpu_to_le16(IEEE80211_FCTL_STYPE)) {
-                case cpu_to_le16(IEEE80211_STYPE_ASSOC_REQ):
-                        stats->mgmt[MANAGEMENT_ASSOC_REQ]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
-                        stats->mgmt[MANAGEMENT_ASSOC_RESP]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_REASSOC_REQ):
-                        stats->mgmt[MANAGEMENT_REASSOC_REQ]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
-                        stats->mgmt[MANAGEMENT_REASSOC_RESP]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_PROBE_REQ):
-                        stats->mgmt[MANAGEMENT_PROBE_REQ]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
-                        stats->mgmt[MANAGEMENT_PROBE_RESP]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_BEACON):
-                        stats->mgmt[MANAGEMENT_BEACON]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_ATIM):
-                        stats->mgmt[MANAGEMENT_ATIM]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_DISASSOC):
-                        stats->mgmt[MANAGEMENT_DISASSOC]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_AUTH):
-                        stats->mgmt[MANAGEMENT_AUTH]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
-                        stats->mgmt[MANAGEMENT_DEAUTH]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_ACTION):
-                        stats->mgmt[MANAGEMENT_ACTION]++;
-                        break;
-                }
-        } else if (ieee80211_is_ctl(fc)) {
-                switch (fc & cpu_to_le16(IEEE80211_FCTL_STYPE)) {
-                case cpu_to_le16(IEEE80211_STYPE_BACK_REQ):
-                        stats->ctrl[CONTROL_BACK_REQ]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_BACK):
-                        stats->ctrl[CONTROL_BACK]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_PSPOLL):
-                        stats->ctrl[CONTROL_PSPOLL]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_RTS):
-                        stats->ctrl[CONTROL_RTS]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_CTS):
-                        stats->ctrl[CONTROL_CTS]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_ACK):
-                        stats->ctrl[CONTROL_ACK]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_CFEND):
-                        stats->ctrl[CONTROL_CFEND]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_CFENDACK):
-                        stats->ctrl[CONTROL_CFENDACK]++;
-                        break;
-                }
-        } else {
-                /* data */
-                stats->data_cnt++;
-                stats->data_bytes += len;
-        }
-}
-#endif
-
-static void iwl_force_rf_reset(struct iwl_priv *priv)
-{
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
-
-        if (!iwl_is_any_associated(priv)) {
-                IWL_DEBUG_SCAN(priv, "force reset rejected: not associated\n");
-                return;
-        }
-        /*
-         * There is no easy and better way to force reset the radio,
-         * the only known method is switching channel which will force to
-         * reset and tune the radio.
-         * Use internal short scan (single channel) operation to should
-         * achieve this objective.
-         * Driver should reset the radio when number of consecutive missed
-         * beacon, or any other uCode error condition detected.
-         */
-        IWL_DEBUG_INFO(priv, "perform radio reset.\n");
-        iwl_internal_short_hw_scan(priv);
-}
-
-
-int iwl_force_reset(struct iwl_priv *priv, int mode, bool external)
-{
-        struct iwl_force_reset *force_reset;
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return -EINVAL;
-
-        if (mode >= IWL_MAX_FORCE_RESET) {
-                IWL_DEBUG_INFO(priv, "invalid reset request.\n");
-                return -EINVAL;
-        }
-        force_reset = &priv->force_reset[mode];
-        force_reset->reset_request_count++;
-        if (!external) {
-                if (force_reset->last_force_reset_jiffies &&
-                    time_after(force_reset->last_force_reset_jiffies +
-                    force_reset->reset_duration, jiffies)) {
-                        IWL_DEBUG_INFO(priv, "force reset rejected\n");
-                        force_reset->reset_reject_count++;
-                        return -EAGAIN;
-                }
-        }
-        force_reset->reset_success_count++;
-        force_reset->last_force_reset_jiffies = jiffies;
-        IWL_DEBUG_INFO(priv, "perform force reset (%d)\n", mode);
-        switch (mode) {
-        case IWL_RF_RESET:
-                iwl_force_rf_reset(priv);
-                break;
-        case IWL_FW_RESET:
-                /*
-                 * if the request is from external(ex: debugfs),
-                 * then always perform the request in regardless the module
-                 * parameter setting
-                 * if the request is from internal (uCode error or driver
-                 * detect failure), then fw_restart module parameter
-                 * need to be check before performing firmware reload
-                 */
-                if (!external && !iwlagn_mod_params.restart_fw) {
-                        IWL_DEBUG_INFO(priv, "Cancel firmware reload based on "
-                                       "module parameter setting\n");
-                        break;
-                }
-                IWL_ERR(priv, "On demand firmware reload\n");
-                iwlagn_fw_error(priv, true);
-                break;
-        }
-        return 0;
-}
-
-
-int iwl_cmd_echo_test(struct iwl_priv *priv)
-{
-        int ret;
-        struct iwl_host_cmd cmd = {
-                .id = REPLY_ECHO,
-                .len = { 0 },
-                .flags = CMD_SYNC,
-        };
-
-        ret = iwl_dvm_send_cmd(priv, &cmd);
-        if (ret)
-                IWL_ERR(priv, "echo testing fail: 0X%x\n", ret);
-        else
-                IWL_DEBUG_INFO(priv, "echo testing pass\n");
-        return ret;
-}
-
-static inline int iwl_check_stuck_queue(struct iwl_priv *priv, int txq)
-{
-        if (iwl_trans_check_stuck_queue(trans(priv), txq)) {
-                int ret;
-                ret = iwl_force_reset(priv, IWL_FW_RESET, false);
-                return (ret == -EAGAIN) ? 0 : 1;
-        }
-        return 0;
-}
-
-/*
- * Making watchdog tick be a quarter of timeout assure we will
- * discover the queue hung between timeout and 1.25*timeout
- */
-#define IWL_WD_TICK(timeout) ((timeout) / 4)
-
-/*
- * Watchdog timer callback, we check each tx queue for stuck, if if hung
- * we reset the firmware. If everything is fine just rearm the timer.
- */
-void iwl_bg_watchdog(unsigned long data)
-{
-        struct iwl_priv *priv = (struct iwl_priv *)data;
-        int cnt;
-        unsigned long timeout;
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
-
-        if (iwl_is_rfkill(priv))
-                return;
-
-        timeout = hw_params(priv).wd_timeout;
-        if (timeout == 0)
-                return;
-
-        /* monitor and check for stuck queues */
-        for (cnt = 0; cnt < cfg(priv)->base_params->num_of_queues; cnt++)
-                if (iwl_check_stuck_queue(priv, cnt))
-                        return;
-
-        mod_timer(&priv->watchdog, jiffies +
-                  msecs_to_jiffies(IWL_WD_TICK(timeout)));
-}
-
-void iwl_setup_watchdog(struct iwl_priv *priv)
-{
-        unsigned int timeout = hw_params(priv).wd_timeout;
-
-        if (!iwlagn_mod_params.wd_disable) {
-                /* use system default */
-                if (timeout && !cfg(priv)->base_params->wd_disable)
-                        mod_timer(&priv->watchdog,
-                                jiffies +
-                                msecs_to_jiffies(IWL_WD_TICK(timeout)));
-                else
-                        del_timer(&priv->watchdog);
-        } else {
-                /* module parameter overwrite default configuration */
-                if (timeout && iwlagn_mod_params.wd_disable == 2)
-                        mod_timer(&priv->watchdog,
-                                jiffies +
-                                msecs_to_jiffies(IWL_WD_TICK(timeout)));
-                else
-                        del_timer(&priv->watchdog);
-        }
-}
-
-/**
- * iwl_beacon_time_mask_low - mask of lower 32 bit of beacon time
- * @priv -- pointer to iwl_priv data structure
- * @tsf_bits -- number of bits need to shift for masking)
- */
-static inline u32 iwl_beacon_time_mask_low(struct iwl_priv *priv,
-                                           u16 tsf_bits)
-{
-        return (1 << tsf_bits) - 1;
-}
-
-/**
- * iwl_beacon_time_mask_high - mask of higher 32 bit of beacon time
- * @priv -- pointer to iwl_priv data structure
- * @tsf_bits -- number of bits need to shift for masking)
- */
-static inline u32 iwl_beacon_time_mask_high(struct iwl_priv *priv,
-                                            u16 tsf_bits)
-{
-        return ((1 << (32 - tsf_bits)) - 1) << tsf_bits;
-}
-
-/*
- * extended beacon time format
- * time in usec will be changed into a 32-bit value in extended:internal format
- * the extended part is the beacon counts
- * the internal part is the time in usec within one beacon interval
- */
-u32 iwl_usecs_to_beacons(struct iwl_priv *priv, u32 usec, u32 beacon_interval)
-{
-        u32 quot;
-        u32 rem;
-        u32 interval = beacon_interval * TIME_UNIT;
-
-        if (!interval || !usec)
-                return 0;
-
-        quot = (usec / interval) &
-                (iwl_beacon_time_mask_high(priv, IWLAGN_EXT_BEACON_TIME_POS) >>
-                IWLAGN_EXT_BEACON_TIME_POS);
-        rem = (usec % interval) & iwl_beacon_time_mask_low(priv,
-                                   IWLAGN_EXT_BEACON_TIME_POS);
-
-        return (quot << IWLAGN_EXT_BEACON_TIME_POS) + rem;
-}
-
-/* base is usually what we get from ucode with each received frame,
- * the same as HW timer counter counting down
- */
-__le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base,
-                           u32 addon, u32 beacon_interval)
-{
-        u32 base_low = base & iwl_beacon_time_mask_low(priv,
-                                IWLAGN_EXT_BEACON_TIME_POS);
-        u32 addon_low = addon & iwl_beacon_time_mask_low(priv,
-                                IWLAGN_EXT_BEACON_TIME_POS);
-        u32 interval = beacon_interval * TIME_UNIT;
-        u32 res = (base & iwl_beacon_time_mask_high(priv,
-                                IWLAGN_EXT_BEACON_TIME_POS)) +
-                                (addon & iwl_beacon_time_mask_high(priv,
-                                IWLAGN_EXT_BEACON_TIME_POS));
-
-        if (base_low > addon_low)
-                res += base_low - addon_low;
-        else if (base_low < addon_low) {
-                res += interval + base_low - addon_low;
-                res += (1 << IWLAGN_EXT_BEACON_TIME_POS);
-        } else
-                res += (1 << IWLAGN_EXT_BEACON_TIME_POS);
-
-        return cpu_to_le32(res);
-}
-
-void iwl_nic_error(struct iwl_op_mode *op_mode)
-{
-        struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
-
-        iwlagn_fw_error(priv, false);
-}
-
-void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)
-{
-        struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
-
-        if (state)
-                set_bit(STATUS_RF_KILL_HW, &priv->status);
-        else
-                clear_bit(STATUS_RF_KILL_HW, &priv->status);
-
-        wiphy_rfkill_set_hw_state(priv->hw->wiphy, state);
-}
-
-void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb)
-{
-        struct ieee80211_tx_info *info;
-
-        info = IEEE80211_SKB_CB(skb);
-        kmem_cache_free(iwl_tx_cmd_pool, (info->driver_data[1]));
-        dev_kfree_skb_any(skb);
-}
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
deleted file mode 100644
index 635eb685edeb..000000000000
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/******************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
- * USA
- *
- * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
- *
- * Contact Information:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *  * Neither the name Intel Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *****************************************************************************/
-
-#ifndef __iwl_core_h__
-#define __iwl_core_h__
-
-#include "iwl-dev.h"
-#include "iwl-io.h"
-
-/************************
- * forward declarations *
- ************************/
-struct iwl_host_cmd;
-struct iwl_cmd;
-
-#define TIME_UNIT               1024
-
-struct iwl_lib_ops {
-        /* set hw dependent parameters */
-        void (*set_hw_params)(struct iwl_priv *priv);
-        int (*set_channel_switch)(struct iwl_priv *priv,
-                                  struct ieee80211_channel_switch *ch_switch);
-        /* device specific configuration */
-        void (*nic_config)(struct iwl_priv *priv);
-
-        /* eeprom operations (as defined in iwl-eeprom.h) */
-        struct iwl_eeprom_ops eeprom_ops;
-
-        /* temperature */
-        void (*temperature)(struct iwl_priv *priv);
-};
-
-/***************************
- *   L i b                 *
- ***************************/
-
-void iwl_set_rxon_hwcrypto(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
-                           int hw_decrypt);
-int iwl_check_rxon_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
-int iwl_full_rxon_required(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
-void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch,
-                         struct iwl_rxon_context *ctx);
-void iwl_set_flags_for_band(struct iwl_priv *priv,
-                            struct iwl_rxon_context *ctx,
-                            enum ieee80211_band band,
-                            struct ieee80211_vif *vif);
-u8 iwl_get_single_channel_number(struct iwl_priv *priv,
-                                  enum ieee80211_band band);
-void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_config *ht_conf);
-bool iwl_is_ht40_tx_allowed(struct iwl_priv *priv,
-                            struct iwl_rxon_context *ctx,
-                            struct ieee80211_sta_ht_cap *ht_cap);
-void iwl_connection_init_rx_config(struct iwl_priv *priv,
-                                   struct iwl_rxon_context *ctx);
-void iwl_set_rate(struct iwl_priv *priv);
-int iwl_cmd_echo_test(struct iwl_priv *priv);
-#ifdef CONFIG_IWLWIFI_DEBUGFS
-int iwl_alloc_traffic_mem(struct iwl_priv *priv);
-void iwl_free_traffic_mem(struct iwl_priv *priv);
-void iwl_dbg_log_tx_data_frame(struct iwl_priv *priv,
-                                u16 length, struct ieee80211_hdr *header);
-void iwl_dbg_log_rx_data_frame(struct iwl_priv *priv,
-                                u16 length, struct ieee80211_hdr *header);
-const char *get_mgmt_string(int cmd);
-const char *get_ctrl_string(int cmd);
-void iwl_clear_traffic_stats(struct iwl_priv *priv);
-void iwl_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc,
-                      u16 len);
-void iwl_reset_traffic_log(struct iwl_priv *priv);
-
-#else
-static inline int iwl_alloc_traffic_mem(struct iwl_priv *priv)
-{
-        return 0;
-}
-static inline void iwl_free_traffic_mem(struct iwl_priv *priv)
-{
-}
-static inline void iwl_reset_traffic_log(struct iwl_priv *priv)
-{
-}
-static inline void iwl_dbg_log_tx_data_frame(struct iwl_priv *priv,
-                      u16 length, struct ieee80211_hdr *header)
-{
-}
-static inline void iwl_dbg_log_rx_data_frame(struct iwl_priv *priv,
-                      u16 length, struct ieee80211_hdr *header)
-{
-}
-static inline void iwl_update_stats(struct iwl_priv *priv, bool is_tx,
-                                    __le16 fc, u16 len)
-{
-}
-#endif
-
-/*****************************************************
-* RX
-******************************************************/
-void iwl_chswitch_done(struct iwl_priv *priv, bool is_success);
-
-void iwl_setup_watchdog(struct iwl_priv *priv);
-/*****************************************************
- * TX power
- ****************************************************/
-int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force);
-
-/*******************************************************************************
- * Scanning
- ******************************************************************************/
-void iwl_init_scan_params(struct iwl_priv *priv);
-int iwl_scan_cancel(struct iwl_priv *priv);
-void iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms);
-void iwl_force_scan_end(struct iwl_priv *priv);
-void iwl_internal_short_hw_scan(struct iwl_priv *priv);
-int iwl_force_reset(struct iwl_priv *priv, int mode, bool external);
-void iwl_setup_rx_scan_handlers(struct iwl_priv *priv);
-void iwl_setup_scan_deferred_work(struct iwl_priv *priv);
-void iwl_cancel_scan_deferred_work(struct iwl_priv *priv);
-int __must_check iwl_scan_initiate(struct iwl_priv *priv,
-                                   struct ieee80211_vif *vif,
-                                   enum iwl_scan_type scan_type,
-                                   enum ieee80211_band band);
-
-/* For faster active scanning, scan will move to the next channel if fewer than
- * PLCP_QUIET_THRESH packets are heard on this channel within
- * ACTIVE_QUIET_TIME after sending probe request.  This shortens the dwell
- * time if it's a quiet channel (nothing responded to our probe, and there's
- * no other traffic).
- * Disable "quiet" feature by setting PLCP_QUIET_THRESH to 0. */
-#define IWL_ACTIVE_QUIET_TIME       cpu_to_le16(10)  /* msec */
-#define IWL_PLCP_QUIET_THRESH       cpu_to_le16(1)  /* packets */
-
-#define IWL_SCAN_CHECK_WATCHDOG         (HZ * 7)
-
-/* traffic log definitions */
-#define IWL_TRAFFIC_ENTRIES     (256)
-#define IWL_TRAFFIC_ENTRY_SIZE  (64)
-
-/*****************************************************
- *   S e n d i n g     H o s t     C o m m a n d s   *
- *****************************************************/
-
-void iwl_bg_watchdog(unsigned long data);
-u32 iwl_usecs_to_beacons(struct iwl_priv *priv, u32 usec, u32 beacon_interval);
-__le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base,
-                           u32 addon, u32 beacon_interval);
-
-
-/*****************************************************
-*  GEOS
-******************************************************/
-int iwl_init_geos(struct iwl_priv *priv);
-void iwl_free_geos(struct iwl_priv *priv);
-
-extern void iwl_send_bt_config(struct iwl_priv *priv);
-extern int iwl_send_statistics_request(struct iwl_priv *priv,
-                                       u8 flags, bool clear);
-
-int iwl_send_rxon_timing(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
-
-static inline const struct ieee80211_supported_band *iwl_get_hw_mode(
-                        struct iwl_priv *priv, enum ieee80211_band band)
-{
-        return priv->hw->wiphy->bands[band];
-}
-
-static inline bool iwl_advanced_bt_coexist(struct iwl_priv *priv)
-{
-        return cfg(priv)->bt_params &&
-               cfg(priv)->bt_params->advanced_bt_coexist;
-}
-
-extern bool bt_siso_mode;
-
-#endif /* __iwl_core_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/iwlwifi/iwl-csr.h
index 5f96ce105f08..59750543fce7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/iwlwifi/iwl-csr.h
@@ -430,6 +430,9 @@
 #define HBUS_TARG_PRPH_WDAT     (HBUS_BASE+0x04c)
 #define HBUS_TARG_PRPH_RDAT     (HBUS_BASE+0x050)
 
+/* Used to enable DBGM */
+#define HBUS_TARG_TEST_REG      (HBUS_BASE+0x05c)
+
 /*
  * Per-Tx-queue write pointer (index, really!)
  * Indicates index to next TFD that driver will fill (1 past latest filled).
diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.c b/drivers/net/wireless/iwlwifi/iwl-debug.c
index 059efabda184..2d1b42847b9b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debug.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debug.c
@@ -63,6 +63,7 @@
 
 #include <linux/interrupt.h>
 #include "iwl-debug.h"
+#include "iwl-devtrace.h"
 
 #define __iwl_fn(fn)                                            \
 void __iwl_ ##fn(struct device *dev, const char *fmt, ...)      \
diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
index a6b32a11e103..8376b842bdba 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
@@ -29,10 +29,13 @@
 #ifndef __iwl_debug_h__
 #define __iwl_debug_h__
 
-#include "iwl-shared.h"
-#include "iwl-devtrace.h"
+#include "iwl-modparams.h"
 
-struct iwl_priv;
+
+static inline bool iwl_have_debug_level(u32 level)
+{
+        return iwlwifi_mod_params.debug_level & level;
+}
 
 void __iwl_err(struct device *dev, bool rfkill_prefix, bool only_trace,
                 const char *fmt, ...);
@@ -41,10 +44,10 @@ void __iwl_info(struct device *dev, const char *fmt, ...);
 void __iwl_crit(struct device *dev, const char *fmt, ...);
 
 /* No matter what is m (priv, bus, trans), this will work */
-#define IWL_ERR(m, f, a...) __iwl_err(trans(m)->dev, false, false, f, ## a)
-#define IWL_WARN(m, f, a...) __iwl_warn(trans(m)->dev, f, ## a)
-#define IWL_INFO(m, f, a...) __iwl_info(trans(m)->dev, f, ## a)
-#define IWL_CRIT(m, f, a...) __iwl_crit(trans(m)->dev, f, ## a)
+#define IWL_ERR(m, f, a...) __iwl_err((m)->dev, false, false, f, ## a)
+#define IWL_WARN(m, f, a...) __iwl_warn((m)->dev, f, ## a)
+#define IWL_INFO(m, f, a...) __iwl_info((m)->dev, f, ## a)
+#define IWL_CRIT(m, f, a...) __iwl_crit((m)->dev, f, ## a)
 
 #if defined(CONFIG_IWLWIFI_DEBUG) || defined(CONFIG_IWLWIFI_DEVICE_TRACING)
 void __iwl_dbg(struct device *dev,
@@ -65,9 +68,9 @@ do {									\
 } while (0)
 
 #define IWL_DEBUG(m, level, fmt, args...)                               \
-        __iwl_dbg(trans(m)->dev, level, false, __func__, fmt, ##args)
+        __iwl_dbg((m)->dev, level, false, __func__, fmt, ##args)
 #define IWL_DEBUG_LIMIT(m, level, fmt, args...)                         \
-        __iwl_dbg(trans(m)->dev, level, true, __func__, fmt, ##args)
+        __iwl_dbg((m)->dev, level, true, __func__, fmt, ##args)
 
 #ifdef CONFIG_IWLWIFI_DEBUG
 #define iwl_print_hex_dump(m, level, p, len)                            \
@@ -80,19 +83,6 @@ do {                                            			\
 #define iwl_print_hex_dump(m, level, p, len)
 #endif                          /* CONFIG_IWLWIFI_DEBUG */
 
-#ifdef CONFIG_IWLWIFI_DEBUGFS
-int iwl_dbgfs_register(struct iwl_priv *priv, const char *name);
-void iwl_dbgfs_unregister(struct iwl_priv *priv);
-#else
-static inline int iwl_dbgfs_register(struct iwl_priv *priv, const char *name)
-{
-        return 0;
-}
-static inline void iwl_dbgfs_unregister(struct iwl_priv *priv)
-{
-}
-#endif                          /* CONFIG_IWLWIFI_DEBUGFS */
-
 /*
  * To use the debug system:
  *
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
index 2bbaebd99ad4..e7c157e5ebeb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
@@ -37,9 +37,9 @@
 
 #include "iwl-dev.h"
 #include "iwl-debug.h"
-#include "iwl-core.h"
 #include "iwl-io.h"
 #include "iwl-agn.h"
+#include "iwl-modparams.h"
 
 /* create and remove of files */
 #define DEBUGFS_ADD_FILE(name, parent, mode) do {                       \
@@ -111,105 +111,6 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {          \
         .llseek = generic_file_llseek,                                  \
 };
 
-static ssize_t iwl_dbgfs_tx_statistics_read(struct file *file,
-                                                char __user *user_buf,
-                                                size_t count, loff_t *ppos) {
-
-        struct iwl_priv *priv = file->private_data;
-        char *buf;
-        int pos = 0;
-
-        int cnt;
-        ssize_t ret;
-        const size_t bufsz = 100 +
-                sizeof(char) * 50 * (MANAGEMENT_MAX + CONTROL_MAX);
-        buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
-        pos += scnprintf(buf + pos, bufsz - pos, "Management:\n");
-        for (cnt = 0; cnt < MANAGEMENT_MAX; cnt++) {
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                 "\t%25s\t\t: %u\n",
-                                 get_mgmt_string(cnt),
-                                 priv->tx_stats.mgmt[cnt]);
-        }
-        pos += scnprintf(buf + pos, bufsz - pos, "Control\n");
-        for (cnt = 0; cnt < CONTROL_MAX; cnt++) {
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                 "\t%25s\t\t: %u\n",
-                                 get_ctrl_string(cnt),
-                                 priv->tx_stats.ctrl[cnt]);
-        }
-        pos += scnprintf(buf + pos, bufsz - pos, "Data:\n");
-        pos += scnprintf(buf + pos, bufsz - pos, "\tcnt: %u\n",
-                         priv->tx_stats.data_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos, "\tbytes: %llu\n",
-                         priv->tx_stats.data_bytes);
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
-
-static ssize_t iwl_dbgfs_clear_traffic_statistics_write(struct file *file,
-                                        const char __user *user_buf,
-                                        size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        u32 clear_flag;
-        char buf[8];
-        int buf_size;
-
-        memset(buf, 0, sizeof(buf));
-        buf_size = min(count, sizeof(buf) -  1);
-        if (copy_from_user(buf, user_buf, buf_size))
-                return -EFAULT;
-        if (sscanf(buf, "%x", &clear_flag) != 1)
-                return -EFAULT;
-        iwl_clear_traffic_stats(priv);
-
-        return count;
-}
-
-static ssize_t iwl_dbgfs_rx_statistics_read(struct file *file,
-                                                char __user *user_buf,
-                                                size_t count, loff_t *ppos) {
-
-        struct iwl_priv *priv = file->private_data;
-        char *buf;
-        int pos = 0;
-        int cnt;
-        ssize_t ret;
-        const size_t bufsz = 100 +
-                sizeof(char) * 50 * (MANAGEMENT_MAX + CONTROL_MAX);
-        buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
-
-        pos += scnprintf(buf + pos, bufsz - pos, "Management:\n");
-        for (cnt = 0; cnt < MANAGEMENT_MAX; cnt++) {
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                 "\t%25s\t\t: %u\n",
-                                 get_mgmt_string(cnt),
-                                 priv->rx_stats.mgmt[cnt]);
-        }
-        pos += scnprintf(buf + pos, bufsz - pos, "Control:\n");
-        for (cnt = 0; cnt < CONTROL_MAX; cnt++) {
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                 "\t%25s\t\t: %u\n",
-                                 get_ctrl_string(cnt),
-                                 priv->rx_stats.ctrl[cnt]);
-        }
-        pos += scnprintf(buf + pos, bufsz - pos, "Data:\n");
-        pos += scnprintf(buf + pos, bufsz - pos, "\tcnt: %u\n",
-                         priv->rx_stats.data_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos, "\tbytes: %llu\n",
-                         priv->rx_stats.data_bytes);
-
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
-
 static ssize_t iwl_dbgfs_sram_read(struct file *file,
                                         char __user *user_buf,
                                         size_t count, loff_t *ppos)
@@ -230,11 +131,9 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file,
         /* default is to dump the entire data segment */
         if (!priv->dbgfs_sram_offset && !priv->dbgfs_sram_len) {
                 priv->dbgfs_sram_offset = 0x800000;
-                if (!priv->ucode_loaded) {
-                        IWL_ERR(priv, "No uCode has been loadded.\n");
+                if (!priv->ucode_loaded)
                         return -EINVAL;
-                }
-                img = &priv->fw->img[priv->shrd->ucode_type];
+                img = &priv->fw->img[priv->cur_ucode];
                 priv->dbgfs_sram_len = img->sec[IWL_UCODE_SECTION_DATA].len;
         }
         len = priv->dbgfs_sram_len;
@@ -259,7 +158,7 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file,
         sram = priv->dbgfs_sram_offset & ~0x3;
 
         /* read the first u32 from sram */
-        val = iwl_read_targ_mem(trans(priv), sram);
+        val = iwl_read_targ_mem(priv->trans, sram);
 
         for (; len; len--) {
                 /* put the address at the start of every line */
@@ -278,7 +177,7 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file,
                 if (++offset == 4) {
                         sram += 4;
                         offset = 0;
-                        val = iwl_read_targ_mem(trans(priv), sram);
+                        val = iwl_read_targ_mem(priv->trans, sram);
                 }
 
                 /* put in extra spaces and split lines for human readability */
@@ -369,14 +268,19 @@ static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf,
                                  i, station->sta.sta.addr,
                                  station->sta.station_flags_msk);
                 pos += scnprintf(buf + pos, bufsz - pos,
-                                "TID\tseq_num\trate_n_flags\n");
+                                "TID seqno  next_rclmd "
+                                "rate_n_flags state txq\n");
 
                 for (j = 0; j < IWL_MAX_TID_COUNT; j++) {
                         tid_data = &priv->tid_data[i][j];
                         pos += scnprintf(buf + pos, bufsz - pos,
-                                "%d:\t%#x\t%#x",
+                                "%d:  0x%.4x 0x%.4x     0x%.8x   "
+                                "%d     %.2d",
                                 j, tid_data->seq_number,
-                                tid_data->agg.rate_n_flags);
+                                tid_data->next_reclaimed,
+                                tid_data->agg.rate_n_flags,
+                                tid_data->agg.state,
+                                tid_data->agg.txq_id);
 
                         if (tid_data->agg.wait_for_ba)
                                 pos += scnprintf(buf + pos, bufsz - pos,
@@ -403,30 +307,25 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file,
         const u8 *ptr;
         char *buf;
         u16 eeprom_ver;
-        size_t eeprom_len = cfg(priv)->base_params->eeprom_size;
+        size_t eeprom_len = priv->cfg->base_params->eeprom_size;
         buf_size = 4 * eeprom_len + 256;
 
-        if (eeprom_len % 16) {
-                IWL_ERR(priv, "NVM size is not multiple of 16.\n");
+        if (eeprom_len % 16)
                 return -ENODATA;
-        }
 
-        ptr = priv->shrd->eeprom;
-        if (!ptr) {
-                IWL_ERR(priv, "Invalid EEPROM/OTP memory\n");
+        ptr = priv->eeprom;
+        if (!ptr)
                 return -ENOMEM;
-        }
 
         /* 4 characters for byte 0xYY */
         buf = kzalloc(buf_size, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
+        if (!buf)
                 return -ENOMEM;
-        }
-        eeprom_ver = iwl_eeprom_query16(priv->shrd, EEPROM_VERSION);
+
+        eeprom_ver = iwl_eeprom_query16(priv, EEPROM_VERSION);
         pos += scnprintf(buf + pos, buf_size - pos, "NVM Type: %s, "
                         "version: 0x%x\n",
-                        (trans(priv)->nvm_device_type == NVM_DEVICE_TYPE_OTP)
+                        (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP)
                          ? "OTP" : "EEPROM", eeprom_ver);
         for (ofs = 0 ; ofs < eeprom_len ; ofs += 16) {
                 pos += scnprintf(buf + pos, buf_size - pos, "0x%.4x ", ofs);
@@ -456,10 +355,8 @@ static ssize_t iwl_dbgfs_channels_read(struct file *file, char __user *user_buf,
                 return -EAGAIN;
 
         buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
+        if (!buf)
                 return -ENOMEM;
-        }
 
         supp_band = iwl_get_hw_mode(priv, IEEE80211_BAND_2GHZ);
         if (supp_band) {
@@ -521,8 +418,6 @@ static ssize_t iwl_dbgfs_status_read(struct file *file,
         int pos = 0;
         const size_t bufsz = sizeof(buf);
 
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_HCMD_ACTIVE:\t %d\n",
-                test_bit(STATUS_HCMD_ACTIVE, &priv->shrd->status));
         pos += scnprintf(buf + pos, bufsz - pos, "STATUS_RF_KILL_HW:\t %d\n",
                 test_bit(STATUS_RF_KILL_HW, &priv->status));
         pos += scnprintf(buf + pos, bufsz - pos, "STATUS_CT_KILL:\t\t %d\n",
@@ -544,9 +439,9 @@ static ssize_t iwl_dbgfs_status_read(struct file *file,
         pos += scnprintf(buf + pos, bufsz - pos, "STATUS_SCAN_HW:\t\t %d\n",
                 test_bit(STATUS_SCAN_HW, &priv->status));
         pos += scnprintf(buf + pos, bufsz - pos, "STATUS_POWER_PMI:\t %d\n",
-                test_bit(STATUS_POWER_PMI, &priv->shrd->status));
+                test_bit(STATUS_POWER_PMI, &priv->status));
         pos += scnprintf(buf + pos, bufsz - pos, "STATUS_FW_ERROR:\t %d\n",
-                test_bit(STATUS_FW_ERROR, &priv->shrd->status));
+                test_bit(STATUS_FW_ERROR, &priv->status));
         return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
 }
 
@@ -563,16 +458,14 @@ static ssize_t iwl_dbgfs_rx_handlers_read(struct file *file,
         ssize_t ret;
 
         buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
+        if (!buf)
                 return -ENOMEM;
-        }
 
         for (cnt = 0; cnt < REPLY_MAX; cnt++) {
                 if (priv->rx_handlers_stats[cnt] > 0)
                         pos += scnprintf(buf + pos, bufsz - pos,
                                 "\tRx handler[%36s]:\t\t %u\n",
-                                get_cmd_string(cnt),
+                                iwl_dvm_get_cmd_string(cnt),
                                 priv->rx_handlers_stats[cnt]);
         }
 
@@ -680,11 +573,8 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
                 return -EFAULT;
         if (!iwl_is_any_associated(priv))
                 priv->disable_ht40 = ht40 ? true : false;
-        else {
-                IWL_ERR(priv, "Sta associated with AP - "
-                        "Change to 40MHz channel support is not allowed\n");
+        else
                 return -EINVAL;
-        }
 
         return count;
 }
@@ -816,87 +706,6 @@ DEBUGFS_READ_FILE_OPS(temperature);
 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
 DEBUGFS_READ_FILE_OPS(current_sleep_command);
 
-static ssize_t iwl_dbgfs_traffic_log_read(struct file *file,
-                                         char __user *user_buf,
-                                         size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        int pos = 0, ofs = 0;
-        int cnt = 0, entry;
-
-        char *buf;
-        int bufsz = ((IWL_TRAFFIC_ENTRIES * IWL_TRAFFIC_ENTRY_SIZE * 64) * 2) +
-                (cfg(priv)->base_params->num_of_queues * 32 * 8) + 400;
-        const u8 *ptr;
-        ssize_t ret;
-
-        buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate buffer\n");
-                return -ENOMEM;
-        }
-        if (priv->tx_traffic && iwl_have_debug_level(IWL_DL_TX)) {
-                ptr = priv->tx_traffic;
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                "Tx Traffic idx: %u\n", priv->tx_traffic_idx);
-                for (cnt = 0, ofs = 0; cnt < IWL_TRAFFIC_ENTRIES; cnt++) {
-                        for (entry = 0; entry < IWL_TRAFFIC_ENTRY_SIZE / 16;
-                             entry++,  ofs += 16) {
-                                pos += scnprintf(buf + pos, bufsz - pos,
-                                                "0x%.4x ", ofs);
-                                hex_dump_to_buffer(ptr + ofs, 16, 16, 2,
-                                                   buf + pos, bufsz - pos, 0);
-                                pos += strlen(buf + pos);
-                                if (bufsz - pos > 0)
-                                        buf[pos++] = '\n';
-                        }
-                }
-        }
-
-        if (priv->rx_traffic && iwl_have_debug_level(IWL_DL_RX)) {
-                ptr = priv->rx_traffic;
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                "Rx Traffic idx: %u\n", priv->rx_traffic_idx);
-                for (cnt = 0, ofs = 0; cnt < IWL_TRAFFIC_ENTRIES; cnt++) {
-                        for (entry = 0; entry < IWL_TRAFFIC_ENTRY_SIZE / 16;
-                             entry++,  ofs += 16) {
-                                pos += scnprintf(buf + pos, bufsz - pos,
-                                                "0x%.4x ", ofs);
-                                hex_dump_to_buffer(ptr + ofs, 16, 16, 2,
-                                                   buf + pos, bufsz - pos, 0);
-                                pos += strlen(buf + pos);
-                                if (bufsz - pos > 0)
-                                        buf[pos++] = '\n';
-                        }
-                }
-        }
-
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
-
-static ssize_t iwl_dbgfs_traffic_log_write(struct file *file,
-                                         const char __user *user_buf,
-                                         size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        char buf[8];
-        int buf_size;
-        int traffic_log;
-
-        memset(buf, 0, sizeof(buf));
-        buf_size = min(count, sizeof(buf) -  1);
-        if (copy_from_user(buf, user_buf, buf_size))
-                return -EFAULT;
-        if (sscanf(buf, "%d", &traffic_log) != 1)
-                return -EFAULT;
-        if (traffic_log == 0)
-                iwl_reset_traffic_log(priv);
-
-        return count;
-}
-
 static const char *fmt_value = "  %-30s %10u\n";
 static const char *fmt_hex   = "  %-30s       0x%02X\n";
 static const char *fmt_table = "  %-30s %10u  %10u  %10u  %10u\n";
@@ -947,10 +756,8 @@ static ssize_t iwl_dbgfs_ucode_rx_stats_read(struct file *file,
                 return -EAGAIN;
 
         buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
+        if (!buf)
                 return -ENOMEM;
-        }
 
         /*
          * the statistic information display here is based on
@@ -1376,10 +1183,8 @@ static ssize_t iwl_dbgfs_ucode_tx_stats_read(struct file *file,
                 return -EAGAIN;
 
         buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
+        if (!buf)
                 return -ENOMEM;
-        }
 
         /* the statistic information display here is based on
          * the last statistics notification from uCode
@@ -1536,17 +1341,17 @@ static ssize_t iwl_dbgfs_ucode_tx_stats_read(struct file *file,
         if (tx->tx_power.ant_a || tx->tx_power.ant_b || tx->tx_power.ant_c) {
                 pos += scnprintf(buf + pos, bufsz - pos,
                         "tx power: (1/2 dB step)\n");
-                if ((hw_params(priv).valid_tx_ant & ANT_A) &&
+                if ((priv->hw_params.valid_tx_ant & ANT_A) &&
                     tx->tx_power.ant_a)
                         pos += scnprintf(buf + pos, bufsz - pos,
                                         fmt_hex, "antenna A:",
                                         tx->tx_power.ant_a);
-                if ((hw_params(priv).valid_tx_ant & ANT_B) &&
+                if ((priv->hw_params.valid_tx_ant & ANT_B) &&
                     tx->tx_power.ant_b)
                         pos += scnprintf(buf + pos, bufsz - pos,
                                         fmt_hex, "antenna B:",
                                         tx->tx_power.ant_b);
-                if ((hw_params(priv).valid_tx_ant & ANT_C) &&
+                if ((priv->hw_params.valid_tx_ant & ANT_C) &&
                     tx->tx_power.ant_c)
                         pos += scnprintf(buf + pos, bufsz - pos,
                                         fmt_hex, "antenna C:",
@@ -1578,10 +1383,8 @@ static ssize_t iwl_dbgfs_ucode_general_stats_read(struct file *file,
                 return -EAGAIN;
 
         buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
+        if (!buf)
                 return -ENOMEM;
-        }
 
         /* the statistic information display here is based on
          * the last statistics notification from uCode
@@ -1704,16 +1507,11 @@ static ssize_t iwl_dbgfs_ucode_bt_stats_read(struct file *file,
         ret = iwl_send_statistics_request(priv, CMD_SYNC, false);
         mutex_unlock(&priv->mutex);
 
-        if (ret) {
-                IWL_ERR(priv,
-                        "Error sending statistics request: %zd\n", ret);
+        if (ret)
                 return -EAGAIN;
-        }
         buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
+        if (!buf)
                 return -ENOMEM;
-        }
 
         /*
          * the statistic information display here is based on
@@ -1790,10 +1588,8 @@ static ssize_t iwl_dbgfs_reply_tx_error_read(struct file *file,
                 return -EAGAIN;
 
         buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
+        if (!buf)
                 return -ENOMEM;
-        }
 
         pos += scnprintf(buf + pos, bufsz - pos, "Statistics_TX_Error:\n");
         pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t\t%u\n",
@@ -1933,10 +1729,8 @@ static ssize_t iwl_dbgfs_sensitivity_read(struct file *file,
 
         data = &priv->sensitivity_data;
         buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
+        if (!buf)
                 return -ENOMEM;
-        }
 
         pos += scnprintf(buf + pos, bufsz - pos, "auto_corr_ofdm:\t\t\t %u\n",
                         data->auto_corr_ofdm);
@@ -2014,10 +1808,8 @@ static ssize_t iwl_dbgfs_chain_noise_read(struct file *file,
 
         data = &priv->chain_noise_data;
         buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
+        if (!buf)
                 return -ENOMEM;
-        }
 
         pos += scnprintf(buf + pos, bufsz - pos, "active_chains:\t\t\t %u\n",
                         data->active_chains);
@@ -2068,7 +1860,7 @@ static ssize_t iwl_dbgfs_power_save_status_read(struct file *file,
         const size_t bufsz = sizeof(buf);
         u32 pwrsave_status;
 
-        pwrsave_status = iwl_read32(trans(priv), CSR_GP_CNTRL) &
+        pwrsave_status = iwl_read32(priv->trans, CSR_GP_CNTRL) &
                         CSR_GP_REG_POWER_SAVE_STATUS_MSK;
 
         pos += scnprintf(buf + pos, bufsz - pos, "Power Save Status: ");
@@ -2262,59 +2054,39 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
         return count;
 }
 
-static ssize_t iwl_dbgfs_force_reset_read(struct file *file,
-                                        char __user *user_buf,
-                                        size_t count, loff_t *ppos)
+static ssize_t iwl_dbgfs_rf_reset_read(struct file *file,
+                                       char __user *user_buf,
+                                       size_t count, loff_t *ppos)
 {
         struct iwl_priv *priv = file->private_data;
-        int i, pos = 0;
+        int pos = 0;
         char buf[300];
         const size_t bufsz = sizeof(buf);
-        struct iwl_force_reset *force_reset;
+        struct iwl_rf_reset *rf_reset = &priv->rf_reset;
+
+        pos += scnprintf(buf + pos, bufsz - pos,
+                        "RF reset statistics\n");
+        pos += scnprintf(buf + pos, bufsz - pos,
+                        "\tnumber of reset request: %d\n",
+                        rf_reset->reset_request_count);
+        pos += scnprintf(buf + pos, bufsz - pos,
+                        "\tnumber of reset request success: %d\n",
+                        rf_reset->reset_success_count);
+        pos += scnprintf(buf + pos, bufsz - pos,
+                        "\tnumber of reset request reject: %d\n",
+                        rf_reset->reset_reject_count);
 
-        for (i = 0; i < IWL_MAX_FORCE_RESET; i++) {
-                force_reset = &priv->force_reset[i];
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                "Force reset method %d\n", i);
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                "\tnumber of reset request: %d\n",
-                                force_reset->reset_request_count);
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                "\tnumber of reset request success: %d\n",
-                                force_reset->reset_success_count);
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                "\tnumber of reset request reject: %d\n",
-                                force_reset->reset_reject_count);
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                "\treset duration: %lu\n",
-                                force_reset->reset_duration);
-        }
         return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
 }
 
-static ssize_t iwl_dbgfs_force_reset_write(struct file *file,
+static ssize_t iwl_dbgfs_rf_reset_write(struct file *file,
                                         const char __user *user_buf,
                                         size_t count, loff_t *ppos) {
 
         struct iwl_priv *priv = file->private_data;
-        char buf[8];
-        int buf_size;
-        int reset, ret;
+        int ret;
 
-        memset(buf, 0, sizeof(buf));
-        buf_size = min(count, sizeof(buf) -  1);
-        if (copy_from_user(buf, user_buf, buf_size))
-                return -EFAULT;
-        if (sscanf(buf, "%d", &reset) != 1)
-                return -EINVAL;
-        switch (reset) {
-        case IWL_RF_RESET:
-        case IWL_FW_RESET:
-                ret = iwl_force_reset(priv, reset, true);
-                break;
-        default:
-                return -EINVAL;
-        }
+        ret = iwl_force_rf_reset(priv, true);
         return ret ? ret : count;
 }
 
@@ -2342,29 +2114,6 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
         return count;
 }
 
-static ssize_t iwl_dbgfs_wd_timeout_write(struct file *file,
-                                        const char __user *user_buf,
-                                        size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        char buf[8];
-        int buf_size;
-        int timeout;
-
-        memset(buf, 0, sizeof(buf));
-        buf_size = min(count, sizeof(buf) -  1);
-        if (copy_from_user(buf, user_buf, buf_size))
-                return -EFAULT;
-        if (sscanf(buf, "%d", &timeout) != 1)
-                return -EINVAL;
-        if (timeout < 0 || timeout > IWL_MAX_WD_TIMEOUT)
-                timeout = IWL_DEF_WD_TIMEOUT;
-
-        hw_params(priv).wd_timeout = timeout;
-        iwl_setup_watchdog(priv);
-        return count;
-}
-
 static ssize_t iwl_dbgfs_bt_traffic_read(struct file *file,
                                         char __user *user_buf,
                                         size_t count, loff_t *ppos) {
@@ -2420,10 +2169,10 @@ static ssize_t iwl_dbgfs_protection_mode_read(struct file *file,
         char buf[40];
         const size_t bufsz = sizeof(buf);
 
-        if (cfg(priv)->ht_params)
+        if (priv->cfg->ht_params)
                 pos += scnprintf(buf + pos, bufsz - pos,
                          "use %s for aggregation\n",
-                         (hw_params(priv).use_rts_for_aggregation) ?
+                         (priv->hw_params.use_rts_for_aggregation) ?
                                 "rts/cts" : "cts-to-self");
         else
                 pos += scnprintf(buf + pos, bufsz - pos, "N/A");
@@ -2440,7 +2189,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
         int buf_size;
         int rts;
 
-        if (!cfg(priv)->ht_params)
+        if (!priv->cfg->ht_params)
                 return -EINVAL;
 
         memset(buf, 0, sizeof(buf));
@@ -2450,12 +2199,29 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
         if (sscanf(buf, "%d", &rts) != 1)
                 return -EINVAL;
         if (rts)
-                hw_params(priv).use_rts_for_aggregation = true;
+                priv->hw_params.use_rts_for_aggregation = true;
         else
-                hw_params(priv).use_rts_for_aggregation = false;
+                priv->hw_params.use_rts_for_aggregation = false;
         return count;
 }
 
+static int iwl_cmd_echo_test(struct iwl_priv *priv)
+{
+        int ret;
+        struct iwl_host_cmd cmd = {
+                .id = REPLY_ECHO,
+                .len = { 0 },
+                .flags = CMD_SYNC,
+        };
+
+        ret = iwl_dvm_send_cmd(priv, &cmd);
+        if (ret)
+                IWL_ERR(priv, "echo testing fail: 0X%x\n", ret);
+        else
+                IWL_DEBUG_INFO(priv, "echo testing pass\n");
+        return ret;
+}
+
 static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
                                         const char __user *user_buf,
                                         size_t count, loff_t *ppos)
@@ -2473,9 +2239,93 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
         return count;
 }
 
-DEBUGFS_READ_FILE_OPS(rx_statistics);
-DEBUGFS_READ_FILE_OPS(tx_statistics);
-DEBUGFS_READ_WRITE_FILE_OPS(traffic_log);
+static ssize_t iwl_dbgfs_log_event_read(struct file *file,
+                                         char __user *user_buf,
+                                         size_t count, loff_t *ppos)
+{
+        struct iwl_priv *priv = file->private_data;
+        char *buf;
+        int pos = 0;
+        ssize_t ret = -ENOMEM;
+
+        ret = pos = iwl_dump_nic_event_log(priv, true, &buf, true);
+        if (buf) {
+                ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+                kfree(buf);
+        }
+        return ret;
+}
+
+static ssize_t iwl_dbgfs_log_event_write(struct file *file,
+                                        const char __user *user_buf,
+                                        size_t count, loff_t *ppos)
+{
+        struct iwl_priv *priv = file->private_data;
+        u32 event_log_flag;
+        char buf[8];
+        int buf_size;
+
+        memset(buf, 0, sizeof(buf));
+        buf_size = min(count, sizeof(buf) -  1);
+        if (copy_from_user(buf, user_buf, buf_size))
+                return -EFAULT;
+        if (sscanf(buf, "%d", &event_log_flag) != 1)
+                return -EFAULT;
+        if (event_log_flag == 1)
+                iwl_dump_nic_event_log(priv, true, NULL, false);
+
+        return count;
+}
+
+static ssize_t iwl_dbgfs_calib_disabled_read(struct file *file,
+                                         char __user *user_buf,
+                                         size_t count, loff_t *ppos)
+{
+        struct iwl_priv *priv = file->private_data;
+        char buf[120];
+        int pos = 0;
+        const size_t bufsz = sizeof(buf);
+
+        pos += scnprintf(buf + pos, bufsz - pos,
+                         "Sensitivity calibrations %s\n",
+                         (priv->calib_disabled &
+                                        IWL_SENSITIVITY_CALIB_DISABLED) ?
+                         "DISABLED" : "ENABLED");
+        pos += scnprintf(buf + pos, bufsz - pos,
+                         "Chain noise calibrations %s\n",
+                         (priv->calib_disabled &
+                                        IWL_CHAIN_NOISE_CALIB_DISABLED) ?
+                         "DISABLED" : "ENABLED");
+        pos += scnprintf(buf + pos, bufsz - pos,
+                         "Tx power calibrations %s\n",
+                         (priv->calib_disabled &
+                                        IWL_TX_POWER_CALIB_DISABLED) ?
+                         "DISABLED" : "ENABLED");
+
+        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+}
+
+static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
+                                              const char __user *user_buf,
+                                              size_t count, loff_t *ppos)
+{
+        struct iwl_priv *priv = file->private_data;
+        char buf[8];
+        u32 calib_disabled;
+        int buf_size;
+
+        memset(buf, 0, sizeof(buf));
+        buf_size = min(count, sizeof(buf) - 1);
+        if (copy_from_user(buf, user_buf, buf_size))
+                return -EFAULT;
+        if (sscanf(buf, "%x", &calib_disabled) != 1)
+                return -EFAULT;
+
+        priv->calib_disabled = calib_disabled;
+
+        return count;
+}
+
 DEBUGFS_READ_FILE_OPS(ucode_rx_stats);
 DEBUGFS_READ_FILE_OPS(ucode_tx_stats);
 DEBUGFS_READ_FILE_OPS(ucode_general_stats);
@@ -2483,20 +2333,20 @@ DEBUGFS_READ_FILE_OPS(sensitivity);
 DEBUGFS_READ_FILE_OPS(chain_noise);
 DEBUGFS_READ_FILE_OPS(power_save_status);
 DEBUGFS_WRITE_FILE_OPS(clear_ucode_statistics);
-DEBUGFS_WRITE_FILE_OPS(clear_traffic_statistics);
 DEBUGFS_READ_WRITE_FILE_OPS(ucode_tracing);
 DEBUGFS_READ_WRITE_FILE_OPS(missed_beacon);
 DEBUGFS_READ_WRITE_FILE_OPS(plcp_delta);
-DEBUGFS_READ_WRITE_FILE_OPS(force_reset);
+DEBUGFS_READ_WRITE_FILE_OPS(rf_reset);
 DEBUGFS_READ_FILE_OPS(rxon_flags);
 DEBUGFS_READ_FILE_OPS(rxon_filter_flags);
 DEBUGFS_WRITE_FILE_OPS(txfifo_flush);
 DEBUGFS_READ_FILE_OPS(ucode_bt_stats);
-DEBUGFS_WRITE_FILE_OPS(wd_timeout);
 DEBUGFS_READ_FILE_OPS(bt_traffic);
 DEBUGFS_READ_WRITE_FILE_OPS(protection_mode);
 DEBUGFS_READ_FILE_OPS(reply_tx_error);
 DEBUGFS_WRITE_FILE_OPS(echo_test);
+DEBUGFS_READ_WRITE_FILE_OPS(log_event);
+DEBUGFS_READ_WRITE_FILE_OPS(calib_disabled);
 
 /*
  * Create the debugfs files and directories
@@ -2537,15 +2387,11 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name)
         DEBUGFS_ADD_FILE(disable_ht40, dir_data, S_IWUSR | S_IRUSR);
         DEBUGFS_ADD_FILE(temperature, dir_data, S_IRUSR);
 
-        DEBUGFS_ADD_FILE(rx_statistics, dir_debug, S_IRUSR);
-        DEBUGFS_ADD_FILE(tx_statistics, dir_debug, S_IRUSR);
-        DEBUGFS_ADD_FILE(traffic_log, dir_debug, S_IWUSR | S_IRUSR);
         DEBUGFS_ADD_FILE(power_save_status, dir_debug, S_IRUSR);
         DEBUGFS_ADD_FILE(clear_ucode_statistics, dir_debug, S_IWUSR);
-        DEBUGFS_ADD_FILE(clear_traffic_statistics, dir_debug, S_IWUSR);
         DEBUGFS_ADD_FILE(missed_beacon, dir_debug, S_IWUSR);
         DEBUGFS_ADD_FILE(plcp_delta, dir_debug, S_IWUSR | S_IRUSR);
-        DEBUGFS_ADD_FILE(force_reset, dir_debug, S_IWUSR | S_IRUSR);
+        DEBUGFS_ADD_FILE(rf_reset, dir_debug, S_IWUSR | S_IRUSR);
         DEBUGFS_ADD_FILE(ucode_rx_stats, dir_debug, S_IRUSR);
         DEBUGFS_ADD_FILE(ucode_tx_stats, dir_debug, S_IRUSR);
         DEBUGFS_ADD_FILE(ucode_general_stats, dir_debug, S_IRUSR);
@@ -2558,17 +2404,16 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name)
         DEBUGFS_ADD_FILE(reply_tx_error, dir_debug, S_IRUSR);
         DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR);
         DEBUGFS_ADD_FILE(rxon_filter_flags, dir_debug, S_IWUSR);
-        DEBUGFS_ADD_FILE(wd_timeout, dir_debug, S_IWUSR);
         DEBUGFS_ADD_FILE(echo_test, dir_debug, S_IWUSR);
+        DEBUGFS_ADD_FILE(log_event, dir_debug, S_IWUSR | S_IRUSR);
+
         if (iwl_advanced_bt_coexist(priv))
                 DEBUGFS_ADD_FILE(bt_traffic, dir_debug, S_IRUSR);
 
-        DEBUGFS_ADD_BOOL(disable_sensitivity, dir_rf,
-                         &priv->disable_sens_cal);
-        DEBUGFS_ADD_BOOL(disable_chain_noise, dir_rf,
-                         &priv->disable_chain_noise_cal);
+        /* Calibrations disabled/enabled status*/
+        DEBUGFS_ADD_FILE(calib_disabled, dir_rf, S_IWUSR | S_IRUSR);
 
-        if (iwl_trans_dbgfs_register(trans(priv), dir_debug))
+        if (iwl_trans_dbgfs_register(priv->trans, dir_debug))
                 goto err;
         return 0;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 16956b777f96..70062379d0ec 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -38,6 +38,7 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
 
+#include "iwl-fw.h"
 #include "iwl-eeprom.h"
 #include "iwl-csr.h"
 #include "iwl-debug.h"
@@ -47,12 +48,9 @@
 #include "iwl-agn-rs.h"
 #include "iwl-agn-tt.h"
 #include "iwl-trans.h"
-#include "iwl-shared.h"
 #include "iwl-op-mode.h"
 #include "iwl-notif-wait.h"
 
-struct iwl_tx_queue;
-
 /* CT-KILL constants */
 #define CT_KILL_THRESHOLD_LEGACY   110 /* in Celsius */
 #define CT_KILL_THRESHOLD          114 /* in Celsius */
@@ -196,6 +194,7 @@ struct iwl_qos_info {
  * These states relate to a specific RA / TID.
  *
  * @IWL_AGG_OFF: aggregation is not used
+ * @IWL_AGG_STARTING: aggregation are starting (between start and oper)
  * @IWL_AGG_ON: aggregation session is up
  * @IWL_EMPTYING_HW_QUEUE_ADDBA: establishing a BA session - waiting for the
  *      HW queue to be empty from packets for this RA /TID.
@@ -204,6 +203,7 @@ struct iwl_qos_info {
  */
 enum iwl_agg_state {
         IWL_AGG_OFF = 0,
+        IWL_AGG_STARTING,
         IWL_AGG_ON,
         IWL_EMPTYING_HW_QUEUE_ADDBA,
         IWL_EMPTYING_HW_QUEUE_DELBA,
@@ -220,8 +220,7 @@ enum iwl_agg_state {
  *      Tx response (REPLY_TX), and the block ack notification
  *      (REPLY_COMPRESSED_BA).
  * @state: state of the BA agreement establishment / tear down.
- * @txq_id: Tx queue used by the BA session - used by the transport layer.
- *      Needed by the upper layer for debugfs only.
+ * @txq_id: Tx queue used by the BA session
  * @ssn: the first packet to be sent in AGG HW queue in Tx AGG start flow, or
  *      the first packet to be sent in legacy HW queue in Tx AGG stop flow.
  *      Basically when next_reclaimed reaches ssn, we can tell mac80211 that
@@ -507,44 +506,6 @@ struct reply_agg_tx_error_statistics {
         u32 unknown;
 };
 
-/* management statistics */
-enum iwl_mgmt_stats {
-        MANAGEMENT_ASSOC_REQ = 0,
-        MANAGEMENT_ASSOC_RESP,
-        MANAGEMENT_REASSOC_REQ,
-        MANAGEMENT_REASSOC_RESP,
-        MANAGEMENT_PROBE_REQ,
-        MANAGEMENT_PROBE_RESP,
-        MANAGEMENT_BEACON,
-        MANAGEMENT_ATIM,
-        MANAGEMENT_DISASSOC,
-        MANAGEMENT_AUTH,
-        MANAGEMENT_DEAUTH,
-        MANAGEMENT_ACTION,
-        MANAGEMENT_MAX,
-};
-/* control statistics */
-enum iwl_ctrl_stats {
-        CONTROL_BACK_REQ =  0,
-        CONTROL_BACK,
-        CONTROL_PSPOLL,
-        CONTROL_RTS,
-        CONTROL_CTS,
-        CONTROL_ACK,
-        CONTROL_CFEND,
-        CONTROL_CFENDACK,
-        CONTROL_MAX,
-};
-
-struct traffic_stats {
-#ifdef CONFIG_IWLWIFI_DEBUGFS
-        u32 mgmt[MANAGEMENT_MAX];
-        u32 ctrl[CONTROL_MAX];
-        u32 data_cnt;
-        u64 data_bytes;
-#endif
-};
-
 /*
  * schedule the timer to wake up every UCODE_TRACE_PERIOD milliseconds
  * to perform continuous uCode event logging operation if enabled
@@ -571,24 +532,7 @@ struct iwl_event_log {
         int wraps_more_count;
 };
 
-/*
- * This is the threshold value of plcp error rate per 100mSecs.  It is
- * used to set and check for the validity of plcp_delta.
- */
-#define IWL_MAX_PLCP_ERR_THRESHOLD_MIN  (1)
-#define IWL_MAX_PLCP_ERR_THRESHOLD_DEF  (50)
-#define IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF     (100)
-#define IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF (200)
-#define IWL_MAX_PLCP_ERR_THRESHOLD_MAX  (255)
-#define IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE      (0)
-
 #define IWL_DELAY_NEXT_FORCE_RF_RESET  (HZ*3)
-#define IWL_DELAY_NEXT_FORCE_FW_RELOAD (HZ*5)
-
-/* TX queue watchdog timeouts in mSecs */
-#define IWL_DEF_WD_TIMEOUT      (2000)
-#define IWL_LONG_WD_TIMEOUT     (10000)
-#define IWL_MAX_WD_TIMEOUT      (120000)
 
 /* BT Antenna Coupling Threshold (dB) */
 #define IWL_BT_ANTENNA_COUPLING_THRESHOLD       (35)
@@ -598,18 +542,18 @@ struct iwl_event_log {
 #define IWL_MAX_CONTINUE_RELOAD_CNT     4
 
 
-enum iwl_reset {
-        IWL_RF_RESET = 0,
-        IWL_FW_RESET,
-        IWL_MAX_FORCE_RESET,
-};
-
-struct iwl_force_reset {
+struct iwl_rf_reset {
         int reset_request_count;
         int reset_success_count;
         int reset_reject_count;
-        unsigned long reset_duration;
-        unsigned long last_force_reset_jiffies;
+        unsigned long last_reset_jiffies;
+};
+
+enum iwl_rxon_context_id {
+        IWL_RXON_CTX_BSS,
+        IWL_RXON_CTX_PAN,
+
+        NUM_IWL_RXON_CTX
 };
 
 /* extend beacon time format bit shifting  */
@@ -623,6 +567,10 @@ struct iwl_force_reset {
 struct iwl_rxon_context {
         struct ieee80211_vif *vif;
 
+        u8 mcast_queue;
+        u8 ac_to_queue[IEEE80211_NUM_ACS];
+        u8 ac_to_fifo[IEEE80211_NUM_ACS];
+
         /*
          * We could use the vif to indicate active, but we
          * also need it to be active during disabling when
@@ -677,6 +625,52 @@ enum iwl_scan_type {
         IWL_SCAN_ROC,
 };
 
+/**
+ * struct iwl_hw_params
+ *
+ * Holds the module parameters
+ *
+ * @tx_chains_num: Number of TX chains
+ * @rx_chains_num: Number of RX chains
+ * @valid_tx_ant: usable antennas for TX
+ * @valid_rx_ant: usable antennas for RX
+ * @ht40_channel: is 40MHz width possible: BIT(IEEE80211_BAND_XXX)
+ * @sku: sku read from EEPROM
+ * @ct_kill_threshold: temperature threshold - in hw dependent unit
+ * @ct_kill_exit_threshold: when to reeable the device - in hw dependent unit
+ *      relevant for 1000, 6000 and up
+ * @struct iwl_sensitivity_ranges: range of sensitivity values
+ * @use_rts_for_aggregation: use rts/cts protection for HT traffic
+ */
+struct iwl_hw_params {
+        u8  tx_chains_num;
+        u8  rx_chains_num;
+        u8  valid_tx_ant;
+        u8  valid_rx_ant;
+        u8  ht40_channel;
+        bool use_rts_for_aggregation;
+        u16 sku;
+        u32 ct_kill_threshold;
+        u32 ct_kill_exit_threshold;
+
+        const struct iwl_sensitivity_ranges *sens;
+};
+
+struct iwl_lib_ops {
+        /* set hw dependent parameters */
+        void (*set_hw_params)(struct iwl_priv *priv);
+        int (*set_channel_switch)(struct iwl_priv *priv,
+                                  struct ieee80211_channel_switch *ch_switch);
+        /* device specific configuration */
+        void (*nic_config)(struct iwl_priv *priv);
+
+        /* eeprom operations (as defined in iwl-eeprom.h) */
+        struct iwl_eeprom_ops eeprom_ops;
+
+        /* temperature */
+        void (*temperature)(struct iwl_priv *priv);
+};
+
 #ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE
 struct iwl_testmode_trace {
         u32 buff_size;
@@ -701,6 +695,17 @@ struct iwl_wipan_noa_data {
         u8 data[];
 };
 
+/* Calibration disabling bit mask */
+enum {
+        IWL_CALIB_ENABLE_ALL                    = 0,
+
+        IWL_SENSITIVITY_CALIB_DISABLED          = BIT(0),
+        IWL_CHAIN_NOISE_CALIB_DISABLED          = BIT(1),
+        IWL_TX_POWER_CALIB_DISABLED             = BIT(2),
+
+        IWL_CALIB_DISABLE_ALL                   = 0xFFFFFFFF,
+};
+
 #define IWL_OP_MODE_GET_DVM(_iwl_op_mode) \
         ((struct iwl_priv *) ((_iwl_op_mode)->op_mode_specific))
 
@@ -710,9 +715,11 @@ struct iwl_wipan_noa_data {
 
 struct iwl_priv {
 
-        /*data shared among all the driver's layers */
-        struct iwl_shared *shrd;
+        struct iwl_trans *trans;
+        struct device *dev;             /* for debug prints only */
+        const struct iwl_cfg *cfg;
         const struct iwl_fw *fw;
+        const struct iwl_lib_ops *lib;
         unsigned long status;
 
         spinlock_t sta_lock;
@@ -720,6 +727,11 @@ struct iwl_priv {
 
         unsigned long transport_queue_stop;
         bool passive_no_rx;
+#define IWL_INVALID_MAC80211_QUEUE      0xff
+        u8 queue_to_mac80211[IWL_MAX_HW_QUEUES];
+        atomic_t queue_stop_count[IWL_MAX_HW_QUEUES];
+
+        unsigned long agg_q_alloc[BITS_TO_LONGS(IWL_MAX_HW_QUEUES)];
 
         /* ieee device used by generic ieee processing code */
         struct ieee80211_hw *hw;
@@ -730,7 +742,10 @@ struct iwl_priv {
 
         struct workqueue_struct *workqueue;
 
+        struct iwl_hw_params hw_params;
+
         enum ieee80211_band band;
+        u8 valid_contexts;
 
         void (*pre_rx_handler)(struct iwl_priv *priv,
                                struct iwl_rx_cmd_buffer *rxb);
@@ -763,8 +778,8 @@ struct iwl_priv {
         /*counters */
         u32 rx_handlers_stats[REPLY_MAX];
 
-        /* force reset */
-        struct iwl_force_reset force_reset[IWL_MAX_FORCE_RESET];
+        /* rf reset */
+        struct iwl_rf_reset rf_reset;
 
         /* firmware reload counter and timestamp */
         unsigned long reload_jiffies;
@@ -810,8 +825,6 @@ struct iwl_priv {
 
         __le16 switch_channel;
 
-        u16 active_rate;
-
         u8 start_calib;
         struct iwl_sensitivity_data sensitivity_data;
         struct iwl_chain_noise_data chain_noise_data;
@@ -825,10 +838,6 @@ struct iwl_priv {
 
         int activity_timer_active;
 
-        /* counts mgmt, ctl, and data packets */
-        struct traffic_stats tx_stats;
-        struct traffic_stats rx_stats;
-
         struct iwl_power_mgr power_data;
         struct iwl_tt_mgmt thermal_throttle;
 
@@ -912,6 +921,7 @@ struct iwl_priv {
         __le32 kill_ack_mask;
         __le32 kill_cts_mask;
         __le16 bt_valid;
+        bool reduced_txpower;
         u16 bt_on_thresh;
         u16 bt_duration;
         u16 dynamic_frag_thresh;
@@ -948,23 +958,21 @@ struct iwl_priv {
 
 #ifdef CONFIG_IWLWIFI_DEBUGFS
         /* debugfs */
-        u16 tx_traffic_idx;
-        u16 rx_traffic_idx;
-        u8 *tx_traffic;
-        u8 *rx_traffic;
         struct dentry *debugfs_dir;
         u32 dbgfs_sram_offset, dbgfs_sram_len;
         bool disable_ht40;
         void *wowlan_sram;
 #endif /* CONFIG_IWLWIFI_DEBUGFS */
 
+        /* eeprom -- this is in the card's little endian byte order */
+        u8 *eeprom;
+        enum iwl_nvm_type nvm_device_type;
+
         struct work_struct txpower_work;
-        u32 disable_sens_cal;
-        u32 disable_chain_noise_cal;
+        u32 calib_disabled;
         struct work_struct run_time_calib_work;
         struct timer_list statistics_periodic;
         struct timer_list ucode_trace;
-        struct timer_list watchdog;
 
         struct iwl_event_log event_log;
 
@@ -982,10 +990,18 @@ struct iwl_priv {
         __le64 replay_ctr;
         __le16 last_seq_ctl;
         bool have_rekey_data;
+
+        /* device_pointers: pointers to ucode event tables */
+        struct {
+                u32 error_event_table;
+                u32 log_event_table;
+        } device_pointers;
+
+        /* indicator of loaded ucode image */
+        enum iwl_ucode_type cur_ucode;
 }; /*iwl_priv */
 
 extern struct kmem_cache *iwl_tx_cmd_pool;
-extern struct iwl_mod_params iwlagn_mod_params;
 
 static inline struct iwl_rxon_context *
 iwl_rxon_ctx_from_vif(struct ieee80211_vif *vif)
@@ -998,7 +1014,7 @@ iwl_rxon_ctx_from_vif(struct ieee80211_vif *vif)
 #define for_each_context(priv, ctx)                             \
         for (ctx = &priv->contexts[IWL_RXON_CTX_BSS];           \
              ctx < &priv->contexts[NUM_IWL_RXON_CTX]; ctx++)    \
-                if (priv->shrd->valid_contexts & BIT(ctx->ctxid))
+                if (priv->valid_contexts & BIT(ctx->ctxid))
 
 static inline int iwl_is_associated_ctx(struct iwl_rxon_context *ctx)
 {
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index 6f312c77af5e..3c72bad0ae56 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -66,10 +66,13 @@
 #include <linux/module.h>
 
 #include "iwl-drv.h"
+#include "iwl-debug.h"
 #include "iwl-trans.h"
-#include "iwl-shared.h"
 #include "iwl-op-mode.h"
 #include "iwl-agn-hw.h"
+#include "iwl-fw.h"
+#include "iwl-config.h"
+#include "iwl-modparams.h"
 
 /* private includes */
 #include "iwl-fw-file.h"
@@ -77,8 +80,10 @@
 /**
  * struct iwl_drv - drv common data
  * @fw: the iwl_fw structure
- * @shrd: pointer to common shared structure
  * @op_mode: the running op_mode
+ * @trans: transport layer
+ * @dev: for debug prints only
+ * @cfg: configuration struct
  * @fw_index: firmware revision to try loading
  * @firmware_name: composite filename of ucode file to load
  * @request_firmware_complete: the firmware has been obtained from user space
@@ -86,8 +91,10 @@
 struct iwl_drv {
         struct iwl_fw fw;
 
-        struct iwl_shared *shrd;
         struct iwl_op_mode *op_mode;
+        struct iwl_trans *trans;
+        struct device *dev;
+        const struct iwl_cfg *cfg;
 
         int fw_index;                   /* firmware we're trying to load */
         char firmware_name[25];         /* name of firmware file to load */
@@ -110,7 +117,7 @@ struct fw_sec {
 static void iwl_free_fw_desc(struct iwl_drv *drv, struct fw_desc *desc)
 {
         if (desc->v_addr)
-                dma_free_coherent(trans(drv)->dev, desc->len,
+                dma_free_coherent(drv->trans->dev, desc->len,
                                   desc->v_addr, desc->p_addr);
         desc->v_addr = NULL;
         desc->len = 0;
@@ -138,7 +145,7 @@ static int iwl_alloc_fw_desc(struct iwl_drv *drv, struct fw_desc *desc,
                 return -EINVAL;
         }
 
-        desc->v_addr = dma_alloc_coherent(trans(drv)->dev, sec->size,
+        desc->v_addr = dma_alloc_coherent(drv->trans->dev, sec->size,
                                           &desc->p_addr, GFP_KERNEL);
         if (!desc->v_addr)
                 return -ENOMEM;
@@ -156,8 +163,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context);
 
 static int iwl_request_firmware(struct iwl_drv *drv, bool first)
 {
-        const struct iwl_cfg *cfg = cfg(drv);
-        const char *name_pre = cfg->fw_name_pre;
+        const char *name_pre = drv->cfg->fw_name_pre;
         char tag[8];
 
         if (first) {
@@ -166,14 +172,14 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first)
                 strcpy(tag, UCODE_EXPERIMENTAL_TAG);
         } else if (drv->fw_index == UCODE_EXPERIMENTAL_INDEX) {
 #endif
-                drv->fw_index = cfg->ucode_api_max;
+                drv->fw_index = drv->cfg->ucode_api_max;
                 sprintf(tag, "%d", drv->fw_index);
         } else {
                 drv->fw_index--;
                 sprintf(tag, "%d", drv->fw_index);
         }
 
-        if (drv->fw_index < cfg->ucode_api_min) {
+        if (drv->fw_index < drv->cfg->ucode_api_min) {
                 IWL_ERR(drv, "no suitable firmware found!\n");
                 return -ENOENT;
         }
@@ -186,7 +192,7 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first)
                        drv->firmware_name);
 
         return request_firmware_nowait(THIS_MODULE, 1, drv->firmware_name,
-                                       trans(drv)->dev,
+                                       drv->trans->dev,
                                        GFP_KERNEL, drv, iwl_ucode_callback);
 }
 
@@ -284,6 +290,7 @@ static int iwl_store_ucode_sec(struct iwl_firmware_pieces *pieces,
 
         sec->offset = le32_to_cpu(sec_parse->offset);
         sec->data = sec_parse->data;
+        sec->size = size - sizeof(sec_parse->offset);
 
         ++img->sec_counter;
 
@@ -414,9 +421,6 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
         struct iwl_ucode_tlv *tlv;
         size_t len = ucode_raw->size;
         const u8 *data;
-        int wanted_alternative = iwlagn_mod_params.wanted_ucode_alternative;
-        int tmp;
-        u64 alternatives;
         u32 tlv_len;
         enum iwl_ucode_tlv_type tlv_type;
         const u8 *tlv_data;
@@ -434,23 +438,6 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
                 return -EINVAL;
         }
 
-        /*
-         * Check which alternatives are present, and "downgrade"
-         * when the chosen alternative is not present, warning
-         * the user when that happens. Some files may not have
-         * any alternatives, so don't warn in that case.
-         */
-        alternatives = le64_to_cpu(ucode->alternatives);
-        tmp = wanted_alternative;
-        if (wanted_alternative > 63)
-                wanted_alternative = 63;
-        while (wanted_alternative && !(alternatives & BIT(wanted_alternative)))
-                wanted_alternative--;
-        if (wanted_alternative && wanted_alternative != tmp)
-                IWL_WARN(drv,
-                         "uCode alternative %d not available, choosing %d\n",
-                         tmp, wanted_alternative);
-
         drv->fw.ucode_ver = le32_to_cpu(ucode->ver);
         build = le32_to_cpu(ucode->build);
 
@@ -475,14 +462,11 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
         len -= sizeof(*ucode);
 
         while (len >= sizeof(*tlv)) {
-                u16 tlv_alt;
-
                 len -= sizeof(*tlv);
                 tlv = (void *)data;
 
                 tlv_len = le32_to_cpu(tlv->length);
-                tlv_type = le16_to_cpu(tlv->type);
-                tlv_alt = le16_to_cpu(tlv->alternative);
+                tlv_type = le32_to_cpu(tlv->type);
                 tlv_data = tlv->data;
 
                 if (len < tlv_len) {
@@ -493,14 +477,6 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
                 len -= ALIGN(tlv_len, 4);
                 data += sizeof(*tlv) + ALIGN(tlv_len, 4);
 
-                /*
-                 * Alternative 0 is always valid.
-                 *
-                 * Skip alternative TLVs that are not selected.
-                 */
-                if (tlv_alt != 0 && tlv_alt != wanted_alternative)
-                        continue;
-
                 switch (tlv_type) {
                 case IWL_UCODE_TLV_INST:
                         set_sec_data(pieces, IWL_UCODE_REGULAR,
@@ -755,14 +731,13 @@ static int validate_sec_sizes(struct iwl_drv *drv,
 static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
 {
         struct iwl_drv *drv = context;
-        const struct iwl_cfg *cfg = cfg(drv);
         struct iwl_fw *fw = &drv->fw;
         struct iwl_ucode_header *ucode;
         int err;
         struct iwl_firmware_pieces pieces;
-        const unsigned int api_max = cfg->ucode_api_max;
-        unsigned int api_ok = cfg->ucode_api_ok;
-        const unsigned int api_min = cfg->ucode_api_min;
+        const unsigned int api_max = drv->cfg->ucode_api_max;
+        unsigned int api_ok = drv->cfg->ucode_api_ok;
+        const unsigned int api_min = drv->cfg->ucode_api_min;
         u32 api_ver;
         int i;
 
@@ -838,46 +813,10 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
         IWL_INFO(drv, "loaded firmware version %s", drv->fw.fw_version);
 
         /*
-         * For any of the failures below (before allocating pci memory)
-         * we will try to load a version with a smaller API -- maybe the
-         * user just got a corrupted version of the latest API.
-         */
-
-        IWL_DEBUG_INFO(drv, "f/w package hdr ucode version raw = 0x%x\n",
-                       drv->fw.ucode_ver);
-        IWL_DEBUG_INFO(drv, "f/w package hdr runtime inst size = %Zd\n",
-                get_sec_size(&pieces, IWL_UCODE_REGULAR,
-                             IWL_UCODE_SECTION_INST));
-        IWL_DEBUG_INFO(drv, "f/w package hdr runtime data size = %Zd\n",
-                get_sec_size(&pieces, IWL_UCODE_REGULAR,
-                             IWL_UCODE_SECTION_DATA));
-        IWL_DEBUG_INFO(drv, "f/w package hdr init inst size = %Zd\n",
-                get_sec_size(&pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_INST));
-        IWL_DEBUG_INFO(drv, "f/w package hdr init data size = %Zd\n",
-                get_sec_size(&pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_DATA));
-
-        /* Verify that uCode images will fit in card's SRAM */
-        if (get_sec_size(&pieces, IWL_UCODE_REGULAR, IWL_UCODE_SECTION_INST) >
-                                                        cfg->max_inst_size) {
-                IWL_ERR(drv, "uCode instr len %Zd too large to fit in\n",
-                        get_sec_size(&pieces, IWL_UCODE_REGULAR,
-                                     IWL_UCODE_SECTION_INST));
-                goto try_again;
-        }
-
-        if (get_sec_size(&pieces, IWL_UCODE_REGULAR, IWL_UCODE_SECTION_DATA) >
-                                                        cfg->max_data_size) {
-                IWL_ERR(drv, "uCode data len %Zd too large to fit in\n",
-                        get_sec_size(&pieces, IWL_UCODE_REGULAR,
-                                     IWL_UCODE_SECTION_DATA));
-                goto try_again;
-        }
-
-        /*
          * In mvm uCode there is no difference between data and instructions
          * sections.
          */
-        if (!fw->mvm_fw && validate_sec_sizes(drv, &pieces, cfg))
+        if (!fw->mvm_fw && validate_sec_sizes(drv, &pieces, drv->cfg))
                 goto try_again;
 
         /* Allocate ucode buffers for card's bus-master loading ... */
@@ -901,14 +840,14 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
                 fw->init_evtlog_size = (pieces.init_evtlog_size - 16)/12;
         else
                 fw->init_evtlog_size =
-                        cfg->base_params->max_event_log_size;
+                        drv->cfg->base_params->max_event_log_size;
         fw->init_errlog_ptr = pieces.init_errlog_ptr;
         fw->inst_evtlog_ptr = pieces.inst_evtlog_ptr;
         if (pieces.inst_evtlog_size)
                 fw->inst_evtlog_size = (pieces.inst_evtlog_size - 16)/12;
         else
                 fw->inst_evtlog_size =
-                        cfg->base_params->max_event_log_size;
+                        drv->cfg->base_params->max_event_log_size;
         fw->inst_errlog_ptr = pieces.inst_errlog_ptr;
 
         /*
@@ -924,7 +863,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
         release_firmware(ucode_raw);
         complete(&drv->request_firmware_complete);
 
-        drv->op_mode = iwl_dvm_ops.start(drv->shrd->trans, &drv->fw);
+        drv->op_mode = iwl_dvm_ops.start(drv->trans, drv->cfg, &drv->fw);
 
         if (!drv->op_mode)
                 goto out_unbind;
@@ -944,42 +883,38 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
         release_firmware(ucode_raw);
  out_unbind:
         complete(&drv->request_firmware_complete);
-        device_release_driver(trans(drv)->dev);
+        device_release_driver(drv->trans->dev);
 }
 
-int iwl_drv_start(struct iwl_shared *shrd,
-                  struct iwl_trans *trans, const struct iwl_cfg *cfg)
+struct iwl_drv *iwl_drv_start(struct iwl_trans *trans,
+                              const struct iwl_cfg *cfg)
 {
         struct iwl_drv *drv;
         int ret;
 
-        shrd->cfg = cfg;
-
         drv = kzalloc(sizeof(*drv), GFP_KERNEL);
-        if (!drv) {
-                dev_printk(KERN_ERR, trans->dev, "Couldn't allocate iwl_drv");
-                return -ENOMEM;
-        }
-        drv->shrd = shrd;
-        shrd->drv = drv;
+        if (!drv)
+                return NULL;
+
+        drv->trans = trans;
+        drv->dev = trans->dev;
+        drv->cfg = cfg;
 
         init_completion(&drv->request_firmware_complete);
 
         ret = iwl_request_firmware(drv, true);
 
         if (ret) {
-                dev_printk(KERN_ERR, trans->dev, "Couldn't request the fw");
+                IWL_ERR(trans, "Couldn't request the fw\n");
                 kfree(drv);
-                shrd->drv = NULL;
+                drv = NULL;
         }
 
-        return ret;
+        return drv;
 }
 
-void iwl_drv_stop(struct iwl_shared *shrd)
+void iwl_drv_stop(struct iwl_drv *drv)
 {
-        struct iwl_drv *drv = shrd->drv;
-
         wait_for_completion(&drv->request_firmware_complete);
 
         /* op_mode can be NULL if its start failed */
@@ -989,5 +924,95 @@ void iwl_drv_stop(struct iwl_shared *shrd)
         iwl_dealloc_ucode(drv);
 
         kfree(drv);
-        shrd->drv = NULL;
 }
+
+
+/* shared module parameters */
+struct iwl_mod_params iwlwifi_mod_params = {
+        .amsdu_size_8K = 1,
+        .restart_fw = 1,
+        .plcp_check = true,
+        .bt_coex_active = true,
+        .power_level = IWL_POWER_INDEX_1,
+        .bt_ch_announce = true,
+        .auto_agg = true,
+        /* the rest are 0 by default */
+};
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+module_param_named(debug, iwlwifi_mod_params.debug_level, uint,
+                   S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "debug output mask");
+#endif
+
+module_param_named(swcrypto, iwlwifi_mod_params.sw_crypto, int, S_IRUGO);
+MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])");
+module_param_named(11n_disable, iwlwifi_mod_params.disable_11n, uint, S_IRUGO);
+MODULE_PARM_DESC(11n_disable,
+        "disable 11n functionality, bitmap: 1: full, 2: agg TX, 4: agg RX");
+module_param_named(amsdu_size_8K, iwlwifi_mod_params.amsdu_size_8K,
+                   int, S_IRUGO);
+MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size");
+module_param_named(fw_restart, iwlwifi_mod_params.restart_fw, int, S_IRUGO);
+MODULE_PARM_DESC(fw_restart, "restart firmware in case of error");
+
+module_param_named(antenna_coupling, iwlwifi_mod_params.ant_coupling,
+                   int, S_IRUGO);
+MODULE_PARM_DESC(antenna_coupling,
+                 "specify antenna coupling in dB (defualt: 0 dB)");
+
+module_param_named(bt_ch_inhibition, iwlwifi_mod_params.bt_ch_announce,
+                   bool, S_IRUGO);
+MODULE_PARM_DESC(bt_ch_inhibition,
+                 "Enable BT channel inhibition (default: enable)");
+
+module_param_named(plcp_check, iwlwifi_mod_params.plcp_check, bool, S_IRUGO);
+MODULE_PARM_DESC(plcp_check, "Check plcp health (default: 1 [enabled])");
+
+module_param_named(wd_disable, iwlwifi_mod_params.wd_disable, int, S_IRUGO);
+MODULE_PARM_DESC(wd_disable,
+                "Disable stuck queue watchdog timer 0=system default, "
+                "1=disable, 2=enable (default: 0)");
+
+/*
+ * set bt_coex_active to true, uCode will do kill/defer
+ * every time the priority line is asserted (BT is sending signals on the
+ * priority line in the PCIx).
+ * set bt_coex_active to false, uCode will ignore the BT activity and
+ * perform the normal operation
+ *
+ * User might experience transmit issue on some platform due to WiFi/BT
+ * co-exist problem. The possible behaviors are:
+ *   Able to scan and finding all the available AP
+ *   Not able to associate with any AP
+ * On those platforms, WiFi communication can be restored by set
+ * "bt_coex_active" module parameter to "false"
+ *
+ * default: bt_coex_active = true (BT_COEX_ENABLE)
+ */
+module_param_named(bt_coex_active, iwlwifi_mod_params.bt_coex_active,
+                bool, S_IRUGO);
+MODULE_PARM_DESC(bt_coex_active, "enable wifi/bt co-exist (default: enable)");
+
+module_param_named(led_mode, iwlwifi_mod_params.led_mode, int, S_IRUGO);
+MODULE_PARM_DESC(led_mode, "0=system default, "
+                "1=On(RF On)/Off(RF Off), 2=blinking, 3=Off (default: 0)");
+
+module_param_named(power_save, iwlwifi_mod_params.power_save,
+                bool, S_IRUGO);
+MODULE_PARM_DESC(power_save,
+                 "enable WiFi power management (default: disable)");
+
+module_param_named(power_level, iwlwifi_mod_params.power_level,
+                int, S_IRUGO);
+MODULE_PARM_DESC(power_level,
+                 "default power save level (range from 1 - 5, default: 1)");
+
+module_param_named(auto_agg, iwlwifi_mod_params.auto_agg,
+                bool, S_IRUGO);
+MODULE_PARM_DESC(auto_agg,
+                 "enable agg w/o check traffic load (default: enable)");
+
+module_param_named(5ghz_disable, iwlwifi_mod_params.disable_5ghz,
+                bool, S_IRUGO);
+MODULE_PARM_DESC(5ghz_disable, "disable 5GHz band (default: 0 [enabled])");
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.h b/drivers/net/wireless/iwlwifi/iwl-drv.h
index 3b771c1d9096..2cbf137b25bf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.h
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.h
@@ -63,7 +63,12 @@
 #ifndef __iwl_drv_h__
 #define __iwl_drv_h__
 
-#include "iwl-shared.h"
+/* for all modules */
+#define DRV_NAME        "iwlwifi"
+#define IWLWIFI_VERSION "in-tree:"
+#define DRV_COPYRIGHT   "Copyright(c) 2003-2012 Intel Corporation"
+#define DRV_AUTHOR     "<ilw@linux.intel.com>"
+
 
 /**
  * DOC: Driver system flows - drv component
@@ -90,34 +95,32 @@
  * 8) iwl_ucode_callback starts the wifi implementation to matches the fw
  */
 
+struct iwl_drv;
+struct iwl_trans;
+struct iwl_cfg;
 /**
  * iwl_drv_start - start the drv
  *
- * @shrd: the shrd area
  * @trans_ops: the ops of the transport
  * @cfg: device specific constants / virtual functions
  *
- * TODO: review the parameters given to this function
- *
  * starts the driver: fetches the firmware. This should be called by bus
  * specific system flows implementations. For example, the bus specific probe
  * function should do bus related operations only, and then call to this
- * function.
+ * function. It returns the driver object or %NULL if an error occured.
  */
-int iwl_drv_start(struct iwl_shared *shrd,
-                  struct iwl_trans *trans, const struct iwl_cfg *cfg);
+struct iwl_drv *iwl_drv_start(struct iwl_trans *trans,
+                              const struct iwl_cfg *cfg);
 
 /**
  * iwl_drv_stop - stop the drv
  *
- * @shrd: the shrd area
- *
- * TODO: review the parameters given to this function
+ * @drv:
  *
  * Stop the driver. This should be called by bus specific system flows
  * implementations. For example, the bus specific remove function should first
  * call this function and then do the bus related operations only.
  */
-void iwl_drv_stop(struct iwl_shared *shrd);
+void iwl_drv_stop(struct iwl_drv *drv);
 
 #endif /* __iwl_drv_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index 23cea42b9495..50c58911e718 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -68,9 +68,7 @@
 
 #include <net/mac80211.h>
 
-#include "iwl-commands.h"
 #include "iwl-dev.h"
-#include "iwl-core.h"
 #include "iwl-debug.h"
 #include "iwl-agn.h"
 #include "iwl-eeprom.h"
@@ -187,33 +185,33 @@ static void iwl_eeprom_release_semaphore(struct iwl_trans *trans)
 
 }
 
-static int iwl_eeprom_verify_signature(struct iwl_trans *trans)
+static int iwl_eeprom_verify_signature(struct iwl_priv *priv)
 {
-        u32 gp = iwl_read32(trans, CSR_EEPROM_GP) &
+        u32 gp = iwl_read32(priv->trans, CSR_EEPROM_GP) &
                            CSR_EEPROM_GP_VALID_MSK;
         int ret = 0;
 
-        IWL_DEBUG_EEPROM(trans, "EEPROM signature=0x%08x\n", gp);
+        IWL_DEBUG_EEPROM(priv, "EEPROM signature=0x%08x\n", gp);
         switch (gp) {
         case CSR_EEPROM_GP_BAD_SIG_EEP_GOOD_SIG_OTP:
-                if (trans->nvm_device_type != NVM_DEVICE_TYPE_OTP) {
-                        IWL_ERR(trans, "EEPROM with bad signature: 0x%08x\n",
+                if (priv->nvm_device_type != NVM_DEVICE_TYPE_OTP) {
+                        IWL_ERR(priv, "EEPROM with bad signature: 0x%08x\n",
                                 gp);
                         ret = -ENOENT;
                 }
                 break;
         case CSR_EEPROM_GP_GOOD_SIG_EEP_LESS_THAN_4K:
         case CSR_EEPROM_GP_GOOD_SIG_EEP_MORE_THAN_4K:
-                if (trans->nvm_device_type != NVM_DEVICE_TYPE_EEPROM) {
-                        IWL_ERR(trans, "OTP with bad signature: 0x%08x\n", gp);
+                if (priv->nvm_device_type != NVM_DEVICE_TYPE_EEPROM) {
+                        IWL_ERR(priv, "OTP with bad signature: 0x%08x\n", gp);
                         ret = -ENOENT;
                 }
                 break;
         case CSR_EEPROM_GP_BAD_SIGNATURE_BOTH_EEP_AND_OTP:
         default:
-                IWL_ERR(trans, "bad EEPROM/OTP signature, type=%s, "
+                IWL_ERR(priv, "bad EEPROM/OTP signature, type=%s, "
                         "EEPROM_GP=0x%08x\n",
-                        (trans->nvm_device_type == NVM_DEVICE_TYPE_OTP)
+                        (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP)
                         ? "OTP" : "EEPROM", gp);
                 ret = -ENOENT;
                 break;
@@ -221,11 +219,11 @@ static int iwl_eeprom_verify_signature(struct iwl_trans *trans)
         return ret;
 }
 
-u16 iwl_eeprom_query16(const struct iwl_shared *shrd, size_t offset)
+u16 iwl_eeprom_query16(struct iwl_priv *priv, size_t offset)
 {
-        if (!shrd->eeprom)
+        if (!priv->eeprom)
                 return 0;
-        return (u16)shrd->eeprom[offset] | ((u16)shrd->eeprom[offset + 1] << 8);
+        return (u16)priv->eeprom[offset] | ((u16)priv->eeprom[offset + 1] << 8);
 }
 
 int iwl_eeprom_check_version(struct iwl_priv *priv)
@@ -233,11 +231,11 @@ int iwl_eeprom_check_version(struct iwl_priv *priv)
         u16 eeprom_ver;
         u16 calib_ver;
 
-        eeprom_ver = iwl_eeprom_query16(priv->shrd, EEPROM_VERSION);
-        calib_ver = iwl_eeprom_calib_version(priv->shrd);
+        eeprom_ver = iwl_eeprom_query16(priv, EEPROM_VERSION);
+        calib_ver = iwl_eeprom_calib_version(priv);
 
-        if (eeprom_ver < cfg(priv)->eeprom_ver ||
-            calib_ver < cfg(priv)->eeprom_calib_ver)
+        if (eeprom_ver < priv->cfg->eeprom_ver ||
+            calib_ver < priv->cfg->eeprom_calib_ver)
                 goto err;
 
         IWL_INFO(priv, "device EEPROM VER=0x%x, CALIB=0x%x\n",
@@ -247,58 +245,115 @@ int iwl_eeprom_check_version(struct iwl_priv *priv)
 err:
         IWL_ERR(priv, "Unsupported (too old) EEPROM VER=0x%x < 0x%x "
                   "CALIB=0x%x < 0x%x\n",
-                  eeprom_ver, cfg(priv)->eeprom_ver,
-                  calib_ver,  cfg(priv)->eeprom_calib_ver);
+                  eeprom_ver, priv->cfg->eeprom_ver,
+                  calib_ver,  priv->cfg->eeprom_calib_ver);
         return -EINVAL;
 
 }
 
 int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
 {
-        struct iwl_shared *shrd = priv->shrd;
         u16 radio_cfg;
 
-        hw_params(priv).sku = iwl_eeprom_query16(shrd, EEPROM_SKU_CAP);
-        if (hw_params(priv).sku & EEPROM_SKU_CAP_11N_ENABLE &&
-            !cfg(priv)->ht_params) {
+        priv->hw_params.sku = iwl_eeprom_query16(priv, EEPROM_SKU_CAP);
+        if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE &&
+            !priv->cfg->ht_params) {
                 IWL_ERR(priv, "Invalid 11n configuration\n");
                 return -EINVAL;
         }
 
-        if (!hw_params(priv).sku) {
+        if (!priv->hw_params.sku) {
                 IWL_ERR(priv, "Invalid device sku\n");
                 return -EINVAL;
         }
 
-        IWL_INFO(priv, "Device SKU: 0x%X\n", hw_params(priv).sku);
+        IWL_INFO(priv, "Device SKU: 0x%X\n", priv->hw_params.sku);
 
-        radio_cfg = iwl_eeprom_query16(shrd, EEPROM_RADIO_CONFIG);
+        radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);
 
-        hw_params(priv).valid_tx_ant = EEPROM_RF_CFG_TX_ANT_MSK(radio_cfg);
-        hw_params(priv).valid_rx_ant = EEPROM_RF_CFG_RX_ANT_MSK(radio_cfg);
+        priv->hw_params.valid_tx_ant = EEPROM_RF_CFG_TX_ANT_MSK(radio_cfg);
+        priv->hw_params.valid_rx_ant = EEPROM_RF_CFG_RX_ANT_MSK(radio_cfg);
 
         /* check overrides (some devices have wrong EEPROM) */
-        if (cfg(priv)->valid_tx_ant)
-                hw_params(priv).valid_tx_ant = cfg(priv)->valid_tx_ant;
-        if (cfg(priv)->valid_rx_ant)
-                hw_params(priv).valid_rx_ant = cfg(priv)->valid_rx_ant;
+        if (priv->cfg->valid_tx_ant)
+                priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;
+        if (priv->cfg->valid_rx_ant)
+                priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;
 
-        if (!hw_params(priv).valid_tx_ant || !hw_params(priv).valid_rx_ant) {
+        if (!priv->hw_params.valid_tx_ant || !priv->hw_params.valid_rx_ant) {
                 IWL_ERR(priv, "Invalid chain (0x%X, 0x%X)\n",
-                        hw_params(priv).valid_tx_ant,
-                        hw_params(priv).valid_rx_ant);
+                        priv->hw_params.valid_tx_ant,
+                        priv->hw_params.valid_rx_ant);
                 return -EINVAL;
         }
 
         IWL_INFO(priv, "Valid Tx ant: 0x%X, Valid Rx ant: 0x%X\n",
-                 hw_params(priv).valid_tx_ant, hw_params(priv).valid_rx_ant);
+                 priv->hw_params.valid_tx_ant, priv->hw_params.valid_rx_ant);
 
         return 0;
 }
 
-void iwl_eeprom_get_mac(const struct iwl_shared *shrd, u8 *mac)
+u16 iwl_eeprom_calib_version(struct iwl_priv *priv)
 {
-        const u8 *addr = iwl_eeprom_query_addr(shrd,
+        struct iwl_eeprom_calib_hdr *hdr;
+
+        hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(priv,
+                                                        EEPROM_CALIB_ALL);
+        return hdr->version;
+}
+
+static u32 eeprom_indirect_address(struct iwl_priv *priv, u32 address)
+{
+        u16 offset = 0;
+
+        if ((address & INDIRECT_ADDRESS) == 0)
+                return address;
+
+        switch (address & INDIRECT_TYPE_MSK) {
+        case INDIRECT_HOST:
+                offset = iwl_eeprom_query16(priv, EEPROM_LINK_HOST);
+                break;
+        case INDIRECT_GENERAL:
+                offset = iwl_eeprom_query16(priv, EEPROM_LINK_GENERAL);
+                break;
+        case INDIRECT_REGULATORY:
+                offset = iwl_eeprom_query16(priv, EEPROM_LINK_REGULATORY);
+                break;
+        case INDIRECT_TXP_LIMIT:
+                offset = iwl_eeprom_query16(priv, EEPROM_LINK_TXP_LIMIT);
+                break;
+        case INDIRECT_TXP_LIMIT_SIZE:
+                offset = iwl_eeprom_query16(priv, EEPROM_LINK_TXP_LIMIT_SIZE);
+                break;
+        case INDIRECT_CALIBRATION:
+                offset = iwl_eeprom_query16(priv, EEPROM_LINK_CALIBRATION);
+                break;
+        case INDIRECT_PROCESS_ADJST:
+                offset = iwl_eeprom_query16(priv, EEPROM_LINK_PROCESS_ADJST);
+                break;
+        case INDIRECT_OTHERS:
+                offset = iwl_eeprom_query16(priv, EEPROM_LINK_OTHERS);
+                break;
+        default:
+                IWL_ERR(priv, "illegal indirect type: 0x%X\n",
+                address & INDIRECT_TYPE_MSK);
+                break;
+        }
+
+        /* translate the offset from words to byte */
+        return (address & ADDRESS_MSK) + (offset << 1);
+}
+
+const u8 *iwl_eeprom_query_addr(struct iwl_priv *priv, size_t offset)
+{
+        u32 address = eeprom_indirect_address(priv, offset);
+        BUG_ON(address >= priv->cfg->base_params->eeprom_size);
+        return &priv->eeprom[address];
+}
+
+void iwl_eeprom_get_mac(struct iwl_priv *priv, u8 *mac)
+{
+        const u8 *addr = iwl_eeprom_query_addr(priv,
                                         EEPROM_MAC_ADDRESS);
         memcpy(mac, addr, ETH_ALEN);
 }
@@ -376,7 +431,7 @@ static int iwl_init_otp_access(struct iwl_trans *trans)
                  * CSR auto clock gate disable bit -
                  * this is only applicable for HW with OTP shadow RAM
                  */
-                if (cfg(trans)->base_params->shadow_ram_support)
+                if (trans->cfg->base_params->shadow_ram_support)
                         iwl_set_bit(trans, CSR_DBG_LINK_PWR_MGMT_REG,
                                 CSR_RESET_LINK_PWR_MGMT_DISABLED);
         }
@@ -497,7 +552,7 @@ static int iwl_find_otp_image(struct iwl_trans *trans,
                 }
                 /* more in the link list, continue */
                 usedblocks++;
-        } while (usedblocks <= cfg(trans)->base_params->max_ll_items);
+        } while (usedblocks <= trans->cfg->base_params->max_ll_items);
 
         /* OTP has no valid blocks */
         IWL_DEBUG_EEPROM(trans, "OTP has no valid blocks\n");
@@ -591,7 +646,6 @@ iwl_eeprom_enh_txp_read_element(struct iwl_priv *priv,
 
 static void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)
 {
-        struct iwl_shared *shrd = priv->shrd;
         struct iwl_eeprom_enhanced_txpwr *txp_array, *txp;
         int idx, entries;
         __le16 *txp_len;
@@ -600,10 +654,10 @@ static void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)
         BUILD_BUG_ON(sizeof(struct iwl_eeprom_enhanced_txpwr) != 8);
 
         /* the length is in 16-bit words, but we want entries */
-        txp_len = (__le16 *) iwl_eeprom_query_addr(shrd, EEPROM_TXP_SZ_OFFS);
+        txp_len = (__le16 *) iwl_eeprom_query_addr(priv, EEPROM_TXP_SZ_OFFS);
         entries = le16_to_cpup(txp_len) * 2 / EEPROM_TXP_ENTRY_LEN;
 
-        txp_array = (void *) iwl_eeprom_query_addr(shrd, EEPROM_TXP_OFFS);
+        txp_array = (void *) iwl_eeprom_query_addr(priv, EEPROM_TXP_OFFS);
 
         for (idx = 0; idx < entries; idx++) {
                 txp = &txp_array[idx];
@@ -637,7 +691,7 @@ static void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)
                                  ((txp->delta_20_in_40 & 0xf0) >> 4),
                                  (txp->delta_20_in_40 & 0x0f));
 
-                max_txp_avg = iwl_get_max_txpower_avg(cfg(priv), txp_array, idx,
+                max_txp_avg = iwl_get_max_txpower_avg(priv->cfg, txp_array, idx,
                                                       &max_txp_avg_halfdbm);
 
                 /*
@@ -656,66 +710,66 @@ static void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)
 /**
  * iwl_eeprom_init - read EEPROM contents
  *
- * Load the EEPROM contents from adapter into shrd->eeprom
+ * Load the EEPROM contents from adapter into priv->eeprom
  *
  * NOTE:  This routine uses the non-debug IO access functions.
  */
-int iwl_eeprom_init(struct iwl_trans *trans, u32 hw_rev)
+int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev)
 {
         __le16 *e;
-        u32 gp = iwl_read32(trans, CSR_EEPROM_GP);
+        u32 gp = iwl_read32(priv->trans, CSR_EEPROM_GP);
         int sz;
         int ret;
         u16 addr;
         u16 validblockaddr = 0;
         u16 cache_addr = 0;
 
-        trans->nvm_device_type = iwl_get_nvm_type(trans, hw_rev);
-        if (trans->nvm_device_type == -ENOENT)
+        priv->nvm_device_type = iwl_get_nvm_type(priv->trans, hw_rev);
+        if (priv->nvm_device_type == -ENOENT)
                 return -ENOENT;
         /* allocate eeprom */
-        sz = cfg(trans)->base_params->eeprom_size;
-        IWL_DEBUG_EEPROM(trans, "NVM size = %d\n", sz);
-        trans->shrd->eeprom = kzalloc(sz, GFP_KERNEL);
-        if (!trans->shrd->eeprom) {
+        sz = priv->cfg->base_params->eeprom_size;
+        IWL_DEBUG_EEPROM(priv, "NVM size = %d\n", sz);
+        priv->eeprom = kzalloc(sz, GFP_KERNEL);
+        if (!priv->eeprom) {
                 ret = -ENOMEM;
                 goto alloc_err;
         }
-        e = (__le16 *)trans->shrd->eeprom;
+        e = (__le16 *)priv->eeprom;
 
-        ret = iwl_eeprom_verify_signature(trans);
+        ret = iwl_eeprom_verify_signature(priv);
         if (ret < 0) {
-                IWL_ERR(trans, "EEPROM not found, EEPROM_GP=0x%08x\n", gp);
+                IWL_ERR(priv, "EEPROM not found, EEPROM_GP=0x%08x\n", gp);
                 ret = -ENOENT;
                 goto err;
         }
 
         /* Make sure driver (instead of uCode) is allowed to read EEPROM */
-        ret = iwl_eeprom_acquire_semaphore(trans);
+        ret = iwl_eeprom_acquire_semaphore(priv->trans);
         if (ret < 0) {
-                IWL_ERR(trans, "Failed to acquire EEPROM semaphore.\n");
+                IWL_ERR(priv, "Failed to acquire EEPROM semaphore.\n");
                 ret = -ENOENT;
                 goto err;
         }
 
-        if (trans->nvm_device_type == NVM_DEVICE_TYPE_OTP) {
+        if (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP) {
 
-                ret = iwl_init_otp_access(trans);
+                ret = iwl_init_otp_access(priv->trans);
                 if (ret) {
-                        IWL_ERR(trans, "Failed to initialize OTP access.\n");
+                        IWL_ERR(priv, "Failed to initialize OTP access.\n");
                         ret = -ENOENT;
                         goto done;
                 }
-                iwl_write32(trans, CSR_EEPROM_GP,
-                            iwl_read32(trans, CSR_EEPROM_GP) &
+                iwl_write32(priv->trans, CSR_EEPROM_GP,
+                            iwl_read32(priv->trans, CSR_EEPROM_GP) &
                             ~CSR_EEPROM_GP_IF_OWNER_MSK);
 
-                iwl_set_bit(trans, CSR_OTP_GP_REG,
+                iwl_set_bit(priv->trans, CSR_OTP_GP_REG,
                              CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK |
                              CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);
                 /* traversing the linked list if no shadow ram supported */
-                if (!cfg(trans)->base_params->shadow_ram_support) {
-                        if (iwl_find_otp_image(trans, &validblockaddr)) {
+                if (!priv->cfg->base_params->shadow_ram_support) {
+                        if (iwl_find_otp_image(priv->trans, &validblockaddr)) {
                                 ret = -ENOENT;
                                 goto done;
                         }
@@ -724,7 +778,8 @@ int iwl_eeprom_init(struct iwl_trans *trans, u32 hw_rev)
                      addr += sizeof(u16)) {
                         __le16 eeprom_data;
 
-                        ret = iwl_read_otp_word(trans, addr, &eeprom_data);
+                        ret = iwl_read_otp_word(priv->trans, addr,
+                                                &eeprom_data);
                         if (ret)
                                 goto done;
                         e[cache_addr / 2] = eeprom_data;
@@ -735,94 +790,93 @@ int iwl_eeprom_init(struct iwl_trans *trans, u32 hw_rev)
                 for (addr = 0; addr < sz; addr += sizeof(u16)) {
                         u32 r;
 
-                        iwl_write32(trans, CSR_EEPROM_REG,
+                        iwl_write32(priv->trans, CSR_EEPROM_REG,
                                     CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
 
-                        ret = iwl_poll_bit(trans, CSR_EEPROM_REG,
+                        ret = iwl_poll_bit(priv->trans, CSR_EEPROM_REG,
                                                   CSR_EEPROM_REG_READ_VALID_MSK,
                                                   CSR_EEPROM_REG_READ_VALID_MSK,
                                                   IWL_EEPROM_ACCESS_TIMEOUT);
                         if (ret < 0) {
-                                IWL_ERR(trans,
+                                IWL_ERR(priv,
                                         "Time out reading EEPROM[%d]\n", addr);
                                 goto done;
                         }
-                        r = iwl_read32(trans, CSR_EEPROM_REG);
+                        r = iwl_read32(priv->trans, CSR_EEPROM_REG);
                         e[addr / 2] = cpu_to_le16(r >> 16);
                 }
         }
 
-        IWL_DEBUG_EEPROM(trans, "NVM Type: %s, version: 0x%x\n",
-                       (trans->nvm_device_type == NVM_DEVICE_TYPE_OTP)
+        IWL_DEBUG_EEPROM(priv, "NVM Type: %s, version: 0x%x\n",
+                       (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP)
                        ? "OTP" : "EEPROM",
-                       iwl_eeprom_query16(trans->shrd, EEPROM_VERSION));
+                       iwl_eeprom_query16(priv, EEPROM_VERSION));
 
         ret = 0;
 done:
-        iwl_eeprom_release_semaphore(trans);
+        iwl_eeprom_release_semaphore(priv->trans);
 
 err:
         if (ret)
-                iwl_eeprom_free(trans->shrd);
+                iwl_eeprom_free(priv);
 alloc_err:
         return ret;
 }
 
-void iwl_eeprom_free(struct iwl_shared *shrd)
+void iwl_eeprom_free(struct iwl_priv *priv)
 {
-        kfree(shrd->eeprom);
-        shrd->eeprom = NULL;
+        kfree(priv->eeprom);
+        priv->eeprom = NULL;
 }
 
-static void iwl_init_band_reference(const struct iwl_priv *priv,
+static void iwl_init_band_reference(struct iwl_priv *priv,
                         int eep_band, int *eeprom_ch_count,
                         const struct iwl_eeprom_channel **eeprom_ch_info,
                         const u8 **eeprom_ch_index)
 {
-        struct iwl_shared *shrd = priv->shrd;
-        u32 offset = cfg(priv)->lib->
+        u32 offset = priv->lib->
                         eeprom_ops.regulatory_bands[eep_band - 1];
         switch (eep_band) {
         case 1:         /* 2.4GHz band */
                 *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_1);
                 *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(shrd, offset);
+                                iwl_eeprom_query_addr(priv, offset);
                 *eeprom_ch_index = iwl_eeprom_band_1;
                 break;
         case 2:         /* 4.9GHz band */
                 *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_2);
                 *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(shrd, offset);
+                                iwl_eeprom_query_addr(priv, offset);
                 *eeprom_ch_index = iwl_eeprom_band_2;
                 break;
         case 3:         /* 5.2GHz band */
                 *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_3);
                 *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(shrd, offset);
+                                iwl_eeprom_query_addr(priv, offset);
                 *eeprom_ch_index = iwl_eeprom_band_3;
                 break;
         case 4:         /* 5.5GHz band */
                 *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_4);
                 *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(shrd, offset);
+                                iwl_eeprom_query_addr(priv, offset);
                 *eeprom_ch_index = iwl_eeprom_band_4;
                 break;
         case 5:         /* 5.7GHz band */
                 *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_5);
                 *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(shrd, offset);
+                                iwl_eeprom_query_addr(priv, offset);
                 *eeprom_ch_index = iwl_eeprom_band_5;
                 break;
         case 6:         /* 2.4GHz ht40 channels */
                 *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_6);
                 *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(shrd, offset);
+                                iwl_eeprom_query_addr(priv, offset);
                 *eeprom_ch_index = iwl_eeprom_band_6;
                 break;
         case 7:         /* 5 GHz ht40 channels */
                 *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_7);
                 *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(shrd, offset);
+                                iwl_eeprom_query_addr(priv, offset);
                 *eeprom_ch_index = iwl_eeprom_band_7;
                 break;
         default:
@@ -987,9 +1041,9 @@ int iwl_init_channel_map(struct iwl_priv *priv)
         }
 
         /* Check if we do have HT40 channels */
-        if (cfg(priv)->lib->eeprom_ops.regulatory_bands[5] ==
+        if (priv->lib->eeprom_ops.regulatory_bands[5] ==
             EEPROM_REGULATORY_BAND_NO_HT40 &&
-            cfg(priv)->lib->eeprom_ops.regulatory_bands[6] ==
+            priv->lib->eeprom_ops.regulatory_bands[6] ==
             EEPROM_REGULATORY_BAND_NO_HT40)
                 return 0;
 
@@ -1025,7 +1079,7 @@ int iwl_init_channel_map(struct iwl_priv *priv)
          * driver need to process addition information
          * to determine the max channel tx power limits
          */
-        if (cfg(priv)->lib->eeprom_ops.enhanced_txpower)
+        if (priv->lib->eeprom_ops.enhanced_txpower)
                 iwl_eeprom_enhanced_txpower(priv);
 
         return 0;
@@ -1072,11 +1126,11 @@ void iwl_rf_config(struct iwl_priv *priv)
 {
         u16 radio_cfg;
 
-        radio_cfg = iwl_eeprom_query16(priv->shrd, EEPROM_RADIO_CONFIG);
+        radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);
 
         /* write radio config values to register */
         if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) <= EEPROM_RF_CONFIG_TYPE_MAX) {
-                iwl_set_bit(trans(priv), CSR_HW_IF_CONFIG_REG,
+                iwl_set_bit(priv->trans, CSR_HW_IF_CONFIG_REG,
                             EEPROM_RF_CFG_TYPE_MSK(radio_cfg) |
                             EEPROM_RF_CFG_STEP_MSK(radio_cfg) |
                             EEPROM_RF_CFG_DASH_MSK(radio_cfg));
@@ -1088,7 +1142,7 @@ void iwl_rf_config(struct iwl_priv *priv)
                 WARN_ON(1);
 
         /* set CSR_HW_CONFIG_REG for uCode use */
-        iwl_set_bit(trans(priv), CSR_HW_IF_CONFIG_REG,
+        iwl_set_bit(priv->trans, CSR_HW_IF_CONFIG_REG,
                     CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
                     CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
index e4a758340996..64bfd947caeb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
@@ -66,8 +66,6 @@
 #include <net/mac80211.h>
 
 struct iwl_priv;
-struct iwl_shared;
-struct iwl_trans;
 
 /*
  * EEPROM access time values:
@@ -208,59 +206,6 @@ struct iwl_eeprom_calib_hdr {
 /* 6000 regulatory - indirect access */
 #define EEPROM_6000_REG_BAND_24_HT40_CHANNELS  ((0x80)\
                 | INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 14  bytes */
-
-/* 5000 Specific */
-#define EEPROM_5000_TX_POWER_VERSION    (4)
-#define EEPROM_5000_EEPROM_VERSION      (0x11A)
-
-/* 5050 Specific */
-#define EEPROM_5050_TX_POWER_VERSION    (4)
-#define EEPROM_5050_EEPROM_VERSION      (0x21E)
-
-/* 1000 Specific */
-#define EEPROM_1000_TX_POWER_VERSION    (4)
-#define EEPROM_1000_EEPROM_VERSION      (0x15C)
-
-/* 6x00 Specific */
-#define EEPROM_6000_TX_POWER_VERSION    (4)
-#define EEPROM_6000_EEPROM_VERSION      (0x423)
-
-/* 6x50 Specific */
-#define EEPROM_6050_TX_POWER_VERSION    (4)
-#define EEPROM_6050_EEPROM_VERSION      (0x532)
-
-/* 6150 Specific */
-#define EEPROM_6150_TX_POWER_VERSION    (6)
-#define EEPROM_6150_EEPROM_VERSION      (0x553)
-
-/* 6x05 Specific */
-#define EEPROM_6005_TX_POWER_VERSION    (6)
-#define EEPROM_6005_EEPROM_VERSION      (0x709)
-
-/* 6x30 Specific */
-#define EEPROM_6030_TX_POWER_VERSION    (6)
-#define EEPROM_6030_EEPROM_VERSION      (0x709)
-
-/* 2x00 Specific */
-#define EEPROM_2000_TX_POWER_VERSION    (6)
-#define EEPROM_2000_EEPROM_VERSION      (0x805)
-
-/* 6x35 Specific */
-#define EEPROM_6035_TX_POWER_VERSION    (6)
-#define EEPROM_6035_EEPROM_VERSION      (0x753)
-
-
-/* OTP */
-/* lower blocks contain EEPROM image and calibration data */
-#define OTP_LOW_IMAGE_SIZE              (2 * 512 * sizeof(u16)) /* 2 KB */
-/* high blocks contain PAPD data */
-#define OTP_HIGH_IMAGE_SIZE_6x00        (6 * 512 * sizeof(u16)) /* 6 KB */
-#define OTP_HIGH_IMAGE_SIZE_1000        (0x200 * sizeof(u16)) /* 1024 bytes */
-#define OTP_MAX_LL_ITEMS_1000           (3)     /* OTP blocks for 1000 */
-#define OTP_MAX_LL_ITEMS_6x00           (4)     /* OTP blocks for 6x00 */
-#define OTP_MAX_LL_ITEMS_6x50           (7)     /* OTP blocks for 6x50 */
-#define OTP_MAX_LL_ITEMS_2x00           (4)     /* OTP blocks for 2x00 */
-
 /* 2.4 GHz */
 extern const u8 iwl_eeprom_band_1[14];
 
@@ -306,12 +251,14 @@ struct iwl_eeprom_ops {
 };
 
 
-int iwl_eeprom_init(struct iwl_trans *trans, u32 hw_rev);
-void iwl_eeprom_free(struct iwl_shared *shrd);
-int  iwl_eeprom_check_version(struct iwl_priv *priv);
+int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev);
+void iwl_eeprom_free(struct iwl_priv *priv);
+int iwl_eeprom_check_version(struct iwl_priv *priv);
 int iwl_eeprom_init_hw_params(struct iwl_priv *priv);
-const u8 *iwl_eeprom_query_addr(const struct iwl_shared *shrd, size_t offset);
-u16 iwl_eeprom_query16(const struct iwl_shared *shrd, size_t offset);
+u16 iwl_eeprom_calib_version(struct iwl_priv *priv);
+const u8 *iwl_eeprom_query_addr(struct iwl_priv *priv, size_t offset);
+u16 iwl_eeprom_query16(struct iwl_priv *priv, size_t offset);
+void iwl_eeprom_get_mac(struct iwl_priv *priv, u8 *mac);
 int iwl_init_channel_map(struct iwl_priv *priv);
 void iwl_free_channel_map(struct iwl_priv *priv);
 const struct iwl_channel_info *iwl_get_channel_info(
diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/iwlwifi/iwl-fh.h
index 90208094b8eb..74bce97a8600 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fh.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fh.h
@@ -104,15 +104,29 @@
  * (see struct iwl_tfd_frame).  These 16 pointer registers are offset by 0x04
  * bytes from one another.  Each TFD circular buffer in DRAM must be 256-byte
  * aligned (address bits 0-7 must be 0).
+ * Later devices have 20 (5000 series) or 30 (higher) queues, but the registers
+ * for them are in different places.
  *
  * Bit fields in each pointer register:
  *  27-0: TFD CB physical base address [35:8], must be 256-byte aligned
  */
-#define FH_MEM_CBBC_LOWER_BOUND          (FH_MEM_LOWER_BOUND + 0x9D0)
-#define FH_MEM_CBBC_UPPER_BOUND          (FH_MEM_LOWER_BOUND + 0xA10)
-
-/* Find TFD CB base pointer for given queue (range 0-15). */
-#define FH_MEM_CBBC_QUEUE(x)  (FH_MEM_CBBC_LOWER_BOUND + (x) * 0x4)
+#define FH_MEM_CBBC_0_15_LOWER_BOUND            (FH_MEM_LOWER_BOUND + 0x9D0)
+#define FH_MEM_CBBC_0_15_UPPER_BOUND            (FH_MEM_LOWER_BOUND + 0xA10)
+#define FH_MEM_CBBC_16_19_LOWER_BOUND           (FH_MEM_LOWER_BOUND + 0xBF0)
+#define FH_MEM_CBBC_16_19_UPPER_BOUND           (FH_MEM_LOWER_BOUND + 0xC00)
+#define FH_MEM_CBBC_20_31_LOWER_BOUND           (FH_MEM_LOWER_BOUND + 0xB20)
+#define FH_MEM_CBBC_20_31_UPPER_BOUND           (FH_MEM_LOWER_BOUND + 0xB80)
+
+/* Find TFD CB base pointer for given queue */
+static inline unsigned int FH_MEM_CBBC_QUEUE(unsigned int chnl)
+{
+        if (chnl < 16)
+                return FH_MEM_CBBC_0_15_LOWER_BOUND + 4 * chnl;
+        if (chnl < 20)
+                return FH_MEM_CBBC_16_19_LOWER_BOUND + 4 * (chnl - 16);
+        WARN_ON_ONCE(chnl >= 32);
+        return FH_MEM_CBBC_20_31_LOWER_BOUND + 4 * (chnl - 20);
+}
 
 
 /**
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-file.h b/drivers/net/wireless/iwlwifi/iwl-fw-file.h
index c924ccb93c8c..e71564053e7f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw-file.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw-file.h
@@ -93,15 +93,7 @@ struct iwl_ucode_header {
  * new TLV uCode file layout
  *
  * The new TLV file format contains TLVs, that each specify
- * some piece of data. To facilitate "groups", for example
- * different instruction image with different capabilities,
- * bundled with the same init image, an alternative mechanism
- * is provided:
- * When the alternative field is 0, that means that the item
- * is always valid. When it is non-zero, then it is only
- * valid in conjunction with items of the same alternative,
- * in which case the driver (user) selects one alternative
- * to use.
+ * some piece of data.
  */
 
 enum iwl_ucode_tlv_type {
@@ -132,8 +124,7 @@ enum iwl_ucode_tlv_type {
 };
 
 struct iwl_ucode_tlv {
-        __le16 type;            /* see above */
-        __le16 alternative;     /* see comment */
+        __le32 type;            /* see above */
         __le32 length;          /* not including type/length fields */
         u8 data[0];
 };
@@ -152,7 +143,7 @@ struct iwl_tlv_ucode_header {
         u8 human_readable[64];
         __le32 ver;             /* major/minor/API/serial */
         __le32 build;
-        __le64 alternatives;    /* bitmask of valid alternatives */
+        __le64 ignore;
         /*
          * The data contained herein has a TLV layout,
          * see above for the TLV header and types.
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw.h b/drivers/net/wireless/iwlwifi/iwl-fw.h
index 8e36bdc1e522..2153e4cc5572 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw.h
@@ -63,6 +63,7 @@
 #ifndef __iwl_fw_h__
 #define __iwl_fw_h__
 #include <linux/types.h>
+#include <net/mac80211.h>
 
 /**
  * enum iwl_ucode_tlv_flag - ucode API flags
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h
index 09b856768f62..abb3250164ba 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.h
+++ b/drivers/net/wireless/iwlwifi/iwl-io.h
@@ -30,7 +30,6 @@
 #define __iwl_io_h__
 
 #include "iwl-devtrace.h"
-#include "iwl-shared.h"
 #include "iwl-trans.h"
 
 static inline void iwl_write8(struct iwl_trans *trans, u32 ofs, u8 val)
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c
index 1993a2b7ae63..47000419f916 100644
--- a/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -36,11 +36,10 @@
 #include <asm/unaligned.h>
 
 #include "iwl-dev.h"
-#include "iwl-core.h"
 #include "iwl-agn.h"
 #include "iwl-io.h"
 #include "iwl-trans.h"
-#include "iwl-shared.h"
+#include "iwl-modparams.h"
 
 /* Throughput           OFF time(ms)    ON time (ms)
  *      >300                    25              25
@@ -71,7 +70,7 @@ static const struct ieee80211_tpt_blink iwl_blink[] = {
 /* Set led register off */
 void iwlagn_led_enable(struct iwl_priv *priv)
 {
-        iwl_write32(trans(priv), CSR_LED_REG, CSR_LED_REG_TRUN_ON);
+        iwl_write32(priv->trans, CSR_LED_REG, CSR_LED_REG_TRUN_ON);
 }
 
 /*
@@ -107,9 +106,9 @@ static int iwl_send_led_cmd(struct iwl_priv *priv, struct iwl_led_cmd *led_cmd)
         };
         u32 reg;
 
-        reg = iwl_read32(trans(priv), CSR_LED_REG);
+        reg = iwl_read32(priv->trans, CSR_LED_REG);
         if (reg != (reg & CSR_LED_BSM_CTRL_MSK))
-                iwl_write32(trans(priv), CSR_LED_REG,
+                iwl_write32(priv->trans, CSR_LED_REG,
                             reg & CSR_LED_BSM_CTRL_MSK);
 
         return iwl_dvm_send_cmd(priv, &cmd);
@@ -138,11 +137,11 @@ static int iwl_led_cmd(struct iwl_priv *priv,
         }
 
         IWL_DEBUG_LED(priv, "Led blink time compensation=%u\n",
-                        cfg(priv)->base_params->led_compensation);
+                        priv->cfg->base_params->led_compensation);
         led_cmd.on = iwl_blink_compensation(priv, on,
-                                cfg(priv)->base_params->led_compensation);
+                                priv->cfg->base_params->led_compensation);
         led_cmd.off = iwl_blink_compensation(priv, off,
-                                cfg(priv)->base_params->led_compensation);
+                                priv->cfg->base_params->led_compensation);
 
         ret = iwl_send_led_cmd(priv, &led_cmd);
         if (!ret) {
@@ -175,7 +174,7 @@ static int iwl_led_blink_set(struct led_classdev *led_cdev,
 
 void iwl_leds_init(struct iwl_priv *priv)
 {
-        int mode = iwlagn_mod_params.led_mode;
+        int mode = iwlwifi_mod_params.led_mode;
         int ret;
 
         if (mode == IWL_LED_DISABLE) {
@@ -183,7 +182,7 @@ void iwl_leds_init(struct iwl_priv *priv)
                 return;
         }
         if (mode == IWL_LED_DEFAULT)
-                mode = cfg(priv)->led_mode;
+                mode = priv->cfg->led_mode;
 
         priv->led.name = kasprintf(GFP_KERNEL, "%s-led",
                                    wiphy_name(priv->hw->wiphy));
@@ -207,7 +206,7 @@ void iwl_leds_init(struct iwl_priv *priv)
                 break;
         }
 
-        ret = led_classdev_register(trans(priv)->dev, &priv->led);
+        ret = led_classdev_register(priv->trans->dev, &priv->led);
         if (ret) {
                 kfree(priv->led.name);
                 return;
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index b6805f8e9a01..d33cc9cc7d3f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -44,13 +44,12 @@
 
 #include "iwl-eeprom.h"
 #include "iwl-dev.h"
-#include "iwl-core.h"
 #include "iwl-io.h"
 #include "iwl-agn-calib.h"
 #include "iwl-agn.h"
-#include "iwl-shared.h"
 #include "iwl-trans.h"
 #include "iwl-op-mode.h"
+#include "iwl-modparams.h"
 
 /*****************************************************************************
  *
@@ -147,7 +146,13 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
                     IEEE80211_HW_AMPDU_AGGREGATION |
                     IEEE80211_HW_NEED_DTIM_PERIOD |
                     IEEE80211_HW_SPECTRUM_MGMT |
-                    IEEE80211_HW_REPORTS_TX_ACK_STATUS;
+                    IEEE80211_HW_REPORTS_TX_ACK_STATUS |
+                    IEEE80211_HW_QUEUE_CONTROL |
+                    IEEE80211_HW_SUPPORTS_PS |
+                    IEEE80211_HW_SUPPORTS_DYNAMIC_PS |
+                    IEEE80211_HW_SCAN_WHILE_IDLE;
+
+        hw->offchannel_tx_hw_queue = IWL_AUX_QUEUE;
 
         /*
          * Including the following line will crash some AP's.  This
@@ -156,10 +161,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
         hw->max_tx_aggregation_subframes = LINK_QUAL_AGG_FRAME_LIMIT_DEF;
          */
 
-        hw->flags |= IEEE80211_HW_SUPPORTS_PS |
-                     IEEE80211_HW_SUPPORTS_DYNAMIC_PS;
-
-        if (hw_params(priv).sku & EEPROM_SKU_CAP_11N_ENABLE)
+        if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE)
                 hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |
                              IEEE80211_HW_SUPPORTS_STATIC_SMPS;
 
@@ -197,13 +199,13 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
                             WIPHY_FLAG_IBSS_RSN;
 
         if (priv->fw->img[IWL_UCODE_WOWLAN].sec[0].len &&
-            trans(priv)->ops->wowlan_suspend &&
-            device_can_wakeup(trans(priv)->dev)) {
+            priv->trans->ops->wowlan_suspend &&
+            device_can_wakeup(priv->trans->dev)) {
                 hw->wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT |
                                           WIPHY_WOWLAN_DISCONNECT |
                                           WIPHY_WOWLAN_EAP_IDENTITY_REQ |
                                           WIPHY_WOWLAN_RFKILL_RELEASE;
-                if (!iwlagn_mod_params.sw_crypto)
+                if (!iwlwifi_mod_params.sw_crypto)
                         hw->wiphy->wowlan.flags |=
                                 WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |
                                 WIPHY_WOWLAN_GTK_REKEY_FAILURE;
@@ -215,7 +217,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
                                         IWLAGN_WOWLAN_MAX_PATTERN_LEN;
         }
 
-        if (iwlagn_mod_params.power_save)
+        if (iwlwifi_mod_params.power_save)
                 hw->wiphy->flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT;
         else
                 hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
@@ -224,8 +226,11 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
         /* we create the 802.11 header and a zero-length SSID element */
         hw->wiphy->max_scan_ie_len = capa->max_probe_length - 24 - 2;
 
-        /* Default value; 4 EDCA QOS priorities */
-        hw->queues = 4;
+        /*
+         * We don't use all queues: 4 and 9 are unused and any
+         * aggregation queue gets mapped down to the AC queue.
+         */
+        hw->queues = IWLAGN_FIRST_AMPDU_QUEUE;
 
         hw->max_listen_interval = IWL_CONN_MAX_LISTEN_INTERVAL;
 
@@ -236,7 +241,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
                 priv->hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
                         &priv->bands[IEEE80211_BAND_5GHZ];
 
-        hw->wiphy->hw_version = trans(priv)->hw_id;
+        hw->wiphy->hw_version = priv->trans->hw_id;
 
         iwl_leds_init(priv);
 
@@ -332,7 +337,7 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw)
         return 0;
 }
 
-static void iwlagn_mac_stop(struct ieee80211_hw *hw)
+void iwlagn_mac_stop(struct ieee80211_hw *hw)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -355,18 +360,18 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw)
          * even if interface is down, trans->down will leave the RF
          * kill interrupt enabled
          */
-        iwl_trans_stop_hw(trans(priv));
+        iwl_trans_stop_hw(priv->trans, false);
 
         IWL_DEBUG_MAC80211(priv, "leave\n");
 }
 
-static void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw,
-                                      struct ieee80211_vif *vif,
-                                      struct cfg80211_gtk_rekey_data *data)
+void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw,
+                               struct ieee80211_vif *vif,
+                               struct cfg80211_gtk_rekey_data *data)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
-        if (iwlagn_mod_params.sw_crypto)
+        if (iwlwifi_mod_params.sw_crypto)
                 return;
 
         IWL_DEBUG_MAC80211(priv, "enter\n");
@@ -388,8 +393,7 @@ static void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw,
 
 #ifdef CONFIG_PM_SLEEP
 
-static int iwlagn_mac_suspend(struct ieee80211_hw *hw,
-                              struct cfg80211_wowlan *wowlan)
+int iwlagn_mac_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
@@ -412,9 +416,9 @@ static int iwlagn_mac_suspend(struct ieee80211_hw *hw,
         if (ret)
                 goto error;
 
-        device_set_wakeup_enable(trans(priv)->dev, true);
+        device_set_wakeup_enable(priv->trans->dev, true);
 
-        iwl_trans_wowlan_suspend(trans(priv));
+        iwl_trans_wowlan_suspend(priv->trans);
 
         goto out;
 
@@ -437,27 +441,28 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
         unsigned long flags;
         u32 base, status = 0xffffffff;
         int ret = -EIO;
-        const struct fw_img *img;
 
         IWL_DEBUG_MAC80211(priv, "enter\n");
         mutex_lock(&priv->mutex);
 
-        iwl_write32(trans(priv), CSR_UCODE_DRV_GP1_CLR,
+        iwl_write32(priv->trans, CSR_UCODE_DRV_GP1_CLR,
                           CSR_UCODE_DRV_GP1_BIT_D3_CFG_COMPLETE);
 
-        base = priv->shrd->device_pointers.error_event_table;
+        base = priv->device_pointers.error_event_table;
         if (iwlagn_hw_valid_rtc_data_addr(base)) {
-                spin_lock_irqsave(&trans(priv)->reg_lock, flags);
-                ret = iwl_grab_nic_access_silent(trans(priv));
+                spin_lock_irqsave(&priv->trans->reg_lock, flags);
+                ret = iwl_grab_nic_access_silent(priv->trans);
                 if (likely(ret == 0)) {
-                        iwl_write32(trans(priv), HBUS_TARG_MEM_RADDR, base);
-                        status = iwl_read32(trans(priv), HBUS_TARG_MEM_RDAT);
-                        iwl_release_nic_access(trans(priv));
+                        iwl_write32(priv->trans, HBUS_TARG_MEM_RADDR, base);
+                        status = iwl_read32(priv->trans, HBUS_TARG_MEM_RDAT);
+                        iwl_release_nic_access(priv->trans);
                 }
-                spin_unlock_irqrestore(&trans(priv)->reg_lock, flags);
+                spin_unlock_irqrestore(&priv->trans->reg_lock, flags);
 
 #ifdef CONFIG_IWLWIFI_DEBUGFS
                 if (ret == 0) {
+                        const struct fw_img *img;
+
                         img = &(priv->fw->img[IWL_UCODE_WOWLAN]);
                         if (!priv->wowlan_sram) {
                                 priv->wowlan_sram =
@@ -467,7 +472,7 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
 
                         if (priv->wowlan_sram)
                                 _iwl_read_targ_mem_words(
-                                      trans(priv), 0x800000,
+                                      priv->trans, 0x800000,
                                       priv->wowlan_sram,
                                       img->sec[IWL_UCODE_SECTION_DATA].len / 4);
                 }
@@ -479,7 +484,7 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
 
         priv->wowlan = false;
 
-        device_set_wakeup_enable(trans(priv)->dev, false);
+        device_set_wakeup_enable(priv->trans->dev, false);
 
         iwlagn_prepare_restart(priv);
 
@@ -497,7 +502,7 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
 
 #endif
 
-static void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
+void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -508,21 +513,21 @@ static void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
                 dev_kfree_skb_any(skb);
 }
 
-static void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,
-                                       struct ieee80211_vif *vif,
-                                       struct ieee80211_key_conf *keyconf,
-                                       struct ieee80211_sta *sta,
-                                       u32 iv32, u16 *phase1key)
+void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,
+                                struct ieee80211_vif *vif,
+                                struct ieee80211_key_conf *keyconf,
+                                struct ieee80211_sta *sta,
+                                u32 iv32, u16 *phase1key)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
         iwl_update_tkip_key(priv, vif, keyconf, sta, iv32, phase1key);
 }
 
-static int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
-                              struct ieee80211_vif *vif,
-                              struct ieee80211_sta *sta,
-                              struct ieee80211_key_conf *key)
+int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
+                       struct ieee80211_vif *vif,
+                       struct ieee80211_sta *sta,
+                       struct ieee80211_key_conf *key)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
@@ -532,7 +537,7 @@ static int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
         IWL_DEBUG_MAC80211(priv, "enter\n");
 
-        if (iwlagn_mod_params.sw_crypto) {
+        if (iwlwifi_mod_params.sw_crypto) {
                 IWL_DEBUG_MAC80211(priv, "leave - hwcrypto disabled\n");
                 return -EOPNOTSUPP;
         }
@@ -622,11 +627,11 @@ static int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         return ret;
 }
 
-static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
-                                   struct ieee80211_vif *vif,
-                                   enum ieee80211_ampdu_mlme_action action,
-                                   struct ieee80211_sta *sta, u16 tid, u16 *ssn,
-                                   u8 buf_size)
+int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
+                            struct ieee80211_vif *vif,
+                            enum ieee80211_ampdu_mlme_action action,
+                            struct ieee80211_sta *sta, u16 tid, u16 *ssn,
+                            u8 buf_size)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         int ret = -EINVAL;
@@ -635,7 +640,7 @@ static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
         IWL_DEBUG_HT(priv, "A-MPDU action on addr %pM tid %d\n",
                      sta->addr, tid);
 
-        if (!(hw_params(priv).sku & EEPROM_SKU_CAP_11N_ENABLE))
+        if (!(priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE))
                 return -EACCES;
 
         IWL_DEBUG_MAC80211(priv, "enter\n");
@@ -643,7 +648,7 @@ static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
 
         switch (action) {
         case IEEE80211_AMPDU_RX_START:
-                if (iwlagn_mod_params.disable_11n & IWL_DISABLE_HT_RXAGG)
+                if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_RXAGG)
                         break;
                 IWL_DEBUG_HT(priv, "start Rx\n");
                 ret = iwl_sta_rx_agg_start(priv, sta, tid, *ssn);
@@ -653,7 +658,9 @@ static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
                 ret = iwl_sta_rx_agg_stop(priv, sta, tid);
                 break;
         case IEEE80211_AMPDU_TX_START:
-                if (iwlagn_mod_params.disable_11n & IWL_DISABLE_HT_TXAGG)
+                if (!priv->trans->ops->tx_agg_setup)
+                        break;
+                if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_TXAGG)
                         break;
                 IWL_DEBUG_HT(priv, "start Tx\n");
                 ret = iwlagn_tx_agg_start(priv, vif, sta, tid, ssn);
@@ -667,7 +674,7 @@ static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
                                      priv->agg_tids_count);
                 }
                 if (!priv->agg_tids_count &&
-                    hw_params(priv).use_rts_for_aggregation) {
+                    priv->hw_params.use_rts_for_aggregation) {
                         /*
                          * switch off RTS/CTS if it was previously enabled
                          */
@@ -746,11 +753,11 @@ static int iwlagn_mac_sta_remove(struct ieee80211_hw *hw,
         return ret;
 }
 
-static int iwlagn_mac_sta_state(struct ieee80211_hw *hw,
-                                struct ieee80211_vif *vif,
-                                struct ieee80211_sta *sta,
-                                enum ieee80211_sta_state old_state,
-                                enum ieee80211_sta_state new_state)
+int iwlagn_mac_sta_state(struct ieee80211_hw *hw,
+                         struct ieee80211_vif *vif,
+                         struct ieee80211_sta *sta,
+                         enum ieee80211_sta_state old_state,
+                         enum ieee80211_sta_state new_state)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
@@ -829,8 +836,8 @@ static int iwlagn_mac_sta_state(struct ieee80211_hw *hw,
         return ret;
 }
 
-static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
-                                struct ieee80211_channel_switch *ch_switch)
+void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
+                               struct ieee80211_channel_switch *ch_switch)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         const struct iwl_channel_info *ch_info;
@@ -863,7 +870,7 @@ static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
         if (!iwl_is_associated_ctx(ctx))
                 goto out;
 
-        if (!cfg(priv)->lib->set_channel_switch)
+        if (!priv->lib->set_channel_switch)
                 goto out;
 
         ch = channel->hw_value;
@@ -892,14 +899,13 @@ static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
         iwl_set_rxon_ht(priv, ht_conf);
         iwl_set_flags_for_band(priv, ctx, channel->band, ctx->vif);
 
-        iwl_set_rate(priv);
         /*
          * at this point, staging_rxon has the
          * configuration for channel switch
          */
         set_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status);
         priv->switch_channel = cpu_to_le16(ch);
-        if (cfg(priv)->lib->set_channel_switch(priv, ch_switch)) {
+        if (priv->lib->set_channel_switch(priv, ch_switch)) {
                 clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status);
                 priv->switch_channel = 0;
                 ieee80211_chswitch_done(ctx->vif, false);
@@ -910,10 +916,25 @@ out:
         IWL_DEBUG_MAC80211(priv, "leave\n");
 }
 
-static void iwlagn_configure_filter(struct ieee80211_hw *hw,
-                                    unsigned int changed_flags,
-                                    unsigned int *total_flags,
-                                    u64 multicast)
+void iwl_chswitch_done(struct iwl_priv *priv, bool is_success)
+{
+        /*
+         * MULTI-FIXME
+         * See iwlagn_mac_channel_switch.
+         */
+        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
+
+        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
+                return;
+
+        if (test_and_clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status))
+                ieee80211_chswitch_done(ctx->vif, is_success);
+}
+
+void iwlagn_configure_filter(struct ieee80211_hw *hw,
+                             unsigned int changed_flags,
+                             unsigned int *total_flags,
+                             u64 multicast)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         __le32 filter_or = 0, filter_nand = 0;
@@ -960,7 +981,7 @@ static void iwlagn_configure_filter(struct ieee80211_hw *hw,
                         FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
 }
 
-static void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop)
+void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -988,7 +1009,7 @@ static void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop)
                 }
         }
         IWL_DEBUG_MAC80211(priv, "wait transmit/flush all frames\n");
-        iwl_trans_wait_tx_queue_empty(trans(priv));
+        iwl_trans_wait_tx_queue_empty(priv->trans);
 done:
         mutex_unlock(&priv->mutex);
         IWL_DEBUG_MAC80211(priv, "leave\n");
@@ -1003,7 +1024,7 @@ static int iwlagn_mac_remain_on_channel(struct ieee80211_hw *hw,
         struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_PAN];
         int err = 0;
 
-        if (!(priv->shrd->valid_contexts & BIT(IWL_RXON_CTX_PAN)))
+        if (!(priv->valid_contexts & BIT(IWL_RXON_CTX_PAN)))
                 return -EOPNOTSUPP;
 
         if (!(ctx->interface_modes & BIT(NL80211_IFTYPE_P2P_CLIENT)))
@@ -1087,11 +1108,11 @@ static int iwlagn_mac_remain_on_channel(struct ieee80211_hw *hw,
         return err;
 }
 
-static int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw)
+int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
-        if (!(priv->shrd->valid_contexts & BIT(IWL_RXON_CTX_PAN)))
+        if (!(priv->valid_contexts & BIT(IWL_RXON_CTX_PAN)))
                 return -EOPNOTSUPP;
 
         IWL_DEBUG_MAC80211(priv, "enter\n");
@@ -1104,16 +1125,16 @@ static int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw)
         return 0;
 }
 
-static void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,
-                           enum ieee80211_rssi_event rssi_event)
+void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,
+                              enum ieee80211_rssi_event rssi_event)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
         IWL_DEBUG_MAC80211(priv, "enter\n");
         mutex_lock(&priv->mutex);
 
-        if (cfg(priv)->bt_params &&
-                        cfg(priv)->bt_params->advanced_bt_coexist) {
+        if (priv->cfg->bt_params &&
+                        priv->cfg->bt_params->advanced_bt_coexist) {
                 if (rssi_event == RSSI_EVENT_LOW)
                         priv->bt_enable_pspoll = true;
                 else if (rssi_event == RSSI_EVENT_HIGH)
@@ -1129,8 +1150,8 @@ static void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,
         IWL_DEBUG_MAC80211(priv, "leave\n");
 }
 
-static int iwlagn_mac_set_tim(struct ieee80211_hw *hw,
-                           struct ieee80211_sta *sta, bool set)
+int iwlagn_mac_set_tim(struct ieee80211_hw *hw,
+                       struct ieee80211_sta *sta, bool set)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -1139,9 +1160,9 @@ static int iwlagn_mac_set_tim(struct ieee80211_hw *hw,
         return 0;
 }
 
-static int iwlagn_mac_conf_tx(struct ieee80211_hw *hw,
-                    struct ieee80211_vif *vif, u16 queue,
-                    const struct ieee80211_tx_queue_params *params)
+int iwlagn_mac_conf_tx(struct ieee80211_hw *hw,
+                       struct ieee80211_vif *vif, u16 queue,
+                       const struct ieee80211_tx_queue_params *params)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
@@ -1183,7 +1204,7 @@ static int iwlagn_mac_conf_tx(struct ieee80211_hw *hw,
         return 0;
 }
 
-static int iwlagn_mac_tx_last_beacon(struct ieee80211_hw *hw)
+int iwlagn_mac_tx_last_beacon(struct ieee80211_hw *hw)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -1199,11 +1220,10 @@ static int iwl_set_mode(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
         return iwlagn_commit_rxon(priv, ctx);
 }
 
-static int iwl_setup_interface(struct iwl_priv *priv,
-                               struct iwl_rxon_context *ctx)
+int iwl_setup_interface(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
 {
         struct ieee80211_vif *vif = ctx->vif;
-        int err;
+        int err, ac;
 
         lockdep_assert_held(&priv->mutex);
 
@@ -1223,7 +1243,7 @@ static int iwl_setup_interface(struct iwl_priv *priv,
                 return err;
         }
 
-        if (cfg(priv)->bt_params && cfg(priv)->bt_params->advanced_bt_coexist &&
+        if (priv->cfg->bt_params && priv->cfg->bt_params->advanced_bt_coexist &&
             vif->type == NL80211_IFTYPE_ADHOC) {
                 /*
                  * pretend to have high BT traffic as long as we
@@ -1233,17 +1253,27 @@ static int iwl_setup_interface(struct iwl_priv *priv,
                 priv->bt_traffic_load = IWL_BT_COEX_TRAFFIC_LOAD_HIGH;
         }
 
+        /* set up queue mappings */
+        for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)
+                vif->hw_queue[ac] = ctx->ac_to_queue[ac];
+
+        if (vif->type == NL80211_IFTYPE_AP)
+                vif->cab_queue = ctx->mcast_queue;
+        else
+                vif->cab_queue = IEEE80211_INVAL_HW_QUEUE;
+
         return 0;
 }
 
 static int iwlagn_mac_add_interface(struct ieee80211_hw *hw,
-                             struct ieee80211_vif *vif)
+                                    struct ieee80211_vif *vif)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
         struct iwl_rxon_context *tmp, *ctx = NULL;
         int err;
         enum nl80211_iftype viftype = ieee80211_vif_type_p2p(vif);
+        bool reset = false;
 
         IWL_DEBUG_MAC80211(priv, "enter: type %d, addr %pM\n",
                            viftype, vif->addr);
@@ -1265,6 +1295,13 @@ static int iwlagn_mac_add_interface(struct ieee80211_hw *hw,
                         tmp->interface_modes | tmp->exclusive_interface_modes;
 
                 if (tmp->vif) {
+                        /* On reset we need to add the same interface again */
+                        if (tmp->vif == vif) {
+                                reset = true;
+                                ctx = tmp;
+                                break;
+                        }
+
                         /* check if this busy context is exclusive */
                         if (tmp->exclusive_interface_modes &
                                                 BIT(tmp->vif->type)) {
@@ -1291,7 +1328,7 @@ static int iwlagn_mac_add_interface(struct ieee80211_hw *hw,
         ctx->vif = vif;
 
         err = iwl_setup_interface(priv, ctx);
-        if (!err)
+        if (!err || reset)
                 goto out;
 
         ctx->vif = NULL;
@@ -1303,9 +1340,9 @@ static int iwlagn_mac_add_interface(struct ieee80211_hw *hw,
         return err;
 }
 
-static void iwl_teardown_interface(struct iwl_priv *priv,
-                                   struct ieee80211_vif *vif,
-                                   bool mode_change)
+void iwl_teardown_interface(struct iwl_priv *priv,
+                            struct ieee80211_vif *vif,
+                            bool mode_change)
 {
         struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);
 
@@ -1446,9 +1483,9 @@ static int iwlagn_mac_change_interface(struct ieee80211_hw *hw,
         return err;
 }
 
-static int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,
-                    struct ieee80211_vif *vif,
-                    struct cfg80211_scan_request *req)
+int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,
+                       struct ieee80211_vif *vif,
+                       struct cfg80211_scan_request *req)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         int ret;
@@ -1503,7 +1540,7 @@ static void iwl_sta_modify_ps_wake(struct iwl_priv *priv, int sta_id)
         iwl_send_add_sta(priv, &cmd, CMD_ASYNC);
 }
 
-static void iwlagn_mac_sta_notify(struct ieee80211_hw *hw,
+void iwlagn_mac_sta_notify(struct ieee80211_hw *hw,
                            struct ieee80211_vif *vif,
                            enum sta_notify_cmd cmd,
                            struct ieee80211_sta *sta)
diff --git a/drivers/net/wireless/iwlwifi/iwl-modparams.h b/drivers/net/wireless/iwlwifi/iwl-modparams.h
new file mode 100644
index 000000000000..d9a86d6b2bd7
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-modparams.h
@@ -0,0 +1,126 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *****************************************************************************/
+#ifndef __iwl_modparams_h__
+#define __iwl_modparams_h__
+
+#include <linux/types.h>
+#include <linux/spinlock.h>
+#include <linux/gfp.h>
+#include <net/mac80211.h>
+
+extern struct iwl_mod_params iwlwifi_mod_params;
+
+enum iwl_power_level {
+        IWL_POWER_INDEX_1,
+        IWL_POWER_INDEX_2,
+        IWL_POWER_INDEX_3,
+        IWL_POWER_INDEX_4,
+        IWL_POWER_INDEX_5,
+        IWL_POWER_NUM
+};
+
+#define IWL_DISABLE_HT_ALL      BIT(0)
+#define IWL_DISABLE_HT_TXAGG    BIT(1)
+#define IWL_DISABLE_HT_RXAGG    BIT(2)
+
+/**
+ * struct iwl_mod_params
+ *
+ * Holds the module parameters
+ *
+ * @sw_crypto: using hardware encryption, default = 0
+ * @disable_11n: disable 11n capabilities, default = 0,
+ *      use IWL_DISABLE_HT_* constants
+ * @amsdu_size_8K: enable 8K amsdu size, default = 1
+ * @restart_fw: restart firmware, default = 1
+ * @plcp_check: enable plcp health check, default = true
+ * @wd_disable: enable stuck queue check, default = 0
+ * @bt_coex_active: enable bt coex, default = true
+ * @led_mode: system default, default = 0
+ * @power_save: disable power save, default = false
+ * @power_level: power level, default = 1
+ * @debug_level: levels are IWL_DL_*
+ * @ant_coupling: antenna coupling in dB, default = 0
+ * @bt_ch_announce: BT channel inhibition, default = enable
+ * @auto_agg: enable agg. without check, default = true
+ * @disable_5ghz: disable 5GHz capability, default = false
+ */
+struct iwl_mod_params {
+        int sw_crypto;
+        unsigned int disable_11n;
+        int amsdu_size_8K;
+        int restart_fw;
+        bool plcp_check;
+        int  wd_disable;
+        bool bt_coex_active;
+        int led_mode;
+        bool power_save;
+        int power_level;
+        u32 debug_level;
+        int ant_coupling;
+        bool bt_ch_announce;
+        bool auto_agg;
+        bool disable_5ghz;
+};
+
+#endif /* #__iwl_modparams_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-notif-wait.c b/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
index 88dc4a0f96b4..0066b899fe5c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
+++ b/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
@@ -75,21 +75,45 @@ void iwl_notification_wait_init(struct iwl_notif_wait_data *notif_wait)
 void iwl_notification_wait_notify(struct iwl_notif_wait_data *notif_wait,
                                   struct iwl_rx_packet *pkt)
 {
+        bool triggered = false;
+
         if (!list_empty(&notif_wait->notif_waits)) {
                 struct iwl_notification_wait *w;
 
                 spin_lock(&notif_wait->notif_wait_lock);
                 list_for_each_entry(w, &notif_wait->notif_waits, list) {
-                        if (w->cmd != pkt->hdr.cmd)
+                        int i;
+                        bool found = false;
+
+                        /*
+                         * If it already finished (triggered) or has been
+                         * aborted then don't evaluate it again to avoid races,
+                         * Otherwise the function could be called again even
+                         * though it returned true before
+                         */
+                        if (w->triggered || w->aborted)
+                                continue;
+
+                        for (i = 0; i < w->n_cmds; i++) {
+                                if (w->cmds[i] == pkt->hdr.cmd) {
+                                        found = true;
+                                        break;
+                                }
+                        }
+                        if (!found)
                                 continue;
-                        w->triggered = true;
-                        if (w->fn)
-                                w->fn(notif_wait, pkt, w->fn_data);
+
+                        if (!w->fn || w->fn(notif_wait, pkt, w->fn_data)) {
+                                w->triggered = true;
+                                triggered = true;
+                        }
                 }
                 spin_unlock(&notif_wait->notif_wait_lock);
 
-                wake_up_all(&notif_wait->notif_waitq);
         }
+
+        if (triggered)
+                wake_up_all(&notif_wait->notif_waitq);
 }
 
 void iwl_abort_notification_waits(struct iwl_notif_wait_data *notif_wait)
@@ -109,14 +133,18 @@ void iwl_abort_notification_waits(struct iwl_notif_wait_data *notif_wait)
 void
 iwl_init_notification_wait(struct iwl_notif_wait_data *notif_wait,
                            struct iwl_notification_wait *wait_entry,
-                           u8 cmd,
-                           void (*fn)(struct iwl_notif_wait_data *notif_wait,
+                           const u8 *cmds, int n_cmds,
+                           bool (*fn)(struct iwl_notif_wait_data *notif_wait,
                                       struct iwl_rx_packet *pkt, void *data),
                            void *fn_data)
 {
+        if (WARN_ON(n_cmds > MAX_NOTIF_CMDS))
+                n_cmds = MAX_NOTIF_CMDS;
+
         wait_entry->fn = fn;
         wait_entry->fn_data = fn_data;
-        wait_entry->cmd = cmd;
+        wait_entry->n_cmds = n_cmds;
+        memcpy(wait_entry->cmds, cmds, n_cmds);
         wait_entry->triggered = false;
         wait_entry->aborted = false;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-notif-wait.h b/drivers/net/wireless/iwlwifi/iwl-notif-wait.h
index 5e8af957aa7b..821523100cf1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-notif-wait.h
+++ b/drivers/net/wireless/iwlwifi/iwl-notif-wait.h
@@ -72,11 +72,19 @@ struct iwl_notif_wait_data {
         wait_queue_head_t notif_waitq;
 };
 
+#define MAX_NOTIF_CMDS  5
+
 /**
  * struct iwl_notification_wait - notification wait entry
  * @list: list head for global list
- * @fn: function called with the notification
- * @cmd: command ID
+ * @fn: Function called with the notification. If the function
+ *      returns true, the wait is over, if it returns false then
+ *      the waiter stays blocked. If no function is given, any
+ *      of the listed commands will unblock the waiter.
+ * @cmds: command IDs
+ * @n_cmds: number of command IDs
+ * @triggered: waiter should be woken up
+ * @aborted: wait was aborted
  *
  * This structure is not used directly, to wait for a
  * notification declare it on the stack, and call
@@ -93,11 +101,12 @@ struct iwl_notif_wait_data {
 struct iwl_notification_wait {
         struct list_head list;
 
-        void (*fn)(struct iwl_notif_wait_data *notif_data,
+        bool (*fn)(struct iwl_notif_wait_data *notif_data,
                    struct iwl_rx_packet *pkt, void *data);
         void *fn_data;
 
-        u8 cmd;
+        u8 cmds[MAX_NOTIF_CMDS];
+        u8 n_cmds;
         bool triggered, aborted;
 };
 
@@ -112,8 +121,8 @@ void iwl_abort_notification_waits(struct iwl_notif_wait_data *notif_data);
 void __acquires(wait_entry)
 iwl_init_notification_wait(struct iwl_notif_wait_data *notif_data,
                            struct iwl_notification_wait *wait_entry,
-                           u8 cmd,
-                           void (*fn)(struct iwl_notif_wait_data *notif_data,
+                           const u8 *cmds, int n_cmds,
+                           bool (*fn)(struct iwl_notif_wait_data *notif_data,
                                       struct iwl_rx_packet *pkt, void *data),
                            void *fn_data);
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-op-mode.h b/drivers/net/wireless/iwlwifi/iwl-op-mode.h
index 6ea4163ff56a..4ef742b28e08 100644
--- a/drivers/net/wireless/iwlwifi/iwl-op-mode.h
+++ b/drivers/net/wireless/iwlwifi/iwl-op-mode.h
@@ -69,6 +69,7 @@ struct sk_buff;
 struct iwl_device_cmd;
 struct iwl_rx_cmd_buffer;
 struct iwl_fw;
+struct iwl_cfg;
 
 /**
  * DOC: Operational mode - what is it ?
@@ -111,10 +112,10 @@ struct iwl_fw;
  * @rx: Rx notification to the op_mode. rxb is the Rx buffer itself. Cmd is the
  *      HCMD the this Rx responds to.
  *      Must be atomic.
- * @queue_full: notifies that a HW queue is full. Ac is the ac of the queue
+ * @queue_full: notifies that a HW queue is full.
  *      Must be atomic
  * @queue_not_full: notifies that a HW queue is not full any more.
- *      Ac is the ac of the queue. Must be atomic
+ *      Must be atomic
  * @hw_rf_kill:notifies of a change in the HW rf kill switch. True means that
  *      the radio is killed. Must be atomic.
  * @free_skb: allows the transport layer to free skbs that haven't been
@@ -125,20 +126,23 @@ struct iwl_fw;
  * @cmd_queue_full: Called when the command queue gets full. Must be atomic.
  * @nic_config: configure NIC, called before firmware is started.
  *      May sleep
+ * @wimax_active: invoked when WiMax becomes active.  Must be atomic.
  */
 struct iwl_op_mode_ops {
         struct iwl_op_mode *(*start)(struct iwl_trans *trans,
+                                     const struct iwl_cfg *cfg,
                                      const struct iwl_fw *fw);
         void (*stop)(struct iwl_op_mode *op_mode);
         int (*rx)(struct iwl_op_mode *op_mode, struct iwl_rx_cmd_buffer *rxb,
                   struct iwl_device_cmd *cmd);
-        void (*queue_full)(struct iwl_op_mode *op_mode, u8 ac);
-        void (*queue_not_full)(struct iwl_op_mode *op_mode, u8 ac);
+        void (*queue_full)(struct iwl_op_mode *op_mode, int queue);
+        void (*queue_not_full)(struct iwl_op_mode *op_mode, int queue);
         void (*hw_rf_kill)(struct iwl_op_mode *op_mode, bool state);
         void (*free_skb)(struct iwl_op_mode *op_mode, struct sk_buff *skb);
         void (*nic_error)(struct iwl_op_mode *op_mode);
         void (*cmd_queue_full)(struct iwl_op_mode *op_mode);
         void (*nic_config)(struct iwl_op_mode *op_mode);
+        void (*wimax_active)(struct iwl_op_mode *op_mode);
 };
 
 /**
@@ -169,15 +173,16 @@ static inline int iwl_op_mode_rx(struct iwl_op_mode *op_mode,
         return op_mode->ops->rx(op_mode, rxb, cmd);
 }
 
-static inline void iwl_op_mode_queue_full(struct iwl_op_mode *op_mode, u8 ac)
+static inline void iwl_op_mode_queue_full(struct iwl_op_mode *op_mode,
+                                          int queue)
 {
-        op_mode->ops->queue_full(op_mode, ac);
+        op_mode->ops->queue_full(op_mode, queue);
 }
 
 static inline void iwl_op_mode_queue_not_full(struct iwl_op_mode *op_mode,
-                                              u8 ac)
+                                              int queue)
 {
-        op_mode->ops->queue_not_full(op_mode, ac);
+        op_mode->ops->queue_not_full(op_mode, queue);
 }
 
 static inline void iwl_op_mode_hw_rf_kill(struct iwl_op_mode *op_mode,
@@ -208,6 +213,11 @@ static inline void iwl_op_mode_nic_config(struct iwl_op_mode *op_mode)
         op_mode->ops->nic_config(op_mode);
 }
 
+static inline void iwl_op_mode_wimax_active(struct iwl_op_mode *op_mode)
+{
+        op_mode->ops->wimax_active(op_mode);
+}
+
 /*****************************************************
 * Op mode layers implementations
 ******************************************************/
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c
index c5e339ee918b..0c8a1c2d8847 100644
--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@ -60,17 +60,18 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *****************************************************************************/
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/pci-aspm.h>
 
-#include "iwl-io.h"
-#include "iwl-shared.h"
 #include "iwl-trans.h"
-#include "iwl-csr.h"
 #include "iwl-cfg.h"
 #include "iwl-drv.h"
 #include "iwl-trans.h"
+#include "iwl-trans-pcie-int.h"
 
 #define IWL_PCI_DEVICE(dev, subdev, cfg) \
         .vendor = PCI_VENDOR_ID_INTEL,  .device = (dev), \
@@ -261,61 +262,46 @@ MODULE_DEVICE_TABLE(pci, iwl_hw_card_ids);
 /* PCI registers */
 #define PCI_CFG_RETRY_TIMEOUT   0x041
 
+#ifndef CONFIG_IWLWIFI_IDI
+
 static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         const struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
-        struct iwl_shared *shrd;
         struct iwl_trans *iwl_trans;
-        int err;
-
-        shrd = kzalloc(sizeof(*iwl_trans->shrd), GFP_KERNEL);
-        if (!shrd) {
-                dev_printk(KERN_ERR, &pdev->dev,
-                           "Couldn't allocate iwl_shared");
-                err = -ENOMEM;
-                goto out_free_bus;
-        }
+        struct iwl_trans_pcie *trans_pcie;
 
-#ifdef CONFIG_IWLWIFI_IDI
-        iwl_trans = iwl_trans_idi_alloc(shrd, pdev, ent);
-#else
-        iwl_trans = iwl_trans_pcie_alloc(shrd, pdev, ent);
-#endif
-        if (iwl_trans == NULL) {
-                err = -ENOMEM;
-                goto out_free_bus;
-        }
+        iwl_trans = iwl_trans_pcie_alloc(pdev, ent, cfg);
+        if (iwl_trans == NULL)
+                return -ENOMEM;
 
-        shrd->trans = iwl_trans;
         pci_set_drvdata(pdev, iwl_trans);
 
-        err = iwl_drv_start(shrd, iwl_trans, cfg);
-        if (err)
+        trans_pcie = IWL_TRANS_GET_PCIE_TRANS(iwl_trans);
+        trans_pcie->drv = iwl_drv_start(iwl_trans, cfg);
+        if (!trans_pcie->drv)
                 goto out_free_trans;
 
         return 0;
 
 out_free_trans:
-        iwl_trans_free(iwl_trans);
+        iwl_trans_pcie_free(iwl_trans);
         pci_set_drvdata(pdev, NULL);
-out_free_bus:
-        kfree(shrd);
-        return err;
+        return -EFAULT;
 }
 
 static void __devexit iwl_pci_remove(struct pci_dev *pdev)
 {
-        struct iwl_trans *iwl_trans = pci_get_drvdata(pdev);
-        struct iwl_shared *shrd = iwl_trans->shrd;
+        struct iwl_trans *trans = pci_get_drvdata(pdev);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
-        iwl_drv_stop(shrd);
-        iwl_trans_free(shrd->trans);
+        iwl_drv_stop(trans_pcie->drv);
+        iwl_trans_pcie_free(trans);
 
         pci_set_drvdata(pdev, NULL);
-
-        kfree(shrd);
 }
 
+#endif /* CONFIG_IWLWIFI_IDI */
+
 #ifdef CONFIG_PM_SLEEP
 
 static int iwl_pci_suspend(struct device *device)
@@ -360,6 +346,15 @@ static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume);
 
 #endif
 
+#ifdef CONFIG_IWLWIFI_IDI
+/*
+ * Defined externally in iwl-idi.c
+ */
+int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
+void __devexit iwl_pci_remove(struct pci_dev *pdev);
+
+#endif /* CONFIG_IWLWIFI_IDI */
+
 static struct pci_driver iwl_pci_driver = {
         .name = DRV_NAME,
         .id_table = iwl_hw_card_ids,
diff --git a/drivers/net/wireless/iwlwifi/iwl-phy-db.c b/drivers/net/wireless/iwlwifi/iwl-phy-db.c
new file mode 100644
index 000000000000..f166955340fe
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-phy-db.c
@@ -0,0 +1,288 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *****************************************************************************/
+
+#include <linux/slab.h>
+#include <linux/string.h>
+
+#include "iwl-debug.h"
+#include "iwl-dev.h"
+
+#include "iwl-phy-db.h"
+
+#define CHANNEL_NUM_SIZE        4       /* num of channels in calib_ch size */
+
+struct iwl_phy_db *iwl_phy_db_init(struct device *dev)
+{
+        struct iwl_phy_db *phy_db = kzalloc(sizeof(struct iwl_phy_db),
+                                            GFP_KERNEL);
+
+        if (!phy_db)
+                return phy_db;
+
+        phy_db->dev = dev;
+
+        /* TODO: add default values of the phy db. */
+        return phy_db;
+}
+
+/*
+ * get phy db section: returns a pointer to a phy db section specified by
+ * type and channel group id.
+ */
+static struct iwl_phy_db_entry *
+iwl_phy_db_get_section(struct iwl_phy_db *phy_db,
+                       enum iwl_phy_db_section_type type,
+                       u16 chg_id)
+{
+        if (!phy_db || type < 0 || type >= IWL_PHY_DB_MAX)
+                return NULL;
+
+        switch (type) {
+        case IWL_PHY_DB_CFG:
+                return &phy_db->cfg;
+        case IWL_PHY_DB_CALIB_NCH:
+                return &phy_db->calib_nch;
+        case IWL_PHY_DB_CALIB_CH:
+                return &phy_db->calib_ch;
+        case IWL_PHY_DB_CALIB_CHG_PAPD:
+                if (chg_id < 0 || chg_id >= IWL_NUM_PAPD_CH_GROUPS)
+                        return NULL;
+                return &phy_db->calib_ch_group_papd[chg_id];
+        case IWL_PHY_DB_CALIB_CHG_TXP:
+                if (chg_id < 0 || chg_id >= IWL_NUM_TXP_CH_GROUPS)
+                        return NULL;
+                return &phy_db->calib_ch_group_txp[chg_id];
+        default:
+                return NULL;
+        }
+        return NULL;
+}
+
+static void iwl_phy_db_free_section(struct iwl_phy_db *phy_db,
+                                    enum iwl_phy_db_section_type type,
+                                    u16 chg_id)
+{
+        struct iwl_phy_db_entry *entry =
+                                iwl_phy_db_get_section(phy_db, type, chg_id);
+        if (!entry)
+                return;
+
+        kfree(entry->data);
+        entry->data = NULL;
+        entry->size = 0;
+}
+
+void iwl_phy_db_free(struct iwl_phy_db *phy_db)
+{
+        int i;
+
+        if (!phy_db)
+                return;
+
+        iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CFG, 0);
+        iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CALIB_NCH, 0);
+        iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CALIB_CH, 0);
+        for (i = 0; i < IWL_NUM_PAPD_CH_GROUPS; i++)
+                iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CALIB_CHG_PAPD, i);
+        for (i = 0; i < IWL_NUM_TXP_CH_GROUPS; i++)
+                iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CALIB_CHG_TXP, i);
+
+        kfree(phy_db);
+}
+
+int iwl_phy_db_set_section(struct iwl_phy_db *phy_db,
+                           enum iwl_phy_db_section_type type, u8 *data,
+                           u16 size, gfp_t alloc_ctx)
+{
+        struct iwl_phy_db_entry *entry;
+        u16 chg_id = 0;
+
+        if (!phy_db)
+                return -EINVAL;
+
+        if (type == IWL_PHY_DB_CALIB_CHG_PAPD ||
+            type == IWL_PHY_DB_CALIB_CHG_TXP)
+                chg_id = le16_to_cpup((__le16 *)data);
+
+        entry = iwl_phy_db_get_section(phy_db, type, chg_id);
+        if (!entry)
+                return -EINVAL;
+
+        kfree(entry->data);
+        entry->data = kmemdup(data, size, alloc_ctx);
+        if (!entry->data) {
+                entry->size = 0;
+                return -ENOMEM;
+        }
+
+        entry->size = size;
+
+        if (type == IWL_PHY_DB_CALIB_CH) {
+                phy_db->channel_num = le32_to_cpup((__le32 *)data);
+                phy_db->channel_size =
+                      (size - CHANNEL_NUM_SIZE) / phy_db->channel_num;
+        }
+
+        return 0;
+}
+
+static int is_valid_channel(u16 ch_id)
+{
+        if (ch_id <= 14 ||
+            (36 <= ch_id && ch_id <= 64 && ch_id % 4 == 0) ||
+            (100 <= ch_id && ch_id <= 140 && ch_id % 4 == 0) ||
+            (145 <= ch_id && ch_id <= 165 && ch_id % 4 == 1))
+                return 1;
+        return 0;
+}
+
+static u8 ch_id_to_ch_index(u16 ch_id)
+{
+        if (WARN_ON(!is_valid_channel(ch_id)))
+                return 0xff;
+
+        if (ch_id <= 14)
+                return ch_id - 1;
+        if (ch_id <= 64)
+                return (ch_id + 20) / 4;
+        if (ch_id <= 140)
+                return (ch_id - 12) / 4;
+        return (ch_id - 13) / 4;
+}
+
+
+static u16 channel_id_to_papd(u16 ch_id)
+{
+        if (WARN_ON(!is_valid_channel(ch_id)))
+                return 0xff;
+
+        if (1 <= ch_id && ch_id <= 14)
+                return 0;
+        if (36 <= ch_id && ch_id <= 64)
+                return 1;
+        if (100 <= ch_id && ch_id <= 140)
+                return 2;
+        return 3;
+}
+
+static u16 channel_id_to_txp(struct iwl_phy_db *phy_db, u16 ch_id)
+{
+        struct iwl_phy_db_chg_txp *txp_chg;
+        int i;
+        u8 ch_index = ch_id_to_ch_index(ch_id);
+        if (ch_index == 0xff)
+                return 0xff;
+
+        for (i = 0; i < IWL_NUM_TXP_CH_GROUPS; i++) {
+                txp_chg = (void *)phy_db->calib_ch_group_txp[i].data;
+                if (!txp_chg)
+                        return 0xff;
+                /*
+                 * Looking for the first channel group that its max channel is
+                 * higher then wanted channel.
+                 */
+                if (le16_to_cpu(txp_chg->max_channel_idx) >= ch_index)
+                        return i;
+        }
+        return 0xff;
+}
+
+int iwl_phy_db_get_section_data(struct iwl_phy_db *phy_db,
+                                enum iwl_phy_db_section_type type, u8 **data,
+                                u16 *size, u16 ch_id)
+{
+        struct iwl_phy_db_entry *entry;
+        u32 channel_num;
+        u32 channel_size;
+        u16 ch_group_id = 0;
+        u16 index;
+
+        if (!phy_db)
+                return -EINVAL;
+
+        /* find wanted channel group */
+        if (type == IWL_PHY_DB_CALIB_CHG_PAPD)
+                ch_group_id = channel_id_to_papd(ch_id);
+        else if (type == IWL_PHY_DB_CALIB_CHG_TXP)
+                ch_group_id = channel_id_to_txp(phy_db, ch_id);
+
+        entry = iwl_phy_db_get_section(phy_db, type, ch_group_id);
+        if (!entry)
+                return -EINVAL;
+
+        if (type == IWL_PHY_DB_CALIB_CH) {
+                index = ch_id_to_ch_index(ch_id);
+                channel_num = phy_db->channel_num;
+                channel_size = phy_db->channel_size;
+                if (index >= channel_num) {
+                        IWL_ERR(phy_db, "Wrong channel number %d", ch_id);
+                        return -EINVAL;
+                }
+                *data = entry->data + CHANNEL_NUM_SIZE + index * channel_size;
+                *size = channel_size;
+        } else {
+                *data = entry->data;
+                *size = entry->size;
+        }
+        return 0;
+}
diff --git a/drivers/net/wireless/iwlwifi/iwl-phy-db.h b/drivers/net/wireless/iwlwifi/iwl-phy-db.h
new file mode 100644
index 000000000000..c34c6a9303ab
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-phy-db.h
@@ -0,0 +1,129 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *****************************************************************************/
+
+#ifndef __IWL_PHYDB_H__
+#define __IWL_PHYDB_H__
+
+#include <linux/types.h>
+
+#define IWL_NUM_PAPD_CH_GROUPS  4
+#define IWL_NUM_TXP_CH_GROUPS   8
+
+struct iwl_phy_db_entry {
+        u16     size;
+        u8      *data;
+};
+
+struct iwl_shared;
+
+/**
+ * struct iwl_phy_db - stores phy configuration and calibration data.
+ *
+ * @cfg: phy configuration.
+ * @calib_nch: non channel specific calibration data.
+ * @calib_ch: channel specific calibration data.
+ * @calib_ch_group_papd: calibration data related to papd channel group.
+ * @calib_ch_group_txp: calibration data related to tx power chanel group.
+ */
+struct iwl_phy_db {
+        struct iwl_phy_db_entry cfg;
+        struct iwl_phy_db_entry calib_nch;
+        struct iwl_phy_db_entry calib_ch;
+        struct iwl_phy_db_entry calib_ch_group_papd[IWL_NUM_PAPD_CH_GROUPS];
+        struct iwl_phy_db_entry calib_ch_group_txp[IWL_NUM_TXP_CH_GROUPS];
+
+        u32 channel_num;
+        u32 channel_size;
+
+        /* for an access to the logger */
+        struct device *dev;
+};
+
+enum iwl_phy_db_section_type {
+        IWL_PHY_DB_CFG = 1,
+        IWL_PHY_DB_CALIB_NCH,
+        IWL_PHY_DB_CALIB_CH,
+        IWL_PHY_DB_CALIB_CHG_PAPD,
+        IWL_PHY_DB_CALIB_CHG_TXP,
+        IWL_PHY_DB_MAX
+};
+
+/* for parsing of tx power channel group data that comes from the firmware*/
+struct iwl_phy_db_chg_txp {
+        __le32 space;
+        __le16 max_channel_idx;
+} __packed;
+
+struct iwl_phy_db *iwl_phy_db_init(struct device *dev);
+
+void iwl_phy_db_free(struct iwl_phy_db *phy_db);
+
+int iwl_phy_db_set_section(struct iwl_phy_db *phy_db,
+                           enum iwl_phy_db_section_type type, u8 *data,
+                           u16 size, gfp_t alloc_ctx);
+
+int iwl_phy_db_get_section_data(struct iwl_phy_db *phy_db,
+                                enum iwl_phy_db_section_type type, u8 **data,
+                                u16 *size, u16 ch_id);
+
+#endif /* __IWL_PHYDB_H__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c
index 958d9d09aee3..8352265dbc4b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-power.c
+++ b/drivers/net/wireless/iwlwifi/iwl-power.c
@@ -37,13 +37,12 @@
 #include "iwl-eeprom.h"
 #include "iwl-dev.h"
 #include "iwl-agn.h"
-#include "iwl-core.h"
 #include "iwl-io.h"
 #include "iwl-commands.h"
 #include "iwl-debug.h"
 #include "iwl-power.h"
 #include "iwl-trans.h"
-#include "iwl-shared.h"
+#include "iwl-modparams.h"
 
 /*
  * Setting power level allows the card to go to sleep when not busy.
@@ -167,7 +166,7 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv,
         u8 skip;
         u32 slp_itrvl;
 
-        if (cfg(priv)->adv_pm) {
+        if (priv->cfg->adv_pm) {
                 table = apm_range_2;
                 if (period <= IWL_DTIM_RANGE_1_MAX)
                         table = apm_range_1;
@@ -215,13 +214,13 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv,
         else
                 cmd->flags &= ~IWL_POWER_SLEEP_OVER_DTIM_MSK;
 
-        if (cfg(priv)->base_params->shadow_reg_enable)
+        if (priv->cfg->base_params->shadow_reg_enable)
                 cmd->flags |= IWL_POWER_SHADOW_REG_ENA;
         else
                 cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA;
 
         if (iwl_advanced_bt_coexist(priv)) {
-                if (!cfg(priv)->bt_params->bt_sco_disable)
+                if (!priv->cfg->bt_params->bt_sco_disable)
                         cmd->flags |= IWL_POWER_BT_SCO_ENA;
                 else
                         cmd->flags &= ~IWL_POWER_BT_SCO_ENA;
@@ -268,61 +267,6 @@ static void iwl_power_sleep_cam_cmd(struct iwl_priv *priv,
         IWL_DEBUG_POWER(priv, "Sleep command for CAM\n");
 }
 
-static void iwl_power_fill_sleep_cmd(struct iwl_priv *priv,
-                                     struct iwl_powertable_cmd *cmd,
-                                     int dynps_ms, int wakeup_period)
-{
-        /*
-         * These are the original power level 3 sleep successions. The
-         * device may behave better with such succession and was also
-         * only tested with that. Just like the original sleep commands,
-         * also adjust the succession here to the wakeup_period below.
-         * The ranges are the same as for the sleep commands, 0-2, 3-9
-         * and >10, which is selected based on the DTIM interval for
-         * the sleep index but here we use the wakeup period since that
-         * is what we need to do for the latency requirements.
-         */
-        static const u8 slp_succ_r0[IWL_POWER_VEC_SIZE] = { 2, 2, 2, 2, 2 };
-        static const u8 slp_succ_r1[IWL_POWER_VEC_SIZE] = { 2, 4, 6, 7, 9 };
-        static const u8 slp_succ_r2[IWL_POWER_VEC_SIZE] = { 2, 7, 9, 9, 0xFF };
-        const u8 *slp_succ = slp_succ_r0;
-        int i;
-
-        if (wakeup_period > IWL_DTIM_RANGE_0_MAX)
-                slp_succ = slp_succ_r1;
-        if (wakeup_period > IWL_DTIM_RANGE_1_MAX)
-                slp_succ = slp_succ_r2;
-
-        memset(cmd, 0, sizeof(*cmd));
-
-        cmd->flags = IWL_POWER_DRIVER_ALLOW_SLEEP_MSK |
-                     IWL_POWER_FAST_PD; /* no use seeing frames for others */
-
-        if (priv->power_data.bus_pm)
-                cmd->flags |= IWL_POWER_PCI_PM_MSK;
-
-        if (cfg(priv)->base_params->shadow_reg_enable)
-                cmd->flags |= IWL_POWER_SHADOW_REG_ENA;
-        else
-                cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA;
-
-        if (iwl_advanced_bt_coexist(priv)) {
-                if (!cfg(priv)->bt_params->bt_sco_disable)
-                        cmd->flags |= IWL_POWER_BT_SCO_ENA;
-                else
-                        cmd->flags &= ~IWL_POWER_BT_SCO_ENA;
-        }
-
-        cmd->rx_data_timeout = cpu_to_le32(1000 * dynps_ms);
-        cmd->tx_data_timeout = cpu_to_le32(1000 * dynps_ms);
-
-        for (i = 0; i < IWL_POWER_VEC_SIZE; i++)
-                cmd->sleep_interval[i] =
-                        cpu_to_le32(min_t(int, slp_succ[i], wakeup_period));
-
-        IWL_DEBUG_POWER(priv, "Automatic sleep command\n");
-}
-
 static int iwl_set_power(struct iwl_priv *priv, struct iwl_powertable_cmd *cmd)
 {
         IWL_DEBUG_POWER(priv, "Sending power/sleep command\n");
@@ -350,7 +294,7 @@ static void iwl_power_build_cmd(struct iwl_priv *priv,
 
         if (priv->wowlan)
                 iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, dtimper);
-        else if (!cfg(priv)->base_params->no_idle_support &&
+        else if (!priv->cfg->base_params->no_idle_support &&
                  priv->hw->conf.flags & IEEE80211_CONF_IDLE)
                 iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, 20);
         else if (iwl_tt_is_low_power_state(priv)) {
@@ -363,18 +307,15 @@ static void iwl_power_build_cmd(struct iwl_priv *priv,
                 iwl_static_sleep_cmd(priv, cmd,
                                      priv->power_data.debug_sleep_level_override,
                                      dtimper);
-        else if (iwlagn_mod_params.no_sleep_autoadjust) {
-                if (iwlagn_mod_params.power_level > IWL_POWER_INDEX_1 &&
-                    iwlagn_mod_params.power_level <= IWL_POWER_INDEX_5)
+        else {
+                if (iwlwifi_mod_params.power_level > IWL_POWER_INDEX_1 &&
+                    iwlwifi_mod_params.power_level <= IWL_POWER_INDEX_5)
                         iwl_static_sleep_cmd(priv, cmd,
-                                iwlagn_mod_params.power_level, dtimper);
+                                iwlwifi_mod_params.power_level, dtimper);
                 else
                         iwl_static_sleep_cmd(priv, cmd,
                                 IWL_POWER_INDEX_1, dtimper);
-        } else
-                iwl_power_fill_sleep_cmd(priv, cmd,
-                                         priv->hw->conf.dynamic_ps_timeout,
-                                         priv->hw->conf.max_sleep_period);
+        }
 }
 
 int iwl_power_set_mode(struct iwl_priv *priv, struct iwl_powertable_cmd *cmd,
@@ -403,12 +344,12 @@ int iwl_power_set_mode(struct iwl_priv *priv, struct iwl_powertable_cmd *cmd,
         }
 
         if (cmd->flags & IWL_POWER_DRIVER_ALLOW_SLEEP_MSK)
-                set_bit(STATUS_POWER_PMI, &priv->shrd->status);
+                iwl_dvm_set_pmi(priv, true);
 
         ret = iwl_set_power(priv, cmd);
         if (!ret) {
                 if (!(cmd->flags & IWL_POWER_DRIVER_ALLOW_SLEEP_MSK))
-                        clear_bit(STATUS_POWER_PMI, &priv->shrd->status);
+                        iwl_dvm_set_pmi(priv, false);
 
                 if (update_chains)
                         iwl_update_chain_flags(priv);
@@ -436,7 +377,7 @@ int iwl_power_update_mode(struct iwl_priv *priv, bool force)
 /* initialize to default */
 void iwl_power_initialize(struct iwl_priv *priv)
 {
-        priv->power_data.bus_pm = trans(priv)->pm_support;
+        priv->power_data.bus_pm = priv->trans->pm_support;
 
         priv->power_data.debug_sleep_level_override = -1;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.h b/drivers/net/wireless/iwlwifi/iwl-power.h
index 07a19fce5fdc..21afc92efacb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-power.h
+++ b/drivers/net/wireless/iwlwifi/iwl-power.h
@@ -30,15 +30,6 @@
 
 #include "iwl-commands.h"
 
-enum iwl_power_level {
-        IWL_POWER_INDEX_1,
-        IWL_POWER_INDEX_2,
-        IWL_POWER_INDEX_3,
-        IWL_POWER_INDEX_4,
-        IWL_POWER_INDEX_5,
-        IWL_POWER_NUM
-};
-
 struct iwl_power_mgr {
         struct iwl_powertable_cmd sleep_cmd;
         struct iwl_powertable_cmd sleep_cmd_next;
diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/iwlwifi/iwl-prph.h
index 75dc20bd965b..3b1069290fa9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/iwlwifi/iwl-prph.h
@@ -223,12 +223,33 @@
 #define SCD_AIT                 (SCD_BASE + 0x0c)
 #define SCD_TXFACT              (SCD_BASE + 0x10)
 #define SCD_ACTIVE              (SCD_BASE + 0x14)
-#define SCD_QUEUE_WRPTR(x)      (SCD_BASE + 0x18 + (x) * 4)
-#define SCD_QUEUE_RDPTR(x)      (SCD_BASE + 0x68 + (x) * 4)
 #define SCD_QUEUECHAIN_SEL      (SCD_BASE + 0xe8)
 #define SCD_AGGR_SEL            (SCD_BASE + 0x248)
 #define SCD_INTERRUPT_MASK      (SCD_BASE + 0x108)
-#define SCD_QUEUE_STATUS_BITS(x)        (SCD_BASE + 0x10c + (x) * 4)
+
+static inline unsigned int SCD_QUEUE_WRPTR(unsigned int chnl)
+{
+        if (chnl < 20)
+                return SCD_BASE + 0x18 + chnl * 4;
+        WARN_ON_ONCE(chnl >= 32);
+        return SCD_BASE + 0x284 + (chnl - 20) * 4;
+}
+
+static inline unsigned int SCD_QUEUE_RDPTR(unsigned int chnl)
+{
+        if (chnl < 20)
+                return SCD_BASE + 0x68 + chnl * 4;
+        WARN_ON_ONCE(chnl >= 32);
+        return SCD_BASE + 0x2B4 + (chnl - 20) * 4;
+}
+
+static inline unsigned int SCD_QUEUE_STATUS_BITS(unsigned int chnl)
+{
+        if (chnl < 20)
+                return SCD_BASE + 0x10c + chnl * 4;
+        WARN_ON_ONCE(chnl >= 32);
+        return SCD_BASE + 0x384 + (chnl - 20) * 4;
+}
 
 /*********************** END TX SCHEDULER *************************************/
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index 902efe4bc898..a8437a6bc18e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -32,7 +32,6 @@
 
 #include "iwl-eeprom.h"
 #include "iwl-dev.h"
-#include "iwl-core.h"
 #include "iwl-io.h"
 #include "iwl-agn.h"
 #include "iwl-trans.h"
@@ -69,7 +68,7 @@ static int iwl_send_scan_abort(struct iwl_priv *priv)
         if (!test_bit(STATUS_READY, &priv->status) ||
             !test_bit(STATUS_GEO_CONFIGURED, &priv->status) ||
             !test_bit(STATUS_SCAN_HW, &priv->status) ||
-            test_bit(STATUS_FW_ERROR, &priv->shrd->status))
+            test_bit(STATUS_FW_ERROR, &priv->status))
                 return -EIO;
 
         ret = iwl_dvm_send_cmd(priv, &cmd);
@@ -451,6 +450,46 @@ static u16 iwl_get_passive_dwell_time(struct iwl_priv *priv,
         return iwl_limit_dwell(priv, passive);
 }
 
+/* Return valid, unused, channel for a passive scan to reset the RF */
+static u8 iwl_get_single_channel_number(struct iwl_priv *priv,
+                                 enum ieee80211_band band)
+{
+        const struct iwl_channel_info *ch_info;
+        int i;
+        u8 channel = 0;
+        u8 min, max;
+        struct iwl_rxon_context *ctx;
+
+        if (band == IEEE80211_BAND_5GHZ) {
+                min = 14;
+                max = priv->channel_count;
+        } else {
+                min = 0;
+                max = 14;
+        }
+
+        for (i = min; i < max; i++) {
+                bool busy = false;
+
+                for_each_context(priv, ctx) {
+                        busy = priv->channel_info[i].channel ==
+                                le16_to_cpu(ctx->staging.channel);
+                        if (busy)
+                                break;
+                }
+
+                if (busy)
+                        continue;
+
+                channel = priv->channel_info[i].channel;
+                ch_info = iwl_get_channel_info(priv, band, channel);
+                if (is_channel_valid(ch_info))
+                        break;
+        }
+
+        return channel;
+}
+
 static int iwl_get_single_channel_for_scan(struct iwl_priv *priv,
                                            struct ieee80211_vif *vif,
                                            enum ieee80211_band band,
@@ -633,12 +672,12 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
         u16 rx_chain = 0;
         enum ieee80211_band band;
         u8 n_probes = 0;
-        u8 rx_ant = hw_params(priv).valid_rx_ant;
+        u8 rx_ant = priv->hw_params.valid_rx_ant;
         u8 rate;
         bool is_active = false;
         int  chan_mod;
         u8 active_chains;
-        u8 scan_tx_antennas = hw_params(priv).valid_tx_ant;
+        u8 scan_tx_antennas = priv->hw_params.valid_tx_ant;
         int ret;
 
         lockdep_assert_held(&priv->mutex);
@@ -751,8 +790,8 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
                  * Internal scans are passive, so we can indiscriminately set
                  * the BT ignore flag on 2.4 GHz since it applies to TX only.
                  */
-                if (cfg(priv)->bt_params &&
-                    cfg(priv)->bt_params->advanced_bt_coexist)
+                if (priv->cfg->bt_params &&
+                    priv->cfg->bt_params->advanced_bt_coexist)
                         scan->tx_cmd.tx_flags |= TX_CMD_FLG_IGNORE_BT;
                 break;
         case IEEE80211_BAND_5GHZ:
@@ -793,12 +832,9 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 
         band = priv->scan_band;
 
-        if (cfg(priv)->scan_rx_antennas[band])
-                rx_ant = cfg(priv)->scan_rx_antennas[band];
-
         if (band == IEEE80211_BAND_2GHZ &&
-            cfg(priv)->bt_params &&
-            cfg(priv)->bt_params->advanced_bt_coexist) {
+            priv->cfg->bt_params &&
+            priv->cfg->bt_params->advanced_bt_coexist) {
                 /* transmit 2.4 GHz probes only on first antenna */
                 scan_tx_antennas = first_antenna(scan_tx_antennas);
         }
@@ -809,8 +845,12 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
         rate_flags |= iwl_ant_idx_to_flags(priv->scan_tx_ant[band]);
         scan->tx_cmd.rate_n_flags = iwl_hw_set_rate_n_flags(rate, rate_flags);
 
-        /* In power save mode use one chain, otherwise use all chains */
-        if (test_bit(STATUS_POWER_PMI, &priv->shrd->status)) {
+        /*
+         * In power save mode while associated use one chain,
+         * otherwise use all chains
+         */
+        if (test_bit(STATUS_POWER_PMI, &priv->status) &&
+            !(priv->hw->conf.flags & IEEE80211_CONF_IDLE)) {
                 /* rx_ant has been set to all valid chains previously */
                 active_chains = rx_ant &
                                 ((u8)(priv->chain_noise_data.active_chains));
@@ -822,8 +862,8 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 
                 rx_ant = first_antenna(active_chains);
         }
-        if (cfg(priv)->bt_params &&
-            cfg(priv)->bt_params->advanced_bt_coexist &&
+        if (priv->cfg->bt_params &&
+            priv->cfg->bt_params->advanced_bt_coexist &&
             priv->bt_full_concurrent) {
                 /* operated as 1x1 in full concurrency mode */
                 rx_ant = first_antenna(rx_ant);
@@ -831,7 +871,7 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 
         /* MIMO is not used here, but value is required */
         rx_chain |=
-                hw_params(priv).valid_rx_ant << RXON_RX_CHAIN_VALID_POS;
+                priv->hw_params.valid_rx_ant << RXON_RX_CHAIN_VALID_POS;
         rx_chain |= rx_ant << RXON_RX_CHAIN_FORCE_MIMO_SEL_POS;
         rx_chain |= rx_ant << RXON_RX_CHAIN_FORCE_SEL_POS;
         rx_chain |= 0x1 << RXON_RX_CHAIN_DRIVER_FORCE_POS;
@@ -944,7 +984,7 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 
 void iwl_init_scan_params(struct iwl_priv *priv)
 {
-        u8 ant_idx = fls(hw_params(priv).valid_tx_ant) - 1;
+        u8 ant_idx = fls(priv->hw_params.valid_tx_ant) - 1;
         if (!priv->scan_tx_ant[IEEE80211_BAND_5GHZ])
                 priv->scan_tx_ant[IEEE80211_BAND_5GHZ] = ant_idx;
         if (!priv->scan_tx_ant[IEEE80211_BAND_2GHZ])
diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.c b/drivers/net/wireless/iwlwifi/iwl-testmode.c
index 76f7f9251436..060aac3e22f1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c
@@ -71,7 +71,6 @@
 #include <net/netlink.h>
 
 #include "iwl-dev.h"
-#include "iwl-core.h"
 #include "iwl-debug.h"
 #include "iwl-io.h"
 #include "iwl-agn.h"
@@ -184,9 +183,10 @@ static void iwl_testmode_ucode_rx_pkt(struct iwl_priv *priv,
                          "Run out of memory for messages to user space ?\n");
                 return;
         }
-        NLA_PUT_U32(skb, IWL_TM_ATTR_COMMAND, IWL_TM_CMD_DEV2APP_UCODE_RX_PKT);
-        /* the length doesn't include len_n_flags field, so add it manually */
-        NLA_PUT(skb, IWL_TM_ATTR_UCODE_RX_PKT, length + sizeof(__le32), data);
+        if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND, IWL_TM_CMD_DEV2APP_UCODE_RX_PKT) ||
+            /* the length doesn't include len_n_flags field, so add it manually */
+            nla_put(skb, IWL_TM_ATTR_UCODE_RX_PKT, length + sizeof(__le32), data))
+                goto nla_put_failure;
         cfg80211_testmode_event(skb, GFP_ATOMIC);
         return;
 
@@ -218,7 +218,7 @@ static void iwl_trace_cleanup(struct iwl_priv *priv)
         if (priv->testmode_trace.trace_enabled) {
                 if (priv->testmode_trace.cpu_addr &&
                     priv->testmode_trace.dma_addr)
-                        dma_free_coherent(trans(priv)->dev,
+                        dma_free_coherent(priv->trans->dev,
                                         priv->testmode_trace.total_size,
                                         priv->testmode_trace.cpu_addr,
                                         priv->testmode_trace.dma_addr);
@@ -314,8 +314,9 @@ static int iwl_testmode_ucode(struct ieee80211_hw *hw, struct nlattr **tb)
         memcpy(reply_buf, &(pkt->hdr), reply_len);
         iwl_free_resp(&cmd);
 
-        NLA_PUT_U32(skb, IWL_TM_ATTR_COMMAND, IWL_TM_CMD_DEV2APP_UCODE_RX_PKT);
-        NLA_PUT(skb, IWL_TM_ATTR_UCODE_RX_PKT, reply_len, reply_buf);
+        if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND, IWL_TM_CMD_DEV2APP_UCODE_RX_PKT) ||
+            nla_put(skb, IWL_TM_ATTR_UCODE_RX_PKT, reply_len, reply_buf))
+                goto nla_put_failure;
         return cfg80211_testmode_reply(skb);
 
 nla_put_failure:
@@ -371,7 +372,7 @@ static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)
 
         switch (cmd) {
         case IWL_TM_CMD_APP2DEV_DIRECT_REG_READ32:
-                val32 = iwl_read_direct32(trans(priv), ofs);
+                val32 = iwl_read_direct32(priv->trans, ofs);
                 IWL_INFO(priv, "32bit value to read 0x%x\n", val32);
 
                 skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, 20);
@@ -379,7 +380,8 @@ static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)
                         IWL_ERR(priv, "Memory allocation fail\n");
                         return -ENOMEM;
                 }
-                NLA_PUT_U32(skb, IWL_TM_ATTR_REG_VALUE32, val32);
+                if (nla_put_u32(skb, IWL_TM_ATTR_REG_VALUE32, val32))
+                        goto nla_put_failure;
                 status = cfg80211_testmode_reply(skb);
                 if (status < 0)
                         IWL_ERR(priv, "Error sending msg : %d\n", status);
@@ -391,7 +393,7 @@ static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)
                 } else {
                         val32 = nla_get_u32(tb[IWL_TM_ATTR_REG_VALUE32]);
                         IWL_INFO(priv, "32bit value to write 0x%x\n", val32);
-                        iwl_write_direct32(trans(priv), ofs, val32);
+                        iwl_write_direct32(priv->trans, ofs, val32);
                 }
                 break;
         case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE8:
@@ -401,7 +403,7 @@ static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)
                 } else {
                         val8 = nla_get_u8(tb[IWL_TM_ATTR_REG_VALUE8]);
                         IWL_INFO(priv, "8bit value to write 0x%x\n", val8);
-                        iwl_write8(trans(priv), ofs, val8);
+                        iwl_write8(priv->trans, ofs, val8);
                 }
                 break;
         default:
@@ -420,10 +422,13 @@ nla_put_failure:
 static int iwl_testmode_cfg_init_calib(struct iwl_priv *priv)
 {
         struct iwl_notification_wait calib_wait;
+        static const u8 calib_complete[] = {
+                CALIBRATION_COMPLETE_NOTIFICATION
+        };
         int ret;
 
         iwl_init_notification_wait(&priv->notif_wait, &calib_wait,
-                                   CALIBRATION_COMPLETE_NOTIFICATION,
+                                   calib_complete, ARRAY_SIZE(calib_complete),
                                    NULL, NULL);
         ret = iwl_init_alive_start(priv);
         if (ret) {
@@ -461,7 +466,7 @@ cfg_init_calib_error:
 static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-        struct iwl_trans *trans = trans(priv);
+        struct iwl_trans *trans = priv->trans;
         struct sk_buff *skb;
         unsigned char *rsp_data_ptr = NULL;
         int status = 0, rsp_data_len = 0;
@@ -470,18 +475,19 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
 
         switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {
         case IWL_TM_CMD_APP2DEV_GET_DEVICENAME:
-                rsp_data_ptr = (unsigned char *)cfg(priv)->name;
-                rsp_data_len = strlen(cfg(priv)->name);
+                rsp_data_ptr = (unsigned char *)priv->cfg->name;
+                rsp_data_len = strlen(priv->cfg->name);
                 skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy,
                                                         rsp_data_len + 20);
                 if (!skb) {
                         IWL_ERR(priv, "Memory allocation fail\n");
                         return -ENOMEM;
                 }
-                NLA_PUT_U32(skb, IWL_TM_ATTR_COMMAND,
-                            IWL_TM_CMD_DEV2APP_SYNC_RSP);
-                NLA_PUT(skb, IWL_TM_ATTR_SYNC_RSP,
-                        rsp_data_len, rsp_data_ptr);
+                if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND,
+                                IWL_TM_CMD_DEV2APP_SYNC_RSP) ||
+                    nla_put(skb, IWL_TM_ATTR_SYNC_RSP,
+                            rsp_data_len, rsp_data_ptr))
+                        goto nla_put_failure;
                 status = cfg80211_testmode_reply(skb);
                 if (status < 0)
                         IWL_ERR(priv, "Error sending msg : %d\n", status);
@@ -529,18 +535,19 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
                 break;
 
         case IWL_TM_CMD_APP2DEV_GET_EEPROM:
-                if (priv->shrd->eeprom) {
+                if (priv->eeprom) {
                         skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy,
-                                cfg(priv)->base_params->eeprom_size + 20);
+                                priv->cfg->base_params->eeprom_size + 20);
                         if (!skb) {
                                 IWL_ERR(priv, "Memory allocation fail\n");
                                 return -ENOMEM;
                         }
-                        NLA_PUT_U32(skb, IWL_TM_ATTR_COMMAND,
-                                IWL_TM_CMD_DEV2APP_EEPROM_RSP);
-                        NLA_PUT(skb, IWL_TM_ATTR_EEPROM,
-                                cfg(priv)->base_params->eeprom_size,
-                                priv->shrd->eeprom);
+                        if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND,
+                                        IWL_TM_CMD_DEV2APP_EEPROM_RSP) ||
+                            nla_put(skb, IWL_TM_ATTR_EEPROM,
+                                    priv->cfg->base_params->eeprom_size,
+                                    priv->eeprom))
+                                goto nla_put_failure;
                         status = cfg80211_testmode_reply(skb);
                         if (status < 0)
                                 IWL_ERR(priv, "Error sending msg : %d\n",
@@ -566,15 +573,16 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
                         IWL_ERR(priv, "Memory allocation fail\n");
                         return -ENOMEM;
                 }
-                NLA_PUT_U32(skb, IWL_TM_ATTR_FW_VERSION,
-                            priv->fw->ucode_ver);
+                if (nla_put_u32(skb, IWL_TM_ATTR_FW_VERSION,
+                                priv->fw->ucode_ver))
+                        goto nla_put_failure;
                 status = cfg80211_testmode_reply(skb);
                 if (status < 0)
                         IWL_ERR(priv, "Error sending msg : %d\n", status);
                 break;
 
         case IWL_TM_CMD_APP2DEV_GET_DEVICE_ID:
-                devid = trans(priv)->hw_id;
+                devid = priv->trans->hw_id;
                 IWL_INFO(priv, "hw version: 0x%x\n", devid);
 
                 skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, 20);
@@ -582,7 +590,8 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
                         IWL_ERR(priv, "Memory allocation fail\n");
                         return -ENOMEM;
                 }
-                NLA_PUT_U32(skb, IWL_TM_ATTR_DEVICE_ID, devid);
+                if (nla_put_u32(skb, IWL_TM_ATTR_DEVICE_ID, devid))
+                        goto nla_put_failure;
                 status = cfg80211_testmode_reply(skb);
                 if (status < 0)
                         IWL_ERR(priv, "Error sending msg : %d\n", status);
@@ -598,13 +607,14 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
                         IWL_ERR(priv, "No uCode has not been loaded\n");
                         return -EINVAL;
                 } else {
-                        img = &priv->fw->img[priv->shrd->ucode_type];
+                        img = &priv->fw->img[priv->cur_ucode];
                         inst_size = img->sec[IWL_UCODE_SECTION_INST].len;
                         data_size = img->sec[IWL_UCODE_SECTION_DATA].len;
                 }
-                NLA_PUT_U32(skb, IWL_TM_ATTR_FW_TYPE, priv->shrd->ucode_type);
-                NLA_PUT_U32(skb, IWL_TM_ATTR_FW_INST_SIZE, inst_size);
-                NLA_PUT_U32(skb, IWL_TM_ATTR_FW_DATA_SIZE, data_size);
+                if (nla_put_u32(skb, IWL_TM_ATTR_FW_TYPE, priv->cur_ucode) ||
+                    nla_put_u32(skb, IWL_TM_ATTR_FW_INST_SIZE, inst_size) ||
+                    nla_put_u32(skb, IWL_TM_ATTR_FW_DATA_SIZE, data_size))
+                        goto nla_put_failure;
                 status = cfg80211_testmode_reply(skb);
                 if (status < 0)
                         IWL_ERR(priv, "Error sending msg : %d\n", status);
@@ -639,7 +649,7 @@ static int iwl_testmode_trace(struct ieee80211_hw *hw, struct nlattr **tb)
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct sk_buff *skb;
         int status = 0;
-        struct device *dev = trans(priv)->dev;
+        struct device *dev = priv->trans->dev;
 
         switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {
         case IWL_TM_CMD_APP2DEV_BEGIN_TRACE:
@@ -678,9 +688,10 @@ static int iwl_testmode_trace(struct ieee80211_hw *hw, struct nlattr **tb)
                         iwl_trace_cleanup(priv);
                         return -ENOMEM;
                 }
-                NLA_PUT(skb, IWL_TM_ATTR_TRACE_ADDR,
-                        sizeof(priv->testmode_trace.dma_addr),
-                        (u64 *)&priv->testmode_trace.dma_addr);
+                if (nla_put(skb, IWL_TM_ATTR_TRACE_ADDR,
+                            sizeof(priv->testmode_trace.dma_addr),
+                            (u64 *)&priv->testmode_trace.dma_addr))
+                        goto nla_put_failure;
                 status = cfg80211_testmode_reply(skb);
                 if (status < 0) {
                         IWL_ERR(priv, "Error sending msg : %d\n", status);
@@ -725,9 +736,10 @@ static int iwl_testmode_trace_dump(struct ieee80211_hw *hw,
                         length = priv->testmode_trace.buff_size %
                                 DUMP_CHUNK_SIZE;
 
-                NLA_PUT(skb, IWL_TM_ATTR_TRACE_DUMP, length,
-                        priv->testmode_trace.trace_addr +
-                        (DUMP_CHUNK_SIZE * idx));
+                if (nla_put(skb, IWL_TM_ATTR_TRACE_DUMP, length,
+                            priv->testmode_trace.trace_addr +
+                            (DUMP_CHUNK_SIZE * idx)))
+                        goto nla_put_failure;
                 idx++;
                 cb->args[4] = idx;
                 return 0;
@@ -779,7 +791,7 @@ static int iwl_testmode_ownership(struct ieee80211_hw *hw, struct nlattr **tb)
 
 static int iwl_testmode_indirect_read(struct iwl_priv *priv, u32 addr, u32 size)
 {
-        struct iwl_trans *trans = trans(priv);
+        struct iwl_trans *trans = priv->trans;
         unsigned long flags;
         int i;
 
@@ -819,7 +831,7 @@ static int iwl_testmode_indirect_read(struct iwl_priv *priv, u32 addr, u32 size)
 static int iwl_testmode_indirect_write(struct iwl_priv *priv, u32 addr,
         u32 size, unsigned char *buf)
 {
-        struct iwl_trans *trans = trans(priv);
+        struct iwl_trans *trans = priv->trans;
         u32 val, i;
         unsigned long flags;
 
@@ -922,9 +934,10 @@ static int iwl_testmode_buffer_dump(struct ieee80211_hw *hw,
                         length = priv->testmode_mem.buff_size %
                                 DUMP_CHUNK_SIZE;
 
-                NLA_PUT(skb, IWL_TM_ATTR_BUFFER_DUMP, length,
-                        priv->testmode_mem.buff_addr +
-                        (DUMP_CHUNK_SIZE * idx));
+                if (nla_put(skb, IWL_TM_ATTR_BUFFER_DUMP, length,
+                            priv->testmode_mem.buff_addr +
+                            (DUMP_CHUNK_SIZE * idx)))
+                        goto nla_put_failure;
                 idx++;
                 cb->args[4] = idx;
                 return 0;
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
index 1c2fe87bd7e2..6213c05a4b52 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
@@ -34,17 +34,15 @@
 #include <linux/skbuff.h>
 #include <linux/wait.h>
 #include <linux/pci.h>
+#include <linux/timer.h>
 
 #include "iwl-fh.h"
 #include "iwl-csr.h"
-#include "iwl-shared.h"
 #include "iwl-trans.h"
 #include "iwl-debug.h"
 #include "iwl-io.h"
 #include "iwl-op-mode.h"
 
-struct iwl_tx_queue;
-struct iwl_queue;
 struct iwl_host_cmd;
 
 /*This file includes the declaration that are internal to the
@@ -136,21 +134,14 @@ static inline int iwl_queue_dec_wrap(int index, int n_bd)
         return --index & (n_bd - 1);
 }
 
-/*
- * This queue number is required for proper operation
- * because the ucode will stop/start the scheduler as
- * required.
- */
-#define IWL_IPAN_MCAST_QUEUE            8
-
 struct iwl_cmd_meta {
         /* only for SYNC commands, iff the reply skb is wanted */
         struct iwl_host_cmd *source;
 
-        u32 flags;
-
         DEFINE_DMA_UNMAP_ADDR(mapping);
         DEFINE_DMA_UNMAP_LEN(len);
+
+        u32 flags;
 };
 
 /*
@@ -188,72 +179,66 @@ struct iwl_queue {
                                 * space less than this */
 };
 
+#define TFD_TX_CMD_SLOTS 256
+#define TFD_CMD_SLOTS 32
+
+struct iwl_pcie_tx_queue_entry {
+        struct iwl_device_cmd *cmd;
+        struct sk_buff *skb;
+        struct iwl_cmd_meta meta;
+};
+
 /**
  * struct iwl_tx_queue - Tx Queue for DMA
  * @q: generic Rx/Tx queue descriptor
- * @bd: base of circular buffer of TFDs
- * @cmd: array of command/TX buffer pointers
- * @meta: array of meta data for each command/tx buffer
- * @dma_addr_cmd: physical address of cmd/tx buffer array
- * @txb: array of per-TFD driver data
- * lock: queue lock
- * @time_stamp: time (in jiffies) of last read_ptr change
+ * @tfds: transmit frame descriptors (DMA memory)
+ * @entries: transmit entries (driver state)
+ * @lock: queue lock
+ * @stuck_timer: timer that fires if queue gets stuck
+ * @trans_pcie: pointer back to transport (for timer)
  * @need_update: indicates need to update read/write index
- * @sched_retry: indicates queue is high-throughput aggregation (HT AGG) enabled
- * @sta_id: valid if sched_retry is set
- * @tid: valid if sched_retry is set
+ * @active: stores if queue is active
  *
  * A Tx queue consists of circular buffer of BDs (a.k.a. TFDs, transmit frame
  * descriptors) and required locking structures.
  */
-#define TFD_TX_CMD_SLOTS 256
-#define TFD_CMD_SLOTS 32
-
 struct iwl_tx_queue {
         struct iwl_queue q;
         struct iwl_tfd *tfds;
-        struct iwl_device_cmd **cmd;
-        struct iwl_cmd_meta *meta;
-        struct sk_buff **skbs;
+        struct iwl_pcie_tx_queue_entry *entries;
         spinlock_t lock;
-        unsigned long time_stamp;
+        struct timer_list stuck_timer;
+        struct iwl_trans_pcie *trans_pcie;
         u8 need_update;
-        u8 sched_retry;
         u8 active;
-        u8 swq_id;
-
-        u16 sta_id;
-        u16 tid;
 };
 
 /**
  * struct iwl_trans_pcie - PCIe transport specific data
  * @rxq: all the RX queue data
  * @rx_replenish: work that will be called when buffers need to be allocated
+ * @drv - pointer to iwl_drv
  * @trans: pointer to the generic transport area
  * @irq - the irq number for the device
  * @irq_requested: true when the irq has been requested
  * @scd_base_addr: scheduler sram base address in SRAM
  * @scd_bc_tbls: pointer to the byte count table of the scheduler
  * @kw: keep warm address
- * @ac_to_fifo: to what fifo is a specifc AC mapped ?
- * @ac_to_queue: to what tx queue  is a specifc AC mapped ?
- * @mcast_queue:
- * @txq: Tx DMA processing queues
- * @txq_ctx_active_msk: what queue is active
- * queue_stopped: tracks what queue is stopped
- * queue_stop_count: tracks what SW queue is stopped
  * @pci_dev: basic pci-network driver stuff
  * @hw_base: pci hardware address support
  * @ucode_write_complete: indicates that the ucode has been copied.
  * @ucode_write_waitq: wait queue for uCode load
  * @status - transport specific status flags
  * @cmd_queue - command queue number
+ * @rx_buf_size_8k: 8 kB RX buffer size
+ * @rx_page_order: page order for receive buffer size
+ * @wd_timeout: queue watchdog timeout (jiffies)
  */
 struct iwl_trans_pcie {
         struct iwl_rx_queue rxq;
         struct work_struct rx_replenish;
         struct iwl_trans *trans;
+        struct iwl_drv *drv;
 
         /* INT ICT Table */
         __le32 *ict_tbl;
@@ -272,16 +257,9 @@ struct iwl_trans_pcie {
         struct iwl_dma_ptr scd_bc_tbls;
         struct iwl_dma_ptr kw;
 
-        const u8 *ac_to_fifo[NUM_IWL_RXON_CTX];
-        const u8 *ac_to_queue[NUM_IWL_RXON_CTX];
-        u8 mcast_queue[NUM_IWL_RXON_CTX];
-        u8 agg_txq[IWLAGN_STATION_COUNT][IWL_MAX_TID_COUNT];
-
         struct iwl_tx_queue *txq;
-        unsigned long txq_ctx_active_msk;
-#define IWL_MAX_HW_QUEUES       32
+        unsigned long queue_used[BITS_TO_LONGS(IWL_MAX_HW_QUEUES)];
         unsigned long queue_stopped[BITS_TO_LONGS(IWL_MAX_HW_QUEUES)];
-        atomic_t queue_stop_count[4];
 
         /* PCI bus related data */
         struct pci_dev *pci_dev;
@@ -293,11 +271,41 @@ struct iwl_trans_pcie {
         u8 cmd_queue;
         u8 n_no_reclaim_cmds;
         u8 no_reclaim_cmds[MAX_NO_RECLAIM_CMDS];
+        u8 setup_q_to_fifo[IWL_MAX_HW_QUEUES];
+        u8 n_q_to_fifo;
+
+        bool rx_buf_size_8k;
+        u32 rx_page_order;
+
+        const char **command_names;
+
+        /* queue watchdog */
+        unsigned long wd_timeout;
 };
 
+/*****************************************************
+* DRIVER STATUS FUNCTIONS
+******************************************************/
+#define STATUS_HCMD_ACTIVE      0
+#define STATUS_DEVICE_ENABLED   1
+#define STATUS_TPOWER_PMI       2
+#define STATUS_INT_ENABLED      3
+
 #define IWL_TRANS_GET_PCIE_TRANS(_iwl_trans) \
         ((struct iwl_trans_pcie *) ((_iwl_trans)->trans_specific))
 
+static inline struct iwl_trans *
+iwl_trans_pcie_get_trans(struct iwl_trans_pcie *trans_pcie)
+{
+        return container_of((void *)trans_pcie, struct iwl_trans,
+                            trans_specific);
+}
+
+struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
+                                       const struct pci_device_id *ent,
+                                       const struct iwl_cfg *cfg);
+void iwl_trans_pcie_free(struct iwl_trans *trans);
+
 /*****************************************************
 * RX
 ******************************************************/
@@ -331,15 +339,12 @@ void iwl_tx_cmd_complete(struct iwl_trans *trans,
 void iwl_trans_txq_update_byte_cnt_tbl(struct iwl_trans *trans,
                                            struct iwl_tx_queue *txq,
                                            u16 byte_cnt);
-int iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans,
-                                  int sta_id, int tid);
+void iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans, int queue);
 void iwl_trans_set_wr_ptrs(struct iwl_trans *trans, int txq_id, u32 index);
 void iwl_trans_tx_queue_set_status(struct iwl_trans *trans,
-                             struct iwl_tx_queue *txq,
-                             int tx_fifo_id, int scd_retry);
-int iwl_trans_pcie_tx_agg_alloc(struct iwl_trans *trans, int sta_id, int tid);
-void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans,
-                                 enum iwl_rxon_context_id ctx,
+                                   struct iwl_tx_queue *txq,
+                                   int tx_fifo_id, bool active);
+void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans, int queue, int fifo,
                                  int sta_id, int tid, int frame_limit, u16 ssn);
 void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
         int index, enum dma_data_direction dma_dir);
@@ -350,8 +355,6 @@ int iwl_queue_space(const struct iwl_queue *q);
 /*****************************************************
 * Error handling
 ******************************************************/
-int iwl_dump_nic_event_log(struct iwl_trans *trans, bool full_log,
-                            char **buf, bool display);
 int iwl_dump_fh(struct iwl_trans *trans, char **buf, bool display);
 void iwl_dump_csr(struct iwl_trans *trans);
 
@@ -388,91 +391,28 @@ static inline void iwl_enable_rfkill_int(struct iwl_trans *trans)
         iwl_write32(trans, CSR_INT_MASK, CSR_INT_BIT_RF_KILL);
 }
 
-/*
- * we have 8 bits used like this:
- *
- * 7 6 5 4 3 2 1 0
- * | | | | | | | |
- * | | | | | | +-+-------- AC queue (0-3)
- * | | | | | |
- * | +-+-+-+-+------------ HW queue ID
- * |
- * +---------------------- unused
- */
-static inline void iwl_set_swq_id(struct iwl_tx_queue *txq, u8 ac, u8 hwq)
-{
-        BUG_ON(ac > 3);   /* only have 2 bits */
-        BUG_ON(hwq > 31); /* only use 5 bits */
-
-        txq->swq_id = (hwq << 2) | ac;
-}
-
-static inline u8 iwl_get_queue_ac(struct iwl_tx_queue *txq)
-{
-        return txq->swq_id & 0x3;
-}
-
 static inline void iwl_wake_queue(struct iwl_trans *trans,
                                   struct iwl_tx_queue *txq)
 {
-        u8 queue = txq->swq_id;
-        u8 ac = queue & 3;
-        u8 hwq = (queue >> 2) & 0x1f;
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
-
-        if (test_and_clear_bit(hwq, trans_pcie->queue_stopped)) {
-                if (atomic_dec_return(&trans_pcie->queue_stop_count[ac]) <= 0) {
-                        iwl_op_mode_queue_not_full(trans->op_mode, ac);
-                        IWL_DEBUG_TX_QUEUES(trans, "Wake hwq %d ac %d",
-                                            hwq, ac);
-                } else {
-                        IWL_DEBUG_TX_QUEUES(trans,
-                                "Don't wake hwq %d ac %d stop count %d",
-                                hwq, ac,
-                                atomic_read(&trans_pcie->queue_stop_count[ac]));
-                }
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+
+        if (test_and_clear_bit(txq->q.id, trans_pcie->queue_stopped)) {
+                IWL_DEBUG_TX_QUEUES(trans, "Wake hwq %d\n", txq->q.id);
+                iwl_op_mode_queue_not_full(trans->op_mode, txq->q.id);
         }
 }
 
 static inline void iwl_stop_queue(struct iwl_trans *trans,
                                   struct iwl_tx_queue *txq)
 {
-        u8 queue = txq->swq_id;
-        u8 ac = queue & 3;
-        u8 hwq = (queue >> 2) & 0x1f;
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
-
-        if (!test_and_set_bit(hwq, trans_pcie->queue_stopped)) {
-                if (atomic_inc_return(&trans_pcie->queue_stop_count[ac]) > 0) {
-                        iwl_op_mode_queue_full(trans->op_mode, ac);
-                        IWL_DEBUG_TX_QUEUES(trans,
-                                "Stop hwq %d ac %d stop count %d",
-                                hwq, ac,
-                                atomic_read(&trans_pcie->queue_stop_count[ac]));
-                } else {
-                        IWL_DEBUG_TX_QUEUES(trans,
-                                "Don't stop hwq %d ac %d stop count %d",
-                                hwq, ac,
-                                atomic_read(&trans_pcie->queue_stop_count[ac]));
-                }
-        } else {
-                IWL_DEBUG_TX_QUEUES(trans, "stop hwq %d, but it is stopped",
-                                    hwq);
-        }
-}
-
-static inline void iwl_txq_ctx_activate(struct iwl_trans_pcie *trans_pcie,
-                                        int txq_id)
-{
-        set_bit(txq_id, &trans_pcie->txq_ctx_active_msk);
-}
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
-static inline void iwl_txq_ctx_deactivate(struct iwl_trans_pcie *trans_pcie,
-                                          int txq_id)
-{
-        clear_bit(txq_id, &trans_pcie->txq_ctx_active_msk);
+        if (!test_and_set_bit(txq->q.id, trans_pcie->queue_stopped)) {
+                iwl_op_mode_queue_full(trans->op_mode, txq->q.id);
+                IWL_DEBUG_TX_QUEUES(trans, "Stop hwq %d\n", txq->q.id);
+        } else
+                IWL_DEBUG_TX_QUEUES(trans, "hwq %d already stopped\n",
+                                    txq->q.id);
 }
 
 static inline int iwl_queue_used(const struct iwl_queue *q, int i)
@@ -487,19 +427,18 @@ static inline u8 get_cmd_index(struct iwl_queue *q, u32 index)
         return index & (q->n_window - 1);
 }
 
-#define IWL_TX_FIFO_BK          0       /* shared */
-#define IWL_TX_FIFO_BE          1
-#define IWL_TX_FIFO_VI          2       /* shared */
-#define IWL_TX_FIFO_VO          3
-#define IWL_TX_FIFO_BK_IPAN     IWL_TX_FIFO_BK
-#define IWL_TX_FIFO_BE_IPAN     4
-#define IWL_TX_FIFO_VI_IPAN     IWL_TX_FIFO_VI
-#define IWL_TX_FIFO_VO_IPAN     5
-/* re-uses the VO FIFO, uCode will properly flush/schedule */
-#define IWL_TX_FIFO_AUX         5
-#define IWL_TX_FIFO_UNUSED      -1
-
-/* AUX (TX during scan dwell) queue */
-#define IWL_AUX_QUEUE           10
+static inline const char *
+trans_pcie_get_cmd_string(struct iwl_trans_pcie *trans_pcie, u8 cmd)
+{
+        if (!trans_pcie->command_names || !trans_pcie->command_names[cmd])
+                return "UNKNOWN";
+        return trans_pcie->command_names[cmd];
+}
+
+static inline bool iwl_is_rfkill_set(struct iwl_trans *trans)
+{
+        return !(iwl_read32(trans, CSR_GP_CNTRL) &
+                CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW);
+}
 
 #endif /* __iwl_trans_int_pcie_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
index 8b1a7988e176..08517d3c80bb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
@@ -140,14 +140,17 @@ void iwl_rx_queue_update_write_ptr(struct iwl_trans *trans,
         if (q->need_update == 0)
                 goto exit_unlock;
 
-        if (cfg(trans)->base_params->shadow_reg_enable) {
+        if (trans->cfg->base_params->shadow_reg_enable) {
                 /* shadow register enabled */
                 /* Device expects a multiple of 8 */
                 q->write_actual = (q->write & ~0x7);
                 iwl_write32(trans, FH_RSCSR_CHNL0_WPTR, q->write_actual);
         } else {
+                struct iwl_trans_pcie *trans_pcie =
+                        IWL_TRANS_GET_PCIE_TRANS(trans);
+
                 /* If power-saving is in use, make sure device is awake */
-                if (test_bit(STATUS_POWER_PMI, &trans->shrd->status)) {
+                if (test_bit(STATUS_TPOWER_PMI, &trans_pcie->status)) {
                         reg = iwl_read32(trans, CSR_UCODE_DRV_GP1);
 
                         if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {
@@ -271,17 +274,17 @@ static void iwlagn_rx_allocate(struct iwl_trans *trans, gfp_t priority)
                 if (rxq->free_count > RX_LOW_WATERMARK)
                         gfp_mask |= __GFP_NOWARN;
 
-                if (hw_params(trans).rx_page_order > 0)
+                if (trans_pcie->rx_page_order > 0)
                         gfp_mask |= __GFP_COMP;
 
                 /* Alloc a new receive buffer */
                 page = alloc_pages(gfp_mask,
-                                  hw_params(trans).rx_page_order);
+                                  trans_pcie->rx_page_order);
                 if (!page) {
                         if (net_ratelimit())
                                 IWL_DEBUG_INFO(trans, "alloc_pages failed, "
                                            "order: %d\n",
-                                           hw_params(trans).rx_page_order);
+                                           trans_pcie->rx_page_order);
 
                         if ((rxq->free_count <= RX_LOW_WATERMARK) &&
                             net_ratelimit())
@@ -300,7 +303,7 @@ static void iwlagn_rx_allocate(struct iwl_trans *trans, gfp_t priority)
 
                 if (list_empty(&rxq->rx_used)) {
                         spin_unlock_irqrestore(&rxq->lock, flags);
-                        __free_pages(page, hw_params(trans).rx_page_order);
+                        __free_pages(page, trans_pcie->rx_page_order);
                         return;
                 }
                 element = rxq->rx_used.next;
@@ -313,7 +316,7 @@ static void iwlagn_rx_allocate(struct iwl_trans *trans, gfp_t priority)
                 rxb->page = page;
                 /* Get physical address of the RB */
                 rxb->page_dma = dma_map_page(trans->dev, page, 0,
-                                PAGE_SIZE << hw_params(trans).rx_page_order,
+                                PAGE_SIZE << trans_pcie->rx_page_order,
                                 DMA_FROM_DEVICE);
                 /* dma address must be no more than 36 bits */
                 BUG_ON(rxb->page_dma & ~DMA_BIT_MASK(36));
@@ -362,83 +365,98 @@ static void iwl_rx_handle_rxbuf(struct iwl_trans *trans,
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rx_queue *rxq = &trans_pcie->rxq;
         struct iwl_tx_queue *txq = &trans_pcie->txq[trans_pcie->cmd_queue];
-        struct iwl_device_cmd *cmd;
         unsigned long flags;
-        int len, err;
-        u16 sequence;
-        struct iwl_rx_cmd_buffer rxcb;
-        struct iwl_rx_packet *pkt;
-        bool reclaim;
-        int index, cmd_index;
+        bool page_stolen = false;
+        int max_len = PAGE_SIZE << trans_pcie->rx_page_order;
+        u32 offset = 0;
 
         if (WARN_ON(!rxb))
                 return;
 
-        dma_unmap_page(trans->dev, rxb->page_dma,
-                       PAGE_SIZE << hw_params(trans).rx_page_order,
-                       DMA_FROM_DEVICE);
-
-        rxcb._page = rxb->page;
-        pkt = rxb_addr(&rxcb);
+        dma_unmap_page(trans->dev, rxb->page_dma, max_len, DMA_FROM_DEVICE);
 
-        IWL_DEBUG_RX(trans, "%s, 0x%02x\n",
-                     get_cmd_string(pkt->hdr.cmd), pkt->hdr.cmd);
+        while (offset + sizeof(u32) + sizeof(struct iwl_cmd_header) < max_len) {
+                struct iwl_rx_packet *pkt;
+                struct iwl_device_cmd *cmd;
+                u16 sequence;
+                bool reclaim;
+                int index, cmd_index, err, len;
+                struct iwl_rx_cmd_buffer rxcb = {
+                        ._offset = offset,
+                        ._page = rxb->page,
+                        ._page_stolen = false,
+                        .truesize = max_len,
+                };
 
+                pkt = rxb_addr(&rxcb);
 
-        len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
-        len += sizeof(u32); /* account for status word */
-        trace_iwlwifi_dev_rx(trans->dev, pkt, len);
-
-        /* Reclaim a command buffer only if this packet is a response
-         *   to a (driver-originated) command.
-         * If the packet (e.g. Rx frame) originated from uCode,
-         *   there is no command buffer to reclaim.
-         * Ucode should set SEQ_RX_FRAME bit if ucode-originated,
-         *   but apparently a few don't get set; catch them here. */
-        reclaim = !(pkt->hdr.sequence & SEQ_RX_FRAME);
-        if (reclaim) {
-                int i;
+                if (pkt->len_n_flags == cpu_to_le32(FH_RSCSR_FRAME_INVALID))
+                        break;
 
-                for (i = 0; i < trans_pcie->n_no_reclaim_cmds; i++) {
-                        if (trans_pcie->no_reclaim_cmds[i] == pkt->hdr.cmd) {
-                                reclaim = false;
-                                break;
+                IWL_DEBUG_RX(trans, "cmd at offset %d: %s (0x%.2x)\n",
+                        rxcb._offset,
+                        trans_pcie_get_cmd_string(trans_pcie, pkt->hdr.cmd),
+                        pkt->hdr.cmd);
+
+                len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
+                len += sizeof(u32); /* account for status word */
+                trace_iwlwifi_dev_rx(trans->dev, pkt, len);
+
+                /* Reclaim a command buffer only if this packet is a response
+                 *   to a (driver-originated) command.
+                 * If the packet (e.g. Rx frame) originated from uCode,
+                 *   there is no command buffer to reclaim.
+                 * Ucode should set SEQ_RX_FRAME bit if ucode-originated,
+                 *   but apparently a few don't get set; catch them here. */
+                reclaim = !(pkt->hdr.sequence & SEQ_RX_FRAME);
+                if (reclaim) {
+                        int i;
+
+                        for (i = 0; i < trans_pcie->n_no_reclaim_cmds; i++) {
+                                if (trans_pcie->no_reclaim_cmds[i] ==
+                                                        pkt->hdr.cmd) {
+                                        reclaim = false;
+                                        break;
+                                }
                         }
                 }
-        }
 
-        sequence = le16_to_cpu(pkt->hdr.sequence);
-        index = SEQ_TO_INDEX(sequence);
-        cmd_index = get_cmd_index(&txq->q, index);
+                sequence = le16_to_cpu(pkt->hdr.sequence);
+                index = SEQ_TO_INDEX(sequence);
+                cmd_index = get_cmd_index(&txq->q, index);
 
-        if (reclaim)
-                cmd = txq->cmd[cmd_index];
-        else
-                cmd = NULL;
+                if (reclaim)
+                        cmd = txq->entries[cmd_index].cmd;
+                else
+                        cmd = NULL;
 
-        err = iwl_op_mode_rx(trans->op_mode, &rxcb, cmd);
+                err = iwl_op_mode_rx(trans->op_mode, &rxcb, cmd);
 
-        /*
-         * XXX: After here, we should always check rxcb._page
-         * against NULL before touching it or its virtual
-         * memory (pkt). Because some rx_handler might have
-         * already taken or freed the pages.
-         */
+                /*
+                 * After here, we should always check rxcb._page_stolen,
+                 * if it is true then one of the handlers took the page.
+                 */
 
-        if (reclaim) {
-                /* Invoke any callbacks, transfer the buffer to caller,
-                 * and fire off the (possibly) blocking
-                 * iwl_trans_send_cmd()
-                 * as we reclaim the driver command queue */
-                if (rxcb._page)
-                        iwl_tx_cmd_complete(trans, &rxcb, err);
-                else
-                        IWL_WARN(trans, "Claim null rxb?\n");
+                if (reclaim) {
+                        /* Invoke any callbacks, transfer the buffer to caller,
+                         * and fire off the (possibly) blocking
+                         * iwl_trans_send_cmd()
+                         * as we reclaim the driver command queue */
+                        if (!rxcb._page_stolen)
+                                iwl_tx_cmd_complete(trans, &rxcb, err);
+                        else
+                                IWL_WARN(trans, "Claim null rxb?\n");
+                }
+
+                page_stolen |= rxcb._page_stolen;
+                offset += ALIGN(len, FH_RSCSR_FRAME_ALIGN);
         }
 
-        /* page was stolen from us */
-        if (rxcb._page == NULL)
+        /* page was stolen from us -- free our reference */
+        if (page_stolen) {
+                __free_pages(rxb->page, trans_pcie->rx_page_order);
                 rxb->page = NULL;
+        }
 
         /* Reuse the page if possible. For notification packets and
          * SKBs that fail to Rx correctly, add them back into the
@@ -447,7 +465,7 @@ static void iwl_rx_handle_rxbuf(struct iwl_trans *trans,
         if (rxb->page != NULL) {
                 rxb->page_dma =
                         dma_map_page(trans->dev, rxb->page, 0,
-                                PAGE_SIZE << hw_params(trans).rx_page_order,
+                                PAGE_SIZE << trans_pcie->rx_page_order,
                                 DMA_FROM_DEVICE);
                 list_add_tail(&rxb->list, &rxq->rx_free);
                 rxq->free_count++;
@@ -520,412 +538,32 @@ static void iwl_rx_handle(struct iwl_trans *trans)
                 iwlagn_rx_queue_restock(trans);
 }
 
-static const char * const desc_lookup_text[] = {
-        "OK",
-        "FAIL",
-        "BAD_PARAM",
-        "BAD_CHECKSUM",
-        "NMI_INTERRUPT_WDG",
-        "SYSASSERT",
-        "FATAL_ERROR",
-        "BAD_COMMAND",
-        "HW_ERROR_TUNE_LOCK",
-        "HW_ERROR_TEMPERATURE",
-        "ILLEGAL_CHAN_FREQ",
-        "VCC_NOT_STABLE",
-        "FH_ERROR",
-        "NMI_INTERRUPT_HOST",
-        "NMI_INTERRUPT_ACTION_PT",
-        "NMI_INTERRUPT_UNKNOWN",
-        "UCODE_VERSION_MISMATCH",
-        "HW_ERROR_ABS_LOCK",
-        "HW_ERROR_CAL_LOCK_FAIL",
-        "NMI_INTERRUPT_INST_ACTION_PT",
-        "NMI_INTERRUPT_DATA_ACTION_PT",
-        "NMI_TRM_HW_ER",
-        "NMI_INTERRUPT_TRM",
-        "NMI_INTERRUPT_BREAK_POINT",
-        "DEBUG_0",
-        "DEBUG_1",
-        "DEBUG_2",
-        "DEBUG_3",
-};
-
-static struct { char *name; u8 num; } advanced_lookup[] = {
-        { "NMI_INTERRUPT_WDG", 0x34 },
-        { "SYSASSERT", 0x35 },
-        { "UCODE_VERSION_MISMATCH", 0x37 },
-        { "BAD_COMMAND", 0x38 },
-        { "NMI_INTERRUPT_DATA_ACTION_PT", 0x3C },
-        { "FATAL_ERROR", 0x3D },
-        { "NMI_TRM_HW_ERR", 0x46 },
-        { "NMI_INTERRUPT_TRM", 0x4C },
-        { "NMI_INTERRUPT_BREAK_POINT", 0x54 },
-        { "NMI_INTERRUPT_WDG_RXF_FULL", 0x5C },
-        { "NMI_INTERRUPT_WDG_NO_RBD_RXF_FULL", 0x64 },
-        { "NMI_INTERRUPT_HOST", 0x66 },
-        { "NMI_INTERRUPT_ACTION_PT", 0x7C },
-        { "NMI_INTERRUPT_UNKNOWN", 0x84 },
-        { "NMI_INTERRUPT_INST_ACTION_PT", 0x86 },
-        { "ADVANCED_SYSASSERT", 0 },
-};
-
-static const char *desc_lookup(u32 num)
-{
-        int i;
-        int max = ARRAY_SIZE(desc_lookup_text);
-
-        if (num < max)
-                return desc_lookup_text[num];
-
-        max = ARRAY_SIZE(advanced_lookup) - 1;
-        for (i = 0; i < max; i++) {
-                if (advanced_lookup[i].num == num)
-                        break;
-        }
-        return advanced_lookup[i].name;
-}
-
-#define ERROR_START_OFFSET  (1 * sizeof(u32))
-#define ERROR_ELEM_SIZE     (7 * sizeof(u32))
-
-static void iwl_dump_nic_error_log(struct iwl_trans *trans)
-{
-        u32 base;
-        struct iwl_error_event_table table;
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
-
-        base = trans->shrd->device_pointers.error_event_table;
-        if (trans->shrd->ucode_type == IWL_UCODE_INIT) {
-                if (!base)
-                        base = trans->shrd->fw->init_errlog_ptr;
-        } else {
-                if (!base)
-                        base = trans->shrd->fw->inst_errlog_ptr;
-        }
-
-        if (!iwlagn_hw_valid_rtc_data_addr(base)) {
-                IWL_ERR(trans,
-                        "Not valid error log pointer 0x%08X for %s uCode\n",
-                        base,
-                        (trans->shrd->ucode_type == IWL_UCODE_INIT)
-                                        ? "Init" : "RT");
-                return;
-        }
-
-        iwl_read_targ_mem_words(trans, base, &table, sizeof(table));
-
-        if (ERROR_START_OFFSET <= table.valid * ERROR_ELEM_SIZE) {
-                IWL_ERR(trans, "Start IWL Error Log Dump:\n");
-                IWL_ERR(trans, "Status: 0x%08lX, count: %d\n",
-                        trans->shrd->status, table.valid);
-        }
-
-        trans_pcie->isr_stats.err_code = table.error_id;
-
-        trace_iwlwifi_dev_ucode_error(trans->dev, table.error_id, table.tsf_low,
-                                      table.data1, table.data2, table.line,
-                                      table.blink1, table.blink2, table.ilink1,
-                                      table.ilink2, table.bcon_time, table.gp1,
-                                      table.gp2, table.gp3, table.ucode_ver,
-                                      table.hw_ver, table.brd_ver);
-        IWL_ERR(trans, "0x%08X | %-28s\n", table.error_id,
-                desc_lookup(table.error_id));
-        IWL_ERR(trans, "0x%08X | uPc\n", table.pc);
-        IWL_ERR(trans, "0x%08X | branchlink1\n", table.blink1);
-        IWL_ERR(trans, "0x%08X | branchlink2\n", table.blink2);
-        IWL_ERR(trans, "0x%08X | interruptlink1\n", table.ilink1);
-        IWL_ERR(trans, "0x%08X | interruptlink2\n", table.ilink2);
-        IWL_ERR(trans, "0x%08X | data1\n", table.data1);
-        IWL_ERR(trans, "0x%08X | data2\n", table.data2);
-        IWL_ERR(trans, "0x%08X | line\n", table.line);
-        IWL_ERR(trans, "0x%08X | beacon time\n", table.bcon_time);
-        IWL_ERR(trans, "0x%08X | tsf low\n", table.tsf_low);
-        IWL_ERR(trans, "0x%08X | tsf hi\n", table.tsf_hi);
-        IWL_ERR(trans, "0x%08X | time gp1\n", table.gp1);
-        IWL_ERR(trans, "0x%08X | time gp2\n", table.gp2);
-        IWL_ERR(trans, "0x%08X | time gp3\n", table.gp3);
-        IWL_ERR(trans, "0x%08X | uCode version\n", table.ucode_ver);
-        IWL_ERR(trans, "0x%08X | hw version\n", table.hw_ver);
-        IWL_ERR(trans, "0x%08X | board version\n", table.brd_ver);
-        IWL_ERR(trans, "0x%08X | hcmd\n", table.hcmd);
-
-        IWL_ERR(trans, "0x%08X | isr0\n", table.isr0);
-        IWL_ERR(trans, "0x%08X | isr1\n", table.isr1);
-        IWL_ERR(trans, "0x%08X | isr2\n", table.isr2);
-        IWL_ERR(trans, "0x%08X | isr3\n", table.isr3);
-        IWL_ERR(trans, "0x%08X | isr4\n", table.isr4);
-        IWL_ERR(trans, "0x%08X | isr_pref\n", table.isr_pref);
-        IWL_ERR(trans, "0x%08X | wait_event\n", table.wait_event);
-        IWL_ERR(trans, "0x%08X | l2p_control\n", table.l2p_control);
-        IWL_ERR(trans, "0x%08X | l2p_duration\n", table.l2p_duration);
-        IWL_ERR(trans, "0x%08X | l2p_mhvalid\n", table.l2p_mhvalid);
-        IWL_ERR(trans, "0x%08X | l2p_addr_match\n", table.l2p_addr_match);
-        IWL_ERR(trans, "0x%08X | lmpm_pmg_sel\n", table.lmpm_pmg_sel);
-        IWL_ERR(trans, "0x%08X | timestamp\n", table.u_timestamp);
-        IWL_ERR(trans, "0x%08X | flow_handler\n", table.flow_handler);
-}
-
 /**
  * iwl_irq_handle_error - called for HW or SW error interrupt from card
  */
 static void iwl_irq_handle_error(struct iwl_trans *trans)
 {
         /* W/A for WiFi/WiMAX coex and WiMAX own the RF */
-        if (cfg(trans)->internal_wimax_coex &&
+        if (trans->cfg->internal_wimax_coex &&
             (!(iwl_read_prph(trans, APMG_CLK_CTRL_REG) &
                         APMS_CLK_VAL_MRB_FUNC_MODE) ||
              (iwl_read_prph(trans, APMG_PS_CTRL_REG) &
                         APMG_PS_CTRL_VAL_RESET_REQ))) {
-                /*
-                 * Keep the restart process from trying to send host
-                 * commands by clearing the ready bit.
-                 */
-                clear_bit(STATUS_READY, &trans->shrd->status);
-                clear_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status);
+                struct iwl_trans_pcie *trans_pcie;
+
+                trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+                clear_bit(STATUS_HCMD_ACTIVE, &trans_pcie->status);
+                iwl_op_mode_wimax_active(trans->op_mode);
                 wake_up(&trans->wait_command_queue);
-                IWL_ERR(trans, "RF is used by WiMAX\n");
                 return;
         }
 
-        IWL_ERR(trans, "Loaded firmware version: %s\n",
-                trans->shrd->fw->fw_version);
-
-        iwl_dump_nic_error_log(trans);
         iwl_dump_csr(trans);
         iwl_dump_fh(trans, NULL, false);
-        iwl_dump_nic_event_log(trans, false, NULL, false);
 
         iwl_op_mode_nic_error(trans->op_mode);
 }
 
-#define EVENT_START_OFFSET  (4 * sizeof(u32))
-
-/**
- * iwl_print_event_log - Dump error event log to syslog
- *
- */
-static int iwl_print_event_log(struct iwl_trans *trans, u32 start_idx,
-                               u32 num_events, u32 mode,
-                               int pos, char **buf, size_t bufsz)
-{
-        u32 i;
-        u32 base;       /* SRAM byte address of event log header */
-        u32 event_size; /* 2 u32s, or 3 u32s if timestamp recorded */
-        u32 ptr;        /* SRAM byte address of log data */
-        u32 ev, time, data; /* event log data */
-        unsigned long reg_flags;
-
-        if (num_events == 0)
-                return pos;
-
-        base = trans->shrd->device_pointers.log_event_table;
-        if (trans->shrd->ucode_type == IWL_UCODE_INIT) {
-                if (!base)
-                        base = trans->shrd->fw->init_evtlog_ptr;
-        } else {
-                if (!base)
-                        base = trans->shrd->fw->inst_evtlog_ptr;
-        }
-
-        if (mode == 0)
-                event_size = 2 * sizeof(u32);
-        else
-                event_size = 3 * sizeof(u32);
-
-        ptr = base + EVENT_START_OFFSET + (start_idx * event_size);
-
-        /* Make sure device is powered up for SRAM reads */
-        spin_lock_irqsave(&trans->reg_lock, reg_flags);
-        if (unlikely(!iwl_grab_nic_access(trans)))
-                goto out_unlock;
-
-        /* Set starting address; reads will auto-increment */
-        iwl_write32(trans, HBUS_TARG_MEM_RADDR, ptr);
-
-        /* "time" is actually "data" for mode 0 (no timestamp).
-        * place event id # at far right for easier visual parsing. */
-        for (i = 0; i < num_events; i++) {
-                ev = iwl_read32(trans, HBUS_TARG_MEM_RDAT);
-                time = iwl_read32(trans, HBUS_TARG_MEM_RDAT);
-                if (mode == 0) {
-                        /* data, ev */
-                        if (bufsz) {
-                                pos += scnprintf(*buf + pos, bufsz - pos,
-                                                "EVT_LOG:0x%08x:%04u\n",
-                                                time, ev);
-                        } else {
-                                trace_iwlwifi_dev_ucode_event(trans->dev, 0,
-                                        time, ev);
-                                IWL_ERR(trans, "EVT_LOG:0x%08x:%04u\n",
-                                        time, ev);
-                        }
-                } else {
-                        data = iwl_read32(trans, HBUS_TARG_MEM_RDAT);
-                        if (bufsz) {
-                                pos += scnprintf(*buf + pos, bufsz - pos,
-                                                "EVT_LOGT:%010u:0x%08x:%04u\n",
-                                                 time, data, ev);
-                        } else {
-                                IWL_ERR(trans, "EVT_LOGT:%010u:0x%08x:%04u\n",
-                                        time, data, ev);
-                                trace_iwlwifi_dev_ucode_event(trans->dev, time,
-                                        data, ev);
-                        }
-                }
-        }
-
-        /* Allow device to power down */
-        iwl_release_nic_access(trans);
-out_unlock:
-        spin_unlock_irqrestore(&trans->reg_lock, reg_flags);
-        return pos;
-}
-
-/**
- * iwl_print_last_event_logs - Dump the newest # of event log to syslog
- */
-static int iwl_print_last_event_logs(struct iwl_trans *trans, u32 capacity,
-                                    u32 num_wraps, u32 next_entry,
-                                    u32 size, u32 mode,
-                                    int pos, char **buf, size_t bufsz)
-{
-        /*
-         * display the newest DEFAULT_LOG_ENTRIES entries
-         * i.e the entries just before the next ont that uCode would fill.
-         */
-        if (num_wraps) {
-                if (next_entry < size) {
-                        pos = iwl_print_event_log(trans,
-                                                capacity - (size - next_entry),
-                                                size - next_entry, mode,
-                                                pos, buf, bufsz);
-                        pos = iwl_print_event_log(trans, 0,
-                                                  next_entry, mode,
-                                                  pos, buf, bufsz);
-                } else
-                        pos = iwl_print_event_log(trans, next_entry - size,
-                                                  size, mode, pos, buf, bufsz);
-        } else {
-                if (next_entry < size) {
-                        pos = iwl_print_event_log(trans, 0, next_entry,
-                                                  mode, pos, buf, bufsz);
-                } else {
-                        pos = iwl_print_event_log(trans, next_entry - size,
-                                                  size, mode, pos, buf, bufsz);
-                }
-        }
-        return pos;
-}
-
-#define DEFAULT_DUMP_EVENT_LOG_ENTRIES (20)
-
-int iwl_dump_nic_event_log(struct iwl_trans *trans, bool full_log,
-                            char **buf, bool display)
-{
-        u32 base;       /* SRAM byte address of event log header */
-        u32 capacity;   /* event log capacity in # entries */
-        u32 mode;       /* 0 - no timestamp, 1 - timestamp recorded */
-        u32 num_wraps;  /* # times uCode wrapped to top of log */
-        u32 next_entry; /* index of next entry to be written by uCode */
-        u32 size;       /* # entries that we'll print */
-        u32 logsize;
-        int pos = 0;
-        size_t bufsz = 0;
-
-        base = trans->shrd->device_pointers.log_event_table;
-        if (trans->shrd->ucode_type == IWL_UCODE_INIT) {
-                logsize = trans->shrd->fw->init_evtlog_size;
-                if (!base)
-                        base = trans->shrd->fw->init_evtlog_ptr;
-        } else {
-                logsize = trans->shrd->fw->inst_evtlog_size;
-                if (!base)
-                        base = trans->shrd->fw->inst_evtlog_ptr;
-        }
-
-        if (!iwlagn_hw_valid_rtc_data_addr(base)) {
-                IWL_ERR(trans,
-                        "Invalid event log pointer 0x%08X for %s uCode\n",
-                        base,
-                        (trans->shrd->ucode_type == IWL_UCODE_INIT)
-                                        ? "Init" : "RT");
-                return -EINVAL;
-        }
-
-        /* event log header */
-        capacity = iwl_read_targ_mem(trans, base);
-        mode = iwl_read_targ_mem(trans, base + (1 * sizeof(u32)));
-        num_wraps = iwl_read_targ_mem(trans, base + (2 * sizeof(u32)));
-        next_entry = iwl_read_targ_mem(trans, base + (3 * sizeof(u32)));
-
-        if (capacity > logsize) {
-                IWL_ERR(trans, "Log capacity %d is bogus, limit to %d "
-                        "entries\n", capacity, logsize);
-                capacity = logsize;
-        }
-
-        if (next_entry > logsize) {
-                IWL_ERR(trans, "Log write index %d is bogus, limit to %d\n",
-                        next_entry, logsize);
-                next_entry = logsize;
-        }
-
-        size = num_wraps ? capacity : next_entry;
-
-        /* bail out if nothing in log */
-        if (size == 0) {
-                IWL_ERR(trans, "Start IWL Event Log Dump: nothing in log\n");
-                return pos;
-        }
-
-#ifdef CONFIG_IWLWIFI_DEBUG
-        if (!(iwl_have_debug_level(IWL_DL_FW_ERRORS)) && !full_log)
-                size = (size > DEFAULT_DUMP_EVENT_LOG_ENTRIES)
-                        ? DEFAULT_DUMP_EVENT_LOG_ENTRIES : size;
-#else
-        size = (size > DEFAULT_DUMP_EVENT_LOG_ENTRIES)
-                ? DEFAULT_DUMP_EVENT_LOG_ENTRIES : size;
-#endif
-        IWL_ERR(trans, "Start IWL Event Log Dump: display last %u entries\n",
-                size);
-
-#ifdef CONFIG_IWLWIFI_DEBUG
-        if (display) {
-                if (full_log)
-                        bufsz = capacity * 48;
-                else
-                        bufsz = size * 48;
-                *buf = kmalloc(bufsz, GFP_KERNEL);
-                if (!*buf)
-                        return -ENOMEM;
-        }
-        if (iwl_have_debug_level(IWL_DL_FW_ERRORS) || full_log) {
-                /*
-                 * if uCode has wrapped back to top of log,
-                 * start at the oldest entry,
-                 * i.e the next one that uCode would fill.
-                 */
-                if (num_wraps)
-                        pos = iwl_print_event_log(trans, next_entry,
-                                                capacity - next_entry, mode,
-                                                pos, buf, bufsz);
-                /* (then/else) start at top of log */
-                pos = iwl_print_event_log(trans, 0,
-                                          next_entry, mode, pos, buf, bufsz);
-        } else
-                pos = iwl_print_last_event_logs(trans, capacity, num_wraps,
-                                                next_entry, size, mode,
-                                                pos, buf, bufsz);
-#else
-        pos = iwl_print_last_event_logs(trans, capacity, num_wraps,
-                                        next_entry, size, mode,
-                                        pos, buf, bufsz);
-#endif
-        return pos;
-}
-
 /* tasklet for iwlagn interrupt */
 void iwl_irq_tasklet(struct iwl_trans *trans)
 {
@@ -963,7 +601,7 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
         if (iwl_have_debug_level(IWL_DL_ISR)) {
                 /* just for debug */
                 inta_mask = iwl_read32(trans, CSR_INT_MASK);
-                IWL_DEBUG_ISR(trans, "inta 0x%08x, enabled 0x%08x\n ",
+                IWL_DEBUG_ISR(trans, "inta 0x%08x, enabled 0x%08x\n",
                                 inta, inta_mask);
         }
 #endif
@@ -1011,8 +649,7 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
         if (inta & CSR_INT_BIT_RF_KILL) {
                 bool hw_rfkill;
 
-                hw_rfkill = !(iwl_read32(trans, CSR_GP_CNTRL) &
-                                CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW);
+                hw_rfkill = iwl_is_rfkill_set(trans);
                 IWL_WARN(trans, "RF_KILL bit toggled to %s.\n",
                                 hw_rfkill ? "disable radio" : "enable radio");
 
@@ -1043,7 +680,7 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
         if (inta & CSR_INT_BIT_WAKEUP) {
                 IWL_DEBUG_ISR(trans, "Wakeup interrupt\n");
                 iwl_rx_queue_update_write_ptr(trans, &trans_pcie->rxq);
-                for (i = 0; i < cfg(trans)->base_params->num_of_queues; i++)
+                for (i = 0; i < trans->cfg->base_params->num_of_queues; i++)
                         iwl_txq_update_write_ptr(trans,
                                                  &trans_pcie->txq[i]);
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
index e92972fd6ecf..21a8a672fbb2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
@@ -37,47 +37,12 @@
 #include "iwl-agn-hw.h"
 #include "iwl-op-mode.h"
 #include "iwl-trans-pcie-int.h"
+/* FIXME: need to abstract out TX command (once we know what it looks like) */
+#include "iwl-commands.h"
 
 #define IWL_TX_CRC_SIZE 4
 #define IWL_TX_DELIMITER_SIZE 4
 
-/*
- * mac80211 queues, ACs, hardware queues, FIFOs.
- *
- * Cf. http://wireless.kernel.org/en/developers/Documentation/mac80211/queues
- *
- * Mac80211 uses the following numbers, which we get as from it
- * by way of skb_get_queue_mapping(skb):
- *
- *      VO      0
- *      VI      1
- *      BE      2
- *      BK      3
- *
- *
- * Regular (not A-MPDU) frames are put into hardware queues corresponding
- * to the FIFOs, see comments in iwl-prph.h. Aggregated frames get their
- * own queue per aggregation session (RA/TID combination), such queues are
- * set up to map into FIFOs too, for which we need an AC->FIFO mapping. In
- * order to map frames to the right queue, we also need an AC->hw queue
- * mapping. This is implemented here.
- *
- * Due to the way hw queues are set up (by the hw specific code), the AC->hw
- * queue mapping is the identity mapping.
- */
-
-static const u8 tid_to_ac[] = {
-        IEEE80211_AC_BE,
-        IEEE80211_AC_BK,
-        IEEE80211_AC_BK,
-        IEEE80211_AC_BE,
-        IEEE80211_AC_VI,
-        IEEE80211_AC_VI,
-        IEEE80211_AC_VO,
-        IEEE80211_AC_VO
-};
-
-
 /**
  * iwl_trans_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array
  */
@@ -95,7 +60,7 @@ void iwl_trans_txq_update_byte_cnt_tbl(struct iwl_trans *trans,
         u16 len = byte_cnt + IWL_TX_CRC_SIZE + IWL_TX_DELIMITER_SIZE;
         __le16 bc_ent;
         struct iwl_tx_cmd *tx_cmd =
-                (struct iwl_tx_cmd *) txq->cmd[txq->q.write_ptr]->payload;
+                (void *) txq->entries[txq->q.write_ptr].cmd->payload;
 
         scd_bc_tbl = trans_pcie->scd_bc_tbls.addr;
 
@@ -136,13 +101,15 @@ void iwl_txq_update_write_ptr(struct iwl_trans *trans, struct iwl_tx_queue *txq)
         if (txq->need_update == 0)
                 return;
 
-        if (cfg(trans)->base_params->shadow_reg_enable) {
+        if (trans->cfg->base_params->shadow_reg_enable) {
                 /* shadow register enabled */
                 iwl_write32(trans, HBUS_TARG_WRPTR,
                             txq->q.write_ptr | (txq_id << 8));
         } else {
+                struct iwl_trans_pcie *trans_pcie =
+                        IWL_TRANS_GET_PCIE_TRANS(trans);
                 /* if we're trying to save power */
-                if (test_bit(STATUS_POWER_PMI, &trans->shrd->status)) {
+                if (test_bit(STATUS_TPOWER_PMI, &trans_pcie->status)) {
                         /* wake up nic if it's powered down ...
                          * uCode will wake up, and interrupt us again, so next
                          * time we'll skip this part. */
@@ -256,13 +223,14 @@ void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
 
         lockdep_assert_held(&txq->lock);
 
-        iwlagn_unmap_tfd(trans, &txq->meta[index], &tfd_tmp[index], dma_dir);
+        iwlagn_unmap_tfd(trans, &txq->entries[index].meta,
+                         &tfd_tmp[index], dma_dir);
 
         /* free SKB */
-        if (txq->skbs) {
+        if (txq->entries) {
                 struct sk_buff *skb;
 
-                skb = txq->skbs[index];
+                skb = txq->entries[index].skb;
 
                 /* Can be called from irqs-disabled context
                  * If skb is not NULL, it means that the whole queue is being
@@ -270,7 +238,7 @@ void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
                  */
                 if (skb) {
                         iwl_op_mode_free_skb(trans->op_mode, skb);
-                        txq->skbs[index] = NULL;
+                        txq->entries[index].skb = NULL;
                 }
         }
 }
@@ -393,7 +361,7 @@ static void iwlagn_txq_inval_byte_cnt_tbl(struct iwl_trans *trans,
         u8 sta_id = 0;
         __le16 bc_ent;
         struct iwl_tx_cmd *tx_cmd =
-                (struct iwl_tx_cmd *) txq->cmd[txq->q.read_ptr]->payload;
+                (void *)txq->entries[txq->q.read_ptr].cmd->payload;
 
         WARN_ON(read_ptr >= TFD_QUEUE_SIZE_MAX);
 
@@ -448,20 +416,17 @@ static void iwlagn_tx_queue_stop_scheduler(struct iwl_trans *trans, u16 txq_id)
 void iwl_trans_set_wr_ptrs(struct iwl_trans *trans,
                                 int txq_id, u32 index)
 {
-        IWL_DEBUG_TX_QUEUES(trans, "Q %d  WrPtr: %d", txq_id, index & 0xff);
+        IWL_DEBUG_TX_QUEUES(trans, "Q %d  WrPtr: %d\n", txq_id, index & 0xff);
         iwl_write_direct32(trans, HBUS_TARG_WRPTR,
                         (index & 0xff) | (txq_id << 8));
         iwl_write_prph(trans, SCD_QUEUE_RDPTR(txq_id), index);
 }
 
 void iwl_trans_tx_queue_set_status(struct iwl_trans *trans,
-                                        struct iwl_tx_queue *txq,
-                                        int tx_fifo_id, int scd_retry)
+                                   struct iwl_tx_queue *txq,
+                                   int tx_fifo_id, bool active)
 {
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         int txq_id = txq->q.id;
-        int active =
-                test_bit(txq_id, &trans_pcie->txq_ctx_active_msk) ? 1 : 0;
 
         iwl_write_prph(trans, SCD_QUEUE_STATUS_BITS(txq_id),
                         (active << SCD_QUEUE_STTS_REG_POS_ACTIVE) |
@@ -469,77 +434,22 @@ void iwl_trans_tx_queue_set_status(struct iwl_trans *trans,
                         (1 << SCD_QUEUE_STTS_REG_POS_WSL) |
                         SCD_QUEUE_STTS_REG_MSK);
 
-        txq->sched_retry = scd_retry;
-
         if (active)
-                IWL_DEBUG_TX_QUEUES(trans, "Activate %s Queue %d on FIFO %d\n",
-                        scd_retry ? "BA" : "AC/CMD", txq_id, tx_fifo_id);
+                IWL_DEBUG_TX_QUEUES(trans, "Activate queue %d on FIFO %d\n",
+                                    txq_id, tx_fifo_id);
         else
-                IWL_DEBUG_TX_QUEUES(trans, "Deactivate %s Queue %d\n",
-                        scd_retry ? "BA" : "AC/CMD", txq_id);
-}
-
-static inline int get_ac_from_tid(u16 tid)
-{
-        if (likely(tid < ARRAY_SIZE(tid_to_ac)))
-                return tid_to_ac[tid];
-
-        /* no support for TIDs 8-15 yet */
-        return -EINVAL;
-}
-
-static inline int get_fifo_from_tid(struct iwl_trans_pcie *trans_pcie,
-                                    u8 ctx, u16 tid)
-{
-        const u8 *ac_to_fifo = trans_pcie->ac_to_fifo[ctx];
-        if (likely(tid < ARRAY_SIZE(tid_to_ac)))
-                return ac_to_fifo[tid_to_ac[tid]];
-
-        /* no support for TIDs 8-15 yet */
-        return -EINVAL;
+                IWL_DEBUG_TX_QUEUES(trans, "Deactivate queue %d\n", txq_id);
 }
 
-static inline bool is_agg_txqid_valid(struct iwl_trans *trans, int txq_id)
+void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans, int txq_id, int fifo,
+                                 int sta_id, int tid, int frame_limit, u16 ssn)
 {
-        if (txq_id < IWLAGN_FIRST_AMPDU_QUEUE)
-                return false;
-        return txq_id < (IWLAGN_FIRST_AMPDU_QUEUE +
-                hw_params(trans).num_ampdu_queues);
-}
-
-void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans,
-                                 enum iwl_rxon_context_id ctx, int sta_id,
-                                 int tid, int frame_limit, u16 ssn)
-{
-        int tx_fifo, txq_id;
-        u16 ra_tid;
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         unsigned long flags;
+        u16 ra_tid = BUILD_RAxTID(sta_id, tid);
 
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
-
-        if (WARN_ON(sta_id == IWL_INVALID_STATION))
-                return;
-        if (WARN_ON(tid >= IWL_MAX_TID_COUNT))
-                return;
-
-        tx_fifo = get_fifo_from_tid(trans_pcie, ctx, tid);
-        if (WARN_ON(tx_fifo < 0)) {
-                IWL_ERR(trans, "txq_agg_setup, bad fifo: %d\n", tx_fifo);
-                return;
-        }
-
-        txq_id = trans_pcie->agg_txq[sta_id][tid];
-        if (WARN_ON_ONCE(!is_agg_txqid_valid(trans, txq_id))) {
-                IWL_ERR(trans,
-                        "queue number out of range: %d, must be %d to %d\n",
-                        txq_id, IWLAGN_FIRST_AMPDU_QUEUE,
-                        IWLAGN_FIRST_AMPDU_QUEUE +
-                        hw_params(trans).num_ampdu_queues - 1);
-                return;
-        }
-
-        ra_tid = BUILD_RAxTID(sta_id, tid);
+        if (test_and_set_bit(txq_id, trans_pcie->queue_used))
+                WARN_ONCE(1, "queue %d already used - expect issues", txq_id);
 
         spin_lock_irqsave(&trans_pcie->irq_lock, flags);
 
@@ -550,10 +460,10 @@ void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans,
         iwlagn_tx_queue_set_q2ratid(trans, ra_tid, txq_id);
 
         /* Set this queue as a chain-building queue */
-        iwl_set_bits_prph(trans, SCD_QUEUECHAIN_SEL, (1<<txq_id));
+        iwl_set_bits_prph(trans, SCD_QUEUECHAIN_SEL, BIT(txq_id));
 
         /* enable aggregations for the queue */
-        iwl_set_bits_prph(trans, SCD_AGGR_SEL, (1<<txq_id));
+        iwl_set_bits_prph(trans, SCD_AGGR_SEL, BIT(txq_id));
 
         /* Place first TFD at index corresponding to start sequence number.
          * Assumes that ssn_idx is valid (!= 0xFFF) */
@@ -563,92 +473,42 @@ void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans,
 
         /* Set up Tx window size and frame limit for this queue */
         iwl_write_targ_mem(trans, trans_pcie->scd_base_addr +
-                        SCD_CONTEXT_QUEUE_OFFSET(txq_id) +
-                        sizeof(u32),
-                        ((frame_limit <<
-                        SCD_QUEUE_CTX_REG2_WIN_SIZE_POS) &
-                        SCD_QUEUE_CTX_REG2_WIN_SIZE_MSK) |
-                        ((frame_limit <<
-                        SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) &
-                        SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK));
+                        SCD_CONTEXT_QUEUE_OFFSET(txq_id) + sizeof(u32),
+                        ((frame_limit << SCD_QUEUE_CTX_REG2_WIN_SIZE_POS) &
+                                SCD_QUEUE_CTX_REG2_WIN_SIZE_MSK) |
+                        ((frame_limit << SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) &
+                                SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK));
 
         iwl_set_bits_prph(trans, SCD_INTERRUPT_MASK, (1 << txq_id));
 
         /* Set up Status area in SRAM, map to Tx DMA/FIFO, activate the queue */
         iwl_trans_tx_queue_set_status(trans, &trans_pcie->txq[txq_id],
-                                        tx_fifo, 1);
-
-        trans_pcie->txq[txq_id].sta_id = sta_id;
-        trans_pcie->txq[txq_id].tid = tid;
+                                      fifo, true);
 
         spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
 }
 
-/*
- * Find first available (lowest unused) Tx Queue, mark it "active".
- * Called only when finding queue for aggregation.
- * Should never return anything < 7, because they should already
- * be in use as EDCA AC (0-3), Command (4), reserved (5, 6)
- */
-static int iwlagn_txq_ctx_activate_free(struct iwl_trans *trans)
-{
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        int txq_id;
-
-        for (txq_id = 0; txq_id < cfg(trans)->base_params->num_of_queues;
-             txq_id++)
-                if (!test_and_set_bit(txq_id,
-                                        &trans_pcie->txq_ctx_active_msk))
-                        return txq_id;
-        return -1;
-}
-
-int iwl_trans_pcie_tx_agg_alloc(struct iwl_trans *trans,
-                                int sta_id, int tid)
-{
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        int txq_id;
-
-        txq_id = iwlagn_txq_ctx_activate_free(trans);
-        if (txq_id == -1) {
-                IWL_ERR(trans, "No free aggregation queue available\n");
-                return -ENXIO;
-        }
-
-        trans_pcie->agg_txq[sta_id][tid] = txq_id;
-        iwl_set_swq_id(&trans_pcie->txq[txq_id], get_ac_from_tid(tid), txq_id);
-
-        return 0;
-}
-
-int iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans, int sta_id, int tid)
+void iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans, int txq_id)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        u8 txq_id = trans_pcie->agg_txq[sta_id][tid];
 
-        if (WARN_ON_ONCE(!is_agg_txqid_valid(trans, txq_id))) {
-                IWL_ERR(trans,
-                        "queue number out of range: %d, must be %d to %d\n",
-                        txq_id, IWLAGN_FIRST_AMPDU_QUEUE,
-                        IWLAGN_FIRST_AMPDU_QUEUE +
-                        hw_params(trans).num_ampdu_queues - 1);
-                return -EINVAL;
+        if (!test_and_clear_bit(txq_id, trans_pcie->queue_used)) {
+                WARN_ONCE(1, "queue %d not used", txq_id);
+                return;
         }
 
         iwlagn_tx_queue_stop_scheduler(trans, txq_id);
 
-        iwl_clear_bits_prph(trans, SCD_AGGR_SEL, (1 << txq_id));
+        iwl_clear_bits_prph(trans, SCD_AGGR_SEL, BIT(txq_id));
 
-        trans_pcie->agg_txq[sta_id][tid] = 0;
         trans_pcie->txq[txq_id].q.read_ptr = 0;
         trans_pcie->txq[txq_id].q.write_ptr = 0;
-        /* supposes that ssn_idx is valid (!= 0xFFF) */
         iwl_trans_set_wr_ptrs(trans, txq_id, 0);
 
-        iwl_clear_bits_prph(trans, SCD_INTERRUPT_MASK, (1 << txq_id));
-        iwl_txq_ctx_deactivate(trans_pcie, txq_id);
-        iwl_trans_tx_queue_set_status(trans, &trans_pcie->txq[txq_id], 0, 0);
-        return 0;
+        iwl_clear_bits_prph(trans, SCD_INTERRUPT_MASK, BIT(txq_id));
+
+        iwl_trans_tx_queue_set_status(trans, &trans_pcie->txq[txq_id],
+                                      0, false);
 }
 
 /*************** HOST COMMAND QUEUE FUNCTIONS   *****/
@@ -681,11 +541,6 @@ static int iwl_enqueue_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
         int trace_idx;
 #endif
 
-        if (test_bit(STATUS_FW_ERROR, &trans->shrd->status)) {
-                IWL_WARN(trans, "fw recovery, no hcmd send\n");
-                return -EIO;
-        }
-
         copy_size = sizeof(out_cmd->hdr);
         cmd_size = sizeof(out_cmd->hdr);
 
@@ -726,8 +581,8 @@ static int iwl_enqueue_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
         }
 
         idx = get_cmd_index(q, q->write_ptr);
-        out_cmd = txq->cmd[idx];
-        out_meta = &txq->meta[idx];
+        out_cmd = txq->entries[idx].cmd;
+        out_meta = &txq->entries[idx].meta;
 
         memset(out_meta, 0, sizeof(*out_meta)); /* re-initialize to NULL */
         if (cmd->flags & CMD_WANT_SKB)
@@ -753,12 +608,11 @@ static int iwl_enqueue_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
                 cmd_dest += cmd->len[i];
         }
 
-        IWL_DEBUG_HC(trans, "Sending command %s (#%x), seq: 0x%04X, "
-                        "%d bytes at %d[%d]:%d\n",
-                        get_cmd_string(out_cmd->hdr.cmd),
-                        out_cmd->hdr.cmd,
-                        le16_to_cpu(out_cmd->hdr.sequence), cmd_size,
-                        q->write_ptr, idx, trans_pcie->cmd_queue);
+        IWL_DEBUG_HC(trans,
+                "Sending command %s (#%x), seq: 0x%04X, %d bytes at %d[%d]:%d\n",
+                trans_pcie_get_cmd_string(trans_pcie, out_cmd->hdr.cmd),
+                out_cmd->hdr.cmd, le16_to_cpu(out_cmd->hdr.sequence), cmd_size,
+                q->write_ptr, idx, trans_pcie->cmd_queue);
 
         phys_addr = dma_map_single(trans->dev, &out_cmd->hdr, copy_size,
                                 DMA_BIDIRECTIONAL);
@@ -816,6 +670,10 @@ static int iwl_enqueue_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
                                trace_bufs[2], trace_lens[2]);
 #endif
 
+        /* start timer if queue currently empty */
+        if (q->read_ptr == q->write_ptr && trans_pcie->wd_timeout)
+                mod_timer(&txq->stuck_timer, jiffies + trans_pcie->wd_timeout);
+
         /* Increment and update queue's write index */
         q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd);
         iwl_txq_update_write_ptr(trans, txq);
@@ -825,6 +683,22 @@ static int iwl_enqueue_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
         return idx;
 }
 
+static inline void iwl_queue_progress(struct iwl_trans_pcie *trans_pcie,
+                                      struct iwl_tx_queue *txq)
+{
+        if (!trans_pcie->wd_timeout)
+                return;
+
+        /*
+         * if empty delete timer, otherwise move timer forward
+         * since we're making progress on this queue
+         */
+        if (txq->q.read_ptr == txq->q.write_ptr)
+                del_timer(&txq->stuck_timer);
+        else
+                mod_timer(&txq->stuck_timer, jiffies + trans_pcie->wd_timeout);
+}
+
 /**
  * iwl_hcmd_queue_reclaim - Reclaim TX command queue entries already Tx'd
  *
@@ -859,6 +733,8 @@ static void iwl_hcmd_queue_reclaim(struct iwl_trans *trans, int txq_id,
                 }
 
         }
+
+        iwl_queue_progress(trans_pcie, txq);
 }
 
 /**
@@ -899,10 +775,8 @@ void iwl_tx_cmd_complete(struct iwl_trans *trans, struct iwl_rx_cmd_buffer *rxb,
         spin_lock(&txq->lock);
 
         cmd_index = get_cmd_index(&txq->q, index);
-        cmd = txq->cmd[cmd_index];
-        meta = &txq->meta[cmd_index];
-
-        txq->time_stamp = jiffies;
+        cmd = txq->entries[cmd_index].cmd;
+        meta = &txq->entries[cmd_index].meta;
 
         iwlagn_unmap_tfd(trans, meta, &txq->tfds[index],
                          DMA_BIDIRECTIONAL);
@@ -913,21 +787,23 @@ void iwl_tx_cmd_complete(struct iwl_trans *trans, struct iwl_rx_cmd_buffer *rxb,
 
                 meta->source->resp_pkt = pkt;
                 meta->source->_rx_page_addr = (unsigned long)page_address(p);
-                meta->source->_rx_page_order = hw_params(trans).rx_page_order;
+                meta->source->_rx_page_order = trans_pcie->rx_page_order;
                 meta->source->handler_status = handler_status;
         }
 
         iwl_hcmd_queue_reclaim(trans, txq_id, index);
 
         if (!(meta->flags & CMD_ASYNC)) {
-                if (!test_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status)) {
+                if (!test_bit(STATUS_HCMD_ACTIVE, &trans_pcie->status)) {
                         IWL_WARN(trans,
                                  "HCMD_ACTIVE already clear for command %s\n",
-                                 get_cmd_string(cmd->hdr.cmd));
+                                 trans_pcie_get_cmd_string(trans_pcie,
+                                                           cmd->hdr.cmd));
                 }
-                clear_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status);
+                clear_bit(STATUS_HCMD_ACTIVE, &trans_pcie->status);
                 IWL_DEBUG_INFO(trans, "Clearing HCMD_ACTIVE for command %s\n",
-                               get_cmd_string(cmd->hdr.cmd));
+                               trans_pcie_get_cmd_string(trans_pcie,
+                                                         cmd->hdr.cmd));
                 wake_up(&trans->wait_command_queue);
         }
 
@@ -940,6 +816,7 @@ void iwl_tx_cmd_complete(struct iwl_trans *trans, struct iwl_rx_cmd_buffer *rxb,
 
 static int iwl_send_cmd_async(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         int ret;
 
         /* An asynchronous command can not expect an SKB to be set. */
@@ -951,7 +828,7 @@ static int iwl_send_cmd_async(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
         if (ret < 0) {
                 IWL_ERR(trans,
                         "Error sending %s: enqueue_hcmd failed: %d\n",
-                          get_cmd_string(cmd->id), ret);
+                        trans_pcie_get_cmd_string(trans_pcie, cmd->id), ret);
                 return ret;
         }
         return 0;
@@ -964,55 +841,51 @@ static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
         int ret;
 
         IWL_DEBUG_INFO(trans, "Attempting to send sync command %s\n",
-                        get_cmd_string(cmd->id));
-
-        if (test_bit(STATUS_FW_ERROR, &trans->shrd->status)) {
-                IWL_ERR(trans, "Command %s failed: FW Error\n",
-                               get_cmd_string(cmd->id));
-                return -EIO;
-        }
+                       trans_pcie_get_cmd_string(trans_pcie, cmd->id));
 
         if (WARN_ON(test_and_set_bit(STATUS_HCMD_ACTIVE,
-                                     &trans->shrd->status))) {
+                                     &trans_pcie->status))) {
                 IWL_ERR(trans, "Command %s: a command is already active!\n",
-                        get_cmd_string(cmd->id));
+                        trans_pcie_get_cmd_string(trans_pcie, cmd->id));
                 return -EIO;
         }
 
         IWL_DEBUG_INFO(trans, "Setting HCMD_ACTIVE for command %s\n",
-                        get_cmd_string(cmd->id));
+                       trans_pcie_get_cmd_string(trans_pcie, cmd->id));
 
         cmd_idx = iwl_enqueue_hcmd(trans, cmd);
         if (cmd_idx < 0) {
                 ret = cmd_idx;
-                clear_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status);
+                clear_bit(STATUS_HCMD_ACTIVE, &trans_pcie->status);
                 IWL_ERR(trans,
                         "Error sending %s: enqueue_hcmd failed: %d\n",
-                          get_cmd_string(cmd->id), ret);
+                        trans_pcie_get_cmd_string(trans_pcie, cmd->id), ret);
                 return ret;
         }
 
         ret = wait_event_timeout(trans->wait_command_queue,
-                        !test_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status),
+                        !test_bit(STATUS_HCMD_ACTIVE, &trans_pcie->status),
                         HOST_COMPLETE_TIMEOUT);
         if (!ret) {
-                if (test_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status)) {
+                if (test_bit(STATUS_HCMD_ACTIVE, &trans_pcie->status)) {
                         struct iwl_tx_queue *txq =
                                 &trans_pcie->txq[trans_pcie->cmd_queue];
                         struct iwl_queue *q = &txq->q;
 
                         IWL_ERR(trans,
                                 "Error sending %s: time out after %dms.\n",
-                                get_cmd_string(cmd->id),
+                                trans_pcie_get_cmd_string(trans_pcie, cmd->id),
                                 jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));
 
                         IWL_ERR(trans,
                                 "Current CMD queue read_ptr %d write_ptr %d\n",
                                 q->read_ptr, q->write_ptr);
 
-                        clear_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status);
-                        IWL_DEBUG_INFO(trans, "Clearing HCMD_ACTIVE for command"
-                                 "%s\n", get_cmd_string(cmd->id));
+                        clear_bit(STATUS_HCMD_ACTIVE, &trans_pcie->status);
+                        IWL_DEBUG_INFO(trans,
+                                       "Clearing HCMD_ACTIVE for command %s\n",
+                                       trans_pcie_get_cmd_string(trans_pcie,
+                                                                 cmd->id));
                         ret = -ETIMEDOUT;
                         goto cancel;
                 }
@@ -1020,7 +893,7 @@ static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
 
         if ((cmd->flags & CMD_WANT_SKB) && !cmd->resp_pkt) {
                 IWL_ERR(trans, "Error: Response NULL in '%s'\n",
-                          get_cmd_string(cmd->id));
+                        trans_pcie_get_cmd_string(trans_pcie, cmd->id));
                 ret = -EIO;
                 goto cancel;
         }
@@ -1035,8 +908,8 @@ cancel:
                  * in later, it will possibly set an invalid
                  * address (cmd->meta.source).
                  */
-                trans_pcie->txq[trans_pcie->cmd_queue].meta[cmd_idx].flags &=
-                                                        ~CMD_WANT_SKB;
+                trans_pcie->txq[trans_pcie->cmd_queue].
+                        entries[cmd_idx].meta.flags &= ~CMD_WANT_SKB;
         }
 
         if (cmd->resp_pkt) {
@@ -1091,17 +964,20 @@ int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,
              q->read_ptr != index;
              q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) {
 
-                if (WARN_ON_ONCE(txq->skbs[txq->q.read_ptr] == NULL))
+                if (WARN_ON_ONCE(txq->entries[txq->q.read_ptr].skb == NULL))
                         continue;
 
-                __skb_queue_tail(skbs, txq->skbs[txq->q.read_ptr]);
+                __skb_queue_tail(skbs, txq->entries[txq->q.read_ptr].skb);
 
-                txq->skbs[txq->q.read_ptr] = NULL;
+                txq->entries[txq->q.read_ptr].skb = NULL;
 
                 iwlagn_txq_inval_byte_cnt_tbl(trans, txq);
 
                 iwlagn_txq_free_tfd(trans, txq, txq->q.read_ptr, DMA_TO_DEVICE);
                 freed++;
         }
+
+        iwl_queue_progress(trans_pcie, txq);
+
         return freed;
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index 4d7b30d3e648..2e57161854b9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -68,18 +68,20 @@
 #include <linux/bitops.h>
 #include <linux/gfp.h>
 
+#include "iwl-drv.h"
 #include "iwl-trans.h"
 #include "iwl-trans-pcie-int.h"
 #include "iwl-csr.h"
 #include "iwl-prph.h"
-#include "iwl-shared.h"
 #include "iwl-eeprom.h"
 #include "iwl-agn-hw.h"
+/* FIXME: need to abstract out TX command (once we know what it looks like) */
+#include "iwl-commands.h"
 
 #define IWL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo))))
 
 #define SCD_QUEUECHAIN_SEL_ALL(trans, trans_pcie)       \
-        (((1<<cfg(trans)->base_params->num_of_queues) - 1) &\
+        (((1<<trans->cfg->base_params->num_of_queues) - 1) &\
         (~(1<<(trans_pcie)->cmd_queue)))
 
 static int iwl_trans_rx_alloc(struct iwl_trans *trans)
@@ -132,10 +134,10 @@ static void iwl_trans_rxq_free_rx_bufs(struct iwl_trans *trans)
                  * to an SKB, so we need to unmap and free potential storage */
                 if (rxq->pool[i].page != NULL) {
                         dma_unmap_page(trans->dev, rxq->pool[i].page_dma,
-                                PAGE_SIZE << hw_params(trans).rx_page_order,
+                                PAGE_SIZE << trans_pcie->rx_page_order,
                                 DMA_FROM_DEVICE);
                         __free_pages(rxq->pool[i].page,
-                                     hw_params(trans).rx_page_order);
+                                     trans_pcie->rx_page_order);
                         rxq->pool[i].page = NULL;
                 }
                 list_add_tail(&rxq->pool[i].list, &rxq->rx_used);
@@ -145,11 +147,12 @@ static void iwl_trans_rxq_free_rx_bufs(struct iwl_trans *trans)
 static void iwl_trans_rx_hw_init(struct iwl_trans *trans,
                                  struct iwl_rx_queue *rxq)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         u32 rb_size;
         const u32 rfdnlog = RX_QUEUE_SIZE_LOG; /* 256 RBDs */
         u32 rb_timeout = RX_RB_TIMEOUT; /* FIXME: RX_RB_TIMEOUT for all devices? */
 
-        if (iwlagn_mod_params.amsdu_size_8K)
+        if (trans_pcie->rx_buf_size_8k)
                 rb_size = FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_8K;
         else
                 rb_size = FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_4K;
@@ -180,7 +183,6 @@ static void iwl_trans_rx_hw_init(struct iwl_trans *trans,
                            FH_RCSR_RX_CONFIG_CHNL_EN_ENABLE_VAL |
                            FH_RCSR_CHNL0_RX_IGNORE_RXF_EMPTY |
                            FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL |
-                           FH_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME_MSK |
                            rb_size|
                            (rb_timeout << FH_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS)|
                            (rfdnlog << FH_RCSR_RX_CONFIG_RBDCB_SIZE_POS));
@@ -299,6 +301,33 @@ static inline void iwlagn_free_dma_ptr(struct iwl_trans *trans,
         memset(ptr, 0, sizeof(*ptr));
 }
 
+static void iwl_trans_pcie_queue_stuck_timer(unsigned long data)
+{
+        struct iwl_tx_queue *txq = (void *)data;
+        struct iwl_trans_pcie *trans_pcie = txq->trans_pcie;
+        struct iwl_trans *trans = iwl_trans_pcie_get_trans(trans_pcie);
+
+        spin_lock(&txq->lock);
+        /* check if triggered erroneously */
+        if (txq->q.read_ptr == txq->q.write_ptr) {
+                spin_unlock(&txq->lock);
+                return;
+        }
+        spin_unlock(&txq->lock);
+
+
+        IWL_ERR(trans, "Queue %d stuck for %u ms.\n", txq->q.id,
+                jiffies_to_msecs(trans_pcie->wd_timeout));
+        IWL_ERR(trans, "Current SW read_ptr %d write_ptr %d\n",
+                txq->q.read_ptr, txq->q.write_ptr);
+        IWL_ERR(trans, "Current HW read_ptr %d write_ptr %d\n",
+                iwl_read_prph(trans, SCD_QUEUE_RDPTR(txq->q.id))
+                                        & (TFD_QUEUE_SIZE_MAX - 1),
+                iwl_read_prph(trans, SCD_QUEUE_WRPTR(txq->q.id)));
+
+        iwl_op_mode_nic_error(trans->op_mode);
+}
+
 static int iwl_trans_txq_alloc(struct iwl_trans *trans,
                                 struct iwl_tx_queue *txq, int slots_num,
                                 u32 txq_id)
@@ -307,40 +336,31 @@ static int iwl_trans_txq_alloc(struct iwl_trans *trans,
         int i;
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
-        if (WARN_ON(txq->meta || txq->cmd || txq->skbs || txq->tfds))
+        if (WARN_ON(txq->entries || txq->tfds))
                 return -EINVAL;
 
+        setup_timer(&txq->stuck_timer, iwl_trans_pcie_queue_stuck_timer,
+                    (unsigned long)txq);
+        txq->trans_pcie = trans_pcie;
+
         txq->q.n_window = slots_num;
 
-        txq->meta = kcalloc(slots_num, sizeof(txq->meta[0]), GFP_KERNEL);
-        txq->cmd = kcalloc(slots_num, sizeof(txq->cmd[0]), GFP_KERNEL);
+        txq->entries = kcalloc(slots_num,
+                               sizeof(struct iwl_pcie_tx_queue_entry),
+                               GFP_KERNEL);
 
-        if (!txq->meta || !txq->cmd)
+        if (!txq->entries)
                 goto error;
 
         if (txq_id == trans_pcie->cmd_queue)
                 for (i = 0; i < slots_num; i++) {
-                        txq->cmd[i] = kmalloc(sizeof(struct iwl_device_cmd),
-                                                GFP_KERNEL);
-                        if (!txq->cmd[i])
+                        txq->entries[i].cmd =
+                                kmalloc(sizeof(struct iwl_device_cmd),
+                                        GFP_KERNEL);
+                        if (!txq->entries[i].cmd)
                                 goto error;
                 }
 
-        /* Alloc driver data array and TFD circular buffer */
-        /* Driver private data, only for Tx (not command) queues,
-         * not shared with device. */
-        if (txq_id != trans_pcie->cmd_queue) {
-                txq->skbs = kcalloc(TFD_QUEUE_SIZE_MAX, sizeof(txq->skbs[0]),
-                                    GFP_KERNEL);
-                if (!txq->skbs) {
-                        IWL_ERR(trans, "kmalloc for auxiliary BD "
-                                  "structures failed\n");
-                        goto error;
-                }
-        } else {
-                txq->skbs = NULL;
-        }
-
         /* Circular buffer of transmit frame descriptors (TFDs),
          * shared with device */
         txq->tfds = dma_alloc_coherent(trans->dev, tfd_sz,
@@ -353,37 +373,22 @@ static int iwl_trans_txq_alloc(struct iwl_trans *trans,
 
         return 0;
 error:
-        kfree(txq->skbs);
-        txq->skbs = NULL;
-        /* since txq->cmd has been zeroed,
-         * all non allocated cmd[i] will be NULL */
-        if (txq->cmd && txq_id == trans_pcie->cmd_queue)
+        if (txq->entries && txq_id == trans_pcie->cmd_queue)
                 for (i = 0; i < slots_num; i++)
-                        kfree(txq->cmd[i]);
-        kfree(txq->meta);
-        kfree(txq->cmd);
-        txq->meta = NULL;
-        txq->cmd = NULL;
+                        kfree(txq->entries[i].cmd);
+        kfree(txq->entries);
+        txq->entries = NULL;
 
         return -ENOMEM;
 
 }
 
 static int iwl_trans_txq_init(struct iwl_trans *trans, struct iwl_tx_queue *txq,
-                      int slots_num, u32 txq_id)
+                              int slots_num, u32 txq_id)
 {
         int ret;
 
         txq->need_update = 0;
-        memset(txq->meta, 0, sizeof(txq->meta[0]) * slots_num);
-
-        /*
-         * For the default queues 0-3, set up the swq_id
-         * already -- all others need to get one later
-         * (if they need one at all).
-         */
-        if (txq_id < 4)
-                iwl_set_swq_id(txq, txq_id, txq_id);
 
         /* TFD_QUEUE_SIZE_MAX must be power-of-two size, otherwise
          * iwl_queue_inc_wrap and iwl_queue_dec_wrap are broken. */
@@ -461,7 +466,7 @@ static void iwl_tx_queue_free(struct iwl_trans *trans, int txq_id)
 
         if (txq_id == trans_pcie->cmd_queue)
                 for (i = 0; i < txq->q.n_window; i++)
-                        kfree(txq->cmd[i]);
+                        kfree(txq->entries[i].cmd);
 
         /* De-alloc circular buffer of TFDs */
         if (txq->q.n_bd) {
@@ -470,15 +475,10 @@ static void iwl_tx_queue_free(struct iwl_trans *trans, int txq_id)
                 memset(&txq->q.dma_addr, 0, sizeof(txq->q.dma_addr));
         }
 
-        /* De-alloc array of per-TFD driver data */
-        kfree(txq->skbs);
-        txq->skbs = NULL;
+        kfree(txq->entries);
+        txq->entries = NULL;
 
-        /* deallocate arrays */
-        kfree(txq->cmd);
-        kfree(txq->meta);
-        txq->cmd = NULL;
-        txq->meta = NULL;
+        del_timer_sync(&txq->stuck_timer);
 
         /* 0-fill queue descriptor structure */
         memset(txq, 0, sizeof(*txq));
@@ -497,7 +497,7 @@ static void iwl_trans_pcie_tx_free(struct iwl_trans *trans)
         /* Tx queues */
         if (trans_pcie->txq) {
                 for (txq_id = 0;
-                     txq_id < cfg(trans)->base_params->num_of_queues; txq_id++)
+                     txq_id < trans->cfg->base_params->num_of_queues; txq_id++)
                         iwl_tx_queue_free(trans, txq_id);
         }
 
@@ -522,7 +522,7 @@ static int iwl_trans_tx_alloc(struct iwl_trans *trans)
         int txq_id, slots_num;
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
-        u16 scd_bc_tbls_size = cfg(trans)->base_params->num_of_queues *
+        u16 scd_bc_tbls_size = trans->cfg->base_params->num_of_queues *
                         sizeof(struct iwlagn_scd_bc_tbl);
 
         /*It is not allowed to alloc twice, so warn when this happens.
@@ -546,7 +546,7 @@ static int iwl_trans_tx_alloc(struct iwl_trans *trans)
                 goto error;
         }
 
-        trans_pcie->txq = kcalloc(cfg(trans)->base_params->num_of_queues,
+        trans_pcie->txq = kcalloc(trans->cfg->base_params->num_of_queues,
                                   sizeof(struct iwl_tx_queue), GFP_KERNEL);
         if (!trans_pcie->txq) {
                 IWL_ERR(trans, "Not enough memory for txq\n");
@@ -555,7 +555,7 @@ static int iwl_trans_tx_alloc(struct iwl_trans *trans)
         }
 
         /* Alloc and init all Tx queues, including the command queue (#4/#9) */
-        for (txq_id = 0; txq_id < cfg(trans)->base_params->num_of_queues;
+        for (txq_id = 0; txq_id < trans->cfg->base_params->num_of_queues;
              txq_id++) {
                 slots_num = (txq_id == trans_pcie->cmd_queue) ?
                                         TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;
@@ -601,7 +601,7 @@ static int iwl_tx_init(struct iwl_trans *trans)
         spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
 
         /* Alloc and init all Tx queues, including the command queue (#4/#9) */
-        for (txq_id = 0; txq_id < cfg(trans)->base_params->num_of_queues;
+        for (txq_id = 0; txq_id < trans->cfg->base_params->num_of_queues;
              txq_id++) {
                 slots_num = (txq_id == trans_pcie->cmd_queue) ?
                                         TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;
@@ -724,9 +724,9 @@ static int iwl_apm_init(struct iwl_trans *trans)
         iwl_apm_config(trans);
 
         /* Configure analog phase-lock-loop before activating to D0A */
-        if (cfg(trans)->base_params->pll_cfg_val)
+        if (trans->cfg->base_params->pll_cfg_val)
                 iwl_set_bit(trans, CSR_ANA_PLL_CFG,
-                            cfg(trans)->base_params->pll_cfg_val);
+                            trans->cfg->base_params->pll_cfg_val);
 
         /*
          * Set "initialization complete" bit to move adapter from
@@ -836,7 +836,7 @@ static int iwl_nic_init(struct iwl_trans *trans)
         if (iwl_tx_init(trans))
                 return -ENOMEM;
 
-        if (cfg(trans)->base_params->shadow_reg_enable) {
+        if (trans->cfg->base_params->shadow_reg_enable) {
                 /* enable shadow regs in HW */
                 iwl_set_bit(trans, CSR_MAC_SHADOW_REG_CTRL,
                         0x800FFFFF);
@@ -895,59 +895,6 @@ static int iwl_prepare_card_hw(struct iwl_trans *trans)
         return ret;
 }
 
-#define IWL_AC_UNSET -1
-
-struct queue_to_fifo_ac {
-        s8 fifo, ac;
-};
-
-static const struct queue_to_fifo_ac iwlagn_default_queue_to_tx_fifo[] = {
-        { IWL_TX_FIFO_VO, IEEE80211_AC_VO, },
-        { IWL_TX_FIFO_VI, IEEE80211_AC_VI, },
-        { IWL_TX_FIFO_BE, IEEE80211_AC_BE, },
-        { IWL_TX_FIFO_BK, IEEE80211_AC_BK, },
-        { IWLAGN_CMD_FIFO_NUM, IWL_AC_UNSET, },
-        { IWL_TX_FIFO_UNUSED, IWL_AC_UNSET, },
-        { IWL_TX_FIFO_UNUSED, IWL_AC_UNSET, },
-        { IWL_TX_FIFO_UNUSED, IWL_AC_UNSET, },
-        { IWL_TX_FIFO_UNUSED, IWL_AC_UNSET, },
-        { IWL_TX_FIFO_UNUSED, IWL_AC_UNSET, },
-        { IWL_TX_FIFO_UNUSED, IWL_AC_UNSET, },
-};
-
-static const struct queue_to_fifo_ac iwlagn_ipan_queue_to_tx_fifo[] = {
-        { IWL_TX_FIFO_VO, IEEE80211_AC_VO, },
-        { IWL_TX_FIFO_VI, IEEE80211_AC_VI, },
-        { IWL_TX_FIFO_BE, IEEE80211_AC_BE, },
-        { IWL_TX_FIFO_BK, IEEE80211_AC_BK, },
-        { IWL_TX_FIFO_BK_IPAN, IEEE80211_AC_BK, },
-        { IWL_TX_FIFO_BE_IPAN, IEEE80211_AC_BE, },
-        { IWL_TX_FIFO_VI_IPAN, IEEE80211_AC_VI, },
-        { IWL_TX_FIFO_VO_IPAN, IEEE80211_AC_VO, },
-        { IWL_TX_FIFO_BE_IPAN, 2, },
-        { IWLAGN_CMD_FIFO_NUM, IWL_AC_UNSET, },
-        { IWL_TX_FIFO_AUX, IWL_AC_UNSET, },
-};
-
-static const u8 iwlagn_bss_ac_to_fifo[] = {
-        IWL_TX_FIFO_VO,
-        IWL_TX_FIFO_VI,
-        IWL_TX_FIFO_BE,
-        IWL_TX_FIFO_BK,
-};
-static const u8 iwlagn_bss_ac_to_queue[] = {
-        0, 1, 2, 3,
-};
-static const u8 iwlagn_pan_ac_to_fifo[] = {
-        IWL_TX_FIFO_VO_IPAN,
-        IWL_TX_FIFO_VI_IPAN,
-        IWL_TX_FIFO_BE_IPAN,
-        IWL_TX_FIFO_BK_IPAN,
-};
-static const u8 iwlagn_pan_ac_to_queue[] = {
-        7, 6, 5, 4,
-};
-
 /*
  * ucode
  */
@@ -1028,34 +975,21 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,
                                    const struct fw_img *fw)
 {
         int ret;
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
         bool hw_rfkill;
 
-        trans_pcie->ac_to_queue[IWL_RXON_CTX_BSS] = iwlagn_bss_ac_to_queue;
-        trans_pcie->ac_to_queue[IWL_RXON_CTX_PAN] = iwlagn_pan_ac_to_queue;
-
-        trans_pcie->ac_to_fifo[IWL_RXON_CTX_BSS] = iwlagn_bss_ac_to_fifo;
-        trans_pcie->ac_to_fifo[IWL_RXON_CTX_PAN] = iwlagn_pan_ac_to_fifo;
-
-        trans_pcie->mcast_queue[IWL_RXON_CTX_BSS] = 0;
-        trans_pcie->mcast_queue[IWL_RXON_CTX_PAN] = IWL_IPAN_MCAST_QUEUE;
-
         /* This may fail if AMT took ownership of the device */
         if (iwl_prepare_card_hw(trans)) {
                 IWL_WARN(trans, "Exit HW not ready\n");
                 return -EIO;
         }
 
+        iwl_enable_rfkill_int(trans);
+
         /* If platform's RF_KILL switch is NOT set to KILL */
-        hw_rfkill = !(iwl_read32(trans, CSR_GP_CNTRL) &
-                                CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW);
+        hw_rfkill = iwl_is_rfkill_set(trans);
         iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);
-
-        if (hw_rfkill) {
-                iwl_enable_rfkill_int(trans);
+        if (hw_rfkill)
                 return -ERFKILL;
-        }
 
         iwl_write32(trans, CSR_INT, 0xFFFFFFFF);
 
@@ -1098,9 +1032,7 @@ static void iwl_trans_txq_set_sched(struct iwl_trans *trans, u32 mask)
 
 static void iwl_tx_start(struct iwl_trans *trans)
 {
-        const struct queue_to_fifo_ac *queue_to_fifo;
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         u32 a;
         unsigned long flags;
         int i, chan;
@@ -1121,7 +1053,7 @@ static void iwl_tx_start(struct iwl_trans *trans)
                 iwl_write_targ_mem(trans, a, 0);
         for (; a < trans_pcie->scd_base_addr +
                SCD_TRANS_TBL_OFFSET_QUEUE(
-                                cfg(trans)->base_params->num_of_queues);
+                                trans->cfg->base_params->num_of_queues);
                a += 4)
                 iwl_write_targ_mem(trans, a, 0);
 
@@ -1144,7 +1076,7 @@ static void iwl_tx_start(struct iwl_trans *trans)
         iwl_write_prph(trans, SCD_AGGR_SEL, 0);
 
         /* initiate the queues */
-        for (i = 0; i < cfg(trans)->base_params->num_of_queues; i++) {
+        for (i = 0; i < trans->cfg->base_params->num_of_queues; i++) {
                 iwl_write_prph(trans, SCD_QUEUE_RDPTR(i), 0);
                 iwl_write_direct32(trans, HBUS_TARG_WRPTR, 0 | (i << 8));
                 iwl_write_targ_mem(trans, trans_pcie->scd_base_addr +
@@ -1161,46 +1093,24 @@ static void iwl_tx_start(struct iwl_trans *trans)
         }
 
         iwl_write_prph(trans, SCD_INTERRUPT_MASK,
-                        IWL_MASK(0, cfg(trans)->base_params->num_of_queues));
+                        IWL_MASK(0, trans->cfg->base_params->num_of_queues));
 
         /* Activate all Tx DMA/FIFO channels */
         iwl_trans_txq_set_sched(trans, IWL_MASK(0, 7));
 
-        /* map queues to FIFOs */
-        if (trans->shrd->valid_contexts != BIT(IWL_RXON_CTX_BSS))
-                queue_to_fifo = iwlagn_ipan_queue_to_tx_fifo;
-        else
-                queue_to_fifo = iwlagn_default_queue_to_tx_fifo;
-
         iwl_trans_set_wr_ptrs(trans, trans_pcie->cmd_queue, 0);
 
-        /* make sure all queue are not stopped */
-        memset(&trans_pcie->queue_stopped[0], 0,
-                sizeof(trans_pcie->queue_stopped));
-        for (i = 0; i < 4; i++)
-                atomic_set(&trans_pcie->queue_stop_count[i], 0);
-
-        /* reset to 0 to enable all the queue first */
-        trans_pcie->txq_ctx_active_msk = 0;
+        /* make sure all queue are not stopped/used */
+        memset(trans_pcie->queue_stopped, 0, sizeof(trans_pcie->queue_stopped));
+        memset(trans_pcie->queue_used, 0, sizeof(trans_pcie->queue_used));
 
-        BUILD_BUG_ON(ARRAY_SIZE(iwlagn_default_queue_to_tx_fifo) <
-                                                IWLAGN_FIRST_AMPDU_QUEUE);
-        BUILD_BUG_ON(ARRAY_SIZE(iwlagn_ipan_queue_to_tx_fifo) <
-                                                IWLAGN_FIRST_AMPDU_QUEUE);
+        for (i = 0; i < trans_pcie->n_q_to_fifo; i++) {
+                int fifo = trans_pcie->setup_q_to_fifo[i];
 
-        for (i = 0; i < IWLAGN_FIRST_AMPDU_QUEUE; i++) {
-                int fifo = queue_to_fifo[i].fifo;
-                int ac = queue_to_fifo[i].ac;
+                set_bit(i, trans_pcie->queue_used);
 
-                iwl_txq_ctx_activate(trans_pcie, i);
-
-                if (fifo == IWL_TX_FIFO_UNUSED)
-                        continue;
-
-                if (ac != IWL_AC_UNSET)
-                        iwl_set_swq_id(&trans_pcie->txq[i], ac, i);
                 iwl_trans_tx_queue_set_status(trans, &trans_pcie->txq[i],
-                                              fifo, 0);
+                                              fifo, true);
         }
 
         spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
@@ -1251,7 +1161,7 @@ static int iwl_trans_tx_stop(struct iwl_trans *trans)
         }
 
         /* Unmap DMA from host system and free skb's */
-        for (txq_id = 0; txq_id < cfg(trans)->base_params->num_of_queues;
+        for (txq_id = 0; txq_id < trans->cfg->base_params->num_of_queues;
              txq_id++)
                 iwl_tx_queue_unmap(trans, txq_id);
 
@@ -1303,6 +1213,8 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
         iwl_disable_interrupts(trans);
         spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
 
+        iwl_enable_rfkill_int(trans);
+
         /* wait to make sure we flush pending tasklet*/
         synchronize_irq(trans_pcie->irq);
         tasklet_kill(&trans_pcie->irq_tasklet);
@@ -1311,6 +1223,12 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
 
         /* stop and reset the on-board processor */
         iwl_write32(trans, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
+
+        /* clear all status bits */
+        clear_bit(STATUS_HCMD_ACTIVE, &trans_pcie->status);
+        clear_bit(STATUS_INT_ENABLED, &trans_pcie->status);
+        clear_bit(STATUS_DEVICE_ENABLED, &trans_pcie->status);
+        clear_bit(STATUS_TPOWER_PMI, &trans_pcie->status);
 }
 
 static void iwl_trans_pcie_wowlan_suspend(struct iwl_trans *trans)
@@ -1325,81 +1243,43 @@ static void iwl_trans_pcie_wowlan_suspend(struct iwl_trans *trans)
 }
 
 static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
-                struct iwl_device_cmd *dev_cmd, enum iwl_rxon_context_id ctx,
-                u8 sta_id, u8 tid)
+                             struct iwl_device_cmd *dev_cmd, int txq_id)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
         struct iwl_tx_cmd *tx_cmd = (struct iwl_tx_cmd *) dev_cmd->payload;
         struct iwl_cmd_meta *out_meta;
         struct iwl_tx_queue *txq;
         struct iwl_queue *q;
-
         dma_addr_t phys_addr = 0;
         dma_addr_t txcmd_phys;
         dma_addr_t scratch_phys;
         u16 len, firstlen, secondlen;
         u8 wait_write_ptr = 0;
-        u8 txq_id;
-        bool is_agg = false;
         __le16 fc = hdr->frame_control;
         u8 hdr_len = ieee80211_hdrlen(fc);
         u16 __maybe_unused wifi_seq;
 
-        /*
-         * Send this frame after DTIM -- there's a special queue
-         * reserved for this for contexts that support AP mode.
-         */
-        if (info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM) {
-                txq_id = trans_pcie->mcast_queue[ctx];
-
-                /*
-                 * The microcode will clear the more data
-                 * bit in the last frame it transmits.
-                 */
-                hdr->frame_control |=
-                        cpu_to_le16(IEEE80211_FCTL_MOREDATA);
-        } else if (info->flags & IEEE80211_TX_CTL_TX_OFFCHAN)
-                txq_id = IWL_AUX_QUEUE;
-        else
-                txq_id =
-                    trans_pcie->ac_to_queue[ctx][skb_get_queue_mapping(skb)];
-
-        /* aggregation is on for this <sta,tid> */
-        if (info->flags & IEEE80211_TX_CTL_AMPDU) {
-                WARN_ON(tid >= IWL_MAX_TID_COUNT);
-                txq_id = trans_pcie->agg_txq[sta_id][tid];
-                is_agg = true;
-        }
-
         txq = &trans_pcie->txq[txq_id];
         q = &txq->q;
 
-        spin_lock(&txq->lock);
+        if (unlikely(!test_bit(txq_id, trans_pcie->queue_used))) {
+                WARN_ON_ONCE(1);
+                return -EINVAL;
+        }
 
-        /* In AGG mode, the index in the ring must correspond to the WiFi
-         * sequence number. This is a HW requirements to help the SCD to parse
-         * the BA.
-         * Check here that the packets are in the right place on the ring.
-         */
-#ifdef CONFIG_IWLWIFI_DEBUG
-        wifi_seq = SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl));
-        WARN_ONCE(is_agg && ((wifi_seq & 0xff) != q->write_ptr),
-                  "Q: %d WiFi Seq %d tfdNum %d",
-                  txq_id, wifi_seq, q->write_ptr);
-#endif
+        spin_lock(&txq->lock);
 
         /* Set up driver data for this TFD */
-        txq->skbs[q->write_ptr] = skb;
-        txq->cmd[q->write_ptr] = dev_cmd;
+        txq->entries[q->write_ptr].skb = skb;
+        txq->entries[q->write_ptr].cmd = dev_cmd;
 
         dev_cmd->hdr.cmd = REPLY_TX;
         dev_cmd->hdr.sequence = cpu_to_le16((u16)(QUEUE_TO_SEQ(txq_id) |
                                 INDEX_TO_SEQ(q->write_ptr)));
 
         /* Set up first empty entry in queue's array of Tx/cmd buffers */
-        out_meta = &txq->meta[q->write_ptr];
+        out_meta = &txq->entries[q->write_ptr].meta;
 
         /*
          * Use the first empty entry in this queue's command buffer array
@@ -1481,6 +1361,10 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
                              &dev_cmd->hdr, firstlen,
                              skb->data + hdr_len, secondlen);
 
+        /* start timer if queue currently empty */
+        if (q->read_ptr == q->write_ptr && trans_pcie->wd_timeout)
+                mod_timer(&txq->stuck_timer, jiffies + trans_pcie->wd_timeout);
+
         /* Tell device the write index *just past* this latest filled TFD */
         q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd);
         iwl_txq_update_write_ptr(trans, txq);
@@ -1541,8 +1425,10 @@ static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
 
         iwl_apm_init(trans);
 
-        hw_rfkill = !(iwl_read32(trans, CSR_GP_CNTRL) &
-                                CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW);
+        /* From now on, the op_mode will be kept updated about RF kill state */
+        iwl_enable_rfkill_int(trans);
+
+        hw_rfkill = iwl_is_rfkill_set(trans);
         iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);
 
         return err;
@@ -1555,18 +1441,41 @@ error:
         return err;
 }
 
-static void iwl_trans_pcie_stop_hw(struct iwl_trans *trans)
+static void iwl_trans_pcie_stop_hw(struct iwl_trans *trans,
+                                   bool op_mode_leaving)
 {
+        bool hw_rfkill;
+        unsigned long flags;
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+
         iwl_apm_stop(trans);
 
+        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
+        iwl_disable_interrupts(trans);
+        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
+
         iwl_write32(trans, CSR_INT, 0xFFFFFFFF);
 
-        /* Even if we stop the HW, we still want the RF kill interrupt */
-        iwl_enable_rfkill_int(trans);
+        if (!op_mode_leaving) {
+                /*
+                 * Even if we stop the HW, we still want the RF kill
+                 * interrupt
+                 */
+                iwl_enable_rfkill_int(trans);
+
+                /*
+                 * Check again since the RF kill state may have changed while
+                 * all the interrupts were disabled, in this case we couldn't
+                 * receive the RF kill interrupt and update the state in the
+                 * op_mode.
+                 */
+                hw_rfkill = iwl_is_rfkill_set(trans);
+                iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);
+        }
 }
 
-static int iwl_trans_pcie_reclaim(struct iwl_trans *trans, int sta_id, int tid,
-                      int txq_id, int ssn, struct sk_buff_head *skbs)
+static void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn,
+                                   struct sk_buff_head *skbs)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_tx_queue *txq = &trans_pcie->txq[txq_id];
@@ -1576,35 +1485,15 @@ static int iwl_trans_pcie_reclaim(struct iwl_trans *trans, int sta_id, int tid,
 
         spin_lock(&txq->lock);
 
-        txq->time_stamp = jiffies;
-
-        if (unlikely(txq_id >= IWLAGN_FIRST_AMPDU_QUEUE &&
-                     tid != IWL_TID_NON_QOS &&
-                     txq_id != trans_pcie->agg_txq[sta_id][tid])) {
-                /*
-                 * FIXME: this is a uCode bug which need to be addressed,
-                 * log the information and return for now.
-                 * Since it is can possibly happen very often and in order
-                 * not to fill the syslog, don't use IWL_ERR or IWL_WARN
-                 */
-                IWL_DEBUG_TX_QUEUES(trans, "Bad queue mapping txq_id %d, "
-                        "agg_txq[sta_id[tid] %d", txq_id,
-                        trans_pcie->agg_txq[sta_id][tid]);
-                spin_unlock(&txq->lock);
-                return 1;
-        }
-
         if (txq->q.read_ptr != tfd_num) {
-                IWL_DEBUG_TX_REPLY(trans, "[Q %d | AC %d] %d -> %d (%d)\n",
-                                txq_id, iwl_get_queue_ac(txq), txq->q.read_ptr,
-                                tfd_num, ssn);
+                IWL_DEBUG_TX_REPLY(trans, "[Q %d] %d -> %d (%d)\n",
+                                   txq_id, txq->q.read_ptr, tfd_num, ssn);
                 freed = iwl_tx_queue_reclaim(trans, txq_id, tfd_num, skbs);
                 if (iwl_queue_space(&txq->q) > txq->q.low_mark)
                         iwl_wake_queue(trans, txq);
         }
 
         spin_unlock(&txq->lock);
-        return 0;
 }
 
 static void iwl_trans_pcie_write8(struct iwl_trans *trans, u32 ofs, u8 val)
@@ -1623,7 +1512,7 @@ static u32 iwl_trans_pcie_read32(struct iwl_trans *trans, u32 ofs)
 }
 
 static void iwl_trans_pcie_configure(struct iwl_trans *trans,
-                              const struct iwl_trans_config *trans_cfg)
+                                     const struct iwl_trans_config *trans_cfg)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
@@ -1635,9 +1524,31 @@ static void iwl_trans_pcie_configure(struct iwl_trans *trans,
         if (trans_pcie->n_no_reclaim_cmds)
                 memcpy(trans_pcie->no_reclaim_cmds, trans_cfg->no_reclaim_cmds,
                        trans_pcie->n_no_reclaim_cmds * sizeof(u8));
+
+        trans_pcie->n_q_to_fifo = trans_cfg->n_queue_to_fifo;
+
+        if (WARN_ON(trans_pcie->n_q_to_fifo > IWL_MAX_HW_QUEUES))
+                trans_pcie->n_q_to_fifo = IWL_MAX_HW_QUEUES;
+
+        /* at least the command queue must be mapped */
+        WARN_ON(!trans_pcie->n_q_to_fifo);
+
+        memcpy(trans_pcie->setup_q_to_fifo, trans_cfg->queue_to_fifo,
+               trans_pcie->n_q_to_fifo * sizeof(u8));
+
+        trans_pcie->rx_buf_size_8k = trans_cfg->rx_buf_size_8k;
+        if (trans_pcie->rx_buf_size_8k)
+                trans_pcie->rx_page_order = get_order(8 * 1024);
+        else
+                trans_pcie->rx_page_order = get_order(4 * 1024);
+
+        trans_pcie->wd_timeout =
+                msecs_to_jiffies(trans_cfg->queue_watchdog_timeout);
+
+        trans_pcie->command_names = trans_cfg->command_names;
 }
 
-static void iwl_trans_pcie_free(struct iwl_trans *trans)
+void iwl_trans_pcie_free(struct iwl_trans *trans)
 {
         struct iwl_trans_pcie *trans_pcie =
                 IWL_TRANS_GET_PCIE_TRANS(trans);
@@ -1656,10 +1567,19 @@ static void iwl_trans_pcie_free(struct iwl_trans *trans)
         pci_release_regions(trans_pcie->pci_dev);
         pci_disable_device(trans_pcie->pci_dev);
 
-        trans->shrd->trans = NULL;
         kfree(trans);
 }
 
+static void iwl_trans_pcie_set_pmi(struct iwl_trans *trans, bool state)
+{
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+
+        if (state)
+                set_bit(STATUS_TPOWER_PMI, &trans_pcie->status);
+        else
+                clear_bit(STATUS_TPOWER_PMI, &trans_pcie->status);
+}
+
 #ifdef CONFIG_PM_SLEEP
 static int iwl_trans_pcie_suspend(struct iwl_trans *trans)
 {
@@ -1670,16 +1590,14 @@ static int iwl_trans_pcie_resume(struct iwl_trans *trans)
 {
         bool hw_rfkill;
 
-        hw_rfkill = !(iwl_read32(trans, CSR_GP_CNTRL) &
-                                CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW);
-
-        if (hw_rfkill)
-                iwl_enable_rfkill_int(trans);
-        else
-                iwl_enable_interrupts(trans);
+        iwl_enable_rfkill_int(trans);
 
+        hw_rfkill = iwl_is_rfkill_set(trans);
         iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);
 
+        if (!hw_rfkill)
+                iwl_enable_interrupts(trans);
+
         return 0;
 }
 #endif /* CONFIG_PM_SLEEP */
@@ -1696,7 +1614,7 @@ static int iwl_trans_pcie_wait_tx_queue_empty(struct iwl_trans *trans)
         int ret = 0;
 
         /* waiting for all the tx frames complete might take a while */
-        for (cnt = 0; cnt < cfg(trans)->base_params->num_of_queues; cnt++) {
+        for (cnt = 0; cnt < trans->cfg->base_params->num_of_queues; cnt++) {
                 if (cnt == trans_pcie->cmd_queue)
                         continue;
                 txq = &trans_pcie->txq[cnt];
@@ -1714,42 +1632,9 @@ static int iwl_trans_pcie_wait_tx_queue_empty(struct iwl_trans *trans)
         return ret;
 }
 
-/*
- * On every watchdog tick we check (latest) time stamp. If it does not
- * change during timeout period and queue is not empty we reset firmware.
- */
-static int iwl_trans_pcie_check_stuck_queue(struct iwl_trans *trans, int cnt)
-{
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        struct iwl_tx_queue *txq = &trans_pcie->txq[cnt];
-        struct iwl_queue *q = &txq->q;
-        unsigned long timeout;
-
-        if (q->read_ptr == q->write_ptr) {
-                txq->time_stamp = jiffies;
-                return 0;
-        }
-
-        timeout = txq->time_stamp +
-                  msecs_to_jiffies(hw_params(trans).wd_timeout);
-
-        if (time_after(jiffies, timeout)) {
-                IWL_ERR(trans, "Queue %d stuck for %u ms.\n", q->id,
-                        hw_params(trans).wd_timeout);
-                IWL_ERR(trans, "Current SW read_ptr %d write_ptr %d\n",
-                        q->read_ptr, q->write_ptr);
-                IWL_ERR(trans, "Current HW read_ptr %d write_ptr %d\n",
-                        iwl_read_prph(trans, SCD_QUEUE_RDPTR(cnt))
-                                & (TFD_QUEUE_SIZE_MAX - 1),
-                        iwl_read_prph(trans, SCD_QUEUE_WRPTR(cnt)));
-                return 1;
-        }
-
-        return 0;
-}
-
 static const char *get_fh_string(int cmd)
 {
+#define IWL_CMD(x) case x: return #x
         switch (cmd) {
         IWL_CMD(FH_RSCSR_CHNL0_STTS_WPTR_REG);
         IWL_CMD(FH_RSCSR_CHNL0_RBDCB_BASE_REG);
@@ -1763,6 +1648,7 @@ static const char *get_fh_string(int cmd)
         default:
                 return "UNKNOWN";
         }
+#undef IWL_CMD
 }
 
 int iwl_dump_fh(struct iwl_trans *trans, char **buf, bool display)
@@ -1811,6 +1697,7 @@ int iwl_dump_fh(struct iwl_trans *trans, char **buf, bool display)
 
 static const char *get_csr_string(int cmd)
 {
+#define IWL_CMD(x) case x: return #x
         switch (cmd) {
         IWL_CMD(CSR_HW_IF_CONFIG_REG);
         IWL_CMD(CSR_INT_COALESCING);
@@ -1838,6 +1725,7 @@ static const char *get_csr_string(int cmd)
         default:
                 return "UNKNOWN";
         }
+#undef IWL_CMD
 }
 
 void iwl_dump_csr(struct iwl_trans *trans)
@@ -1938,32 +1826,23 @@ static ssize_t iwl_dbgfs_tx_queue_read(struct file *file,
         int ret;
         size_t bufsz;
 
-        bufsz = sizeof(char) * 64 * cfg(trans)->base_params->num_of_queues;
+        bufsz = sizeof(char) * 64 * trans->cfg->base_params->num_of_queues;
 
-        if (!trans_pcie->txq) {
-                IWL_ERR(trans, "txq not ready\n");
+        if (!trans_pcie->txq)
                 return -EAGAIN;
-        }
+
         buf = kzalloc(bufsz, GFP_KERNEL);
         if (!buf)
                 return -ENOMEM;
 
-        for (cnt = 0; cnt < cfg(trans)->base_params->num_of_queues; cnt++) {
+        for (cnt = 0; cnt < trans->cfg->base_params->num_of_queues; cnt++) {
                 txq = &trans_pcie->txq[cnt];
                 q = &txq->q;
                 pos += scnprintf(buf + pos, bufsz - pos,
-                                "hwq %.2d: read=%u write=%u stop=%d"
-                                " swq_id=%#.2x (ac %d/hwq %d)\n",
+                                "hwq %.2d: read=%u write=%u use=%d stop=%d\n",
                                 cnt, q->read_ptr, q->write_ptr,
-                                !!test_bit(cnt, trans_pcie->queue_stopped),
-                                txq->swq_id, txq->swq_id & 3,
-                                (txq->swq_id >> 2) & 0x1f);
-                if (cnt >= 4)
-                        continue;
-                /* for the ACs, display the stop count too */
-                pos += scnprintf(buf + pos, bufsz - pos,
-                        "        stop-count: %d\n",
-                        atomic_read(&trans_pcie->queue_stop_count[cnt]));
+                                !!test_bit(cnt, trans_pcie->queue_used),
+                                !!test_bit(cnt, trans_pcie->queue_stopped));
         }
         ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
         kfree(buf);
@@ -1997,44 +1876,6 @@ static ssize_t iwl_dbgfs_rx_queue_read(struct file *file,
         return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
 }
 
-static ssize_t iwl_dbgfs_log_event_read(struct file *file,
-                                         char __user *user_buf,
-                                         size_t count, loff_t *ppos)
-{
-        struct iwl_trans *trans = file->private_data;
-        char *buf;
-        int pos = 0;
-        ssize_t ret = -ENOMEM;
-
-        ret = pos = iwl_dump_nic_event_log(trans, true, &buf, true);
-        if (buf) {
-                ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-                kfree(buf);
-        }
-        return ret;
-}
-
-static ssize_t iwl_dbgfs_log_event_write(struct file *file,
-                                        const char __user *user_buf,
-                                        size_t count, loff_t *ppos)
-{
-        struct iwl_trans *trans = file->private_data;
-        u32 event_log_flag;
-        char buf[8];
-        int buf_size;
-
-        memset(buf, 0, sizeof(buf));
-        buf_size = min(count, sizeof(buf) -  1);
-        if (copy_from_user(buf, user_buf, buf_size))
-                return -EFAULT;
-        if (sscanf(buf, "%d", &event_log_flag) != 1)
-                return -EFAULT;
-        if (event_log_flag == 1)
-                iwl_dump_nic_event_log(trans, true, NULL, false);
-
-        return count;
-}
-
 static ssize_t iwl_dbgfs_interrupt_read(struct file *file,
                                         char __user *user_buf,
                                         size_t count, loff_t *ppos) {
@@ -2050,10 +1891,8 @@ static ssize_t iwl_dbgfs_interrupt_read(struct file *file,
         ssize_t ret;
 
         buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(trans, "Can not allocate Buffer\n");
+        if (!buf)
                 return -ENOMEM;
-        }
 
         pos += scnprintf(buf + pos, bufsz - pos,
                         "Interrupt Statistics Report:\n");
@@ -2161,12 +2000,26 @@ static ssize_t iwl_dbgfs_fh_reg_read(struct file *file,
         return ret;
 }
 
-DEBUGFS_READ_WRITE_FILE_OPS(log_event);
+static ssize_t iwl_dbgfs_fw_restart_write(struct file *file,
+                                          const char __user *user_buf,
+                                          size_t count, loff_t *ppos)
+{
+        struct iwl_trans *trans = file->private_data;
+
+        if (!trans->op_mode)
+                return -EAGAIN;
+
+        iwl_op_mode_nic_error(trans->op_mode);
+
+        return count;
+}
+
 DEBUGFS_READ_WRITE_FILE_OPS(interrupt);
 DEBUGFS_READ_FILE_OPS(fh_reg);
 DEBUGFS_READ_FILE_OPS(rx_queue);
 DEBUGFS_READ_FILE_OPS(tx_queue);
 DEBUGFS_WRITE_FILE_OPS(csr);
+DEBUGFS_WRITE_FILE_OPS(fw_restart);
 
 /*
  * Create the debugfs files and directories
@@ -2177,10 +2030,10 @@ static int iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans,
 {
         DEBUGFS_ADD_FILE(rx_queue, dir, S_IRUSR);
         DEBUGFS_ADD_FILE(tx_queue, dir, S_IRUSR);
-        DEBUGFS_ADD_FILE(log_event, dir, S_IWUSR | S_IRUSR);
         DEBUGFS_ADD_FILE(interrupt, dir, S_IWUSR | S_IRUSR);
         DEBUGFS_ADD_FILE(csr, dir, S_IWUSR);
         DEBUGFS_ADD_FILE(fh_reg, dir, S_IRUSR);
+        DEBUGFS_ADD_FILE(fw_restart, dir, S_IWUSR);
         return 0;
 }
 #else
@@ -2190,7 +2043,7 @@ static int iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans,
 
 #endif /*CONFIG_IWLWIFI_DEBUGFS */
 
-const struct iwl_trans_ops trans_ops_pcie = {
+static const struct iwl_trans_ops trans_ops_pcie = {
         .start_hw = iwl_trans_pcie_start_hw,
         .stop_hw = iwl_trans_pcie_stop_hw,
         .fw_alive = iwl_trans_pcie_fw_alive,
@@ -2205,15 +2058,11 @@ const struct iwl_trans_ops trans_ops_pcie = {
         .reclaim = iwl_trans_pcie_reclaim,
 
         .tx_agg_disable = iwl_trans_pcie_tx_agg_disable,
-        .tx_agg_alloc = iwl_trans_pcie_tx_agg_alloc,
         .tx_agg_setup = iwl_trans_pcie_tx_agg_setup,
 
-        .free = iwl_trans_pcie_free,
-
         .dbgfs_register = iwl_trans_pcie_dbgfs_register,
 
         .wait_tx_queue_empty = iwl_trans_pcie_wait_tx_queue_empty,
-        .check_stuck_queue = iwl_trans_pcie_check_stuck_queue,
 
 #ifdef CONFIG_PM_SLEEP
         .suspend = iwl_trans_pcie_suspend,
@@ -2223,11 +2072,12 @@ const struct iwl_trans_ops trans_ops_pcie = {
         .write32 = iwl_trans_pcie_write32,
         .read32 = iwl_trans_pcie_read32,
         .configure = iwl_trans_pcie_configure,
+        .set_pmi = iwl_trans_pcie_set_pmi,
 };
 
-struct iwl_trans *iwl_trans_pcie_alloc(struct iwl_shared *shrd,
-                                       struct pci_dev *pdev,
-                                       const struct pci_device_id *ent)
+struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
+                                       const struct pci_device_id *ent,
+                                       const struct iwl_cfg *cfg)
 {
         struct iwl_trans_pcie *trans_pcie;
         struct iwl_trans *trans;
@@ -2243,7 +2093,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct iwl_shared *shrd,
         trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
         trans->ops = &trans_ops_pcie;
-        trans->shrd = shrd;
+        trans->cfg = cfg;
         trans_pcie->trans = trans;
         spin_lock_init(&trans_pcie->irq_lock);
         init_waitqueue_head(&trans_pcie->ucode_write_waitq);
@@ -2325,6 +2175,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct iwl_shared *shrd,
 
         /* Initialize the wait queue for commands */
         init_waitqueue_head(&trans->wait_command_queue);
+        spin_lock_init(&trans->reg_lock);
 
         return trans;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index 0c81cbaa8088..79a1e7ae4995 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -66,8 +66,9 @@
 #include <linux/ieee80211.h>
 #include <linux/mm.h> /* for page_address */
 
-#include "iwl-shared.h"
 #include "iwl-debug.h"
+#include "iwl-config.h"
+#include "iwl-fw.h"
 
 /**
  * DOC: Transport layer - what is it ?
@@ -104,13 +105,6 @@
  *      6) Eventually, the free function will be called.
  */
 
-struct iwl_priv;
-struct iwl_shared;
-struct iwl_op_mode;
-struct fw_img;
-struct sk_buff;
-struct dentry;
-
 /**
  * DOC: Host command section
  *
@@ -162,6 +156,8 @@ struct iwl_cmd_header {
 
 
 #define FH_RSCSR_FRAME_SIZE_MSK         0x00003FFF      /* bits 0-13 */
+#define FH_RSCSR_FRAME_INVALID          0x55550000
+#define FH_RSCSR_FRAME_ALIGN            0x40
 
 struct iwl_rx_packet {
         /*
@@ -260,27 +256,43 @@ static inline void iwl_free_resp(struct iwl_host_cmd *cmd)
 
 struct iwl_rx_cmd_buffer {
         struct page *_page;
+        int _offset;
+        bool _page_stolen;
+        unsigned int truesize;
 };
 
 static inline void *rxb_addr(struct iwl_rx_cmd_buffer *r)
 {
-        return page_address(r->_page);
+        return (void *)((unsigned long)page_address(r->_page) + r->_offset);
+}
+
+static inline int rxb_offset(struct iwl_rx_cmd_buffer *r)
+{
+        return r->_offset;
 }
 
 static inline struct page *rxb_steal_page(struct iwl_rx_cmd_buffer *r)
 {
-        struct page *p = r->_page;
-        r->_page = NULL;
-        return p;
+        r->_page_stolen = true;
+        get_page(r->_page);
+        return r->_page;
 }
 
 #define MAX_NO_RECLAIM_CMDS     6
 
+/*
+ * Maximum number of HW queues the transport layer
+ * currently supports
+ */
+#define IWL_MAX_HW_QUEUES               32
+
 /**
  * struct iwl_trans_config - transport configuration
  *
  * @op_mode: pointer to the upper layer.
- *      Must be set before any other call.
+ * @queue_to_fifo: queue to FIFO mapping to set up by
+ *      default
+ * @n_queue_to_fifo: number of queues to set up
  * @cmd_queue: the index of the command queue.
  *      Must be set before start_fw.
  * @no_reclaim_cmds: Some devices erroneously don't set the
@@ -288,14 +300,29 @@ static inline struct page *rxb_steal_page(struct iwl_rx_cmd_buffer *r)
  *      list of such notifications to filter. Max length is
  *      %MAX_NO_RECLAIM_CMDS.
  * @n_no_reclaim_cmds: # of commands in list
+ * @rx_buf_size_8k: 8 kB RX buffer size needed for A-MSDUs,
+ *      if unset 4k will be the RX buffer size
+ * @queue_watchdog_timeout: time (in ms) after which queues
+ *      are considered stuck and will trigger device restart
+ * @command_names: array of command names, must be 256 entries
+ *      (one for each command); for debugging only
  */
 struct iwl_trans_config {
         struct iwl_op_mode *op_mode;
+        const u8 *queue_to_fifo;
+        u8 n_queue_to_fifo;
+
         u8 cmd_queue;
         const u8 *no_reclaim_cmds;
         int n_no_reclaim_cmds;
+
+        bool rx_buf_size_8k;
+        unsigned int queue_watchdog_timeout;
+        const char **command_names;
 };
 
+struct iwl_trans;
+
 /**
  * struct iwl_trans_ops - transport specific operations
  *
@@ -304,7 +331,8 @@ struct iwl_trans_config {
  * @start_hw: starts the HW- from that point on, the HW can send interrupts
  *      May sleep
  * @stop_hw: stops the HW- from that point on, the HW will be in low power but
- *      will still issue interrupt if the HW RF kill is triggered.
+ *      will still issue interrupt if the HW RF kill is triggered unless
+ *      op_mode_leaving is true.
  *      May sleep
  * @start_fw: allocates and inits all the resources for the transport
  *      layer. Also kick a fw image.
@@ -322,18 +350,11 @@ struct iwl_trans_config {
  *      Must be atomic
  * @reclaim: free packet until ssn. Returns a list of freed packets.
  *      Must be atomic
- * @tx_agg_alloc: allocate resources for a TX BA session
- *      Must be atomic
  * @tx_agg_setup: setup a tx queue for AMPDU - will be called once the HW is
  *      ready and a successful ADDBA response has been received.
  *      May sleep
  * @tx_agg_disable: de-configure a Tx queue to send AMPDUs
  *      Must be atomic
- * @free: release all the ressource for the transport layer itself such as
- *      irq, tasklet etc... From this point on, the device may not issue
- *      any interrupt (incl. RFKILL).
- *      May sleep
- * @check_stuck_queue: check if a specific queue is stuck
  * @wait_tx_queue_empty: wait until all tx queues are empty
  *      May sleep
  * @dbgfs_register: add the dbgfs files under this directory. Files will be
@@ -346,11 +367,12 @@ struct iwl_trans_config {
  * @configure: configure parameters required by the transport layer from
  *      the op_mode. May be called several times before start_fw, can't be
  *      called after that.
+ * @set_pmi: set the power pmi state
  */
 struct iwl_trans_ops {
 
         int (*start_hw)(struct iwl_trans *iwl_trans);
-        void (*stop_hw)(struct iwl_trans *iwl_trans);
+        void (*stop_hw)(struct iwl_trans *iwl_trans, bool op_mode_leaving);
         int (*start_fw)(struct iwl_trans *trans, const struct fw_img *fw);
         void (*fw_alive)(struct iwl_trans *trans);
         void (*stop_device)(struct iwl_trans *trans);
@@ -360,23 +382,15 @@ struct iwl_trans_ops {
         int (*send_cmd)(struct iwl_trans *trans, struct iwl_host_cmd *cmd);
 
         int (*tx)(struct iwl_trans *trans, struct sk_buff *skb,
-                struct iwl_device_cmd *dev_cmd, enum iwl_rxon_context_id ctx,
-                u8 sta_id, u8 tid);
-        int (*reclaim)(struct iwl_trans *trans, int sta_id, int tid,
-                        int txq_id, int ssn, struct sk_buff_head *skbs);
+                  struct iwl_device_cmd *dev_cmd, int queue);
+        void (*reclaim)(struct iwl_trans *trans, int queue, int ssn,
+                        struct sk_buff_head *skbs);
 
-        int (*tx_agg_disable)(struct iwl_trans *trans,
-                              int sta_id, int tid);
-        int (*tx_agg_alloc)(struct iwl_trans *trans,
-                            int sta_id, int tid);
-        void (*tx_agg_setup)(struct iwl_trans *trans,
-                             enum iwl_rxon_context_id ctx, int sta_id, int tid,
-                             int frame_limit, u16 ssn);
-
-        void (*free)(struct iwl_trans *trans);
+        void (*tx_agg_setup)(struct iwl_trans *trans, int queue, int fifo,
+                             int sta_id, int tid, int frame_limit, u16 ssn);
+        void (*tx_agg_disable)(struct iwl_trans *trans, int queue);
 
         int (*dbgfs_register)(struct iwl_trans *trans, struct dentry* dir);
-        int (*check_stuck_queue)(struct iwl_trans *trans, int q);
         int (*wait_tx_queue_empty)(struct iwl_trans *trans);
 #ifdef CONFIG_PM_SLEEP
         int (*suspend)(struct iwl_trans *trans);
@@ -387,6 +401,7 @@ struct iwl_trans_ops {
         u32 (*read32)(struct iwl_trans *trans, u32 ofs);
         void (*configure)(struct iwl_trans *trans,
                           const struct iwl_trans_config *trans_cfg);
+        void (*set_pmi)(struct iwl_trans *trans, bool state);
 };
 
 /**
@@ -405,20 +420,19 @@ enum iwl_trans_state {
  *
  * @ops - pointer to iwl_trans_ops
  * @op_mode - pointer to the op_mode
- * @shrd - pointer to iwl_shared which holds shared data from the upper layer
+ * @cfg - pointer to the configuration
  * @reg_lock - protect hw register access
  * @dev - pointer to struct device * that represents the device
  * @hw_id: a u32 with the ID of the device / subdevice.
  *      Set during transport allocation.
  * @hw_id_str: a string with info about HW ID. Set during transport allocation.
- * @nvm_device_type: indicates OTP or eeprom
  * @pm_support: set to true in start_hw if link pm is supported
  * @wait_command_queue: the wait_queue for SYNC host commands
  */
 struct iwl_trans {
         const struct iwl_trans_ops *ops;
         struct iwl_op_mode *op_mode;
-        struct iwl_shared *shrd;
+        const struct iwl_cfg *cfg;
         enum iwl_trans_state state;
         spinlock_t reg_lock;
 
@@ -427,7 +441,6 @@ struct iwl_trans {
         u32 hw_id;
         char hw_id_str[52];
 
-        int    nvm_device_type;
         bool pm_support;
 
         wait_queue_head_t wait_command_queue;
@@ -456,11 +469,12 @@ static inline int iwl_trans_start_hw(struct iwl_trans *trans)
         return trans->ops->start_hw(trans);
 }
 
-static inline void iwl_trans_stop_hw(struct iwl_trans *trans)
+static inline void iwl_trans_stop_hw(struct iwl_trans *trans,
+                                     bool op_mode_leaving)
 {
         might_sleep();
 
-        trans->ops->stop_hw(trans);
+        trans->ops->stop_hw(trans, op_mode_leaving);
 
         trans->state = IWL_TRANS_NO_FW;
 }
@@ -507,60 +521,42 @@ static inline int iwl_trans_send_cmd(struct iwl_trans *trans,
 }
 
 static inline int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb,
-                struct iwl_device_cmd *dev_cmd, enum iwl_rxon_context_id ctx,
-                u8 sta_id, u8 tid)
-{
-        if (trans->state != IWL_TRANS_FW_ALIVE)
-                IWL_ERR(trans, "%s bad state = %d", __func__, trans->state);
-
-        return trans->ops->tx(trans, skb, dev_cmd, ctx, sta_id, tid);
-}
-
-static inline int iwl_trans_reclaim(struct iwl_trans *trans, int sta_id,
-                                 int tid, int txq_id, int ssn,
-                                 struct sk_buff_head *skbs)
+                               struct iwl_device_cmd *dev_cmd, int queue)
 {
         WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE,
                   "%s bad state = %d", __func__, trans->state);
 
-        return trans->ops->reclaim(trans, sta_id, tid, txq_id, ssn, skbs);
+        return trans->ops->tx(trans, skb, dev_cmd, queue);
 }
 
-static inline int iwl_trans_tx_agg_disable(struct iwl_trans *trans,
-                                            int sta_id, int tid)
+static inline void iwl_trans_reclaim(struct iwl_trans *trans, int queue,
+                                     int ssn, struct sk_buff_head *skbs)
 {
         WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE,
                   "%s bad state = %d", __func__, trans->state);
 
-        return trans->ops->tx_agg_disable(trans, sta_id, tid);
+        trans->ops->reclaim(trans, queue, ssn, skbs);
 }
 
-static inline int iwl_trans_tx_agg_alloc(struct iwl_trans *trans,
-                                         int sta_id, int tid)
+static inline void iwl_trans_tx_agg_disable(struct iwl_trans *trans, int queue)
 {
         WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE,
                   "%s bad state = %d", __func__, trans->state);
 
-        return trans->ops->tx_agg_alloc(trans, sta_id, tid);
+        trans->ops->tx_agg_disable(trans, queue);
 }
 
-
-static inline void iwl_trans_tx_agg_setup(struct iwl_trans *trans,
-                                           enum iwl_rxon_context_id ctx,
-                                           int sta_id, int tid,
-                                           int frame_limit, u16 ssn)
+static inline void iwl_trans_tx_agg_setup(struct iwl_trans *trans, int queue,
+                                          int fifo, int sta_id, int tid,
+                                          int frame_limit, u16 ssn)
 {
         might_sleep();
 
         WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE,
                   "%s bad state = %d", __func__, trans->state);
 
-        trans->ops->tx_agg_setup(trans, ctx, sta_id, tid, frame_limit, ssn);
-}
-
-static inline void iwl_trans_free(struct iwl_trans *trans)
-{
-        trans->ops->free(trans);
+        trans->ops->tx_agg_setup(trans, queue, fifo, sta_id, tid,
+                                 frame_limit, ssn);
 }
 
 static inline int iwl_trans_wait_tx_queue_empty(struct iwl_trans *trans)
@@ -571,13 +567,6 @@ static inline int iwl_trans_wait_tx_queue_empty(struct iwl_trans *trans)
         return trans->ops->wait_tx_queue_empty(trans);
 }
 
-static inline int iwl_trans_check_stuck_queue(struct iwl_trans *trans, int q)
-{
-        WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE,
-                  "%s bad state = %d", __func__, trans->state);
-
-        return trans->ops->check_stuck_queue(trans, q);
-}
 static inline int iwl_trans_dbgfs_register(struct iwl_trans *trans,
                                             struct dentry *dir)
 {
@@ -611,20 +600,15 @@ static inline u32 iwl_trans_read32(struct iwl_trans *trans, u32 ofs)
         return trans->ops->read32(trans, ofs);
 }
 
+static inline void iwl_trans_set_pmi(struct iwl_trans *trans, bool state)
+{
+        trans->ops->set_pmi(trans, state);
+}
+
 /*****************************************************
-* Transport layers implementations + their allocation function
+* driver (transport) register/unregister functions
 ******************************************************/
-struct pci_dev;
-struct pci_device_id;
-extern const struct iwl_trans_ops trans_ops_pcie;
-struct iwl_trans *iwl_trans_pcie_alloc(struct iwl_shared *shrd,
-                                       struct pci_dev *pdev,
-                                       const struct pci_device_id *ent);
 int __must_check iwl_pci_register_driver(void);
 void iwl_pci_unregister_driver(void);
 
-extern const struct iwl_trans_ops trans_ops_idi;
-struct iwl_trans *iwl_trans_idi_alloc(struct iwl_shared *shrd,
-                                      void *pdev_void,
-                                      const void *ent_void);
 #endif /* __iwl_trans_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-ucode.c b/drivers/net/wireless/iwlwifi/iwl-ucode.c
index 252828728837..bc40dc68b0f4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-ucode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-ucode.c
@@ -31,7 +31,6 @@
 #include <linux/init.h>
 
 #include "iwl-dev.h"
-#include "iwl-core.h"
 #include "iwl-io.h"
 #include "iwl-agn-hw.h"
 #include "iwl-agn.h"
@@ -40,37 +39,6 @@
 #include "iwl-fh.h"
 #include "iwl-op-mode.h"
 
-static struct iwl_wimax_coex_event_entry cu_priorities[COEX_NUM_OF_EVENTS] = {
-        {COEX_CU_UNASSOC_IDLE_RP, COEX_CU_UNASSOC_IDLE_WP,
-         0, COEX_UNASSOC_IDLE_FLAGS},
-        {COEX_CU_UNASSOC_MANUAL_SCAN_RP, COEX_CU_UNASSOC_MANUAL_SCAN_WP,
-         0, COEX_UNASSOC_MANUAL_SCAN_FLAGS},
-        {COEX_CU_UNASSOC_AUTO_SCAN_RP, COEX_CU_UNASSOC_AUTO_SCAN_WP,
-         0, COEX_UNASSOC_AUTO_SCAN_FLAGS},
-        {COEX_CU_CALIBRATION_RP, COEX_CU_CALIBRATION_WP,
-         0, COEX_CALIBRATION_FLAGS},
-        {COEX_CU_PERIODIC_CALIBRATION_RP, COEX_CU_PERIODIC_CALIBRATION_WP,
-         0, COEX_PERIODIC_CALIBRATION_FLAGS},
-        {COEX_CU_CONNECTION_ESTAB_RP, COEX_CU_CONNECTION_ESTAB_WP,
-         0, COEX_CONNECTION_ESTAB_FLAGS},
-        {COEX_CU_ASSOCIATED_IDLE_RP, COEX_CU_ASSOCIATED_IDLE_WP,
-         0, COEX_ASSOCIATED_IDLE_FLAGS},
-        {COEX_CU_ASSOC_MANUAL_SCAN_RP, COEX_CU_ASSOC_MANUAL_SCAN_WP,
-         0, COEX_ASSOC_MANUAL_SCAN_FLAGS},
-        {COEX_CU_ASSOC_AUTO_SCAN_RP, COEX_CU_ASSOC_AUTO_SCAN_WP,
-         0, COEX_ASSOC_AUTO_SCAN_FLAGS},
-        {COEX_CU_ASSOC_ACTIVE_LEVEL_RP, COEX_CU_ASSOC_ACTIVE_LEVEL_WP,
-         0, COEX_ASSOC_ACTIVE_LEVEL_FLAGS},
-        {COEX_CU_RF_ON_RP, COEX_CU_RF_ON_WP, 0, COEX_CU_RF_ON_FLAGS},
-        {COEX_CU_RF_OFF_RP, COEX_CU_RF_OFF_WP, 0, COEX_RF_OFF_FLAGS},
-        {COEX_CU_STAND_ALONE_DEBUG_RP, COEX_CU_STAND_ALONE_DEBUG_WP,
-         0, COEX_STAND_ALONE_DEBUG_FLAGS},
-        {COEX_CU_IPAN_ASSOC_LEVEL_RP, COEX_CU_IPAN_ASSOC_LEVEL_WP,
-         0, COEX_IPAN_ASSOC_LEVEL_FLAGS},
-        {COEX_CU_RSRVD1_RP, COEX_CU_RSRVD1_WP, 0, COEX_RSRVD1_FLAGS},
-        {COEX_CU_RSRVD2_RP, COEX_CU_RSRVD2_WP, 0, COEX_RSRVD2_FLAGS}
-};
-
 /******************************************************************************
  *
  * uCode download functions
@@ -93,7 +61,7 @@ static int iwl_set_Xtal_calib(struct iwl_priv *priv)
 {
         struct iwl_calib_xtal_freq_cmd cmd;
         __le16 *xtal_calib =
-                (__le16 *)iwl_eeprom_query_addr(priv->shrd, EEPROM_XTAL);
+                (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_XTAL);
 
         iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_CRYSTAL_FRQ_CMD);
         cmd.cap_pin1 = le16_to_cpu(xtal_calib[0]);
@@ -105,8 +73,7 @@ static int iwl_set_temperature_offset_calib(struct iwl_priv *priv)
 {
         struct iwl_calib_temperature_offset_cmd cmd;
         __le16 *offset_calib =
-                (__le16 *)iwl_eeprom_query_addr(priv->shrd,
-                                                EEPROM_RAW_TEMPERATURE);
+                (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_RAW_TEMPERATURE);
 
         memset(&cmd, 0, sizeof(cmd));
         iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD);
@@ -122,16 +89,15 @@ static int iwl_set_temperature_offset_calib(struct iwl_priv *priv)
 static int iwl_set_temperature_offset_calib_v2(struct iwl_priv *priv)
 {
         struct iwl_calib_temperature_offset_v2_cmd cmd;
-        __le16 *offset_calib_high = (__le16 *)iwl_eeprom_query_addr(priv->shrd,
+        __le16 *offset_calib_high = (__le16 *)iwl_eeprom_query_addr(priv,
                                      EEPROM_KELVIN_TEMPERATURE);
         __le16 *offset_calib_low =
-                (__le16 *)iwl_eeprom_query_addr(priv->shrd,
-                                                EEPROM_RAW_TEMPERATURE);
+                (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_RAW_TEMPERATURE);
         struct iwl_eeprom_calib_hdr *hdr;
 
         memset(&cmd, 0, sizeof(cmd));
         iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD);
-        hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(priv->shrd,
+        hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(priv,
                                                         EEPROM_CALIB_ALL);
         memcpy(&cmd.radio_sensor_offset_high, offset_calib_high,
                 sizeof(*offset_calib_high));
@@ -174,30 +140,12 @@ static int iwl_send_calib_cfg(struct iwl_priv *priv)
         return iwl_dvm_send_cmd(priv, &cmd);
 }
 
-int iwlagn_rx_calib_result(struct iwl_priv *priv,
-                            struct iwl_rx_cmd_buffer *rxb,
-                            struct iwl_device_cmd *cmd)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl_calib_hdr *hdr = (struct iwl_calib_hdr *)pkt->data;
-        int len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
-
-        /* reduce the size of the length field itself */
-        len -= 4;
-
-        if (iwl_calib_set(priv, hdr, len))
-                IWL_ERR(priv, "Failed to record calibration data %d\n",
-                        hdr->op_code);
-
-        return 0;
-}
-
 int iwl_init_alive_start(struct iwl_priv *priv)
 {
         int ret;
 
-        if (cfg(priv)->bt_params &&
-            cfg(priv)->bt_params->advanced_bt_coexist) {
+        if (priv->cfg->bt_params &&
+            priv->cfg->bt_params->advanced_bt_coexist) {
                 /*
                  * Tell uCode we are ready to perform calibration
                  * need to perform this before any calibration
@@ -219,8 +167,8 @@ int iwl_init_alive_start(struct iwl_priv *priv)
          * temperature offset calibration is only needed for runtime ucode,
          * so prepare the value now.
          */
-        if (cfg(priv)->need_temp_offset_calib) {
-                if (cfg(priv)->temp_offset_v2)
+        if (priv->cfg->need_temp_offset_calib) {
+                if (priv->cfg->temp_offset_v2)
                         return iwl_set_temperature_offset_calib_v2(priv);
                 else
                         return iwl_set_temperature_offset_calib(priv);
@@ -229,29 +177,13 @@ int iwl_init_alive_start(struct iwl_priv *priv)
         return 0;
 }
 
-static int iwl_send_wimax_coex(struct iwl_priv *priv)
+int iwl_send_wimax_coex(struct iwl_priv *priv)
 {
         struct iwl_wimax_coex_cmd coex_cmd;
 
-        if (cfg(priv)->base_params->support_wimax_coexist) {
-                /* UnMask wake up src at associated sleep */
-                coex_cmd.flags = COEX_FLAGS_ASSOC_WA_UNMASK_MSK;
+        /* coexistence is disabled */
+        memset(&coex_cmd, 0, sizeof(coex_cmd));
 
-                /* UnMask wake up src at unassociated sleep */
-                coex_cmd.flags |= COEX_FLAGS_UNASSOC_WA_UNMASK_MSK;
-                memcpy(coex_cmd.sta_prio, cu_priorities,
-                        sizeof(struct iwl_wimax_coex_event_entry) *
-                         COEX_NUM_OF_EVENTS);
-
-                /* enabling the coexistence feature */
-                coex_cmd.flags |= COEX_FLAGS_COEX_ENABLE_MSK;
-
-                /* enabling the priorities tables */
-                coex_cmd.flags |= COEX_FLAGS_STA_TABLE_VALID_MSK;
-        } else {
-                /* coexistence is disabled */
-                memset(&coex_cmd, 0, sizeof(coex_cmd));
-        }
         return iwl_dvm_send_cmd_pdu(priv,
                                 COEX_PRIORITY_TABLE_CMD, CMD_SYNC,
                                 sizeof(coex_cmd), &coex_cmd);
@@ -311,7 +243,7 @@ static int iwl_alive_notify(struct iwl_priv *priv)
 {
         int ret;
 
-        iwl_trans_fw_alive(trans(priv));
+        iwl_trans_fw_alive(priv->trans);
 
         priv->passive_no_rx = false;
         priv->transport_queue_stop = 0;
@@ -320,7 +252,7 @@ static int iwl_alive_notify(struct iwl_priv *priv)
         if (ret)
                 return ret;
 
-        if (!cfg(priv)->no_xtal_calib) {
+        if (!priv->cfg->no_xtal_calib) {
                 ret = iwl_set_Xtal_calib(priv);
                 if (ret)
                         return ret;
@@ -349,9 +281,9 @@ static int iwl_verify_sec_sparse(struct iwl_priv *priv,
                 /* read data comes through single port, auto-incr addr */
                 /* NOTE: Use the debugless read so we don't flood kernel log
                  * if IWL_DL_IO is set */
-                iwl_write_direct32(trans(priv), HBUS_TARG_MEM_RADDR,
+                iwl_write_direct32(priv->trans, HBUS_TARG_MEM_RADDR,
                         i + fw_desc->offset);
-                val = iwl_read32(trans(priv), HBUS_TARG_MEM_RDAT);
+                val = iwl_read32(priv->trans, HBUS_TARG_MEM_RDAT);
                 if (val != le32_to_cpu(*image))
                         return -EIO;
         }
@@ -370,14 +302,14 @@ static void iwl_print_mismatch_sec(struct iwl_priv *priv,
 
         IWL_DEBUG_FW(priv, "ucode inst image size is %u\n", len);
 
-        iwl_write_direct32(trans(priv), HBUS_TARG_MEM_RADDR,
+        iwl_write_direct32(priv->trans, HBUS_TARG_MEM_RADDR,
                                 fw_desc->offset);
 
         for (offs = 0;
              offs < len && errors < 20;
              offs += sizeof(u32), image++) {
                 /* read data comes through single port, auto-incr addr */
-                val = iwl_read32(trans(priv), HBUS_TARG_MEM_RDAT);
+                val = iwl_read32(priv->trans, HBUS_TARG_MEM_RDAT);
                 if (val != le32_to_cpu(*image)) {
                         IWL_ERR(priv, "uCode INST section at "
                                 "offset 0x%x, is 0x%x, s/b 0x%x\n",
@@ -417,9 +349,8 @@ struct iwl_alive_data {
         u8 subtype;
 };
 
-static void iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,
-                            struct iwl_rx_packet *pkt,
-                            void *data)
+static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,
+                         struct iwl_rx_packet *pkt, void *data)
 {
         struct iwl_priv *priv =
                 container_of(notif_wait, struct iwl_priv, notif_wait);
@@ -433,13 +364,15 @@ static void iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,
                        palive->is_valid, palive->ver_type,
                        palive->ver_subtype);
 
-        priv->shrd->device_pointers.error_event_table =
+        priv->device_pointers.error_event_table =
                 le32_to_cpu(palive->error_event_table_ptr);
-        priv->shrd->device_pointers.log_event_table =
+        priv->device_pointers.log_event_table =
                 le32_to_cpu(palive->log_event_table_ptr);
 
         alive_data->subtype = palive->ver_subtype;
         alive_data->valid = palive->is_valid == UCODE_VALID_OK;
+
+        return true;
 }
 
 #define UCODE_ALIVE_TIMEOUT     HZ
@@ -453,9 +386,10 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
         const struct fw_img *fw;
         int ret;
         enum iwl_ucode_type old_type;
+        static const u8 alive_cmd[] = { REPLY_ALIVE };
 
-        old_type = priv->shrd->ucode_type;
-        priv->shrd->ucode_type = ucode_type;
+        old_type = priv->cur_ucode;
+        priv->cur_ucode = ucode_type;
         fw = iwl_get_ucode_image(priv, ucode_type);
 
         priv->ucode_loaded = false;
@@ -463,12 +397,13 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
         if (!fw)
                 return -EINVAL;
 
-        iwl_init_notification_wait(&priv->notif_wait, &alive_wait, REPLY_ALIVE,
-                                      iwl_alive_fn, &alive_data);
+        iwl_init_notification_wait(&priv->notif_wait, &alive_wait,
+                                   alive_cmd, ARRAY_SIZE(alive_cmd),
+                                   iwl_alive_fn, &alive_data);
 
-        ret = iwl_trans_start_fw(trans(priv), fw);
+        ret = iwl_trans_start_fw(priv->trans, fw);
         if (ret) {
-                priv->shrd->ucode_type = old_type;
+                priv->cur_ucode = old_type;
                 iwl_remove_notification(&priv->notif_wait, &alive_wait);
                 return ret;
         }
@@ -480,13 +415,13 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
         ret = iwl_wait_notification(&priv->notif_wait, &alive_wait,
                                         UCODE_ALIVE_TIMEOUT);
         if (ret) {
-                priv->shrd->ucode_type = old_type;
+                priv->cur_ucode = old_type;
                 return ret;
         }
 
         if (!alive_data.valid) {
                 IWL_ERR(priv, "Loaded ucode is not valid!\n");
-                priv->shrd->ucode_type = old_type;
+                priv->cur_ucode = old_type;
                 return -EIO;
         }
 
@@ -498,7 +433,7 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
         if (ucode_type != IWL_UCODE_WOWLAN) {
                 ret = iwl_verify_ucode(priv, ucode_type);
                 if (ret) {
-                        priv->shrd->ucode_type = old_type;
+                        priv->cur_ucode = old_type;
                         return ret;
                 }
 
@@ -510,7 +445,7 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
         if (ret) {
                 IWL_WARN(priv,
                         "Could not complete ALIVE transition: %d\n", ret);
-                priv->shrd->ucode_type = old_type;
+                priv->cur_ucode = old_type;
                 return ret;
         }
 
@@ -519,9 +454,38 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
         return 0;
 }
 
+static bool iwlagn_wait_calib(struct iwl_notif_wait_data *notif_wait,
+                              struct iwl_rx_packet *pkt, void *data)
+{
+        struct iwl_priv *priv = data;
+        struct iwl_calib_hdr *hdr;
+        int len;
+
+        if (pkt->hdr.cmd != CALIBRATION_RES_NOTIFICATION) {
+                WARN_ON(pkt->hdr.cmd != CALIBRATION_COMPLETE_NOTIFICATION);
+                return true;
+        }
+
+        hdr = (struct iwl_calib_hdr *)pkt->data;
+        len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
+
+        /* reduce the size by the length field itself */
+        len -= sizeof(__le32);
+
+        if (iwl_calib_set(priv, hdr, len))
+                IWL_ERR(priv, "Failed to record calibration data %d\n",
+                        hdr->op_code);
+
+        return false;
+}
+
 int iwl_run_init_ucode(struct iwl_priv *priv)
 {
         struct iwl_notification_wait calib_wait;
+        static const u8 calib_complete[] = {
+                CALIBRATION_RES_NOTIFICATION,
+                CALIBRATION_COMPLETE_NOTIFICATION
+        };
         int ret;
 
         lockdep_assert_held(&priv->mutex);
@@ -534,8 +498,8 @@ int iwl_run_init_ucode(struct iwl_priv *priv)
                 return 0;
 
         iwl_init_notification_wait(&priv->notif_wait, &calib_wait,
-                                      CALIBRATION_COMPLETE_NOTIFICATION,
-                                      NULL, NULL);
+                                   calib_complete, ARRAY_SIZE(calib_complete),
+                                   iwlagn_wait_calib, priv);
 
         /* Will also start the device */
         ret = iwl_load_ucode_wait_alive(priv, IWL_UCODE_INIT);
@@ -561,7 +525,7 @@ int iwl_run_init_ucode(struct iwl_priv *priv)
         iwl_remove_notification(&priv->notif_wait, &calib_wait);
  out:
         /* Whatever happened, stop the device */
-        iwl_trans_stop_device(trans(priv));
+        iwl_trans_stop_device(priv->trans);
         priv->ucode_loaded = false;
 
         return ret;
diff --git a/drivers/net/wireless/iwmc3200wifi/Kconfig b/drivers/net/wireless/iwmc3200wifi/Kconfig
index 03f998d098c5..7107ce53d4d4 100644
--- a/drivers/net/wireless/iwmc3200wifi/Kconfig
+++ b/drivers/net/wireless/iwmc3200wifi/Kconfig
@@ -1,5 +1,5 @@
 config IWM
-        tristate "Intel Wireless Multicomm 3200 WiFi driver"
+        tristate "Intel Wireless Multicomm 3200 WiFi driver (EXPERIMENTAL)"
         depends on MMC && EXPERIMENTAL
         depends on CFG80211
         select FW_LOADER
diff --git a/drivers/net/wireless/libertas/Makefile b/drivers/net/wireless/libertas/Makefile
index f7d01bfa2e4a..eac72f7bd341 100644
--- a/drivers/net/wireless/libertas/Makefile
+++ b/drivers/net/wireless/libertas/Makefile
@@ -6,6 +6,7 @@ libertas-y += ethtool.o
 libertas-y += main.o
 libertas-y += rx.o
 libertas-y += tx.o
+libertas-y += firmware.o
 libertas-$(CONFIG_LIBERTAS_MESH) += mesh.o
 
 usb8xxx-objs += if_usb.o
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index 3fa1ecebadfd..2fa879b015b6 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -103,7 +103,7 @@ static const u32 cipher_suites[] = {
  * Convert NL80211's auth_type to the one from Libertas, see chapter 5.9.1
  * in the firmware spec
  */
-static u8 lbs_auth_to_authtype(enum nl80211_auth_type auth_type)
+static int lbs_auth_to_authtype(enum nl80211_auth_type auth_type)
 {
         int ret = -ENOTSUPP;
 
@@ -1411,7 +1411,12 @@ static int lbs_cfg_connect(struct wiphy *wiphy, struct net_device *dev,
                 goto done;
         }
 
-        lbs_set_authtype(priv, sme);
+        ret = lbs_set_authtype(priv, sme);
+        if (ret == -ENOTSUPP) {
+                wiphy_err(wiphy, "unsupported authtype 0x%x\n", sme->auth_type);
+                goto done;
+        }
+
         lbs_set_radio(priv, preamble, 1);
 
         /* Do the actual association */
diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h
index bc951ab4b681..84a3aa7ac570 100644
--- a/drivers/net/wireless/libertas/decl.h
+++ b/drivers/net/wireless/libertas/decl.h
@@ -19,6 +19,10 @@ struct lbs_fw_table {
 };
 
 struct lbs_private;
+typedef void (*lbs_fw_cb)(struct lbs_private *priv, int ret,
+                const struct firmware *helper, const struct firmware *mainfw);
+
+struct lbs_private;
 struct sk_buff;
 struct net_device;
 struct cmd_ds_command;
@@ -66,10 +70,13 @@ int lbs_exit_auto_deep_sleep(struct lbs_private *priv);
 u32 lbs_fw_index_to_data_rate(u8 index);
 u8 lbs_data_rate_to_fw_index(u32 rate);
 
-int lbs_get_firmware(struct device *dev, const char *user_helper,
-                        const char *user_mainfw, u32 card_model,
+int lbs_get_firmware(struct device *dev, u32 card_model,
                         const struct lbs_fw_table *fw_table,
                         const struct firmware **helper,
                         const struct firmware **mainfw);
+int lbs_get_firmware_async(struct lbs_private *priv, struct device *device,
+                           u32 card_model, const struct lbs_fw_table *fw_table,
+                           lbs_fw_cb callback);
+void lbs_wait_for_firmware_load(struct lbs_private *priv);
 
 #endif
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index f3fd447131c2..672005430aca 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -7,6 +7,7 @@
 #define _LBS_DEV_H_
 
 #include "defs.h"
+#include "decl.h"
 #include "host.h"
 
 #include <linux/kfifo.h>
@@ -180,6 +181,15 @@ struct lbs_private {
         wait_queue_head_t scan_q;
         /* Whether the scan was initiated internally and not by cfg80211 */
         bool internal_scan;
+
+        /* Firmware load */
+        u32 fw_model;
+        wait_queue_head_t fw_waitq;
+        struct device *fw_device;
+        const struct firmware *helper_fw;
+        const struct lbs_fw_table *fw_table;
+        const struct lbs_fw_table *fw_iter;
+        lbs_fw_cb fw_callback;
 };
 
 extern struct cmd_confirm_sleep confirm_sleep;
diff --git a/drivers/net/wireless/libertas/firmware.c b/drivers/net/wireless/libertas/firmware.c
new file mode 100644
index 000000000000..601f2075355e
--- /dev/null
+++ b/drivers/net/wireless/libertas/firmware.c
@@ -0,0 +1,224 @@
+/*
+ * Firmware loading and handling functions.
+ */
+
+#include <linux/sched.h>
+#include <linux/firmware.h>
+#include <linux/firmware.h>
+#include <linux/module.h>
+#include <linux/sched.h>
+
+#include "dev.h"
+#include "decl.h"
+
+static void load_next_firmware_from_table(struct lbs_private *private);
+
+static void lbs_fw_loaded(struct lbs_private *priv, int ret,
+        const struct firmware *helper, const struct firmware *mainfw)
+{
+        unsigned long flags;
+
+        lbs_deb_fw("firmware load complete, code %d\n", ret);
+
+        /* User must free helper/mainfw */
+        priv->fw_callback(priv, ret, helper, mainfw);
+
+        spin_lock_irqsave(&priv->driver_lock, flags);
+        priv->fw_callback = NULL;
+        wake_up(&priv->fw_waitq);
+        spin_unlock_irqrestore(&priv->driver_lock, flags);
+}
+
+static void do_load_firmware(struct lbs_private *priv, const char *name,
+        void (*cb)(const struct firmware *fw, void *context))
+{
+        int ret;
+
+        lbs_deb_fw("Requesting %s\n", name);
+        ret = request_firmware_nowait(THIS_MODULE, true, name,
+                        priv->fw_device, GFP_KERNEL, priv, cb);
+        if (ret) {
+                lbs_deb_fw("request_firmware_nowait error %d\n", ret);
+                lbs_fw_loaded(priv, ret, NULL, NULL);
+        }
+}
+
+static void main_firmware_cb(const struct firmware *firmware, void *context)
+{
+        struct lbs_private *priv = context;
+
+        if (!firmware) {
+                /* Failed to find firmware: try next table entry */
+                load_next_firmware_from_table(priv);
+                return;
+        }
+
+        /* Firmware found! */
+        lbs_fw_loaded(priv, 0, priv->helper_fw, firmware);
+}
+
+static void helper_firmware_cb(const struct firmware *firmware, void *context)
+{
+        struct lbs_private *priv = context;
+
+        if (!firmware) {
+                /* Failed to find firmware: try next table entry */
+                load_next_firmware_from_table(priv);
+                return;
+        }
+
+        /* Firmware found! */
+        if (priv->fw_iter->fwname) {
+                priv->helper_fw = firmware;
+                do_load_firmware(priv, priv->fw_iter->fwname, main_firmware_cb);
+        } else {
+                /* No main firmware needed for this helper --> success! */
+                lbs_fw_loaded(priv, 0, firmware, NULL);
+        }
+}
+
+static void load_next_firmware_from_table(struct lbs_private *priv)
+{
+        const struct lbs_fw_table *iter;
+
+        if (!priv->fw_iter)
+                iter = priv->fw_table;
+        else
+                iter = ++priv->fw_iter;
+
+        if (priv->helper_fw) {
+                release_firmware(priv->helper_fw);
+                priv->helper_fw = NULL;
+        }
+
+next:
+        if (!iter->helper) {
+                /* End of table hit. */
+                lbs_fw_loaded(priv, -ENOENT, NULL, NULL);
+                return;
+        }
+
+        if (iter->model != priv->fw_model) {
+                iter++;
+                goto next;
+        }
+
+        priv->fw_iter = iter;
+        do_load_firmware(priv, iter->helper, helper_firmware_cb);
+}
+
+void lbs_wait_for_firmware_load(struct lbs_private *priv)
+{
+        wait_event(priv->fw_waitq, priv->fw_callback == NULL);
+}
+
+/**
+ *  lbs_get_firmware_async - Retrieves firmware asynchronously. Can load
+ *  either a helper firmware and a main firmware (2-stage), or just the helper.
+ *
+ *  @priv:      Pointer to lbs_private instance
+ *  @dev:       A pointer to &device structure
+ *  @card_model: Bus-specific card model ID used to filter firmware table
+ *              elements
+ *  @fw_table:  Table of firmware file names and device model numbers
+ *              terminated by an entry with a NULL helper name
+ *      @callback: User callback to invoke when firmware load succeeds or fails.
+ */
+int lbs_get_firmware_async(struct lbs_private *priv, struct device *device,
+                            u32 card_model, const struct lbs_fw_table *fw_table,
+                            lbs_fw_cb callback)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->driver_lock, flags);
+        if (priv->fw_callback) {
+                lbs_deb_fw("firmware load already in progress\n");
+                spin_unlock_irqrestore(&priv->driver_lock, flags);
+                return -EBUSY;
+        }
+
+        priv->fw_device = device;
+        priv->fw_callback = callback;
+        priv->fw_table = fw_table;
+        priv->fw_iter = NULL;
+        priv->fw_model = card_model;
+        spin_unlock_irqrestore(&priv->driver_lock, flags);
+
+        lbs_deb_fw("Starting async firmware load\n");
+        load_next_firmware_from_table(priv);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(lbs_get_firmware_async);
+
+/**
+ *  lbs_get_firmware - Retrieves two-stage firmware
+ *
+ *  @dev:       A pointer to &device structure
+ *  @card_model: Bus-specific card model ID used to filter firmware table
+ *              elements
+ *  @fw_table:  Table of firmware file names and device model numbers
+ *              terminated by an entry with a NULL helper name
+ *  @helper:    On success, the helper firmware; caller must free
+ *  @mainfw:    On success, the main firmware; caller must free
+ *
+ * Deprecated: use lbs_get_firmware_async() instead.
+ *
+ *  returns:            0 on success, non-zero on failure
+ */
+int lbs_get_firmware(struct device *dev, u32 card_model,
+                        const struct lbs_fw_table *fw_table,
+                        const struct firmware **helper,
+                        const struct firmware **mainfw)
+{
+        const struct lbs_fw_table *iter;
+        int ret;
+
+        BUG_ON(helper == NULL);
+        BUG_ON(mainfw == NULL);
+
+        /* Search for firmware to use from the table. */
+        iter = fw_table;
+        while (iter && iter->helper) {
+                if (iter->model != card_model)
+                        goto next;
+
+                if (*helper == NULL) {
+                        ret = request_firmware(helper, iter->helper, dev);
+                        if (ret)
+                                goto next;
+
+                        /* If the device has one-stage firmware (ie cf8305) and
+                         * we've got it then we don't need to bother with the
+                         * main firmware.
+                         */
+                        if (iter->fwname == NULL)
+                                return 0;
+                }
+
+                if (*mainfw == NULL) {
+                        ret = request_firmware(mainfw, iter->fwname, dev);
+                        if (ret) {
+                                /* Clear the helper to ensure we don't have
+                                 * mismatched firmware pairs.
+                                 */
+                                release_firmware(*helper);
+                                *helper = NULL;
+                        }
+                }
+
+                if (*helper && *mainfw)
+                        return 0;
+
+  next:
+                iter++;
+        }
+
+        /* Failed */
+        release_firmware(*helper);
+        *helper = NULL;
+        release_firmware(*mainfw);
+        *mainfw = NULL;
+
+        return -ENOENT;
+}
+EXPORT_SYMBOL_GPL(lbs_get_firmware);
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index 234ee88dec95..16beaf39dc53 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -738,6 +738,50 @@ done:
         return ret;
 }
 
+static void if_cs_prog_firmware(struct lbs_private *priv, int ret,
+                                 const struct firmware *helper,
+                                 const struct firmware *mainfw)
+{
+        struct if_cs_card *card = priv->card;
+
+        if (ret) {
+                pr_err("failed to find firmware (%d)\n", ret);
+                return;
+        }
+
+        /* Load the firmware */
+        ret = if_cs_prog_helper(card, helper);
+        if (ret == 0 && (card->model != MODEL_8305))
+                ret = if_cs_prog_real(card, mainfw);
+        if (ret)
+                goto out;
+
+        /* Now actually get the IRQ */
+        ret = request_irq(card->p_dev->irq, if_cs_interrupt,
+                IRQF_SHARED, DRV_NAME, card);
+        if (ret) {
+                pr_err("error in request_irq\n");
+                goto out;
+        }
+
+        /*
+         * Clear any interrupt cause that happened while sending
+         * firmware/initializing card
+         */
+        if_cs_write16(card, IF_CS_CARD_INT_CAUSE, IF_CS_BIT_MASK);
+        if_cs_enable_ints(card);
+
+        /* And finally bring the card up */
+        priv->fw_ready = 1;
+        if (lbs_start_card(priv) != 0) {
+                pr_err("could not activate card\n");
+                free_irq(card->p_dev->irq, card);
+        }
+
+out:
+        release_firmware(helper);
+        release_firmware(mainfw);
+}
 
 
 /********************************************************************/
@@ -809,8 +853,6 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
         unsigned int prod_id;
         struct lbs_private *priv;
         struct if_cs_card *card;
-        const struct firmware *helper = NULL;
-        const struct firmware *mainfw = NULL;
 
         lbs_deb_enter(LBS_DEB_CS);
 
@@ -890,20 +932,6 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
                 goto out2;
         }
 
-        ret = lbs_get_firmware(&p_dev->dev, NULL, NULL, card->model,
-                                &fw_table[0], &helper, &mainfw);
-        if (ret) {
-                pr_err("failed to find firmware (%d)\n", ret);
-                goto out2;
-        }
-
-        /* Load the firmware early, before calling into libertas.ko */
-        ret = if_cs_prog_helper(card, helper);
-        if (ret == 0 && (card->model != MODEL_8305))
-                ret = if_cs_prog_real(card, mainfw);
-        if (ret)
-                goto out2;
-
         /* Make this card known to the libertas driver */
         priv = lbs_add_card(card, &p_dev->dev);
         if (!priv) {
@@ -911,37 +939,22 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
                 goto out2;
         }
 
-        /* Finish setting up fields in lbs_private */
+        /* Set up fields in lbs_private */
         card->priv = priv;
         priv->card = card;
         priv->hw_host_to_card = if_cs_host_to_card;
         priv->enter_deep_sleep = NULL;
         priv->exit_deep_sleep = NULL;
         priv->reset_deep_sleep_wakeup = NULL;
-        priv->fw_ready = 1;
 
-        /* Now actually get the IRQ */
-        ret = request_irq(p_dev->irq, if_cs_interrupt,
-                IRQF_SHARED, DRV_NAME, card);
+        /* Get firmware */
+        ret = lbs_get_firmware_async(priv, &p_dev->dev, card->model, fw_table,
+                                     if_cs_prog_firmware);
         if (ret) {
-                pr_err("error in request_irq\n");
-                goto out3;
-        }
-
-        /*
-         * Clear any interrupt cause that happened while sending
-         * firmware/initializing card
-         */
-        if_cs_write16(card, IF_CS_CARD_INT_CAUSE, IF_CS_BIT_MASK);
-        if_cs_enable_ints(card);
-
-        /* And finally bring the card up */
-        if (lbs_start_card(priv) != 0) {
-                pr_err("could not activate card\n");
+                pr_err("failed to find firmware (%d)\n", ret);
                 goto out3;
         }
 
-        ret = 0;
         goto out;
 
 out3:
@@ -951,11 +964,6 @@ out2:
 out1:
         pcmcia_disable_device(p_dev);
 out:
-        if (helper)
-                release_firmware(helper);
-        if (mainfw)
-                release_firmware(mainfw);
-
         lbs_deb_leave_args(LBS_DEB_CS, "ret %d", ret);
         return ret;
 }
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index 9804ebc892d4..76caebaa4397 100644
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -65,12 +65,6 @@ static void if_sdio_interrupt(struct sdio_func *func);
  */
 static u8 user_rmmod;
 
-static char *lbs_helper_name = NULL;
-module_param_named(helper_name, lbs_helper_name, charp, 0644);
-
-static char *lbs_fw_name = NULL;
-module_param_named(fw_name, lbs_fw_name, charp, 0644);
-
 static const struct sdio_device_id if_sdio_ids[] = {
         { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL,
                         SDIO_DEVICE_ID_MARVELL_LIBERTAS) },
@@ -123,11 +117,8 @@ struct if_sdio_card {
         int                     model;
         unsigned long           ioport;
         unsigned int            scratch_reg;
-
-        const char              *helper;
-        const char              *firmware;
-        bool                    helper_allocated;
-        bool                    firmware_allocated;
+        bool                    started;
+        wait_queue_head_t       pwron_waitq;
 
         u8                      buffer[65536] __attribute__((aligned(4)));
 
@@ -140,6 +131,9 @@ struct if_sdio_card {
         u8                      rx_unit;
 };
 
+static void if_sdio_finish_power_on(struct if_sdio_card *card);
+static int if_sdio_power_off(struct if_sdio_card *card);
+
 /********************************************************************/
 /* I/O                                                              */
 /********************************************************************/
@@ -680,12 +674,39 @@ out:
         return ret;
 }
 
+static void if_sdio_do_prog_firmware(struct lbs_private *priv, int ret,
+                                     const struct firmware *helper,
+                                     const struct firmware *mainfw)
+{
+        struct if_sdio_card *card = priv->card;
+
+        if (ret) {
+                pr_err("failed to find firmware (%d)\n", ret);
+                return;
+        }
+
+        ret = if_sdio_prog_helper(card, helper);
+        if (ret)
+                goto out;
+
+        lbs_deb_sdio("Helper firmware loaded\n");
+
+        ret = if_sdio_prog_real(card, mainfw);
+        if (ret)
+                goto out;
+
+        lbs_deb_sdio("Firmware loaded\n");
+        if_sdio_finish_power_on(card);
+
+out:
+        release_firmware(helper);
+        release_firmware(mainfw);
+}
+
 static int if_sdio_prog_firmware(struct if_sdio_card *card)
 {
         int ret;
         u16 scratch;
-        const struct firmware *helper = NULL;
-        const struct firmware *mainfw = NULL;
 
         lbs_deb_enter(LBS_DEB_SDIO);
 
@@ -719,43 +740,18 @@ static int if_sdio_prog_firmware(struct if_sdio_card *card)
          */
         if (scratch == IF_SDIO_FIRMWARE_OK) {
                 lbs_deb_sdio("firmware already loaded\n");
-                goto success;
+                if_sdio_finish_power_on(card);
+                return 0;
         } else if ((card->model == MODEL_8686) && (scratch & 0x7fff)) {
                 lbs_deb_sdio("firmware may be running\n");
-                goto success;
-        }
-
-        ret = lbs_get_firmware(&card->func->dev, lbs_helper_name, lbs_fw_name,
-                                card->model, &fw_table[0], &helper, &mainfw);
-        if (ret) {
-                pr_err("failed to find firmware (%d)\n", ret);
-                goto out;
+                if_sdio_finish_power_on(card);
+                return 0;
         }
 
-        ret = if_sdio_prog_helper(card, helper);
-        if (ret)
-                goto out;
-
-        lbs_deb_sdio("Helper firmware loaded\n");
-
-        ret = if_sdio_prog_real(card, mainfw);
-        if (ret)
-                goto out;
-
-        lbs_deb_sdio("Firmware loaded\n");
-
-success:
-        sdio_claim_host(card->func);
-        sdio_set_block_size(card->func, IF_SDIO_BLOCK_SIZE);
-        sdio_release_host(card->func);
-        ret = 0;
+        ret = lbs_get_firmware_async(card->priv, &card->func->dev, card->model,
+                                     fw_table, if_sdio_do_prog_firmware);
 
 out:
-        if (helper)
-                release_firmware(helper);
-        if (mainfw)
-                release_firmware(mainfw);
-
         lbs_deb_leave_args(LBS_DEB_SDIO, "ret %d", ret);
         return ret;
 }
@@ -764,55 +760,15 @@ out:
 /* Power management                                                 */
 /********************************************************************/
 
-static int if_sdio_power_on(struct if_sdio_card *card)
+/* Finish power on sequence (after firmware is loaded) */
+static void if_sdio_finish_power_on(struct if_sdio_card *card)
 {
         struct sdio_func *func = card->func;
         struct lbs_private *priv = card->priv;
-        struct mmc_host *host = func->card->host;
         int ret;
 
         sdio_claim_host(func);
-
-        ret = sdio_enable_func(func);
-        if (ret)
-                goto release;
-
-        /* For 1-bit transfers to the 8686 model, we need to enable the
-         * interrupt flag in the CCCR register. Set the MMC_QUIRK_LENIENT_FN0
-         * bit to allow access to non-vendor registers. */
-        if ((card->model == MODEL_8686) &&
-            (host->caps & MMC_CAP_SDIO_IRQ) &&
-            (host->ios.bus_width == MMC_BUS_WIDTH_1)) {
-                u8 reg;
-
-                func->card->quirks |= MMC_QUIRK_LENIENT_FN0;
-                reg = sdio_f0_readb(func, SDIO_CCCR_IF, &ret);
-                if (ret)
-                        goto disable;
-
-                reg |= SDIO_BUS_ECSI;
-                sdio_f0_writeb(func, reg, SDIO_CCCR_IF, &ret);
-                if (ret)
-                        goto disable;
-        }
-
-        card->ioport = sdio_readb(func, IF_SDIO_IOPORT, &ret);
-        if (ret)
-                goto disable;
-
-        card->ioport |= sdio_readb(func, IF_SDIO_IOPORT + 1, &ret) << 8;
-        if (ret)
-                goto disable;
-
-        card->ioport |= sdio_readb(func, IF_SDIO_IOPORT + 2, &ret) << 16;
-        if (ret)
-                goto disable;
-
-        sdio_release_host(func);
-        ret = if_sdio_prog_firmware(card);
-        sdio_claim_host(func);
-        if (ret)
-                goto disable;
+        sdio_set_block_size(card->func, IF_SDIO_BLOCK_SIZE);
 
         /*
          * Get rx_unit if the chip is SD8688 or newer.
@@ -837,7 +793,7 @@ static int if_sdio_power_on(struct if_sdio_card *card)
          */
         ret = sdio_claim_irq(func, if_sdio_interrupt);
         if (ret)
-                goto disable;
+                goto release;
 
         /*
          * Enable interrupts now that everything is set up
@@ -863,11 +819,79 @@ static int if_sdio_power_on(struct if_sdio_card *card)
         }
 
         priv->fw_ready = 1;
+        wake_up(&card->pwron_waitq);
 
-        return 0;
+        if (!card->started) {
+                ret = lbs_start_card(priv);
+                if_sdio_power_off(card);
+                if (ret == 0) {
+                        card->started = true;
+                        /* Tell PM core that we don't need the card to be
+                         * powered now */
+                        pm_runtime_put_noidle(&func->dev);
+                }
+        }
+
+        return;
 
 release_irq:
         sdio_release_irq(func);
+release:
+        sdio_release_host(func);
+}
+
+static int if_sdio_power_on(struct if_sdio_card *card)
+{
+        struct sdio_func *func = card->func;
+        struct mmc_host *host = func->card->host;
+        int ret;
+
+        sdio_claim_host(func);
+
+        ret = sdio_enable_func(func);
+        if (ret)
+                goto release;
+
+        /* For 1-bit transfers to the 8686 model, we need to enable the
+         * interrupt flag in the CCCR register. Set the MMC_QUIRK_LENIENT_FN0
+         * bit to allow access to non-vendor registers. */
+        if ((card->model == MODEL_8686) &&
+            (host->caps & MMC_CAP_SDIO_IRQ) &&
+            (host->ios.bus_width == MMC_BUS_WIDTH_1)) {
+                u8 reg;
+
+                func->card->quirks |= MMC_QUIRK_LENIENT_FN0;
+                reg = sdio_f0_readb(func, SDIO_CCCR_IF, &ret);
+                if (ret)
+                        goto disable;
+
+                reg |= SDIO_BUS_ECSI;
+                sdio_f0_writeb(func, reg, SDIO_CCCR_IF, &ret);
+                if (ret)
+                        goto disable;
+        }
+
+        card->ioport = sdio_readb(func, IF_SDIO_IOPORT, &ret);
+        if (ret)
+                goto disable;
+
+        card->ioport |= sdio_readb(func, IF_SDIO_IOPORT + 1, &ret) << 8;
+        if (ret)
+                goto disable;
+
+        card->ioport |= sdio_readb(func, IF_SDIO_IOPORT + 2, &ret) << 16;
+        if (ret)
+                goto disable;
+
+        sdio_release_host(func);
+        ret = if_sdio_prog_firmware(card);
+        if (ret) {
+                sdio_disable_func(func);
+                return ret;
+        }
+
+        return 0;
+
 disable:
         sdio_disable_func(func);
 release:
@@ -1074,11 +1098,17 @@ static int if_sdio_power_save(struct lbs_private *priv)
 static int if_sdio_power_restore(struct lbs_private *priv)
 {
         struct if_sdio_card *card = priv->card;
+        int r;
 
         /* Make sure the card will not be powered off by runtime PM */
         pm_runtime_get_sync(&card->func->dev);
 
-        return if_sdio_power_on(card);
+        r = if_sdio_power_on(card);
+        if (r)
+                return r;
+
+        wait_event(card->pwron_waitq, priv->fw_ready);
+        return 0;
 }
 
 
@@ -1179,6 +1209,7 @@ static int if_sdio_probe(struct sdio_func *func,
         spin_lock_init(&card->lock);
         card->workqueue = create_workqueue("libertas_sdio");
         INIT_WORK(&card->packet_worker, if_sdio_host_to_card_worker);
+        init_waitqueue_head(&card->pwron_waitq);
 
         /* Check if we support this card */
         for (i = 0; i < ARRAY_SIZE(fw_table); i++) {
@@ -1220,14 +1251,6 @@ static int if_sdio_probe(struct sdio_func *func,
         if (ret)
                 goto err_activate_card;
 
-        ret = lbs_start_card(priv);
-        if_sdio_power_off(card);
-        if (ret)
-                goto err_activate_card;
-
-        /* Tell PM core that we don't need the card to be powered now */
-        pm_runtime_put_noidle(&func->dev);
-
 out:
         lbs_deb_leave_args(LBS_DEB_SDIO, "ret %d", ret);
 
@@ -1244,10 +1267,6 @@ free:
                 kfree(packet);
         }
 
-        if (card->helper_allocated)
-                kfree(card->helper);
-        if (card->firmware_allocated)
-                kfree(card->firmware);
         kfree(card);
 
         goto out;
@@ -1295,12 +1314,6 @@ static void if_sdio_remove(struct sdio_func *func)
                 kfree(packet);
         }
 
-        if (card->helper_allocated)
-                kfree(card->helper);
-        if (card->firmware_allocated)
-                kfree(card->firmware);
-        kfree(card);
-
         lbs_deb_leave(LBS_DEB_SDIO);
 }
 
diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
index 50b1ee7721e9..9604a1c4a74d 100644
--- a/drivers/net/wireless/libertas/if_spi.c
+++ b/drivers/net/wireless/libertas/if_spi.c
@@ -1064,9 +1064,8 @@ static int if_spi_init_card(struct if_spi_card *card)
                         goto out;
                 }
 
-                err = lbs_get_firmware(&card->spi->dev, NULL, NULL,
-                                        card->card_id, &fw_table[0], &helper,
-                                        &mainfw);
+                err = lbs_get_firmware(&card->spi->dev, card->card_id,
+                                        &fw_table[0], &helper, &mainfw);
                 if (err) {
                         netdev_err(priv->dev, "failed to find firmware (%d)\n",
                                    err);
@@ -1095,10 +1094,8 @@ static int if_spi_init_card(struct if_spi_card *card)
                 goto out;
 
 out:
-        if (helper)
-                release_firmware(helper);
-        if (mainfw)
-                release_firmware(mainfw);
+        release_firmware(helper);
+        release_firmware(mainfw);
 
         lbs_deb_leave_args(LBS_DEB_SPI, "err %d\n", err);
 
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 74da5f1ea243..75403e6e3990 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -29,9 +29,6 @@
 
 #define MESSAGE_HEADER_LEN      4
 
-static char *lbs_fw_name = NULL;
-module_param_named(fw_name, lbs_fw_name, charp, 0644);
-
 MODULE_FIRMWARE("libertas/usb8388_v9.bin");
 MODULE_FIRMWARE("libertas/usb8388_v5.bin");
 MODULE_FIRMWARE("libertas/usb8388.bin");
@@ -44,6 +41,16 @@ enum {
         MODEL_8682 = 0x2
 };
 
+/* table of firmware file names */
+static const struct lbs_fw_table fw_table[] = {
+        { MODEL_8388, "libertas/usb8388_olpc.bin", NULL },
+        { MODEL_8388, "libertas/usb8388_v9.bin", NULL },
+        { MODEL_8388, "libertas/usb8388_v5.bin", NULL },
+        { MODEL_8388, "libertas/usb8388.bin", NULL },
+        { MODEL_8388, "usb8388.bin", NULL },
+        { MODEL_8682, "libertas/usb8682.bin", NULL }
+};
+
 static struct usb_device_id if_usb_table[] = {
         /* Enter the device signature inside */
         { USB_DEVICE(0x1286, 0x2001), .driver_info = MODEL_8388 },
@@ -55,10 +62,9 @@ MODULE_DEVICE_TABLE(usb, if_usb_table);
 
 static void if_usb_receive(struct urb *urb);
 static void if_usb_receive_fwload(struct urb *urb);
-static int __if_usb_prog_firmware(struct if_usb_card *cardp,
-                                        const char *fwname, int cmd);
-static int if_usb_prog_firmware(struct if_usb_card *cardp,
-                                        const char *fwname, int cmd);
+static void if_usb_prog_firmware(struct lbs_private *priv, int ret,
+                                 const struct firmware *fw,
+                                 const struct firmware *unused);
 static int if_usb_host_to_card(struct lbs_private *priv, uint8_t type,
                                uint8_t *payload, uint16_t nb);
 static int usb_tx_block(struct if_usb_card *cardp, uint8_t *payload,
@@ -67,69 +73,6 @@ static void if_usb_free(struct if_usb_card *cardp);
 static int if_usb_submit_rx_urb(struct if_usb_card *cardp);
 static int if_usb_reset_device(struct if_usb_card *cardp);
 
-/* sysfs hooks */
-
-/*
- *  Set function to write firmware to device's persistent memory
- */
-static ssize_t if_usb_firmware_set(struct device *dev,
-                struct device_attribute *attr, const char *buf, size_t count)
-{
-        struct lbs_private *priv = to_net_dev(dev)->ml_priv;
-        struct if_usb_card *cardp = priv->card;
-        int ret;
-
-        BUG_ON(buf == NULL);
-
-        ret = if_usb_prog_firmware(cardp, buf, BOOT_CMD_UPDATE_FW);
-        if (ret == 0)
-                return count;
-
-        return ret;
-}
-
-/*
- * lbs_flash_fw attribute to be exported per ethX interface through sysfs
- * (/sys/class/net/ethX/lbs_flash_fw).  Use this like so to write firmware to
- * the device's persistent memory:
- * echo usb8388-5.126.0.p5.bin > /sys/class/net/ethX/lbs_flash_fw
- */
-static DEVICE_ATTR(lbs_flash_fw, 0200, NULL, if_usb_firmware_set);
-
-/**
- * if_usb_boot2_set - write firmware to device's persistent memory
- *
- * @dev: target device
- * @attr: device attributes
- * @buf: firmware buffer to write
- * @count: number of bytes to write
- *
- * returns: number of bytes written or negative error code
- */
-static ssize_t if_usb_boot2_set(struct device *dev,
-                struct device_attribute *attr, const char *buf, size_t count)
-{
-        struct lbs_private *priv = to_net_dev(dev)->ml_priv;
-        struct if_usb_card *cardp = priv->card;
-        int ret;
-
-        BUG_ON(buf == NULL);
-
-        ret = if_usb_prog_firmware(cardp, buf, BOOT_CMD_UPDATE_BOOT2);
-        if (ret == 0)
-                return count;
-
-        return ret;
-}
-
-/*
- * lbs_flash_boot2 attribute to be exported per ethX interface through sysfs
- * (/sys/class/net/ethX/lbs_flash_boot2).  Use this like so to write firmware
- * to the device's persistent memory:
- * echo usb8388-5.126.0.p5.bin > /sys/class/net/ethX/lbs_flash_boot2
- */
-static DEVICE_ATTR(lbs_flash_boot2, 0200, NULL, if_usb_boot2_set);
-
 /**
  * if_usb_write_bulk_callback - callback function to handle the status
  * of the URB
@@ -256,6 +199,7 @@ static int if_usb_probe(struct usb_interface *intf,
         struct usb_endpoint_descriptor *endpoint;
         struct lbs_private *priv;
         struct if_usb_card *cardp;
+        int r = -ENOMEM;
         int i;
 
         udev = interface_to_usbdev(intf);
@@ -313,20 +257,10 @@ static int if_usb_probe(struct usb_interface *intf,
                 goto dealloc;
         }
 
-        /* Upload firmware */
-        kparam_block_sysfs_write(fw_name);
-        if (__if_usb_prog_firmware(cardp, lbs_fw_name, BOOT_CMD_FW_BY_USB)) {
-                kparam_unblock_sysfs_write(fw_name);
-                lbs_deb_usbd(&udev->dev, "FW upload failed\n");
-                goto err_prog_firmware;
-        }
-        kparam_unblock_sysfs_write(fw_name);
-
         if (!(priv = lbs_add_card(cardp, &intf->dev)))
-                goto err_prog_firmware;
+                goto err_add_card;
 
         cardp->priv = priv;
-        cardp->priv->fw_ready = 1;
 
         priv->hw_host_to_card = if_usb_host_to_card;
         priv->enter_deep_sleep = NULL;
@@ -339,42 +273,25 @@ static int if_usb_probe(struct usb_interface *intf,
 
         cardp->boot2_version = udev->descriptor.bcdDevice;
 
-        if_usb_submit_rx_urb(cardp);
-
-        if (lbs_start_card(priv))
-                goto err_start_card;
-
-        if_usb_setup_firmware(priv);
-
         usb_get_dev(udev);
         usb_set_intfdata(intf, cardp);
 
-        if (device_create_file(&priv->dev->dev, &dev_attr_lbs_flash_fw))
-                netdev_err(priv->dev,
-                           "cannot register lbs_flash_fw attribute\n");
-
-        if (device_create_file(&priv->dev->dev, &dev_attr_lbs_flash_boot2))
-                netdev_err(priv->dev,
-                           "cannot register lbs_flash_boot2 attribute\n");
-
-        /*
-         * EHS_REMOVE_WAKEUP is not supported on all versions of the firmware.
-         */
-        priv->wol_criteria = EHS_REMOVE_WAKEUP;
-        if (lbs_host_sleep_cfg(priv, priv->wol_criteria, NULL))
-                priv->ehs_remove_supported = false;
+        r = lbs_get_firmware_async(priv, &udev->dev, cardp->model,
+                                   fw_table, if_usb_prog_firmware);
+        if (r)
+                goto err_get_fw;
 
         return 0;
 
-err_start_card:
+err_get_fw:
         lbs_remove_card(priv);
-err_prog_firmware:
+err_add_card:
         if_usb_reset_device(cardp);
 dealloc:
         if_usb_free(cardp);
 
 error:
-        return -ENOMEM;
+        return r;
 }
 
 /**
@@ -389,9 +306,6 @@ static void if_usb_disconnect(struct usb_interface *intf)
 
         lbs_deb_enter(LBS_DEB_MAIN);
 
-        device_remove_file(&priv->dev->dev, &dev_attr_lbs_flash_boot2);
-        device_remove_file(&priv->dev->dev, &dev_attr_lbs_flash_fw);
-
         cardp->surprise_removed = 1;
 
         if (priv) {
@@ -912,121 +826,22 @@ static int check_fwfile_format(const uint8_t *data, uint32_t totlen)
         return ret;
 }
 
-
-/**
-*  if_usb_prog_firmware - programs the firmware subject to cmd
-*
-*  @cardp:      the if_usb_card descriptor
-*  @fwname:     firmware or boot2 image file name
-*  @cmd:        either BOOT_CMD_FW_BY_USB, BOOT_CMD_UPDATE_FW,
-*               or BOOT_CMD_UPDATE_BOOT2.
-*  returns:     0 or error code
-*/
-static int if_usb_prog_firmware(struct if_usb_card *cardp,
-                                const char *fwname, int cmd)
-{
-        struct lbs_private *priv = cardp->priv;
-        unsigned long flags, caps;
-        int ret;
-
-        caps = priv->fwcapinfo;
-        if (((cmd == BOOT_CMD_UPDATE_FW) && !(caps & FW_CAPINFO_FIRMWARE_UPGRADE)) ||
-            ((cmd == BOOT_CMD_UPDATE_BOOT2) && !(caps & FW_CAPINFO_BOOT2_UPGRADE)))
-                return -EOPNOTSUPP;
-
-        /* Ensure main thread is idle. */
-        spin_lock_irqsave(&priv->driver_lock, flags);
-        while (priv->cur_cmd != NULL || priv->dnld_sent != DNLD_RES_RECEIVED) {
-                spin_unlock_irqrestore(&priv->driver_lock, flags);
-                if (wait_event_interruptible(priv->waitq,
-                                (priv->cur_cmd == NULL &&
-                                priv->dnld_sent == DNLD_RES_RECEIVED))) {
-                        return -ERESTARTSYS;
-                }
-                spin_lock_irqsave(&priv->driver_lock, flags);
-        }
-        priv->dnld_sent = DNLD_BOOTCMD_SENT;
-        spin_unlock_irqrestore(&priv->driver_lock, flags);
-
-        ret = __if_usb_prog_firmware(cardp, fwname, cmd);
-
-        spin_lock_irqsave(&priv->driver_lock, flags);
-        priv->dnld_sent = DNLD_RES_RECEIVED;
-        spin_unlock_irqrestore(&priv->driver_lock, flags);
-
-        wake_up(&priv->waitq);
-
-        return ret;
-}
-
-/* table of firmware file names */
-static const struct {
-        u32 model;
-        const char *fwname;
-} fw_table[] = {
-        { MODEL_8388, "libertas/usb8388_v9.bin" },
-        { MODEL_8388, "libertas/usb8388_v5.bin" },
-        { MODEL_8388, "libertas/usb8388.bin" },
-        { MODEL_8388, "usb8388.bin" },
-        { MODEL_8682, "libertas/usb8682.bin" }
-};
-
-#ifdef CONFIG_OLPC
-
-static int try_olpc_fw(struct if_usb_card *cardp)
-{
-        int retval = -ENOENT;
-
-        /* try the OLPC firmware first; fall back to fw_table list */
-        if (machine_is_olpc() && cardp->model == MODEL_8388)
-                retval = request_firmware(&cardp->fw,
-                                "libertas/usb8388_olpc.bin", &cardp->udev->dev);
-        return retval;
-}
-
-#else
-static int try_olpc_fw(struct if_usb_card *cardp) { return -ENOENT; }
-#endif /* !CONFIG_OLPC */
-
-static int get_fw(struct if_usb_card *cardp, const char *fwname)
-{
-        int i;
-
-        /* Try user-specified firmware first */
-        if (fwname)
-                return request_firmware(&cardp->fw, fwname, &cardp->udev->dev);
-
-        /* Handle OLPC firmware */
-        if (try_olpc_fw(cardp) == 0)
-                return 0;
-
-        /* Otherwise search for firmware to use */
-        for (i = 0; i < ARRAY_SIZE(fw_table); i++) {
-                if (fw_table[i].model != cardp->model)
-                        continue;
-                if (request_firmware(&cardp->fw, fw_table[i].fwname,
-                                        &cardp->udev->dev) == 0)
-                        return 0;
-        }
-
-        return -ENOENT;
-}
-
-static int __if_usb_prog_firmware(struct if_usb_card *cardp,
-                                        const char *fwname, int cmd)
+static void if_usb_prog_firmware(struct lbs_private *priv, int ret,
+                                 const struct firmware *fw,
+                                 const struct firmware *unused)
 {
+        struct if_usb_card *cardp = priv->card;
         int i = 0;
         static int reset_count = 10;
-        int ret = 0;
 
         lbs_deb_enter(LBS_DEB_USB);
 
-        ret = get_fw(cardp, fwname);
         if (ret) {
                 pr_err("failed to find firmware (%d)\n", ret);
                 goto done;
         }
 
+        cardp->fw = fw;
         if (check_fwfile_format(cardp->fw->data, cardp->fw->size)) {
                 ret = -EINVAL;
                 goto release_fw;
@@ -1053,7 +868,7 @@ restart:
         do {
                 int j = 0;
                 i++;
-                if_usb_issue_boot_command(cardp, cmd);
+                if_usb_issue_boot_command(cardp, BOOT_CMD_FW_BY_USB);
                 /* wait for command response */
                 do {
                         j++;
@@ -1109,13 +924,27 @@ restart:
                 goto release_fw;
         }
 
+        cardp->priv->fw_ready = 1;
+        if_usb_submit_rx_urb(cardp);
+
+        if (lbs_start_card(priv))
+                goto release_fw;
+
+        if_usb_setup_firmware(priv);
+
+        /*
+         * EHS_REMOVE_WAKEUP is not supported on all versions of the firmware.
+         */
+        priv->wol_criteria = EHS_REMOVE_WAKEUP;
+        if (lbs_host_sleep_cfg(priv, priv->wol_criteria, NULL))
+                priv->ehs_remove_supported = false;
+
  release_fw:
         release_firmware(cardp->fw);
         cardp->fw = NULL;
 
  done:
-        lbs_deb_leave_args(LBS_DEB_USB, "ret %d", ret);
-        return ret;
+        lbs_deb_leave(LBS_DEB_USB);
 }
 
 
@@ -1128,8 +957,10 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
 
         lbs_deb_enter(LBS_DEB_USB);
 
-        if (priv->psstate != PS_STATE_FULL_POWER)
-                return -1;
+        if (priv->psstate != PS_STATE_FULL_POWER) {
+                ret = -1;
+                goto out;
+        }
 
 #ifdef CONFIG_OLPC
         if (machine_is_olpc()) {
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 957681dede17..e96ee0aa8439 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -878,6 +878,7 @@ static int lbs_init_adapter(struct lbs_private *priv)
         priv->is_host_sleep_configured = 0;
         priv->is_host_sleep_activated = 0;
         init_waitqueue_head(&priv->host_sleep_q);
+        init_waitqueue_head(&priv->fw_waitq);
         mutex_init(&priv->lock);
 
         setup_timer(&priv->command_timer, lbs_cmd_timeout_handler,
@@ -1033,7 +1034,11 @@ void lbs_remove_card(struct lbs_private *priv)
         lbs_deb_enter(LBS_DEB_MAIN);
 
         lbs_remove_mesh(priv);
-        lbs_scan_deinit(priv);
+
+        if (priv->wiphy_registered)
+                lbs_scan_deinit(priv);
+
+        lbs_wait_for_firmware_load(priv);
 
         /* worker thread destruction blocks on the in-flight command which
          * should have been cleared already in lbs_stop_card().
@@ -1128,6 +1133,11 @@ void lbs_stop_card(struct lbs_private *priv)
                 goto out;
         dev = priv->dev;
 
+        /* If the netdev isn't registered, it means that lbs_start_card() was
+         * never called so we have nothing to do here. */
+        if (dev->reg_state != NETREG_REGISTERED)
+                goto out;
+
         netif_stop_queue(dev);
         netif_carrier_off(dev);
 
@@ -1177,111 +1187,6 @@ void lbs_notify_command_response(struct lbs_private *priv, u8 resp_idx)
 }
 EXPORT_SYMBOL_GPL(lbs_notify_command_response);
 
-/**
- *  lbs_get_firmware - Retrieves two-stage firmware
- *
- *  @dev:       A pointer to &device structure
- *  @user_helper: User-defined helper firmware file
- *  @user_mainfw: User-defined main firmware file
- *  @card_model: Bus-specific card model ID used to filter firmware table
- *              elements
- *  @fw_table:  Table of firmware file names and device model numbers
- *              terminated by an entry with a NULL helper name
- *  @helper:    On success, the helper firmware; caller must free
- *  @mainfw:    On success, the main firmware; caller must free
- *
- *  returns:            0 on success, non-zero on failure
- */
-int lbs_get_firmware(struct device *dev, const char *user_helper,
-                        const char *user_mainfw, u32 card_model,
-                        const struct lbs_fw_table *fw_table,
-                        const struct firmware **helper,
-                        const struct firmware **mainfw)
-{
-        const struct lbs_fw_table *iter;
-        int ret;
-
-        BUG_ON(helper == NULL);
-        BUG_ON(mainfw == NULL);
-
-        /* Try user-specified firmware first */
-        if (user_helper) {
-                ret = request_firmware(helper, user_helper, dev);
-                if (ret) {
-                        dev_err(dev, "couldn't find helper firmware %s\n",
-                                user_helper);
-                        goto fail;
-                }
-        }
-        if (user_mainfw) {
-                ret = request_firmware(mainfw, user_mainfw, dev);
-                if (ret) {
-                        dev_err(dev, "couldn't find main firmware %s\n",
-                                user_mainfw);
-                        goto fail;
-                }
-        }
-
-        if (*helper && *mainfw)
-                return 0;
-
-        /* Otherwise search for firmware to use.  If neither the helper or
-         * the main firmware were specified by the user, then we need to
-         * make sure that found helper & main are from the same entry in
-         * fw_table.
-         */
-        iter = fw_table;
-        while (iter && iter->helper) {
-                if (iter->model != card_model)
-                        goto next;
-
-                if (*helper == NULL) {
-                        ret = request_firmware(helper, iter->helper, dev);
-                        if (ret)
-                                goto next;
-
-                        /* If the device has one-stage firmware (ie cf8305) and
-                         * we've got it then we don't need to bother with the
-                         * main firmware.
-                         */
-                        if (iter->fwname == NULL)
-                                return 0;
-                }
-
-                if (*mainfw == NULL) {
-                        ret = request_firmware(mainfw, iter->fwname, dev);
-                        if (ret && !user_helper) {
-                                /* Clear the helper if it wasn't user-specified
-                                 * and the main firmware load failed, to ensure
-                                 * we don't have mismatched firmware pairs.
-                                 */
-                                release_firmware(*helper);
-                                *helper = NULL;
-                        }
-                }
-
-                if (*helper && *mainfw)
-                        return 0;
-
-  next:
-                iter++;
-        }
-
-  fail:
-        /* Failed */
-        if (*helper) {
-                release_firmware(*helper);
-                *helper = NULL;
-        }
-        if (*mainfw) {
-                release_firmware(*mainfw);
-                *mainfw = NULL;
-        }
-
-        return -ENOENT;
-}
-EXPORT_SYMBOL_GPL(lbs_get_firmware);
-
 static int __init lbs_init_module(void)
 {
         lbs_deb_enter(LBS_DEB_MAIN);
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index b7ce6a6e355f..03c0c6b1372c 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -582,11 +582,13 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
                 goto nla_put_failure;
         }
 
-        NLA_PUT(skb, HWSIM_ATTR_ADDR_TRANSMITTER,
-                     sizeof(struct mac_address), data->addresses[1].addr);
+        if (nla_put(skb, HWSIM_ATTR_ADDR_TRANSMITTER,
+                    sizeof(struct mac_address), data->addresses[1].addr))
+                goto nla_put_failure;
 
         /* We get the skb->data */
-        NLA_PUT(skb, HWSIM_ATTR_FRAME, my_skb->len, my_skb->data);
+        if (nla_put(skb, HWSIM_ATTR_FRAME, my_skb->len, my_skb->data))
+                goto nla_put_failure;
 
         /* We get the flags for this transmission, and we translate them to
            wmediumd flags  */
@@ -597,7 +599,8 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
         if (info->flags & IEEE80211_TX_CTL_NO_ACK)
                 hwsim_flags |= HWSIM_TX_CTL_NO_ACK;
 
-        NLA_PUT_U32(skb, HWSIM_ATTR_FLAGS, hwsim_flags);
+        if (nla_put_u32(skb, HWSIM_ATTR_FLAGS, hwsim_flags))
+                goto nla_put_failure;
 
         /* We get the tx control (rate and retries) info*/
 
@@ -606,12 +609,14 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
                 tx_attempts[i].count = info->status.rates[i].count;
         }
 
-        NLA_PUT(skb, HWSIM_ATTR_TX_INFO,
-                     sizeof(struct hwsim_tx_rate)*IEEE80211_TX_MAX_RATES,
-                     tx_attempts);
+        if (nla_put(skb, HWSIM_ATTR_TX_INFO,
+                    sizeof(struct hwsim_tx_rate)*IEEE80211_TX_MAX_RATES,
+                    tx_attempts))
+                goto nla_put_failure;
 
         /* We create a cookie to identify this skb */
-        NLA_PUT_U64(skb, HWSIM_ATTR_COOKIE, (unsigned long) my_skb);
+        if (nla_put_u64(skb, HWSIM_ATTR_COOKIE, (unsigned long) my_skb))
+                goto nla_put_failure;
 
         genlmsg_end(skb, msg_head);
         genlmsg_unicast(&init_net, skb, dst_pid);
@@ -632,6 +637,7 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw,
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
         struct ieee80211_rx_status rx_status;
+        struct ieee80211_rate *txrate = ieee80211_get_tx_rate(hw, info);
 
         if (data->idle) {
                 wiphy_debug(hw->wiphy, "Trying to TX when idle - reject\n");
@@ -666,6 +672,7 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw,
         spin_lock(&hwsim_radio_lock);
         list_for_each_entry(data2, &hwsim_radios, list) {
                 struct sk_buff *nskb;
+                struct ieee80211_mgmt *mgmt;
 
                 if (data == data2)
                         continue;
@@ -683,8 +690,18 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw,
 
                 if (mac80211_hwsim_addr_match(data2, hdr->addr1))
                         ack = true;
+
+                /* set bcn timestamp relative to receiver mactime */
                 rx_status.mactime =
-                        le64_to_cpu(__mac80211_hwsim_get_tsf(data2));
+                                le64_to_cpu(__mac80211_hwsim_get_tsf(data2));
+                mgmt = (struct ieee80211_mgmt *) nskb->data;
+                if (ieee80211_is_beacon(mgmt->frame_control) ||
+                    ieee80211_is_probe_resp(mgmt->frame_control))
+                        mgmt->u.beacon.timestamp = cpu_to_le64(
+                                rx_status.mactime +
+                                (data->tsf_offset - data2->tsf_offset) +
+                                24 * 8 * 10 / txrate->bitrate);
+
                 memcpy(IEEE80211_SKB_RXCB(nskb), &rx_status, sizeof(rx_status));
                 ieee80211_rx_irqsafe(data2->hw, nskb);
         }
@@ -698,12 +715,6 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
         bool ack;
         struct ieee80211_tx_info *txi;
         u32 _pid;
-        struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *) skb->data;
-        struct mac80211_hwsim_data *data = hw->priv;
-
-        if (ieee80211_is_beacon(mgmt->frame_control) ||
-            ieee80211_is_probe_resp(mgmt->frame_control))
-                mgmt->u.beacon.timestamp = __mac80211_hwsim_get_tsf(data);
 
         mac80211_hwsim_monitor_rx(hw, skb);
 
@@ -800,11 +811,9 @@ static void mac80211_hwsim_beacon_tx(void *arg, u8 *mac,
                                      struct ieee80211_vif *vif)
 {
         struct ieee80211_hw *hw = arg;
-        struct mac80211_hwsim_data *data = hw->priv;
         struct sk_buff *skb;
         struct ieee80211_tx_info *info;
         u32 _pid;
-        struct ieee80211_mgmt *mgmt;
 
         hwsim_check_magic(vif);
 
@@ -818,9 +827,6 @@ static void mac80211_hwsim_beacon_tx(void *arg, u8 *mac,
                 return;
         info = IEEE80211_SKB_CB(skb);
 
-        mgmt = (struct ieee80211_mgmt *) skb->data;
-        mgmt->u.beacon.timestamp = __mac80211_hwsim_get_tsf(data);
-
         mac80211_hwsim_monitor_rx(hw, skb);
 
         /* wmediumd mode check */
@@ -1108,7 +1114,8 @@ static int mac80211_hwsim_testmode_cmd(struct ieee80211_hw *hw,
                                                 nla_total_size(sizeof(u32)));
                 if (!skb)
                         return -ENOMEM;
-                NLA_PUT_U32(skb, HWSIM_TM_ATTR_PS, hwsim->ps);
+                if (nla_put_u32(skb, HWSIM_TM_ATTR_PS, hwsim->ps))
+                        goto nla_put_failure;
                 return cfg80211_testmode_reply(skb);
         default:
                 return -EOPNOTSUPP;
@@ -1444,7 +1451,7 @@ DEFINE_SIMPLE_ATTRIBUTE(hwsim_fops_group,
                         hwsim_fops_group_read, hwsim_fops_group_write,
                         "%llx\n");
 
-struct mac80211_hwsim_data *get_hwsim_data_ref_from_addr(
+static struct mac80211_hwsim_data *get_hwsim_data_ref_from_addr(
                              struct mac_address *addr)
 {
         struct mac80211_hwsim_data *data;
@@ -1789,9 +1796,11 @@ static int __init init_mac80211_hwsim(void)
                             IEEE80211_HW_SIGNAL_DBM |
                             IEEE80211_HW_SUPPORTS_STATIC_SMPS |
                             IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |
-                            IEEE80211_HW_AMPDU_AGGREGATION;
+                            IEEE80211_HW_AMPDU_AGGREGATION |
+                            IEEE80211_HW_WANT_MONITOR_VIF;
 
-                hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS;
+                hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS |
+                                    WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
 
                 /* ask mac80211 to reserve space for magic */
                 hw->vif_data_size = sizeof(struct hwsim_vif_priv);
diff --git a/drivers/net/wireless/mwifiex/11n.c b/drivers/net/wireless/mwifiex/11n.c
index a5e182b5e944..fe8ebfebcc0e 100644
--- a/drivers/net/wireless/mwifiex/11n.c
+++ b/drivers/net/wireless/mwifiex/11n.c
@@ -350,25 +350,26 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,
                 ret_len += sizeof(struct mwifiex_ie_types_htcap);
         }
 
-        if (bss_desc->bcn_ht_info) {
+        if (bss_desc->bcn_ht_oper) {
                 if (priv->bss_mode == NL80211_IFTYPE_ADHOC) {
                         ht_info = (struct mwifiex_ie_types_htinfo *) *buffer;
                         memset(ht_info, 0,
                                sizeof(struct mwifiex_ie_types_htinfo));
                         ht_info->header.type =
-                                        cpu_to_le16(WLAN_EID_HT_INFORMATION);
+                                        cpu_to_le16(WLAN_EID_HT_OPERATION);
                         ht_info->header.len =
-                                cpu_to_le16(sizeof(struct ieee80211_ht_info));
+                                cpu_to_le16(
+                                        sizeof(struct ieee80211_ht_operation));
 
                         memcpy((u8 *) ht_info +
                                sizeof(struct mwifiex_ie_types_header),
-                               (u8 *) bss_desc->bcn_ht_info +
+                               (u8 *) bss_desc->bcn_ht_oper +
                                sizeof(struct ieee_types_header),
                                le16_to_cpu(ht_info->header.len));
 
                         if (!(sband->ht_cap.cap &
                                         IEEE80211_HT_CAP_SUP_WIDTH_20_40))
-                                ht_info->ht_info.ht_param &=
+                                ht_info->ht_oper.ht_param &=
                                         ~(IEEE80211_HT_PARAM_CHAN_WIDTH_ANY |
                                         IEEE80211_HT_PARAM_CHA_SEC_OFFSET);
 
@@ -385,16 +386,16 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,
                         sizeof(struct mwifiex_ie_types_chan_list_param_set) -
                         sizeof(struct mwifiex_ie_types_header));
                 chan_list->chan_scan_param[0].chan_number =
-                        bss_desc->bcn_ht_info->control_chan;
+                        bss_desc->bcn_ht_oper->primary_chan;
                 chan_list->chan_scan_param[0].radio_type =
                         mwifiex_band_to_radio_type((u8) bss_desc->bss_band);
 
                 if (sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 &&
-                    bss_desc->bcn_ht_info->ht_param &
+                    bss_desc->bcn_ht_oper->ht_param &
                     IEEE80211_HT_PARAM_CHAN_WIDTH_ANY)
                         SET_SECONDARYCHAN(chan_list->chan_scan_param[0].
                                           radio_type,
-                                          (bss_desc->bcn_ht_info->ht_param &
+                                          (bss_desc->bcn_ht_oper->ht_param &
                                           IEEE80211_HT_PARAM_CHA_SEC_OFFSET));
 
                 *buffer += sizeof(struct mwifiex_ie_types_chan_list_param_set);
diff --git a/drivers/net/wireless/mwifiex/11n_aggr.c b/drivers/net/wireless/mwifiex/11n_aggr.c
index 9eefb2a0ce9f..ab84eb943749 100644
--- a/drivers/net/wireless/mwifiex/11n_aggr.c
+++ b/drivers/net/wireless/mwifiex/11n_aggr.c
@@ -233,21 +233,27 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
 
         skb_push(skb_aggr, headroom);
 
-        /*
-         * Padding per MSDU will affect the length of next
-         * packet and hence the exact length of next packet
-         * is uncertain here.
-         *
-         * Also, aggregation of transmission buffer, while
-         * downloading the data to the card, wont gain much
-         * on the AMSDU packets as the AMSDU packets utilizes
-         * the transmission buffer space to the maximum
-         * (adapter->tx_buf_size).
-         */
-        tx_param.next_pkt_len = 0;
-
-        ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_DATA,
-                                           skb_aggr, &tx_param);
+        if (adapter->iface_type == MWIFIEX_USB) {
+                adapter->data_sent = true;
+                ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_USB_EP_DATA,
+                                                   skb_aggr, NULL);
+        } else {
+                /*
+                 * Padding per MSDU will affect the length of next
+                 * packet and hence the exact length of next packet
+                 * is uncertain here.
+                 *
+                 * Also, aggregation of transmission buffer, while
+                 * downloading the data to the card, wont gain much
+                 * on the AMSDU packets as the AMSDU packets utilizes
+                 * the transmission buffer space to the maximum
+                 * (adapter->tx_buf_size).
+                 */
+                tx_param.next_pkt_len = 0;
+
+                ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_DATA,
+                                                   skb_aggr, &tx_param);
+        }
         switch (ret) {
         case -EBUSY:
                 spin_lock_irqsave(&priv->wmm.ra_list_spinlock, ra_list_flags);
diff --git a/drivers/net/wireless/mwifiex/Kconfig b/drivers/net/wireless/mwifiex/Kconfig
index 2a078cea830a..8e384fae3e68 100644
--- a/drivers/net/wireless/mwifiex/Kconfig
+++ b/drivers/net/wireless/mwifiex/Kconfig
@@ -10,12 +10,12 @@ config MWIFIEX
           mwifiex.
 
 config MWIFIEX_SDIO
-        tristate "Marvell WiFi-Ex Driver for SD8787/SD8797"
+        tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797"
         depends on MWIFIEX && MMC
         select FW_LOADER
         ---help---
           This adds support for wireless adapters based on Marvell
-          8787/8797 chipsets with SDIO interface.
+          8786/8787/8797 chipsets with SDIO interface.
 
           If you choose to build it as a module, it will be called
           mwifiex_sdio.
@@ -30,3 +30,14 @@ config MWIFIEX_PCIE
 
           If you choose to build it as a module, it will be called
           mwifiex_pcie.
+
+config MWIFIEX_USB
+        tristate "Marvell WiFi-Ex Driver for USB8797"
+        depends on MWIFIEX && USB
+        select FW_LOADER
+        ---help---
+          This adds support for wireless adapters based on Marvell
+          Avastar 88W8797 chipset with USB interface.
+
+          If you choose to build it as a module, it will be called
+          mwifiex_usb.
diff --git a/drivers/net/wireless/mwifiex/Makefile b/drivers/net/wireless/mwifiex/Makefile
index b0257ad1bbed..5c1a46bf1e11 100644
--- a/drivers/net/wireless/mwifiex/Makefile
+++ b/drivers/net/wireless/mwifiex/Makefile
@@ -42,3 +42,6 @@ obj-$(CONFIG_MWIFIEX_SDIO) += mwifiex_sdio.o
 
 mwifiex_pcie-y += pcie.o
 obj-$(CONFIG_MWIFIEX_PCIE) += mwifiex_pcie.o
+
+mwifiex_usb-y += usb.o
+obj-$(CONFIG_MWIFIEX_USB) += mwifiex_usb.o
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 65050384c42b..c78ea873a63a 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -516,25 +516,23 @@ static int
 mwifiex_dump_station_info(struct mwifiex_private *priv,
                           struct station_info *sinfo)
 {
-        struct mwifiex_ds_get_signal signal;
         struct mwifiex_rate_cfg rate;
-        int ret = 0;
 
         sinfo->filled = STATION_INFO_RX_BYTES | STATION_INFO_TX_BYTES |
-                STATION_INFO_RX_PACKETS |
-                STATION_INFO_TX_PACKETS
-                | STATION_INFO_SIGNAL | STATION_INFO_TX_BITRATE;
+                        STATION_INFO_RX_PACKETS | STATION_INFO_TX_PACKETS |
+                        STATION_INFO_TX_BITRATE |
+                        STATION_INFO_SIGNAL | STATION_INFO_SIGNAL_AVG;
 
         /* Get signal information from the firmware */
-        memset(&signal, 0, sizeof(struct mwifiex_ds_get_signal));
-        if (mwifiex_get_signal_info(priv, &signal)) {
-                dev_err(priv->adapter->dev, "getting signal information\n");
-                ret = -EFAULT;
+        if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_RSSI_INFO,
+                                  HostCmd_ACT_GEN_GET, 0, NULL)) {
+                dev_err(priv->adapter->dev, "failed to get signal information\n");
+                return -EFAULT;
         }
 
         if (mwifiex_drv_get_data_rate(priv, &rate)) {
                 dev_err(priv->adapter->dev, "getting data rate\n");
-                ret = -EFAULT;
+                return -EFAULT;
         }
 
         /* Get DTIM period information from firmware */
@@ -557,11 +555,12 @@ mwifiex_dump_station_info(struct mwifiex_private *priv,
                         sinfo->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;
         }
 
+        sinfo->signal_avg = priv->bcn_rssi_avg;
         sinfo->rx_bytes = priv->stats.rx_bytes;
         sinfo->tx_bytes = priv->stats.tx_bytes;
         sinfo->rx_packets = priv->stats.rx_packets;
         sinfo->tx_packets = priv->stats.tx_packets;
-        sinfo->signal = priv->qual_level;
+        sinfo->signal = priv->bcn_rssi_avg;
         /* bit rate is in 500 kb/s units. Convert it to 100kb/s units */
         sinfo->txrate.legacy = rate.rate * 5;
 
@@ -581,7 +580,7 @@ mwifiex_dump_station_info(struct mwifiex_private *priv,
                         priv->curr_bss_params.bss_descriptor.beacon_period;
         }
 
-        return ret;
+        return 0;
 }
 
 /*
@@ -604,6 +603,23 @@ mwifiex_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
         return mwifiex_dump_station_info(priv, sinfo);
 }
 
+/*
+ * CFG802.11 operation handler to dump station information.
+ */
+static int
+mwifiex_cfg80211_dump_station(struct wiphy *wiphy, struct net_device *dev,
+                              int idx, u8 *mac, struct station_info *sinfo)
+{
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+
+        if (!priv->media_connected || idx)
+                return -ENOENT;
+
+        memcpy(mac, priv->cfg_bssid, ETH_ALEN);
+
+        return mwifiex_dump_station_info(priv, sinfo);
+}
+
 /* Supported rates to be advertised to the cfg80211 */
 
 static struct ieee80211_rate mwifiex_rates[] = {
@@ -750,6 +766,45 @@ static int mwifiex_cfg80211_set_bitrate_mask(struct wiphy *wiphy,
 }
 
 /*
+ * CFG802.11 operation handler for connection quality monitoring.
+ *
+ * This function subscribes/unsubscribes HIGH_RSSI and LOW_RSSI
+ * events to FW.
+ */
+static int mwifiex_cfg80211_set_cqm_rssi_config(struct wiphy *wiphy,
+                                                struct net_device *dev,
+                                                s32 rssi_thold, u32 rssi_hyst)
+{
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+        struct mwifiex_ds_misc_subsc_evt subsc_evt;
+
+        priv->cqm_rssi_thold = rssi_thold;
+        priv->cqm_rssi_hyst = rssi_hyst;
+
+        memset(&subsc_evt, 0x00, sizeof(struct mwifiex_ds_misc_subsc_evt));
+        subsc_evt.events = BITMASK_BCN_RSSI_LOW | BITMASK_BCN_RSSI_HIGH;
+
+        /* Subscribe/unsubscribe low and high rssi events */
+        if (rssi_thold && rssi_hyst) {
+                subsc_evt.action = HostCmd_ACT_BITWISE_SET;
+                subsc_evt.bcn_l_rssi_cfg.abs_value = abs(rssi_thold);
+                subsc_evt.bcn_h_rssi_cfg.abs_value = abs(rssi_thold);
+                subsc_evt.bcn_l_rssi_cfg.evt_freq = 1;
+                subsc_evt.bcn_h_rssi_cfg.evt_freq = 1;
+                return mwifiex_send_cmd_sync(priv,
+                                             HostCmd_CMD_802_11_SUBSCRIBE_EVENT,
+                                             0, 0, &subsc_evt);
+        } else {
+                subsc_evt.action = HostCmd_ACT_BITWISE_CLR;
+                return mwifiex_send_cmd_sync(priv,
+                                             HostCmd_CMD_802_11_SUBSCRIBE_EVENT,
+                                             0, 0, &subsc_evt);
+        }
+
+        return 0;
+}
+
+/*
  * CFG802.11 operation handler for disconnection request.
  *
  * This function does not work when there is already a disconnection
@@ -1107,6 +1162,17 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev,
         priv->user_scan_cfg->num_ssids = request->n_ssids;
         priv->user_scan_cfg->ssid_list = request->ssids;
 
+        if (request->ie && request->ie_len) {
+                for (i = 0; i < MWIFIEX_MAX_VSIE_NUM; i++) {
+                        if (priv->vs_ie[i].mask != MWIFIEX_VSIE_MASK_CLEAR)
+                                continue;
+                        priv->vs_ie[i].mask = MWIFIEX_VSIE_MASK_SCAN;
+                        memcpy(&priv->vs_ie[i].ie, request->ie,
+                               request->ie_len);
+                        break;
+                }
+        }
+
         for (i = 0; i < request->n_channels; i++) {
                 chan = request->channels[i];
                 priv->user_scan_cfg->chan_list[i].chan_number = chan->hw_value;
@@ -1124,6 +1190,15 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev,
         if (mwifiex_set_user_scan_ioctl(priv, priv->user_scan_cfg))
                 return -EFAULT;
 
+        if (request->ie && request->ie_len) {
+                for (i = 0; i < MWIFIEX_MAX_VSIE_NUM; i++) {
+                        if (priv->vs_ie[i].mask == MWIFIEX_VSIE_MASK_SCAN) {
+                                priv->vs_ie[i].mask = MWIFIEX_VSIE_MASK_CLEAR;
+                                memset(&priv->vs_ie[i].ie, 0,
+                                       MWIFIEX_MAX_VSIE_LEN);
+                        }
+                }
+        }
         return 0;
 }
 
@@ -1340,6 +1415,7 @@ static struct cfg80211_ops mwifiex_cfg80211_ops = {
         .connect = mwifiex_cfg80211_connect,
         .disconnect = mwifiex_cfg80211_disconnect,
         .get_station = mwifiex_cfg80211_get_station,
+        .dump_station = mwifiex_cfg80211_dump_station,
         .set_wiphy_params = mwifiex_cfg80211_set_wiphy_params,
         .set_channel = mwifiex_cfg80211_set_channel,
         .join_ibss = mwifiex_cfg80211_join_ibss,
@@ -1350,6 +1426,7 @@ static struct cfg80211_ops mwifiex_cfg80211_ops = {
         .set_power_mgmt = mwifiex_cfg80211_set_power_mgmt,
         .set_tx_power = mwifiex_cfg80211_set_tx_power,
         .set_bitrate_mask = mwifiex_cfg80211_set_bitrate_mask,
+        .set_cqm_rssi_config = mwifiex_cfg80211_set_cqm_rssi_config,
 };
 
 /*
@@ -1365,6 +1442,7 @@ int mwifiex_register_cfg80211(struct mwifiex_private *priv)
         void *wdev_priv;
         struct wireless_dev *wdev;
         struct ieee80211_sta_ht_cap *ht_info;
+        u8 *country_code;
 
         wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL);
         if (!wdev) {
@@ -1381,6 +1459,7 @@ int mwifiex_register_cfg80211(struct mwifiex_private *priv)
         }
         wdev->iftype = NL80211_IFTYPE_STATION;
         wdev->wiphy->max_scan_ssids = 10;
+        wdev->wiphy->max_scan_ie_len = MWIFIEX_MAX_VSIE_LEN;
         wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
                                        BIT(NL80211_IFTYPE_ADHOC);
 
@@ -1403,8 +1482,8 @@ int mwifiex_register_cfg80211(struct mwifiex_private *priv)
         memcpy(wdev->wiphy->perm_addr, priv->curr_addr, ETH_ALEN);
         wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
 
-        /* Reserve space for bss band information */
-        wdev->wiphy->bss_priv_size = sizeof(u8);
+        /* Reserve space for mwifiex specific private data for BSS */
+        wdev->wiphy->bss_priv_size = sizeof(struct mwifiex_bss_priv);
 
         wdev->wiphy->reg_notifier = mwifiex_reg_notifier;
 
@@ -1427,6 +1506,11 @@ int mwifiex_register_cfg80211(struct mwifiex_private *priv)
                         "info: successfully registered wiphy device\n");
         }
 
+        country_code = mwifiex_11d_code_2_region(priv->adapter->region_code);
+        if (country_code && regulatory_hint(wdev->wiphy, country_code))
+                dev_err(priv->adapter->dev,
+                        "%s: regulatory_hint failed\n", __func__);
+
         priv->wdev = wdev;
 
         return ret;
diff --git a/drivers/net/wireless/mwifiex/cfp.c b/drivers/net/wireless/mwifiex/cfp.c
index 2fe1c33765b8..560871b0e236 100644
--- a/drivers/net/wireless/mwifiex/cfp.c
+++ b/drivers/net/wireless/mwifiex/cfp.c
@@ -71,6 +71,37 @@ u16 region_code_index[MWIFIEX_MAX_REGION_CODE] = { 0x10, 0x20, 0x30,
 
 static u8 supported_rates_n[N_SUPPORTED_RATES] = { 0x02, 0x04, 0 };
 
+struct region_code_mapping {
+        u8 code;
+        u8 region[IEEE80211_COUNTRY_STRING_LEN];
+};
+
+static struct region_code_mapping region_code_mapping_t[] = {
+        { 0x10, "US " }, /* US FCC */
+        { 0x20, "CA " }, /* IC Canada */
+        { 0x30, "EU " }, /* ETSI */
+        { 0x31, "ES " }, /* Spain */
+        { 0x32, "FR " }, /* France */
+        { 0x40, "JP " }, /* Japan */
+        { 0x41, "JP " }, /* Japan */
+        { 0x50, "CN " }, /* China */
+};
+
+/* This function converts integer code to region string */
+u8 *mwifiex_11d_code_2_region(u8 code)
+{
+        u8 i;
+        u8 size = sizeof(region_code_mapping_t)/
+                                sizeof(struct region_code_mapping);
+
+        /* Look for code in mapping table */
+        for (i = 0; i < size; i++)
+                if (region_code_mapping_t[i].code == code)
+                        return region_code_mapping_t[i].region;
+
+        return NULL;
+}
+
 /*
  * This function maps an index in supported rates table into
  * the corresponding data rate.
diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/mwifiex/cmdevt.c
index 07f6e0092552..1710beffb93a 100644
--- a/drivers/net/wireless/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/mwifiex/cmdevt.c
@@ -139,6 +139,7 @@ static int mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv,
         uint16_t cmd_size;
         struct timeval tstamp;
         unsigned long flags;
+        __le32 tmp;
 
         if (!adapter || !cmd_node)
                 return -1;
@@ -178,15 +179,28 @@ static int mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv,
                 le16_to_cpu(*(__le16 *) ((u8 *) host_cmd + S_DS_GEN)), cmd_size,
                 le16_to_cpu(host_cmd->seq_num));
 
-        skb_push(cmd_node->cmd_skb, INTF_HEADER_LEN);
-
-        ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_CMD,
-                                           cmd_node->cmd_skb, NULL);
-
-        skb_pull(cmd_node->cmd_skb, INTF_HEADER_LEN);
+        if (adapter->iface_type == MWIFIEX_USB) {
+                tmp = cpu_to_le32(MWIFIEX_USB_TYPE_CMD);
+                skb_push(cmd_node->cmd_skb, MWIFIEX_TYPE_LEN);
+                memcpy(cmd_node->cmd_skb->data, &tmp, MWIFIEX_TYPE_LEN);
+                adapter->cmd_sent = true;
+                ret = adapter->if_ops.host_to_card(adapter,
+                                                   MWIFIEX_USB_EP_CMD_EVENT,
+                                                   cmd_node->cmd_skb, NULL);
+                skb_pull(cmd_node->cmd_skb, MWIFIEX_TYPE_LEN);
+                if (ret == -EBUSY)
+                        cmd_node->cmd_skb = NULL;
+        } else {
+                skb_push(cmd_node->cmd_skb, INTF_HEADER_LEN);
+                ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_CMD,
+                                                   cmd_node->cmd_skb, NULL);
+                skb_pull(cmd_node->cmd_skb, INTF_HEADER_LEN);
+        }
 
         if (ret == -1) {
                 dev_err(adapter->dev, "DNLD_CMD: host to card failed\n");
+                if (adapter->iface_type == MWIFIEX_USB)
+                        adapter->cmd_sent = false;
                 if (cmd_node->wait_q_enabled)
                         adapter->cmd_wait_q.status = -1;
                 mwifiex_insert_cmd_to_free_q(adapter, adapter->curr_cmd);
@@ -232,6 +246,9 @@ static int mwifiex_dnld_sleep_confirm_cmd(struct mwifiex_adapter *adapter)
         struct mwifiex_opt_sleep_confirm *sleep_cfm_buf =
                                 (struct mwifiex_opt_sleep_confirm *)
                                                 adapter->sleep_cfm->data;
+        struct sk_buff *sleep_cfm_tmp;
+        __le32 tmp;
+
         priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
 
         sleep_cfm_buf->seq_num =
@@ -240,10 +257,28 @@ static int mwifiex_dnld_sleep_confirm_cmd(struct mwifiex_adapter *adapter)
                                          priv->bss_type)));
         adapter->seq_num++;
 
-        skb_push(adapter->sleep_cfm, INTF_HEADER_LEN);
-        ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_CMD,
-                                           adapter->sleep_cfm, NULL);
-        skb_pull(adapter->sleep_cfm, INTF_HEADER_LEN);
+        if (adapter->iface_type == MWIFIEX_USB) {
+                sleep_cfm_tmp =
+                        dev_alloc_skb(sizeof(struct mwifiex_opt_sleep_confirm)
+                                      + MWIFIEX_TYPE_LEN);
+                skb_put(sleep_cfm_tmp, sizeof(struct mwifiex_opt_sleep_confirm)
+                        + MWIFIEX_TYPE_LEN);
+                tmp = cpu_to_le32(MWIFIEX_USB_TYPE_CMD);
+                memcpy(sleep_cfm_tmp->data, &tmp, MWIFIEX_TYPE_LEN);
+                memcpy(sleep_cfm_tmp->data + MWIFIEX_TYPE_LEN,
+                       adapter->sleep_cfm->data,
+                       sizeof(struct mwifiex_opt_sleep_confirm));
+                ret = adapter->if_ops.host_to_card(adapter,
+                                                   MWIFIEX_USB_EP_CMD_EVENT,
+                                                   sleep_cfm_tmp, NULL);
+                if (ret != -EBUSY)
+                        dev_kfree_skb_any(sleep_cfm_tmp);
+        } else {
+                skb_push(adapter->sleep_cfm, INTF_HEADER_LEN);
+                ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_CMD,
+                                                   adapter->sleep_cfm, NULL);
+                skb_pull(adapter->sleep_cfm, INTF_HEADER_LEN);
+        }
 
         if (ret == -1) {
                 dev_err(adapter->dev, "SLEEP_CFM: failed\n");
@@ -343,7 +378,12 @@ int mwifiex_free_cmd_buffer(struct mwifiex_adapter *adapter)
                 }
                 if (!cmd_array[i].resp_skb)
                         continue;
-                dev_kfree_skb_any(cmd_array[i].resp_skb);
+
+                if (adapter->iface_type == MWIFIEX_USB)
+                        adapter->if_ops.cmdrsp_complete(adapter,
+                                                        cmd_array[i].resp_skb);
+                else
+                        dev_kfree_skb_any(cmd_array[i].resp_skb);
         }
         /* Release struct cmd_ctrl_node */
         if (adapter->cmd_pool) {
@@ -1083,6 +1123,7 @@ mwifiex_process_hs_config(struct mwifiex_adapter *adapter)
                                                     MWIFIEX_BSS_ROLE_ANY),
                                    false);
 }
+EXPORT_SYMBOL_GPL(mwifiex_process_hs_config);
 
 /*
  * This function handles the command response of a sleep confirm command.
diff --git a/drivers/net/wireless/mwifiex/debugfs.c b/drivers/net/wireless/mwifiex/debugfs.c
index 1a845074c52a..a870b5885c09 100644
--- a/drivers/net/wireless/mwifiex/debugfs.c
+++ b/drivers/net/wireless/mwifiex/debugfs.c
@@ -212,7 +212,7 @@ mwifiex_info_read(struct file *file, char __user *ubuf,
                 p += sprintf(p, "essid=\"%s\"\n", info.ssid.ssid);
                 p += sprintf(p, "bssid=\"%pM\"\n", info.bssid);
                 p += sprintf(p, "channel=\"%d\"\n", (int) info.bss_chan);
-                p += sprintf(p, "region_code = \"%02x\"\n", info.region_code);
+                p += sprintf(p, "country_code = \"%s\"\n", info.country_code);
 
                 netdev_for_each_mc_addr(ha, netdev)
                         p += sprintf(p, "multicast_address[%d]=\"%pM\"\n",
diff --git a/drivers/net/wireless/mwifiex/decl.h b/drivers/net/wireless/mwifiex/decl.h
index be5fd1652e53..d04aba4131dc 100644
--- a/drivers/net/wireless/mwifiex/decl.h
+++ b/drivers/net/wireless/mwifiex/decl.h
@@ -53,6 +53,7 @@
 #define MWIFIEX_RATE_BITMAP_MCS127 159
 
 #define MWIFIEX_RX_DATA_BUF_SIZE     (4 * 1024)
+#define MWIFIEX_RX_CMD_BUF_SIZE      (2 * 1024)
 
 #define MWIFIEX_RTS_MIN_VALUE              (0)
 #define MWIFIEX_RTS_MAX_VALUE              (2347)
diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h
index e98fc5af73dc..5f6adeb9b950 100644
--- a/drivers/net/wireless/mwifiex/fw.h
+++ b/drivers/net/wireless/mwifiex/fw.h
@@ -81,6 +81,11 @@ enum KEY_TYPE_ID {
 #define FIRMWARE_READY_SDIO                             0xfedc
 #define FIRMWARE_READY_PCIE                             0xfedcba00
 
+enum mwifiex_usb_ep {
+        MWIFIEX_USB_EP_CMD_EVENT = 1,
+        MWIFIEX_USB_EP_DATA = 2,
+};
+
 enum MWIFIEX_802_11_PRIVACY_FILTER {
         MWIFIEX_802_11_PRIV_FILTER_ACCEPT_ALL,
         MWIFIEX_802_11_PRIV_FILTER_8021X_WEP
@@ -92,16 +97,19 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 #define TLV_TYPE_KEY_MATERIAL       (PROPRIETARY_TLV_BASE_ID + 0)
 #define TLV_TYPE_CHANLIST           (PROPRIETARY_TLV_BASE_ID + 1)
 #define TLV_TYPE_NUMPROBES          (PROPRIETARY_TLV_BASE_ID + 2)
+#define TLV_TYPE_RSSI_LOW           (PROPRIETARY_TLV_BASE_ID + 4)
 #define TLV_TYPE_PASSTHROUGH        (PROPRIETARY_TLV_BASE_ID + 10)
 #define TLV_TYPE_WMMQSTATUS         (PROPRIETARY_TLV_BASE_ID + 16)
 #define TLV_TYPE_WILDCARDSSID       (PROPRIETARY_TLV_BASE_ID + 18)
 #define TLV_TYPE_TSFTIMESTAMP       (PROPRIETARY_TLV_BASE_ID + 19)
+#define TLV_TYPE_RSSI_HIGH          (PROPRIETARY_TLV_BASE_ID + 22)
 #define TLV_TYPE_AUTH_TYPE          (PROPRIETARY_TLV_BASE_ID + 31)
 #define TLV_TYPE_CHANNELBANDLIST    (PROPRIETARY_TLV_BASE_ID + 42)
 #define TLV_TYPE_RATE_DROP_CONTROL  (PROPRIETARY_TLV_BASE_ID + 82)
 #define TLV_TYPE_RATE_SCOPE         (PROPRIETARY_TLV_BASE_ID + 83)
 #define TLV_TYPE_POWER_GROUP        (PROPRIETARY_TLV_BASE_ID + 84)
 #define TLV_TYPE_WAPI_IE            (PROPRIETARY_TLV_BASE_ID + 94)
+#define TLV_TYPE_MGMT_IE            (PROPRIETARY_TLV_BASE_ID + 105)
 #define TLV_TYPE_AUTO_DS_PARAM      (PROPRIETARY_TLV_BASE_ID + 113)
 #define TLV_TYPE_PS_PARAM           (PROPRIETARY_TLV_BASE_ID + 114)
 
@@ -194,6 +202,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 #define HostCmd_CMD_802_11_KEY_MATERIAL               0x005e
 #define HostCmd_CMD_802_11_BG_SCAN_QUERY              0x006c
 #define HostCmd_CMD_WMM_GET_STATUS                    0x0071
+#define HostCmd_CMD_802_11_SUBSCRIBE_EVENT            0x0075
 #define HostCmd_CMD_802_11_TX_RATE_QUERY              0x007f
 #define HostCmd_CMD_802_11_IBSS_COALESCING_STATUS     0x0083
 #define HostCmd_CMD_VERSION_EXT                       0x0097
@@ -228,6 +237,8 @@ enum ENH_PS_MODES {
 #define HostCmd_RET_BIT                       0x8000
 #define HostCmd_ACT_GEN_GET                   0x0000
 #define HostCmd_ACT_GEN_SET                   0x0001
+#define HostCmd_ACT_BITWISE_SET               0x0002
+#define HostCmd_ACT_BITWISE_CLR               0x0003
 #define HostCmd_RESULT_OK                     0x0000
 
 #define HostCmd_ACT_MAC_RX_ON                 0x0001
@@ -813,7 +824,7 @@ struct host_cmd_ds_txpwr_cfg {
 struct mwifiex_bcn_param {
         u8 bssid[ETH_ALEN];
         u8 rssi;
-        __le32 timestamp[2];
+        __le64 timestamp;
         __le16 beacon_period;
         __le16 cap_info_bitmap;
 } __packed;
@@ -982,8 +993,7 @@ struct mwifiex_ie_types_wmm_queue_status {
 struct ieee_types_vendor_header {
         u8 element_id;
         u8 len;
-        u8 oui[3];
-        u8 oui_type;
+        u8 oui[4];      /* 0~2: oui, 3: oui_type */
         u8 oui_subtype;
         u8 version;
 } __packed;
@@ -1007,7 +1017,7 @@ struct ieee_types_wmm_parameter {
         struct ieee_types_vendor_header vend_hdr;
         u8 qos_info_bitmap;
         u8 reserved;
-        struct ieee_types_wmm_ac_parameters ac_params[IEEE80211_MAX_QUEUES];
+        struct ieee_types_wmm_ac_parameters ac_params[IEEE80211_NUM_ACS];
 } __packed;
 
 struct ieee_types_wmm_info {
@@ -1028,7 +1038,7 @@ struct ieee_types_wmm_info {
 
 struct host_cmd_ds_wmm_get_status {
         u8 queue_status_tlv[sizeof(struct mwifiex_ie_types_wmm_queue_status) *
-                              IEEE80211_MAX_QUEUES];
+                              IEEE80211_NUM_ACS];
         u8 wmm_param_tlv[sizeof(struct ieee_types_wmm_parameter) + 2];
 } __packed;
 
@@ -1045,7 +1055,7 @@ struct mwifiex_ie_types_htcap {
 
 struct mwifiex_ie_types_htinfo {
         struct mwifiex_ie_types_header header;
-        struct ieee80211_ht_info ht_info;
+        struct ieee80211_ht_operation ht_oper;
 } __packed;
 
 struct mwifiex_ie_types_2040bssco {
@@ -1146,6 +1156,17 @@ struct host_cmd_ds_pcie_details {
         u32 sleep_cookie_addr_hi;
 } __packed;
 
+struct mwifiex_ie_types_rssi_threshold {
+        struct mwifiex_ie_types_header header;
+        u8 abs_value;
+        u8 evt_freq;
+} __packed;
+
+struct host_cmd_ds_802_11_subsc_evt {
+        __le16 action;
+        __le16 events;
+} __packed;
+
 struct host_cmd_ds_command {
         __le16 command;
         __le16 size;
@@ -1195,6 +1216,7 @@ struct host_cmd_ds_command {
                 struct host_cmd_ds_set_bss_mode bss_mode;
                 struct host_cmd_ds_pcie_details pcie_host_spec;
                 struct host_cmd_ds_802_11_eeprom_access eeprom;
+                struct host_cmd_ds_802_11_subsc_evt subsc_evt;
         } params;
 } __packed;
 
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index 54bb4839b57c..d440c3eb640b 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -131,6 +131,8 @@ static int mwifiex_init_priv(struct mwifiex_private *priv)
         priv->wmm_qosinfo = 0;
         priv->curr_bcn_buf = NULL;
         priv->curr_bcn_size = 0;
+        priv->wps_ie = NULL;
+        priv->wps_ie_len = 0;
 
         priv->scan_block = false;
 
@@ -186,10 +188,10 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
 
         adapter->cmd_sent = false;
 
-        if (adapter->iface_type == MWIFIEX_PCIE)
-                adapter->data_sent = false;
-        else
+        if (adapter->iface_type == MWIFIEX_SDIO)
                 adapter->data_sent = true;
+        else
+                adapter->data_sent = false;
 
         adapter->cmd_resp_received = false;
         adapter->event_received = false;
@@ -377,7 +379,8 @@ mwifiex_free_adapter(struct mwifiex_adapter *adapter)
 
         dev_dbg(adapter->dev, "info: free scan table\n");
 
-        adapter->if_ops.cleanup_if(adapter);
+        if (adapter->if_ops.cleanup_if)
+                adapter->if_ops.cleanup_if(adapter);
 
         if (adapter->sleep_cfm)
                 dev_kfree_skb_any(adapter->sleep_cfm);
@@ -417,6 +420,8 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter)
         spin_lock_init(&adapter->cmd_pending_q_lock);
         spin_lock_init(&adapter->scan_pending_q_lock);
 
+        skb_queue_head_init(&adapter->usb_rx_data_q);
+
         for (i = 0; i < adapter->priv_num; ++i) {
                 INIT_LIST_HEAD(&adapter->bss_prio_tbl[i].bss_prio_head);
                 adapter->bss_prio_tbl[i].bss_prio_cur = NULL;
@@ -572,6 +577,7 @@ mwifiex_shutdown_drv(struct mwifiex_adapter *adapter)
         struct mwifiex_private *priv;
         s32 i;
         unsigned long flags;
+        struct sk_buff *skb;
 
         /* mwifiex already shutdown */
         if (adapter->hw_status == MWIFIEX_HW_STATUS_NOT_READY)
@@ -599,6 +605,18 @@ mwifiex_shutdown_drv(struct mwifiex_adapter *adapter)
 
         spin_lock_irqsave(&adapter->mwifiex_lock, flags);
 
+        if (adapter->if_ops.data_complete) {
+                while ((skb = skb_dequeue(&adapter->usb_rx_data_q))) {
+                        struct mwifiex_rxinfo *rx_info = MWIFIEX_SKB_RXCB(skb);
+
+                        priv = adapter->priv[rx_info->bss_num];
+                        if (priv)
+                                priv->stats.rx_dropped++;
+
+                        adapter->if_ops.data_complete(adapter, skb);
+                }
+        }
+
         /* Free adapter structure */
         mwifiex_free_adapter(adapter);
 
@@ -628,24 +646,28 @@ int mwifiex_dnld_fw(struct mwifiex_adapter *adapter,
         int ret;
         u32 poll_num = 1;
 
-        adapter->winner = 0;
+        if (adapter->if_ops.check_fw_status) {
+                adapter->winner = 0;
 
-        /* Check if firmware is already running */
-        ret = adapter->if_ops.check_fw_status(adapter, poll_num);
-        if (!ret) {
-                dev_notice(adapter->dev,
-                           "WLAN FW already running! Skip FW download\n");
-                goto done;
-        }
-        poll_num = MAX_FIRMWARE_POLL_TRIES;
-
-        /* Check if we are the winner for downloading FW */
-        if (!adapter->winner) {
-                dev_notice(adapter->dev,
-                           "Other intf already running! Skip FW download\n");
-                poll_num = MAX_MULTI_INTERFACE_POLL_TRIES;
-                goto poll_fw;
+                /* check if firmware is already running */
+                ret = adapter->if_ops.check_fw_status(adapter, poll_num);
+                if (!ret) {
+                        dev_notice(adapter->dev,
+                                   "WLAN FW already running! Skip FW dnld\n");
+                        goto done;
+                }
+
+                poll_num = MAX_FIRMWARE_POLL_TRIES;
+
+                /* check if we are the winner for downloading FW */
+                if (!adapter->winner) {
+                        dev_notice(adapter->dev,
+                                   "FW already running! Skip FW dnld\n");
+                        poll_num = MAX_MULTI_INTERFACE_POLL_TRIES;
+                        goto poll_fw;
+                }
         }
+
         if (pmfw) {
                 /* Download firmware with helper */
                 ret = adapter->if_ops.prog_fw(adapter, pmfw);
@@ -664,6 +686,8 @@ poll_fw:
         }
 done:
         /* re-enable host interrupt for mwifiex after fw dnld is successful */
-        adapter->if_ops.enable_int(adapter);
+        if (adapter->if_ops.enable_int)
+                adapter->if_ops.enable_int(adapter);
+
         return ret;
 }
diff --git a/drivers/net/wireless/mwifiex/ioctl.h b/drivers/net/wireless/mwifiex/ioctl.h
index 7ca4e8234f3e..f0f95524e96b 100644
--- a/drivers/net/wireless/mwifiex/ioctl.h
+++ b/drivers/net/wireless/mwifiex/ioctl.h
@@ -85,34 +85,6 @@ struct mwifiex_ds_get_stats {
         u32 wep_icv_error[4];
 };
 
-#define BCN_RSSI_AVG_MASK               0x00000002
-#define BCN_NF_AVG_MASK                 0x00000200
-#define ALL_RSSI_INFO_MASK              0x00000fff
-
-struct mwifiex_ds_get_signal {
-        /*
-         * Bit0:  Last Beacon RSSI,  Bit1:  Average Beacon RSSI,
-         * Bit2:  Last Data RSSI,    Bit3:  Average Data RSSI,
-         * Bit4:  Last Beacon SNR,   Bit5:  Average Beacon SNR,
-         * Bit6:  Last Data SNR,     Bit7:  Average Data SNR,
-         * Bit8:  Last Beacon NF,    Bit9:  Average Beacon NF,
-         * Bit10: Last Data NF,      Bit11: Average Data NF
-         */
-        u16 selector;
-        s16 bcn_rssi_last;
-        s16 bcn_rssi_avg;
-        s16 data_rssi_last;
-        s16 data_rssi_avg;
-        s16 bcn_snr_last;
-        s16 bcn_snr_avg;
-        s16 data_snr_last;
-        s16 data_snr_avg;
-        s16 bcn_nf_last;
-        s16 bcn_nf_avg;
-        s16 data_nf_last;
-        s16 data_nf_avg;
-};
-
 #define MWIFIEX_MAX_VER_STR_LEN    128
 
 struct mwifiex_ver_ext {
@@ -124,7 +96,7 @@ struct mwifiex_bss_info {
         u32 bss_mode;
         struct cfg80211_ssid ssid;
         u32 bss_chan;
-        u32 region_code;
+        u8 country_code[3];
         u32 media_connected;
         u32 max_power_level;
         u32 min_power_level;
@@ -308,8 +280,30 @@ struct mwifiex_ds_misc_cmd {
         u8 cmd[MWIFIEX_SIZE_OF_CMD_BUFFER];
 };
 
+#define BITMASK_BCN_RSSI_LOW    BIT(0)
+#define BITMASK_BCN_RSSI_HIGH   BIT(4)
+
+enum subsc_evt_rssi_state {
+        EVENT_HANDLED,
+        RSSI_LOW_RECVD,
+        RSSI_HIGH_RECVD
+};
+
+struct subsc_evt_cfg {
+        u8 abs_value;
+        u8 evt_freq;
+};
+
+struct mwifiex_ds_misc_subsc_evt {
+        u16 action;
+        u16 events;
+        struct subsc_evt_cfg bcn_l_rssi_cfg;
+        struct subsc_evt_cfg bcn_h_rssi_cfg;
+};
+
 #define MWIFIEX_MAX_VSIE_LEN       (256)
 #define MWIFIEX_MAX_VSIE_NUM       (8)
+#define MWIFIEX_VSIE_MASK_CLEAR    0x00
 #define MWIFIEX_VSIE_MASK_SCAN     0x01
 #define MWIFIEX_VSIE_MASK_ASSOC    0x02
 #define MWIFIEX_VSIE_MASK_ADHOC    0x04
diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
index 8f9382b9c3ca..8a390982463e 100644
--- a/drivers/net/wireless/mwifiex/join.c
+++ b/drivers/net/wireless/mwifiex/join.c
@@ -118,15 +118,15 @@ mwifiex_cmd_append_tsf_tlv(struct mwifiex_private *priv, u8 **buffer,
         *buffer += sizeof(tsf_tlv.header);
 
         /* TSF at the time when beacon/probe_response was received */
-        tsf_val = cpu_to_le64(bss_desc->network_tsf);
+        tsf_val = cpu_to_le64(bss_desc->fw_tsf);
         memcpy(*buffer, &tsf_val, sizeof(tsf_val));
         *buffer += sizeof(tsf_val);
 
-        memcpy(&tsf_val, bss_desc->time_stamp, sizeof(tsf_val));
+        tsf_val = cpu_to_le64(bss_desc->timestamp);
 
         dev_dbg(priv->adapter->dev,
                 "info: %s: TSF offset calc: %016llx - %016llx\n",
-                __func__, tsf_val, bss_desc->network_tsf);
+                __func__, bss_desc->timestamp, bss_desc->fw_tsf);
 
         memcpy(*buffer, &tsf_val, sizeof(tsf_val));
         *buffer += sizeof(tsf_val);
@@ -225,6 +225,48 @@ mwifiex_setup_rates_from_bssdesc(struct mwifiex_private *priv,
 }
 
 /*
+ * This function appends a WPS IE. It is called from the network join command
+ * preparation routine.
+ *
+ * If the IE buffer has been setup by the application, this routine appends
+ * the buffer as a WPS TLV type to the request.
+ */
+static int
+mwifiex_cmd_append_wps_ie(struct mwifiex_private *priv, u8 **buffer)
+{
+        int retLen = 0;
+        struct mwifiex_ie_types_header ie_header;
+
+        if (!buffer || !*buffer)
+                return 0;
+
+        /*
+         * If there is a wps ie buffer setup, append it to the return
+         * parameter buffer pointer.
+         */
+        if (priv->wps_ie_len) {
+                dev_dbg(priv->adapter->dev, "cmd: append wps ie %d to %p\n",
+                        priv->wps_ie_len, *buffer);
+
+                /* Wrap the generic IE buffer with a pass through TLV type */
+                ie_header.type = cpu_to_le16(TLV_TYPE_MGMT_IE);
+                ie_header.len = cpu_to_le16(priv->wps_ie_len);
+                memcpy(*buffer, &ie_header, sizeof(ie_header));
+                *buffer += sizeof(ie_header);
+                retLen += sizeof(ie_header);
+
+                memcpy(*buffer, priv->wps_ie, priv->wps_ie_len);
+                *buffer += priv->wps_ie_len;
+                retLen += priv->wps_ie_len;
+
+        }
+
+        kfree(priv->wps_ie);
+        priv->wps_ie_len = 0;
+        return retLen;
+}
+
+/*
  * This function appends a WAPI IE.
  *
  * This function is called from the network join command preparation routine.
@@ -480,6 +522,8 @@ int mwifiex_cmd_802_11_associate(struct mwifiex_private *priv,
         if (priv->sec_info.wapi_enabled && priv->wapi_ie_len)
                 mwifiex_cmd_append_wapi_ie(priv, &pos);
 
+        if (priv->wps.session_enable && priv->wps_ie_len)
+                mwifiex_cmd_append_wps_ie(priv, &pos);
 
         mwifiex_cmd_append_generic_ie(priv, &pos);
 
@@ -932,20 +976,20 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,
                 /* Fill HT INFORMATION */
                 ht_info = (struct mwifiex_ie_types_htinfo *) pos;
                 memset(ht_info, 0, sizeof(struct mwifiex_ie_types_htinfo));
-                ht_info->header.type = cpu_to_le16(WLAN_EID_HT_INFORMATION);
+                ht_info->header.type = cpu_to_le16(WLAN_EID_HT_OPERATION);
                 ht_info->header.len =
-                                cpu_to_le16(sizeof(struct ieee80211_ht_info));
+                        cpu_to_le16(sizeof(struct ieee80211_ht_operation));
 
-                ht_info->ht_info.control_chan =
+                ht_info->ht_oper.primary_chan =
                         (u8) priv->curr_bss_params.bss_descriptor.channel;
                 if (adapter->sec_chan_offset) {
-                        ht_info->ht_info.ht_param = adapter->sec_chan_offset;
-                        ht_info->ht_info.ht_param |=
+                        ht_info->ht_oper.ht_param = adapter->sec_chan_offset;
+                        ht_info->ht_oper.ht_param |=
                                         IEEE80211_HT_PARAM_CHAN_WIDTH_ANY;
                 }
-                ht_info->ht_info.operation_mode =
+                ht_info->ht_oper.operation_mode =
                      cpu_to_le16(IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);
-                ht_info->ht_info.basic_set[0] = 0xff;
+                ht_info->ht_oper.basic_set[0] = 0xff;
                 pos += sizeof(struct mwifiex_ie_types_htinfo);
                 cmd_append_size +=
                                 sizeof(struct mwifiex_ie_types_htinfo);
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index 9d1b3ca6334b..be0f0e583f75 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -58,8 +58,9 @@ static int mwifiex_register(void *card, struct mwifiex_if_ops *if_ops,
         memmove(&adapter->if_ops, if_ops, sizeof(struct mwifiex_if_ops));
 
         /* card specific initialization has been deferred until now .. */
-        if (adapter->if_ops.init_if(adapter))
-                goto error;
+        if (adapter->if_ops.init_if)
+                if (adapter->if_ops.init_if(adapter))
+                        goto error;
 
         adapter->priv_num = 0;
 
@@ -140,6 +141,7 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter)
 {
         int ret = 0;
         unsigned long flags;
+        struct sk_buff *skb;
 
         spin_lock_irqsave(&adapter->main_proc_lock, flags);
 
@@ -161,7 +163,8 @@ process_start:
                 if (adapter->int_status) {
                         if (adapter->hs_activated)
                                 mwifiex_process_hs_config(adapter);
-                        adapter->if_ops.process_int_status(adapter);
+                        if (adapter->if_ops.process_int_status)
+                                adapter->if_ops.process_int_status(adapter);
                 }
 
                 /* Need to wake up the card ? */
@@ -174,6 +177,7 @@ process_start:
                         adapter->if_ops.wakeup(adapter);
                         continue;
                 }
+
                 if (IS_CARD_RX_RCVD(adapter)) {
                         adapter->pm_wakeup_fw_try = false;
                         if (adapter->ps_state == PS_STATE_SLEEP)
@@ -194,6 +198,11 @@ process_start:
                         }
                 }
 
+                /* Check Rx data for USB */
+                if (adapter->iface_type == MWIFIEX_USB)
+                        while ((skb = skb_dequeue(&adapter->usb_rx_data_q)))
+                                mwifiex_handle_rx_packet(adapter, skb);
+
                 /* Check for Cmd Resp */
                 if (adapter->cmd_resp_received) {
                         adapter->cmd_resp_received = false;
@@ -292,33 +301,35 @@ static void mwifiex_free_adapter(struct mwifiex_adapter *adapter)
 }
 
 /*
- * This function initializes the hardware and firmware.
+ * This function gets firmware and initializes it.
  *
  * The main initialization steps followed are -
  *      - Download the correct firmware to card
- *      - Allocate and initialize the adapter structure
- *      - Initialize the private structures
  *      - Issue the init commands to firmware
  */
-static int mwifiex_init_hw_fw(struct mwifiex_adapter *adapter)
+static void mwifiex_fw_dpc(const struct firmware *firmware, void *context)
 {
-        int ret, err;
+        int ret;
+        char fmt[64];
+        struct mwifiex_private *priv;
+        struct mwifiex_adapter *adapter = context;
         struct mwifiex_fw_image fw;
 
-        memset(&fw, 0, sizeof(struct mwifiex_fw_image));
-
-        err = request_firmware(&adapter->firmware, adapter->fw_name,
-                               adapter->dev);
-        if (err < 0) {
-                dev_err(adapter->dev, "request_firmware() returned"
-                                " error code %#x\n", err);
-                ret = -1;
+        if (!firmware) {
+                dev_err(adapter->dev,
+                        "Failed to get firmware %s\n", adapter->fw_name);
                 goto done;
         }
+
+        memset(&fw, 0, sizeof(struct mwifiex_fw_image));
+        adapter->firmware = firmware;
         fw.fw_buf = (u8 *) adapter->firmware->data;
         fw.fw_len = adapter->firmware->size;
 
-        ret = mwifiex_dnld_fw(adapter, &fw);
+        if (adapter->if_ops.dnld_fw)
+                ret = adapter->if_ops.dnld_fw(adapter, &fw);
+        else
+                ret = mwifiex_dnld_fw(adapter, &fw);
         if (ret == -1)
                 goto done;
 
@@ -335,17 +346,54 @@ static int mwifiex_init_hw_fw(struct mwifiex_adapter *adapter)
         /* Wait for mwifiex_init to complete */
         wait_event_interruptible(adapter->init_wait_q,
                                  adapter->init_wait_q_woken);
-        if (adapter->hw_status != MWIFIEX_HW_STATUS_READY) {
-                ret = -1;
+        if (adapter->hw_status != MWIFIEX_HW_STATUS_READY)
                 goto done;
+
+        priv = adapter->priv[0];
+        if (mwifiex_register_cfg80211(priv) != 0) {
+                dev_err(adapter->dev, "cannot register with cfg80211\n");
+                goto err_init_fw;
         }
-        ret = 0;
 
+        rtnl_lock();
+        /* Create station interface by default */
+        if (!mwifiex_add_virtual_intf(priv->wdev->wiphy, "mlan%d",
+                                      NL80211_IFTYPE_STATION, NULL, NULL)) {
+                dev_err(adapter->dev, "cannot create default STA interface\n");
+                goto err_add_intf;
+        }
+        rtnl_unlock();
+
+        mwifiex_drv_get_driver_version(adapter, fmt, sizeof(fmt) - 1);
+        dev_notice(adapter->dev, "driver_version = %s\n", fmt);
+        goto done;
+
+err_add_intf:
+        mwifiex_del_virtual_intf(priv->wdev->wiphy, priv->netdev);
+        rtnl_unlock();
+err_init_fw:
+        pr_debug("info: %s: unregister device\n", __func__);
+        adapter->if_ops.unregister_dev(adapter);
 done:
-        if (adapter->firmware)
-                release_firmware(adapter->firmware);
-        if (ret)
-                ret = -1;
+        release_firmware(adapter->firmware);
+        complete(&adapter->fw_load);
+        return;
+}
+
+/*
+ * This function initializes the hardware and gets firmware.
+ */
+static int mwifiex_init_hw_fw(struct mwifiex_adapter *adapter)
+{
+        int ret;
+
+        init_completion(&adapter->fw_load);
+        ret = request_firmware_nowait(THIS_MODULE, 1, adapter->fw_name,
+                                      adapter->dev, GFP_KERNEL, adapter,
+                                      mwifiex_fw_dpc);
+        if (ret < 0)
+                dev_err(adapter->dev,
+                        "request_firmware_nowait() returned error %d\n", ret);
         return ret;
 }
 
@@ -650,8 +698,6 @@ mwifiex_add_card(void *card, struct semaphore *sem,
                  struct mwifiex_if_ops *if_ops, u8 iface_type)
 {
         struct mwifiex_adapter *adapter;
-        char fmt[64];
-        struct mwifiex_private *priv;
 
         if (down_interruptible(sem))
                 goto exit_sem_err;
@@ -692,40 +738,13 @@ mwifiex_add_card(void *card, struct semaphore *sem,
                 goto err_init_fw;
         }
 
-        priv = adapter->priv[0];
-
-        if (mwifiex_register_cfg80211(priv) != 0) {
-                dev_err(adapter->dev, "cannot register netdevice"
-                               " with cfg80211\n");
-                        goto err_init_fw;
-        }
-
-        rtnl_lock();
-        /* Create station interface by default */
-        if (!mwifiex_add_virtual_intf(priv->wdev->wiphy, "mlan%d",
-                                      NL80211_IFTYPE_STATION, NULL, NULL)) {
-                rtnl_unlock();
-                dev_err(adapter->dev, "cannot create default station"
-                                " interface\n");
-                goto err_add_intf;
-        }
-
-        rtnl_unlock();
-
         up(sem);
-
-        mwifiex_drv_get_driver_version(adapter, fmt, sizeof(fmt) - 1);
-        dev_notice(adapter->dev, "driver_version = %s\n", fmt);
-
         return 0;
 
-err_add_intf:
-        rtnl_lock();
-        mwifiex_del_virtual_intf(priv->wdev->wiphy, priv->netdev);
-        rtnl_unlock();
 err_init_fw:
         pr_debug("info: %s: unregister device\n", __func__);
-        adapter->if_ops.unregister_dev(adapter);
+        if (adapter->if_ops.unregister_dev)
+                adapter->if_ops.unregister_dev(adapter);
 err_registerdev:
         adapter->surprise_removed = true;
         mwifiex_terminate_workqueue(adapter);
@@ -830,7 +849,8 @@ int mwifiex_remove_card(struct mwifiex_adapter *adapter, struct semaphore *sem)
 
         /* Unregister device */
         dev_dbg(adapter->dev, "info: unregister device\n");
-        adapter->if_ops.unregister_dev(adapter);
+        if (adapter->if_ops.unregister_dev)
+                adapter->if_ops.unregister_dev(adapter);
         /* Free adapter structure */
         dev_dbg(adapter->dev, "info: free adapter\n");
         mwifiex_free_adapter(adapter);
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index 35225e9b1080..324ad390cacd 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -92,9 +92,16 @@ enum {
 #define MWIFIEX_OUI_NOT_PRESENT                 0
 #define MWIFIEX_OUI_PRESENT                             1
 
+/*
+ * Do not check for data_received for USB, as data_received
+ * is handled in mwifiex_usb_recv for USB
+ */
 #define IS_CARD_RX_RCVD(adapter) (adapter->cmd_resp_received || \
-                                        adapter->event_received || \
-                                        adapter->data_received)
+                                adapter->event_received || \
+                                ((adapter->iface_type != MWIFIEX_USB) && \
+                                adapter->data_received) || \
+                                ((adapter->iface_type == MWIFIEX_USB) && \
+                                !skb_queue_empty(&adapter->usb_rx_data_q)))
 
 #define MWIFIEX_TYPE_CMD                                1
 #define MWIFIEX_TYPE_DATA                               0
@@ -110,6 +117,11 @@ enum {
 
 #define MWIFIEX_EVENT_HEADER_LEN           4
 
+#define MWIFIEX_TYPE_LEN                        4
+#define MWIFIEX_USB_TYPE_CMD                    0xF00DFACE
+#define MWIFIEX_USB_TYPE_DATA                   0xBEADC0DE
+#define MWIFIEX_USB_TYPE_EVENT                  0xBEEFFACE
+
 struct mwifiex_dbg {
         u32 num_cmd_host_to_card_failure;
         u32 num_cmd_sleep_cfm_host_to_card_failure;
@@ -162,6 +174,7 @@ enum MWIFIEX_PS_STATE {
 enum mwifiex_iface_type {
         MWIFIEX_SDIO,
         MWIFIEX_PCIE,
+        MWIFIEX_USB
 };
 
 struct mwifiex_add_ba_param {
@@ -201,10 +214,10 @@ struct mwifiex_wmm_desc {
         u32 packets_out[MAX_NUM_TID];
         /* spin lock to protect ra_list */
         spinlock_t ra_list_spinlock;
-        struct mwifiex_wmm_ac_status ac_status[IEEE80211_MAX_QUEUES];
-        enum mwifiex_wmm_ac_e ac_down_graded_vals[IEEE80211_MAX_QUEUES];
+        struct mwifiex_wmm_ac_status ac_status[IEEE80211_NUM_ACS];
+        enum mwifiex_wmm_ac_e ac_down_graded_vals[IEEE80211_NUM_ACS];
         u32 drv_pkt_delay_max;
-        u8 queue_priority[IEEE80211_MAX_QUEUES];
+        u8 queue_priority[IEEE80211_NUM_ACS];
         u32 user_pri_pkt_tx_ctrl[WMM_HIGHEST_PRIORITY + 1];     /* UP: 0 to 7 */
         /* Number of transmit packets queued */
         atomic_t tx_pkts_queued;
@@ -260,8 +273,8 @@ struct mwifiex_bssdescriptor {
          * BAND_A(0X04): 'a' band
          */
         u16 bss_band;
-        u64 network_tsf;
-        u8 time_stamp[8];
+        u64 fw_tsf;
+        u64 timestamp;
         union ieee_types_phy_param_set phy_param_set;
         union ieee_types_ss_param_set ss_param_set;
         u16 cap_info_bitmap;
@@ -269,7 +282,7 @@ struct mwifiex_bssdescriptor {
         u8  disable_11n;
         struct ieee80211_ht_cap *bcn_ht_cap;
         u16 ht_cap_offset;
-        struct ieee80211_ht_info *bcn_ht_info;
+        struct ieee80211_ht_operation *bcn_ht_oper;
         u16 ht_info_offset;
         u8 *bcn_bss_co_2040;
         u16 bss_co_2040_offset;
@@ -407,6 +420,8 @@ struct mwifiex_private {
         struct host_cmd_ds_802_11_key_material aes_key;
         u8 wapi_ie[256];
         u8 wapi_ie_len;
+        u8 *wps_ie;
+        u8 wps_ie_len;
         u8 wmm_required;
         u8 wmm_enabled;
         u8 wmm_qosinfo;
@@ -448,7 +463,6 @@ struct mwifiex_private {
         struct dentry *dfs_dev_dir;
 #endif
         u8 nick_name[16];
-        u8 qual_level, qual_noise;
         u16 current_key_index;
         struct semaphore async_sem;
         u8 scan_pending_on_block;
@@ -459,6 +473,9 @@ struct mwifiex_private {
         u8 country_code[IEEE80211_COUNTRY_STRING_LEN];
         struct wps wps;
         u8 scan_block;
+        s32 cqm_rssi_thold;
+        u32 cqm_rssi_hyst;
+        u8 subsc_evt_rssi_state;
 };
 
 enum mwifiex_ba_status {
@@ -518,6 +535,11 @@ struct cmd_ctrl_node {
         u8 cmd_wait_q_woken;
 };
 
+struct mwifiex_bss_priv {
+        u8 band;
+        u64 fw_tsf;
+};
+
 struct mwifiex_if_ops {
         int (*init_if) (struct mwifiex_adapter *);
         void (*cleanup_if) (struct mwifiex_adapter *);
@@ -537,6 +559,8 @@ struct mwifiex_if_ops {
         void (*cleanup_mpa_buf) (struct mwifiex_adapter *);
         int (*cmdrsp_complete) (struct mwifiex_adapter *, struct sk_buff *);
         int (*event_complete) (struct mwifiex_adapter *, struct sk_buff *);
+        int (*data_complete) (struct mwifiex_adapter *, struct sk_buff *);
+        int (*dnld_fw) (struct mwifiex_adapter *, struct mwifiex_fw_image *);
 };
 
 struct mwifiex_adapter {
@@ -599,6 +623,7 @@ struct mwifiex_adapter {
         struct list_head scan_pending_q;
         /* spin lock for scan_pending_q */
         spinlock_t scan_pending_q_lock;
+        struct sk_buff_head usb_rx_data_q;
         u32 scan_processing;
         u16 region_code;
         struct mwifiex_802_11d_domain_reg domain_reg;
@@ -651,6 +676,7 @@ struct mwifiex_adapter {
         u8 scan_wait_q_woken;
         struct cmd_ctrl_node *cmd_queued;
         spinlock_t queue_lock;          /* lock for tx queues */
+        struct completion fw_load;
 };
 
 int mwifiex_init_lock_list(struct mwifiex_adapter *adapter);
@@ -896,8 +922,6 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
 int mwifiex_cancel_hs(struct mwifiex_private *priv, int cmd_type);
 int mwifiex_enable_hs(struct mwifiex_adapter *adapter);
 int mwifiex_disable_auto_ds(struct mwifiex_private *priv);
-int mwifiex_get_signal_info(struct mwifiex_private *priv,
-                            struct mwifiex_ds_get_signal *signal);
 int mwifiex_drv_get_data_rate(struct mwifiex_private *priv,
                               struct mwifiex_rate_cfg *rate);
 int mwifiex_request_scan(struct mwifiex_private *priv,
@@ -950,13 +974,10 @@ int mwifiex_bss_set_channel(struct mwifiex_private *,
 int mwifiex_get_bss_info(struct mwifiex_private *,
                          struct mwifiex_bss_info *);
 int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv,
-                              u8 *bssid, s32 rssi, u8 *ie_buf,
-                              size_t ie_len, u16 beacon_period,
-                              u16 cap_info_bitmap, u8 band,
+                              struct cfg80211_bss *bss,
                               struct mwifiex_bssdescriptor *bss_desc);
 int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,
-                                struct mwifiex_bssdescriptor *bss_entry,
-                                u8 *ie_buf, u32 ie_len);
+                                    struct mwifiex_bssdescriptor *bss_entry);
 int mwifiex_check_network_compatibility(struct mwifiex_private *priv,
                                         struct mwifiex_bssdescriptor *bss_desc);
 
@@ -965,6 +986,7 @@ struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                                         u32 *flags, struct vif_params *params);
 int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev);
 
+u8 *mwifiex_11d_code_2_region(u8 code);
 
 #ifdef CONFIG_DEBUG_FS
 void mwifiex_debugfs_init(void);
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
index 5867facd415d..13fbc4eb1595 100644
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -119,6 +119,9 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev)
         if (!adapter || !adapter->priv_num)
                 return;
 
+        /* In case driver is removed when asynchronous FW load is in progress */
+        wait_for_completion(&adapter->fw_load);
+
         if (user_rmmod) {
 #ifdef CONFIG_PM
                 if (adapter->is_suspended)
diff --git a/drivers/net/wireless/mwifiex/pcie.h b/drivers/net/wireless/mwifiex/pcie.h
index 445ff21772e2..2f218f9a3fd3 100644
--- a/drivers/net/wireless/mwifiex/pcie.h
+++ b/drivers/net/wireless/mwifiex/pcie.h
@@ -48,15 +48,15 @@
 #define PCIE_HOST_INT_STATUS_MASK                       0xC3C
 #define PCIE_SCRATCH_2_REG                              0xC40
 #define PCIE_SCRATCH_3_REG                              0xC44
-#define PCIE_SCRATCH_4_REG                              0xCC0
-#define PCIE_SCRATCH_5_REG                              0xCC4
-#define PCIE_SCRATCH_6_REG                              0xCC8
-#define PCIE_SCRATCH_7_REG                              0xCCC
-#define PCIE_SCRATCH_8_REG                              0xCD0
-#define PCIE_SCRATCH_9_REG                              0xCD4
-#define PCIE_SCRATCH_10_REG                             0xCD8
-#define PCIE_SCRATCH_11_REG                             0xCDC
-#define PCIE_SCRATCH_12_REG                             0xCE0
+#define PCIE_SCRATCH_4_REG                              0xCD0
+#define PCIE_SCRATCH_5_REG                              0xCD4
+#define PCIE_SCRATCH_6_REG                              0xCD8
+#define PCIE_SCRATCH_7_REG                              0xCDC
+#define PCIE_SCRATCH_8_REG                              0xCE0
+#define PCIE_SCRATCH_9_REG                              0xCE4
+#define PCIE_SCRATCH_10_REG                             0xCE8
+#define PCIE_SCRATCH_11_REG                             0xCEC
+#define PCIE_SCRATCH_12_REG                             0xCF0
 
 #define CPU_INTR_DNLD_RDY                               BIT(0)
 #define CPU_INTR_DOOR_BELL                              BIT(1)
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index aff9cd763f2b..74f045715723 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1048,10 +1048,8 @@ mwifiex_ret_802_11_scan_get_tlv_ptrs(struct mwifiex_adapter *adapter,
  * This function parses provided beacon buffer and updates
  * respective fields in bss descriptor structure.
  */
-int
-mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,
-                                struct mwifiex_bssdescriptor *bss_entry,
-                                u8 *ie_buf, u32 ie_len)
+int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,
+                                    struct mwifiex_bssdescriptor *bss_entry)
 {
         int ret = 0;
         u8 element_id;
@@ -1073,10 +1071,8 @@ mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,
 
         found_data_rate_ie = false;
         rate_size = 0;
-        current_ptr = ie_buf;
-        bytes_left = ie_len;
-        bss_entry->beacon_buf = ie_buf;
-        bss_entry->beacon_buf_size = ie_len;
+        current_ptr = bss_entry->beacon_buf;
+        bytes_left = bss_entry->beacon_buf_size;
 
         /* Process variable IE */
         while (bytes_left >= 2) {
@@ -1221,9 +1217,9 @@ mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,
                                         sizeof(struct ieee_types_header) -
                                         bss_entry->beacon_buf);
                         break;
-                case WLAN_EID_HT_INFORMATION:
-                        bss_entry->bcn_ht_info = (struct ieee80211_ht_info *)
-                                        (current_ptr +
+                case WLAN_EID_HT_OPERATION:
+                        bss_entry->bcn_ht_oper =
+                                (struct ieee80211_ht_operation *)(current_ptr +
                                         sizeof(struct ieee_types_header));
                         bss_entry->ht_info_offset = (u16) (current_ptr +
                                         sizeof(struct ieee_types_header) -
@@ -1447,15 +1443,12 @@ int mwifiex_check_network_compatibility(struct mwifiex_private *priv,
         return ret;
 }
 
-static int
-mwifiex_update_curr_bss_params(struct mwifiex_private *priv, u8 *bssid,
-                               s32 rssi, const u8 *ie_buf, size_t ie_len,
-                               u16 beacon_period, u16 cap_info_bitmap, u8 band)
+static int mwifiex_update_curr_bss_params(struct mwifiex_private *priv,
+                                          struct cfg80211_bss *bss)
 {
         struct mwifiex_bssdescriptor *bss_desc;
         int ret;
         unsigned long flags;
-        u8 *beacon_ie;
 
         /* Allocate and fill new bss descriptor */
         bss_desc = kzalloc(sizeof(struct mwifiex_bssdescriptor),
@@ -1465,16 +1458,7 @@ mwifiex_update_curr_bss_params(struct mwifiex_private *priv, u8 *bssid,
                 return -ENOMEM;
         }
 
-        beacon_ie = kmemdup(ie_buf, ie_len, GFP_KERNEL);
-        if (!beacon_ie) {
-                kfree(bss_desc);
-                dev_err(priv->adapter->dev, " failed to alloc beacon_ie\n");
-                return -ENOMEM;
-        }
-
-        ret = mwifiex_fill_new_bss_desc(priv, bssid, rssi, beacon_ie,
-                                        ie_len, beacon_period,
-                                        cap_info_bitmap, band, bss_desc);
+        ret = mwifiex_fill_new_bss_desc(priv, bss, bss_desc);
         if (ret)
                 goto done;
 
@@ -1493,7 +1477,7 @@ mwifiex_update_curr_bss_params(struct mwifiex_private *priv, u8 *bssid,
         priv->curr_bss_params.bss_descriptor.bcn_ht_cap = NULL;
         priv->curr_bss_params.bss_descriptor.ht_cap_offset =
                 0;
-        priv->curr_bss_params.bss_descriptor.bcn_ht_info = NULL;
+        priv->curr_bss_params.bss_descriptor.bcn_ht_oper = NULL;
         priv->curr_bss_params.bss_descriptor.ht_info_offset =
                 0;
         priv->curr_bss_params.bss_descriptor.bcn_bss_co_2040 =
@@ -1514,7 +1498,6 @@ mwifiex_update_curr_bss_params(struct mwifiex_private *priv, u8 *bssid,
 
 done:
         kfree(bss_desc);
-        kfree(beacon_ie);
         return 0;
 }
 
@@ -1620,14 +1603,16 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
                 const u8 *ie_buf;
                 size_t ie_len;
                 u16 channel = 0;
-                u64 network_tsf = 0;
+                u64 fw_tsf = 0;
                 u16 beacon_size = 0;
                 u32 curr_bcn_bytes;
                 u32 freq;
                 u16 beacon_period;
                 u16 cap_info_bitmap;
                 u8 *current_ptr;
+                u64 timestamp;
                 struct mwifiex_bcn_param *bcn_param;
+                struct mwifiex_bss_priv *bss_priv;
 
                 if (bytes_left >= sizeof(beacon_size)) {
                         /* Extract & convert beacon size from command buffer */
@@ -1667,9 +1652,11 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
 
                 memcpy(bssid, bcn_param->bssid, ETH_ALEN);
 
-                rssi = (s32) (bcn_param->rssi);
-                dev_dbg(adapter->dev, "info: InterpretIE: RSSI=%02X\n", rssi);
+                rssi = (s32) bcn_param->rssi;
+                rssi = (-rssi) * 100;           /* Convert dBm to mBm */
+                dev_dbg(adapter->dev, "info: InterpretIE: RSSI=%d\n", rssi);
 
+                timestamp = le64_to_cpu(bcn_param->timestamp);
                 beacon_period = le16_to_cpu(bcn_param->beacon_period);
 
                 cap_info_bitmap = le16_to_cpu(bcn_param->cap_info_bitmap);
@@ -1709,14 +1696,13 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
 
                 /*
                  * If the TSF TLV was appended to the scan results, save this
-                 * entry's TSF value in the networkTSF field.The networkTSF is
-                 * the firmware's TSF value at the time the beacon or probe
-                 * response was received.
+                 * entry's TSF value in the fw_tsf field. It is the firmware's
+                 * TSF value at the time the beacon or probe response was
+                 * received.
                  */
                 if (tsf_tlv)
-                        memcpy(&network_tsf,
-                               &tsf_tlv->tsf_data[idx * TSF_DATA_SIZE],
-                               sizeof(network_tsf));
+                        memcpy(&fw_tsf, &tsf_tlv->tsf_data[idx * TSF_DATA_SIZE],
+                               sizeof(fw_tsf));
 
                 if (channel) {
                         struct ieee80211_channel *chan;
@@ -1739,21 +1725,19 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
 
                         if (chan && !(chan->flags & IEEE80211_CHAN_DISABLED)) {
                                 bss = cfg80211_inform_bss(priv->wdev->wiphy,
-                                              chan, bssid, network_tsf,
+                                              chan, bssid, timestamp,
                                               cap_info_bitmap, beacon_period,
                                               ie_buf, ie_len, rssi, GFP_KERNEL);
-                                *(u8 *)bss->priv = band;
-                                cfg80211_put_bss(bss);
-
+                                bss_priv = (struct mwifiex_bss_priv *)bss->priv;
+                                bss_priv->band = band;
+                                bss_priv->fw_tsf = fw_tsf;
                                 if (priv->media_connected &&
                                     !memcmp(bssid,
                                             priv->curr_bss_params.bss_descriptor
                                             .mac_address, ETH_ALEN))
-                                        mwifiex_update_curr_bss_params
-                                                        (priv, bssid, rssi,
-                                                         ie_buf, ie_len,
-                                                         beacon_period,
-                                                         cap_info_bitmap, band);
+                                        mwifiex_update_curr_bss_params(priv,
+                                                                       bss);
+                                cfg80211_put_bss(bss);
                         }
                 } else {
                         dev_dbg(adapter->dev, "missing BSS channel IE\n");
@@ -2019,8 +2003,8 @@ mwifiex_save_curr_bcn(struct mwifiex_private *priv)
                         (curr_bss->beacon_buf +
                          curr_bss->ht_cap_offset);
 
-        if (curr_bss->bcn_ht_info)
-                curr_bss->bcn_ht_info = (struct ieee80211_ht_info *)
+        if (curr_bss->bcn_ht_oper)
+                curr_bss->bcn_ht_oper = (struct ieee80211_ht_operation *)
                         (curr_bss->beacon_buf +
                          curr_bss->ht_info_offset);
 
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index f8012e2b7f7c..e0377473282f 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -123,6 +123,9 @@ mwifiex_sdio_remove(struct sdio_func *func)
         if (!adapter || !adapter->priv_num)
                 return;
 
+        /* In case driver is removed when asynchronous FW load is in progress */
+        wait_for_completion(&adapter->fw_load);
+
         if (user_rmmod) {
                 if (adapter->is_suspended)
                         mwifiex_sdio_resume(adapter->dev);
@@ -250,6 +253,8 @@ static int mwifiex_sdio_resume(struct device *dev)
         return 0;
 }
 
+/* Device ID for SD8786 */
+#define SDIO_DEVICE_ID_MARVELL_8786   (0x9116)
 /* Device ID for SD8787 */
 #define SDIO_DEVICE_ID_MARVELL_8787   (0x9119)
 /* Device ID for SD8797 */
@@ -257,6 +262,7 @@ static int mwifiex_sdio_resume(struct device *dev)
 
 /* WLAN IDs */
 static const struct sdio_device_id mwifiex_ids[] = {
+        {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8786)},
         {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787)},
         {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797)},
         {},
@@ -1596,6 +1602,9 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter)
         adapter->dev = &func->dev;
 
         switch (func->device) {
+        case SDIO_DEVICE_ID_MARVELL_8786:
+                strcpy(adapter->fw_name, SD8786_DEFAULT_FW_NAME);
+                break;
         case SDIO_DEVICE_ID_MARVELL_8797:
                 strcpy(adapter->fw_name, SD8797_DEFAULT_FW_NAME);
                 break;
@@ -1804,5 +1813,6 @@ MODULE_AUTHOR("Marvell International Ltd.");
 MODULE_DESCRIPTION("Marvell WiFi-Ex SDIO Driver version " SDIO_VERSION);
 MODULE_VERSION(SDIO_VERSION);
 MODULE_LICENSE("GPL v2");
+MODULE_FIRMWARE(SD8786_DEFAULT_FW_NAME);
 MODULE_FIRMWARE(SD8787_DEFAULT_FW_NAME);
 MODULE_FIRMWARE(SD8797_DEFAULT_FW_NAME);
diff --git a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h
index a3fb322205b0..21033738ef0c 100644
--- a/drivers/net/wireless/mwifiex/sdio.h
+++ b/drivers/net/wireless/mwifiex/sdio.h
@@ -28,6 +28,7 @@
 
 #include "main.h"
 
+#define SD8786_DEFAULT_FW_NAME "mrvl/sd8786_uapsta.bin"
 #define SD8787_DEFAULT_FW_NAME "mrvl/sd8787_uapsta.bin"
 #define SD8797_DEFAULT_FW_NAME "mrvl/sd8797_uapsta.bin"
 
@@ -193,7 +194,7 @@
                 a->mpa_tx.ports |= (1<<(a->mpa_tx.pkt_cnt+1+(MAX_PORT - \
                                                 a->mp_end_port)));      \
         a->mpa_tx.pkt_cnt++;                                            \
-} while (0);
+} while (0)
 
 /* SDIO Tx aggregation limit ? */
 #define MP_TX_AGGR_PKT_LIMIT_REACHED(a)                                 \
@@ -211,7 +212,7 @@
         a->mpa_tx.buf_len = 0;                                          \
         a->mpa_tx.ports = 0;                                            \
         a->mpa_tx.start_port = 0;                                       \
-} while (0);
+} while (0)
 
 /* SDIO Rx aggregation limit ? */
 #define MP_RX_AGGR_PKT_LIMIT_REACHED(a)                                 \
@@ -242,7 +243,7 @@
         a->mpa_rx.skb_arr[a->mpa_rx.pkt_cnt] = skb;                     \
         a->mpa_rx.len_arr[a->mpa_rx.pkt_cnt] = skb->len;                \
         a->mpa_rx.pkt_cnt++;                                            \
-} while (0);
+} while (0)
 
 /* Reset SDIO Rx aggregation buffer parameters */
 #define MP_RX_AGGR_BUF_RESET(a) do {                                    \
@@ -250,7 +251,7 @@
         a->mpa_rx.buf_len = 0;                                          \
         a->mpa_rx.ports = 0;                                            \
         a->mpa_rx.start_port = 0;                                       \
-} while (0);
+} while (0)
 
 
 /* data structure for SDIO MPA TX */
diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c
index 6c8e4594b48b..87ed2a1f6cd9 100644
--- a/drivers/net/wireless/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/mwifiex/sta_cmd.c
@@ -907,6 +907,101 @@ mwifiex_cmd_pcie_host_spec(struct mwifiex_private *priv,
 }
 
 /*
+ * This function prepares command for event subscription, configuration
+ * and query. Events can be subscribed or unsubscribed. Current subscribed
+ * events can be queried. Also, current subscribed events are reported in
+ * every FW response.
+ */
+static int
+mwifiex_cmd_802_11_subsc_evt(struct mwifiex_private *priv,
+                             struct host_cmd_ds_command *cmd,
+                             struct mwifiex_ds_misc_subsc_evt *subsc_evt_cfg)
+{
+        struct host_cmd_ds_802_11_subsc_evt *subsc_evt = &cmd->params.subsc_evt;
+        struct mwifiex_ie_types_rssi_threshold *rssi_tlv;
+        u16 event_bitmap;
+        u8 *pos;
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_802_11_SUBSCRIBE_EVENT);
+        cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_802_11_subsc_evt) +
+                                S_DS_GEN);
+
+        subsc_evt->action = cpu_to_le16(subsc_evt_cfg->action);
+        dev_dbg(priv->adapter->dev, "cmd: action: %d\n", subsc_evt_cfg->action);
+
+        /*For query requests, no configuration TLV structures are to be added.*/
+        if (subsc_evt_cfg->action == HostCmd_ACT_GEN_GET)
+                return 0;
+
+        subsc_evt->events = cpu_to_le16(subsc_evt_cfg->events);
+
+        event_bitmap = subsc_evt_cfg->events;
+        dev_dbg(priv->adapter->dev, "cmd: event bitmap : %16x\n",
+                event_bitmap);
+
+        if (((subsc_evt_cfg->action == HostCmd_ACT_BITWISE_CLR) ||
+             (subsc_evt_cfg->action == HostCmd_ACT_BITWISE_SET)) &&
+            (event_bitmap == 0)) {
+                dev_dbg(priv->adapter->dev, "Error: No event specified "
+                        "for bitwise action type\n");
+                return -EINVAL;
+        }
+
+        /*
+         * Append TLV structures for each of the specified events for
+         * subscribing or re-configuring. This is not required for
+         * bitwise unsubscribing request.
+         */
+        if (subsc_evt_cfg->action == HostCmd_ACT_BITWISE_CLR)
+                return 0;
+
+        pos = ((u8 *)subsc_evt) +
+                        sizeof(struct host_cmd_ds_802_11_subsc_evt);
+
+        if (event_bitmap & BITMASK_BCN_RSSI_LOW) {
+                rssi_tlv = (struct mwifiex_ie_types_rssi_threshold *) pos;
+
+                rssi_tlv->header.type = cpu_to_le16(TLV_TYPE_RSSI_LOW);
+                rssi_tlv->header.len =
+                    cpu_to_le16(sizeof(struct mwifiex_ie_types_rssi_threshold) -
+                                sizeof(struct mwifiex_ie_types_header));
+                rssi_tlv->abs_value = subsc_evt_cfg->bcn_l_rssi_cfg.abs_value;
+                rssi_tlv->evt_freq = subsc_evt_cfg->bcn_l_rssi_cfg.evt_freq;
+
+                dev_dbg(priv->adapter->dev, "Cfg Beacon Low Rssi event, "
+                        "RSSI:-%d dBm, Freq:%d\n",
+                        subsc_evt_cfg->bcn_l_rssi_cfg.abs_value,
+                        subsc_evt_cfg->bcn_l_rssi_cfg.evt_freq);
+
+                pos += sizeof(struct mwifiex_ie_types_rssi_threshold);
+                le16_add_cpu(&cmd->size,
+                             sizeof(struct mwifiex_ie_types_rssi_threshold));
+        }
+
+        if (event_bitmap & BITMASK_BCN_RSSI_HIGH) {
+                rssi_tlv = (struct mwifiex_ie_types_rssi_threshold *) pos;
+
+                rssi_tlv->header.type = cpu_to_le16(TLV_TYPE_RSSI_HIGH);
+                rssi_tlv->header.len =
+                    cpu_to_le16(sizeof(struct mwifiex_ie_types_rssi_threshold) -
+                                sizeof(struct mwifiex_ie_types_header));
+                rssi_tlv->abs_value = subsc_evt_cfg->bcn_h_rssi_cfg.abs_value;
+                rssi_tlv->evt_freq = subsc_evt_cfg->bcn_h_rssi_cfg.evt_freq;
+
+                dev_dbg(priv->adapter->dev, "Cfg Beacon High Rssi event, "
+                        "RSSI:-%d dBm, Freq:%d\n",
+                        subsc_evt_cfg->bcn_h_rssi_cfg.abs_value,
+                        subsc_evt_cfg->bcn_h_rssi_cfg.evt_freq);
+
+                pos += sizeof(struct mwifiex_ie_types_rssi_threshold);
+                le16_add_cpu(&cmd->size,
+                             sizeof(struct mwifiex_ie_types_rssi_threshold));
+        }
+
+        return 0;
+}
+
+/*
  * This function prepares the commands before sending them to the firmware.
  *
  * This is a generic function which calls specific command preparation
@@ -1086,6 +1181,9 @@ int mwifiex_sta_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,
         case HostCmd_CMD_PCIE_DESC_DETAILS:
                 ret = mwifiex_cmd_pcie_host_spec(priv, cmd_ptr, cmd_action);
                 break;
+        case HostCmd_CMD_802_11_SUBSCRIBE_EVENT:
+                ret = mwifiex_cmd_802_11_subsc_evt(priv, cmd_ptr, data_buf);
+                break;
         default:
                 dev_err(priv->adapter->dev,
                         "PREP_CMD: unknown cmd- %#x\n", cmd_no);
@@ -1195,7 +1293,7 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta)
         if (ret)
                 return -1;
 
-        if (first_sta) {
+        if (first_sta && (priv->adapter->iface_type != MWIFIEX_USB)) {
                 /* Enable auto deep sleep */
                 auto_ds.auto_ds = DEEP_SLEEP_ON;
                 auto_ds.idle_time = DEEP_SLEEP_IDLE_TIME;
diff --git a/drivers/net/wireless/mwifiex/sta_cmdresp.c b/drivers/net/wireless/mwifiex/sta_cmdresp.c
index 4da19ed0f078..3aa54243dea9 100644
--- a/drivers/net/wireless/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/mwifiex/sta_cmdresp.c
@@ -119,11 +119,11 @@ mwifiex_process_cmdresp_error(struct mwifiex_private *priv,
  * calculated SNR values.
  */
 static int mwifiex_ret_802_11_rssi_info(struct mwifiex_private *priv,
-                                        struct host_cmd_ds_command *resp,
-                                        struct mwifiex_ds_get_signal *signal)
+                                        struct host_cmd_ds_command *resp)
 {
         struct host_cmd_ds_802_11_rssi_info_rsp *rssi_info_rsp =
                                                 &resp->params.rssi_info_rsp;
+        struct mwifiex_ds_misc_subsc_evt subsc_evt;
 
         priv->data_rssi_last = le16_to_cpu(rssi_info_rsp->data_rssi_last);
         priv->data_nf_last = le16_to_cpu(rssi_info_rsp->data_nf_last);
@@ -137,34 +137,29 @@ static int mwifiex_ret_802_11_rssi_info(struct mwifiex_private *priv,
         priv->bcn_rssi_avg = le16_to_cpu(rssi_info_rsp->bcn_rssi_avg);
         priv->bcn_nf_avg = le16_to_cpu(rssi_info_rsp->bcn_nf_avg);
 
-        /* Need to indicate IOCTL complete */
-        if (signal) {
-                memset(signal, 0, sizeof(*signal));
-
-                signal->selector = ALL_RSSI_INFO_MASK;
-
-                /* RSSI */
-                signal->bcn_rssi_last = priv->bcn_rssi_last;
-                signal->bcn_rssi_avg = priv->bcn_rssi_avg;
-                signal->data_rssi_last = priv->data_rssi_last;
-                signal->data_rssi_avg = priv->data_rssi_avg;
-
-                /* SNR */
-                signal->bcn_snr_last =
-                        CAL_SNR(priv->bcn_rssi_last, priv->bcn_nf_last);
-                signal->bcn_snr_avg =
-                        CAL_SNR(priv->bcn_rssi_avg, priv->bcn_nf_avg);
-                signal->data_snr_last =
-                        CAL_SNR(priv->data_rssi_last, priv->data_nf_last);
-                signal->data_snr_avg =
-                        CAL_SNR(priv->data_rssi_avg, priv->data_nf_avg);
-
-                /* NF */
-                signal->bcn_nf_last = priv->bcn_nf_last;
-                signal->bcn_nf_avg = priv->bcn_nf_avg;
-                signal->data_nf_last = priv->data_nf_last;
-                signal->data_nf_avg = priv->data_nf_avg;
+        if (priv->subsc_evt_rssi_state == EVENT_HANDLED)
+                return 0;
+
+        /* Resubscribe low and high rssi events with new thresholds */
+        memset(&subsc_evt, 0x00, sizeof(struct mwifiex_ds_misc_subsc_evt));
+        subsc_evt.events = BITMASK_BCN_RSSI_LOW | BITMASK_BCN_RSSI_HIGH;
+        subsc_evt.action = HostCmd_ACT_BITWISE_SET;
+        if (priv->subsc_evt_rssi_state == RSSI_LOW_RECVD) {
+                subsc_evt.bcn_l_rssi_cfg.abs_value = abs(priv->bcn_rssi_avg -
+                                priv->cqm_rssi_hyst);
+                subsc_evt.bcn_h_rssi_cfg.abs_value = abs(priv->cqm_rssi_thold);
+        } else if (priv->subsc_evt_rssi_state == RSSI_HIGH_RECVD) {
+                subsc_evt.bcn_l_rssi_cfg.abs_value = abs(priv->cqm_rssi_thold);
+                subsc_evt.bcn_h_rssi_cfg.abs_value = abs(priv->bcn_rssi_avg +
+                                priv->cqm_rssi_hyst);
         }
+        subsc_evt.bcn_l_rssi_cfg.evt_freq = 1;
+        subsc_evt.bcn_h_rssi_cfg.evt_freq = 1;
+
+        priv->subsc_evt_rssi_state = EVENT_HANDLED;
+
+        mwifiex_send_cmd_async(priv, HostCmd_CMD_802_11_SUBSCRIBE_EVENT,
+                               0, 0, &subsc_evt);
 
         return 0;
 }
@@ -785,6 +780,28 @@ static int mwifiex_ret_ibss_coalescing_status(struct mwifiex_private *priv,
 }
 
 /*
+ * This function handles the command response for subscribe event command.
+ */
+static int mwifiex_ret_subsc_evt(struct mwifiex_private *priv,
+                                 struct host_cmd_ds_command *resp,
+                                 struct mwifiex_ds_misc_subsc_evt *sub_event)
+{
+        struct host_cmd_ds_802_11_subsc_evt *cmd_sub_event =
+                (struct host_cmd_ds_802_11_subsc_evt *)&resp->params.subsc_evt;
+
+        /* For every subscribe event command (Get/Set/Clear), FW reports the
+         * current set of subscribed events*/
+        dev_dbg(priv->adapter->dev, "Bitmap of currently subscribed events: %16x\n",
+                le16_to_cpu(cmd_sub_event->events));
+
+        /*Return the subscribed event info for a Get request*/
+        if (sub_event)
+                sub_event->events = le16_to_cpu(cmd_sub_event->events);
+
+        return 0;
+}
+
+/*
  * This function handles the command responses.
  *
  * This is a generic function, which calls command specific
@@ -853,7 +870,7 @@ int mwifiex_process_sta_cmdresp(struct mwifiex_private *priv, u16 cmdresp_no,
                 ret = mwifiex_ret_get_log(priv, resp, data_buf);
                 break;
         case HostCmd_CMD_RSSI_INFO:
-                ret = mwifiex_ret_802_11_rssi_info(priv, resp, data_buf);
+                ret = mwifiex_ret_802_11_rssi_info(priv, resp);
                 break;
         case HostCmd_CMD_802_11_SNMP_MIB:
                 ret = mwifiex_ret_802_11_snmp_mib(priv, resp, data_buf);
@@ -924,6 +941,9 @@ int mwifiex_process_sta_cmdresp(struct mwifiex_private *priv, u16 cmdresp_no,
                 break;
         case HostCmd_CMD_PCIE_DESC_DETAILS:
                 break;
+        case HostCmd_CMD_802_11_SUBSCRIBE_EVENT:
+                ret = mwifiex_ret_subsc_evt(priv, resp, data_buf);
+                break;
         default:
                 dev_err(adapter->dev, "CMD_RESP: unknown cmd response %#x\n",
                         resp->command);
diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c
index cc531b536a56..f6bbb9307f86 100644
--- a/drivers/net/wireless/mwifiex/sta_event.c
+++ b/drivers/net/wireless/mwifiex/sta_event.c
@@ -128,9 +128,6 @@ mwifiex_reset_connect_state(struct mwifiex_private *priv)
                 mwifiex_stop_net_dev_queue(priv->netdev, adapter);
         if (netif_carrier_ok(priv->netdev))
                 netif_carrier_off(priv->netdev);
-        /* Reset wireless stats signal info */
-        priv->qual_level = 0;
-        priv->qual_noise = 0;
 }
 
 /*
@@ -317,6 +314,12 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                 break;
 
         case EVENT_RSSI_LOW:
+                cfg80211_cqm_rssi_notify(priv->netdev,
+                                         NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW,
+                                         GFP_KERNEL);
+                mwifiex_send_cmd_async(priv, HostCmd_CMD_RSSI_INFO,
+                                       HostCmd_ACT_GEN_GET, 0, NULL);
+                priv->subsc_evt_rssi_state = RSSI_LOW_RECVD;
                 dev_dbg(adapter->dev, "event: Beacon RSSI_LOW\n");
                 break;
         case EVENT_SNR_LOW:
@@ -326,6 +329,12 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                 dev_dbg(adapter->dev, "event: MAX_FAIL\n");
                 break;
         case EVENT_RSSI_HIGH:
+                cfg80211_cqm_rssi_notify(priv->netdev,
+                                         NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH,
+                                         GFP_KERNEL);
+                mwifiex_send_cmd_async(priv, HostCmd_CMD_RSSI_INFO,
+                                       HostCmd_ACT_GEN_GET, 0, NULL);
+                priv->subsc_evt_rssi_state = RSSI_HIGH_RECVD;
                 dev_dbg(adapter->dev, "event: Beacon RSSI_HIGH\n");
                 break;
         case EVENT_SNR_HIGH:
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index d7b11defafe0..58970e0f7d13 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -155,20 +155,29 @@ int mwifiex_request_set_multicast_list(struct mwifiex_private *priv,
  * information.
  */
 int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv,
-                              u8 *bssid, s32 rssi, u8 *ie_buf,
-                              size_t ie_len, u16 beacon_period,
-                              u16 cap_info_bitmap, u8 band,
+                              struct cfg80211_bss *bss,
                               struct mwifiex_bssdescriptor *bss_desc)
 {
         int ret;
+        u8 *beacon_ie;
+        struct mwifiex_bss_priv *bss_priv = (void *)bss->priv;
 
-        memcpy(bss_desc->mac_address, bssid, ETH_ALEN);
-        bss_desc->rssi = rssi;
-        bss_desc->beacon_buf = ie_buf;
-        bss_desc->beacon_buf_size = ie_len;
-        bss_desc->beacon_period = beacon_period;
-        bss_desc->cap_info_bitmap = cap_info_bitmap;
-        bss_desc->bss_band = band;
+        beacon_ie = kmemdup(bss->information_elements, bss->len_beacon_ies,
+                            GFP_KERNEL);
+        if (!beacon_ie) {
+                dev_err(priv->adapter->dev, " failed to alloc beacon_ie\n");
+                return -ENOMEM;
+        }
+
+        memcpy(bss_desc->mac_address, bss->bssid, ETH_ALEN);
+        bss_desc->rssi = bss->signal;
+        bss_desc->beacon_buf = beacon_ie;
+        bss_desc->beacon_buf_size = bss->len_beacon_ies;
+        bss_desc->beacon_period = bss->beacon_interval;
+        bss_desc->cap_info_bitmap = bss->capability;
+        bss_desc->bss_band = bss_priv->band;
+        bss_desc->fw_tsf = bss_priv->fw_tsf;
+        bss_desc->timestamp = bss->tsf;
         if (bss_desc->cap_info_bitmap & WLAN_CAPABILITY_PRIVACY) {
                 dev_dbg(priv->adapter->dev, "info: InterpretIE: AP WEP enabled\n");
                 bss_desc->privacy = MWIFIEX_802_11_PRIV_FILTER_8021X_WEP;
@@ -180,9 +189,9 @@ int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv,
         else
                 bss_desc->bss_mode = NL80211_IFTYPE_STATION;
 
-        ret = mwifiex_update_bss_desc_with_ie(priv->adapter, bss_desc,
-                                              ie_buf, ie_len);
+        ret = mwifiex_update_bss_desc_with_ie(priv->adapter, bss_desc);
 
+        kfree(beacon_ie);
         return ret;
 }
 
@@ -197,7 +206,6 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
         int ret;
         struct mwifiex_adapter *adapter = priv->adapter;
         struct mwifiex_bssdescriptor *bss_desc = NULL;
-        u8 *beacon_ie = NULL;
 
         priv->scan_block = false;
 
@@ -210,19 +218,7 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
                         return -ENOMEM;
                 }
 
-                beacon_ie = kmemdup(bss->information_elements,
-                                        bss->len_beacon_ies, GFP_KERNEL);
-                if (!beacon_ie) {
-                        kfree(bss_desc);
-                        dev_err(priv->adapter->dev, " failed to alloc beacon_ie\n");
-                        return -ENOMEM;
-                }
-
-                ret = mwifiex_fill_new_bss_desc(priv, bss->bssid, bss->signal,
-                                                beacon_ie, bss->len_beacon_ies,
-                                                bss->beacon_interval,
-                                                bss->capability,
-                                                *(u8 *)bss->priv, bss_desc);
+                ret = mwifiex_fill_new_bss_desc(priv, bss, bss_desc);
                 if (ret)
                         goto done;
         }
@@ -269,7 +265,6 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
                     (!mwifiex_ssid_cmp(&priv->curr_bss_params.bss_descriptor.
                                        ssid, &bss_desc->ssid))) {
                         kfree(bss_desc);
-                        kfree(beacon_ie);
                         return 0;
                 }
 
@@ -304,7 +299,6 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
 
 done:
         kfree(bss_desc);
-        kfree(beacon_ie);
         return ret;
 }
 
@@ -468,7 +462,8 @@ int mwifiex_get_bss_info(struct mwifiex_private *priv,
 
         info->bss_chan = bss_desc->channel;
 
-        info->region_code = adapter->region_code;
+        memcpy(info->country_code, priv->country_code,
+               IEEE80211_COUNTRY_STRING_LEN);
 
         info->media_connected = priv->media_connected;
 
@@ -996,6 +991,39 @@ static int mwifiex_set_wapi_ie(struct mwifiex_private *priv,
 }
 
 /*
+ * IOCTL request handler to set/reset WPS IE.
+ *
+ * The supplied WPS IE is treated as a opaque buffer. Only the first field
+ * is checked to internally enable WPS. If buffer length is zero, the existing
+ * WPS IE is reset.
+ */
+static int mwifiex_set_wps_ie(struct mwifiex_private *priv,
+                               u8 *ie_data_ptr, u16 ie_len)
+{
+        if (ie_len) {
+                priv->wps_ie = kzalloc(MWIFIEX_MAX_VSIE_LEN, GFP_KERNEL);
+                if (!priv->wps_ie)
+                        return -ENOMEM;
+                if (ie_len > sizeof(priv->wps_ie)) {
+                        dev_dbg(priv->adapter->dev,
+                                "info: failed to copy WPS IE, too big\n");
+                        kfree(priv->wps_ie);
+                        return -1;
+                }
+                memcpy(priv->wps_ie, ie_data_ptr, ie_len);
+                priv->wps_ie_len = ie_len;
+                dev_dbg(priv->adapter->dev, "cmd: Set wps_ie_len=%d IE=%#x\n",
+                        priv->wps_ie_len, priv->wps_ie[0]);
+        } else {
+                kfree(priv->wps_ie);
+                priv->wps_ie_len = ie_len;
+                dev_dbg(priv->adapter->dev,
+                        "info: Reset wps_ie_len=%d\n", priv->wps_ie_len);
+        }
+        return 0;
+}
+
+/*
  * IOCTL request handler to set WAPI key.
  *
  * This function prepares the correct firmware command and
@@ -1185,39 +1213,6 @@ mwifiex_drv_get_driver_version(struct mwifiex_adapter *adapter, char *version,
 }
 
 /*
- * Sends IOCTL request to get signal information.
- *
- * This function allocates the IOCTL request buffer, fills it
- * with requisite parameters and calls the IOCTL handler.
- */
-int mwifiex_get_signal_info(struct mwifiex_private *priv,
-                            struct mwifiex_ds_get_signal *signal)
-{
-        int status;
-
-        signal->selector = ALL_RSSI_INFO_MASK;
-
-        /* Signal info can be obtained only if connected */
-        if (!priv->media_connected) {
-                dev_dbg(priv->adapter->dev,
-                        "info: Can not get signal in disconnected state\n");
-                return -1;
-        }
-
-        status = mwifiex_send_cmd_sync(priv, HostCmd_CMD_RSSI_INFO,
-                                       HostCmd_ACT_GEN_GET, 0, signal);
-
-        if (!status) {
-                if (signal->selector & BCN_RSSI_AVG_MASK)
-                        priv->qual_level = signal->bcn_rssi_avg;
-                if (signal->selector & BCN_NF_AVG_MASK)
-                        priv->qual_noise = signal->bcn_nf_avg;
-        }
-
-        return status;
-}
-
-/*
  * Sends IOCTL request to set encoding parameters.
  *
  * This function allocates the IOCTL request buffer, fills it
@@ -1441,6 +1436,7 @@ mwifiex_set_gen_ie_helper(struct mwifiex_private *priv, u8 *ie_data_ptr,
                         priv->wps.session_enable = true;
                         dev_dbg(priv->adapter->dev,
                                 "info: WPS Session Enabled.\n");
+                        ret = mwifiex_set_wps_ie(priv, ie_data_ptr, ie_len);
                 }
 
                 /* Append the passed data to the end of the
diff --git a/drivers/net/wireless/mwifiex/sta_rx.c b/drivers/net/wireless/mwifiex/sta_rx.c
index 750b695aca12..02ce3b77d3e7 100644
--- a/drivers/net/wireless/mwifiex/sta_rx.c
+++ b/drivers/net/wireless/mwifiex/sta_rx.c
@@ -145,7 +145,12 @@ int mwifiex_process_sta_rx_packet(struct mwifiex_adapter *adapter,
                         " rx_pkt_offset=%d, rx_pkt_length=%d\n", skb->len,
                        local_rx_pd->rx_pkt_offset, local_rx_pd->rx_pkt_length);
                 priv->stats.rx_dropped++;
-                dev_kfree_skb_any(skb);
+
+                if (adapter->if_ops.data_complete)
+                        adapter->if_ops.data_complete(adapter, skb);
+                else
+                        dev_kfree_skb_any(skb);
+
                 return ret;
         }
 
@@ -196,8 +201,12 @@ int mwifiex_process_sta_rx_packet(struct mwifiex_adapter *adapter,
                                              (u8) local_rx_pd->rx_pkt_type,
                                              skb);
 
-        if (ret || (rx_pkt_type == PKT_TYPE_BAR))
-                dev_kfree_skb_any(skb);
+        if (ret || (rx_pkt_type == PKT_TYPE_BAR)) {
+                if (adapter->if_ops.data_complete)
+                        adapter->if_ops.data_complete(adapter, skb);
+                else
+                        dev_kfree_skb_any(skb);
+        }
 
         if (ret)
                 priv->stats.rx_dropped++;
diff --git a/drivers/net/wireless/mwifiex/sta_tx.c b/drivers/net/wireless/mwifiex/sta_tx.c
index 7af534feb420..0a046d3a0c16 100644
--- a/drivers/net/wireless/mwifiex/sta_tx.c
+++ b/drivers/net/wireless/mwifiex/sta_tx.c
@@ -149,10 +149,14 @@ int mwifiex_send_null_packet(struct mwifiex_private *priv, u8 flags)
         local_tx_pd->bss_num = priv->bss_num;
         local_tx_pd->bss_type = priv->bss_type;
 
-        skb_push(skb, INTF_HEADER_LEN);
-
-        ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_DATA,
-                                           skb, NULL);
+        if (adapter->iface_type == MWIFIEX_USB) {
+                ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_USB_EP_DATA,
+                                                   skb, NULL);
+        } else {
+                skb_push(skb, INTF_HEADER_LEN);
+                ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_DATA,
+                                                   skb, NULL);
+        }
         switch (ret) {
         case -EBUSY:
                 adapter->data_sent = true;
diff --git a/drivers/net/wireless/mwifiex/txrx.c b/drivers/net/wireless/mwifiex/txrx.c
index d2af8cb98541..e2faec4db108 100644
--- a/drivers/net/wireless/mwifiex/txrx.c
+++ b/drivers/net/wireless/mwifiex/txrx.c
@@ -77,12 +77,23 @@ int mwifiex_process_tx(struct mwifiex_private *priv, struct sk_buff *skb,
                 if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA)
                         local_tx_pd =
                                 (struct txpd *) (head_ptr + INTF_HEADER_LEN);
-
-                ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_DATA,
-                                                   skb, tx_param);
+                if (adapter->iface_type == MWIFIEX_USB) {
+                        adapter->data_sent = true;
+                        skb_pull(skb, INTF_HEADER_LEN);
+                        ret = adapter->if_ops.host_to_card(adapter,
+                                                           MWIFIEX_USB_EP_DATA,
+                                                           skb, NULL);
+                } else {
+                        ret = adapter->if_ops.host_to_card(adapter,
+                                                           MWIFIEX_TYPE_DATA,
+                                                           skb, tx_param);
+                }
         }
 
         switch (ret) {
+        case -ENOSR:
+                dev_err(adapter->dev, "data: -ENOSR is returned\n");
+                break;
         case -EBUSY:
                 if ((GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA) &&
                     (adapter->pps_uapsd_mode) && (adapter->tx_lock_flag)) {
@@ -135,6 +146,9 @@ int mwifiex_write_data_complete(struct mwifiex_adapter *adapter,
         if (!priv)
                 goto done;
 
+        if (adapter->iface_type == MWIFIEX_USB)
+                adapter->data_sent = false;
+
         mwifiex_set_trans_start(priv->netdev);
         if (!status) {
                 priv->stats.tx_packets++;
@@ -162,4 +176,5 @@ done:
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(mwifiex_write_data_complete);
 
diff --git a/drivers/net/wireless/mwifiex/usb.c b/drivers/net/wireless/mwifiex/usb.c
new file mode 100644
index 000000000000..49ebf20c56eb
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/usb.c
@@ -0,0 +1,1052 @@
+/*
+ * Marvell Wireless LAN device driver: USB specific handling
+ *
+ * Copyright (C) 2012, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "main.h"
+#include "usb.h"
+
+#define USB_VERSION     "1.0"
+
+static const char usbdriver_name[] = "usb8797";
+
+static u8 user_rmmod;
+static struct mwifiex_if_ops usb_ops;
+static struct semaphore add_remove_card_sem;
+
+static struct usb_device_id mwifiex_usb_table[] = {
+        {USB_DEVICE(USB8797_VID, USB8797_PID_1)},
+        {USB_DEVICE_AND_INTERFACE_INFO(USB8797_VID, USB8797_PID_2,
+                                       USB_CLASS_VENDOR_SPEC,
+                                       USB_SUBCLASS_VENDOR_SPEC, 0xff)},
+        { }     /* Terminating entry */
+};
+
+MODULE_DEVICE_TABLE(usb, mwifiex_usb_table);
+
+static int mwifiex_usb_submit_rx_urb(struct urb_context *ctx, int size);
+
+/* This function handles received packet. Necessary action is taken based on
+ * cmd/event/data.
+ */
+static int mwifiex_usb_recv(struct mwifiex_adapter *adapter,
+                            struct sk_buff *skb, u8 ep)
+{
+        struct device *dev = adapter->dev;
+        u32 recv_type;
+        __le32 tmp;
+
+        if (adapter->hs_activated)
+                mwifiex_process_hs_config(adapter);
+
+        if (skb->len < INTF_HEADER_LEN) {
+                dev_err(dev, "%s: invalid skb->len\n", __func__);
+                return -1;
+        }
+
+        switch (ep) {
+        case MWIFIEX_USB_EP_CMD_EVENT:
+                dev_dbg(dev, "%s: EP_CMD_EVENT\n", __func__);
+                skb_copy_from_linear_data(skb, &tmp, INTF_HEADER_LEN);
+                recv_type = le32_to_cpu(tmp);
+                skb_pull(skb, INTF_HEADER_LEN);
+
+                switch (recv_type) {
+                case MWIFIEX_USB_TYPE_CMD:
+                        if (skb->len > MWIFIEX_SIZE_OF_CMD_BUFFER) {
+                                dev_err(dev, "CMD: skb->len too large\n");
+                                return -1;
+                        } else if (!adapter->curr_cmd) {
+                                dev_dbg(dev, "CMD: no curr_cmd\n");
+                                if (adapter->ps_state == PS_STATE_SLEEP_CFM) {
+                                        mwifiex_process_sleep_confirm_resp(
+                                                        adapter, skb->data,
+                                                        skb->len);
+                                        return 0;
+                                }
+                                return -1;
+                        }
+
+                        adapter->curr_cmd->resp_skb = skb;
+                        adapter->cmd_resp_received = true;
+                        break;
+                case MWIFIEX_USB_TYPE_EVENT:
+                        if (skb->len < sizeof(u32)) {
+                                dev_err(dev, "EVENT: skb->len too small\n");
+                                return -1;
+                        }
+                        skb_copy_from_linear_data(skb, &tmp, sizeof(u32));
+                        adapter->event_cause = le32_to_cpu(tmp);
+                        skb_pull(skb, sizeof(u32));
+                        dev_dbg(dev, "event_cause %#x\n", adapter->event_cause);
+
+                        if (skb->len > MAX_EVENT_SIZE) {
+                                dev_err(dev, "EVENT: event body too large\n");
+                                return -1;
+                        }
+
+                        skb_copy_from_linear_data(skb, adapter->event_body,
+                                                  skb->len);
+                        adapter->event_received = true;
+                        adapter->event_skb = skb;
+                        break;
+                default:
+                        dev_err(dev, "unknown recv_type %#x\n", recv_type);
+                        return -1;
+                }
+                break;
+        case MWIFIEX_USB_EP_DATA:
+                dev_dbg(dev, "%s: EP_DATA\n", __func__);
+                if (skb->len > MWIFIEX_RX_DATA_BUF_SIZE) {
+                        dev_err(dev, "DATA: skb->len too large\n");
+                        return -1;
+                }
+                skb_queue_tail(&adapter->usb_rx_data_q, skb);
+                adapter->data_received = true;
+                break;
+        default:
+                dev_err(dev, "%s: unknown endport %#x\n", __func__, ep);
+                return -1;
+        }
+
+        return -EINPROGRESS;
+}
+
+static void mwifiex_usb_rx_complete(struct urb *urb)
+{
+        struct urb_context *context = (struct urb_context *)urb->context;
+        struct mwifiex_adapter *adapter = context->adapter;
+        struct sk_buff *skb = context->skb;
+        struct usb_card_rec *card;
+        int recv_length = urb->actual_length;
+        int size, status;
+
+        if (!adapter || !adapter->card) {
+                pr_err("mwifiex adapter or card structure is not valid\n");
+                return;
+        }
+
+        card = (struct usb_card_rec *)adapter->card;
+        if (card->rx_cmd_ep == context->ep)
+                atomic_dec(&card->rx_cmd_urb_pending);
+        else
+                atomic_dec(&card->rx_data_urb_pending);
+
+        if (recv_length) {
+                if (urb->status || (adapter->surprise_removed)) {
+                        dev_err(adapter->dev,
+                                "URB status is failed: %d\n", urb->status);
+                        /* Do not free skb in case of command ep */
+                        if (card->rx_cmd_ep != context->ep)
+                                dev_kfree_skb_any(skb);
+                        goto setup_for_next;
+                }
+                if (skb->len > recv_length)
+                        skb_trim(skb, recv_length);
+                else
+                        skb_put(skb, recv_length - skb->len);
+
+                atomic_inc(&adapter->rx_pending);
+                status = mwifiex_usb_recv(adapter, skb, context->ep);
+
+                dev_dbg(adapter->dev, "info: recv_length=%d, status=%d\n",
+                        recv_length, status);
+                if (status == -EINPROGRESS) {
+                        queue_work(adapter->workqueue, &adapter->main_work);
+
+                        /* urb for data_ep is re-submitted now;
+                         * urb for cmd_ep will be re-submitted in callback
+                         * mwifiex_usb_recv_complete
+                         */
+                        if (card->rx_cmd_ep == context->ep)
+                                return;
+                } else {
+                        atomic_dec(&adapter->rx_pending);
+                        if (status == -1)
+                                dev_err(adapter->dev,
+                                        "received data processing failed!\n");
+
+                        /* Do not free skb in case of command ep */
+                        if (card->rx_cmd_ep != context->ep)
+                                dev_kfree_skb_any(skb);
+                }
+        } else if (urb->status) {
+                if (!adapter->is_suspended) {
+                        dev_warn(adapter->dev,
+                                 "Card is removed: %d\n", urb->status);
+                        adapter->surprise_removed = true;
+                }
+                dev_kfree_skb_any(skb);
+                return;
+        } else {
+                /* Do not free skb in case of command ep */
+                if (card->rx_cmd_ep != context->ep)
+                        dev_kfree_skb_any(skb);
+
+                /* fall through setup_for_next */
+        }
+
+setup_for_next:
+        if (card->rx_cmd_ep == context->ep)
+                size = MWIFIEX_RX_CMD_BUF_SIZE;
+        else
+                size = MWIFIEX_RX_DATA_BUF_SIZE;
+
+        mwifiex_usb_submit_rx_urb(context, size);
+
+        return;
+}
+
+static void mwifiex_usb_tx_complete(struct urb *urb)
+{
+        struct urb_context *context = (struct urb_context *)(urb->context);
+        struct mwifiex_adapter *adapter = context->adapter;
+        struct usb_card_rec *card = adapter->card;
+
+        dev_dbg(adapter->dev, "%s: status: %d\n", __func__, urb->status);
+
+        if (context->ep == card->tx_cmd_ep) {
+                dev_dbg(adapter->dev, "%s: CMD\n", __func__);
+                atomic_dec(&card->tx_cmd_urb_pending);
+                adapter->cmd_sent = false;
+        } else {
+                dev_dbg(adapter->dev, "%s: DATA\n", __func__);
+                atomic_dec(&card->tx_data_urb_pending);
+                mwifiex_write_data_complete(adapter, context->skb,
+                                            urb->status ? -1 : 0);
+        }
+
+        queue_work(adapter->workqueue, &adapter->main_work);
+
+        return;
+}
+
+static int mwifiex_usb_submit_rx_urb(struct urb_context *ctx, int size)
+{
+        struct mwifiex_adapter *adapter = ctx->adapter;
+        struct usb_card_rec *card = (struct usb_card_rec *)adapter->card;
+
+        if (card->rx_cmd_ep != ctx->ep) {
+                ctx->skb = dev_alloc_skb(size);
+                if (!ctx->skb) {
+                        dev_err(adapter->dev,
+                                "%s: dev_alloc_skb failed\n", __func__);
+                        return -ENOMEM;
+                }
+        }
+
+        usb_fill_bulk_urb(ctx->urb, card->udev,
+                          usb_rcvbulkpipe(card->udev, ctx->ep), ctx->skb->data,
+                          size, mwifiex_usb_rx_complete, (void *)ctx);
+
+        if (card->rx_cmd_ep == ctx->ep)
+                atomic_inc(&card->rx_cmd_urb_pending);
+        else
+                atomic_inc(&card->rx_data_urb_pending);
+
+        if (usb_submit_urb(ctx->urb, GFP_ATOMIC)) {
+                dev_err(adapter->dev, "usb_submit_urb failed\n");
+                dev_kfree_skb_any(ctx->skb);
+                ctx->skb = NULL;
+
+                if (card->rx_cmd_ep == ctx->ep)
+                        atomic_dec(&card->rx_cmd_urb_pending);
+                else
+                        atomic_dec(&card->rx_data_urb_pending);
+
+                return -1;
+        }
+
+        return 0;
+}
+
+static void mwifiex_usb_free(struct usb_card_rec *card)
+{
+        int i;
+
+        if (atomic_read(&card->rx_cmd_urb_pending) && card->rx_cmd.urb)
+                usb_kill_urb(card->rx_cmd.urb);
+
+        usb_free_urb(card->rx_cmd.urb);
+        card->rx_cmd.urb = NULL;
+
+        if (atomic_read(&card->rx_data_urb_pending))
+                for (i = 0; i < MWIFIEX_RX_DATA_URB; i++)
+                        if (card->rx_data_list[i].urb)
+                                usb_kill_urb(card->rx_data_list[i].urb);
+
+        for (i = 0; i < MWIFIEX_RX_DATA_URB; i++) {
+                usb_free_urb(card->rx_data_list[i].urb);
+                card->rx_data_list[i].urb = NULL;
+        }
+
+        for (i = 0; i < MWIFIEX_TX_DATA_URB; i++) {
+                usb_free_urb(card->tx_data_list[i].urb);
+                card->tx_data_list[i].urb = NULL;
+        }
+
+        usb_free_urb(card->tx_cmd.urb);
+        card->tx_cmd.urb = NULL;
+
+        return;
+}
+
+/* This function probes an mwifiex device and registers it. It allocates
+ * the card structure, initiates the device registration and initialization
+ * procedure by adding a logical interface.
+ */
+static int mwifiex_usb_probe(struct usb_interface *intf,
+                             const struct usb_device_id *id)
+{
+        struct usb_device *udev = interface_to_usbdev(intf);
+        struct usb_host_interface *iface_desc = intf->cur_altsetting;
+        struct usb_endpoint_descriptor *epd;
+        int ret, i;
+        struct usb_card_rec *card;
+        u16 id_vendor, id_product, bcd_device, bcd_usb;
+
+        card = kzalloc(sizeof(struct usb_card_rec), GFP_KERNEL);
+        if (!card)
+                return -ENOMEM;
+
+        id_vendor = le16_to_cpu(udev->descriptor.idVendor);
+        id_product = le16_to_cpu(udev->descriptor.idProduct);
+        bcd_device = le16_to_cpu(udev->descriptor.bcdDevice);
+        bcd_usb = le16_to_cpu(udev->descriptor.bcdUSB);
+        pr_debug("info: VID/PID = %X/%X, Boot2 version = %X\n",
+                 id_vendor, id_product, bcd_device);
+
+        /* PID_1 is used for firmware downloading only */
+        if (id_product == USB8797_PID_1)
+                card->usb_boot_state = USB8797_FW_DNLD;
+        else
+                card->usb_boot_state = USB8797_FW_READY;
+
+        card->udev = udev;
+        card->intf = intf;
+
+        pr_debug("info: bcdUSB=%#x Device Class=%#x SubClass=%#x Protocl=%#x\n",
+                 udev->descriptor.bcdUSB, udev->descriptor.bDeviceClass,
+                 udev->descriptor.bDeviceSubClass,
+                 udev->descriptor.bDeviceProtocol);
+
+        for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
+                epd = &iface_desc->endpoint[i].desc;
+                if (usb_endpoint_dir_in(epd) &&
+                    usb_endpoint_num(epd) == MWIFIEX_USB_EP_CMD_EVENT &&
+                    usb_endpoint_xfer_bulk(epd)) {
+                        pr_debug("info: bulk IN: max pkt size: %d, addr: %d\n",
+                                 le16_to_cpu(epd->wMaxPacketSize),
+                                 epd->bEndpointAddress);
+                        card->rx_cmd_ep = usb_endpoint_num(epd);
+                        atomic_set(&card->rx_cmd_urb_pending, 0);
+                }
+                if (usb_endpoint_dir_in(epd) &&
+                    usb_endpoint_num(epd) == MWIFIEX_USB_EP_DATA &&
+                    usb_endpoint_xfer_bulk(epd)) {
+                        pr_debug("info: bulk IN: max pkt size: %d, addr: %d\n",
+                                 le16_to_cpu(epd->wMaxPacketSize),
+                                 epd->bEndpointAddress);
+                        card->rx_data_ep = usb_endpoint_num(epd);
+                        atomic_set(&card->rx_data_urb_pending, 0);
+                }
+                if (usb_endpoint_dir_out(epd) &&
+                    usb_endpoint_num(epd) == MWIFIEX_USB_EP_DATA &&
+                    usb_endpoint_xfer_bulk(epd)) {
+                        pr_debug("info: bulk OUT: max pkt size: %d, addr: %d\n",
+                                 le16_to_cpu(epd->wMaxPacketSize),
+                                 epd->bEndpointAddress);
+                        card->tx_data_ep = usb_endpoint_num(epd);
+                        atomic_set(&card->tx_data_urb_pending, 0);
+                }
+                if (usb_endpoint_dir_out(epd) &&
+                    usb_endpoint_num(epd) == MWIFIEX_USB_EP_CMD_EVENT &&
+                    usb_endpoint_xfer_bulk(epd)) {
+                        pr_debug("info: bulk OUT: max pkt size: %d, addr: %d\n",
+                                 le16_to_cpu(epd->wMaxPacketSize),
+                                 epd->bEndpointAddress);
+                        card->tx_cmd_ep = usb_endpoint_num(epd);
+                        atomic_set(&card->tx_cmd_urb_pending, 0);
+                        card->bulk_out_maxpktsize =
+                                        le16_to_cpu(epd->wMaxPacketSize);
+                }
+        }
+
+        usb_set_intfdata(intf, card);
+
+        ret = mwifiex_add_card(card, &add_remove_card_sem, &usb_ops,
+                               MWIFIEX_USB);
+        if (ret) {
+                pr_err("%s: mwifiex_add_card failed: %d\n", __func__, ret);
+                usb_reset_device(udev);
+                kfree(card);
+                return ret;
+        }
+
+        usb_get_dev(udev);
+
+        return 0;
+}
+
+/* Kernel needs to suspend all functions separately. Therefore all
+ * registered functions must have drivers with suspend and resume
+ * methods. Failing that the kernel simply removes the whole card.
+ *
+ * If already not suspended, this function allocates and sends a
+ * 'host sleep activate' request to the firmware and turns off the traffic.
+ */
+static int mwifiex_usb_suspend(struct usb_interface *intf, pm_message_t message)
+{
+        struct usb_card_rec *card = usb_get_intfdata(intf);
+        struct mwifiex_adapter *adapter;
+        int i;
+
+        if (!card || !card->adapter) {
+                pr_err("%s: card or card->adapter is NULL\n", __func__);
+                return 0;
+        }
+        adapter = card->adapter;
+
+        if (unlikely(adapter->is_suspended))
+                dev_warn(adapter->dev, "Device already suspended\n");
+
+        mwifiex_enable_hs(adapter);
+
+        /* 'is_suspended' flag indicates device is suspended.
+         * It must be set here before the usb_kill_urb() calls. Reason
+         * is in the complete handlers, urb->status(= -ENOENT) and
+         * this flag is used in combination to distinguish between a
+         * 'suspended' state and a 'disconnect' one.
+         */
+        adapter->is_suspended = true;
+
+        for (i = 0; i < adapter->priv_num; i++)
+                netif_carrier_off(adapter->priv[i]->netdev);
+
+        if (atomic_read(&card->rx_cmd_urb_pending) && card->rx_cmd.urb)
+                usb_kill_urb(card->rx_cmd.urb);
+
+        if (atomic_read(&card->rx_data_urb_pending))
+                for (i = 0; i < MWIFIEX_RX_DATA_URB; i++)
+                        if (card->rx_data_list[i].urb)
+                                usb_kill_urb(card->rx_data_list[i].urb);
+
+        for (i = 0; i < MWIFIEX_TX_DATA_URB; i++)
+                if (card->tx_data_list[i].urb)
+                        usb_kill_urb(card->tx_data_list[i].urb);
+
+        if (card->tx_cmd.urb)
+                usb_kill_urb(card->tx_cmd.urb);
+
+        return 0;
+}
+
+/* Kernel needs to suspend all functions separately. Therefore all
+ * registered functions must have drivers with suspend and resume
+ * methods. Failing that the kernel simply removes the whole card.
+ *
+ * If already not resumed, this function turns on the traffic and
+ * sends a 'host sleep cancel' request to the firmware.
+ */
+static int mwifiex_usb_resume(struct usb_interface *intf)
+{
+        struct usb_card_rec *card = usb_get_intfdata(intf);
+        struct mwifiex_adapter *adapter;
+        int i;
+
+        if (!card || !card->adapter) {
+                pr_err("%s: card or card->adapter is NULL\n", __func__);
+                return 0;
+        }
+        adapter = card->adapter;
+
+        if (unlikely(!adapter->is_suspended)) {
+                dev_warn(adapter->dev, "Device already resumed\n");
+                return 0;
+        }
+
+        /* Indicate device resumed. The netdev queue will be resumed only
+         * after the urbs have been re-submitted
+         */
+        adapter->is_suspended = false;
+
+        if (!atomic_read(&card->rx_data_urb_pending))
+                for (i = 0; i < MWIFIEX_RX_DATA_URB; i++)
+                        mwifiex_usb_submit_rx_urb(&card->rx_data_list[i],
+                                                  MWIFIEX_RX_DATA_BUF_SIZE);
+
+        if (!atomic_read(&card->rx_cmd_urb_pending)) {
+                card->rx_cmd.skb = dev_alloc_skb(MWIFIEX_RX_CMD_BUF_SIZE);
+                if (card->rx_cmd.skb)
+                        mwifiex_usb_submit_rx_urb(&card->rx_cmd,
+                                                  MWIFIEX_RX_CMD_BUF_SIZE);
+        }
+
+        for (i = 0; i < adapter->priv_num; i++)
+                if (adapter->priv[i]->media_connected)
+                        netif_carrier_on(adapter->priv[i]->netdev);
+
+        /* Disable Host Sleep */
+        if (adapter->hs_activated)
+                mwifiex_cancel_hs(mwifiex_get_priv(adapter,
+                                                   MWIFIEX_BSS_ROLE_ANY),
+                                  MWIFIEX_ASYNC_CMD);
+
+#ifdef CONFIG_PM
+        /* Resume handler may be called due to remote wakeup,
+         * force to exit suspend anyway
+         */
+        usb_disable_autosuspend(card->udev);
+#endif /* CONFIG_PM */
+
+        return 0;
+}
+
+static void mwifiex_usb_disconnect(struct usb_interface *intf)
+{
+        struct usb_card_rec *card = usb_get_intfdata(intf);
+        struct mwifiex_adapter *adapter;
+        int i;
+
+        if (!card || !card->adapter) {
+                pr_err("%s: card or card->adapter is NULL\n", __func__);
+                return;
+        }
+
+        adapter = card->adapter;
+        if (!adapter->priv_num)
+                return;
+
+        /* In case driver is removed when asynchronous FW downloading is
+         * in progress
+         */
+        wait_for_completion(&adapter->fw_load);
+
+        if (user_rmmod) {
+#ifdef CONFIG_PM
+                if (adapter->is_suspended)
+                        mwifiex_usb_resume(intf);
+#endif
+                for (i = 0; i < adapter->priv_num; i++)
+                        if ((GET_BSS_ROLE(adapter->priv[i]) ==
+                             MWIFIEX_BSS_ROLE_STA) &&
+                            adapter->priv[i]->media_connected)
+                                mwifiex_deauthenticate(adapter->priv[i], NULL);
+
+                mwifiex_init_shutdown_fw(mwifiex_get_priv(adapter,
+                                                          MWIFIEX_BSS_ROLE_ANY),
+                                         MWIFIEX_FUNC_SHUTDOWN);
+        }
+
+        mwifiex_usb_free(card);
+
+        dev_dbg(adapter->dev, "%s: removing card\n", __func__);
+        mwifiex_remove_card(adapter, &add_remove_card_sem);
+
+        usb_set_intfdata(intf, NULL);
+        usb_put_dev(interface_to_usbdev(intf));
+        kfree(card);
+
+        return;
+}
+
+static struct usb_driver mwifiex_usb_driver = {
+        .name = usbdriver_name,
+        .probe = mwifiex_usb_probe,
+        .disconnect = mwifiex_usb_disconnect,
+        .id_table = mwifiex_usb_table,
+        .suspend = mwifiex_usb_suspend,
+        .resume = mwifiex_usb_resume,
+        .supports_autosuspend = 1,
+};
+
+static int mwifiex_usb_tx_init(struct mwifiex_adapter *adapter)
+{
+        struct usb_card_rec *card = (struct usb_card_rec *)adapter->card;
+        int i;
+
+        card->tx_cmd.adapter = adapter;
+        card->tx_cmd.ep = card->tx_cmd_ep;
+
+        card->tx_cmd.urb = usb_alloc_urb(0, GFP_KERNEL);
+        if (!card->tx_cmd.urb) {
+                dev_err(adapter->dev, "tx_cmd.urb allocation failed\n");
+                return -ENOMEM;
+        }
+
+        card->tx_data_ix = 0;
+
+        for (i = 0; i < MWIFIEX_TX_DATA_URB; i++) {
+                card->tx_data_list[i].adapter = adapter;
+                card->tx_data_list[i].ep = card->tx_data_ep;
+
+                card->tx_data_list[i].urb = usb_alloc_urb(0, GFP_KERNEL);
+                if (!card->tx_data_list[i].urb) {
+                        dev_err(adapter->dev,
+                                "tx_data_list[] urb allocation failed\n");
+                        return -ENOMEM;
+                }
+        }
+
+        return 0;
+}
+
+static int mwifiex_usb_rx_init(struct mwifiex_adapter *adapter)
+{
+        struct usb_card_rec *card = (struct usb_card_rec *)adapter->card;
+        int i;
+
+        card->rx_cmd.adapter = adapter;
+        card->rx_cmd.ep = card->rx_cmd_ep;
+
+        card->rx_cmd.urb = usb_alloc_urb(0, GFP_KERNEL);
+        if (!card->rx_cmd.urb) {
+                dev_err(adapter->dev, "rx_cmd.urb allocation failed\n");
+                return -ENOMEM;
+        }
+
+        card->rx_cmd.skb = dev_alloc_skb(MWIFIEX_RX_CMD_BUF_SIZE);
+        if (!card->rx_cmd.skb) {
+                dev_err(adapter->dev, "rx_cmd.skb allocation failed\n");
+                return -ENOMEM;
+        }
+
+        if (mwifiex_usb_submit_rx_urb(&card->rx_cmd, MWIFIEX_RX_CMD_BUF_SIZE))
+                return -1;
+
+        for (i = 0; i < MWIFIEX_RX_DATA_URB; i++) {
+                card->rx_data_list[i].adapter = adapter;
+                card->rx_data_list[i].ep = card->rx_data_ep;
+
+                card->rx_data_list[i].urb = usb_alloc_urb(0, GFP_KERNEL);
+                if (!card->rx_data_list[i].urb) {
+                        dev_err(adapter->dev,
+                                "rx_data_list[] urb allocation failed\n");
+                        return -1;
+                }
+                if (mwifiex_usb_submit_rx_urb(&card->rx_data_list[i],
+                                              MWIFIEX_RX_DATA_BUF_SIZE))
+                        return -1;
+        }
+
+        return 0;
+}
+
+static int mwifiex_write_data_sync(struct mwifiex_adapter *adapter, u8 *pbuf,
+                                   u32 *len, u8 ep, u32 timeout)
+{
+        struct usb_card_rec *card = adapter->card;
+        int actual_length, ret;
+
+        if (!(*len % card->bulk_out_maxpktsize))
+                (*len)++;
+
+        /* Send the data block */
+        ret = usb_bulk_msg(card->udev, usb_sndbulkpipe(card->udev, ep), pbuf,
+                           *len, &actual_length, timeout);
+        if (ret) {
+                dev_err(adapter->dev, "usb_bulk_msg for tx failed: %d\n", ret);
+                ret = -1;
+        }
+
+        *len = actual_length;
+
+        return ret;
+}
+
+static int mwifiex_read_data_sync(struct mwifiex_adapter *adapter, u8 *pbuf,
+                                  u32 *len, u8 ep, u32 timeout)
+{
+        struct usb_card_rec *card = adapter->card;
+        int actual_length, ret;
+
+        /* Receive the data response */
+        ret = usb_bulk_msg(card->udev, usb_rcvbulkpipe(card->udev, ep), pbuf,
+                           *len, &actual_length, timeout);
+        if (ret) {
+                dev_err(adapter->dev, "usb_bulk_msg for rx failed: %d\n", ret);
+                ret = -1;
+        }
+
+        *len = actual_length;
+
+        return ret;
+}
+
+/* This function write a command/data packet to card. */
+static int mwifiex_usb_host_to_card(struct mwifiex_adapter *adapter, u8 ep,
+                                    struct sk_buff *skb,
+                                    struct mwifiex_tx_param *tx_param)
+{
+        struct usb_card_rec *card = adapter->card;
+        struct urb_context *context;
+        u8 *data = (u8 *)skb->data;
+        struct urb *tx_urb;
+
+        if (adapter->is_suspended) {
+                dev_err(adapter->dev,
+                        "%s: not allowed while suspended\n", __func__);
+                return -1;
+        }
+
+        if (adapter->surprise_removed) {
+                dev_err(adapter->dev, "%s: device removed\n", __func__);
+                return -1;
+        }
+
+        if (ep == card->tx_data_ep &&
+            atomic_read(&card->tx_data_urb_pending) >= MWIFIEX_TX_DATA_URB) {
+                return -EBUSY;
+        }
+
+        dev_dbg(adapter->dev, "%s: ep=%d\n", __func__, ep);
+
+        if (ep == card->tx_cmd_ep) {
+                context = &card->tx_cmd;
+        } else {
+                if (card->tx_data_ix >= MWIFIEX_TX_DATA_URB)
+                        card->tx_data_ix = 0;
+                context = &card->tx_data_list[card->tx_data_ix++];
+        }
+
+        context->adapter = adapter;
+        context->ep = ep;
+        context->skb = skb;
+        tx_urb = context->urb;
+
+        usb_fill_bulk_urb(tx_urb, card->udev, usb_sndbulkpipe(card->udev, ep),
+                          data, skb->len, mwifiex_usb_tx_complete,
+                          (void *)context);
+
+        tx_urb->transfer_flags |= URB_ZERO_PACKET;
+
+        if (ep == card->tx_cmd_ep)
+                atomic_inc(&card->tx_cmd_urb_pending);
+        else
+                atomic_inc(&card->tx_data_urb_pending);
+
+        if (usb_submit_urb(tx_urb, GFP_ATOMIC)) {
+                dev_err(adapter->dev, "%s: usb_submit_urb failed\n", __func__);
+                if (ep == card->tx_cmd_ep) {
+                        atomic_dec(&card->tx_cmd_urb_pending);
+                } else {
+                        atomic_dec(&card->tx_data_urb_pending);
+                        if (card->tx_data_ix)
+                                card->tx_data_ix--;
+                        else
+                                card->tx_data_ix = MWIFIEX_TX_DATA_URB;
+                }
+
+                return -1;
+        } else {
+                if (ep == card->tx_data_ep &&
+                    atomic_read(&card->tx_data_urb_pending) ==
+                                                        MWIFIEX_TX_DATA_URB)
+                        return -ENOSR;
+        }
+
+        return -EINPROGRESS;
+}
+
+/* This function register usb device and initialize parameter. */
+static int mwifiex_register_dev(struct mwifiex_adapter *adapter)
+{
+        struct usb_card_rec *card = (struct usb_card_rec *)adapter->card;
+
+        card->adapter = adapter;
+        adapter->dev = &card->udev->dev;
+        strcpy(adapter->fw_name, USB8797_DEFAULT_FW_NAME);
+
+        return 0;
+}
+
+/* This function reads one block of firmware data. */
+static int mwifiex_get_fw_data(struct mwifiex_adapter *adapter,
+                               u32 offset, u32 len, u8 *buf)
+{
+        if (!buf || !len)
+                return -1;
+
+        if (offset + len > adapter->firmware->size)
+                return -1;
+
+        memcpy(buf, adapter->firmware->data + offset, len);
+
+        return 0;
+}
+
+static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
+                                    struct mwifiex_fw_image *fw)
+{
+        int ret = 0;
+        u8 *firmware = fw->fw_buf, *recv_buff;
+        u32 retries = USB8797_FW_MAX_RETRY, dlen;
+        u32 fw_seqnum = 0, tlen = 0, dnld_cmd = 0;
+        struct fw_data *fwdata;
+        struct fw_sync_header sync_fw;
+        u8 check_winner = 1;
+
+        if (!firmware) {
+                dev_err(adapter->dev,
+                        "No firmware image found! Terminating download\n");
+                ret = -1;
+                goto fw_exit;
+        }
+
+        /* Allocate memory for transmit */
+        fwdata = kzalloc(FW_DNLD_TX_BUF_SIZE, GFP_KERNEL);
+        if (!fwdata)
+                goto fw_exit;
+
+        /* Allocate memory for receive */
+        recv_buff = kzalloc(FW_DNLD_RX_BUF_SIZE, GFP_KERNEL);
+        if (!recv_buff)
+                goto cleanup;
+
+        do {
+                /* Send pseudo data to check winner status first */
+                if (check_winner) {
+                        memset(&fwdata->fw_hdr, 0, sizeof(struct fw_header));
+                        dlen = 0;
+                } else {
+                        /* copy the header of the fw_data to get the length */
+                        if (firmware)
+                                memcpy(&fwdata->fw_hdr, &firmware[tlen],
+                                       sizeof(struct fw_header));
+                        else
+                                mwifiex_get_fw_data(adapter, tlen,
+                                                    sizeof(struct fw_header),
+                                                    (u8 *)&fwdata->fw_hdr);
+
+                        dlen = le32_to_cpu(fwdata->fw_hdr.data_len);
+                        dnld_cmd = le32_to_cpu(fwdata->fw_hdr.dnld_cmd);
+                        tlen += sizeof(struct fw_header);
+
+                        if (firmware)
+                                memcpy(fwdata->data, &firmware[tlen], dlen);
+                        else
+                                mwifiex_get_fw_data(adapter, tlen, dlen,
+                                                    (u8 *)fwdata->data);
+
+                        fwdata->seq_num = cpu_to_le32(fw_seqnum);
+                        tlen += dlen;
+                }
+
+                /* If the send/receive fails or CRC occurs then retry */
+                while (retries--) {
+                        u8 *buf = (u8 *)fwdata;
+                        u32 len = FW_DATA_XMIT_SIZE;
+
+                        /* send the firmware block */
+                        ret = mwifiex_write_data_sync(adapter, buf, &len,
+                                                MWIFIEX_USB_EP_CMD_EVENT,
+                                                MWIFIEX_USB_TIMEOUT);
+                        if (ret) {
+                                dev_err(adapter->dev,
+                                        "write_data_sync: failed: %d\n", ret);
+                                continue;
+                        }
+
+                        buf = recv_buff;
+                        len = FW_DNLD_RX_BUF_SIZE;
+
+                        /* Receive the firmware block response */
+                        ret = mwifiex_read_data_sync(adapter, buf, &len,
+                                                MWIFIEX_USB_EP_CMD_EVENT,
+                                                MWIFIEX_USB_TIMEOUT);
+                        if (ret) {
+                                dev_err(adapter->dev,
+                                        "read_data_sync: failed: %d\n", ret);
+                                continue;
+                        }
+
+                        memcpy(&sync_fw, recv_buff,
+                               sizeof(struct fw_sync_header));
+
+                        /* check 1st firmware block resp for highest bit set */
+                        if (check_winner) {
+                                if (le32_to_cpu(sync_fw.cmd) & 0x80000000) {
+                                        dev_warn(adapter->dev,
+                                                 "USB is not the winner %#x\n",
+                                                 sync_fw.cmd);
+
+                                        /* returning success */
+                                        ret = 0;
+                                        goto cleanup;
+                                }
+
+                                dev_dbg(adapter->dev,
+                                        "USB is the winner, start to download FW\n");
+
+                                check_winner = 0;
+                                break;
+                        }
+
+                        /* check the firmware block response for CRC errors */
+                        if (sync_fw.cmd) {
+                                dev_err(adapter->dev,
+                                        "FW received block with CRC %#x\n",
+                                        sync_fw.cmd);
+                                ret = -1;
+                                continue;
+                        }
+
+                        retries = USB8797_FW_MAX_RETRY;
+                        break;
+                }
+                fw_seqnum++;
+        } while ((dnld_cmd != FW_HAS_LAST_BLOCK) && retries);
+
+cleanup:
+        dev_dbg(adapter->dev, "%s: %d bytes downloaded\n", __func__, tlen);
+
+        kfree(recv_buff);
+        kfree(fwdata);
+
+        if (retries)
+                ret = 0;
+fw_exit:
+        return ret;
+}
+
+static int mwifiex_usb_dnld_fw(struct mwifiex_adapter *adapter,
+                        struct mwifiex_fw_image *fw)
+{
+        int ret;
+        struct usb_card_rec *card = (struct usb_card_rec *)adapter->card;
+
+        if (card->usb_boot_state == USB8797_FW_DNLD) {
+                ret = mwifiex_prog_fw_w_helper(adapter, fw);
+                if (ret)
+                        return -1;
+
+                /* Boot state changes after successful firmware download */
+                if (card->usb_boot_state == USB8797_FW_DNLD)
+                        return -1;
+        }
+
+        ret = mwifiex_usb_rx_init(adapter);
+        if (!ret)
+                ret = mwifiex_usb_tx_init(adapter);
+
+        return ret;
+}
+
+static void mwifiex_submit_rx_urb(struct mwifiex_adapter *adapter, u8 ep)
+{
+        struct usb_card_rec *card = (struct usb_card_rec *)adapter->card;
+
+        skb_push(card->rx_cmd.skb, INTF_HEADER_LEN);
+        if ((ep == card->rx_cmd_ep) &&
+            (!atomic_read(&card->rx_cmd_urb_pending)))
+                mwifiex_usb_submit_rx_urb(&card->rx_cmd,
+                                          MWIFIEX_RX_CMD_BUF_SIZE);
+
+        return;
+}
+
+static int mwifiex_usb_cmd_event_complete(struct mwifiex_adapter *adapter,
+                                       struct sk_buff *skb)
+{
+        atomic_dec(&adapter->rx_pending);
+        mwifiex_submit_rx_urb(adapter, MWIFIEX_USB_EP_CMD_EVENT);
+
+        return 0;
+}
+
+static int mwifiex_usb_data_complete(struct mwifiex_adapter *adapter,
+                                     struct sk_buff *skb)
+{
+        atomic_dec(&adapter->rx_pending);
+        dev_kfree_skb_any(skb);
+
+        return 0;
+}
+
+/* This function wakes up the card. */
+static int mwifiex_pm_wakeup_card(struct mwifiex_adapter *adapter)
+{
+        /* Simulation of HS_AWAKE event */
+        adapter->pm_wakeup_fw_try = false;
+        adapter->pm_wakeup_card_req = false;
+        adapter->ps_state = PS_STATE_AWAKE;
+
+        return 0;
+}
+
+static struct mwifiex_if_ops usb_ops = {
+        .register_dev =         mwifiex_register_dev,
+        .wakeup =               mwifiex_pm_wakeup_card,
+        .wakeup_complete =      mwifiex_pm_wakeup_card_complete,
+
+        /* USB specific */
+        .dnld_fw =              mwifiex_usb_dnld_fw,
+        .cmdrsp_complete =      mwifiex_usb_cmd_event_complete,
+        .event_complete =       mwifiex_usb_cmd_event_complete,
+        .data_complete =        mwifiex_usb_data_complete,
+        .host_to_card =         mwifiex_usb_host_to_card,
+};
+
+/* This function initializes the USB driver module.
+ *
+ * This initiates the semaphore and registers the device with
+ * USB bus.
+ */
+static int mwifiex_usb_init_module(void)
+{
+        int ret;
+
+        pr_debug("Marvell USB8797 Driver\n");
+
+        sema_init(&add_remove_card_sem, 1);
+
+        ret = usb_register(&mwifiex_usb_driver);
+        if (ret)
+                pr_err("Driver register failed!\n");
+        else
+                pr_debug("info: Driver registered successfully!\n");
+
+        return ret;
+}
+
+/* This function cleans up the USB driver.
+ *
+ * The following major steps are followed in .disconnect for cleanup:
+ *      - Resume the device if its suspended
+ *      - Disconnect the device if connected
+ *      - Shutdown the firmware
+ *      - Unregister the device from USB bus.
+ */
+static void mwifiex_usb_cleanup_module(void)
+{
+        if (!down_interruptible(&add_remove_card_sem))
+                up(&add_remove_card_sem);
+
+        /* set the flag as user is removing this module */
+        user_rmmod = 1;
+
+        usb_deregister(&mwifiex_usb_driver);
+}
+
+module_init(mwifiex_usb_init_module);
+module_exit(mwifiex_usb_cleanup_module);
+
+MODULE_AUTHOR("Marvell International Ltd.");
+MODULE_DESCRIPTION("Marvell WiFi-Ex USB Driver version" USB_VERSION);
+MODULE_VERSION(USB_VERSION);
+MODULE_LICENSE("GPL v2");
+MODULE_FIRMWARE("mrvl/usb8797_uapsta.bin");
diff --git a/drivers/net/wireless/mwifiex/usb.h b/drivers/net/wireless/mwifiex/usb.h
new file mode 100644
index 000000000000..98c4316cd1a9
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/usb.h
@@ -0,0 +1,99 @@
+/*
+ * This file contains definitions for mwifiex USB interface driver.
+ *
+ * Copyright (C) 2012, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#ifndef _MWIFIEX_USB_H
+#define _MWIFIEX_USB_H
+
+#include <linux/usb.h>
+
+#define USB8797_VID             0x1286
+#define USB8797_PID_1           0x2043
+#define USB8797_PID_2           0x2044
+
+#define USB8797_FW_DNLD         1
+#define USB8797_FW_READY        2
+#define USB8797_FW_MAX_RETRY    3
+
+#define MWIFIEX_TX_DATA_URB     6
+#define MWIFIEX_RX_DATA_URB     6
+#define MWIFIEX_USB_TIMEOUT     100
+
+#define USB8797_DEFAULT_FW_NAME "mrvl/usb8797_uapsta.bin"
+
+#define FW_DNLD_TX_BUF_SIZE     620
+#define FW_DNLD_RX_BUF_SIZE     2048
+#define FW_HAS_LAST_BLOCK       0x00000004
+
+#define FW_DATA_XMIT_SIZE \
+        (sizeof(struct fw_header) + dlen + sizeof(u32))
+
+struct urb_context {
+        struct mwifiex_adapter *adapter;
+        struct sk_buff *skb;
+        struct urb *urb;
+        u8 ep;
+};
+
+struct usb_card_rec {
+        struct mwifiex_adapter *adapter;
+        struct usb_device *udev;
+        struct usb_interface *intf;
+        u8 rx_cmd_ep;
+        struct urb_context rx_cmd;
+        atomic_t rx_cmd_urb_pending;
+        struct urb_context rx_data_list[MWIFIEX_RX_DATA_URB];
+        u8 usb_boot_state;
+        u8 rx_data_ep;
+        atomic_t rx_data_urb_pending;
+        u8 tx_data_ep;
+        u8 tx_cmd_ep;
+        atomic_t tx_data_urb_pending;
+        atomic_t tx_cmd_urb_pending;
+        int bulk_out_maxpktsize;
+        struct urb_context tx_cmd;
+        int tx_data_ix;
+        struct urb_context tx_data_list[MWIFIEX_TX_DATA_URB];
+};
+
+struct fw_header {
+        __le32 dnld_cmd;
+        __le32 base_addr;
+        __le32 data_len;
+        __le32 crc;
+};
+
+struct fw_sync_header {
+        __le32 cmd;
+        __le32 seq_num;
+};
+
+struct fw_data {
+        struct fw_header fw_hdr;
+        __le32 seq_num;
+        u8 data[1];
+};
+
+/* This function is called after the card has woken up. */
+static inline int
+mwifiex_pm_wakeup_card_complete(struct mwifiex_adapter *adapter)
+{
+        return 0;
+}
+
+#endif /*_MWIFIEX_USB_H */
diff --git a/drivers/net/wireless/mwifiex/util.c b/drivers/net/wireless/mwifiex/util.c
index 6b399976d6c8..2864c74bdb6f 100644
--- a/drivers/net/wireless/mwifiex/util.c
+++ b/drivers/net/wireless/mwifiex/util.c
@@ -167,6 +167,28 @@ int mwifiex_recv_packet(struct mwifiex_adapter *adapter, struct sk_buff *skb)
         skb->dev = priv->netdev;
         skb->protocol = eth_type_trans(skb, priv->netdev);
         skb->ip_summed = CHECKSUM_NONE;
+
+        /* This is required only in case of 11n and USB as we alloc
+         * a buffer of 4K only if its 11N (to be able to receive 4K
+         * AMSDU packets). In case of SD we allocate buffers based
+         * on the size of packet and hence this is not needed.
+         *
+         * Modifying the truesize here as our allocation for each
+         * skb is 4K but we only receive 2K packets and this cause
+         * the kernel to start dropping packets in case where
+         * application has allocated buffer based on 2K size i.e.
+         * if there a 64K packet received (in IP fragments and
+         * application allocates 64K to receive this packet but
+         * this packet would almost double up because we allocate
+         * each 1.5K fragment in 4K and pass it up. As soon as the
+         * 64K limit hits kernel will start to drop rest of the
+         * fragments. Currently we fail the Filesndl-ht.scr script
+         * for UDP, hence this fix
+         */
+        if ((adapter->iface_type == MWIFIEX_USB) &&
+            (skb->truesize > MWIFIEX_RX_DATA_BUF_SIZE))
+                skb->truesize += (skb->len - MWIFIEX_RX_DATA_BUF_SIZE);
+
         priv->stats.rx_bytes += skb->len;
         priv->stats.rx_packets++;
         if (in_interrupt())
diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c
index 5a7316c6f125..429a1dee2d26 100644
--- a/drivers/net/wireless/mwifiex/wmm.c
+++ b/drivers/net/wireless/mwifiex/wmm.c
@@ -1120,11 +1120,19 @@ mwifiex_send_processed_packet(struct mwifiex_private *priv,
         tx_info = MWIFIEX_SKB_TXCB(skb);
 
         spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, ra_list_flags);
-        tx_param.next_pkt_len =
-                ((skb_next) ? skb_next->len +
-                 sizeof(struct txpd) : 0);
-        ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_DATA, skb,
-                                           &tx_param);
+
+        if (adapter->iface_type == MWIFIEX_USB) {
+                adapter->data_sent = true;
+                ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_USB_EP_DATA,
+                                                   skb, NULL);
+        } else {
+                tx_param.next_pkt_len =
+                        ((skb_next) ? skb_next->len +
+                         sizeof(struct txpd) : 0);
+                ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_DATA,
+                                                   skb, &tx_param);
+        }
+
         switch (ret) {
         case -EBUSY:
                 dev_dbg(adapter->dev, "data: -EBUSY is returned\n");
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index b48674b577e6..cf7bdc66f822 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -1235,7 +1235,7 @@ mwl8k_capture_bssid(struct mwl8k_priv *priv, struct ieee80211_hdr *wh)
 {
         return priv->capture_beacon &&
                 ieee80211_is_beacon(wh->frame_control) &&
-                !compare_ether_addr(wh->addr3, priv->capture_bssid);
+                ether_addr_equal(wh->addr3, priv->capture_bssid);
 }
 
 static inline void mwl8k_save_beacon(struct ieee80211_hw *hw,
@@ -5893,18 +5893,7 @@ static struct pci_driver mwl8k_driver = {
         .shutdown       = __devexit_p(mwl8k_shutdown),
 };
 
-static int __init mwl8k_init(void)
-{
-        return pci_register_driver(&mwl8k_driver);
-}
-
-static void __exit mwl8k_exit(void)
-{
-        pci_unregister_driver(&mwl8k_driver);
-}
-
-module_init(mwl8k_init);
-module_exit(mwl8k_exit);
+module_pci_driver(mwl8k_driver);
 
 MODULE_DESCRIPTION(MWL8K_DESC);
 MODULE_VERSION(MWL8K_VERSION);
diff --git a/drivers/net/wireless/orinoco/fw.c b/drivers/net/wireless/orinoco/fw.c
index 4df8cf64b56c..400a35217644 100644
--- a/drivers/net/wireless/orinoco/fw.c
+++ b/drivers/net/wireless/orinoco/fw.c
@@ -379,11 +379,8 @@ void orinoco_cache_fw(struct orinoco_private *priv, int ap)
 
 void orinoco_uncache_fw(struct orinoco_private *priv)
 {
-        if (priv->cached_pri_fw)
-                release_firmware(priv->cached_pri_fw);
-        if (priv->cached_fw)
-                release_firmware(priv->cached_fw);
-
+        release_firmware(priv->cached_pri_fw);
+        release_firmware(priv->cached_fw);
         priv->cached_pri_fw = NULL;
         priv->cached_fw = NULL;
 }
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index ee8af1f047c8..7cffea795ad2 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -796,11 +796,14 @@ int p54_register_common(struct ieee80211_hw *dev, struct device *pdev)
                 dev_err(pdev, "Cannot register device (%d).\n", err);
                 return err;
         }
+        priv->registered = true;
 
 #ifdef CONFIG_P54_LEDS
         err = p54_init_leds(priv);
-        if (err)
+        if (err) {
+                p54_unregister_common(dev);
                 return err;
+        }
 #endif /* CONFIG_P54_LEDS */
 
         dev_info(pdev, "is registered as '%s'\n", wiphy_name(dev->wiphy));
@@ -840,7 +843,11 @@ void p54_unregister_common(struct ieee80211_hw *dev)
         p54_unregister_leds(priv);
 #endif /* CONFIG_P54_LEDS */
 
-        ieee80211_unregister_hw(dev);
+        if (priv->registered) {
+                priv->registered = false;
+                ieee80211_unregister_hw(dev);
+        }
+
         mutex_destroy(&priv->conf_mutex);
         mutex_destroy(&priv->eeprom_mutex);
 }
diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/p54/p54.h
index 452fa3a64aa1..40b401ed6845 100644
--- a/drivers/net/wireless/p54/p54.h
+++ b/drivers/net/wireless/p54/p54.h
@@ -173,6 +173,7 @@ struct p54_common {
         struct sk_buff_head tx_pending;
         struct sk_buff_head tx_queue;
         struct mutex conf_mutex;
+        bool registered;
 
         /* memory management (as seen by the firmware) */
         u32 rx_start;
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index 45df728183fd..89318adc8c7f 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -667,15 +667,4 @@ static struct pci_driver p54p_driver = {
         .driver.pm      = P54P_PM_OPS,
 };
 
-static int __init p54p_init(void)
-{
-        return pci_register_driver(&p54p_driver);
-}
-
-static void __exit p54p_exit(void)
-{
-        pci_unregister_driver(&p54p_driver);
-}
-
-module_init(p54p_init);
-module_exit(p54p_exit);
+module_pci_driver(p54p_driver);
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index f4d28c39aac7..e1eac830e2fc 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -117,21 +117,18 @@ static const struct {
         u32 intf;
         enum p54u_hw_type type;
         const char *fw;
-        const char *fw_legacy;
         char hw[20];
 } p54u_fwlist[__NUM_P54U_HWTYPES] = {
         {
                 .type = P54U_NET2280,
                 .intf = FW_LM86,
                 .fw = "isl3886usb",
-                .fw_legacy = "isl3890usb",
                 .hw = "ISL3886 + net2280",
         },
         {
                 .type = P54U_3887,
                 .intf = FW_LM87,
                 .fw = "isl3887usb",
-                .fw_legacy = "isl3887usb_bare",
                 .hw = "ISL3887",
         },
 };
@@ -208,6 +205,16 @@ static void p54u_free_urbs(struct ieee80211_hw *dev)
         usb_kill_anchored_urbs(&priv->submitted);
 }
 
+static void p54u_stop(struct ieee80211_hw *dev)
+{
+        /*
+         * TODO: figure out how to reliably stop the 3887 and net2280 so
+         * the hardware is still usable next time we want to start it.
+         * until then, we just stop listening to the hardware..
+         */
+        p54u_free_urbs(dev);
+}
+
 static int p54u_init_urbs(struct ieee80211_hw *dev)
 {
         struct p54u_priv *priv = dev->priv;
@@ -257,6 +264,16 @@ static int p54u_init_urbs(struct ieee80211_hw *dev)
         return ret;
 }
 
+static int p54u_open(struct ieee80211_hw *dev)
+{
+        /*
+         * TODO: Because we don't know how to reliably stop the 3887 and
+         * the isl3886+net2280, other than brutally cut off all
+         * communications. We have to reinitialize the urbs on every start.
+         */
+        return p54u_init_urbs(dev);
+}
+
 static __le32 p54u_lm87_chksum(const __le32 *data, size_t length)
 {
         u32 chk = 0;
@@ -836,70 +853,137 @@ fail:
         return err;
 }
 
-static int p54u_load_firmware(struct ieee80211_hw *dev)
+static int p54_find_type(struct p54u_priv *priv)
 {
-        struct p54u_priv *priv = dev->priv;
-        int err, i;
-
-        BUILD_BUG_ON(ARRAY_SIZE(p54u_fwlist) != __NUM_P54U_HWTYPES);
+        int i;
 
         for (i = 0; i < __NUM_P54U_HWTYPES; i++)
                 if (p54u_fwlist[i].type == priv->hw_type)
                         break;
-
         if (i == __NUM_P54U_HWTYPES)
                 return -EOPNOTSUPP;
 
-        err = request_firmware(&priv->fw, p54u_fwlist[i].fw, &priv->udev->dev);
-        if (err) {
-                dev_err(&priv->udev->dev, "(p54usb) cannot load firmware %s "
-                                          "(%d)!\n", p54u_fwlist[i].fw, err);
+        return i;
+}
 
-                err = request_firmware(&priv->fw, p54u_fwlist[i].fw_legacy,
-                                       &priv->udev->dev);
-                if (err)
-                        return err;
-        }
+static int p54u_start_ops(struct p54u_priv *priv)
+{
+        struct ieee80211_hw *dev = priv->common.hw;
+        int ret;
 
-        err = p54_parse_firmware(dev, priv->fw);
-        if (err)
-                goto out;
+        ret = p54_parse_firmware(dev, priv->fw);
+        if (ret)
+                goto err_out;
+
+        ret = p54_find_type(priv);
+        if (ret < 0)
+                goto err_out;
 
-        if (priv->common.fw_interface != p54u_fwlist[i].intf) {
+        if (priv->common.fw_interface != p54u_fwlist[ret].intf) {
                 dev_err(&priv->udev->dev, "wrong firmware, please get "
                         "a firmware for \"%s\" and try again.\n",
-                        p54u_fwlist[i].hw);
-                err = -EINVAL;
+                        p54u_fwlist[ret].hw);
+                ret = -ENODEV;
+                goto err_out;
         }
 
-out:
-        if (err)
-                release_firmware(priv->fw);
+        ret = priv->upload_fw(dev);
+        if (ret)
+                goto err_out;
 
-        return err;
+        ret = p54u_open(dev);
+        if (ret)
+                goto err_out;
+
+        ret = p54_read_eeprom(dev);
+        if (ret)
+                goto err_stop;
+
+        p54u_stop(dev);
+
+        ret = p54_register_common(dev, &priv->udev->dev);
+        if (ret)
+                goto err_stop;
+
+        return 0;
+
+err_stop:
+        p54u_stop(dev);
+
+err_out:
+        /*
+         * p54u_disconnect will do the rest of the
+         * cleanup
+         */
+        return ret;
 }
 
-static int p54u_open(struct ieee80211_hw *dev)
+static void p54u_load_firmware_cb(const struct firmware *firmware,
+                                  void *context)
 {
-        struct p54u_priv *priv = dev->priv;
+        struct p54u_priv *priv = context;
+        struct usb_device *udev = priv->udev;
         int err;
 
-        err = p54u_init_urbs(dev);
-        if (err) {
-                return err;
+        complete(&priv->fw_wait_load);
+        if (firmware) {
+                priv->fw = firmware;
+                err = p54u_start_ops(priv);
+        } else {
+                err = -ENOENT;
+                dev_err(&udev->dev, "Firmware not found.\n");
         }
 
-        priv->common.open = p54u_init_urbs;
+        if (err) {
+                struct device *parent = priv->udev->dev.parent;
 
-        return 0;
+                dev_err(&udev->dev, "failed to initialize device (%d)\n", err);
+
+                if (parent)
+                        device_lock(parent);
+
+                device_release_driver(&udev->dev);
+                /*
+                 * At this point p54u_disconnect has already freed
+                 * the "priv" context. Do not use it anymore!
+                 */
+                priv = NULL;
+
+                if (parent)
+                        device_unlock(parent);
+        }
+
+        usb_put_dev(udev);
 }
 
-static void p54u_stop(struct ieee80211_hw *dev)
+static int p54u_load_firmware(struct ieee80211_hw *dev,
+                              struct usb_interface *intf)
 {
-        /* TODO: figure out how to reliably stop the 3887 and net2280 so
-           the hardware is still usable next time we want to start it.
-           until then, we just stop listening to the hardware.. */
-        p54u_free_urbs(dev);
+        struct usb_device *udev = interface_to_usbdev(intf);
+        struct p54u_priv *priv = dev->priv;
+        struct device *device = &udev->dev;
+        int err, i;
+
+        BUILD_BUG_ON(ARRAY_SIZE(p54u_fwlist) != __NUM_P54U_HWTYPES);
+
+        init_completion(&priv->fw_wait_load);
+        i = p54_find_type(priv);
+        if (i < 0)
+                return i;
+
+        dev_info(&priv->udev->dev, "Loading firmware file %s\n",
+               p54u_fwlist[i].fw);
+
+        usb_get_dev(udev);
+        err = request_firmware_nowait(THIS_MODULE, 1, p54u_fwlist[i].fw,
+                                      device, GFP_KERNEL, priv,
+                                      p54u_load_firmware_cb);
+        if (err) {
+                dev_err(&priv->udev->dev, "(p54usb) cannot load firmware %s "
+                                          "(%d)!\n", p54u_fwlist[i].fw, err);
+        }
+
+        return err;
 }
 
 static int __devinit p54u_probe(struct usb_interface *intf,
@@ -969,33 +1053,7 @@ static int __devinit p54u_probe(struct usb_interface *intf,
                 priv->common.tx = p54u_tx_net2280;
                 priv->upload_fw = p54u_upload_firmware_net2280;
         }
-        err = p54u_load_firmware(dev);
-        if (err)
-                goto err_free_dev;
-
-        err = priv->upload_fw(dev);
-        if (err)
-                goto err_free_fw;
-
-        p54u_open(dev);
-        err = p54_read_eeprom(dev);
-        p54u_stop(dev);
-        if (err)
-                goto err_free_fw;
-
-        err = p54_register_common(dev, &udev->dev);
-        if (err)
-                goto err_free_fw;
-
-        return 0;
-
-err_free_fw:
-        release_firmware(priv->fw);
-
-err_free_dev:
-        p54_free_common(dev);
-        usb_set_intfdata(intf, NULL);
-        usb_put_dev(udev);
+        err = p54u_load_firmware(dev, intf);
         return err;
 }
 
@@ -1007,9 +1065,10 @@ static void __devexit p54u_disconnect(struct usb_interface *intf)
         if (!dev)
                 return;
 
+        priv = dev->priv;
+        wait_for_completion(&priv->fw_wait_load);
         p54_unregister_common(dev);
 
-        priv = dev->priv;
         usb_put_dev(interface_to_usbdev(intf));
         release_firmware(priv->fw);
         p54_free_common(dev);
@@ -1072,7 +1131,7 @@ static struct usb_driver p54u_driver = {
         .name   = "p54usb",
         .id_table = p54u_table,
         .probe = p54u_probe,
-        .disconnect = p54u_disconnect,
+        .disconnect = __devexit_p(p54u_disconnect),
         .pre_reset = p54u_pre_reset,
         .post_reset = p54u_post_reset,
 #ifdef CONFIG_PM
diff --git a/drivers/net/wireless/p54/p54usb.h b/drivers/net/wireless/p54/p54usb.h
index ed4034ade59a..d273be7272b9 100644
--- a/drivers/net/wireless/p54/p54usb.h
+++ b/drivers/net/wireless/p54/p54usb.h
@@ -143,6 +143,9 @@ struct p54u_priv {
         struct sk_buff_head rx_queue;
         struct usb_anchor submitted;
         const struct firmware *fw;
+
+        /* asynchronous firmware callback */
+        struct completion fw_wait_load;
 };
 
 #endif /* P54USB_H */
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c
index a08a6f0e4dd1..82a1cac920bd 100644
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@ -308,7 +308,7 @@ static void p54_pspoll_workaround(struct p54_common *priv, struct sk_buff *skb)
                 return;
 
         /* only consider beacons from the associated BSSID */
-        if (compare_ether_addr(hdr->addr3, priv->bssid))
+        if (!ether_addr_equal(hdr->addr3, priv->bssid))
                 return;
 
         tim = p54_find_ie(skb, WLAN_EID_TIM);
@@ -914,8 +914,7 @@ void p54_tx_80211(struct ieee80211_hw *dev, struct sk_buff *skb)
         txhdr->hw_queue = queue;
         txhdr->backlog = priv->tx_stats[queue].len - 1;
         memset(txhdr->durations, 0, sizeof(txhdr->durations));
-        txhdr->tx_antenna = ((info->antenna_sel_tx == 0) ?
-                2 : info->antenna_sel_tx - 1) & priv->tx_diversity_mask;
+        txhdr->tx_antenna = 2 & priv->tx_diversity_mask;
         if (priv->rxhw == 5) {
                 txhdr->longbow.cts_rate = cts_rate;
                 txhdr->longbow.output_power = cpu_to_le16(priv->output_power);
diff --git a/drivers/net/wireless/prism54/oid_mgt.c b/drivers/net/wireless/prism54/oid_mgt.c
index 9b796cae4afe..a01606b36e03 100644
--- a/drivers/net/wireless/prism54/oid_mgt.c
+++ b/drivers/net/wireless/prism54/oid_mgt.c
@@ -693,8 +693,6 @@ mgt_update_addr(islpci_private *priv)
         return ret;
 }
 
-#define VEC_SIZE(a) ARRAY_SIZE(a)
-
 int
 mgt_commit(islpci_private *priv)
 {
@@ -704,10 +702,10 @@ mgt_commit(islpci_private *priv)
         if (islpci_get_state(priv) < PRV_STATE_INIT)
                 return 0;
 
-        rvalue = mgt_commit_list(priv, commit_part1, VEC_SIZE(commit_part1));
+        rvalue = mgt_commit_list(priv, commit_part1, ARRAY_SIZE(commit_part1));
 
         if (priv->iw_mode != IW_MODE_MONITOR)
-                rvalue |= mgt_commit_list(priv, commit_part2, VEC_SIZE(commit_part2));
+                rvalue |= mgt_commit_list(priv, commit_part2, ARRAY_SIZE(commit_part2));
 
         u = OID_INL_MODE;
         rvalue |= mgt_commit_list(priv, &u, 1);
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index d66e2980bc27..b91d1bb30b41 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -88,49 +88,6 @@ module_param_named(workaround_interval, modparam_workaround_interval,
 MODULE_PARM_DESC(workaround_interval,
         "set stall workaround interval in msecs (0=disabled) (default: 0)");
 
-
-/* various RNDIS OID defs */
-#define OID_GEN_LINK_SPEED                      cpu_to_le32(0x00010107)
-#define OID_GEN_RNDIS_CONFIG_PARAMETER          cpu_to_le32(0x0001021b)
-
-#define OID_GEN_XMIT_OK                         cpu_to_le32(0x00020101)
-#define OID_GEN_RCV_OK                          cpu_to_le32(0x00020102)
-#define OID_GEN_XMIT_ERROR                      cpu_to_le32(0x00020103)
-#define OID_GEN_RCV_ERROR                       cpu_to_le32(0x00020104)
-#define OID_GEN_RCV_NO_BUFFER                   cpu_to_le32(0x00020105)
-
-#define OID_802_3_CURRENT_ADDRESS               cpu_to_le32(0x01010102)
-#define OID_802_3_MULTICAST_LIST                cpu_to_le32(0x01010103)
-#define OID_802_3_MAXIMUM_LIST_SIZE             cpu_to_le32(0x01010104)
-
-#define OID_802_11_BSSID                        cpu_to_le32(0x0d010101)
-#define OID_802_11_SSID                         cpu_to_le32(0x0d010102)
-#define OID_802_11_INFRASTRUCTURE_MODE          cpu_to_le32(0x0d010108)
-#define OID_802_11_ADD_WEP                      cpu_to_le32(0x0d010113)
-#define OID_802_11_REMOVE_WEP                   cpu_to_le32(0x0d010114)
-#define OID_802_11_DISASSOCIATE                 cpu_to_le32(0x0d010115)
-#define OID_802_11_AUTHENTICATION_MODE          cpu_to_le32(0x0d010118)
-#define OID_802_11_PRIVACY_FILTER               cpu_to_le32(0x0d010119)
-#define OID_802_11_BSSID_LIST_SCAN              cpu_to_le32(0x0d01011a)
-#define OID_802_11_ENCRYPTION_STATUS            cpu_to_le32(0x0d01011b)
-#define OID_802_11_ADD_KEY                      cpu_to_le32(0x0d01011d)
-#define OID_802_11_REMOVE_KEY                   cpu_to_le32(0x0d01011e)
-#define OID_802_11_ASSOCIATION_INFORMATION      cpu_to_le32(0x0d01011f)
-#define OID_802_11_CAPABILITY                   cpu_to_le32(0x0d010122)
-#define OID_802_11_PMKID                        cpu_to_le32(0x0d010123)
-#define OID_802_11_NETWORK_TYPES_SUPPORTED      cpu_to_le32(0x0d010203)
-#define OID_802_11_NETWORK_TYPE_IN_USE          cpu_to_le32(0x0d010204)
-#define OID_802_11_TX_POWER_LEVEL               cpu_to_le32(0x0d010205)
-#define OID_802_11_RSSI                         cpu_to_le32(0x0d010206)
-#define OID_802_11_RSSI_TRIGGER                 cpu_to_le32(0x0d010207)
-#define OID_802_11_FRAGMENTATION_THRESHOLD      cpu_to_le32(0x0d010209)
-#define OID_802_11_RTS_THRESHOLD                cpu_to_le32(0x0d01020a)
-#define OID_802_11_SUPPORTED_RATES              cpu_to_le32(0x0d01020e)
-#define OID_802_11_CONFIGURATION                cpu_to_le32(0x0d010211)
-#define OID_802_11_POWER_MODE                   cpu_to_le32(0x0d010216)
-#define OID_802_11_BSSID_LIST                   cpu_to_le32(0x0d010217)
-
-
 /* Typical noise/maximum signal level values taken from ndiswrapper iw_ndis.h */
 #define WL_NOISE        -96     /* typical noise level in dBm */
 #define WL_SIGMAX       -32     /* typical maximum signal level in dBm */
@@ -149,12 +106,6 @@ MODULE_PARM_DESC(workaround_interval,
 #define BCM4320_DEFAULT_TXPOWER_DBM_50  10
 #define BCM4320_DEFAULT_TXPOWER_DBM_25  7
 
-
-/* codes for "status" field of completion messages */
-#define RNDIS_STATUS_ADAPTER_NOT_READY          cpu_to_le32(0xc0010011)
-#define RNDIS_STATUS_ADAPTER_NOT_OPEN           cpu_to_le32(0xc0010012)
-
-
 /* Known device types */
 #define RNDIS_UNKNOWN   0
 #define RNDIS_BCM4320A  1
@@ -515,7 +466,7 @@ struct rndis_wlan_private {
         int infra_mode;
         bool connected;
         u8 bssid[ETH_ALEN];
-        __le32 current_command_oid;
+        u32 current_command_oid;
 
         /* encryption stuff */
         u8 encr_tx_key_index;
@@ -670,63 +621,63 @@ static int rndis_akm_suite_to_key_mgmt(u32 akm_suite)
 }
 
 #ifdef DEBUG
-static const char *oid_to_string(__le32 oid)
+static const char *oid_to_string(u32 oid)
 {
         switch (oid) {
 #define OID_STR(oid) case oid: return(#oid)
                 /* from rndis_host.h */
-                OID_STR(OID_802_3_PERMANENT_ADDRESS);
-                OID_STR(OID_GEN_MAXIMUM_FRAME_SIZE);
-                OID_STR(OID_GEN_CURRENT_PACKET_FILTER);
-                OID_STR(OID_GEN_PHYSICAL_MEDIUM);
+                OID_STR(RNDIS_OID_802_3_PERMANENT_ADDRESS);
+                OID_STR(RNDIS_OID_GEN_MAXIMUM_FRAME_SIZE);
+                OID_STR(RNDIS_OID_GEN_CURRENT_PACKET_FILTER);
+                OID_STR(RNDIS_OID_GEN_PHYSICAL_MEDIUM);
 
                 /* from rndis_wlan.c */
-                OID_STR(OID_GEN_LINK_SPEED);
-                OID_STR(OID_GEN_RNDIS_CONFIG_PARAMETER);
-
-                OID_STR(OID_GEN_XMIT_OK);
-                OID_STR(OID_GEN_RCV_OK);
-                OID_STR(OID_GEN_XMIT_ERROR);
-                OID_STR(OID_GEN_RCV_ERROR);
-                OID_STR(OID_GEN_RCV_NO_BUFFER);
-
-                OID_STR(OID_802_3_CURRENT_ADDRESS);
-                OID_STR(OID_802_3_MULTICAST_LIST);
-                OID_STR(OID_802_3_MAXIMUM_LIST_SIZE);
-
-                OID_STR(OID_802_11_BSSID);
-                OID_STR(OID_802_11_SSID);
-                OID_STR(OID_802_11_INFRASTRUCTURE_MODE);
-                OID_STR(OID_802_11_ADD_WEP);
-                OID_STR(OID_802_11_REMOVE_WEP);
-                OID_STR(OID_802_11_DISASSOCIATE);
-                OID_STR(OID_802_11_AUTHENTICATION_MODE);
-                OID_STR(OID_802_11_PRIVACY_FILTER);
-                OID_STR(OID_802_11_BSSID_LIST_SCAN);
-                OID_STR(OID_802_11_ENCRYPTION_STATUS);
-                OID_STR(OID_802_11_ADD_KEY);
-                OID_STR(OID_802_11_REMOVE_KEY);
-                OID_STR(OID_802_11_ASSOCIATION_INFORMATION);
-                OID_STR(OID_802_11_CAPABILITY);
-                OID_STR(OID_802_11_PMKID);
-                OID_STR(OID_802_11_NETWORK_TYPES_SUPPORTED);
-                OID_STR(OID_802_11_NETWORK_TYPE_IN_USE);
-                OID_STR(OID_802_11_TX_POWER_LEVEL);
-                OID_STR(OID_802_11_RSSI);
-                OID_STR(OID_802_11_RSSI_TRIGGER);
-                OID_STR(OID_802_11_FRAGMENTATION_THRESHOLD);
-                OID_STR(OID_802_11_RTS_THRESHOLD);
-                OID_STR(OID_802_11_SUPPORTED_RATES);
-                OID_STR(OID_802_11_CONFIGURATION);
-                OID_STR(OID_802_11_POWER_MODE);
-                OID_STR(OID_802_11_BSSID_LIST);
+                OID_STR(RNDIS_OID_GEN_LINK_SPEED);
+                OID_STR(RNDIS_OID_GEN_RNDIS_CONFIG_PARAMETER);
+
+                OID_STR(RNDIS_OID_GEN_XMIT_OK);
+                OID_STR(RNDIS_OID_GEN_RCV_OK);
+                OID_STR(RNDIS_OID_GEN_XMIT_ERROR);
+                OID_STR(RNDIS_OID_GEN_RCV_ERROR);
+                OID_STR(RNDIS_OID_GEN_RCV_NO_BUFFER);
+
+                OID_STR(RNDIS_OID_802_3_CURRENT_ADDRESS);
+                OID_STR(RNDIS_OID_802_3_MULTICAST_LIST);
+                OID_STR(RNDIS_OID_802_3_MAXIMUM_LIST_SIZE);
+
+                OID_STR(RNDIS_OID_802_11_BSSID);
+                OID_STR(RNDIS_OID_802_11_SSID);
+                OID_STR(RNDIS_OID_802_11_INFRASTRUCTURE_MODE);
+                OID_STR(RNDIS_OID_802_11_ADD_WEP);
+                OID_STR(RNDIS_OID_802_11_REMOVE_WEP);
+                OID_STR(RNDIS_OID_802_11_DISASSOCIATE);
+                OID_STR(RNDIS_OID_802_11_AUTHENTICATION_MODE);
+                OID_STR(RNDIS_OID_802_11_PRIVACY_FILTER);
+                OID_STR(RNDIS_OID_802_11_BSSID_LIST_SCAN);
+                OID_STR(RNDIS_OID_802_11_ENCRYPTION_STATUS);
+                OID_STR(RNDIS_OID_802_11_ADD_KEY);
+                OID_STR(RNDIS_OID_802_11_REMOVE_KEY);
+                OID_STR(RNDIS_OID_802_11_ASSOCIATION_INFORMATION);
+                OID_STR(RNDIS_OID_802_11_CAPABILITY);
+                OID_STR(RNDIS_OID_802_11_PMKID);
+                OID_STR(RNDIS_OID_802_11_NETWORK_TYPES_SUPPORTED);
+                OID_STR(RNDIS_OID_802_11_NETWORK_TYPE_IN_USE);
+                OID_STR(RNDIS_OID_802_11_TX_POWER_LEVEL);
+                OID_STR(RNDIS_OID_802_11_RSSI);
+                OID_STR(RNDIS_OID_802_11_RSSI_TRIGGER);
+                OID_STR(RNDIS_OID_802_11_FRAGMENTATION_THRESHOLD);
+                OID_STR(RNDIS_OID_802_11_RTS_THRESHOLD);
+                OID_STR(RNDIS_OID_802_11_SUPPORTED_RATES);
+                OID_STR(RNDIS_OID_802_11_CONFIGURATION);
+                OID_STR(RNDIS_OID_802_11_POWER_MODE);
+                OID_STR(RNDIS_OID_802_11_BSSID_LIST);
 #undef OID_STR
         }
 
         return "?";
 }
 #else
-static const char *oid_to_string(__le32 oid)
+static const char *oid_to_string(u32 oid)
 {
         return "?";
 }
@@ -736,7 +687,7 @@ static const char *oid_to_string(__le32 oid)
 static int rndis_error_status(__le32 rndis_status)
 {
         int ret = -EINVAL;
-        switch (rndis_status) {
+        switch (le32_to_cpu(rndis_status)) {
         case RNDIS_STATUS_SUCCESS:
                 ret = 0;
                 break;
@@ -755,7 +706,7 @@ static int rndis_error_status(__le32 rndis_status)
         return ret;
 }
 
-static int rndis_query_oid(struct usbnet *dev, __le32 oid, void *data, int *len)
+static int rndis_query_oid(struct usbnet *dev, u32 oid, void *data, int *len)
 {
         struct rndis_wlan_private *priv = get_rndis_wlan_priv(dev);
         union {
@@ -782,9 +733,9 @@ static int rndis_query_oid(struct usbnet *dev, __le32 oid, void *data, int *len)
         mutex_lock(&priv->command_lock);
 
         memset(u.get, 0, sizeof *u.get);
-        u.get->msg_type = RNDIS_MSG_QUERY;
+        u.get->msg_type = cpu_to_le32(RNDIS_MSG_QUERY);
         u.get->msg_len = cpu_to_le32(sizeof *u.get);
-        u.get->oid = oid;
+        u.get->oid = cpu_to_le32(oid);
 
         priv->current_command_oid = oid;
         ret = rndis_command(dev, u.header, buflen);
@@ -839,7 +790,7 @@ exit_unlock:
         return ret;
 }
 
-static int rndis_set_oid(struct usbnet *dev, __le32 oid, const void *data,
+static int rndis_set_oid(struct usbnet *dev, u32 oid, const void *data,
                          int len)
 {
         struct rndis_wlan_private *priv = get_rndis_wlan_priv(dev);
@@ -866,9 +817,9 @@ static int rndis_set_oid(struct usbnet *dev, __le32 oid, const void *data,
         mutex_lock(&priv->command_lock);
 
         memset(u.set, 0, sizeof *u.set);
-        u.set->msg_type = RNDIS_MSG_SET;
+        u.set->msg_type = cpu_to_le32(RNDIS_MSG_SET);
         u.set->msg_len = cpu_to_le32(sizeof(*u.set) + len);
-        u.set->oid = oid;
+        u.set->oid = cpu_to_le32(oid);
         u.set->len = cpu_to_le32(len);
         u.set->offset = cpu_to_le32(sizeof(*u.set) - 8);
         u.set->handle = cpu_to_le32(0);
@@ -908,7 +859,7 @@ static int rndis_reset(struct usbnet *usbdev)
 
         reset = (void *)priv->command_buffer;
         memset(reset, 0, sizeof(*reset));
-        reset->msg_type = RNDIS_MSG_RESET;
+        reset->msg_type = cpu_to_le32(RNDIS_MSG_RESET);
         reset->msg_len = cpu_to_le32(sizeof(*reset));
         priv->current_command_oid = 0;
         ret = rndis_command(usbdev, (void *)reset, CONTROL_BUFFER_SIZE);
@@ -994,7 +945,7 @@ static int rndis_set_config_parameter(struct usbnet *dev, char *param,
         }
 #endif
 
-        ret = rndis_set_oid(dev, OID_GEN_RNDIS_CONFIG_PARAMETER,
+        ret = rndis_set_oid(dev, RNDIS_OID_GEN_RNDIS_CONFIG_PARAMETER,
                                                         infobuf, info_len);
         if (ret != 0)
                 netdev_dbg(dev->net, "setting rndis config parameter failed, %d\n",
@@ -1031,9 +982,9 @@ static int rndis_start_bssid_list_scan(struct usbnet *usbdev)
 {
         __le32 tmp;
 
-        /* Note: OID_802_11_BSSID_LIST_SCAN clears internal BSS list. */
+        /* Note: RNDIS_OID_802_11_BSSID_LIST_SCAN clears internal BSS list. */
         tmp = cpu_to_le32(1);
-        return rndis_set_oid(usbdev, OID_802_11_BSSID_LIST_SCAN, &tmp,
+        return rndis_set_oid(usbdev, RNDIS_OID_802_11_BSSID_LIST_SCAN, &tmp,
                                                         sizeof(tmp));
 }
 
@@ -1042,7 +993,8 @@ static int set_essid(struct usbnet *usbdev, struct ndis_80211_ssid *ssid)
         struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
         int ret;
 
-        ret = rndis_set_oid(usbdev, OID_802_11_SSID, ssid, sizeof(*ssid));
+        ret = rndis_set_oid(usbdev, RNDIS_OID_802_11_SSID,
+                            ssid, sizeof(*ssid));
         if (ret < 0) {
                 netdev_warn(usbdev->net, "setting SSID failed (%08X)\n", ret);
                 return ret;
@@ -1059,7 +1011,8 @@ static int set_bssid(struct usbnet *usbdev, const u8 *bssid)
 {
         int ret;
 
-        ret = rndis_set_oid(usbdev, OID_802_11_BSSID, bssid, ETH_ALEN);
+        ret = rndis_set_oid(usbdev, RNDIS_OID_802_11_BSSID,
+                            bssid, ETH_ALEN);
         if (ret < 0) {
                 netdev_warn(usbdev->net, "setting BSSID[%pM] failed (%08X)\n",
                             bssid, ret);
@@ -1083,7 +1036,8 @@ static int get_bssid(struct usbnet *usbdev, u8 bssid[ETH_ALEN])
         int ret, len;
 
         len = ETH_ALEN;
-        ret = rndis_query_oid(usbdev, OID_802_11_BSSID, bssid, &len);
+        ret = rndis_query_oid(usbdev, RNDIS_OID_802_11_BSSID,
+                              bssid, &len);
 
         if (ret != 0)
                 memset(bssid, 0, ETH_ALEN);
@@ -1094,8 +1048,9 @@ static int get_bssid(struct usbnet *usbdev, u8 bssid[ETH_ALEN])
 static int get_association_info(struct usbnet *usbdev,
                         struct ndis_80211_assoc_info *info, int len)
 {
-        return rndis_query_oid(usbdev, OID_802_11_ASSOCIATION_INFORMATION,
-                                info, &len);
+        return rndis_query_oid(usbdev,
+                        RNDIS_OID_802_11_ASSOCIATION_INFORMATION,
+                        info, &len);
 }
 
 static bool is_associated(struct usbnet *usbdev)
@@ -1119,7 +1074,9 @@ static int disassociate(struct usbnet *usbdev, bool reset_ssid)
         int i, ret = 0;
 
         if (priv->radio_on) {
-                ret = rndis_set_oid(usbdev, OID_802_11_DISASSOCIATE, NULL, 0);
+                ret = rndis_set_oid(usbdev,
+                                RNDIS_OID_802_11_DISASSOCIATE,
+                                NULL, 0);
                 if (ret == 0) {
                         priv->radio_on = false;
                         netdev_dbg(usbdev->net, "%s(): radio_on = false\n",
@@ -1181,8 +1138,9 @@ static int set_auth_mode(struct usbnet *usbdev, u32 wpa_version,
                 return -ENOTSUPP;
 
         tmp = cpu_to_le32(auth_mode);
-        ret = rndis_set_oid(usbdev, OID_802_11_AUTHENTICATION_MODE, &tmp,
-                                                                sizeof(tmp));
+        ret = rndis_set_oid(usbdev,
+                            RNDIS_OID_802_11_AUTHENTICATION_MODE,
+                            &tmp, sizeof(tmp));
         if (ret != 0) {
                 netdev_warn(usbdev->net, "setting auth mode failed (%08X)\n",
                             ret);
@@ -1208,8 +1166,9 @@ static int set_priv_filter(struct usbnet *usbdev)
         else
                 tmp = cpu_to_le32(NDIS_80211_PRIV_ACCEPT_ALL);
 
-        return rndis_set_oid(usbdev, OID_802_11_PRIVACY_FILTER, &tmp,
-                                                                sizeof(tmp));
+        return rndis_set_oid(usbdev,
+                             RNDIS_OID_802_11_PRIVACY_FILTER, &tmp,
+                             sizeof(tmp));
 }
 
 static int set_encr_mode(struct usbnet *usbdev, int pairwise, int groupwise)
@@ -1234,8 +1193,9 @@ static int set_encr_mode(struct usbnet *usbdev, int pairwise, int groupwise)
                 encr_mode = NDIS_80211_ENCR_DISABLED;
 
         tmp = cpu_to_le32(encr_mode);
-        ret = rndis_set_oid(usbdev, OID_802_11_ENCRYPTION_STATUS, &tmp,
-                                                                sizeof(tmp));
+        ret = rndis_set_oid(usbdev,
+                        RNDIS_OID_802_11_ENCRYPTION_STATUS, &tmp,
+                        sizeof(tmp));
         if (ret != 0) {
                 netdev_warn(usbdev->net, "setting encr mode failed (%08X)\n",
                             ret);
@@ -1255,8 +1215,9 @@ static int set_infra_mode(struct usbnet *usbdev, int mode)
                    __func__, priv->infra_mode);
 
         tmp = cpu_to_le32(mode);
-        ret = rndis_set_oid(usbdev, OID_802_11_INFRASTRUCTURE_MODE, &tmp,
-                                                                sizeof(tmp));
+        ret = rndis_set_oid(usbdev,
+                            RNDIS_OID_802_11_INFRASTRUCTURE_MODE,
+                            &tmp, sizeof(tmp));
         if (ret != 0) {
                 netdev_warn(usbdev->net, "setting infra mode failed (%08X)\n",
                             ret);
@@ -1282,8 +1243,9 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
                 rts_threshold = 2347;
 
         tmp = cpu_to_le32(rts_threshold);
-        return rndis_set_oid(usbdev, OID_802_11_RTS_THRESHOLD, &tmp,
-                                                                sizeof(tmp));
+        return rndis_set_oid(usbdev,
+                             RNDIS_OID_802_11_RTS_THRESHOLD,
+                             &tmp, sizeof(tmp));
 }
 
 static int set_frag_threshold(struct usbnet *usbdev, u32 frag_threshold)
@@ -1296,8 +1258,9 @@ static int set_frag_threshold(struct usbnet *usbdev, u32 frag_threshold)
                 frag_threshold = 2346;
 
         tmp = cpu_to_le32(frag_threshold);
-        return rndis_set_oid(usbdev, OID_802_11_FRAGMENTATION_THRESHOLD, &tmp,
-                                                                sizeof(tmp));
+        return rndis_set_oid(usbdev,
+                        RNDIS_OID_802_11_FRAGMENTATION_THRESHOLD,
+                        &tmp, sizeof(tmp));
 }
 
 static void set_default_iw_params(struct usbnet *usbdev)
@@ -1333,7 +1296,9 @@ static int set_channel(struct usbnet *usbdev, int channel)
         dsconfig = ieee80211_dsss_chan_to_freq(channel) * 1000;
 
         len = sizeof(config);
-        ret = rndis_query_oid(usbdev, OID_802_11_CONFIGURATION, &config, &len);
+        ret = rndis_query_oid(usbdev,
+                        RNDIS_OID_802_11_CONFIGURATION,
+                        &config, &len);
         if (ret < 0) {
                 netdev_dbg(usbdev->net, "%s(): querying configuration failed\n",
                            __func__);
@@ -1341,8 +1306,9 @@ static int set_channel(struct usbnet *usbdev, int channel)
         }
 
         config.ds_config = cpu_to_le32(dsconfig);
-        ret = rndis_set_oid(usbdev, OID_802_11_CONFIGURATION, &config,
-                                                                sizeof(config));
+        ret = rndis_set_oid(usbdev,
+                        RNDIS_OID_802_11_CONFIGURATION,
+                        &config, sizeof(config));
 
         netdev_dbg(usbdev->net, "%s(): %d -> %d\n", __func__, channel, ret);
 
@@ -1359,8 +1325,10 @@ static struct ieee80211_channel *get_current_channel(struct usbnet *usbdev,
 
         /* Get channel and beacon interval */
         len = sizeof(config);
-        ret = rndis_query_oid(usbdev, OID_802_11_CONFIGURATION, &config, &len);
-        netdev_dbg(usbdev->net, "%s(): OID_802_11_CONFIGURATION -> %d\n",
+        ret = rndis_query_oid(usbdev,
+                        RNDIS_OID_802_11_CONFIGURATION,
+                        &config, &len);
+        netdev_dbg(usbdev->net, "%s(): RNDIS_OID_802_11_CONFIGURATION -> %d\n",
                                 __func__, ret);
         if (ret < 0)
                 return NULL;
@@ -1413,8 +1381,9 @@ static int add_wep_key(struct usbnet *usbdev, const u8 *key, int key_len,
                                     ret);
         }
 
-        ret = rndis_set_oid(usbdev, OID_802_11_ADD_WEP, &ndis_key,
-                                                        sizeof(ndis_key));
+        ret = rndis_set_oid(usbdev,
+                        RNDIS_OID_802_11_ADD_WEP, &ndis_key,
+                        sizeof(ndis_key));
         if (ret != 0) {
                 netdev_warn(usbdev->net, "adding encryption key %d failed (%08X)\n",
                             index + 1, ret);
@@ -1504,9 +1473,10 @@ static int add_wpa_key(struct usbnet *usbdev, const u8 *key, int key_len,
                         get_bssid(usbdev, ndis_key.bssid);
         }
 
-        ret = rndis_set_oid(usbdev, OID_802_11_ADD_KEY, &ndis_key,
-                                        le32_to_cpu(ndis_key.size));
-        netdev_dbg(usbdev->net, "%s(): OID_802_11_ADD_KEY -> %08X\n",
+        ret = rndis_set_oid(usbdev,
+                        RNDIS_OID_802_11_ADD_KEY, &ndis_key,
+                        le32_to_cpu(ndis_key.size));
+        netdev_dbg(usbdev->net, "%s(): RNDIS_OID_802_11_ADD_KEY -> %08X\n",
                    __func__, ret);
         if (ret != 0)
                 return ret;
@@ -1594,14 +1564,16 @@ static int remove_key(struct usbnet *usbdev, u8 index, const u8 *bssid)
                         memset(remove_key.bssid, 0xff,
                                                 sizeof(remove_key.bssid));
 
-                ret = rndis_set_oid(usbdev, OID_802_11_REMOVE_KEY, &remove_key,
-                                                        sizeof(remove_key));
+                ret = rndis_set_oid(usbdev,
+                                RNDIS_OID_802_11_REMOVE_KEY,
+                                &remove_key, sizeof(remove_key));
                 if (ret != 0)
                         return ret;
         } else {
                 keyindex = cpu_to_le32(index);
-                ret = rndis_set_oid(usbdev, OID_802_11_REMOVE_WEP, &keyindex,
-                                                        sizeof(keyindex));
+                ret = rndis_set_oid(usbdev,
+                                RNDIS_OID_802_11_REMOVE_WEP,
+                                &keyindex, sizeof(keyindex));
                 if (ret != 0) {
                         netdev_warn(usbdev->net,
                                     "removing encryption key %d failed (%08X)\n",
@@ -1626,14 +1598,14 @@ static void set_multicast_list(struct usbnet *usbdev)
         char *mc_addrs = NULL;
         int mc_count;
 
-        basefilter = filter = RNDIS_PACKET_TYPE_DIRECTED |
-                              RNDIS_PACKET_TYPE_BROADCAST;
+        basefilter = filter = cpu_to_le32(RNDIS_PACKET_TYPE_DIRECTED |
+                                          RNDIS_PACKET_TYPE_BROADCAST);
 
         if (usbdev->net->flags & IFF_PROMISC) {
-                filter |= RNDIS_PACKET_TYPE_PROMISCUOUS |
-                        RNDIS_PACKET_TYPE_ALL_LOCAL;
+                filter |= cpu_to_le32(RNDIS_PACKET_TYPE_PROMISCUOUS |
+                                      RNDIS_PACKET_TYPE_ALL_LOCAL);
         } else if (usbdev->net->flags & IFF_ALLMULTI) {
-                filter |= RNDIS_PACKET_TYPE_ALL_MULTICAST;
+                filter |= cpu_to_le32(RNDIS_PACKET_TYPE_ALL_MULTICAST);
         }
 
         if (filter != basefilter)
@@ -1646,7 +1618,7 @@ static void set_multicast_list(struct usbnet *usbdev)
         netif_addr_lock_bh(usbdev->net);
         mc_count = netdev_mc_count(usbdev->net);
         if (mc_count > priv->multicast_size) {
-                filter |= RNDIS_PACKET_TYPE_ALL_MULTICAST;
+                filter |= cpu_to_le32(RNDIS_PACKET_TYPE_ALL_MULTICAST);
         } else if (mc_count) {
                 int i = 0;
 
@@ -1669,27 +1641,28 @@ static void set_multicast_list(struct usbnet *usbdev)
                 goto set_filter;
 
         if (mc_count) {
-                ret = rndis_set_oid(usbdev, OID_802_3_MULTICAST_LIST, mc_addrs,
-                                    mc_count * ETH_ALEN);
+                ret = rndis_set_oid(usbdev,
+                                RNDIS_OID_802_3_MULTICAST_LIST,
+                                mc_addrs, mc_count * ETH_ALEN);
                 kfree(mc_addrs);
                 if (ret == 0)
-                        filter |= RNDIS_PACKET_TYPE_MULTICAST;
+                        filter |= cpu_to_le32(RNDIS_PACKET_TYPE_MULTICAST);
                 else
-                        filter |= RNDIS_PACKET_TYPE_ALL_MULTICAST;
+                        filter |= cpu_to_le32(RNDIS_PACKET_TYPE_ALL_MULTICAST);
 
-                netdev_dbg(usbdev->net, "OID_802_3_MULTICAST_LIST(%d, max: %d) -> %d\n",
+                netdev_dbg(usbdev->net, "RNDIS_OID_802_3_MULTICAST_LIST(%d, max: %d) -> %d\n",
                            mc_count, priv->multicast_size, ret);
         }
 
 set_filter:
-        ret = rndis_set_oid(usbdev, OID_GEN_CURRENT_PACKET_FILTER, &filter,
+        ret = rndis_set_oid(usbdev, RNDIS_OID_GEN_CURRENT_PACKET_FILTER, &filter,
                                                         sizeof(filter));
         if (ret < 0) {
                 netdev_warn(usbdev->net, "couldn't set packet filter: %08x\n",
                             le32_to_cpu(filter));
         }
 
-        netdev_dbg(usbdev->net, "OID_GEN_CURRENT_PACKET_FILTER(%08x) -> %d\n",
+        netdev_dbg(usbdev->net, "RNDIS_OID_GEN_CURRENT_PACKET_FILTER(%08x) -> %d\n",
                    le32_to_cpu(filter), ret);
 }
 
@@ -1748,9 +1721,10 @@ static struct ndis_80211_pmkid *get_device_pmkids(struct usbnet *usbdev)
         pmkids->length = cpu_to_le32(len);
         pmkids->bssid_info_count = cpu_to_le32(max_pmkids);
 
-        ret = rndis_query_oid(usbdev, OID_802_11_PMKID, pmkids, &len);
+        ret = rndis_query_oid(usbdev, RNDIS_OID_802_11_PMKID,
+                        pmkids, &len);
         if (ret < 0) {
-                netdev_dbg(usbdev->net, "%s(): OID_802_11_PMKID(%d, %d)"
+                netdev_dbg(usbdev->net, "%s(): RNDIS_OID_802_11_PMKID(%d, %d)"
                                 " -> %d\n", __func__, len, max_pmkids, ret);
 
                 kfree(pmkids);
@@ -1776,10 +1750,10 @@ static int set_device_pmkids(struct usbnet *usbdev,
 
         debug_print_pmkids(usbdev, pmkids, __func__);
 
-        ret = rndis_set_oid(usbdev, OID_802_11_PMKID, pmkids,
-                                                le32_to_cpu(pmkids->length));
+        ret = rndis_set_oid(usbdev, RNDIS_OID_802_11_PMKID, pmkids,
+                            le32_to_cpu(pmkids->length));
         if (ret < 0) {
-                netdev_dbg(usbdev->net, "%s(): OID_802_11_PMKID(%d, %d) -> %d"
+                netdev_dbg(usbdev->net, "%s(): RNDIS_OID_802_11_PMKID(%d, %d) -> %d"
                                 "\n", __func__, len, num_pmkids, ret);
         }
 
@@ -1801,8 +1775,8 @@ static struct ndis_80211_pmkid *remove_pmkid(struct usbnet *usbdev,
                 count = max_pmkids;
 
         for (i = 0; i < count; i++)
-                if (!compare_ether_addr(pmkids->bssid_info[i].bssid,
-                                                        pmksa->bssid))
+                if (ether_addr_equal(pmkids->bssid_info[i].bssid,
+                                     pmksa->bssid))
                         break;
 
         /* pmkid not found */
@@ -1843,8 +1817,8 @@ static struct ndis_80211_pmkid *update_pmkid(struct usbnet *usbdev,
 
         /* update with new pmkid */
         for (i = 0; i < count; i++) {
-                if (compare_ether_addr(pmkids->bssid_info[i].bssid,
-                                                        pmksa->bssid))
+                if (!ether_addr_equal(pmkids->bssid_info[i].bssid,
+                                      pmksa->bssid))
                         continue;
 
                 memcpy(pmkids->bssid_info[i].pmkid, pmksa->pmkid,
@@ -2113,7 +2087,8 @@ resize_buf:
          * resizing until it won't get any bigger.
          */
         new_len = len;
-        ret = rndis_query_oid(usbdev, OID_802_11_BSSID_LIST, buf, &new_len);
+        ret = rndis_query_oid(usbdev, RNDIS_OID_802_11_BSSID_LIST,
+                              buf, &new_len);
         if (ret != 0 || new_len < sizeof(struct ndis_80211_bssid_list_ex))
                 goto out;
 
@@ -2139,7 +2114,7 @@ resize_buf:
         while (check_bssid_list_item(bssid, bssid_len, buf, len)) {
                 if (rndis_bss_info_update(usbdev, bssid) && match_bssid &&
                     matched) {
-                        if (compare_ether_addr(bssid->mac, match_bssid))
+                        if (!ether_addr_equal(bssid->mac, match_bssid))
                                 *matched = true;
                 }
 
@@ -2511,14 +2486,15 @@ static void rndis_fill_station_info(struct usbnet *usbdev,
         memset(sinfo, 0, sizeof(*sinfo));
 
         len = sizeof(linkspeed);
-        ret = rndis_query_oid(usbdev, OID_GEN_LINK_SPEED, &linkspeed, &len);
+        ret = rndis_query_oid(usbdev, RNDIS_OID_GEN_LINK_SPEED, &linkspeed, &len);
         if (ret == 0) {
                 sinfo->txrate.legacy = le32_to_cpu(linkspeed) / 1000;
                 sinfo->filled |= STATION_INFO_TX_BITRATE;
         }
 
         len = sizeof(rssi);
-        ret = rndis_query_oid(usbdev, OID_802_11_RSSI, &rssi, &len);
+        ret = rndis_query_oid(usbdev, RNDIS_OID_802_11_RSSI,
+                              &rssi, &len);
         if (ret == 0) {
                 sinfo->signal = level_to_qual(le32_to_cpu(rssi));
                 sinfo->filled |= STATION_INFO_SIGNAL;
@@ -2531,7 +2507,7 @@ static int rndis_get_station(struct wiphy *wiphy, struct net_device *dev,
         struct rndis_wlan_private *priv = wiphy_priv(wiphy);
         struct usbnet *usbdev = priv->usbdev;
 
-        if (compare_ether_addr(priv->bssid, mac))
+        if (!ether_addr_equal(priv->bssid, mac))
                 return -ENOENT;
 
         rndis_fill_station_info(usbdev, sinfo);
@@ -2624,7 +2600,8 @@ static int rndis_flush_pmksa(struct wiphy *wiphy, struct net_device *netdev)
         pmkid.length = cpu_to_le32(sizeof(pmkid));
         pmkid.bssid_info_count = cpu_to_le32(0);
 
-        return rndis_set_oid(usbdev, OID_802_11_PMKID, &pmkid, sizeof(pmkid));
+        return rndis_set_oid(usbdev, RNDIS_OID_802_11_PMKID,
+                             &pmkid, sizeof(pmkid));
 }
 
 static int rndis_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
@@ -2654,9 +2631,10 @@ static int rndis_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
         priv->power_mode = power_mode;
 
         mode = cpu_to_le32(power_mode);
-        ret = rndis_set_oid(usbdev, OID_802_11_POWER_MODE, &mode, sizeof(mode));
+        ret = rndis_set_oid(usbdev, RNDIS_OID_802_11_POWER_MODE,
+                            &mode, sizeof(mode));
 
-        netdev_dbg(usbdev->net, "%s(): OID_802_11_POWER_MODE -> %d\n",
+        netdev_dbg(usbdev->net, "%s(): RNDIS_OID_802_11_POWER_MODE -> %d\n",
                                 __func__, ret);
 
         return ret;
@@ -2693,10 +2671,11 @@ static void rndis_wlan_craft_connected_bss(struct usbnet *usbdev, u8 *bssid,
         /* Get signal quality, in case of error use rssi=0 and ignore error. */
         len = sizeof(rssi);
         rssi = 0;
-        ret = rndis_query_oid(usbdev, OID_802_11_RSSI, &rssi, &len);
+        ret = rndis_query_oid(usbdev, RNDIS_OID_802_11_RSSI,
+                              &rssi, &len);
         signal = level_to_qual(le32_to_cpu(rssi));
 
-        netdev_dbg(usbdev->net, "%s(): OID_802_11_RSSI -> %d, "
+        netdev_dbg(usbdev->net, "%s(): RNDIS_OID_802_11_RSSI -> %d, "
                    "rssi:%d, qual: %d\n", __func__, ret, le32_to_cpu(rssi),
                    level_to_qual(le32_to_cpu(rssi)));
 
@@ -2720,8 +2699,9 @@ static void rndis_wlan_craft_connected_bss(struct usbnet *usbdev, u8 *bssid,
         /* Get SSID, in case of error, use zero length SSID and ignore error. */
         len = sizeof(ssid);
         memset(&ssid, 0, sizeof(ssid));
-        ret = rndis_query_oid(usbdev, OID_802_11_SSID, &ssid, &len);
-        netdev_dbg(usbdev->net, "%s(): OID_802_11_SSID -> %d, len: %d, ssid: "
+        ret = rndis_query_oid(usbdev, RNDIS_OID_802_11_SSID,
+                              &ssid, &len);
+        netdev_dbg(usbdev->net, "%s(): RNDIS_OID_802_11_SSID -> %d, len: %d, ssid: "
                                 "'%.32s'\n", __func__, ret,
                                 le32_to_cpu(ssid.length), ssid.essid);
 
@@ -2843,7 +2823,7 @@ static void rndis_wlan_do_link_up_work(struct usbnet *usbdev)
          * NDIS spec says: "If the device is associated, but the associated
          *  BSSID is not in its BSSID scan list, then the driver must add an
          *  entry for the BSSID at the end of the data that it returns in
-         *  response to query of OID_802_11_BSSID_LIST."
+         *  response to query of RNDIS_OID_802_11_BSSID_LIST."
          *
          * NOTE: Seems to be true for BCM4320b variant, but not BCM4320a.
          */
@@ -3095,15 +3075,15 @@ static void rndis_wlan_indication(struct usbnet *usbdev, void *ind, int buflen)
         struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
         struct rndis_indicate *msg = ind;
 
-        switch (msg->status) {
+        switch (le32_to_cpu(msg->status)) {
         case RNDIS_STATUS_MEDIA_CONNECT:
-                if (priv->current_command_oid == OID_802_11_ADD_KEY) {
-                        /* OID_802_11_ADD_KEY causes sometimes extra
+                if (priv->current_command_oid == RNDIS_OID_802_11_ADD_KEY) {
+                        /* RNDIS_OID_802_11_ADD_KEY causes sometimes extra
                          * "media connect" indications which confuses driver
                          * and userspace to think that device is
                          * roaming/reassociating when it isn't.
                          */
-                        netdev_dbg(usbdev->net, "ignored OID_802_11_ADD_KEY triggered 'media connect'\n");
+                        netdev_dbg(usbdev->net, "ignored RNDIS_OID_802_11_ADD_KEY triggered 'media connect'\n");
                         return;
                 }
 
@@ -3148,8 +3128,9 @@ static int rndis_wlan_get_caps(struct usbnet *usbdev, struct wiphy *wiphy)
 
         /* determine supported modes */
         len = sizeof(networks_supported);
-        retval = rndis_query_oid(usbdev, OID_802_11_NETWORK_TYPES_SUPPORTED,
-                                                &networks_supported, &len);
+        retval = rndis_query_oid(usbdev,
+                                 RNDIS_OID_802_11_NETWORK_TYPES_SUPPORTED,
+                                 &networks_supported, &len);
         if (retval >= 0) {
                 n = le32_to_cpu(networks_supported.num_items);
                 if (n > 8)
@@ -3173,9 +3154,11 @@ static int rndis_wlan_get_caps(struct usbnet *usbdev, struct wiphy *wiphy)
         /* get device 802.11 capabilities, number of PMKIDs */
         caps = (struct ndis_80211_capability *)caps_buf;
         len = sizeof(caps_buf);
-        retval = rndis_query_oid(usbdev, OID_802_11_CAPABILITY, caps, &len);
+        retval = rndis_query_oid(usbdev,
+                                 RNDIS_OID_802_11_CAPABILITY,
+                                 caps, &len);
         if (retval >= 0) {
-                netdev_dbg(usbdev->net, "OID_802_11_CAPABILITY -> len %d, "
+                netdev_dbg(usbdev->net, "RNDIS_OID_802_11_CAPABILITY -> len %d, "
                                 "ver %d, pmkids %d, auth-encr-pairs %d\n",
                                 le32_to_cpu(caps->length),
                                 le32_to_cpu(caps->version),
@@ -3247,13 +3230,14 @@ static void rndis_device_poller(struct work_struct *work)
         }
 
         len = sizeof(rssi);
-        ret = rndis_query_oid(usbdev, OID_802_11_RSSI, &rssi, &len);
+        ret = rndis_query_oid(usbdev, RNDIS_OID_802_11_RSSI,
+                              &rssi, &len);
         if (ret == 0) {
                 priv->last_qual = level_to_qual(le32_to_cpu(rssi));
                 rndis_do_cqm(usbdev, le32_to_cpu(rssi));
         }
 
-        netdev_dbg(usbdev->net, "dev-poller: OID_802_11_RSSI -> %d, rssi:%d, qual: %d\n",
+        netdev_dbg(usbdev->net, "dev-poller: RNDIS_OID_802_11_RSSI -> %d, rssi:%d, qual: %d\n",
                    ret, le32_to_cpu(rssi), level_to_qual(le32_to_cpu(rssi)));
 
         /* Workaround transfer stalls on poor quality links.
@@ -3275,15 +3259,18 @@ static void rndis_device_poller(struct work_struct *work)
                  * working.
                  */
                 tmp = cpu_to_le32(1);
-                rndis_set_oid(usbdev, OID_802_11_BSSID_LIST_SCAN, &tmp,
-                                                                sizeof(tmp));
+                rndis_set_oid(usbdev,
+                              RNDIS_OID_802_11_BSSID_LIST_SCAN,
+                              &tmp, sizeof(tmp));
 
                 len = CONTROL_BUFFER_SIZE;
                 buf = kmalloc(len, GFP_KERNEL);
                 if (!buf)
                         goto end;
 
-                rndis_query_oid(usbdev, OID_802_11_BSSID_LIST, buf, &len);
+                rndis_query_oid(usbdev,
+                                RNDIS_OID_802_11_BSSID_LIST,
+                                buf, &len);
                 kfree(buf);
         }
 
@@ -3465,13 +3452,15 @@ static int rndis_wlan_bind(struct usbnet *usbdev, struct usb_interface *intf)
          */
         usbdev->net->netdev_ops = &rndis_wlan_netdev_ops;
 
-        tmp = RNDIS_PACKET_TYPE_DIRECTED | RNDIS_PACKET_TYPE_BROADCAST;
-        retval = rndis_set_oid(usbdev, OID_GEN_CURRENT_PACKET_FILTER, &tmp,
-                                                                sizeof(tmp));
+        tmp = cpu_to_le32(RNDIS_PACKET_TYPE_DIRECTED | RNDIS_PACKET_TYPE_BROADCAST);
+        retval = rndis_set_oid(usbdev,
+                               RNDIS_OID_GEN_CURRENT_PACKET_FILTER,
+                               &tmp, sizeof(tmp));
 
         len = sizeof(tmp);
-        retval = rndis_query_oid(usbdev, OID_802_3_MAXIMUM_LIST_SIZE, &tmp,
-                                                                &len);
+        retval = rndis_query_oid(usbdev,
+                                 RNDIS_OID_802_3_MAXIMUM_LIST_SIZE,
+                                 &tmp, &len);
         priv->multicast_size = le32_to_cpu(tmp);
         if (retval < 0 || priv->multicast_size < 0)
                 priv->multicast_size = 0;
@@ -3601,7 +3590,7 @@ static int rndis_wlan_stop(struct usbnet *usbdev)
         /* Set current packet filter zero to block receiving data packets from
            device. */
         filter = 0;
-        rndis_set_oid(usbdev, OID_GEN_CURRENT_PACKET_FILTER, &filter,
+        rndis_set_oid(usbdev, RNDIS_OID_GEN_CURRENT_PACKET_FILTER, &filter,
                                                                 sizeof(filter));
 
         return retval;
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index 3a6b40239bc1..5e6b50143165 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -1828,15 +1828,4 @@ static struct pci_driver rt2400pci_driver = {
         .resume         = rt2x00pci_resume,
 };
 
-static int __init rt2400pci_init(void)
-{
-        return pci_register_driver(&rt2400pci_driver);
-}
-
-static void __exit rt2400pci_exit(void)
-{
-        pci_unregister_driver(&rt2400pci_driver);
-}
-
-module_init(rt2400pci_init);
-module_exit(rt2400pci_exit);
+module_pci_driver(rt2400pci_driver);
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index dcc0e1fcca77..136b849f11b5 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -2119,15 +2119,4 @@ static struct pci_driver rt2500pci_driver = {
         .resume         = rt2x00pci_resume,
 };
 
-static int __init rt2500pci_init(void)
-{
-        return pci_register_driver(&rt2500pci_driver);
-}
-
-static void __exit rt2500pci_exit(void)
-{
-        pci_unregister_driver(&rt2500pci_driver);
-}
-
-module_init(rt2500pci_init);
-module_exit(rt2500pci_exit);
+module_pci_driver(rt2500pci_driver);
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 1de9c752c88b..c88fd3e61090 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1912,7 +1912,7 @@ static struct usb_device_id rt2500usb_device_table[] = {
         { USB_DEVICE(0x0b05, 0x1706) },
         { USB_DEVICE(0x0b05, 0x1707) },
         /* Belkin */
-        { USB_DEVICE(0x050d, 0x7050) },
+        { USB_DEVICE(0x050d, 0x7050) }, /* FCC ID: K7SF5D7050A ver. 2.x */
         { USB_DEVICE(0x050d, 0x7051) },
         /* Cisco Systems */
         { USB_DEVICE(0x13b1, 0x000d) },
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index 063bfa8b91f4..9348521e0832 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -83,6 +83,7 @@
 #define REV_RT3090E                     0x0211
 #define REV_RT3390E                     0x0211
 #define REV_RT5390F                     0x0502
+#define REV_RT5390R                     0x1502
 
 /*
  * Signal information.
@@ -98,9 +99,11 @@
 #define EEPROM_BASE                     0x0000
 #define EEPROM_SIZE                     0x0110
 #define BBP_BASE                        0x0000
-#define BBP_SIZE                        0x0080
+#define BBP_SIZE                        0x00ff
 #define RF_BASE                         0x0004
 #define RF_SIZE                         0x0010
+#define RFCSR_BASE                      0x0000
+#define RFCSR_SIZE                      0x0040
 
 /*
  * Number of TX queues.
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 6c0a12ea6a15..dfc90d34be6d 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -290,11 +290,25 @@ int rt2800_wait_wpdma_ready(struct rt2x00_dev *rt2x00dev)
                 msleep(10);
         }
 
-        ERROR(rt2x00dev, "WPDMA TX/RX busy, aborting.\n");
+        ERROR(rt2x00dev, "WPDMA TX/RX busy [0x%08x].\n", reg);
         return -EACCES;
 }
 EXPORT_SYMBOL_GPL(rt2800_wait_wpdma_ready);
 
+void rt2800_disable_wpdma(struct rt2x00_dev *rt2x00dev)
+{
+        u32 reg;
+
+        rt2800_register_read(rt2x00dev, WPDMA_GLO_CFG, &reg);
+        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_TX_DMA, 0);
+        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_TX_DMA_BUSY, 0);
+        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_RX_DMA, 0);
+        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_RX_DMA_BUSY, 0);
+        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_TX_WRITEBACK_DONE, 1);
+        rt2800_register_write(rt2x00dev, WPDMA_GLO_CFG, reg);
+}
+EXPORT_SYMBOL_GPL(rt2800_disable_wpdma);
+
 static bool rt2800_check_firmware_crc(const u8 *data, const size_t len)
 {
         u16 fw_crc;
@@ -412,6 +426,8 @@ int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev,
                 rt2800_register_write(rt2x00dev, PWR_PIN_CFG, 0x00000002);
         }
 
+        rt2800_disable_wpdma(rt2x00dev);
+
         /*
          * Write firmware to the device.
          */
@@ -436,10 +452,7 @@ int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev,
          * Disable DMA, will be reenabled later when enabling
          * the radio.
          */
-        rt2800_register_read(rt2x00dev, WPDMA_GLO_CFG, &reg);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_TX_DMA, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_RX_DMA, 0);
-        rt2800_register_write(rt2x00dev, WPDMA_GLO_CFG, reg);
+        rt2800_disable_wpdma(rt2x00dev);
 
         /*
          * Initialize firmware.
@@ -823,6 +836,13 @@ const struct rt2x00debug rt2800_rt2x00debug = {
                 .word_size      = sizeof(u32),
                 .word_count     = RF_SIZE / sizeof(u32),
         },
+        .rfcsr  = {
+                .read           = rt2800_rfcsr_read,
+                .write          = rt2800_rfcsr_write,
+                .word_base      = RFCSR_BASE,
+                .word_size      = sizeof(u8),
+                .word_count     = RFCSR_SIZE / sizeof(u8),
+        },
 };
 EXPORT_SYMBOL_GPL(rt2800_rt2x00debug);
 #endif /* CONFIG_RT2X00_LIB_DEBUGFS */
@@ -2717,13 +2737,7 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
         unsigned int i;
         int ret;
 
-        rt2800_register_read(rt2x00dev, WPDMA_GLO_CFG, &reg);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_TX_DMA, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_TX_DMA_BUSY, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_RX_DMA, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_RX_DMA_BUSY, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_TX_WRITEBACK_DONE, 1);
-        rt2800_register_write(rt2x00dev, WPDMA_GLO_CFG, reg);
+        rt2800_disable_wpdma(rt2x00dev);
 
         ret = rt2800_drv_init_registers(rt2x00dev);
         if (ret)
@@ -3349,6 +3363,13 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
                         rt2800_register_write(rt2x00dev, GPIO_CTRL_CFG, reg);
                 }
 
+                /* This chip has hardware antenna diversity*/
+                if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390R)) {
+                        rt2800_bbp_write(rt2x00dev, 150, 0); /* Disable Antenna Software OFDM */
+                        rt2800_bbp_write(rt2x00dev, 151, 0); /* Disable Antenna Software CCK */
+                        rt2800_bbp_write(rt2x00dev, 154, 0); /* Clear previously selected antenna */
+                }
+
                 rt2800_bbp_read(rt2x00dev, 152, &value);
                 if (ant == 0)
                         rt2x00_set_field8(&value, BBP152_RX_DEFAULT_ANT, 1);
@@ -3997,10 +4018,7 @@ void rt2800_disable_radio(struct rt2x00_dev *rt2x00dev)
 {
         u32 reg;
 
-        rt2800_register_read(rt2x00dev, WPDMA_GLO_CFG, &reg);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_TX_DMA, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_RX_DMA, 0);
-        rt2800_register_write(rt2x00dev, WPDMA_GLO_CFG, reg);
+        rt2800_disable_wpdma(rt2x00dev);
 
         /* Wait for DMA, ignore error */
         rt2800_wait_wpdma_ready(rt2x00dev);
@@ -4287,6 +4305,11 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00dev->default_ant.rx = ANTENNA_A;
         }
 
+        if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390R)) {
+                rt2x00dev->default_ant.tx = ANTENNA_HW_DIVERSITY; /* Unused */
+                rt2x00dev->default_ant.rx = ANTENNA_HW_DIVERSITY; /* Unused */
+        }
+
         /*
          * Determine external LNA informations.
          */
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.h b/drivers/net/wireless/rt2x00/rt2800lib.h
index 419e36cb06be..18a0b67b4c68 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.h
+++ b/drivers/net/wireless/rt2x00/rt2800lib.h
@@ -208,5 +208,6 @@ int rt2800_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                         u8 buf_size);
 int rt2800_get_survey(struct ieee80211_hw *hw, int idx,
                       struct survey_info *survey);
+void rt2800_disable_wpdma(struct rt2x00_dev *rt2x00dev);
 
 #endif /* RT2800LIB_H */
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index 0397bbf0ce01..931331d95217 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -361,7 +361,6 @@ static void rt2800pci_clear_entry(struct queue_entry *entry)
 static int rt2800pci_init_queues(struct rt2x00_dev *rt2x00dev)
 {
         struct queue_entry_priv_pci *entry_priv;
-        u32 reg;
 
         /*
          * Initialize registers.
@@ -394,6 +393,16 @@ static int rt2800pci_init_queues(struct rt2x00_dev *rt2x00dev)
         rt2x00pci_register_write(rt2x00dev, TX_CTX_IDX3, 0);
         rt2x00pci_register_write(rt2x00dev, TX_DTX_IDX3, 0);
 
+        rt2x00pci_register_write(rt2x00dev, TX_BASE_PTR4, 0);
+        rt2x00pci_register_write(rt2x00dev, TX_MAX_CNT4, 0);
+        rt2x00pci_register_write(rt2x00dev, TX_CTX_IDX4, 0);
+        rt2x00pci_register_write(rt2x00dev, TX_DTX_IDX4, 0);
+
+        rt2x00pci_register_write(rt2x00dev, TX_BASE_PTR5, 0);
+        rt2x00pci_register_write(rt2x00dev, TX_MAX_CNT5, 0);
+        rt2x00pci_register_write(rt2x00dev, TX_CTX_IDX5, 0);
+        rt2x00pci_register_write(rt2x00dev, TX_DTX_IDX5, 0);
+
         entry_priv = rt2x00dev->rx->entries[0].priv_data;
         rt2x00pci_register_write(rt2x00dev, RX_BASE_PTR, entry_priv->desc_dma);
         rt2x00pci_register_write(rt2x00dev, RX_MAX_CNT,
@@ -402,14 +411,7 @@ static int rt2800pci_init_queues(struct rt2x00_dev *rt2x00dev)
                                  rt2x00dev->rx[0].limit - 1);
         rt2x00pci_register_write(rt2x00dev, RX_DRX_IDX, 0);
 
-        /*
-         * Enable global DMA configuration
-         */
-        rt2x00pci_register_read(rt2x00dev, WPDMA_GLO_CFG, &reg);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_TX_DMA, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_RX_DMA, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_TX_WRITEBACK_DONE, 1);
-        rt2x00pci_register_write(rt2x00dev, WPDMA_GLO_CFG, reg);
+        rt2800_disable_wpdma(rt2x00dev);
 
         rt2x00pci_register_write(rt2x00dev, DELAY_INT_CFG, 0);
 
@@ -504,8 +506,10 @@ static int rt2800pci_enable_radio(struct rt2x00_dev *rt2x00dev)
 {
         int retval;
 
-        if (unlikely(rt2800_wait_wpdma_ready(rt2x00dev) ||
-                     rt2800pci_init_queues(rt2x00dev)))
+        /* Wait for DMA, ignore error until we initialize queues. */
+        rt2800_wait_wpdma_ready(rt2x00dev);
+
+        if (unlikely(rt2800pci_init_queues(rt2x00dev)))
                 return -EIO;
 
         retval = rt2800_enable_radio(rt2x00dev);
@@ -1184,7 +1188,9 @@ static DEFINE_PCI_DEVICE_TABLE(rt2800pci_device_table) = {
         { PCI_DEVICE(0x1814, 0x3593) },
 #endif
 #ifdef CONFIG_RT2800PCI_RT53XX
+        { PCI_DEVICE(0x1814, 0x5362) },
         { PCI_DEVICE(0x1814, 0x5390) },
+        { PCI_DEVICE(0x1814, 0x5392) },
         { PCI_DEVICE(0x1814, 0x539a) },
         { PCI_DEVICE(0x1814, 0x539f) },
 #endif
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 001735f7a661..5601302d09ad 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -922,6 +922,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x1482, 0x3c09) },
         /* AirTies */
         { USB_DEVICE(0x1eda, 0x2012) },
+        { USB_DEVICE(0x1eda, 0x2210) },
         { USB_DEVICE(0x1eda, 0x2310) },
         /* Allwin */
         { USB_DEVICE(0x8516, 0x2070) },
@@ -991,6 +992,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
         /* DVICO */
         { USB_DEVICE(0x0fe9, 0xb307) },
         /* Edimax */
+        { USB_DEVICE(0x7392, 0x4085) },
         { USB_DEVICE(0x7392, 0x7711) },
         { USB_DEVICE(0x7392, 0x7717) },
         { USB_DEVICE(0x7392, 0x7718) },
@@ -1066,6 +1068,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
         /* Philips */
         { USB_DEVICE(0x0471, 0x200f) },
         /* Planex */
+        { USB_DEVICE(0x2019, 0x5201) },
         { USB_DEVICE(0x2019, 0xab25) },
         { USB_DEVICE(0x2019, 0xed06) },
         /* Quanta */
@@ -1134,6 +1137,10 @@ static struct usb_device_id rt2800usb_device_table[] = {
 #ifdef CONFIG_RT2800USB_RT33XX
         /* Belkin */
         { USB_DEVICE(0x050d, 0x945b) },
+        /* Panasonic */
+        { USB_DEVICE(0x083a, 0xb511) },
+        /* Philips */
+        { USB_DEVICE(0x0471, 0x20dd) },
         /* Ralink */
         { USB_DEVICE(0x148f, 0x3370) },
         { USB_DEVICE(0x148f, 0x8070) },
@@ -1145,6 +1152,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x8516, 0x3572) },
         /* Askey */
         { USB_DEVICE(0x1690, 0x0744) },
+        { USB_DEVICE(0x1690, 0x0761) },
+        { USB_DEVICE(0x1690, 0x0764) },
         /* Cisco */
         { USB_DEVICE(0x167b, 0x4001) },
         /* EnGenius */
@@ -1159,20 +1168,25 @@ static struct usb_device_id rt2800usb_device_table[] = {
         /* Sitecom */
         { USB_DEVICE(0x0df6, 0x0041) },
         { USB_DEVICE(0x0df6, 0x0062) },
+        { USB_DEVICE(0x0df6, 0x0065) },
+        { USB_DEVICE(0x0df6, 0x0066) },
+        { USB_DEVICE(0x0df6, 0x0068) },
         /* Toshiba */
         { USB_DEVICE(0x0930, 0x0a07) },
         /* Zinwell */
         { USB_DEVICE(0x5a57, 0x0284) },
 #endif
 #ifdef CONFIG_RT2800USB_RT53XX
-        /* Alpha */
-        { USB_DEVICE(0x2001, 0x3c15) },
-        { USB_DEVICE(0x2001, 0x3c19) },
         /* Arcadyan */
         { USB_DEVICE(0x043e, 0x7a12) },
         /* Azurewave */
         { USB_DEVICE(0x13d3, 0x3329) },
         { USB_DEVICE(0x13d3, 0x3365) },
+        /* D-Link */
+        { USB_DEVICE(0x2001, 0x3c15) },
+        { USB_DEVICE(0x2001, 0x3c19) },
+        { USB_DEVICE(0x2001, 0x3c1c) },
+        { USB_DEVICE(0x2001, 0x3c1d) },
         /* LG innotek */
         { USB_DEVICE(0x043e, 0x7a22) },
         /* Panasonic */
@@ -1224,12 +1238,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x07d1, 0x3c0b) },
         { USB_DEVICE(0x07d1, 0x3c17) },
         { USB_DEVICE(0x2001, 0x3c17) },
-        /* Edimax */
-        { USB_DEVICE(0x7392, 0x4085) },
         /* Encore */
         { USB_DEVICE(0x203d, 0x14a1) },
-        /* Fujitsu Stylistic 550 */
-        { USB_DEVICE(0x1690, 0x0761) },
         /* Gemtek */
         { USB_DEVICE(0x15a9, 0x0010) },
         /* Gigabyte */
@@ -1250,7 +1260,6 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x05a6, 0x0101) },
         { USB_DEVICE(0x1d4d, 0x0010) },
         /* Planex */
-        { USB_DEVICE(0x2019, 0x5201) },
         { USB_DEVICE(0x2019, 0xab24) },
         /* Qcom */
         { USB_DEVICE(0x18e8, 0x6259) },
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 471f87cab4ab..ca36cccaba31 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -692,6 +692,8 @@ enum rt2x00_state_flags {
          */
         CONFIG_CHANNEL_HT40,
         CONFIG_POWERSAVING,
+        CONFIG_HT_DISABLED,
+        CONFIG_QOS_DISABLED,
 
         /*
          * Mark we currently are sequentially reading TX_STA_FIFO register
@@ -1280,7 +1282,7 @@ void rt2x00lib_dmadone(struct queue_entry *entry);
 void rt2x00lib_txdone(struct queue_entry *entry,
                       struct txdone_entry_desc *txdesc);
 void rt2x00lib_txdone_noinfo(struct queue_entry *entry, u32 status);
-void rt2x00lib_rxdone(struct queue_entry *entry);
+void rt2x00lib_rxdone(struct queue_entry *entry, gfp_t gfp);
 
 /*
  * mac80211 handlers.
diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c
index 293676bfa571..e7361d913e8e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00config.c
+++ b/drivers/net/wireless/rt2x00/rt2x00config.c
@@ -217,6 +217,11 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
         libconf.conf = conf;
 
         if (ieee80211_flags & IEEE80211_CONF_CHANGE_CHANNEL) {
+                if (!conf_is_ht(conf))
+                        set_bit(CONFIG_HT_DISABLED, &rt2x00dev->flags);
+                else
+                        clear_bit(CONFIG_HT_DISABLED, &rt2x00dev->flags);
+
                 if (conf_is_ht40(conf)) {
                         set_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags);
                         hw_value = rt2x00ht_center_channel(rt2x00dev, conf);
diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c
index 78787fcc919e..3bb8cafbac59 100644
--- a/drivers/net/wireless/rt2x00/rt2x00debug.c
+++ b/drivers/net/wireless/rt2x00/rt2x00debug.c
@@ -70,6 +70,7 @@ struct rt2x00debug_intf {
          *     - eeprom offset/value files
          *     - bbp offset/value files
          *     - rf offset/value files
+         *     - rfcsr offset/value files
          *   - queue folder
          *     - frame dump file
          *     - queue stats file
@@ -89,6 +90,8 @@ struct rt2x00debug_intf {
         struct dentry *bbp_val_entry;
         struct dentry *rf_off_entry;
         struct dentry *rf_val_entry;
+        struct dentry *rfcsr_off_entry;
+        struct dentry *rfcsr_val_entry;
         struct dentry *queue_folder;
         struct dentry *queue_frame_dump_entry;
         struct dentry *queue_stats_entry;
@@ -131,6 +134,7 @@ struct rt2x00debug_intf {
         unsigned int offset_eeprom;
         unsigned int offset_bbp;
         unsigned int offset_rf;
+        unsigned int offset_rfcsr;
 };
 
 void rt2x00debug_update_crypto(struct rt2x00_dev *rt2x00dev,
@@ -525,6 +529,7 @@ RT2X00DEBUGFS_OPS(csr, "0x%.8x\n", u32);
 RT2X00DEBUGFS_OPS(eeprom, "0x%.4x\n", u16);
 RT2X00DEBUGFS_OPS(bbp, "0x%.2x\n", u8);
 RT2X00DEBUGFS_OPS(rf, "0x%.8x\n", u32);
+RT2X00DEBUGFS_OPS(rfcsr, "0x%.2x\n", u8);
 
 static ssize_t rt2x00debug_read_dev_flags(struct file *file,
                                           char __user *buf,
@@ -614,7 +619,7 @@ static struct dentry *rt2x00debug_create_file_chipset(const char *name,
         const struct rt2x00debug *debug = intf->debug;
         char *data;
 
-        data = kzalloc(8 * MAX_LINE_LENGTH, GFP_KERNEL);
+        data = kzalloc(9 * MAX_LINE_LENGTH, GFP_KERNEL);
         if (!data)
                 return NULL;
 
@@ -624,22 +629,22 @@ static struct dentry *rt2x00debug_create_file_chipset(const char *name,
         data += sprintf(data, "revision:\t%04x\n", intf->rt2x00dev->chip.rev);
         data += sprintf(data, "\n");
         data += sprintf(data, "register\tbase\twords\twordsize\n");
-        data += sprintf(data, "csr\t%d\t%d\t%d\n",
-                        debug->csr.word_base,
-                        debug->csr.word_count,
-                        debug->csr.word_size);
-        data += sprintf(data, "eeprom\t%d\t%d\t%d\n",
-                        debug->eeprom.word_base,
-                        debug->eeprom.word_count,
-                        debug->eeprom.word_size);
-        data += sprintf(data, "bbp\t%d\t%d\t%d\n",
-                        debug->bbp.word_base,
-                        debug->bbp.word_count,
-                        debug->bbp.word_size);
-        data += sprintf(data, "rf\t%d\t%d\t%d\n",
-                        debug->rf.word_base,
-                        debug->rf.word_count,
-                        debug->rf.word_size);
+#define RT2X00DEBUGFS_SPRINTF_REGISTER(__name)                  \
+{                                                               \
+        if(debug->__name.read)                                  \
+                data += sprintf(data, __stringify(__name)       \
+                                "\t%d\t%d\t%d\n",               \
+                                debug->__name.word_base,        \
+                                debug->__name.word_count,       \
+                                debug->__name.word_size);       \
+}
+        RT2X00DEBUGFS_SPRINTF_REGISTER(csr);
+        RT2X00DEBUGFS_SPRINTF_REGISTER(eeprom);
+        RT2X00DEBUGFS_SPRINTF_REGISTER(bbp);
+        RT2X00DEBUGFS_SPRINTF_REGISTER(rf);
+        RT2X00DEBUGFS_SPRINTF_REGISTER(rfcsr);
+#undef RT2X00DEBUGFS_SPRINTF_REGISTER
+
         blob->size = strlen(blob->data);
 
         return debugfs_create_blob(name, S_IRUSR, intf->driver_folder, blob);
@@ -694,31 +699,34 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
         if (IS_ERR(intf->register_folder) || !intf->register_folder)
                 goto exit;
 
-#define RT2X00DEBUGFS_CREATE_REGISTER_ENTRY(__intf, __name)     \
-({                                                              \
-        (__intf)->__name##_off_entry =                          \
-            debugfs_create_u32(__stringify(__name) "_offset",   \
-                               S_IRUSR | S_IWUSR,               \
-                               (__intf)->register_folder,       \
-                               &(__intf)->offset_##__name);     \
-        if (IS_ERR((__intf)->__name##_off_entry)                \
-                        || !(__intf)->__name##_off_entry)       \
-                goto exit;                                      \
-                                                                \
-        (__intf)->__name##_val_entry =                          \
-            debugfs_create_file(__stringify(__name) "_value",   \
-                                S_IRUSR | S_IWUSR,              \
-                                (__intf)->register_folder,      \
-                                (__intf), &rt2x00debug_fop_##__name);\
-        if (IS_ERR((__intf)->__name##_val_entry)                \
-                        || !(__intf)->__name##_val_entry)       \
-                goto exit;                                      \
+#define RT2X00DEBUGFS_CREATE_REGISTER_ENTRY(__intf, __name)                     \
+({                                                                              \
+        if(debug->__name.read) {                                                \
+                (__intf)->__name##_off_entry =                                  \
+                debugfs_create_u32(__stringify(__name) "_offset",               \
+                                       S_IRUSR | S_IWUSR,                       \
+                                       (__intf)->register_folder,               \
+                                       &(__intf)->offset_##__name);             \
+                if (IS_ERR((__intf)->__name##_off_entry)                        \
+                                || !(__intf)->__name##_off_entry)               \
+                        goto exit;                                              \
+                                                                                \
+                (__intf)->__name##_val_entry =                                  \
+                debugfs_create_file(__stringify(__name) "_value",               \
+                                        S_IRUSR | S_IWUSR,                      \
+                                        (__intf)->register_folder,              \
+                                        (__intf), &rt2x00debug_fop_##__name);   \
+                if (IS_ERR((__intf)->__name##_val_entry)                        \
+                                || !(__intf)->__name##_val_entry)               \
+                        goto exit;                                              \
+        }                                                                       \
 })
 
         RT2X00DEBUGFS_CREATE_REGISTER_ENTRY(intf, csr);
         RT2X00DEBUGFS_CREATE_REGISTER_ENTRY(intf, eeprom);
         RT2X00DEBUGFS_CREATE_REGISTER_ENTRY(intf, bbp);
         RT2X00DEBUGFS_CREATE_REGISTER_ENTRY(intf, rf);
+        RT2X00DEBUGFS_CREATE_REGISTER_ENTRY(intf, rfcsr);
 
 #undef RT2X00DEBUGFS_CREATE_REGISTER_ENTRY
 
@@ -770,6 +778,8 @@ void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev)
         debugfs_remove(intf->queue_stats_entry);
         debugfs_remove(intf->queue_frame_dump_entry);
         debugfs_remove(intf->queue_folder);
+        debugfs_remove(intf->rfcsr_val_entry);
+        debugfs_remove(intf->rfcsr_off_entry);
         debugfs_remove(intf->rf_val_entry);
         debugfs_remove(intf->rf_off_entry);
         debugfs_remove(intf->bbp_val_entry);
diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.h b/drivers/net/wireless/rt2x00/rt2x00debug.h
index fa11409cb5c6..e11d39bdfef7 100644
--- a/drivers/net/wireless/rt2x00/rt2x00debug.h
+++ b/drivers/net/wireless/rt2x00/rt2x00debug.h
@@ -65,6 +65,7 @@ struct rt2x00debug {
         RT2X00DEBUGFS_REGISTER_ENTRY(eeprom, u16);
         RT2X00DEBUGFS_REGISTER_ENTRY(bbp, u8);
         RT2X00DEBUGFS_REGISTER_ENTRY(rf, u32);
+        RT2X00DEBUGFS_REGISTER_ENTRY(rfcsr, u8);
 };
 
 #endif /* RT2X00DEBUG_H */
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 90cc5e772650..e5404e576251 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -391,9 +391,10 @@ void rt2x00lib_txdone(struct queue_entry *entry,
                 tx_info->flags |= IEEE80211_TX_STAT_AMPDU;
                 tx_info->status.ampdu_len = 1;
                 tx_info->status.ampdu_ack_len = success ? 1 : 0;
-
-                if (!success)
-                        tx_info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;
+                /*
+                 * TODO: Need to tear down BA session here
+                 * if not successful.
+                 */
         }
 
         if (rate_flags & IEEE80211_TX_RC_USE_RTS_CTS) {
@@ -587,7 +588,7 @@ static int rt2x00lib_rxdone_read_signal(struct rt2x00_dev *rt2x00dev,
         return 0;
 }
 
-void rt2x00lib_rxdone(struct queue_entry *entry)
+void rt2x00lib_rxdone(struct queue_entry *entry, gfp_t gfp)
 {
         struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
         struct rxdone_entry_desc rxdesc;
@@ -607,7 +608,7 @@ void rt2x00lib_rxdone(struct queue_entry *entry)
          * Allocate a new sk_buffer. If no new buffer available, drop the
          * received frame and reuse the existing buffer.
          */
-        skb = rt2x00queue_alloc_rxskb(entry);
+        skb = rt2x00queue_alloc_rxskb(entry, gfp);
         if (!skb)
                 goto submit_entry;
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00leds.c b/drivers/net/wireless/rt2x00/rt2x00leds.c
index ca585e34d00e..8679d781a264 100644
--- a/drivers/net/wireless/rt2x00/rt2x00leds.c
+++ b/drivers/net/wireless/rt2x00/rt2x00leds.c
@@ -124,17 +124,15 @@ static int rt2x00leds_register_led(struct rt2x00_dev *rt2x00dev,
 
 void rt2x00leds_register(struct rt2x00_dev *rt2x00dev)
 {
-        char dev_name[16];
-        char name[32];
+        char name[36];
         int retval;
         unsigned long on_period;
         unsigned long off_period;
-
-        snprintf(dev_name, sizeof(dev_name), "%s-%s",
-                 rt2x00dev->ops->name, wiphy_name(rt2x00dev->hw->wiphy));
+        const char *phy_name = wiphy_name(rt2x00dev->hw->wiphy);
 
         if (rt2x00dev->led_radio.flags & LED_INITIALIZED) {
-                snprintf(name, sizeof(name), "%s::radio", dev_name);
+                snprintf(name, sizeof(name), "%s-%s::radio",
+                         rt2x00dev->ops->name, phy_name);
 
                 retval = rt2x00leds_register_led(rt2x00dev,
                                                  &rt2x00dev->led_radio,
@@ -144,7 +142,8 @@ void rt2x00leds_register(struct rt2x00_dev *rt2x00dev)
         }
 
         if (rt2x00dev->led_assoc.flags & LED_INITIALIZED) {
-                snprintf(name, sizeof(name), "%s::assoc", dev_name);
+                snprintf(name, sizeof(name), "%s-%s::assoc",
+                         rt2x00dev->ops->name, phy_name);
 
                 retval = rt2x00leds_register_led(rt2x00dev,
                                                  &rt2x00dev->led_assoc,
@@ -154,7 +153,8 @@ void rt2x00leds_register(struct rt2x00_dev *rt2x00dev)
         }
 
         if (rt2x00dev->led_qual.flags & LED_INITIALIZED) {
-                snprintf(name, sizeof(name), "%s::quality", dev_name);
+                snprintf(name, sizeof(name), "%s-%s::quality",
+                         rt2x00dev->ops->name, phy_name);
 
                 retval = rt2x00leds_register_led(rt2x00dev,
                                                  &rt2x00dev->led_qual,
diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h
index 78bd43b8961f..a0935987fa3a 100644
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
@@ -103,7 +103,7 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
  * rt2x00queue_alloc_rxskb - allocate a skb for RX purposes.
  * @entry: The entry for which the skb will be applicable.
  */
-struct sk_buff *rt2x00queue_alloc_rxskb(struct queue_entry *entry);
+struct sk_buff *rt2x00queue_alloc_rxskb(struct queue_entry *entry, gfp_t gfp);
 
 /**
  * rt2x00queue_free_skb - free a skb
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 2df2eb6d3e06..b49773ef72f2 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -709,9 +709,19 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
                         rt2x00dev->intf_associated--;
 
                 rt2x00leds_led_assoc(rt2x00dev, !!rt2x00dev->intf_associated);
+
+                clear_bit(CONFIG_QOS_DISABLED, &rt2x00dev->flags);
         }
 
         /*
+         * Check for access point which do not support 802.11e . We have to
+         * generate data frames sequence number in S/W for such AP, because
+         * of H/W bug.
+         */
+        if (changes & BSS_CHANGED_QOS && !bss_conf->qos)
+                set_bit(CONFIG_QOS_DISABLED, &rt2x00dev->flags);
+
+        /*
          * When the erp information has changed, we should perform
          * additional configuration steps. For all other changes we are done.
          */
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index 17148bb24426..0a4653a92cab 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -92,7 +92,7 @@ bool rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
                 /*
                  * Send the frame to rt2x00lib for further processing.
                  */
-                rt2x00lib_rxdone(entry);
+                rt2x00lib_rxdone(entry, GFP_ATOMIC);
         }
 
         return !max_rx;
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 9b1b2b7a7807..4c662eccf53c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -33,7 +33,7 @@
 #include "rt2x00.h"
 #include "rt2x00lib.h"
 
-struct sk_buff *rt2x00queue_alloc_rxskb(struct queue_entry *entry)
+struct sk_buff *rt2x00queue_alloc_rxskb(struct queue_entry *entry, gfp_t gfp)
 {
         struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
         struct sk_buff *skb;
@@ -68,7 +68,7 @@ struct sk_buff *rt2x00queue_alloc_rxskb(struct queue_entry *entry)
         /*
          * Allocate skbuffer.
          */
-        skb = dev_alloc_skb(frame_size + head_size + tail_size);
+        skb = __dev_alloc_skb(frame_size + head_size + tail_size, gfp);
         if (!skb)
                 return NULL;
 
@@ -213,8 +213,19 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
 
         __set_bit(ENTRY_TXD_GENERATE_SEQ, &txdesc->flags);
 
-        if (!test_bit(REQUIRE_SW_SEQNO, &rt2x00dev->cap_flags))
-                return;
+        if (!test_bit(REQUIRE_SW_SEQNO, &rt2x00dev->cap_flags)) {
+                /*
+                 * rt2800 has a H/W (or F/W) bug, device incorrectly increase
+                 * seqno on retransmited data (non-QOS) frames. To workaround
+                 * the problem let's generate seqno in software if QOS is
+                 * disabled.
+                 */
+                if (test_bit(CONFIG_QOS_DISABLED, &rt2x00dev->flags))
+                        __clear_bit(ENTRY_TXD_GENERATE_SEQ, &txdesc->flags);
+                else
+                        /* H/W will generate sequence number */
+                        return;
+        }
 
         /*
          * The hardware is not able to insert a sequence number. Assign a
@@ -320,14 +331,6 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev,
                 txdesc->u.ht.wcid = sta_priv->wcid;
         }
 
-        txdesc->u.ht.ba_size = 7;       /* FIXME: What value is needed? */
-
-        /*
-         * Only one STBC stream is supported for now.
-         */
-        if (tx_info->flags & IEEE80211_TX_CTL_STBC)
-                txdesc->u.ht.stbc = 1;
-
         /*
          * If IEEE80211_TX_RC_MCS is set txrate->idx just contains the
          * mcs rate to be used
@@ -351,6 +354,24 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev,
                         txdesc->u.ht.mcs |= 0x08;
         }
 
+        if (test_bit(CONFIG_HT_DISABLED, &rt2x00dev->flags)) {
+                if (!(tx_info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT))
+                        txdesc->u.ht.txop = TXOP_SIFS;
+                else
+                        txdesc->u.ht.txop = TXOP_BACKOFF;
+
+                /* Left zero on all other settings. */
+                return;
+        }
+
+        txdesc->u.ht.ba_size = 7;       /* FIXME: What value is needed? */
+
+        /*
+         * Only one STBC stream is supported for now.
+         */
+        if (tx_info->flags & IEEE80211_TX_CTL_STBC)
+                txdesc->u.ht.stbc = 1;
+
         /*
          * This frame is eligible for an AMPDU, however, don't aggregate
          * frames that are intended to probe a specific tx rate.
@@ -1142,7 +1163,7 @@ static int rt2x00queue_alloc_rxskbs(struct data_queue *queue)
         struct sk_buff *skb;
 
         for (i = 0; i < queue->limit; i++) {
-                skb = rt2x00queue_alloc_rxskb(&queue->entries[i]);
+                skb = rt2x00queue_alloc_rxskb(&queue->entries[i], GFP_KERNEL);
                 if (!skb)
                         return -ENOMEM;
                 queue->entries[i].skb = skb;
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 66094eb21b61..d357d1ed92f6 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -358,7 +358,7 @@ static void rt2x00usb_work_rxdone(struct work_struct *work)
                 /*
                  * Send the frame to rt2x00lib for further processing.
                  */
-                rt2x00lib_rxdone(entry);
+                rt2x00lib_rxdone(entry, GFP_KERNEL);
         }
 }
 
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index e0c6d117429d..ee22bd74579d 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -3092,15 +3092,4 @@ static struct pci_driver rt61pci_driver = {
         .resume         = rt2x00pci_resume,
 };
 
-static int __init rt61pci_init(void)
-{
-        return pci_register_driver(&rt61pci_driver);
-}
-
-static void __exit rt61pci_exit(void)
-{
-        pci_unregister_driver(&rt61pci_driver);
-}
-
-module_init(rt61pci_init);
-module_exit(rt61pci_exit);
+module_pci_driver(rt61pci_driver);
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index e477a964081d..155136691a38 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -2412,6 +2412,7 @@ static struct usb_device_id rt73usb_device_table[] = {
         { USB_DEVICE(0x0b05, 0x1723) },
         { USB_DEVICE(0x0b05, 0x1724) },
         /* Belkin */
+        { USB_DEVICE(0x050d, 0x7050) }, /* FCC ID: K7SF5D7050B ver. 3.x */
         { USB_DEVICE(0x050d, 0x705a) },
         { USB_DEVICE(0x050d, 0x905b) },
         { USB_DEVICE(0x050d, 0x905c) },
diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c
index 2f14a5fb0cbb..2bebcb71a1e9 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c
@@ -1173,15 +1173,4 @@ static struct pci_driver rtl8180_driver = {
 #endif /* CONFIG_PM */
 };
 
-static int __init rtl8180_init(void)
-{
-        return pci_register_driver(&rtl8180_driver);
-}
-
-static void __exit rtl8180_exit(void)
-{
-        pci_unregister_driver(&rtl8180_driver);
-}
-
-module_init(rtl8180_init);
-module_exit(rtl8180_exit);
+module_pci_driver(rtl8180_driver);
diff --git a/drivers/net/wireless/rtl818x/rtl8187/dev.c b/drivers/net/wireless/rtl818x/rtl8187/dev.c
index cf53ac9d6f23..d8114962b0c9 100644
--- a/drivers/net/wireless/rtl818x/rtl8187/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c
@@ -294,6 +294,7 @@ static void rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
                 hdr->retry = cpu_to_le32((info->control.rates[0].count - 1) << 8);
                 hdr->tx_duration =
                         ieee80211_generic_frame_duration(dev, priv->vif,
+                                                         info->band,
                                                          skb->len, txrate);
                 buf = hdr;
 
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index e54488db0e10..f4c852c6749b 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -1460,7 +1460,7 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len)
                 return;
 
         /* and only beacons from the associated BSSID, please */
-        if (compare_ether_addr(hdr->addr3, rtlpriv->mac80211.bssid))
+        if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid))
                 return;
 
         if (rtl_find_221_ie(hw, data, len))
diff --git a/drivers/net/wireless/rtlwifi/cam.c b/drivers/net/wireless/rtlwifi/cam.c
index 5c7d57947d23..3d8cc4a0c86d 100644
--- a/drivers/net/wireless/rtlwifi/cam.c
+++ b/drivers/net/wireless/rtlwifi/cam.c
@@ -328,10 +328,9 @@ void rtl_cam_del_entry(struct ieee80211_hw *hw, u8 *sta_addr)
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG, "sta_addr is NULL\n");
         }
 
-        if ((sta_addr[0]|sta_addr[1]|sta_addr[2]|sta_addr[3]|\
-                                sta_addr[4]|sta_addr[5]) == 0) {
+        if (is_zero_ether_addr(sta_addr)) {
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,
-                         "sta_addr is 00:00:00:00:00:00\n");
+                         "sta_addr is %pM\n", sta_addr);
                 return;
         }
         /* Does STA already exist? */
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 288b035a3579..2062ea1d7c80 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -34,6 +34,7 @@
 #include "ps.h"
 #include "efuse.h"
 #include <linux/export.h>
+#include <linux/kmemleak.h>
 
 static const u16 pcibridge_vendors[PCI_BRIDGE_VENDOR_MAX] = {
         PCI_VENDOR_ID_INTEL,
@@ -1099,6 +1100,7 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw)
                         u32 bufferaddress;
                         if (!skb)
                                 return 0;
+                        kmemleak_not_leak(skb);
                         entry = &rtlpci->rx_ring[rx_queue_idx].desc[i];
 
                         /*skb->dev = dev; */
@@ -1851,14 +1853,6 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
         /*like read eeprom and so on */
         rtlpriv->cfg->ops->read_eeprom_info(hw);
 
-        if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");
-                err = -ENODEV;
-                goto fail3;
-        }
-
-        rtlpriv->cfg->ops->init_sw_leds(hw);
-
         /*aspm */
         rtl_pci_init_aspm(hw);
 
@@ -1877,6 +1871,14 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
                 goto fail3;
         }
 
+        if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");
+                err = -ENODEV;
+                goto fail3;
+        }
+
+        rtlpriv->cfg->ops->init_sw_leds(hw);
+
         err = sysfs_create_group(&pdev->dev.kobj, &rtl_attribute_group);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
@@ -1941,6 +1943,7 @@ void rtl_pci_disconnect(struct pci_dev *pdev)
                 rtl_deinit_deferred_work(hw);
                 rtlpriv->intf_ops->adapter_stop(hw);
         }
+        rtlpriv->cfg->ops->disable_interrupt(hw);
 
         /*deinit rfkill */
         rtl_deinit_rfkill(hw);
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c
index 5b9c3b5e8c92..5ae26647f340 100644
--- a/drivers/net/wireless/rtlwifi/ps.c
+++ b/drivers/net/wireless/rtlwifi/ps.c
@@ -480,7 +480,7 @@ void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len)
                 return;
 
         /* and only beacons from the associated BSSID, please */
-        if (compare_ether_addr(hdr->addr3, rtlpriv->mac80211.bssid))
+        if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid))
                 return;
 
         rtlpriv->psc.last_beacon = jiffies;
diff --git a/drivers/net/wireless/rtlwifi/rc.c b/drivers/net/wireless/rtlwifi/rc.c
index c66f08a0524a..d5cbf01da8ac 100644
--- a/drivers/net/wireless/rtlwifi/rc.c
+++ b/drivers/net/wireless/rtlwifi/rc.c
@@ -225,8 +225,7 @@ static void rtl_rate_init(void *ppriv,
 static void rtl_rate_update(void *ppriv,
                             struct ieee80211_supported_band *sband,
                             struct ieee80211_sta *sta, void *priv_sta,
-                            u32 changed,
-                            enum nl80211_channel_type oper_chan_type)
+                            u32 changed)
 {
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index 1208b753f62f..f7f48c7ac854 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -33,9 +33,6 @@
 #include "../pci.h"
 #include "../base.h"
 
-struct dig_t dm_digtable;
-static struct ps_t dm_pstable;
-
 #define BT_RSSI_STATE_NORMAL_POWER      BIT_OFFSET_LEN_MASK_32(0, 1)
 #define BT_RSSI_STATE_AMDPU_OFF         BIT_OFFSET_LEN_MASK_32(1, 1)
 #define BT_RSSI_STATE_SPECIAL_LOW       BIT_OFFSET_LEN_MASK_32(2, 1)
@@ -163,33 +160,37 @@ static const u8 cckswing_table_ch14[CCK_TABLE_SIZE][8] = {
 
 static void rtl92c_dm_diginit(struct ieee80211_hw *hw)
 {
-        dm_digtable.dig_enable_flag = true;
-        dm_digtable.dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX;
-        dm_digtable.cur_igvalue = 0x20;
-        dm_digtable.pre_igvalue = 0x0;
-        dm_digtable.cursta_connectctate = DIG_STA_DISCONNECT;
-        dm_digtable.presta_connectstate = DIG_STA_DISCONNECT;
-        dm_digtable.curmultista_connectstate = DIG_MULTISTA_DISCONNECT;
-        dm_digtable.rssi_lowthresh = DM_DIG_THRESH_LOW;
-        dm_digtable.rssi_highthresh = DM_DIG_THRESH_HIGH;
-        dm_digtable.fa_lowthresh = DM_FALSEALARM_THRESH_LOW;
-        dm_digtable.fa_highthresh = DM_FALSEALARM_THRESH_HIGH;
-        dm_digtable.rx_gain_range_max = DM_DIG_MAX;
-        dm_digtable.rx_gain_range_min = DM_DIG_MIN;
-        dm_digtable.backoff_val = DM_DIG_BACKOFF_DEFAULT;
-        dm_digtable.backoff_val_range_max = DM_DIG_BACKOFF_MAX;
-        dm_digtable.backoff_val_range_min = DM_DIG_BACKOFF_MIN;
-        dm_digtable.pre_cck_pd_state = CCK_PD_STAGE_MAX;
-        dm_digtable.cur_cck_pd_state = CCK_PD_STAGE_MAX;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
+
+        dm_digtable->dig_enable_flag = true;
+        dm_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX;
+        dm_digtable->cur_igvalue = 0x20;
+        dm_digtable->pre_igvalue = 0x0;
+        dm_digtable->cursta_connectctate = DIG_STA_DISCONNECT;
+        dm_digtable->presta_connectstate = DIG_STA_DISCONNECT;
+        dm_digtable->curmultista_connectstate = DIG_MULTISTA_DISCONNECT;
+        dm_digtable->rssi_lowthresh = DM_DIG_THRESH_LOW;
+        dm_digtable->rssi_highthresh = DM_DIG_THRESH_HIGH;
+        dm_digtable->fa_lowthresh = DM_FALSEALARM_THRESH_LOW;
+        dm_digtable->fa_highthresh = DM_FALSEALARM_THRESH_HIGH;
+        dm_digtable->rx_gain_range_max = DM_DIG_MAX;
+        dm_digtable->rx_gain_range_min = DM_DIG_MIN;
+        dm_digtable->backoff_val = DM_DIG_BACKOFF_DEFAULT;
+        dm_digtable->backoff_val_range_max = DM_DIG_BACKOFF_MAX;
+        dm_digtable->backoff_val_range_min = DM_DIG_BACKOFF_MIN;
+        dm_digtable->pre_cck_pd_state = CCK_PD_STAGE_MAX;
+        dm_digtable->cur_cck_pd_state = CCK_PD_STAGE_MAX;
 }
 
 static u8 rtl92c_dm_initial_gain_min_pwdb(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
         long rssi_val_min = 0;
 
-        if ((dm_digtable.curmultista_connectstate == DIG_MULTISTA_CONNECT) &&
-            (dm_digtable.cursta_connectctate == DIG_STA_CONNECT)) {
+        if ((dm_digtable->curmultista_connectstate == DIG_MULTISTA_CONNECT) &&
+            (dm_digtable->cursta_connectctate == DIG_STA_CONNECT)) {
                 if (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb != 0)
                         rssi_val_min =
                             (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb >
@@ -198,10 +199,10 @@ static u8 rtl92c_dm_initial_gain_min_pwdb(struct ieee80211_hw *hw)
                             rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
                 else
                         rssi_val_min = rtlpriv->dm.undecorated_smoothed_pwdb;
-        } else if (dm_digtable.cursta_connectctate == DIG_STA_CONNECT ||
-                   dm_digtable.cursta_connectctate == DIG_STA_BEFORE_CONNECT) {
+        } else if (dm_digtable->cursta_connectctate == DIG_STA_CONNECT ||
+                   dm_digtable->cursta_connectctate == DIG_STA_BEFORE_CONNECT) {
                 rssi_val_min = rtlpriv->dm.undecorated_smoothed_pwdb;
-        } else if (dm_digtable.curmultista_connectstate ==
+        } else if (dm_digtable->curmultista_connectstate ==
                    DIG_MULTISTA_CONNECT) {
                 rssi_val_min = rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
         }
@@ -260,7 +261,8 @@ static void rtl92c_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
 static void rtl92c_dm_ctrl_initgain_by_fa(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u8 value_igi = dm_digtable.cur_igvalue;
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
+        u8 value_igi = dm_digtable->cur_igvalue;
 
         if (rtlpriv->falsealm_cnt.cnt_all < DM_DIG_FA_TH0)
                 value_igi--;
@@ -277,43 +279,44 @@ static void rtl92c_dm_ctrl_initgain_by_fa(struct ieee80211_hw *hw)
         if (rtlpriv->falsealm_cnt.cnt_all > 10000)
                 value_igi = 0x32;
 
-        dm_digtable.cur_igvalue = value_igi;
+        dm_digtable->cur_igvalue = value_igi;
         rtl92c_dm_write_dig(hw);
 }
 
 static void rtl92c_dm_ctrl_initgain_by_rssi(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
 
-        if (rtlpriv->falsealm_cnt.cnt_all > dm_digtable.fa_highthresh) {
-                if ((dm_digtable.backoff_val - 2) <
-                    dm_digtable.backoff_val_range_min)
-                        dm_digtable.backoff_val =
-                            dm_digtable.backoff_val_range_min;
+        if (rtlpriv->falsealm_cnt.cnt_all > dm_digtable->fa_highthresh) {
+                if ((dm_digtable->backoff_val - 2) <
+                    dm_digtable->backoff_val_range_min)
+                        dm_digtable->backoff_val =
+                            dm_digtable->backoff_val_range_min;
                 else
-                        dm_digtable.backoff_val -= 2;
-        } else if (rtlpriv->falsealm_cnt.cnt_all < dm_digtable.fa_lowthresh) {
-                if ((dm_digtable.backoff_val + 2) >
-                    dm_digtable.backoff_val_range_max)
-                        dm_digtable.backoff_val =
-                            dm_digtable.backoff_val_range_max;
+                        dm_digtable->backoff_val -= 2;
+        } else if (rtlpriv->falsealm_cnt.cnt_all < dm_digtable->fa_lowthresh) {
+                if ((dm_digtable->backoff_val + 2) >
+                    dm_digtable->backoff_val_range_max)
+                        dm_digtable->backoff_val =
+                            dm_digtable->backoff_val_range_max;
                 else
-                        dm_digtable.backoff_val += 2;
+                        dm_digtable->backoff_val += 2;
         }
 
-        if ((dm_digtable.rssi_val_min + 10 - dm_digtable.backoff_val) >
-            dm_digtable.rx_gain_range_max)
-                dm_digtable.cur_igvalue = dm_digtable.rx_gain_range_max;
-        else if ((dm_digtable.rssi_val_min + 10 -
-                  dm_digtable.backoff_val) < dm_digtable.rx_gain_range_min)
-                dm_digtable.cur_igvalue = dm_digtable.rx_gain_range_min;
+        if ((dm_digtable->rssi_val_min + 10 - dm_digtable->backoff_val) >
+            dm_digtable->rx_gain_range_max)
+                dm_digtable->cur_igvalue = dm_digtable->rx_gain_range_max;
+        else if ((dm_digtable->rssi_val_min + 10 -
+                  dm_digtable->backoff_val) < dm_digtable->rx_gain_range_min)
+                dm_digtable->cur_igvalue = dm_digtable->rx_gain_range_min;
         else
-                dm_digtable.cur_igvalue = dm_digtable.rssi_val_min + 10 -
-                    dm_digtable.backoff_val;
+                dm_digtable->cur_igvalue = dm_digtable->rssi_val_min + 10 -
+                    dm_digtable->backoff_val;
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
                  "rssi_val_min = %x backoff_val %x\n",
-                 dm_digtable.rssi_val_min, dm_digtable.backoff_val);
+                 dm_digtable->rssi_val_min, dm_digtable->backoff_val);
 
         rtl92c_dm_write_dig(hw);
 }
@@ -322,6 +325,7 @@ static void rtl92c_dm_initial_gain_multi_sta(struct ieee80211_hw *hw)
 {
         static u8 initialized; /* initialized to false */
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         long rssi_strength = rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
         bool multi_sta = false;
@@ -330,68 +334,69 @@ static void rtl92c_dm_initial_gain_multi_sta(struct ieee80211_hw *hw)
                 multi_sta = true;
 
         if (!multi_sta ||
-            dm_digtable.cursta_connectctate != DIG_STA_DISCONNECT) {
+            dm_digtable->cursta_connectctate != DIG_STA_DISCONNECT) {
                 initialized = false;
-                dm_digtable.dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX;
+                dm_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX;
                 return;
         } else if (initialized == false) {
                 initialized = true;
-                dm_digtable.dig_ext_port_stage = DIG_EXT_PORT_STAGE_0;
-                dm_digtable.cur_igvalue = 0x20;
+                dm_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_0;
+                dm_digtable->cur_igvalue = 0x20;
                 rtl92c_dm_write_dig(hw);
         }
 
-        if (dm_digtable.curmultista_connectstate == DIG_MULTISTA_CONNECT) {
-                if ((rssi_strength < dm_digtable.rssi_lowthresh) &&
-                    (dm_digtable.dig_ext_port_stage != DIG_EXT_PORT_STAGE_1)) {
+        if (dm_digtable->curmultista_connectstate == DIG_MULTISTA_CONNECT) {
+                if ((rssi_strength < dm_digtable->rssi_lowthresh) &&
+                    (dm_digtable->dig_ext_port_stage != DIG_EXT_PORT_STAGE_1)) {
 
-                        if (dm_digtable.dig_ext_port_stage ==
+                        if (dm_digtable->dig_ext_port_stage ==
                             DIG_EXT_PORT_STAGE_2) {
-                                dm_digtable.cur_igvalue = 0x20;
+                                dm_digtable->cur_igvalue = 0x20;
                                 rtl92c_dm_write_dig(hw);
                         }
 
-                        dm_digtable.dig_ext_port_stage = DIG_EXT_PORT_STAGE_1;
-                } else if (rssi_strength > dm_digtable.rssi_highthresh) {
-                        dm_digtable.dig_ext_port_stage = DIG_EXT_PORT_STAGE_2;
+                        dm_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_1;
+                } else if (rssi_strength > dm_digtable->rssi_highthresh) {
+                        dm_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_2;
                         rtl92c_dm_ctrl_initgain_by_fa(hw);
                 }
-        } else if (dm_digtable.dig_ext_port_stage != DIG_EXT_PORT_STAGE_0) {
-                dm_digtable.dig_ext_port_stage = DIG_EXT_PORT_STAGE_0;
-                dm_digtable.cur_igvalue = 0x20;
+        } else if (dm_digtable->dig_ext_port_stage != DIG_EXT_PORT_STAGE_0) {
+                dm_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_0;
+                dm_digtable->cur_igvalue = 0x20;
                 rtl92c_dm_write_dig(hw);
         }
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
                  "curmultista_connectstate = %x dig_ext_port_stage %x\n",
-                 dm_digtable.curmultista_connectstate,
-                 dm_digtable.dig_ext_port_stage);
+                 dm_digtable->curmultista_connectstate,
+                 dm_digtable->dig_ext_port_stage);
 }
 
 static void rtl92c_dm_initial_gain_sta(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
                  "presta_connectstate = %x, cursta_connectctate = %x\n",
-                 dm_digtable.presta_connectstate,
-                 dm_digtable.cursta_connectctate);
+                 dm_digtable->presta_connectstate,
+                 dm_digtable->cursta_connectctate);
 
-        if (dm_digtable.presta_connectstate == dm_digtable.cursta_connectctate
-            || dm_digtable.cursta_connectctate == DIG_STA_BEFORE_CONNECT
-            || dm_digtable.cursta_connectctate == DIG_STA_CONNECT) {
+        if (dm_digtable->presta_connectstate == dm_digtable->cursta_connectctate
+            || dm_digtable->cursta_connectctate == DIG_STA_BEFORE_CONNECT
+            || dm_digtable->cursta_connectctate == DIG_STA_CONNECT) {
 
-                if (dm_digtable.cursta_connectctate != DIG_STA_DISCONNECT) {
-                        dm_digtable.rssi_val_min =
+                if (dm_digtable->cursta_connectctate != DIG_STA_DISCONNECT) {
+                        dm_digtable->rssi_val_min =
                             rtl92c_dm_initial_gain_min_pwdb(hw);
                         rtl92c_dm_ctrl_initgain_by_rssi(hw);
                 }
         } else {
-                dm_digtable.rssi_val_min = 0;
-                dm_digtable.dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX;
-                dm_digtable.backoff_val = DM_DIG_BACKOFF_DEFAULT;
-                dm_digtable.cur_igvalue = 0x20;
-                dm_digtable.pre_igvalue = 0;
+                dm_digtable->rssi_val_min = 0;
+                dm_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX;
+                dm_digtable->backoff_val = DM_DIG_BACKOFF_DEFAULT;
+                dm_digtable->cur_igvalue = 0x20;
+                dm_digtable->pre_igvalue = 0;
                 rtl92c_dm_write_dig(hw);
         }
 }
@@ -400,40 +405,41 @@ static void rtl92c_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
 
-        if (dm_digtable.cursta_connectctate == DIG_STA_CONNECT) {
-                dm_digtable.rssi_val_min = rtl92c_dm_initial_gain_min_pwdb(hw);
+        if (dm_digtable->cursta_connectctate == DIG_STA_CONNECT) {
+                dm_digtable->rssi_val_min = rtl92c_dm_initial_gain_min_pwdb(hw);
 
-                if (dm_digtable.pre_cck_pd_state == CCK_PD_STAGE_LowRssi) {
-                        if (dm_digtable.rssi_val_min <= 25)
-                                dm_digtable.cur_cck_pd_state =
+                if (dm_digtable->pre_cck_pd_state == CCK_PD_STAGE_LowRssi) {
+                        if (dm_digtable->rssi_val_min <= 25)
+                                dm_digtable->cur_cck_pd_state =
                                     CCK_PD_STAGE_LowRssi;
                         else
-                                dm_digtable.cur_cck_pd_state =
+                                dm_digtable->cur_cck_pd_state =
                                     CCK_PD_STAGE_HighRssi;
                 } else {
-                        if (dm_digtable.rssi_val_min <= 20)
-                                dm_digtable.cur_cck_pd_state =
+                        if (dm_digtable->rssi_val_min <= 20)
+                                dm_digtable->cur_cck_pd_state =
                                     CCK_PD_STAGE_LowRssi;
                         else
-                                dm_digtable.cur_cck_pd_state =
+                                dm_digtable->cur_cck_pd_state =
                                     CCK_PD_STAGE_HighRssi;
                 }
         } else {
-                dm_digtable.cur_cck_pd_state = CCK_PD_STAGE_MAX;
+                dm_digtable->cur_cck_pd_state = CCK_PD_STAGE_MAX;
         }
 
-        if (dm_digtable.pre_cck_pd_state != dm_digtable.cur_cck_pd_state) {
-                if (dm_digtable.cur_cck_pd_state == CCK_PD_STAGE_LowRssi) {
+        if (dm_digtable->pre_cck_pd_state != dm_digtable->cur_cck_pd_state) {
+                if (dm_digtable->cur_cck_pd_state == CCK_PD_STAGE_LowRssi) {
                         if (rtlpriv->falsealm_cnt.cnt_cck_fail > 800)
-                                dm_digtable.cur_cck_fa_state =
+                                dm_digtable->cur_cck_fa_state =
                                     CCK_FA_STAGE_High;
                         else
-                                dm_digtable.cur_cck_fa_state = CCK_FA_STAGE_Low;
+                                dm_digtable->cur_cck_fa_state = CCK_FA_STAGE_Low;
 
-                        if (dm_digtable.pre_cck_fa_state !=
-                            dm_digtable.cur_cck_fa_state) {
-                                if (dm_digtable.cur_cck_fa_state ==
+                        if (dm_digtable->pre_cck_fa_state !=
+                            dm_digtable->cur_cck_fa_state) {
+                                if (dm_digtable->cur_cck_fa_state ==
                                     CCK_FA_STAGE_Low)
                                         rtl_set_bbreg(hw, RCCK0_CCA, MASKBYTE2,
                                                       0x83);
@@ -441,8 +447,8 @@ static void rtl92c_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
                                         rtl_set_bbreg(hw, RCCK0_CCA, MASKBYTE2,
                                                       0xcd);
 
-                                dm_digtable.pre_cck_fa_state =
-                                    dm_digtable.cur_cck_fa_state;
+                                dm_digtable->pre_cck_fa_state =
+                                    dm_digtable->cur_cck_fa_state;
                         }
 
                         rtl_set_bbreg(hw, RCCK0_SYSTEM, MASKBYTE1, 0x40);
@@ -458,11 +464,11 @@ static void rtl92c_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
                                 rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT,
                                               MASKBYTE2, 0xd3);
                 }
-                dm_digtable.pre_cck_pd_state = dm_digtable.cur_cck_pd_state;
+                dm_digtable->pre_cck_pd_state = dm_digtable->cur_cck_pd_state;
         }
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE, "CCKPDStage=%x\n",
-                 dm_digtable.cur_cck_pd_state);
+                 dm_digtable->cur_cck_pd_state);
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE, "is92C=%x\n",
                  IS_92C_SERIAL(rtlhal->version));
@@ -470,31 +476,34 @@ static void rtl92c_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
 
 static void rtl92c_dm_ctrl_initgain_by_twoport(struct ieee80211_hw *hw)
 {
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
 
         if (mac->act_scanning)
                 return;
 
         if (mac->link_state >= MAC80211_LINKED)
-                dm_digtable.cursta_connectctate = DIG_STA_CONNECT;
+                dm_digtable->cursta_connectctate = DIG_STA_CONNECT;
         else
-                dm_digtable.cursta_connectctate = DIG_STA_DISCONNECT;
+                dm_digtable->cursta_connectctate = DIG_STA_DISCONNECT;
 
         rtl92c_dm_initial_gain_sta(hw);
         rtl92c_dm_initial_gain_multi_sta(hw);
         rtl92c_dm_cck_packet_detection_thresh(hw);
 
-        dm_digtable.presta_connectstate = dm_digtable.cursta_connectctate;
+        dm_digtable->presta_connectstate = dm_digtable->cursta_connectctate;
 
 }
 
 static void rtl92c_dm_dig(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
 
         if (rtlpriv->dm.dm_initialgain_enable == false)
                 return;
-        if (dm_digtable.dig_enable_flag == false)
+        if (dm_digtable->dig_enable_flag == false)
                 return;
 
         rtl92c_dm_ctrl_initgain_by_twoport(hw);
@@ -514,23 +523,24 @@ static void rtl92c_dm_init_dynamic_txpower(struct ieee80211_hw *hw)
 void rtl92c_dm_write_dig(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
                  "cur_igvalue = 0x%x, pre_igvalue = 0x%x, backoff_val = %d\n",
-                 dm_digtable.cur_igvalue, dm_digtable.pre_igvalue,
-                 dm_digtable.backoff_val);
+                 dm_digtable->cur_igvalue, dm_digtable->pre_igvalue,
+                 dm_digtable->backoff_val);
 
-        dm_digtable.cur_igvalue += 2;
-        if (dm_digtable.cur_igvalue > 0x3f)
-                dm_digtable.cur_igvalue = 0x3f;
+        dm_digtable->cur_igvalue += 2;
+        if (dm_digtable->cur_igvalue > 0x3f)
+                dm_digtable->cur_igvalue = 0x3f;
 
-        if (dm_digtable.pre_igvalue != dm_digtable.cur_igvalue) {
+        if (dm_digtable->pre_igvalue != dm_digtable->cur_igvalue) {
                 rtl_set_bbreg(hw, ROFDM0_XAAGCCORE1, 0x7f,
-                              dm_digtable.cur_igvalue);
+                              dm_digtable->cur_igvalue);
                 rtl_set_bbreg(hw, ROFDM0_XBAGCCORE1, 0x7f,
-                              dm_digtable.cur_igvalue);
+                              dm_digtable->cur_igvalue);
 
-                dm_digtable.pre_igvalue = dm_digtable.cur_igvalue;
+                dm_digtable->pre_igvalue = dm_digtable->cur_igvalue;
         }
 }
 EXPORT_SYMBOL(rtl92c_dm_write_dig);
@@ -1223,15 +1233,20 @@ static void rtl92c_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
 
 static void rtl92c_dm_init_dynamic_bb_powersaving(struct ieee80211_hw *hw)
 {
-        dm_pstable.pre_ccastate = CCA_MAX;
-        dm_pstable.cur_ccasate = CCA_MAX;
-        dm_pstable.pre_rfstate = RF_MAX;
-        dm_pstable.cur_rfstate = RF_MAX;
-        dm_pstable.rssi_val_min = 0;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct ps_t *dm_pstable = &rtlpriv->dm_pstable;
+
+        dm_pstable->pre_ccastate = CCA_MAX;
+        dm_pstable->cur_ccasate = CCA_MAX;
+        dm_pstable->pre_rfstate = RF_MAX;
+        dm_pstable->cur_rfstate = RF_MAX;
+        dm_pstable->rssi_val_min = 0;
 }
 
 void rtl92c_dm_rf_saving(struct ieee80211_hw *hw, u8 bforce_in_normal)
 {
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct ps_t *dm_pstable = &rtlpriv->dm_pstable;
         static u8 initialize;
         static u32 reg_874, reg_c70, reg_85c, reg_a74;
 
@@ -1251,27 +1266,27 @@ void rtl92c_dm_rf_saving(struct ieee80211_hw *hw, u8 bforce_in_normal)
         }
 
         if (!bforce_in_normal) {
-                if (dm_pstable.rssi_val_min != 0) {
-                        if (dm_pstable.pre_rfstate == RF_NORMAL) {
-                                if (dm_pstable.rssi_val_min >= 30)
-                                        dm_pstable.cur_rfstate = RF_SAVE;
+                if (dm_pstable->rssi_val_min != 0) {
+                        if (dm_pstable->pre_rfstate == RF_NORMAL) {
+                                if (dm_pstable->rssi_val_min >= 30)
+                                        dm_pstable->cur_rfstate = RF_SAVE;
                                 else
-                                        dm_pstable.cur_rfstate = RF_NORMAL;
+                                        dm_pstable->cur_rfstate = RF_NORMAL;
                         } else {
-                                if (dm_pstable.rssi_val_min <= 25)
-                                        dm_pstable.cur_rfstate = RF_NORMAL;
+                                if (dm_pstable->rssi_val_min <= 25)
+                                        dm_pstable->cur_rfstate = RF_NORMAL;
                                 else
-                                        dm_pstable.cur_rfstate = RF_SAVE;
+                                        dm_pstable->cur_rfstate = RF_SAVE;
                         }
                 } else {
-                        dm_pstable.cur_rfstate = RF_MAX;
+                        dm_pstable->cur_rfstate = RF_MAX;
                 }
         } else {
-                dm_pstable.cur_rfstate = RF_NORMAL;
+                dm_pstable->cur_rfstate = RF_NORMAL;
         }
 
-        if (dm_pstable.pre_rfstate != dm_pstable.cur_rfstate) {
-                if (dm_pstable.cur_rfstate == RF_SAVE) {
+        if (dm_pstable->pre_rfstate != dm_pstable->cur_rfstate) {
+                if (dm_pstable->cur_rfstate == RF_SAVE) {
                         rtl_set_bbreg(hw, RFPGA0_XCD_RFINTERFACESW,
                                       0x1C0000, 0x2);
                         rtl_set_bbreg(hw, ROFDM0_AGCPARAMETER1, BIT(3), 0);
@@ -1293,7 +1308,7 @@ void rtl92c_dm_rf_saving(struct ieee80211_hw *hw, u8 bforce_in_normal)
                         rtl_set_bbreg(hw, 0x818, BIT(28), 0x0);
                 }
 
-                dm_pstable.pre_rfstate = dm_pstable.cur_rfstate;
+                dm_pstable->pre_rfstate = dm_pstable->cur_rfstate;
         }
 }
 EXPORT_SYMBOL(rtl92c_dm_rf_saving);
@@ -1301,36 +1316,37 @@ EXPORT_SYMBOL(rtl92c_dm_rf_saving);
 static void rtl92c_dm_dynamic_bb_powersaving(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct ps_t *dm_pstable = &rtlpriv->dm_pstable;
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 
         if (((mac->link_state == MAC80211_NOLINK)) &&
             (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb == 0)) {
-                dm_pstable.rssi_val_min = 0;
+                dm_pstable->rssi_val_min = 0;
                 RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD, "Not connected to any\n");
         }
 
         if (mac->link_state == MAC80211_LINKED) {
                 if (mac->opmode == NL80211_IFTYPE_ADHOC) {
-                        dm_pstable.rssi_val_min =
+                        dm_pstable->rssi_val_min =
                             rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
                         RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD,
                                  "AP Client PWDB = 0x%lx\n",
-                                 dm_pstable.rssi_val_min);
+                                 dm_pstable->rssi_val_min);
                 } else {
-                        dm_pstable.rssi_val_min =
+                        dm_pstable->rssi_val_min =
                             rtlpriv->dm.undecorated_smoothed_pwdb;
                         RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD,
                                  "STA Default Port PWDB = 0x%lx\n",
-                                 dm_pstable.rssi_val_min);
+                                 dm_pstable->rssi_val_min);
                 }
         } else {
-                dm_pstable.rssi_val_min =
+                dm_pstable->rssi_val_min =
                     rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
 
                 RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD,
                          "AP Ext Port PWDB = 0x%lx\n",
-                         dm_pstable.rssi_val_min);
+                         dm_pstable->rssi_val_min);
         }
 
         if (IS_92C_SERIAL(rtlhal->version))
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h
index 2178e3761883..518e208c0180 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h
@@ -91,40 +91,6 @@
 #define TX_POWER_NEAR_FIELD_THRESH_LVL2         74
 #define TX_POWER_NEAR_FIELD_THRESH_LVL1         67
 
-struct ps_t {
-        u8 pre_ccastate;
-        u8 cur_ccasate;
-        u8 pre_rfstate;
-        u8 cur_rfstate;
-        long rssi_val_min;
-};
-
-struct dig_t {
-        u8 dig_enable_flag;
-        u8 dig_ext_port_stage;
-        u32 rssi_lowthresh;
-        u32 rssi_highthresh;
-        u32 fa_lowthresh;
-        u32 fa_highthresh;
-        u8 cursta_connectctate;
-        u8 presta_connectstate;
-        u8 curmultista_connectstate;
-        u8 pre_igvalue;
-        u8 cur_igvalue;
-        char backoff_val;
-        char backoff_val_range_max;
-        char backoff_val_range_min;
-        u8 rx_gain_range_max;
-        u8 rx_gain_range_min;
-        u8 rssi_val_min;
-        u8 pre_cck_pd_state;
-        u8 cur_cck_pd_state;
-        u8 pre_cck_fa_state;
-        u8 cur_cck_fa_state;
-        u8 pre_ccastate;
-        u8 cur_ccasate;
-};
-
 struct swat_t {
         u8 failure_cnt;
         u8 try_flag;
@@ -189,7 +155,6 @@ enum dm_dig_connect_e {
         DIG_CONNECT_MAX
 };
 
-extern struct dig_t dm_digtable;
 void rtl92c_dm_init(struct ieee80211_hw *hw);
 void rtl92c_dm_watchdog(struct ieee80211_hw *hw);
 void rtl92c_dm_write_dig(struct ieee80211_hw *hw);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
index c20b3c30f62e..692c8ef5ee89 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
@@ -34,6 +34,7 @@
 #include "../rtl8192ce/def.h"
 #include "fw_common.h"
 #include <linux/export.h>
+#include <linux/kmemleak.h>
 
 static void _rtl92c_enable_fw_download(struct ieee80211_hw *hw, bool enable)
 {
@@ -776,6 +777,8 @@ void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
         skb = dev_alloc_skb(totalpacketlen);
         if (!skb)
                 return;
+        kmemleak_not_leak(skb);
+
         memcpy((u8 *) skb_put(skb, totalpacketlen),
                &reserved_page_packet, totalpacketlen);
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
index 4c016241f340..cdcad7d9f15e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
@@ -1881,6 +1881,7 @@ void rtl92c_phy_set_io(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct dig_t dm_digtable = rtlpriv->dm_digtable;
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
                  "--->Cmd(%#x), set_io_inprogress(%d)\n",
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h
index 26747fa86005..d4a3d032c7bf 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h
@@ -86,40 +86,6 @@
 #define TX_POWER_NEAR_FIELD_THRESH_LVL2         74
 #define TX_POWER_NEAR_FIELD_THRESH_LVL1         67
 
-struct ps_t {
-        u8 pre_ccastate;
-        u8 cur_ccasate;
-        u8 pre_rfstate;
-        u8 cur_rfstate;
-        long rssi_val_min;
-};
-
-struct dig_t {
-        u8 dig_enable_flag;
-        u8 dig_ext_port_stage;
-        u32 rssi_lowthresh;
-        u32 rssi_highthresh;
-        u32 fa_lowthresh;
-        u32 fa_highthresh;
-        u8 cursta_connectctate;
-        u8 presta_connectstate;
-        u8 curmultista_connectstate;
-        u8 pre_igvalue;
-        u8 cur_igvalue;
-        char backoff_val;
-        char backoff_val_range_max;
-        char backoff_val_range_min;
-        u8 rx_gain_range_max;
-        u8 rx_gain_range_min;
-        u8 rssi_val_min;
-        u8 pre_cck_pd_state;
-        u8 cur_cck_pd_state;
-        u8 pre_cck_fa_state;
-        u8 cur_cck_fa_state;
-        u8 pre_ccastate;
-        u8 cur_ccasate;
-};
-
 struct swat_t {
         u8 failure_cnt;
         u8 try_flag;
@@ -184,7 +150,6 @@ enum dm_dig_connect_e {
         DIG_CONNECT_MAX
 };
 
-extern struct dig_t dm_digtable;
 void rtl92c_dm_init(struct ieee80211_hw *hw);
 void rtl92c_dm_watchdog(struct ieee80211_hw *hw);
 void rtl92c_dm_write_dig(struct ieee80211_hw *hw);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
index 2c3b73366cd2..3aa927f8b9b9 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
@@ -389,21 +389,4 @@ static struct pci_driver rtl92ce_driver = {
         .driver.pm = &rtlwifi_pm_ops,
 };
 
-static int __init rtl92ce_module_init(void)
-{
-        int ret;
-
-        ret = pci_register_driver(&rtl92ce_driver);
-        if (ret)
-                RT_ASSERT(false, "No device found\n");
-
-        return ret;
-}
-
-static void __exit rtl92ce_module_exit(void)
-{
-        pci_unregister_driver(&rtl92ce_driver);
-}
-
-module_init(rtl92ce_module_init);
-module_exit(rtl92ce_module_exit);
+module_pci_driver(rtl92ce_driver);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
index 37b13636a778..3af874e69595 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
@@ -508,14 +508,14 @@ static void _rtl92ce_translate_rx_signal_stuff(struct ieee80211_hw *hw,
 
         packet_matchbssid =
             ((IEEE80211_FTYPE_CTL != type) &&
-             (!compare_ether_addr(mac->bssid,
-                                  (c_fc & IEEE80211_FCTL_TODS) ?
-                                  hdr->addr1 : (c_fc & IEEE80211_FCTL_FROMDS) ?
-                                  hdr->addr2 : hdr->addr3)) &&
+             ether_addr_equal(mac->bssid,
+                              (c_fc & IEEE80211_FCTL_TODS) ? hdr->addr1 :
+                              (c_fc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 :
+                              hdr->addr3) &&
              (!pstats->hwerror) && (!pstats->crc) && (!pstats->icv));
 
         packet_toself = packet_matchbssid &&
-            (!compare_ether_addr(praddr, rtlefuse->dev_addr));
+             ether_addr_equal(praddr, rtlefuse->dev_addr);
 
         if (ieee80211_is_beacon(fc))
                 packet_beacon = true;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
index efb9ab270403..c4adb9777365 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
@@ -530,12 +530,7 @@
         SET_BITS_OFFSET_LE(__pdesc+28, 0, 32, __val)
 
 #define CLEAR_PCI_TX_DESC_CONTENT(__pdesc, _size)       \
-do {                                                    \
-        if (_size > TX_DESC_NEXT_DESC_OFFSET)           \
-                memset(__pdesc, 0, TX_DESC_NEXT_DESC_OFFSET);   \
-        else                                            \
-                memset(__pdesc, 0, _size);      \
-} while (0);
+        memset(__pdesc, 0, min_t(size_t, _size, TX_DESC_NEXT_DESC_OFFSET))
 
 struct rx_fwinfo_92c {
         u8 gain_trsw[4];
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
index 025bdc2eba44..7e91c76582ec 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
@@ -1099,14 +1099,14 @@ void rtl92c_translate_rx_signal_stuff(struct ieee80211_hw *hw,
         praddr = hdr->addr1;
         packet_matchbssid =
             ((IEEE80211_FTYPE_CTL != type) &&
-             (!compare_ether_addr(mac->bssid,
-                          (cpu_fc & IEEE80211_FCTL_TODS) ?
-                          hdr->addr1 : (cpu_fc & IEEE80211_FCTL_FROMDS) ?
-                          hdr->addr2 : hdr->addr3)) &&
+             ether_addr_equal(mac->bssid,
+                              (cpu_fc & IEEE80211_FCTL_TODS) ? hdr->addr1 :
+                              (cpu_fc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 :
+                              hdr->addr3) &&
              (!pstats->hwerror) && (!pstats->crc) && (!pstats->icv));
 
         packet_toself = packet_matchbssid &&
-            (!compare_ether_addr(praddr, rtlefuse->dev_addr));
+            ether_addr_equal(praddr, rtlefuse->dev_addr);
         if (ieee80211_is_beacon(fc))
                 packet_beacon = true;
         _rtl92c_query_rxphystatus(hw, pstats, pdesc, p_drvinfo,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index 82c85286ab2e..7737fb0c6661 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@ -338,6 +338,7 @@ static struct usb_device_id rtl8192c_usb_ids[] = {
         {RTL_USB_DEVICE(0x2019, 0x1201, rtl92cu_hal_cfg)}, /*Planex-Vencer*/
 
         /****** 8192CU ********/
+        {RTL_USB_DEVICE(0x050d, 0x1004, rtl92cu_hal_cfg)}, /*Belcom-SurfN300*/
         {RTL_USB_DEVICE(0x050d, 0x2102, rtl92cu_hal_cfg)}, /*Belcom-Sercomm*/
         {RTL_USB_DEVICE(0x050d, 0x2103, rtl92cu_hal_cfg)}, /*Belcom-Edimax*/
         {RTL_USB_DEVICE(0x0586, 0x341f, rtl92cu_hal_cfg)}, /*Zyxel -Abocom*/
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/def.h b/drivers/net/wireless/rtlwifi/rtl8192de/def.h
index eafdf76ed64d..939c905f547f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/def.h
@@ -151,9 +151,6 @@ enum version_8192d {
 
 /* for 92D */
 #define CHIP_92D_SINGLEPHY              BIT(9)
-#define C_CUT_VERSION                   BIT(13)
-#define D_CUT_VERSION                   ((BIT(12)|BIT(13)))
-#define E_CUT_VERSION                   BIT(14)
 
 /* Chip specific */
 #define CHIP_BONDING_IDENTIFIER(_value) (((_value)>>22)&0x3)
@@ -173,7 +170,10 @@ enum version_8192d {
 #define RF_TYPE_1T2R                    BIT(4)
 #define RF_TYPE_2T2R                    BIT(5)
 #define CHIP_VENDOR_UMC                 BIT(7)
-#define B_CUT_VERSION                   BIT(12)
+#define CHIP_92D_B_CUT                  BIT(12)
+#define CHIP_92D_C_CUT                  BIT(13)
+#define CHIP_92D_D_CUT                  (BIT(13)|BIT(12))
+#define CHIP_92D_E_CUT                  BIT(14)
 
 /* MASK */
 #define IC_TYPE_MASK                    (BIT(0)|BIT(1)|BIT(2))
@@ -205,15 +205,13 @@ enum version_8192d {
                                          CHIP_92D) ? true : false)
 #define IS_92D_C_CUT(version)           ((IS_92D(version)) ?            \
                                  ((GET_CVID_CUT_VERSION(version) ==     \
-                                 0x2000) ? true : false) : false)
+                                 CHIP_92D_C_CUT) ? true : false) : false)
 #define IS_92D_D_CUT(version)                   ((IS_92D(version)) ?    \
                                  ((GET_CVID_CUT_VERSION(version) ==     \
-                                 0x3000) ? true : false) : false)
+                                 CHIP_92D_D_CUT) ? true : false) : false)
 #define IS_92D_E_CUT(version)           ((IS_92D(version)) ?            \
                                  ((GET_CVID_CUT_VERSION(version) ==     \
-                                 0x4000) ? true : false) : false)
-#define CHIP_92D_C_CUT                  BIT(10)
-#define CHIP_92D_D_CUT                  BIT(11)
+                                 CHIP_92D_E_CUT) ? true : false) : false)
 
 enum rf_optype {
         RF_OP_BY_SW_3WIRE = 0,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
index 4737018c9daa..a7d63a84551a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
@@ -37,8 +37,6 @@
 
 #define UNDEC_SM_PWDB   entry_min_undecoratedsmoothed_pwdb
 
-struct dig_t de_digtable;
-
 static const u32 ofdmswing_table[OFDM_TABLE_SIZE_92D] = {
         0x7f8001fe,             /* 0, +6.0dB */
         0x788001e2,             /* 1, +5.5dB */
@@ -159,27 +157,30 @@ static const u8 cckswing_table_ch14[CCK_TABLE_SIZE][8] = {
 
 static void rtl92d_dm_diginit(struct ieee80211_hw *hw)
 {
-        de_digtable.dig_enable_flag = true;
-        de_digtable.dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX;
-        de_digtable.cur_igvalue = 0x20;
-        de_digtable.pre_igvalue = 0x0;
-        de_digtable.cursta_connectctate = DIG_STA_DISCONNECT;
-        de_digtable.presta_connectstate = DIG_STA_DISCONNECT;
-        de_digtable.curmultista_connectstate = DIG_MULTISTA_DISCONNECT;
-        de_digtable.rssi_lowthresh = DM_DIG_THRESH_LOW;
-        de_digtable.rssi_highthresh = DM_DIG_THRESH_HIGH;
-        de_digtable.fa_lowthresh = DM_FALSEALARM_THRESH_LOW;
-        de_digtable.fa_highthresh = DM_FALSEALARM_THRESH_HIGH;
-        de_digtable.rx_gain_range_max = DM_DIG_FA_UPPER;
-        de_digtable.rx_gain_range_min = DM_DIG_FA_LOWER;
-        de_digtable.backoff_val = DM_DIG_BACKOFF_DEFAULT;
-        de_digtable.backoff_val_range_max = DM_DIG_BACKOFF_MAX;
-        de_digtable.backoff_val_range_min = DM_DIG_BACKOFF_MIN;
-        de_digtable.pre_cck_pd_state = CCK_PD_STAGE_LOWRSSI;
-        de_digtable.cur_cck_pd_state = CCK_PD_STAGE_MAX;
-        de_digtable.large_fa_hit = 0;
-        de_digtable.recover_cnt = 0;
-        de_digtable.forbidden_igi = DM_DIG_FA_LOWER;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *de_digtable = &rtlpriv->dm_digtable;
+
+        de_digtable->dig_enable_flag = true;
+        de_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX;
+        de_digtable->cur_igvalue = 0x20;
+        de_digtable->pre_igvalue = 0x0;
+        de_digtable->cursta_connectctate = DIG_STA_DISCONNECT;
+        de_digtable->presta_connectstate = DIG_STA_DISCONNECT;
+        de_digtable->curmultista_connectstate = DIG_MULTISTA_DISCONNECT;
+        de_digtable->rssi_lowthresh = DM_DIG_THRESH_LOW;
+        de_digtable->rssi_highthresh = DM_DIG_THRESH_HIGH;
+        de_digtable->fa_lowthresh = DM_FALSEALARM_THRESH_LOW;
+        de_digtable->fa_highthresh = DM_FALSEALARM_THRESH_HIGH;
+        de_digtable->rx_gain_range_max = DM_DIG_FA_UPPER;
+        de_digtable->rx_gain_range_min = DM_DIG_FA_LOWER;
+        de_digtable->backoff_val = DM_DIG_BACKOFF_DEFAULT;
+        de_digtable->backoff_val_range_max = DM_DIG_BACKOFF_MAX;
+        de_digtable->backoff_val_range_min = DM_DIG_BACKOFF_MIN;
+        de_digtable->pre_cck_pd_state = CCK_PD_STAGE_LOWRSSI;
+        de_digtable->cur_cck_pd_state = CCK_PD_STAGE_MAX;
+        de_digtable->large_fa_hit = 0;
+        de_digtable->recover_cnt = 0;
+        de_digtable->forbidden_igi = DM_DIG_FA_LOWER;
 }
 
 static void rtl92d_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
@@ -266,68 +267,70 @@ static void rtl92d_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
 static void rtl92d_dm_find_minimum_rssi(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *de_digtable = &rtlpriv->dm_digtable;
         struct rtl_mac *mac = rtl_mac(rtlpriv);
 
         /* Determine the minimum RSSI  */
         if ((mac->link_state < MAC80211_LINKED) &&
             (rtlpriv->dm.UNDEC_SM_PWDB == 0)) {
-                de_digtable.min_undecorated_pwdb_for_dm = 0;
+                de_digtable->min_undecorated_pwdb_for_dm = 0;
                 RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
                          "Not connected to any\n");
         }
         if (mac->link_state >= MAC80211_LINKED) {
                 if (mac->opmode == NL80211_IFTYPE_AP ||
                     mac->opmode == NL80211_IFTYPE_ADHOC) {
-                        de_digtable.min_undecorated_pwdb_for_dm =
+                        de_digtable->min_undecorated_pwdb_for_dm =
                             rtlpriv->dm.UNDEC_SM_PWDB;
                         RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
                                  "AP Client PWDB = 0x%lx\n",
                                  rtlpriv->dm.UNDEC_SM_PWDB);
                 } else {
-                        de_digtable.min_undecorated_pwdb_for_dm =
+                        de_digtable->min_undecorated_pwdb_for_dm =
                             rtlpriv->dm.undecorated_smoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
                                  "STA Default Port PWDB = 0x%x\n",
-                                 de_digtable.min_undecorated_pwdb_for_dm);
+                                 de_digtable->min_undecorated_pwdb_for_dm);
                 }
         } else {
-                de_digtable.min_undecorated_pwdb_for_dm =
+                de_digtable->min_undecorated_pwdb_for_dm =
                     rtlpriv->dm.UNDEC_SM_PWDB;
                 RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
                          "AP Ext Port or disconnect PWDB = 0x%x\n",
-                         de_digtable.min_undecorated_pwdb_for_dm);
+                         de_digtable->min_undecorated_pwdb_for_dm);
         }
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "MinUndecoratedPWDBForDM =%d\n",
-                 de_digtable.min_undecorated_pwdb_for_dm);
+                 de_digtable->min_undecorated_pwdb_for_dm);
 }
 
 static void rtl92d_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *de_digtable = &rtlpriv->dm_digtable;
         unsigned long flag = 0;
 
-        if (de_digtable.cursta_connectctate == DIG_STA_CONNECT) {
-                if (de_digtable.pre_cck_pd_state == CCK_PD_STAGE_LOWRSSI) {
-                        if (de_digtable.min_undecorated_pwdb_for_dm <= 25)
-                                de_digtable.cur_cck_pd_state =
+        if (de_digtable->cursta_connectctate == DIG_STA_CONNECT) {
+                if (de_digtable->pre_cck_pd_state == CCK_PD_STAGE_LOWRSSI) {
+                        if (de_digtable->min_undecorated_pwdb_for_dm <= 25)
+                                de_digtable->cur_cck_pd_state =
                                                          CCK_PD_STAGE_LOWRSSI;
                         else
-                                de_digtable.cur_cck_pd_state =
+                                de_digtable->cur_cck_pd_state =
                                                          CCK_PD_STAGE_HIGHRSSI;
                 } else {
-                        if (de_digtable.min_undecorated_pwdb_for_dm <= 20)
-                                de_digtable.cur_cck_pd_state =
+                        if (de_digtable->min_undecorated_pwdb_for_dm <= 20)
+                                de_digtable->cur_cck_pd_state =
                                                          CCK_PD_STAGE_LOWRSSI;
                         else
-                                de_digtable.cur_cck_pd_state =
+                                de_digtable->cur_cck_pd_state =
                                                          CCK_PD_STAGE_HIGHRSSI;
                 }
         } else {
-                de_digtable.cur_cck_pd_state = CCK_PD_STAGE_LOWRSSI;
+                de_digtable->cur_cck_pd_state = CCK_PD_STAGE_LOWRSSI;
         }
-        if (de_digtable.pre_cck_pd_state != de_digtable.cur_cck_pd_state) {
-                if (de_digtable.cur_cck_pd_state == CCK_PD_STAGE_LOWRSSI) {
+        if (de_digtable->pre_cck_pd_state != de_digtable->cur_cck_pd_state) {
+                if (de_digtable->cur_cck_pd_state == CCK_PD_STAGE_LOWRSSI) {
                         rtl92d_acquire_cckandrw_pagea_ctl(hw, &flag);
                         rtl_set_bbreg(hw, RCCK0_CCA, BMASKBYTE2, 0x83);
                         rtl92d_release_cckandrw_pagea_ctl(hw, &flag);
@@ -336,13 +339,13 @@ static void rtl92d_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
                         rtl_set_bbreg(hw, RCCK0_CCA, BMASKBYTE2, 0xcd);
                         rtl92d_release_cckandrw_pagea_ctl(hw, &flag);
                 }
-                de_digtable.pre_cck_pd_state = de_digtable.cur_cck_pd_state;
+                de_digtable->pre_cck_pd_state = de_digtable->cur_cck_pd_state;
         }
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "CurSTAConnectState=%s\n",
-                 de_digtable.cursta_connectctate == DIG_STA_CONNECT ?
+                 de_digtable->cursta_connectctate == DIG_STA_CONNECT ?
                  "DIG_STA_CONNECT " : "DIG_STA_DISCONNECT");
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "CCKPDStage=%s\n",
-                 de_digtable.cur_cck_pd_state == CCK_PD_STAGE_LOWRSSI ?
+                 de_digtable->cur_cck_pd_state == CCK_PD_STAGE_LOWRSSI ?
                  "Low RSSI " : "High RSSI ");
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "is92d single phy =%x\n",
                  IS_92D_SINGLEPHY(rtlpriv->rtlhal.version));
@@ -352,37 +355,40 @@ static void rtl92d_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
 void rtl92d_dm_write_dig(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *de_digtable = &rtlpriv->dm_digtable;
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
                  "cur_igvalue = 0x%x, pre_igvalue = 0x%x, backoff_val = %d\n",
-                 de_digtable.cur_igvalue, de_digtable.pre_igvalue,
-                 de_digtable.backoff_val);
-        if (de_digtable.dig_enable_flag == false) {
+                 de_digtable->cur_igvalue, de_digtable->pre_igvalue,
+                 de_digtable->backoff_val);
+        if (de_digtable->dig_enable_flag == false) {
                 RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "DIG is disabled\n");
-                de_digtable.pre_igvalue = 0x17;
+                de_digtable->pre_igvalue = 0x17;
                 return;
         }
-        if (de_digtable.pre_igvalue != de_digtable.cur_igvalue) {
+        if (de_digtable->pre_igvalue != de_digtable->cur_igvalue) {
                 rtl_set_bbreg(hw, ROFDM0_XAAGCCORE1, 0x7f,
-                              de_digtable.cur_igvalue);
+                              de_digtable->cur_igvalue);
                 rtl_set_bbreg(hw, ROFDM0_XBAGCCORE1, 0x7f,
-                              de_digtable.cur_igvalue);
-                de_digtable.pre_igvalue = de_digtable.cur_igvalue;
+                              de_digtable->cur_igvalue);
+                de_digtable->pre_igvalue = de_digtable->cur_igvalue;
         }
 }
 
 static void rtl92d_early_mode_enabled(struct rtl_priv *rtlpriv)
 {
+        struct dig_t *de_digtable = &rtlpriv->dm_digtable;
+
         if ((rtlpriv->mac80211.link_state >= MAC80211_LINKED) &&
             (rtlpriv->mac80211.vendor == PEER_CISCO)) {
                 RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "IOT_PEER = CISCO\n");
-                if (de_digtable.last_min_undecorated_pwdb_for_dm >= 50
-                    && de_digtable.min_undecorated_pwdb_for_dm < 50) {
+                if (de_digtable->last_min_undecorated_pwdb_for_dm >= 50
+                    && de_digtable->min_undecorated_pwdb_for_dm < 50) {
                         rtl_write_byte(rtlpriv, REG_EARLY_MODE_CONTROL, 0x00);
                         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
                                  "Early Mode Off\n");
-                } else if (de_digtable.last_min_undecorated_pwdb_for_dm <= 55 &&
-                           de_digtable.min_undecorated_pwdb_for_dm > 55) {
+                } else if (de_digtable->last_min_undecorated_pwdb_for_dm <= 55 &&
+                           de_digtable->min_undecorated_pwdb_for_dm > 55) {
                         rtl_write_byte(rtlpriv, REG_EARLY_MODE_CONTROL, 0x0f);
                         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
                                  "Early Mode On\n");
@@ -396,14 +402,15 @@ static void rtl92d_early_mode_enabled(struct rtl_priv *rtlpriv)
 static void rtl92d_dm_dig(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u8 value_igi = de_digtable.cur_igvalue;
+        struct dig_t *de_digtable = &rtlpriv->dm_digtable;
+        u8 value_igi = de_digtable->cur_igvalue;
         struct false_alarm_statistics *falsealm_cnt = &(rtlpriv->falsealm_cnt);
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "==>\n");
         if (rtlpriv->rtlhal.earlymode_enable) {
                 rtl92d_early_mode_enabled(rtlpriv);
-                de_digtable.last_min_undecorated_pwdb_for_dm =
-                                 de_digtable.min_undecorated_pwdb_for_dm;
+                de_digtable->last_min_undecorated_pwdb_for_dm =
+                                 de_digtable->min_undecorated_pwdb_for_dm;
         }
         if (!rtlpriv->dm.dm_initialgain_enable)
                 return;
@@ -421,9 +428,9 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "progress\n");
         /* Decide the current status and if modify initial gain or not */
         if (rtlpriv->mac80211.link_state >= MAC80211_LINKED)
-                de_digtable.cursta_connectctate = DIG_STA_CONNECT;
+                de_digtable->cursta_connectctate = DIG_STA_CONNECT;
         else
-                de_digtable.cursta_connectctate = DIG_STA_DISCONNECT;
+                de_digtable->cursta_connectctate = DIG_STA_DISCONNECT;
 
         /* adjust initial gain according to false alarm counter */
         if (falsealm_cnt->cnt_all < DM_DIG_FA_TH0)
@@ -436,64 +443,64 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
                 value_igi += 2;
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
                  "dm_DIG() Before: large_fa_hit=%d, forbidden_igi=%x\n",
-                 de_digtable.large_fa_hit, de_digtable.forbidden_igi);
+                 de_digtable->large_fa_hit, de_digtable->forbidden_igi);
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
                  "dm_DIG() Before: Recover_cnt=%d, rx_gain_range_min=%x\n",
-                 de_digtable.recover_cnt, de_digtable.rx_gain_range_min);
+                 de_digtable->recover_cnt, de_digtable->rx_gain_range_min);
 
         /* deal with abnorally large false alarm */
         if (falsealm_cnt->cnt_all > 10000) {
                 RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
                          "dm_DIG(): Abnormally false alarm case\n");
 
-                de_digtable.large_fa_hit++;
-                if (de_digtable.forbidden_igi < de_digtable.cur_igvalue) {
-                        de_digtable.forbidden_igi = de_digtable.cur_igvalue;
-                        de_digtable.large_fa_hit = 1;
+                de_digtable->large_fa_hit++;
+                if (de_digtable->forbidden_igi < de_digtable->cur_igvalue) {
+                        de_digtable->forbidden_igi = de_digtable->cur_igvalue;
+                        de_digtable->large_fa_hit = 1;
                 }
-                if (de_digtable.large_fa_hit >= 3) {
-                        if ((de_digtable.forbidden_igi + 1) > DM_DIG_MAX)
-                                de_digtable.rx_gain_range_min = DM_DIG_MAX;
+                if (de_digtable->large_fa_hit >= 3) {
+                        if ((de_digtable->forbidden_igi + 1) > DM_DIG_MAX)
+                                de_digtable->rx_gain_range_min = DM_DIG_MAX;
                         else
-                                de_digtable.rx_gain_range_min =
-                                    (de_digtable.forbidden_igi + 1);
-                        de_digtable.recover_cnt = 3600; /* 3600=2hr */
+                                de_digtable->rx_gain_range_min =
+                                    (de_digtable->forbidden_igi + 1);
+                        de_digtable->recover_cnt = 3600;        /* 3600=2hr */
                 }
         } else {
                 /* Recovery mechanism for IGI lower bound */
-                if (de_digtable.recover_cnt != 0) {
-                        de_digtable.recover_cnt--;
+                if (de_digtable->recover_cnt != 0) {
+                        de_digtable->recover_cnt--;
                 } else {
-                        if (de_digtable.large_fa_hit == 0) {
-                                if ((de_digtable.forbidden_igi - 1) <
+                        if (de_digtable->large_fa_hit == 0) {
+                                if ((de_digtable->forbidden_igi - 1) <
                                     DM_DIG_FA_LOWER) {
-                                        de_digtable.forbidden_igi =
+                                        de_digtable->forbidden_igi =
                                                          DM_DIG_FA_LOWER;
-                                        de_digtable.rx_gain_range_min =
+                                        de_digtable->rx_gain_range_min =
                                                          DM_DIG_FA_LOWER;
 
                                 } else {
-                                        de_digtable.forbidden_igi--;
-                                        de_digtable.rx_gain_range_min =
-                                            (de_digtable.forbidden_igi + 1);
+                                        de_digtable->forbidden_igi--;
+                                        de_digtable->rx_gain_range_min =
+                                            (de_digtable->forbidden_igi + 1);
                                 }
-                        } else if (de_digtable.large_fa_hit == 3) {
-                                de_digtable.large_fa_hit = 0;
+                        } else if (de_digtable->large_fa_hit == 3) {
+                                de_digtable->large_fa_hit = 0;
                         }
                 }
         }
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
                  "dm_DIG() After: large_fa_hit=%d, forbidden_igi=%x\n",
-                 de_digtable.large_fa_hit, de_digtable.forbidden_igi);
+                 de_digtable->large_fa_hit, de_digtable->forbidden_igi);
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
                  "dm_DIG() After: recover_cnt=%d, rx_gain_range_min=%x\n",
-                 de_digtable.recover_cnt, de_digtable.rx_gain_range_min);
+                 de_digtable->recover_cnt, de_digtable->rx_gain_range_min);
 
         if (value_igi > DM_DIG_MAX)
                 value_igi = DM_DIG_MAX;
-        else if (value_igi < de_digtable.rx_gain_range_min)
-                value_igi = de_digtable.rx_gain_range_min;
-        de_digtable.cur_igvalue = value_igi;
+        else if (value_igi < de_digtable->rx_gain_range_min)
+                value_igi = de_digtable->rx_gain_range_min;
+        de_digtable->cur_igvalue = value_igi;
         rtl92d_dm_write_dig(hw);
         if (rtlpriv->rtlhal.current_bandtype != BAND_ON_5G)
                 rtl92d_dm_cck_packet_detection_thresh(hw);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.h b/drivers/net/wireless/rtlwifi/rtl8192de/dm.h
index 91030ec8ac3e..3fea0c11c24a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.h
@@ -87,55 +87,6 @@
 #define TX_POWER_NEAR_FIELD_THRESH_LVL1         67
 #define INDEX_MAPPING_NUM                       13
 
-struct ps_t {
-        u8 pre_ccastate;
-        u8 cur_ccasate;
-
-        u8 pre_rfstate;
-        u8 cur_rfstate;
-
-        long rssi_val_min;
-};
-
-struct dig_t {
-        u8 dig_enable_flag;
-        u8 dig_ext_port_stage;
-
-        u32 rssi_lowthresh;
-        u32 rssi_highthresh;
-
-        u32 fa_lowthresh;
-        u32 fa_highthresh;
-
-        u8 cursta_connectctate;
-        u8 presta_connectstate;
-        u8 curmultista_connectstate;
-
-        u8 pre_igvalue;
-        u8 cur_igvalue;
-
-        char backoff_val;
-        char backoff_val_range_max;
-        char backoff_val_range_min;
-        u8 rx_gain_range_max;
-        u8 rx_gain_range_min;
-        u8 min_undecorated_pwdb_for_dm;
-        long last_min_undecorated_pwdb_for_dm;
-
-        u8 pre_cck_pd_state;
-        u8 cur_cck_pd_state;
-
-        u8 pre_cck_fa_state;
-        u8 cur_cck_fa_state;
-
-        u8 pre_ccastate;
-        u8 cur_ccasate;
-
-        u8 large_fa_hit;
-        u8 forbidden_igi;
-        u32 recover_cnt;
-};
-
 struct swat {
         u8 failure_cnt;
         u8 try_flag;
@@ -200,8 +151,6 @@ enum dm_dig_connect {
         DIG_CONNECT_MAX
 };
 
-extern struct dig_t de_digtable;
-
 void rtl92d_dm_init(struct ieee80211_hw *hw);
 void rtl92d_dm_watchdog(struct ieee80211_hw *hw);
 void rtl92d_dm_init_edca_turbo(struct ieee80211_hw *hw);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
index 509f5af38adf..b338d526c422 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
@@ -1743,9 +1743,13 @@ static void _rtl92de_efuse_update_chip_version(struct ieee80211_hw *hw)
                 chipver |= CHIP_92D_D_CUT;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "D-CUT!!!\n");
                 break;
+        case 0xCC33:
+                chipver |= CHIP_92D_E_CUT;
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "E-CUT!!!\n");
+                break;
         default:
                 chipver |= CHIP_92D_D_CUT;
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "Unkown CUT!\n");
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "Unknown CUT!\n");
                 break;
         }
         rtlpriv->rtlhal.version = chipver;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
index 28fc5fb8057b..18380a7829f1 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
@@ -3064,6 +3064,7 @@ u8 rtl92d_phy_sw_chnl(struct ieee80211_hw *hw)
 static void rtl92d_phy_set_io(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *de_digtable = &rtlpriv->dm_digtable;
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
@@ -3071,13 +3072,13 @@ static void rtl92d_phy_set_io(struct ieee80211_hw *hw)
                  rtlphy->current_io_type, rtlphy->set_io_inprogress);
         switch (rtlphy->current_io_type) {
         case IO_CMD_RESUME_DM_BY_SCAN:
-                de_digtable.cur_igvalue = rtlphy->initgain_backup.xaagccore1;
+                de_digtable->cur_igvalue = rtlphy->initgain_backup.xaagccore1;
                 rtl92d_dm_write_dig(hw);
                 rtl92d_phy_set_txpower_level(hw, rtlphy->current_channel);
                 break;
         case IO_CMD_PAUSE_DM_BY_SCAN:
-                rtlphy->initgain_backup.xaagccore1 = de_digtable.cur_igvalue;
-                de_digtable.cur_igvalue = 0x37;
+                rtlphy->initgain_backup.xaagccore1 = de_digtable->cur_igvalue;
+                de_digtable->cur_igvalue = 0x37;
                 rtl92d_dm_write_dig(hw);
                 break;
         default:
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
index a7f6126e2f86..1666ef7fd87b 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
@@ -466,12 +466,13 @@ static void _rtl92de_translate_rx_signal_stuff(struct ieee80211_hw *hw,
         type = WLAN_FC_GET_TYPE(fc);
         praddr = hdr->addr1;
         packet_matchbssid = ((IEEE80211_FTYPE_CTL != type) &&
-             (!compare_ether_addr(mac->bssid, (cfc & IEEE80211_FCTL_TODS) ?
-                  hdr->addr1 : (cfc & IEEE80211_FCTL_FROMDS) ?
-                  hdr->addr2 : hdr->addr3)) && (!pstats->hwerror) &&
-                  (!pstats->crc) && (!pstats->icv));
+             ether_addr_equal(mac->bssid,
+                              (cfc & IEEE80211_FCTL_TODS) ? hdr->addr1 :
+                              (cfc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 :
+                              hdr->addr3) &&
+             (!pstats->hwerror) && (!pstats->crc) && (!pstats->icv));
         packet_toself = packet_matchbssid &&
-                        (!compare_ether_addr(praddr, rtlefuse->dev_addr));
+                        ether_addr_equal(praddr, rtlefuse->dev_addr);
         if (ieee80211_is_beacon(fc))
                 packet_beacon = true;
         _rtl92de_query_rxphystatus(hw, pstats, pdesc, p_drvinfo,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/trx.h b/drivers/net/wireless/rtlwifi/rtl8192de/trx.h
index 0dc736c2723b..057a52431b00 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/trx.h
@@ -530,12 +530,8 @@
         SET_BITS_OFFSET_LE(__pdesc+28, 0, 32, __val)
 
 #define CLEAR_PCI_TX_DESC_CONTENT(__pdesc, _size)       \
-do {                                                    \
-        if (_size > TX_DESC_NEXT_DESC_OFFSET)           \
-                memset((void *)__pdesc, 0, TX_DESC_NEXT_DESC_OFFSET);   \
-        else                                            \
-                memset((void *)__pdesc, 0, _size);      \
-} while (0);
+        memset((void *)__pdesc, 0,                      \
+               min_t(size_t, _size, TX_DESC_NEXT_DESC_OFFSET))
 
 /* For 92D early mode */
 #define SET_EARLYMODE_PKTNUM(__paddr, __value)          \
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/def.h b/drivers/net/wireless/rtlwifi/rtl8192se/def.h
index d1b0a1e14971..20afec62ce05 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/def.h
@@ -252,12 +252,7 @@
  * the desc is cleared. */
 #define TX_DESC_NEXT_DESC_OFFSET                        36
 #define CLEAR_PCI_TX_DESC_CONTENT(__pdesc, _size)               \
-do {                                                            \
-        if (_size > TX_DESC_NEXT_DESC_OFFSET)                   \
-                memset(__pdesc, 0, TX_DESC_NEXT_DESC_OFFSET);   \
-        else                                                    \
-                memset(__pdesc, 0, _size);                      \
-} while (0);
+        memset(__pdesc, 0, min_t(size_t, _size, TX_DESC_NEXT_DESC_OFFSET))
 
 /* Rx Desc */
 #define RX_STATUS_DESC_SIZE                             24
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
index fbabae17259e..2e1158026fb7 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
@@ -35,7 +35,6 @@
 #include "dm.h"
 #include "fw.h"
 
-struct dig_t digtable;
 static const u32 edca_setting_dl[PEER_MAX] = {
         0xa44f,         /* 0 UNKNOWN */
         0x5ea44f,       /* 1 REALTEK_90 */
@@ -421,62 +420,64 @@ static void _rtl92s_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
 static void rtl92s_backoff_enable_flag(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *digtable = &rtlpriv->dm_digtable;
         struct false_alarm_statistics *falsealm_cnt = &(rtlpriv->falsealm_cnt);
 
-        if (falsealm_cnt->cnt_all > digtable.fa_highthresh) {
-                if ((digtable.backoff_val - 6) <
-                        digtable.backoffval_range_min)
-                        digtable.backoff_val = digtable.backoffval_range_min;
+        if (falsealm_cnt->cnt_all > digtable->fa_highthresh) {
+                if ((digtable->backoff_val - 6) <
+                        digtable->backoffval_range_min)
+                        digtable->backoff_val = digtable->backoffval_range_min;
                 else
-                        digtable.backoff_val -= 6;
-        } else if (falsealm_cnt->cnt_all < digtable.fa_lowthresh) {
-                if ((digtable.backoff_val + 6) >
-                        digtable.backoffval_range_max)
-                        digtable.backoff_val =
-                                 digtable.backoffval_range_max;
+                        digtable->backoff_val -= 6;
+        } else if (falsealm_cnt->cnt_all < digtable->fa_lowthresh) {
+                if ((digtable->backoff_val + 6) >
+                        digtable->backoffval_range_max)
+                        digtable->backoff_val =
+                                 digtable->backoffval_range_max;
                 else
-                        digtable.backoff_val += 6;
+                        digtable->backoff_val += 6;
         }
 }
 
 static void _rtl92s_dm_initial_gain_sta_beforeconnect(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *digtable = &rtlpriv->dm_digtable;
         struct false_alarm_statistics *falsealm_cnt = &(rtlpriv->falsealm_cnt);
         static u8 initialized, force_write;
         u8 initial_gain = 0;
 
-        if ((digtable.pre_sta_connectstate == digtable.cur_sta_connectstate) ||
-                (digtable.cur_sta_connectstate == DIG_STA_BEFORE_CONNECT)) {
-                if (digtable.cur_sta_connectstate == DIG_STA_BEFORE_CONNECT) {
+        if ((digtable->pre_sta_connectstate == digtable->cur_sta_connectstate) ||
+                (digtable->cur_sta_connectstate == DIG_STA_BEFORE_CONNECT)) {
+                if (digtable->cur_sta_connectstate == DIG_STA_BEFORE_CONNECT) {
                         if (rtlpriv->psc.rfpwr_state != ERFON)
                                 return;
 
-                        if (digtable.backoff_enable_flag)
+                        if (digtable->backoff_enable_flag)
                                 rtl92s_backoff_enable_flag(hw);
                         else
-                                digtable.backoff_val = DM_DIG_BACKOFF;
-
-                        if ((digtable.rssi_val + 10 - digtable.backoff_val) >
-                                digtable.rx_gain_range_max)
-                                digtable.cur_igvalue =
-                                                digtable.rx_gain_range_max;
-                        else if ((digtable.rssi_val + 10 - digtable.backoff_val)
-                                 < digtable.rx_gain_range_min)
-                                digtable.cur_igvalue =
-                                                digtable.rx_gain_range_min;
+                                digtable->backoff_val = DM_DIG_BACKOFF;
+
+                        if ((digtable->rssi_val + 10 - digtable->backoff_val) >
+                                digtable->rx_gain_range_max)
+                                digtable->cur_igvalue =
+                                                digtable->rx_gain_range_max;
+                        else if ((digtable->rssi_val + 10 - digtable->backoff_val)
+                                 < digtable->rx_gain_range_min)
+                                digtable->cur_igvalue =
+                                                digtable->rx_gain_range_min;
                         else
-                                digtable.cur_igvalue = digtable.rssi_val + 10 -
-                                                digtable.backoff_val;
+                                digtable->cur_igvalue = digtable->rssi_val + 10 -
+                                                digtable->backoff_val;
 
                         if (falsealm_cnt->cnt_all > 10000)
-                                digtable.cur_igvalue =
-                                         (digtable.cur_igvalue > 0x33) ?
-                                         digtable.cur_igvalue : 0x33;
+                                digtable->cur_igvalue =
+                                         (digtable->cur_igvalue > 0x33) ?
+                                         digtable->cur_igvalue : 0x33;
 
                         if (falsealm_cnt->cnt_all > 16000)
-                                digtable.cur_igvalue =
-                                                 digtable.rx_gain_range_max;
+                                digtable->cur_igvalue =
+                                                 digtable->rx_gain_range_max;
                 /* connected -> connected or disconnected -> disconnected  */
                 } else {
                         /* Firmware control DIG, do nothing in driver dm */
@@ -486,31 +487,31 @@ static void _rtl92s_dm_initial_gain_sta_beforeconnect(struct ieee80211_hw *hw)
                  * disconnected or beforeconnect->(dis)connected */
         } else {
                 /* Enable FW DIG */
-                digtable.dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX;
+                digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX;
                 rtl92s_phy_set_fw_cmd(hw, FW_CMD_DIG_ENABLE);
 
-                digtable.backoff_val = DM_DIG_BACKOFF;
-                digtable.cur_igvalue = rtlpriv->phy.default_initialgain[0];
-                digtable.pre_igvalue = 0;
+                digtable->backoff_val = DM_DIG_BACKOFF;
+                digtable->cur_igvalue = rtlpriv->phy.default_initialgain[0];
+                digtable->pre_igvalue = 0;
                 return;
         }
 
         /* Forced writing to prevent from fw-dig overwriting. */
-        if (digtable.pre_igvalue != rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1,
+        if (digtable->pre_igvalue != rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1,
                                                   MASKBYTE0))
                 force_write = 1;
 
-        if ((digtable.pre_igvalue != digtable.cur_igvalue) ||
+        if ((digtable->pre_igvalue != digtable->cur_igvalue) ||
             !initialized || force_write) {
                 /* Disable FW DIG */
                 rtl92s_phy_set_fw_cmd(hw, FW_CMD_DIG_DISABLE);
 
-                initial_gain = (u8)digtable.cur_igvalue;
+                initial_gain = (u8)digtable->cur_igvalue;
 
                 /* Set initial gain. */
                 rtl_set_bbreg(hw, ROFDM0_XAAGCCORE1, MASKBYTE0, initial_gain);
                 rtl_set_bbreg(hw, ROFDM0_XBAGCCORE1, MASKBYTE0, initial_gain);
-                digtable.pre_igvalue = digtable.cur_igvalue;
+                digtable->pre_igvalue = digtable->cur_igvalue;
                 initialized = 1;
                 force_write = 0;
         }
@@ -519,6 +520,7 @@ static void _rtl92s_dm_initial_gain_sta_beforeconnect(struct ieee80211_hw *hw)
 static void _rtl92s_dm_ctrl_initgain_bytwoport(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *digtable = &rtlpriv->dm_digtable;
 
         if (rtlpriv->mac80211.act_scanning)
                 return;
@@ -526,17 +528,17 @@ static void _rtl92s_dm_ctrl_initgain_bytwoport(struct ieee80211_hw *hw)
         /* Decide the current status and if modify initial gain or not */
         if (rtlpriv->mac80211.link_state >= MAC80211_LINKED ||
             rtlpriv->mac80211.opmode == NL80211_IFTYPE_ADHOC)
-                digtable.cur_sta_connectstate = DIG_STA_CONNECT;
+                digtable->cur_sta_connectstate = DIG_STA_CONNECT;
         else
-                digtable.cur_sta_connectstate = DIG_STA_DISCONNECT;
+                digtable->cur_sta_connectstate = DIG_STA_DISCONNECT;
 
-        digtable.rssi_val = rtlpriv->dm.undecorated_smoothed_pwdb;
+        digtable->rssi_val = rtlpriv->dm.undecorated_smoothed_pwdb;
 
         /* Change dig mode to rssi */
-        if (digtable.cur_sta_connectstate != DIG_STA_DISCONNECT) {
-                if (digtable.dig_twoport_algorithm ==
+        if (digtable->cur_sta_connectstate != DIG_STA_DISCONNECT) {
+                if (digtable->dig_twoport_algorithm ==
                     DIG_TWO_PORT_ALGO_FALSE_ALARM) {
-                        digtable.dig_twoport_algorithm = DIG_TWO_PORT_ALGO_RSSI;
+                        digtable->dig_twoport_algorithm = DIG_TWO_PORT_ALGO_RSSI;
                         rtl92s_phy_set_fw_cmd(hw, FW_CMD_DIG_MODE_SS);
                 }
         }
@@ -544,13 +546,14 @@ static void _rtl92s_dm_ctrl_initgain_bytwoport(struct ieee80211_hw *hw)
         _rtl92s_dm_false_alarm_counter_statistics(hw);
         _rtl92s_dm_initial_gain_sta_beforeconnect(hw);
 
-        digtable.pre_sta_connectstate = digtable.cur_sta_connectstate;
+        digtable->pre_sta_connectstate = digtable->cur_sta_connectstate;
 }
 
 static void _rtl92s_dm_ctrl_initgain_byrssi(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
+        struct dig_t *digtable = &rtlpriv->dm_digtable;
 
         /* 2T2R TP issue */
         if (rtlphy->rf_type == RF_2T2R)
@@ -559,7 +562,7 @@ static void _rtl92s_dm_ctrl_initgain_byrssi(struct ieee80211_hw *hw)
         if (!rtlpriv->dm.dm_initialgain_enable)
                 return;
 
-        if (digtable.dig_enable_flag == false)
+        if (digtable->dig_enable_flag == false)
                 return;
 
         _rtl92s_dm_ctrl_initgain_bytwoport(hw);
@@ -639,51 +642,52 @@ static void _rtl92s_dm_dynamic_txpower(struct ieee80211_hw *hw)
 static void _rtl92s_dm_init_dig(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *digtable = &rtlpriv->dm_digtable;
 
         /* Disable DIG scheme now.*/
-        digtable.dig_enable_flag = true;
-        digtable.backoff_enable_flag = true;
+        digtable->dig_enable_flag = true;
+        digtable->backoff_enable_flag = true;
 
         if ((rtlpriv->dm.dm_type == DM_TYPE_BYDRIVER) &&
             (hal_get_firmwareversion(rtlpriv) >= 0x3c))
-                digtable.dig_algorithm = DIG_ALGO_BY_TOW_PORT;
+                digtable->dig_algorithm = DIG_ALGO_BY_TOW_PORT;
         else
-                digtable.dig_algorithm =
+                digtable->dig_algorithm =
                          DIG_ALGO_BEFORE_CONNECT_BY_RSSI_AND_ALARM;
 
-        digtable.dig_twoport_algorithm = DIG_TWO_PORT_ALGO_RSSI;
-        digtable.dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX;
-        /* off=by real rssi value, on=by digtable.rssi_val for new dig */
-        digtable.dig_dbgmode = DM_DBG_OFF;
-        digtable.dig_slgorithm_switch = 0;
+        digtable->dig_twoport_algorithm = DIG_TWO_PORT_ALGO_RSSI;
+        digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX;
+        /* off=by real rssi value, on=by digtable->rssi_val for new dig */
+        digtable->dig_dbgmode = DM_DBG_OFF;
+        digtable->dig_slgorithm_switch = 0;
 
         /* 2007/10/04 MH Define init gain threshol. */
-        digtable.dig_state = DM_STA_DIG_MAX;
-        digtable.dig_highpwrstate = DM_STA_DIG_MAX;
+        digtable->dig_state = DM_STA_DIG_MAX;
+        digtable->dig_highpwrstate = DM_STA_DIG_MAX;
 
-        digtable.cur_sta_connectstate = DIG_STA_DISCONNECT;
-        digtable.pre_sta_connectstate = DIG_STA_DISCONNECT;
-        digtable.cur_ap_connectstate = DIG_AP_DISCONNECT;
-        digtable.pre_ap_connectstate = DIG_AP_DISCONNECT;
+        digtable->cur_sta_connectstate = DIG_STA_DISCONNECT;
+        digtable->pre_sta_connectstate = DIG_STA_DISCONNECT;
+        digtable->cur_ap_connectstate = DIG_AP_DISCONNECT;
+        digtable->pre_ap_connectstate = DIG_AP_DISCONNECT;
 
-        digtable.rssi_lowthresh = DM_DIG_THRESH_LOW;
-        digtable.rssi_highthresh = DM_DIG_THRESH_HIGH;
+        digtable->rssi_lowthresh = DM_DIG_THRESH_LOW;
+        digtable->rssi_highthresh = DM_DIG_THRESH_HIGH;
 
-        digtable.fa_lowthresh = DM_FALSEALARM_THRESH_LOW;
-        digtable.fa_highthresh = DM_FALSEALARM_THRESH_HIGH;
+        digtable->fa_lowthresh = DM_FALSEALARM_THRESH_LOW;
+        digtable->fa_highthresh = DM_FALSEALARM_THRESH_HIGH;
 
-        digtable.rssi_highpower_lowthresh = DM_DIG_HIGH_PWR_THRESH_LOW;
-        digtable.rssi_highpower_highthresh = DM_DIG_HIGH_PWR_THRESH_HIGH;
+        digtable->rssi_highpower_lowthresh = DM_DIG_HIGH_PWR_THRESH_LOW;
+        digtable->rssi_highpower_highthresh = DM_DIG_HIGH_PWR_THRESH_HIGH;
 
         /* for dig debug rssi value */
-        digtable.rssi_val = 50;
-        digtable.backoff_val = DM_DIG_BACKOFF;
-        digtable.rx_gain_range_max = DM_DIG_MAX;
+        digtable->rssi_val = 50;
+        digtable->backoff_val = DM_DIG_BACKOFF;
+        digtable->rx_gain_range_max = DM_DIG_MAX;
 
-        digtable.rx_gain_range_min = DM_DIG_MIN;
+        digtable->rx_gain_range_min = DM_DIG_MIN;
 
-        digtable.backoffval_range_max = DM_DIG_BACKOFF_MAX;
-        digtable.backoffval_range_min = DM_DIG_BACKOFF_MIN;
+        digtable->backoffval_range_max = DM_DIG_BACKOFF_MAX;
+        digtable->backoffval_range_min = DM_DIG_BACKOFF_MIN;
 }
 
 static void _rtl92s_dm_init_dynamic_txpower(struct ieee80211_hw *hw)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/dm.h b/drivers/net/wireless/rtlwifi/rtl8192se/dm.h
index e1b19a641765..2e9052c8fe4b 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/dm.h
@@ -29,48 +29,6 @@
 #ifndef __RTL_92S_DM_H__
 #define __RTL_92S_DM_H__
 
-struct dig_t {
-        u8 dig_enable_flag;
-        u8 dig_algorithm;
-        u8 dig_twoport_algorithm;
-        u8 dig_ext_port_stage;
-        u8 dig_dbgmode;
-        u8 dig_slgorithm_switch;
-
-        long rssi_lowthresh;
-        long rssi_highthresh;
-
-        u32 fa_lowthresh;
-        u32 fa_highthresh;
-
-        long rssi_highpower_lowthresh;
-        long rssi_highpower_highthresh;
-
-        u8 dig_state;
-        u8 dig_highpwrstate;
-        u8 cur_sta_connectstate;
-        u8 pre_sta_connectstate;
-        u8 cur_ap_connectstate;
-        u8 pre_ap_connectstate;
-
-        u8 cur_pd_thstate;
-        u8 pre_pd_thstate;
-        u8 cur_cs_ratiostate;
-        u8 pre_cs_ratiostate;
-
-        u32 pre_igvalue;
-        u32     cur_igvalue;
-
-        u8 backoff_enable_flag;
-        char backoff_val;
-        char backoffval_range_max;
-        char backoffval_range_min;
-        u8 rx_gain_range_max;
-        u8 rx_gain_range_min;
-
-        long rssi_val;
-};
-
 enum dm_dig_alg {
         DIG_ALGO_BY_FALSE_ALARM = 0,
         DIG_ALGO_BY_RSSI        = 1,
@@ -154,8 +112,6 @@ enum dm_ratr_sta {
 #define DM_DIG_BACKOFF_MAX              12
 #define DM_DIG_BACKOFF_MIN              -4
 
-extern struct dig_t digtable;
-
 void rtl92s_dm_watchdog(struct ieee80211_hw *hw);
 void rtl92s_dm_init(struct ieee80211_hw *hw);
 void rtl92s_dm_init_edca_turbo(struct ieee80211_hw *hw);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/fw.h b/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
index b4afff626437..d53f4332464d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
@@ -345,7 +345,7 @@ enum fw_h2c_cmd {
         do {                                                    \
                 udelay(1000);                                   \
                 rtlpriv->rtlhal.fwcmd_iomap &= (~_Bit);         \
-        } while (0);
+        } while (0)
 
 #define FW_CMD_IO_UPDATE(rtlpriv, _val)                         \
         rtlpriv->rtlhal.fwcmd_iomap = _val;
@@ -354,13 +354,13 @@ enum fw_h2c_cmd {
         do {                                                    \
                 rtl_write_word(rtlpriv, LBUS_MON_ADDR, (u16)_val);      \
                 FW_CMD_IO_UPDATE(rtlpriv, _val);                \
-        } while (0);
+        } while (0)
 
 #define FW_CMD_PARA_SET(rtlpriv, _val)                          \
         do {                                                    \
                 rtl_write_dword(rtlpriv, LBUS_ADDR_MASK, _val); \
                 rtlpriv->rtlhal.fwcmd_ioparam = _val;           \
-        } while (0);
+        } while (0)
 
 #define FW_CMD_IO_QUERY(rtlpriv)                                \
         (u16)(rtlpriv->rtlhal.fwcmd_iomap)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
index 4a499928e4c6..8d7099bc472c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
@@ -1450,6 +1450,7 @@ static void _rtl92s_phy_set_fwcmd_io(struct ieee80211_hw *hw)
 bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct dig_t *digtable = &rtlpriv->dm_digtable;
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         u32     fw_param = FW_CMD_IO_PARA_QUERY(rtlpriv);
@@ -1588,16 +1589,16 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                                       FW_SS_CTL);
 
                         if (rtlpriv->dm.dm_flag & HAL_DM_DIG_DISABLE ||
-                                !digtable.dig_enable_flag)
+                                !digtable->dig_enable_flag)
                                 fw_cmdmap &= ~FW_DIG_ENABLE_CTL;
 
                         if ((rtlpriv->dm.dm_flag & HAL_DM_HIPWR_DISABLE) ||
                             rtlpriv->dm.dynamic_txpower_enable)
                                 fw_cmdmap &= ~FW_HIGH_PWR_ENABLE_CTL;
 
-                        if ((digtable.dig_ext_port_stage ==
+                        if ((digtable->dig_ext_port_stage ==
                             DIG_EXT_PORT_STAGE_0) ||
-                            (digtable.dig_ext_port_stage ==
+                            (digtable->dig_ext_port_stage ==
                             DIG_EXT_PORT_STAGE_1))
                                 fw_cmdmap &= ~FW_DIG_ENABLE_CTL;
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
index f1b36005c6a2..730bcc919529 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
@@ -450,21 +450,4 @@ static struct pci_driver rtl92se_driver = {
         .driver.pm = &rtlwifi_pm_ops,
 };
 
-static int __init rtl92se_module_init(void)
-{
-        int ret = 0;
-
-        ret = pci_register_driver(&rtl92se_driver);
-        if (ret)
-                RT_ASSERT(false, "No device found\n");
-
-        return ret;
-}
-
-static void __exit rtl92se_module_exit(void)
-{
-        pci_unregister_driver(&rtl92se_driver);
-}
-
-module_init(rtl92se_module_init);
-module_exit(rtl92se_module_exit);
+module_pci_driver(rtl92se_driver);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
index 2fd3d13b7ced..812b5858f14a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
@@ -492,13 +492,14 @@ static void _rtl92se_translate_rx_signal_stuff(struct ieee80211_hw *hw,
         praddr = hdr->addr1;
 
         packet_matchbssid = ((IEEE80211_FTYPE_CTL != type) &&
-             (!compare_ether_addr(mac->bssid, (cfc & IEEE80211_FCTL_TODS) ?
-                        hdr->addr1 : (cfc & IEEE80211_FCTL_FROMDS) ?
-                        hdr->addr2 : hdr->addr3)) && (!pstats->hwerror) &&
-                        (!pstats->crc) && (!pstats->icv));
+             ether_addr_equal(mac->bssid,
+                              (cfc & IEEE80211_FCTL_TODS) ? hdr->addr1 :
+                              (cfc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 :
+                              hdr->addr3) &&
+             (!pstats->hwerror) && (!pstats->crc) && (!pstats->icv));
 
         packet_toself = packet_matchbssid &&
-            (!compare_ether_addr(praddr, rtlefuse->dev_addr));
+            ether_addr_equal(praddr, rtlefuse->dev_addr);
 
         if (ieee80211_is_beacon(fc))
                 packet_beacon = true;
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
index d04dbda13f5a..a6049d7d51b3 100644
--- a/drivers/net/wireless/rtlwifi/usb.c
+++ b/drivers/net/wireless/rtlwifi/usb.c
@@ -971,11 +971,6 @@ int __devinit rtl_usb_probe(struct usb_interface *intf,
         rtlpriv->cfg->ops->read_chip_version(hw);
         /*like read eeprom and so on */
         rtlpriv->cfg->ops->read_eeprom_info(hw);
-        if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");
-                goto error_out;
-        }
-        rtlpriv->cfg->ops->init_sw_leds(hw);
         err = _rtl_usb_init(hw);
         if (err)
                 goto error_out;
@@ -987,6 +982,11 @@ int __devinit rtl_usb_probe(struct usb_interface *intf,
                          "Can't allocate sw for mac80211\n");
                 goto error_out;
         }
+        if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");
+                goto error_out;
+        }
+        rtlpriv->cfg->ops->init_sw_leds(hw);
 
         return 0;
 error_out:
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 28ebc69218a3..bd816aef26dc 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -1592,6 +1592,65 @@ struct rtl_debug {
         char proc_name[20];
 };
 
+struct ps_t {
+        u8 pre_ccastate;
+        u8 cur_ccasate;
+        u8 pre_rfstate;
+        u8 cur_rfstate;
+        long rssi_val_min;
+};
+
+struct dig_t {
+        u32 rssi_lowthresh;
+        u32 rssi_highthresh;
+        u32 fa_lowthresh;
+        u32 fa_highthresh;
+        long last_min_undecorated_pwdb_for_dm;
+        long rssi_highpower_lowthresh;
+        long rssi_highpower_highthresh;
+        u32 recover_cnt;
+        u32 pre_igvalue;
+        u32 cur_igvalue;
+        long rssi_val;
+        u8 dig_enable_flag;
+        u8 dig_ext_port_stage;
+        u8 dig_algorithm;
+        u8 dig_twoport_algorithm;
+        u8 dig_dbgmode;
+        u8 dig_slgorithm_switch;
+        u8 cursta_connectctate;
+        u8 presta_connectstate;
+        u8 curmultista_connectstate;
+        char backoff_val;
+        char backoff_val_range_max;
+        char backoff_val_range_min;
+        u8 rx_gain_range_max;
+        u8 rx_gain_range_min;
+        u8 min_undecorated_pwdb_for_dm;
+        u8 rssi_val_min;
+        u8 pre_cck_pd_state;
+        u8 cur_cck_pd_state;
+        u8 pre_cck_fa_state;
+        u8 cur_cck_fa_state;
+        u8 pre_ccastate;
+        u8 cur_ccasate;
+        u8 large_fa_hit;
+        u8 forbidden_igi;
+        u8 dig_state;
+        u8 dig_highpwrstate;
+        u8 cur_sta_connectstate;
+        u8 pre_sta_connectstate;
+        u8 cur_ap_connectstate;
+        u8 pre_ap_connectstate;
+        u8 cur_pd_thstate;
+        u8 pre_pd_thstate;
+        u8 cur_cs_ratiostate;
+        u8 pre_cs_ratiostate;
+        u8 backoff_enable_flag;
+        char backoffval_range_max;
+        char backoffval_range_min;
+};
+
 struct rtl_priv {
         struct completion firmware_loading_complete;
         struct rtl_locks locks;
@@ -1629,6 +1688,10 @@ struct rtl_priv {
            interface or hardware */
         unsigned long status;
 
+        /* tables for dm */
+        struct dig_t dm_digtable;
+        struct ps_t dm_pstable;
+
         /* data buffer pointer for USB reads */
         __le32 *usb_data;
         int usb_data_index;
@@ -1958,37 +2021,35 @@ static inline void rtl_write_dword(struct rtl_priv *rtlpriv,
 static inline u32 rtl_get_bbreg(struct ieee80211_hw *hw,
                                 u32 regaddr, u32 bitmask)
 {
-        return ((struct rtl_priv *)(hw)->priv)->cfg->ops->get_bbreg(hw,
-                                                                    regaddr,
-                                                                    bitmask);
+        struct rtl_priv *rtlpriv = hw->priv;
+
+        return rtlpriv->cfg->ops->get_bbreg(hw, regaddr, bitmask);
 }
 
 static inline void rtl_set_bbreg(struct ieee80211_hw *hw, u32 regaddr,
                                  u32 bitmask, u32 data)
 {
-        ((struct rtl_priv *)(hw)->priv)->cfg->ops->set_bbreg(hw,
-                                                             regaddr, bitmask,
-                                                             data);
+        struct rtl_priv *rtlpriv = hw->priv;
 
+        rtlpriv->cfg->ops->set_bbreg(hw, regaddr, bitmask, data);
 }
 
 static inline u32 rtl_get_rfreg(struct ieee80211_hw *hw,
                                 enum radio_path rfpath, u32 regaddr,
                                 u32 bitmask)
 {
-        return ((struct rtl_priv *)(hw)->priv)->cfg->ops->get_rfreg(hw,
-                                                                    rfpath,
-                                                                    regaddr,
-                                                                    bitmask);
+        struct rtl_priv *rtlpriv = hw->priv;
+
+        return rtlpriv->cfg->ops->get_rfreg(hw, rfpath, regaddr, bitmask);
 }
 
 static inline void rtl_set_rfreg(struct ieee80211_hw *hw,
                                  enum radio_path rfpath, u32 regaddr,
                                  u32 bitmask, u32 data)
 {
-        ((struct rtl_priv *)(hw)->priv)->cfg->ops->set_rfreg(hw,
-                                                             rfpath, regaddr,
-                                                             bitmask, data);
+        struct rtl_priv *rtlpriv = hw->priv;
+
+        rtlpriv->cfg->ops->set_rfreg(hw, rfpath, regaddr, bitmask, data);
 }
 
 static inline bool is_hal_stop(struct rtl_hal *rtlhal)
diff --git a/drivers/net/wireless/ti/Kconfig b/drivers/net/wireless/ti/Kconfig
new file mode 100644
index 000000000000..1a72932e2213
--- /dev/null
+++ b/drivers/net/wireless/ti/Kconfig
@@ -0,0 +1,14 @@
+menuconfig WL_TI
+        bool "TI Wireless LAN support"
+        ---help---
+          This section contains support for all the wireless drivers
+          for Texas Instruments WLAN chips, such as wl1251 and the wl12xx
+          family.
+
+if WL_TI
+source "drivers/net/wireless/ti/wl1251/Kconfig"
+source "drivers/net/wireless/ti/wl12xx/Kconfig"
+
+# keep last for automatic dependencies
+source "drivers/net/wireless/ti/wlcore/Kconfig"
+endif # WL_TI
diff --git a/drivers/net/wireless/ti/Makefile b/drivers/net/wireless/ti/Makefile
new file mode 100644
index 000000000000..0a565622d4a4
--- /dev/null
+++ b/drivers/net/wireless/ti/Makefile
@@ -0,0 +1,4 @@
+obj-$(CONFIG_WLCORE)                    += wlcore/
+obj-$(CONFIG_WL12XX)                    += wl12xx/
+obj-$(CONFIG_WL12XX_PLATFORM_DATA)      += wlcore/
+obj-$(CONFIG_WL1251)                    += wl1251/
diff --git a/drivers/net/wireless/wl1251/Kconfig b/drivers/net/wireless/ti/wl1251/Kconfig
index 1fb65849414f..1fb65849414f 100644
--- a/drivers/net/wireless/wl1251/Kconfig
+++ b/drivers/net/wireless/ti/wl1251/Kconfig
diff --git a/drivers/net/wireless/wl1251/Makefile b/drivers/net/wireless/ti/wl1251/Makefile
index a5c6328b5f72..a5c6328b5f72 100644
--- a/drivers/net/wireless/wl1251/Makefile
+++ b/drivers/net/wireless/ti/wl1251/Makefile
diff --git a/drivers/net/wireless/wl1251/acx.c b/drivers/net/wireless/ti/wl1251/acx.c
index ad87a1ac6462..ad87a1ac6462 100644
--- a/drivers/net/wireless/wl1251/acx.c
+++ b/drivers/net/wireless/ti/wl1251/acx.c
diff --git a/drivers/net/wireless/wl1251/acx.h b/drivers/net/wireless/ti/wl1251/acx.h
index c2ba100f9b1a..c2ba100f9b1a 100644
--- a/drivers/net/wireless/wl1251/acx.h
+++ b/drivers/net/wireless/ti/wl1251/acx.h
diff --git a/drivers/net/wireless/wl1251/boot.c b/drivers/net/wireless/ti/wl1251/boot.c
index a2e5241382da..a2e5241382da 100644
--- a/drivers/net/wireless/wl1251/boot.c
+++ b/drivers/net/wireless/ti/wl1251/boot.c
diff --git a/drivers/net/wireless/wl1251/boot.h b/drivers/net/wireless/ti/wl1251/boot.h
index 7661bc5e4662..7661bc5e4662 100644
--- a/drivers/net/wireless/wl1251/boot.h
+++ b/drivers/net/wireless/ti/wl1251/boot.h
diff --git a/drivers/net/wireless/wl1251/cmd.c b/drivers/net/wireless/ti/wl1251/cmd.c
index d14d69d733a0..d14d69d733a0 100644
--- a/drivers/net/wireless/wl1251/cmd.c
+++ b/drivers/net/wireless/ti/wl1251/cmd.c
diff --git a/drivers/net/wireless/wl1251/cmd.h b/drivers/net/wireless/ti/wl1251/cmd.h
index ee4f2b391822..ee4f2b391822 100644
--- a/drivers/net/wireless/wl1251/cmd.h
+++ b/drivers/net/wireless/ti/wl1251/cmd.h
diff --git a/drivers/net/wireless/wl1251/debugfs.c b/drivers/net/wireless/ti/wl1251/debugfs.c
index 448da1f8c22f..448da1f8c22f 100644
--- a/drivers/net/wireless/wl1251/debugfs.c
+++ b/drivers/net/wireless/ti/wl1251/debugfs.c
diff --git a/drivers/net/wireless/wl1251/debugfs.h b/drivers/net/wireless/ti/wl1251/debugfs.h
index b3417c02a218..b3417c02a218 100644
--- a/drivers/net/wireless/wl1251/debugfs.h
+++ b/drivers/net/wireless/ti/wl1251/debugfs.h
diff --git a/drivers/net/wireless/wl1251/event.c b/drivers/net/wireless/ti/wl1251/event.c
index 9f15ccaf8f05..9f15ccaf8f05 100644
--- a/drivers/net/wireless/wl1251/event.c
+++ b/drivers/net/wireless/ti/wl1251/event.c
diff --git a/drivers/net/wireless/wl1251/event.h b/drivers/net/wireless/ti/wl1251/event.h
index 30eb5d150bf7..30eb5d150bf7 100644
--- a/drivers/net/wireless/wl1251/event.h
+++ b/drivers/net/wireless/ti/wl1251/event.h
diff --git a/drivers/net/wireless/wl1251/init.c b/drivers/net/wireless/ti/wl1251/init.c
index 89b43d35473c..89b43d35473c 100644
--- a/drivers/net/wireless/wl1251/init.c
+++ b/drivers/net/wireless/ti/wl1251/init.c
diff --git a/drivers/net/wireless/wl1251/init.h b/drivers/net/wireless/ti/wl1251/init.h
index 543f17582ead..543f17582ead 100644
--- a/drivers/net/wireless/wl1251/init.h
+++ b/drivers/net/wireless/ti/wl1251/init.h
diff --git a/drivers/net/wireless/wl1251/io.c b/drivers/net/wireless/ti/wl1251/io.c
index cdcadbf6ac2c..cdcadbf6ac2c 100644
--- a/drivers/net/wireless/wl1251/io.c
+++ b/drivers/net/wireless/ti/wl1251/io.c
diff --git a/drivers/net/wireless/wl1251/io.h b/drivers/net/wireless/ti/wl1251/io.h
index d382877c34cc..d382877c34cc 100644
--- a/drivers/net/wireless/wl1251/io.h
+++ b/drivers/net/wireless/ti/wl1251/io.h
diff --git a/drivers/net/wireless/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c
index 41302c7b1ad0..d1afb8e3b2ef 100644
--- a/drivers/net/wireless/wl1251/main.c
+++ b/drivers/net/wireless/ti/wl1251/main.c
@@ -479,6 +479,7 @@ static void wl1251_op_stop(struct ieee80211_hw *hw)
         cancel_work_sync(&wl->irq_work);
         cancel_work_sync(&wl->tx_work);
         cancel_work_sync(&wl->filter_work);
+        cancel_delayed_work_sync(&wl->elp_work);
 
         mutex_lock(&wl->mutex);
 
diff --git a/drivers/net/wireless/wl1251/ps.c b/drivers/net/wireless/ti/wl1251/ps.c
index db719f7d2692..db719f7d2692 100644
--- a/drivers/net/wireless/wl1251/ps.c
+++ b/drivers/net/wireless/ti/wl1251/ps.c
diff --git a/drivers/net/wireless/wl1251/ps.h b/drivers/net/wireless/ti/wl1251/ps.h
index 75efad246d67..75efad246d67 100644
--- a/drivers/net/wireless/wl1251/ps.h
+++ b/drivers/net/wireless/ti/wl1251/ps.h
diff --git a/drivers/net/wireless/wl1251/reg.h b/drivers/net/wireless/ti/wl1251/reg.h
index a5809019c5c1..a5809019c5c1 100644
--- a/drivers/net/wireless/wl1251/reg.h
+++ b/drivers/net/wireless/ti/wl1251/reg.h
diff --git a/drivers/net/wireless/wl1251/rx.c b/drivers/net/wireless/ti/wl1251/rx.c
index 6af35265c900..6af35265c900 100644
--- a/drivers/net/wireless/wl1251/rx.c
+++ b/drivers/net/wireless/ti/wl1251/rx.c
diff --git a/drivers/net/wireless/wl1251/rx.h b/drivers/net/wireless/ti/wl1251/rx.h
index 4448f635a4d8..4448f635a4d8 100644
--- a/drivers/net/wireless/wl1251/rx.h
+++ b/drivers/net/wireless/ti/wl1251/rx.h
diff --git a/drivers/net/wireless/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index f78694295c39..1b851f650e07 100644
--- a/drivers/net/wireless/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c
@@ -315,8 +315,8 @@ static void __devexit wl1251_sdio_remove(struct sdio_func *func)
 
         if (wl->irq)
                 free_irq(wl->irq, wl);
-        kfree(wl_sdio);
         wl1251_free_hw(wl);
+        kfree(wl_sdio);
 
         sdio_claim_host(func);
         sdio_release_irq(func);
diff --git a/drivers/net/wireless/wl1251/spi.c b/drivers/net/wireless/ti/wl1251/spi.c
index 6248c354fc5c..6248c354fc5c 100644
--- a/drivers/net/wireless/wl1251/spi.c
+++ b/drivers/net/wireless/ti/wl1251/spi.c
diff --git a/drivers/net/wireless/wl1251/spi.h b/drivers/net/wireless/ti/wl1251/spi.h
index 16d506955cc0..16d506955cc0 100644
--- a/drivers/net/wireless/wl1251/spi.h
+++ b/drivers/net/wireless/ti/wl1251/spi.h
diff --git a/drivers/net/wireless/wl1251/tx.c b/drivers/net/wireless/ti/wl1251/tx.c
index 28121c590a2b..28121c590a2b 100644
--- a/drivers/net/wireless/wl1251/tx.c
+++ b/drivers/net/wireless/ti/wl1251/tx.c
diff --git a/drivers/net/wireless/wl1251/tx.h b/drivers/net/wireless/ti/wl1251/tx.h
index 81338d39b43e..81338d39b43e 100644
--- a/drivers/net/wireless/wl1251/tx.h
+++ b/drivers/net/wireless/ti/wl1251/tx.h
diff --git a/drivers/net/wireless/wl1251/wl1251.h b/drivers/net/wireless/ti/wl1251/wl1251.h
index 9d8f5816c6f9..9d8f5816c6f9 100644
--- a/drivers/net/wireless/wl1251/wl1251.h
+++ b/drivers/net/wireless/ti/wl1251/wl1251.h
diff --git a/drivers/net/wireless/wl1251/wl12xx_80211.h b/drivers/net/wireless/ti/wl1251/wl12xx_80211.h
index 04ed51495772..04ed51495772 100644
--- a/drivers/net/wireless/wl1251/wl12xx_80211.h
+++ b/drivers/net/wireless/ti/wl1251/wl12xx_80211.h
diff --git a/drivers/net/wireless/ti/wl12xx/Kconfig b/drivers/net/wireless/ti/wl12xx/Kconfig
new file mode 100644
index 000000000000..5b92329122c4
--- /dev/null
+++ b/drivers/net/wireless/ti/wl12xx/Kconfig
@@ -0,0 +1,8 @@
+config WL12XX
+       tristate "TI wl12xx support"
+       select WLCORE
+       ---help---
+          This module adds support for wireless adapters based on TI wl1271,
+          wl1273, wl1281 and wl1283 chipsets. This module does *not* include
+          support for wl1251.  For wl1251 support, use the separate homonymous
+           driver instead.
diff --git a/drivers/net/wireless/ti/wl12xx/Makefile b/drivers/net/wireless/ti/wl12xx/Makefile
new file mode 100644
index 000000000000..87f64b14db35
--- /dev/null
+++ b/drivers/net/wireless/ti/wl12xx/Makefile
@@ -0,0 +1,3 @@
+wl12xx-objs     = main.o cmd.o acx.o
+
+obj-$(CONFIG_WL12XX)            += wl12xx.o
diff --git a/drivers/net/wireless/ti/wl12xx/acx.c b/drivers/net/wireless/ti/wl12xx/acx.c
new file mode 100644
index 000000000000..bea06b2d7bf4
--- /dev/null
+++ b/drivers/net/wireless/ti/wl12xx/acx.c
@@ -0,0 +1,53 @@
+/*
+ * This file is part of wl12xx
+ *
+ * Copyright (C) 2008-2009 Nokia Corporation
+ * Copyright (C) 2011 Texas Instruments Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include "../wlcore/cmd.h"
+#include "../wlcore/debug.h"
+#include "../wlcore/acx.h"
+
+#include "acx.h"
+
+int wl1271_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap)
+{
+        struct wl1271_acx_host_config_bitmap *bitmap_conf;
+        int ret;
+
+        bitmap_conf = kzalloc(sizeof(*bitmap_conf), GFP_KERNEL);
+        if (!bitmap_conf) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        bitmap_conf->host_cfg_bitmap = cpu_to_le32(host_cfg_bitmap);
+
+        ret = wl1271_cmd_configure(wl, ACX_HOST_IF_CFG_BITMAP,
+                                   bitmap_conf, sizeof(*bitmap_conf));
+        if (ret < 0) {
+                wl1271_warning("wl1271 bitmap config opt failed: %d", ret);
+                goto out;
+        }
+
+out:
+        kfree(bitmap_conf);
+
+        return ret;
+}
diff --git a/drivers/net/wireless/ti/wl12xx/acx.h b/drivers/net/wireless/ti/wl12xx/acx.h
new file mode 100644
index 000000000000..d1f5aba0afce
--- /dev/null
+++ b/drivers/net/wireless/ti/wl12xx/acx.h
@@ -0,0 +1,36 @@
+/*
+ * This file is part of wl12xx
+ *
+ * Copyright (C) 1998-2009, 2011 Texas Instruments. All rights reserved.
+ * Copyright (C) 2008-2010 Nokia Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __WL12XX_ACX_H__
+#define __WL12XX_ACX_H__
+
+#include "../wlcore/wlcore.h"
+
+struct wl1271_acx_host_config_bitmap {
+        struct acx_header header;
+
+        __le32 host_cfg_bitmap;
+} __packed;
+
+int wl1271_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap);
+
+#endif /* __WL12XX_ACX_H__ */
diff --git a/drivers/net/wireless/ti/wl12xx/cmd.c b/drivers/net/wireless/ti/wl12xx/cmd.c
new file mode 100644
index 000000000000..8ffaeb5f2147
--- /dev/null
+++ b/drivers/net/wireless/ti/wl12xx/cmd.c
@@ -0,0 +1,254 @@
+/*
+ * This file is part of wl12xx
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation
+ * Copyright (C) 2011 Texas Instruments Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include "../wlcore/cmd.h"
+#include "../wlcore/debug.h"
+
+#include "wl12xx.h"
+#include "cmd.h"
+
+int wl1271_cmd_ext_radio_parms(struct wl1271 *wl)
+{
+        struct wl1271_ext_radio_parms_cmd *ext_radio_parms;
+        struct wl12xx_priv *priv = wl->priv;
+        struct wl12xx_conf_rf *rf = &priv->conf.rf;
+        int ret;
+
+        if (!wl->nvs)
+                return -ENODEV;
+
+        ext_radio_parms = kzalloc(sizeof(*ext_radio_parms), GFP_KERNEL);
+        if (!ext_radio_parms)
+                return -ENOMEM;
+
+        ext_radio_parms->test.id = TEST_CMD_INI_FILE_RF_EXTENDED_PARAM;
+
+        memcpy(ext_radio_parms->tx_per_channel_power_compensation_2,
+               rf->tx_per_channel_power_compensation_2,
+               CONF_TX_PWR_COMPENSATION_LEN_2);
+        memcpy(ext_radio_parms->tx_per_channel_power_compensation_5,
+               rf->tx_per_channel_power_compensation_5,
+               CONF_TX_PWR_COMPENSATION_LEN_5);
+
+        wl1271_dump(DEBUG_CMD, "TEST_CMD_INI_FILE_EXT_RADIO_PARAM: ",
+                    ext_radio_parms, sizeof(*ext_radio_parms));
+
+        ret = wl1271_cmd_test(wl, ext_radio_parms, sizeof(*ext_radio_parms), 0);
+        if (ret < 0)
+                wl1271_warning("TEST_CMD_INI_FILE_RF_EXTENDED_PARAM failed");
+
+        kfree(ext_radio_parms);
+        return ret;
+}
+
+int wl1271_cmd_general_parms(struct wl1271 *wl)
+{
+        struct wl1271_general_parms_cmd *gen_parms;
+        struct wl1271_ini_general_params *gp =
+                &((struct wl1271_nvs_file *)wl->nvs)->general_params;
+        bool answer = false;
+        int ret;
+
+        if (!wl->nvs)
+                return -ENODEV;
+
+        if (gp->tx_bip_fem_manufacturer >= WL1271_INI_FEM_MODULE_COUNT) {
+                wl1271_warning("FEM index from INI out of bounds");
+                return -EINVAL;
+        }
+
+        gen_parms = kzalloc(sizeof(*gen_parms), GFP_KERNEL);
+        if (!gen_parms)
+                return -ENOMEM;
+
+        gen_parms->test.id = TEST_CMD_INI_FILE_GENERAL_PARAM;
+
+        memcpy(&gen_parms->general_params, gp, sizeof(*gp));
+
+        if (gp->tx_bip_fem_auto_detect)
+                answer = true;
+
+        /* Override the REF CLK from the NVS with the one from platform data */
+        gen_parms->general_params.ref_clock = wl->ref_clock;
+
+        ret = wl1271_cmd_test(wl, gen_parms, sizeof(*gen_parms), answer);
+        if (ret < 0) {
+                wl1271_warning("CMD_INI_FILE_GENERAL_PARAM failed");
+                goto out;
+        }
+
+        gp->tx_bip_fem_manufacturer =
+                gen_parms->general_params.tx_bip_fem_manufacturer;
+
+        if (gp->tx_bip_fem_manufacturer >= WL1271_INI_FEM_MODULE_COUNT) {
+                wl1271_warning("FEM index from FW out of bounds");
+                ret = -EINVAL;
+                goto out;
+        }
+
+        wl1271_debug(DEBUG_CMD, "FEM autodetect: %s, manufacturer: %d\n",
+                     answer ? "auto" : "manual", gp->tx_bip_fem_manufacturer);
+
+out:
+        kfree(gen_parms);
+        return ret;
+}
+
+int wl128x_cmd_general_parms(struct wl1271 *wl)
+{
+        struct wl128x_general_parms_cmd *gen_parms;
+        struct wl128x_ini_general_params *gp =
+                &((struct wl128x_nvs_file *)wl->nvs)->general_params;
+        bool answer = false;
+        int ret;
+
+        if (!wl->nvs)
+                return -ENODEV;
+
+        if (gp->tx_bip_fem_manufacturer >= WL1271_INI_FEM_MODULE_COUNT) {
+                wl1271_warning("FEM index from ini out of bounds");
+                return -EINVAL;
+        }
+
+        gen_parms = kzalloc(sizeof(*gen_parms), GFP_KERNEL);
+        if (!gen_parms)
+                return -ENOMEM;
+
+        gen_parms->test.id = TEST_CMD_INI_FILE_GENERAL_PARAM;
+
+        memcpy(&gen_parms->general_params, gp, sizeof(*gp));
+
+        if (gp->tx_bip_fem_auto_detect)
+                answer = true;
+
+        /* Replace REF and TCXO CLKs with the ones from platform data */
+        gen_parms->general_params.ref_clock = wl->ref_clock;
+        gen_parms->general_params.tcxo_ref_clock = wl->tcxo_clock;
+
+        ret = wl1271_cmd_test(wl, gen_parms, sizeof(*gen_parms), answer);
+        if (ret < 0) {
+                wl1271_warning("CMD_INI_FILE_GENERAL_PARAM failed");
+                goto out;
+        }
+
+        gp->tx_bip_fem_manufacturer =
+                gen_parms->general_params.tx_bip_fem_manufacturer;
+
+        if (gp->tx_bip_fem_manufacturer >= WL1271_INI_FEM_MODULE_COUNT) {
+                wl1271_warning("FEM index from FW out of bounds");
+                ret = -EINVAL;
+                goto out;
+        }
+
+        wl1271_debug(DEBUG_CMD, "FEM autodetect: %s, manufacturer: %d\n",
+                     answer ? "auto" : "manual", gp->tx_bip_fem_manufacturer);
+
+out:
+        kfree(gen_parms);
+        return ret;
+}
+
+int wl1271_cmd_radio_parms(struct wl1271 *wl)
+{
+        struct wl1271_nvs_file *nvs = (struct wl1271_nvs_file *)wl->nvs;
+        struct wl1271_radio_parms_cmd *radio_parms;
+        struct wl1271_ini_general_params *gp = &nvs->general_params;
+        int ret;
+
+        if (!wl->nvs)
+                return -ENODEV;
+
+        radio_parms = kzalloc(sizeof(*radio_parms), GFP_KERNEL);
+        if (!radio_parms)
+                return -ENOMEM;
+
+        radio_parms->test.id = TEST_CMD_INI_FILE_RADIO_PARAM;
+
+        /* 2.4GHz parameters */
+        memcpy(&radio_parms->static_params_2, &nvs->stat_radio_params_2,
+               sizeof(struct wl1271_ini_band_params_2));
+        memcpy(&radio_parms->dyn_params_2,
+               &nvs->dyn_radio_params_2[gp->tx_bip_fem_manufacturer].params,
+               sizeof(struct wl1271_ini_fem_params_2));
+
+        /* 5GHz parameters */
+        memcpy(&radio_parms->static_params_5,
+               &nvs->stat_radio_params_5,
+               sizeof(struct wl1271_ini_band_params_5));
+        memcpy(&radio_parms->dyn_params_5,
+               &nvs->dyn_radio_params_5[gp->tx_bip_fem_manufacturer].params,
+               sizeof(struct wl1271_ini_fem_params_5));
+
+        wl1271_dump(DEBUG_CMD, "TEST_CMD_INI_FILE_RADIO_PARAM: ",
+                    radio_parms, sizeof(*radio_parms));
+
+        ret = wl1271_cmd_test(wl, radio_parms, sizeof(*radio_parms), 0);
+        if (ret < 0)
+                wl1271_warning("CMD_INI_FILE_RADIO_PARAM failed");
+
+        kfree(radio_parms);
+        return ret;
+}
+
+int wl128x_cmd_radio_parms(struct wl1271 *wl)
+{
+        struct wl128x_nvs_file *nvs = (struct wl128x_nvs_file *)wl->nvs;
+        struct wl128x_radio_parms_cmd *radio_parms;
+        struct wl128x_ini_general_params *gp = &nvs->general_params;
+        int ret;
+
+        if (!wl->nvs)
+                return -ENODEV;
+
+        radio_parms = kzalloc(sizeof(*radio_parms), GFP_KERNEL);
+        if (!radio_parms)
+                return -ENOMEM;
+
+        radio_parms->test.id = TEST_CMD_INI_FILE_RADIO_PARAM;
+
+        /* 2.4GHz parameters */
+        memcpy(&radio_parms->static_params_2, &nvs->stat_radio_params_2,
+               sizeof(struct wl128x_ini_band_params_2));
+        memcpy(&radio_parms->dyn_params_2,
+               &nvs->dyn_radio_params_2[gp->tx_bip_fem_manufacturer].params,
+               sizeof(struct wl128x_ini_fem_params_2));
+
+        /* 5GHz parameters */
+        memcpy(&radio_parms->static_params_5,
+               &nvs->stat_radio_params_5,
+               sizeof(struct wl128x_ini_band_params_5));
+        memcpy(&radio_parms->dyn_params_5,
+               &nvs->dyn_radio_params_5[gp->tx_bip_fem_manufacturer].params,
+               sizeof(struct wl128x_ini_fem_params_5));
+
+        radio_parms->fem_vendor_and_options = nvs->fem_vendor_and_options;
+
+        wl1271_dump(DEBUG_CMD, "TEST_CMD_INI_FILE_RADIO_PARAM: ",
+                    radio_parms, sizeof(*radio_parms));
+
+        ret = wl1271_cmd_test(wl, radio_parms, sizeof(*radio_parms), 0);
+        if (ret < 0)
+                wl1271_warning("CMD_INI_FILE_RADIO_PARAM failed");
+
+        kfree(radio_parms);
+        return ret;
+}
diff --git a/drivers/net/wireless/ti/wl12xx/cmd.h b/drivers/net/wireless/ti/wl12xx/cmd.h
new file mode 100644
index 000000000000..140a0e8829d5
--- /dev/null
+++ b/drivers/net/wireless/ti/wl12xx/cmd.h
@@ -0,0 +1,112 @@
+/*
+ * This file is part of wl12xx
+ *
+ * Copyright (C) 1998-2009, 2011 Texas Instruments. All rights reserved.
+ * Copyright (C) 2009 Nokia Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __WL12XX_CMD_H__
+#define __WL12XX_CMD_H__
+
+#include "conf.h"
+
+#define TEST_CMD_INI_FILE_RADIO_PARAM       0x19
+#define TEST_CMD_INI_FILE_GENERAL_PARAM     0x1E
+
+struct wl1271_general_parms_cmd {
+        struct wl1271_cmd_header header;
+
+        struct wl1271_cmd_test_header test;
+
+        struct wl1271_ini_general_params general_params;
+
+        u8 sr_debug_table[WL1271_INI_MAX_SMART_REFLEX_PARAM];
+        u8 sr_sen_n_p;
+        u8 sr_sen_n_p_gain;
+        u8 sr_sen_nrn;
+        u8 sr_sen_prn;
+        u8 padding[3];
+} __packed;
+
+struct wl128x_general_parms_cmd {
+        struct wl1271_cmd_header header;
+
+        struct wl1271_cmd_test_header test;
+
+        struct wl128x_ini_general_params general_params;
+
+        u8 sr_debug_table[WL1271_INI_MAX_SMART_REFLEX_PARAM];
+        u8 sr_sen_n_p;
+        u8 sr_sen_n_p_gain;
+        u8 sr_sen_nrn;
+        u8 sr_sen_prn;
+        u8 padding[3];
+} __packed;
+
+struct wl1271_radio_parms_cmd {
+        struct wl1271_cmd_header header;
+
+        struct wl1271_cmd_test_header test;
+
+        /* Static radio parameters */
+        struct wl1271_ini_band_params_2 static_params_2;
+        struct wl1271_ini_band_params_5 static_params_5;
+
+        /* Dynamic radio parameters */
+        struct wl1271_ini_fem_params_2 dyn_params_2;
+        u8 padding2;
+        struct wl1271_ini_fem_params_5 dyn_params_5;
+        u8 padding3[2];
+} __packed;
+
+struct wl128x_radio_parms_cmd {
+        struct wl1271_cmd_header header;
+
+        struct wl1271_cmd_test_header test;
+
+        /* Static radio parameters */
+        struct wl128x_ini_band_params_2 static_params_2;
+        struct wl128x_ini_band_params_5 static_params_5;
+
+        u8 fem_vendor_and_options;
+
+        /* Dynamic radio parameters */
+        struct wl128x_ini_fem_params_2 dyn_params_2;
+        u8 padding2;
+        struct wl128x_ini_fem_params_5 dyn_params_5;
+} __packed;
+
+#define TEST_CMD_INI_FILE_RF_EXTENDED_PARAM 0x26
+
+struct wl1271_ext_radio_parms_cmd {
+        struct wl1271_cmd_header header;
+
+        struct wl1271_cmd_test_header test;
+
+        u8 tx_per_channel_power_compensation_2[CONF_TX_PWR_COMPENSATION_LEN_2];
+        u8 tx_per_channel_power_compensation_5[CONF_TX_PWR_COMPENSATION_LEN_5];
+        u8 padding[3];
+} __packed;
+
+int wl1271_cmd_general_parms(struct wl1271 *wl);
+int wl128x_cmd_general_parms(struct wl1271 *wl);
+int wl1271_cmd_radio_parms(struct wl1271 *wl);
+int wl128x_cmd_radio_parms(struct wl1271 *wl);
+int wl1271_cmd_ext_radio_parms(struct wl1271 *wl);
+
+#endif /* __WL12XX_CMD_H__ */
diff --git a/drivers/net/wireless/ti/wl12xx/conf.h b/drivers/net/wireless/ti/wl12xx/conf.h
new file mode 100644
index 000000000000..75e29897a0f5
--- /dev/null
+++ b/drivers/net/wireless/ti/wl12xx/conf.h
@@ -0,0 +1,50 @@
+/*
+ * This file is part of wl12xx
+ *
+ * Copyright (C) 2011 Texas Instruments Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __WL12XX_CONF_H__
+#define __WL12XX_CONF_H__
+
+/* these are number of channels on the band divided by two, rounded up */
+#define CONF_TX_PWR_COMPENSATION_LEN_2 7
+#define CONF_TX_PWR_COMPENSATION_LEN_5 18
+
+struct wl12xx_conf_rf {
+        /*
+         * Per channel power compensation for 2.4GHz
+         *
+         * Range: s8
+         */
+        u8 tx_per_channel_power_compensation_2[CONF_TX_PWR_COMPENSATION_LEN_2];
+
+        /*
+         * Per channel power compensation for 5GHz
+         *
+         * Range: s8
+         */
+        u8 tx_per_channel_power_compensation_5[CONF_TX_PWR_COMPENSATION_LEN_5];
+};
+
+struct wl12xx_priv_conf {
+        struct wl12xx_conf_rf rf;
+        struct conf_memory_settings mem_wl127x;
+};
+
+#endif /* __WL12XX_CONF_H__ */
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
new file mode 100644
index 000000000000..d7dd3def07b5
--- /dev/null
+++ b/drivers/net/wireless/ti/wl12xx/main.c
@@ -0,0 +1,1388 @@
+/*
+ * This file is part of wl1271
+ *
+ * Copyright (C) 2008-2010 Nokia Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include <linux/err.h>
+
+#include <linux/wl12xx.h>
+
+#include "../wlcore/wlcore.h"
+#include "../wlcore/debug.h"
+#include "../wlcore/io.h"
+#include "../wlcore/acx.h"
+#include "../wlcore/tx.h"
+#include "../wlcore/rx.h"
+#include "../wlcore/io.h"
+#include "../wlcore/boot.h"
+
+#include "wl12xx.h"
+#include "reg.h"
+#include "cmd.h"
+#include "acx.h"
+
+static struct wlcore_conf wl12xx_conf = {
+        .sg = {
+                .params = {
+                        [CONF_SG_ACL_BT_MASTER_MIN_BR] = 10,
+                        [CONF_SG_ACL_BT_MASTER_MAX_BR] = 180,
+                        [CONF_SG_ACL_BT_SLAVE_MIN_BR] = 10,
+                        [CONF_SG_ACL_BT_SLAVE_MAX_BR] = 180,
+                        [CONF_SG_ACL_BT_MASTER_MIN_EDR] = 10,
+                        [CONF_SG_ACL_BT_MASTER_MAX_EDR] = 80,
+                        [CONF_SG_ACL_BT_SLAVE_MIN_EDR] = 10,
+                        [CONF_SG_ACL_BT_SLAVE_MAX_EDR] = 80,
+                        [CONF_SG_ACL_WLAN_PS_MASTER_BR] = 8,
+                        [CONF_SG_ACL_WLAN_PS_SLAVE_BR] = 8,
+                        [CONF_SG_ACL_WLAN_PS_MASTER_EDR] = 20,
+                        [CONF_SG_ACL_WLAN_PS_SLAVE_EDR] = 20,
+                        [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MIN_BR] = 20,
+                        [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MAX_BR] = 35,
+                        [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MIN_BR] = 16,
+                        [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MAX_BR] = 35,
+                        [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MIN_EDR] = 32,
+                        [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MAX_EDR] = 50,
+                        [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MIN_EDR] = 28,
+                        [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MAX_EDR] = 50,
+                        [CONF_SG_ACL_ACTIVE_SCAN_WLAN_BR] = 10,
+                        [CONF_SG_ACL_ACTIVE_SCAN_WLAN_EDR] = 20,
+                        [CONF_SG_ACL_PASSIVE_SCAN_BT_BR] = 75,
+                        [CONF_SG_ACL_PASSIVE_SCAN_WLAN_BR] = 15,
+                        [CONF_SG_ACL_PASSIVE_SCAN_BT_EDR] = 27,
+                        [CONF_SG_ACL_PASSIVE_SCAN_WLAN_EDR] = 17,
+                        /* active scan params */
+                        [CONF_SG_AUTO_SCAN_PROBE_REQ] = 170,
+                        [CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_HV3] = 50,
+                        [CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_A2DP] = 100,
+                        /* passive scan params */
+                        [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_A2DP_BR] = 800,
+                        [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_A2DP_EDR] = 200,
+                        [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_HV3] = 200,
+                        /* passive scan in dual antenna params */
+                        [CONF_SG_CONSECUTIVE_HV3_IN_PASSIVE_SCAN] = 0,
+                        [CONF_SG_BCN_HV3_COLLISION_THRESH_IN_PASSIVE_SCAN] = 0,
+                        [CONF_SG_TX_RX_PROTECTION_BWIDTH_IN_PASSIVE_SCAN] = 0,
+                        /* general params */
+                        [CONF_SG_STA_FORCE_PS_IN_BT_SCO] = 1,
+                        [CONF_SG_ANTENNA_CONFIGURATION] = 0,
+                        [CONF_SG_BEACON_MISS_PERCENT] = 60,
+                        [CONF_SG_DHCP_TIME] = 5000,
+                        [CONF_SG_RXT] = 1200,
+                        [CONF_SG_TXT] = 1000,
+                        [CONF_SG_ADAPTIVE_RXT_TXT] = 1,
+                        [CONF_SG_GENERAL_USAGE_BIT_MAP] = 3,
+                        [CONF_SG_HV3_MAX_SERVED] = 6,
+                        [CONF_SG_PS_POLL_TIMEOUT] = 10,
+                        [CONF_SG_UPSD_TIMEOUT] = 10,
+                        [CONF_SG_CONSECUTIVE_CTS_THRESHOLD] = 2,
+                        [CONF_SG_STA_RX_WINDOW_AFTER_DTIM] = 5,
+                        [CONF_SG_STA_CONNECTION_PROTECTION_TIME] = 30,
+                        /* AP params */
+                        [CONF_AP_BEACON_MISS_TX] = 3,
+                        [CONF_AP_RX_WINDOW_AFTER_BEACON] = 10,
+                        [CONF_AP_BEACON_WINDOW_INTERVAL] = 2,
+                        [CONF_AP_CONNECTION_PROTECTION_TIME] = 0,
+                        [CONF_AP_BT_ACL_VAL_BT_SERVE_TIME] = 25,
+                        [CONF_AP_BT_ACL_VAL_WL_SERVE_TIME] = 25,
+                        /* CTS Diluting params */
+                        [CONF_SG_CTS_DILUTED_BAD_RX_PACKETS_TH] = 0,
+                        [CONF_SG_CTS_CHOP_IN_DUAL_ANT_SCO_MASTER] = 0,
+                },
+                .state = CONF_SG_PROTECTIVE,
+        },
+        .rx = {
+                .rx_msdu_life_time           = 512000,
+                .packet_detection_threshold  = 0,
+                .ps_poll_timeout             = 15,
+                .upsd_timeout                = 15,
+                .rts_threshold               = IEEE80211_MAX_RTS_THRESHOLD,
+                .rx_cca_threshold            = 0,
+                .irq_blk_threshold           = 0xFFFF,
+                .irq_pkt_threshold           = 0,
+                .irq_timeout                 = 600,
+                .queue_type                  = CONF_RX_QUEUE_TYPE_LOW_PRIORITY,
+        },
+        .tx = {
+                .tx_energy_detection         = 0,
+                .sta_rc_conf                 = {
+                        .enabled_rates       = 0,
+                        .short_retry_limit   = 10,
+                        .long_retry_limit    = 10,
+                        .aflags              = 0,
+                },
+                .ac_conf_count               = 4,
+                .ac_conf                     = {
+                        [CONF_TX_AC_BE] = {
+                                .ac          = CONF_TX_AC_BE,
+                                .cw_min      = 15,
+                                .cw_max      = 63,
+                                .aifsn       = 3,
+                                .tx_op_limit = 0,
+                        },
+                        [CONF_TX_AC_BK] = {
+                                .ac          = CONF_TX_AC_BK,
+                                .cw_min      = 15,
+                                .cw_max      = 63,
+                                .aifsn       = 7,
+                                .tx_op_limit = 0,
+                        },
+                        [CONF_TX_AC_VI] = {
+                                .ac          = CONF_TX_AC_VI,
+                                .cw_min      = 15,
+                                .cw_max      = 63,
+                                .aifsn       = CONF_TX_AIFS_PIFS,
+                                .tx_op_limit = 3008,
+                        },
+                        [CONF_TX_AC_VO] = {
+                                .ac          = CONF_TX_AC_VO,
+                                .cw_min      = 15,
+                                .cw_max      = 63,
+                                .aifsn       = CONF_TX_AIFS_PIFS,
+                                .tx_op_limit = 1504,
+                        },
+                },
+                .max_tx_retries = 100,
+                .ap_aging_period = 300,
+                .tid_conf_count = 4,
+                .tid_conf = {
+                        [CONF_TX_AC_BE] = {
+                                .queue_id    = CONF_TX_AC_BE,
+                                .channel_type = CONF_CHANNEL_TYPE_EDCF,
+                                .tsid        = CONF_TX_AC_BE,
+                                .ps_scheme   = CONF_PS_SCHEME_LEGACY,
+                                .ack_policy  = CONF_ACK_POLICY_LEGACY,
+                                .apsd_conf   = {0, 0},
+                        },
+                        [CONF_TX_AC_BK] = {
+                                .queue_id    = CONF_TX_AC_BK,
+                                .channel_type = CONF_CHANNEL_TYPE_EDCF,
+                                .tsid        = CONF_TX_AC_BK,
+                                .ps_scheme   = CONF_PS_SCHEME_LEGACY,
+                                .ack_policy  = CONF_ACK_POLICY_LEGACY,
+                                .apsd_conf   = {0, 0},
+                        },
+                        [CONF_TX_AC_VI] = {
+                                .queue_id    = CONF_TX_AC_VI,
+                                .channel_type = CONF_CHANNEL_TYPE_EDCF,
+                                .tsid        = CONF_TX_AC_VI,
+                                .ps_scheme   = CONF_PS_SCHEME_LEGACY,
+                                .ack_policy  = CONF_ACK_POLICY_LEGACY,
+                                .apsd_conf   = {0, 0},
+                        },
+                        [CONF_TX_AC_VO] = {
+                                .queue_id    = CONF_TX_AC_VO,
+                                .channel_type = CONF_CHANNEL_TYPE_EDCF,
+                                .tsid        = CONF_TX_AC_VO,
+                                .ps_scheme   = CONF_PS_SCHEME_LEGACY,
+                                .ack_policy  = CONF_ACK_POLICY_LEGACY,
+                                .apsd_conf   = {0, 0},
+                        },
+                },
+                .frag_threshold              = IEEE80211_MAX_FRAG_THRESHOLD,
+                .tx_compl_timeout            = 700,
+                .tx_compl_threshold          = 4,
+                .basic_rate                  = CONF_HW_BIT_RATE_1MBPS,
+                .basic_rate_5                = CONF_HW_BIT_RATE_6MBPS,
+                .tmpl_short_retry_limit      = 10,
+                .tmpl_long_retry_limit       = 10,
+                .tx_watchdog_timeout         = 5000,
+        },
+        .conn = {
+                .wake_up_event               = CONF_WAKE_UP_EVENT_DTIM,
+                .listen_interval             = 1,
+                .suspend_wake_up_event       = CONF_WAKE_UP_EVENT_N_DTIM,
+                .suspend_listen_interval     = 3,
+                .bcn_filt_mode               = CONF_BCN_FILT_MODE_ENABLED,
+                .bcn_filt_ie_count           = 2,
+                .bcn_filt_ie = {
+                        [0] = {
+                                .ie          = WLAN_EID_CHANNEL_SWITCH,
+                                .rule        = CONF_BCN_RULE_PASS_ON_APPEARANCE,
+                        },
+                        [1] = {
+                                .ie          = WLAN_EID_HT_OPERATION,
+                                .rule        = CONF_BCN_RULE_PASS_ON_CHANGE,
+                        },
+                },
+                .synch_fail_thold            = 10,
+                .bss_lose_timeout            = 100,
+                .beacon_rx_timeout           = 10000,
+                .broadcast_timeout           = 20000,
+                .rx_broadcast_in_ps          = 1,
+                .ps_poll_threshold           = 10,
+                .bet_enable                  = CONF_BET_MODE_ENABLE,
+                .bet_max_consecutive         = 50,
+                .psm_entry_retries           = 8,
+                .psm_exit_retries            = 16,
+                .psm_entry_nullfunc_retries  = 3,
+                .dynamic_ps_timeout          = 40,
+                .forced_ps                   = false,
+                .keep_alive_interval         = 55000,
+                .max_listen_interval         = 20,
+        },
+        .itrim = {
+                .enable = false,
+                .timeout = 50000,
+        },
+        .pm_config = {
+                .host_clk_settling_time = 5000,
+                .host_fast_wakeup_support = false
+        },
+        .roam_trigger = {
+                .trigger_pacing               = 1,
+                .avg_weight_rssi_beacon       = 20,
+                .avg_weight_rssi_data         = 10,
+                .avg_weight_snr_beacon        = 20,
+                .avg_weight_snr_data          = 10,
+        },
+        .scan = {
+                .min_dwell_time_active        = 7500,
+                .max_dwell_time_active        = 30000,
+                .min_dwell_time_passive       = 100000,
+                .max_dwell_time_passive       = 100000,
+                .num_probe_reqs               = 2,
+                .split_scan_timeout           = 50000,
+        },
+        .sched_scan = {
+                /*
+                 * Values are in TU/1000 but since sched scan FW command
+                 * params are in TUs rounding up may occur.
+                 */
+                .base_dwell_time                = 7500,
+                .max_dwell_time_delta           = 22500,
+                /* based on 250bits per probe @1Mbps */
+                .dwell_time_delta_per_probe     = 2000,
+                /* based on 250bits per probe @6Mbps (plus a bit more) */
+                .dwell_time_delta_per_probe_5   = 350,
+                .dwell_time_passive             = 100000,
+                .dwell_time_dfs                 = 150000,
+                .num_probe_reqs                 = 2,
+                .rssi_threshold                 = -90,
+                .snr_threshold                  = 0,
+        },
+        .ht = {
+                .rx_ba_win_size = 8,
+                .tx_ba_win_size = 64,
+                .inactivity_timeout = 10000,
+                .tx_ba_tid_bitmap = CONF_TX_BA_ENABLED_TID_BITMAP,
+        },
+        /*
+         * Memory config for wl127x chips is given in the
+         * wl12xx_default_priv_conf struct. The below configuration is
+         * for wl128x chips.
+         */
+        .mem = {
+                .num_stations                 = 1,
+                .ssid_profiles                = 1,
+                .rx_block_num                 = 40,
+                .tx_min_block_num             = 40,
+                .dynamic_memory               = 1,
+                .min_req_tx_blocks            = 45,
+                .min_req_rx_blocks            = 22,
+                .tx_min                       = 27,
+        },
+        .fm_coex = {
+                .enable                       = true,
+                .swallow_period               = 5,
+                .n_divider_fref_set_1         = 0xff,       /* default */
+                .n_divider_fref_set_2         = 12,
+                .m_divider_fref_set_1         = 148,
+                .m_divider_fref_set_2         = 0xffff,     /* default */
+                .coex_pll_stabilization_time  = 0xffffffff, /* default */
+                .ldo_stabilization_time       = 0xffff,     /* default */
+                .fm_disturbed_band_margin     = 0xff,       /* default */
+                .swallow_clk_diff             = 0xff,       /* default */
+        },
+        .rx_streaming = {
+                .duration                      = 150,
+                .queues                        = 0x1,
+                .interval                      = 20,
+                .always                        = 0,
+        },
+        .fwlog = {
+                .mode                         = WL12XX_FWLOG_ON_DEMAND,
+                .mem_blocks                   = 2,
+                .severity                     = 0,
+                .timestamp                    = WL12XX_FWLOG_TIMESTAMP_DISABLED,
+                .output                       = WL12XX_FWLOG_OUTPUT_HOST,
+                .threshold                    = 0,
+        },
+        .rate = {
+                .rate_retry_score = 32000,
+                .per_add = 8192,
+                .per_th1 = 2048,
+                .per_th2 = 4096,
+                .max_per = 8100,
+                .inverse_curiosity_factor = 5,
+                .tx_fail_low_th = 4,
+                .tx_fail_high_th = 10,
+                .per_alpha_shift = 4,
+                .per_add_shift = 13,
+                .per_beta1_shift = 10,
+                .per_beta2_shift = 8,
+                .rate_check_up = 2,
+                .rate_check_down = 12,
+                .rate_retry_policy = {
+                        0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00,
+                },
+        },
+        .hangover = {
+                .recover_time               = 0,
+                .hangover_period            = 20,
+                .dynamic_mode               = 1,
+                .early_termination_mode     = 1,
+                .max_period                 = 20,
+                .min_period                 = 1,
+                .increase_delta             = 1,
+                .decrease_delta             = 2,
+                .quiet_time                 = 4,
+                .increase_time              = 1,
+                .window_size                = 16,
+        },
+};
+
+static struct wl12xx_priv_conf wl12xx_default_priv_conf = {
+        .rf = {
+                .tx_per_channel_power_compensation_2 = {
+                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .tx_per_channel_power_compensation_5 = {
+                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+        },
+        .mem_wl127x = {
+                .num_stations                 = 1,
+                .ssid_profiles                = 1,
+                .rx_block_num                 = 70,
+                .tx_min_block_num             = 40,
+                .dynamic_memory               = 1,
+                .min_req_tx_blocks            = 100,
+                .min_req_rx_blocks            = 22,
+                .tx_min                       = 27,
+        },
+
+};
+
+#define WL12XX_TX_HW_BLOCK_SPARE_DEFAULT        1
+#define WL12XX_TX_HW_BLOCK_GEM_SPARE            2
+#define WL12XX_TX_HW_BLOCK_SIZE                 252
+
+static const u8 wl12xx_rate_to_idx_2ghz[] = {
+        /* MCS rates are used only with 11n */
+        7,                             /* WL12XX_CONF_HW_RXTX_RATE_MCS7_SGI */
+        7,                             /* WL12XX_CONF_HW_RXTX_RATE_MCS7 */
+        6,                             /* WL12XX_CONF_HW_RXTX_RATE_MCS6 */
+        5,                             /* WL12XX_CONF_HW_RXTX_RATE_MCS5 */
+        4,                             /* WL12XX_CONF_HW_RXTX_RATE_MCS4 */
+        3,                             /* WL12XX_CONF_HW_RXTX_RATE_MCS3 */
+        2,                             /* WL12XX_CONF_HW_RXTX_RATE_MCS2 */
+        1,                             /* WL12XX_CONF_HW_RXTX_RATE_MCS1 */
+        0,                             /* WL12XX_CONF_HW_RXTX_RATE_MCS0 */
+
+        11,                            /* WL12XX_CONF_HW_RXTX_RATE_54   */
+        10,                            /* WL12XX_CONF_HW_RXTX_RATE_48   */
+        9,                             /* WL12XX_CONF_HW_RXTX_RATE_36   */
+        8,                             /* WL12XX_CONF_HW_RXTX_RATE_24   */
+
+        /* TI-specific rate */
+        CONF_HW_RXTX_RATE_UNSUPPORTED, /* WL12XX_CONF_HW_RXTX_RATE_22   */
+
+        7,                             /* WL12XX_CONF_HW_RXTX_RATE_18   */
+        6,                             /* WL12XX_CONF_HW_RXTX_RATE_12   */
+        3,                             /* WL12XX_CONF_HW_RXTX_RATE_11   */
+        5,                             /* WL12XX_CONF_HW_RXTX_RATE_9    */
+        4,                             /* WL12XX_CONF_HW_RXTX_RATE_6    */
+        2,                             /* WL12XX_CONF_HW_RXTX_RATE_5_5  */
+        1,                             /* WL12XX_CONF_HW_RXTX_RATE_2    */
+        0                              /* WL12XX_CONF_HW_RXTX_RATE_1    */
+};
+
+static const u8 wl12xx_rate_to_idx_5ghz[] = {
+        /* MCS rates are used only with 11n */
+        7,                             /* WL12XX_CONF_HW_RXTX_RATE_MCS7_SGI */
+        7,                             /* WL12XX_CONF_HW_RXTX_RATE_MCS7 */
+        6,                             /* WL12XX_CONF_HW_RXTX_RATE_MCS6 */
+        5,                             /* WL12XX_CONF_HW_RXTX_RATE_MCS5 */
+        4,                             /* WL12XX_CONF_HW_RXTX_RATE_MCS4 */
+        3,                             /* WL12XX_CONF_HW_RXTX_RATE_MCS3 */
+        2,                             /* WL12XX_CONF_HW_RXTX_RATE_MCS2 */
+        1,                             /* WL12XX_CONF_HW_RXTX_RATE_MCS1 */
+        0,                             /* WL12XX_CONF_HW_RXTX_RATE_MCS0 */
+
+        7,                             /* WL12XX_CONF_HW_RXTX_RATE_54   */
+        6,                             /* WL12XX_CONF_HW_RXTX_RATE_48   */
+        5,                             /* WL12XX_CONF_HW_RXTX_RATE_36   */
+        4,                             /* WL12XX_CONF_HW_RXTX_RATE_24   */
+
+        /* TI-specific rate */
+        CONF_HW_RXTX_RATE_UNSUPPORTED, /* WL12XX_CONF_HW_RXTX_RATE_22   */
+
+        3,                             /* WL12XX_CONF_HW_RXTX_RATE_18   */
+        2,                             /* WL12XX_CONF_HW_RXTX_RATE_12   */
+        CONF_HW_RXTX_RATE_UNSUPPORTED, /* WL12XX_CONF_HW_RXTX_RATE_11   */
+        1,                             /* WL12XX_CONF_HW_RXTX_RATE_9    */
+        0,                             /* WL12XX_CONF_HW_RXTX_RATE_6    */
+        CONF_HW_RXTX_RATE_UNSUPPORTED, /* WL12XX_CONF_HW_RXTX_RATE_5_5  */
+        CONF_HW_RXTX_RATE_UNSUPPORTED, /* WL12XX_CONF_HW_RXTX_RATE_2    */
+        CONF_HW_RXTX_RATE_UNSUPPORTED  /* WL12XX_CONF_HW_RXTX_RATE_1    */
+};
+
+static const u8 *wl12xx_band_rate_to_idx[] = {
+        [IEEE80211_BAND_2GHZ] = wl12xx_rate_to_idx_2ghz,
+        [IEEE80211_BAND_5GHZ] = wl12xx_rate_to_idx_5ghz
+};
+
+enum wl12xx_hw_rates {
+        WL12XX_CONF_HW_RXTX_RATE_MCS7_SGI = 0,
+        WL12XX_CONF_HW_RXTX_RATE_MCS7,
+        WL12XX_CONF_HW_RXTX_RATE_MCS6,
+        WL12XX_CONF_HW_RXTX_RATE_MCS5,
+        WL12XX_CONF_HW_RXTX_RATE_MCS4,
+        WL12XX_CONF_HW_RXTX_RATE_MCS3,
+        WL12XX_CONF_HW_RXTX_RATE_MCS2,
+        WL12XX_CONF_HW_RXTX_RATE_MCS1,
+        WL12XX_CONF_HW_RXTX_RATE_MCS0,
+        WL12XX_CONF_HW_RXTX_RATE_54,
+        WL12XX_CONF_HW_RXTX_RATE_48,
+        WL12XX_CONF_HW_RXTX_RATE_36,
+        WL12XX_CONF_HW_RXTX_RATE_24,
+        WL12XX_CONF_HW_RXTX_RATE_22,
+        WL12XX_CONF_HW_RXTX_RATE_18,
+        WL12XX_CONF_HW_RXTX_RATE_12,
+        WL12XX_CONF_HW_RXTX_RATE_11,
+        WL12XX_CONF_HW_RXTX_RATE_9,
+        WL12XX_CONF_HW_RXTX_RATE_6,
+        WL12XX_CONF_HW_RXTX_RATE_5_5,
+        WL12XX_CONF_HW_RXTX_RATE_2,
+        WL12XX_CONF_HW_RXTX_RATE_1,
+        WL12XX_CONF_HW_RXTX_RATE_MAX,
+};
+
+static struct wlcore_partition_set wl12xx_ptable[PART_TABLE_LEN] = {
+        [PART_DOWN] = {
+                .mem = {
+                        .start = 0x00000000,
+                        .size  = 0x000177c0
+                },
+                .reg = {
+                        .start = REGISTERS_BASE,
+                        .size  = 0x00008800
+                },
+                .mem2 = {
+                        .start = 0x00000000,
+                        .size  = 0x00000000
+                },
+                .mem3 = {
+                        .start = 0x00000000,
+                        .size  = 0x00000000
+                },
+        },
+
+        [PART_BOOT] = { /* in wl12xx we can use a mix of work and down
+                         * partition here */
+                .mem = {
+                        .start = 0x00040000,
+                        .size  = 0x00014fc0
+                },
+                .reg = {
+                        .start = REGISTERS_BASE,
+                        .size  = 0x00008800
+                },
+                .mem2 = {
+                        .start = 0x00000000,
+                        .size  = 0x00000000
+                },
+                .mem3 = {
+                        .start = 0x00000000,
+                        .size  = 0x00000000
+                },
+        },
+
+        [PART_WORK] = {
+                .mem = {
+                        .start = 0x00040000,
+                        .size  = 0x00014fc0
+                },
+                .reg = {
+                        .start = REGISTERS_BASE,
+                        .size  = 0x0000a000
+                },
+                .mem2 = {
+                        .start = 0x003004f8,
+                        .size  = 0x00000004
+                },
+                .mem3 = {
+                        .start = 0x00040404,
+                        .size  = 0x00000000
+                },
+        },
+
+        [PART_DRPW] = {
+                .mem = {
+                        .start = 0x00040000,
+                        .size  = 0x00014fc0
+                },
+                .reg = {
+                        .start = DRPW_BASE,
+                        .size  = 0x00006000
+                },
+                .mem2 = {
+                        .start = 0x00000000,
+                        .size  = 0x00000000
+                },
+                .mem3 = {
+                        .start = 0x00000000,
+                        .size  = 0x00000000
+                }
+        }
+};
+
+static const int wl12xx_rtable[REG_TABLE_LEN] = {
+        [REG_ECPU_CONTROL]              = WL12XX_REG_ECPU_CONTROL,
+        [REG_INTERRUPT_NO_CLEAR]        = WL12XX_REG_INTERRUPT_NO_CLEAR,
+        [REG_INTERRUPT_ACK]             = WL12XX_REG_INTERRUPT_ACK,
+        [REG_COMMAND_MAILBOX_PTR]       = WL12XX_REG_COMMAND_MAILBOX_PTR,
+        [REG_EVENT_MAILBOX_PTR]         = WL12XX_REG_EVENT_MAILBOX_PTR,
+        [REG_INTERRUPT_TRIG]            = WL12XX_REG_INTERRUPT_TRIG,
+        [REG_INTERRUPT_MASK]            = WL12XX_REG_INTERRUPT_MASK,
+        [REG_PC_ON_RECOVERY]            = WL12XX_SCR_PAD4,
+        [REG_CHIP_ID_B]                 = WL12XX_CHIP_ID_B,
+        [REG_CMD_MBOX_ADDRESS]          = WL12XX_CMD_MBOX_ADDRESS,
+
+        /* data access memory addresses, used with partition translation */
+        [REG_SLV_MEM_DATA]              = WL1271_SLV_MEM_DATA,
+        [REG_SLV_REG_DATA]              = WL1271_SLV_REG_DATA,
+
+        /* raw data access memory addresses */
+        [REG_RAW_FW_STATUS_ADDR]        = FW_STATUS_ADDR,
+};
+
+/* TODO: maybe move to a new header file? */
+#define WL127X_FW_NAME_MULTI    "ti-connectivity/wl127x-fw-4-mr.bin"
+#define WL127X_FW_NAME_SINGLE   "ti-connectivity/wl127x-fw-4-sr.bin"
+#define WL127X_PLT_FW_NAME      "ti-connectivity/wl127x-fw-4-plt.bin"
+
+#define WL128X_FW_NAME_MULTI    "ti-connectivity/wl128x-fw-4-mr.bin"
+#define WL128X_FW_NAME_SINGLE   "ti-connectivity/wl128x-fw-4-sr.bin"
+#define WL128X_PLT_FW_NAME      "ti-connectivity/wl128x-fw-4-plt.bin"
+
+static void wl127x_prepare_read(struct wl1271 *wl, u32 rx_desc, u32 len)
+{
+        if (wl->chip.id != CHIP_ID_1283_PG20) {
+                struct wl1271_acx_mem_map *wl_mem_map = wl->target_mem_map;
+                struct wl1271_rx_mem_pool_addr rx_mem_addr;
+
+                /*
+                 * Choose the block we want to read
+                 * For aggregated packets, only the first memory block
+                 * should be retrieved. The FW takes care of the rest.
+                 */
+                u32 mem_block = rx_desc & RX_MEM_BLOCK_MASK;
+
+                rx_mem_addr.addr = (mem_block << 8) +
+                        le32_to_cpu(wl_mem_map->packet_memory_pool_start);
+
+                rx_mem_addr.addr_extra = rx_mem_addr.addr + 4;
+
+                wl1271_write(wl, WL1271_SLV_REG_DATA,
+                             &rx_mem_addr, sizeof(rx_mem_addr), false);
+        }
+}
+
+static int wl12xx_identify_chip(struct wl1271 *wl)
+{
+        int ret = 0;
+
+        switch (wl->chip.id) {
+        case CHIP_ID_1271_PG10:
+                wl1271_warning("chip id 0x%x (1271 PG10) support is obsolete",
+                               wl->chip.id);
+
+                /* clear the alignment quirk, since we don't support it */
+                wl->quirks &= ~WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN;
+
+                wl->quirks |= WLCORE_QUIRK_LEGACY_NVS;
+                wl->sr_fw_name = WL127X_FW_NAME_SINGLE;
+                wl->mr_fw_name = WL127X_FW_NAME_MULTI;
+                memcpy(&wl->conf.mem, &wl12xx_default_priv_conf.mem_wl127x,
+                       sizeof(wl->conf.mem));
+
+                /* read data preparation is only needed by wl127x */
+                wl->ops->prepare_read = wl127x_prepare_read;
+
+                break;
+
+        case CHIP_ID_1271_PG20:
+                wl1271_debug(DEBUG_BOOT, "chip id 0x%x (1271 PG20)",
+                             wl->chip.id);
+
+                /* clear the alignment quirk, since we don't support it */
+                wl->quirks &= ~WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN;
+
+                wl->quirks |= WLCORE_QUIRK_LEGACY_NVS;
+                wl->plt_fw_name = WL127X_PLT_FW_NAME;
+                wl->sr_fw_name = WL127X_FW_NAME_SINGLE;
+                wl->mr_fw_name = WL127X_FW_NAME_MULTI;
+                memcpy(&wl->conf.mem, &wl12xx_default_priv_conf.mem_wl127x,
+                       sizeof(wl->conf.mem));
+
+                /* read data preparation is only needed by wl127x */
+                wl->ops->prepare_read = wl127x_prepare_read;
+
+                break;
+
+        case CHIP_ID_1283_PG20:
+                wl1271_debug(DEBUG_BOOT, "chip id 0x%x (1283 PG20)",
+                             wl->chip.id);
+                wl->plt_fw_name = WL128X_PLT_FW_NAME;
+                wl->sr_fw_name = WL128X_FW_NAME_SINGLE;
+                wl->mr_fw_name = WL128X_FW_NAME_MULTI;
+                break;
+        case CHIP_ID_1283_PG10:
+        default:
+                wl1271_warning("unsupported chip id: 0x%x", wl->chip.id);
+                ret = -ENODEV;
+                goto out;
+        }
+
+out:
+        return ret;
+}
+
+static void wl12xx_top_reg_write(struct wl1271 *wl, int addr, u16 val)
+{
+        /* write address >> 1 + 0x30000 to OCP_POR_CTR */
+        addr = (addr >> 1) + 0x30000;
+        wl1271_write32(wl, WL12XX_OCP_POR_CTR, addr);
+
+        /* write value to OCP_POR_WDATA */
+        wl1271_write32(wl, WL12XX_OCP_DATA_WRITE, val);
+
+        /* write 1 to OCP_CMD */
+        wl1271_write32(wl, WL12XX_OCP_CMD, OCP_CMD_WRITE);
+}
+
+static u16 wl12xx_top_reg_read(struct wl1271 *wl, int addr)
+{
+        u32 val;
+        int timeout = OCP_CMD_LOOP;
+
+        /* write address >> 1 + 0x30000 to OCP_POR_CTR */
+        addr = (addr >> 1) + 0x30000;
+        wl1271_write32(wl, WL12XX_OCP_POR_CTR, addr);
+
+        /* write 2 to OCP_CMD */
+        wl1271_write32(wl, WL12XX_OCP_CMD, OCP_CMD_READ);
+
+        /* poll for data ready */
+        do {
+                val = wl1271_read32(wl, WL12XX_OCP_DATA_READ);
+        } while (!(val & OCP_READY_MASK) && --timeout);
+
+        if (!timeout) {
+                wl1271_warning("Top register access timed out.");
+                return 0xffff;
+        }
+
+        /* check data status and return if OK */
+        if ((val & OCP_STATUS_MASK) == OCP_STATUS_OK)
+                return val & 0xffff;
+        else {
+                wl1271_warning("Top register access returned error.");
+                return 0xffff;
+        }
+}
+
+static int wl128x_switch_tcxo_to_fref(struct wl1271 *wl)
+{
+        u16 spare_reg;
+
+        /* Mask bits [2] & [8:4] in the sys_clk_cfg register */
+        spare_reg = wl12xx_top_reg_read(wl, WL_SPARE_REG);
+        if (spare_reg == 0xFFFF)
+                return -EFAULT;
+        spare_reg |= (BIT(3) | BIT(5) | BIT(6));
+        wl12xx_top_reg_write(wl, WL_SPARE_REG, spare_reg);
+
+        /* Enable FREF_CLK_REQ & mux MCS and coex PLLs to FREF */
+        wl12xx_top_reg_write(wl, SYS_CLK_CFG_REG,
+                             WL_CLK_REQ_TYPE_PG2 | MCS_PLL_CLK_SEL_FREF);
+
+        /* Delay execution for 15msec, to let the HW settle */
+        mdelay(15);
+
+        return 0;
+}
+
+static bool wl128x_is_tcxo_valid(struct wl1271 *wl)
+{
+        u16 tcxo_detection;
+
+        tcxo_detection = wl12xx_top_reg_read(wl, TCXO_CLK_DETECT_REG);
+        if (tcxo_detection & TCXO_DET_FAILED)
+                return false;
+
+        return true;
+}
+
+static bool wl128x_is_fref_valid(struct wl1271 *wl)
+{
+        u16 fref_detection;
+
+        fref_detection = wl12xx_top_reg_read(wl, FREF_CLK_DETECT_REG);
+        if (fref_detection & FREF_CLK_DETECT_FAIL)
+                return false;
+
+        return true;
+}
+
+static int wl128x_manually_configure_mcs_pll(struct wl1271 *wl)
+{
+        wl12xx_top_reg_write(wl, MCS_PLL_M_REG, MCS_PLL_M_REG_VAL);
+        wl12xx_top_reg_write(wl, MCS_PLL_N_REG, MCS_PLL_N_REG_VAL);
+        wl12xx_top_reg_write(wl, MCS_PLL_CONFIG_REG, MCS_PLL_CONFIG_REG_VAL);
+
+        return 0;
+}
+
+static int wl128x_configure_mcs_pll(struct wl1271 *wl, int clk)
+{
+        u16 spare_reg;
+        u16 pll_config;
+        u8 input_freq;
+
+        /* Mask bits [3:1] in the sys_clk_cfg register */
+        spare_reg = wl12xx_top_reg_read(wl, WL_SPARE_REG);
+        if (spare_reg == 0xFFFF)
+                return -EFAULT;
+        spare_reg |= BIT(2);
+        wl12xx_top_reg_write(wl, WL_SPARE_REG, spare_reg);
+
+        /* Handle special cases of the TCXO clock */
+        if (wl->tcxo_clock == WL12XX_TCXOCLOCK_16_8 ||
+            wl->tcxo_clock == WL12XX_TCXOCLOCK_33_6)
+                return wl128x_manually_configure_mcs_pll(wl);
+
+        /* Set the input frequency according to the selected clock source */
+        input_freq = (clk & 1) + 1;
+
+        pll_config = wl12xx_top_reg_read(wl, MCS_PLL_CONFIG_REG);
+        if (pll_config == 0xFFFF)
+                return -EFAULT;
+        pll_config |= (input_freq << MCS_SEL_IN_FREQ_SHIFT);
+        pll_config |= MCS_PLL_ENABLE_HP;
+        wl12xx_top_reg_write(wl, MCS_PLL_CONFIG_REG, pll_config);
+
+        return 0;
+}
+
+/*
+ * WL128x has two clocks input - TCXO and FREF.
+ * TCXO is the main clock of the device, while FREF is used to sync
+ * between the GPS and the cellular modem.
+ * In cases where TCXO is 32.736MHz or 16.368MHz, the FREF will be used
+ * as the WLAN/BT main clock.
+ */
+static int wl128x_boot_clk(struct wl1271 *wl, int *selected_clock)
+{
+        u16 sys_clk_cfg;
+
+        /* For XTAL-only modes, FREF will be used after switching from TCXO */
+        if (wl->ref_clock == WL12XX_REFCLOCK_26_XTAL ||
+            wl->ref_clock == WL12XX_REFCLOCK_38_XTAL) {
+                if (!wl128x_switch_tcxo_to_fref(wl))
+                        return -EINVAL;
+                goto fref_clk;
+        }
+
+        /* Query the HW, to determine which clock source we should use */
+        sys_clk_cfg = wl12xx_top_reg_read(wl, SYS_CLK_CFG_REG);
+        if (sys_clk_cfg == 0xFFFF)
+                return -EINVAL;
+        if (sys_clk_cfg & PRCM_CM_EN_MUX_WLAN_FREF)
+                goto fref_clk;
+
+        /* If TCXO is either 32.736MHz or 16.368MHz, switch to FREF */
+        if (wl->tcxo_clock == WL12XX_TCXOCLOCK_16_368 ||
+            wl->tcxo_clock == WL12XX_TCXOCLOCK_32_736) {
+                if (!wl128x_switch_tcxo_to_fref(wl))
+                        return -EINVAL;
+                goto fref_clk;
+        }
+
+        /* TCXO clock is selected */
+        if (!wl128x_is_tcxo_valid(wl))
+                return -EINVAL;
+        *selected_clock = wl->tcxo_clock;
+        goto config_mcs_pll;
+
+fref_clk:
+        /* FREF clock is selected */
+        if (!wl128x_is_fref_valid(wl))
+                return -EINVAL;
+        *selected_clock = wl->ref_clock;
+
+config_mcs_pll:
+        return wl128x_configure_mcs_pll(wl, *selected_clock);
+}
+
+static int wl127x_boot_clk(struct wl1271 *wl)
+{
+        u32 pause;
+        u32 clk;
+
+        if (WL127X_PG_GET_MAJOR(wl->hw_pg_ver) < 3)
+                wl->quirks |= WLCORE_QUIRK_END_OF_TRANSACTION;
+
+        if (wl->ref_clock == CONF_REF_CLK_19_2_E ||
+            wl->ref_clock == CONF_REF_CLK_38_4_E ||
+            wl->ref_clock == CONF_REF_CLK_38_4_M_XTAL)
+                /* ref clk: 19.2/38.4/38.4-XTAL */
+                clk = 0x3;
+        else if (wl->ref_clock == CONF_REF_CLK_26_E ||
+                 wl->ref_clock == CONF_REF_CLK_52_E)
+                /* ref clk: 26/52 */
+                clk = 0x5;
+        else
+                return -EINVAL;
+
+        if (wl->ref_clock != CONF_REF_CLK_19_2_E) {
+                u16 val;
+                /* Set clock type (open drain) */
+                val = wl12xx_top_reg_read(wl, OCP_REG_CLK_TYPE);
+                val &= FREF_CLK_TYPE_BITS;
+                wl12xx_top_reg_write(wl, OCP_REG_CLK_TYPE, val);
+
+                /* Set clock pull mode (no pull) */
+                val = wl12xx_top_reg_read(wl, OCP_REG_CLK_PULL);
+                val |= NO_PULL;
+                wl12xx_top_reg_write(wl, OCP_REG_CLK_PULL, val);
+        } else {
+                u16 val;
+                /* Set clock polarity */
+                val = wl12xx_top_reg_read(wl, OCP_REG_CLK_POLARITY);
+                val &= FREF_CLK_POLARITY_BITS;
+                val |= CLK_REQ_OUTN_SEL;
+                wl12xx_top_reg_write(wl, OCP_REG_CLK_POLARITY, val);
+        }
+
+        wl1271_write32(wl, WL12XX_PLL_PARAMETERS, clk);
+
+        pause = wl1271_read32(wl, WL12XX_PLL_PARAMETERS);
+
+        wl1271_debug(DEBUG_BOOT, "pause1 0x%x", pause);
+
+        pause &= ~(WU_COUNTER_PAUSE_VAL);
+        pause |= WU_COUNTER_PAUSE_VAL;
+        wl1271_write32(wl, WL12XX_WU_COUNTER_PAUSE, pause);
+
+        return 0;
+}
+
+static int wl1271_boot_soft_reset(struct wl1271 *wl)
+{
+        unsigned long timeout;
+        u32 boot_data;
+
+        /* perform soft reset */
+        wl1271_write32(wl, WL12XX_SLV_SOFT_RESET, ACX_SLV_SOFT_RESET_BIT);
+
+        /* SOFT_RESET is self clearing */
+        timeout = jiffies + usecs_to_jiffies(SOFT_RESET_MAX_TIME);
+        while (1) {
+                boot_data = wl1271_read32(wl, WL12XX_SLV_SOFT_RESET);
+                wl1271_debug(DEBUG_BOOT, "soft reset bootdata 0x%x", boot_data);
+                if ((boot_data & ACX_SLV_SOFT_RESET_BIT) == 0)
+                        break;
+
+                if (time_after(jiffies, timeout)) {
+                        /* 1.2 check pWhalBus->uSelfClearTime if the
+                         * timeout was reached */
+                        wl1271_error("soft reset timeout");
+                        return -1;
+                }
+
+                udelay(SOFT_RESET_STALL_TIME);
+        }
+
+        /* disable Rx/Tx */
+        wl1271_write32(wl, WL12XX_ENABLE, 0x0);
+
+        /* disable auto calibration on start*/
+        wl1271_write32(wl, WL12XX_SPARE_A2, 0xffff);
+
+        return 0;
+}
+
+static int wl12xx_pre_boot(struct wl1271 *wl)
+{
+        int ret = 0;
+        u32 clk;
+        int selected_clock = -1;
+
+        if (wl->chip.id == CHIP_ID_1283_PG20) {
+                ret = wl128x_boot_clk(wl, &selected_clock);
+                if (ret < 0)
+                        goto out;
+        } else {
+                ret = wl127x_boot_clk(wl);
+                if (ret < 0)
+                        goto out;
+        }
+
+        /* Continue the ELP wake up sequence */
+        wl1271_write32(wl, WL12XX_WELP_ARM_COMMAND, WELP_ARM_COMMAND_VAL);
+        udelay(500);
+
+        wlcore_set_partition(wl, &wl->ptable[PART_DRPW]);
+
+        /* Read-modify-write DRPW_SCRATCH_START register (see next state)
+           to be used by DRPw FW. The RTRIM value will be added by the FW
+           before taking DRPw out of reset */
+
+        clk = wl1271_read32(wl, WL12XX_DRPW_SCRATCH_START);
+
+        wl1271_debug(DEBUG_BOOT, "clk2 0x%x", clk);
+
+        if (wl->chip.id == CHIP_ID_1283_PG20)
+                clk |= ((selected_clock & 0x3) << 1) << 4;
+        else
+                clk |= (wl->ref_clock << 1) << 4;
+
+        wl1271_write32(wl, WL12XX_DRPW_SCRATCH_START, clk);
+
+        wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
+
+        /* Disable interrupts */
+        wlcore_write_reg(wl, REG_INTERRUPT_MASK, WL1271_ACX_INTR_ALL);
+
+        ret = wl1271_boot_soft_reset(wl);
+        if (ret < 0)
+                goto out;
+
+out:
+        return ret;
+}
+
+static void wl12xx_pre_upload(struct wl1271 *wl)
+{
+        u32 tmp;
+
+        /* write firmware's last address (ie. it's length) to
+         * ACX_EEPROMLESS_IND_REG */
+        wl1271_debug(DEBUG_BOOT, "ACX_EEPROMLESS_IND_REG");
+
+        wl1271_write32(wl, WL12XX_EEPROMLESS_IND, WL12XX_EEPROMLESS_IND);
+
+        tmp = wlcore_read_reg(wl, REG_CHIP_ID_B);
+
+        wl1271_debug(DEBUG_BOOT, "chip id 0x%x", tmp);
+
+        /* 6. read the EEPROM parameters */
+        tmp = wl1271_read32(wl, WL12XX_SCR_PAD2);
+
+        /* WL1271: The reference driver skips steps 7 to 10 (jumps directly
+         * to upload_fw) */
+
+        if (wl->chip.id == CHIP_ID_1283_PG20)
+                wl12xx_top_reg_write(wl, SDIO_IO_DS, HCI_IO_DS_6MA);
+}
+
+static void wl12xx_enable_interrupts(struct wl1271 *wl)
+{
+        u32 polarity;
+
+        polarity = wl12xx_top_reg_read(wl, OCP_REG_POLARITY);
+
+        /* We use HIGH polarity, so unset the LOW bit */
+        polarity &= ~POLARITY_LOW;
+        wl12xx_top_reg_write(wl, OCP_REG_POLARITY, polarity);
+
+        wlcore_write_reg(wl, REG_INTERRUPT_MASK, WL1271_ACX_ALL_EVENTS_VECTOR);
+
+        wlcore_enable_interrupts(wl);
+        wlcore_write_reg(wl, REG_INTERRUPT_MASK,
+                         WL1271_ACX_INTR_ALL & ~(WL1271_INTR_MASK));
+
+        wl1271_write32(wl, WL12XX_HI_CFG, HI_CFG_DEF_VAL);
+}
+
+static int wl12xx_boot(struct wl1271 *wl)
+{
+        int ret;
+
+        ret = wl12xx_pre_boot(wl);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_boot_upload_nvs(wl);
+        if (ret < 0)
+                goto out;
+
+        wl12xx_pre_upload(wl);
+
+        ret = wlcore_boot_upload_firmware(wl);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_boot_run_firmware(wl);
+        if (ret < 0)
+                goto out;
+
+        wl12xx_enable_interrupts(wl);
+
+out:
+        return ret;
+}
+
+static void wl12xx_trigger_cmd(struct wl1271 *wl, int cmd_box_addr,
+                               void *buf, size_t len)
+{
+        wl1271_write(wl, cmd_box_addr, buf, len, false);
+        wlcore_write_reg(wl, REG_INTERRUPT_TRIG, WL12XX_INTR_TRIG_CMD);
+}
+
+static void wl12xx_ack_event(struct wl1271 *wl)
+{
+        wlcore_write_reg(wl, REG_INTERRUPT_TRIG, WL12XX_INTR_TRIG_EVENT_ACK);
+}
+
+static u32 wl12xx_calc_tx_blocks(struct wl1271 *wl, u32 len, u32 spare_blks)
+{
+        u32 blk_size = WL12XX_TX_HW_BLOCK_SIZE;
+        u32 align_len = wlcore_calc_packet_alignment(wl, len);
+
+        return (align_len + blk_size - 1) / blk_size + spare_blks;
+}
+
+static void
+wl12xx_set_tx_desc_blocks(struct wl1271 *wl, struct wl1271_tx_hw_descr *desc,
+                          u32 blks, u32 spare_blks)
+{
+        if (wl->chip.id == CHIP_ID_1283_PG20) {
+                desc->wl128x_mem.total_mem_blocks = blks;
+        } else {
+                desc->wl127x_mem.extra_blocks = spare_blks;
+                desc->wl127x_mem.total_mem_blocks = blks;
+        }
+}
+
+static void
+wl12xx_set_tx_desc_data_len(struct wl1271 *wl, struct wl1271_tx_hw_descr *desc,
+                            struct sk_buff *skb)
+{
+        u32 aligned_len = wlcore_calc_packet_alignment(wl, skb->len);
+
+        if (wl->chip.id == CHIP_ID_1283_PG20) {
+                desc->wl128x_mem.extra_bytes = aligned_len - skb->len;
+                desc->length = cpu_to_le16(aligned_len >> 2);
+
+                wl1271_debug(DEBUG_TX,
+                             "tx_fill_hdr: hlid: %d len: %d life: %d mem: %d extra: %d",
+                             desc->hlid,
+                             le16_to_cpu(desc->length),
+                             le16_to_cpu(desc->life_time),
+                             desc->wl128x_mem.total_mem_blocks,
+                             desc->wl128x_mem.extra_bytes);
+        } else {
+                /* calculate number of padding bytes */
+                int pad = aligned_len - skb->len;
+                desc->tx_attr |=
+                        cpu_to_le16(pad << TX_HW_ATTR_OFST_LAST_WORD_PAD);
+
+                /* Store the aligned length in terms of words */
+                desc->length = cpu_to_le16(aligned_len >> 2);
+
+                wl1271_debug(DEBUG_TX,
+                             "tx_fill_hdr: pad: %d hlid: %d len: %d life: %d mem: %d",
+                             pad, desc->hlid,
+                             le16_to_cpu(desc->length),
+                             le16_to_cpu(desc->life_time),
+                             desc->wl127x_mem.total_mem_blocks);
+        }
+}
+
+static enum wl_rx_buf_align
+wl12xx_get_rx_buf_align(struct wl1271 *wl, u32 rx_desc)
+{
+        if (rx_desc & RX_BUF_UNALIGNED_PAYLOAD)
+                return WLCORE_RX_BUF_UNALIGNED;
+
+        return WLCORE_RX_BUF_ALIGNED;
+}
+
+static u32 wl12xx_get_rx_packet_len(struct wl1271 *wl, void *rx_data,
+                                    u32 data_len)
+{
+        struct wl1271_rx_descriptor *desc = rx_data;
+
+        /* invalid packet */
+        if (data_len < sizeof(*desc) ||
+            data_len < sizeof(*desc) + desc->pad_len)
+                return 0;
+
+        return data_len - sizeof(*desc) - desc->pad_len;
+}
+
+static void wl12xx_tx_delayed_compl(struct wl1271 *wl)
+{
+        if (wl->fw_status->tx_results_counter == (wl->tx_results_count & 0xff))
+                return;
+
+        wl1271_tx_complete(wl);
+}
+
+static int wl12xx_hw_init(struct wl1271 *wl)
+{
+        int ret;
+
+        if (wl->chip.id == CHIP_ID_1283_PG20) {
+                u32 host_cfg_bitmap = HOST_IF_CFG_RX_FIFO_ENABLE;
+
+                ret = wl128x_cmd_general_parms(wl);
+                if (ret < 0)
+                        goto out;
+                ret = wl128x_cmd_radio_parms(wl);
+                if (ret < 0)
+                        goto out;
+
+                if (wl->quirks & WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN)
+                        /* Enable SDIO padding */
+                        host_cfg_bitmap |= HOST_IF_CFG_TX_PAD_TO_SDIO_BLK;
+
+                /* Must be before wl1271_acx_init_mem_config() */
+                ret = wl1271_acx_host_if_cfg_bitmap(wl, host_cfg_bitmap);
+                if (ret < 0)
+                        goto out;
+        } else {
+                ret = wl1271_cmd_general_parms(wl);
+                if (ret < 0)
+                        goto out;
+                ret = wl1271_cmd_radio_parms(wl);
+                if (ret < 0)
+                        goto out;
+                ret = wl1271_cmd_ext_radio_parms(wl);
+                if (ret < 0)
+                        goto out;
+        }
+out:
+        return ret;
+}
+
+static u32 wl12xx_sta_get_ap_rate_mask(struct wl1271 *wl,
+                                       struct wl12xx_vif *wlvif)
+{
+        return wlvif->rate_set;
+}
+
+static int wl12xx_identify_fw(struct wl1271 *wl)
+{
+        unsigned int *fw_ver = wl->chip.fw_ver;
+
+        /* Only new station firmwares support routing fw logs to the host */
+        if ((fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_STA) &&
+            (fw_ver[FW_VER_MINOR] < FW_VER_MINOR_FWLOG_STA_MIN))
+                wl->quirks |= WLCORE_QUIRK_FWLOG_NOT_IMPLEMENTED;
+
+        /* This feature is not yet supported for AP mode */
+        if (fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_AP)
+                wl->quirks |= WLCORE_QUIRK_FWLOG_NOT_IMPLEMENTED;
+
+        return 0;
+}
+
+static void wl12xx_conf_init(struct wl1271 *wl)
+{
+        struct wl12xx_priv *priv = wl->priv;
+
+        /* apply driver default configuration */
+        memcpy(&wl->conf, &wl12xx_conf, sizeof(wl12xx_conf));
+
+        /* apply default private configuration */
+        memcpy(&priv->conf, &wl12xx_default_priv_conf, sizeof(priv->conf));
+}
+
+static bool wl12xx_mac_in_fuse(struct wl1271 *wl)
+{
+        bool supported = false;
+        u8 major, minor;
+
+        if (wl->chip.id == CHIP_ID_1283_PG20) {
+                major = WL128X_PG_GET_MAJOR(wl->hw_pg_ver);
+                minor = WL128X_PG_GET_MINOR(wl->hw_pg_ver);
+
+                /* in wl128x we have the MAC address if the PG is >= (2, 1) */
+                if (major > 2 || (major == 2 && minor >= 1))
+                        supported = true;
+        } else {
+                major = WL127X_PG_GET_MAJOR(wl->hw_pg_ver);
+                minor = WL127X_PG_GET_MINOR(wl->hw_pg_ver);
+
+                /* in wl127x we have the MAC address if the PG is >= (3, 1) */
+                if (major == 3 && minor >= 1)
+                        supported = true;
+        }
+
+        wl1271_debug(DEBUG_PROBE,
+                     "PG Ver major = %d minor = %d, MAC %s present",
+                     major, minor, supported ? "is" : "is not");
+
+        return supported;
+}
+
+static void wl12xx_get_fuse_mac(struct wl1271 *wl)
+{
+        u32 mac1, mac2;
+
+        wlcore_set_partition(wl, &wl->ptable[PART_DRPW]);
+
+        mac1 = wl1271_read32(wl, WL12XX_REG_FUSE_BD_ADDR_1);
+        mac2 = wl1271_read32(wl, WL12XX_REG_FUSE_BD_ADDR_2);
+
+        /* these are the two parts of the BD_ADDR */
+        wl->fuse_oui_addr = ((mac2 & 0xffff) << 8) +
+                ((mac1 & 0xff000000) >> 24);
+        wl->fuse_nic_addr = mac1 & 0xffffff;
+
+        wlcore_set_partition(wl, &wl->ptable[PART_DOWN]);
+}
+
+static s8 wl12xx_get_pg_ver(struct wl1271 *wl)
+{
+        u32 die_info;
+
+        if (wl->chip.id == CHIP_ID_1283_PG20)
+                die_info = wl12xx_top_reg_read(wl, WL128X_REG_FUSE_DATA_2_1);
+        else
+                die_info = wl12xx_top_reg_read(wl, WL127X_REG_FUSE_DATA_2_1);
+
+        return (s8) (die_info & PG_VER_MASK) >> PG_VER_OFFSET;
+}
+
+static void wl12xx_get_mac(struct wl1271 *wl)
+{
+        if (wl12xx_mac_in_fuse(wl))
+                wl12xx_get_fuse_mac(wl);
+}
+
+static struct wlcore_ops wl12xx_ops = {
+        .identify_chip          = wl12xx_identify_chip,
+        .identify_fw            = wl12xx_identify_fw,
+        .boot                   = wl12xx_boot,
+        .trigger_cmd            = wl12xx_trigger_cmd,
+        .ack_event              = wl12xx_ack_event,
+        .calc_tx_blocks         = wl12xx_calc_tx_blocks,
+        .set_tx_desc_blocks     = wl12xx_set_tx_desc_blocks,
+        .set_tx_desc_data_len   = wl12xx_set_tx_desc_data_len,
+        .get_rx_buf_align       = wl12xx_get_rx_buf_align,
+        .get_rx_packet_len      = wl12xx_get_rx_packet_len,
+        .tx_immediate_compl     = NULL,
+        .tx_delayed_compl       = wl12xx_tx_delayed_compl,
+        .hw_init                = wl12xx_hw_init,
+        .init_vif               = NULL,
+        .sta_get_ap_rate_mask   = wl12xx_sta_get_ap_rate_mask,
+        .get_pg_ver             = wl12xx_get_pg_ver,
+        .get_mac                = wl12xx_get_mac,
+};
+
+static struct ieee80211_sta_ht_cap wl12xx_ht_cap = {
+        .cap = IEEE80211_HT_CAP_GRN_FLD | IEEE80211_HT_CAP_SGI_20 |
+               (1 << IEEE80211_HT_CAP_RX_STBC_SHIFT),
+        .ht_supported = true,
+        .ampdu_factor = IEEE80211_HT_MAX_AMPDU_8K,
+        .ampdu_density = IEEE80211_HT_MPDU_DENSITY_8,
+        .mcs = {
+                .rx_mask = { 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
+                .rx_highest = cpu_to_le16(72),
+                .tx_params = IEEE80211_HT_MCS_TX_DEFINED,
+                },
+};
+
+static int __devinit wl12xx_probe(struct platform_device *pdev)
+{
+        struct wl1271 *wl;
+        struct ieee80211_hw *hw;
+        struct wl12xx_priv *priv;
+
+        hw = wlcore_alloc_hw(sizeof(*priv));
+        if (IS_ERR(hw)) {
+                wl1271_error("can't allocate hw");
+                return PTR_ERR(hw);
+        }
+
+        wl = hw->priv;
+        wl->ops = &wl12xx_ops;
+        wl->ptable = wl12xx_ptable;
+        wl->rtable = wl12xx_rtable;
+        wl->num_tx_desc = 16;
+        wl->normal_tx_spare = WL12XX_TX_HW_BLOCK_SPARE_DEFAULT;
+        wl->gem_tx_spare = WL12XX_TX_HW_BLOCK_GEM_SPARE;
+        wl->band_rate_to_idx = wl12xx_band_rate_to_idx;
+        wl->hw_tx_rate_tbl_size = WL12XX_CONF_HW_RXTX_RATE_MAX;
+        wl->hw_min_ht_rate = WL12XX_CONF_HW_RXTX_RATE_MCS0;
+        wl->fw_status_priv_len = 0;
+        memcpy(&wl->ht_cap, &wl12xx_ht_cap, sizeof(wl12xx_ht_cap));
+        wl12xx_conf_init(wl);
+
+        return wlcore_probe(wl, pdev);
+}
+
+static const struct platform_device_id wl12xx_id_table[] __devinitconst = {
+        { "wl12xx", 0 },
+        {  } /* Terminating Entry */
+};
+MODULE_DEVICE_TABLE(platform, wl12xx_id_table);
+
+static struct platform_driver wl12xx_driver = {
+        .probe          = wl12xx_probe,
+        .remove         = __devexit_p(wlcore_remove),
+        .id_table       = wl12xx_id_table,
+        .driver = {
+                .name   = "wl12xx_driver",
+                .owner  = THIS_MODULE,
+        }
+};
+
+static int __init wl12xx_init(void)
+{
+        return platform_driver_register(&wl12xx_driver);
+}
+module_init(wl12xx_init);
+
+static void __exit wl12xx_exit(void)
+{
+        platform_driver_unregister(&wl12xx_driver);
+}
+module_exit(wl12xx_exit);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Luciano Coelho <coelho@ti.com>");
+MODULE_FIRMWARE(WL127X_FW_NAME_SINGLE);
+MODULE_FIRMWARE(WL127X_FW_NAME_MULTI);
+MODULE_FIRMWARE(WL127X_PLT_FW_NAME);
+MODULE_FIRMWARE(WL128X_FW_NAME_SINGLE);
+MODULE_FIRMWARE(WL128X_FW_NAME_MULTI);
+MODULE_FIRMWARE(WL128X_PLT_FW_NAME);
diff --git a/drivers/net/wireless/wl12xx/reg.h b/drivers/net/wireless/ti/wl12xx/reg.h
index 340db324bc26..79ede02e2587 100644
--- a/drivers/net/wireless/wl12xx/reg.h
+++ b/drivers/net/wireless/ti/wl12xx/reg.h
@@ -33,16 +33,8 @@
 #define REGISTERS_DOWN_SIZE 0x00008800
 #define REGISTERS_WORK_SIZE 0x0000b000
 
-#define HW_ACCESS_ELP_CTRL_REG_ADDR         0x1FFFC
 #define FW_STATUS_ADDR                      (0x14FC0 + 0xA000)
 
-/* ELP register commands */
-#define ELPCTRL_WAKE_UP             0x1
-#define ELPCTRL_WAKE_UP_WLAN_READY  0x5
-#define ELPCTRL_SLEEP               0x0
-/* ELP WLAN_READY bit */
-#define ELPCTRL_WLAN_READY          0x2
-
 /*===============================================
    Host Software Reset - 32bit RW
  ------------------------------------------
@@ -57,14 +49,14 @@
     (not self-clearing), the Wlan hardware
     exits the software reset state.
 ===============================================*/
-#define ACX_REG_SLV_SOFT_RESET         (REGISTERS_BASE + 0x0000)
+#define WL12XX_SLV_SOFT_RESET           (REGISTERS_BASE + 0x0000)
 
 #define WL1271_SLV_REG_DATA            (REGISTERS_BASE + 0x0008)
 #define WL1271_SLV_REG_ADATA           (REGISTERS_BASE + 0x000c)
 #define WL1271_SLV_MEM_DATA            (REGISTERS_BASE + 0x0018)
 
-#define ACX_REG_INTERRUPT_TRIG         (REGISTERS_BASE + 0x0474)
-#define ACX_REG_INTERRUPT_TRIG_H       (REGISTERS_BASE + 0x0478)
+#define WL12XX_REG_INTERRUPT_TRIG         (REGISTERS_BASE + 0x0474)
+#define WL12XX_REG_INTERRUPT_TRIG_H       (REGISTERS_BASE + 0x0478)
 
 /*=============================================
   Host Interrupt Mask Register - 32bit (RW)
@@ -94,7 +86,7 @@
  21-                    -
  Default: 0x0001
 *==============================================*/
-#define ACX_REG_INTERRUPT_MASK         (REGISTERS_BASE + 0x04DC)
+#define WL12XX_REG_INTERRUPT_MASK         (REGISTERS_BASE + 0x04DC)
 
 /*=============================================
   Host Interrupt Mask Set 16bit, (Write only)
@@ -125,7 +117,7 @@
  Reading this register doesn't
  effect its content.
 =============================================*/
-#define ACX_REG_INTERRUPT_NO_CLEAR     (REGISTERS_BASE + 0x04E8)
+#define WL12XX_REG_INTERRUPT_NO_CLEAR     (REGISTERS_BASE + 0x04E8)
 
 /*=============================================
   Host Interrupt Status Clear on Read  Register
@@ -148,9 +140,9 @@
  HINT_STS_ND registers, thus making the
  assotiated interrupt inactive. (0-no effect)
 ==============================================*/
-#define ACX_REG_INTERRUPT_ACK          (REGISTERS_BASE + 0x04F0)
+#define WL12XX_REG_INTERRUPT_ACK          (REGISTERS_BASE + 0x04F0)
 
-#define RX_DRIVER_COUNTER_ADDRESS      (REGISTERS_BASE + 0x0538)
+#define WL12XX_REG_RX_DRIVER_COUNTER    (REGISTERS_BASE + 0x0538)
 
 /* Device Configuration registers*/
 #define SOR_CFG                        (REGISTERS_BASE + 0x0800)
@@ -175,9 +167,9 @@
  1 halt eCPU
  0 enable eCPU
  ===============================================*/
-#define ACX_REG_ECPU_CONTROL           (REGISTERS_BASE + 0x0804)
+#define WL12XX_REG_ECPU_CONTROL           (REGISTERS_BASE + 0x0804)
 
-#define HI_CFG                         (REGISTERS_BASE + 0x0808)
+#define WL12XX_HI_CFG                   (REGISTERS_BASE + 0x0808)
 
 /*===============================================
  EEPROM Burst Read Start  - 32bit RW
@@ -196,72 +188,67 @@
 *================================================*/
 #define ACX_REG_EE_START               (REGISTERS_BASE + 0x080C)
 
-#define OCP_POR_CTR                    (REGISTERS_BASE + 0x09B4)
-#define OCP_DATA_WRITE                 (REGISTERS_BASE + 0x09B8)
-#define OCP_DATA_READ                  (REGISTERS_BASE + 0x09BC)
-#define OCP_CMD                        (REGISTERS_BASE + 0x09C0)
-
-#define WL1271_HOST_WR_ACCESS          (REGISTERS_BASE + 0x09F8)
+#define WL12XX_OCP_POR_CTR              (REGISTERS_BASE + 0x09B4)
+#define WL12XX_OCP_DATA_WRITE           (REGISTERS_BASE + 0x09B8)
+#define WL12XX_OCP_DATA_READ            (REGISTERS_BASE + 0x09BC)
+#define WL12XX_OCP_CMD                  (REGISTERS_BASE + 0x09C0)
 
-#define CHIP_ID_B                      (REGISTERS_BASE + 0x5674)
+#define WL12XX_HOST_WR_ACCESS           (REGISTERS_BASE + 0x09F8)
 
-#define CHIP_ID_1271_PG10              (0x4030101)
-#define CHIP_ID_1271_PG20              (0x4030111)
-#define CHIP_ID_1283_PG10              (0x05030101)
-#define CHIP_ID_1283_PG20              (0x05030111)
+#define WL12XX_CHIP_ID_B                (REGISTERS_BASE + 0x5674)
 
-#define ENABLE                         (REGISTERS_BASE + 0x5450)
+#define WL12XX_ENABLE                   (REGISTERS_BASE + 0x5450)
 
 /* Power Management registers */
-#define ELP_CFG_MODE                   (REGISTERS_BASE + 0x5804)
-#define ELP_CMD                        (REGISTERS_BASE + 0x5808)
-#define PLL_CAL_TIME                   (REGISTERS_BASE + 0x5810)
-#define CLK_REQ_TIME                   (REGISTERS_BASE + 0x5814)
-#define CLK_BUF_TIME                   (REGISTERS_BASE + 0x5818)
+#define WL12XX_ELP_CFG_MODE             (REGISTERS_BASE + 0x5804)
+#define WL12XX_ELP_CMD                  (REGISTERS_BASE + 0x5808)
+#define WL12XX_PLL_CAL_TIME             (REGISTERS_BASE + 0x5810)
+#define WL12XX_CLK_REQ_TIME             (REGISTERS_BASE + 0x5814)
+#define WL12XX_CLK_BUF_TIME             (REGISTERS_BASE + 0x5818)
 
-#define CFG_PLL_SYNC_CNT               (REGISTERS_BASE + 0x5820)
+#define WL12XX_CFG_PLL_SYNC_CNT         (REGISTERS_BASE + 0x5820)
 
 /* Scratch Pad registers*/
-#define SCR_PAD0                       (REGISTERS_BASE + 0x5608)
-#define SCR_PAD1                       (REGISTERS_BASE + 0x560C)
-#define SCR_PAD2                       (REGISTERS_BASE + 0x5610)
-#define SCR_PAD3                       (REGISTERS_BASE + 0x5614)
-#define SCR_PAD4                       (REGISTERS_BASE + 0x5618)
-#define SCR_PAD4_SET                   (REGISTERS_BASE + 0x561C)
-#define SCR_PAD4_CLR                   (REGISTERS_BASE + 0x5620)
-#define SCR_PAD5                       (REGISTERS_BASE + 0x5624)
-#define SCR_PAD5_SET                   (REGISTERS_BASE + 0x5628)
-#define SCR_PAD5_CLR                   (REGISTERS_BASE + 0x562C)
-#define SCR_PAD6                       (REGISTERS_BASE + 0x5630)
-#define SCR_PAD7                       (REGISTERS_BASE + 0x5634)
-#define SCR_PAD8                       (REGISTERS_BASE + 0x5638)
-#define SCR_PAD9                       (REGISTERS_BASE + 0x563C)
+#define WL12XX_SCR_PAD0                 (REGISTERS_BASE + 0x5608)
+#define WL12XX_SCR_PAD1                 (REGISTERS_BASE + 0x560C)
+#define WL12XX_SCR_PAD2                 (REGISTERS_BASE + 0x5610)
+#define WL12XX_SCR_PAD3                 (REGISTERS_BASE + 0x5614)
+#define WL12XX_SCR_PAD4                 (REGISTERS_BASE + 0x5618)
+#define WL12XX_SCR_PAD4_SET             (REGISTERS_BASE + 0x561C)
+#define WL12XX_SCR_PAD4_CLR             (REGISTERS_BASE + 0x5620)
+#define WL12XX_SCR_PAD5                 (REGISTERS_BASE + 0x5624)
+#define WL12XX_SCR_PAD5_SET             (REGISTERS_BASE + 0x5628)
+#define WL12XX_SCR_PAD5_CLR             (REGISTERS_BASE + 0x562C)
+#define WL12XX_SCR_PAD6                 (REGISTERS_BASE + 0x5630)
+#define WL12XX_SCR_PAD7                 (REGISTERS_BASE + 0x5634)
+#define WL12XX_SCR_PAD8                 (REGISTERS_BASE + 0x5638)
+#define WL12XX_SCR_PAD9                 (REGISTERS_BASE + 0x563C)
 
 /* Spare registers*/
-#define SPARE_A1                       (REGISTERS_BASE + 0x0994)
-#define SPARE_A2                       (REGISTERS_BASE + 0x0998)
-#define SPARE_A3                       (REGISTERS_BASE + 0x099C)
-#define SPARE_A4                       (REGISTERS_BASE + 0x09A0)
-#define SPARE_A5                       (REGISTERS_BASE + 0x09A4)
-#define SPARE_A6                       (REGISTERS_BASE + 0x09A8)
-#define SPARE_A7                       (REGISTERS_BASE + 0x09AC)
-#define SPARE_A8                       (REGISTERS_BASE + 0x09B0)
-#define SPARE_B1                       (REGISTERS_BASE + 0x5420)
-#define SPARE_B2                       (REGISTERS_BASE + 0x5424)
-#define SPARE_B3                       (REGISTERS_BASE + 0x5428)
-#define SPARE_B4                       (REGISTERS_BASE + 0x542C)
-#define SPARE_B5                       (REGISTERS_BASE + 0x5430)
-#define SPARE_B6                       (REGISTERS_BASE + 0x5434)
-#define SPARE_B7                       (REGISTERS_BASE + 0x5438)
-#define SPARE_B8                       (REGISTERS_BASE + 0x543C)
-
-#define PLL_PARAMETERS                 (REGISTERS_BASE + 0x6040)
-#define WU_COUNTER_PAUSE               (REGISTERS_BASE + 0x6008)
-#define WELP_ARM_COMMAND               (REGISTERS_BASE + 0x6100)
-#define DRPW_SCRATCH_START             (DRPW_BASE + 0x002C)
-
-
-#define ACX_SLV_SOFT_RESET_BIT   BIT(1)
+#define WL12XX_SPARE_A1                 (REGISTERS_BASE + 0x0994)
+#define WL12XX_SPARE_A2                 (REGISTERS_BASE + 0x0998)
+#define WL12XX_SPARE_A3                 (REGISTERS_BASE + 0x099C)
+#define WL12XX_SPARE_A4                 (REGISTERS_BASE + 0x09A0)
+#define WL12XX_SPARE_A5                 (REGISTERS_BASE + 0x09A4)
+#define WL12XX_SPARE_A6                 (REGISTERS_BASE + 0x09A8)
+#define WL12XX_SPARE_A7                 (REGISTERS_BASE + 0x09AC)
+#define WL12XX_SPARE_A8                 (REGISTERS_BASE + 0x09B0)
+#define WL12XX_SPARE_B1                 (REGISTERS_BASE + 0x5420)
+#define WL12XX_SPARE_B2                 (REGISTERS_BASE + 0x5424)
+#define WL12XX_SPARE_B3                 (REGISTERS_BASE + 0x5428)
+#define WL12XX_SPARE_B4                 (REGISTERS_BASE + 0x542C)
+#define WL12XX_SPARE_B5                 (REGISTERS_BASE + 0x5430)
+#define WL12XX_SPARE_B6                 (REGISTERS_BASE + 0x5434)
+#define WL12XX_SPARE_B7                 (REGISTERS_BASE + 0x5438)
+#define WL12XX_SPARE_B8                 (REGISTERS_BASE + 0x543C)
+
+#define WL12XX_PLL_PARAMETERS           (REGISTERS_BASE + 0x6040)
+#define WL12XX_WU_COUNTER_PAUSE         (REGISTERS_BASE + 0x6008)
+#define WL12XX_WELP_ARM_COMMAND         (REGISTERS_BASE + 0x6100)
+#define WL12XX_DRPW_SCRATCH_START       (DRPW_BASE + 0x002C)
+
+#define WL12XX_CMD_MBOX_ADDRESS         0x407B4
+
 #define ACX_REG_EEPROM_START_BIT BIT(1)
 
 /* Command/Information Mailbox Pointers */
@@ -279,7 +266,7 @@
  the host receives the Init Complete interrupt from
  the Wlan hardware.
  ===============================================*/
-#define REG_COMMAND_MAILBOX_PTR                         (SCR_PAD0)
+#define WL12XX_REG_COMMAND_MAILBOX_PTR          (WL12XX_SCR_PAD0)
 
 /*===============================================
   Information Mailbox Pointer - 32bit RW
@@ -294,7 +281,7 @@
  until after the host receives the Init Complete interrupt from
  the Wlan hardware.
  ===============================================*/
-#define REG_EVENT_MAILBOX_PTR                           (SCR_PAD1)
+#define WL12XX_REG_EVENT_MAILBOX_PTR            (WL12XX_SCR_PAD1)
 
 /*===============================================
  EEPROM Read/Write Request 32bit RW
@@ -365,26 +352,6 @@
 #define ACX_CONT_WIND_MIN_MASK   0x0000007f
 #define ACX_CONT_WIND_MAX        0x03ff0000
 
-/*===============================================
-  HI_CFG Interface Configuration Register Values
-  ------------------------------------------
-  ===============================================*/
-#define HI_CFG_UART_ENABLE          0x00000004
-#define HI_CFG_RST232_ENABLE        0x00000008
-#define HI_CFG_CLOCK_REQ_SELECT     0x00000010
-#define HI_CFG_HOST_INT_ENABLE      0x00000020
-#define HI_CFG_VLYNQ_OUTPUT_ENABLE  0x00000040
-#define HI_CFG_HOST_INT_ACTIVE_LOW  0x00000080
-#define HI_CFG_UART_TX_OUT_GPIO_15  0x00000100
-#define HI_CFG_UART_TX_OUT_GPIO_14  0x00000200
-#define HI_CFG_UART_TX_OUT_GPIO_7   0x00000400
-
-#define HI_CFG_DEF_VAL              \
-        (HI_CFG_UART_ENABLE |        \
-        HI_CFG_RST232_ENABLE |      \
-        HI_CFG_CLOCK_REQ_SELECT |   \
-        HI_CFG_HOST_INT_ENABLE)
-
 #define REF_FREQ_19_2                       0
 #define REF_FREQ_26_0                       1
 #define REF_FREQ_38_4                       2
@@ -400,38 +367,19 @@
 #define LUT_PARAM_BB_PLL_LOOP_FILTER        5
 #define LUT_PARAM_NUM                       6
 
-#define ACX_EEPROMLESS_IND_REG              (SCR_PAD4)
+#define WL12XX_EEPROMLESS_IND           (WL12XX_SCR_PAD4)
 #define USE_EEPROM                          0
-#define SOFT_RESET_MAX_TIME                 1000000
-#define SOFT_RESET_STALL_TIME               1000
 #define NVS_DATA_BUNDARY_ALIGNMENT          4
 
-
-/* Firmware image load chunk size */
-#define CHUNK_SIZE      16384
-
 /* Firmware image header size */
 #define FW_HDR_SIZE 8
 
-#define ECPU_CONTROL_HALT                                       0x00000101
-
-
 /******************************************************************************
 
     CHANNELS, BAND & REG DOMAINS definitions
 
 ******************************************************************************/
 
-
-enum {
-        RADIO_BAND_2_4GHZ = 0,  /* 2.4 Ghz band */
-        RADIO_BAND_5GHZ = 1,    /* 5 Ghz band */
-        RADIO_BAND_JAPAN_4_9_GHZ = 2,
-        DEFAULT_BAND = RADIO_BAND_2_4GHZ,
-        INVALID_BAND = 0xFE,
-        MAX_RADIO_BANDS = 0xFF
-};
-
 #define SHORT_PREAMBLE_BIT   BIT(0) /* CCK or Barker depending on the rate */
 #define OFDM_RATE_BIT        BIT(6)
 #define PBCC_RATE_BIT        BIT(7)
@@ -465,14 +413,82 @@ b12-b0 - Supported Rate indicator bits as defined below.
 
 ******************************************************************************/
 
+#define OCP_CMD_LOOP            32
+#define OCP_CMD_WRITE           0x1
+#define OCP_CMD_READ            0x2
+#define OCP_READY_MASK          BIT(18)
+#define OCP_STATUS_MASK         (BIT(16) | BIT(17))
+#define OCP_STATUS_NO_RESP      0x00000
+#define OCP_STATUS_OK           0x10000
+#define OCP_STATUS_REQ_FAILED   0x20000
+#define OCP_STATUS_RESP_ERROR   0x30000
+
+#define OCP_REG_POLARITY     0x0064
+#define OCP_REG_CLK_TYPE     0x0448
+#define OCP_REG_CLK_POLARITY 0x0cb2
+#define OCP_REG_CLK_PULL     0x0cb4
+
+#define POLARITY_LOW         BIT(1)
+#define NO_PULL              (BIT(14) | BIT(15))
+
+#define FREF_CLK_TYPE_BITS     0xfffffe7f
+#define CLK_REQ_PRCM           0x100
+#define FREF_CLK_POLARITY_BITS 0xfffff8ff
+#define CLK_REQ_OUTN_SEL       0x700
+
+#define WU_COUNTER_PAUSE_VAL 0x3FF
+
+/* PLL configuration algorithm for wl128x */
+#define SYS_CLK_CFG_REG              0x2200
+/* Bit[0]   -  0-TCXO,  1-FREF */
+#define MCS_PLL_CLK_SEL_FREF         BIT(0)
+/* Bit[3:2] - 01-TCXO, 10-FREF */
+#define WL_CLK_REQ_TYPE_FREF         BIT(3)
+#define WL_CLK_REQ_TYPE_PG2          (BIT(3) | BIT(2))
+/* Bit[4]   -  0-TCXO,  1-FREF */
+#define PRCM_CM_EN_MUX_WLAN_FREF     BIT(4)
+
+#define TCXO_ILOAD_INT_REG           0x2264
+#define TCXO_CLK_DETECT_REG          0x2266
+
+#define TCXO_DET_FAILED              BIT(4)
+
+#define FREF_ILOAD_INT_REG           0x2084
+#define FREF_CLK_DETECT_REG          0x2086
+#define FREF_CLK_DETECT_FAIL         BIT(4)
+
+/* Use this reg for masking during driver access */
+#define WL_SPARE_REG                 0x2320
+#define WL_SPARE_VAL                 BIT(2)
+/* Bit[6:5:3] -  mask wl write SYS_CLK_CFG[8:5:2:4] */
+#define WL_SPARE_MASK_8526           (BIT(6) | BIT(5) | BIT(3))
+
+#define PLL_LOCK_COUNTERS_REG        0xD8C
+#define PLL_LOCK_COUNTERS_COEX       0x0F
+#define PLL_LOCK_COUNTERS_MCS        0xF0
+#define MCS_PLL_OVERRIDE_REG         0xD90
+#define MCS_PLL_CONFIG_REG           0xD92
+#define MCS_SEL_IN_FREQ_MASK         0x0070
+#define MCS_SEL_IN_FREQ_SHIFT        4
+#define MCS_PLL_CONFIG_REG_VAL       0x73
+#define MCS_PLL_ENABLE_HP            (BIT(0) | BIT(1))
+
+#define MCS_PLL_M_REG                0xD94
+#define MCS_PLL_N_REG                0xD96
+#define MCS_PLL_M_REG_VAL            0xC8
+#define MCS_PLL_N_REG_VAL            0x07
+
+#define SDIO_IO_DS                   0xd14
+
+/* SDIO/wSPI DS configuration values */
+enum {
+        HCI_IO_DS_8MA = 0,
+        HCI_IO_DS_4MA = 1, /* default */
+        HCI_IO_DS_6MA = 2,
+        HCI_IO_DS_2MA = 3,
+};
 
-/*************************************************************************
-
-    Interrupt Trigger Register (Host -> WiLink)
-
-**************************************************************************/
-
-/* Hardware to Embedded CPU Interrupts - first 32-bit register set */
+/* end PLL configuration algorithm for wl128x */
 
 /*
  * Host Command Interrupt. Setting this bit masks
@@ -480,7 +496,7 @@ b12-b0 - Supported Rate indicator bits as defined below.
  * the FW that it has sent a command
  * to the Wlan hardware Command Mailbox.
  */
-#define INTR_TRIG_CMD       BIT(0)
+#define WL12XX_INTR_TRIG_CMD            BIT(0)
 
 /*
  * Host Event Acknowlegde Interrupt. The host
@@ -488,42 +504,27 @@ b12-b0 - Supported Rate indicator bits as defined below.
  * the unsolicited information from the event
  * mailbox.
  */
-#define INTR_TRIG_EVENT_ACK BIT(1)
-
-/*
- * The host sets this bit to inform the Wlan
- * FW that a TX packet is in the XFER
- * Buffer #0.
- */
-#define INTR_TRIG_TX_PROC0 BIT(2)
-
-/*
- * The host sets this bit to inform the FW
- * that it read a packet from RX XFER
- * Buffer #0.
- */
-#define INTR_TRIG_RX_PROC0 BIT(3)
-
-#define INTR_TRIG_DEBUG_ACK BIT(4)
+#define WL12XX_INTR_TRIG_EVENT_ACK      BIT(1)
 
-#define INTR_TRIG_STATE_CHANGED BIT(5)
-
-
-/* Hardware to Embedded CPU Interrupts - second 32-bit register set */
-
-/*
- * The host sets this bit to inform the FW
- * that it read a packet from RX XFER
- * Buffer #1.
- */
-#define INTR_TRIG_RX_PROC1 BIT(17)
+/*===============================================
+  HI_CFG Interface Configuration Register Values
+  ------------------------------------------
+  ===============================================*/
+#define HI_CFG_UART_ENABLE          0x00000004
+#define HI_CFG_RST232_ENABLE        0x00000008
+#define HI_CFG_CLOCK_REQ_SELECT     0x00000010
+#define HI_CFG_HOST_INT_ENABLE      0x00000020
+#define HI_CFG_VLYNQ_OUTPUT_ENABLE  0x00000040
+#define HI_CFG_HOST_INT_ACTIVE_LOW  0x00000080
+#define HI_CFG_UART_TX_OUT_GPIO_15  0x00000100
+#define HI_CFG_UART_TX_OUT_GPIO_14  0x00000200
+#define HI_CFG_UART_TX_OUT_GPIO_7   0x00000400
 
-/*
- * The host sets this bit to inform the Wlan
- * hardware that a TX packet is in the XFER
- * Buffer #1.
- */
-#define INTR_TRIG_TX_PROC1 BIT(18)
+#define HI_CFG_DEF_VAL              \
+        (HI_CFG_UART_ENABLE |        \
+        HI_CFG_RST232_ENABLE |      \
+        HI_CFG_CLOCK_REQ_SELECT |   \
+        HI_CFG_HOST_INT_ENABLE)
 
 #define WL127X_REG_FUSE_DATA_2_1        0x050a
 #define WL128X_REG_FUSE_DATA_2_1        0x2152
diff --git a/drivers/net/wireless/ti/wl12xx/wl12xx.h b/drivers/net/wireless/ti/wl12xx/wl12xx.h
new file mode 100644
index 000000000000..74cd332e23ef
--- /dev/null
+++ b/drivers/net/wireless/ti/wl12xx/wl12xx.h
@@ -0,0 +1,31 @@
+/*
+ * This file is part of wl12xx
+ *
+ * Copyright (C) 2011 Texas Instruments Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __WL12XX_PRIV_H__
+#define __WL12XX_PRIV_H__
+
+#include "conf.h"
+
+struct wl12xx_priv {
+        struct wl12xx_priv_conf conf;
+};
+
+#endif /* __WL12XX_PRIV_H__ */
diff --git a/drivers/net/wireless/ti/wlcore/Kconfig b/drivers/net/wireless/ti/wlcore/Kconfig
new file mode 100644
index 000000000000..9d04c38938bc
--- /dev/null
+++ b/drivers/net/wireless/ti/wlcore/Kconfig
@@ -0,0 +1,41 @@
+config WLCORE
+        tristate "TI wlcore support"
+        depends on WL_TI && GENERIC_HARDIRQS
+        depends on INET
+        select FW_LOADER
+        ---help---
+          This module contains the main code for TI WLAN chips.  It abstracts
+          hardware-specific differences among different chipset families.
+          Each chipset family needs to implement its own lower-level module
+          that will depend on this module for the common code.
+
+          If you choose to build a module, it will be called wlcore. Say N if
+          unsure.
+
+config WLCORE_SPI
+        tristate "TI wlcore SPI support"
+        depends on WLCORE && SPI_MASTER
+        select CRC7
+        ---help---
+          This module adds support for the SPI interface of adapters using
+          TI WLAN chipsets.  Select this if your platform is using
+          the SPI bus.
+
+          If you choose to build a module, it'll be called wlcore_spi.
+          Say N if unsure.
+
+config WLCORE_SDIO
+        tristate "TI wlcore SDIO support"
+        depends on WLCORE && MMC
+        ---help---
+          This module adds support for the SDIO interface of adapters using
+          TI WLAN chipsets.  Select this if your platform is using
+          the SDIO bus.
+
+          If you choose to build a module, it'll be called wlcore_sdio.
+          Say N if unsure.
+
+config WL12XX_PLATFORM_DATA
+        bool
+        depends on WLCORE_SDIO != n || WL1251_SDIO != n
+        default y
diff --git a/drivers/net/wireless/ti/wlcore/Makefile b/drivers/net/wireless/ti/wlcore/Makefile
new file mode 100644
index 000000000000..d9fba9e32130
--- /dev/null
+++ b/drivers/net/wireless/ti/wlcore/Makefile
@@ -0,0 +1,15 @@
+wlcore-objs             = main.o cmd.o io.o event.o tx.o rx.o ps.o acx.o \
+                          boot.o init.o debugfs.o scan.o
+
+wlcore_spi-objs         = spi.o
+wlcore_sdio-objs        = sdio.o
+
+wlcore-$(CONFIG_NL80211_TESTMODE)       += testmode.o
+obj-$(CONFIG_WLCORE)                    += wlcore.o
+obj-$(CONFIG_WLCORE_SPI)                += wlcore_spi.o
+obj-$(CONFIG_WLCORE_SDIO)               += wlcore_sdio.o
+
+# small builtin driver bit
+obj-$(CONFIG_WL12XX_PLATFORM_DATA)      += wl12xx_platform_data.o
+
+ccflags-y += -D__CHECK_ENDIAN__
diff --git a/drivers/net/wireless/wl12xx/acx.c b/drivers/net/wireless/ti/wlcore/acx.c
index bc96db0683a5..5912541a925e 100644
--- a/drivers/net/wireless/wl12xx/acx.c
+++ b/drivers/net/wireless/ti/wlcore/acx.c
@@ -28,11 +28,11 @@
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
 
-#include "wl12xx.h"
+#include "wlcore.h"
 #include "debug.h"
 #include "wl12xx_80211.h"
-#include "reg.h"
 #include "ps.h"
+#include "hw_ops.h"
 
 int wl1271_acx_wake_up_conditions(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                                   u8 wake_up_event, u8 listen_interval)
@@ -757,7 +757,10 @@ int wl1271_acx_sta_rate_policies(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 
         /* configure one AP supported rate class */
         acx->rate_policy_idx = cpu_to_le32(wlvif->sta.ap_rate_idx);
-        acx->rate_policy.enabled_rates = cpu_to_le32(wlvif->rate_set);
+
+        /* the AP policy is HW specific */
+        acx->rate_policy.enabled_rates =
+                cpu_to_le32(wlcore_hw_sta_get_ap_rate_mask(wl, wlvif));
         acx->rate_policy.short_retry_limit = c->short_retry_limit;
         acx->rate_policy.long_retry_limit = c->long_retry_limit;
         acx->rate_policy.aflags = c->aflags;
@@ -969,17 +972,14 @@ int wl12xx_acx_mem_cfg(struct wl1271 *wl)
                 goto out;
         }
 
-        if (wl->chip.id == CHIP_ID_1283_PG20)
-                mem = &wl->conf.mem_wl128x;
-        else
-                mem = &wl->conf.mem_wl127x;
+        mem = &wl->conf.mem;
 
         /* memory config */
         mem_conf->num_stations = mem->num_stations;
         mem_conf->rx_mem_block_num = mem->rx_block_num;
         mem_conf->tx_min_mem_block_num = mem->tx_min_block_num;
         mem_conf->num_ssid_profiles = mem->ssid_profiles;
-        mem_conf->total_tx_descriptors = cpu_to_le32(ACX_TX_DESCRIPTORS);
+        mem_conf->total_tx_descriptors = cpu_to_le32(wl->num_tx_desc);
         mem_conf->dyn_mem_enable = mem->dynamic_memory;
         mem_conf->tx_free_req = mem->min_req_tx_blocks;
         mem_conf->rx_free_req = mem->min_req_rx_blocks;
@@ -998,32 +998,6 @@ out:
         return ret;
 }
 
-int wl1271_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap)
-{
-        struct wl1271_acx_host_config_bitmap *bitmap_conf;
-        int ret;
-
-        bitmap_conf = kzalloc(sizeof(*bitmap_conf), GFP_KERNEL);
-        if (!bitmap_conf) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        bitmap_conf->host_cfg_bitmap = cpu_to_le32(host_cfg_bitmap);
-
-        ret = wl1271_cmd_configure(wl, ACX_HOST_IF_CFG_BITMAP,
-                                   bitmap_conf, sizeof(*bitmap_conf));
-        if (ret < 0) {
-                wl1271_warning("wl1271 bitmap config opt failed: %d", ret);
-                goto out;
-        }
-
-out:
-        kfree(bitmap_conf);
-
-        return ret;
-}
-
 int wl1271_acx_init_mem_config(struct wl1271 *wl)
 {
         int ret;
diff --git a/drivers/net/wireless/wl12xx/acx.h b/drivers/net/wireless/ti/wlcore/acx.h
index a28fc044034c..b2f88831b7a9 100644
--- a/drivers/net/wireless/wl12xx/acx.h
+++ b/drivers/net/wireless/ti/wlcore/acx.h
@@ -25,7 +25,7 @@
 #ifndef __ACX_H__
 #define __ACX_H__
 
-#include "wl12xx.h"
+#include "wlcore.h"
 #include "cmd.h"
 
 /*************************************************************************
@@ -824,16 +824,11 @@ struct wl1271_acx_keep_alive_config {
         __le32 period;
 } __packed;
 
+/* TODO: maybe this needs to be moved somewhere else? */
 #define HOST_IF_CFG_RX_FIFO_ENABLE     BIT(0)
 #define HOST_IF_CFG_TX_EXTRA_BLKS_SWAP BIT(1)
 #define HOST_IF_CFG_TX_PAD_TO_SDIO_BLK BIT(3)
 
-struct wl1271_acx_host_config_bitmap {
-        struct acx_header header;
-
-        __le32 host_cfg_bitmap;
-} __packed;
-
 enum {
         WL1271_ACX_TRIG_TYPE_LEVEL = 0,
         WL1271_ACX_TRIG_TYPE_EDGE,
@@ -1274,7 +1269,6 @@ int wl1271_acx_frag_threshold(struct wl1271 *wl, u32 frag_threshold);
 int wl1271_acx_tx_config_options(struct wl1271 *wl);
 int wl12xx_acx_mem_cfg(struct wl1271 *wl);
 int wl1271_acx_init_mem_config(struct wl1271 *wl);
-int wl1271_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap);
 int wl1271_acx_init_rx_interrupt(struct wl1271 *wl);
 int wl1271_acx_smart_reflex(struct wl1271 *wl);
 int wl1271_acx_bet_enable(struct wl1271 *wl, struct wl12xx_vif *wlvif,
diff --git a/drivers/net/wireless/ti/wlcore/boot.c b/drivers/net/wireless/ti/wlcore/boot.c
new file mode 100644
index 000000000000..3a2207db5405
--- /dev/null
+++ b/drivers/net/wireless/ti/wlcore/boot.c
@@ -0,0 +1,443 @@
+/*
+ * This file is part of wl1271
+ *
+ * Copyright (C) 2008-2010 Nokia Corporation
+ *
+ * Contact: Luciano Coelho <luciano.coelho@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include <linux/slab.h>
+#include <linux/wl12xx.h>
+#include <linux/export.h>
+
+#include "debug.h"
+#include "acx.h"
+#include "boot.h"
+#include "io.h"
+#include "event.h"
+#include "rx.h"
+#include "hw_ops.h"
+
+static void wl1271_boot_set_ecpu_ctrl(struct wl1271 *wl, u32 flag)
+{
+        u32 cpu_ctrl;
+
+        /* 10.5.0 run the firmware (I) */
+        cpu_ctrl = wlcore_read_reg(wl, REG_ECPU_CONTROL);
+
+        /* 10.5.1 run the firmware (II) */
+        cpu_ctrl |= flag;
+        wlcore_write_reg(wl, REG_ECPU_CONTROL, cpu_ctrl);
+}
+
+static int wlcore_parse_fw_ver(struct wl1271 *wl)
+{
+        int ret;
+
+        ret = sscanf(wl->chip.fw_ver_str + 4, "%u.%u.%u.%u.%u",
+                     &wl->chip.fw_ver[0], &wl->chip.fw_ver[1],
+                     &wl->chip.fw_ver[2], &wl->chip.fw_ver[3],
+                     &wl->chip.fw_ver[4]);
+
+        if (ret != 5) {
+                wl1271_warning("fw version incorrect value");
+                memset(wl->chip.fw_ver, 0, sizeof(wl->chip.fw_ver));
+                return -EINVAL;
+        }
+
+        ret = wlcore_identify_fw(wl);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+static int wlcore_boot_fw_version(struct wl1271 *wl)
+{
+        struct wl1271_static_data *static_data;
+        int ret;
+
+        static_data = kmalloc(sizeof(*static_data), GFP_DMA);
+        if (!static_data) {
+                wl1271_error("Couldn't allocate memory for static data!");
+                return -ENOMEM;
+        }
+
+        wl1271_read(wl, wl->cmd_box_addr, static_data, sizeof(*static_data),
+                    false);
+
+        strncpy(wl->chip.fw_ver_str, static_data->fw_version,
+                sizeof(wl->chip.fw_ver_str));
+
+        kfree(static_data);
+
+        /* make sure the string is NULL-terminated */
+        wl->chip.fw_ver_str[sizeof(wl->chip.fw_ver_str) - 1] = '\0';
+
+        ret = wlcore_parse_fw_ver(wl);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
+                                             size_t fw_data_len, u32 dest)
+{
+        struct wlcore_partition_set partition;
+        int addr, chunk_num, partition_limit;
+        u8 *p, *chunk;
+
+        /* whal_FwCtrl_LoadFwImageSm() */
+
+        wl1271_debug(DEBUG_BOOT, "starting firmware upload");
+
+        wl1271_debug(DEBUG_BOOT, "fw_data_len %zd chunk_size %d",
+                     fw_data_len, CHUNK_SIZE);
+
+        if ((fw_data_len % 4) != 0) {
+                wl1271_error("firmware length not multiple of four");
+                return -EIO;
+        }
+
+        chunk = kmalloc(CHUNK_SIZE, GFP_KERNEL);
+        if (!chunk) {
+                wl1271_error("allocation for firmware upload chunk failed");
+                return -ENOMEM;
+        }
+
+        memcpy(&partition, &wl->ptable[PART_DOWN], sizeof(partition));
+        partition.mem.start = dest;
+        wlcore_set_partition(wl, &partition);
+
+        /* 10.1 set partition limit and chunk num */
+        chunk_num = 0;
+        partition_limit = wl->ptable[PART_DOWN].mem.size;
+
+        while (chunk_num < fw_data_len / CHUNK_SIZE) {
+                /* 10.2 update partition, if needed */
+                addr = dest + (chunk_num + 2) * CHUNK_SIZE;
+                if (addr > partition_limit) {
+                        addr = dest + chunk_num * CHUNK_SIZE;
+                        partition_limit = chunk_num * CHUNK_SIZE +
+                                wl->ptable[PART_DOWN].mem.size;
+                        partition.mem.start = addr;
+                        wlcore_set_partition(wl, &partition);
+                }
+
+                /* 10.3 upload the chunk */
+                addr = dest + chunk_num * CHUNK_SIZE;
+                p = buf + chunk_num * CHUNK_SIZE;
+                memcpy(chunk, p, CHUNK_SIZE);
+                wl1271_debug(DEBUG_BOOT, "uploading fw chunk 0x%p to 0x%x",
+                             p, addr);
+                wl1271_write(wl, addr, chunk, CHUNK_SIZE, false);
+
+                chunk_num++;
+        }
+
+        /* 10.4 upload the last chunk */
+        addr = dest + chunk_num * CHUNK_SIZE;
+        p = buf + chunk_num * CHUNK_SIZE;
+        memcpy(chunk, p, fw_data_len % CHUNK_SIZE);
+        wl1271_debug(DEBUG_BOOT, "uploading fw last chunk (%zd B) 0x%p to 0x%x",
+                     fw_data_len % CHUNK_SIZE, p, addr);
+        wl1271_write(wl, addr, chunk, fw_data_len % CHUNK_SIZE, false);
+
+        kfree(chunk);
+        return 0;
+}
+
+int wlcore_boot_upload_firmware(struct wl1271 *wl)
+{
+        u32 chunks, addr, len;
+        int ret = 0;
+        u8 *fw;
+
+        fw = wl->fw;
+        chunks = be32_to_cpup((__be32 *) fw);
+        fw += sizeof(u32);
+
+        wl1271_debug(DEBUG_BOOT, "firmware chunks to be uploaded: %u", chunks);
+
+        while (chunks--) {
+                addr = be32_to_cpup((__be32 *) fw);
+                fw += sizeof(u32);
+                len = be32_to_cpup((__be32 *) fw);
+                fw += sizeof(u32);
+
+                if (len > 300000) {
+                        wl1271_info("firmware chunk too long: %u", len);
+                        return -EINVAL;
+                }
+                wl1271_debug(DEBUG_BOOT, "chunk %d addr 0x%x len %u",
+                             chunks, addr, len);
+                ret = wl1271_boot_upload_firmware_chunk(wl, fw, len, addr);
+                if (ret != 0)
+                        break;
+                fw += len;
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(wlcore_boot_upload_firmware);
+
+int wlcore_boot_upload_nvs(struct wl1271 *wl)
+{
+        size_t nvs_len, burst_len;
+        int i;
+        u32 dest_addr, val;
+        u8 *nvs_ptr, *nvs_aligned;
+
+        if (wl->nvs == NULL)
+                return -ENODEV;
+
+        if (wl->quirks & WLCORE_QUIRK_LEGACY_NVS) {
+                struct wl1271_nvs_file *nvs =
+                        (struct wl1271_nvs_file *)wl->nvs;
+                /*
+                 * FIXME: the LEGACY NVS image support (NVS's missing the 5GHz
+                 * band configurations) can be removed when those NVS files stop
+                 * floating around.
+                 */
+                if (wl->nvs_len == sizeof(struct wl1271_nvs_file) ||
+                    wl->nvs_len == WL1271_INI_LEGACY_NVS_FILE_SIZE) {
+                        if (nvs->general_params.dual_mode_select)
+                                wl->enable_11a = true;
+                }
+
+                if (wl->nvs_len != sizeof(struct wl1271_nvs_file) &&
+                    (wl->nvs_len != WL1271_INI_LEGACY_NVS_FILE_SIZE ||
+                     wl->enable_11a)) {
+                        wl1271_error("nvs size is not as expected: %zu != %zu",
+                                wl->nvs_len, sizeof(struct wl1271_nvs_file));
+                        kfree(wl->nvs);
+                        wl->nvs = NULL;
+                        wl->nvs_len = 0;
+                        return -EILSEQ;
+                }
+
+                /* only the first part of the NVS needs to be uploaded */
+                nvs_len = sizeof(nvs->nvs);
+                nvs_ptr = (u8 *) nvs->nvs;
+        } else {
+                struct wl128x_nvs_file *nvs = (struct wl128x_nvs_file *)wl->nvs;
+
+                if (wl->nvs_len == sizeof(struct wl128x_nvs_file)) {
+                        if (nvs->general_params.dual_mode_select)
+                                wl->enable_11a = true;
+                } else {
+                        wl1271_error("nvs size is not as expected: %zu != %zu",
+                                     wl->nvs_len,
+                                     sizeof(struct wl128x_nvs_file));
+                        kfree(wl->nvs);
+                        wl->nvs = NULL;
+                        wl->nvs_len = 0;
+                        return -EILSEQ;
+                }
+
+                /* only the first part of the NVS needs to be uploaded */
+                nvs_len = sizeof(nvs->nvs);
+                nvs_ptr = (u8 *)nvs->nvs;
+        }
+
+        /* update current MAC address to NVS */
+        nvs_ptr[11] = wl->addresses[0].addr[0];
+        nvs_ptr[10] = wl->addresses[0].addr[1];
+        nvs_ptr[6] = wl->addresses[0].addr[2];
+        nvs_ptr[5] = wl->addresses[0].addr[3];
+        nvs_ptr[4] = wl->addresses[0].addr[4];
+        nvs_ptr[3] = wl->addresses[0].addr[5];
+
+        /*
+         * Layout before the actual NVS tables:
+         * 1 byte : burst length.
+         * 2 bytes: destination address.
+         * n bytes: data to burst copy.
+         *
+         * This is ended by a 0 length, then the NVS tables.
+         */
+
+        /* FIXME: Do we need to check here whether the LSB is 1? */
+        while (nvs_ptr[0]) {
+                burst_len = nvs_ptr[0];
+                dest_addr = (nvs_ptr[1] & 0xfe) | ((u32)(nvs_ptr[2] << 8));
+
+                /*
+                 * Due to our new wl1271_translate_reg_addr function,
+                 * we need to add the register partition start address
+                 * to the destination
+                 */
+                dest_addr += wl->curr_part.reg.start;
+
+                /* We move our pointer to the data */
+                nvs_ptr += 3;
+
+                for (i = 0; i < burst_len; i++) {
+                        if (nvs_ptr + 3 >= (u8 *) wl->nvs + nvs_len)
+                                goto out_badnvs;
+
+                        val = (nvs_ptr[0] | (nvs_ptr[1] << 8)
+                               | (nvs_ptr[2] << 16) | (nvs_ptr[3] << 24));
+
+                        wl1271_debug(DEBUG_BOOT,
+                                     "nvs burst write 0x%x: 0x%x",
+                                     dest_addr, val);
+                        wl1271_write32(wl, dest_addr, val);
+
+                        nvs_ptr += 4;
+                        dest_addr += 4;
+                }
+
+                if (nvs_ptr >= (u8 *) wl->nvs + nvs_len)
+                        goto out_badnvs;
+        }
+
+        /*
+         * We've reached the first zero length, the first NVS table
+         * is located at an aligned offset which is at least 7 bytes further.
+         * NOTE: The wl->nvs->nvs element must be first, in order to
+         * simplify the casting, we assume it is at the beginning of
+         * the wl->nvs structure.
+         */
+        nvs_ptr = (u8 *)wl->nvs +
+                        ALIGN(nvs_ptr - (u8 *)wl->nvs + 7, 4);
+
+        if (nvs_ptr >= (u8 *) wl->nvs + nvs_len)
+                goto out_badnvs;
+
+        nvs_len -= nvs_ptr - (u8 *)wl->nvs;
+
+        /* Now we must set the partition correctly */
+        wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
+
+        /* Copy the NVS tables to a new block to ensure alignment */
+        nvs_aligned = kmemdup(nvs_ptr, nvs_len, GFP_KERNEL);
+        if (!nvs_aligned)
+                return -ENOMEM;
+
+        /* And finally we upload the NVS tables */
+        wlcore_write_data(wl, REG_CMD_MBOX_ADDRESS,
+                          nvs_aligned, nvs_len, false);
+
+        kfree(nvs_aligned);
+        return 0;
+
+out_badnvs:
+        wl1271_error("nvs data is malformed");
+        return -EILSEQ;
+}
+EXPORT_SYMBOL_GPL(wlcore_boot_upload_nvs);
+
+int wlcore_boot_run_firmware(struct wl1271 *wl)
+{
+        int loop, ret;
+        u32 chip_id, intr;
+
+        /* Make sure we have the boot partition */
+        wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+
+        wl1271_boot_set_ecpu_ctrl(wl, ECPU_CONTROL_HALT);
+
+        chip_id = wlcore_read_reg(wl, REG_CHIP_ID_B);
+
+        wl1271_debug(DEBUG_BOOT, "chip id after firmware boot: 0x%x", chip_id);
+
+        if (chip_id != wl->chip.id) {
+                wl1271_error("chip id doesn't match after firmware boot");
+                return -EIO;
+        }
+
+        /* wait for init to complete */
+        loop = 0;
+        while (loop++ < INIT_LOOP) {
+                udelay(INIT_LOOP_DELAY);
+                intr = wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR);
+
+                if (intr == 0xffffffff) {
+                        wl1271_error("error reading hardware complete "
+                                     "init indication");
+                        return -EIO;
+                }
+                /* check that ACX_INTR_INIT_COMPLETE is enabled */
+                else if (intr & WL1271_ACX_INTR_INIT_COMPLETE) {
+                        wlcore_write_reg(wl, REG_INTERRUPT_ACK,
+                                         WL1271_ACX_INTR_INIT_COMPLETE);
+                        break;
+                }
+        }
+
+        if (loop > INIT_LOOP) {
+                wl1271_error("timeout waiting for the hardware to "
+                             "complete initialization");
+                return -EIO;
+        }
+
+        /* get hardware config command mail box */
+        wl->cmd_box_addr = wlcore_read_reg(wl, REG_COMMAND_MAILBOX_PTR);
+
+        wl1271_debug(DEBUG_MAILBOX, "cmd_box_addr 0x%x", wl->cmd_box_addr);
+
+        /* get hardware config event mail box */
+        wl->mbox_ptr[0] = wlcore_read_reg(wl, REG_EVENT_MAILBOX_PTR);
+        wl->mbox_ptr[1] = wl->mbox_ptr[0] + sizeof(struct event_mailbox);
+
+        wl1271_debug(DEBUG_MAILBOX, "MBOX ptrs: 0x%x 0x%x",
+                     wl->mbox_ptr[0], wl->mbox_ptr[1]);
+
+        ret = wlcore_boot_fw_version(wl);
+        if (ret < 0) {
+                wl1271_error("couldn't boot firmware");
+                return ret;
+        }
+
+        /*
+         * in case of full asynchronous mode the firmware event must be
+         * ready to receive event from the command mailbox
+         */
+
+        /* unmask required mbox events  */
+        wl->event_mask = BSS_LOSE_EVENT_ID |
+                SCAN_COMPLETE_EVENT_ID |
+                ROLE_STOP_COMPLETE_EVENT_ID |
+                RSSI_SNR_TRIGGER_0_EVENT_ID |
+                PSPOLL_DELIVERY_FAILURE_EVENT_ID |
+                SOFT_GEMINI_SENSE_EVENT_ID |
+                PERIODIC_SCAN_REPORT_EVENT_ID |
+                PERIODIC_SCAN_COMPLETE_EVENT_ID |
+                DUMMY_PACKET_EVENT_ID |
+                PEER_REMOVE_COMPLETE_EVENT_ID |
+                BA_SESSION_RX_CONSTRAINT_EVENT_ID |
+                REMAIN_ON_CHANNEL_COMPLETE_EVENT_ID |
+                INACTIVE_STA_EVENT_ID |
+                MAX_TX_RETRY_EVENT_ID |
+                CHANNEL_SWITCH_COMPLETE_EVENT_ID;
+
+        ret = wl1271_event_unmask(wl);
+        if (ret < 0) {
+                wl1271_error("EVENT mask setting failed");
+                return ret;
+        }
+
+        /* set the working partition to its "running" mode offset */
+        wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
+
+        /* firmware startup completed */
+        return 0;
+}
+EXPORT_SYMBOL_GPL(wlcore_boot_run_firmware);
diff --git a/drivers/net/wireless/ti/wlcore/boot.h b/drivers/net/wireless/ti/wlcore/boot.h
new file mode 100644
index 000000000000..094981dd2227
--- /dev/null
+++ b/drivers/net/wireless/ti/wlcore/boot.h
@@ -0,0 +1,54 @@
+/*
+ * This file is part of wl1271
+ *
+ * Copyright (C) 2008-2009 Nokia Corporation
+ *
+ * Contact: Luciano Coelho <luciano.coelho@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __BOOT_H__
+#define __BOOT_H__
+
+#include "wlcore.h"
+
+int wlcore_boot_upload_firmware(struct wl1271 *wl);
+int wlcore_boot_upload_nvs(struct wl1271 *wl);
+int wlcore_boot_run_firmware(struct wl1271 *wl);
+
+#define WL1271_NO_SUBBANDS 8
+#define WL1271_NO_POWER_LEVELS 4
+#define WL1271_FW_VERSION_MAX_LEN 20
+
+struct wl1271_static_data {
+        u8 mac_address[ETH_ALEN];
+        u8 padding[2];
+        u8 fw_version[WL1271_FW_VERSION_MAX_LEN];
+        u32 hw_version;
+        u8 tx_power_table[WL1271_NO_SUBBANDS][WL1271_NO_POWER_LEVELS];
+};
+
+/* number of times we try to read the INIT interrupt */
+#define INIT_LOOP 20000
+
+/* delay between retries */
+#define INIT_LOOP_DELAY 50
+
+#define WU_COUNTER_PAUSE_VAL 0x3FF
+#define WELP_ARM_COMMAND_VAL 0x4
+
+#endif
diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
index 3414fc11e9ba..5c4716c6f040 100644
--- a/drivers/net/wireless/wl12xx/cmd.c
+++ b/drivers/net/wireless/ti/wlcore/cmd.c
@@ -28,9 +28,8 @@
 #include <linux/ieee80211.h>
 #include <linux/slab.h>
 
-#include "wl12xx.h"
+#include "wlcore.h"
 #include "debug.h"
-#include "reg.h"
 #include "io.h"
 #include "acx.h"
 #include "wl12xx_80211.h"
@@ -67,11 +66,15 @@ int wl1271_cmd_send(struct wl1271 *wl, u16 id, void *buf, size_t len,
 
         wl1271_write(wl, wl->cmd_box_addr, buf, len, false);
 
-        wl1271_write32(wl, ACX_REG_INTERRUPT_TRIG, INTR_TRIG_CMD);
+        /*
+         * TODO: we just need this because one bit is in a different
+         * place.  Is there any better way?
+         */
+        wl->ops->trigger_cmd(wl, wl->cmd_box_addr, buf, len);
 
         timeout = jiffies + msecs_to_jiffies(WL1271_COMMAND_TIMEOUT);
 
-        intr = wl1271_read32(wl, ACX_REG_INTERRUPT_NO_CLEAR);
+        intr = wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR);
         while (!(intr & WL1271_ACX_INTR_CMD_COMPLETE)) {
                 if (time_after(jiffies, timeout)) {
                         wl1271_error("command complete timeout");
@@ -85,7 +88,7 @@ int wl1271_cmd_send(struct wl1271 *wl, u16 id, void *buf, size_t len,
                 else
                         msleep(1);
 
-                intr = wl1271_read32(wl, ACX_REG_INTERRUPT_NO_CLEAR);
+                intr = wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR);
         }
 
         /* read back the status code of the command */
@@ -100,8 +103,7 @@ int wl1271_cmd_send(struct wl1271 *wl, u16 id, void *buf, size_t len,
                 goto fail;
         }
 
-        wl1271_write32(wl, ACX_REG_INTERRUPT_ACK,
-                       WL1271_ACX_INTR_CMD_COMPLETE);
+        wlcore_write_reg(wl, REG_INTERRUPT_ACK, WL1271_ACX_INTR_CMD_COMPLETE);
         return 0;
 
 fail:
@@ -110,240 +112,18 @@ fail:
         return ret;
 }
 
-int wl1271_cmd_general_parms(struct wl1271 *wl)
-{
-        struct wl1271_general_parms_cmd *gen_parms;
-        struct wl1271_ini_general_params *gp =
-                &((struct wl1271_nvs_file *)wl->nvs)->general_params;
-        bool answer = false;
-        int ret;
-
-        if (!wl->nvs)
-                return -ENODEV;
-
-        if (gp->tx_bip_fem_manufacturer >= WL1271_INI_FEM_MODULE_COUNT) {
-                wl1271_warning("FEM index from INI out of bounds");
-                return -EINVAL;
-        }
-
-        gen_parms = kzalloc(sizeof(*gen_parms), GFP_KERNEL);
-        if (!gen_parms)
-                return -ENOMEM;
-
-        gen_parms->test.id = TEST_CMD_INI_FILE_GENERAL_PARAM;
-
-        memcpy(&gen_parms->general_params, gp, sizeof(*gp));
-
-        if (gp->tx_bip_fem_auto_detect)
-                answer = true;
-
-        /* Override the REF CLK from the NVS with the one from platform data */
-        gen_parms->general_params.ref_clock = wl->ref_clock;
-
-        ret = wl1271_cmd_test(wl, gen_parms, sizeof(*gen_parms), answer);
-        if (ret < 0) {
-                wl1271_warning("CMD_INI_FILE_GENERAL_PARAM failed");
-                goto out;
-        }
-
-        gp->tx_bip_fem_manufacturer =
-                gen_parms->general_params.tx_bip_fem_manufacturer;
-
-        if (gp->tx_bip_fem_manufacturer >= WL1271_INI_FEM_MODULE_COUNT) {
-                wl1271_warning("FEM index from FW out of bounds");
-                ret = -EINVAL;
-                goto out;
-        }
-
-        wl1271_debug(DEBUG_CMD, "FEM autodetect: %s, manufacturer: %d\n",
-                     answer ? "auto" : "manual", gp->tx_bip_fem_manufacturer);
-
-out:
-        kfree(gen_parms);
-        return ret;
-}
-
-int wl128x_cmd_general_parms(struct wl1271 *wl)
-{
-        struct wl128x_general_parms_cmd *gen_parms;
-        struct wl128x_ini_general_params *gp =
-                &((struct wl128x_nvs_file *)wl->nvs)->general_params;
-        bool answer = false;
-        int ret;
-
-        if (!wl->nvs)
-                return -ENODEV;
-
-        if (gp->tx_bip_fem_manufacturer >= WL1271_INI_FEM_MODULE_COUNT) {
-                wl1271_warning("FEM index from ini out of bounds");
-                return -EINVAL;
-        }
-
-        gen_parms = kzalloc(sizeof(*gen_parms), GFP_KERNEL);
-        if (!gen_parms)
-                return -ENOMEM;
-
-        gen_parms->test.id = TEST_CMD_INI_FILE_GENERAL_PARAM;
-
-        memcpy(&gen_parms->general_params, gp, sizeof(*gp));
-
-        if (gp->tx_bip_fem_auto_detect)
-                answer = true;
-
-        /* Replace REF and TCXO CLKs with the ones from platform data */
-        gen_parms->general_params.ref_clock = wl->ref_clock;
-        gen_parms->general_params.tcxo_ref_clock = wl->tcxo_clock;
-
-        ret = wl1271_cmd_test(wl, gen_parms, sizeof(*gen_parms), answer);
-        if (ret < 0) {
-                wl1271_warning("CMD_INI_FILE_GENERAL_PARAM failed");
-                goto out;
-        }
-
-        gp->tx_bip_fem_manufacturer =
-                gen_parms->general_params.tx_bip_fem_manufacturer;
-
-        if (gp->tx_bip_fem_manufacturer >= WL1271_INI_FEM_MODULE_COUNT) {
-                wl1271_warning("FEM index from FW out of bounds");
-                ret = -EINVAL;
-                goto out;
-        }
-
-        wl1271_debug(DEBUG_CMD, "FEM autodetect: %s, manufacturer: %d\n",
-                     answer ? "auto" : "manual", gp->tx_bip_fem_manufacturer);
-
-out:
-        kfree(gen_parms);
-        return ret;
-}
-
-int wl1271_cmd_radio_parms(struct wl1271 *wl)
-{
-        struct wl1271_nvs_file *nvs = (struct wl1271_nvs_file *)wl->nvs;
-        struct wl1271_radio_parms_cmd *radio_parms;
-        struct wl1271_ini_general_params *gp = &nvs->general_params;
-        int ret;
-
-        if (!wl->nvs)
-                return -ENODEV;
-
-        radio_parms = kzalloc(sizeof(*radio_parms), GFP_KERNEL);
-        if (!radio_parms)
-                return -ENOMEM;
-
-        radio_parms->test.id = TEST_CMD_INI_FILE_RADIO_PARAM;
-
-        /* 2.4GHz parameters */
-        memcpy(&radio_parms->static_params_2, &nvs->stat_radio_params_2,
-               sizeof(struct wl1271_ini_band_params_2));
-        memcpy(&radio_parms->dyn_params_2,
-               &nvs->dyn_radio_params_2[gp->tx_bip_fem_manufacturer].params,
-               sizeof(struct wl1271_ini_fem_params_2));
-
-        /* 5GHz parameters */
-        memcpy(&radio_parms->static_params_5,
-               &nvs->stat_radio_params_5,
-               sizeof(struct wl1271_ini_band_params_5));
-        memcpy(&radio_parms->dyn_params_5,
-               &nvs->dyn_radio_params_5[gp->tx_bip_fem_manufacturer].params,
-               sizeof(struct wl1271_ini_fem_params_5));
-
-        wl1271_dump(DEBUG_CMD, "TEST_CMD_INI_FILE_RADIO_PARAM: ",
-                    radio_parms, sizeof(*radio_parms));
-
-        ret = wl1271_cmd_test(wl, radio_parms, sizeof(*radio_parms), 0);
-        if (ret < 0)
-                wl1271_warning("CMD_INI_FILE_RADIO_PARAM failed");
-
-        kfree(radio_parms);
-        return ret;
-}
-
-int wl128x_cmd_radio_parms(struct wl1271 *wl)
-{
-        struct wl128x_nvs_file *nvs = (struct wl128x_nvs_file *)wl->nvs;
-        struct wl128x_radio_parms_cmd *radio_parms;
-        struct wl128x_ini_general_params *gp = &nvs->general_params;
-        int ret;
-
-        if (!wl->nvs)
-                return -ENODEV;
-
-        radio_parms = kzalloc(sizeof(*radio_parms), GFP_KERNEL);
-        if (!radio_parms)
-                return -ENOMEM;
-
-        radio_parms->test.id = TEST_CMD_INI_FILE_RADIO_PARAM;
-
-        /* 2.4GHz parameters */
-        memcpy(&radio_parms->static_params_2, &nvs->stat_radio_params_2,
-               sizeof(struct wl128x_ini_band_params_2));
-        memcpy(&radio_parms->dyn_params_2,
-               &nvs->dyn_radio_params_2[gp->tx_bip_fem_manufacturer].params,
-               sizeof(struct wl128x_ini_fem_params_2));
-
-        /* 5GHz parameters */
-        memcpy(&radio_parms->static_params_5,
-               &nvs->stat_radio_params_5,
-               sizeof(struct wl128x_ini_band_params_5));
-        memcpy(&radio_parms->dyn_params_5,
-               &nvs->dyn_radio_params_5[gp->tx_bip_fem_manufacturer].params,
-               sizeof(struct wl128x_ini_fem_params_5));
-
-        radio_parms->fem_vendor_and_options = nvs->fem_vendor_and_options;
-
-        wl1271_dump(DEBUG_CMD, "TEST_CMD_INI_FILE_RADIO_PARAM: ",
-                    radio_parms, sizeof(*radio_parms));
-
-        ret = wl1271_cmd_test(wl, radio_parms, sizeof(*radio_parms), 0);
-        if (ret < 0)
-                wl1271_warning("CMD_INI_FILE_RADIO_PARAM failed");
-
-        kfree(radio_parms);
-        return ret;
-}
-
-int wl1271_cmd_ext_radio_parms(struct wl1271 *wl)
-{
-        struct wl1271_ext_radio_parms_cmd *ext_radio_parms;
-        struct conf_rf_settings *rf = &wl->conf.rf;
-        int ret;
-
-        if (!wl->nvs)
-                return -ENODEV;
-
-        ext_radio_parms = kzalloc(sizeof(*ext_radio_parms), GFP_KERNEL);
-        if (!ext_radio_parms)
-                return -ENOMEM;
-
-        ext_radio_parms->test.id = TEST_CMD_INI_FILE_RF_EXTENDED_PARAM;
-
-        memcpy(ext_radio_parms->tx_per_channel_power_compensation_2,
-               rf->tx_per_channel_power_compensation_2,
-               CONF_TX_PWR_COMPENSATION_LEN_2);
-        memcpy(ext_radio_parms->tx_per_channel_power_compensation_5,
-               rf->tx_per_channel_power_compensation_5,
-               CONF_TX_PWR_COMPENSATION_LEN_5);
-
-        wl1271_dump(DEBUG_CMD, "TEST_CMD_INI_FILE_EXT_RADIO_PARAM: ",
-                    ext_radio_parms, sizeof(*ext_radio_parms));
-
-        ret = wl1271_cmd_test(wl, ext_radio_parms, sizeof(*ext_radio_parms), 0);
-        if (ret < 0)
-                wl1271_warning("TEST_CMD_INI_FILE_RF_EXTENDED_PARAM failed");
-
-        kfree(ext_radio_parms);
-        return ret;
-}
-
 /*
  * Poll the mailbox event field until any of the bits in the mask is set or a
  * timeout occurs (WL1271_EVENT_TIMEOUT in msecs)
  */
 static int wl1271_cmd_wait_for_event_or_timeout(struct wl1271 *wl, u32 mask)
 {
-        u32 events_vector, event;
+        u32 *events_vector;
+        u32 event;
         unsigned long timeout;
+        int ret = 0;
+
+        events_vector = kmalloc(sizeof(*events_vector), GFP_DMA);
 
         timeout = jiffies + msecs_to_jiffies(WL1271_EVENT_TIMEOUT);
 
@@ -351,21 +131,24 @@ static int wl1271_cmd_wait_for_event_or_timeout(struct wl1271 *wl, u32 mask)
                 if (time_after(jiffies, timeout)) {
                         wl1271_debug(DEBUG_CMD, "timeout waiting for event %d",
                                      (int)mask);
-                        return -ETIMEDOUT;
+                        ret = -ETIMEDOUT;
+                        goto out;
                 }
 
                 msleep(1);
 
                 /* read from both event fields */
-                wl1271_read(wl, wl->mbox_ptr[0], &events_vector,
-                            sizeof(events_vector), false);
-                event = events_vector & mask;
-                wl1271_read(wl, wl->mbox_ptr[1], &events_vector,
-                            sizeof(events_vector), false);
-                event |= events_vector & mask;
+                wl1271_read(wl, wl->mbox_ptr[0], events_vector,
+                            sizeof(*events_vector), false);
+                event = *events_vector & mask;
+                wl1271_read(wl, wl->mbox_ptr[1], events_vector,
+                            sizeof(*events_vector), false);
+                event |= *events_vector & mask;
         } while (!event);
 
-        return 0;
+out:
+        kfree(events_vector);
+        return ret;
 }
 
 static int wl1271_cmd_wait_for_event(struct wl1271 *wl, u32 mask)
@@ -522,7 +305,7 @@ static int wl12xx_cmd_role_start_dev(struct wl1271 *wl,
 
         cmd->role_id = wlvif->dev_role_id;
         if (wlvif->band == IEEE80211_BAND_5GHZ)
-                cmd->band = WL12XX_BAND_5GHZ;
+                cmd->band = WLCORE_BAND_5GHZ;
         cmd->channel = wlvif->channel;
 
         if (wlvif->dev_hlid == WL12XX_INVALID_LINK_ID) {
@@ -613,7 +396,7 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 
         cmd->role_id = wlvif->role_id;
         if (wlvif->band == IEEE80211_BAND_5GHZ)
-                cmd->band = WL12XX_BAND_5GHZ;
+                cmd->band = WLCORE_BAND_5GHZ;
         cmd->channel = wlvif->channel;
         cmd->sta.basic_rate_set = cpu_to_le32(wlvif->basic_rate_set);
         cmd->sta.beacon_interval = cpu_to_le16(wlvif->beacon_int);
@@ -750,14 +533,14 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 
         switch (wlvif->band) {
         case IEEE80211_BAND_2GHZ:
-                cmd->band = RADIO_BAND_2_4GHZ;
+                cmd->band = WLCORE_BAND_2_4GHZ;
                 break;
         case IEEE80211_BAND_5GHZ:
-                cmd->band = RADIO_BAND_5GHZ;
+                cmd->band = WLCORE_BAND_5GHZ;
                 break;
         default:
                 wl1271_warning("ap start - unknown band: %d", (int)wlvif->band);
-                cmd->band = RADIO_BAND_2_4GHZ;
+                cmd->band = WLCORE_BAND_2_4GHZ;
                 break;
         }
 
@@ -830,7 +613,7 @@ int wl12xx_cmd_role_start_ibss(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 
         cmd->role_id = wlvif->role_id;
         if (wlvif->band == IEEE80211_BAND_5GHZ)
-                cmd->band = WL12XX_BAND_5GHZ;
+                cmd->band = WLCORE_BAND_5GHZ;
         cmd->channel = wlvif->channel;
         cmd->ibss.basic_rate_set = cpu_to_le32(wlvif->basic_rate_set);
         cmd->ibss.beacon_interval = cpu_to_le16(wlvif->beacon_int);
@@ -904,6 +687,7 @@ int wl1271_cmd_test(struct wl1271 *wl, void *buf, size_t buf_len, u8 answer)
 
         return ret;
 }
+EXPORT_SYMBOL_GPL(wl1271_cmd_test);
 
 /**
  * read acx from firmware
@@ -960,6 +744,7 @@ int wl1271_cmd_configure(struct wl1271 *wl, u16 id, void *buf, size_t len)
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(wl1271_cmd_configure);
 
 int wl1271_cmd_data_path(struct wl1271 *wl, bool enable)
 {
@@ -1730,10 +1515,10 @@ static int wl12xx_cmd_roc(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         cmd->channel = wlvif->channel;
         switch (wlvif->band) {
         case IEEE80211_BAND_2GHZ:
-                cmd->band = RADIO_BAND_2_4GHZ;
+                cmd->band = WLCORE_BAND_2_4GHZ;
                 break;
         case IEEE80211_BAND_5GHZ:
-                cmd->band = RADIO_BAND_5GHZ;
+                cmd->band = WLCORE_BAND_5GHZ;
                 break;
         default:
                 wl1271_error("roc - unknown band: %d", (int)wlvif->band);
diff --git a/drivers/net/wireless/wl12xx/cmd.h b/drivers/net/wireless/ti/wlcore/cmd.h
index de217d92516b..a46ae07cb77e 100644
--- a/drivers/net/wireless/wl12xx/cmd.h
+++ b/drivers/net/wireless/ti/wlcore/cmd.h
@@ -25,17 +25,12 @@
 #ifndef __CMD_H__
 #define __CMD_H__
 
-#include "wl12xx.h"
+#include "wlcore.h"
 
 struct acx_header;
 
 int wl1271_cmd_send(struct wl1271 *wl, u16 id, void *buf, size_t len,
                     size_t res_len);
-int wl1271_cmd_general_parms(struct wl1271 *wl);
-int wl128x_cmd_general_parms(struct wl1271 *wl);
-int wl1271_cmd_radio_parms(struct wl1271 *wl);
-int wl128x_cmd_radio_parms(struct wl1271 *wl);
-int wl1271_cmd_ext_radio_parms(struct wl1271 *wl);
 int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 *addr, u8 role_type,
                            u8 *role_id);
 int wl12xx_cmd_role_disable(struct wl1271 *wl, u8 *role_id);
@@ -262,13 +257,13 @@ struct wl12xx_cmd_role_disable {
         u8 padding[3];
 } __packed;
 
-enum wl12xx_band {
-        WL12XX_BAND_2_4GHZ              = 0,
-        WL12XX_BAND_5GHZ                = 1,
-        WL12XX_BAND_JAPAN_4_9_GHZ       = 2,
-        WL12XX_BAND_DEFAULT             = WL12XX_BAND_2_4GHZ,
-        WL12XX_BAND_INVALID             = 0x7E,
-        WL12XX_BAND_MAX_RADIO           = 0x7F,
+enum wlcore_band {
+        WLCORE_BAND_2_4GHZ              = 0,
+        WLCORE_BAND_5GHZ                = 1,
+        WLCORE_BAND_JAPAN_4_9_GHZ       = 2,
+        WLCORE_BAND_DEFAULT             = WLCORE_BAND_2_4GHZ,
+        WLCORE_BAND_INVALID             = 0x7E,
+        WLCORE_BAND_MAX_RADIO           = 0x7F,
 };
 
 struct wl12xx_cmd_role_start {
@@ -494,83 +489,6 @@ enum wl1271_channel_tune_bands {
 
 #define WL1271_PD_REFERENCE_POINT_BAND_B_G  0
 
-#define TEST_CMD_INI_FILE_RADIO_PARAM       0x19
-#define TEST_CMD_INI_FILE_GENERAL_PARAM     0x1E
-#define TEST_CMD_INI_FILE_RF_EXTENDED_PARAM 0x26
-
-struct wl1271_general_parms_cmd {
-        struct wl1271_cmd_header header;
-
-        struct wl1271_cmd_test_header test;
-
-        struct wl1271_ini_general_params general_params;
-
-        u8 sr_debug_table[WL1271_INI_MAX_SMART_REFLEX_PARAM];
-        u8 sr_sen_n_p;
-        u8 sr_sen_n_p_gain;
-        u8 sr_sen_nrn;
-        u8 sr_sen_prn;
-        u8 padding[3];
-} __packed;
-
-struct wl128x_general_parms_cmd {
-        struct wl1271_cmd_header header;
-
-        struct wl1271_cmd_test_header test;
-
-        struct wl128x_ini_general_params general_params;
-
-        u8 sr_debug_table[WL1271_INI_MAX_SMART_REFLEX_PARAM];
-        u8 sr_sen_n_p;
-        u8 sr_sen_n_p_gain;
-        u8 sr_sen_nrn;
-        u8 sr_sen_prn;
-        u8 padding[3];
-} __packed;
-
-struct wl1271_radio_parms_cmd {
-        struct wl1271_cmd_header header;
-
-        struct wl1271_cmd_test_header test;
-
-        /* Static radio parameters */
-        struct wl1271_ini_band_params_2 static_params_2;
-        struct wl1271_ini_band_params_5 static_params_5;
-
-        /* Dynamic radio parameters */
-        struct wl1271_ini_fem_params_2 dyn_params_2;
-        u8 padding2;
-        struct wl1271_ini_fem_params_5 dyn_params_5;
-        u8 padding3[2];
-} __packed;
-
-struct wl128x_radio_parms_cmd {
-        struct wl1271_cmd_header header;
-
-        struct wl1271_cmd_test_header test;
-
-        /* Static radio parameters */
-        struct wl128x_ini_band_params_2 static_params_2;
-        struct wl128x_ini_band_params_5 static_params_5;
-
-        u8 fem_vendor_and_options;
-
-        /* Dynamic radio parameters */
-        struct wl128x_ini_fem_params_2 dyn_params_2;
-        u8 padding2;
-        struct wl128x_ini_fem_params_5 dyn_params_5;
-} __packed;
-
-struct wl1271_ext_radio_parms_cmd {
-        struct wl1271_cmd_header header;
-
-        struct wl1271_cmd_test_header test;
-
-        u8 tx_per_channel_power_compensation_2[CONF_TX_PWR_COMPENSATION_LEN_2];
-        u8 tx_per_channel_power_compensation_5[CONF_TX_PWR_COMPENSATION_LEN_5];
-        u8 padding[3];
-} __packed;
-
 /*
  * There are three types of disconnections:
  *
diff --git a/drivers/net/wireless/wl12xx/conf.h b/drivers/net/wireless/ti/wlcore/conf.h
index 3e581e19424c..fef0db4213bc 100644
--- a/drivers/net/wireless/wl12xx/conf.h
+++ b/drivers/net/wireless/ti/wlcore/conf.h
@@ -65,36 +65,7 @@ enum {
         CONF_HW_RATE_INDEX_MAX     = CONF_HW_RATE_INDEX_54MBPS,
 };
 
-enum {
-        CONF_HW_RXTX_RATE_MCS7_SGI = 0,
-        CONF_HW_RXTX_RATE_MCS7,
-        CONF_HW_RXTX_RATE_MCS6,
-        CONF_HW_RXTX_RATE_MCS5,
-        CONF_HW_RXTX_RATE_MCS4,
-        CONF_HW_RXTX_RATE_MCS3,
-        CONF_HW_RXTX_RATE_MCS2,
-        CONF_HW_RXTX_RATE_MCS1,
-        CONF_HW_RXTX_RATE_MCS0,
-        CONF_HW_RXTX_RATE_54,
-        CONF_HW_RXTX_RATE_48,
-        CONF_HW_RXTX_RATE_36,
-        CONF_HW_RXTX_RATE_24,
-        CONF_HW_RXTX_RATE_22,
-        CONF_HW_RXTX_RATE_18,
-        CONF_HW_RXTX_RATE_12,
-        CONF_HW_RXTX_RATE_11,
-        CONF_HW_RXTX_RATE_9,
-        CONF_HW_RXTX_RATE_6,
-        CONF_HW_RXTX_RATE_5_5,
-        CONF_HW_RXTX_RATE_2,
-        CONF_HW_RXTX_RATE_1,
-        CONF_HW_RXTX_RATE_MAX,
-        CONF_HW_RXTX_RATE_UNSUPPORTED = 0xff
-};
-
-/* Rates between and including these are MCS rates */
-#define CONF_HW_RXTX_RATE_MCS_MIN CONF_HW_RXTX_RATE_MCS7_SGI
-#define CONF_HW_RXTX_RATE_MCS_MAX CONF_HW_RXTX_RATE_MCS0
+#define CONF_HW_RXTX_RATE_UNSUPPORTED 0xff
 
 enum {
         CONF_SG_DISABLE = 0,
@@ -1096,16 +1067,31 @@ struct conf_scan_settings {
 };
 
 struct conf_sched_scan_settings {
-        /* minimum time to wait on the channel for active scans (in TUs) */
-        u16 min_dwell_time_active;
+        /*
+         * The base time to wait on the channel for active scans (in TU/1000).
+         * The minimum dwell time is calculated according to this:
+         * min_dwell_time = base + num_of_probes_to_be_sent * delta_per_probe
+         * The maximum dwell time is calculated according to this:
+         * max_dwell_time = min_dwell_time + max_dwell_time_delta
+         */
+        u32 base_dwell_time;
 
-        /* maximum time to wait on the channel for active scans (in TUs) */
-        u16 max_dwell_time_active;
+        /* The delta between the min dwell time and max dwell time for
+         * active scans (in TU/1000s). The max dwell time is used by the FW once
+         * traffic is detected on the channel.
+         */
+        u32 max_dwell_time_delta;
+
+        /* Delta added to min dwell time per each probe in 2.4 GHz (TU/1000) */
+        u32 dwell_time_delta_per_probe;
 
-        /* time to wait on the channel for passive scans (in TUs) */
+        /* Delta added to min dwell time per each probe in 5 GHz (TU/1000) */
+        u32 dwell_time_delta_per_probe_5;
+
+        /* time to wait on the channel for passive scans (in TU/1000) */
         u32 dwell_time_passive;
 
-        /* time to wait on the channel for DFS scans (in TUs) */
+        /* time to wait on the channel for DFS scans (in TU/1000) */
         u32 dwell_time_dfs;
 
         /* number of probe requests to send on each channel in active scans */
@@ -1118,26 +1104,6 @@ struct conf_sched_scan_settings {
         s8 snr_threshold;
 };
 
-/* these are number of channels on the band divided by two, rounded up */
-#define CONF_TX_PWR_COMPENSATION_LEN_2 7
-#define CONF_TX_PWR_COMPENSATION_LEN_5 18
-
-struct conf_rf_settings {
-        /*
-         * Per channel power compensation for 2.4GHz
-         *
-         * Range: s8
-         */
-        u8 tx_per_channel_power_compensation_2[CONF_TX_PWR_COMPENSATION_LEN_2];
-
-        /*
-         * Per channel power compensation for 5GHz
-         *
-         * Range: s8
-         */
-        u8 tx_per_channel_power_compensation_5[CONF_TX_PWR_COMPENSATION_LEN_5];
-};
-
 struct conf_ht_setting {
         u8 rx_ba_win_size;
         u8 tx_ba_win_size;
@@ -1286,7 +1252,7 @@ struct conf_hangover_settings {
         u8 window_size;
 };
 
-struct conf_drv_settings {
+struct wlcore_conf {
         struct conf_sg_settings sg;
         struct conf_rx_settings rx;
         struct conf_tx_settings tx;
@@ -1296,16 +1262,13 @@ struct conf_drv_settings {
         struct conf_roam_trigger_settings roam_trigger;
         struct conf_scan_settings scan;
         struct conf_sched_scan_settings sched_scan;
-        struct conf_rf_settings rf;
         struct conf_ht_setting ht;
-        struct conf_memory_settings mem_wl127x;
-        struct conf_memory_settings mem_wl128x;
+        struct conf_memory_settings mem;
         struct conf_fm_coex fm_coex;
         struct conf_rx_streaming_settings rx_streaming;
         struct conf_fwlog fwlog;
         struct conf_rate_policy_settings rate;
         struct conf_hangover_settings hangover;
-        u8 hci_io_ds;
 };
 
 #endif
diff --git a/drivers/net/wireless/wl12xx/debug.h b/drivers/net/wireless/ti/wlcore/debug.h
index ec0fdc25b280..6b800b3cbea5 100644
--- a/drivers/net/wireless/wl12xx/debug.h
+++ b/drivers/net/wireless/ti/wlcore/debug.h
@@ -52,6 +52,7 @@ enum {
         DEBUG_ADHOC     = BIT(16),
         DEBUG_AP        = BIT(17),
         DEBUG_PROBE     = BIT(18),
+        DEBUG_IO        = BIT(19),
         DEBUG_MASTER    = (DEBUG_ADHOC | DEBUG_AP),
         DEBUG_ALL       = ~0,
 };
diff --git a/drivers/net/wireless/wl12xx/debugfs.c b/drivers/net/wireless/ti/wlcore/debugfs.c
index 564d49575c94..d5aea1ff5ad1 100644
--- a/drivers/net/wireless/wl12xx/debugfs.c
+++ b/drivers/net/wireless/ti/wlcore/debugfs.c
@@ -26,7 +26,7 @@
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 
-#include "wl12xx.h"
+#include "wlcore.h"
 #include "debug.h"
 #include "acx.h"
 #include "ps.h"
@@ -647,6 +647,7 @@ static ssize_t vifs_state_read(struct file *file, char __user *user_buf,
                 VIF_STATE_PRINT_INT(last_rssi_event);
                 VIF_STATE_PRINT_INT(ba_support);
                 VIF_STATE_PRINT_INT(ba_allowed);
+                VIF_STATE_PRINT_INT(is_gem);
                 VIF_STATE_PRINT_LLHEX(tx_security_seq);
                 VIF_STATE_PRINT_INT(tx_security_last_seq_lsb);
         }
diff --git a/drivers/net/wireless/wl12xx/debugfs.h b/drivers/net/wireless/ti/wlcore/debugfs.h
index 254c5b292cf6..a8d3aef011ff 100644
--- a/drivers/net/wireless/wl12xx/debugfs.h
+++ b/drivers/net/wireless/ti/wlcore/debugfs.h
@@ -24,7 +24,7 @@
 #ifndef __DEBUGFS_H__
 #define __DEBUGFS_H__
 
-#include "wl12xx.h"
+#include "wlcore.h"
 
 int wl1271_debugfs_init(struct wl1271 *wl);
 void wl1271_debugfs_exit(struct wl1271 *wl);
diff --git a/drivers/net/wireless/wl12xx/event.c b/drivers/net/wireless/ti/wlcore/event.c
index c953717f38eb..292632ddf890 100644
--- a/drivers/net/wireless/wl12xx/event.c
+++ b/drivers/net/wireless/ti/wlcore/event.c
@@ -21,9 +21,8 @@
  *
  */
 
-#include "wl12xx.h"
+#include "wlcore.h"
 #include "debug.h"
-#include "reg.h"
 #include "io.h"
 #include "event.h"
 #include "ps.h"
@@ -98,8 +97,9 @@ static void wl1271_event_mbox_dump(struct event_mailbox *mbox)
         wl1271_debug(DEBUG_EVENT, "\tmask: 0x%x", mbox->events_mask);
 }
 
-static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox)
+static int wl1271_event_process(struct wl1271 *wl)
 {
+        struct event_mailbox *mbox = wl->mbox;
         struct ieee80211_vif *vif;
         struct wl12xx_vif *wlvif;
         u32 vector;
@@ -196,7 +196,7 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox)
                         bool success;
 
                         if (!test_and_clear_bit(WLVIF_FLAG_CS_PROGRESS,
-                                                &wl->flags))
+                                                &wlvif->flags))
                                 continue;
 
                         success = mbox->channel_switch_status ? false : true;
@@ -278,18 +278,8 @@ int wl1271_event_unmask(struct wl1271 *wl)
         return 0;
 }
 
-void wl1271_event_mbox_config(struct wl1271 *wl)
-{
-        wl->mbox_ptr[0] = wl1271_read32(wl, REG_EVENT_MAILBOX_PTR);
-        wl->mbox_ptr[1] = wl->mbox_ptr[0] + sizeof(struct event_mailbox);
-
-        wl1271_debug(DEBUG_EVENT, "MBOX ptrs: 0x%x 0x%x",
-                     wl->mbox_ptr[0], wl->mbox_ptr[1]);
-}
-
 int wl1271_event_handle(struct wl1271 *wl, u8 mbox_num)
 {
-        struct event_mailbox mbox;
         int ret;
 
         wl1271_debug(DEBUG_EVENT, "EVENT on mbox %d", mbox_num);
@@ -298,16 +288,19 @@ int wl1271_event_handle(struct wl1271 *wl, u8 mbox_num)
                 return -EINVAL;
 
         /* first we read the mbox descriptor */
-        wl1271_read(wl, wl->mbox_ptr[mbox_num], &mbox,
-                    sizeof(struct event_mailbox), false);
+        wl1271_read(wl, wl->mbox_ptr[mbox_num], wl->mbox,
+                    sizeof(*wl->mbox), false);
 
         /* process the descriptor */
-        ret = wl1271_event_process(wl, &mbox);
+        ret = wl1271_event_process(wl);
         if (ret < 0)
                 return ret;
 
-        /* then we let the firmware know it can go on...*/
-        wl1271_write32(wl, ACX_REG_INTERRUPT_TRIG, INTR_TRIG_EVENT_ACK);
+        /*
+         * TODO: we just need this because one bit is in a different
+         * place.  Is there any better way?
+         */
+        wl->ops->ack_event(wl);
 
         return 0;
 }
diff --git a/drivers/net/wireless/wl12xx/event.h b/drivers/net/wireless/ti/wlcore/event.h
index 057d193d3525..8adf18d6c58f 100644
--- a/drivers/net/wireless/wl12xx/event.h
+++ b/drivers/net/wireless/ti/wlcore/event.h
@@ -132,8 +132,9 @@ struct event_mailbox {
         u8 reserved_8[9];
 } __packed;
 
+struct wl1271;
+
 int wl1271_event_unmask(struct wl1271 *wl);
-void wl1271_event_mbox_config(struct wl1271 *wl);
 int wl1271_event_handle(struct wl1271 *wl, u8 mbox);
 
 #endif
diff --git a/drivers/net/wireless/ti/wlcore/hw_ops.h b/drivers/net/wireless/ti/wlcore/hw_ops.h
new file mode 100644
index 000000000000..9384b4d56c24
--- /dev/null
+++ b/drivers/net/wireless/ti/wlcore/hw_ops.h
@@ -0,0 +1,122 @@
+/*
+ * This file is part of wlcore
+ *
+ * Copyright (C) 2011 Texas Instruments Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __WLCORE_HW_OPS_H__
+#define __WLCORE_HW_OPS_H__
+
+#include "wlcore.h"
+#include "rx.h"
+
+static inline u32
+wlcore_hw_calc_tx_blocks(struct wl1271 *wl, u32 len, u32 spare_blks)
+{
+        if (!wl->ops->calc_tx_blocks)
+                BUG_ON(1);
+
+        return wl->ops->calc_tx_blocks(wl, len, spare_blks);
+}
+
+static inline void
+wlcore_hw_set_tx_desc_blocks(struct wl1271 *wl, struct wl1271_tx_hw_descr *desc,
+                             u32 blks, u32 spare_blks)
+{
+        if (!wl->ops->set_tx_desc_blocks)
+                BUG_ON(1);
+
+        return wl->ops->set_tx_desc_blocks(wl, desc, blks, spare_blks);
+}
+
+static inline void
+wlcore_hw_set_tx_desc_data_len(struct wl1271 *wl,
+                               struct wl1271_tx_hw_descr *desc,
+                               struct sk_buff *skb)
+{
+        if (!wl->ops->set_tx_desc_data_len)
+                BUG_ON(1);
+
+        wl->ops->set_tx_desc_data_len(wl, desc, skb);
+}
+
+static inline enum wl_rx_buf_align
+wlcore_hw_get_rx_buf_align(struct wl1271 *wl, u32 rx_desc)
+{
+
+        if (!wl->ops->get_rx_buf_align)
+                BUG_ON(1);
+
+        return wl->ops->get_rx_buf_align(wl, rx_desc);
+}
+
+static inline void
+wlcore_hw_prepare_read(struct wl1271 *wl, u32 rx_desc, u32 len)
+{
+        if (wl->ops->prepare_read)
+                wl->ops->prepare_read(wl, rx_desc, len);
+}
+
+static inline u32
+wlcore_hw_get_rx_packet_len(struct wl1271 *wl, void *rx_data, u32 data_len)
+{
+        if (!wl->ops->get_rx_packet_len)
+                BUG_ON(1);
+
+        return wl->ops->get_rx_packet_len(wl, rx_data, data_len);
+}
+
+static inline void wlcore_hw_tx_delayed_compl(struct wl1271 *wl)
+{
+        if (wl->ops->tx_delayed_compl)
+                wl->ops->tx_delayed_compl(wl);
+}
+
+static inline void wlcore_hw_tx_immediate_compl(struct wl1271 *wl)
+{
+        if (wl->ops->tx_immediate_compl)
+                wl->ops->tx_immediate_compl(wl);
+}
+
+static inline int
+wlcore_hw_init_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif)
+{
+        if (wl->ops->init_vif)
+                return wl->ops->init_vif(wl, wlvif);
+
+        return 0;
+}
+
+static inline u32
+wlcore_hw_sta_get_ap_rate_mask(struct wl1271 *wl, struct wl12xx_vif *wlvif)
+{
+        if (!wl->ops->sta_get_ap_rate_mask)
+                BUG_ON(1);
+
+        return wl->ops->sta_get_ap_rate_mask(wl, wlvif);
+}
+
+static inline int wlcore_identify_fw(struct wl1271 *wl)
+{
+        if (wl->ops->identify_fw)
+                return wl->ops->identify_fw(wl);
+
+        return 0;
+}
+
+#endif
diff --git a/drivers/net/wireless/wl12xx/ini.h b/drivers/net/wireless/ti/wlcore/ini.h
index 4cf9ecc56212..4cf9ecc56212 100644
--- a/drivers/net/wireless/wl12xx/ini.h
+++ b/drivers/net/wireless/ti/wlcore/ini.h
diff --git a/drivers/net/wireless/wl12xx/init.c b/drivers/net/wireless/ti/wlcore/init.c
index 203fbebf09eb..9f89255eb6e6 100644
--- a/drivers/net/wireless/wl12xx/init.c
+++ b/drivers/net/wireless/ti/wlcore/init.c
@@ -30,9 +30,9 @@
 #include "wl12xx_80211.h"
 #include "acx.h"
 #include "cmd.h"
-#include "reg.h"
 #include "tx.h"
 #include "io.h"
+#include "hw_ops.h"
 
 int wl1271_init_templates_config(struct wl1271 *wl)
 {
@@ -319,7 +319,7 @@ static int wl12xx_init_fwlog(struct wl1271 *wl)
 {
         int ret;
 
-        if (wl->quirks & WL12XX_QUIRK_FWLOG_NOT_IMPLEMENTED)
+        if (wl->quirks & WLCORE_QUIRK_FWLOG_NOT_IMPLEMENTED)
                 return 0;
 
         ret = wl12xx_cmd_config_fwlog(wl);
@@ -494,26 +494,6 @@ static int wl1271_set_ba_policies(struct wl1271 *wl, struct wl12xx_vif *wlvif)
         return wl12xx_acx_set_ba_initiator_policy(wl, wlvif);
 }
 
-int wl1271_chip_specific_init(struct wl1271 *wl)
-{
-        int ret = 0;
-
-        if (wl->chip.id == CHIP_ID_1283_PG20) {
-                u32 host_cfg_bitmap = HOST_IF_CFG_RX_FIFO_ENABLE;
-
-                if (!(wl->quirks & WL12XX_QUIRK_NO_BLOCKSIZE_ALIGNMENT))
-                        /* Enable SDIO padding */
-                        host_cfg_bitmap |= HOST_IF_CFG_TX_PAD_TO_SDIO_BLK;
-
-                /* Must be before wl1271_acx_init_mem_config() */
-                ret = wl1271_acx_host_if_cfg_bitmap(wl, host_cfg_bitmap);
-                if (ret < 0)
-                        goto out;
-        }
-out:
-        return ret;
-}
-
 /* vif-specifc initialization */
 static int wl12xx_init_sta_role(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
@@ -582,10 +562,17 @@ int wl1271_init_vif_specific(struct wl1271 *wl, struct ieee80211_vif *vif)
                         if (ret < 0)
                                 return ret;
                 } else if (!wl->sta_count) {
-                        /* Configure for ELP power saving */
-                        ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_ELP);
-                        if (ret < 0)
-                                return ret;
+                        if (wl->quirks & WLCORE_QUIRK_NO_ELP) {
+                                /* Configure for power always on */
+                                ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);
+                                if (ret < 0)
+                                        return ret;
+                        } else {
+                                /* Configure for ELP power saving */
+                                ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_ELP);
+                                if (ret < 0)
+                                        return ret;
+                        }
                 }
         }
 
@@ -652,6 +639,10 @@ int wl1271_init_vif_specific(struct wl1271 *wl, struct ieee80211_vif *vif)
         if (ret < 0)
                 return ret;
 
+        ret = wlcore_hw_init_vif(wl, wlvif);
+        if (ret < 0)
+                return ret;
+
         return 0;
 }
 
@@ -659,27 +650,8 @@ int wl1271_hw_init(struct wl1271 *wl)
 {
         int ret;
 
-        if (wl->chip.id == CHIP_ID_1283_PG20) {
-                ret = wl128x_cmd_general_parms(wl);
-                if (ret < 0)
-                        return ret;
-                ret = wl128x_cmd_radio_parms(wl);
-                if (ret < 0)
-                        return ret;
-        } else {
-                ret = wl1271_cmd_general_parms(wl);
-                if (ret < 0)
-                        return ret;
-                ret = wl1271_cmd_radio_parms(wl);
-                if (ret < 0)
-                        return ret;
-                ret = wl1271_cmd_ext_radio_parms(wl);
-                if (ret < 0)
-                        return ret;
-        }
-
-        /* Chip-specific init */
-        ret = wl1271_chip_specific_init(wl);
+        /* Chip-specific hw init */
+        ret = wl->ops->hw_init(wl);
         if (ret < 0)
                 return ret;
 
diff --git a/drivers/net/wireless/wl12xx/init.h b/drivers/net/wireless/ti/wlcore/init.h
index 2da0f404ef6e..a45fbfddec19 100644
--- a/drivers/net/wireless/wl12xx/init.h
+++ b/drivers/net/wireless/ti/wlcore/init.h
@@ -24,7 +24,7 @@
 #ifndef __INIT_H__
 #define __INIT_H__
 
-#include "wl12xx.h"
+#include "wlcore.h"
 
 int wl1271_hw_init_power_auth(struct wl1271 *wl);
 int wl1271_init_templates_config(struct wl1271 *wl);
diff --git a/drivers/net/wireless/wl12xx/io.c b/drivers/net/wireless/ti/wlcore/io.c
index c574a3b31e31..7cd0081aede5 100644
--- a/drivers/net/wireless/wl12xx/io.c
+++ b/drivers/net/wireless/ti/wlcore/io.c
@@ -26,84 +26,12 @@
 #include <linux/spi/spi.h>
 #include <linux/interrupt.h>
 
-#include "wl12xx.h"
+#include "wlcore.h"
 #include "debug.h"
 #include "wl12xx_80211.h"
 #include "io.h"
 #include "tx.h"
 
-#define OCP_CMD_LOOP  32
-
-#define OCP_CMD_WRITE 0x1
-#define OCP_CMD_READ  0x2
-
-#define OCP_READY_MASK  BIT(18)
-#define OCP_STATUS_MASK (BIT(16) | BIT(17))
-
-#define OCP_STATUS_NO_RESP    0x00000
-#define OCP_STATUS_OK         0x10000
-#define OCP_STATUS_REQ_FAILED 0x20000
-#define OCP_STATUS_RESP_ERROR 0x30000
-
-struct wl1271_partition_set wl12xx_part_table[PART_TABLE_LEN] = {
-        [PART_DOWN] = {
-                .mem = {
-                        .start = 0x00000000,
-                        .size  = 0x000177c0
-                },
-                .reg = {
-                        .start = REGISTERS_BASE,
-                        .size  = 0x00008800
-                },
-                .mem2 = {
-                        .start = 0x00000000,
-                        .size  = 0x00000000
-                },
-                .mem3 = {
-                        .start = 0x00000000,
-                        .size  = 0x00000000
-                },
-        },
-
-        [PART_WORK] = {
-                .mem = {
-                        .start = 0x00040000,
-                        .size  = 0x00014fc0
-                },
-                .reg = {
-                        .start = REGISTERS_BASE,
-                        .size  = 0x0000a000
-                },
-                .mem2 = {
-                        .start = 0x003004f8,
-                        .size  = 0x00000004
-                },
-                .mem3 = {
-                        .start = 0x00040404,
-                        .size  = 0x00000000
-                },
-        },
-
-        [PART_DRPW] = {
-                .mem = {
-                        .start = 0x00040000,
-                        .size  = 0x00014fc0
-                },
-                .reg = {
-                        .start = DRPW_BASE,
-                        .size  = 0x00006000
-                },
-                .mem2 = {
-                        .start = 0x00000000,
-                        .size  = 0x00000000
-                },
-                .mem3 = {
-                        .start = 0x00000000,
-                        .size  = 0x00000000
-                }
-        }
-};
-
 bool wl1271_set_block_size(struct wl1271 *wl)
 {
         if (wl->if_ops->set_block_size) {
@@ -114,17 +42,53 @@ bool wl1271_set_block_size(struct wl1271 *wl)
         return false;
 }
 
-void wl1271_disable_interrupts(struct wl1271 *wl)
+void wlcore_disable_interrupts(struct wl1271 *wl)
 {
         disable_irq(wl->irq);
 }
+EXPORT_SYMBOL_GPL(wlcore_disable_interrupts);
 
-void wl1271_enable_interrupts(struct wl1271 *wl)
+void wlcore_enable_interrupts(struct wl1271 *wl)
 {
         enable_irq(wl->irq);
 }
+EXPORT_SYMBOL_GPL(wlcore_enable_interrupts);
 
-/* Set the SPI partitions to access the chip addresses
+int wlcore_translate_addr(struct wl1271 *wl, int addr)
+{
+        struct wlcore_partition_set *part = &wl->curr_part;
+
+        /*
+         * To translate, first check to which window of addresses the
+         * particular address belongs. Then subtract the starting address
+         * of that window from the address. Then, add offset of the
+         * translated region.
+         *
+         * The translated regions occur next to each other in physical device
+         * memory, so just add the sizes of the preceding address regions to
+         * get the offset to the new region.
+         */
+        if ((addr >= part->mem.start) &&
+            (addr < part->mem.start + part->mem.size))
+                return addr - part->mem.start;
+        else if ((addr >= part->reg.start) &&
+                 (addr < part->reg.start + part->reg.size))
+                return addr - part->reg.start + part->mem.size;
+        else if ((addr >= part->mem2.start) &&
+                 (addr < part->mem2.start + part->mem2.size))
+                return addr - part->mem2.start + part->mem.size +
+                        part->reg.size;
+        else if ((addr >= part->mem3.start) &&
+                 (addr < part->mem3.start + part->mem3.size))
+                return addr - part->mem3.start + part->mem.size +
+                        part->reg.size + part->mem2.size;
+
+        WARN(1, "HW address 0x%x out of range", addr);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(wlcore_translate_addr);
+
+/* Set the partitions to access the chip addresses
  *
  * To simplify driver code, a fixed (virtual) memory map is defined for
  * register and memory addresses. Because in the chipset, in different stages
@@ -158,33 +122,43 @@ void wl1271_enable_interrupts(struct wl1271 *wl)
  *                                    |    |
  *
  */
-int wl1271_set_partition(struct wl1271 *wl,
-                         struct wl1271_partition_set *p)
+void wlcore_set_partition(struct wl1271 *wl,
+                          const struct wlcore_partition_set *p)
 {
         /* copy partition info */
-        memcpy(&wl->part, p, sizeof(*p));
+        memcpy(&wl->curr_part, p, sizeof(*p));
 
-        wl1271_debug(DEBUG_SPI, "mem_start %08X mem_size %08X",
+        wl1271_debug(DEBUG_IO, "mem_start %08X mem_size %08X",
                      p->mem.start, p->mem.size);
-        wl1271_debug(DEBUG_SPI, "reg_start %08X reg_size %08X",
+        wl1271_debug(DEBUG_IO, "reg_start %08X reg_size %08X",
                      p->reg.start, p->reg.size);
-        wl1271_debug(DEBUG_SPI, "mem2_start %08X mem2_size %08X",
+        wl1271_debug(DEBUG_IO, "mem2_start %08X mem2_size %08X",
                      p->mem2.start, p->mem2.size);
-        wl1271_debug(DEBUG_SPI, "mem3_start %08X mem3_size %08X",
+        wl1271_debug(DEBUG_IO, "mem3_start %08X mem3_size %08X",
                      p->mem3.start, p->mem3.size);
 
-        /* write partition info to the chipset */
         wl1271_raw_write32(wl, HW_PART0_START_ADDR, p->mem.start);
         wl1271_raw_write32(wl, HW_PART0_SIZE_ADDR, p->mem.size);
         wl1271_raw_write32(wl, HW_PART1_START_ADDR, p->reg.start);
         wl1271_raw_write32(wl, HW_PART1_SIZE_ADDR, p->reg.size);
         wl1271_raw_write32(wl, HW_PART2_START_ADDR, p->mem2.start);
         wl1271_raw_write32(wl, HW_PART2_SIZE_ADDR, p->mem2.size);
+        /*
+         * We don't need the size of the last partition, as it is
+         * automatically calculated based on the total memory size and
+         * the sizes of the previous partitions.
+         */
         wl1271_raw_write32(wl, HW_PART3_START_ADDR, p->mem3.start);
+}
+EXPORT_SYMBOL_GPL(wlcore_set_partition);
 
-        return 0;
+void wlcore_select_partition(struct wl1271 *wl, u8 part)
+{
+        wl1271_debug(DEBUG_IO, "setting partition %d", part);
+
+        wlcore_set_partition(wl, &wl->ptable[part]);
 }
-EXPORT_SYMBOL_GPL(wl1271_set_partition);
+EXPORT_SYMBOL_GPL(wlcore_select_partition);
 
 void wl1271_io_reset(struct wl1271 *wl)
 {
@@ -197,48 +171,3 @@ void wl1271_io_init(struct wl1271 *wl)
         if (wl->if_ops->init)
                 wl->if_ops->init(wl->dev);
 }
-
-void wl1271_top_reg_write(struct wl1271 *wl, int addr, u16 val)
-{
-        /* write address >> 1 + 0x30000 to OCP_POR_CTR */
-        addr = (addr >> 1) + 0x30000;
-        wl1271_write32(wl, OCP_POR_CTR, addr);
-
-        /* write value to OCP_POR_WDATA */
-        wl1271_write32(wl, OCP_DATA_WRITE, val);
-
-        /* write 1 to OCP_CMD */
-        wl1271_write32(wl, OCP_CMD, OCP_CMD_WRITE);
-}
-
-u16 wl1271_top_reg_read(struct wl1271 *wl, int addr)
-{
-        u32 val;
-        int timeout = OCP_CMD_LOOP;
-
-        /* write address >> 1 + 0x30000 to OCP_POR_CTR */
-        addr = (addr >> 1) + 0x30000;
-        wl1271_write32(wl, OCP_POR_CTR, addr);
-
-        /* write 2 to OCP_CMD */
-        wl1271_write32(wl, OCP_CMD, OCP_CMD_READ);
-
-        /* poll for data ready */
-        do {
-                val = wl1271_read32(wl, OCP_DATA_READ);
-        } while (!(val & OCP_READY_MASK) && --timeout);
-
-        if (!timeout) {
-                wl1271_warning("Top register access timed out.");
-                return 0xffff;
-        }
-
-        /* check data status and return if OK */
-        if ((val & OCP_STATUS_MASK) == OCP_STATUS_OK)
-                return val & 0xffff;
-        else {
-                wl1271_warning("Top register access returned error.");
-                return 0xffff;
-        }
-}
-
diff --git a/drivers/net/wireless/wl12xx/io.h b/drivers/net/wireless/ti/wlcore/io.h
index 4fb3dab8c3b2..8942954b56a0 100644
--- a/drivers/net/wireless/wl12xx/io.h
+++ b/drivers/net/wireless/ti/wlcore/io.h
@@ -26,7 +26,6 @@
 #define __IO_H__
 
 #include <linux/irqreturn.h>
-#include "reg.h"
 
 #define HW_ACCESS_MEMORY_MAX_RANGE      0x1FFC0
 
@@ -43,15 +42,14 @@
 
 #define HW_ACCESS_PRAM_MAX_RANGE        0x3c000
 
-extern struct wl1271_partition_set wl12xx_part_table[PART_TABLE_LEN];
-
 struct wl1271;
 
-void wl1271_disable_interrupts(struct wl1271 *wl);
-void wl1271_enable_interrupts(struct wl1271 *wl);
+void wlcore_disable_interrupts(struct wl1271 *wl);
+void wlcore_enable_interrupts(struct wl1271 *wl);
 
 void wl1271_io_reset(struct wl1271 *wl);
 void wl1271_io_init(struct wl1271 *wl);
+int wlcore_translate_addr(struct wl1271 *wl, int addr);
 
 /* Raw target IO, address is not translated */
 static inline void wl1271_raw_write(struct wl1271 *wl, int addr, void *buf,
@@ -66,6 +64,18 @@ static inline void wl1271_raw_read(struct wl1271 *wl, int addr, void *buf,
         wl->if_ops->read(wl->dev, addr, buf, len, fixed);
 }
 
+static inline void wlcore_raw_read_data(struct wl1271 *wl, int reg, void *buf,
+                                        size_t len, bool fixed)
+{
+        wl1271_raw_read(wl, wl->rtable[reg], buf, len, fixed);
+}
+
+static inline void wlcore_raw_write_data(struct wl1271 *wl, int reg, void *buf,
+                                         size_t len, bool fixed)
+{
+        wl1271_raw_write(wl, wl->rtable[reg], buf, len, fixed);
+}
+
 static inline u32 wl1271_raw_read32(struct wl1271 *wl, int addr)
 {
         wl1271_raw_read(wl, addr, &wl->buffer_32,
@@ -81,36 +91,12 @@ static inline void wl1271_raw_write32(struct wl1271 *wl, int addr, u32 val)
                              sizeof(wl->buffer_32), false);
 }
 
-/* Translated target IO */
-static inline int wl1271_translate_addr(struct wl1271 *wl, int addr)
-{
-        /*
-         * To translate, first check to which window of addresses the
-         * particular address belongs. Then subtract the starting address
-         * of that window from the address. Then, add offset of the
-         * translated region.
-         *
-         * The translated regions occur next to each other in physical device
-         * memory, so just add the sizes of the preceding address regions to
-         * get the offset to the new region.
-         *
-         * Currently, only the two first regions are addressed, and the
-         * assumption is that all addresses will fall into either of those
-         * two.
-         */
-        if ((addr >= wl->part.reg.start) &&
-            (addr < wl->part.reg.start + wl->part.reg.size))
-                return addr - wl->part.reg.start + wl->part.mem.size;
-        else
-                return addr - wl->part.mem.start;
-}
-
 static inline void wl1271_read(struct wl1271 *wl, int addr, void *buf,
                                size_t len, bool fixed)
 {
         int physical;
 
-        physical = wl1271_translate_addr(wl, addr);
+        physical = wlcore_translate_addr(wl, addr);
 
         wl1271_raw_read(wl, physical, buf, len, fixed);
 }
@@ -120,11 +106,23 @@ static inline void wl1271_write(struct wl1271 *wl, int addr, void *buf,
 {
         int physical;
 
-        physical = wl1271_translate_addr(wl, addr);
+        physical = wlcore_translate_addr(wl, addr);
 
         wl1271_raw_write(wl, physical, buf, len, fixed);
 }
 
+static inline void wlcore_write_data(struct wl1271 *wl, int reg, void *buf,
+                                     size_t len, bool fixed)
+{
+        wl1271_write(wl, wl->rtable[reg], buf, len, fixed);
+}
+
+static inline void wlcore_read_data(struct wl1271 *wl, int reg, void *buf,
+                                    size_t len, bool fixed)
+{
+        wl1271_read(wl, wl->rtable[reg], buf, len, fixed);
+}
+
 static inline void wl1271_read_hwaddr(struct wl1271 *wl, int hwaddr,
                                       void *buf, size_t len, bool fixed)
 {
@@ -134,19 +132,30 @@ static inline void wl1271_read_hwaddr(struct wl1271 *wl, int hwaddr,
         /* Addresses are stored internally as addresses to 32 bytes blocks */
         addr = hwaddr << 5;
 
-        physical = wl1271_translate_addr(wl, addr);
+        physical = wlcore_translate_addr(wl, addr);
 
         wl1271_raw_read(wl, physical, buf, len, fixed);
 }
 
 static inline u32 wl1271_read32(struct wl1271 *wl, int addr)
 {
-        return wl1271_raw_read32(wl, wl1271_translate_addr(wl, addr));
+        return wl1271_raw_read32(wl, wlcore_translate_addr(wl, addr));
 }
 
 static inline void wl1271_write32(struct wl1271 *wl, int addr, u32 val)
 {
-        wl1271_raw_write32(wl, wl1271_translate_addr(wl, addr), val);
+        wl1271_raw_write32(wl, wlcore_translate_addr(wl, addr), val);
+}
+
+static inline u32 wlcore_read_reg(struct wl1271 *wl, int reg)
+{
+        return wl1271_raw_read32(wl,
+                                 wlcore_translate_addr(wl, wl->rtable[reg]));
+}
+
+static inline void wlcore_write_reg(struct wl1271 *wl, int reg, u32 val)
+{
+        wl1271_raw_write32(wl, wlcore_translate_addr(wl, wl->rtable[reg]), val);
 }
 
 static inline void wl1271_power_off(struct wl1271 *wl)
@@ -164,13 +173,8 @@ static inline int wl1271_power_on(struct wl1271 *wl)
         return ret;
 }
 
-
-/* Top Register IO */
-void wl1271_top_reg_write(struct wl1271 *wl, int addr, u16 val);
-u16 wl1271_top_reg_read(struct wl1271 *wl, int addr);
-
-int wl1271_set_partition(struct wl1271 *wl,
-                         struct wl1271_partition_set *p);
+void wlcore_set_partition(struct wl1271 *wl,
+                          const struct wlcore_partition_set *p);
 
 bool wl1271_set_block_size(struct wl1271 *wl);
 
@@ -178,4 +182,6 @@ bool wl1271_set_block_size(struct wl1271 *wl);
 
 int wl1271_tx_dummy_packet(struct wl1271 *wl);
 
+void wlcore_select_partition(struct wl1271 *wl, u8 part);
+
 #endif
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 39002363611e..2b0f987660c6 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -35,10 +35,9 @@
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 
-#include "wl12xx.h"
+#include "wlcore.h"
 #include "debug.h"
 #include "wl12xx_80211.h"
-#include "reg.h"
 #include "io.h"
 #include "event.h"
 #include "tx.h"
@@ -50,342 +49,15 @@
 #include "boot.h"
 #include "testmode.h"
 #include "scan.h"
+#include "hw_ops.h"
 
 #define WL1271_BOOT_RETRIES 3
 
-static struct conf_drv_settings default_conf = {
-        .sg = {
-                .params = {
-                        [CONF_SG_ACL_BT_MASTER_MIN_BR] = 10,
-                        [CONF_SG_ACL_BT_MASTER_MAX_BR] = 180,
-                        [CONF_SG_ACL_BT_SLAVE_MIN_BR] = 10,
-                        [CONF_SG_ACL_BT_SLAVE_MAX_BR] = 180,
-                        [CONF_SG_ACL_BT_MASTER_MIN_EDR] = 10,
-                        [CONF_SG_ACL_BT_MASTER_MAX_EDR] = 80,
-                        [CONF_SG_ACL_BT_SLAVE_MIN_EDR] = 10,
-                        [CONF_SG_ACL_BT_SLAVE_MAX_EDR] = 80,
-                        [CONF_SG_ACL_WLAN_PS_MASTER_BR] = 8,
-                        [CONF_SG_ACL_WLAN_PS_SLAVE_BR] = 8,
-                        [CONF_SG_ACL_WLAN_PS_MASTER_EDR] = 20,
-                        [CONF_SG_ACL_WLAN_PS_SLAVE_EDR] = 20,
-                        [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MIN_BR] = 20,
-                        [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MAX_BR] = 35,
-                        [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MIN_BR] = 16,
-                        [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MAX_BR] = 35,
-                        [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MIN_EDR] = 32,
-                        [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MAX_EDR] = 50,
-                        [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MIN_EDR] = 28,
-                        [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MAX_EDR] = 50,
-                        [CONF_SG_ACL_ACTIVE_SCAN_WLAN_BR] = 10,
-                        [CONF_SG_ACL_ACTIVE_SCAN_WLAN_EDR] = 20,
-                        [CONF_SG_ACL_PASSIVE_SCAN_BT_BR] = 75,
-                        [CONF_SG_ACL_PASSIVE_SCAN_WLAN_BR] = 15,
-                        [CONF_SG_ACL_PASSIVE_SCAN_BT_EDR] = 27,
-                        [CONF_SG_ACL_PASSIVE_SCAN_WLAN_EDR] = 17,
-                        /* active scan params */
-                        [CONF_SG_AUTO_SCAN_PROBE_REQ] = 170,
-                        [CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_HV3] = 50,
-                        [CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_A2DP] = 100,
-                        /* passive scan params */
-                        [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_A2DP_BR] = 800,
-                        [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_A2DP_EDR] = 200,
-                        [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_HV3] = 200,
-                        /* passive scan in dual antenna params */
-                        [CONF_SG_CONSECUTIVE_HV3_IN_PASSIVE_SCAN] = 0,
-                        [CONF_SG_BCN_HV3_COLLISION_THRESH_IN_PASSIVE_SCAN] = 0,
-                        [CONF_SG_TX_RX_PROTECTION_BWIDTH_IN_PASSIVE_SCAN] = 0,
-                        /* general params */
-                        [CONF_SG_STA_FORCE_PS_IN_BT_SCO] = 1,
-                        [CONF_SG_ANTENNA_CONFIGURATION] = 0,
-                        [CONF_SG_BEACON_MISS_PERCENT] = 60,
-                        [CONF_SG_DHCP_TIME] = 5000,
-                        [CONF_SG_RXT] = 1200,
-                        [CONF_SG_TXT] = 1000,
-                        [CONF_SG_ADAPTIVE_RXT_TXT] = 1,
-                        [CONF_SG_GENERAL_USAGE_BIT_MAP] = 3,
-                        [CONF_SG_HV3_MAX_SERVED] = 6,
-                        [CONF_SG_PS_POLL_TIMEOUT] = 10,
-                        [CONF_SG_UPSD_TIMEOUT] = 10,
-                        [CONF_SG_CONSECUTIVE_CTS_THRESHOLD] = 2,
-                        [CONF_SG_STA_RX_WINDOW_AFTER_DTIM] = 5,
-                        [CONF_SG_STA_CONNECTION_PROTECTION_TIME] = 30,
-                        /* AP params */
-                        [CONF_AP_BEACON_MISS_TX] = 3,
-                        [CONF_AP_RX_WINDOW_AFTER_BEACON] = 10,
-                        [CONF_AP_BEACON_WINDOW_INTERVAL] = 2,
-                        [CONF_AP_CONNECTION_PROTECTION_TIME] = 0,
-                        [CONF_AP_BT_ACL_VAL_BT_SERVE_TIME] = 25,
-                        [CONF_AP_BT_ACL_VAL_WL_SERVE_TIME] = 25,
-                        /* CTS Diluting params */
-                        [CONF_SG_CTS_DILUTED_BAD_RX_PACKETS_TH] = 0,
-                        [CONF_SG_CTS_CHOP_IN_DUAL_ANT_SCO_MASTER] = 0,
-                },
-                .state = CONF_SG_PROTECTIVE,
-        },
-        .rx = {
-                .rx_msdu_life_time           = 512000,
-                .packet_detection_threshold  = 0,
-                .ps_poll_timeout             = 15,
-                .upsd_timeout                = 15,
-                .rts_threshold               = IEEE80211_MAX_RTS_THRESHOLD,
-                .rx_cca_threshold            = 0,
-                .irq_blk_threshold           = 0xFFFF,
-                .irq_pkt_threshold           = 0,
-                .irq_timeout                 = 600,
-                .queue_type                  = CONF_RX_QUEUE_TYPE_LOW_PRIORITY,
-        },
-        .tx = {
-                .tx_energy_detection         = 0,
-                .sta_rc_conf                 = {
-                        .enabled_rates       = 0,
-                        .short_retry_limit   = 10,
-                        .long_retry_limit    = 10,
-                        .aflags              = 0,
-                },
-                .ac_conf_count               = 4,
-                .ac_conf                     = {
-                        [CONF_TX_AC_BE] = {
-                                .ac          = CONF_TX_AC_BE,
-                                .cw_min      = 15,
-                                .cw_max      = 63,
-                                .aifsn       = 3,
-                                .tx_op_limit = 0,
-                        },
-                        [CONF_TX_AC_BK] = {
-                                .ac          = CONF_TX_AC_BK,
-                                .cw_min      = 15,
-                                .cw_max      = 63,
-                                .aifsn       = 7,
-                                .tx_op_limit = 0,
-                        },
-                        [CONF_TX_AC_VI] = {
-                                .ac          = CONF_TX_AC_VI,
-                                .cw_min      = 15,
-                                .cw_max      = 63,
-                                .aifsn       = CONF_TX_AIFS_PIFS,
-                                .tx_op_limit = 3008,
-                        },
-                        [CONF_TX_AC_VO] = {
-                                .ac          = CONF_TX_AC_VO,
-                                .cw_min      = 15,
-                                .cw_max      = 63,
-                                .aifsn       = CONF_TX_AIFS_PIFS,
-                                .tx_op_limit = 1504,
-                        },
-                },
-                .max_tx_retries = 100,
-                .ap_aging_period = 300,
-                .tid_conf_count = 4,
-                .tid_conf = {
-                        [CONF_TX_AC_BE] = {
-                                .queue_id    = CONF_TX_AC_BE,
-                                .channel_type = CONF_CHANNEL_TYPE_EDCF,
-                                .tsid        = CONF_TX_AC_BE,
-                                .ps_scheme   = CONF_PS_SCHEME_LEGACY,
-                                .ack_policy  = CONF_ACK_POLICY_LEGACY,
-                                .apsd_conf   = {0, 0},
-                        },
-                        [CONF_TX_AC_BK] = {
-                                .queue_id    = CONF_TX_AC_BK,
-                                .channel_type = CONF_CHANNEL_TYPE_EDCF,
-                                .tsid        = CONF_TX_AC_BK,
-                                .ps_scheme   = CONF_PS_SCHEME_LEGACY,
-                                .ack_policy  = CONF_ACK_POLICY_LEGACY,
-                                .apsd_conf   = {0, 0},
-                        },
-                        [CONF_TX_AC_VI] = {
-                                .queue_id    = CONF_TX_AC_VI,
-                                .channel_type = CONF_CHANNEL_TYPE_EDCF,
-                                .tsid        = CONF_TX_AC_VI,
-                                .ps_scheme   = CONF_PS_SCHEME_LEGACY,
-                                .ack_policy  = CONF_ACK_POLICY_LEGACY,
-                                .apsd_conf   = {0, 0},
-                        },
-                        [CONF_TX_AC_VO] = {
-                                .queue_id    = CONF_TX_AC_VO,
-                                .channel_type = CONF_CHANNEL_TYPE_EDCF,
-                                .tsid        = CONF_TX_AC_VO,
-                                .ps_scheme   = CONF_PS_SCHEME_LEGACY,
-                                .ack_policy  = CONF_ACK_POLICY_LEGACY,
-                                .apsd_conf   = {0, 0},
-                        },
-                },
-                .frag_threshold              = IEEE80211_MAX_FRAG_THRESHOLD,
-                .tx_compl_timeout            = 700,
-                .tx_compl_threshold          = 4,
-                .basic_rate                  = CONF_HW_BIT_RATE_1MBPS,
-                .basic_rate_5                = CONF_HW_BIT_RATE_6MBPS,
-                .tmpl_short_retry_limit      = 10,
-                .tmpl_long_retry_limit       = 10,
-                .tx_watchdog_timeout         = 5000,
-        },
-        .conn = {
-                .wake_up_event               = CONF_WAKE_UP_EVENT_DTIM,
-                .listen_interval             = 1,
-                .suspend_wake_up_event       = CONF_WAKE_UP_EVENT_N_DTIM,
-                .suspend_listen_interval     = 3,
-                .bcn_filt_mode               = CONF_BCN_FILT_MODE_ENABLED,
-                .bcn_filt_ie_count           = 2,
-                .bcn_filt_ie = {
-                        [0] = {
-                                .ie          = WLAN_EID_CHANNEL_SWITCH,
-                                .rule        = CONF_BCN_RULE_PASS_ON_APPEARANCE,
-                        },
-                        [1] = {
-                                .ie          = WLAN_EID_HT_INFORMATION,
-                                .rule        = CONF_BCN_RULE_PASS_ON_CHANGE,
-                        },
-                },
-                .synch_fail_thold            = 10,
-                .bss_lose_timeout            = 100,
-                .beacon_rx_timeout           = 10000,
-                .broadcast_timeout           = 20000,
-                .rx_broadcast_in_ps          = 1,
-                .ps_poll_threshold           = 10,
-                .bet_enable                  = CONF_BET_MODE_ENABLE,
-                .bet_max_consecutive         = 50,
-                .psm_entry_retries           = 8,
-                .psm_exit_retries            = 16,
-                .psm_entry_nullfunc_retries  = 3,
-                .dynamic_ps_timeout          = 200,
-                .forced_ps                   = false,
-                .keep_alive_interval         = 55000,
-                .max_listen_interval         = 20,
-        },
-        .itrim = {
-                .enable = false,
-                .timeout = 50000,
-        },
-        .pm_config = {
-                .host_clk_settling_time = 5000,
-                .host_fast_wakeup_support = false
-        },
-        .roam_trigger = {
-                .trigger_pacing               = 1,
-                .avg_weight_rssi_beacon       = 20,
-                .avg_weight_rssi_data         = 10,
-                .avg_weight_snr_beacon        = 20,
-                .avg_weight_snr_data          = 10,
-        },
-        .scan = {
-                .min_dwell_time_active        = 7500,
-                .max_dwell_time_active        = 30000,
-                .min_dwell_time_passive       = 100000,
-                .max_dwell_time_passive       = 100000,
-                .num_probe_reqs               = 2,
-                .split_scan_timeout           = 50000,
-        },
-        .sched_scan = {
-                /* sched_scan requires dwell times in TU instead of TU/1000 */
-                .min_dwell_time_active = 30,
-                .max_dwell_time_active = 60,
-                .dwell_time_passive    = 100,
-                .dwell_time_dfs        = 150,
-                .num_probe_reqs        = 2,
-                .rssi_threshold        = -90,
-                .snr_threshold         = 0,
-        },
-        .rf = {
-                .tx_per_channel_power_compensation_2 = {
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                },
-                .tx_per_channel_power_compensation_5 = {
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                },
-        },
-        .ht = {
-                .rx_ba_win_size = 8,
-                .tx_ba_win_size = 64,
-                .inactivity_timeout = 10000,
-                .tx_ba_tid_bitmap = CONF_TX_BA_ENABLED_TID_BITMAP,
-        },
-        .mem_wl127x = {
-                .num_stations                 = 1,
-                .ssid_profiles                = 1,
-                .rx_block_num                 = 70,
-                .tx_min_block_num             = 40,
-                .dynamic_memory               = 1,
-                .min_req_tx_blocks            = 100,
-                .min_req_rx_blocks            = 22,
-                .tx_min                       = 27,
-        },
-        .mem_wl128x = {
-                .num_stations                 = 1,
-                .ssid_profiles                = 1,
-                .rx_block_num                 = 40,
-                .tx_min_block_num             = 40,
-                .dynamic_memory               = 1,
-                .min_req_tx_blocks            = 45,
-                .min_req_rx_blocks            = 22,
-                .tx_min                       = 27,
-        },
-        .fm_coex = {
-                .enable                       = true,
-                .swallow_period               = 5,
-                .n_divider_fref_set_1         = 0xff,       /* default */
-                .n_divider_fref_set_2         = 12,
-                .m_divider_fref_set_1         = 148,
-                .m_divider_fref_set_2         = 0xffff,     /* default */
-                .coex_pll_stabilization_time  = 0xffffffff, /* default */
-                .ldo_stabilization_time       = 0xffff,     /* default */
-                .fm_disturbed_band_margin     = 0xff,       /* default */
-                .swallow_clk_diff             = 0xff,       /* default */
-        },
-        .rx_streaming = {
-                .duration                      = 150,
-                .queues                        = 0x1,
-                .interval                      = 20,
-                .always                        = 0,
-        },
-        .fwlog = {
-                .mode                         = WL12XX_FWLOG_ON_DEMAND,
-                .mem_blocks                   = 2,
-                .severity                     = 0,
-                .timestamp                    = WL12XX_FWLOG_TIMESTAMP_DISABLED,
-                .output                       = WL12XX_FWLOG_OUTPUT_HOST,
-                .threshold                    = 0,
-        },
-        .hci_io_ds = HCI_IO_DS_6MA,
-        .rate = {
-                .rate_retry_score = 32000,
-                .per_add = 8192,
-                .per_th1 = 2048,
-                .per_th2 = 4096,
-                .max_per = 8100,
-                .inverse_curiosity_factor = 5,
-                .tx_fail_low_th = 4,
-                .tx_fail_high_th = 10,
-                .per_alpha_shift = 4,
-                .per_add_shift = 13,
-                .per_beta1_shift = 10,
-                .per_beta2_shift = 8,
-                .rate_check_up = 2,
-                .rate_check_down = 12,
-                .rate_retry_policy = {
-                        0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00,
-                },
-        },
-        .hangover = {
-                .recover_time               = 0,
-                .hangover_period            = 20,
-                .dynamic_mode               = 1,
-                .early_termination_mode     = 1,
-                .max_period                 = 20,
-                .min_period                 = 1,
-                .increase_delta             = 1,
-                .decrease_delta             = 2,
-                .quiet_time                 = 4,
-                .increase_time              = 1,
-                .window_size                = 16,
-        },
-};
+#define WL1271_BOOT_RETRIES 3
 
 static char *fwlog_param;
 static bool bug_on_recovery;
+static bool no_recovery;
 
 static void __wl1271_op_remove_interface(struct wl1271 *wl,
                                          struct ieee80211_vif *vif,
@@ -628,22 +300,8 @@ out:
         mutex_unlock(&wl->mutex);
 }
 
-static void wl1271_conf_init(struct wl1271 *wl)
+static void wlcore_adjust_conf(struct wl1271 *wl)
 {
-
-        /*
-         * This function applies the default configuration to the driver. This
-         * function is invoked upon driver load (spi probe.)
-         *
-         * The configuration is stored in a run-time structure in order to
-         * facilitate for run-time adjustment of any of the parameters. Making
-         * changes to the configuration structure will apply the new values on
-         * the next interface up (wl1271_op_start.)
-         */
-
-        /* apply driver default configuration */
-        memcpy(&wl->conf, &default_conf, sizeof(default_conf));
-
         /* Adjust settings according to optional module parameters */
         if (fwlog_param) {
                 if (!strcmp(fwlog_param, "continuous")) {
@@ -666,28 +324,7 @@ static int wl1271_plt_init(struct wl1271 *wl)
 {
         int ret;
 
-        if (wl->chip.id == CHIP_ID_1283_PG20)
-                ret = wl128x_cmd_general_parms(wl);
-        else
-                ret = wl1271_cmd_general_parms(wl);
-        if (ret < 0)
-                return ret;
-
-        if (wl->chip.id == CHIP_ID_1283_PG20)
-                ret = wl128x_cmd_radio_parms(wl);
-        else
-                ret = wl1271_cmd_radio_parms(wl);
-        if (ret < 0)
-                return ret;
-
-        if (wl->chip.id != CHIP_ID_1283_PG20) {
-                ret = wl1271_cmd_ext_radio_parms(wl);
-                if (ret < 0)
-                        return ret;
-        }
-
-        /* Chip-specific initializations */
-        ret = wl1271_chip_specific_init(wl);
+        ret = wl->ops->hw_init(wl);
         if (ret < 0)
                 return ret;
 
@@ -750,7 +387,7 @@ static void wl12xx_irq_ps_regulate_link(struct wl1271 *wl,
 
 static void wl12xx_irq_update_links_status(struct wl1271 *wl,
                                            struct wl12xx_vif *wlvif,
-                                           struct wl12xx_fw_status *status)
+                                           struct wl_fw_status *status)
 {
         struct wl1271_link *lnk;
         u32 cur_fw_ps_map;
@@ -770,9 +407,10 @@ static void wl12xx_irq_update_links_status(struct wl1271 *wl,
 
         for_each_set_bit(hlid, wlvif->ap.sta_hlid_map, WL12XX_MAX_LINKS) {
                 lnk = &wl->links[hlid];
-                cnt = status->tx_lnk_free_pkts[hlid] - lnk->prev_freed_pkts;
+                cnt = status->counters.tx_lnk_free_pkts[hlid] -
+                        lnk->prev_freed_pkts;
 
-                lnk->prev_freed_pkts = status->tx_lnk_free_pkts[hlid];
+                lnk->prev_freed_pkts = status->counters.tx_lnk_free_pkts[hlid];
                 lnk->allocated_pkts -= cnt;
 
                 wl12xx_irq_ps_regulate_link(wl, wlvif, hlid,
@@ -781,15 +419,19 @@ static void wl12xx_irq_update_links_status(struct wl1271 *wl,
 }
 
 static void wl12xx_fw_status(struct wl1271 *wl,
-                             struct wl12xx_fw_status *status)
+                             struct wl_fw_status *status)
 {
         struct wl12xx_vif *wlvif;
         struct timespec ts;
         u32 old_tx_blk_count = wl->tx_blocks_available;
         int avail, freed_blocks;
         int i;
+        size_t status_len;
+
+        status_len = sizeof(*status) + wl->fw_status_priv_len;
 
-        wl1271_raw_read(wl, FW_STATUS_ADDR, status, sizeof(*status), false);
+        wlcore_raw_read_data(wl, REG_RAW_FW_STATUS_ADDR, status,
+                             status_len, false);
 
         wl1271_debug(DEBUG_IRQ, "intr: 0x%x (fw_rx_counter = %d, "
                      "drv_rx_counter = %d, tx_results_counter = %d)",
@@ -801,10 +443,10 @@ static void wl12xx_fw_status(struct wl1271 *wl,
         for (i = 0; i < NUM_TX_QUEUES; i++) {
                 /* prevent wrap-around in freed-packets counter */
                 wl->tx_allocated_pkts[i] -=
-                                (status->tx_released_pkts[i] -
+                                (status->counters.tx_released_pkts[i] -
                                 wl->tx_pkts_freed[i]) & 0xff;
 
-                wl->tx_pkts_freed[i] = status->tx_released_pkts[i];
+                wl->tx_pkts_freed[i] = status->counters.tx_released_pkts[i];
         }
 
         /* prevent wrap-around in total blocks counter */
@@ -927,6 +569,9 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
                 smp_mb__after_clear_bit();
 
                 wl12xx_fw_status(wl, wl->fw_status);
+
+                wlcore_hw_tx_immediate_compl(wl);
+
                 intr = le32_to_cpu(wl->fw_status->intr);
                 intr &= WL1271_INTR_MASK;
                 if (!intr) {
@@ -963,9 +608,7 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
                         }
 
                         /* check for tx results */
-                        if (wl->fw_status->tx_results_counter !=
-                            (wl->tx_results_count & 0xff))
-                                wl1271_tx_complete(wl);
+                        wlcore_hw_tx_delayed_compl(wl);
 
                         /* Make sure the deferred queues don't get too long */
                         defer_count = skb_queue_len(&wl->deferred_tx_queue) +
@@ -1046,10 +689,7 @@ static int wl12xx_fetch_firmware(struct wl1271 *wl, bool plt)
 
         if (plt) {
                 fw_type = WL12XX_FW_TYPE_PLT;
-                if (wl->chip.id == CHIP_ID_1283_PG20)
-                        fw_name = WL128X_PLT_FW_NAME;
-                else
-                        fw_name = WL127X_PLT_FW_NAME;
+                fw_name = wl->plt_fw_name;
         } else {
                 /*
                  * we can't call wl12xx_get_vif_count() here because
@@ -1057,16 +697,10 @@ static int wl12xx_fetch_firmware(struct wl1271 *wl, bool plt)
                  */
                 if (wl->last_vif_count > 1) {
                         fw_type = WL12XX_FW_TYPE_MULTI;
-                        if (wl->chip.id == CHIP_ID_1283_PG20)
-                                fw_name = WL128X_FW_NAME_MULTI;
-                        else
-                                fw_name = WL127X_FW_NAME_MULTI;
+                        fw_name = wl->mr_fw_name;
                 } else {
                         fw_type = WL12XX_FW_TYPE_NORMAL;
-                        if (wl->chip.id == CHIP_ID_1283_PG20)
-                                fw_name = WL128X_FW_NAME_SINGLE;
-                        else
-                                fw_name = WL127X_FW_NAME_SINGLE;
+                        fw_name = wl->sr_fw_name;
                 }
         }
 
@@ -1173,7 +807,7 @@ static void wl12xx_read_fwlog_panic(struct wl1271 *wl)
         u32 first_addr;
         u8 *block;
 
-        if ((wl->quirks & WL12XX_QUIRK_FWLOG_NOT_IMPLEMENTED) ||
+        if ((wl->quirks & WLCORE_QUIRK_FWLOG_NOT_IMPLEMENTED) ||
             (wl->conf.fwlog.mode != WL12XX_FWLOG_ON_DEMAND) ||
             (wl->conf.fwlog.mem_blocks == 0))
                 return;
@@ -1239,11 +873,20 @@ static void wl1271_recovery_work(struct work_struct *work)
         wl12xx_read_fwlog_panic(wl);
 
         wl1271_info("Hardware recovery in progress. FW ver: %s pc: 0x%x",
-                    wl->chip.fw_ver_str, wl1271_read32(wl, SCR_PAD4));
+                    wl->chip.fw_ver_str,
+                    wlcore_read_reg(wl, REG_PC_ON_RECOVERY));
 
         BUG_ON(bug_on_recovery &&
                !test_bit(WL1271_FLAG_INTENDED_FW_RECOVERY, &wl->flags));
 
+        if (no_recovery) {
+                wl1271_info("No recovery (chosen on module load). Fw will remain stuck.");
+                clear_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags);
+                goto out_unlock;
+        }
+
+        BUG_ON(bug_on_recovery);
+
         /*
          * Advance security sequence number to overcome potential progress
          * in the firmware during recovery. This doens't hurt if the network is
@@ -1290,10 +933,7 @@ out_unlock:
 
 static void wl1271_fw_wakeup(struct wl1271 *wl)
 {
-        u32 elp_reg;
-
-        elp_reg = ELPCTRL_WAKE_UP;
-        wl1271_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG_ADDR, elp_reg);
+        wl1271_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_WAKE_UP);
 }
 
 static int wl1271_setup(struct wl1271 *wl)
@@ -1323,7 +963,7 @@ static int wl12xx_set_power_on(struct wl1271 *wl)
         wl1271_io_reset(wl);
         wl1271_io_init(wl);
 
-        wl1271_set_partition(wl, &wl12xx_part_table[PART_DOWN]);
+        wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
 
         /* ELP module wake up */
         wl1271_fw_wakeup(wl);
@@ -1348,44 +988,18 @@ static int wl12xx_chip_wakeup(struct wl1271 *wl, bool plt)
          * negligible, we use the same block size for all different
          * chip types.
          */
-        if (!wl1271_set_block_size(wl))
-                wl->quirks |= WL12XX_QUIRK_NO_BLOCKSIZE_ALIGNMENT;
-
-        switch (wl->chip.id) {
-        case CHIP_ID_1271_PG10:
-                wl1271_warning("chip id 0x%x (1271 PG10) support is obsolete",
-                               wl->chip.id);
+        if (wl1271_set_block_size(wl))
+                wl->quirks |= WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN;
 
-                ret = wl1271_setup(wl);
-                if (ret < 0)
-                        goto out;
-                wl->quirks |= WL12XX_QUIRK_NO_BLOCKSIZE_ALIGNMENT;
-                break;
-
-        case CHIP_ID_1271_PG20:
-                wl1271_debug(DEBUG_BOOT, "chip id 0x%x (1271 PG20)",
-                             wl->chip.id);
-
-                ret = wl1271_setup(wl);
-                if (ret < 0)
-                        goto out;
-                wl->quirks |= WL12XX_QUIRK_NO_BLOCKSIZE_ALIGNMENT;
-                break;
+        ret = wl->ops->identify_chip(wl);
+        if (ret < 0)
+                goto out;
 
-        case CHIP_ID_1283_PG20:
-                wl1271_debug(DEBUG_BOOT, "chip id 0x%x (1283 PG20)",
-                             wl->chip.id);
+        /* TODO: make sure the lower driver has set things up correctly */
 
-                ret = wl1271_setup(wl);
-                if (ret < 0)
-                        goto out;
-                break;
-        case CHIP_ID_1283_PG10:
-        default:
-                wl1271_warning("unsupported chip id: 0x%x", wl->chip.id);
-                ret = -ENODEV;
+        ret = wl1271_setup(wl);
+        if (ret < 0)
                 goto out;
-        }
 
         ret = wl12xx_fetch_firmware(wl, plt);
         if (ret < 0)
@@ -1425,7 +1039,7 @@ int wl1271_plt_start(struct wl1271 *wl)
                 if (ret < 0)
                         goto power_off;
 
-                ret = wl1271_boot(wl);
+                ret = wl->ops->boot(wl);
                 if (ret < 0)
                         goto power_off;
 
@@ -1454,7 +1068,7 @@ irq_disable:
                    work function will not do anything.) Also, any other
                    possible concurrent operations will fail due to the
                    current state, hence the wl1271 struct should be safe. */
-                wl1271_disable_interrupts(wl);
+                wlcore_disable_interrupts(wl);
                 wl1271_flush_deferred_work(wl);
                 cancel_work_sync(&wl->netstack_work);
                 mutex_lock(&wl->mutex);
@@ -1481,7 +1095,7 @@ int wl1271_plt_stop(struct wl1271 *wl)
          * Otherwise, the interrupt handler might be called and exit without
          * reading the interrupt status.
          */
-        wl1271_disable_interrupts(wl);
+        wlcore_disable_interrupts(wl);
         mutex_lock(&wl->mutex);
         if (!wl->plt) {
                 mutex_unlock(&wl->mutex);
@@ -1491,7 +1105,7 @@ int wl1271_plt_stop(struct wl1271 *wl)
                  * may have been disabled when op_stop was called. It will,
                  * however, balance the above call to disable_interrupts().
                  */
-                wl1271_enable_interrupts(wl);
+                wlcore_enable_interrupts(wl);
 
                 wl1271_error("cannot power down because not in PLT "
                              "state: %d", wl->state);
@@ -1652,14 +1266,12 @@ static int wl1271_configure_suspend_sta(struct wl1271 *wl,
 {
         int ret = 0;
 
-        mutex_lock(&wl->mutex);
-
         if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))
-                goto out_unlock;
+                goto out;
 
         ret = wl1271_ps_elp_wakeup(wl);
         if (ret < 0)
-                goto out_unlock;
+                goto out;
 
         ret = wl1271_acx_wake_up_conditions(wl, wlvif,
                                     wl->conf.conn.suspend_wake_up_event,
@@ -1668,11 +1280,9 @@ static int wl1271_configure_suspend_sta(struct wl1271 *wl,
         if (ret < 0)
                 wl1271_error("suspend: set wake up conditions failed: %d", ret);
 
-
         wl1271_ps_elp_sleep(wl);
 
-out_unlock:
-        mutex_unlock(&wl->mutex);
+out:
         return ret;
 
 }
@@ -1682,20 +1292,17 @@ static int wl1271_configure_suspend_ap(struct wl1271 *wl,
 {
         int ret = 0;
 
-        mutex_lock(&wl->mutex);
-
         if (!test_bit(WLVIF_FLAG_AP_STARTED, &wlvif->flags))
-                goto out_unlock;
+                goto out;
 
         ret = wl1271_ps_elp_wakeup(wl);
         if (ret < 0)
-                goto out_unlock;
+                goto out;
 
         ret = wl1271_acx_beacon_filter_opt(wl, wlvif, true);
 
         wl1271_ps_elp_sleep(wl);
-out_unlock:
-        mutex_unlock(&wl->mutex);
+out:
         return ret;
 
 }
@@ -1720,10 +1327,9 @@ static void wl1271_configure_resume(struct wl1271 *wl,
         if ((!is_ap) && (!is_sta))
                 return;
 
-        mutex_lock(&wl->mutex);
         ret = wl1271_ps_elp_wakeup(wl);
         if (ret < 0)
-                goto out;
+                return;
 
         if (is_sta) {
                 ret = wl1271_acx_wake_up_conditions(wl, wlvif,
@@ -1739,8 +1345,6 @@ static void wl1271_configure_resume(struct wl1271 *wl,
         }
 
         wl1271_ps_elp_sleep(wl);
-out:
-        mutex_unlock(&wl->mutex);
 }
 
 static int wl1271_op_suspend(struct ieee80211_hw *hw,
@@ -1755,6 +1359,7 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw,
 
         wl1271_tx_flush(wl);
 
+        mutex_lock(&wl->mutex);
         wl->wow_enabled = true;
         wl12xx_for_each_wlvif(wl, wlvif) {
                 ret = wl1271_configure_suspend(wl, wlvif);
@@ -1763,6 +1368,7 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw,
                         return ret;
                 }
         }
+        mutex_unlock(&wl->mutex);
         /* flush any remaining work */
         wl1271_debug(DEBUG_MAC80211, "flushing remaining works");
 
@@ -1770,7 +1376,7 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw,
          * disable and re-enable interrupts in order to flush
          * the threaded_irq
          */
-        wl1271_disable_interrupts(wl);
+        wlcore_disable_interrupts(wl);
 
         /*
          * set suspended flag to avoid triggering a new threaded_irq
@@ -1778,7 +1384,7 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw,
          */
         set_bit(WL1271_FLAG_SUSPENDED, &wl->flags);
 
-        wl1271_enable_interrupts(wl);
+        wlcore_enable_interrupts(wl);
         flush_work(&wl->tx_work);
         flush_delayed_work(&wl->elp_work);
 
@@ -1810,12 +1416,15 @@ static int wl1271_op_resume(struct ieee80211_hw *hw)
                 wl1271_debug(DEBUG_MAC80211,
                              "run postponed irq_work directly");
                 wl1271_irq(0, wl);
-                wl1271_enable_interrupts(wl);
+                wlcore_enable_interrupts(wl);
         }
+
+        mutex_lock(&wl->mutex);
         wl12xx_for_each_wlvif(wl, wlvif) {
                 wl1271_configure_resume(wl, wlvif);
         }
         wl->wow_enabled = false;
+        mutex_unlock(&wl->mutex);
 
         return 0;
 }
@@ -1851,7 +1460,7 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)
          * Otherwise, the interrupt handler might be called and exit without
          * reading the interrupt status.
          */
-        wl1271_disable_interrupts(wl);
+        wlcore_disable_interrupts(wl);
         mutex_lock(&wl->mutex);
         if (wl->state == WL1271_STATE_OFF) {
                 mutex_unlock(&wl->mutex);
@@ -1861,7 +1470,7 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)
                  * may have been disabled when op_stop was called. It will,
                  * however, balance the above call to disable_interrupts().
                  */
-                wl1271_enable_interrupts(wl);
+                wlcore_enable_interrupts(wl);
                 return;
         }
 
@@ -1894,7 +1503,6 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)
         wl->tx_results_count = 0;
         wl->tx_packets_count = 0;
         wl->time_offset = 0;
-        wl->tx_spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;
         wl->ap_fw_ps_map = 0;
         wl->ap_ps_map = 0;
         wl->sched_scanning = false;
@@ -2067,7 +1675,7 @@ static bool wl12xx_init_fw(struct wl1271 *wl)
                 if (ret < 0)
                         goto power_off;
 
-                ret = wl1271_boot(wl);
+                ret = wl->ops->boot(wl);
                 if (ret < 0)
                         goto power_off;
 
@@ -2087,7 +1695,7 @@ irq_disable:
                    work function will not do anything.) Also, any other
                    possible concurrent operations will fail due to the
                    current state, hence the wl1271 struct should be safe. */
-                wl1271_disable_interrupts(wl);
+                wlcore_disable_interrupts(wl);
                 wl1271_flush_deferred_work(wl);
                 cancel_work_sync(&wl->netstack_work);
                 mutex_lock(&wl->mutex);
@@ -2360,10 +1968,12 @@ deinit:
                 for (i = 0; i < CONF_TX_MAX_AC_COUNT; i++)
                         wl12xx_free_rate_policy(wl,
                                                 &wlvif->ap.ucast_rate_idx[i]);
+                wl1271_free_ap_keys(wl, wlvif);
         }
 
+        dev_kfree_skb(wlvif->probereq);
+        wlvif->probereq = NULL;
         wl12xx_tx_reset_wlvif(wl, wlvif);
-        wl1271_free_ap_keys(wl, wlvif);
         if (wl->last_wlvif == wlvif)
                 wl->last_wlvif = NULL;
         list_del(&wlvif->list);
@@ -2946,6 +2556,17 @@ static int wl1271_set_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         int ret;
         bool is_ap = (wlvif->bss_type == BSS_TYPE_AP_BSS);
 
+        /*
+         * A role set to GEM cipher requires different Tx settings (namely
+         * spare blocks). Note when we are in this mode so the HW can adjust.
+         */
+        if (key_type == KEY_GEM) {
+                if (action == KEY_ADD_OR_REPLACE)
+                        wlvif->is_gem = true;
+                else if (action == KEY_REMOVE)
+                        wlvif->is_gem = false;
+        }
+
         if (is_ap) {
                 struct wl1271_station *wl_sta;
                 u8 hlid;
@@ -2984,17 +2605,6 @@ static int wl1271_set_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                         0xff, 0xff, 0xff, 0xff, 0xff, 0xff
                 };
 
-                /*
-                 * A STA set to GEM cipher requires 2 tx spare blocks.
-                 * Return to default value when GEM cipher key is removed
-                 */
-                if (key_type == KEY_GEM) {
-                        if (action == KEY_ADD_OR_REPLACE)
-                                wl->tx_spare_blocks = 2;
-                        else if (action == KEY_REMOVE)
-                                wl->tx_spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;
-                }
-
                 addr = sta ? sta->addr : bcast_addr;
 
                 if (is_zero_ether_addr(addr)) {
@@ -3791,8 +3401,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
                 wlvif->rssi_thold = bss_conf->cqm_rssi_thold;
         }
 
-        if (changed & BSS_CHANGED_BSSID &&
-            (is_ibss || bss_conf->assoc))
+        if (changed & BSS_CHANGED_BSSID)
                 if (!is_zero_ether_addr(bss_conf->bssid)) {
                         ret = wl12xx_cmd_build_null_data(wl, wlvif);
                         if (ret < 0)
@@ -3801,9 +3410,6 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
                         ret = wl1271_build_qos_null_data(wl, vif);
                         if (ret < 0)
                                 goto out;
-
-                        /* Need to update the BSSID (for filtering etc) */
-                        do_join = true;
                 }
 
         if (changed & (BSS_CHANGED_ASSOC | BSS_CHANGED_HT)) {
@@ -3830,6 +3436,7 @@ sta_not_found:
                         int ieoffset;
                         wlvif->aid = bss_conf->aid;
                         wlvif->beacon_int = bss_conf->beacon_int;
+                        do_join = true;
                         set_assoc = true;
 
                         /*
@@ -4662,60 +4269,12 @@ static struct ieee80211_channel wl1271_channels[] = {
         { .hw_value = 14, .center_freq = 2484, .max_power = 25 },
 };
 
-/* mapping to indexes for wl1271_rates */
-static const u8 wl1271_rate_to_idx_2ghz[] = {
-        /* MCS rates are used only with 11n */
-        7,                            /* CONF_HW_RXTX_RATE_MCS7_SGI */
-        7,                            /* CONF_HW_RXTX_RATE_MCS7 */
-        6,                            /* CONF_HW_RXTX_RATE_MCS6 */
-        5,                            /* CONF_HW_RXTX_RATE_MCS5 */
-        4,                            /* CONF_HW_RXTX_RATE_MCS4 */
-        3,                            /* CONF_HW_RXTX_RATE_MCS3 */
-        2,                            /* CONF_HW_RXTX_RATE_MCS2 */
-        1,                            /* CONF_HW_RXTX_RATE_MCS1 */
-        0,                            /* CONF_HW_RXTX_RATE_MCS0 */
-
-        11,                            /* CONF_HW_RXTX_RATE_54   */
-        10,                            /* CONF_HW_RXTX_RATE_48   */
-        9,                             /* CONF_HW_RXTX_RATE_36   */
-        8,                             /* CONF_HW_RXTX_RATE_24   */
-
-        /* TI-specific rate */
-        CONF_HW_RXTX_RATE_UNSUPPORTED, /* CONF_HW_RXTX_RATE_22   */
-
-        7,                             /* CONF_HW_RXTX_RATE_18   */
-        6,                             /* CONF_HW_RXTX_RATE_12   */
-        3,                             /* CONF_HW_RXTX_RATE_11   */
-        5,                             /* CONF_HW_RXTX_RATE_9    */
-        4,                             /* CONF_HW_RXTX_RATE_6    */
-        2,                             /* CONF_HW_RXTX_RATE_5_5  */
-        1,                             /* CONF_HW_RXTX_RATE_2    */
-        0                              /* CONF_HW_RXTX_RATE_1    */
-};
-
-/* 11n STA capabilities */
-#define HW_RX_HIGHEST_RATE      72
-
-#define WL12XX_HT_CAP { \
-        .cap = IEEE80211_HT_CAP_GRN_FLD | IEEE80211_HT_CAP_SGI_20 | \
-               (1 << IEEE80211_HT_CAP_RX_STBC_SHIFT), \
-        .ht_supported = true, \
-        .ampdu_factor = IEEE80211_HT_MAX_AMPDU_8K, \
-        .ampdu_density = IEEE80211_HT_MPDU_DENSITY_8, \
-        .mcs = { \
-                .rx_mask = { 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, \
-                .rx_highest = cpu_to_le16(HW_RX_HIGHEST_RATE), \
-                .tx_params = IEEE80211_HT_MCS_TX_DEFINED, \
-                }, \
-}
-
 /* can't be const, mac80211 writes to this */
 static struct ieee80211_supported_band wl1271_band_2ghz = {
         .channels = wl1271_channels,
         .n_channels = ARRAY_SIZE(wl1271_channels),
         .bitrates = wl1271_rates,
         .n_bitrates = ARRAY_SIZE(wl1271_rates),
-        .ht_cap = WL12XX_HT_CAP,
 };
 
 /* 5 GHz data rates for WL1273 */
@@ -4784,48 +4343,11 @@ static struct ieee80211_channel wl1271_channels_5ghz[] = {
         { .hw_value = 165, .center_freq = 5825, .max_power = 25 },
 };
 
-/* mapping to indexes for wl1271_rates_5ghz */
-static const u8 wl1271_rate_to_idx_5ghz[] = {
-        /* MCS rates are used only with 11n */
-        7,                            /* CONF_HW_RXTX_RATE_MCS7_SGI */
-        7,                            /* CONF_HW_RXTX_RATE_MCS7 */
-        6,                            /* CONF_HW_RXTX_RATE_MCS6 */
-        5,                            /* CONF_HW_RXTX_RATE_MCS5 */
-        4,                            /* CONF_HW_RXTX_RATE_MCS4 */
-        3,                            /* CONF_HW_RXTX_RATE_MCS3 */
-        2,                            /* CONF_HW_RXTX_RATE_MCS2 */
-        1,                            /* CONF_HW_RXTX_RATE_MCS1 */
-        0,                            /* CONF_HW_RXTX_RATE_MCS0 */
-
-        7,                             /* CONF_HW_RXTX_RATE_54   */
-        6,                             /* CONF_HW_RXTX_RATE_48   */
-        5,                             /* CONF_HW_RXTX_RATE_36   */
-        4,                             /* CONF_HW_RXTX_RATE_24   */
-
-        /* TI-specific rate */
-        CONF_HW_RXTX_RATE_UNSUPPORTED, /* CONF_HW_RXTX_RATE_22   */
-
-        3,                             /* CONF_HW_RXTX_RATE_18   */
-        2,                             /* CONF_HW_RXTX_RATE_12   */
-        CONF_HW_RXTX_RATE_UNSUPPORTED, /* CONF_HW_RXTX_RATE_11   */
-        1,                             /* CONF_HW_RXTX_RATE_9    */
-        0,                             /* CONF_HW_RXTX_RATE_6    */
-        CONF_HW_RXTX_RATE_UNSUPPORTED, /* CONF_HW_RXTX_RATE_5_5  */
-        CONF_HW_RXTX_RATE_UNSUPPORTED, /* CONF_HW_RXTX_RATE_2    */
-        CONF_HW_RXTX_RATE_UNSUPPORTED  /* CONF_HW_RXTX_RATE_1    */
-};
-
 static struct ieee80211_supported_band wl1271_band_5ghz = {
         .channels = wl1271_channels_5ghz,
         .n_channels = ARRAY_SIZE(wl1271_channels_5ghz),
         .bitrates = wl1271_rates_5ghz,
         .n_bitrates = ARRAY_SIZE(wl1271_rates_5ghz),
-        .ht_cap = WL12XX_HT_CAP,
-};
-
-static const u8 *wl1271_band_rate_to_idx[] = {
-        [IEEE80211_BAND_2GHZ] = wl1271_rate_to_idx_2ghz,
-        [IEEE80211_BAND_5GHZ] = wl1271_rate_to_idx_5ghz
 };
 
 static const struct ieee80211_ops wl1271_ops = {
@@ -4862,18 +4384,18 @@ static const struct ieee80211_ops wl1271_ops = {
 };
 
 
-u8 wl1271_rate_to_idx(int rate, enum ieee80211_band band)
+u8 wlcore_rate_to_idx(struct wl1271 *wl, u8 rate, enum ieee80211_band band)
 {
         u8 idx;
 
-        BUG_ON(band >= sizeof(wl1271_band_rate_to_idx)/sizeof(u8 *));
+        BUG_ON(band >= 2);
 
-        if (unlikely(rate >= CONF_HW_RXTX_RATE_MAX)) {
+        if (unlikely(rate >= wl->hw_tx_rate_tbl_size)) {
                 wl1271_error("Illegal RX rate from HW: %d", rate);
                 return 0;
         }
 
-        idx = wl1271_band_rate_to_idx[band][rate];
+        idx = wl->band_rate_to_idx[band][rate];
         if (unlikely(idx == CONF_HW_RXTX_RATE_UNSUPPORTED)) {
                 wl1271_error("Unsupported RX rate from HW: %d", rate);
                 return 0;
@@ -5027,34 +4549,6 @@ static struct bin_attribute fwlog_attr = {
         .read = wl1271_sysfs_read_fwlog,
 };
 
-static bool wl12xx_mac_in_fuse(struct wl1271 *wl)
-{
-        bool supported = false;
-        u8 major, minor;
-
-        if (wl->chip.id == CHIP_ID_1283_PG20) {
-                major = WL128X_PG_GET_MAJOR(wl->hw_pg_ver);
-                minor = WL128X_PG_GET_MINOR(wl->hw_pg_ver);
-
-                /* in wl128x we have the MAC address if the PG is >= (2, 1) */
-                if (major > 2 || (major == 2 && minor >= 1))
-                        supported = true;
-        } else {
-                major = WL127X_PG_GET_MAJOR(wl->hw_pg_ver);
-                minor = WL127X_PG_GET_MINOR(wl->hw_pg_ver);
-
-                /* in wl127x we have the MAC address if the PG is >= (3, 1) */
-                if (major == 3 && minor >= 1)
-                        supported = true;
-        }
-
-        wl1271_debug(DEBUG_PROBE,
-                     "PG Ver major = %d minor = %d, MAC %s present",
-                     major, minor, supported ? "is" : "is not");
-
-        return supported;
-}
-
 static void wl12xx_derive_mac_addresses(struct wl1271 *wl,
                                         u32 oui, u32 nic, int n)
 {
@@ -5080,47 +4574,23 @@ static void wl12xx_derive_mac_addresses(struct wl1271 *wl,
         wl->hw->wiphy->addresses = wl->addresses;
 }
 
-static void wl12xx_get_fuse_mac(struct wl1271 *wl)
-{
-        u32 mac1, mac2;
-
-        wl1271_set_partition(wl, &wl12xx_part_table[PART_DRPW]);
-
-        mac1 = wl1271_read32(wl, WL12XX_REG_FUSE_BD_ADDR_1);
-        mac2 = wl1271_read32(wl, WL12XX_REG_FUSE_BD_ADDR_2);
-
-        /* these are the two parts of the BD_ADDR */
-        wl->fuse_oui_addr = ((mac2 & 0xffff) << 8) +
-                ((mac1 & 0xff000000) >> 24);
-        wl->fuse_nic_addr = mac1 & 0xffffff;
-
-        wl1271_set_partition(wl, &wl12xx_part_table[PART_DOWN]);
-}
-
 static int wl12xx_get_hw_info(struct wl1271 *wl)
 {
         int ret;
-        u32 die_info;
 
         ret = wl12xx_set_power_on(wl);
         if (ret < 0)
                 goto out;
 
-        wl->chip.id = wl1271_read32(wl, CHIP_ID_B);
+        wl->chip.id = wlcore_read_reg(wl, REG_CHIP_ID_B);
 
-        if (wl->chip.id == CHIP_ID_1283_PG20)
-                die_info = wl1271_top_reg_read(wl, WL128X_REG_FUSE_DATA_2_1);
-        else
-                die_info = wl1271_top_reg_read(wl, WL127X_REG_FUSE_DATA_2_1);
+        wl->fuse_oui_addr = 0;
+        wl->fuse_nic_addr = 0;
 
-        wl->hw_pg_ver = (s8) (die_info & PG_VER_MASK) >> PG_VER_OFFSET;
+        wl->hw_pg_ver = wl->ops->get_pg_ver(wl);
 
-        if (!wl12xx_mac_in_fuse(wl)) {
-                wl->fuse_oui_addr = 0;
-                wl->fuse_nic_addr = 0;
-        } else {
-                wl12xx_get_fuse_mac(wl);
-        }
+        if (wl->ops->get_mac)
+                wl->ops->get_mac(wl);
 
         wl1271_power_off(wl);
 out:
@@ -5242,7 +4712,8 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)
         wl->hw->wiphy->max_sched_scan_ie_len = WL1271_CMD_TEMPL_MAX_SIZE -
                 sizeof(struct ieee80211_header);
 
-        wl->hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD;
+        wl->hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD |
+                                WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
 
         /* make sure all our channels fit in the scanned_ch bitmask */
         BUILD_BUG_ON(ARRAY_SIZE(wl1271_channels) +
@@ -5254,8 +4725,12 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)
          */
         memcpy(&wl->bands[IEEE80211_BAND_2GHZ], &wl1271_band_2ghz,
                sizeof(wl1271_band_2ghz));
+        memcpy(&wl->bands[IEEE80211_BAND_2GHZ].ht_cap, &wl->ht_cap,
+               sizeof(wl->ht_cap));
         memcpy(&wl->bands[IEEE80211_BAND_5GHZ], &wl1271_band_5ghz,
                sizeof(wl1271_band_5ghz));
+        memcpy(&wl->bands[IEEE80211_BAND_5GHZ].ht_cap, &wl->ht_cap,
+               sizeof(wl->ht_cap));
 
         wl->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
                 &wl->bands[IEEE80211_BAND_2GHZ];
@@ -5279,14 +4754,14 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)
         wl->hw->sta_data_size = sizeof(struct wl1271_station);
         wl->hw->vif_data_size = sizeof(struct wl12xx_vif);
 
-        wl->hw->max_rx_aggregation_subframes = 8;
+        wl->hw->max_rx_aggregation_subframes = wl->conf.ht.rx_ba_win_size;
 
         return 0;
 }
 
 #define WL1271_DEFAULT_CHANNEL 0
 
-static struct ieee80211_hw *wl1271_alloc_hw(void)
+struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size)
 {
         struct ieee80211_hw *hw;
         struct wl1271 *wl;
@@ -5305,6 +4780,13 @@ static struct ieee80211_hw *wl1271_alloc_hw(void)
         wl = hw->priv;
         memset(wl, 0, sizeof(*wl));
 
+        wl->priv = kzalloc(priv_size, GFP_KERNEL);
+        if (!wl->priv) {
+                wl1271_error("could not alloc wl priv");
+                ret = -ENOMEM;
+                goto err_priv_alloc;
+        }
+
         INIT_LIST_HEAD(&wl->wlvif_list);
 
         wl->hw = hw;
@@ -5341,7 +4823,6 @@ static struct ieee80211_hw *wl1271_alloc_hw(void)
         wl->quirks = 0;
         wl->platform_quirks = 0;
         wl->sched_scanning = false;
-        wl->tx_spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;
         wl->system_hlid = WL12XX_SYSTEM_HLID;
         wl->active_sta_count = 0;
         wl->fwlog_size = 0;
@@ -5351,7 +4832,7 @@ static struct ieee80211_hw *wl1271_alloc_hw(void)
         __set_bit(WL12XX_SYSTEM_HLID, wl->links_map);
 
         memset(wl->tx_frames_map, 0, sizeof(wl->tx_frames_map));
-        for (i = 0; i < ACX_TX_DESCRIPTORS; i++)
+        for (i = 0; i < wl->num_tx_desc; i++)
                 wl->tx_frames[i] = NULL;
 
         spin_lock_init(&wl->wl_lock);
@@ -5360,9 +4841,6 @@ static struct ieee80211_hw *wl1271_alloc_hw(void)
         wl->fw_type = WL12XX_FW_TYPE_NONE;
         mutex_init(&wl->mutex);
 
-        /* Apply default driver configuration. */
-        wl1271_conf_init(wl);
-
         order = get_order(WL1271_AGGR_BUFFER_SIZE);
         wl->aggr_buf = (u8 *)__get_free_pages(GFP_KERNEL, order);
         if (!wl->aggr_buf) {
@@ -5383,8 +4861,17 @@ static struct ieee80211_hw *wl1271_alloc_hw(void)
                 goto err_dummy_packet;
         }
 
+        wl->mbox = kmalloc(sizeof(*wl->mbox), GFP_DMA);
+        if (!wl->mbox) {
+                ret = -ENOMEM;
+                goto err_fwlog;
+        }
+
         return hw;
 
+err_fwlog:
+        free_page((unsigned long)wl->fwlog);
+
 err_dummy_packet:
         dev_kfree_skb(wl->dummy_packet);
 
@@ -5396,14 +4883,18 @@ err_wq:
 
 err_hw:
         wl1271_debugfs_exit(wl);
+        kfree(wl->priv);
+
+err_priv_alloc:
         ieee80211_free_hw(hw);
 
 err_hw_alloc:
 
         return ERR_PTR(ret);
 }
+EXPORT_SYMBOL_GPL(wlcore_alloc_hw);
 
-static int wl1271_free_hw(struct wl1271 *wl)
+int wlcore_free_hw(struct wl1271 *wl)
 {
         /* Unblock any fwlog readers */
         mutex_lock(&wl->mutex);
@@ -5433,10 +4924,12 @@ static int wl1271_free_hw(struct wl1271 *wl)
         kfree(wl->tx_res_if);
         destroy_workqueue(wl->freezable_wq);
 
+        kfree(wl->priv);
         ieee80211_free_hw(wl->hw);
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(wlcore_free_hw);
 
 static irqreturn_t wl12xx_hardirq(int irq, void *cookie)
 {
@@ -5467,22 +4960,22 @@ static irqreturn_t wl12xx_hardirq(int irq, void *cookie)
         return IRQ_WAKE_THREAD;
 }
 
-static int __devinit wl12xx_probe(struct platform_device *pdev)
+int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev)
 {
         struct wl12xx_platform_data *pdata = pdev->dev.platform_data;
-        struct ieee80211_hw *hw;
-        struct wl1271 *wl;
         unsigned long irqflags;
-        int ret = -ENODEV;
+        int ret;
 
-        hw = wl1271_alloc_hw();
-        if (IS_ERR(hw)) {
-                wl1271_error("can't allocate hw");
-                ret = PTR_ERR(hw);
-                goto out;
+        if (!wl->ops || !wl->ptable) {
+                ret = -EINVAL;
+                goto out_free_hw;
         }
 
-        wl = hw->priv;
+        BUG_ON(wl->num_tx_desc > WLCORE_MAX_TX_DESCRIPTORS);
+
+        /* adjust some runtime configuration parameters */
+        wlcore_adjust_conf(wl);
+
         wl->irq = platform_get_irq(pdev, 0);
         wl->ref_clock = pdata->board_ref_clock;
         wl->tcxo_clock = pdata->board_tcxo_clock;
@@ -5511,7 +5004,7 @@ static int __devinit wl12xx_probe(struct platform_device *pdev)
                 wl->irq_wake_enabled = true;
                 device_init_wakeup(wl->dev, 1);
                 if (pdata->pwr_in_suspend)
-                        hw->wiphy->wowlan.flags = WIPHY_WOWLAN_ANY;
+                        wl->hw->wiphy->wowlan.flags = WIPHY_WOWLAN_ANY;
 
         }
         disable_irq(wl->irq);
@@ -5545,7 +5038,7 @@ static int __devinit wl12xx_probe(struct platform_device *pdev)
                 goto out_hw_pg_ver;
         }
 
-        return 0;
+        goto out;
 
 out_hw_pg_ver:
         device_remove_file(wl->dev, &dev_attr_hw_pg_ver);
@@ -5557,13 +5050,14 @@ out_irq:
         free_irq(wl->irq, wl);
 
 out_free_hw:
-        wl1271_free_hw(wl);
+        wlcore_free_hw(wl);
 
 out:
         return ret;
 }
+EXPORT_SYMBOL_GPL(wlcore_probe);
 
-static int __devexit wl12xx_remove(struct platform_device *pdev)
+int __devexit wlcore_remove(struct platform_device *pdev)
 {
         struct wl1271 *wl = platform_get_drvdata(pdev);
 
@@ -5573,38 +5067,11 @@ static int __devexit wl12xx_remove(struct platform_device *pdev)
         }
         wl1271_unregister_hw(wl);
         free_irq(wl->irq, wl);
-        wl1271_free_hw(wl);
+        wlcore_free_hw(wl);
 
         return 0;
 }
-
-static const struct platform_device_id wl12xx_id_table[] __devinitconst = {
-        { "wl12xx", 0 },
-        {  } /* Terminating Entry */
-};
-MODULE_DEVICE_TABLE(platform, wl12xx_id_table);
-
-static struct platform_driver wl12xx_driver = {
-        .probe          = wl12xx_probe,
-        .remove         = __devexit_p(wl12xx_remove),
-        .id_table       = wl12xx_id_table,
-        .driver = {
-                .name   = "wl12xx_driver",
-                .owner  = THIS_MODULE,
-        }
-};
-
-static int __init wl12xx_init(void)
-{
-        return platform_driver_register(&wl12xx_driver);
-}
-module_init(wl12xx_init);
-
-static void __exit wl12xx_exit(void)
-{
-        platform_driver_unregister(&wl12xx_driver);
-}
-module_exit(wl12xx_exit);
+EXPORT_SYMBOL_GPL(wlcore_remove);
 
 u32 wl12xx_debug_level = DEBUG_NONE;
 EXPORT_SYMBOL_GPL(wl12xx_debug_level);
@@ -5618,6 +5085,9 @@ MODULE_PARM_DESC(fwlog,
 module_param(bug_on_recovery, bool, S_IRUSR | S_IWUSR);
 MODULE_PARM_DESC(bug_on_recovery, "BUG() on fw recovery");
 
+module_param(no_recovery, bool, S_IRUSR | S_IWUSR);
+MODULE_PARM_DESC(no_recovery, "Prevent HW recovery. FW will remain stuck.");
+
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Luciano Coelho <coelho@ti.com>");
 MODULE_AUTHOR("Juuso Oikarinen <juuso.oikarinen@nokia.com>");
diff --git a/drivers/net/wireless/wl12xx/ps.c b/drivers/net/wireless/ti/wlcore/ps.c
index 78f598b4f97b..756eee2257b4 100644
--- a/drivers/net/wireless/wl12xx/ps.c
+++ b/drivers/net/wireless/ti/wlcore/ps.c
@@ -21,7 +21,6 @@
  *
  */
 
-#include "reg.h"
 #include "ps.h"
 #include "io.h"
 #include "tx.h"
@@ -62,7 +61,7 @@ void wl1271_elp_work(struct work_struct *work)
         }
 
         wl1271_debug(DEBUG_PSM, "chip to elp");
-        wl1271_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG_ADDR, ELPCTRL_SLEEP);
+        wl1271_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_SLEEP);
         set_bit(WL1271_FLAG_IN_ELP, &wl->flags);
 
 out:
@@ -74,6 +73,9 @@ void wl1271_ps_elp_sleep(struct wl1271 *wl)
 {
         struct wl12xx_vif *wlvif;
 
+        if (wl->quirks & WLCORE_QUIRK_NO_ELP)
+                return;
+
         /* we shouldn't get consecutive sleep requests */
         if (WARN_ON(test_and_set_bit(WL1271_FLAG_ELP_REQUESTED, &wl->flags)))
                 return;
@@ -125,7 +127,7 @@ int wl1271_ps_elp_wakeup(struct wl1271 *wl)
                 wl->elp_compl = &compl;
         spin_unlock_irqrestore(&wl->wl_lock, flags);
 
-        wl1271_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG_ADDR, ELPCTRL_WAKE_UP);
+        wl1271_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_WAKE_UP);
 
         if (!pending) {
                 ret = wait_for_completion_timeout(
diff --git a/drivers/net/wireless/wl12xx/ps.h b/drivers/net/wireless/ti/wlcore/ps.h
index 5f19d4fbbf27..de4f9da8ed26 100644
--- a/drivers/net/wireless/wl12xx/ps.h
+++ b/drivers/net/wireless/ti/wlcore/ps.h
@@ -24,7 +24,7 @@
 #ifndef __PS_H__
 #define __PS_H__
 
-#include "wl12xx.h"
+#include "wlcore.h"
 #include "acx.h"
 
 int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
diff --git a/drivers/net/wireless/wl12xx/rx.c b/drivers/net/wireless/ti/wlcore/rx.c
index cfa6071704c5..89bd9385e90b 100644
--- a/drivers/net/wireless/wl12xx/rx.c
+++ b/drivers/net/wireless/ti/wlcore/rx.c
@@ -24,34 +24,36 @@
 #include <linux/gfp.h>
 #include <linux/sched.h>
 
-#include "wl12xx.h"
+#include "wlcore.h"
 #include "debug.h"
 #include "acx.h"
-#include "reg.h"
 #include "rx.h"
 #include "tx.h"
 #include "io.h"
+#include "hw_ops.h"
 
-static u8 wl12xx_rx_get_mem_block(struct wl12xx_fw_status *status,
-                                  u32 drv_rx_counter)
-{
-        return le32_to_cpu(status->rx_pkt_descs[drv_rx_counter]) &
-                RX_MEM_BLOCK_MASK;
-}
+/*
+ * TODO: this is here just for now, it must be removed when the data
+ * operations are in place.
+ */
+#include "../wl12xx/reg.h"
 
-static u32 wl12xx_rx_get_buf_size(struct wl12xx_fw_status *status,
-                                 u32 drv_rx_counter)
+static u32 wlcore_rx_get_buf_size(struct wl1271 *wl,
+                                  u32 rx_pkt_desc)
 {
-        return (le32_to_cpu(status->rx_pkt_descs[drv_rx_counter]) &
-                RX_BUF_SIZE_MASK) >> RX_BUF_SIZE_SHIFT_DIV;
+        if (wl->quirks & WLCORE_QUIRK_RX_BLOCKSIZE_ALIGN)
+                return (rx_pkt_desc & ALIGNED_RX_BUF_SIZE_MASK) >>
+                       ALIGNED_RX_BUF_SIZE_SHIFT;
+
+        return (rx_pkt_desc & RX_BUF_SIZE_MASK) >> RX_BUF_SIZE_SHIFT_DIV;
 }
 
-static bool wl12xx_rx_get_unaligned(struct wl12xx_fw_status *status,
-                                    u32 drv_rx_counter)
+static u32 wlcore_rx_get_align_buf_size(struct wl1271 *wl, u32 pkt_len)
 {
-        /* Convert the value to bool */
-        return !!(le32_to_cpu(status->rx_pkt_descs[drv_rx_counter]) &
-                RX_BUF_UNALIGNED_PAYLOAD);
+        if (wl->quirks & WLCORE_QUIRK_RX_BLOCKSIZE_ALIGN)
+                return ALIGN(pkt_len, WL12XX_BUS_BLOCK_SIZE);
+
+        return pkt_len;
 }
 
 static void wl1271_rx_status(struct wl1271 *wl,
@@ -66,10 +68,10 @@ static void wl1271_rx_status(struct wl1271 *wl,
         else
                 status->band = IEEE80211_BAND_5GHZ;
 
-        status->rate_idx = wl1271_rate_to_idx(desc->rate, status->band);
+        status->rate_idx = wlcore_rate_to_idx(wl, desc->rate, status->band);
 
         /* 11n support */
-        if (desc->rate <= CONF_HW_RXTX_RATE_MCS0)
+        if (desc->rate <= wl->hw_min_ht_rate)
                 status->flag |= RX_FLAG_HT;
 
         status->signal = desc->rssi;
@@ -98,7 +100,7 @@ static void wl1271_rx_status(struct wl1271 *wl,
 }
 
 static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
-                                 bool unaligned, u8 *hlid)
+                                 enum wl_rx_buf_align rx_align, u8 *hlid)
 {
         struct wl1271_rx_descriptor *desc;
         struct sk_buff *skb;
@@ -106,8 +108,9 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
         u8 *buf;
         u8 beacon = 0;
         u8 is_data = 0;
-        u8 reserved = unaligned ? NET_IP_ALIGN : 0;
+        u8 reserved = 0;
         u16 seq_num;
+        u32 pkt_data_len;
 
         /*
          * In PLT mode we seem to get frames and mac80211 warns about them,
@@ -116,6 +119,16 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
         if (unlikely(wl->plt))
                 return -EINVAL;
 
+        pkt_data_len = wlcore_hw_get_rx_packet_len(wl, data, length);
+        if (!pkt_data_len) {
+                wl1271_error("Invalid packet arrived from HW. length %d",
+                             length);
+                return -EINVAL;
+        }
+
+        if (rx_align == WLCORE_RX_BUF_UNALIGNED)
+                reserved = NET_IP_ALIGN;
+
         /* the data read starts with the descriptor */
         desc = (struct wl1271_rx_descriptor *) data;
 
@@ -142,8 +155,8 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
                 return -EINVAL;
         }
 
-        /* skb length not included rx descriptor */
-        skb = __dev_alloc_skb(length + reserved - sizeof(*desc), GFP_KERNEL);
+        /* skb length not including rx descriptor */
+        skb = __dev_alloc_skb(pkt_data_len + reserved, GFP_KERNEL);
         if (!skb) {
                 wl1271_error("Couldn't allocate RX frame");
                 return -ENOMEM;
@@ -152,7 +165,7 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
         /* reserve the unaligned payload(if any) */
         skb_reserve(skb, reserved);
 
-        buf = skb_put(skb, length - sizeof(*desc));
+        buf = skb_put(skb, pkt_data_len);
 
         /*
          * Copy packets from aggregation buffer to the skbs without rx
@@ -160,7 +173,10 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
          * packets copy the packets in offset of 2 bytes guarantee IP header
          * payload aligned to 4 bytes.
          */
-        memcpy(buf, data + sizeof(*desc), length - sizeof(*desc));
+        memcpy(buf, data + sizeof(*desc), pkt_data_len);
+        if (rx_align == WLCORE_RX_BUF_PADDED)
+                skb_pull(skb, NET_IP_ALIGN);
+
         *hlid = desc->hlid;
 
         hdr = (struct ieee80211_hdr *)skb->data;
@@ -177,36 +193,35 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
                      beacon ? "beacon" : "",
                      seq_num, *hlid);
 
-        skb_trim(skb, skb->len - desc->pad_len);
-
         skb_queue_tail(&wl->deferred_rx_queue, skb);
         queue_work(wl->freezable_wq, &wl->netstack_work);
 
         return is_data;
 }
 
-void wl12xx_rx(struct wl1271 *wl, struct wl12xx_fw_status *status)
+void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status *status)
 {
-        struct wl1271_acx_mem_map *wl_mem_map = wl->target_mem_map;
         unsigned long active_hlids[BITS_TO_LONGS(WL12XX_MAX_LINKS)] = {0};
         u32 buf_size;
         u32 fw_rx_counter  = status->fw_rx_counter & NUM_RX_PKT_DESC_MOD_MASK;
         u32 drv_rx_counter = wl->rx_counter & NUM_RX_PKT_DESC_MOD_MASK;
         u32 rx_counter;
-        u32 mem_block;
-        u32 pkt_length;
-        u32 pkt_offset;
+        u32 pkt_len, align_pkt_len;
+        u32 pkt_offset, des;
         u8 hlid;
-        bool unaligned = false;
+        enum wl_rx_buf_align rx_align;
 
         while (drv_rx_counter != fw_rx_counter) {
                 buf_size = 0;
                 rx_counter = drv_rx_counter;
                 while (rx_counter != fw_rx_counter) {
-                        pkt_length = wl12xx_rx_get_buf_size(status, rx_counter);
-                        if (buf_size + pkt_length > WL1271_AGGR_BUFFER_SIZE)
+                        des = le32_to_cpu(status->rx_pkt_descs[rx_counter]);
+                        pkt_len = wlcore_rx_get_buf_size(wl, des);
+                        align_pkt_len = wlcore_rx_get_align_buf_size(wl,
+                                                                     pkt_len);
+                        if (buf_size + align_pkt_len > WL1271_AGGR_BUFFER_SIZE)
                                 break;
-                        buf_size += pkt_length;
+                        buf_size += align_pkt_len;
                         rx_counter++;
                         rx_counter &= NUM_RX_PKT_DESC_MOD_MASK;
                 }
@@ -216,38 +231,18 @@ void wl12xx_rx(struct wl1271 *wl, struct wl12xx_fw_status *status)
                         break;
                 }
 
-                if (wl->chip.id != CHIP_ID_1283_PG20) {
-                        /*
-                         * Choose the block we want to read
-                         * For aggregated packets, only the first memory block
-                         * should be retrieved. The FW takes care of the rest.
-                         */
-                        mem_block = wl12xx_rx_get_mem_block(status,
-                                                            drv_rx_counter);
-
-                        wl->rx_mem_pool_addr.addr = (mem_block << 8) +
-                           le32_to_cpu(wl_mem_map->packet_memory_pool_start);
-
-                        wl->rx_mem_pool_addr.addr_extra =
-                                wl->rx_mem_pool_addr.addr + 4;
-
-                        wl1271_write(wl, WL1271_SLV_REG_DATA,
-                                     &wl->rx_mem_pool_addr,
-                                     sizeof(wl->rx_mem_pool_addr), false);
-                }
-
                 /* Read all available packets at once */
-                wl1271_read(wl, WL1271_SLV_MEM_DATA, wl->aggr_buf,
-                                buf_size, true);
+                des = le32_to_cpu(status->rx_pkt_descs[drv_rx_counter]);
+                wlcore_hw_prepare_read(wl, des, buf_size);
+                wlcore_read_data(wl, REG_SLV_MEM_DATA, wl->aggr_buf,
+                                 buf_size, true);
 
                 /* Split data into separate packets */
                 pkt_offset = 0;
                 while (pkt_offset < buf_size) {
-                        pkt_length = wl12xx_rx_get_buf_size(status,
-                                        drv_rx_counter);
-
-                        unaligned = wl12xx_rx_get_unaligned(status,
-                                        drv_rx_counter);
+                        des = le32_to_cpu(status->rx_pkt_descs[drv_rx_counter]);
+                        pkt_len = wlcore_rx_get_buf_size(wl, des);
+                        rx_align = wlcore_hw_get_rx_buf_align(wl, des);
 
                         /*
                          * the handle data call can only fail in memory-outage
@@ -256,7 +251,7 @@ void wl12xx_rx(struct wl1271 *wl, struct wl12xx_fw_status *status)
                          */
                         if (wl1271_rx_handle_data(wl,
                                                   wl->aggr_buf + pkt_offset,
-                                                  pkt_length, unaligned,
+                                                  pkt_len, rx_align,
                                                   &hlid) == 1) {
                                 if (hlid < WL12XX_MAX_LINKS)
                                         __set_bit(hlid, active_hlids);
@@ -269,7 +264,7 @@ void wl12xx_rx(struct wl1271 *wl, struct wl12xx_fw_status *status)
                         wl->rx_counter++;
                         drv_rx_counter++;
                         drv_rx_counter &= NUM_RX_PKT_DESC_MOD_MASK;
-                        pkt_offset += pkt_length;
+                        pkt_offset += wlcore_rx_get_align_buf_size(wl, pkt_len);
                 }
         }
 
@@ -277,8 +272,9 @@ void wl12xx_rx(struct wl1271 *wl, struct wl12xx_fw_status *status)
          * Write the driver's packet counter to the FW. This is only required
          * for older hardware revisions
          */
-        if (wl->quirks & WL12XX_QUIRK_END_OF_TRANSACTION)
-                wl1271_write32(wl, RX_DRIVER_COUNTER_ADDRESS, wl->rx_counter);
+        if (wl->quirks & WLCORE_QUIRK_END_OF_TRANSACTION)
+                wl1271_write32(wl, WL12XX_REG_RX_DRIVER_COUNTER,
+                               wl->rx_counter);
 
         wl12xx_rearm_rx_streaming(wl, active_hlids);
 }
diff --git a/drivers/net/wireless/wl12xx/rx.h b/drivers/net/wireless/ti/wlcore/rx.h
index 86ba6b1d0cdc..6e129e2a8546 100644
--- a/drivers/net/wireless/wl12xx/rx.h
+++ b/drivers/net/wireless/ti/wlcore/rx.h
@@ -96,9 +96,19 @@
 #define RX_MEM_BLOCK_MASK            0xFF
 #define RX_BUF_SIZE_MASK             0xFFF00
 #define RX_BUF_SIZE_SHIFT_DIV        6
+#define ALIGNED_RX_BUF_SIZE_MASK     0xFFFF00
+#define ALIGNED_RX_BUF_SIZE_SHIFT    8
+
 /* If set, the start of IP payload is not 4 bytes aligned */
 #define RX_BUF_UNALIGNED_PAYLOAD     BIT(20)
 
+/* Describes the alignment state of a Rx buffer */
+enum wl_rx_buf_align {
+        WLCORE_RX_BUF_ALIGNED,
+        WLCORE_RX_BUF_UNALIGNED,
+        WLCORE_RX_BUF_PADDED,
+};
+
 enum {
         WL12XX_RX_CLASS_UNKNOWN,
         WL12XX_RX_CLASS_MANAGEMENT,
@@ -126,7 +136,7 @@ struct wl1271_rx_descriptor {
         u8  reserved;
 } __packed;
 
-void wl12xx_rx(struct wl1271 *wl, struct wl12xx_fw_status *status);
+void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status *status);
 u8 wl1271_rate_to_idx(int rate, enum ieee80211_band band);
 
 #endif
diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/ti/wlcore/scan.c
index fcba055ef196..ade21a011c45 100644
--- a/drivers/net/wireless/wl12xx/scan.c
+++ b/drivers/net/wireless/ti/wlcore/scan.c
@@ -23,7 +23,7 @@
 
 #include <linux/ieee80211.h>
 
-#include "wl12xx.h"
+#include "wlcore.h"
 #include "debug.h"
 #include "cmd.h"
 #include "scan.h"
@@ -417,6 +417,23 @@ wl1271_scan_get_sched_scan_channels(struct wl1271 *wl,
         int i, j;
         u32 flags;
         bool force_passive = !req->n_ssids;
+        u32 min_dwell_time_active, max_dwell_time_active, delta_per_probe;
+        u32 dwell_time_passive, dwell_time_dfs;
+
+        if (band == IEEE80211_BAND_5GHZ)
+                delta_per_probe = c->dwell_time_delta_per_probe_5;
+        else
+                delta_per_probe = c->dwell_time_delta_per_probe;
+
+        min_dwell_time_active = c->base_dwell_time +
+                 req->n_ssids * c->num_probe_reqs * delta_per_probe;
+
+        max_dwell_time_active = min_dwell_time_active + c->max_dwell_time_delta;
+
+        min_dwell_time_active = DIV_ROUND_UP(min_dwell_time_active, 1000);
+        max_dwell_time_active = DIV_ROUND_UP(max_dwell_time_active, 1000);
+        dwell_time_passive = DIV_ROUND_UP(c->dwell_time_passive, 1000);
+        dwell_time_dfs = DIV_ROUND_UP(c->dwell_time_dfs, 1000);
 
         for (i = 0, j = start;
              i < req->n_channels && j < max_channels;
@@ -440,21 +457,24 @@ wl1271_scan_get_sched_scan_channels(struct wl1271 *wl,
                                      req->channels[i]->flags);
                         wl1271_debug(DEBUG_SCAN, "max_power %d",
                                      req->channels[i]->max_power);
+                        wl1271_debug(DEBUG_SCAN, "min_dwell_time %d max dwell time %d",
+                                     min_dwell_time_active,
+                                     max_dwell_time_active);
 
                         if (flags & IEEE80211_CHAN_RADAR) {
                                 channels[j].flags |= SCAN_CHANNEL_FLAGS_DFS;
 
                                 channels[j].passive_duration =
-                                        cpu_to_le16(c->dwell_time_dfs);
+                                        cpu_to_le16(dwell_time_dfs);
                         } else {
                                 channels[j].passive_duration =
-                                        cpu_to_le16(c->dwell_time_passive);
+                                        cpu_to_le16(dwell_time_passive);
                         }
 
                         channels[j].min_duration =
-                                cpu_to_le16(c->min_dwell_time_active);
+                                cpu_to_le16(min_dwell_time_active);
                         channels[j].max_duration =
-                                cpu_to_le16(c->max_dwell_time_active);
+                                cpu_to_le16(max_dwell_time_active);
 
                         channels[j].tx_power_att = req->channels[i]->max_power;
                         channels[j].channel = req->channels[i]->hw_value;
diff --git a/drivers/net/wireless/wl12xx/scan.h b/drivers/net/wireless/ti/wlcore/scan.h
index 96ff457a3a0b..81ee36ac2078 100644
--- a/drivers/net/wireless/wl12xx/scan.h
+++ b/drivers/net/wireless/ti/wlcore/scan.h
@@ -24,7 +24,7 @@
 #ifndef __SCAN_H__
 #define __SCAN_H__
 
-#include "wl12xx.h"
+#include "wlcore.h"
 
 int wl1271_scan(struct wl1271 *wl, struct ieee80211_vif *vif,
                 const u8 *ssid, size_t ssid_len,
@@ -55,7 +55,7 @@ void wl1271_scan_sched_scan_results(struct wl1271 *wl);
 #define WL1271_SCAN_BAND_2_4_GHZ 0
 #define WL1271_SCAN_BAND_5_GHZ 1
 
-#define WL1271_SCAN_TIMEOUT    10000 /* msec */
+#define WL1271_SCAN_TIMEOUT    30000 /* msec */
 
 enum {
         WL1271_SCAN_STATE_IDLE,
diff --git a/drivers/net/wireless/wl12xx/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
index 4b3c32774bae..0a72347cfc4c 100644
--- a/drivers/net/wireless/wl12xx/sdio.c
+++ b/drivers/net/wireless/ti/wlcore/sdio.c
@@ -33,7 +33,7 @@
 #include <linux/wl12xx.h>
 #include <linux/pm_runtime.h>
 
-#include "wl12xx.h"
+#include "wlcore.h"
 #include "wl12xx_80211.h"
 #include "io.h"
 
@@ -76,7 +76,7 @@ static void wl12xx_sdio_raw_read(struct device *child, int addr, void *buf,
 
         sdio_claim_host(func);
 
-        if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG_ADDR)) {
+        if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG)) {
                 ((u8 *)buf)[0] = sdio_f0_readb(func, addr, &ret);
                 dev_dbg(child->parent, "sdio read 52 addr 0x%x, byte 0x%02x\n",
                         addr, ((u8 *)buf)[0]);
@@ -105,7 +105,7 @@ static void wl12xx_sdio_raw_write(struct device *child, int addr, void *buf,
 
         sdio_claim_host(func);
 
-        if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG_ADDR)) {
+        if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG)) {
                 sdio_f0_writeb(func, ((u8 *)buf)[0], addr, &ret);
                 dev_dbg(child->parent, "sdio write 52 addr 0x%x, byte 0x%02x\n",
                         addr, ((u8 *)buf)[0]);
diff --git a/drivers/net/wireless/wl12xx/spi.c b/drivers/net/wireless/ti/wlcore/spi.c
index 2fc18a8dcce8..553cd3cbb98c 100644
--- a/drivers/net/wireless/wl12xx/spi.c
+++ b/drivers/net/wireless/ti/wlcore/spi.c
@@ -30,12 +30,10 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
-#include "wl12xx.h"
+#include "wlcore.h"
 #include "wl12xx_80211.h"
 #include "io.h"
 
-#include "reg.h"
-
 #define WSPI_CMD_READ                 0x40000000
 #define WSPI_CMD_WRITE                0x00000000
 #define WSPI_CMD_FIXED                0x20000000
diff --git a/drivers/net/wireless/wl12xx/testmode.c b/drivers/net/wireless/ti/wlcore/testmode.c
index 1e93bb9c0246..0e59ea2cdd39 100644
--- a/drivers/net/wireless/wl12xx/testmode.c
+++ b/drivers/net/wireless/ti/wlcore/testmode.c
@@ -25,10 +25,9 @@
 #include <linux/slab.h>
 #include <net/genetlink.h>
 
-#include "wl12xx.h"
+#include "wlcore.h"
 #include "debug.h"
 #include "acx.h"
-#include "reg.h"
 #include "ps.h"
 #include "io.h"
 
@@ -116,7 +115,8 @@ static int wl1271_tm_cmd_test(struct wl1271 *wl, struct nlattr *tb[])
                         goto out_sleep;
                 }
 
-                NLA_PUT(skb, WL1271_TM_ATTR_DATA, buf_len, buf);
+                if (nla_put(skb, WL1271_TM_ATTR_DATA, buf_len, buf))
+                        goto nla_put_failure;
                 ret = cfg80211_testmode_reply(skb);
                 if (ret < 0)
                         goto out_sleep;
@@ -178,7 +178,8 @@ static int wl1271_tm_cmd_interrogate(struct wl1271 *wl, struct nlattr *tb[])
                 goto out_free;
         }
 
-        NLA_PUT(skb, WL1271_TM_ATTR_DATA, sizeof(*cmd), cmd);
+        if (nla_put(skb, WL1271_TM_ATTR_DATA, sizeof(*cmd), cmd))
+                goto nla_put_failure;
         ret = cfg80211_testmode_reply(skb);
         if (ret < 0)
                 goto out_free;
@@ -297,7 +298,8 @@ static int wl12xx_tm_cmd_get_mac(struct wl1271 *wl, struct nlattr *tb[])
                 goto out;
         }
 
-        NLA_PUT(skb, WL1271_TM_ATTR_DATA, ETH_ALEN, mac_addr);
+        if (nla_put(skb, WL1271_TM_ATTR_DATA, ETH_ALEN, mac_addr))
+                goto nla_put_failure;
         ret = cfg80211_testmode_reply(skb);
         if (ret < 0)
                 goto out;
diff --git a/drivers/net/wireless/wl12xx/testmode.h b/drivers/net/wireless/ti/wlcore/testmode.h
index 8071654259ea..8071654259ea 100644
--- a/drivers/net/wireless/wl12xx/testmode.h
+++ b/drivers/net/wireless/ti/wlcore/testmode.h
diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/ti/wlcore/tx.c
index 43ae49143d68..6893bc207994 100644
--- a/drivers/net/wireless/wl12xx/tx.c
+++ b/drivers/net/wireless/ti/wlcore/tx.c
@@ -25,13 +25,19 @@
 #include <linux/module.h>
 #include <linux/etherdevice.h>
 
-#include "wl12xx.h"
+#include "wlcore.h"
 #include "debug.h"
 #include "io.h"
-#include "reg.h"
 #include "ps.h"
 #include "tx.h"
 #include "event.h"
+#include "hw_ops.h"
+
+/*
+ * TODO: this is here just for now, it must be removed when the data
+ * operations are in place.
+ */
+#include "../wl12xx/reg.h"
 
 static int wl1271_set_default_wep_key(struct wl1271 *wl,
                                       struct wl12xx_vif *wlvif, u8 id)
@@ -56,8 +62,8 @@ static int wl1271_alloc_tx_id(struct wl1271 *wl, struct sk_buff *skb)
 {
         int id;
 
-        id = find_first_zero_bit(wl->tx_frames_map, ACX_TX_DESCRIPTORS);
-        if (id >= ACX_TX_DESCRIPTORS)
+        id = find_first_zero_bit(wl->tx_frames_map, wl->num_tx_desc);
+        if (id >= wl->num_tx_desc)
                 return -EBUSY;
 
         __set_bit(id, wl->tx_frames_map);
@@ -69,7 +75,7 @@ static int wl1271_alloc_tx_id(struct wl1271 *wl, struct sk_buff *skb)
 static void wl1271_free_tx_id(struct wl1271 *wl, int id)
 {
         if (__test_and_clear_bit(id, wl->tx_frames_map)) {
-                if (unlikely(wl->tx_frames_cnt == ACX_TX_DESCRIPTORS))
+                if (unlikely(wl->tx_frames_cnt == wl->num_tx_desc))
                         clear_bit(WL1271_FLAG_FW_TX_BUSY, &wl->flags);
 
                 wl->tx_frames[id] = NULL;
@@ -167,14 +173,15 @@ u8 wl12xx_tx_get_hlid(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                 return wlvif->dev_hlid;
 }
 
-static unsigned int wl12xx_calc_packet_alignment(struct wl1271 *wl,
-                                                unsigned int packet_length)
+unsigned int wlcore_calc_packet_alignment(struct wl1271 *wl,
+                                          unsigned int packet_length)
 {
-        if (wl->quirks & WL12XX_QUIRK_NO_BLOCKSIZE_ALIGNMENT)
-                return ALIGN(packet_length, WL1271_TX_ALIGN_TO);
-        else
+        if (wl->quirks & WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN)
                 return ALIGN(packet_length, WL12XX_BUS_BLOCK_SIZE);
+        else
+                return ALIGN(packet_length, WL1271_TX_ALIGN_TO);
 }
+EXPORT_SYMBOL(wlcore_calc_packet_alignment);
 
 static int wl1271_tx_allocate(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                               struct sk_buff *skb, u32 extra, u32 buf_offset,
@@ -182,10 +189,9 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 {
         struct wl1271_tx_hw_descr *desc;
         u32 total_len = skb->len + sizeof(struct wl1271_tx_hw_descr) + extra;
-        u32 len;
         u32 total_blocks;
         int id, ret = -EBUSY, ac;
-        u32 spare_blocks = wl->tx_spare_blocks;
+        u32 spare_blocks = wl->normal_tx_spare;
         bool is_dummy = false;
 
         if (buf_offset + total_len > WL1271_AGGR_BUFFER_SIZE)
@@ -196,30 +202,19 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         if (id < 0)
                 return id;
 
-        /* approximate the number of blocks required for this packet
-           in the firmware */
-        len = wl12xx_calc_packet_alignment(wl, total_len);
-
-        /* in case of a dummy packet, use default amount of spare mem blocks */
-        if (unlikely(wl12xx_is_dummy_packet(wl, skb))) {
+        if (unlikely(wl12xx_is_dummy_packet(wl, skb)))
                 is_dummy = true;
-                spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;
-        }
+        else if (wlvif->is_gem)
+                spare_blocks = wl->gem_tx_spare;
 
-        total_blocks = (len + TX_HW_BLOCK_SIZE - 1) / TX_HW_BLOCK_SIZE +
-                spare_blocks;
+        total_blocks = wlcore_hw_calc_tx_blocks(wl, total_len, spare_blocks);
 
         if (total_blocks <= wl->tx_blocks_available) {
                 desc = (struct wl1271_tx_hw_descr *)skb_push(
                         skb, total_len - skb->len);
 
-                /* HW descriptor fields change between wl127x and wl128x */
-                if (wl->chip.id == CHIP_ID_1283_PG20) {
-                        desc->wl128x_mem.total_mem_blocks = total_blocks;
-                } else {
-                        desc->wl127x_mem.extra_blocks = spare_blocks;
-                        desc->wl127x_mem.total_mem_blocks = total_blocks;
-                }
+                wlcore_hw_set_tx_desc_blocks(wl, desc, total_blocks,
+                                             spare_blocks);
 
                 desc->id = id;
 
@@ -256,7 +251,7 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 {
         struct timespec ts;
         struct wl1271_tx_hw_descr *desc;
-        int aligned_len, ac, rate_idx;
+        int ac, rate_idx;
         s64 hosttime;
         u16 tx_attr = 0;
         __le16 frame_control;
@@ -329,44 +324,16 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         }
 
         tx_attr |= rate_idx << TX_HW_ATTR_OFST_RATE_POLICY;
-        desc->reserved = 0;
-
-        aligned_len = wl12xx_calc_packet_alignment(wl, skb->len);
-
-        if (wl->chip.id == CHIP_ID_1283_PG20) {
-                desc->wl128x_mem.extra_bytes = aligned_len - skb->len;
-                desc->length = cpu_to_le16(aligned_len >> 2);
-
-                wl1271_debug(DEBUG_TX, "tx_fill_hdr: hlid: %d "
-                             "tx_attr: 0x%x len: %d life: %d mem: %d",
-                             desc->hlid, tx_attr,
-                             le16_to_cpu(desc->length),
-                             le16_to_cpu(desc->life_time),
-                             desc->wl128x_mem.total_mem_blocks);
-        } else {
-                int pad;
-
-                /* Store the aligned length in terms of words */
-                desc->length = cpu_to_le16(aligned_len >> 2);
-
-                /* calculate number of padding bytes */
-                pad = aligned_len - skb->len;
-                tx_attr |= pad << TX_HW_ATTR_OFST_LAST_WORD_PAD;
-
-                wl1271_debug(DEBUG_TX, "tx_fill_hdr: pad: %d hlid: %d "
-                             "tx_attr: 0x%x len: %d life: %d mem: %d", pad,
-                             desc->hlid, tx_attr,
-                             le16_to_cpu(desc->length),
-                             le16_to_cpu(desc->life_time),
-                             desc->wl127x_mem.total_mem_blocks);
-        }
 
         /* for WEP shared auth - no fw encryption is needed */
         if (ieee80211_is_auth(frame_control) &&
             ieee80211_has_protected(frame_control))
                 tx_attr |= TX_HW_ATTR_HOST_ENCRYPT;
 
+        desc->reserved = 0;
         desc->tx_attr = cpu_to_le16(tx_attr);
+
+        wlcore_hw_set_tx_desc_data_len(wl, desc, skb);
 }
 
 /* caller must hold wl->mutex */
@@ -432,7 +399,7 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct wl12xx_vif *wlvif,
          * In special cases, we want to align to a specific block size
          * (eg. for wl128x with SDIO we align to 256).
          */
-        total_len = wl12xx_calc_packet_alignment(wl, skb->len);
+        total_len = wlcore_calc_packet_alignment(wl, skb->len);
 
         memcpy(wl->aggr_buf + buf_offset, skb->data, skb->len);
         memset(wl->aggr_buf + buf_offset + skb->len, 0, total_len - skb->len);
@@ -718,8 +685,8 @@ void wl1271_tx_work_locked(struct wl1271 *wl)
                          * Flush buffer and try again.
                          */
                         wl1271_skb_queue_head(wl, wlvif, skb);
-                        wl1271_write(wl, WL1271_SLV_MEM_DATA, wl->aggr_buf,
-                                     buf_offset, true);
+                        wlcore_write_data(wl, REG_SLV_MEM_DATA, wl->aggr_buf,
+                                          buf_offset, true);
                         sent_packets = true;
                         buf_offset = 0;
                         continue;
@@ -753,8 +720,8 @@ void wl1271_tx_work_locked(struct wl1271 *wl)
 
 out_ack:
         if (buf_offset) {
-                wl1271_write(wl, WL1271_SLV_MEM_DATA, wl->aggr_buf,
-                                buf_offset, true);
+                wlcore_write_data(wl, REG_SLV_MEM_DATA, wl->aggr_buf,
+                                  buf_offset, true);
                 sent_packets = true;
         }
         if (sent_packets) {
@@ -762,8 +729,8 @@ out_ack:
                  * Interrupt the firmware with the new packets. This is only
                  * required for older hardware revisions
                  */
-                if (wl->quirks & WL12XX_QUIRK_END_OF_TRANSACTION)
-                        wl1271_write32(wl, WL1271_HOST_WR_ACCESS,
+                if (wl->quirks & WLCORE_QUIRK_END_OF_TRANSACTION)
+                        wl1271_write32(wl, WL12XX_HOST_WR_ACCESS,
                                        wl->tx_packets_count);
 
                 wl1271_handle_tx_low_watermark(wl);
@@ -792,11 +759,20 @@ static u8 wl1271_tx_get_rate_flags(u8 rate_class_index)
 {
         u8 flags = 0;
 
-        if (rate_class_index >= CONF_HW_RXTX_RATE_MCS_MIN &&
-            rate_class_index <= CONF_HW_RXTX_RATE_MCS_MAX)
+        /*
+         * TODO: use wl12xx constants when this code is moved to wl12xx, as
+         * only it uses Tx-completion.
+         */
+        if (rate_class_index <= 8)
                 flags |= IEEE80211_TX_RC_MCS;
-        if (rate_class_index == CONF_HW_RXTX_RATE_MCS7_SGI)
+
+        /*
+         * TODO: use wl12xx constants when this code is moved to wl12xx, as
+         * only it uses Tx-completion.
+         */
+        if (rate_class_index == 0)
                 flags |= IEEE80211_TX_RC_SHORT_GI;
+
         return flags;
 }
 
@@ -813,7 +789,7 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
         u8 retries = 0;
 
         /* check for id legality */
-        if (unlikely(id >= ACX_TX_DESCRIPTORS || wl->tx_frames[id] == NULL)) {
+        if (unlikely(id >= wl->num_tx_desc || wl->tx_frames[id] == NULL)) {
                 wl1271_warning("TX result illegal id: %d", id);
                 return;
         }
@@ -834,7 +810,7 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
         if (result->status == TX_SUCCESS) {
                 if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
                         info->flags |= IEEE80211_TX_STAT_ACK;
-                rate = wl1271_rate_to_idx(result->rate_class_index,
+                rate = wlcore_rate_to_idx(wl, result->rate_class_index,
                                           wlvif->band);
                 rate_flags = wl1271_tx_get_rate_flags(result->rate_class_index);
                 retries = result->ack_failures;
@@ -929,6 +905,7 @@ void wl1271_tx_complete(struct wl1271 *wl)
                 wl->tx_results_count++;
         }
 }
+EXPORT_SYMBOL(wl1271_tx_complete);
 
 void wl1271_tx_reset_link_queues(struct wl1271 *wl, u8 hlid)
 {
@@ -1006,7 +983,7 @@ void wl12xx_tx_reset(struct wl1271 *wl, bool reset_tx_queues)
         if (reset_tx_queues)
                 wl1271_handle_tx_low_watermark(wl);
 
-        for (i = 0; i < ACX_TX_DESCRIPTORS; i++) {
+        for (i = 0; i < wl->num_tx_desc; i++) {
                 if (wl->tx_frames[i] == NULL)
                         continue;
 
diff --git a/drivers/net/wireless/wl12xx/tx.h b/drivers/net/wireless/ti/wlcore/tx.h
index 5cf8c32d40d1..2fd6e5dc6f75 100644
--- a/drivers/net/wireless/wl12xx/tx.h
+++ b/drivers/net/wireless/ti/wlcore/tx.h
@@ -25,9 +25,6 @@
 #ifndef __TX_H__
 #define __TX_H__
 
-#define TX_HW_BLOCK_SPARE_DEFAULT        1
-#define TX_HW_BLOCK_SIZE                 252
-
 #define TX_HW_MGMT_PKT_LIFETIME_TU       2000
 #define TX_HW_AP_MODE_PKT_LIFETIME_TU    8000
 
@@ -212,7 +209,7 @@ void wl1271_tx_complete(struct wl1271 *wl);
 void wl12xx_tx_reset_wlvif(struct wl1271 *wl, struct wl12xx_vif *wlvif);
 void wl12xx_tx_reset(struct wl1271 *wl, bool reset_tx_queues);
 void wl1271_tx_flush(struct wl1271 *wl);
-u8 wl1271_rate_to_idx(int rate, enum ieee80211_band band);
+u8 wlcore_rate_to_idx(struct wl1271 *wl, u8 rate, enum ieee80211_band band);
 u32 wl1271_tx_enabled_rates_get(struct wl1271 *wl, u32 rate_set,
                                 enum ieee80211_band rate_band);
 u32 wl1271_tx_min_rate_get(struct wl1271 *wl, u32 rate_set);
@@ -224,6 +221,8 @@ void wl1271_tx_reset_link_queues(struct wl1271 *wl, u8 hlid);
 void wl1271_handle_tx_low_watermark(struct wl1271 *wl);
 bool wl12xx_is_dummy_packet(struct wl1271 *wl, struct sk_buff *skb);
 void wl12xx_rearm_rx_streaming(struct wl1271 *wl, unsigned long *active_hlids);
+unsigned int wlcore_calc_packet_alignment(struct wl1271 *wl,
+                                          unsigned int packet_length);
 
 /* from main.c */
 void wl1271_free_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 hlid);
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/ti/wlcore/wl12xx.h
index 749a15a75d38..a9b220c43e54 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/ti/wlcore/wl12xx.h
@@ -89,8 +89,6 @@
 #define WL1271_AP_BSS_INDEX        0
 #define WL1271_AP_DEF_BEACON_EXP   20
 
-#define ACX_TX_DESCRIPTORS         16
-
 #define WL1271_AGGR_BUFFER_SIZE (4 * PAGE_SIZE)
 
 enum wl1271_state {
@@ -105,26 +103,6 @@ enum wl12xx_fw_type {
         WL12XX_FW_TYPE_PLT,
 };
 
-enum wl1271_partition_type {
-        PART_DOWN,
-        PART_WORK,
-        PART_DRPW,
-
-        PART_TABLE_LEN
-};
-
-struct wl1271_partition {
-        u32 size;
-        u32 start;
-};
-
-struct wl1271_partition_set {
-        struct wl1271_partition mem;
-        struct wl1271_partition reg;
-        struct wl1271_partition mem2;
-        struct wl1271_partition mem3;
-};
-
 struct wl1271;
 
 enum {
@@ -167,8 +145,21 @@ struct wl1271_stats {
 
 #define AP_MAX_STATIONS            8
 
+struct wl_fw_packet_counters {
+        /* Cumulative counter of released packets per AC */
+        u8 tx_released_pkts[NUM_TX_QUEUES];
+
+        /* Cumulative counter of freed packets per HLID */
+        u8 tx_lnk_free_pkts[WL12XX_MAX_LINKS];
+
+        /* Cumulative counter of released Voice memory blocks */
+        u8 tx_voice_released_blks;
+
+        u8 padding[3];
+} __packed;
+
 /* FW status registers */
-struct wl12xx_fw_status {
+struct wl_fw_status {
         __le32 intr;
         u8  fw_rx_counter;
         u8  drv_rx_counter;
@@ -195,16 +186,12 @@ struct wl12xx_fw_status {
         /* Size (in Memory Blocks) of TX pool */
         __le32 tx_total;
 
-        /* Cumulative counter of released packets per AC */
-        u8 tx_released_pkts[NUM_TX_QUEUES];
+        struct wl_fw_packet_counters counters;
 
-        /* Cumulative counter of freed packets per HLID */
-        u8 tx_lnk_free_pkts[WL12XX_MAX_LINKS];
-
-        /* Cumulative counter of released Voice memory blocks */
-        u8 tx_voice_released_blks;
-        u8 padding_1[3];
         __le32 log_start_addr;
+
+        /* Private status to be used by the lower drivers */
+        u8 priv[0];
 } __packed;
 
 struct wl1271_rx_mem_pool_addr {
@@ -292,214 +279,6 @@ struct wl1271_link {
         u8 ba_bitmap;
 };
 
-struct wl1271 {
-        struct ieee80211_hw *hw;
-        bool mac80211_registered;
-
-        struct device *dev;
-
-        void *if_priv;
-
-        struct wl1271_if_operations *if_ops;
-
-        void (*set_power)(bool enable);
-        int irq;
-        int ref_clock;
-
-        spinlock_t wl_lock;
-
-        enum wl1271_state state;
-        enum wl12xx_fw_type fw_type;
-        bool plt;
-        u8 last_vif_count;
-        struct mutex mutex;
-
-        unsigned long flags;
-
-        struct wl1271_partition_set part;
-
-        struct wl1271_chip chip;
-
-        int cmd_box_addr;
-        int event_box_addr;
-
-        u8 *fw;
-        size_t fw_len;
-        void *nvs;
-        size_t nvs_len;
-
-        s8 hw_pg_ver;
-
-        /* address read from the fuse ROM */
-        u32 fuse_oui_addr;
-        u32 fuse_nic_addr;
-
-        /* we have up to 2 MAC addresses */
-        struct mac_address addresses[2];
-        int channel;
-        u8 system_hlid;
-
-        unsigned long links_map[BITS_TO_LONGS(WL12XX_MAX_LINKS)];
-        unsigned long roles_map[BITS_TO_LONGS(WL12XX_MAX_ROLES)];
-        unsigned long roc_map[BITS_TO_LONGS(WL12XX_MAX_ROLES)];
-        unsigned long rate_policies_map[
-                        BITS_TO_LONGS(WL12XX_MAX_RATE_POLICIES)];
-
-        struct list_head wlvif_list;
-
-        u8 sta_count;
-        u8 ap_count;
-
-        struct wl1271_acx_mem_map *target_mem_map;
-
-        /* Accounting for allocated / available TX blocks on HW */
-        u32 tx_blocks_freed;
-        u32 tx_blocks_available;
-        u32 tx_allocated_blocks;
-        u32 tx_results_count;
-
-        /* amount of spare TX blocks to use */
-        u32 tx_spare_blocks;
-
-        /* Accounting for allocated / available Tx packets in HW */
-        u32 tx_pkts_freed[NUM_TX_QUEUES];
-        u32 tx_allocated_pkts[NUM_TX_QUEUES];
-
-        /* Transmitted TX packets counter for chipset interface */
-        u32 tx_packets_count;
-
-        /* Time-offset between host and chipset clocks */
-        s64 time_offset;
-
-        /* Frames scheduled for transmission, not handled yet */
-        int tx_queue_count[NUM_TX_QUEUES];
-        long stopped_queues_map;
-
-        /* Frames received, not handled yet by mac80211 */
-        struct sk_buff_head deferred_rx_queue;
-
-        /* Frames sent, not returned yet to mac80211 */
-        struct sk_buff_head deferred_tx_queue;
-
-        struct work_struct tx_work;
-        struct workqueue_struct *freezable_wq;
-
-        /* Pending TX frames */
-        unsigned long tx_frames_map[BITS_TO_LONGS(ACX_TX_DESCRIPTORS)];
-        struct sk_buff *tx_frames[ACX_TX_DESCRIPTORS];
-        int tx_frames_cnt;
-
-        /* FW Rx counter */
-        u32 rx_counter;
-
-        /* Rx memory pool address */
-        struct wl1271_rx_mem_pool_addr rx_mem_pool_addr;
-
-        /* Intermediate buffer, used for packet aggregation */
-        u8 *aggr_buf;
-
-        /* Reusable dummy packet template */
-        struct sk_buff *dummy_packet;
-
-        /* Network stack work  */
-        struct work_struct netstack_work;
-
-        /* FW log buffer */
-        u8 *fwlog;
-
-        /* Number of valid bytes in the FW log buffer */
-        ssize_t fwlog_size;
-
-        /* Sysfs FW log entry readers wait queue */
-        wait_queue_head_t fwlog_waitq;
-
-        /* Hardware recovery work */
-        struct work_struct recovery_work;
-
-        /* The mbox event mask */
-        u32 event_mask;
-
-        /* Mailbox pointers */
-        u32 mbox_ptr[2];
-
-        /* Are we currently scanning */
-        struct ieee80211_vif *scan_vif;
-        struct wl1271_scan scan;
-        struct delayed_work scan_complete_work;
-
-        bool sched_scanning;
-
-        /* The current band */
-        enum ieee80211_band band;
-
-        struct completion *elp_compl;
-        struct delayed_work elp_work;
-
-        /* in dBm */
-        int power_level;
-
-        struct wl1271_stats stats;
-
-        __le32 buffer_32;
-        u32 buffer_cmd;
-        u32 buffer_busyword[WL1271_BUSY_WORD_CNT];
-
-        struct wl12xx_fw_status *fw_status;
-        struct wl1271_tx_hw_res_if *tx_res_if;
-
-        /* Current chipset configuration */
-        struct conf_drv_settings conf;
-
-        bool sg_enabled;
-
-        bool enable_11a;
-
-        /* Most recently reported noise in dBm */
-        s8 noise;
-
-        /* bands supported by this instance of wl12xx */
-        struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
-
-        int tcxo_clock;
-
-        /*
-         * wowlan trigger was configured during suspend.
-         * (currently, only "ANY" trigger is supported)
-         */
-        bool wow_enabled;
-        bool irq_wake_enabled;
-
-        /*
-         * AP-mode - links indexed by HLID. The global and broadcast links
-         * are always active.
-         */
-        struct wl1271_link links[WL12XX_MAX_LINKS];
-
-        /* AP-mode - a bitmap of links currently in PS mode according to FW */
-        u32 ap_fw_ps_map;
-
-        /* AP-mode - a bitmap of links currently in PS mode in mac80211 */
-        unsigned long ap_ps_map;
-
-        /* Quirks of specific hardware revisions */
-        unsigned int quirks;
-
-        /* Platform limitations */
-        unsigned int platform_quirks;
-
-        /* number of currently active RX BA sessions */
-        int ba_rx_session_count;
-
-        /* AP-mode - number of currently connected stations */
-        int active_sta_count;
-
-        /* last wlvif we transmitted from */
-        struct wl12xx_vif *last_wlvif;
-
-        /* work to fire when Tx is stuck */
-        struct delayed_work tx_watchdog_work;
-};
-
 struct wl1271_station {
         u8 hlid;
 };
@@ -605,6 +384,9 @@ struct wl12xx_vif {
         struct work_struct rx_streaming_disable_work;
         struct timer_list rx_streaming_timer;
 
+        /* does the current role use GEM for encryption (AP or STA) */
+        bool is_gem;
+
         /*
          * This struct must be last!
          * data that has to be saved acrossed reconfigs (e.g. recovery)
@@ -679,17 +461,6 @@ size_t wl12xx_copy_fwlog(struct wl1271 *wl, u8 *memblock, size_t maxlen);
 #define HW_BG_RATES_MASK        0xffff
 #define HW_HT_RATES_OFFSET      16
 
-/* Quirks */
-
-/* Each RX/TX transaction requires an end-of-transaction transfer */
-#define WL12XX_QUIRK_END_OF_TRANSACTION         BIT(0)
-
-/* wl127x and SPI don't support SDIO block size alignment */
-#define WL12XX_QUIRK_NO_BLOCKSIZE_ALIGNMENT     BIT(2)
-
-/* Older firmwares did not implement the FW logger over bus feature */
-#define WL12XX_QUIRK_FWLOG_NOT_IMPLEMENTED      BIT(4)
-
 #define WL12XX_HW_BLOCK_SIZE    256
 
 #endif
diff --git a/drivers/net/wireless/wl12xx/wl12xx_80211.h b/drivers/net/wireless/ti/wlcore/wl12xx_80211.h
index 22b0bc98d7b5..22b0bc98d7b5 100644
--- a/drivers/net/wireless/wl12xx/wl12xx_80211.h
+++ b/drivers/net/wireless/ti/wlcore/wl12xx_80211.h
diff --git a/drivers/net/wireless/wl12xx/wl12xx_platform_data.c b/drivers/net/wireless/ti/wlcore/wl12xx_platform_data.c
index 998e95895f9d..998e95895f9d 100644
--- a/drivers/net/wireless/wl12xx/wl12xx_platform_data.c
+++ b/drivers/net/wireless/ti/wlcore/wl12xx_platform_data.c
diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
new file mode 100644
index 000000000000..39f9fadfebd9
--- /dev/null
+++ b/drivers/net/wireless/ti/wlcore/wlcore.h
@@ -0,0 +1,448 @@
+/*
+ * This file is part of wlcore
+ *
+ * Copyright (C) 2011 Texas Instruments Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __WLCORE_H__
+#define __WLCORE_H__
+
+#include <linux/platform_device.h>
+
+#include "wl12xx.h"
+#include "event.h"
+
+/* The maximum number of Tx descriptors in all chip families */
+#define WLCORE_MAX_TX_DESCRIPTORS 32
+
+/* forward declaration */
+struct wl1271_tx_hw_descr;
+enum wl_rx_buf_align;
+
+struct wlcore_ops {
+        int (*identify_chip)(struct wl1271 *wl);
+        int (*identify_fw)(struct wl1271 *wl);
+        int (*boot)(struct wl1271 *wl);
+        void (*trigger_cmd)(struct wl1271 *wl, int cmd_box_addr,
+                            void *buf, size_t len);
+        void (*ack_event)(struct wl1271 *wl);
+        u32 (*calc_tx_blocks)(struct wl1271 *wl, u32 len, u32 spare_blks);
+        void (*set_tx_desc_blocks)(struct wl1271 *wl,
+                                   struct wl1271_tx_hw_descr *desc,
+                                   u32 blks, u32 spare_blks);
+        void (*set_tx_desc_data_len)(struct wl1271 *wl,
+                                     struct wl1271_tx_hw_descr *desc,
+                                     struct sk_buff *skb);
+        enum wl_rx_buf_align (*get_rx_buf_align)(struct wl1271 *wl,
+                                                 u32 rx_desc);
+        void (*prepare_read)(struct wl1271 *wl, u32 rx_desc, u32 len);
+        u32 (*get_rx_packet_len)(struct wl1271 *wl, void *rx_data,
+                                 u32 data_len);
+        void (*tx_delayed_compl)(struct wl1271 *wl);
+        void (*tx_immediate_compl)(struct wl1271 *wl);
+        int (*hw_init)(struct wl1271 *wl);
+        int (*init_vif)(struct wl1271 *wl, struct wl12xx_vif *wlvif);
+        u32 (*sta_get_ap_rate_mask)(struct wl1271 *wl,
+                                    struct wl12xx_vif *wlvif);
+        s8 (*get_pg_ver)(struct wl1271 *wl);
+        void (*get_mac)(struct wl1271 *wl);
+};
+
+enum wlcore_partitions {
+        PART_DOWN,
+        PART_WORK,
+        PART_BOOT,
+        PART_DRPW,
+        PART_TOP_PRCM_ELP_SOC,
+        PART_PHY_INIT,
+
+        PART_TABLE_LEN,
+};
+
+struct wlcore_partition {
+        u32 size;
+        u32 start;
+};
+
+struct wlcore_partition_set {
+        struct wlcore_partition mem;
+        struct wlcore_partition reg;
+        struct wlcore_partition mem2;
+        struct wlcore_partition mem3;
+};
+
+enum wlcore_registers {
+        /* register addresses, used with partition translation */
+        REG_ECPU_CONTROL,
+        REG_INTERRUPT_NO_CLEAR,
+        REG_INTERRUPT_ACK,
+        REG_COMMAND_MAILBOX_PTR,
+        REG_EVENT_MAILBOX_PTR,
+        REG_INTERRUPT_TRIG,
+        REG_INTERRUPT_MASK,
+        REG_PC_ON_RECOVERY,
+        REG_CHIP_ID_B,
+        REG_CMD_MBOX_ADDRESS,
+
+        /* data access memory addresses, used with partition translation */
+        REG_SLV_MEM_DATA,
+        REG_SLV_REG_DATA,
+
+        /* raw data access memory addresses */
+        REG_RAW_FW_STATUS_ADDR,
+
+        REG_TABLE_LEN,
+};
+
+struct wl1271 {
+        struct ieee80211_hw *hw;
+        bool mac80211_registered;
+
+        struct device *dev;
+
+        void *if_priv;
+
+        struct wl1271_if_operations *if_ops;
+
+        void (*set_power)(bool enable);
+        int irq;
+        int ref_clock;
+
+        spinlock_t wl_lock;
+
+        enum wl1271_state state;
+        enum wl12xx_fw_type fw_type;
+        bool plt;
+        u8 last_vif_count;
+        struct mutex mutex;
+
+        unsigned long flags;
+
+        struct wlcore_partition_set curr_part;
+
+        struct wl1271_chip chip;
+
+        int cmd_box_addr;
+
+        u8 *fw;
+        size_t fw_len;
+        void *nvs;
+        size_t nvs_len;
+
+        s8 hw_pg_ver;
+
+        /* address read from the fuse ROM */
+        u32 fuse_oui_addr;
+        u32 fuse_nic_addr;
+
+        /* we have up to 2 MAC addresses */
+        struct mac_address addresses[2];
+        int channel;
+        u8 system_hlid;
+
+        unsigned long links_map[BITS_TO_LONGS(WL12XX_MAX_LINKS)];
+        unsigned long roles_map[BITS_TO_LONGS(WL12XX_MAX_ROLES)];
+        unsigned long roc_map[BITS_TO_LONGS(WL12XX_MAX_ROLES)];
+        unsigned long rate_policies_map[
+                        BITS_TO_LONGS(WL12XX_MAX_RATE_POLICIES)];
+
+        struct list_head wlvif_list;
+
+        u8 sta_count;
+        u8 ap_count;
+
+        struct wl1271_acx_mem_map *target_mem_map;
+
+        /* Accounting for allocated / available TX blocks on HW */
+        u32 tx_blocks_freed;
+        u32 tx_blocks_available;
+        u32 tx_allocated_blocks;
+        u32 tx_results_count;
+
+        /* Accounting for allocated / available Tx packets in HW */
+        u32 tx_pkts_freed[NUM_TX_QUEUES];
+        u32 tx_allocated_pkts[NUM_TX_QUEUES];
+
+        /* Transmitted TX packets counter for chipset interface */
+        u32 tx_packets_count;
+
+        /* Time-offset between host and chipset clocks */
+        s64 time_offset;
+
+        /* Frames scheduled for transmission, not handled yet */
+        int tx_queue_count[NUM_TX_QUEUES];
+        long stopped_queues_map;
+
+        /* Frames received, not handled yet by mac80211 */
+        struct sk_buff_head deferred_rx_queue;
+
+        /* Frames sent, not returned yet to mac80211 */
+        struct sk_buff_head deferred_tx_queue;
+
+        struct work_struct tx_work;
+        struct workqueue_struct *freezable_wq;
+
+        /* Pending TX frames */
+        unsigned long tx_frames_map[BITS_TO_LONGS(WLCORE_MAX_TX_DESCRIPTORS)];
+        struct sk_buff *tx_frames[WLCORE_MAX_TX_DESCRIPTORS];
+        int tx_frames_cnt;
+
+        /* FW Rx counter */
+        u32 rx_counter;
+
+        /* Rx memory pool address */
+        struct wl1271_rx_mem_pool_addr rx_mem_pool_addr;
+
+        /* Intermediate buffer, used for packet aggregation */
+        u8 *aggr_buf;
+
+        /* Reusable dummy packet template */
+        struct sk_buff *dummy_packet;
+
+        /* Network stack work  */
+        struct work_struct netstack_work;
+
+        /* FW log buffer */
+        u8 *fwlog;
+
+        /* Number of valid bytes in the FW log buffer */
+        ssize_t fwlog_size;
+
+        /* Sysfs FW log entry readers wait queue */
+        wait_queue_head_t fwlog_waitq;
+
+        /* Hardware recovery work */
+        struct work_struct recovery_work;
+
+        /* Pointer that holds DMA-friendly block for the mailbox */
+        struct event_mailbox *mbox;
+
+        /* The mbox event mask */
+        u32 event_mask;
+
+        /* Mailbox pointers */
+        u32 mbox_ptr[2];
+
+        /* Are we currently scanning */
+        struct ieee80211_vif *scan_vif;
+        struct wl1271_scan scan;
+        struct delayed_work scan_complete_work;
+
+        bool sched_scanning;
+
+        /* The current band */
+        enum ieee80211_band band;
+
+        struct completion *elp_compl;
+        struct delayed_work elp_work;
+
+        /* in dBm */
+        int power_level;
+
+        struct wl1271_stats stats;
+
+        __le32 buffer_32;
+        u32 buffer_cmd;
+        u32 buffer_busyword[WL1271_BUSY_WORD_CNT];
+
+        struct wl_fw_status *fw_status;
+        struct wl1271_tx_hw_res_if *tx_res_if;
+
+        /* Current chipset configuration */
+        struct wlcore_conf conf;
+
+        bool sg_enabled;
+
+        bool enable_11a;
+
+        /* Most recently reported noise in dBm */
+        s8 noise;
+
+        /* bands supported by this instance of wl12xx */
+        struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
+
+        int tcxo_clock;
+
+        /*
+         * wowlan trigger was configured during suspend.
+         * (currently, only "ANY" trigger is supported)
+         */
+        bool wow_enabled;
+        bool irq_wake_enabled;
+
+        /*
+         * AP-mode - links indexed by HLID. The global and broadcast links
+         * are always active.
+         */
+        struct wl1271_link links[WL12XX_MAX_LINKS];
+
+        /* AP-mode - a bitmap of links currently in PS mode according to FW */
+        u32 ap_fw_ps_map;
+
+        /* AP-mode - a bitmap of links currently in PS mode in mac80211 */
+        unsigned long ap_ps_map;
+
+        /* Quirks of specific hardware revisions */
+        unsigned int quirks;
+
+        /* Platform limitations */
+        unsigned int platform_quirks;
+
+        /* number of currently active RX BA sessions */
+        int ba_rx_session_count;
+
+        /* AP-mode - number of currently connected stations */
+        int active_sta_count;
+
+        /* last wlvif we transmitted from */
+        struct wl12xx_vif *last_wlvif;
+
+        /* work to fire when Tx is stuck */
+        struct delayed_work tx_watchdog_work;
+
+        struct wlcore_ops *ops;
+        /* pointer to the lower driver partition table */
+        const struct wlcore_partition_set *ptable;
+        /* pointer to the lower driver register table */
+        const int *rtable;
+        /* name of the firmwares to load - for PLT, single role, multi-role */
+        const char *plt_fw_name;
+        const char *sr_fw_name;
+        const char *mr_fw_name;
+
+        /* per-chip-family private structure */
+        void *priv;
+
+        /* number of TX descriptors the HW supports. */
+        u32 num_tx_desc;
+
+        /* spare Tx blocks for normal/GEM operating modes */
+        u32 normal_tx_spare;
+        u32 gem_tx_spare;
+
+        /* translate HW Tx rates to standard rate-indices */
+        const u8 **band_rate_to_idx;
+
+        /* size of table for HW rates that can be received from chip */
+        u8 hw_tx_rate_tbl_size;
+
+        /* this HW rate and below are considered HT rates for this chip */
+        u8 hw_min_ht_rate;
+
+        /* HW HT (11n) capabilities */
+        struct ieee80211_sta_ht_cap ht_cap;
+
+        /* size of the private FW status data */
+        size_t fw_status_priv_len;
+};
+
+int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev);
+int __devexit wlcore_remove(struct platform_device *pdev);
+struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size);
+int wlcore_free_hw(struct wl1271 *wl);
+
+/* Firmware image load chunk size */
+#define CHUNK_SIZE      16384
+
+/* Quirks */
+
+/* Each RX/TX transaction requires an end-of-transaction transfer */
+#define WLCORE_QUIRK_END_OF_TRANSACTION         BIT(0)
+
+/* wl127x and SPI don't support SDIO block size alignment */
+#define WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN         BIT(2)
+
+/* means aggregated Rx packets are aligned to a SDIO block */
+#define WLCORE_QUIRK_RX_BLOCKSIZE_ALIGN         BIT(3)
+
+/* Older firmwares did not implement the FW logger over bus feature */
+#define WLCORE_QUIRK_FWLOG_NOT_IMPLEMENTED      BIT(4)
+
+/* Older firmwares use an old NVS format */
+#define WLCORE_QUIRK_LEGACY_NVS                 BIT(5)
+
+/* Some firmwares may not support ELP */
+#define WLCORE_QUIRK_NO_ELP                     BIT(6)
+
+/* TODO: move to the lower drivers when all usages are abstracted */
+#define CHIP_ID_1271_PG10              (0x4030101)
+#define CHIP_ID_1271_PG20              (0x4030111)
+#define CHIP_ID_1283_PG10              (0x05030101)
+#define CHIP_ID_1283_PG20              (0x05030111)
+
+/* TODO: move all these common registers and values elsewhere */
+#define HW_ACCESS_ELP_CTRL_REG          0x1FFFC
+
+/* ELP register commands */
+#define ELPCTRL_WAKE_UP             0x1
+#define ELPCTRL_WAKE_UP_WLAN_READY  0x5
+#define ELPCTRL_SLEEP               0x0
+/* ELP WLAN_READY bit */
+#define ELPCTRL_WLAN_READY          0x2
+
+/*************************************************************************
+
+    Interrupt Trigger Register (Host -> WiLink)
+
+**************************************************************************/
+
+/* Hardware to Embedded CPU Interrupts - first 32-bit register set */
+
+/*
+ * The host sets this bit to inform the Wlan
+ * FW that a TX packet is in the XFER
+ * Buffer #0.
+ */
+#define INTR_TRIG_TX_PROC0 BIT(2)
+
+/*
+ * The host sets this bit to inform the FW
+ * that it read a packet from RX XFER
+ * Buffer #0.
+ */
+#define INTR_TRIG_RX_PROC0 BIT(3)
+
+#define INTR_TRIG_DEBUG_ACK BIT(4)
+
+#define INTR_TRIG_STATE_CHANGED BIT(5)
+
+/* Hardware to Embedded CPU Interrupts - second 32-bit register set */
+
+/*
+ * The host sets this bit to inform the FW
+ * that it read a packet from RX XFER
+ * Buffer #1.
+ */
+#define INTR_TRIG_RX_PROC1 BIT(17)
+
+/*
+ * The host sets this bit to inform the Wlan
+ * hardware that a TX packet is in the XFER
+ * Buffer #1.
+ */
+#define INTR_TRIG_TX_PROC1 BIT(18)
+
+#define ACX_SLV_SOFT_RESET_BIT  BIT(1)
+#define SOFT_RESET_MAX_TIME     1000000
+#define SOFT_RESET_STALL_TIME   1000
+
+#define ECPU_CONTROL_HALT       0x00000101
+
+#define WELP_ARM_COMMAND_VAL    0x4
+
+#endif /* __WLCORE_H__ */
diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
deleted file mode 100644
index af08c8609c63..000000000000
--- a/drivers/net/wireless/wl12xx/Kconfig
+++ /dev/null
@@ -1,48 +0,0 @@
-menuconfig WL12XX_MENU
-        tristate "TI wl12xx driver support"
-        depends on MAC80211 && EXPERIMENTAL
-        ---help---
-          This will enable TI wl12xx driver support for the following chips:
-          wl1271, wl1273, wl1281 and wl1283.
-          The drivers make use of the mac80211 stack.
-
-config WL12XX
-        tristate "TI wl12xx support"
-        depends on WL12XX_MENU && GENERIC_HARDIRQS
-        depends on INET
-        select FW_LOADER
-        ---help---
-          This module adds support for wireless adapters based on TI wl1271 and
-          TI wl1273 chipsets. This module does *not* include support for wl1251.
-          For wl1251 support, use the separate homonymous driver instead.
-
-          If you choose to build a module, it will be called wl12xx. Say N if
-          unsure.
-
-config WL12XX_SPI
-        tristate "TI wl12xx SPI support"
-        depends on WL12XX && SPI_MASTER
-        select CRC7
-        ---help---
-          This module adds support for the SPI interface of adapters using
-          TI wl12xx chipsets.  Select this if your platform is using
-          the SPI bus.
-
-          If you choose to build a module, it'll be called wl12xx_spi.
-          Say N if unsure.
-
-config WL12XX_SDIO
-        tristate "TI wl12xx SDIO support"
-        depends on WL12XX && MMC
-        ---help---
-          This module adds support for the SDIO interface of adapters using
-          TI wl12xx chipsets.  Select this if your platform is using
-          the SDIO bus.
-
-          If you choose to build a module, it'll be called wl12xx_sdio.
-          Say N if unsure.
-
-config WL12XX_PLATFORM_DATA
-        bool
-        depends on WL12XX_SDIO != n || WL1251_SDIO != n
-        default y
diff --git a/drivers/net/wireless/wl12xx/Makefile b/drivers/net/wireless/wl12xx/Makefile
deleted file mode 100644
index 98f289c907a9..000000000000
--- a/drivers/net/wireless/wl12xx/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-wl12xx-objs             = main.o cmd.o io.o event.o tx.o rx.o ps.o acx.o \
-                          boot.o init.o debugfs.o scan.o
-
-wl12xx_spi-objs         = spi.o
-wl12xx_sdio-objs        = sdio.o
-
-wl12xx-$(CONFIG_NL80211_TESTMODE)       += testmode.o
-obj-$(CONFIG_WL12XX)                    += wl12xx.o
-obj-$(CONFIG_WL12XX_SPI)                += wl12xx_spi.o
-obj-$(CONFIG_WL12XX_SDIO)               += wl12xx_sdio.o
-
-# small builtin driver bit
-obj-$(CONFIG_WL12XX_PLATFORM_DATA)      += wl12xx_platform_data.o
-
-ccflags-y += -D__CHECK_ENDIAN__
diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/wl12xx/boot.c
deleted file mode 100644
index 954101d03f06..000000000000
--- a/drivers/net/wireless/wl12xx/boot.c
+++ /dev/null
@@ -1,786 +0,0 @@
-/*
- * This file is part of wl1271
- *
- * Copyright (C) 2008-2010 Nokia Corporation
- *
- * Contact: Luciano Coelho <luciano.coelho@nokia.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#include <linux/slab.h>
-#include <linux/wl12xx.h>
-#include <linux/export.h>
-
-#include "debug.h"
-#include "acx.h"
-#include "reg.h"
-#include "boot.h"
-#include "io.h"
-#include "event.h"
-#include "rx.h"
-
-static void wl1271_boot_set_ecpu_ctrl(struct wl1271 *wl, u32 flag)
-{
-        u32 cpu_ctrl;
-
-        /* 10.5.0 run the firmware (I) */
-        cpu_ctrl = wl1271_read32(wl, ACX_REG_ECPU_CONTROL);
-
-        /* 10.5.1 run the firmware (II) */
-        cpu_ctrl |= flag;
-        wl1271_write32(wl, ACX_REG_ECPU_CONTROL, cpu_ctrl);
-}
-
-static unsigned int wl12xx_get_fw_ver_quirks(struct wl1271 *wl)
-{
-        unsigned int quirks = 0;
-        unsigned int *fw_ver = wl->chip.fw_ver;
-
-        /* Only new station firmwares support routing fw logs to the host */
-        if ((fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_STA) &&
-            (fw_ver[FW_VER_MINOR] < FW_VER_MINOR_FWLOG_STA_MIN))
-                quirks |= WL12XX_QUIRK_FWLOG_NOT_IMPLEMENTED;
-
-        /* This feature is not yet supported for AP mode */
-        if (fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_AP)
-                quirks |= WL12XX_QUIRK_FWLOG_NOT_IMPLEMENTED;
-
-        return quirks;
-}
-
-static void wl1271_parse_fw_ver(struct wl1271 *wl)
-{
-        int ret;
-
-        ret = sscanf(wl->chip.fw_ver_str + 4, "%u.%u.%u.%u.%u",
-                     &wl->chip.fw_ver[0], &wl->chip.fw_ver[1],
-                     &wl->chip.fw_ver[2], &wl->chip.fw_ver[3],
-                     &wl->chip.fw_ver[4]);
-
-        if (ret != 5) {
-                wl1271_warning("fw version incorrect value");
-                memset(wl->chip.fw_ver, 0, sizeof(wl->chip.fw_ver));
-                return;
-        }
-
-        /* Check if any quirks are needed with older fw versions */
-        wl->quirks |= wl12xx_get_fw_ver_quirks(wl);
-}
-
-static void wl1271_boot_fw_version(struct wl1271 *wl)
-{
-        struct wl1271_static_data static_data;
-
-        wl1271_read(wl, wl->cmd_box_addr, &static_data, sizeof(static_data),
-                    false);
-
-        strncpy(wl->chip.fw_ver_str, static_data.fw_version,
-                sizeof(wl->chip.fw_ver_str));
-
-        /* make sure the string is NULL-terminated */
-        wl->chip.fw_ver_str[sizeof(wl->chip.fw_ver_str) - 1] = '\0';
-
-        wl1271_parse_fw_ver(wl);
-}
-
-static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
-                                             size_t fw_data_len, u32 dest)
-{
-        struct wl1271_partition_set partition;
-        int addr, chunk_num, partition_limit;
-        u8 *p, *chunk;
-
-        /* whal_FwCtrl_LoadFwImageSm() */
-
-        wl1271_debug(DEBUG_BOOT, "starting firmware upload");
-
-        wl1271_debug(DEBUG_BOOT, "fw_data_len %zd chunk_size %d",
-                     fw_data_len, CHUNK_SIZE);
-
-        if ((fw_data_len % 4) != 0) {
-                wl1271_error("firmware length not multiple of four");
-                return -EIO;
-        }
-
-        chunk = kmalloc(CHUNK_SIZE, GFP_KERNEL);
-        if (!chunk) {
-                wl1271_error("allocation for firmware upload chunk failed");
-                return -ENOMEM;
-        }
-
-        memcpy(&partition, &wl12xx_part_table[PART_DOWN], sizeof(partition));
-        partition.mem.start = dest;
-        wl1271_set_partition(wl, &partition);
-
-        /* 10.1 set partition limit and chunk num */
-        chunk_num = 0;
-        partition_limit = wl12xx_part_table[PART_DOWN].mem.size;
-
-        while (chunk_num < fw_data_len / CHUNK_SIZE) {
-                /* 10.2 update partition, if needed */
-                addr = dest + (chunk_num + 2) * CHUNK_SIZE;
-                if (addr > partition_limit) {
-                        addr = dest + chunk_num * CHUNK_SIZE;
-                        partition_limit = chunk_num * CHUNK_SIZE +
-                                wl12xx_part_table[PART_DOWN].mem.size;
-                        partition.mem.start = addr;
-                        wl1271_set_partition(wl, &partition);
-                }
-
-                /* 10.3 upload the chunk */
-                addr = dest + chunk_num * CHUNK_SIZE;
-                p = buf + chunk_num * CHUNK_SIZE;
-                memcpy(chunk, p, CHUNK_SIZE);
-                wl1271_debug(DEBUG_BOOT, "uploading fw chunk 0x%p to 0x%x",
-                             p, addr);
-                wl1271_write(wl, addr, chunk, CHUNK_SIZE, false);
-
-                chunk_num++;
-        }
-
-        /* 10.4 upload the last chunk */
-        addr = dest + chunk_num * CHUNK_SIZE;
-        p = buf + chunk_num * CHUNK_SIZE;
-        memcpy(chunk, p, fw_data_len % CHUNK_SIZE);
-        wl1271_debug(DEBUG_BOOT, "uploading fw last chunk (%zd B) 0x%p to 0x%x",
-                     fw_data_len % CHUNK_SIZE, p, addr);
-        wl1271_write(wl, addr, chunk, fw_data_len % CHUNK_SIZE, false);
-
-        kfree(chunk);
-        return 0;
-}
-
-static int wl1271_boot_upload_firmware(struct wl1271 *wl)
-{
-        u32 chunks, addr, len;
-        int ret = 0;
-        u8 *fw;
-
-        fw = wl->fw;
-        chunks = be32_to_cpup((__be32 *) fw);
-        fw += sizeof(u32);
-
-        wl1271_debug(DEBUG_BOOT, "firmware chunks to be uploaded: %u", chunks);
-
-        while (chunks--) {
-                addr = be32_to_cpup((__be32 *) fw);
-                fw += sizeof(u32);
-                len = be32_to_cpup((__be32 *) fw);
-                fw += sizeof(u32);
-
-                if (len > 300000) {
-                        wl1271_info("firmware chunk too long: %u", len);
-                        return -EINVAL;
-                }
-                wl1271_debug(DEBUG_BOOT, "chunk %d addr 0x%x len %u",
-                             chunks, addr, len);
-                ret = wl1271_boot_upload_firmware_chunk(wl, fw, len, addr);
-                if (ret != 0)
-                        break;
-                fw += len;
-        }
-
-        return ret;
-}
-
-static int wl1271_boot_upload_nvs(struct wl1271 *wl)
-{
-        size_t nvs_len, burst_len;
-        int i;
-        u32 dest_addr, val;
-        u8 *nvs_ptr, *nvs_aligned;
-
-        if (wl->nvs == NULL)
-                return -ENODEV;
-
-        if (wl->chip.id == CHIP_ID_1283_PG20) {
-                struct wl128x_nvs_file *nvs = (struct wl128x_nvs_file *)wl->nvs;
-
-                if (wl->nvs_len == sizeof(struct wl128x_nvs_file)) {
-                        if (nvs->general_params.dual_mode_select)
-                                wl->enable_11a = true;
-                } else {
-                        wl1271_error("nvs size is not as expected: %zu != %zu",
-                                     wl->nvs_len,
-                                     sizeof(struct wl128x_nvs_file));
-                        kfree(wl->nvs);
-                        wl->nvs = NULL;
-                        wl->nvs_len = 0;
-                        return -EILSEQ;
-                }
-
-                /* only the first part of the NVS needs to be uploaded */
-                nvs_len = sizeof(nvs->nvs);
-                nvs_ptr = (u8 *)nvs->nvs;
-
-        } else {
-                struct wl1271_nvs_file *nvs =
-                        (struct wl1271_nvs_file *)wl->nvs;
-                /*
-                 * FIXME: the LEGACY NVS image support (NVS's missing the 5GHz
-                 * band configurations) can be removed when those NVS files stop
-                 * floating around.
-                 */
-                if (wl->nvs_len == sizeof(struct wl1271_nvs_file) ||
-                    wl->nvs_len == WL1271_INI_LEGACY_NVS_FILE_SIZE) {
-                        if (nvs->general_params.dual_mode_select)
-                                wl->enable_11a = true;
-                }
-
-                if (wl->nvs_len != sizeof(struct wl1271_nvs_file) &&
-                    (wl->nvs_len != WL1271_INI_LEGACY_NVS_FILE_SIZE ||
-                     wl->enable_11a)) {
-                        wl1271_error("nvs size is not as expected: %zu != %zu",
-                                wl->nvs_len, sizeof(struct wl1271_nvs_file));
-                        kfree(wl->nvs);
-                        wl->nvs = NULL;
-                        wl->nvs_len = 0;
-                        return -EILSEQ;
-                }
-
-                /* only the first part of the NVS needs to be uploaded */
-                nvs_len = sizeof(nvs->nvs);
-                nvs_ptr = (u8 *) nvs->nvs;
-        }
-
-        /* update current MAC address to NVS */
-        nvs_ptr[11] = wl->addresses[0].addr[0];
-        nvs_ptr[10] = wl->addresses[0].addr[1];
-        nvs_ptr[6] = wl->addresses[0].addr[2];
-        nvs_ptr[5] = wl->addresses[0].addr[3];
-        nvs_ptr[4] = wl->addresses[0].addr[4];
-        nvs_ptr[3] = wl->addresses[0].addr[5];
-
-        /*
-         * Layout before the actual NVS tables:
-         * 1 byte : burst length.
-         * 2 bytes: destination address.
-         * n bytes: data to burst copy.
-         *
-         * This is ended by a 0 length, then the NVS tables.
-         */
-
-        /* FIXME: Do we need to check here whether the LSB is 1? */
-        while (nvs_ptr[0]) {
-                burst_len = nvs_ptr[0];
-                dest_addr = (nvs_ptr[1] & 0xfe) | ((u32)(nvs_ptr[2] << 8));
-
-                /*
-                 * Due to our new wl1271_translate_reg_addr function,
-                 * we need to add the REGISTER_BASE to the destination
-                 */
-                dest_addr += REGISTERS_BASE;
-
-                /* We move our pointer to the data */
-                nvs_ptr += 3;
-
-                for (i = 0; i < burst_len; i++) {
-                        if (nvs_ptr + 3 >= (u8 *) wl->nvs + nvs_len)
-                                goto out_badnvs;
-
-                        val = (nvs_ptr[0] | (nvs_ptr[1] << 8)
-                               | (nvs_ptr[2] << 16) | (nvs_ptr[3] << 24));
-
-                        wl1271_debug(DEBUG_BOOT,
-                                     "nvs burst write 0x%x: 0x%x",
-                                     dest_addr, val);
-                        wl1271_write32(wl, dest_addr, val);
-
-                        nvs_ptr += 4;
-                        dest_addr += 4;
-                }
-
-                if (nvs_ptr >= (u8 *) wl->nvs + nvs_len)
-                        goto out_badnvs;
-        }
-
-        /*
-         * We've reached the first zero length, the first NVS table
-         * is located at an aligned offset which is at least 7 bytes further.
-         * NOTE: The wl->nvs->nvs element must be first, in order to
-         * simplify the casting, we assume it is at the beginning of
-         * the wl->nvs structure.
-         */
-        nvs_ptr = (u8 *)wl->nvs +
-                        ALIGN(nvs_ptr - (u8 *)wl->nvs + 7, 4);
-
-        if (nvs_ptr >= (u8 *) wl->nvs + nvs_len)
-                goto out_badnvs;
-
-        nvs_len -= nvs_ptr - (u8 *)wl->nvs;
-
-        /* Now we must set the partition correctly */
-        wl1271_set_partition(wl, &wl12xx_part_table[PART_WORK]);
-
-        /* Copy the NVS tables to a new block to ensure alignment */
-        nvs_aligned = kmemdup(nvs_ptr, nvs_len, GFP_KERNEL);
-        if (!nvs_aligned)
-                return -ENOMEM;
-
-        /* And finally we upload the NVS tables */
-        wl1271_write(wl, CMD_MBOX_ADDRESS, nvs_aligned, nvs_len, false);
-
-        kfree(nvs_aligned);
-        return 0;
-
-out_badnvs:
-        wl1271_error("nvs data is malformed");
-        return -EILSEQ;
-}
-
-static void wl1271_boot_enable_interrupts(struct wl1271 *wl)
-{
-        wl1271_enable_interrupts(wl);
-        wl1271_write32(wl, ACX_REG_INTERRUPT_MASK,
-                       WL1271_ACX_INTR_ALL & ~(WL1271_INTR_MASK));
-        wl1271_write32(wl, HI_CFG, HI_CFG_DEF_VAL);
-}
-
-static int wl1271_boot_soft_reset(struct wl1271 *wl)
-{
-        unsigned long timeout;
-        u32 boot_data;
-
-        /* perform soft reset */
-        wl1271_write32(wl, ACX_REG_SLV_SOFT_RESET, ACX_SLV_SOFT_RESET_BIT);
-
-        /* SOFT_RESET is self clearing */
-        timeout = jiffies + usecs_to_jiffies(SOFT_RESET_MAX_TIME);
-        while (1) {
-                boot_data = wl1271_read32(wl, ACX_REG_SLV_SOFT_RESET);
-                wl1271_debug(DEBUG_BOOT, "soft reset bootdata 0x%x", boot_data);
-                if ((boot_data & ACX_SLV_SOFT_RESET_BIT) == 0)
-                        break;
-
-                if (time_after(jiffies, timeout)) {
-                        /* 1.2 check pWhalBus->uSelfClearTime if the
-                         * timeout was reached */
-                        wl1271_error("soft reset timeout");
-                        return -1;
-                }
-
-                udelay(SOFT_RESET_STALL_TIME);
-        }
-
-        /* disable Rx/Tx */
-        wl1271_write32(wl, ENABLE, 0x0);
-
-        /* disable auto calibration on start*/
-        wl1271_write32(wl, SPARE_A2, 0xffff);
-
-        return 0;
-}
-
-static int wl1271_boot_run_firmware(struct wl1271 *wl)
-{
-        int loop, ret;
-        u32 chip_id, intr;
-
-        wl1271_boot_set_ecpu_ctrl(wl, ECPU_CONTROL_HALT);
-
-        chip_id = wl1271_read32(wl, CHIP_ID_B);
-
-        wl1271_debug(DEBUG_BOOT, "chip id after firmware boot: 0x%x", chip_id);
-
-        if (chip_id != wl->chip.id) {
-                wl1271_error("chip id doesn't match after firmware boot");
-                return -EIO;
-        }
-
-        /* wait for init to complete */
-        loop = 0;
-        while (loop++ < INIT_LOOP) {
-                udelay(INIT_LOOP_DELAY);
-                intr = wl1271_read32(wl, ACX_REG_INTERRUPT_NO_CLEAR);
-
-                if (intr == 0xffffffff) {
-                        wl1271_error("error reading hardware complete "
-                                     "init indication");
-                        return -EIO;
-                }
-                /* check that ACX_INTR_INIT_COMPLETE is enabled */
-                else if (intr & WL1271_ACX_INTR_INIT_COMPLETE) {
-                        wl1271_write32(wl, ACX_REG_INTERRUPT_ACK,
-                                       WL1271_ACX_INTR_INIT_COMPLETE);
-                        break;
-                }
-        }
-
-        if (loop > INIT_LOOP) {
-                wl1271_error("timeout waiting for the hardware to "
-                             "complete initialization");
-                return -EIO;
-        }
-
-        /* get hardware config command mail box */
-        wl->cmd_box_addr = wl1271_read32(wl, REG_COMMAND_MAILBOX_PTR);
-
-        /* get hardware config event mail box */
-        wl->event_box_addr = wl1271_read32(wl, REG_EVENT_MAILBOX_PTR);
-
-        /* set the working partition to its "running" mode offset */
-        wl1271_set_partition(wl, &wl12xx_part_table[PART_WORK]);
-
-        wl1271_debug(DEBUG_MAILBOX, "cmd_box_addr 0x%x event_box_addr 0x%x",
-                     wl->cmd_box_addr, wl->event_box_addr);
-
-        wl1271_boot_fw_version(wl);
-
-        /*
-         * in case of full asynchronous mode the firmware event must be
-         * ready to receive event from the command mailbox
-         */
-
-        /* unmask required mbox events  */
-        wl->event_mask = BSS_LOSE_EVENT_ID |
-                SCAN_COMPLETE_EVENT_ID |
-                ROLE_STOP_COMPLETE_EVENT_ID |
-                RSSI_SNR_TRIGGER_0_EVENT_ID |
-                PSPOLL_DELIVERY_FAILURE_EVENT_ID |
-                SOFT_GEMINI_SENSE_EVENT_ID |
-                PERIODIC_SCAN_REPORT_EVENT_ID |
-                PERIODIC_SCAN_COMPLETE_EVENT_ID |
-                DUMMY_PACKET_EVENT_ID |
-                PEER_REMOVE_COMPLETE_EVENT_ID |
-                BA_SESSION_RX_CONSTRAINT_EVENT_ID |
-                REMAIN_ON_CHANNEL_COMPLETE_EVENT_ID |
-                INACTIVE_STA_EVENT_ID |
-                MAX_TX_RETRY_EVENT_ID |
-                CHANNEL_SWITCH_COMPLETE_EVENT_ID;
-
-        ret = wl1271_event_unmask(wl);
-        if (ret < 0) {
-                wl1271_error("EVENT mask setting failed");
-                return ret;
-        }
-
-        wl1271_event_mbox_config(wl);
-
-        /* firmware startup completed */
-        return 0;
-}
-
-static int wl1271_boot_write_irq_polarity(struct wl1271 *wl)
-{
-        u32 polarity;
-
-        polarity = wl1271_top_reg_read(wl, OCP_REG_POLARITY);
-
-        /* We use HIGH polarity, so unset the LOW bit */
-        polarity &= ~POLARITY_LOW;
-        wl1271_top_reg_write(wl, OCP_REG_POLARITY, polarity);
-
-        return 0;
-}
-
-static int wl128x_switch_tcxo_to_fref(struct wl1271 *wl)
-{
-        u16 spare_reg;
-
-        /* Mask bits [2] & [8:4] in the sys_clk_cfg register */
-        spare_reg = wl1271_top_reg_read(wl, WL_SPARE_REG);
-        if (spare_reg == 0xFFFF)
-                return -EFAULT;
-        spare_reg |= (BIT(3) | BIT(5) | BIT(6));
-        wl1271_top_reg_write(wl, WL_SPARE_REG, spare_reg);
-
-        /* Enable FREF_CLK_REQ & mux MCS and coex PLLs to FREF */
-        wl1271_top_reg_write(wl, SYS_CLK_CFG_REG,
-                             WL_CLK_REQ_TYPE_PG2 | MCS_PLL_CLK_SEL_FREF);
-
-        /* Delay execution for 15msec, to let the HW settle */
-        mdelay(15);
-
-        return 0;
-}
-
-static bool wl128x_is_tcxo_valid(struct wl1271 *wl)
-{
-        u16 tcxo_detection;
-
-        tcxo_detection = wl1271_top_reg_read(wl, TCXO_CLK_DETECT_REG);
-        if (tcxo_detection & TCXO_DET_FAILED)
-                return false;
-
-        return true;
-}
-
-static bool wl128x_is_fref_valid(struct wl1271 *wl)
-{
-        u16 fref_detection;
-
-        fref_detection = wl1271_top_reg_read(wl, FREF_CLK_DETECT_REG);
-        if (fref_detection & FREF_CLK_DETECT_FAIL)
-                return false;
-
-        return true;
-}
-
-static int wl128x_manually_configure_mcs_pll(struct wl1271 *wl)
-{
-        wl1271_top_reg_write(wl, MCS_PLL_M_REG, MCS_PLL_M_REG_VAL);
-        wl1271_top_reg_write(wl, MCS_PLL_N_REG, MCS_PLL_N_REG_VAL);
-        wl1271_top_reg_write(wl, MCS_PLL_CONFIG_REG, MCS_PLL_CONFIG_REG_VAL);
-
-        return 0;
-}
-
-static int wl128x_configure_mcs_pll(struct wl1271 *wl, int clk)
-{
-        u16 spare_reg;
-        u16 pll_config;
-        u8 input_freq;
-
-        /* Mask bits [3:1] in the sys_clk_cfg register */
-        spare_reg = wl1271_top_reg_read(wl, WL_SPARE_REG);
-        if (spare_reg == 0xFFFF)
-                return -EFAULT;
-        spare_reg |= BIT(2);
-        wl1271_top_reg_write(wl, WL_SPARE_REG, spare_reg);
-
-        /* Handle special cases of the TCXO clock */
-        if (wl->tcxo_clock == WL12XX_TCXOCLOCK_16_8 ||
-            wl->tcxo_clock == WL12XX_TCXOCLOCK_33_6)
-                return wl128x_manually_configure_mcs_pll(wl);
-
-        /* Set the input frequency according to the selected clock source */
-        input_freq = (clk & 1) + 1;
-
-        pll_config = wl1271_top_reg_read(wl, MCS_PLL_CONFIG_REG);
-        if (pll_config == 0xFFFF)
-                return -EFAULT;
-        pll_config |= (input_freq << MCS_SEL_IN_FREQ_SHIFT);
-        pll_config |= MCS_PLL_ENABLE_HP;
-        wl1271_top_reg_write(wl, MCS_PLL_CONFIG_REG, pll_config);
-
-        return 0;
-}
-
-/*
- * WL128x has two clocks input - TCXO and FREF.
- * TCXO is the main clock of the device, while FREF is used to sync
- * between the GPS and the cellular modem.
- * In cases where TCXO is 32.736MHz or 16.368MHz, the FREF will be used
- * as the WLAN/BT main clock.
- */
-static int wl128x_boot_clk(struct wl1271 *wl, int *selected_clock)
-{
-        u16 sys_clk_cfg;
-
-        /* For XTAL-only modes, FREF will be used after switching from TCXO */
-        if (wl->ref_clock == WL12XX_REFCLOCK_26_XTAL ||
-            wl->ref_clock == WL12XX_REFCLOCK_38_XTAL) {
-                if (!wl128x_switch_tcxo_to_fref(wl))
-                        return -EINVAL;
-                goto fref_clk;
-        }
-
-        /* Query the HW, to determine which clock source we should use */
-        sys_clk_cfg = wl1271_top_reg_read(wl, SYS_CLK_CFG_REG);
-        if (sys_clk_cfg == 0xFFFF)
-                return -EINVAL;
-        if (sys_clk_cfg & PRCM_CM_EN_MUX_WLAN_FREF)
-                goto fref_clk;
-
-        /* If TCXO is either 32.736MHz or 16.368MHz, switch to FREF */
-        if (wl->tcxo_clock == WL12XX_TCXOCLOCK_16_368 ||
-            wl->tcxo_clock == WL12XX_TCXOCLOCK_32_736) {
-                if (!wl128x_switch_tcxo_to_fref(wl))
-                        return -EINVAL;
-                goto fref_clk;
-        }
-
-        /* TCXO clock is selected */
-        if (!wl128x_is_tcxo_valid(wl))
-                return -EINVAL;
-        *selected_clock = wl->tcxo_clock;
-        goto config_mcs_pll;
-
-fref_clk:
-        /* FREF clock is selected */
-        if (!wl128x_is_fref_valid(wl))
-                return -EINVAL;
-        *selected_clock = wl->ref_clock;
-
-config_mcs_pll:
-        return wl128x_configure_mcs_pll(wl, *selected_clock);
-}
-
-static int wl127x_boot_clk(struct wl1271 *wl)
-{
-        u32 pause;
-        u32 clk;
-
-        if (WL127X_PG_GET_MAJOR(wl->hw_pg_ver) < 3)
-                wl->quirks |= WL12XX_QUIRK_END_OF_TRANSACTION;
-
-        if (wl->ref_clock == CONF_REF_CLK_19_2_E ||
-            wl->ref_clock == CONF_REF_CLK_38_4_E ||
-            wl->ref_clock == CONF_REF_CLK_38_4_M_XTAL)
-                /* ref clk: 19.2/38.4/38.4-XTAL */
-                clk = 0x3;
-        else if (wl->ref_clock == CONF_REF_CLK_26_E ||
-                 wl->ref_clock == CONF_REF_CLK_52_E)
-                /* ref clk: 26/52 */
-                clk = 0x5;
-        else
-                return -EINVAL;
-
-        if (wl->ref_clock != CONF_REF_CLK_19_2_E) {
-                u16 val;
-                /* Set clock type (open drain) */
-                val = wl1271_top_reg_read(wl, OCP_REG_CLK_TYPE);
-                val &= FREF_CLK_TYPE_BITS;
-                wl1271_top_reg_write(wl, OCP_REG_CLK_TYPE, val);
-
-                /* Set clock pull mode (no pull) */
-                val = wl1271_top_reg_read(wl, OCP_REG_CLK_PULL);
-                val |= NO_PULL;
-                wl1271_top_reg_write(wl, OCP_REG_CLK_PULL, val);
-        } else {
-                u16 val;
-                /* Set clock polarity */
-                val = wl1271_top_reg_read(wl, OCP_REG_CLK_POLARITY);
-                val &= FREF_CLK_POLARITY_BITS;
-                val |= CLK_REQ_OUTN_SEL;
-                wl1271_top_reg_write(wl, OCP_REG_CLK_POLARITY, val);
-        }
-
-        wl1271_write32(wl, PLL_PARAMETERS, clk);
-
-        pause = wl1271_read32(wl, PLL_PARAMETERS);
-
-        wl1271_debug(DEBUG_BOOT, "pause1 0x%x", pause);
-
-        pause &= ~(WU_COUNTER_PAUSE_VAL);
-        pause |= WU_COUNTER_PAUSE_VAL;
-        wl1271_write32(wl, WU_COUNTER_PAUSE, pause);
-
-        return 0;
-}
-
-/* uploads NVS and firmware */
-int wl1271_load_firmware(struct wl1271 *wl)
-{
-        int ret = 0;
-        u32 tmp, clk;
-        int selected_clock = -1;
-
-        if (wl->chip.id == CHIP_ID_1283_PG20) {
-                ret = wl128x_boot_clk(wl, &selected_clock);
-                if (ret < 0)
-                        goto out;
-        } else {
-                ret = wl127x_boot_clk(wl);
-                if (ret < 0)
-                        goto out;
-        }
-
-        /* Continue the ELP wake up sequence */
-        wl1271_write32(wl, WELP_ARM_COMMAND, WELP_ARM_COMMAND_VAL);
-        udelay(500);
-
-        wl1271_set_partition(wl, &wl12xx_part_table[PART_DRPW]);
-
-        /* Read-modify-write DRPW_SCRATCH_START register (see next state)
-           to be used by DRPw FW. The RTRIM value will be added by the FW
-           before taking DRPw out of reset */
-
-        wl1271_debug(DEBUG_BOOT, "DRPW_SCRATCH_START %08x", DRPW_SCRATCH_START);
-        clk = wl1271_read32(wl, DRPW_SCRATCH_START);
-
-        wl1271_debug(DEBUG_BOOT, "clk2 0x%x", clk);
-
-        if (wl->chip.id == CHIP_ID_1283_PG20) {
-                clk |= ((selected_clock & 0x3) << 1) << 4;
-        } else {
-                clk |= (wl->ref_clock << 1) << 4;
-        }
-
-        wl1271_write32(wl, DRPW_SCRATCH_START, clk);
-
-        wl1271_set_partition(wl, &wl12xx_part_table[PART_WORK]);
-
-        /* Disable interrupts */
-        wl1271_write32(wl, ACX_REG_INTERRUPT_MASK, WL1271_ACX_INTR_ALL);
-
-        ret = wl1271_boot_soft_reset(wl);
-        if (ret < 0)
-                goto out;
-
-        /* 2. start processing NVS file */
-        ret = wl1271_boot_upload_nvs(wl);
-        if (ret < 0)
-                goto out;
-
-        /* write firmware's last address (ie. it's length) to
-         * ACX_EEPROMLESS_IND_REG */
-        wl1271_debug(DEBUG_BOOT, "ACX_EEPROMLESS_IND_REG");
-
-        wl1271_write32(wl, ACX_EEPROMLESS_IND_REG, ACX_EEPROMLESS_IND_REG);
-
-        tmp = wl1271_read32(wl, CHIP_ID_B);
-
-        wl1271_debug(DEBUG_BOOT, "chip id 0x%x", tmp);
-
-        /* 6. read the EEPROM parameters */
-        tmp = wl1271_read32(wl, SCR_PAD2);
-
-        /* WL1271: The reference driver skips steps 7 to 10 (jumps directly
-         * to upload_fw) */
-
-        if (wl->chip.id == CHIP_ID_1283_PG20)
-                wl1271_top_reg_write(wl, SDIO_IO_DS, wl->conf.hci_io_ds);
-
-        ret = wl1271_boot_upload_firmware(wl);
-        if (ret < 0)
-                goto out;
-
-out:
-        return ret;
-}
-EXPORT_SYMBOL_GPL(wl1271_load_firmware);
-
-int wl1271_boot(struct wl1271 *wl)
-{
-        int ret;
-
-        /* upload NVS and firmware */
-        ret = wl1271_load_firmware(wl);
-        if (ret)
-                return ret;
-
-        /* 10.5 start firmware */
-        ret = wl1271_boot_run_firmware(wl);
-        if (ret < 0)
-                goto out;
-
-        ret = wl1271_boot_write_irq_polarity(wl);
-        if (ret < 0)
-                goto out;
-
-        wl1271_write32(wl, ACX_REG_INTERRUPT_MASK,
-                       WL1271_ACX_ALL_EVENTS_VECTOR);
-
-        /* Enable firmware interrupts now */
-        wl1271_boot_enable_interrupts(wl);
-
-        wl1271_event_mbox_config(wl);
-
-out:
-        return ret;
-}
diff --git a/drivers/net/wireless/wl12xx/boot.h b/drivers/net/wireless/wl12xx/boot.h
deleted file mode 100644
index c3adc09f403d..000000000000
--- a/drivers/net/wireless/wl12xx/boot.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * This file is part of wl1271
- *
- * Copyright (C) 2008-2009 Nokia Corporation
- *
- * Contact: Luciano Coelho <luciano.coelho@nokia.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#ifndef __BOOT_H__
-#define __BOOT_H__
-
-#include "wl12xx.h"
-
-int wl1271_boot(struct wl1271 *wl);
-int wl1271_load_firmware(struct wl1271 *wl);
-
-#define WL1271_NO_SUBBANDS 8
-#define WL1271_NO_POWER_LEVELS 4
-#define WL1271_FW_VERSION_MAX_LEN 20
-
-struct wl1271_static_data {
-        u8 mac_address[ETH_ALEN];
-        u8 padding[2];
-        u8 fw_version[WL1271_FW_VERSION_MAX_LEN];
-        u32 hw_version;
-        u8 tx_power_table[WL1271_NO_SUBBANDS][WL1271_NO_POWER_LEVELS];
-};
-
-/* number of times we try to read the INIT interrupt */
-#define INIT_LOOP 20000
-
-/* delay between retries */
-#define INIT_LOOP_DELAY 50
-
-#define WU_COUNTER_PAUSE_VAL 0x3FF
-#define WELP_ARM_COMMAND_VAL 0x4
-
-#define OCP_REG_POLARITY     0x0064
-#define OCP_REG_CLK_TYPE     0x0448
-#define OCP_REG_CLK_POLARITY 0x0cb2
-#define OCP_REG_CLK_PULL     0x0cb4
-
-#define CMD_MBOX_ADDRESS     0x407B4
-
-#define POLARITY_LOW         BIT(1)
-#define NO_PULL              (BIT(14) | BIT(15))
-
-#define FREF_CLK_TYPE_BITS     0xfffffe7f
-#define CLK_REQ_PRCM           0x100
-#define FREF_CLK_POLARITY_BITS 0xfffff8ff
-#define CLK_REQ_OUTN_SEL       0x700
-
-/* PLL configuration algorithm for wl128x */
-#define SYS_CLK_CFG_REG              0x2200
-/* Bit[0]   -  0-TCXO,  1-FREF */
-#define MCS_PLL_CLK_SEL_FREF         BIT(0)
-/* Bit[3:2] - 01-TCXO, 10-FREF */
-#define WL_CLK_REQ_TYPE_FREF         BIT(3)
-#define WL_CLK_REQ_TYPE_PG2          (BIT(3) | BIT(2))
-/* Bit[4]   -  0-TCXO,  1-FREF */
-#define PRCM_CM_EN_MUX_WLAN_FREF     BIT(4)
-
-#define TCXO_ILOAD_INT_REG           0x2264
-#define TCXO_CLK_DETECT_REG          0x2266
-
-#define TCXO_DET_FAILED              BIT(4)
-
-#define FREF_ILOAD_INT_REG           0x2084
-#define FREF_CLK_DETECT_REG          0x2086
-#define FREF_CLK_DETECT_FAIL         BIT(4)
-
-/* Use this reg for masking during driver access */
-#define WL_SPARE_REG                 0x2320
-#define WL_SPARE_VAL                 BIT(2)
-/* Bit[6:5:3] -  mask wl write SYS_CLK_CFG[8:5:2:4] */
-#define WL_SPARE_MASK_8526           (BIT(6) | BIT(5) | BIT(3))
-
-#define PLL_LOCK_COUNTERS_REG        0xD8C
-#define PLL_LOCK_COUNTERS_COEX       0x0F
-#define PLL_LOCK_COUNTERS_MCS        0xF0
-#define MCS_PLL_OVERRIDE_REG         0xD90
-#define MCS_PLL_CONFIG_REG           0xD92
-#define MCS_SEL_IN_FREQ_MASK         0x0070
-#define MCS_SEL_IN_FREQ_SHIFT        4
-#define MCS_PLL_CONFIG_REG_VAL       0x73
-#define MCS_PLL_ENABLE_HP            (BIT(0) | BIT(1))
-
-#define MCS_PLL_M_REG                0xD94
-#define MCS_PLL_N_REG                0xD96
-#define MCS_PLL_M_REG_VAL            0xC8
-#define MCS_PLL_N_REG_VAL            0x07
-
-#define SDIO_IO_DS                   0xd14
-
-/* SDIO/wSPI DS configuration values */
-enum {
-        HCI_IO_DS_8MA = 0,
-        HCI_IO_DS_4MA = 1, /* default */
-        HCI_IO_DS_6MA = 2,
-        HCI_IO_DS_2MA = 3,
-};
-
-/* end PLL configuration algorithm for wl128x */
-
-#endif
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index cb6204f78300..e6ec16d92e65 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -266,9 +266,13 @@ struct pn533 {
         int in_maxlen;
         struct pn533_frame *in_frame;
 
-        struct tasklet_struct tasklet;
-        struct pn533_frame *tklt_in_frame;
-        int tklt_in_error;
+        struct sk_buff_head resp_q;
+
+        struct workqueue_struct *wq;
+        struct work_struct cmd_work;
+        struct work_struct mi_work;
+        struct pn533_frame *wq_in_frame;
+        int wq_in_error;
 
         pn533_cmd_complete_t cmd_complete;
         void *cmd_complete_arg;
@@ -383,15 +387,21 @@ static bool pn533_rx_frame_is_cmd_response(struct pn533_frame *frame, u8 cmd)
         return (PN533_FRAME_CMD(frame) == PN533_CMD_RESPONSE(cmd));
 }
 
-static void pn533_tasklet_cmd_complete(unsigned long arg)
+
+static void pn533_wq_cmd_complete(struct work_struct *work)
 {
-        struct pn533 *dev = (struct pn533 *) arg;
-        struct pn533_frame *in_frame = dev->tklt_in_frame;
+        struct pn533 *dev = container_of(work, struct pn533, cmd_work);
+        struct pn533_frame *in_frame;
         int rc;
 
-        if (dev->tklt_in_error)
+        if (dev == NULL)
+                return;
+
+        in_frame = dev->wq_in_frame;
+
+        if (dev->wq_in_error)
                 rc = dev->cmd_complete(dev, dev->cmd_complete_arg, NULL,
-                                                        dev->tklt_in_error);
+                                                        dev->wq_in_error);
         else
                 rc = dev->cmd_complete(dev, dev->cmd_complete_arg,
                                         PN533_FRAME_CMD_PARAMS_PTR(in_frame),
@@ -406,7 +416,7 @@ static void pn533_recv_response(struct urb *urb)
         struct pn533 *dev = urb->context;
         struct pn533_frame *in_frame;
 
-        dev->tklt_in_frame = NULL;
+        dev->wq_in_frame = NULL;
 
         switch (urb->status) {
         case 0:
@@ -417,36 +427,36 @@ static void pn533_recv_response(struct urb *urb)
         case -ESHUTDOWN:
                 nfc_dev_dbg(&dev->interface->dev, "Urb shutting down with"
                                                 " status: %d", urb->status);
-                dev->tklt_in_error = urb->status;
-                goto sched_tasklet;
+                dev->wq_in_error = urb->status;
+                goto sched_wq;
         default:
                 nfc_dev_err(&dev->interface->dev, "Nonzero urb status received:"
                                                         " %d", urb->status);
-                dev->tklt_in_error = urb->status;
-                goto sched_tasklet;
+                dev->wq_in_error = urb->status;
+                goto sched_wq;
         }
 
         in_frame = dev->in_urb->transfer_buffer;
 
         if (!pn533_rx_frame_is_valid(in_frame)) {
                 nfc_dev_err(&dev->interface->dev, "Received an invalid frame");
-                dev->tklt_in_error = -EIO;
-                goto sched_tasklet;
+                dev->wq_in_error = -EIO;
+                goto sched_wq;
         }
 
         if (!pn533_rx_frame_is_cmd_response(in_frame, dev->cmd)) {
                 nfc_dev_err(&dev->interface->dev, "The received frame is not "
                                                 "response to the last command");
-                dev->tklt_in_error = -EIO;
-                goto sched_tasklet;
+                dev->wq_in_error = -EIO;
+                goto sched_wq;
         }
 
         nfc_dev_dbg(&dev->interface->dev, "Received a valid frame");
-        dev->tklt_in_error = 0;
-        dev->tklt_in_frame = in_frame;
+        dev->wq_in_error = 0;
+        dev->wq_in_frame = in_frame;
 
-sched_tasklet:
-        tasklet_schedule(&dev->tasklet);
+sched_wq:
+        queue_work(dev->wq, &dev->cmd_work);
 }
 
 static int pn533_submit_urb_for_response(struct pn533 *dev, gfp_t flags)
@@ -471,21 +481,21 @@ static void pn533_recv_ack(struct urb *urb)
         case -ESHUTDOWN:
                 nfc_dev_dbg(&dev->interface->dev, "Urb shutting down with"
                                                 " status: %d", urb->status);
-                dev->tklt_in_error = urb->status;
-                goto sched_tasklet;
+                dev->wq_in_error = urb->status;
+                goto sched_wq;
         default:
                 nfc_dev_err(&dev->interface->dev, "Nonzero urb status received:"
                                                         " %d", urb->status);
-                dev->tklt_in_error = urb->status;
-                goto sched_tasklet;
+                dev->wq_in_error = urb->status;
+                goto sched_wq;
         }
 
         in_frame = dev->in_urb->transfer_buffer;
 
         if (!pn533_rx_frame_is_ack(in_frame)) {
                 nfc_dev_err(&dev->interface->dev, "Received an invalid ack");
-                dev->tklt_in_error = -EIO;
-                goto sched_tasklet;
+                dev->wq_in_error = -EIO;
+                goto sched_wq;
         }
 
         nfc_dev_dbg(&dev->interface->dev, "Received a valid ack");
@@ -494,15 +504,15 @@ static void pn533_recv_ack(struct urb *urb)
         if (rc) {
                 nfc_dev_err(&dev->interface->dev, "usb_submit_urb failed with"
                                                         " result %d", rc);
-                dev->tklt_in_error = rc;
-                goto sched_tasklet;
+                dev->wq_in_error = rc;
+                goto sched_wq;
         }
 
         return;
 
-sched_tasklet:
-        dev->tklt_in_frame = NULL;
-        tasklet_schedule(&dev->tasklet);
+sched_wq:
+        dev->wq_in_frame = NULL;
+        queue_work(dev->wq, &dev->cmd_work);
 }
 
 static int pn533_submit_urb_for_ack(struct pn533 *dev, gfp_t flags)
@@ -1249,6 +1259,8 @@ static void pn533_deactivate_target(struct nfc_dev *nfc_dev, u32 target_idx)
 
         dev->tgt_active_prot = 0;
 
+        skb_queue_purge(&dev->resp_q);
+
         pn533_tx_frame_init(dev->out_frame, PN533_CMD_IN_RELEASE);
 
         tg = 1;
@@ -1447,11 +1459,49 @@ struct pn533_data_exchange_arg {
         void *cb_context;
 };
 
+static struct sk_buff *pn533_build_response(struct pn533 *dev)
+{
+        struct sk_buff *skb, *tmp, *t;
+        unsigned int skb_len = 0, tmp_len = 0;
+
+        nfc_dev_dbg(&dev->interface->dev, "%s\n", __func__);
+
+        if (skb_queue_empty(&dev->resp_q))
+                return NULL;
+
+        if (skb_queue_len(&dev->resp_q) == 1) {
+                skb = skb_dequeue(&dev->resp_q);
+                goto out;
+        }
+
+        skb_queue_walk_safe(&dev->resp_q, tmp, t)
+                skb_len += tmp->len;
+
+        nfc_dev_dbg(&dev->interface->dev, "%s total length %d\n",
+                    __func__, skb_len);
+
+        skb = alloc_skb(skb_len, GFP_KERNEL);
+        if (skb == NULL)
+                goto out;
+
+        skb_put(skb, skb_len);
+
+        skb_queue_walk_safe(&dev->resp_q, tmp, t) {
+                memcpy(skb->data + tmp_len, tmp->data, tmp->len);
+                tmp_len += tmp->len;
+        }
+
+out:
+        skb_queue_purge(&dev->resp_q);
+
+        return skb;
+}
+
 static int pn533_data_exchange_complete(struct pn533 *dev, void *_arg,
                                                 u8 *params, int params_len)
 {
         struct pn533_data_exchange_arg *arg = _arg;
-        struct sk_buff *skb_resp = arg->skb_resp;
+        struct sk_buff *skb = NULL, *skb_resp = arg->skb_resp;
         struct pn533_frame *in_frame = (struct pn533_frame *) skb_resp->data;
         int err = 0;
         u8 status;
@@ -1459,15 +1509,13 @@ static int pn533_data_exchange_complete(struct pn533 *dev, void *_arg,
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
-        dev_kfree_skb_irq(arg->skb_out);
+        dev_kfree_skb(arg->skb_out);
 
         if (params_len < 0) { /* error */
                 err = params_len;
                 goto error;
         }
 
-        skb_put(skb_resp, PN533_FRAME_SIZE(in_frame));
-
         status = params[0];
 
         cmd_ret = status & PN533_CMD_RET_MASK;
@@ -1478,25 +1526,27 @@ static int pn533_data_exchange_complete(struct pn533 *dev, void *_arg,
                 goto error;
         }
 
+        skb_put(skb_resp, PN533_FRAME_SIZE(in_frame));
+        skb_pull(skb_resp, PN533_CMD_DATAEXCH_HEAD_LEN);
+        skb_trim(skb_resp, skb_resp->len - PN533_FRAME_TAIL_SIZE);
+        skb_queue_tail(&dev->resp_q, skb_resp);
+
         if (status & PN533_CMD_MI_MASK) {
-                /* TODO: Implement support to multi-part data exchange */
-                nfc_dev_err(&dev->interface->dev, "Multi-part message not yet"
-                                                                " supported");
-                /* Prevent the other messages from controller */
-                pn533_send_ack(dev, GFP_ATOMIC);
-                err = -ENOSYS;
-                goto error;
+                queue_work(dev->wq, &dev->mi_work);
+                return -EINPROGRESS;
         }
 
-        skb_pull(skb_resp, PN533_CMD_DATAEXCH_HEAD_LEN);
-        skb_trim(skb_resp, skb_resp->len - PN533_FRAME_TAIL_SIZE);
+        skb = pn533_build_response(dev);
+        if (skb == NULL)
+                goto error;
 
-        arg->cb(arg->cb_context, skb_resp, 0);
+        arg->cb(arg->cb_context, skb, 0);
         kfree(arg);
         return 0;
 
 error:
-        dev_kfree_skb_irq(skb_resp);
+        skb_queue_purge(&dev->resp_q);
+        dev_kfree_skb(skb_resp);
         arg->cb(arg->cb_context, NULL, err);
         kfree(arg);
         return 0;
@@ -1571,6 +1621,68 @@ error:
         return rc;
 }
 
+static void pn533_wq_mi_recv(struct work_struct *work)
+{
+        struct pn533 *dev = container_of(work, struct pn533, mi_work);
+        struct sk_buff *skb_cmd;
+        struct pn533_data_exchange_arg *arg = dev->cmd_complete_arg;
+        struct pn533_frame *out_frame, *in_frame;
+        struct sk_buff *skb_resp;
+        int skb_resp_len;
+        int rc;
+
+        nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
+
+        /* This is a zero payload size skb */
+        skb_cmd = alloc_skb(PN533_CMD_DATAEXCH_HEAD_LEN + PN533_FRAME_TAIL_SIZE,
+                            GFP_KERNEL);
+        if (skb_cmd == NULL)
+                goto error_cmd;
+
+        skb_reserve(skb_cmd, PN533_CMD_DATAEXCH_HEAD_LEN);
+
+        rc = pn533_data_exchange_tx_frame(dev, skb_cmd);
+        if (rc)
+                goto error_frame;
+
+        skb_resp_len = PN533_CMD_DATAEXCH_HEAD_LEN +
+                        PN533_CMD_DATAEXCH_DATA_MAXLEN +
+                        PN533_FRAME_TAIL_SIZE;
+        skb_resp = alloc_skb(skb_resp_len, GFP_KERNEL);
+        if (!skb_resp) {
+                rc = -ENOMEM;
+                goto error_frame;
+        }
+
+        in_frame = (struct pn533_frame *) skb_resp->data;
+        out_frame = (struct pn533_frame *) skb_cmd->data;
+
+        arg->skb_resp = skb_resp;
+        arg->skb_out = skb_cmd;
+
+        rc = __pn533_send_cmd_frame_async(dev, out_frame, in_frame,
+                                          skb_resp_len,
+                                          pn533_data_exchange_complete,
+                                          dev->cmd_complete_arg, GFP_KERNEL);
+        if (!rc)
+                return;
+
+        nfc_dev_err(&dev->interface->dev, "Error %d when trying to"
+                                                " perform data_exchange", rc);
+
+        kfree_skb(skb_resp);
+
+error_frame:
+        kfree_skb(skb_cmd);
+
+error_cmd:
+        pn533_send_ack(dev, GFP_KERNEL);
+
+        kfree(arg);
+
+        up(&dev->cmd_lock);
+}
+
 static int pn533_set_configuration(struct pn533 *dev, u8 cfgitem, u8 *cfgdata,
                                                                 u8 cfgdata_len)
 {
@@ -1668,7 +1780,15 @@ static int pn533_probe(struct usb_interface *interface,
                         NULL, 0,
                         pn533_send_complete, dev);
 
-        tasklet_init(&dev->tasklet, pn533_tasklet_cmd_complete, (ulong)dev);
+        INIT_WORK(&dev->cmd_work, pn533_wq_cmd_complete);
+        INIT_WORK(&dev->mi_work, pn533_wq_mi_recv);
+        dev->wq = alloc_workqueue("pn533",
+                                  WQ_NON_REENTRANT | WQ_UNBOUND | WQ_MEM_RECLAIM,
+                                  1);
+        if (dev->wq == NULL)
+                goto error;
+
+        skb_queue_head_init(&dev->resp_q);
 
         usb_set_intfdata(interface, dev);
 
@@ -1678,7 +1798,7 @@ static int pn533_probe(struct usb_interface *interface,
         rc = pn533_send_cmd_frame_sync(dev, dev->out_frame, dev->in_frame,
                                                                 dev->in_maxlen);
         if (rc)
-                goto kill_tasklet;
+                goto destroy_wq;
 
         fw_ver = (struct pn533_fw_version *)
                                 PN533_FRAME_CMD_PARAMS_PTR(dev->in_frame);
@@ -1694,7 +1814,7 @@ static int pn533_probe(struct usb_interface *interface,
                                            PN533_CMD_DATAEXCH_HEAD_LEN,
                                            PN533_FRAME_TAIL_SIZE);
         if (!dev->nfc_dev)
-                goto kill_tasklet;
+                goto destroy_wq;
 
         nfc_set_parent_dev(dev->nfc_dev, &interface->dev);
         nfc_set_drvdata(dev->nfc_dev, dev);
@@ -1720,8 +1840,8 @@ static int pn533_probe(struct usb_interface *interface,
 
 free_nfc_dev:
         nfc_free_device(dev->nfc_dev);
-kill_tasklet:
-        tasklet_kill(&dev->tasklet);
+destroy_wq:
+        destroy_workqueue(dev->wq);
 error:
         kfree(dev->in_frame);
         usb_free_urb(dev->in_urb);
@@ -1744,7 +1864,9 @@ static void pn533_disconnect(struct usb_interface *interface)
         usb_kill_urb(dev->in_urb);
         usb_kill_urb(dev->out_urb);
 
-        tasklet_kill(&dev->tasklet);
+        destroy_workqueue(dev->wq);
+
+        skb_queue_purge(&dev->resp_q);
 
         kfree(dev->in_frame);
         usb_free_urb(dev->in_urb);
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index 483c0adcad87..2574abde8d99 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -45,6 +45,8 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
                 for (i=0; i<PHY_MAX_ADDR; i++)
                         mdio->irq[i] = PHY_POLL;
 
+        mdio->dev.of_node = np;
+
         /* Register the MDIO bus */
         rc = mdiobus_register(mdio);
         if (rc)
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 8644d5372e7f..42cfcd9eb9aa 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -44,6 +44,7 @@
 #include <asm/ropes.h>
 #include <asm/mckinley.h>       /* for proc_mckinley_root */
 #include <asm/runway.h>         /* for proc_runway_root */
+#include <asm/page.h>           /* for PAGE0 */
 #include <asm/pdc.h>            /* for PDC_MODEL_* */
 #include <asm/pdcpat.h>         /* for is_pdc_pat() */
 #include <asm/parisc-device.h>
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 2c224edae1ac..01c001f3b766 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_UNICORE32) += setup-bus.o setup-irq.o
 obj-$(CONFIG_PARISC) += setup-bus.o
 obj-$(CONFIG_SUPERH) += setup-bus.o setup-irq.o
 obj-$(CONFIG_PPC) += setup-bus.o
+obj-$(CONFIG_FRV) += setup-bus.o
 obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
 obj-$(CONFIG_X86_VISWS) += setup-irq.o
 obj-$(CONFIG_MN10300) += setup-bus.o
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 0f150f271c2a..61e2fefeedab 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -200,7 +200,7 @@ static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev)
                 return PCI_D1;
         case ACPI_STATE_D2:
                 return PCI_D2;
-        case ACPI_STATE_D3:
+        case ACPI_STATE_D3_HOT:
                 return PCI_D3hot;
         case ACPI_STATE_D3_COLD:
                 return PCI_D3cold;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 6279d5b85993..2a7521677541 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2626,6 +2626,18 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4374,
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4375,
                         quirk_msi_intx_disable_bug);
 
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATTANSIC, 0x1062,
+                        quirk_msi_intx_disable_bug);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATTANSIC, 0x1063,
+                        quirk_msi_intx_disable_bug);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATTANSIC, 0x2060,
+                        quirk_msi_intx_disable_bug);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATTANSIC, 0x2062,
+                        quirk_msi_intx_disable_bug);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATTANSIC, 0x1073,
+                        quirk_msi_intx_disable_bug);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATTANSIC, 0x1083,
+                        quirk_msi_intx_disable_bug);
 #endif /* CONFIG_PCI_MSI */
 
 /* Allow manual resource allocation for PCI hotplug bridges
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
index bc8384c6f3eb..639db4d0aa76 100644
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -50,7 +50,7 @@
  */
 #undef START_IN_KERNEL_MODE
 
-#define DRV_VER "0.5.24"
+#define DRV_VER "0.5.26"
 
 /*
  * According to the Atom N270 datasheet,
@@ -83,8 +83,8 @@ static int kernelmode;
 #endif
 
 static unsigned int interval = 10;
-static unsigned int fanon = 63000;
-static unsigned int fanoff = 58000;
+static unsigned int fanon = 60000;
+static unsigned int fanoff = 53000;
 static unsigned int verbose;
 static unsigned int fanstate = ACERHDF_FAN_AUTO;
 static char force_bios[16];
@@ -150,6 +150,8 @@ static const struct bios_settings_t bios_tbl[] = {
         {"Acer", "AOA150", "v0.3308", 0x55, 0x58, {0x20, 0x00} },
         {"Acer", "AOA150", "v0.3309", 0x55, 0x58, {0x20, 0x00} },
         {"Acer", "AOA150", "v0.3310", 0x55, 0x58, {0x20, 0x00} },
+        /* LT1005u */
+        {"Acer", "LT-10Q", "v0.3310", 0x55, 0x58, {0x20, 0x00} },
         /* Acer 1410 */
         {"Acer", "Aspire 1410", "v0.3108", 0x55, 0x58, {0x9e, 0x00} },
         {"Acer", "Aspire 1410", "v0.3113", 0x55, 0x58, {0x9e, 0x00} },
@@ -161,6 +163,7 @@ static const struct bios_settings_t bios_tbl[] = {
         {"Acer", "Aspire 1410", "v1.3303", 0x55, 0x58, {0x9e, 0x00} },
         {"Acer", "Aspire 1410", "v1.3308", 0x55, 0x58, {0x9e, 0x00} },
         {"Acer", "Aspire 1410", "v1.3310", 0x55, 0x58, {0x9e, 0x00} },
+        {"Acer", "Aspire 1410", "v1.3314", 0x55, 0x58, {0x9e, 0x00} },
         /* Acer 1810xx */
         {"Acer", "Aspire 1810TZ", "v0.3108", 0x55, 0x58, {0x9e, 0x00} },
         {"Acer", "Aspire 1810T",  "v0.3108", 0x55, 0x58, {0x9e, 0x00} },
@@ -183,29 +186,44 @@ static const struct bios_settings_t bios_tbl[] = {
         {"Acer", "Aspire 1810TZ", "v1.3310", 0x55, 0x58, {0x9e, 0x00} },
         {"Acer", "Aspire 1810T",  "v1.3310", 0x55, 0x58, {0x9e, 0x00} },
         {"Acer", "Aspire 1810TZ", "v1.3314", 0x55, 0x58, {0x9e, 0x00} },
+        {"Acer", "Aspire 1810T",  "v1.3314", 0x55, 0x58, {0x9e, 0x00} },
         /* Acer 531 */
+        {"Acer", "AO531h", "v0.3104", 0x55, 0x58, {0x20, 0x00} },
         {"Acer", "AO531h", "v0.3201", 0x55, 0x58, {0x20, 0x00} },
+        {"Acer", "AO531h", "v0.3304", 0x55, 0x58, {0x20, 0x00} },
+        /* Acer 751 */
+        {"Acer", "AO751h", "V0.3212", 0x55, 0x58, {0x21, 0x00} },
+        /* Acer 1825 */
+        {"Acer", "Aspire 1825PTZ", "V1.3118", 0x55, 0x58, {0x9e, 0x00} },
+        {"Acer", "Aspire 1825PTZ", "V1.3127", 0x55, 0x58, {0x9e, 0x00} },
+        /* Acer TravelMate 7730 */
+        {"Acer", "TravelMate 7730G", "v0.3509", 0x55, 0x58, {0xaf, 0x00} },
         /* Gateway */
-        {"Gateway", "AOA110", "v0.3103", 0x55, 0x58, {0x21, 0x00} },
-        {"Gateway", "AOA150", "v0.3103", 0x55, 0x58, {0x20, 0x00} },
-        {"Gateway", "LT31",   "v1.3103", 0x55, 0x58, {0x9e, 0x00} },
-        {"Gateway", "LT31",   "v1.3201", 0x55, 0x58, {0x9e, 0x00} },
-        {"Gateway", "LT31",   "v1.3302", 0x55, 0x58, {0x9e, 0x00} },
+        {"Gateway", "AOA110", "v0.3103",  0x55, 0x58, {0x21, 0x00} },
+        {"Gateway", "AOA150", "v0.3103",  0x55, 0x58, {0x20, 0x00} },
+        {"Gateway", "LT31",   "v1.3103",  0x55, 0x58, {0x9e, 0x00} },
+        {"Gateway", "LT31",   "v1.3201",  0x55, 0x58, {0x9e, 0x00} },
+        {"Gateway", "LT31",   "v1.3302",  0x55, 0x58, {0x9e, 0x00} },
+        {"Gateway", "LT31",   "v1.3303t", 0x55, 0x58, {0x9e, 0x00} },
         /* Packard Bell */
-        {"Packard Bell", "DOA150", "v0.3104", 0x55, 0x58, {0x21, 0x00} },
-        {"Packard Bell", "DOA150", "v0.3105", 0x55, 0x58, {0x20, 0x00} },
-        {"Packard Bell", "AOA110", "v0.3105", 0x55, 0x58, {0x21, 0x00} },
-        {"Packard Bell", "AOA150", "v0.3105", 0x55, 0x58, {0x20, 0x00} },
-        {"Packard Bell", "DOTMU",  "v1.3303", 0x55, 0x58, {0x9e, 0x00} },
-        {"Packard Bell", "DOTMU",  "v0.3120", 0x55, 0x58, {0x9e, 0x00} },
-        {"Packard Bell", "DOTMU",  "v0.3108", 0x55, 0x58, {0x9e, 0x00} },
-        {"Packard Bell", "DOTMU",  "v0.3113", 0x55, 0x58, {0x9e, 0x00} },
-        {"Packard Bell", "DOTMU",  "v0.3115", 0x55, 0x58, {0x9e, 0x00} },
-        {"Packard Bell", "DOTMU",  "v0.3117", 0x55, 0x58, {0x9e, 0x00} },
-        {"Packard Bell", "DOTMU",  "v0.3119", 0x55, 0x58, {0x9e, 0x00} },
-        {"Packard Bell", "DOTMU",  "v1.3204", 0x55, 0x58, {0x9e, 0x00} },
-        {"Packard Bell", "DOTMA",  "v1.3201", 0x55, 0x58, {0x9e, 0x00} },
-        {"Packard Bell", "DOTMA",  "v1.3302", 0x55, 0x58, {0x9e, 0x00} },
+        {"Packard Bell", "DOA150",  "v0.3104",  0x55, 0x58, {0x21, 0x00} },
+        {"Packard Bell", "DOA150",  "v0.3105",  0x55, 0x58, {0x20, 0x00} },
+        {"Packard Bell", "AOA110",  "v0.3105",  0x55, 0x58, {0x21, 0x00} },
+        {"Packard Bell", "AOA150",  "v0.3105",  0x55, 0x58, {0x20, 0x00} },
+        {"Packard Bell", "ENBFT",   "V1.3118",  0x55, 0x58, {0x9e, 0x00} },
+        {"Packard Bell", "ENBFT",   "V1.3127",  0x55, 0x58, {0x9e, 0x00} },
+        {"Packard Bell", "DOTMU",   "v1.3303",  0x55, 0x58, {0x9e, 0x00} },
+        {"Packard Bell", "DOTMU",   "v0.3120",  0x55, 0x58, {0x9e, 0x00} },
+        {"Packard Bell", "DOTMU",   "v0.3108",  0x55, 0x58, {0x9e, 0x00} },
+        {"Packard Bell", "DOTMU",   "v0.3113",  0x55, 0x58, {0x9e, 0x00} },
+        {"Packard Bell", "DOTMU",   "v0.3115",  0x55, 0x58, {0x9e, 0x00} },
+        {"Packard Bell", "DOTMU",   "v0.3117",  0x55, 0x58, {0x9e, 0x00} },
+        {"Packard Bell", "DOTMU",   "v0.3119",  0x55, 0x58, {0x9e, 0x00} },
+        {"Packard Bell", "DOTMU",   "v1.3204",  0x55, 0x58, {0x9e, 0x00} },
+        {"Packard Bell", "DOTMA",   "v1.3201",  0x55, 0x58, {0x9e, 0x00} },
+        {"Packard Bell", "DOTMA",   "v1.3302",  0x55, 0x58, {0x9e, 0x00} },
+        {"Packard Bell", "DOTMA",   "v1.3303t", 0x55, 0x58, {0x9e, 0x00} },
+        {"Packard Bell", "DOTVR46", "v1.3308",  0x55, 0x58, {0x9e, 0x00} },
         /* pewpew-terminator */
         {"", "", "", 0, 0, {0, 0} }
 };
@@ -701,15 +719,20 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Peter Feuerer");
 MODULE_DESCRIPTION("Aspire One temperature and fan driver");
 MODULE_ALIAS("dmi:*:*Acer*:pnAOA*:");
+MODULE_ALIAS("dmi:*:*Acer*:pnAO751h*:");
 MODULE_ALIAS("dmi:*:*Acer*:pnAspire*1410*:");
 MODULE_ALIAS("dmi:*:*Acer*:pnAspire*1810*:");
+MODULE_ALIAS("dmi:*:*Acer*:pnAspire*1825PTZ:");
 MODULE_ALIAS("dmi:*:*Acer*:pnAO531*:");
+MODULE_ALIAS("dmi:*:*Acer*:TravelMate*7730G:");
 MODULE_ALIAS("dmi:*:*Gateway*:pnAOA*:");
 MODULE_ALIAS("dmi:*:*Gateway*:pnLT31*:");
 MODULE_ALIAS("dmi:*:*Packard*Bell*:pnAOA*:");
 MODULE_ALIAS("dmi:*:*Packard*Bell*:pnDOA*:");
 MODULE_ALIAS("dmi:*:*Packard*Bell*:pnDOTMU*:");
+MODULE_ALIAS("dmi:*:*Packard*Bell*:pnENBFT*:");
 MODULE_ALIAS("dmi:*:*Packard*Bell*:pnDOTMA*:");
+MODULE_ALIAS("dmi:*:*Packard*Bell*:pnDOTVR46*:");
 
 module_init(acerhdf_init);
 module_exit(acerhdf_exit);
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index a05fc9c955d8..e6c08ee8d46c 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -212,6 +212,7 @@ static struct dmi_system_id __devinitdata dell_quirks[] = {
                 },
                 .driver_data = &quirk_dell_vostro_v130,
         },
+        { }
 };
 
 static struct calling_interface_buffer *buffer;
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
index f7ba316e0ed6..0ffdb3cde2bb 100644
--- a/drivers/platform/x86/intel_ips.c
+++ b/drivers/platform/x86/intel_ips.c
@@ -1565,7 +1565,7 @@ static int ips_probe(struct pci_dev *dev, const struct pci_device_id *id)
                 ips->poll_turbo_status = true;
 
         if (!ips_get_i915_syms(ips)) {
-                dev_err(&dev->dev, "failed to get i915 symbols, graphics turbo disabled\n");
+                dev_info(&dev->dev, "failed to get i915 symbols, graphics turbo disabled until i915 loads\n");
                 ips->gpu_turbo_enabled = false;
         } else {
                 dev_dbg(&dev->dev, "graphics turbo enabled\n");
diff --git a/drivers/platform/x86/intel_mid_powerbtn.c b/drivers/platform/x86/intel_mid_powerbtn.c
index 0a3594c7e912..bcbad8452a6f 100644
--- a/drivers/platform/x86/intel_mid_powerbtn.c
+++ b/drivers/platform/x86/intel_mid_powerbtn.c
@@ -78,7 +78,7 @@ static int __devinit mfld_pb_probe(struct platform_device *pdev)
 
         input_set_capability(input, EV_KEY, KEY_POWER);
 
-        error = request_threaded_irq(irq, NULL, mfld_pb_isr, 0,
+        error = request_threaded_irq(irq, NULL, mfld_pb_isr, IRQF_NO_SUSPEND,
                         DRIVER_NAME, input);
         if (error) {
                 dev_err(&pdev->dev, "Unable to request irq %d for mfld power"
diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
index cd9bc3b129bc..5648dad71fb3 100644
--- a/drivers/ptp/Kconfig
+++ b/drivers/ptp/Kconfig
@@ -78,9 +78,13 @@ config PTP_1588_CLOCK_PCH
         depends on PCH_GBE
         help
           This driver adds support for using the PCH EG20T as a PTP
-          clock. This clock is only useful if your PTP programs are
-          getting hardware time stamps on the PTP Ethernet packets
-          using the SO_TIMESTAMPING API.
+          clock. The hardware supports time stamping of PTP packets
+          when using the end-to-end delay (E2E) mechansim. The peer
+          delay mechansim (P2P) is not supported.
+
+          This clock is only useful if your PTP programs are getting
+          hardware time stamps on the PTP Ethernet packets using the
+          SO_TIMESTAMPING API.
 
           To compile this driver as a module, choose M here: the module
           will be called ptp_pch.
diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index f519a131238d..1e528b539a07 100644
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -304,6 +304,12 @@ void ptp_clock_event(struct ptp_clock *ptp, struct ptp_clock_event *event)
 }
 EXPORT_SYMBOL(ptp_clock_event);
 
+int ptp_clock_index(struct ptp_clock *ptp)
+{
+        return ptp->index;
+}
+EXPORT_SYMBOL(ptp_clock_index);
+
 /* module operations */
 
 static void __exit ptp_exit(void)
diff --git a/drivers/ptp/ptp_ixp46x.c b/drivers/ptp/ptp_ixp46x.c
index 6f2782bb5f41..e03c40692b00 100644
--- a/drivers/ptp/ptp_ixp46x.c
+++ b/drivers/ptp/ptp_ixp46x.c
@@ -284,6 +284,7 @@ static void __exit ptp_ixp_exit(void)
 {
         free_irq(MASTER_IRQ, &ixp_clock);
         free_irq(SLAVE_IRQ, &ixp_clock);
+        ixp46x_phc_index = -1;
         ptp_clock_unregister(ixp_clock.ptp_clock);
 }
 
@@ -302,6 +303,8 @@ static int __init ptp_ixp_init(void)
         if (IS_ERR(ixp_clock.ptp_clock))
                 return PTR_ERR(ixp_clock.ptp_clock);
 
+        ixp46x_phc_index = ptp_clock_index(ixp_clock.ptp_clock);
+
         __raw_writel(DEFAULT_ADDEND, &ixp_clock.regs->addend);
         __raw_writel(1, &ixp_clock.regs->trgt_lo);
         __raw_writel(0, &ixp_clock.regs->trgt_hi);
diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c
index 375eb04c16ea..3a9c17eced10 100644
--- a/drivers/ptp/ptp_pch.c
+++ b/drivers/ptp/ptp_pch.c
@@ -30,6 +30,7 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/ptp_clock_kernel.h>
+#include <linux/slab.h>
 
 #define STATION_ADDR_LEN        20
 #define PCI_DEVICE_ID_PCH_1588  0x8819
@@ -261,6 +262,7 @@ u64 pch_rx_snap_read(struct pci_dev *pdev)
 
         ns = ((u64) hi) << 32;
         ns |= lo;
+        ns <<= TICKS_NS_SHIFT;
 
         return ns;
 }
@@ -277,6 +279,7 @@ u64 pch_tx_snap_read(struct pci_dev *pdev)
 
         ns = ((u64) hi) << 32;
         ns |= lo;
+        ns <<= TICKS_NS_SHIFT;
 
         return ns;
 }
@@ -306,7 +309,7 @@ static void pch_reset(struct pch_dev *chip)
  *                                  traffic on the  ethernet interface
  * @addr:       dress which contain the column separated address to be used.
  */
-static int pch_set_station_address(u8 *addr, struct pci_dev *pdev)
+int pch_set_station_address(u8 *addr, struct pci_dev *pdev)
 {
         s32 i;
         struct pch_dev *chip = pci_get_drvdata(pdev);
@@ -350,6 +353,7 @@ static int pch_set_station_address(u8 *addr, struct pci_dev *pdev)
         }
         return 0;
 }
+EXPORT_SYMBOL(pch_set_station_address);
 
 /*
  * Interrupt service routine
@@ -649,8 +653,6 @@ pch_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         iowrite32(1, &chip->regs->trgt_lo);
         iowrite32(0, &chip->regs->trgt_hi);
         iowrite32(PCH_TSE_TTIPEND, &chip->regs->event);
-        /* Version: IEEE1588 v1 and IEEE1588-2008,  Mode: All Evwnt, Locked  */
-        iowrite32(0x80020000, &chip->regs->ch_control);
 
         pch_eth_enable_set(chip);
 
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index e70dd382a009..046fb1bd8619 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1431,7 +1431,10 @@ void devm_regulator_put(struct regulator *regulator)
 
         rc = devres_destroy(regulator->dev, devm_regulator_release,
                             devm_regulator_match, regulator);
-        WARN_ON(rc);
+        if (rc == 0)
+                regulator_put(regulator);
+        else
+                WARN_ON(rc);
 }
 EXPORT_SYMBOL_GPL(devm_regulator_put);
 
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c
index 96579296f04d..17a58c56eebf 100644
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -684,7 +684,7 @@ static int max8997_set_voltage_buck(struct regulator_dev *rdev,
                 }
 
                 new_val++;
-        } while (desc->min + desc->step + new_val <= desc->max);
+        } while (desc->min + desc->step * new_val <= desc->max);
 
         new_idx = tmp_idx;
         new_val = tmp_val;
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index ee15c68fb519..e756a0df3664 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -354,7 +354,7 @@ static void __rproc_free_vrings(struct rproc_vdev *rvdev, int i)
 {
         struct rproc *rproc = rvdev->rproc;
 
-        for (i--; i > 0; i--) {
+        for (i--; i >= 0; i--) {
                 struct rproc_vring *rvring = &rvdev->vring[i];
                 int size = PAGE_ALIGN(vring_size(rvring->len, rvring->align));
 
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index cd188ab72f79..c293d0cdb104 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -902,6 +902,7 @@ read_rtc:
                 }
                 ds1307->nvram->attr.name = "nvram";
                 ds1307->nvram->attr.mode = S_IRUGO | S_IWUSR;
+                sysfs_bin_attr_init(ds1307->nvram);
                 ds1307->nvram->read = ds1307_nvram_read,
                 ds1307->nvram->write = ds1307_nvram_write,
                 ds1307->nvram->size = chip->nvram_size;
diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c
index 42f5f829b3ee..029e421baaed 100644
--- a/drivers/rtc/rtc-mpc5121.c
+++ b/drivers/rtc/rtc-mpc5121.c
@@ -360,12 +360,11 @@ static int __devinit mpc5121_rtc_probe(struct platform_device *op)
                                                 &mpc5200_rtc_ops, THIS_MODULE);
         }
 
-        rtc->rtc->uie_unsupported = 1;
-
         if (IS_ERR(rtc->rtc)) {
                 err = PTR_ERR(rtc->rtc);
                 goto out_free_irq;
         }
+        rtc->rtc->uie_unsupported = 1;
 
         return 0;
 
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
index 684ef4bbfce4..f027c063fb20 100644
--- a/drivers/rtc/rtc-pl031.c
+++ b/drivers/rtc/rtc-pl031.c
@@ -312,6 +312,7 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
         int ret;
         struct pl031_local *ldata;
         struct rtc_class_ops *ops = id->data;
+        unsigned long time;
 
         ret = amba_request_regions(adev, NULL);
         if (ret)
@@ -343,6 +344,23 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
                 writel(readl(ldata->base + RTC_CR) | RTC_CR_CWEN,
                        ldata->base + RTC_CR);
 
+        /*
+         * On ST PL031 variants, the RTC reset value does not provide correct
+         * weekday for 2000-01-01. Correct the erroneous sunday to saturday.
+         */
+        if (ldata->hw_designer == AMBA_VENDOR_ST) {
+                if (readl(ldata->base + RTC_YDR) == 0x2000) {
+                        time = readl(ldata->base + RTC_DR);
+                        if ((time &
+                             (RTC_MON_MASK | RTC_MDAY_MASK | RTC_WDAY_MASK))
+                            == 0x02120000) {
+                                time = time | (0x7 << RTC_WDAY_SHIFT);
+                                writel(0x2000, ldata->base + RTC_YLR);
+                                writel(time, ldata->base + RTC_LR);
+                        }
+                }
+        }
+
         ldata->rtc = rtc_device_register("pl031", &adev->dev, ops,
                                         THIS_MODULE);
         if (IS_ERR(ldata->rtc)) {
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index 231a1d85127b..36506366158d 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -352,7 +352,17 @@ out:
 
 static int sclp_assign_storage(u16 rn)
 {
-        return do_assign_storage(0x000d0001, rn);
+        unsigned long long start, address;
+        int rc;
+
+        rc = do_assign_storage(0x000d0001, rn);
+        if (rc)
+                goto out;
+        start = address = rn2addr(rn);
+        for (; address < start + rzm; address += PAGE_SIZE)
+                page_set_storage_key(address, PAGE_DEFAULT_KEY, 0);
+out:
+        return rc;
 }
 
 static int sclp_unassign_storage(u16 rn)
diff --git a/drivers/s390/char/tape.h b/drivers/s390/char/tape.h
index 267b54e8ff5a..bc6c7cfd36b6 100644
--- a/drivers/s390/char/tape.h
+++ b/drivers/s390/char/tape.h
@@ -154,12 +154,6 @@ struct tape_discipline {
         struct tape_request *(*read_block)(struct tape_device *, size_t);
         struct tape_request *(*write_block)(struct tape_device *, size_t);
         void (*process_eov)(struct tape_device*);
-#ifdef CONFIG_S390_TAPE_BLOCK
-        /* Block device stuff. */
-        struct tape_request *(*bread)(struct tape_device *, struct request *);
-        void (*check_locate)(struct tape_device *, struct tape_request *);
-        void (*free_bread)(struct tape_request *);
-#endif
         /* ioctl function for additional ioctls. */
         int (*ioctl_fn)(struct tape_device *, unsigned int, unsigned long);
         /* Array of tape commands with TAPE_NR_MTOPS entries */
@@ -182,26 +176,6 @@ struct tape_char_data {
         int block_size;                 /*   of size block_size. */
 };
 
-#ifdef CONFIG_S390_TAPE_BLOCK
-/* Block Frontend Data */
-struct tape_blk_data
-{
-        struct tape_device *    device;
-        /* Block device request queue. */
-        struct request_queue *  request_queue;
-        spinlock_t              request_queue_lock;
-
-        /* Task to move entries from block request to CCS request queue. */
-        struct work_struct      requeue_task;
-        atomic_t                requeue_scheduled;
-
-        /* Current position on the tape. */
-        long                    block_position;
-        int                     medium_changed;
-        struct gendisk *        disk;
-};
-#endif
-
 /* Tape Info */
 struct tape_device {
         /* entry in tape_device_list */
@@ -248,10 +222,6 @@ struct tape_device {
 
         /* Character device frontend data */
         struct tape_char_data           char_data;
-#ifdef CONFIG_S390_TAPE_BLOCK
-        /* Block dev frontend data */
-        struct tape_blk_data            blk_data;
-#endif
 
         /* Function to start or stop the next request later. */
         struct delayed_work             tape_dnr;
@@ -313,19 +283,6 @@ extern void tapechar_exit(void);
 extern int  tapechar_setup_device(struct tape_device *);
 extern void tapechar_cleanup_device(struct tape_device *);
 
-/* Externals from tape_block.c */
-#ifdef CONFIG_S390_TAPE_BLOCK
-extern int tapeblock_init (void);
-extern void tapeblock_exit(void);
-extern int tapeblock_setup_device(struct tape_device *);
-extern void tapeblock_cleanup_device(struct tape_device *);
-#else
-static inline int tapeblock_init (void) {return 0;}
-static inline void tapeblock_exit (void) {;}
-static inline int tapeblock_setup_device(struct tape_device *t) {return 0;}
-static inline void tapeblock_cleanup_device (struct tape_device *t) {;}
-#endif
-
 /* tape initialisation functions */
 #ifdef CONFIG_PROC_FS
 extern void tape_proc_init (void);
diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c
index 934ef33eb9a4..b28de80b7ca4 100644
--- a/drivers/s390/char/tape_34xx.c
+++ b/drivers/s390/char/tape_34xx.c
@@ -323,20 +323,6 @@ tape_34xx_unit_check(struct tape_device *device, struct tape_request *request,
         inhibit_cu_recovery = (*device->modeset_byte & 0x80) ? 1 : 0;
         sense = irb->ecw;
 
-#ifdef CONFIG_S390_TAPE_BLOCK
-        if (request->op == TO_BLOCK) {
-                /*
-                 * Recovery for block device requests. Set the block_position
-                 * to something invalid and retry.
-                 */
-                device->blk_data.block_position = -1;
-                if (request->retries-- <= 0)
-                        return tape_34xx_erp_failed(request, -EIO);
-                else
-                        return tape_34xx_erp_retry(request);
-        }
-#endif
-
         if (
                 sense[0] & SENSE_COMMAND_REJECT &&
                 sense[1] & SENSE_WRITE_PROTECT
@@ -1129,123 +1115,6 @@ tape_34xx_mtseek(struct tape_device *device, int mt_count)
         return tape_do_io_free(device, request);
 }
 
-#ifdef CONFIG_S390_TAPE_BLOCK
-/*
- * Tape block read for 34xx.
- */
-static struct tape_request *
-tape_34xx_bread(struct tape_device *device, struct request *req)
-{
-        struct tape_request *request;
-        struct ccw1 *ccw;
-        int count = 0;
-        unsigned off;
-        char *dst;
-        struct bio_vec *bv;
-        struct req_iterator iter;
-        struct tape_34xx_block_id *     start_block;
-
-        DBF_EVENT(6, "xBREDid:");
-
-        /* Count the number of blocks for the request. */
-        rq_for_each_segment(bv, req, iter)
-                count += bv->bv_len >> (TAPEBLOCK_HSEC_S2B + 9);
-
-        /* Allocate the ccw request. */
-        request = tape_alloc_request(3+count+1, 8);
-        if (IS_ERR(request))
-                return request;
-
-        /* Setup ccws. */
-        request->op = TO_BLOCK;
-        start_block = (struct tape_34xx_block_id *) request->cpdata;
-        start_block->block = blk_rq_pos(req) >> TAPEBLOCK_HSEC_S2B;
-        DBF_EVENT(6, "start_block = %i\n", start_block->block);
-
-        ccw = request->cpaddr;
-        ccw = tape_ccw_cc(ccw, MODE_SET_DB, 1, device->modeset_byte);
-
-        /*
-         * We always setup a nop after the mode set ccw. This slot is
-         * used in tape_std_check_locate to insert a locate ccw if the
-         * current tape position doesn't match the start block to be read.
-         * The second nop will be filled with a read block id which is in
-         * turn used by tape_34xx_free_bread to populate the segment bid
-         * table.
-         */
-        ccw = tape_ccw_cc(ccw, NOP, 0, NULL);
-        ccw = tape_ccw_cc(ccw, NOP, 0, NULL);
-
-        rq_for_each_segment(bv, req, iter) {
-                dst = kmap(bv->bv_page) + bv->bv_offset;
-                for (off = 0; off < bv->bv_len; off += TAPEBLOCK_HSEC_SIZE) {
-                        ccw->flags = CCW_FLAG_CC;
-                        ccw->cmd_code = READ_FORWARD;
-                        ccw->count = TAPEBLOCK_HSEC_SIZE;
-                        set_normalized_cda(ccw, (void*) __pa(dst));
-                        ccw++;
-                        dst += TAPEBLOCK_HSEC_SIZE;
-                }
-        }
-
-        ccw = tape_ccw_end(ccw, NOP, 0, NULL);
-        DBF_EVENT(6, "xBREDccwg\n");
-        return request;
-}
-
-static void
-tape_34xx_free_bread (struct tape_request *request)
-{
-        struct ccw1* ccw;
-
-        ccw = request->cpaddr;
-        if ((ccw + 2)->cmd_code == READ_BLOCK_ID) {
-                struct {
-                        struct tape_34xx_block_id       cbid;
-                        struct tape_34xx_block_id       dbid;
-                } __attribute__ ((packed)) *rbi_data;
-
-                rbi_data = request->cpdata;
-
-                if (request->device)
-                        tape_34xx_add_sbid(request->device, rbi_data->cbid);
-        }
-
-        /* Last ccw is a nop and doesn't need clear_normalized_cda */
-        for (; ccw->flags & CCW_FLAG_CC; ccw++)
-                if (ccw->cmd_code == READ_FORWARD)
-                        clear_normalized_cda(ccw);
-        tape_free_request(request);
-}
-
-/*
- * check_locate is called just before the tape request is passed to
- * the common io layer for execution. It has to check the current
- * tape position and insert a locate ccw if it doesn't match the
- * start block for the request.
- */
-static void
-tape_34xx_check_locate(struct tape_device *device, struct tape_request *request)
-{
-        struct tape_34xx_block_id *     start_block;
-
-        start_block = (struct tape_34xx_block_id *) request->cpdata;
-        if (start_block->block == device->blk_data.block_position)
-                return;
-
-        DBF_LH(4, "Block seek(%06d+%06d)\n", start_block->block, device->bof);
-        start_block->wrap    = 0;
-        start_block->segment = 1;
-        start_block->format  = (*device->modeset_byte & 0x08) ?
-                                TAPE34XX_FMT_3480_XF :
-                                TAPE34XX_FMT_3480;
-        start_block->block   = start_block->block + device->bof;
-        tape_34xx_merge_sbid(device, start_block);
-        tape_ccw_cc(request->cpaddr + 1, LOCATE, 4, request->cpdata);
-        tape_ccw_cc(request->cpaddr + 2, READ_BLOCK_ID, 8, request->cpdata);
-}
-#endif
-
 /*
  * List of 3480/3490 magnetic tape commands.
  */
@@ -1295,11 +1164,6 @@ static struct tape_discipline tape_discipline_34xx = {
         .irq = tape_34xx_irq,
         .read_block = tape_std_read_block,
         .write_block = tape_std_write_block,
-#ifdef CONFIG_S390_TAPE_BLOCK
-        .bread = tape_34xx_bread,
-        .free_bread = tape_34xx_free_bread,
-        .check_locate = tape_34xx_check_locate,
-#endif
         .ioctl_fn = tape_34xx_ioctl,
         .mtop_array = tape_34xx_mtop
 };
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index 49c6aab7ad78..a5c6614b0db2 100644
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -670,92 +670,6 @@ tape_3590_schedule_work(struct tape_device *device, enum tape_op op)
         return 0;
 }
 
-#ifdef CONFIG_S390_TAPE_BLOCK
-/*
- * Tape Block READ
- */
-static struct tape_request *
-tape_3590_bread(struct tape_device *device, struct request *req)
-{
-        struct tape_request *request;
-        struct ccw1 *ccw;
-        int count = 0, start_block;
-        unsigned off;
-        char *dst;
-        struct bio_vec *bv;
-        struct req_iterator iter;
-
-        DBF_EVENT(6, "xBREDid:");
-        start_block = blk_rq_pos(req) >> TAPEBLOCK_HSEC_S2B;
-        DBF_EVENT(6, "start_block = %i\n", start_block);
-
-        rq_for_each_segment(bv, req, iter)
-                count += bv->bv_len >> (TAPEBLOCK_HSEC_S2B + 9);
-
-        request = tape_alloc_request(2 + count + 1, 4);
-        if (IS_ERR(request))
-                return request;
-        request->op = TO_BLOCK;
-        *(__u32 *) request->cpdata = start_block;
-        ccw = request->cpaddr;
-        ccw = tape_ccw_cc(ccw, MODE_SET_DB, 1, device->modeset_byte);
-
-        /*
-         * We always setup a nop after the mode set ccw. This slot is
-         * used in tape_std_check_locate to insert a locate ccw if the
-         * current tape position doesn't match the start block to be read.
-         */
-        ccw = tape_ccw_cc(ccw, NOP, 0, NULL);
-
-        rq_for_each_segment(bv, req, iter) {
-                dst = page_address(bv->bv_page) + bv->bv_offset;
-                for (off = 0; off < bv->bv_len; off += TAPEBLOCK_HSEC_SIZE) {
-                        ccw->flags = CCW_FLAG_CC;
-                        ccw->cmd_code = READ_FORWARD;
-                        ccw->count = TAPEBLOCK_HSEC_SIZE;
-                        set_normalized_cda(ccw, (void *) __pa(dst));
-                        ccw++;
-                        dst += TAPEBLOCK_HSEC_SIZE;
-                }
-                BUG_ON(off > bv->bv_len);
-        }
-        ccw = tape_ccw_end(ccw, NOP, 0, NULL);
-        DBF_EVENT(6, "xBREDccwg\n");
-        return request;
-}
-
-static void
-tape_3590_free_bread(struct tape_request *request)
-{
-        struct ccw1 *ccw;
-
-        /* Last ccw is a nop and doesn't need clear_normalized_cda */
-        for (ccw = request->cpaddr; ccw->flags & CCW_FLAG_CC; ccw++)
-                if (ccw->cmd_code == READ_FORWARD)
-                        clear_normalized_cda(ccw);
-        tape_free_request(request);
-}
-
-/*
- * check_locate is called just before the tape request is passed to
- * the common io layer for execution. It has to check the current
- * tape position and insert a locate ccw if it doesn't match the
- * start block for the request.
- */
-static void
-tape_3590_check_locate(struct tape_device *device, struct tape_request *request)
-{
-        __u32 *start_block;
-
-        start_block = (__u32 *) request->cpdata;
-        if (*start_block != device->blk_data.block_position) {
-                /* Add the start offset of the file to get the real block. */
-                *start_block += device->bof;
-                tape_ccw_cc(request->cpaddr + 1, LOCATE, 4, request->cpdata);
-        }
-}
-#endif
-
 static void tape_3590_med_state_set(struct tape_device *device,
                                     struct tape_3590_med_sense *sense)
 {
@@ -1423,20 +1337,6 @@ tape_3590_unit_check(struct tape_device *device, struct tape_request *request,
 {
         struct tape_3590_sense *sense;
 
-#ifdef CONFIG_S390_TAPE_BLOCK
-        if (request->op == TO_BLOCK) {
-                /*
-                 * Recovery for block device requests. Set the block_position
-                 * to something invalid and retry.
-                 */
-                device->blk_data.block_position = -1;
-                if (request->retries-- <= 0)
-                        return tape_3590_erp_failed(device, request, irb, -EIO);
-                else
-                        return tape_3590_erp_retry(device, request, irb);
-        }
-#endif
-
         sense = (struct tape_3590_sense *) irb->ecw;
 
         DBF_EVENT(6, "Unit Check: RQC = %x\n", sense->rc_rqc);
@@ -1729,11 +1629,6 @@ static struct tape_discipline tape_discipline_3590 = {
         .irq = tape_3590_irq,
         .read_block = tape_std_read_block,
         .write_block = tape_std_write_block,
-#ifdef CONFIG_S390_TAPE_BLOCK
-        .bread = tape_3590_bread,
-        .free_bread = tape_3590_free_bread,
-        .check_locate = tape_3590_check_locate,
-#endif
         .ioctl_fn = tape_3590_ioctl,
         .mtop_array = tape_3590_mtop
 };
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index 87cd0ab242de..46886a7578c6 100644
--- a/drivers/s390/char/tape_char.c
+++ b/drivers/s390/char/tape_char.c
@@ -161,11 +161,6 @@ tapechar_read(struct file *filp, char __user *data, size_t count, loff_t *ppos)
         if (rc)
                 return rc;
 
-#ifdef CONFIG_S390_TAPE_BLOCK
-        /* Changes position. */
-        device->blk_data.medium_changed = 1;
-#endif
-
         DBF_EVENT(6, "TCHAR:nbytes: %lx\n", block_size);
         /* Let the discipline build the ccw chain. */
         request = device->discipline->read_block(device, block_size);
@@ -218,11 +213,6 @@ tapechar_write(struct file *filp, const char __user *data, size_t count, loff_t
         if (rc)
                 return rc;
 
-#ifdef CONFIG_S390_TAPE_BLOCK
-        /* Changes position. */
-        device->blk_data.medium_changed = 1;
-#endif
-
         DBF_EVENT(6,"TCHAR:nbytes: %lx\n", block_size);
         DBF_EVENT(6, "TCHAR:nblocks: %x\n", nblocks);
         /* Let the discipline build the ccw chain. */
@@ -379,9 +369,6 @@ __tapechar_ioctl(struct tape_device *device,
                         case MTBSFM:
                         case MTFSFM:
                         case MTSEEK:
-#ifdef CONFIG_S390_TAPE_BLOCK
-                                device->blk_data.medium_changed = 1;
-#endif
                                 if (device->required_tapemarks)
                                         tape_std_terminate_write(device);
                         default:
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index b3a3e8e8656e..585618663ba4 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -401,9 +401,6 @@ tape_generic_online(struct tape_device *device,
         rc = tapechar_setup_device(device);
         if (rc)
                 goto out_minor;
-        rc = tapeblock_setup_device(device);
-        if (rc)
-                goto out_char;
 
         tape_state_set(device, TS_UNUSED);
 
@@ -411,8 +408,6 @@ tape_generic_online(struct tape_device *device,
 
         return 0;
 
-out_char:
-        tapechar_cleanup_device(device);
 out_minor:
         tape_remove_minor(device);
 out_discipline:
@@ -426,7 +421,6 @@ out:
 static void
 tape_cleanup_device(struct tape_device *device)
 {
-        tapeblock_cleanup_device(device);
         tapechar_cleanup_device(device);
         device->discipline->cleanup_device(device);
         module_put(device->discipline->owner);
@@ -785,10 +779,6 @@ __tape_start_io(struct tape_device *device, struct tape_request *request)
 {
         int rc;
 
-#ifdef CONFIG_S390_TAPE_BLOCK
-        if (request->op == TO_BLOCK)
-                device->discipline->check_locate(device, request);
-#endif
         rc = ccw_device_start(
                 device->cdev,
                 request->cpaddr,
@@ -1253,7 +1243,7 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
 }
 
 /*
- * Tape device open function used by tape_char & tape_block frontends.
+ * Tape device open function used by tape_char frontend.
  */
 int
 tape_open(struct tape_device *device)
@@ -1283,7 +1273,7 @@ tape_open(struct tape_device *device)
 }
 
 /*
- * Tape device release function used by tape_char & tape_block frontends.
+ * Tape device release function used by tape_char frontend.
  */
 int
 tape_release(struct tape_device *device)
@@ -1344,7 +1334,6 @@ tape_init (void)
         DBF_EVENT(3, "tape init\n");
         tape_proc_init();
         tapechar_init ();
-        tapeblock_init ();
         return 0;
 }
 
@@ -1358,7 +1347,6 @@ tape_exit(void)
 
         /* Get rid of the frontends */
         tapechar_exit();
-        tapeblock_exit();
         tape_proc_cleanup();
         debug_unregister (TAPE_DBF_AREA);
 }
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 5f1dc6fb5708..731470e68493 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -1,7 +1,7 @@
 /*
  *  bus driver for ccwgroup
  *
- *  Copyright IBM Corp. 2002, 2009
+ *  Copyright IBM Corp. 2002, 2012
  *
  *  Author(s): Arnd Bergmann (arndb@de.ibm.com)
  *             Cornelia Huck (cornelia.huck@de.ibm.com)
@@ -15,10 +15,13 @@
 #include <linux/ctype.h>
 #include <linux/dcache.h>
 
+#include <asm/cio.h>
 #include <asm/ccwdev.h>
 #include <asm/ccwgroup.h>
 
-#define CCW_BUS_ID_SIZE         20
+#include "device.h"
+
+#define CCW_BUS_ID_SIZE         10
 
 /* In Linux 2.4, we had a channel device layer called "chandev"
  * that did all sorts of obscure stuff for networking devices.
@@ -27,19 +30,6 @@
  * to devices that use multiple subchannels.
  */
 
-/* a device matches a driver if all its slave devices match the same
- * entry of the driver */
-static int ccwgroup_bus_match(struct device *dev, struct device_driver * drv)
-{
-        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
-        struct ccwgroup_driver *gdrv = to_ccwgroupdrv(drv);
-
-        if (gdev->creator_id == gdrv->driver_id)
-                return 1;
-
-        return 0;
-}
-
 static struct bus_type ccwgroup_bus_type;
 
 static void __ccwgroup_remove_symlinks(struct ccwgroup_device *gdev)
@@ -254,9 +244,10 @@ static int __ccwgroup_create_symlinks(struct ccwgroup_device *gdev)
         return 0;
 }
 
-static int __get_next_bus_id(const char **buf, char *bus_id)
+static int __get_next_id(const char **buf, struct ccw_dev_id *id)
 {
-        int rc, len;
+        unsigned int cssid, ssid, devno;
+        int ret = 0, len;
         char *start, *end;
 
         start = (char *)*buf;
@@ -271,49 +262,40 @@ static int __get_next_bus_id(const char **buf, char *bus_id)
                 len = end - start + 1;
                 end++;
         }
-        if (len < CCW_BUS_ID_SIZE) {
-                strlcpy(bus_id, start, len);
-                rc = 0;
+        if (len <= CCW_BUS_ID_SIZE) {
+                if (sscanf(start, "%2x.%1x.%04x", &cssid, &ssid, &devno) != 3)
+                        ret = -EINVAL;
         } else
-                rc = -EINVAL;
-        *buf = end;
-        return rc;
-}
-
-static int __is_valid_bus_id(char bus_id[CCW_BUS_ID_SIZE])
-{
-        int cssid, ssid, devno;
+                ret = -EINVAL;
 
-        /* Must be of form %x.%x.%04x */
-        if (sscanf(bus_id, "%x.%1x.%04x", &cssid, &ssid, &devno) != 3)
-                return 0;
-        return 1;
+        if (!ret) {
+                id->ssid = ssid;
+                id->devno = devno;
+        }
+        *buf = end;
+        return ret;
 }
 
 /**
- * ccwgroup_create_from_string() - create and register a ccw group device
- * @root: parent device for the new device
- * @creator_id: identifier of creating driver
- * @cdrv: ccw driver of slave devices
+ * ccwgroup_create_dev() - create and register a ccw group device
+ * @parent: parent device for the new device
+ * @gdrv: driver for the new group device
  * @num_devices: number of slave devices
  * @buf: buffer containing comma separated bus ids of slave devices
  *
- * Create and register a new ccw group device as a child of @root. Slave
- * devices are obtained from the list of bus ids given in @buf and must all
- * belong to @cdrv.
+ * Create and register a new ccw group device as a child of @parent. Slave
+ * devices are obtained from the list of bus ids given in @buf.
  * Returns:
  *  %0 on success and an error code on failure.
  * Context:
  *  non-atomic
  */
-int ccwgroup_create_from_string(struct device *root, unsigned int creator_id,
-                                struct ccw_driver *cdrv, int num_devices,
-                                const char *buf)
+int ccwgroup_create_dev(struct device *parent, struct ccwgroup_driver *gdrv,
+                        int num_devices, const char *buf)
 {
         struct ccwgroup_device *gdev;
+        struct ccw_dev_id dev_id;
         int rc, i;
-        char tmp_bus_id[CCW_BUS_ID_SIZE];
-        const char *curr_buf;
 
         gdev = kzalloc(sizeof(*gdev) + num_devices * sizeof(gdev->cdev[0]),
                        GFP_KERNEL);
@@ -323,29 +305,24 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id,
         atomic_set(&gdev->onoff, 0);
         mutex_init(&gdev->reg_mutex);
         mutex_lock(&gdev->reg_mutex);
-        gdev->creator_id = creator_id;
         gdev->count = num_devices;
         gdev->dev.bus = &ccwgroup_bus_type;
-        gdev->dev.parent = root;
+        gdev->dev.parent = parent;
         gdev->dev.release = ccwgroup_release;
         device_initialize(&gdev->dev);
 
-        curr_buf = buf;
-        for (i = 0; i < num_devices && curr_buf; i++) {
-                rc = __get_next_bus_id(&curr_buf, tmp_bus_id);
+        for (i = 0; i < num_devices && buf; i++) {
+                rc = __get_next_id(&buf, &dev_id);
                 if (rc != 0)
                         goto error;
-                if (!__is_valid_bus_id(tmp_bus_id)) {
-                        rc = -EINVAL;
-                        goto error;
-                }
-                gdev->cdev[i] = get_ccwdev_by_busid(cdrv, tmp_bus_id);
+                gdev->cdev[i] = get_ccwdev_by_dev_id(&dev_id);
                 /*
                  * All devices have to be of the same type in
                  * order to be grouped.
                  */
-                if (!gdev->cdev[i]
-                    || gdev->cdev[i]->id.driver_info !=
+                if (!gdev->cdev[i] || !gdev->cdev[i]->drv ||
+                    gdev->cdev[i]->drv != gdev->cdev[0]->drv ||
+                    gdev->cdev[i]->id.driver_info !=
                     gdev->cdev[0]->id.driver_info) {
                         rc = -EINVAL;
                         goto error;
@@ -361,18 +338,25 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id,
                 spin_unlock_irq(gdev->cdev[i]->ccwlock);
         }
         /* Check for sufficient number of bus ids. */
-        if (i < num_devices && !curr_buf) {
+        if (i < num_devices) {
                 rc = -EINVAL;
                 goto error;
         }
         /* Check for trailing stuff. */
-        if (i == num_devices && strlen(curr_buf) > 0) {
+        if (i == num_devices && strlen(buf) > 0) {
                 rc = -EINVAL;
                 goto error;
         }
 
         dev_set_name(&gdev->dev, "%s", dev_name(&gdev->cdev[0]->dev));
         gdev->dev.groups = ccwgroup_attr_groups;
+
+        if (gdrv) {
+                gdev->dev.driver = &gdrv->driver;
+                rc = gdrv->setup ? gdrv->setup(gdev) : 0;
+                if (rc)
+                        goto error;
+        }
         rc = device_add(&gdev->dev);
         if (rc)
                 goto error;
@@ -397,7 +381,7 @@ error:
         put_device(&gdev->dev);
         return rc;
 }
-EXPORT_SYMBOL(ccwgroup_create_from_string);
+EXPORT_SYMBOL(ccwgroup_create_dev);
 
 static int ccwgroup_notifier(struct notifier_block *nb, unsigned long action,
                              void *data)
@@ -440,14 +424,6 @@ module_exit(cleanup_ccwgroup);
 
 /************************** driver stuff ******************************/
 
-static int ccwgroup_probe(struct device *dev)
-{
-        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
-        struct ccwgroup_driver *gdrv = to_ccwgroupdrv(dev->driver);
-
-        return gdrv->probe ? gdrv->probe(gdev) : -ENODEV;
-}
-
 static int ccwgroup_remove(struct device *dev)
 {
         struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
@@ -542,8 +518,6 @@ static const struct dev_pm_ops ccwgroup_pm_ops = {
 
 static struct bus_type ccwgroup_bus_type = {
         .name   = "ccwgroup",
-        .match  = ccwgroup_bus_match,
-        .probe  = ccwgroup_probe,
         .remove = ccwgroup_remove,
         .shutdown = ccwgroup_shutdown,
         .pm = &ccwgroup_pm_ops,
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index a49c46c91983..a6ddaed8793d 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -656,51 +656,34 @@ static struct io_subchannel_private console_priv;
 static int console_subchannel_in_use;
 
 /*
- * Use cio_tpi to get a pending interrupt and call the interrupt handler.
- * Return non-zero if an interrupt was processed, zero otherwise.
+ * Use cio_tsch to update the subchannel status and call the interrupt handler
+ * if status had been pending. Called with the console_subchannel lock.
  */
-static int cio_tpi(void)
+static void cio_tsch(struct subchannel *sch)
 {
-        struct tpi_info *tpi_info;
-        struct subchannel *sch;
         struct irb *irb;
         int irq_context;
 
-        tpi_info = (struct tpi_info *)&S390_lowcore.subchannel_id;
-        if (tpi(NULL) != 1)
-                return 0;
-        kstat_cpu(smp_processor_id()).irqs[IO_INTERRUPT]++;
-        if (tpi_info->adapter_IO) {
-                do_adapter_IO(tpi_info->isc);
-                return 1;
-        }
         irb = (struct irb *)&S390_lowcore.irb;
         /* Store interrupt response block to lowcore. */
-        if (tsch(tpi_info->schid, irb) != 0) {
+        if (tsch(sch->schid, irb) != 0)
                 /* Not status pending or not operational. */
-                kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
-                return 1;
-        }
-        sch = (struct subchannel *)(unsigned long)tpi_info->intparm;
-        if (!sch) {
-                kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
-                return 1;
-        }
+                return;
+        memcpy(&sch->schib.scsw, &irb->scsw, sizeof(union scsw));
+        /* Call interrupt handler with updated status. */
         irq_context = in_interrupt();
-        if (!irq_context)
+        if (!irq_context) {
                 local_bh_disable();
-        irq_enter();
-        spin_lock(sch->lock);
-        memcpy(&sch->schib.scsw, &irb->scsw, sizeof(union scsw));
+                irq_enter();
+        }
         if (sch->driver && sch->driver->irq)
                 sch->driver->irq(sch);
         else
                 kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
-        spin_unlock(sch->lock);
-        irq_exit();
-        if (!irq_context)
+        if (!irq_context) {
+                irq_exit();
                 _local_bh_enable();
-        return 1;
+        }
 }
 
 void *cio_get_console_priv(void)
@@ -712,34 +695,16 @@ void *cio_get_console_priv(void)
  * busy wait for the next interrupt on the console
  */
 void wait_cons_dev(void)
-        __releases(console_subchannel.lock)
-        __acquires(console_subchannel.lock)
 {
-        unsigned long cr6      __attribute__ ((aligned (8)));
-        unsigned long save_cr6 __attribute__ ((aligned (8)));
-
-        /* 
-         * before entering the spinlock we may already have
-         * processed the interrupt on a different CPU...
-         */
         if (!console_subchannel_in_use)
                 return;
 
-        /* disable all but the console isc */
-        __ctl_store (save_cr6, 6, 6);
-        cr6 = 1UL << (31 - CONSOLE_ISC);
-        __ctl_load (cr6, 6, 6);
-
-        do {
-                spin_unlock(console_subchannel.lock);
-                if (!cio_tpi())
-                        cpu_relax();
-                spin_lock(console_subchannel.lock);
-        } while (console_subchannel.schib.scsw.cmd.actl != 0);
-        /*
-         * restore previous isc value
-         */
-        __ctl_load (save_cr6, 6, 6);
+        while (1) {
+                cio_tsch(&console_subchannel);
+                if (console_subchannel.schib.scsw.cmd.actl == 0)
+                        break;
+                udelay_simple(100);
+        }
 }
 
 static int
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 02d015259461..f8f952d52045 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -695,7 +695,17 @@ static int match_dev_id(struct device *dev, void *data)
         return ccw_dev_id_is_equal(&cdev->private->dev_id, dev_id);
 }
 
-static struct ccw_device *get_ccwdev_by_dev_id(struct ccw_dev_id *dev_id)
+/**
+ * get_ccwdev_by_dev_id() - obtain device from a ccw device id
+ * @dev_id: id of the device to be searched
+ *
+ * This function searches all devices attached to the ccw bus for a device
+ * matching @dev_id.
+ * Returns:
+ *  If a device is found its reference count is increased and returned;
+ *  else %NULL is returned.
+ */
+struct ccw_device *get_ccwdev_by_dev_id(struct ccw_dev_id *dev_id)
 {
         struct device *dev;
 
@@ -703,6 +713,7 @@ static struct ccw_device *get_ccwdev_by_dev_id(struct ccw_dev_id *dev_id)
 
         return dev ? to_ccwdev(dev) : NULL;
 }
+EXPORT_SYMBOL_GPL(get_ccwdev_by_dev_id);
 
 static void ccw_device_do_unbind_bind(struct ccw_device *cdev)
 {
diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index 179824b3082f..6bace6942396 100644
--- a/drivers/s390/cio/device.h
+++ b/drivers/s390/cio/device.h
@@ -101,6 +101,7 @@ int ccw_device_test_sense_data(struct ccw_device *);
 void ccw_device_schedule_sch_unregister(struct ccw_device *);
 int ccw_purge_blacklisted(void);
 void ccw_device_sched_todo(struct ccw_device *cdev, enum cdev_todo todo);
+struct ccw_device *get_ccwdev_by_dev_id(struct ccw_dev_id *dev_id);
 
 /* Function prototypes for device status and basic sense stuff. */
 void ccw_device_accumulate_irb(struct ccw_device *, struct irb *);
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index 35c685c374e9..7493efafa0d5 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -63,7 +63,7 @@ static inline int do_siga_input(unsigned long schid, unsigned int mask,
                 "       ipm     %0\n"
                 "       srl     %0,28\n"
                 : "=d" (cc)
-                : "d" (__fc), "d" (__schid), "d" (__mask) : "cc", "memory");
+                : "d" (__fc), "d" (__schid), "d" (__mask) : "cc");
         return cc;
 }
 
@@ -74,7 +74,7 @@ static inline int do_siga_input(unsigned long schid, unsigned int mask,
  * @bb: busy bit indicator, set only if SIGA-w/wt could not access a buffer
  * @fc: function code to perform
  *
- * Returns cc or QDIO_ERROR_SIGA_ACCESS_EXCEPTION.
+ * Returns condition code.
  * Note: For IQDC unicast queues only the highest priority queue is processed.
  */
 static inline int do_siga_output(unsigned long schid, unsigned long mask,
@@ -85,18 +85,16 @@ static inline int do_siga_output(unsigned long schid, unsigned long mask,
         register unsigned long __schid asm("1") = schid;
         register unsigned long __mask asm("2") = mask;
         register unsigned long __aob asm("3") = aob;
-        int cc = QDIO_ERROR_SIGA_ACCESS_EXCEPTION;
+        int cc;
 
         asm volatile(
                 "       siga    0\n"
-                "0:     ipm     %0\n"
+                "       ipm     %0\n"
                 "       srl     %0,28\n"
-                "1:\n"
-                EX_TABLE(0b, 1b)
-                : "+d" (cc), "+d" (__fc), "+d" (__schid), "+d" (__mask),
-                  "+d" (__aob)
-                : : "cc", "memory");
-        *bb = ((unsigned int) __fc) >> 31;
+                : "=d" (cc), "+d" (__fc), "+d" (__aob)
+                : "d" (__schid), "d" (__mask)
+                : "cc");
+        *bb = __fc >> 31;
         return cc;
 }
 
@@ -167,7 +165,7 @@ again:
 
         DBF_ERROR("%4x EQBS ERROR", SCH_NO(q));
         DBF_ERROR("%3d%3d%2d", count, tmp_count, nr);
-        q->handler(q->irq_ptr->cdev, QDIO_ERROR_ACTIVATE_CHECK_CONDITION,
+        q->handler(q->irq_ptr->cdev, QDIO_ERROR_GET_BUF_STATE,
                    q->nr, q->first_to_kick, count, q->irq_ptr->int_parm);
         return 0;
 }
@@ -215,7 +213,7 @@ again:
 
         DBF_ERROR("%4x SQBS ERROR", SCH_NO(q));
         DBF_ERROR("%3d%3d%2d", count, tmp_count, nr);
-        q->handler(q->irq_ptr->cdev, QDIO_ERROR_ACTIVATE_CHECK_CONDITION,
+        q->handler(q->irq_ptr->cdev, QDIO_ERROR_SET_BUF_STATE,
                    q->nr, q->first_to_kick, count, q->irq_ptr->int_parm);
         return 0;
 }
@@ -313,7 +311,7 @@ static inline int qdio_siga_sync(struct qdio_q *q, unsigned int output,
         cc = do_siga_sync(schid, output, input, fc);
         if (unlikely(cc))
                 DBF_ERROR("%4x SIGA-S:%2d", SCH_NO(q), cc);
-        return cc;
+        return (cc) ? -EIO : 0;
 }
 
 static inline int qdio_siga_sync_q(struct qdio_q *q)
@@ -384,7 +382,7 @@ static inline int qdio_siga_input(struct qdio_q *q)
         cc = do_siga_input(schid, q->mask, fc);
         if (unlikely(cc))
                 DBF_ERROR("%4x SIGA-R:%2d", SCH_NO(q), cc);
-        return cc;
+        return (cc) ? -EIO : 0;
 }
 
 #define qdio_siga_sync_out(q) qdio_siga_sync(q, ~0U, 0)
@@ -443,7 +441,7 @@ static void process_buffer_error(struct qdio_q *q, int count)
         unsigned char state = (q->is_input_q) ? SLSB_P_INPUT_NOT_INIT :
                                         SLSB_P_OUTPUT_NOT_INIT;
 
-        q->qdio_error |= QDIO_ERROR_SLSB_STATE;
+        q->qdio_error = QDIO_ERROR_SLSB_STATE;
 
         /* special handling for no target buffer empty */
         if ((!q->is_input_q &&
@@ -519,7 +517,7 @@ static int get_inbound_buffer_frontier(struct qdio_q *q)
         int count, stop;
         unsigned char state = 0;
 
-        q->timestamp = get_clock_fast();
+        q->timestamp = get_clock();
 
         /*
          * Don't check 128 buffers, as otherwise qdio_inbound_q_moved
@@ -575,7 +573,7 @@ static int qdio_inbound_q_moved(struct qdio_q *q)
 
         bufnr = get_inbound_buffer_frontier(q);
 
-        if ((bufnr != q->last_move) || q->qdio_error) {
+        if (bufnr != q->last_move) {
                 q->last_move = bufnr;
                 if (!is_thinint_irq(q->irq_ptr) && MACHINE_IS_LPAR)
                         q->u.in.timestamp = get_clock();
@@ -790,7 +788,7 @@ static int get_outbound_buffer_frontier(struct qdio_q *q)
         int count, stop;
         unsigned char state = 0;
 
-        q->timestamp = get_clock_fast();
+        q->timestamp = get_clock();
 
         if (need_siga_sync(q))
                 if (((queue_type(q) != QDIO_IQDIO_QFMT) &&
@@ -863,7 +861,7 @@ static inline int qdio_outbound_q_moved(struct qdio_q *q)
 
         bufnr = get_outbound_buffer_frontier(q);
 
-        if ((bufnr != q->last_move) || q->qdio_error) {
+        if (bufnr != q->last_move) {
                 q->last_move = bufnr;
                 DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "out moved:%1d", q->nr);
                 return 1;
@@ -894,13 +892,16 @@ retry:
                                 goto retry;
                         }
                         DBF_ERROR("%4x cc2 BBC:%1d", SCH_NO(q), q->nr);
-                        cc |= QDIO_ERROR_SIGA_BUSY;
-                } else
+                        cc = -EBUSY;
+                } else {
                         DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "siga-w cc2:%1d", q->nr);
+                        cc = -ENOBUFS;
+                }
                 break;
         case 1:
         case 3:
                 DBF_ERROR("%4x SIGA-W:%1d", SCH_NO(q), cc);
+                cc = -EIO;
                 break;
         }
         if (retries) {
@@ -1090,7 +1091,7 @@ static void qdio_handle_activate_check(struct ccw_device *cdev,
         }
 
         count = sub_buf(q->first_to_check, q->first_to_kick);
-        q->handler(q->irq_ptr->cdev, QDIO_ERROR_ACTIVATE_CHECK_CONDITION,
+        q->handler(q->irq_ptr->cdev, QDIO_ERROR_ACTIVATE,
                    q->nr, q->first_to_kick, count, irq_ptr->int_parm);
 no_handler:
         qdio_set_state(irq_ptr, QDIO_IRQ_STATE_STOPPED);
@@ -1691,7 +1692,7 @@ int do_QDIO(struct ccw_device *cdev, unsigned int callflags,
                       "do%02x b:%02x c:%02x", callflags, bufnr, count);
 
         if (irq_ptr->state != QDIO_IRQ_STATE_ACTIVE)
-                return -EBUSY;
+                return -EIO;
         if (!count)
                 return 0;
         if (callflags & QDIO_FLAG_SYNC_INPUT)
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 7e9a72eb2fe0..b987d4619586 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -215,7 +215,7 @@ ap_queue_interruption_control(ap_qid_t qid, void *ind)
         register struct ap_queue_status reg1_out asm ("1");
         register void *reg2 asm ("2") = ind;
         asm volatile(
-                ".long 0xb2af0000"              /* PQAP(RAPQ) */
+                ".long 0xb2af0000"              /* PQAP(AQIC) */
                 : "+d" (reg0), "+d" (reg1_in), "=d" (reg1_out), "+d" (reg2)
                 :
                 : "cc" );
@@ -232,7 +232,7 @@ __ap_query_functions(ap_qid_t qid, unsigned int *functions)
         register unsigned long reg2 asm ("2");
 
         asm volatile(
-                ".long 0xb2af0000\n"
+                ".long 0xb2af0000\n"            /* PQAP(TAPQ) */
                 "0:\n"
                 EX_TABLE(0b, 0b)
                 : "+d" (reg0), "+d" (reg1), "=d" (reg2)
@@ -391,7 +391,7 @@ __ap_send(ap_qid_t qid, unsigned long long psmid, void *msg, size_t length,
                 reg0 |= 0x400000UL;
 
         asm volatile (
-                "0: .long 0xb2ad0042\n"         /* DQAP */
+                "0: .long 0xb2ad0042\n"         /* NQAP */
                 "   brc   2,0b"
                 : "+d" (reg0), "=d" (reg1), "+d" (reg2), "+d" (reg3)
                 : "d" (reg4), "d" (reg5), "m" (*(msgblock *) msg)
@@ -450,7 +450,7 @@ __ap_recv(ap_qid_t qid, unsigned long long *psmid, void *msg, size_t length)
 
 
         asm volatile(
-                "0: .long 0xb2ae0064\n"
+                "0: .long 0xb2ae0064\n"         /* DQAP */
                 "   brc   6,0b\n"
                 : "+d" (reg0), "=d" (reg1), "+d" (reg2),
                 "+d" (reg4), "+d" (reg5), "+d" (reg6), "+d" (reg7),
@@ -836,12 +836,12 @@ static void __ap_flush_queue(struct ap_device *ap_dev)
         list_for_each_entry_safe(ap_msg, next, &ap_dev->pendingq, list) {
                 list_del_init(&ap_msg->list);
                 ap_dev->pendingq_count--;
-                ap_dev->drv->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
+                ap_msg->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
         }
         list_for_each_entry_safe(ap_msg, next, &ap_dev->requestq, list) {
                 list_del_init(&ap_msg->list);
                 ap_dev->requestq_count--;
-                ap_dev->drv->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
+                ap_msg->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
         }
 }
 
@@ -1329,7 +1329,7 @@ static int ap_poll_read(struct ap_device *ap_dev, unsigned long *flags)
                                 continue;
                         list_del_init(&ap_msg->list);
                         ap_dev->pendingq_count--;
-                        ap_dev->drv->receive(ap_dev, ap_msg, ap_dev->reply);
+                        ap_msg->receive(ap_dev, ap_msg, ap_dev->reply);
                         break;
                 }
                 if (ap_dev->queue_count > 0)
@@ -1450,10 +1450,10 @@ static int __ap_queue_message(struct ap_device *ap_dev, struct ap_message *ap_ms
                         return -EBUSY;
                 case AP_RESPONSE_REQ_FAC_NOT_INST:
                 case AP_RESPONSE_MESSAGE_TOO_BIG:
-                        ap_dev->drv->receive(ap_dev, ap_msg, ERR_PTR(-EINVAL));
+                        ap_msg->receive(ap_dev, ap_msg, ERR_PTR(-EINVAL));
                         return -EINVAL;
                 default:        /* Device is gone. */
-                        ap_dev->drv->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
+                        ap_msg->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
                         return -ENODEV;
                 }
         } else {
@@ -1471,6 +1471,10 @@ void ap_queue_message(struct ap_device *ap_dev, struct ap_message *ap_msg)
         unsigned long flags;
         int rc;
 
+        /* For asynchronous message handling a valid receive-callback
+         * is required. */
+        BUG_ON(!ap_msg->receive);
+
         spin_lock_bh(&ap_dev->lock);
         if (!ap_dev->unregistered) {
                 /* Make room on the queue by polling for finished requests. */
@@ -1482,7 +1486,7 @@ void ap_queue_message(struct ap_device *ap_dev, struct ap_message *ap_msg)
                 if (rc == -ENODEV)
                         ap_dev->unregistered = 1;
         } else {
-                ap_dev->drv->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
+                ap_msg->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
                 rc = -ENODEV;
         }
         spin_unlock_bh(&ap_dev->lock);
diff --git a/drivers/s390/crypto/ap_bus.h b/drivers/s390/crypto/ap_bus.h
index d960a6309eec..726fc65809d8 100644
--- a/drivers/s390/crypto/ap_bus.h
+++ b/drivers/s390/crypto/ap_bus.h
@@ -136,9 +136,6 @@ struct ap_driver {
 
         int (*probe)(struct ap_device *);
         void (*remove)(struct ap_device *);
-        /* receive is called from tasklet context */
-        void (*receive)(struct ap_device *, struct ap_message *,
-                        struct ap_message *);
         int request_timeout;            /* request timeout in jiffies */
 };
 
@@ -183,6 +180,9 @@ struct ap_message {
 
         void *private;                  /* ap driver private pointer. */
         unsigned int special:1;         /* Used for special commands. */
+        /* receive is called from tasklet context */
+        void (*receive)(struct ap_device *, struct ap_message *,
+                        struct ap_message *);
 };
 
 #define AP_DEVICE(dt)                                   \
@@ -199,6 +199,7 @@ static inline void ap_init_message(struct ap_message *ap_msg)
         ap_msg->psmid = 0;
         ap_msg->length = 0;
         ap_msg->special = 0;
+        ap_msg->receive = NULL;
 }
 
 /*
diff --git a/drivers/s390/crypto/zcrypt_cex2a.c b/drivers/s390/crypto/zcrypt_cex2a.c
index 084286728166..46812440425a 100644
--- a/drivers/s390/crypto/zcrypt_cex2a.c
+++ b/drivers/s390/crypto/zcrypt_cex2a.c
@@ -77,7 +77,6 @@ static void zcrypt_cex2a_receive(struct ap_device *, struct ap_message *,
 static struct ap_driver zcrypt_cex2a_driver = {
         .probe = zcrypt_cex2a_probe,
         .remove = zcrypt_cex2a_remove,
-        .receive = zcrypt_cex2a_receive,
         .ids = zcrypt_cex2a_ids,
         .request_timeout = CEX2A_CLEANUP_TIME,
 };
@@ -349,6 +348,7 @@ static long zcrypt_cex2a_modexpo(struct zcrypt_device *zdev,
                 ap_msg.message = kmalloc(CEX3A_MAX_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_cex2a_receive;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
         ap_msg.private = &work;
@@ -390,6 +390,7 @@ static long zcrypt_cex2a_modexpo_crt(struct zcrypt_device *zdev,
                 ap_msg.message = kmalloc(CEX3A_MAX_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_cex2a_receive;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
         ap_msg.private = &work;
diff --git a/drivers/s390/crypto/zcrypt_pcica.c b/drivers/s390/crypto/zcrypt_pcica.c
index 0effca925451..ad7951c21b79 100644
--- a/drivers/s390/crypto/zcrypt_pcica.c
+++ b/drivers/s390/crypto/zcrypt_pcica.c
@@ -67,7 +67,6 @@ static void zcrypt_pcica_receive(struct ap_device *, struct ap_message *,
 static struct ap_driver zcrypt_pcica_driver = {
         .probe = zcrypt_pcica_probe,
         .remove = zcrypt_pcica_remove,
-        .receive = zcrypt_pcica_receive,
         .ids = zcrypt_pcica_ids,
         .request_timeout = PCICA_CLEANUP_TIME,
 };
@@ -284,6 +283,7 @@ static long zcrypt_pcica_modexpo(struct zcrypt_device *zdev,
         ap_msg.message = kmalloc(PCICA_MAX_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_pcica_receive;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
         ap_msg.private = &work;
@@ -322,6 +322,7 @@ static long zcrypt_pcica_modexpo_crt(struct zcrypt_device *zdev,
         ap_msg.message = kmalloc(PCICA_MAX_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_pcica_receive;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
         ap_msg.private = &work;
diff --git a/drivers/s390/crypto/zcrypt_pcicc.c b/drivers/s390/crypto/zcrypt_pcicc.c
index f9523c0cc8d2..e5dd335fda53 100644
--- a/drivers/s390/crypto/zcrypt_pcicc.c
+++ b/drivers/s390/crypto/zcrypt_pcicc.c
@@ -79,7 +79,6 @@ static void zcrypt_pcicc_receive(struct ap_device *, struct ap_message *,
 static struct ap_driver zcrypt_pcicc_driver = {
         .probe = zcrypt_pcicc_probe,
         .remove = zcrypt_pcicc_remove,
-        .receive = zcrypt_pcicc_receive,
         .ids = zcrypt_pcicc_ids,
         .request_timeout = PCICC_CLEANUP_TIME,
 };
@@ -488,6 +487,7 @@ static long zcrypt_pcicc_modexpo(struct zcrypt_device *zdev,
         ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_pcicc_receive;
         ap_msg.length = PAGE_SIZE;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
@@ -527,6 +527,7 @@ static long zcrypt_pcicc_modexpo_crt(struct zcrypt_device *zdev,
         ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_pcicc_receive;
         ap_msg.length = PAGE_SIZE;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
diff --git a/drivers/s390/crypto/zcrypt_pcixcc.c b/drivers/s390/crypto/zcrypt_pcixcc.c
index cf1cbd4747f4..f7cc43401816 100644
--- a/drivers/s390/crypto/zcrypt_pcixcc.c
+++ b/drivers/s390/crypto/zcrypt_pcixcc.c
@@ -89,7 +89,6 @@ static void zcrypt_pcixcc_receive(struct ap_device *, struct ap_message *,
 static struct ap_driver zcrypt_pcixcc_driver = {
         .probe = zcrypt_pcixcc_probe,
         .remove = zcrypt_pcixcc_remove,
-        .receive = zcrypt_pcixcc_receive,
         .ids = zcrypt_pcixcc_ids,
         .request_timeout = PCIXCC_CLEANUP_TIME,
 };
@@ -698,6 +697,7 @@ static long zcrypt_pcixcc_modexpo(struct zcrypt_device *zdev,
         ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_pcixcc_receive;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
         ap_msg.private = &resp_type;
@@ -738,6 +738,7 @@ static long zcrypt_pcixcc_modexpo_crt(struct zcrypt_device *zdev,
         ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_pcixcc_receive;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
         ap_msg.private = &resp_type;
@@ -778,6 +779,7 @@ static long zcrypt_pcixcc_send_cprb(struct zcrypt_device *zdev,
         ap_msg.message = kmalloc(PCIXCC_MAX_XCRB_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_pcixcc_receive;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
         ap_msg.private = &resp_type;
@@ -818,6 +820,7 @@ static long zcrypt_pcixcc_rng(struct zcrypt_device *zdev,
         ap_msg.message = kmalloc(PCIXCC_MAX_XCRB_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
+        ap_msg.receive = zcrypt_pcixcc_receive;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
                                 atomic_inc_return(&zcrypt_step);
         ap_msg.private = &resp_type;
diff --git a/drivers/s390/net/Kconfig b/drivers/s390/net/Kconfig
index 9b66d2d1809b..dfda748c4000 100644
--- a/drivers/s390/net/Kconfig
+++ b/drivers/s390/net/Kconfig
@@ -4,11 +4,10 @@ menu "S/390 network device drivers"
 config LCS
         def_tristate m
         prompt "Lan Channel Station Interface"
-        depends on CCW && NETDEVICES && (ETHERNET || TR || FDDI)
+        depends on CCW && NETDEVICES && (ETHERNET || FDDI)
         help
            Select this option if you want to use LCS networking on IBM System z.
-           This device driver supports Token Ring (IEEE 802.5),
-           FDDI (IEEE 802.7) and Ethernet.
+           This device driver supports FDDI (IEEE 802.7) and Ethernet.
            To compile as a module, choose M. The module name is lcs.
            If you do not know what it is, it's safe to choose Y.
 
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index b41fae37d3af..6b1ff90d2f00 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -136,7 +136,6 @@ static inline void
 claw_set_busy(struct net_device *dev)
 {
  ((struct claw_privbk *)dev->ml_priv)->tbusy = 1;
- eieio();
 }
 
 static inline void
@@ -144,13 +143,11 @@ claw_clear_busy(struct net_device *dev)
 {
         clear_bit(0, &(((struct claw_privbk *) dev->ml_priv)->tbusy));
         netif_wake_queue(dev);
-        eieio();
 }
 
 static inline int
 claw_check_busy(struct net_device *dev)
 {
-        eieio();
         return ((struct claw_privbk *) dev->ml_priv)->tbusy;
 }
 
@@ -233,8 +230,6 @@ static ssize_t claw_rbuff_show(struct device *dev,
 static ssize_t claw_rbuff_write(struct device *dev,
         struct device_attribute *attr,
         const char *buf, size_t count);
-static int claw_add_files(struct device *dev);
-static void claw_remove_files(struct device *dev);
 
 /*   Functions for System Validate  */
 static int claw_process_control( struct net_device *dev, struct ccwbk * p_ccw);
@@ -267,12 +262,10 @@ static struct ccwgroup_driver claw_group_driver = {
                 .owner  = THIS_MODULE,
                 .name   = "claw",
         },
-        .max_slaves  = 2,
-        .driver_id   = 0xC3D3C1E6,
-        .probe       = claw_probe,
-        .remove      = claw_remove_device,
-        .set_online  = claw_new_device,
-        .set_offline = claw_shutdown_device,
+        .setup       = claw_probe,
+        .remove      = claw_remove_device,
+        .set_online  = claw_new_device,
+        .set_offline = claw_shutdown_device,
         .prepare     = claw_pm_prepare,
 };
 
@@ -293,30 +286,24 @@ static struct ccw_driver claw_ccw_driver = {
         .int_class = IOINT_CLW,
 };
 
-static ssize_t
-claw_driver_group_store(struct device_driver *ddrv, const char *buf,
-                        size_t count)
+static ssize_t claw_driver_group_store(struct device_driver *ddrv,
+                                       const char *buf, size_t count)
 {
         int err;
-        err = ccwgroup_create_from_string(claw_root_dev,
-                                          claw_group_driver.driver_id,
-                                          &claw_ccw_driver, 2, buf);
+        err = ccwgroup_create_dev(claw_root_dev, &claw_group_driver, 2, buf);
         return err ? err : count;
 }
-
 static DRIVER_ATTR(group, 0200, NULL, claw_driver_group_store);
 
-static struct attribute *claw_group_attrs[] = {
+static struct attribute *claw_drv_attrs[] = {
         &driver_attr_group.attr,
         NULL,
 };
-
-static struct attribute_group claw_group_attr_group = {
-        .attrs = claw_group_attrs,
+static struct attribute_group claw_drv_attr_group = {
+        .attrs = claw_drv_attrs,
 };
-
-static const struct attribute_group *claw_group_attr_groups[] = {
-        &claw_group_attr_group,
+static const struct attribute_group *claw_drv_attr_groups[] = {
+        &claw_drv_attr_group,
         NULL,
 };
 
@@ -324,60 +311,6 @@ static const struct attribute_group *claw_group_attr_groups[] = {
 *       Key functions
 */
 
-/*----------------------------------------------------------------*
- *   claw_probe                                                   *
- *      this function is called for each CLAW device.             *
- *----------------------------------------------------------------*/
-static int
-claw_probe(struct ccwgroup_device *cgdev)
-{
-        int             rc;
-        struct claw_privbk *privptr=NULL;
-
-        CLAW_DBF_TEXT(2, setup, "probe");
-        if (!get_device(&cgdev->dev))
-                return -ENODEV;
-        privptr = kzalloc(sizeof(struct claw_privbk), GFP_KERNEL);
-        dev_set_drvdata(&cgdev->dev, privptr);
-        if (privptr == NULL) {
-                probe_error(cgdev);
-                put_device(&cgdev->dev);
-                CLAW_DBF_TEXT_(2, setup, "probex%d", -ENOMEM);
-                return -ENOMEM;
-        }
-        privptr->p_mtc_envelope= kzalloc( MAX_ENVELOPE_SIZE, GFP_KERNEL);
-        privptr->p_env = kzalloc(sizeof(struct claw_env), GFP_KERNEL);
-        if ((privptr->p_mtc_envelope==NULL) || (privptr->p_env==NULL)) {
-                probe_error(cgdev);
-                put_device(&cgdev->dev);
-                CLAW_DBF_TEXT_(2, setup, "probex%d", -ENOMEM);
-                return -ENOMEM;
-        }
-        memcpy(privptr->p_env->adapter_name,WS_NAME_NOT_DEF,8);
-        memcpy(privptr->p_env->host_name,WS_NAME_NOT_DEF,8);
-        memcpy(privptr->p_env->api_type,WS_NAME_NOT_DEF,8);
-        privptr->p_env->packing = 0;
-        privptr->p_env->write_buffers = 5;
-        privptr->p_env->read_buffers = 5;
-        privptr->p_env->read_size = CLAW_FRAME_SIZE;
-        privptr->p_env->write_size = CLAW_FRAME_SIZE;
-        rc = claw_add_files(&cgdev->dev);
-        if (rc) {
-                probe_error(cgdev);
-                put_device(&cgdev->dev);
-                dev_err(&cgdev->dev, "Creating the /proc files for a new"
-                " CLAW device failed\n");
-                CLAW_DBF_TEXT_(2, setup, "probex%d", rc);
-                return rc;
-        }
-        privptr->p_env->p_priv = privptr;
-        cgdev->cdev[0]->handler = claw_irq_handler;
-        cgdev->cdev[1]->handler = claw_irq_handler;
-        CLAW_DBF_TEXT(2, setup, "prbext 0");
-
-        return 0;
-}  /*  end of claw_probe       */
-
 /*-------------------------------------------------------------------*
  *   claw_tx                                                         *
  *-------------------------------------------------------------------*/
@@ -3093,7 +3026,6 @@ claw_remove_device(struct ccwgroup_device *cgdev)
         dev_info(&cgdev->dev, " will be removed.\n");
         if (cgdev->state == CCWGROUP_ONLINE)
                 claw_shutdown_device(cgdev);
-        claw_remove_files(&cgdev->dev);
         kfree(priv->p_mtc_envelope);
         priv->p_mtc_envelope=NULL;
         kfree(priv->p_env);
@@ -3321,7 +3253,6 @@ claw_rbuff_write(struct device *dev, struct device_attribute *attr,
         CLAW_DBF_TEXT_(2, setup, "RB=%d", p_env->read_buffers);
         return count;
 }
-
 static DEVICE_ATTR(read_buffer, 0644, claw_rbuff_show, claw_rbuff_write);
 
 static struct attribute *claw_attr[] = {
@@ -3332,40 +3263,73 @@ static struct attribute *claw_attr[] = {
         &dev_attr_host_name.attr,
         NULL,
 };
-
 static struct attribute_group claw_attr_group = {
         .attrs = claw_attr,
 };
+static const struct attribute_group *claw_attr_groups[] = {
+        &claw_attr_group,
+        NULL,
+};
+static const struct device_type claw_devtype = {
+        .name = "claw",
+        .groups = claw_attr_groups,
+};
 
-static int
-claw_add_files(struct device *dev)
+/*----------------------------------------------------------------*
+ *   claw_probe                                                   *
+ *      this function is called for each CLAW device.             *
+ *----------------------------------------------------------------*/
+static int claw_probe(struct ccwgroup_device *cgdev)
 {
-        CLAW_DBF_TEXT(2, setup, "add_file");
-        return sysfs_create_group(&dev->kobj, &claw_attr_group);
-}
+        struct claw_privbk *privptr = NULL;
 
-static void
-claw_remove_files(struct device *dev)
-{
-        CLAW_DBF_TEXT(2, setup, "rem_file");
-        sysfs_remove_group(&dev->kobj, &claw_attr_group);
-}
+        CLAW_DBF_TEXT(2, setup, "probe");
+        if (!get_device(&cgdev->dev))
+                return -ENODEV;
+        privptr = kzalloc(sizeof(struct claw_privbk), GFP_KERNEL);
+        dev_set_drvdata(&cgdev->dev, privptr);
+        if (privptr == NULL) {
+                probe_error(cgdev);
+                put_device(&cgdev->dev);
+                CLAW_DBF_TEXT_(2, setup, "probex%d", -ENOMEM);
+                return -ENOMEM;
+        }
+        privptr->p_mtc_envelope = kzalloc(MAX_ENVELOPE_SIZE, GFP_KERNEL);
+        privptr->p_env = kzalloc(sizeof(struct claw_env), GFP_KERNEL);
+        if ((privptr->p_mtc_envelope == NULL) || (privptr->p_env == NULL)) {
+                probe_error(cgdev);
+                put_device(&cgdev->dev);
+                CLAW_DBF_TEXT_(2, setup, "probex%d", -ENOMEM);
+                return -ENOMEM;
+        }
+        memcpy(privptr->p_env->adapter_name, WS_NAME_NOT_DEF, 8);
+        memcpy(privptr->p_env->host_name, WS_NAME_NOT_DEF, 8);
+        memcpy(privptr->p_env->api_type, WS_NAME_NOT_DEF, 8);
+        privptr->p_env->packing = 0;
+        privptr->p_env->write_buffers = 5;
+        privptr->p_env->read_buffers = 5;
+        privptr->p_env->read_size = CLAW_FRAME_SIZE;
+        privptr->p_env->write_size = CLAW_FRAME_SIZE;
+        privptr->p_env->p_priv = privptr;
+        cgdev->cdev[0]->handler = claw_irq_handler;
+        cgdev->cdev[1]->handler = claw_irq_handler;
+        cgdev->dev.type = &claw_devtype;
+        CLAW_DBF_TEXT(2, setup, "prbext 0");
+
+        return 0;
+}  /*  end of claw_probe       */
 
 /*--------------------------------------------------------------------*
 *    claw_init  and cleanup                                           *
 *---------------------------------------------------------------------*/
 
-static void __exit
-claw_cleanup(void)
+static void __exit claw_cleanup(void)
 {
-        driver_remove_file(&claw_group_driver.driver,
-                           &driver_attr_group);
         ccwgroup_driver_unregister(&claw_group_driver);
         ccw_driver_unregister(&claw_ccw_driver);
         root_device_unregister(claw_root_dev);
         claw_unregister_debug_facility();
         pr_info("Driver unloaded\n");
-
 }
 
 /**
@@ -3374,8 +3338,7 @@ claw_cleanup(void)
  *
  * @return 0 on success, !0 on error.
  */
-static int __init
-claw_init(void)
+static int __init claw_init(void)
 {
         int ret = 0;
 
@@ -3394,7 +3357,7 @@ claw_init(void)
         ret = ccw_driver_register(&claw_ccw_driver);
         if (ret)
                 goto ccw_err;
-        claw_group_driver.driver.groups = claw_group_attr_groups;
+        claw_group_driver.driver.groups = claw_drv_attr_groups;
         ret = ccwgroup_driver_register(&claw_group_driver);
         if (ret)
                 goto ccwgroup_err;
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index 11f3b071f305..3cd25544a27a 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -1296,6 +1296,11 @@ static void ctcm_irq_handler(struct ccw_device *cdev,
 
 }
 
+static const struct device_type ctcm_devtype = {
+        .name = "ctcm",
+        .groups = ctcm_attr_groups,
+};
+
 /**
  * Add ctcm specific attributes.
  * Add ctcm private data.
@@ -1307,7 +1312,6 @@ static void ctcm_irq_handler(struct ccw_device *cdev,
 static int ctcm_probe_device(struct ccwgroup_device *cgdev)
 {
         struct ctcm_priv *priv;
-        int rc;
 
         CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO,
                         "%s %p",
@@ -1324,17 +1328,11 @@ static int ctcm_probe_device(struct ccwgroup_device *cgdev)
                 put_device(&cgdev->dev);
                 return -ENOMEM;
         }
-
-        rc = ctcm_add_files(&cgdev->dev);
-        if (rc) {
-                kfree(priv);
-                put_device(&cgdev->dev);
-                return rc;
-        }
         priv->buffer_size = CTCM_BUFSIZE_DEFAULT;
         cgdev->cdev[0]->handler = ctcm_irq_handler;
         cgdev->cdev[1]->handler = ctcm_irq_handler;
         dev_set_drvdata(&cgdev->dev, priv);
+        cgdev->dev.type = &ctcm_devtype;
 
         return 0;
 }
@@ -1611,11 +1609,6 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev)
                 goto out_dev;
         }
 
-        if (ctcm_add_attributes(&cgdev->dev)) {
-                result = -ENODEV;
-                goto out_unregister;
-        }
-
         strlcpy(priv->fsm->name, dev->name, sizeof(priv->fsm->name));
 
         dev_info(&dev->dev,
@@ -1629,8 +1622,6 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev)
                         priv->channel[CTCM_WRITE]->id, priv->protocol);
 
         return 0;
-out_unregister:
-        unregister_netdev(dev);
 out_dev:
         ctcm_free_netdevice(dev);
 out_ccw2:
@@ -1669,7 +1660,6 @@ static int ctcm_shutdown_device(struct ccwgroup_device *cgdev)
                 /* Close the device */
                 ctcm_close(dev);
                 dev->flags &= ~IFF_RUNNING;
-                ctcm_remove_attributes(&cgdev->dev);
                 channel_free(priv->channel[CTCM_READ]);
         } else
                 dev = NULL;
@@ -1711,7 +1701,6 @@ static void ctcm_remove_device(struct ccwgroup_device *cgdev)
 
         if (cgdev->state == CCWGROUP_ONLINE)
                 ctcm_shutdown_device(cgdev);
-        ctcm_remove_files(&cgdev->dev);
         dev_set_drvdata(&cgdev->dev, NULL);
         kfree(priv);
         put_device(&cgdev->dev);
@@ -1778,9 +1767,7 @@ static struct ccwgroup_driver ctcm_group_driver = {
                 .owner  = THIS_MODULE,
                 .name   = CTC_DRIVER_NAME,
         },
-        .max_slaves  = 2,
-        .driver_id   = 0xC3E3C3D4,      /* CTCM */
-        .probe       = ctcm_probe_device,
+        .setup       = ctcm_probe_device,
         .remove      = ctcm_remove_device,
         .set_online  = ctcm_new_device,
         .set_offline = ctcm_shutdown_device,
@@ -1789,31 +1776,25 @@ static struct ccwgroup_driver ctcm_group_driver = {
         .restore     = ctcm_pm_resume,
 };
 
-static ssize_t
-ctcm_driver_group_store(struct device_driver *ddrv, const char *buf,
-                        size_t count)
+static ssize_t ctcm_driver_group_store(struct device_driver *ddrv,
+                                       const char *buf, size_t count)
 {
         int err;
 
-        err = ccwgroup_create_from_string(ctcm_root_dev,
-                                          ctcm_group_driver.driver_id,
-                                          &ctcm_ccw_driver, 2, buf);
+        err = ccwgroup_create_dev(ctcm_root_dev, &ctcm_group_driver, 2, buf);
         return err ? err : count;
 }
-
 static DRIVER_ATTR(group, 0200, NULL, ctcm_driver_group_store);
 
-static struct attribute *ctcm_group_attrs[] = {
+static struct attribute *ctcm_drv_attrs[] = {
         &driver_attr_group.attr,
         NULL,
 };
-
-static struct attribute_group ctcm_group_attr_group = {
-        .attrs = ctcm_group_attrs,
+static struct attribute_group ctcm_drv_attr_group = {
+        .attrs = ctcm_drv_attrs,
 };
-
-static const struct attribute_group *ctcm_group_attr_groups[] = {
-        &ctcm_group_attr_group,
+static const struct attribute_group *ctcm_drv_attr_groups[] = {
+        &ctcm_drv_attr_group,
         NULL,
 };
 
@@ -1829,7 +1810,6 @@ static const struct attribute_group *ctcm_group_attr_groups[] = {
  */
 static void __exit ctcm_exit(void)
 {
-        driver_remove_file(&ctcm_group_driver.driver, &driver_attr_group);
         ccwgroup_driver_unregister(&ctcm_group_driver);
         ccw_driver_unregister(&ctcm_ccw_driver);
         root_device_unregister(ctcm_root_dev);
@@ -1867,7 +1847,7 @@ static int __init ctcm_init(void)
         ret = ccw_driver_register(&ctcm_ccw_driver);
         if (ret)
                 goto ccw_err;
-        ctcm_group_driver.driver.groups = ctcm_group_attr_groups;
+        ctcm_group_driver.driver.groups = ctcm_drv_attr_groups;
         ret = ccwgroup_driver_register(&ctcm_group_driver);
         if (ret)
                 goto ccwgroup_err;
diff --git a/drivers/s390/net/ctcm_main.h b/drivers/s390/net/ctcm_main.h
index 24d5215eb0c4..b9056a55d995 100644
--- a/drivers/s390/net/ctcm_main.h
+++ b/drivers/s390/net/ctcm_main.h
@@ -225,13 +225,7 @@ struct ctcm_priv {
 int ctcm_open(struct net_device *dev);
 int ctcm_close(struct net_device *dev);
 
-/*
- * prototypes for non-static sysfs functions
- */
-int ctcm_add_attributes(struct device *dev);
-void ctcm_remove_attributes(struct device *dev);
-int ctcm_add_files(struct device *dev);
-void ctcm_remove_files(struct device *dev);
+extern const struct attribute_group *ctcm_attr_groups[];
 
 /*
  * Compatibility macros for busy handling
diff --git a/drivers/s390/net/ctcm_sysfs.c b/drivers/s390/net/ctcm_sysfs.c
index 650aec1839e9..0c27ae726475 100644
--- a/drivers/s390/net/ctcm_sysfs.c
+++ b/drivers/s390/net/ctcm_sysfs.c
@@ -13,6 +13,7 @@
 #define KMSG_COMPONENT "ctcm"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
+#include <linux/device.h>
 #include <linux/sysfs.h>
 #include <linux/slab.h>
 #include "ctcm_main.h"
@@ -108,10 +109,12 @@ static void ctcm_print_statistics(struct ctcm_priv *priv)
 }
 
 static ssize_t stats_show(struct device *dev,
-                                struct device_attribute *attr, char *buf)
+                          struct device_attribute *attr, char *buf)
 {
+        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
         struct ctcm_priv *priv = dev_get_drvdata(dev);
-        if (!priv)
+
+        if (!priv || gdev->state != CCWGROUP_ONLINE)
                 return -ENODEV;
         ctcm_print_statistics(priv);
         return sprintf(buf, "0\n");
@@ -190,34 +193,14 @@ static struct attribute *ctcm_attr[] = {
         &dev_attr_protocol.attr,
         &dev_attr_type.attr,
         &dev_attr_buffer.attr,
+        &dev_attr_stats.attr,
         NULL,
 };
 
 static struct attribute_group ctcm_attr_group = {
         .attrs = ctcm_attr,
 };
-
-int ctcm_add_attributes(struct device *dev)
-{
-        int rc;
-
-        rc = device_create_file(dev, &dev_attr_stats);
-
-        return rc;
-}
-
-void ctcm_remove_attributes(struct device *dev)
-{
-        device_remove_file(dev, &dev_attr_stats);
-}
-
-int ctcm_add_files(struct device *dev)
-{
-        return sysfs_create_group(&dev->kobj, &ctcm_attr_group);
-}
-
-void ctcm_remove_files(struct device *dev)
-{
-        sysfs_remove_group(&dev->kobj, &ctcm_attr_group);
-}
-
+const struct attribute_group *ctcm_attr_groups[] = {
+        &ctcm_attr_group,
+        NULL,
+};
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 687efe4d589a..a3adf4b1c60d 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -30,7 +30,6 @@
 #include <linux/if.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/trdevice.h>
 #include <linux/fddidevice.h>
 #include <linux/inetdevice.h>
 #include <linux/in.h>
@@ -50,8 +49,7 @@
 #include "lcs.h"
 
 
-#if !defined(CONFIG_ETHERNET) && \
-    !defined(CONFIG_TR) && !defined(CONFIG_FDDI)
+#if !defined(CONFIG_ETHERNET) && !defined(CONFIG_FDDI)
 #error Cannot compile lcs.c without some net devices switched on.
 #endif
 
@@ -1166,10 +1164,7 @@ static void
 lcs_get_mac_for_ipm(__be32 ipm, char *mac, struct net_device *dev)
 {
         LCS_DBF_TEXT(4,trace, "getmac");
-        if (dev->type == ARPHRD_IEEE802_TR)
-                ip_tr_mc_map(ipm, mac);
-        else
-                ip_eth_mc_map(ipm, mac);
+        ip_eth_mc_map(ipm, mac);
 }
 
 /**
@@ -1641,12 +1636,6 @@ lcs_startlan_auto(struct lcs_card *card)
                 return 0;
 
 #endif
-#ifdef CONFIG_TR
-        card->lan_type = LCS_FRAME_TYPE_TR;
-        rc = lcs_send_startlan(card, LCS_INITIATOR_TCPIP);
-        if (rc == 0)
-                return 0;
-#endif
 #ifdef CONFIG_FDDI
         card->lan_type = LCS_FRAME_TYPE_FDDI;
         rc = lcs_send_startlan(card, LCS_INITIATOR_TCPIP);
@@ -2051,10 +2040,17 @@ static struct attribute * lcs_attrs[] = {
         &dev_attr_recover.attr,
         NULL,
 };
-
 static struct attribute_group lcs_attr_group = {
         .attrs = lcs_attrs,
 };
+static const struct attribute_group *lcs_attr_groups[] = {
+        &lcs_attr_group,
+        NULL,
+};
+static const struct device_type lcs_devtype = {
+        .name = "lcs",
+        .groups = lcs_attr_groups,
+};
 
 /**
  * lcs_probe_device is called on establishing a new ccwgroup_device.
@@ -2063,7 +2059,6 @@ static int
 lcs_probe_device(struct ccwgroup_device *ccwgdev)
 {
         struct lcs_card *card;
-        int ret;
 
         if (!get_device(&ccwgdev->dev))
                 return -ENODEV;
@@ -2075,12 +2070,6 @@ lcs_probe_device(struct ccwgroup_device *ccwgdev)
                 put_device(&ccwgdev->dev);
                 return -ENOMEM;
         }
-        ret = sysfs_create_group(&ccwgdev->dev.kobj, &lcs_attr_group);
-        if (ret) {
-                lcs_free_card(card);
-                put_device(&ccwgdev->dev);
-                return ret;
-        }
         dev_set_drvdata(&ccwgdev->dev, card);
         ccwgdev->cdev[0]->handler = lcs_irq;
         ccwgdev->cdev[1]->handler = lcs_irq;
@@ -2089,7 +2078,9 @@ lcs_probe_device(struct ccwgroup_device *ccwgdev)
         card->thread_start_mask = 0;
         card->thread_allowed_mask = 0;
         card->thread_running_mask = 0;
-        return 0;
+        ccwgdev->dev.type = &lcs_devtype;
+
+        return 0;
 }
 
 static int
@@ -2172,12 +2163,6 @@ lcs_new_device(struct ccwgroup_device *ccwgdev)
                 dev = alloc_etherdev(0);
                 break;
 #endif
-#ifdef CONFIG_TR
-        case LCS_FRAME_TYPE_TR:
-                card->lan_type_trans = tr_type_trans;
-                dev = alloc_trdev(0);
-                break;
-#endif
 #ifdef CONFIG_FDDI
         case LCS_FRAME_TYPE_FDDI:
                 card->lan_type_trans = fddi_type_trans;
@@ -2323,9 +2308,9 @@ lcs_remove_device(struct ccwgroup_device *ccwgdev)
         }
         if (card->dev)
                 unregister_netdev(card->dev);
-        sysfs_remove_group(&ccwgdev->dev.kobj, &lcs_attr_group);
         lcs_cleanup_card(card);
         lcs_free_card(card);
+        dev_set_drvdata(&ccwgdev->dev, NULL);
         put_device(&ccwgdev->dev);
 }
 
@@ -2410,9 +2395,7 @@ static struct ccwgroup_driver lcs_group_driver = {
                 .owner  = THIS_MODULE,
                 .name   = "lcs",
         },
-        .max_slaves  = 2,
-        .driver_id   = 0xD3C3E2,
-        .probe       = lcs_probe_device,
+        .setup       = lcs_probe_device,
         .remove      = lcs_remove_device,
         .set_online  = lcs_new_device,
         .set_offline = lcs_shutdown_device,
@@ -2423,30 +2406,24 @@ static struct ccwgroup_driver lcs_group_driver = {
         .restore     = lcs_restore,
 };
 
-static ssize_t
-lcs_driver_group_store(struct device_driver *ddrv, const char *buf,
-                       size_t count)
+static ssize_t lcs_driver_group_store(struct device_driver *ddrv,
+                                      const char *buf, size_t count)
 {
         int err;
-        err = ccwgroup_create_from_string(lcs_root_dev,
-                                          lcs_group_driver.driver_id,
-                                          &lcs_ccw_driver, 2, buf);
+        err = ccwgroup_create_dev(lcs_root_dev, &lcs_group_driver, 2, buf);
         return err ? err : count;
 }
-
 static DRIVER_ATTR(group, 0200, NULL, lcs_driver_group_store);
 
-static struct attribute *lcs_group_attrs[] = {
+static struct attribute *lcs_drv_attrs[] = {
         &driver_attr_group.attr,
         NULL,
 };
-
-static struct attribute_group lcs_group_attr_group = {
-        .attrs = lcs_group_attrs,
+static struct attribute_group lcs_drv_attr_group = {
+        .attrs = lcs_drv_attrs,
 };
-
-static const struct attribute_group *lcs_group_attr_groups[] = {
-        &lcs_group_attr_group,
+static const struct attribute_group *lcs_drv_attr_groups[] = {
+        &lcs_drv_attr_group,
         NULL,
 };
 
@@ -2470,7 +2447,7 @@ __init lcs_init_module(void)
         rc = ccw_driver_register(&lcs_ccw_driver);
         if (rc)
                 goto ccw_err;
-        lcs_group_driver.driver.groups = lcs_group_attr_groups;
+        lcs_group_driver.driver.groups = lcs_drv_attr_groups;
         rc = ccwgroup_driver_register(&lcs_group_driver);
         if (rc)
                 goto ccwgroup_err;
@@ -2496,8 +2473,6 @@ __exit lcs_cleanup_module(void)
 {
         pr_info("Terminating lcs module.\n");
         LCS_DBF_TEXT(0, trace, "cleanup");
-        driver_remove_file(&lcs_group_driver.driver,
-                           &driver_attr_group);
         ccwgroup_driver_unregister(&lcs_group_driver);
         ccw_driver_unregister(&lcs_ccw_driver);
         root_device_unregister(lcs_root_dev);
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index ec7921b5138e..06e8f31ff3dc 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -13,8 +13,6 @@
 
 #include <linux/if.h>
 #include <linux/if_arp.h>
-#include <linux/if_tr.h>
-#include <linux/trdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/if_vlan.h>
 #include <linux/ctype.h>
@@ -676,8 +674,6 @@ struct qeth_card_options {
         struct qeth_ipa_info adp; /*Adapter parameters*/
         struct qeth_routing_info route6;
         struct qeth_ipa_info ipa6;
-        int broadcast_mode;
-        int macaddr_mode;
         int fake_broadcast;
         int add_hhlen;
         int layer2;
@@ -711,7 +707,16 @@ struct qeth_discipline {
         qdio_handler_t *input_handler;
         qdio_handler_t *output_handler;
         int (*recover)(void *ptr);
-        struct ccwgroup_driver *ccwgdriver;
+        int (*setup) (struct ccwgroup_device *);
+        void (*remove) (struct ccwgroup_device *);
+        int (*set_online) (struct ccwgroup_device *);
+        int (*set_offline) (struct ccwgroup_device *);
+        void (*shutdown)(struct ccwgroup_device *);
+        int (*prepare) (struct ccwgroup_device *);
+        void (*complete) (struct ccwgroup_device *);
+        int (*freeze)(struct ccwgroup_device *);
+        int (*thaw) (struct ccwgroup_device *);
+        int (*restore)(struct ccwgroup_device *);
 };
 
 struct qeth_vlan_vid {
@@ -775,7 +780,7 @@ struct qeth_card {
         struct qeth_perf_stats perf_stats;
         int read_or_write_problem;
         struct qeth_osn_info osn_info;
-        struct qeth_discipline discipline;
+        struct qeth_discipline *discipline;
         atomic_t force_alloc_skb;
         struct service_level qeth_service_level;
         struct qdio_ssqd_desc ssqd;
@@ -841,16 +846,15 @@ static inline int qeth_is_diagass_supported(struct qeth_card *card,
         return card->info.diagass_support & (__u32)cmd;
 }
 
-extern struct ccwgroup_driver qeth_l2_ccwgroup_driver;
-extern struct ccwgroup_driver qeth_l3_ccwgroup_driver;
+extern struct qeth_discipline qeth_l2_discipline;
+extern struct qeth_discipline qeth_l3_discipline;
+extern const struct attribute_group *qeth_generic_attr_groups[];
+extern const struct attribute_group *qeth_osn_attr_groups[];
+
 const char *qeth_get_cardname_short(struct qeth_card *);
 int qeth_realloc_buffer_pool(struct qeth_card *, int);
 int qeth_core_load_discipline(struct qeth_card *, enum qeth_discipline_id);
 void qeth_core_free_discipline(struct qeth_card *);
-int qeth_core_create_device_attributes(struct device *);
-void qeth_core_remove_device_attributes(struct device *);
-int qeth_core_create_osn_attributes(struct device *);
-void qeth_core_remove_osn_attributes(struct device *);
 void qeth_buffer_reclaim_work(struct work_struct *);
 
 /* exports for qeth discipline device drivers */
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 120955c66410..e118e1e1e1c1 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -1329,8 +1329,6 @@ static void qeth_set_intial_options(struct qeth_card *card)
 {
         card->options.route4.type = NO_ROUTER;
         card->options.route6.type = NO_ROUTER;
-        card->options.broadcast_mode = QETH_TR_BROADCAST_ALLRINGS;
-        card->options.macaddr_mode = QETH_TR_MACADDR_NONCANONICAL;
         card->options.fake_broadcast = 0;
         card->options.add_hhlen = DEFAULT_ADD_HHLEN;
         card->options.performance_stats = 0;
@@ -1365,7 +1363,7 @@ static void qeth_start_kernel_thread(struct work_struct *work)
             card->write.state != CH_STATE_UP)
                 return;
         if (qeth_do_start_thread(card, QETH_RECOVER_THREAD)) {
-                ts = kthread_run(card->discipline.recover, (void *)card,
+                ts = kthread_run(card->discipline->recover, (void *)card,
                                 "qeth_recover");
                 if (IS_ERR(ts)) {
                         qeth_clear_thread_start_bit(card, QETH_RECOVER_THREAD);
@@ -1672,7 +1670,8 @@ static void qeth_configure_blkt_default(struct qeth_card *card, char *prcd)
 {
         QETH_DBF_TEXT(SETUP, 2, "cfgblkt");
 
-        if (prcd[74] == 0xF0 && prcd[75] == 0xF0 && prcd[76] == 0xF5) {
+        if (prcd[74] == 0xF0 && prcd[75] == 0xF0 &&
+            (prcd[76] == 0xF5 || prcd[76] == 0xF6)) {
                 card->info.blkt.time_total = 250;
                 card->info.blkt.inter_packet = 5;
                 card->info.blkt.inter_packet_jumbo = 15;
@@ -3338,7 +3337,7 @@ static void qeth_flush_buffers(struct qeth_qdio_out_q *queue, int index,
         if (rc) {
                 queue->card->stats.tx_errors += count;
                 /* ignore temporary SIGA errors without busy condition */
-                if (rc == QDIO_ERROR_SIGA_TARGET)
+                if (rc == -ENOBUFS)
                         return;
                 QETH_CARD_TEXT(queue->card, 2, "flushbuf");
                 QETH_CARD_TEXT_(queue->card, 2, " q%d", queue->queue_no);
@@ -3532,7 +3531,7 @@ void qeth_qdio_output_handler(struct ccw_device *ccwdev,
         int i;
 
         QETH_CARD_TEXT(card, 6, "qdouhdl");
-        if (qdio_error & QDIO_ERROR_ACTIVATE_CHECK_CONDITION) {
+        if (qdio_error & QDIO_ERROR_FATAL) {
                 QETH_CARD_TEXT(card, 2, "achkcond");
                 netif_stop_queue(card->dev);
                 qeth_schedule_recovery(card);
@@ -4540,7 +4539,8 @@ static void qeth_determine_capabilities(struct qeth_card *card)
                 goto out_offline;
         }
         qeth_configure_unitaddr(card, prcd);
-        qeth_configure_blkt_default(card, prcd);
+        if (ddev_offline)
+                qeth_configure_blkt_default(card, prcd);
         kfree(prcd);
 
         rc = qdio_get_ssqd_desc(ddev, &card->ssqd);
@@ -4627,7 +4627,7 @@ static int qeth_qdio_establish(struct qeth_card *card)
                 goto out_free_in_sbals;
         }
         for (i = 0; i < card->qdio.no_in_queues; ++i)
-                queue_start_poll[i] = card->discipline.start_poll;
+                queue_start_poll[i] = card->discipline->start_poll;
 
         qeth_qdio_establish_cq(card, in_sbal_ptrs, queue_start_poll);
 
@@ -4651,8 +4651,8 @@ static int qeth_qdio_establish(struct qeth_card *card)
         init_data.qib_param_field        = qib_param_field;
         init_data.no_input_qs            = card->qdio.no_in_queues;
         init_data.no_output_qs           = card->qdio.no_out_queues;
-        init_data.input_handler          = card->discipline.input_handler;
-        init_data.output_handler         = card->discipline.output_handler;
+        init_data.input_handler          = card->discipline->input_handler;
+        init_data.output_handler         = card->discipline->output_handler;
         init_data.queue_start_poll_array = queue_start_poll;
         init_data.int_parm               = (unsigned long) card;
         init_data.input_sbal_addr_array  = (void **) in_sbal_ptrs;
@@ -4737,13 +4737,6 @@ static struct ccw_driver qeth_ccw_driver = {
         .remove = ccwgroup_remove_ccwdev,
 };
 
-static int qeth_core_driver_group(const char *buf, struct device *root_dev,
-                                unsigned long driver_id)
-{
-        return ccwgroup_create_from_string(root_dev, driver_id,
-                                           &qeth_ccw_driver, 3, buf);
-}
-
 int qeth_core_hardsetup_card(struct qeth_card *card)
 {
         int retries = 0;
@@ -4909,11 +4902,7 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card,
                 break;
         case QETH_HEADER_TYPE_LAYER3:
                 skb_len = (*hdr)->hdr.l3.length;
-                if ((card->info.link_type == QETH_LINK_TYPE_LANE_TR) ||
-                    (card->info.link_type == QETH_LINK_TYPE_HSTR))
-                        headroom = TR_HLEN;
-                else
-                        headroom = ETH_HLEN;
+                headroom = ETH_HLEN;
                 break;
         case QETH_HEADER_TYPE_OSN:
                 skb_len = (*hdr)->hdr.osn.pdu_length;
@@ -5044,17 +5033,15 @@ int qeth_core_load_discipline(struct qeth_card *card,
         mutex_lock(&qeth_mod_mutex);
         switch (discipline) {
         case QETH_DISCIPLINE_LAYER3:
-                card->discipline.ccwgdriver = try_then_request_module(
-                        symbol_get(qeth_l3_ccwgroup_driver),
-                        "qeth_l3");
+                card->discipline = try_then_request_module(
+                        symbol_get(qeth_l3_discipline), "qeth_l3");
                 break;
         case QETH_DISCIPLINE_LAYER2:
-                card->discipline.ccwgdriver = try_then_request_module(
-                        symbol_get(qeth_l2_ccwgroup_driver),
-                        "qeth_l2");
+                card->discipline = try_then_request_module(
+                        symbol_get(qeth_l2_discipline), "qeth_l2");
                 break;
         }
-        if (!card->discipline.ccwgdriver) {
+        if (!card->discipline) {
                 dev_err(&card->gdev->dev, "There is no kernel module to "
                         "support discipline %d\n", discipline);
                 rc = -EINVAL;
@@ -5066,12 +5053,21 @@ int qeth_core_load_discipline(struct qeth_card *card,
 void qeth_core_free_discipline(struct qeth_card *card)
 {
         if (card->options.layer2)
-                symbol_put(qeth_l2_ccwgroup_driver);
+                symbol_put(qeth_l2_discipline);
         else
-                symbol_put(qeth_l3_ccwgroup_driver);
-        card->discipline.ccwgdriver = NULL;
+                symbol_put(qeth_l3_discipline);
+        card->discipline = NULL;
 }
 
+static const struct device_type qeth_generic_devtype = {
+        .name = "qeth_generic",
+        .groups = qeth_generic_attr_groups,
+};
+static const struct device_type qeth_osn_devtype = {
+        .name = "qeth_osn",
+        .groups = qeth_osn_attr_groups,
+};
+
 static int qeth_core_probe_device(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card;
@@ -5126,18 +5122,17 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)
         }
 
         if (card->info.type == QETH_CARD_TYPE_OSN)
-                rc = qeth_core_create_osn_attributes(dev);
+                gdev->dev.type = &qeth_osn_devtype;
         else
-                rc = qeth_core_create_device_attributes(dev);
-        if (rc)
-                goto err_dbf;
+                gdev->dev.type = &qeth_generic_devtype;
+
         switch (card->info.type) {
         case QETH_CARD_TYPE_OSN:
         case QETH_CARD_TYPE_OSM:
                 rc = qeth_core_load_discipline(card, QETH_DISCIPLINE_LAYER2);
                 if (rc)
-                        goto err_attr;
-                rc = card->discipline.ccwgdriver->probe(card->gdev);
+                        goto err_dbf;
+                rc = card->discipline->setup(card->gdev);
                 if (rc)
                         goto err_disc;
         case QETH_CARD_TYPE_OSD:
@@ -5155,11 +5150,6 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)
 
 err_disc:
         qeth_core_free_discipline(card);
-err_attr:
-        if (card->info.type == QETH_CARD_TYPE_OSN)
-                qeth_core_remove_osn_attributes(dev);
-        else
-                qeth_core_remove_device_attributes(dev);
 err_dbf:
         debug_unregister(card->debug);
 err_card:
@@ -5176,14 +5166,8 @@ static void qeth_core_remove_device(struct ccwgroup_device *gdev)
 
         QETH_DBF_TEXT(SETUP, 2, "removedv");
 
-        if (card->info.type == QETH_CARD_TYPE_OSN) {
-                qeth_core_remove_osn_attributes(&gdev->dev);
-        } else {
-                qeth_core_remove_device_attributes(&gdev->dev);
-        }
-
-        if (card->discipline.ccwgdriver) {
-                card->discipline.ccwgdriver->remove(gdev);
+        if (card->discipline) {
+                card->discipline->remove(gdev);
                 qeth_core_free_discipline(card);
         }
 
@@ -5203,7 +5187,7 @@ static int qeth_core_set_online(struct ccwgroup_device *gdev)
         int rc = 0;
         int def_discipline;
 
-        if (!card->discipline.ccwgdriver) {
+        if (!card->discipline) {
                 if (card->info.type == QETH_CARD_TYPE_IQD)
                         def_discipline = QETH_DISCIPLINE_LAYER3;
                 else
@@ -5211,11 +5195,11 @@ static int qeth_core_set_online(struct ccwgroup_device *gdev)
                 rc = qeth_core_load_discipline(card, def_discipline);
                 if (rc)
                         goto err;
-                rc = card->discipline.ccwgdriver->probe(card->gdev);
+                rc = card->discipline->setup(card->gdev);
                 if (rc)
                         goto err;
         }
-        rc = card->discipline.ccwgdriver->set_online(gdev);
+        rc = card->discipline->set_online(gdev);
 err:
         return rc;
 }
@@ -5223,58 +5207,52 @@ err:
 static int qeth_core_set_offline(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card = dev_get_drvdata(&gdev->dev);
-        return card->discipline.ccwgdriver->set_offline(gdev);
+        return card->discipline->set_offline(gdev);
 }
 
 static void qeth_core_shutdown(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card = dev_get_drvdata(&gdev->dev);
-        if (card->discipline.ccwgdriver &&
-            card->discipline.ccwgdriver->shutdown)
-                card->discipline.ccwgdriver->shutdown(gdev);
+        if (card->discipline && card->discipline->shutdown)
+                card->discipline->shutdown(gdev);
 }
 
 static int qeth_core_prepare(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card = dev_get_drvdata(&gdev->dev);
-        if (card->discipline.ccwgdriver &&
-            card->discipline.ccwgdriver->prepare)
-                return card->discipline.ccwgdriver->prepare(gdev);
+        if (card->discipline && card->discipline->prepare)
+                return card->discipline->prepare(gdev);
         return 0;
 }
 
 static void qeth_core_complete(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card = dev_get_drvdata(&gdev->dev);
-        if (card->discipline.ccwgdriver &&
-            card->discipline.ccwgdriver->complete)
-                card->discipline.ccwgdriver->complete(gdev);
+        if (card->discipline && card->discipline->complete)
+                card->discipline->complete(gdev);
 }
 
 static int qeth_core_freeze(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card = dev_get_drvdata(&gdev->dev);
-        if (card->discipline.ccwgdriver &&
-            card->discipline.ccwgdriver->freeze)
-                return card->discipline.ccwgdriver->freeze(gdev);
+        if (card->discipline && card->discipline->freeze)
+                return card->discipline->freeze(gdev);
         return 0;
 }
 
 static int qeth_core_thaw(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card = dev_get_drvdata(&gdev->dev);
-        if (card->discipline.ccwgdriver &&
-            card->discipline.ccwgdriver->thaw)
-                return card->discipline.ccwgdriver->thaw(gdev);
+        if (card->discipline && card->discipline->thaw)
+                return card->discipline->thaw(gdev);
         return 0;
 }
 
 static int qeth_core_restore(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card = dev_get_drvdata(&gdev->dev);
-        if (card->discipline.ccwgdriver &&
-            card->discipline.ccwgdriver->restore)
-                return card->discipline.ccwgdriver->restore(gdev);
+        if (card->discipline && card->discipline->restore)
+                return card->discipline->restore(gdev);
         return 0;
 }
 
@@ -5283,8 +5261,7 @@ static struct ccwgroup_driver qeth_core_ccwgroup_driver = {
                 .owner = THIS_MODULE,
                 .name = "qeth",
         },
-        .driver_id = 0xD8C5E3C8,
-        .probe = qeth_core_probe_device,
+        .setup = qeth_core_probe_device,
         .remove = qeth_core_remove_device,
         .set_online = qeth_core_set_online,
         .set_offline = qeth_core_set_offline,
@@ -5296,21 +5273,30 @@ static struct ccwgroup_driver qeth_core_ccwgroup_driver = {
         .restore = qeth_core_restore,
 };
 
-static ssize_t
-qeth_core_driver_group_store(struct device_driver *ddrv, const char *buf,
-                           size_t count)
+static ssize_t qeth_core_driver_group_store(struct device_driver *ddrv,
+                                            const char *buf, size_t count)
 {
         int err;
-        err = qeth_core_driver_group(buf, qeth_core_root_dev,
-                                        qeth_core_ccwgroup_driver.driver_id);
-        if (err)
-                return err;
-        else
-                return count;
-}
 
+        err = ccwgroup_create_dev(qeth_core_root_dev,
+                                  &qeth_core_ccwgroup_driver, 3, buf);
+
+        return err ? err : count;
+}
 static DRIVER_ATTR(group, 0200, NULL, qeth_core_driver_group_store);
 
+static struct attribute *qeth_drv_attrs[] = {
+        &driver_attr_group.attr,
+        NULL,
+};
+static struct attribute_group qeth_drv_attr_group = {
+        .attrs = qeth_drv_attrs,
+};
+static const struct attribute_group *qeth_drv_attr_groups[] = {
+        &qeth_drv_attr_group,
+        NULL,
+};
+
 static struct {
         const char str[ETH_GSTRING_LEN];
 } qeth_ethtool_stats_keys[] = {
@@ -5548,49 +5534,41 @@ static int __init qeth_core_init(void)
         rc = qeth_register_dbf_views();
         if (rc)
                 goto out_err;
-        rc = ccw_driver_register(&qeth_ccw_driver);
-        if (rc)
-                goto ccw_err;
-        rc = ccwgroup_driver_register(&qeth_core_ccwgroup_driver);
-        if (rc)
-                goto ccwgroup_err;
-        rc = driver_create_file(&qeth_core_ccwgroup_driver.driver,
-                                &driver_attr_group);
-        if (rc)
-                goto driver_err;
         qeth_core_root_dev = root_device_register("qeth");
         rc = IS_ERR(qeth_core_root_dev) ? PTR_ERR(qeth_core_root_dev) : 0;
         if (rc)
                 goto register_err;
-
         qeth_core_header_cache = kmem_cache_create("qeth_hdr",
                         sizeof(struct qeth_hdr) + ETH_HLEN, 64, 0, NULL);
         if (!qeth_core_header_cache) {
                 rc = -ENOMEM;
                 goto slab_err;
         }
-
         qeth_qdio_outbuf_cache = kmem_cache_create("qeth_buf",
                         sizeof(struct qeth_qdio_out_buffer), 0, 0, NULL);
         if (!qeth_qdio_outbuf_cache) {
                 rc = -ENOMEM;
                 goto cqslab_err;
         }
+        rc = ccw_driver_register(&qeth_ccw_driver);
+        if (rc)
+                goto ccw_err;
+        qeth_core_ccwgroup_driver.driver.groups = qeth_drv_attr_groups;
+        rc = ccwgroup_driver_register(&qeth_core_ccwgroup_driver);
+        if (rc)
+                goto ccwgroup_err;
 
         return 0;
+
+ccwgroup_err:
+        ccw_driver_unregister(&qeth_ccw_driver);
+ccw_err:
+        kmem_cache_destroy(qeth_qdio_outbuf_cache);
 cqslab_err:
         kmem_cache_destroy(qeth_core_header_cache);
 slab_err:
         root_device_unregister(qeth_core_root_dev);
 register_err:
-        driver_remove_file(&qeth_core_ccwgroup_driver.driver,
-                           &driver_attr_group);
-driver_err:
-        ccwgroup_driver_unregister(&qeth_core_ccwgroup_driver);
-ccwgroup_err:
-        ccw_driver_unregister(&qeth_ccw_driver);
-ccw_err:
-        QETH_DBF_MESSAGE(2, "Initialization failed with code %d\n", rc);
         qeth_unregister_dbf_views();
 out_err:
         pr_err("Initializing the qeth device driver failed\n");
@@ -5599,13 +5577,11 @@ out_err:
 
 static void __exit qeth_core_exit(void)
 {
-        root_device_unregister(qeth_core_root_dev);
-        driver_remove_file(&qeth_core_ccwgroup_driver.driver,
-                           &driver_attr_group);
         ccwgroup_driver_unregister(&qeth_core_ccwgroup_driver);
         ccw_driver_unregister(&qeth_ccw_driver);
         kmem_cache_destroy(qeth_qdio_outbuf_cache);
         kmem_cache_destroy(qeth_core_header_cache);
+        root_device_unregister(qeth_core_root_dev);
         qeth_unregister_dbf_views();
         pr_info("core functions removed\n");
 }
diff --git a/drivers/s390/net/qeth_core_mpc.h b/drivers/s390/net/qeth_core_mpc.h
index ff41e42004ac..a11b30c38423 100644
--- a/drivers/s390/net/qeth_core_mpc.h
+++ b/drivers/s390/net/qeth_core_mpc.h
@@ -70,16 +70,6 @@ enum qeth_link_types {
         QETH_LINK_TYPE_ATM_NATIVE   = 0x90,
 };
 
-enum qeth_tr_macaddr_modes {
-        QETH_TR_MACADDR_NONCANONICAL = 0,
-        QETH_TR_MACADDR_CANONICAL    = 1,
-};
-
-enum qeth_tr_broadcast_modes {
-        QETH_TR_BROADCAST_ALLRINGS = 0,
-        QETH_TR_BROADCAST_LOCAL    = 1,
-};
-
 /*
  * Routing stuff
  */
diff --git a/drivers/s390/net/qeth_core_sys.c b/drivers/s390/net/qeth_core_sys.c
index 0a8e86c1b0ea..f163af575c48 100644
--- a/drivers/s390/net/qeth_core_sys.c
+++ b/drivers/s390/net/qeth_core_sys.c
@@ -434,8 +434,8 @@ static ssize_t qeth_dev_layer2_store(struct device *dev,
                 goto out;
         else {
                 card->info.mac_bits  = 0;
-                if (card->discipline.ccwgdriver) {
-                        card->discipline.ccwgdriver->remove(card->gdev);
+                if (card->discipline) {
+                        card->discipline->remove(card->gdev);
                         qeth_core_free_discipline(card);
                 }
         }
@@ -444,7 +444,7 @@ static ssize_t qeth_dev_layer2_store(struct device *dev,
         if (rc)
                 goto out;
 
-        rc = card->discipline.ccwgdriver->probe(card->gdev);
+        rc = card->discipline->setup(card->gdev);
 out:
         mutex_unlock(&card->discipline_mutex);
         return rc ? rc : count;
@@ -693,7 +693,6 @@ static struct attribute *qeth_blkt_device_attrs[] = {
         &dev_attr_inter_jumbo.attr,
         NULL,
 };
-
 static struct attribute_group qeth_device_blkt_group = {
         .name = "blkt",
         .attrs = qeth_blkt_device_attrs,
@@ -716,11 +715,16 @@ static struct attribute *qeth_device_attrs[] = {
         &dev_attr_hw_trap.attr,
         NULL,
 };
-
 static struct attribute_group qeth_device_attr_group = {
         .attrs = qeth_device_attrs,
 };
 
+const struct attribute_group *qeth_generic_attr_groups[] = {
+        &qeth_device_attr_group,
+        &qeth_device_blkt_group,
+        NULL,
+};
+
 static struct attribute *qeth_osn_device_attrs[] = {
         &dev_attr_state.attr,
         &dev_attr_chpid.attr,
@@ -730,37 +734,10 @@ static struct attribute *qeth_osn_device_attrs[] = {
         &dev_attr_recover.attr,
         NULL,
 };
-
 static struct attribute_group qeth_osn_device_attr_group = {
         .attrs = qeth_osn_device_attrs,
 };
-
-int qeth_core_create_device_attributes(struct device *dev)
-{
-        int ret;
-        ret = sysfs_create_group(&dev->kobj, &qeth_device_attr_group);
-        if (ret)
-                return ret;
-        ret = sysfs_create_group(&dev->kobj, &qeth_device_blkt_group);
-        if (ret)
-                sysfs_remove_group(&dev->kobj, &qeth_device_attr_group);
-
-        return 0;
-}
-
-void qeth_core_remove_device_attributes(struct device *dev)
-{
-        sysfs_remove_group(&dev->kobj, &qeth_device_attr_group);
-        sysfs_remove_group(&dev->kobj, &qeth_device_blkt_group);
-}
-
-int qeth_core_create_osn_attributes(struct device *dev)
-{
-        return sysfs_create_group(&dev->kobj, &qeth_osn_device_attr_group);
-}
-
-void qeth_core_remove_osn_attributes(struct device *dev)
-{
-        sysfs_remove_group(&dev->kobj, &qeth_osn_device_attr_group);
-        return;
-}
+const struct attribute_group *qeth_osn_attr_groups[] = {
+        &qeth_osn_device_attr_group,
+        NULL,
+};
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 0e7c29d1d7ef..426986518e96 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -882,12 +882,6 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev)
         INIT_LIST_HEAD(&card->mc_list);
         card->options.layer2 = 1;
         card->info.hwtrap = 0;
-        card->discipline.start_poll = qeth_qdio_start_poll;
-        card->discipline.input_handler = (qdio_handler_t *)
-                qeth_qdio_input_handler;
-        card->discipline.output_handler = (qdio_handler_t *)
-                qeth_qdio_output_handler;
-        card->discipline.recover = qeth_l2_recover;
         return 0;
 }
 
@@ -1227,8 +1221,12 @@ out:
         return rc;
 }
 
-struct ccwgroup_driver qeth_l2_ccwgroup_driver = {
-        .probe = qeth_l2_probe_device,
+struct qeth_discipline qeth_l2_discipline = {
+        .start_poll = qeth_qdio_start_poll,
+        .input_handler = (qdio_handler_t *) qeth_qdio_input_handler,
+        .output_handler = (qdio_handler_t *) qeth_qdio_output_handler,
+        .recover = qeth_l2_recover,
+        .setup = qeth_l2_probe_device,
         .remove = qeth_l2_remove_device,
         .set_online = qeth_l2_set_online,
         .set_offline = qeth_l2_set_offline,
@@ -1237,7 +1235,7 @@ struct ccwgroup_driver qeth_l2_ccwgroup_driver = {
         .thaw = qeth_l2_pm_resume,
         .restore = qeth_l2_pm_resume,
 };
-EXPORT_SYMBOL_GPL(qeth_l2_ccwgroup_driver);
+EXPORT_SYMBOL_GPL(qeth_l2_discipline);
 
 static int qeth_osn_send_control_data(struct qeth_card *card, int len,
                            struct qeth_cmd_buffer *iob)
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index f85921607686..7be5e9775691 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -976,57 +976,6 @@ static inline u8 qeth_l3_get_qeth_hdr_flags6(int cast_type)
         return ct | QETH_CAST_UNICAST;
 }
 
-static int qeth_l3_send_setadp_mode(struct qeth_card *card, __u32 command,
-                                        __u32 mode)
-{
-        int rc;
-        struct qeth_cmd_buffer *iob;
-        struct qeth_ipa_cmd *cmd;
-
-        QETH_CARD_TEXT(card, 4, "adpmode");
-
-        iob = qeth_get_adapter_cmd(card, command,
-                                   sizeof(struct qeth_ipacmd_setadpparms));
-        cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
-        cmd->data.setadapterparms.data.mode = mode;
-        rc = qeth_send_ipa_cmd(card, iob, qeth_default_setadapterparms_cb,
-                               NULL);
-        return rc;
-}
-
-static int qeth_l3_setadapter_hstr(struct qeth_card *card)
-{
-        int rc;
-
-        QETH_CARD_TEXT(card, 4, "adphstr");
-
-        if (qeth_adp_supported(card, IPA_SETADP_SET_BROADCAST_MODE)) {
-                rc = qeth_l3_send_setadp_mode(card,
-                                        IPA_SETADP_SET_BROADCAST_MODE,
-                                        card->options.broadcast_mode);
-                if (rc)
-                        QETH_DBF_MESSAGE(2, "couldn't set broadcast mode on "
-                                   "device %s: x%x\n",
-                                   CARD_BUS_ID(card), rc);
-                rc = qeth_l3_send_setadp_mode(card,
-                                        IPA_SETADP_ALTER_MAC_ADDRESS,
-                                        card->options.macaddr_mode);
-                if (rc)
-                        QETH_DBF_MESSAGE(2, "couldn't set macaddr mode on "
-                                   "device %s: x%x\n", CARD_BUS_ID(card), rc);
-                return rc;
-        }
-        if (card->options.broadcast_mode == QETH_TR_BROADCAST_LOCAL)
-                QETH_DBF_MESSAGE(2, "set adapter parameters not available "
-                           "to set broadcast mode, using ALLRINGS "
-                           "on device %s:\n", CARD_BUS_ID(card));
-        if (card->options.macaddr_mode == QETH_TR_MACADDR_CANONICAL)
-                QETH_DBF_MESSAGE(2, "set adapter parameters not available "
-                           "to set macaddr mode, using NONCANONICAL "
-                           "on device %s:\n", CARD_BUS_ID(card));
-        return 0;
-}
-
 static int qeth_l3_setadapter_parms(struct qeth_card *card)
 {
         int rc;
@@ -1052,10 +1001,6 @@ static int qeth_l3_setadapter_parms(struct qeth_card *card)
                                 " address failed\n");
         }
 
-        if ((card->info.link_type == QETH_LINK_TYPE_HSTR) ||
-            (card->info.link_type == QETH_LINK_TYPE_LANE_TR))
-                rc = qeth_l3_setadapter_hstr(card);
-
         return rc;
 }
 
@@ -1671,10 +1616,7 @@ qeth_diags_trace(struct qeth_card *card, enum qeth_diags_trace_cmds diags_cmd)
 static void qeth_l3_get_mac_for_ipm(__u32 ipm, char *mac,
                                 struct net_device *dev)
 {
-        if (dev->type == ARPHRD_IEEE802_TR)
-                ip_tr_mc_map(ipm, mac);
-        else
-                ip_eth_mc_map(ipm, mac);
+        ip_eth_mc_map(ipm, mac);
 }
 
 static void qeth_l3_add_mc(struct qeth_card *card, struct in_device *in4_dev)
@@ -1922,8 +1864,6 @@ static inline int qeth_l3_rebuild_skb(struct qeth_card *card,
 #endif
                         case __constant_htons(ETH_P_IP):
                                 ip_hdr = (struct iphdr *)skb->data;
-                                (card->dev->type == ARPHRD_IEEE802_TR) ?
-                                ip_tr_mc_map(ip_hdr->daddr, tg_addr):
                                 ip_eth_mc_map(ip_hdr->daddr, tg_addr);
                                 break;
                         default:
@@ -1959,12 +1899,7 @@ static inline int qeth_l3_rebuild_skb(struct qeth_card *card,
                                 tg_addr, "FAKELL", card->dev->addr_len);
         }
 
-#ifdef CONFIG_TR
-        if (card->dev->type == ARPHRD_IEEE802_TR)
-                skb->protocol = tr_type_trans(skb, card->dev);
-        else
-#endif
-                skb->protocol = eth_type_trans(skb, card->dev);
+        skb->protocol = eth_type_trans(skb, card->dev);
 
         if (hdr->hdr.l3.ext_flags &
             (QETH_HDR_EXT_VLAN_FRAME | QETH_HDR_EXT_INCLUDE_VLAN_TAG)) {
@@ -2138,7 +2073,7 @@ static int qeth_l3_verify_vlan_dev(struct net_device *dev,
                 struct net_device *netdev;
 
                 rcu_read_lock();
-                netdev = __vlan_find_dev_deep(dev, vid);
+                netdev = __vlan_find_dev_deep(card->dev, vid);
                 rcu_read_unlock();
                 if (netdev == dev) {
                         rc = QETH_VLAN_CARD;
@@ -2883,13 +2818,7 @@ static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
                         hdr->hdr.l3.flags &= ~QETH_HDR_PASSTHRU;
                 memcpy(hdr->hdr.l3.dest_addr, pkey, 16);
         } else {
-                /* passthrough */
-                if ((skb->dev->type == ARPHRD_IEEE802_TR) &&
-                        !memcmp(skb->data + sizeof(struct qeth_hdr) +
-                        sizeof(__u16), skb->dev->broadcast, 6)) {
-                        hdr->hdr.l3.flags = QETH_CAST_BROADCAST |
-                                                QETH_HDR_PASSTHRU;
-                } else if (!memcmp(skb->data + sizeof(struct qeth_hdr),
+                if (!memcmp(skb->data + sizeof(struct qeth_hdr),
                             skb->dev->broadcast, 6)) {
                         /* broadcast? */
                         hdr->hdr.l3.flags = QETH_CAST_BROADCAST |
@@ -3031,10 +2960,7 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         skb_pull(new_skb, ETH_HLEN);
         } else {
                 if (ipv == 4) {
-                        if (card->dev->type == ARPHRD_IEEE802_TR)
-                                skb_pull(new_skb, TR_HLEN);
-                        else
-                                skb_pull(new_skb, ETH_HLEN);
+                        skb_pull(new_skb, ETH_HLEN);
                 }
 
                 if (ipv != 4 && vlan_tx_tag_present(new_skb)) {
@@ -3318,12 +3244,8 @@ static int qeth_l3_setup_netdev(struct qeth_card *card)
             card->info.type == QETH_CARD_TYPE_OSX) {
                 if ((card->info.link_type == QETH_LINK_TYPE_LANE_TR) ||
                     (card->info.link_type == QETH_LINK_TYPE_HSTR)) {
-#ifdef CONFIG_TR
-                        card->dev = alloc_trdev(0);
-#endif
-                        if (!card->dev)
-                                return -ENODEV;
-                        card->dev->netdev_ops = &qeth_l3_netdev_ops;
+                        pr_info("qeth_l3: ignoring TR device\n");
+                        return -ENODEV;
                 } else {
                         card->dev = alloc_etherdev(0);
                         if (!card->dev)
@@ -3376,12 +3298,6 @@ static int qeth_l3_probe_device(struct ccwgroup_device *gdev)
         qeth_l3_create_device_attributes(&gdev->dev);
         card->options.layer2 = 0;
         card->info.hwtrap = 0;
-        card->discipline.start_poll = qeth_qdio_start_poll;
-        card->discipline.input_handler = (qdio_handler_t *)
-                qeth_qdio_input_handler;
-        card->discipline.output_handler = (qdio_handler_t *)
-                qeth_qdio_output_handler;
-        card->discipline.recover = qeth_l3_recover;
         return 0;
 }
 
@@ -3656,8 +3572,12 @@ out:
         return rc;
 }
 
-struct ccwgroup_driver qeth_l3_ccwgroup_driver = {
-        .probe = qeth_l3_probe_device,
+struct qeth_discipline qeth_l3_discipline = {
+        .start_poll = qeth_qdio_start_poll,
+        .input_handler = (qdio_handler_t *) qeth_qdio_input_handler,
+        .output_handler = (qdio_handler_t *) qeth_qdio_output_handler,
+        .recover = qeth_l3_recover,
+        .setup = qeth_l3_probe_device,
         .remove = qeth_l3_remove_device,
         .set_online = qeth_l3_set_online,
         .set_offline = qeth_l3_set_offline,
@@ -3666,7 +3586,7 @@ struct ccwgroup_driver qeth_l3_ccwgroup_driver = {
         .thaw = qeth_l3_pm_resume,
         .restore = qeth_l3_pm_resume,
 };
-EXPORT_SYMBOL_GPL(qeth_l3_ccwgroup_driver);
+EXPORT_SYMBOL_GPL(qeth_l3_discipline);
 
 static int qeth_l3_ip_event(struct notifier_block *this,
                             unsigned long event, void *ptr)
@@ -3680,9 +3600,9 @@ static int qeth_l3_ip_event(struct notifier_block *this,
                 return NOTIFY_DONE;
 
         card = qeth_l3_get_card_from_dev(dev);
-        QETH_CARD_TEXT(card, 3, "ipevent");
         if (!card)
                 return NOTIFY_DONE;
+        QETH_CARD_TEXT(card, 3, "ipevent");
 
         addr = qeth_l3_get_addr_buffer(QETH_PROT_IPV4);
         if (addr != NULL) {
diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
index d979bb26522f..4cafedf950ad 100644
--- a/drivers/s390/net/qeth_l3_sys.c
+++ b/drivers/s390/net/qeth_l3_sys.c
@@ -175,116 +175,6 @@ out:
 static DEVICE_ATTR(fake_broadcast, 0644, qeth_l3_dev_fake_broadcast_show,
                    qeth_l3_dev_fake_broadcast_store);
 
-static ssize_t qeth_l3_dev_broadcast_mode_show(struct device *dev,
-                                struct device_attribute *attr, char *buf)
-{
-        struct qeth_card *card = dev_get_drvdata(dev);
-
-        if (!card)
-                return -EINVAL;
-
-        if (!((card->info.link_type == QETH_LINK_TYPE_HSTR) ||
-              (card->info.link_type == QETH_LINK_TYPE_LANE_TR)))
-                return sprintf(buf, "n/a\n");
-
-        return sprintf(buf, "%s\n", (card->options.broadcast_mode ==
-                                     QETH_TR_BROADCAST_ALLRINGS)?
-                       "all rings":"local");
-}
-
-static ssize_t qeth_l3_dev_broadcast_mode_store(struct device *dev,
-                struct device_attribute *attr, const char *buf, size_t count)
-{
-        struct qeth_card *card = dev_get_drvdata(dev);
-        char *tmp;
-        int rc = 0;
-
-        if (!card)
-                return -EINVAL;
-
-        mutex_lock(&card->conf_mutex);
-        if ((card->state != CARD_STATE_DOWN) &&
-            (card->state != CARD_STATE_RECOVER)) {
-                rc = -EPERM;
-                goto out;
-        }
-
-        if (!((card->info.link_type == QETH_LINK_TYPE_HSTR) ||
-              (card->info.link_type == QETH_LINK_TYPE_LANE_TR))) {
-                rc = -EINVAL;
-                goto out;
-        }
-
-        tmp = strsep((char **) &buf, "\n");
-
-        if (!strcmp(tmp, "local"))
-                card->options.broadcast_mode = QETH_TR_BROADCAST_LOCAL;
-        else if (!strcmp(tmp, "all_rings"))
-                card->options.broadcast_mode = QETH_TR_BROADCAST_ALLRINGS;
-        else
-                rc = -EINVAL;
-out:
-        mutex_unlock(&card->conf_mutex);
-        return rc ? rc : count;
-}
-
-static DEVICE_ATTR(broadcast_mode, 0644, qeth_l3_dev_broadcast_mode_show,
-                   qeth_l3_dev_broadcast_mode_store);
-
-static ssize_t qeth_l3_dev_canonical_macaddr_show(struct device *dev,
-                                struct device_attribute *attr, char *buf)
-{
-        struct qeth_card *card = dev_get_drvdata(dev);
-
-        if (!card)
-                return -EINVAL;
-
-        if (!((card->info.link_type == QETH_LINK_TYPE_HSTR) ||
-              (card->info.link_type == QETH_LINK_TYPE_LANE_TR)))
-                return sprintf(buf, "n/a\n");
-
-        return sprintf(buf, "%i\n", (card->options.macaddr_mode ==
-                                     QETH_TR_MACADDR_CANONICAL)? 1:0);
-}
-
-static ssize_t qeth_l3_dev_canonical_macaddr_store(struct device *dev,
-                struct device_attribute *attr, const char *buf, size_t count)
-{
-        struct qeth_card *card = dev_get_drvdata(dev);
-        char *tmp;
-        int i, rc = 0;
-
-        if (!card)
-                return -EINVAL;
-
-        mutex_lock(&card->conf_mutex);
-        if ((card->state != CARD_STATE_DOWN) &&
-            (card->state != CARD_STATE_RECOVER)) {
-                rc = -EPERM;
-                goto out;
-        }
-
-        if (!((card->info.link_type == QETH_LINK_TYPE_HSTR) ||
-              (card->info.link_type == QETH_LINK_TYPE_LANE_TR))) {
-                rc = -EINVAL;
-                goto out;
-        }
-
-        i = simple_strtoul(buf, &tmp, 16);
-        if ((i == 0) || (i == 1))
-                card->options.macaddr_mode = i?
-                        QETH_TR_MACADDR_CANONICAL :
-                        QETH_TR_MACADDR_NONCANONICAL;
-        else
-                rc = -EINVAL;
-out:
-        mutex_unlock(&card->conf_mutex);
-        return rc ? rc : count;
-}
-
-static DEVICE_ATTR(canonical_macaddr, 0644, qeth_l3_dev_canonical_macaddr_show,
-                   qeth_l3_dev_canonical_macaddr_store);
-
 static ssize_t qeth_l3_dev_sniffer_show(struct device *dev,
                 struct device_attribute *attr, char *buf)
 {
@@ -458,8 +348,6 @@ static struct attribute *qeth_l3_device_attrs[] = {
         &dev_attr_route4.attr,
         &dev_attr_route6.attr,
         &dev_attr_fake_broadcast.attr,
-        &dev_attr_broadcast_mode.attr,
-        &dev_attr_canonical_macaddr.attr,
         &dev_attr_sniffer.attr,
         &dev_attr_hsuid.attr,
         NULL,
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index 04a154f87e3e..df740cbbaef4 100644
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -572,7 +572,7 @@ static void falcon_get_lock(void)
 }
 
 
-int __init atari_scsi_detect(struct scsi_host_template *host)
+static int __init atari_scsi_detect(struct scsi_host_template *host)
 {
         static int called = 0;
         struct Scsi_Host *instance;
@@ -724,7 +724,7 @@ int __init atari_scsi_detect(struct scsi_host_template *host)
         return 1;
 }
 
-int atari_scsi_release(struct Scsi_Host *sh)
+static int atari_scsi_release(struct Scsi_Host *sh)
 {
         if (IS_A_TT())
                 free_irq(IRQ_TT_MFP_SCSI, sh);
@@ -734,17 +734,21 @@ int atari_scsi_release(struct Scsi_Host *sh)
         return 1;
 }
 
-void __init atari_scsi_setup(char *str, int *ints)
+#ifndef MODULE
+static int __init atari_scsi_setup(char *str)
 {
         /* Format of atascsi parameter is:
          *   atascsi=<can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags>
          * Defaults depend on TT or Falcon, hostid determined at run time.
          * Negative values mean don't change.
          */
+        int ints[6];
+
+        get_options(str, ARRAY_SIZE(ints), ints);
 
         if (ints[0] < 1) {
                 printk("atari_scsi_setup: no arguments!\n");
-                return;
+                return 0;
         }
 
         if (ints[0] >= 1) {
@@ -777,9 +781,14 @@ void __init atari_scsi_setup(char *str, int *ints)
                         setup_use_tagged_queuing = !!ints[5];
         }
 #endif
+
+        return 1;
 }
 
-int atari_scsi_bus_reset(Scsi_Cmnd *cmd)
+__setup("atascsi=", atari_scsi_setup);
+#endif /* !MODULE */
+
+static int atari_scsi_bus_reset(Scsi_Cmnd *cmd)
 {
         int rv;
         struct NCR5380_hostdata *hostdata =
@@ -852,7 +861,7 @@ static void __init atari_scsi_reset_boot(void)
 #endif
 
 
-const char *atari_scsi_info(struct Scsi_Host *host)
+static const char *atari_scsi_info(struct Scsi_Host *host)
 {
         /* atari_scsi_detect() is verbose enough... */
         static const char string[] = "Atari native SCSI";
@@ -862,8 +871,9 @@ const char *atari_scsi_info(struct Scsi_Host *host)
 
 #if defined(REAL_DMA)
 
-unsigned long atari_scsi_dma_setup(struct Scsi_Host *instance, void *data,
-                                   unsigned long count, int dir)
+static unsigned long atari_scsi_dma_setup(struct Scsi_Host *instance,
+                                          void *data, unsigned long count,
+                                          int dir)
 {
         unsigned long addr = virt_to_phys(data);
 
diff --git a/drivers/scsi/atari_scsi.h b/drivers/scsi/atari_scsi.h
index efadb8d567c2..bd52df78b209 100644
--- a/drivers/scsi/atari_scsi.h
+++ b/drivers/scsi/atari_scsi.h
@@ -18,11 +18,6 @@
 /* (I_HAVE_OVERRUNS stuff removed) */
 
 #ifndef ASM
-int atari_scsi_detect (struct scsi_host_template *);
-const char *atari_scsi_info (struct Scsi_Host *);
-int atari_scsi_reset (Scsi_Cmnd *, unsigned int);
-int atari_scsi_release (struct Scsi_Host *);
-
 /* The values for CMD_PER_LUN and CAN_QUEUE are somehow arbitrary. Higher
  * values should work, too; try it! (but cmd_per_lun costs memory!) */
 
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 351dc0b86fab..a3a056a9db67 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -218,6 +218,9 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev,
 
         if (!shost->shost_gendev.parent)
                 shost->shost_gendev.parent = dev ? dev : &platform_bus;
+        if (!dma_dev)
+                dma_dev = shost->shost_gendev.parent;
+
         shost->dma_dev = dma_dev;
 
         error = device_add(&shost->shost_gendev);
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index e002cd466e9a..467dc38246f9 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -4549,8 +4549,12 @@ static int ipr_ata_slave_alloc(struct scsi_device *sdev)
         ENTER;
         if (sdev->sdev_target)
                 sata_port = sdev->sdev_target->hostdata;
-        if (sata_port)
+        if (sata_port) {
                 rc = ata_sas_port_init(sata_port->ap);
+                if (rc == 0)
+                        rc = ata_sas_sync_probe(sata_port->ap);
+        }
+
         if (rc)
                 ipr_slave_destroy(sdev);
 
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 453a740fa68e..922086105b4b 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -662,7 +662,7 @@ iscsi_sw_tcp_conn_bind(struct iscsi_cls_session *cls_session,
 
         /* setup Socket parameters */
         sk = sock->sk;
-        sk->sk_reuse = 1;
+        sk->sk_reuse = SK_CAN_REUSE;
         sk->sk_sndtimeo = 15 * HZ; /* FIXME: make it configurable */
         sk->sk_allocation = GFP_ATOMIC;
 
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index ef9560dff295..cc83b66d45b7 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -1742,17 +1742,19 @@ void fc_lport_flogi_resp(struct fc_seq *sp, struct fc_frame *fp,
 
         mfs = ntohs(flp->fl_csp.sp_bb_data) &
                 FC_SP_BB_DATA_MASK;
-        if (mfs >= FC_SP_MIN_MAX_PAYLOAD &&
-            mfs <= lport->mfs) {
-                lport->mfs = mfs;
-                fc_host_maxframe_size(lport->host) = mfs;
-        } else {
+
+        if (mfs < FC_SP_MIN_MAX_PAYLOAD || mfs > FC_SP_MAX_MAX_PAYLOAD) {
                 FC_LPORT_DBG(lport, "FLOGI bad mfs:%hu response, "
                              "lport->mfs:%hu\n", mfs, lport->mfs);
                 fc_lport_error(lport, fp);
                 goto err;
         }
 
+        if (mfs <= lport->mfs) {
+                lport->mfs = mfs;
+                fc_host_maxframe_size(lport->host) = mfs;
+        }
+
         csp_flags = ntohs(flp->fl_csp.sp_features);
         r_a_tov = ntohl(flp->fl_csp.sp_r_a_tov);
         e_d_tov = ntohl(flp->fl_csp.sp_e_d_tov);
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index bc0cecc6ad62..441d88ad99a7 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -546,11 +546,12 @@ static struct ata_port_info sata_port_info = {
         .port_ops = &sas_sata_ops
 };
 
-int sas_ata_init_host_and_port(struct domain_device *found_dev)
+int sas_ata_init(struct domain_device *found_dev)
 {
         struct sas_ha_struct *ha = found_dev->port->ha;
         struct Scsi_Host *shost = ha->core.shost;
         struct ata_port *ap;
+        int rc;
 
         ata_host_init(&found_dev->sata_dev.ata_host,
                       ha->dev,
@@ -567,8 +568,11 @@ int sas_ata_init_host_and_port(struct domain_device *found_dev)
         ap->private_data = found_dev;
         ap->cbl = ATA_CBL_SATA;
         ap->scsi_host = shost;
-        /* publish initialized ata port */
-        smp_wmb();
+        rc = ata_sas_port_init(ap);
+        if (rc) {
+                ata_sas_port_destroy(ap);
+                return rc;
+        }
         found_dev->sata_dev.ap = ap;
 
         return 0;
@@ -648,18 +652,13 @@ static void sas_get_ata_command_set(struct domain_device *dev)
 void sas_probe_sata(struct asd_sas_port *port)
 {
         struct domain_device *dev, *n;
-        int err;
 
         mutex_lock(&port->ha->disco_mutex);
-        list_for_each_entry_safe(dev, n, &port->disco_list, disco_list_node) {
+        list_for_each_entry(dev, &port->disco_list, disco_list_node) {
                 if (!dev_is_sata(dev))
                         continue;
 
-                err = sas_ata_init_host_and_port(dev);
-                if (err)
-                        sas_fail_probe(dev, __func__, err);
-                else
-                        ata_sas_async_port_init(dev->sata_dev.ap);
+                ata_sas_async_probe(dev->sata_dev.ap);
         }
         mutex_unlock(&port->ha->disco_mutex);
 
@@ -718,18 +717,6 @@ static void async_sas_ata_eh(void *data, async_cookie_t cookie)
         sas_put_device(dev);
 }
 
-static bool sas_ata_dev_eh_valid(struct domain_device *dev)
-{
-        struct ata_port *ap;
-
-        if (!dev_is_sata(dev))
-                return false;
-        ap = dev->sata_dev.ap;
-        /* consume fully initialized ata ports */
-        smp_rmb();
-        return !!ap;
-}
-
 void sas_ata_strategy_handler(struct Scsi_Host *shost)
 {
         struct sas_ha_struct *sas_ha = SHOST_TO_SAS_HA(shost);
@@ -753,7 +740,7 @@ void sas_ata_strategy_handler(struct Scsi_Host *shost)
 
                 spin_lock(&port->dev_list_lock);
                 list_for_each_entry(dev, &port->dev_list, dev_list_node) {
-                        if (!sas_ata_dev_eh_valid(dev))
+                        if (!dev_is_sata(dev))
                                 continue;
                         async_schedule_domain(async_sas_ata_eh, dev, &async);
                 }
diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index 364679675602..629a0865b130 100644
--- a/drivers/scsi/libsas/sas_discover.c
+++ b/drivers/scsi/libsas/sas_discover.c
@@ -72,6 +72,7 @@ static int sas_get_port_device(struct asd_sas_port *port)
         struct asd_sas_phy *phy;
         struct sas_rphy *rphy;
         struct domain_device *dev;
+        int rc = -ENODEV;
 
         dev = sas_alloc_device();
         if (!dev)
@@ -110,9 +111,16 @@ static int sas_get_port_device(struct asd_sas_port *port)
 
         sas_init_dev(dev);
 
+        dev->port = port;
         switch (dev->dev_type) {
-        case SAS_END_DEV:
         case SATA_DEV:
+                rc = sas_ata_init(dev);
+                if (rc) {
+                        rphy = NULL;
+                        break;
+                }
+                /* fall through */
+        case SAS_END_DEV:
                 rphy = sas_end_device_alloc(port->port);
                 break;
         case EDGE_DEV:
@@ -131,19 +139,14 @@ static int sas_get_port_device(struct asd_sas_port *port)
 
         if (!rphy) {
                 sas_put_device(dev);
-                return -ENODEV;
+                return rc;
         }
 
-        spin_lock_irq(&port->phy_list_lock);
-        list_for_each_entry(phy, &port->phy_list, port_phy_el)
-                sas_phy_set_target(phy, dev);
-        spin_unlock_irq(&port->phy_list_lock);
         rphy->identify.phy_identifier = phy->phy->identify.phy_identifier;
         memcpy(dev->sas_addr, port->attached_sas_addr, SAS_ADDR_SIZE);
         sas_fill_in_rphy(dev, rphy);
         sas_hash_addr(dev->hashed_sas_addr, dev->sas_addr);
         port->port_dev = dev;
-        dev->port = port;
         dev->linkrate = port->linkrate;
         dev->min_linkrate = port->linkrate;
         dev->max_linkrate = port->linkrate;
@@ -155,6 +158,7 @@ static int sas_get_port_device(struct asd_sas_port *port)
         sas_device_set_phy(dev, port->port);
 
         dev->rphy = rphy;
+        get_device(&dev->rphy->dev);
 
         if (dev_is_sata(dev) || dev->dev_type == SAS_END_DEV)
                 list_add_tail(&dev->disco_list_node, &port->disco_list);
@@ -164,6 +168,11 @@ static int sas_get_port_device(struct asd_sas_port *port)
                 spin_unlock_irq(&port->dev_list_lock);
         }
 
+        spin_lock_irq(&port->phy_list_lock);
+        list_for_each_entry(phy, &port->phy_list, port_phy_el)
+                sas_phy_set_target(phy, dev);
+        spin_unlock_irq(&port->phy_list_lock);
+
         return 0;
 }
 
@@ -205,8 +214,7 @@ void sas_notify_lldd_dev_gone(struct domain_device *dev)
 static void sas_probe_devices(struct work_struct *work)
 {
         struct domain_device *dev, *n;
-        struct sas_discovery_event *ev =
-                container_of(work, struct sas_discovery_event, work);
+        struct sas_discovery_event *ev = to_sas_discovery_event(work);
         struct asd_sas_port *port = ev->port;
 
         clear_bit(DISCE_PROBE, &port->disc.pending);
@@ -255,6 +263,9 @@ void sas_free_device(struct kref *kref)
 {
         struct domain_device *dev = container_of(kref, typeof(*dev), kref);
 
+        put_device(&dev->rphy->dev);
+        dev->rphy = NULL;
+
         if (dev->parent)
                 sas_put_device(dev->parent);
 
@@ -291,8 +302,7 @@ static void sas_unregister_common_dev(struct asd_sas_port *port, struct domain_d
 static void sas_destruct_devices(struct work_struct *work)
 {
         struct domain_device *dev, *n;
-        struct sas_discovery_event *ev =
-                container_of(work, struct sas_discovery_event, work);
+        struct sas_discovery_event *ev = to_sas_discovery_event(work);
         struct asd_sas_port *port = ev->port;
 
         clear_bit(DISCE_DESTRUCT, &port->disc.pending);
@@ -302,7 +312,6 @@ static void sas_destruct_devices(struct work_struct *work)
 
                 sas_remove_children(&dev->rphy->dev);
                 sas_rphy_delete(dev->rphy);
-                dev->rphy = NULL;
                 sas_unregister_common_dev(port, dev);
         }
 }
@@ -314,11 +323,11 @@ void sas_unregister_dev(struct asd_sas_port *port, struct domain_device *dev)
                 /* this rphy never saw sas_rphy_add */
                 list_del_init(&dev->disco_list_node);
                 sas_rphy_free(dev->rphy);
-                dev->rphy = NULL;
                 sas_unregister_common_dev(port, dev);
+                return;
         }
 
-        if (dev->rphy && !test_and_set_bit(SAS_DEV_DESTROY, &dev->state)) {
+        if (!test_and_set_bit(SAS_DEV_DESTROY, &dev->state)) {
                 sas_rphy_unlink(dev->rphy);
                 list_move_tail(&dev->disco_list_node, &port->destroy_list);
                 sas_discover_event(dev->port, DISCE_DESTRUCT);
@@ -377,8 +386,7 @@ static void sas_discover_domain(struct work_struct *work)
 {
         struct domain_device *dev;
         int error = 0;
-        struct sas_discovery_event *ev =
-                container_of(work, struct sas_discovery_event, work);
+        struct sas_discovery_event *ev = to_sas_discovery_event(work);
         struct asd_sas_port *port = ev->port;
 
         clear_bit(DISCE_DISCOVER_DOMAIN, &port->disc.pending);
@@ -419,8 +427,6 @@ static void sas_discover_domain(struct work_struct *work)
 
         if (error) {
                 sas_rphy_free(dev->rphy);
-                dev->rphy = NULL;
-
                 list_del_init(&dev->disco_list_node);
                 spin_lock_irq(&port->dev_list_lock);
                 list_del_init(&dev->dev_list_node);
@@ -437,8 +443,7 @@ static void sas_discover_domain(struct work_struct *work)
 static void sas_revalidate_domain(struct work_struct *work)
 {
         int res = 0;
-        struct sas_discovery_event *ev =
-                container_of(work, struct sas_discovery_event, work);
+        struct sas_discovery_event *ev = to_sas_discovery_event(work);
         struct asd_sas_port *port = ev->port;
         struct sas_ha_struct *ha = port->ha;
 
@@ -466,21 +471,25 @@ static void sas_revalidate_domain(struct work_struct *work)
 
 /* ---------- Events ---------- */
 
-static void sas_chain_work(struct sas_ha_struct *ha, struct work_struct *work)
+static void sas_chain_work(struct sas_ha_struct *ha, struct sas_work *sw)
 {
-        /* chained work is not subject to SA_HA_DRAINING or SAS_HA_REGISTERED */
-        scsi_queue_work(ha->core.shost, work);
+        /* chained work is not subject to SA_HA_DRAINING or
+         * SAS_HA_REGISTERED, because it is either submitted in the
+         * workqueue, or known to be submitted from a context that is
+         * not racing against draining
+         */
+        scsi_queue_work(ha->core.shost, &sw->work);
 }
 
 static void sas_chain_event(int event, unsigned long *pending,
-                            struct work_struct *work,
+                            struct sas_work *sw,
                             struct sas_ha_struct *ha)
 {
         if (!test_and_set_bit(event, pending)) {
                 unsigned long flags;
 
                 spin_lock_irqsave(&ha->state_lock, flags);
-                sas_chain_work(ha, work);
+                sas_chain_work(ha, sw);
                 spin_unlock_irqrestore(&ha->state_lock, flags);
         }
 }
@@ -519,7 +528,7 @@ void sas_init_disc(struct sas_discovery *disc, struct asd_sas_port *port)
 
         disc->pending = 0;
         for (i = 0; i < DISC_NUM_EVENTS; i++) {
-                INIT_WORK(&disc->disc_work[i].work, sas_event_fns[i]);
+                INIT_SAS_WORK(&disc->disc_work[i].work, sas_event_fns[i]);
                 disc->disc_work[i].port = port;
         }
 }
diff --git a/drivers/scsi/libsas/sas_event.c b/drivers/scsi/libsas/sas_event.c
index 16639bbae629..4e4292d210c1 100644
--- a/drivers/scsi/libsas/sas_event.c
+++ b/drivers/scsi/libsas/sas_event.c
@@ -27,19 +27,21 @@
 #include "sas_internal.h"
 #include "sas_dump.h"
 
-void sas_queue_work(struct sas_ha_struct *ha, struct work_struct *work)
+void sas_queue_work(struct sas_ha_struct *ha, struct sas_work *sw)
 {
         if (!test_bit(SAS_HA_REGISTERED, &ha->state))
                 return;
 
-        if (test_bit(SAS_HA_DRAINING, &ha->state))
-                list_add(&work->entry, &ha->defer_q);
-        else
-                scsi_queue_work(ha->core.shost, work);
+        if (test_bit(SAS_HA_DRAINING, &ha->state)) {
+                /* add it to the defer list, if not already pending */
+                if (list_empty(&sw->drain_node))
+                        list_add(&sw->drain_node, &ha->defer_q);
+        } else
+                scsi_queue_work(ha->core.shost, &sw->work);
 }
 
 static void sas_queue_event(int event, unsigned long *pending,
-                            struct work_struct *work,
+                            struct sas_work *work,
                             struct sas_ha_struct *ha)
 {
         if (!test_and_set_bit(event, pending)) {
@@ -55,7 +57,7 @@ static void sas_queue_event(int event, unsigned long *pending,
 void __sas_drain_work(struct sas_ha_struct *ha)
 {
         struct workqueue_struct *wq = ha->core.shost->work_q;
-        struct work_struct *w, *_w;
+        struct sas_work *sw, *_sw;
 
         set_bit(SAS_HA_DRAINING, &ha->state);
         /* flush submitters */
@@ -66,9 +68,9 @@ void __sas_drain_work(struct sas_ha_struct *ha)
 
         spin_lock_irq(&ha->state_lock);
         clear_bit(SAS_HA_DRAINING, &ha->state);
-        list_for_each_entry_safe(w, _w, &ha->defer_q, entry) {
-                list_del_init(&w->entry);
-                sas_queue_work(ha, w);
+        list_for_each_entry_safe(sw, _sw, &ha->defer_q, drain_node) {
+                list_del_init(&sw->drain_node);
+                sas_queue_work(ha, sw);
         }
         spin_unlock_irq(&ha->state_lock);
 }
@@ -151,7 +153,7 @@ int sas_init_events(struct sas_ha_struct *sas_ha)
         int i;
 
         for (i = 0; i < HA_NUM_EVENTS; i++) {
-                INIT_WORK(&sas_ha->ha_events[i].work, sas_ha_event_fns[i]);
+                INIT_SAS_WORK(&sas_ha->ha_events[i].work, sas_ha_event_fns[i]);
                 sas_ha->ha_events[i].ha = sas_ha;
         }
 
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index 05acd9e35fc4..caa0525d2523 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -202,6 +202,7 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id, void *rsp)
         u8 sas_addr[SAS_ADDR_SIZE];
         struct smp_resp *resp = rsp;
         struct discover_resp *dr = &resp->disc;
+        struct sas_ha_struct *ha = dev->port->ha;
         struct expander_device *ex = &dev->ex_dev;
         struct ex_phy *phy = &ex->ex_phy[phy_id];
         struct sas_rphy *rphy = dev->rphy;
@@ -209,6 +210,8 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id, void *rsp)
         char *type;
 
         if (new_phy) {
+                if (WARN_ON_ONCE(test_bit(SAS_HA_ATA_EH_ACTIVE, &ha->state)))
+                        return;
                 phy->phy = sas_phy_alloc(&rphy->dev, phy_id);
 
                 /* FIXME: error_handling */
@@ -233,6 +236,8 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id, void *rsp)
         memcpy(sas_addr, phy->attached_sas_addr, SAS_ADDR_SIZE);
 
         phy->attached_dev_type = to_dev_type(dr);
+        if (test_bit(SAS_HA_ATA_EH_ACTIVE, &ha->state))
+                goto out;
         phy->phy_id = phy_id;
         phy->linkrate = dr->linkrate;
         phy->attached_sata_host = dr->attached_sata_host;
@@ -240,7 +245,14 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id, void *rsp)
         phy->attached_sata_ps   = dr->attached_sata_ps;
         phy->attached_iproto = dr->iproto << 1;
         phy->attached_tproto = dr->tproto << 1;
-        memcpy(phy->attached_sas_addr, dr->attached_sas_addr, SAS_ADDR_SIZE);
+        /* help some expanders that fail to zero sas_address in the 'no
+         * device' case
+         */
+        if (phy->attached_dev_type == NO_DEVICE ||
+            phy->linkrate < SAS_LINK_RATE_1_5_GBPS)
+                memset(phy->attached_sas_addr, 0, SAS_ADDR_SIZE);
+        else
+                memcpy(phy->attached_sas_addr, dr->attached_sas_addr, SAS_ADDR_SIZE);
         phy->attached_phy_id = dr->attached_phy_id;
         phy->phy_change_count = dr->change_count;
         phy->routing_attr = dr->routing_attr;
@@ -266,6 +278,7 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id, void *rsp)
                         return;
                 }
 
+ out:
         switch (phy->attached_dev_type) {
         case SATA_PENDING:
                 type = "stp pending";
@@ -304,7 +317,15 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id, void *rsp)
         else
                 return;
 
-        SAS_DPRINTK("ex %016llx phy%02d:%c:%X attached: %016llx (%s)\n",
+        /* if the attached device type changed and ata_eh is active,
+         * make sure we run revalidation when eh completes (see:
+         * sas_enable_revalidation)
+         */
+        if (test_bit(SAS_HA_ATA_EH_ACTIVE, &ha->state))
+                set_bit(DISCE_REVALIDATE_DOMAIN, &dev->port->disc.pending);
+
+        SAS_DPRINTK("%sex %016llx phy%02d:%c:%X attached: %016llx (%s)\n",
+                    test_bit(SAS_HA_ATA_EH_ACTIVE, &ha->state) ? "ata: " : "",
                     SAS_ADDR(dev->sas_addr), phy->phy_id,
                     sas_route_char(dev, phy), phy->linkrate,
                     SAS_ADDR(phy->attached_sas_addr), type);
@@ -776,13 +797,16 @@ static struct domain_device *sas_ex_discover_end_dev(
                 if (res)
                         goto out_free;
 
+                sas_init_dev(child);
+                res = sas_ata_init(child);
+                if (res)
+                        goto out_free;
                 rphy = sas_end_device_alloc(phy->port);
-                if (unlikely(!rphy))
+                if (!rphy)
                         goto out_free;
 
-                sas_init_dev(child);
-
                 child->rphy = rphy;
+                get_device(&rphy->dev);
 
                 list_add_tail(&child->disco_list_node, &parent->port->disco_list);
 
@@ -806,6 +830,7 @@ static struct domain_device *sas_ex_discover_end_dev(
                 sas_init_dev(child);
 
                 child->rphy = rphy;
+                get_device(&rphy->dev);
                 sas_fill_in_rphy(child, rphy);
 
                 list_add_tail(&child->disco_list_node, &parent->port->disco_list);
@@ -830,8 +855,6 @@ static struct domain_device *sas_ex_discover_end_dev(
 
  out_list_del:
         sas_rphy_free(child->rphy);
-        child->rphy = NULL;
-
         list_del(&child->disco_list_node);
         spin_lock_irq(&parent->port->dev_list_lock);
         list_del(&child->dev_list_node);
@@ -911,6 +934,7 @@ static struct domain_device *sas_ex_discover_expander(
         }
         port = parent->port;
         child->rphy = rphy;
+        get_device(&rphy->dev);
         edev = rphy_to_expander_device(rphy);
         child->dev_type = phy->attached_dev_type;
         kref_get(&parent->kref);
@@ -934,6 +958,7 @@ static struct domain_device *sas_ex_discover_expander(
 
         res = sas_discover_expander(child);
         if (res) {
+                sas_rphy_delete(rphy);
                 spin_lock_irq(&parent->port->dev_list_lock);
                 list_del(&child->dev_list_node);
                 spin_unlock_irq(&parent->port->dev_list_lock);
@@ -1718,9 +1743,17 @@ static int sas_find_bcast_phy(struct domain_device *dev, int *phy_id,
                 int phy_change_count = 0;
 
                 res = sas_get_phy_change_count(dev, i, &phy_change_count);
-                if (res)
-                        goto out;
-                else if (phy_change_count != ex->ex_phy[i].phy_change_count) {
+                switch (res) {
+                case SMP_RESP_PHY_VACANT:
+                case SMP_RESP_NO_PHY:
+                        continue;
+                case SMP_RESP_FUNC_ACC:
+                        break;
+                default:
+                        return res;
+                }
+
+                if (phy_change_count != ex->ex_phy[i].phy_change_count) {
                         if (update)
                                 ex->ex_phy[i].phy_change_count =
                                         phy_change_count;
@@ -1728,8 +1761,7 @@ static int sas_find_bcast_phy(struct domain_device *dev, int *phy_id,
                         return 0;
                 }
         }
-out:
-        return res;
+        return 0;
 }
 
 static int sas_get_ex_change_count(struct domain_device *dev, int *ecc)
diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c
index 120bff64be30..10cb5ae30977 100644
--- a/drivers/scsi/libsas/sas_init.c
+++ b/drivers/scsi/libsas/sas_init.c
@@ -94,8 +94,7 @@ void sas_hash_addr(u8 *hashed, const u8 *sas_addr)
 
 void sas_hae_reset(struct work_struct *work)
 {
-        struct sas_ha_event *ev =
-                container_of(work, struct sas_ha_event, work);
+        struct sas_ha_event *ev = to_sas_ha_event(work);
         struct sas_ha_struct *ha = ev->ha;
 
         clear_bit(HAE_RESET, &ha->pending);
@@ -369,14 +368,14 @@ static void sas_phy_release(struct sas_phy *phy)
 
 static void phy_reset_work(struct work_struct *work)
 {
-        struct sas_phy_data *d = container_of(work, typeof(*d), reset_work);
+        struct sas_phy_data *d = container_of(work, typeof(*d), reset_work.work);
 
         d->reset_result = transport_sas_phy_reset(d->phy, d->hard_reset);
 }
 
 static void phy_enable_work(struct work_struct *work)
 {
-        struct sas_phy_data *d = container_of(work, typeof(*d), enable_work);
+        struct sas_phy_data *d = container_of(work, typeof(*d), enable_work.work);
 
         d->enable_result = sas_phy_enable(d->phy, d->enable);
 }
@@ -389,8 +388,8 @@ static int sas_phy_setup(struct sas_phy *phy)
                 return -ENOMEM;
 
         mutex_init(&d->event_lock);
-        INIT_WORK(&d->reset_work, phy_reset_work);
-        INIT_WORK(&d->enable_work, phy_enable_work);
+        INIT_SAS_WORK(&d->reset_work, phy_reset_work);
+        INIT_SAS_WORK(&d->enable_work, phy_enable_work);
         d->phy = phy;
         phy->hostdata = d;
 
diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h
index f05c63879949..507e4cf12e56 100644
--- a/drivers/scsi/libsas/sas_internal.h
+++ b/drivers/scsi/libsas/sas_internal.h
@@ -45,10 +45,10 @@ struct sas_phy_data {
         struct mutex event_lock;
         int hard_reset;
         int reset_result;
-        struct work_struct reset_work;
+        struct sas_work reset_work;
         int enable;
         int enable_result;
-        struct work_struct enable_work;
+        struct sas_work enable_work;
 };
 
 void sas_scsi_recover_host(struct Scsi_Host *shost);
@@ -80,7 +80,7 @@ void sas_porte_broadcast_rcvd(struct work_struct *work);
 void sas_porte_link_reset_err(struct work_struct *work);
 void sas_porte_timer_event(struct work_struct *work);
 void sas_porte_hard_reset(struct work_struct *work);
-void sas_queue_work(struct sas_ha_struct *ha, struct work_struct *work);
+void sas_queue_work(struct sas_ha_struct *ha, struct sas_work *sw);
 
 int sas_notify_lldd_dev_found(struct domain_device *);
 void sas_notify_lldd_dev_gone(struct domain_device *);
diff --git a/drivers/scsi/libsas/sas_phy.c b/drivers/scsi/libsas/sas_phy.c
index dcfd4a9105c5..521422e857ab 100644
--- a/drivers/scsi/libsas/sas_phy.c
+++ b/drivers/scsi/libsas/sas_phy.c
@@ -32,8 +32,7 @@
 
 static void sas_phye_loss_of_signal(struct work_struct *work)
 {
-        struct asd_sas_event *ev =
-                container_of(work, struct asd_sas_event, work);
+        struct asd_sas_event *ev = to_asd_sas_event(work);
         struct asd_sas_phy *phy = ev->phy;
 
         clear_bit(PHYE_LOSS_OF_SIGNAL, &phy->phy_events_pending);
@@ -43,8 +42,7 @@ static void sas_phye_loss_of_signal(struct work_struct *work)
 
 static void sas_phye_oob_done(struct work_struct *work)
 {
-        struct asd_sas_event *ev =
-                container_of(work, struct asd_sas_event, work);
+        struct asd_sas_event *ev = to_asd_sas_event(work);
         struct asd_sas_phy *phy = ev->phy;
 
         clear_bit(PHYE_OOB_DONE, &phy->phy_events_pending);
@@ -53,8 +51,7 @@ static void sas_phye_oob_done(struct work_struct *work)
 
 static void sas_phye_oob_error(struct work_struct *work)
 {
-        struct asd_sas_event *ev =
-                container_of(work, struct asd_sas_event, work);
+        struct asd_sas_event *ev = to_asd_sas_event(work);
         struct asd_sas_phy *phy = ev->phy;
         struct sas_ha_struct *sas_ha = phy->ha;
         struct asd_sas_port *port = phy->port;
@@ -85,8 +82,7 @@ static void sas_phye_oob_error(struct work_struct *work)
 
 static void sas_phye_spinup_hold(struct work_struct *work)
 {
-        struct asd_sas_event *ev =
-                container_of(work, struct asd_sas_event, work);
+        struct asd_sas_event *ev = to_asd_sas_event(work);
         struct asd_sas_phy *phy = ev->phy;
         struct sas_ha_struct *sas_ha = phy->ha;
         struct sas_internal *i =
@@ -127,14 +123,12 @@ int sas_register_phys(struct sas_ha_struct *sas_ha)
                 phy->error = 0;
                 INIT_LIST_HEAD(&phy->port_phy_el);
                 for (k = 0; k < PORT_NUM_EVENTS; k++) {
-                        INIT_WORK(&phy->port_events[k].work,
-                                  sas_port_event_fns[k]);
+                        INIT_SAS_WORK(&phy->port_events[k].work, sas_port_event_fns[k]);
                         phy->port_events[k].phy = phy;
                 }
 
                 for (k = 0; k < PHY_NUM_EVENTS; k++) {
-                        INIT_WORK(&phy->phy_events[k].work,
-                                  sas_phy_event_fns[k]);
+                        INIT_SAS_WORK(&phy->phy_events[k].work, sas_phy_event_fns[k]);
                         phy->phy_events[k].phy = phy;
                 }
 
@@ -144,8 +138,7 @@ int sas_register_phys(struct sas_ha_struct *sas_ha)
                 spin_lock_init(&phy->sas_prim_lock);
                 phy->frame_rcvd_size = 0;
 
-                phy->phy = sas_phy_alloc(&sas_ha->core.shost->shost_gendev,
-                                         i);
+                phy->phy = sas_phy_alloc(&sas_ha->core.shost->shost_gendev, i);
                 if (!phy->phy)
                         return -ENOMEM;
 
diff --git a/drivers/scsi/libsas/sas_port.c b/drivers/scsi/libsas/sas_port.c
index eb19c016d500..e884a8c58a0c 100644
--- a/drivers/scsi/libsas/sas_port.c
+++ b/drivers/scsi/libsas/sas_port.c
@@ -123,7 +123,7 @@ static void sas_form_port(struct asd_sas_phy *phy)
         spin_unlock_irqrestore(&sas_ha->phy_port_lock, flags);
 
         if (!port->port) {
-                port->port = sas_port_alloc(phy->phy->dev.parent, phy->id);
+                port->port = sas_port_alloc(phy->phy->dev.parent, port->id);
                 BUG_ON(!port->port);
                 sas_port_add(port->port);
         }
@@ -208,8 +208,7 @@ void sas_deform_port(struct asd_sas_phy *phy, int gone)
 
 void sas_porte_bytes_dmaed(struct work_struct *work)
 {
-        struct asd_sas_event *ev =
-                container_of(work, struct asd_sas_event, work);
+        struct asd_sas_event *ev = to_asd_sas_event(work);
         struct asd_sas_phy *phy = ev->phy;
 
         clear_bit(PORTE_BYTES_DMAED, &phy->port_events_pending);
@@ -219,8 +218,7 @@ void sas_porte_bytes_dmaed(struct work_struct *work)
 
 void sas_porte_broadcast_rcvd(struct work_struct *work)
 {
-        struct asd_sas_event *ev =
-                container_of(work, struct asd_sas_event, work);
+        struct asd_sas_event *ev = to_asd_sas_event(work);
         struct asd_sas_phy *phy = ev->phy;
         unsigned long flags;
         u32 prim;
@@ -237,8 +235,7 @@ void sas_porte_broadcast_rcvd(struct work_struct *work)
 
 void sas_porte_link_reset_err(struct work_struct *work)
 {
-        struct asd_sas_event *ev =
-                container_of(work, struct asd_sas_event, work);
+        struct asd_sas_event *ev = to_asd_sas_event(work);
         struct asd_sas_phy *phy = ev->phy;
 
         clear_bit(PORTE_LINK_RESET_ERR, &phy->port_events_pending);
@@ -248,8 +245,7 @@ void sas_porte_link_reset_err(struct work_struct *work)
 
 void sas_porte_timer_event(struct work_struct *work)
 {
-        struct asd_sas_event *ev =
-                container_of(work, struct asd_sas_event, work);
+        struct asd_sas_event *ev = to_asd_sas_event(work);
         struct asd_sas_phy *phy = ev->phy;
 
         clear_bit(PORTE_TIMER_EVENT, &phy->port_events_pending);
@@ -259,8 +255,7 @@ void sas_porte_timer_event(struct work_struct *work)
 
 void sas_porte_hard_reset(struct work_struct *work)
 {
-        struct asd_sas_event *ev =
-                container_of(work, struct asd_sas_event, work);
+        struct asd_sas_event *ev = to_asd_sas_event(work);
         struct asd_sas_phy *phy = ev->phy;
 
         clear_bit(PORTE_HARD_RESET, &phy->port_events_pending);
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index f74cc0602f3b..bc3cc6d91117 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -1367,6 +1367,9 @@ qla2x00_read_optrom(struct fc_bsg_job *bsg_job)
         struct qla_hw_data *ha = vha->hw;
         int rval = 0;
 
+        if (ha->flags.isp82xx_reset_hdlr_active)
+                return -EBUSY;
+
         rval = qla2x00_optrom_setup(bsg_job, vha, 0);
         if (rval)
                 return rval;
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 897731b93df2..62324a1d5573 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -15,7 +15,7 @@
  * | Mailbox commands             |       0x113e       | 0x112c-0x112e  |
  * |                              |                    | 0x113a         |
  * | Device Discovery             |       0x2086       | 0x2020-0x2022  |
- * | Queue Command and IO tracing |       0x302f       | 0x3006,0x3008  |
+ * | Queue Command and IO tracing |       0x3030       | 0x3006,0x3008  |
  * |                              |                    | 0x302d-0x302e  |
  * | DPC Thread                   |       0x401c       |                |
  * | Async Events                 |       0x505d       | 0x502b-0x502f  |
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index f79844ce7122..ce42288049b5 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1715,13 +1715,24 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
                                 res = DID_ERROR << 16;
                                 break;
                         }
-                } else {
+                } else if (lscsi_status != SAM_STAT_TASK_SET_FULL &&
+                            lscsi_status != SAM_STAT_BUSY) {
+                        /*
+                         * scsi status of task set and busy are considered to be
+                         * task not completed.
+                         */
+
                         ql_dbg(ql_dbg_io, fcport->vha, 0x301f,
                             "Dropped frame(s) detected (0x%x "
-                            "of 0x%x bytes).\n", resid, scsi_bufflen(cp));
+                            "of 0x%x bytes).\n", resid,
+                            scsi_bufflen(cp));
 
                         res = DID_ERROR << 16 | lscsi_status;
                         goto check_scsi_status;
+                } else {
+                        ql_dbg(ql_dbg_io, fcport->vha, 0x3030,
+                            "scsi_status: 0x%x, lscsi_status: 0x%x\n",
+                            scsi_status, lscsi_status);
                 }
 
                 res = DID_OK << 16 | lscsi_status;
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index f0528539bbbc..de722a933438 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -3125,6 +3125,7 @@ qla82xx_need_reset_handler(scsi_qla_host_t *vha)
                 ql_log(ql_log_info, vha, 0x00b7,
                     "HW State: COLD/RE-INIT.\n");
                 qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE, QLA82XX_DEV_COLD);
+                qla82xx_set_rst_ready(ha);
                 if (ql2xmdenable) {
                         if (qla82xx_md_collect(vha))
                                 ql_log(ql_log_warn, vha, 0xb02c,
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index a2f999273a5f..7db803377c64 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -3577,9 +3577,25 @@ void qla2x00_relogin(struct scsi_qla_host *vha)
                                                 continue;
                                         /* Attempt a retry. */
                                         status = 1;
-                                } else
+                                } else {
                                         status = qla2x00_fabric_login(vha,
                                             fcport, &next_loopid);
+                                        if (status ==  QLA_SUCCESS) {
+                                                int status2;
+                                                uint8_t opts;
+
+                                                opts = 0;
+                                                if (fcport->flags &
+                                                    FCF_FCP2_DEVICE)
+                                                        opts |= BIT_1;
+                                                        status2 =
+                                                            qla2x00_get_port_database(
+                                                                vha, fcport,
+                                                                opts);
+                                                if (status2 != QLA_SUCCESS)
+                                                        status = 1;
+                                        }
+                                }
                         } else
                                 status = qla2x00_local_device_login(vha,
                                                                 fcport);
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 3c13c0a6be63..a683e766d1ae 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -1017,6 +1017,9 @@ qla2xxx_flash_npiv_conf(scsi_qla_host_t *vha)
             !IS_CNA_CAPABLE(ha) && !IS_QLA2031(ha))
                 return;
 
+        if (ha->flags.isp82xx_reset_hdlr_active)
+                return;
+
         ha->isp_ops->read_optrom(vha, (uint8_t *)&hdr,
             ha->flt_region_npiv_conf << 2, sizeof(struct qla_npiv_header));
         if (hdr.version == __constant_cpu_to_le16(0xffff))
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index 29d780c38040..f5fdb16bec9b 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,9 +7,9 @@
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.03.07.13-k"
+#define QLA2XXX_VERSION      "8.04.00.03-k"
 
 #define QLA_DRIVER_MAJOR_VER    8
-#define QLA_DRIVER_MINOR_VER    3
-#define QLA_DRIVER_PATCH_VER    7
+#define QLA_DRIVER_MINOR_VER    4
+#define QLA_DRIVER_PATCH_VER    0
 #define QLA_DRIVER_BETA_VER     3
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ead6405f3e51..5dfd7495d1a1 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1638,7 +1638,7 @@ struct request_queue *__scsi_alloc_queue(struct Scsi_Host *shost,
                                          request_fn_proc *request_fn)
 {
         struct request_queue *q;
-        struct device *dev = shost->shost_gendev.parent;
+        struct device *dev = shost->dma_dev;
 
         q = blk_init_queue(request_fn, NULL);
         if (!q)
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index efccd72c4a3e..1b3843117268 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -175,7 +175,8 @@ static void virtscsi_complete_free(void *buf)
 
         if (cmd->comp)
                 complete_all(cmd->comp);
-        mempool_free(cmd, virtscsi_cmd_pool);
+        else
+                mempool_free(cmd, virtscsi_cmd_pool);
 }
 
 static void virtscsi_ctrl_done(struct virtqueue *vq)
@@ -311,21 +312,22 @@ out:
 static int virtscsi_tmf(struct virtio_scsi *vscsi, struct virtio_scsi_cmd *cmd)
 {
         DECLARE_COMPLETION_ONSTACK(comp);
-        int ret;
+        int ret = FAILED;
 
         cmd->comp = &comp;
-        ret = virtscsi_kick_cmd(vscsi, vscsi->ctrl_vq, cmd,
-                               sizeof cmd->req.tmf, sizeof cmd->resp.tmf,
-                               GFP_NOIO);
-        if (ret < 0)
-                return FAILED;
+        if (virtscsi_kick_cmd(vscsi, vscsi->ctrl_vq, cmd,
+                              sizeof cmd->req.tmf, sizeof cmd->resp.tmf,
+                              GFP_NOIO) < 0)
+                goto out;
 
         wait_for_completion(&comp);
-        if (cmd->resp.tmf.response != VIRTIO_SCSI_S_OK &&
-            cmd->resp.tmf.response != VIRTIO_SCSI_S_FUNCTION_SUCCEEDED)
-                return FAILED;
+        if (cmd->resp.tmf.response == VIRTIO_SCSI_S_OK ||
+            cmd->resp.tmf.response == VIRTIO_SCSI_S_FUNCTION_SUCCEEDED)
+                ret = SUCCESS;
 
-        return SUCCESS;
+out:
+        mempool_free(cmd, virtscsi_cmd_pool);
+        return ret;
 }
 
 static int virtscsi_device_reset(struct scsi_cmnd *sc)
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 3ed748355b98..00c024039c97 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -74,7 +74,7 @@ config SPI_ATMEL
           This selects a driver for the Atmel SPI Controller, present on
           many AT32 (AVR32) and AT91 (ARM) chips.
 
-config SPI_BFIN
+config SPI_BFIN5XX
         tristate "SPI controller driver for ADI Blackfin5xx"
         depends on BLACKFIN
         help
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index a1d48e0ba3dc..9d75d2198ff5 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -15,7 +15,7 @@ obj-$(CONFIG_SPI_ATMEL)			+= spi-atmel.o
 obj-$(CONFIG_SPI_ATH79)                 += spi-ath79.o
 obj-$(CONFIG_SPI_AU1550)                += spi-au1550.o
 obj-$(CONFIG_SPI_BCM63XX)               += spi-bcm63xx.o
-obj-$(CONFIG_SPI_BFIN)                  += spi-bfin5xx.o
+obj-$(CONFIG_SPI_BFIN5XX)               += spi-bfin5xx.o
 obj-$(CONFIG_SPI_BFIN_SPORT)            += spi-bfin-sport.o
 obj-$(CONFIG_SPI_BITBANG)               += spi-bitbang.o
 obj-$(CONFIG_SPI_BUTTERFLY)             += spi-butterfly.o
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index f01b2648452e..7491971139a6 100644
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -1,7 +1,7 @@
 /*
  * Broadcom BCM63xx SPI controller support
  *
- * Copyright (C) 2009-2011 Florian Fainelli <florian@openwrt.org>
+ * Copyright (C) 2009-2012 Florian Fainelli <florian@openwrt.org>
  * Copyright (C) 2010 Tanguy Bouzeloc <tanguy.bouzeloc@efixo.com>
  *
  * This program is free software; you can redistribute it and/or
@@ -30,6 +30,8 @@
 #include <linux/spi/spi.h>
 #include <linux/completion.h>
 #include <linux/err.h>
+#include <linux/workqueue.h>
+#include <linux/pm_runtime.h>
 
 #include <bcm63xx_dev_spi.h>
 
@@ -37,8 +39,6 @@
 #define DRV_VER         "0.1.2"
 
 struct bcm63xx_spi {
-        spinlock_t              lock;
-        int                     stopping;
         struct completion       done;
 
         void __iomem            *regs;
@@ -96,17 +96,12 @@ static const unsigned bcm63xx_spi_freq_table[SPI_CLK_MASK][2] = {
         {   391000, SPI_CLK_0_391MHZ }
 };
 
-static int bcm63xx_spi_setup_transfer(struct spi_device *spi,
-                                      struct spi_transfer *t)
+static int bcm63xx_spi_check_transfer(struct spi_device *spi,
+                                        struct spi_transfer *t)
 {
-        struct bcm63xx_spi *bs = spi_master_get_devdata(spi->master);
         u8 bits_per_word;
-        u8 clk_cfg, reg;
-        u32 hz;
-        int i;
 
         bits_per_word = (t) ? t->bits_per_word : spi->bits_per_word;
-        hz = (t) ? t->speed_hz : spi->max_speed_hz;
         if (bits_per_word != 8) {
                 dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",
                         __func__, bits_per_word);
@@ -119,6 +114,19 @@ static int bcm63xx_spi_setup_transfer(struct spi_device *spi,
                 return -EINVAL;
         }
 
+        return 0;
+}
+
+static void bcm63xx_spi_setup_transfer(struct spi_device *spi,
+                                      struct spi_transfer *t)
+{
+        struct bcm63xx_spi *bs = spi_master_get_devdata(spi->master);
+        u32 hz;
+        u8 clk_cfg, reg;
+        int i;
+
+        hz = (t) ? t->speed_hz : spi->max_speed_hz;
+
         /* Find the closest clock configuration */
         for (i = 0; i < SPI_CLK_MASK; i++) {
                 if (hz <= bcm63xx_spi_freq_table[i][0]) {
@@ -139,8 +147,6 @@ static int bcm63xx_spi_setup_transfer(struct spi_device *spi,
         bcm_spi_writeb(bs, reg, SPI_CLK_CFG);
         dev_dbg(&spi->dev, "Setting clock register to %02x (hz %d)\n",
                 clk_cfg, hz);
-
-        return 0;
 }
 
 /* the spi->mode bits understood by this driver: */
@@ -153,9 +159,6 @@ static int bcm63xx_spi_setup(struct spi_device *spi)
 
         bs = spi_master_get_devdata(spi->master);
 
-        if (bs->stopping)
-                return -ESHUTDOWN;
-
         if (!spi->bits_per_word)
                 spi->bits_per_word = 8;
 
@@ -165,7 +168,7 @@ static int bcm63xx_spi_setup(struct spi_device *spi)
                 return -EINVAL;
         }
 
-        ret = bcm63xx_spi_setup_transfer(spi, NULL);
+        ret = bcm63xx_spi_check_transfer(spi, NULL);
         if (ret < 0) {
                 dev_err(&spi->dev, "setup: unsupported mode bits %x\n",
                         spi->mode & ~MODEBITS);
@@ -190,28 +193,29 @@ static void bcm63xx_spi_fill_tx_fifo(struct bcm63xx_spi *bs)
         bs->remaining_bytes -= size;
 }
 
-static int bcm63xx_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
+static unsigned int bcm63xx_txrx_bufs(struct spi_device *spi,
+                                        struct spi_transfer *t)
 {
         struct bcm63xx_spi *bs = spi_master_get_devdata(spi->master);
         u16 msg_ctl;
         u16 cmd;
 
+        /* Disable the CMD_DONE interrupt */
+        bcm_spi_writeb(bs, 0, SPI_INT_MASK);
+
         dev_dbg(&spi->dev, "txrx: tx %p, rx %p, len %d\n",
                 t->tx_buf, t->rx_buf, t->len);
 
         /* Transmitter is inhibited */
         bs->tx_ptr = t->tx_buf;
         bs->rx_ptr = t->rx_buf;
-        init_completion(&bs->done);
 
         if (t->tx_buf) {
                 bs->remaining_bytes = t->len;
                 bcm63xx_spi_fill_tx_fifo(bs);
         }
 
-        /* Enable the command done interrupt which
-         * we use to determine completion of a command */
-        bcm_spi_writeb(bs, SPI_INTR_CMD_DONE, SPI_INT_MASK);
+        init_completion(&bs->done);
 
         /* Fill in the Message control register */
         msg_ctl = (t->len << SPI_BYTE_CNT_SHIFT);
@@ -230,33 +234,76 @@ static int bcm63xx_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
         cmd |= (0 << SPI_CMD_PREPEND_BYTE_CNT_SHIFT);
         cmd |= (spi->chip_select << SPI_CMD_DEVICE_ID_SHIFT);
         bcm_spi_writew(bs, cmd, SPI_CMD);
-        wait_for_completion(&bs->done);
 
-        /* Disable the CMD_DONE interrupt */
-        bcm_spi_writeb(bs, 0, SPI_INT_MASK);
+        /* Enable the CMD_DONE interrupt */
+        bcm_spi_writeb(bs, SPI_INTR_CMD_DONE, SPI_INT_MASK);
 
         return t->len - bs->remaining_bytes;
 }
 
-static int bcm63xx_transfer(struct spi_device *spi, struct spi_message *m)
+static int bcm63xx_spi_prepare_transfer(struct spi_master *master)
 {
-        struct bcm63xx_spi *bs = spi_master_get_devdata(spi->master);
-        struct spi_transfer *t;
-        int ret = 0;
+        struct bcm63xx_spi *bs = spi_master_get_devdata(master);
 
-        if (unlikely(list_empty(&m->transfers)))
-                return -EINVAL;
+        pm_runtime_get_sync(&bs->pdev->dev);
 
-        if (bs->stopping)
-                return -ESHUTDOWN;
+        return 0;
+}
+
+static int bcm63xx_spi_unprepare_transfer(struct spi_master *master)
+{
+        struct bcm63xx_spi *bs = spi_master_get_devdata(master);
+
+        pm_runtime_put(&bs->pdev->dev);
+
+        return 0;
+}
+
+static int bcm63xx_spi_transfer_one(struct spi_master *master,
+                                        struct spi_message *m)
+{
+        struct bcm63xx_spi *bs = spi_master_get_devdata(master);
+        struct spi_transfer *t;
+        struct spi_device *spi = m->spi;
+        int status = 0;
+        unsigned int timeout = 0;
 
         list_for_each_entry(t, &m->transfers, transfer_list) {
-                ret += bcm63xx_txrx_bufs(spi, t);
-        }
+                unsigned int len = t->len;
+                u8 rx_tail;
 
-        m->complete(m->context);
+                status = bcm63xx_spi_check_transfer(spi, t);
+                if (status < 0)
+                        goto exit;
 
-        return ret;
+                /* configure adapter for a new transfer */
+                bcm63xx_spi_setup_transfer(spi, t);
+
+                while (len) {
+                        /* send the data */
+                        len -= bcm63xx_txrx_bufs(spi, t);
+
+                        timeout = wait_for_completion_timeout(&bs->done, HZ);
+                        if (!timeout) {
+                                status = -ETIMEDOUT;
+                                goto exit;
+                        }
+
+                        /* read out all data */
+                        rx_tail = bcm_spi_readb(bs, SPI_RX_TAIL);
+
+                        /* Read out all the data */
+                        if (rx_tail)
+                                memcpy_fromio(bs->rx_ptr, bs->rx_io, rx_tail);
+                }
+
+                m->actual_length += t->len;
+        }
+exit:
+        m->status = status;
+        spi_finalize_current_message(master);
+
+        return 0;
 }
 
 /* This driver supports single master mode only. Hence
@@ -267,39 +314,15 @@ static irqreturn_t bcm63xx_spi_interrupt(int irq, void *dev_id)
         struct spi_master *master = (struct spi_master *)dev_id;
         struct bcm63xx_spi *bs = spi_master_get_devdata(master);
         u8 intr;
-        u16 cmd;
 
         /* Read interupts and clear them immediately */
         intr = bcm_spi_readb(bs, SPI_INT_STATUS);
         bcm_spi_writeb(bs, SPI_INTR_CLEAR_ALL, SPI_INT_STATUS);
         bcm_spi_writeb(bs, 0, SPI_INT_MASK);
 
-        /* A tansfer completed */
-        if (intr & SPI_INTR_CMD_DONE) {
-                u8 rx_tail;
-
-                rx_tail = bcm_spi_readb(bs, SPI_RX_TAIL);
-
-                /* Read out all the data */
-                if (rx_tail)
-                        memcpy_fromio(bs->rx_ptr, bs->rx_io, rx_tail);
-
-                /* See if there is more data to send */
-                if (bs->remaining_bytes > 0) {
-                        bcm63xx_spi_fill_tx_fifo(bs);
-
-                        /* Start the transfer */
-                        bcm_spi_writew(bs, SPI_HD_W << SPI_MSG_TYPE_SHIFT,
-                                       SPI_MSG_CTL);
-                        cmd = bcm_spi_readw(bs, SPI_CMD);
-                        cmd |= SPI_CMD_START_IMMEDIATE;
-                        cmd |= (0 << SPI_CMD_PREPEND_BYTE_CNT_SHIFT);
-                        bcm_spi_writeb(bs, SPI_INTR_CMD_DONE, SPI_INT_MASK);
-                        bcm_spi_writew(bs, cmd, SPI_CMD);
-                } else {
-                        complete(&bs->done);
-                }
-        }
+        /* A transfer completed */
+        if (intr & SPI_INTR_CMD_DONE)
+                complete(&bs->done);
 
         return IRQ_HANDLED;
 }
@@ -345,7 +368,6 @@ static int __devinit bcm63xx_spi_probe(struct platform_device *pdev)
         }
 
         bs = spi_master_get_devdata(master);
-        init_completion(&bs->done);
 
         platform_set_drvdata(pdev, master);
         bs->pdev = pdev;
@@ -379,12 +401,13 @@ static int __devinit bcm63xx_spi_probe(struct platform_device *pdev)
         master->bus_num = pdata->bus_num;
         master->num_chipselect = pdata->num_chipselect;
         master->setup = bcm63xx_spi_setup;
-        master->transfer = bcm63xx_transfer;
+        master->prepare_transfer_hardware = bcm63xx_spi_prepare_transfer;
+        master->unprepare_transfer_hardware = bcm63xx_spi_unprepare_transfer;
+        master->transfer_one_message = bcm63xx_spi_transfer_one;
+        master->mode_bits = MODEBITS;
         bs->speed_hz = pdata->speed_hz;
-        bs->stopping = 0;
         bs->tx_io = (u8 *)(bs->regs + bcm63xx_spireg(SPI_MSG_DATA));
         bs->rx_io = (const u8 *)(bs->regs + bcm63xx_spireg(SPI_RX_DATA));
-        spin_lock_init(&bs->lock);
 
         /* Initialize hardware */
         clk_enable(bs->clk);
@@ -418,18 +441,16 @@ static int __devexit bcm63xx_spi_remove(struct platform_device *pdev)
         struct spi_master *master = platform_get_drvdata(pdev);
         struct bcm63xx_spi *bs = spi_master_get_devdata(master);
 
+        spi_unregister_master(master);
+
         /* reset spi block */
         bcm_spi_writeb(bs, 0, SPI_INT_MASK);
-        spin_lock(&bs->lock);
-        bs->stopping = 1;
 
         /* HW shutdown */
         clk_disable(bs->clk);
         clk_put(bs->clk);
 
-        spin_unlock(&bs->lock);
         platform_set_drvdata(pdev, 0);
-        spi_unregister_master(master);
 
         return 0;
 }
diff --git a/drivers/spi/spi-bfin-sport.c b/drivers/spi/spi-bfin-sport.c
index 248a2cc671a9..1fe51198a622 100644
--- a/drivers/spi/spi-bfin-sport.c
+++ b/drivers/spi/spi-bfin-sport.c
@@ -252,19 +252,15 @@ static void
 bfin_sport_spi_restore_state(struct bfin_sport_spi_master_data *drv_data)
 {
         struct bfin_sport_spi_slave_data *chip = drv_data->cur_chip;
-        unsigned int bits = (drv_data->ops == &bfin_sport_transfer_ops_u8 ? 7 : 15);
 
         bfin_sport_spi_disable(drv_data);
         dev_dbg(drv_data->dev, "restoring spi ctl state\n");
 
         bfin_write(&drv_data->regs->tcr1, chip->ctl_reg);
-        bfin_write(&drv_data->regs->tcr2, bits);
         bfin_write(&drv_data->regs->tclkdiv, chip->baud);
-        bfin_write(&drv_data->regs->tfsdiv, bits);
         SSYNC();
 
         bfin_write(&drv_data->regs->rcr1, chip->ctl_reg & ~(ITCLK | ITFS));
-        bfin_write(&drv_data->regs->rcr2, bits);
         SSYNC();
 
         bfin_sport_spi_cs_active(chip);
@@ -420,11 +416,15 @@ bfin_sport_spi_pump_transfers(unsigned long data)
         drv_data->cs_change = transfer->cs_change;
 
         /* Bits per word setup */
-        bits_per_word = transfer->bits_per_word ? : message->spi->bits_per_word;
-        if (bits_per_word == 8)
-                drv_data->ops = &bfin_sport_transfer_ops_u8;
-        else
+        bits_per_word = transfer->bits_per_word ? :
+                message->spi->bits_per_word ? : 8;
+        if (bits_per_word % 16 == 0)
                 drv_data->ops = &bfin_sport_transfer_ops_u16;
+        else
+                drv_data->ops = &bfin_sport_transfer_ops_u8;
+        bfin_write(&drv_data->regs->tcr2, bits_per_word - 1);
+        bfin_write(&drv_data->regs->tfsdiv, bits_per_word - 1);
+        bfin_write(&drv_data->regs->rcr2, bits_per_word - 1);
 
         drv_data->state = RUNNING_STATE;
 
@@ -598,11 +598,12 @@ bfin_sport_spi_setup(struct spi_device *spi)
                         }
                         chip->cs_chg_udelay = chip_info->cs_chg_udelay;
                         chip->idle_tx_val = chip_info->idle_tx_val;
-                        spi->bits_per_word = chip_info->bits_per_word;
                 }
         }
 
-        if (spi->bits_per_word != 8 && spi->bits_per_word != 16) {
+        if (spi->bits_per_word % 8) {
+                dev_err(&spi->dev, "%d bits_per_word is not supported\n",
+                                spi->bits_per_word);
                 ret = -EINVAL;
                 goto error;
         }
diff --git a/drivers/spi/spi-bfin5xx.c b/drivers/spi/spi-bfin5xx.c
index 3b83ff8b1e2b..9bb4d4af8547 100644
--- a/drivers/spi/spi-bfin5xx.c
+++ b/drivers/spi/spi-bfin5xx.c
@@ -396,7 +396,7 @@ static irqreturn_t bfin_spi_pio_irq_handler(int irq, void *dev_id)
                 /* last read */
                 if (drv_data->rx) {
                         dev_dbg(&drv_data->pdev->dev, "last read\n");
-                        if (n_bytes % 2) {
+                        if (!(n_bytes % 2)) {
                                 u16 *buf = (u16 *)drv_data->rx;
                                 for (loop = 0; loop < n_bytes / 2; loop++)
                                         *buf++ = bfin_read(&drv_data->regs->rdbr);
@@ -424,7 +424,7 @@ static irqreturn_t bfin_spi_pio_irq_handler(int irq, void *dev_id)
         if (drv_data->rx && drv_data->tx) {
                 /* duplex */
                 dev_dbg(&drv_data->pdev->dev, "duplex: write_TDBR\n");
-                if (n_bytes % 2) {
+                if (!(n_bytes % 2)) {
                         u16 *buf = (u16 *)drv_data->rx;
                         u16 *buf2 = (u16 *)drv_data->tx;
                         for (loop = 0; loop < n_bytes / 2; loop++) {
@@ -442,7 +442,7 @@ static irqreturn_t bfin_spi_pio_irq_handler(int irq, void *dev_id)
         } else if (drv_data->rx) {
                 /* read */
                 dev_dbg(&drv_data->pdev->dev, "read: write_TDBR\n");
-                if (n_bytes % 2) {
+                if (!(n_bytes % 2)) {
                         u16 *buf = (u16 *)drv_data->rx;
                         for (loop = 0; loop < n_bytes / 2; loop++) {
                                 *buf++ = bfin_read(&drv_data->regs->rdbr);
@@ -458,7 +458,7 @@ static irqreturn_t bfin_spi_pio_irq_handler(int irq, void *dev_id)
         } else if (drv_data->tx) {
                 /* write */
                 dev_dbg(&drv_data->pdev->dev, "write: write_TDBR\n");
-                if (n_bytes % 2) {
+                if (!(n_bytes % 2)) {
                         u16 *buf = (u16 *)drv_data->tx;
                         for (loop = 0; loop < n_bytes / 2; loop++) {
                                 bfin_read(&drv_data->regs->rdbr);
@@ -587,6 +587,7 @@ static void bfin_spi_pump_transfers(unsigned long data)
         if (message->state == DONE_STATE) {
                 dev_dbg(&drv_data->pdev->dev, "transfer: all done!\n");
                 message->status = 0;
+                bfin_spi_flush(drv_data);
                 bfin_spi_giveback(drv_data);
                 return;
         }
@@ -870,8 +871,10 @@ static void bfin_spi_pump_transfers(unsigned long data)
                 message->actual_length += drv_data->len_in_bytes;
                 /* Move to next transfer of this msg */
                 message->state = bfin_spi_next_transfer(drv_data);
-                if (drv_data->cs_change)
+                if (drv_data->cs_change && message->state != DONE_STATE) {
+                        bfin_spi_flush(drv_data);
                         bfin_spi_cs_deactive(drv_data, chip);
+                }
         }
 
         /* Schedule next transfer tasklet */
@@ -1026,7 +1029,6 @@ static int bfin_spi_setup(struct spi_device *spi)
                 chip->cs_chg_udelay = chip_info->cs_chg_udelay;
                 chip->idle_tx_val = chip_info->idle_tx_val;
                 chip->pio_interrupt = chip_info->pio_interrupt;
-                spi->bits_per_word = chip_info->bits_per_word;
         } else {
                 /* force a default base state */
                 chip->ctl_reg &= bfin_ctl_reg;
diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
index 6db2887852d6..e8055073e84d 100644
--- a/drivers/spi/spi-ep93xx.c
+++ b/drivers/spi/spi-ep93xx.c
@@ -545,13 +545,12 @@ static void ep93xx_spi_pio_transfer(struct ep93xx_spi *espi)
  * in case of failure.
  */
 static struct dma_async_tx_descriptor *
-ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir)
+ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_transfer_direction dir)
 {
         struct spi_transfer *t = espi->current_msg->state;
         struct dma_async_tx_descriptor *txd;
         enum dma_slave_buswidth buswidth;
         struct dma_slave_config conf;
-        enum dma_transfer_direction slave_dirn;
         struct scatterlist *sg;
         struct sg_table *sgt;
         struct dma_chan *chan;
@@ -567,14 +566,13 @@ ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir)
         memset(&conf, 0, sizeof(conf));
         conf.direction = dir;
 
-        if (dir == DMA_FROM_DEVICE) {
+        if (dir == DMA_DEV_TO_MEM) {
                 chan = espi->dma_rx;
                 buf = t->rx_buf;
                 sgt = &espi->rx_sgt;
 
                 conf.src_addr = espi->sspdr_phys;
                 conf.src_addr_width = buswidth;
-                slave_dirn = DMA_DEV_TO_MEM;
         } else {
                 chan = espi->dma_tx;
                 buf = t->tx_buf;
@@ -582,7 +580,6 @@ ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir)
 
                 conf.dst_addr = espi->sspdr_phys;
                 conf.dst_addr_width = buswidth;
-                slave_dirn = DMA_MEM_TO_DEV;
         }
 
         ret = dmaengine_slave_config(chan, &conf);
@@ -633,8 +630,7 @@ ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir)
         if (!nents)
                 return ERR_PTR(-ENOMEM);
 
-        txd = dmaengine_prep_slave_sg(chan, sgt->sgl, nents,
-                                        slave_dirn, DMA_CTRL_ACK);
+        txd = dmaengine_prep_slave_sg(chan, sgt->sgl, nents, dir, DMA_CTRL_ACK);
         if (!txd) {
                 dma_unmap_sg(chan->device->dev, sgt->sgl, sgt->nents, dir);
                 return ERR_PTR(-ENOMEM);
@@ -651,12 +647,12 @@ ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir)
  * unmapped.
  */
 static void ep93xx_spi_dma_finish(struct ep93xx_spi *espi,
-                                  enum dma_data_direction dir)
+                                  enum dma_transfer_direction dir)
 {
         struct dma_chan *chan;
         struct sg_table *sgt;
 
-        if (dir == DMA_FROM_DEVICE) {
+        if (dir == DMA_DEV_TO_MEM) {
                 chan = espi->dma_rx;
                 sgt = &espi->rx_sgt;
         } else {
@@ -677,16 +673,16 @@ static void ep93xx_spi_dma_transfer(struct ep93xx_spi *espi)
         struct spi_message *msg = espi->current_msg;
         struct dma_async_tx_descriptor *rxd, *txd;
 
-        rxd = ep93xx_spi_dma_prepare(espi, DMA_FROM_DEVICE);
+        rxd = ep93xx_spi_dma_prepare(espi, DMA_DEV_TO_MEM);
         if (IS_ERR(rxd)) {
                 dev_err(&espi->pdev->dev, "DMA RX failed: %ld\n", PTR_ERR(rxd));
                 msg->status = PTR_ERR(rxd);
                 return;
         }
 
-        txd = ep93xx_spi_dma_prepare(espi, DMA_TO_DEVICE);
+        txd = ep93xx_spi_dma_prepare(espi, DMA_MEM_TO_DEV);
         if (IS_ERR(txd)) {
-                ep93xx_spi_dma_finish(espi, DMA_FROM_DEVICE);
+                ep93xx_spi_dma_finish(espi, DMA_DEV_TO_MEM);
                 dev_err(&espi->pdev->dev, "DMA TX failed: %ld\n", PTR_ERR(rxd));
                 msg->status = PTR_ERR(txd);
                 return;
@@ -705,8 +701,8 @@ static void ep93xx_spi_dma_transfer(struct ep93xx_spi *espi)
 
         wait_for_completion(&espi->wait);
 
-        ep93xx_spi_dma_finish(espi, DMA_TO_DEVICE);
-        ep93xx_spi_dma_finish(espi, DMA_FROM_DEVICE);
+        ep93xx_spi_dma_finish(espi, DMA_MEM_TO_DEV);
+        ep93xx_spi_dma_finish(espi, DMA_DEV_TO_MEM);
 }
 
 /**
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index 09c925aaf320..400ae2121a2a 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -1667,9 +1667,15 @@ static int calculate_effective_freq(struct pl022 *pl022, int freq, struct
         /* cpsdvsr = 254 & scr = 255 */
         min_tclk = spi_rate(rate, CPSDVR_MAX, SCR_MAX);
 
-        if (!((freq <= max_tclk) && (freq >= min_tclk))) {
+        if (freq > max_tclk)
+                dev_warn(&pl022->adev->dev,
+                        "Max speed that can be programmed is %d Hz, you requested %d\n",
+                        max_tclk, freq);
+
+        if (freq < min_tclk) {
                 dev_err(&pl022->adev->dev,
-                        "controller data is incorrect: out of range frequency");
+                        "Requested frequency: %d Hz is less than minimum possible %d Hz\n",
+                        freq, min_tclk);
                 return -EINVAL;
         }
 
@@ -1681,26 +1687,37 @@ static int calculate_effective_freq(struct pl022 *pl022, int freq, struct
                 while (scr <= SCR_MAX) {
                         tmp = spi_rate(rate, cpsdvsr, scr);
 
-                        if (tmp > freq)
+                        if (tmp > freq) {
+                                /* we need lower freq */
                                 scr++;
+                                continue;
+                        }
+
                         /*
-                         * If found exact value, update and break.
-                         * If found more closer value, update and continue.
+                         * If found exact value, mark found and break.
+                         * If found more closer value, update and break.
                          */
-                        else if ((tmp == freq) || (tmp > best_freq)) {
+                        if (tmp > best_freq) {
                                 best_freq = tmp;
                                 best_cpsdvsr = cpsdvsr;
                                 best_scr = scr;
 
                                 if (tmp == freq)
-                                        break;
+                                        found = 1;
                         }
-                        scr++;
+                        /*
+                         * increased scr will give lower rates, which are not
+                         * required
+                         */
+                        break;
                 }
                 cpsdvsr += 2;
                 scr = SCR_MIN;
         }
 
+        WARN(!best_freq, "pl022: Matching cpsdvsr and scr not found for %d Hz rate \n",
+                        freq);
+
         clk_freq->cpsdvsr = (u8) (best_cpsdvsr & 0xFF);
         clk_freq->scr = (u8) (best_scr & 0xFF);
         dev_dbg(&pl022->adev->dev,
@@ -1823,9 +1840,12 @@ static int pl022_setup(struct spi_device *spi)
         } else
                 chip->cs_control = chip_info->cs_control;
 
-        if (bits <= 3) {
-                /* PL022 doesn't support less than 4-bits */
+        /* Check bits per word with vendor specific range */
+        if ((bits <= 3) || (bits > pl022->vendor->max_bpw)) {
                 status = -ENOTSUPP;
+                dev_err(&spi->dev, "illegal data size for this controller!\n");
+                dev_err(&spi->dev, "This controller can only handle 4 <= n <= %d bit words\n",
+                                pl022->vendor->max_bpw);
                 goto err_config_params;
         } else if (bits <= 8) {
                 dev_dbg(&spi->dev, "4 <= n <=8 bits per word\n");
@@ -1838,20 +1858,10 @@ static int pl022_setup(struct spi_device *spi)
                 chip->read = READING_U16;
                 chip->write = WRITING_U16;
         } else {
-                if (pl022->vendor->max_bpw >= 32) {
-                        dev_dbg(&spi->dev, "17 <= n <= 32 bits per word\n");
-                        chip->n_bytes = 4;
-                        chip->read = READING_U32;
-                        chip->write = WRITING_U32;
-                } else {
-                        dev_err(&spi->dev,
-                                "illegal data size for this controller!\n");
-                        dev_err(&spi->dev,
-                                "a standard pl022 can only handle "
-                                "1 <= n <= 16 bit words\n");
-                        status = -ENOTSUPP;
-                        goto err_config_params;
-                }
+                dev_dbg(&spi->dev, "17 <= n <= 32 bits per word\n");
+                chip->n_bytes = 4;
+                chip->read = READING_U32;
+                chip->write = WRITING_U32;
         }
 
         /* Now Initialize all register settings required for this chip */
diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
index 400df8cbee53..d91751f9ffe8 100644
--- a/drivers/staging/octeon/ethernet-rx.c
+++ b/drivers/staging/octeon/ethernet-rx.c
@@ -36,6 +36,7 @@
 #include <linux/prefetch.h>
 #include <linux/ratelimit.h>
 #include <linux/smp.h>
+#include <linux/interrupt.h>
 #include <net/dst.h>
 #ifdef CONFIG_XFRM
 #include <linux/xfrm.h>
diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
index 56d74dc2fbd5..5877b2c64e2a 100644
--- a/drivers/staging/octeon/ethernet-tx.c
+++ b/drivers/staging/octeon/ethernet-tx.c
@@ -32,6 +32,7 @@
 #include <linux/ip.h>
 #include <linux/ratelimit.h>
 #include <linux/string.h>
+#include <linux/interrupt.h>
 #include <net/dst.h>
 #ifdef CONFIG_XFRM
 #include <linux/xfrm.h>
@@ -344,7 +345,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
         }
         if (unlikely
             (skb->truesize !=
-             sizeof(*skb) + skb_end_pointer(skb) - skb->head)) {
+             sizeof(*skb) + skb_end_offset(skb))) {
                 /*
                    printk("TX buffer truesize has been changed\n");
                  */
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index 9112cd882154..60cba8194de3 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -31,6 +31,7 @@
 #include <linux/etherdevice.h>
 #include <linux/phy.h>
 #include <linux/slab.h>
+#include <linux/interrupt.h>
 
 #include <net/dst.h>
 
diff --git a/drivers/staging/ozwpan/ozpd.c b/drivers/staging/ozwpan/ozpd.c
index 2b45d3d1800c..04cd57f2a6da 100644
--- a/drivers/staging/ozwpan/ozpd.c
+++ b/drivers/staging/ozwpan/ozpd.c
@@ -383,8 +383,6 @@ static void oz_tx_frame_free(struct oz_pd *pd, struct oz_tx_frame *f)
                 pd->tx_pool = &f->link;
                 pd->tx_pool_count++;
                 f = 0;
-        } else {
-                kfree(f);
         }
         spin_unlock_bh(&pd->tx_frame_lock);
         if (f)
diff --git a/drivers/staging/ramster/cluster/tcp.c b/drivers/staging/ramster/cluster/tcp.c
index 3af1b2c51b78..b9721c1055b1 100644
--- a/drivers/staging/ramster/cluster/tcp.c
+++ b/drivers/staging/ramster/cluster/tcp.c
@@ -2106,7 +2106,7 @@ static int r2net_open_listening_sock(__be32 addr, __be16 port)
         r2net_listen_sock = sock;
         INIT_WORK(&r2net_listen_work, r2net_accept_many);
 
-        sock->sk->sk_reuse = 1;
+        sock->sk->sk_reuse = SK_CAN_REUSE;
         ret = sock->ops->bind(sock, (struct sockaddr *)&sin, sizeof(sin));
         if (ret < 0) {
                 printk(KERN_ERR "ramster: Error %d while binding socket at "
diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index 7862513cc295..9cf29fcea11e 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -79,10 +79,6 @@
 #define OMAP343X_CONTROL_IVA2_BOOTADDR (OMAP2_CONTROL_GENERAL + 0x0190)
 #define OMAP343X_CONTROL_IVA2_BOOTMOD (OMAP2_CONTROL_GENERAL + 0x0194)
 
-#define OMAP343X_CTRL_REGADDR(reg) \
-        OMAP2_L4_IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))
-
-
 /* Forward Declarations: */
 static int bridge_brd_monitor(struct bridge_dev_context *dev_ctxt);
 static int bridge_brd_read(struct bridge_dev_context *dev_ctxt,
@@ -418,19 +414,27 @@ static int bridge_brd_start(struct bridge_dev_context *dev_ctxt,
 
                 /* Assert RST1 i.e only the RST only for DSP megacell */
                 if (!status) {
+                        /*
+                         * XXX: ioremapping  MUST be removed once ctrl
+                         * function is made available.
+                         */
+                        void __iomem *ctrl = ioremap(OMAP343X_CTRL_BASE, SZ_4K);
+                        if (!ctrl)
+                                return -ENOMEM;
+
                         (*pdata->dsp_prm_rmw_bits)(OMAP3430_RST1_IVA2_MASK,
                                         OMAP3430_RST1_IVA2_MASK, OMAP3430_IVA2_MOD,
                                         OMAP2_RM_RSTCTRL);
                         /* Mask address with 1K for compatibility */
                         __raw_writel(dsp_addr & OMAP3_IVA2_BOOTADDR_MASK,
-                                        OMAP343X_CTRL_REGADDR(
-                                        OMAP343X_CONTROL_IVA2_BOOTADDR));
+                                        ctrl + OMAP343X_CONTROL_IVA2_BOOTADDR);
                         /*
                          * Set bootmode to self loop if dsp_debug flag is true
                          */
                         __raw_writel((dsp_debug) ? OMAP3_IVA2_BOOTMOD_IDLE : 0,
-                                        OMAP343X_CTRL_REGADDR(
-                                        OMAP343X_CONTROL_IVA2_BOOTMOD));
+                                        ctrl + OMAP343X_CONTROL_IVA2_BOOTMOD);
+
+                        iounmap(ctrl);
                 }
         }
         if (!status) {
diff --git a/drivers/staging/tidspbridge/core/wdt.c b/drivers/staging/tidspbridge/core/wdt.c
index 70055c8111ed..870f934f4f3b 100644
--- a/drivers/staging/tidspbridge/core/wdt.c
+++ b/drivers/staging/tidspbridge/core/wdt.c
@@ -53,7 +53,10 @@ int dsp_wdt_init(void)
         int ret = 0;
 
         dsp_wdt.sm_wdt = NULL;
-        dsp_wdt.reg_base = OMAP2_L4_IO_ADDRESS(OMAP34XX_WDT3_BASE);
+        dsp_wdt.reg_base = ioremap(OMAP34XX_WDT3_BASE, SZ_4K);
+        if (!dsp_wdt.reg_base)
+                return -ENOMEM;
+
         tasklet_init(&dsp_wdt.wdt3_tasklet, dsp_wdt_dpc, 0);
 
         dsp_wdt.fclk = clk_get(NULL, "wdt3_fck");
@@ -99,6 +102,9 @@ void dsp_wdt_exit(void)
         dsp_wdt.fclk = NULL;
         dsp_wdt.iclk = NULL;
         dsp_wdt.sm_wdt = NULL;
+
+        if (dsp_wdt.reg_base)
+                iounmap(dsp_wdt.reg_base);
         dsp_wdt.reg_base = NULL;
 }
 
diff --git a/drivers/staging/zcache/Kconfig b/drivers/staging/zcache/Kconfig
index 3ed2c8f656a5..7048e01f0817 100644
--- a/drivers/staging/zcache/Kconfig
+++ b/drivers/staging/zcache/Kconfig
@@ -2,7 +2,7 @@ config ZCACHE
         bool "Dynamic compression of swap pages and clean pagecache pages"
         # X86 dependency is because zsmalloc uses non-portable pte/tlb
         # functions
-        depends on (CLEANCACHE || FRONTSWAP) && CRYPTO && X86
+        depends on (CLEANCACHE || FRONTSWAP) && CRYPTO=y && X86
         select ZSMALLOC
         select CRYPTO_LZO
         default n
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
index 7ed58e2df791..f286955331a2 100644
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -169,6 +169,7 @@ static struct se_device *fd_create_virtdevice(
         inode = file->f_mapping->host;
         if (S_ISBLK(inode->i_mode)) {
                 struct request_queue *q;
+                unsigned long long dev_size;
                 /*
                  * Setup the local scope queue_limits from struct request_queue->limits
                  * to pass into transport_add_device_to_core_hba() as struct se_dev_limits.
@@ -183,13 +184,12 @@ static struct se_device *fd_create_virtdevice(
                  * one (1) logical sector from underlying struct block_device
                  */
                 fd_dev->fd_block_size = bdev_logical_block_size(inode->i_bdev);
-                fd_dev->fd_dev_size = (i_size_read(file->f_mapping->host) -
+                dev_size = (i_size_read(file->f_mapping->host) -
                                        fd_dev->fd_block_size);
 
                 pr_debug("FILEIO: Using size: %llu bytes from struct"
                         " block_device blocks: %llu logical_block_size: %d\n",
-                        fd_dev->fd_dev_size,
-                        div_u64(fd_dev->fd_dev_size, fd_dev->fd_block_size),
+                        dev_size, div_u64(dev_size, fd_dev->fd_block_size),
                         fd_dev->fd_block_size);
         } else {
                 if (!(fd_dev->fbd_flags & FBDF_HAS_SIZE)) {
@@ -605,10 +605,20 @@ static u32 fd_get_device_type(struct se_device *dev)
 static sector_t fd_get_blocks(struct se_device *dev)
 {
         struct fd_dev *fd_dev = dev->dev_ptr;
-        unsigned long long blocks_long = div_u64(fd_dev->fd_dev_size,
-                        dev->se_sub_dev->se_dev_attrib.block_size);
+        struct file *f = fd_dev->fd_file;
+        struct inode *i = f->f_mapping->host;
+        unsigned long long dev_size;
+        /*
+         * When using a file that references an underlying struct block_device,
+         * ensure dev_size is always based on the current inode size in order
+         * to handle underlying block_device resize operations.
+         */
+        if (S_ISBLK(i->i_mode))
+                dev_size = (i_size_read(i) - fd_dev->fd_block_size);
+        else
+                dev_size = fd_dev->fd_dev_size;
 
-        return blocks_long;
+        return div_u64(dev_size, dev->se_sub_dev->se_dev_attrib.block_size);
 }
 
 static struct se_subsystem_api fileio_template = {
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index 86f0c3b5d500..c3148b10b4b3 100644
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -220,6 +220,9 @@ int target_scsi2_reservation_release(struct se_task *task)
         if (dev->dev_reserved_node_acl != sess->se_node_acl)
                 goto out_unlock;
 
+        if (dev->dev_res_bin_isid != sess->sess_bin_isid)
+                goto out_unlock;
+
         dev->dev_reserved_node_acl = NULL;
         dev->dev_flags &= ~DF_SPC2_RESERVATIONS;
         if (dev->dev_flags & DF_SPC2_RESERVATIONS_WITH_ISID) {
diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
index 70c3ffb981e7..e320ec24aa1b 100644
--- a/drivers/target/target_core_tpg.c
+++ b/drivers/target/target_core_tpg.c
@@ -60,7 +60,6 @@ static void core_clear_initiator_node_from_tpg(
         int i;
         struct se_dev_entry *deve;
         struct se_lun *lun;
-        struct se_lun_acl *acl, *acl_tmp;
 
         spin_lock_irq(&nacl->device_list_lock);
         for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
@@ -81,28 +80,7 @@ static void core_clear_initiator_node_from_tpg(
                 core_update_device_list_for_node(lun, NULL, deve->mapped_lun,
                         TRANSPORT_LUNFLAGS_NO_ACCESS, nacl, tpg, 0);
 
-                spin_lock(&lun->lun_acl_lock);
-                list_for_each_entry_safe(acl, acl_tmp,
-                                        &lun->lun_acl_list, lacl_list) {
-                        if (!strcmp(acl->initiatorname, nacl->initiatorname) &&
-                            (acl->mapped_lun == deve->mapped_lun))
-                                break;
-                }
-
-                if (!acl) {
-                        pr_err("Unable to locate struct se_lun_acl for %s,"
-                                " mapped_lun: %u\n", nacl->initiatorname,
-                                deve->mapped_lun);
-                        spin_unlock(&lun->lun_acl_lock);
-                        spin_lock_irq(&nacl->device_list_lock);
-                        continue;
-                }
-
-                list_del(&acl->lacl_list);
-                spin_unlock(&lun->lun_acl_lock);
-
                 spin_lock_irq(&nacl->device_list_lock);
-                kfree(acl);
         }
         spin_unlock_irq(&nacl->device_list_lock);
 }
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 08ebe901bb59..654755a990df 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -469,7 +469,7 @@ static irqreturn_t pmz_interrupt(int irq, void *dev_id)
         tty = NULL;
         if (r3 & (CHAEXT | CHATxIP | CHARxIP)) {
                 if (!ZS_IS_OPEN(uap_a)) {
-                        pmz_debug("ChanA interrupt while open !\n");
+                        pmz_debug("ChanA interrupt while not open !\n");
                         goto skip_a;
                 }
                 write_zsreg(uap_a, R0, RES_H_IUS);
@@ -493,8 +493,8 @@ static irqreturn_t pmz_interrupt(int irq, void *dev_id)
         spin_lock(&uap_b->port.lock);
         tty = NULL;
         if (r3 & (CHBEXT | CHBTxIP | CHBRxIP)) {
-                if (!ZS_IS_OPEN(uap_a)) {
-                        pmz_debug("ChanB interrupt while open !\n");
+                if (!ZS_IS_OPEN(uap_b)) {
+                        pmz_debug("ChanB interrupt while not open !\n");
                         goto skip_b;
                 }
                 write_zsreg(uap_b, R0, RES_H_IUS);
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index 86dd1e302bb3..3b0c4e32ed7b 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -1085,15 +1085,21 @@ void vt_set_led_state(int console, int leds)
  *
  *      Handle console start. This is a wrapper for the VT layer
  *      so that we can keep kbd knowledge internal
+ *
+ *      FIXME: We eventually need to hold the kbd lock here to protect
+ *      the LED updating. We can't do it yet because fn_hold calls stop_tty
+ *      and start_tty under the kbd_event_lock, while normal tty paths
+ *      don't hold the lock. We probably need to split out an LED lock
+ *      but not during an -rc release!
  */
 void vt_kbd_con_start(int console)
 {
         struct kbd_struct * kbd = kbd_table + console;
-        unsigned long flags;
-        spin_lock_irqsave(&kbd_event_lock, flags);
+/*      unsigned long flags; */
+/*      spin_lock_irqsave(&kbd_event_lock, flags); */
         clr_vc_kbd_led(kbd, VC_SCROLLOCK);
         set_leds();
-        spin_unlock_irqrestore(&kbd_event_lock, flags);
+/*      spin_unlock_irqrestore(&kbd_event_lock, flags); */
 }
 
 /**
@@ -1102,22 +1108,28 @@ void vt_kbd_con_start(int console)
  *
  *      Handle console stop. This is a wrapper for the VT layer
  *      so that we can keep kbd knowledge internal
+ *
+ *      FIXME: We eventually need to hold the kbd lock here to protect
+ *      the LED updating. We can't do it yet because fn_hold calls stop_tty
+ *      and start_tty under the kbd_event_lock, while normal tty paths
+ *      don't hold the lock. We probably need to split out an LED lock
+ *      but not during an -rc release!
  */
 void vt_kbd_con_stop(int console)
 {
         struct kbd_struct * kbd = kbd_table + console;
-        unsigned long flags;
-        spin_lock_irqsave(&kbd_event_lock, flags);
+/*      unsigned long flags; */
+/*      spin_lock_irqsave(&kbd_event_lock, flags); */
         set_vc_kbd_led(kbd, VC_SCROLLOCK);
         set_leds();
-        spin_unlock_irqrestore(&kbd_event_lock, flags);
+/*      spin_unlock_irqrestore(&kbd_event_lock, flags); */
 }
 
 /*
  * This is the tasklet that updates LED state on all keyboards
  * attached to the box. The reason we use tasklet is that we
  * need to handle the scenario when keyboard handler is not
- * registered yet but we already getting updates form VT to
+ * registered yet but we already getting updates from the VT to
  * update led state.
  */
 static void kbd_bh(unsigned long dummy)
@@ -2032,7 +2044,7 @@ int vt_do_kdskled(int console, int cmd, unsigned long arg, int perm)
                 kbd->default_ledflagstate = ((arg >> 4) & 7);
                 set_leds();
                 spin_unlock_irqrestore(&kbd_event_lock, flags);
-                break;
+                return 0;
 
         /* the ioctls below only set the lights, not the functions */
         /* for those, see KDGKBLED and KDSKBLED above */
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index c6f6560d436c..0bb2b3248dad 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -157,8 +157,9 @@ static void wdm_out_callback(struct urb *urb)
         spin_lock(&desc->iuspin);
         desc->werr = urb->status;
         spin_unlock(&desc->iuspin);
-        clear_bit(WDM_IN_USE, &desc->flags);
         kfree(desc->outbuf);
+        desc->outbuf = NULL;
+        clear_bit(WDM_IN_USE, &desc->flags);
         wake_up(&desc->wait);
 }
 
@@ -338,7 +339,7 @@ static ssize_t wdm_write
         if (we < 0)
                 return -EIO;
 
-        desc->outbuf = buf = kmalloc(count, GFP_KERNEL);
+        buf = kmalloc(count, GFP_KERNEL);
         if (!buf) {
                 rv = -ENOMEM;
                 goto outnl;
@@ -406,10 +407,12 @@ static ssize_t wdm_write
         req->wIndex = desc->inum;
         req->wLength = cpu_to_le16(count);
         set_bit(WDM_IN_USE, &desc->flags);
+        desc->outbuf = buf;
 
         rv = usb_submit_urb(desc->command, GFP_KERNEL);
         if (rv < 0) {
                 kfree(buf);
+                desc->outbuf = NULL;
                 clear_bit(WDM_IN_USE, &desc->flags);
                 dev_err(&desc->intf->dev, "Tx URB error: %d\n", rv);
         } else {
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index 622b4a48e732..57ed9e400c06 100644
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -493,6 +493,15 @@ static int hcd_pci_suspend_noirq(struct device *dev)
 
         pci_save_state(pci_dev);
 
+        /*
+         * Some systems crash if an EHCI controller is in D3 during
+         * a sleep transition.  We have to leave such controllers in D0.
+         */
+        if (hcd->broken_pci_sleep) {
+                dev_dbg(dev, "Staying in PCI D0\n");
+                return retval;
+        }
+
         /* If the root hub is dead rather than suspended, disallow remote
          * wakeup.  usb_hc_died() should ensure that both hosts are marked as
          * dying, so we only need to check the primary roothub.
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index a6dfd2164166..170cbe89d9f8 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -927,7 +927,6 @@ static int dummy_udc_stop(struct usb_gadget *g,
 
         dum->driver = NULL;
 
-        dummy_pullup(&dum->gadget, 0);
         return 0;
 }
 
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index a371e966425f..cb8c162cae5a 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -2189,7 +2189,7 @@ unknown_cmnd:
                 common->data_size_from_cmnd = 0;
                 sprintf(unknown, "Unknown x%02x", common->cmnd[0]);
                 reply = check_command(common, common->cmnd_size,
-                                      DATA_DIR_UNKNOWN, 0xff, 0, unknown);
+                                      DATA_DIR_UNKNOWN, ~0, 0, unknown);
                 if (reply == 0) {
                         common->curlun->sense_data = SS_INVALID_COMMAND;
                         reply = -EINVAL;
diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
index 52343654f5df..d4f823f463e9 100644
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -637,7 +637,7 @@ static void rndis_open(struct gether *geth)
 
         DBG(cdev, "%s\n", __func__);
 
-        rndis_set_param_medium(rndis->config, NDIS_MEDIUM_802_3,
+        rndis_set_param_medium(rndis->config, RNDIS_MEDIUM_802_3,
                                 bitrate(cdev->gadget) / 100);
         rndis_signal_connect(rndis->config);
 }
@@ -648,7 +648,7 @@ static void rndis_close(struct gether *geth)
 
         DBG(geth->func.config->cdev, "%s\n", __func__);
 
-        rndis_set_param_medium(rndis->config, NDIS_MEDIUM_802_3, 0);
+        rndis_set_param_medium(rndis->config, RNDIS_MEDIUM_802_3, 0);
         rndis_signal_disconnect(rndis->config);
 }
 
@@ -765,7 +765,7 @@ rndis_bind(struct usb_configuration *c, struct usb_function *f)
                 goto fail;
         rndis->config = status;
 
-        rndis_set_param_medium(rndis->config, NDIS_MEDIUM_802_3, 0);
+        rndis_set_param_medium(rndis->config, RNDIS_MEDIUM_802_3, 0);
         rndis_set_host_mac(rndis->config, rndis->ethaddr);
 
 #if 0
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 4fac56927741..a896d73f7a93 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -2579,7 +2579,7 @@ static int do_scsi_command(struct fsg_dev *fsg)
                 fsg->data_size_from_cmnd = 0;
                 sprintf(unknown, "Unknown x%02x", fsg->cmnd[0]);
                 if ((reply = check_command(fsg, fsg->cmnd_size,
-                                DATA_DIR_UNKNOWN, 0xff, 0, unknown)) == 0) {
+                                DATA_DIR_UNKNOWN, ~0, 0, unknown)) == 0) {
                         fsg->curlun->sense_data = SS_INVALID_COMMAND;
                         reply = -EINVAL;
                 }
diff --git a/drivers/usb/gadget/ndis.h b/drivers/usb/gadget/ndis.h
index b0e52fc277b4..a19f72dec0cd 100644
--- a/drivers/usb/gadget/ndis.h
+++ b/drivers/usb/gadget/ndis.h
@@ -15,11 +15,6 @@
 #ifndef _LINUX_NDIS_H
 #define _LINUX_NDIS_H
 
-
-#define NDIS_STATUS_MULTICAST_FULL        0xC0010009
-#define NDIS_STATUS_MULTICAST_EXISTS      0xC001000A
-#define NDIS_STATUS_MULTICAST_NOT_FOUND   0xC001000B
-
 enum NDIS_DEVICE_POWER_STATE {
         NdisDeviceStateUnspecified = 0,
         NdisDeviceStateD0,
@@ -35,11 +30,6 @@ struct NDIS_PM_WAKE_UP_CAPABILITIES {
         enum NDIS_DEVICE_POWER_STATE  MinLinkChangeWakeUp;
 };
 
-/* NDIS_PNP_CAPABILITIES.Flags constants */
-#define NDIS_DEVICE_WAKE_UP_ENABLE                0x00000001
-#define NDIS_DEVICE_WAKE_ON_PATTERN_MATCH_ENABLE  0x00000002
-#define NDIS_DEVICE_WAKE_ON_MAGIC_PACKET_ENABLE   0x00000004
-
 struct NDIS_PNP_CAPABILITIES {
         __le32                                  Flags;
         struct NDIS_PM_WAKE_UP_CAPABILITIES     WakeUpCapabilities;
@@ -54,158 +44,4 @@ struct NDIS_PM_PACKET_PATTERN {
         __le32  PatternFlags;
 };
 
-
-/* Required Object IDs (OIDs) */
-#define OID_GEN_SUPPORTED_LIST            0x00010101
-#define OID_GEN_HARDWARE_STATUS           0x00010102
-#define OID_GEN_MEDIA_SUPPORTED           0x00010103
-#define OID_GEN_MEDIA_IN_USE              0x00010104
-#define OID_GEN_MAXIMUM_LOOKAHEAD         0x00010105
-#define OID_GEN_MAXIMUM_FRAME_SIZE        0x00010106
-#define OID_GEN_LINK_SPEED                0x00010107
-#define OID_GEN_TRANSMIT_BUFFER_SPACE     0x00010108
-#define OID_GEN_RECEIVE_BUFFER_SPACE      0x00010109
-#define OID_GEN_TRANSMIT_BLOCK_SIZE       0x0001010A
-#define OID_GEN_RECEIVE_BLOCK_SIZE        0x0001010B
-#define OID_GEN_VENDOR_ID                 0x0001010C
-#define OID_GEN_VENDOR_DESCRIPTION        0x0001010D
-#define OID_GEN_CURRENT_PACKET_FILTER     0x0001010E
-#define OID_GEN_CURRENT_LOOKAHEAD         0x0001010F
-#define OID_GEN_DRIVER_VERSION            0x00010110
-#define OID_GEN_MAXIMUM_TOTAL_SIZE        0x00010111
-#define OID_GEN_PROTOCOL_OPTIONS          0x00010112
-#define OID_GEN_MAC_OPTIONS               0x00010113
-#define OID_GEN_MEDIA_CONNECT_STATUS      0x00010114
-#define OID_GEN_MAXIMUM_SEND_PACKETS      0x00010115
-#define OID_GEN_VENDOR_DRIVER_VERSION     0x00010116
-#define OID_GEN_SUPPORTED_GUIDS           0x00010117
-#define OID_GEN_NETWORK_LAYER_ADDRESSES   0x00010118
-#define OID_GEN_TRANSPORT_HEADER_OFFSET   0x00010119
-#define OID_GEN_MACHINE_NAME              0x0001021A
-#define OID_GEN_RNDIS_CONFIG_PARAMETER    0x0001021B
-#define OID_GEN_VLAN_ID                   0x0001021C
-
-/* Optional OIDs */
-#define OID_GEN_MEDIA_CAPABILITIES        0x00010201
-#define OID_GEN_PHYSICAL_MEDIUM           0x00010202
-
-/* Required statistics OIDs */
-#define OID_GEN_XMIT_OK                   0x00020101
-#define OID_GEN_RCV_OK                    0x00020102
-#define OID_GEN_XMIT_ERROR                0x00020103
-#define OID_GEN_RCV_ERROR                 0x00020104
-#define OID_GEN_RCV_NO_BUFFER             0x00020105
-
-/* Optional statistics OIDs */
-#define OID_GEN_DIRECTED_BYTES_XMIT       0x00020201
-#define OID_GEN_DIRECTED_FRAMES_XMIT      0x00020202
-#define OID_GEN_MULTICAST_BYTES_XMIT      0x00020203
-#define OID_GEN_MULTICAST_FRAMES_XMIT     0x00020204
-#define OID_GEN_BROADCAST_BYTES_XMIT      0x00020205
-#define OID_GEN_BROADCAST_FRAMES_XMIT     0x00020206
-#define OID_GEN_DIRECTED_BYTES_RCV        0x00020207
-#define OID_GEN_DIRECTED_FRAMES_RCV       0x00020208
-#define OID_GEN_MULTICAST_BYTES_RCV       0x00020209
-#define OID_GEN_MULTICAST_FRAMES_RCV      0x0002020A
-#define OID_GEN_BROADCAST_BYTES_RCV       0x0002020B
-#define OID_GEN_BROADCAST_FRAMES_RCV      0x0002020C
-#define OID_GEN_RCV_CRC_ERROR             0x0002020D
-#define OID_GEN_TRANSMIT_QUEUE_LENGTH     0x0002020E
-#define OID_GEN_GET_TIME_CAPS             0x0002020F
-#define OID_GEN_GET_NETCARD_TIME          0x00020210
-#define OID_GEN_NETCARD_LOAD              0x00020211
-#define OID_GEN_DEVICE_PROFILE            0x00020212
-#define OID_GEN_INIT_TIME_MS              0x00020213
-#define OID_GEN_RESET_COUNTS              0x00020214
-#define OID_GEN_MEDIA_SENSE_COUNTS        0x00020215
-#define OID_GEN_FRIENDLY_NAME             0x00020216
-#define OID_GEN_MINIPORT_INFO             0x00020217
-#define OID_GEN_RESET_VERIFY_PARAMETERS   0x00020218
-
-/* IEEE 802.3 (Ethernet) OIDs */
-#define NDIS_802_3_MAC_OPTION_PRIORITY    0x00000001
-
-#define OID_802_3_PERMANENT_ADDRESS       0x01010101
-#define OID_802_3_CURRENT_ADDRESS         0x01010102
-#define OID_802_3_MULTICAST_LIST          0x01010103
-#define OID_802_3_MAXIMUM_LIST_SIZE       0x01010104
-#define OID_802_3_MAC_OPTIONS             0x01010105
-#define OID_802_3_RCV_ERROR_ALIGNMENT     0x01020101
-#define OID_802_3_XMIT_ONE_COLLISION      0x01020102
-#define OID_802_3_XMIT_MORE_COLLISIONS    0x01020103
-#define OID_802_3_XMIT_DEFERRED           0x01020201
-#define OID_802_3_XMIT_MAX_COLLISIONS     0x01020202
-#define OID_802_3_RCV_OVERRUN             0x01020203
-#define OID_802_3_XMIT_UNDERRUN           0x01020204
-#define OID_802_3_XMIT_HEARTBEAT_FAILURE  0x01020205
-#define OID_802_3_XMIT_TIMES_CRS_LOST     0x01020206
-#define OID_802_3_XMIT_LATE_COLLISIONS    0x01020207
-
-/* OID_GEN_MINIPORT_INFO constants */
-#define NDIS_MINIPORT_BUS_MASTER                      0x00000001
-#define NDIS_MINIPORT_WDM_DRIVER                      0x00000002
-#define NDIS_MINIPORT_SG_LIST                         0x00000004
-#define NDIS_MINIPORT_SUPPORTS_MEDIA_QUERY            0x00000008
-#define NDIS_MINIPORT_INDICATES_PACKETS               0x00000010
-#define NDIS_MINIPORT_IGNORE_PACKET_QUEUE             0x00000020
-#define NDIS_MINIPORT_IGNORE_REQUEST_QUEUE            0x00000040
-#define NDIS_MINIPORT_IGNORE_TOKEN_RING_ERRORS        0x00000080
-#define NDIS_MINIPORT_INTERMEDIATE_DRIVER             0x00000100
-#define NDIS_MINIPORT_IS_NDIS_5                       0x00000200
-#define NDIS_MINIPORT_IS_CO                           0x00000400
-#define NDIS_MINIPORT_DESERIALIZE                     0x00000800
-#define NDIS_MINIPORT_REQUIRES_MEDIA_POLLING          0x00001000
-#define NDIS_MINIPORT_SUPPORTS_MEDIA_SENSE            0x00002000
-#define NDIS_MINIPORT_NETBOOT_CARD                    0x00004000
-#define NDIS_MINIPORT_PM_SUPPORTED                    0x00008000
-#define NDIS_MINIPORT_SUPPORTS_MAC_ADDRESS_OVERWRITE  0x00010000
-#define NDIS_MINIPORT_USES_SAFE_BUFFER_APIS           0x00020000
-#define NDIS_MINIPORT_HIDDEN                          0x00040000
-#define NDIS_MINIPORT_SWENUM                          0x00080000
-#define NDIS_MINIPORT_SURPRISE_REMOVE_OK              0x00100000
-#define NDIS_MINIPORT_NO_HALT_ON_SUSPEND              0x00200000
-#define NDIS_MINIPORT_HARDWARE_DEVICE                 0x00400000
-#define NDIS_MINIPORT_SUPPORTS_CANCEL_SEND_PACKETS    0x00800000
-#define NDIS_MINIPORT_64BITS_DMA                      0x01000000
-
-#define NDIS_MEDIUM_802_3               0x00000000
-#define NDIS_MEDIUM_802_5               0x00000001
-#define NDIS_MEDIUM_FDDI                0x00000002
-#define NDIS_MEDIUM_WAN                 0x00000003
-#define NDIS_MEDIUM_LOCAL_TALK          0x00000004
-#define NDIS_MEDIUM_DIX                 0x00000005
-#define NDIS_MEDIUM_ARCENT_RAW          0x00000006
-#define NDIS_MEDIUM_ARCENT_878_2        0x00000007
-#define NDIS_MEDIUM_ATM                 0x00000008
-#define NDIS_MEDIUM_WIRELESS_LAN        0x00000009
-#define NDIS_MEDIUM_IRDA                0x0000000A
-#define NDIS_MEDIUM_BPC                 0x0000000B
-#define NDIS_MEDIUM_CO_WAN              0x0000000C
-#define NDIS_MEDIUM_1394                0x0000000D
-
-#define NDIS_PACKET_TYPE_DIRECTED       0x00000001
-#define NDIS_PACKET_TYPE_MULTICAST      0x00000002
-#define NDIS_PACKET_TYPE_ALL_MULTICAST  0x00000004
-#define NDIS_PACKET_TYPE_BROADCAST      0x00000008
-#define NDIS_PACKET_TYPE_SOURCE_ROUTING 0x00000010
-#define NDIS_PACKET_TYPE_PROMISCUOUS    0x00000020
-#define NDIS_PACKET_TYPE_SMT            0x00000040
-#define NDIS_PACKET_TYPE_ALL_LOCAL      0x00000080
-#define NDIS_PACKET_TYPE_GROUP          0x00000100
-#define NDIS_PACKET_TYPE_ALL_FUNCTIONAL 0x00000200
-#define NDIS_PACKET_TYPE_FUNCTIONAL     0x00000400
-#define NDIS_PACKET_TYPE_MAC_FRAME      0x00000800
-
-#define NDIS_MEDIA_STATE_CONNECTED      0x00000000
-#define NDIS_MEDIA_STATE_DISCONNECTED   0x00000001
-
-#define NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA     0x00000001
-#define NDIS_MAC_OPTION_RECEIVE_SERIALIZED      0x00000002
-#define NDIS_MAC_OPTION_TRANSFERS_NOT_PEND      0x00000004
-#define NDIS_MAC_OPTION_NO_LOOPBACK             0x00000008
-#define NDIS_MAC_OPTION_FULL_DUPLEX             0x00000010
-#define NDIS_MAC_OPTION_EOTX_INDICATION         0x00000020
-#define NDIS_MAC_OPTION_8021P_PRIORITY          0x00000040
-#define NDIS_MAC_OPTION_RESERVED                0x80000000
-
 #endif /* _LINUX_NDIS_H */
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c
index 73a934a170d1..b35babed6fcb 100644
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@ -73,65 +73,65 @@ static rndis_resp_t *rndis_add_response(int configNr, u32 length);
 static const u32 oid_supported_list[] =
 {
         /* the general stuff */
-        OID_GEN_SUPPORTED_LIST,
-        OID_GEN_HARDWARE_STATUS,
-        OID_GEN_MEDIA_SUPPORTED,
-        OID_GEN_MEDIA_IN_USE,
-        OID_GEN_MAXIMUM_FRAME_SIZE,
-        OID_GEN_LINK_SPEED,
-        OID_GEN_TRANSMIT_BLOCK_SIZE,
-        OID_GEN_RECEIVE_BLOCK_SIZE,
-        OID_GEN_VENDOR_ID,
-        OID_GEN_VENDOR_DESCRIPTION,
-        OID_GEN_VENDOR_DRIVER_VERSION,
-        OID_GEN_CURRENT_PACKET_FILTER,
-        OID_GEN_MAXIMUM_TOTAL_SIZE,
-        OID_GEN_MEDIA_CONNECT_STATUS,
-        OID_GEN_PHYSICAL_MEDIUM,
+        RNDIS_OID_GEN_SUPPORTED_LIST,
+        RNDIS_OID_GEN_HARDWARE_STATUS,
+        RNDIS_OID_GEN_MEDIA_SUPPORTED,
+        RNDIS_OID_GEN_MEDIA_IN_USE,
+        RNDIS_OID_GEN_MAXIMUM_FRAME_SIZE,
+        RNDIS_OID_GEN_LINK_SPEED,
+        RNDIS_OID_GEN_TRANSMIT_BLOCK_SIZE,
+        RNDIS_OID_GEN_RECEIVE_BLOCK_SIZE,
+        RNDIS_OID_GEN_VENDOR_ID,
+        RNDIS_OID_GEN_VENDOR_DESCRIPTION,
+        RNDIS_OID_GEN_VENDOR_DRIVER_VERSION,
+        RNDIS_OID_GEN_CURRENT_PACKET_FILTER,
+        RNDIS_OID_GEN_MAXIMUM_TOTAL_SIZE,
+        RNDIS_OID_GEN_MEDIA_CONNECT_STATUS,
+        RNDIS_OID_GEN_PHYSICAL_MEDIUM,
 
         /* the statistical stuff */
-        OID_GEN_XMIT_OK,
-        OID_GEN_RCV_OK,
-        OID_GEN_XMIT_ERROR,
-        OID_GEN_RCV_ERROR,
-        OID_GEN_RCV_NO_BUFFER,
+        RNDIS_OID_GEN_XMIT_OK,
+        RNDIS_OID_GEN_RCV_OK,
+        RNDIS_OID_GEN_XMIT_ERROR,
+        RNDIS_OID_GEN_RCV_ERROR,
+        RNDIS_OID_GEN_RCV_NO_BUFFER,
 #ifdef  RNDIS_OPTIONAL_STATS
-        OID_GEN_DIRECTED_BYTES_XMIT,
-        OID_GEN_DIRECTED_FRAMES_XMIT,
-        OID_GEN_MULTICAST_BYTES_XMIT,
-        OID_GEN_MULTICAST_FRAMES_XMIT,
-        OID_GEN_BROADCAST_BYTES_XMIT,
-        OID_GEN_BROADCAST_FRAMES_XMIT,
-        OID_GEN_DIRECTED_BYTES_RCV,
-        OID_GEN_DIRECTED_FRAMES_RCV,
-        OID_GEN_MULTICAST_BYTES_RCV,
-        OID_GEN_MULTICAST_FRAMES_RCV,
-        OID_GEN_BROADCAST_BYTES_RCV,
-        OID_GEN_BROADCAST_FRAMES_RCV,
-        OID_GEN_RCV_CRC_ERROR,
-        OID_GEN_TRANSMIT_QUEUE_LENGTH,
+        RNDIS_OID_GEN_DIRECTED_BYTES_XMIT,
+        RNDIS_OID_GEN_DIRECTED_FRAMES_XMIT,
+        RNDIS_OID_GEN_MULTICAST_BYTES_XMIT,
+        RNDIS_OID_GEN_MULTICAST_FRAMES_XMIT,
+        RNDIS_OID_GEN_BROADCAST_BYTES_XMIT,
+        RNDIS_OID_GEN_BROADCAST_FRAMES_XMIT,
+        RNDIS_OID_GEN_DIRECTED_BYTES_RCV,
+        RNDIS_OID_GEN_DIRECTED_FRAMES_RCV,
+        RNDIS_OID_GEN_MULTICAST_BYTES_RCV,
+        RNDIS_OID_GEN_MULTICAST_FRAMES_RCV,
+        RNDIS_OID_GEN_BROADCAST_BYTES_RCV,
+        RNDIS_OID_GEN_BROADCAST_FRAMES_RCV,
+        RNDIS_OID_GEN_RCV_CRC_ERROR,
+        RNDIS_OID_GEN_TRANSMIT_QUEUE_LENGTH,
 #endif  /* RNDIS_OPTIONAL_STATS */
 
         /* mandatory 802.3 */
         /* the general stuff */
-        OID_802_3_PERMANENT_ADDRESS,
-        OID_802_3_CURRENT_ADDRESS,
-        OID_802_3_MULTICAST_LIST,
-        OID_802_3_MAC_OPTIONS,
-        OID_802_3_MAXIMUM_LIST_SIZE,
+        RNDIS_OID_802_3_PERMANENT_ADDRESS,
+        RNDIS_OID_802_3_CURRENT_ADDRESS,
+        RNDIS_OID_802_3_MULTICAST_LIST,
+        RNDIS_OID_802_3_MAC_OPTIONS,
+        RNDIS_OID_802_3_MAXIMUM_LIST_SIZE,
 
         /* the statistical stuff */
-        OID_802_3_RCV_ERROR_ALIGNMENT,
-        OID_802_3_XMIT_ONE_COLLISION,
-        OID_802_3_XMIT_MORE_COLLISIONS,
+        RNDIS_OID_802_3_RCV_ERROR_ALIGNMENT,
+        RNDIS_OID_802_3_XMIT_ONE_COLLISION,
+        RNDIS_OID_802_3_XMIT_MORE_COLLISIONS,
 #ifdef  RNDIS_OPTIONAL_STATS
-        OID_802_3_XMIT_DEFERRED,
-        OID_802_3_XMIT_MAX_COLLISIONS,
-        OID_802_3_RCV_OVERRUN,
-        OID_802_3_XMIT_UNDERRUN,
-        OID_802_3_XMIT_HEARTBEAT_FAILURE,
-        OID_802_3_XMIT_TIMES_CRS_LOST,
-        OID_802_3_XMIT_LATE_COLLISIONS,
+        RNDIS_OID_802_3_XMIT_DEFERRED,
+        RNDIS_OID_802_3_XMIT_MAX_COLLISIONS,
+        RNDIS_OID_802_3_RCV_OVERRUN,
+        RNDIS_OID_802_3_XMIT_UNDERRUN,
+        RNDIS_OID_802_3_XMIT_HEARTBEAT_FAILURE,
+        RNDIS_OID_802_3_XMIT_TIMES_CRS_LOST,
+        RNDIS_OID_802_3_XMIT_LATE_COLLISIONS,
 #endif  /* RNDIS_OPTIONAL_STATS */
 
 #ifdef  RNDIS_PM
@@ -200,8 +200,8 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
         /* general oids (table 4-1) */
 
         /* mandatory */
-        case OID_GEN_SUPPORTED_LIST:
-                pr_debug("%s: OID_GEN_SUPPORTED_LIST\n", __func__);
+        case RNDIS_OID_GEN_SUPPORTED_LIST:
+                pr_debug("%s: RNDIS_OID_GEN_SUPPORTED_LIST\n", __func__);
                 length = sizeof(oid_supported_list);
                 count  = length / sizeof(u32);
                 for (i = 0; i < count; i++)
@@ -210,8 +210,8 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
                 break;
 
         /* mandatory */
-        case OID_GEN_HARDWARE_STATUS:
-                pr_debug("%s: OID_GEN_HARDWARE_STATUS\n", __func__);
+        case RNDIS_OID_GEN_HARDWARE_STATUS:
+                pr_debug("%s: RNDIS_OID_GEN_HARDWARE_STATUS\n", __func__);
                 /* Bogus question!
                  * Hardware must be ready to receive high level protocols.
                  * BTW:
@@ -223,23 +223,23 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
                 break;
 
         /* mandatory */
-        case OID_GEN_MEDIA_SUPPORTED:
-                pr_debug("%s: OID_GEN_MEDIA_SUPPORTED\n", __func__);
+        case RNDIS_OID_GEN_MEDIA_SUPPORTED:
+                pr_debug("%s: RNDIS_OID_GEN_MEDIA_SUPPORTED\n", __func__);
                 *outbuf = cpu_to_le32(rndis_per_dev_params[configNr].medium);
                 retval = 0;
                 break;
 
         /* mandatory */
-        case OID_GEN_MEDIA_IN_USE:
-                pr_debug("%s: OID_GEN_MEDIA_IN_USE\n", __func__);
+        case RNDIS_OID_GEN_MEDIA_IN_USE:
+                pr_debug("%s: RNDIS_OID_GEN_MEDIA_IN_USE\n", __func__);
                 /* one medium, one transport... (maybe you do it better) */
                 *outbuf = cpu_to_le32(rndis_per_dev_params[configNr].medium);
                 retval = 0;
                 break;
 
         /* mandatory */
-        case OID_GEN_MAXIMUM_FRAME_SIZE:
-                pr_debug("%s: OID_GEN_MAXIMUM_FRAME_SIZE\n", __func__);
+        case RNDIS_OID_GEN_MAXIMUM_FRAME_SIZE:
+                pr_debug("%s: RNDIS_OID_GEN_MAXIMUM_FRAME_SIZE\n", __func__);
                 if (rndis_per_dev_params[configNr].dev) {
                         *outbuf = cpu_to_le32(
                                 rndis_per_dev_params[configNr].dev->mtu);
@@ -248,11 +248,11 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
                 break;
 
         /* mandatory */
-        case OID_GEN_LINK_SPEED:
+        case RNDIS_OID_GEN_LINK_SPEED:
                 if (rndis_debug > 1)
-                        pr_debug("%s: OID_GEN_LINK_SPEED\n", __func__);
+                        pr_debug("%s: RNDIS_OID_GEN_LINK_SPEED\n", __func__);
                 if (rndis_per_dev_params[configNr].media_state
-                                == NDIS_MEDIA_STATE_DISCONNECTED)
+                                == RNDIS_MEDIA_STATE_DISCONNECTED)
                         *outbuf = cpu_to_le32(0);
                 else
                         *outbuf = cpu_to_le32(
@@ -261,8 +261,8 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
                 break;
 
         /* mandatory */
-        case OID_GEN_TRANSMIT_BLOCK_SIZE:
-                pr_debug("%s: OID_GEN_TRANSMIT_BLOCK_SIZE\n", __func__);
+        case RNDIS_OID_GEN_TRANSMIT_BLOCK_SIZE:
+                pr_debug("%s: RNDIS_OID_GEN_TRANSMIT_BLOCK_SIZE\n", __func__);
                 if (rndis_per_dev_params[configNr].dev) {
                         *outbuf = cpu_to_le32(
                                 rndis_per_dev_params[configNr].dev->mtu);
@@ -271,8 +271,8 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
                 break;
 
         /* mandatory */
-        case OID_GEN_RECEIVE_BLOCK_SIZE:
-                pr_debug("%s: OID_GEN_RECEIVE_BLOCK_SIZE\n", __func__);
+        case RNDIS_OID_GEN_RECEIVE_BLOCK_SIZE:
+                pr_debug("%s: RNDIS_OID_GEN_RECEIVE_BLOCK_SIZE\n", __func__);
                 if (rndis_per_dev_params[configNr].dev) {
                         *outbuf = cpu_to_le32(
                                 rndis_per_dev_params[configNr].dev->mtu);
@@ -281,16 +281,16 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
                 break;
 
         /* mandatory */
-        case OID_GEN_VENDOR_ID:
-                pr_debug("%s: OID_GEN_VENDOR_ID\n", __func__);
+        case RNDIS_OID_GEN_VENDOR_ID:
+                pr_debug("%s: RNDIS_OID_GEN_VENDOR_ID\n", __func__);
                 *outbuf = cpu_to_le32(
                         rndis_per_dev_params[configNr].vendorID);
                 retval = 0;
                 break;
 
         /* mandatory */
-        case OID_GEN_VENDOR_DESCRIPTION:
-                pr_debug("%s: OID_GEN_VENDOR_DESCRIPTION\n", __func__);
+        case RNDIS_OID_GEN_VENDOR_DESCRIPTION:
+                pr_debug("%s: RNDIS_OID_GEN_VENDOR_DESCRIPTION\n", __func__);
                 if (rndis_per_dev_params[configNr].vendorDescr) {
                         length = strlen(rndis_per_dev_params[configNr].
                                         vendorDescr);
@@ -303,38 +303,38 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
                 retval = 0;
                 break;
 
-        case OID_GEN_VENDOR_DRIVER_VERSION:
-                pr_debug("%s: OID_GEN_VENDOR_DRIVER_VERSION\n", __func__);
+        case RNDIS_OID_GEN_VENDOR_DRIVER_VERSION:
+                pr_debug("%s: RNDIS_OID_GEN_VENDOR_DRIVER_VERSION\n", __func__);
                 /* Created as LE */
                 *outbuf = rndis_driver_version;
                 retval = 0;
                 break;
 
         /* mandatory */
-        case OID_GEN_CURRENT_PACKET_FILTER:
-                pr_debug("%s: OID_GEN_CURRENT_PACKET_FILTER\n", __func__);
+        case RNDIS_OID_GEN_CURRENT_PACKET_FILTER:
+                pr_debug("%s: RNDIS_OID_GEN_CURRENT_PACKET_FILTER\n", __func__);
                 *outbuf = cpu_to_le32(*rndis_per_dev_params[configNr].filter);
                 retval = 0;
                 break;
 
         /* mandatory */
-        case OID_GEN_MAXIMUM_TOTAL_SIZE:
-                pr_debug("%s: OID_GEN_MAXIMUM_TOTAL_SIZE\n", __func__);
+        case RNDIS_OID_GEN_MAXIMUM_TOTAL_SIZE:
+                pr_debug("%s: RNDIS_OID_GEN_MAXIMUM_TOTAL_SIZE\n", __func__);
                 *outbuf = cpu_to_le32(RNDIS_MAX_TOTAL_SIZE);
                 retval = 0;
                 break;
 
         /* mandatory */
-        case OID_GEN_MEDIA_CONNECT_STATUS:
+        case RNDIS_OID_GEN_MEDIA_CONNECT_STATUS:
                 if (rndis_debug > 1)
-                        pr_debug("%s: OID_GEN_MEDIA_CONNECT_STATUS\n", __func__);
+                        pr_debug("%s: RNDIS_OID_GEN_MEDIA_CONNECT_STATUS\n", __func__);
                 *outbuf = cpu_to_le32(rndis_per_dev_params[configNr]
                                                 .media_state);
                 retval = 0;
                 break;
 
-        case OID_GEN_PHYSICAL_MEDIUM:
-                pr_debug("%s: OID_GEN_PHYSICAL_MEDIUM\n", __func__);
+        case RNDIS_OID_GEN_PHYSICAL_MEDIUM:
+                pr_debug("%s: RNDIS_OID_GEN_PHYSICAL_MEDIUM\n", __func__);
                 *outbuf = cpu_to_le32(0);
                 retval = 0;
                 break;
@@ -343,20 +343,20 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
          * of MS-Windows expect OIDs that aren't specified there.  Other
          * versions emit undefined RNDIS messages. DOCUMENT ALL THESE!
          */
-        case OID_GEN_MAC_OPTIONS:               /* from WinME */
-                pr_debug("%s: OID_GEN_MAC_OPTIONS\n", __func__);
+        case RNDIS_OID_GEN_MAC_OPTIONS:         /* from WinME */
+                pr_debug("%s: RNDIS_OID_GEN_MAC_OPTIONS\n", __func__);
                 *outbuf = cpu_to_le32(
-                          NDIS_MAC_OPTION_RECEIVE_SERIALIZED
-                        | NDIS_MAC_OPTION_FULL_DUPLEX);
+                          RNDIS_MAC_OPTION_RECEIVE_SERIALIZED
+                        | RNDIS_MAC_OPTION_FULL_DUPLEX);
                 retval = 0;
                 break;
 
         /* statistics OIDs (table 4-2) */
 
         /* mandatory */
-        case OID_GEN_XMIT_OK:
+        case RNDIS_OID_GEN_XMIT_OK:
                 if (rndis_debug > 1)
-                        pr_debug("%s: OID_GEN_XMIT_OK\n", __func__);
+                        pr_debug("%s: RNDIS_OID_GEN_XMIT_OK\n", __func__);
                 if (stats) {
                         *outbuf = cpu_to_le32(stats->tx_packets
                                 - stats->tx_errors - stats->tx_dropped);
@@ -365,9 +365,9 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
                 break;
 
         /* mandatory */
-        case OID_GEN_RCV_OK:
+        case RNDIS_OID_GEN_RCV_OK:
                 if (rndis_debug > 1)
-                        pr_debug("%s: OID_GEN_RCV_OK\n", __func__);
+                        pr_debug("%s: RNDIS_OID_GEN_RCV_OK\n", __func__);
                 if (stats) {
                         *outbuf = cpu_to_le32(stats->rx_packets
                                 - stats->rx_errors - stats->rx_dropped);
@@ -376,9 +376,9 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
                 break;
 
         /* mandatory */
-        case OID_GEN_XMIT_ERROR:
+        case RNDIS_OID_GEN_XMIT_ERROR:
                 if (rndis_debug > 1)
-                        pr_debug("%s: OID_GEN_XMIT_ERROR\n", __func__);
+                        pr_debug("%s: RNDIS_OID_GEN_XMIT_ERROR\n", __func__);
                 if (stats) {
                         *outbuf = cpu_to_le32(stats->tx_errors);
                         retval = 0;
@@ -386,9 +386,9 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
                 break;
 
         /* mandatory */
-        case OID_GEN_RCV_ERROR:
+        case RNDIS_OID_GEN_RCV_ERROR:
                 if (rndis_debug > 1)
-                        pr_debug("%s: OID_GEN_RCV_ERROR\n", __func__);
+                        pr_debug("%s: RNDIS_OID_GEN_RCV_ERROR\n", __func__);
                 if (stats) {
                         *outbuf = cpu_to_le32(stats->rx_errors);
                         retval = 0;
@@ -396,8 +396,8 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
                 break;
 
         /* mandatory */
-        case OID_GEN_RCV_NO_BUFFER:
-                pr_debug("%s: OID_GEN_RCV_NO_BUFFER\n", __func__);
+        case RNDIS_OID_GEN_RCV_NO_BUFFER:
+                pr_debug("%s: RNDIS_OID_GEN_RCV_NO_BUFFER\n", __func__);
                 if (stats) {
                         *outbuf = cpu_to_le32(stats->rx_dropped);
                         retval = 0;
@@ -407,8 +407,8 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
         /* ieee802.3 OIDs (table 4-3) */
 
         /* mandatory */
-        case OID_802_3_PERMANENT_ADDRESS:
-                pr_debug("%s: OID_802_3_PERMANENT_ADDRESS\n", __func__);
+        case RNDIS_OID_802_3_PERMANENT_ADDRESS:
+                pr_debug("%s: RNDIS_OID_802_3_PERMANENT_ADDRESS\n", __func__);
                 if (rndis_per_dev_params[configNr].dev) {
                         length = ETH_ALEN;
                         memcpy(outbuf,
@@ -419,8 +419,8 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
                 break;
 
         /* mandatory */
-        case OID_802_3_CURRENT_ADDRESS:
-                pr_debug("%s: OID_802_3_CURRENT_ADDRESS\n", __func__);
+        case RNDIS_OID_802_3_CURRENT_ADDRESS:
+                pr_debug("%s: RNDIS_OID_802_3_CURRENT_ADDRESS\n", __func__);
                 if (rndis_per_dev_params[configNr].dev) {
                         length = ETH_ALEN;
                         memcpy(outbuf,
@@ -431,23 +431,23 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
                 break;
 
         /* mandatory */
-        case OID_802_3_MULTICAST_LIST:
-                pr_debug("%s: OID_802_3_MULTICAST_LIST\n", __func__);
+        case RNDIS_OID_802_3_MULTICAST_LIST:
+                pr_debug("%s: RNDIS_OID_802_3_MULTICAST_LIST\n", __func__);
                 /* Multicast base address only */
                 *outbuf = cpu_to_le32(0xE0000000);
                 retval = 0;
                 break;
 
         /* mandatory */
-        case OID_802_3_MAXIMUM_LIST_SIZE:
-                pr_debug("%s: OID_802_3_MAXIMUM_LIST_SIZE\n", __func__);
+        case RNDIS_OID_802_3_MAXIMUM_LIST_SIZE:
+                pr_debug("%s: RNDIS_OID_802_3_MAXIMUM_LIST_SIZE\n", __func__);
                 /* Multicast base address only */
                 *outbuf = cpu_to_le32(1);
                 retval = 0;
                 break;
 
-        case OID_802_3_MAC_OPTIONS:
-                pr_debug("%s: OID_802_3_MAC_OPTIONS\n", __func__);
+        case RNDIS_OID_802_3_MAC_OPTIONS:
+                pr_debug("%s: RNDIS_OID_802_3_MAC_OPTIONS\n", __func__);
                 *outbuf = cpu_to_le32(0);
                 retval = 0;
                 break;
@@ -455,8 +455,8 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
         /* ieee802.3 statistics OIDs (table 4-4) */
 
         /* mandatory */
-        case OID_802_3_RCV_ERROR_ALIGNMENT:
-                pr_debug("%s: OID_802_3_RCV_ERROR_ALIGNMENT\n", __func__);
+        case RNDIS_OID_802_3_RCV_ERROR_ALIGNMENT:
+                pr_debug("%s: RNDIS_OID_802_3_RCV_ERROR_ALIGNMENT\n", __func__);
                 if (stats) {
                         *outbuf = cpu_to_le32(stats->rx_frame_errors);
                         retval = 0;
@@ -464,15 +464,15 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
                 break;
 
         /* mandatory */
-        case OID_802_3_XMIT_ONE_COLLISION:
-                pr_debug("%s: OID_802_3_XMIT_ONE_COLLISION\n", __func__);
+        case RNDIS_OID_802_3_XMIT_ONE_COLLISION:
+                pr_debug("%s: RNDIS_OID_802_3_XMIT_ONE_COLLISION\n", __func__);
                 *outbuf = cpu_to_le32(0);
                 retval = 0;
                 break;
 
         /* mandatory */
-        case OID_802_3_XMIT_MORE_COLLISIONS:
-                pr_debug("%s: OID_802_3_XMIT_MORE_COLLISIONS\n", __func__);
+        case RNDIS_OID_802_3_XMIT_MORE_COLLISIONS:
+                pr_debug("%s: RNDIS_OID_802_3_XMIT_MORE_COLLISIONS\n", __func__);
                 *outbuf = cpu_to_le32(0);
                 retval = 0;
                 break;
@@ -516,7 +516,7 @@ static int gen_ndis_set_resp(u8 configNr, u32 OID, u8 *buf, u32 buf_len,
 
         params = &rndis_per_dev_params[configNr];
         switch (OID) {
-        case OID_GEN_CURRENT_PACKET_FILTER:
+        case RNDIS_OID_GEN_CURRENT_PACKET_FILTER:
 
                 /* these NDIS_PACKET_TYPE_* bitflags are shared with
                  * cdc_filter; it's not RNDIS-specific
@@ -525,7 +525,7 @@ static int gen_ndis_set_resp(u8 configNr, u32 OID, u8 *buf, u32 buf_len,
                  *      MULTICAST, ALL_MULTICAST, BROADCAST
                  */
                 *params->filter = (u16)get_unaligned_le32(buf);
-                pr_debug("%s: OID_GEN_CURRENT_PACKET_FILTER %08x\n",
+                pr_debug("%s: RNDIS_OID_GEN_CURRENT_PACKET_FILTER %08x\n",
                         __func__, *params->filter);
 
                 /* this call has a significant side effect:  it's
@@ -545,9 +545,9 @@ static int gen_ndis_set_resp(u8 configNr, u32 OID, u8 *buf, u32 buf_len,
                 }
                 break;
 
-        case OID_802_3_MULTICAST_LIST:
+        case RNDIS_OID_802_3_MULTICAST_LIST:
                 /* I think we can ignore this */
-                pr_debug("%s: OID_802_3_MULTICAST_LIST\n", __func__);
+                pr_debug("%s: RNDIS_OID_802_3_MULTICAST_LIST\n", __func__);
                 retval = 0;
                 break;
 
@@ -577,7 +577,7 @@ static int rndis_init_response(int configNr, rndis_init_msg_type *buf)
                 return -ENOMEM;
         resp = (rndis_init_cmplt_type *)r->buf;
 
-        resp->MessageType = cpu_to_le32(REMOTE_NDIS_INITIALIZE_CMPLT);
+        resp->MessageType = cpu_to_le32(RNDIS_MSG_INIT_C);
         resp->MessageLength = cpu_to_le32(52);
         resp->RequestID = buf->RequestID; /* Still LE in msg buffer */
         resp->Status = cpu_to_le32(RNDIS_STATUS_SUCCESS);
@@ -621,7 +621,7 @@ static int rndis_query_response(int configNr, rndis_query_msg_type *buf)
                 return -ENOMEM;
         resp = (rndis_query_cmplt_type *)r->buf;
 
-        resp->MessageType = cpu_to_le32(REMOTE_NDIS_QUERY_CMPLT);
+        resp->MessageType = cpu_to_le32(RNDIS_MSG_QUERY_C);
         resp->RequestID = buf->RequestID; /* Still LE in msg buffer */
 
         if (gen_ndis_query_resp(configNr, le32_to_cpu(buf->OID),
@@ -668,7 +668,7 @@ static int rndis_set_response(int configNr, rndis_set_msg_type *buf)
         pr_debug("\n");
 #endif
 
-        resp->MessageType = cpu_to_le32(REMOTE_NDIS_SET_CMPLT);
+        resp->MessageType = cpu_to_le32(RNDIS_MSG_SET_C);
         resp->MessageLength = cpu_to_le32(16);
         resp->RequestID = buf->RequestID; /* Still LE in msg buffer */
         if (gen_ndis_set_resp(configNr, le32_to_cpu(buf->OID),
@@ -692,7 +692,7 @@ static int rndis_reset_response(int configNr, rndis_reset_msg_type *buf)
                 return -ENOMEM;
         resp = (rndis_reset_cmplt_type *)r->buf;
 
-        resp->MessageType = cpu_to_le32(REMOTE_NDIS_RESET_CMPLT);
+        resp->MessageType = cpu_to_le32(RNDIS_MSG_RESET_C);
         resp->MessageLength = cpu_to_le32(16);
         resp->Status = cpu_to_le32(RNDIS_STATUS_SUCCESS);
         /* resent information */
@@ -716,8 +716,7 @@ static int rndis_keepalive_response(int configNr,
                 return -ENOMEM;
         resp = (rndis_keepalive_cmplt_type *)r->buf;
 
-        resp->MessageType = cpu_to_le32(
-                        REMOTE_NDIS_KEEPALIVE_CMPLT);
+        resp->MessageType = cpu_to_le32(RNDIS_MSG_KEEPALIVE_C);
         resp->MessageLength = cpu_to_le32(16);
         resp->RequestID = buf->RequestID; /* Still LE in msg buffer */
         resp->Status = cpu_to_le32(RNDIS_STATUS_SUCCESS);
@@ -745,7 +744,7 @@ static int rndis_indicate_status_msg(int configNr, u32 status)
                 return -ENOMEM;
         resp = (rndis_indicate_status_msg_type *)r->buf;
 
-        resp->MessageType = cpu_to_le32(REMOTE_NDIS_INDICATE_STATUS_MSG);
+        resp->MessageType = cpu_to_le32(RNDIS_MSG_INDICATE);
         resp->MessageLength = cpu_to_le32(20);
         resp->Status = cpu_to_le32(status);
         resp->StatusBufferLength = cpu_to_le32(0);
@@ -758,7 +757,7 @@ static int rndis_indicate_status_msg(int configNr, u32 status)
 int rndis_signal_connect(int configNr)
 {
         rndis_per_dev_params[configNr].media_state
-                        = NDIS_MEDIA_STATE_CONNECTED;
+                        = RNDIS_MEDIA_STATE_CONNECTED;
         return rndis_indicate_status_msg(configNr,
                                           RNDIS_STATUS_MEDIA_CONNECT);
 }
@@ -766,7 +765,7 @@ int rndis_signal_connect(int configNr)
 int rndis_signal_disconnect(int configNr)
 {
         rndis_per_dev_params[configNr].media_state
-                        = NDIS_MEDIA_STATE_DISCONNECTED;
+                        = RNDIS_MEDIA_STATE_DISCONNECTED;
         return rndis_indicate_status_msg(configNr,
                                           RNDIS_STATUS_MEDIA_DISCONNECT);
 }
@@ -817,15 +816,15 @@ int rndis_msg_parser(u8 configNr, u8 *buf)
 
         /* For USB: responses may take up to 10 seconds */
         switch (MsgType) {
-        case REMOTE_NDIS_INITIALIZE_MSG:
-                pr_debug("%s: REMOTE_NDIS_INITIALIZE_MSG\n",
+        case RNDIS_MSG_INIT:
+                pr_debug("%s: RNDIS_MSG_INIT\n",
                         __func__);
                 params->state = RNDIS_INITIALIZED;
                 return rndis_init_response(configNr,
                                         (rndis_init_msg_type *)buf);
 
-        case REMOTE_NDIS_HALT_MSG:
-                pr_debug("%s: REMOTE_NDIS_HALT_MSG\n",
+        case RNDIS_MSG_HALT:
+                pr_debug("%s: RNDIS_MSG_HALT\n",
                         __func__);
                 params->state = RNDIS_UNINITIALIZED;
                 if (params->dev) {
@@ -834,24 +833,24 @@ int rndis_msg_parser(u8 configNr, u8 *buf)
                 }
                 return 0;
 
-        case REMOTE_NDIS_QUERY_MSG:
+        case RNDIS_MSG_QUERY:
                 return rndis_query_response(configNr,
                                         (rndis_query_msg_type *)buf);
 
-        case REMOTE_NDIS_SET_MSG:
+        case RNDIS_MSG_SET:
                 return rndis_set_response(configNr,
                                         (rndis_set_msg_type *)buf);
 
-        case REMOTE_NDIS_RESET_MSG:
-                pr_debug("%s: REMOTE_NDIS_RESET_MSG\n",
+        case RNDIS_MSG_RESET:
+                pr_debug("%s: RNDIS_MSG_RESET\n",
                         __func__);
                 return rndis_reset_response(configNr,
                                         (rndis_reset_msg_type *)buf);
 
-        case REMOTE_NDIS_KEEPALIVE_MSG:
+        case RNDIS_MSG_KEEPALIVE:
                 /* For USB: host does this every 5 seconds */
                 if (rndis_debug > 1)
-                        pr_debug("%s: REMOTE_NDIS_KEEPALIVE_MSG\n",
+                        pr_debug("%s: RNDIS_MSG_KEEPALIVE\n",
                                 __func__);
                 return rndis_keepalive_response(configNr,
                                                  (rndis_keepalive_msg_type *)
@@ -963,7 +962,7 @@ void rndis_add_hdr(struct sk_buff *skb)
                 return;
         header = (void *)skb_push(skb, sizeof(*header));
         memset(header, 0, sizeof *header);
-        header->MessageType = cpu_to_le32(REMOTE_NDIS_PACKET_MSG);
+        header->MessageType = cpu_to_le32(RNDIS_MSG_PACKET);
         header->MessageLength = cpu_to_le32(skb->len);
         header->DataOffset = cpu_to_le32(36);
         header->DataLength = cpu_to_le32(skb->len - sizeof(*header));
@@ -1031,7 +1030,7 @@ int rndis_rm_hdr(struct gether *port,
         __le32 *tmp = (void *)skb->data;
 
         /* MessageType, MessageLength */
-        if (cpu_to_le32(REMOTE_NDIS_PACKET_MSG)
+        if (cpu_to_le32(RNDIS_MSG_PACKET)
                         != get_unaligned(tmp++)) {
                 dev_kfree_skb_any(skb);
                 return -EINVAL;
@@ -1173,7 +1172,7 @@ int rndis_init(void)
                 rndis_per_dev_params[i].used = 0;
                 rndis_per_dev_params[i].state = RNDIS_UNINITIALIZED;
                 rndis_per_dev_params[i].media_state
-                                = NDIS_MEDIA_STATE_DISCONNECTED;
+                                = RNDIS_MEDIA_STATE_DISCONNECTED;
                 INIT_LIST_HEAD(&(rndis_per_dev_params[i].resp_queue));
         }
 
diff --git a/drivers/usb/gadget/rndis.h b/drivers/usb/gadget/rndis.h
index 907c33008118..0647f2f34e89 100644
--- a/drivers/usb/gadget/rndis.h
+++ b/drivers/usb/gadget/rndis.h
@@ -15,58 +15,12 @@
 #ifndef _LINUX_RNDIS_H
 #define _LINUX_RNDIS_H
 
+#include <linux/rndis.h>
 #include "ndis.h"
 
 #define RNDIS_MAXIMUM_FRAME_SIZE        1518
 #define RNDIS_MAX_TOTAL_SIZE            1558
 
-/* Remote NDIS Versions */
-#define RNDIS_MAJOR_VERSION             1
-#define RNDIS_MINOR_VERSION             0
-
-/* Status Values */
-#define RNDIS_STATUS_SUCCESS            0x00000000U     /* Success           */
-#define RNDIS_STATUS_FAILURE            0xC0000001U     /* Unspecified error */
-#define RNDIS_STATUS_INVALID_DATA       0xC0010015U     /* Invalid data      */
-#define RNDIS_STATUS_NOT_SUPPORTED      0xC00000BBU     /* Unsupported request */
-#define RNDIS_STATUS_MEDIA_CONNECT      0x4001000BU     /* Device connected  */
-#define RNDIS_STATUS_MEDIA_DISCONNECT   0x4001000CU     /* Device disconnected */
-/* For all not specified status messages:
- * RNDIS_STATUS_Xxx -> NDIS_STATUS_Xxx
- */
-
-/* Message Set for Connectionless (802.3) Devices */
-#define REMOTE_NDIS_PACKET_MSG          0x00000001U
-#define REMOTE_NDIS_INITIALIZE_MSG      0x00000002U     /* Initialize device */
-#define REMOTE_NDIS_HALT_MSG            0x00000003U
-#define REMOTE_NDIS_QUERY_MSG           0x00000004U
-#define REMOTE_NDIS_SET_MSG             0x00000005U
-#define REMOTE_NDIS_RESET_MSG           0x00000006U
-#define REMOTE_NDIS_INDICATE_STATUS_MSG 0x00000007U
-#define REMOTE_NDIS_KEEPALIVE_MSG       0x00000008U
-
-/* Message completion */
-#define REMOTE_NDIS_INITIALIZE_CMPLT    0x80000002U
-#define REMOTE_NDIS_QUERY_CMPLT         0x80000004U
-#define REMOTE_NDIS_SET_CMPLT           0x80000005U
-#define REMOTE_NDIS_RESET_CMPLT         0x80000006U
-#define REMOTE_NDIS_KEEPALIVE_CMPLT     0x80000008U
-
-/* Device Flags */
-#define RNDIS_DF_CONNECTIONLESS         0x00000001U
-#define RNDIS_DF_CONNECTION_ORIENTED    0x00000002U
-
-#define RNDIS_MEDIUM_802_3              0x00000000U
-
-/* from drivers/net/sk98lin/h/skgepnmi.h */
-#define OID_PNP_CAPABILITIES                    0xFD010100
-#define OID_PNP_SET_POWER                       0xFD010101
-#define OID_PNP_QUERY_POWER                     0xFD010102
-#define OID_PNP_ADD_WAKE_UP_PATTERN             0xFD010103
-#define OID_PNP_REMOVE_WAKE_UP_PATTERN          0xFD010104
-#define OID_PNP_ENABLE_WAKE_UP                  0xFD010106
-
-
 typedef struct rndis_init_msg_type
 {
         __le32  MessageType;
diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c
index 2fa9865babed..e5e44f8cde9a 100644
--- a/drivers/usb/gadget/udc-core.c
+++ b/drivers/usb/gadget/udc-core.c
@@ -263,8 +263,8 @@ static void usb_gadget_remove_driver(struct usb_udc *udc)
 
         if (udc_is_newstyle(udc)) {
                 udc->driver->disconnect(udc->gadget);
-                udc->driver->unbind(udc->gadget);
                 usb_gadget_disconnect(udc->gadget);
+                udc->driver->unbind(udc->gadget);
                 usb_gadget_udc_stop(udc->gadget, udc->driver);
         } else {
                 usb_gadget_stop(udc->gadget, udc->driver);
@@ -415,9 +415,9 @@ static ssize_t usb_udc_softconn_store(struct device *dev,
                         usb_gadget_udc_start(udc->gadget, udc->driver);
                 usb_gadget_connect(udc->gadget);
         } else if (sysfs_streq(buf, "disconnect")) {
+                usb_gadget_disconnect(udc->gadget);
                 if (udc_is_newstyle(udc))
                         usb_gadget_udc_stop(udc->gadget, udc->driver);
-                usb_gadget_disconnect(udc->gadget);
         } else {
                 dev_err(dev, "unsupported command '%s'\n", buf);
                 return -EINVAL;
diff --git a/drivers/usb/gadget/uvc.h b/drivers/usb/gadget/uvc.h
index bc78c606c12b..ca4e03a1c73a 100644
--- a/drivers/usb/gadget/uvc.h
+++ b/drivers/usb/gadget/uvc.h
@@ -28,7 +28,7 @@
 
 struct uvc_request_data
 {
-        unsigned int length;
+        __s32 length;
         __u8 data[60];
 };
 
diff --git a/drivers/usb/gadget/uvc_v4l2.c b/drivers/usb/gadget/uvc_v4l2.c
index f6e083b50191..54d7ca559cb2 100644
--- a/drivers/usb/gadget/uvc_v4l2.c
+++ b/drivers/usb/gadget/uvc_v4l2.c
@@ -39,7 +39,7 @@ uvc_send_response(struct uvc_device *uvc, struct uvc_request_data *data)
         if (data->length < 0)
                 return usb_ep_set_halt(cdev->gadget->ep0);
 
-        req->length = min(uvc->event_length, data->length);
+        req->length = min_t(unsigned int, uvc->event_length, data->length);
         req->zero = data->length < uvc->event_length;
         req->dma = DMA_ADDR_INVALID;
 
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 01bb7241d6ef..fe8dc069164e 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -144,6 +144,14 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
                         hcd->has_tt = 1;
                         tdi_reset(ehci);
                 }
+                if (pdev->subsystem_vendor == PCI_VENDOR_ID_ASUSTEK) {
+                        /* EHCI #1 or #2 on 6 Series/C200 Series chipset */
+                        if (pdev->device == 0x1c26 || pdev->device == 0x1c2d) {
+                                ehci_info(ehci, "broken D3 during system sleep on ASUS\n");
+                                hcd->broken_pci_sleep = 1;
+                                device_set_wakeup_capable(&pdev->dev, false);
+                        }
+                }
                 break;
         case PCI_VENDOR_ID_TDI:
                 if (pdev->device == PCI_DEVICE_ID_TDI_EHCI) {
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 86183366647f..f214a80cdee2 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -24,6 +24,7 @@
 #include <linux/gpio.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
+#include <linux/pm_runtime.h>
 
 #include <mach/usb_phy.h>
 #include <mach/iomap.h>
@@ -37,9 +38,7 @@ struct tegra_ehci_hcd {
         struct clk *emc_clk;
         struct usb_phy *transceiver;
         int host_resumed;
-        int bus_suspended;
         int port_resuming;
-        int power_down_on_bus_suspend;
         enum tegra_usb_phy_port_speed port_speed;
 };
 
@@ -273,120 +272,6 @@ static void tegra_ehci_restart(struct usb_hcd *hcd)
         up_write(&ehci_cf_port_reset_rwsem);
 }
 
-static int tegra_usb_suspend(struct usb_hcd *hcd)
-{
-        struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller);
-        struct ehci_regs __iomem *hw = tegra->ehci->regs;
-        unsigned long flags;
-
-        spin_lock_irqsave(&tegra->ehci->lock, flags);
-
-        tegra->port_speed = (readl(&hw->port_status[0]) >> 26) & 0x3;
-        ehci_halt(tegra->ehci);
-        clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
-
-        spin_unlock_irqrestore(&tegra->ehci->lock, flags);
-
-        tegra_ehci_power_down(hcd);
-        return 0;
-}
-
-static int tegra_usb_resume(struct usb_hcd *hcd)
-{
-        struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller);
-        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-        struct ehci_regs __iomem *hw = ehci->regs;
-        unsigned long val;
-
-        set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
-        tegra_ehci_power_up(hcd);
-
-        if (tegra->port_speed > TEGRA_USB_PHY_PORT_SPEED_HIGH) {
-                /* Wait for the phy to detect new devices
-                 * before we restart the controller */
-                msleep(10);
-                goto restart;
-        }
-
-        /* Force the phy to keep data lines in suspend state */
-        tegra_ehci_phy_restore_start(tegra->phy, tegra->port_speed);
-
-        /* Enable host mode */
-        tdi_reset(ehci);
-
-        /* Enable Port Power */
-        val = readl(&hw->port_status[0]);
-        val |= PORT_POWER;
-        writel(val, &hw->port_status[0]);
-        udelay(10);
-
-        /* Check if the phy resume from LP0. When the phy resume from LP0
-         * USB register will be reset. */
-        if (!readl(&hw->async_next)) {
-                /* Program the field PTC based on the saved speed mode */
-                val = readl(&hw->port_status[0]);
-                val &= ~PORT_TEST(~0);
-                if (tegra->port_speed == TEGRA_USB_PHY_PORT_SPEED_HIGH)
-                        val |= PORT_TEST_FORCE;
-                else if (tegra->port_speed == TEGRA_USB_PHY_PORT_SPEED_FULL)
-                        val |= PORT_TEST(6);
-                else if (tegra->port_speed == TEGRA_USB_PHY_PORT_SPEED_LOW)
-                        val |= PORT_TEST(7);
-                writel(val, &hw->port_status[0]);
-                udelay(10);
-
-                /* Disable test mode by setting PTC field to NORMAL_OP */
-                val = readl(&hw->port_status[0]);
-                val &= ~PORT_TEST(~0);
-                writel(val, &hw->port_status[0]);
-                udelay(10);
-        }
-
-        /* Poll until CCS is enabled */
-        if (handshake(ehci, &hw->port_status[0], PORT_CONNECT,
-                                                 PORT_CONNECT, 2000)) {
-                pr_err("%s: timeout waiting for PORT_CONNECT\n", __func__);
-                goto restart;
-        }
-
-        /* Poll until PE is enabled */
-        if (handshake(ehci, &hw->port_status[0], PORT_PE,
-                                                 PORT_PE, 2000)) {
-                pr_err("%s: timeout waiting for USB_PORTSC1_PE\n", __func__);
-                goto restart;
-        }
-
-        /* Clear the PCI status, to avoid an interrupt taken upon resume */
-        val = readl(&hw->status);
-        val |= STS_PCD;
-        writel(val, &hw->status);
-
-        /* Put controller in suspend mode by writing 1 to SUSP bit of PORTSC */
-        val = readl(&hw->port_status[0]);
-        if ((val & PORT_POWER) && (val & PORT_PE)) {
-                val |= PORT_SUSPEND;
-                writel(val, &hw->port_status[0]);
-
-                /* Wait until port suspend completes */
-                if (handshake(ehci, &hw->port_status[0], PORT_SUSPEND,
-                                                         PORT_SUSPEND, 1000)) {
-                        pr_err("%s: timeout waiting for PORT_SUSPEND\n",
-                                                                __func__);
-                        goto restart;
-                }
-        }
-
-        tegra_ehci_phy_restore_end(tegra->phy);
-        return 0;
-
-restart:
-        if (tegra->port_speed <= TEGRA_USB_PHY_PORT_SPEED_HIGH)
-                tegra_ehci_phy_restore_end(tegra->phy);
-
-        tegra_ehci_restart(hcd);
-        return 0;
-}
-
 static void tegra_ehci_shutdown(struct usb_hcd *hcd)
 {
         struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller);
@@ -434,36 +319,6 @@ static int tegra_ehci_setup(struct usb_hcd *hcd)
         return retval;
 }
 
-#ifdef CONFIG_PM
-static int tegra_ehci_bus_suspend(struct usb_hcd *hcd)
-{
-        struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller);
-        int error_status = 0;
-
-        error_status = ehci_bus_suspend(hcd);
-        if (!error_status && tegra->power_down_on_bus_suspend) {
-                tegra_usb_suspend(hcd);
-                tegra->bus_suspended = 1;
-        }
-
-        return error_status;
-}
-
-static int tegra_ehci_bus_resume(struct usb_hcd *hcd)
-{
-        struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller);
-
-        if (tegra->bus_suspended && tegra->power_down_on_bus_suspend) {
-                tegra_usb_resume(hcd);
-                tegra->bus_suspended = 0;
-        }
-
-        tegra_usb_phy_preresume(tegra->phy);
-        tegra->port_resuming = 1;
-        return ehci_bus_resume(hcd);
-}
-#endif
-
 struct temp_buffer {
         void *kmalloc_ptr;
         void *old_xfer_buffer;
@@ -574,8 +429,8 @@ static const struct hc_driver tegra_ehci_hc_driver = {
         .hub_control            = tegra_ehci_hub_control,
         .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
 #ifdef CONFIG_PM
-        .bus_suspend            = tegra_ehci_bus_suspend,
-        .bus_resume             = tegra_ehci_bus_resume,
+        .bus_suspend            = ehci_bus_suspend,
+        .bus_resume             = ehci_bus_resume,
 #endif
         .relinquish_port        = ehci_relinquish_port,
         .port_handed_over       = ehci_port_handed_over,
@@ -603,11 +458,187 @@ static int setup_vbus_gpio(struct platform_device *pdev)
                 dev_err(&pdev->dev, "can't enable vbus\n");
                 return err;
         }
-        gpio_set_value(gpio, 1);
 
         return err;
 }
 
+#ifdef CONFIG_PM
+
+static int controller_suspend(struct device *dev)
+{
+        struct tegra_ehci_hcd *tegra =
+                        platform_get_drvdata(to_platform_device(dev));
+        struct ehci_hcd *ehci = tegra->ehci;
+        struct usb_hcd *hcd = ehci_to_hcd(ehci);
+        struct ehci_regs __iomem *hw = ehci->regs;
+        unsigned long flags;
+
+        if (time_before(jiffies, ehci->next_statechange))
+                msleep(10);
+
+        spin_lock_irqsave(&ehci->lock, flags);
+
+        tegra->port_speed = (readl(&hw->port_status[0]) >> 26) & 0x3;
+        ehci_halt(ehci);
+        clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
+
+        spin_unlock_irqrestore(&ehci->lock, flags);
+
+        tegra_ehci_power_down(hcd);
+        return 0;
+}
+
+static int controller_resume(struct device *dev)
+{
+        struct tegra_ehci_hcd *tegra =
+                        platform_get_drvdata(to_platform_device(dev));
+        struct ehci_hcd *ehci = tegra->ehci;
+        struct usb_hcd *hcd = ehci_to_hcd(ehci);
+        struct ehci_regs __iomem *hw = ehci->regs;
+        unsigned long val;
+
+        set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
+        tegra_ehci_power_up(hcd);
+
+        if (tegra->port_speed > TEGRA_USB_PHY_PORT_SPEED_HIGH) {
+                /* Wait for the phy to detect new devices
+                 * before we restart the controller */
+                msleep(10);
+                goto restart;
+        }
+
+        /* Force the phy to keep data lines in suspend state */
+        tegra_ehci_phy_restore_start(tegra->phy, tegra->port_speed);
+
+        /* Enable host mode */
+        tdi_reset(ehci);
+
+        /* Enable Port Power */
+        val = readl(&hw->port_status[0]);
+        val |= PORT_POWER;
+        writel(val, &hw->port_status[0]);
+        udelay(10);
+
+        /* Check if the phy resume from LP0. When the phy resume from LP0
+         * USB register will be reset. */
+        if (!readl(&hw->async_next)) {
+                /* Program the field PTC based on the saved speed mode */
+                val = readl(&hw->port_status[0]);
+                val &= ~PORT_TEST(~0);
+                if (tegra->port_speed == TEGRA_USB_PHY_PORT_SPEED_HIGH)
+                        val |= PORT_TEST_FORCE;
+                else if (tegra->port_speed == TEGRA_USB_PHY_PORT_SPEED_FULL)
+                        val |= PORT_TEST(6);
+                else if (tegra->port_speed == TEGRA_USB_PHY_PORT_SPEED_LOW)
+                        val |= PORT_TEST(7);
+                writel(val, &hw->port_status[0]);
+                udelay(10);
+
+                /* Disable test mode by setting PTC field to NORMAL_OP */
+                val = readl(&hw->port_status[0]);
+                val &= ~PORT_TEST(~0);
+                writel(val, &hw->port_status[0]);
+                udelay(10);
+        }
+
+        /* Poll until CCS is enabled */
+        if (handshake(ehci, &hw->port_status[0], PORT_CONNECT,
+                                                 PORT_CONNECT, 2000)) {
+                pr_err("%s: timeout waiting for PORT_CONNECT\n", __func__);
+                goto restart;
+        }
+
+        /* Poll until PE is enabled */
+        if (handshake(ehci, &hw->port_status[0], PORT_PE,
+                                                 PORT_PE, 2000)) {
+                pr_err("%s: timeout waiting for USB_PORTSC1_PE\n", __func__);
+                goto restart;
+        }
+
+        /* Clear the PCI status, to avoid an interrupt taken upon resume */
+        val = readl(&hw->status);
+        val |= STS_PCD;
+        writel(val, &hw->status);
+
+        /* Put controller in suspend mode by writing 1 to SUSP bit of PORTSC */
+        val = readl(&hw->port_status[0]);
+        if ((val & PORT_POWER) && (val & PORT_PE)) {
+                val |= PORT_SUSPEND;
+                writel(val, &hw->port_status[0]);
+
+                /* Wait until port suspend completes */
+                if (handshake(ehci, &hw->port_status[0], PORT_SUSPEND,
+                                                         PORT_SUSPEND, 1000)) {
+                        pr_err("%s: timeout waiting for PORT_SUSPEND\n",
+                                                                __func__);
+                        goto restart;
+                }
+        }
+
+        tegra_ehci_phy_restore_end(tegra->phy);
+        goto done;
+
+ restart:
+        if (tegra->port_speed <= TEGRA_USB_PHY_PORT_SPEED_HIGH)
+                tegra_ehci_phy_restore_end(tegra->phy);
+
+        tegra_ehci_restart(hcd);
+
+ done:
+        tegra_usb_phy_preresume(tegra->phy);
+        tegra->port_resuming = 1;
+        return 0;
+}
+
+static int tegra_ehci_suspend(struct device *dev)
+{
+        struct tegra_ehci_hcd *tegra =
+                        platform_get_drvdata(to_platform_device(dev));
+        struct usb_hcd *hcd = ehci_to_hcd(tegra->ehci);
+        int rc = 0;
+
+        /*
+         * When system sleep is supported and USB controller wakeup is
+         * implemented: If the controller is runtime-suspended and the
+         * wakeup setting needs to be changed, call pm_runtime_resume().
+         */
+        if (HCD_HW_ACCESSIBLE(hcd))
+                rc = controller_suspend(dev);
+        return rc;
+}
+
+static int tegra_ehci_resume(struct device *dev)
+{
+        int rc;
+
+        rc = controller_resume(dev);
+        if (rc == 0) {
+                pm_runtime_disable(dev);
+                pm_runtime_set_active(dev);
+                pm_runtime_enable(dev);
+        }
+        return rc;
+}
+
+static int tegra_ehci_runtime_suspend(struct device *dev)
+{
+        return controller_suspend(dev);
+}
+
+static int tegra_ehci_runtime_resume(struct device *dev)
+{
+        return controller_resume(dev);
+}
+
+static const struct dev_pm_ops tegra_ehci_pm_ops = {
+        .suspend        = tegra_ehci_suspend,
+        .resume         = tegra_ehci_resume,
+        .runtime_suspend = tegra_ehci_runtime_suspend,
+        .runtime_resume = tegra_ehci_runtime_resume,
+};
+
+#endif
+
 static u64 tegra_ehci_dma_mask = DMA_BIT_MASK(32);
 
 static int tegra_ehci_probe(struct platform_device *pdev)
@@ -722,7 +753,6 @@ static int tegra_ehci_probe(struct platform_device *pdev)
         }
 
         tegra->host_resumed = 1;
-        tegra->power_down_on_bus_suspend = pdata->power_down_on_bus_suspend;
         tegra->ehci = hcd_to_ehci(hcd);
 
         irq = platform_get_irq(pdev, 0);
@@ -746,6 +776,14 @@ static int tegra_ehci_probe(struct platform_device *pdev)
                 goto fail;
         }
 
+        pm_runtime_set_active(&pdev->dev);
+        pm_runtime_get_noresume(&pdev->dev);
+
+        /* Don't skip the pm_runtime_forbid call if wakeup isn't working */
+        /* if (!pdata->power_down_on_bus_suspend) */
+                pm_runtime_forbid(&pdev->dev);
+        pm_runtime_enable(&pdev->dev);
+        pm_runtime_put_sync(&pdev->dev);
         return err;
 
 fail:
@@ -772,33 +810,6 @@ fail_hcd:
         return err;
 }
 
-#ifdef CONFIG_PM
-static int tegra_ehci_resume(struct platform_device *pdev)
-{
-        struct tegra_ehci_hcd *tegra = platform_get_drvdata(pdev);
-        struct usb_hcd *hcd = ehci_to_hcd(tegra->ehci);
-
-        if (tegra->bus_suspended)
-                return 0;
-
-        return tegra_usb_resume(hcd);
-}
-
-static int tegra_ehci_suspend(struct platform_device *pdev, pm_message_t state)
-{
-        struct tegra_ehci_hcd *tegra = platform_get_drvdata(pdev);
-        struct usb_hcd *hcd = ehci_to_hcd(tegra->ehci);
-
-        if (tegra->bus_suspended)
-                return 0;
-
-        if (time_before(jiffies, tegra->ehci->next_statechange))
-                msleep(10);
-
-        return tegra_usb_suspend(hcd);
-}
-#endif
-
 static int tegra_ehci_remove(struct platform_device *pdev)
 {
         struct tegra_ehci_hcd *tegra = platform_get_drvdata(pdev);
@@ -807,6 +818,10 @@ static int tegra_ehci_remove(struct platform_device *pdev)
         if (tegra == NULL || hcd == NULL)
                 return -EINVAL;
 
+        pm_runtime_get_sync(&pdev->dev);
+        pm_runtime_disable(&pdev->dev);
+        pm_runtime_put_noidle(&pdev->dev);
+
 #ifdef CONFIG_USB_OTG_UTILS
         if (tegra->transceiver) {
                 otg_set_host(tegra->transceiver->otg, NULL);
@@ -847,13 +862,12 @@ static struct of_device_id tegra_ehci_of_match[] __devinitdata = {
 static struct platform_driver tegra_ehci_driver = {
         .probe          = tegra_ehci_probe,
         .remove         = tegra_ehci_remove,
-#ifdef CONFIG_PM
-        .suspend        = tegra_ehci_suspend,
-        .resume         = tegra_ehci_resume,
-#endif
         .shutdown       = tegra_ehci_hcd_shutdown,
         .driver         = {
                 .name   = "tegra-ehci",
                 .of_match_table = tegra_ehci_of_match,
+#ifdef CONFIG_PM
+                .pm     = &tegra_ehci_pm_ops,
+#endif
         }
 };
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index 97ab975fa442..768b4b55c816 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -386,7 +386,7 @@ static int davinci_musb_init(struct musb *musb)
         usb_nop_xceiv_register();
         musb->xceiv = usb_get_transceiver();
         if (!musb->xceiv)
-                return -ENODEV;
+                goto unregister;
 
         musb->mregs += DAVINCI_BASE_OFFSET;
 
@@ -444,6 +444,7 @@ static int davinci_musb_init(struct musb *musb)
 
 fail:
         usb_put_transceiver(musb->xceiv);
+unregister:
         usb_nop_xceiv_unregister();
         return -ENODEV;
 }
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 93de517a32a0..f4a40f001c88 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -449,7 +449,7 @@ struct musb {
          * We added this flag to forcefully disable double
          * buffering until we get it working.
          */
-        unsigned                double_buffer_not_ok:1 __deprecated;
+        unsigned                double_buffer_not_ok:1;
 
         struct musb_hdrc_config *config;
 
diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h
index 1d5eda26fbd1..f7c1c8e2dc3f 100644
--- a/drivers/usb/musb/musb_io.h
+++ b/drivers/usb/musb/musb_io.h
@@ -40,7 +40,7 @@
 #if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \
         && !defined(CONFIG_AVR32) && !defined(CONFIG_PPC32) \
         && !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN) \
-        && !defined(CONFIG_MIPS)
+        && !defined(CONFIG_MIPS) && !defined(CONFIG_M68K)
 static inline void readsl(const void __iomem *addr, void *buf, int len)
         { insl((unsigned long)addr, buf, len); }
 static inline void readsw(const void __iomem *addr, void *buf, int len)
diff --git a/drivers/usb/otg/gpio_vbus.c b/drivers/usb/otg/gpio_vbus.c
index 3ece43a2e4c1..a0a2178974fe 100644
--- a/drivers/usb/otg/gpio_vbus.c
+++ b/drivers/usb/otg/gpio_vbus.c
@@ -96,7 +96,7 @@ static void gpio_vbus_work(struct work_struct *work)
         struct gpio_vbus_data *gpio_vbus =
                 container_of(work, struct gpio_vbus_data, work);
         struct gpio_vbus_mach_info *pdata = gpio_vbus->dev->platform_data;
-        int gpio;
+        int gpio, status;
 
         if (!gpio_vbus->phy.otg->gadget)
                 return;
@@ -108,7 +108,9 @@ static void gpio_vbus_work(struct work_struct *work)
          */
         gpio = pdata->gpio_pullup;
         if (is_vbus_powered(pdata)) {
+                status = USB_EVENT_VBUS;
                 gpio_vbus->phy.state = OTG_STATE_B_PERIPHERAL;
+                gpio_vbus->phy.last_event = status;
                 usb_gadget_vbus_connect(gpio_vbus->phy.otg->gadget);
 
                 /* drawing a "unit load" is *always* OK, except for OTG */
@@ -117,6 +119,9 @@ static void gpio_vbus_work(struct work_struct *work)
                 /* optionally enable D+ pullup */
                 if (gpio_is_valid(gpio))
                         gpio_set_value(gpio, !pdata->gpio_pullup_inverted);
+
+                atomic_notifier_call_chain(&gpio_vbus->phy.notifier,
+                                           status, gpio_vbus->phy.otg->gadget);
         } else {
                 /* optionally disable D+ pullup */
                 if (gpio_is_valid(gpio))
@@ -125,7 +130,12 @@ static void gpio_vbus_work(struct work_struct *work)
                 set_vbus_draw(gpio_vbus, 0);
 
                 usb_gadget_vbus_disconnect(gpio_vbus->phy.otg->gadget);
+                status = USB_EVENT_NONE;
                 gpio_vbus->phy.state = OTG_STATE_B_IDLE;
+                gpio_vbus->phy.last_event = status;
+
+                atomic_notifier_call_chain(&gpio_vbus->phy.notifier,
+                                           status, gpio_vbus->phy.otg->gadget);
         }
 }
 
@@ -287,6 +297,9 @@ static int __init gpio_vbus_probe(struct platform_device *pdev)
                         irq, err);
                 goto err_irq;
         }
+
+        ATOMIC_INIT_NOTIFIER_HEAD(&gpio_vbus->phy.notifier);
+
         INIT_WORK(&gpio_vbus->work, gpio_vbus_work);
 
         gpio_vbus->vbus_draw = regulator_get(&pdev->dev, "vbus_draw");
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index f0da2c32fbde..f82a7394756e 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -24,6 +24,7 @@
 #include <linux/if_arp.h>
 #include <linux/if_tun.h>
 #include <linux/if_macvlan.h>
+#include <linux/if_vlan.h>
 
 #include <net/sock.h>
 
@@ -166,7 +167,7 @@ static void handle_tx(struct vhost_net *net)
         if (wmem < sock->sk->sk_sndbuf / 2)
                 tx_poll_stop(net);
         hdr_size = vq->vhost_hlen;
-        zcopy = vhost_sock_zcopy(sock);
+        zcopy = vq->ubufs;
 
         for (;;) {
                 /* Release DMAs done buffers first */
@@ -238,7 +239,7 @@ static void handle_tx(struct vhost_net *net)
 
                                 vq->heads[vq->upend_idx].len = len;
                                 ubuf->callback = vhost_zerocopy_callback;
-                                ubuf->arg = vq->ubufs;
+                                ubuf->ctx = vq->ubufs;
                                 ubuf->desc = vq->upend_idx;
                                 msg.msg_control = ubuf;
                                 msg.msg_controllen = sizeof(ubuf);
@@ -257,7 +258,8 @@ static void handle_tx(struct vhost_net *net)
                                         UIO_MAXIOV;
                         }
                         vhost_discard_vq_desc(vq, 1);
-                        tx_poll_start(net, sock);
+                        if (err == -EAGAIN || err == -ENOBUFS)
+                                tx_poll_start(net, sock);
                         break;
                 }
                 if (err != len)
@@ -265,6 +267,8 @@ static void handle_tx(struct vhost_net *net)
                                  " len %d != %zd\n", err, len);
                 if (!zcopy)
                         vhost_add_used_and_signal(&net->dev, vq, head, 0);
+                else
+                        vhost_zerocopy_signal_used(vq);
                 total_len += len;
                 if (unlikely(total_len >= VHOST_NET_WEIGHT)) {
                         vhost_poll_queue(&vq->poll);
@@ -283,8 +287,12 @@ static int peek_head_len(struct sock *sk)
 
         spin_lock_irqsave(&sk->sk_receive_queue.lock, flags);
         head = skb_peek(&sk->sk_receive_queue);
-        if (likely(head))
+        if (likely(head)) {
                 len = head->len;
+                if (vlan_tx_tag_present(head))
+                        len += VLAN_HLEN;
+        }
+
         spin_unlock_irqrestore(&sk->sk_receive_queue.lock, flags);
         return len;
 }
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 947f00d8e091..94dbd25caa30 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -1598,12 +1598,12 @@ void vhost_ubuf_put_and_wait(struct vhost_ubuf_ref *ubufs)
         kfree(ubufs);
 }
 
-void vhost_zerocopy_callback(void *arg)
+void vhost_zerocopy_callback(struct ubuf_info *ubuf)
 {
-        struct ubuf_info *ubuf = arg;
-        struct vhost_ubuf_ref *ubufs = ubuf->arg;
+        struct vhost_ubuf_ref *ubufs = ubuf->ctx;
         struct vhost_virtqueue *vq = ubufs->vq;
 
+        vhost_poll_queue(&vq->poll);
         /* set len = 1 to mark this desc buffers done DMA */
         vq->heads[ubuf->desc].len = VHOST_DMA_DONE_LEN;
         kref_put(&ubufs->kref, vhost_zerocopy_done_signal);
diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
index 8dcf4cca6bf2..8de1fd5b8efb 100644
--- a/drivers/vhost/vhost.h
+++ b/drivers/vhost/vhost.h
@@ -188,7 +188,7 @@ bool vhost_enable_notify(struct vhost_dev *, struct vhost_virtqueue *);
 
 int vhost_log_write(struct vhost_virtqueue *vq, struct vhost_log *log,
                     unsigned int log_num, u64 len);
-void vhost_zerocopy_callback(void *arg);
+void vhost_zerocopy_callback(struct ubuf_info *);
 int vhost_zerocopy_signal_used(struct vhost_virtqueue *vq);
 
 #define vq_err(vq, fmt, ...) do {                                  \
diff --git a/drivers/video/bfin-lq035q1-fb.c b/drivers/video/bfin-lq035q1-fb.c
index 86922ac84412..353c02fe8a95 100644
--- a/drivers/video/bfin-lq035q1-fb.c
+++ b/drivers/video/bfin-lq035q1-fb.c
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/fb.h>
+#include <linux/gpio.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/types.h>
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 6468a297e341..39571f9e0162 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -22,7 +22,9 @@
 #include <linux/font.h>
 
 #include <asm/hardware.h>
+#include <asm/page.h>
 #include <asm/parisc-device.h>
+#include <asm/pdc.h>
 #include <asm/cacheflush.h>
 #include <asm/grfioctl.h>
 
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index 26e83d7fdd6f..b0e2a4261afe 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -73,7 +73,7 @@ static void uvesafb_cn_callback(struct cn_msg *msg, struct netlink_skb_parms *ns
         struct uvesafb_task *utask;
         struct uvesafb_ktask *task;
 
-        if (!cap_raised(current_cap(), CAP_SYS_ADMIN))
+        if (!capable(CAP_SYS_ADMIN))
                 return;
 
         if (msg->seq >= UVESAFB_TASKS_MAX)
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c
index cb4529c40d74..b7f5173ff9e9 100644
--- a/drivers/video/xen-fbfront.c
+++ b/drivers/video/xen-fbfront.c
@@ -365,7 +365,7 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
         struct fb_info *fb_info;
         int fb_size;
         int val;
-        int ret;
+        int ret = 0;
 
         info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (info == NULL) {
@@ -458,26 +458,31 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
         xenfb_init_shared_page(info, fb_info);
 
         ret = xenfb_connect_backend(dev, info);
-        if (ret < 0)
-                goto error;
+        if (ret < 0) {
+                xenbus_dev_fatal(dev, ret, "xenfb_connect_backend");
+                goto error_fb;
+        }
 
         ret = register_framebuffer(fb_info);
         if (ret) {
-                fb_deferred_io_cleanup(fb_info);
-                fb_dealloc_cmap(&fb_info->cmap);
-                framebuffer_release(fb_info);
                 xenbus_dev_fatal(dev, ret, "register_framebuffer");
-                goto error;
+                goto error_fb;
         }
         info->fb_info = fb_info;
 
         xenfb_make_preferred_console();
         return 0;
 
- error_nomem:
-        ret = -ENOMEM;
-        xenbus_dev_fatal(dev, ret, "allocating device memory");
- error:
+error_fb:
+        fb_deferred_io_cleanup(fb_info);
+        fb_dealloc_cmap(&fb_info->cmap);
+        framebuffer_release(fb_info);
+error_nomem:
+        if (!ret) {
+                ret = -ENOMEM;
+                xenbus_dev_fatal(dev, ret, "allocating device memory");
+        }
+error:
         xenfb_remove(dev);
         return ret;
 }
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index c2d05a8279fd..8807fe501d20 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -390,6 +390,7 @@ static void __devexit virtballoon_remove(struct virtio_device *vdev)
         /* There might be pages left in the balloon: free them. */
         while (vb->num_pages)
                 leak_balloon(vb, vb->num_pages);
+        update_balloon_size(vb);
 
         /* Now we reset the device so we can clean up the queues. */
         vdev->config->reset(vdev);
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index cbc7ceef2786..9f13b897fd64 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -435,16 +435,16 @@ static void hpwdt_start(void)
 {
         reload = SECS_TO_TICKS(soft_margin);
         iowrite16(reload, hpwdt_timer_reg);
-        iowrite16(0x85, hpwdt_timer_con);
+        iowrite8(0x85, hpwdt_timer_con);
 }
 
 static void hpwdt_stop(void)
 {
         unsigned long data;
 
-        data = ioread16(hpwdt_timer_con);
+        data = ioread8(hpwdt_timer_con);
         data &= 0xFE;
-        iowrite16(data, hpwdt_timer_con);
+        iowrite8(data, hpwdt_timer_con);
 }
 
 static void hpwdt_ping(void)
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 94243136f6bf..ea20c51d24c7 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -183,15 +183,17 @@ config XEN_ACPI_PROCESSOR
         depends on XEN && X86 && ACPI_PROCESSOR && CPU_FREQ
         default m
         help
-          This ACPI processor uploads Power Management information to the Xen hypervisor.
-
-          To do that the driver parses the Power Management data and uploads said
-          information to the Xen hypervisor. Then the Xen hypervisor can select the
-          proper Cx and Pxx states. It also registers itslef as the SMM so that
-          other drivers (such as ACPI cpufreq scaling driver) will not load.
-
-          To compile this driver as a module, choose M here: the
-          module will be called xen_acpi_processor  If you do not know what to choose,
-          select M here. If the CPUFREQ drivers are built in, select Y here.
+          This ACPI processor uploads Power Management information to the Xen
+          hypervisor.
+
+          To do that the driver parses the Power Management data and uploads
+          said information to the Xen hypervisor. Then the Xen hypervisor can
+          select the proper Cx and Pxx states. It also registers itslef as the
+          SMM so that other drivers (such as ACPI cpufreq scaling driver) will
+          not load.
+
+          To compile this driver as a module, choose M here: the module will be
+          called xen_acpi_processor  If you do not know what to choose, select
+          M here. If the CPUFREQ drivers are built in, select Y here.
 
 endmenu
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 4b33acd8ed4e..0a8a17cd80be 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -274,7 +274,7 @@ static unsigned int cpu_from_evtchn(unsigned int evtchn)
 
 static bool pirq_check_eoi_map(unsigned irq)
 {
-        return test_bit(irq, pirq_eoi_map);
+        return test_bit(pirq_from_irq(irq), pirq_eoi_map);
 }
 
 static bool pirq_needs_eoi_flag(unsigned irq)
diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c
index 174b5653cd8a..0b48579a9cd6 100644
--- a/drivers/xen/xen-acpi-processor.c
+++ b/drivers/xen/xen-acpi-processor.c
@@ -128,7 +128,10 @@ static int push_cxx_to_hypervisor(struct acpi_processor *_pr)
                         pr_debug("     C%d: %s %d uS\n",
                                  cx->type, cx->desc, (u32)cx->latency);
                 }
-        } else
+        } else if (ret != -EINVAL)
+                /* EINVAL means the ACPI ID is incorrect - meaning the ACPI
+                 * table is referencing a non-existing CPU - which can happen
+                 * with broken ACPI tables. */
                 pr_err(DRV_NAME "(CX): Hypervisor error (%d) for ACPI CPU%u\n",
                        ret, _pr->acpi_id);