136 files changed, 1496 insertions, 1115 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index b9f923ef173d..ccf6ea95f68c 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -82,6 +82,12 @@ config ACPI_PROCFS_POWER
          and functions, which do not yet exist in /sys
          Say N to delete power /proc/acpi/ folders that have moved to /sys/
+config ACPI_SYSFS_POWER
+        bool "Future power /sys interface"
+        select POWER_SUPPLY
+        default y
+        ---help---
+          Say N to disable power /sys interface
 config ACPI_PROC_EVENT
        bool "Deprecated /proc/acpi/event support"
        depends on PROC_FS
@@ -103,7 +109,6 @@ config ACPI_PROC_EVENT
 config ACPI_AC
        tristate "AC Adapter"
        depends on X86
-        select POWER_SUPPLY
        default y
        help
          This driver adds support for the AC Adapter object, which indicates
@@ -113,7 +118,6 @@ config ACPI_AC
 config ACPI_BATTERY
        tristate "Battery"
        depends on X86
-        select POWER_SUPPLY
        default y
        help
          This driver adds support for battery information through
@@ -368,7 +372,6 @@ config ACPI_HOTPLUG_MEMORY
 config ACPI_SBS
        tristate "Smart Battery System"
        depends on X86
-        select POWER_SUPPLY
        help
          This driver adds support for the Smart Battery System, another
          type of access to battery information, found on some laptops.
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 76ed4f52bebd..76b9bea98b6d 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -31,7 +31,9 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #endif
+#ifdef CONFIG_ACPI_SYSFS_POWER
 #include <linux/power_supply.h>
+#endif
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
@@ -79,7 +81,9 @@ static struct acpi_driver acpi_ac_driver = {
 };
 struct acpi_ac {
+#ifdef CONFIG_ACPI_SYSFS_POWER
        struct power_supply charger;
+#endif
        struct acpi_device * device;
        unsigned long state;
 };
@@ -94,7 +98,7 @@ static const struct file_operations acpi_ac_fops = {
        .release = single_release,
 };
 #endif
+#ifdef CONFIG_ACPI_SYSFS_POWER
 static int get_ac_property(struct power_supply *psy,
                           enum power_supply_property psp,
                           union power_supply_propval *val)
@@ -113,7 +117,7 @@ static int get_ac_property(struct power_supply *psy,
 static enum power_supply_property ac_props[] = {
        POWER_SUPPLY_PROP_ONLINE,
 };
+#endif
 /* --------------------------------------------------------------------------
                               AC Adapter Management
   -------------------------------------------------------------------------- */
@@ -241,7 +245,9 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data)
                acpi_bus_generate_netlink_event(device->pnp.device_class,
                                                  device->dev.bus_id, event,
                                                  (u32) ac->state);
+#ifdef CONFIG_ACPI_SYSFS_POWER
                kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);
+#endif
                break;
        default:
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -280,12 +286,14 @@ static int acpi_ac_add(struct acpi_device *device)
 #endif
        if (result)
                goto end;
+#ifdef CONFIG_ACPI_SYSFS_POWER
        ac->charger.name = acpi_device_bid(device);
        ac->charger.type = POWER_SUPPLY_TYPE_MAINS;
        ac->charger.properties = ac_props;
        ac->charger.num_properties = ARRAY_SIZE(ac_props);
        ac->charger.get_property = get_ac_property;
        power_supply_register(&ac->device->dev, &ac->charger);
+#endif
        status = acpi_install_notify_handler(device->handle,
                                             ACPI_ALL_NOTIFY, acpi_ac_notify,
                                             ac);
@@ -319,8 +327,10 @@ static int acpi_ac_resume(struct acpi_device *device)
        old_state = ac->state;
        if (acpi_ac_get_state(ac))
                return 0;
+#ifdef CONFIG_ACPI_SYSFS_POWER
        if (old_state != ac->state)
                kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);
+#endif
        return 0;
 }
@@ -337,8 +347,10 @@ static int acpi_ac_remove(struct acpi_device *device, int type)
        status = acpi_remove_notify_handler(device->handle,
                                            ACPI_ALL_NOTIFY, acpi_ac_notify);
+#ifdef CONFIG_ACPI_SYSFS_POWER
        if (ac->charger.dev)
                power_supply_unregister(&ac->charger);
+#endif
 #ifdef CONFIG_ACPI_PROCFS_POWER
        acpi_ac_remove_fs(device);
 #endif
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 8f7505d304b5..c4a769d1ba85 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -40,7 +40,9 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
+#ifdef CONFIG_ACPI_SYSFS_POWER
 #include <linux/power_supply.h>
+#endif
 #define ACPI_BATTERY_VALUE_UNKNOWN 0xFFFFFFFF
@@ -86,7 +88,9 @@ MODULE_DEVICE_TABLE(acpi, battery_device_ids);
 struct acpi_battery {
        struct mutex lock;
+#ifdef CONFIG_ACPI_SYSFS_POWER
        struct power_supply bat;
+#endif
        struct acpi_device *device;
        unsigned long update_time;
        int current_now;
@@ -117,6 +121,7 @@ inline int acpi_battery_present(struct acpi_battery *battery)
        return battery->device->status.battery_present;
 }
+#ifdef CONFIG_ACPI_SYSFS_POWER
 static int acpi_battery_technology(struct acpi_battery *battery)
 {
        if (!strcasecmp("NiCd", battery->type))
@@ -222,6 +227,7 @@ static enum power_supply_property energy_battery_props[] = {
        POWER_SUPPLY_PROP_MODEL_NAME,
        POWER_SUPPLY_PROP_MANUFACTURER,
 };
+#endif
 #ifdef CONFIG_ACPI_PROCFS_POWER
 inline char *acpi_battery_units(struct acpi_battery *battery)
@@ -398,6 +404,7 @@ static int acpi_battery_init_alarm(struct acpi_battery *battery)
        return acpi_battery_set_alarm(battery);
 }
+#ifdef CONFIG_ACPI_SYSFS_POWER
 static ssize_t acpi_battery_alarm_show(struct device *dev,
                                        struct device_attribute *attr,
                                        char *buf)
@@ -429,11 +436,6 @@ static int sysfs_add_battery(struct acpi_battery *battery)
 {
        int result;
-        battery->update_time = 0;
-        result = acpi_battery_get_info(battery);
-        acpi_battery_init_alarm(battery);
-        if (result)
-                return result;
        if (battery->power_unit) {
                battery->bat.properties = charge_battery_props;
                battery->bat.num_properties =
@@ -462,18 +464,31 @@ static void sysfs_remove_battery(struct acpi_battery *battery)
        power_supply_unregister(&battery->bat);
        battery->bat.dev = NULL;
 }
+#endif
 static int acpi_battery_update(struct acpi_battery *battery)
 {
-        int result = acpi_battery_get_status(battery);
+        int result;
+        result = acpi_battery_get_status(battery);
        if (result)
                return result;
+#ifdef CONFIG_ACPI_SYSFS_POWER
        if (!acpi_battery_present(battery)) {
                sysfs_remove_battery(battery);
+                battery->update_time = 0;
                return 0;
        }
+#endif
+        if (!battery->update_time) {
+                result = acpi_battery_get_info(battery);
+                if (result)
+                        return result;
+                acpi_battery_init_alarm(battery);
+        }
+#ifdef CONFIG_ACPI_SYSFS_POWER
        if (!battery->bat.dev)
                sysfs_add_battery(battery);
+#endif
        return acpi_battery_get_state(battery);
 }
@@ -767,9 +782,11 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)
        acpi_bus_generate_netlink_event(device->pnp.device_class,
                                        device->dev.bus_id, event,
                                        acpi_battery_present(battery));
+#ifdef CONFIG_ACPI_SYSFS_POWER
        /* acpi_batter_update could remove power_supply object */
        if (battery->bat.dev)
                kobject_uevent(&battery->bat.dev->kobj, KOBJ_CHANGE);
+#endif
 }
 static int acpi_battery_add(struct acpi_device *device)
@@ -828,7 +845,9 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
 #ifdef CONFIG_ACPI_PROCFS_POWER
        acpi_battery_remove_fs(device);
 #endif
+#ifdef CONFIG_ACPI_SYSFS_POWER
        sysfs_remove_battery(battery);
+#endif
        mutex_destroy(&battery->lock);
        kfree(battery);
        return 0;
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 49d432d0a12c..d7a115c362d1 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -29,7 +29,6 @@
 #include <linux/list.h>
 #include <linux/sched.h>
 #include <linux/pm.h>
-#include <linux/pm_legacy.h>
 #include <linux/device.h>
 #include <linux/proc_fs.h>
 #ifdef CONFIG_X86
@@ -764,16 +763,14 @@ static int __init acpi_init(void)
        result = acpi_bus_init();
        if (!result) {
-#ifdef CONFIG_PM_LEGACY
+                if (!(pm_flags & PM_APM))
-                if (!PM_IS_ACTIVE())
+                        pm_flags |= PM_ACPI;
-                        pm_active = 1;
                else {
                        printk(KERN_INFO PREFIX
                               "APM is already active, exiting\n");
                        disable_acpi();
                        result = -ENODEV;
                }
-#endif
        } else
                disable_acpi();
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index d411017f8c06..97dc16155a55 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -892,6 +892,17 @@ static int acpi_ec_stop(struct acpi_device *device, int type)
        return 0;
 }
+int __init acpi_boot_ec_enable(void)
+{
+        if (!boot_ec || boot_ec->handlers_installed)
+                return 0;
+        if (!ec_install_handlers(boot_ec)) {
+                first_ec = boot_ec;
+                return 0;
+        }
+        return -EFAULT;
+}
 int __init acpi_ec_ecdt_probe(void)
 {
        int ret;
@@ -924,9 +935,10 @@ int __init acpi_ec_ecdt_probe(void)
                        goto error;
                /* We really need to limit this workaround, the only ASUS,
                 * which needs it, has fake EC._INI method, so use it as flag.
+                 * Keep boot_ec struct as it will be needed soon.
                 */
                if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x)))
-                        goto error;
+                        return -ENODEV;
        }
        ret = ec_install_handlers(boot_ec);
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
index e99f0c435a47..58ad09725dd2 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/events/evregion.c
@@ -344,7 +344,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 * setup will potentially execute control methods
                 * (e.g., _REG method for this region)
                 */
-                acpi_ex_relinquish_interpreter();
+                acpi_ex_exit_interpreter();
                status = region_setup(region_obj, ACPI_REGION_ACTIVATE,
                                      handler_desc->address_space.context,
@@ -352,7 +352,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                /* Re-enter the interpreter */
-                acpi_ex_reacquire_interpreter();
+                acpi_ex_enter_interpreter();
                /* Check for failure of the Region Setup */
@@ -405,7 +405,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 * exit the interpreter because the handler *might* block -- we don't
                 * know what it will do, so we can't hold the lock on the intepreter.
                 */
-                acpi_ex_relinquish_interpreter();
+                acpi_ex_exit_interpreter();
        }
        /* Call the handler */
@@ -426,7 +426,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 * We just returned from a non-default handler, we must re-enter the
                 * interpreter
                 */
-                acpi_ex_reacquire_interpreter();
+                acpi_ex_enter_interpreter();
        }
        return_ACPI_STATUS(status);
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index dd3186abe07a..62010c2481b3 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -429,6 +429,15 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
                                          &polarity, &link,
                                          acpi_pci_allocate_irq);
+        if (irq < 0) {
+                /*
+                 * IDE legacy mode controller IRQs are magic. Why do compat
+                 * extensions always make such a nasty mess.
+                 */
+                if (dev->class >> 8 == PCI_CLASS_STORAGE_IDE &&
+                                (dev->class & 0x05) == 0)
+                        return 0;
+        }
        /*
         * No IRQ known to the ACPI subsystem - maybe the BIOS / 
         * driver reported one, then use it. Exit in any case.
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 2fe34cc73c13..2235f4e02d26 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -76,7 +76,11 @@ static void (*pm_idle_save) (void) __read_mostly;
 #define PM_TIMER_TICKS_TO_US(p)         (((p) * 1000)/(PM_TIMER_FREQUENCY/1000))
 static unsigned int max_cstate __read_mostly = ACPI_PROCESSOR_MAX_POWER;
+#ifdef CONFIG_CPU_IDLE
 module_param(max_cstate, uint, 0000);
+#else
+module_param(max_cstate, uint, 0644);
+#endif
 static unsigned int nocst __read_mostly;
 module_param(nocst, uint, 0000);
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 22cb95b349e4..f136c7d3b3c2 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -40,7 +40,9 @@
 #include <linux/jiffies.h>
 #include <linux/delay.h>
+#ifdef CONFIG_ACPI_SYSFS_POWER
 #include <linux/power_supply.h>
+#endif
 #include "sbshc.h"
@@ -80,7 +82,9 @@ static const struct acpi_device_id sbs_device_ids[] = {
 MODULE_DEVICE_TABLE(acpi, sbs_device_ids);
 struct acpi_battery {
+#ifdef CONFIG_ACPI_SYSFS_POWER
        struct power_supply bat;
+#endif
        struct acpi_sbs *sbs;
 #ifdef CONFIG_ACPI_PROCFS_POWER
        struct proc_dir_entry *proc_entry;
@@ -113,7 +117,9 @@ struct acpi_battery {
 #define to_acpi_battery(x) container_of(x, struct acpi_battery, bat);
 struct acpi_sbs {
+#ifdef CONFIG_ACPI_SYSFS_POWER
        struct power_supply charger;
+#endif
        struct acpi_device *device;
        struct acpi_smb_hc *hc;
        struct mutex lock;
@@ -157,6 +163,7 @@ static inline int acpi_battery_scale(struct acpi_battery *battery)
            acpi_battery_ipscale(battery);
 }
+#ifdef CONFIG_ACPI_SYSFS_POWER
 static int sbs_get_ac_property(struct power_supply *psy,
                               enum power_supply_property psp,
                               union power_supply_propval *val)
@@ -294,6 +301,7 @@ static enum power_supply_property sbs_energy_battery_props[] = {
        POWER_SUPPLY_PROP_MODEL_NAME,
        POWER_SUPPLY_PROP_MANUFACTURER,
 };
+#endif
 /* --------------------------------------------------------------------------
                            Smart Battery System Management
@@ -429,6 +437,7 @@ static int acpi_ac_get_present(struct acpi_sbs *sbs)
        return result;
 }
+#ifdef CONFIG_ACPI_SYSFS_POWER
 static ssize_t acpi_battery_alarm_show(struct device *dev,
                                        struct device_attribute *attr,
                                        char *buf)
@@ -458,6 +467,7 @@ static struct device_attribute alarm_attr = {
        .show = acpi_battery_alarm_show,
        .store = acpi_battery_alarm_store,
 };
+#endif
 /* --------------------------------------------------------------------------
                              FS Interface (/proc/acpi)
@@ -793,6 +803,7 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
                        &acpi_battery_state_fops, &acpi_battery_alarm_fops,
                        battery);
 #endif
+#ifdef CONFIG_ACPI_SYSFS_POWER
        battery->bat.name = battery->name;
        battery->bat.type = POWER_SUPPLY_TYPE_BATTERY;
        if (!acpi_battery_mode(battery)) {
@@ -813,6 +824,7 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
                goto end;
        battery->have_sysfs_alarm = 1;
      end:
+#endif
        printk(KERN_INFO PREFIX "%s [%s]: Battery Slot [%s] (battery %s)\n",
               ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device),
               battery->name, sbs->battery->present ? "present" : "absent");
@@ -822,12 +834,13 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
 static void acpi_battery_remove(struct acpi_sbs *sbs, int id)
 {
        struct acpi_battery *battery = &sbs->battery[id];
+#ifdef CONFIG_ACPI_SYSFS_POWER
        if (battery->bat.dev) {
                if (battery->have_sysfs_alarm)
                        device_remove_file(battery->bat.dev, &alarm_attr);
                power_supply_unregister(&battery->bat);
        }
+#endif
 #ifdef CONFIG_ACPI_PROCFS_POWER
        if (battery->proc_entry)
                acpi_sbs_remove_fs(&battery->proc_entry, acpi_battery_dir);
@@ -848,12 +861,14 @@ static int acpi_charger_add(struct acpi_sbs *sbs)
        if (result)
                goto end;
 #endif
+#ifdef CONFIG_ACPI_SYSFS_POWER
        sbs->charger.name = "sbs-charger";
        sbs->charger.type = POWER_SUPPLY_TYPE_MAINS;
        sbs->charger.properties = sbs_ac_props;
        sbs->charger.num_properties = ARRAY_SIZE(sbs_ac_props);
        sbs->charger.get_property = sbs_get_ac_property;
        power_supply_register(&sbs->device->dev, &sbs->charger);
+#endif
        printk(KERN_INFO PREFIX "%s [%s]: AC Adapter [%s] (%s)\n",
               ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device),
               ACPI_AC_DIR_NAME, sbs->charger_present ? "on-line" : "off-line");
@@ -863,8 +878,10 @@ static int acpi_charger_add(struct acpi_sbs *sbs)
 static void acpi_charger_remove(struct acpi_sbs *sbs)
 {
+#ifdef CONFIG_ACPI_SYSFS_POWER
        if (sbs->charger.dev)
                power_supply_unregister(&sbs->charger);
+#endif
 #ifdef CONFIG_ACPI_PROCFS_POWER
        if (sbs->charger_entry)
                acpi_sbs_remove_fs(&sbs->charger_entry, acpi_ac_dir);
@@ -885,7 +902,9 @@ void acpi_sbs_callback(void *context)
                                              ACPI_SBS_NOTIFY_STATUS,
                                              sbs->charger_present);
 #endif
+#ifdef CONFIG_ACPI_SYSFS_POWER
                kobject_uevent(&sbs->charger.dev->kobj, KOBJ_CHANGE);
+#endif
        }
        if (sbs->manager_present) {
                for (id = 0; id < MAX_SBS_BAT; ++id) {
@@ -902,7 +921,9 @@ void acpi_sbs_callback(void *context)
                                                      ACPI_SBS_NOTIFY_STATUS,
                                                      bat->present);
 #endif
+#ifdef CONFIG_ACPI_SYSFS_POWER
                        kobject_uevent(&bat->bat.dev->kobj, KOBJ_CHANGE);
+#endif
                }
        }
 }
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 5b4d462117cf..cbfe9ae7a9e5 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1449,6 +1449,8 @@ static int acpi_bus_scan_fixed(struct acpi_device *root)
        return result;
 }
+int __init acpi_boot_ec_enable(void);
 static int __init acpi_scan_init(void)
 {
        int result;
@@ -1480,6 +1482,10 @@ static int __init acpi_scan_init(void)
         * Enumerate devices in the ACPI namespace.
         */
        result = acpi_bus_scan_fixed(acpi_root);
+        /* EC region might be needed at bus_scan, so enable it now */
+        acpi_boot_ec_enable();
        if (!result)
                result = acpi_bus_scan(acpi_root, &ops);
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index bb62a588f489..b406b39b878e 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -132,6 +132,7 @@ enum {
        ich8_2port_sata,
        ich8m_apple_sata_ahci,          /* locks up on second port enable */
        tolapai_sata_ahci,
+        piix_pata_vmw,                  /* PIIX4 for VMware, spurious DMA_ERR */
        /* constants for mapping table */
        P0                      = 0,  /* port 0 */
@@ -165,6 +166,7 @@ static void piix_set_piomode(struct ata_port *ap, struct ata_device *adev);
 static void piix_set_dmamode(struct ata_port *ap, struct ata_device *adev);
 static void ich_set_dmamode(struct ata_port *ap, struct ata_device *adev);
 static int ich_pata_cable_detect(struct ata_port *ap);
+static u8 piix_vmw_bmdma_status(struct ata_port *ap);
 #ifdef CONFIG_PM
 static int piix_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg);
 static int piix_pci_device_resume(struct pci_dev *pdev);
@@ -175,6 +177,8 @@ static unsigned int in_module_init = 1;
 static const struct pci_device_id piix_pci_tbl[] = {
        /* Intel PIIX3 for the 430HX etc */
        { 0x8086, 0x7010, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_mwdma },
+        /* VMware ICH4 */
+        { 0x8086, 0x7111, 0x15ad, 0x1976, 0, 0, piix_pata_vmw },
        /* Intel PIIX4 for the 430TX/440BX/MX chipset: UDMA 33 */
        /* Also PIIX4E (fn3 rev 2) and PIIX4M (fn3 rev 3) */
        { 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
@@ -383,6 +387,38 @@ static const struct ata_port_operations piix_sata_ops = {
        .port_start             = ata_port_start,
 };
+static const struct ata_port_operations piix_vmw_ops = {
+        .set_piomode            = piix_set_piomode,
+        .set_dmamode            = piix_set_dmamode,
+        .mode_filter            = ata_pci_default_filter,
+        .tf_load                = ata_tf_load,
+        .tf_read                = ata_tf_read,
+        .check_status           = ata_check_status,
+        .exec_command           = ata_exec_command,
+        .dev_select             = ata_std_dev_select,
+        .bmdma_setup            = ata_bmdma_setup,
+        .bmdma_start            = ata_bmdma_start,
+        .bmdma_stop             = ata_bmdma_stop,
+        .bmdma_status           = piix_vmw_bmdma_status,
+        .qc_prep                = ata_qc_prep,
+        .qc_issue               = ata_qc_issue_prot,
+        .data_xfer              = ata_data_xfer,
+        .freeze                 = ata_bmdma_freeze,
+        .thaw                   = ata_bmdma_thaw,
+        .error_handler          = piix_pata_error_handler,
+        .post_internal_cmd      = ata_bmdma_post_internal_cmd,
+        .cable_detect           = ata_cable_40wire,
+        .irq_handler            = ata_interrupt,
+        .irq_clear              = ata_bmdma_irq_clear,
+        .irq_on                 = ata_irq_on,
+        .port_start             = ata_port_start,
+};
 static const struct piix_map_db ich5_map_db = {
        .mask = 0x7,
        .port_enable = 0x3,
@@ -623,6 +659,16 @@ static struct ata_port_info piix_port_info[] = {
                .port_ops       = &piix_sata_ops,
        },
+        [piix_pata_vmw] =
+        {
+                .sht            = &piix_sht,
+                .flags          = PIIX_PATA_FLAGS,
+                .pio_mask       = 0x1f, /* pio0-4 */
+                .mwdma_mask     = 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */
+                .udma_mask      = ATA_UDMA_MASK_40C,
+                .port_ops       = &piix_vmw_ops,
+        },
 };
 static struct pci_bits piix_enable_bits[] = {
@@ -1135,6 +1181,11 @@ static int piix_pci_device_resume(struct pci_dev *pdev)
 }
 #endif
+static u8 piix_vmw_bmdma_status(struct ata_port *ap)
+{
+        return ata_bmdma_status(ap) & ~ATA_DMA_ERR;
+}
 #define AHCI_PCI_BAR 5
 #define AHCI_GLOBAL_CTL 0x04
 #define AHCI_ENABLE (1 << 31)
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 4753a1831dbc..6380726f7538 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -6998,7 +6998,9 @@ int ata_host_start(struct ata_host *host)
                        rc = ap->ops->port_start(ap);
                        if (rc) {
                                if (rc != -ENODEV)
-                                        dev_printk(KERN_ERR, host->dev, "failed to start port %d (errno=%d)\n", i, rc);
+                                        dev_printk(KERN_ERR, host->dev,
+                                                "failed to start port %d "
+                                                "(errno=%d)\n", i, rc);
                                goto err_out;
                        }
                }
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index f0124a8d3134..21a81cd148e4 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1733,11 +1733,15 @@ static void ata_eh_link_autopsy(struct ata_link *link)
                ehc->i.action &= ~ATA_EH_PERDEV_MASK;
        }
-        /* consider speeding down */
+        /* propagate timeout to host link */
+        if ((all_err_mask & AC_ERR_TIMEOUT) && !ata_is_host_link(link))
+                ap->link.eh_context.i.err_mask |= AC_ERR_TIMEOUT;
+        /* record error and consider speeding down */
        dev = ehc->i.dev;
-        if (!dev && ata_link_max_devices(link) == 1 &&
+        if (!dev && ((ata_link_max_devices(link) == 1 &&
-            ata_dev_enabled(link->device))
+                      ata_dev_enabled(link->device))))
-                dev = link->device;
+            dev = link->device;
        if (dev)
                ehc->i.action |= ata_eh_speed_down(dev, is_io, all_err_mask);
@@ -1759,8 +1763,14 @@ void ata_eh_autopsy(struct ata_port *ap)
 {
        struct ata_link *link;
-        __ata_port_for_each_link(link, ap)
+        ata_port_for_each_link(link, ap)
                ata_eh_link_autopsy(link);
+        /* Autopsy of fanout ports can affect host link autopsy.
+         * Perform host link autopsy last.
+         */
+        if (ap->nr_pmp_links)
+                ata_eh_link_autopsy(&ap->link);
 }
 /**
@@ -2157,13 +2167,11 @@ int ata_eh_reset(struct ata_link *link, int classify,
                if (ata_link_offline(link))
                        continue;
-                /* apply class override and convert UNKNOWN to NONE */
+                /* apply class override */
                if (lflags & ATA_LFLAG_ASSUME_ATA)
                        classes[dev->devno] = ATA_DEV_ATA;
                else if (lflags & ATA_LFLAG_ASSUME_SEMB)
                        classes[dev->devno] = ATA_DEV_SEMB_UNSUP; /* not yet */
-                else if (classes[dev->devno] == ATA_DEV_UNKNOWN)
-                        classes[dev->devno] = ATA_DEV_NONE;
        }
        /* record current link speed */
diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c
index c0c4dbcde091..caef2bbd4a8a 100644
--- a/drivers/ata/libata-pmp.c
+++ b/drivers/ata/libata-pmp.c
@@ -495,14 +495,12 @@ static void sata_pmp_quirks(struct ata_port *ap)
                        /* SError.N need a kick in the ass to get working */
                        link->flags |= ATA_LFLAG_HRST_TO_RESUME;
-                        /* class code report is unreliable */
+                        /* Class code report is unreliable and SRST
-                        if (link->pmp < 5)
+                         * times out under certain configurations.
-                                link->flags |= ATA_LFLAG_ASSUME_ATA;
+                         * Config device can be at port 0 or 5 and
+                         * locks up on SRST.
-                        /* The config device, which can be either at
-                         * port 0 or 5, locks up on SRST.
                         */
-                        if (link->pmp == 0 || link->pmp == 5)
+                        if (link->pmp <= 5)
                                link->flags |= ATA_LFLAG_NO_SRST |
                                               ATA_LFLAG_ASSUME_ATA;
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index a883bb03d4c7..14daf4848f09 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -841,6 +841,9 @@ static void ata_scsi_dev_config(struct scsi_device *sdev,
                blk_queue_max_hw_segments(q, q->max_hw_segments - 1);
        }
+        if (dev->class == ATA_DEV_ATA)
+                sdev->manage_start_stop = 1;
        if (dev->flags & ATA_DFLAG_AN)
                set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events);
@@ -872,8 +875,6 @@ int ata_scsi_slave_config(struct scsi_device *sdev)
        ata_scsi_sdev_config(sdev);
-        sdev->manage_start_stop = 1;
        if (dev)
                ata_scsi_dev_config(sdev, dev);
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 48acc09dab96..b7ac80b4b1fb 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -806,7 +806,10 @@ int ata_pci_init_one(struct pci_dev *pdev,
        if (rc)
                goto err_out;
-        if (!legacy_mode) {
+        if (!legacy_mode && pdev->irq) {
+                /* We may have no IRQ assigned in which case we can poll. This
+                   shouldn't happen on a sane system but robustness is cheap
+                   in this case */
                rc = devm_request_irq(dev, pdev->irq, pi->port_ops->irq_handler,
                                      IRQF_SHARED, DRV_NAME, host);
                if (rc)
@@ -814,7 +817,7 @@ int ata_pci_init_one(struct pci_dev *pdev,
                ata_port_desc(host->ports[0], "irq %d", pdev->irq);
                ata_port_desc(host->ports[1], "irq %d", pdev->irq);
-        } else {
+        } else if (legacy_mode) {
                if (!ata_port_is_dummy(host->ports[0])) {
                        rc = devm_request_irq(dev, ATA_PRIMARY_IRQ(pdev),
                                              pi->port_ops->irq_handler,
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
index 088a41f4e656..7842cc487359 100644
--- a/drivers/ata/pata_bf54x.c
+++ b/drivers/ata/pata_bf54x.c
@@ -1509,7 +1509,8 @@ static int __devinit bfin_atapi_probe(struct platform_device *pdev)
        if (res == NULL)
                return -EINVAL;
-        while (bfin_port_info[board_idx].udma_mask>0 && udma_fsclk[udma_mode] > fsclk) {
+        while (bfin_port_info[board_idx].udma_mask > 0 &&
+                        udma_fsclk[udma_mode] > fsclk) {
                udma_mode--;
                bfin_port_info[board_idx].udma_mask >>= 1;
        }
diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index fcd532afbf2e..120b5bfa7ce6 100644
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -130,10 +130,11 @@ static struct ata_port_operations ixp4xx_port_ops = {
        .port_start             = ata_port_start,
 };
-static void ixp4xx_setup_port(struct ata_ioports *ioaddr,
+static void ixp4xx_setup_port(struct ata_port *ap,
                              struct ixp4xx_pata_data *data,
                              unsigned long raw_cs0, unsigned long raw_cs1)
 {
+        struct ata_ioports *ioaddr = &ap->ioaddr;
        unsigned long raw_cmd = raw_cs0;
        unsigned long raw_ctl = raw_cs1 + 0x06;
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index 7bed8d806381..17159b5e1e43 100644
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -271,14 +271,12 @@ static void pdc_data_xfer_vlb(struct ata_device *adev, unsigned char *buf, unsig
                        ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);
                if (unlikely(slop)) {
-                        u32 pad;
+                        __le32 pad = 0;
                        if (write_data) {
                                memcpy(&pad, buf + buflen - slop, slop);
-                                pad = le32_to_cpu(pad);
+                                iowrite32(le32_to_cpu(pad), ap->ioaddr.data_addr);
-                                iowrite32(pad, ap->ioaddr.data_addr);
                        } else {
-                                pad = ioread32(ap->ioaddr.data_addr);
+                                pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
-                                pad = cpu_to_le16(pad);
                                memcpy(buf + buflen - slop, &pad, slop);
                        }
                }
diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
index bc7c2d5d8d5e..8f2815601791 100644
--- a/drivers/ata/pata_pdc202xx_old.c
+++ b/drivers/ata/pata_pdc202xx_old.c
@@ -215,8 +215,8 @@ static void pdc2026x_bmdma_stop(struct ata_queued_cmd *qc)
        /* Flip back to 33Mhz for PIO */
        if (adev->dma_mode >= XFER_UDMA_2)
                iowrite8(ioread8(clock) & ~sel66, clock);
        ata_bmdma_stop(qc);
+        pdc202xx_set_piomode(ap, adev);
 }
 /**
@@ -233,6 +233,17 @@ static void pdc2026x_dev_config(struct ata_device *adev)
        adev->max_sectors = 256;
 }
+static int pdc2026x_port_start(struct ata_port *ap)
+{
+        void __iomem *bmdma = ap->ioaddr.bmdma_addr;
+        if (bmdma) {
+                /* Enable burst mode */
+                u8 burst = ioread8(bmdma + 0x1f);
+                iowrite8(burst | 0x01, bmdma + 0x1f);
+        }
+        return ata_sff_port_start(ap);
+}
 static struct scsi_host_template pdc202xx_sht = {
        .module                 = THIS_MODULE,
        .name                   = DRV_NAME,
@@ -313,7 +324,7 @@ static struct ata_port_operations pdc2026x_port_ops = {
        .irq_clear      = ata_bmdma_irq_clear,
        .irq_on         = ata_irq_on,
-        .port_start     = ata_sff_port_start,
+        .port_start     = pdc2026x_port_start,
 };
 static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id)
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
index 7d4c696c4cb6..a4c0e502cb42 100644
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
@@ -136,14 +136,12 @@ static void qdi_data_xfer(struct ata_device *adev, unsigned char *buf, unsigned
                        ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);
                if (unlikely(slop)) {
-                        u32 pad;
+                        __le32 pad = 0;
                        if (write_data) {
                                memcpy(&pad, buf + buflen - slop, slop);
-                                pad = le32_to_cpu(pad);
+                                iowrite32(le32_to_cpu(pad), ap->ioaddr.data_addr);
-                                iowrite32(pad, ap->ioaddr.data_addr);
                        } else {
-                                pad = ioread32(ap->ioaddr.data_addr);
+                                pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
-                                pad = cpu_to_le32(pad);
                                memcpy(buf + buflen - slop, &pad, slop);
                        }
                }
diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c
index 311cdb3a5566..7116a9e7a8b2 100644
--- a/drivers/ata/pata_winbond.c
+++ b/drivers/ata/pata_winbond.c
@@ -104,14 +104,12 @@ static void winbond_data_xfer(struct ata_device *adev, unsigned char *buf, unsig
                        ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);
                if (unlikely(slop)) {
-                        u32 pad;
+                        __le32 pad = 0;
                        if (write_data) {
                                memcpy(&pad, buf + buflen - slop, slop);
-                                pad = le32_to_cpu(pad);
+                                iowrite32(le32_to_cpu(pad), ap->ioaddr.data_addr);
-                                iowrite32(pad, ap->ioaddr.data_addr);
                        } else {
-                                pad = ioread32(ap->ioaddr.data_addr);
+                                pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
-                                pad = cpu_to_le16(pad);
                                memcpy(buf + buflen - slop, &pad, slop);
                        }
                }
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index 2f1de6ec044c..c68b241805fd 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -270,7 +270,7 @@ static int qs_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)
 static void qs_error_handler(struct ata_port *ap)
 {
        qs_enter_reg_mode(ap);
-        ata_do_eh(ap, qs_prereset, ata_std_softreset, NULL,
+        ata_do_eh(ap, qs_prereset, NULL, sata_std_hardreset,
                  ata_std_postreset);
 }
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 96fd5260446d..864c1c1b8511 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -301,7 +301,7 @@ static struct sil24_cerr_info {
        [PORT_CERR_PKT_PROT]    = { AC_ERR_HSM, ATA_EH_SOFTRESET,
                                    "invalid data directon for ATAPI CDB" },
        [PORT_CERR_SGT_BOUNDARY] = { AC_ERR_SYSTEM, ATA_EH_SOFTRESET,
-                                     "SGT no on qword boundary" },
+                                     "SGT not on qword boundary" },
        [PORT_CERR_SGT_TGTABRT] = { AC_ERR_HOST_BUS, ATA_EH_SOFTRESET,
                                    "PCI target abort while fetching SGT" },
        [PORT_CERR_SGT_MSTABRT] = { AC_ERR_HOST_BUS, ATA_EH_SOFTRESET,
@@ -832,16 +832,31 @@ static int sil24_qc_defer(struct ata_queued_cmd *qc)
        struct ata_link *link = qc->dev->link;
        struct ata_port *ap = link->ap;
        u8 prot = qc->tf.protocol;
-        int is_atapi = (prot == ATA_PROT_ATAPI ||
-                        prot == ATA_PROT_ATAPI_NODATA ||
+        /*
-                        prot == ATA_PROT_ATAPI_DMA);
+         * There is a bug in the chip:
+         * Port LRAM Causes the PRB/SGT Data to be Corrupted
-        /* ATAPI commands completing with CHECK_SENSE cause various
+         * If the host issues a read request for LRAM and SActive registers
-         * weird problems if other commands are active.  PMP DMA CS
+         * while active commands are available in the port, PRB/SGT data in
-         * errata doesn't cover all and HSM violation occurs even with
+         * the LRAM can become corrupted. This issue applies only when
-         * only one other device active.  Always run an ATAPI command
+         * reading from, but not writing to, the LRAM.
-         * by itself.
+         *
-         */
+         * Therefore, reading LRAM when there is no particular error [and
+         * other commands may be outstanding] is prohibited.
+         *
+         * To avoid this bug there are two situations where a command must run
+         * exclusive of any other commands on the port:
+         *
+         * - ATAPI commands which check the sense data
+         * - Passthrough ATA commands which always have ATA_QCFLAG_RESULT_TF
+         *   set.
+         *
+         */
+        int is_excl = (prot == ATA_PROT_ATAPI ||
+                       prot == ATA_PROT_ATAPI_NODATA ||
+                       prot == ATA_PROT_ATAPI_DMA ||
+                       (qc->flags & ATA_QCFLAG_RESULT_TF));
        if (unlikely(ap->excl_link)) {
                if (link == ap->excl_link) {
                        if (ap->nr_active_links)
@@ -849,7 +864,7 @@ static int sil24_qc_defer(struct ata_queued_cmd *qc)
                        qc->flags |= ATA_QCFLAG_CLEAR_EXCL;
                } else
                        return ATA_DEFER_PORT;
-        } else if (unlikely(is_atapi)) {
+        } else if (unlikely(is_excl)) {
                ap->excl_link = link;
                if (ap->nr_active_links)
                        return ATA_DEFER_PORT;
@@ -1079,10 +1094,13 @@ static void sil24_error_intr(struct ata_port *ap)
                if (ci && ci->desc) {
                        err_mask |= ci->err_mask;
                        action |= ci->action;
+                        if (action & ATA_EH_RESET_MASK)
+                                freeze = 1;
                        ata_ehi_push_desc(ehi, "%s", ci->desc);
                } else {
                        err_mask |= AC_ERR_OTHER;
                        action |= ATA_EH_SOFTRESET;
+                        freeze = 1;
                        ata_ehi_push_desc(ehi, "unknown command error %d",
                                          cerr);
                }
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index 14ced85b3f54..0c205b000e8b 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -625,14 +625,6 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev)
   if (mac[i] == NULL)
      nicstar_init_eprom(card->membase);
-   if (request_irq(pcidev->irq, &ns_irq_handler, IRQF_DISABLED | IRQF_SHARED, "nicstar", card) != 0)
-   {
-      printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);
-      error = 9;
-      ns_init_card_error(card, error);
-      return error;
-   }
   /* Set the VPI/VCI MSb mask to zero so we can receive OAM cells */
   writel(0x00000000, card->membase + VPM);
      
@@ -858,8 +850,6 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev)
      card->iovpool.count++;
   }
-   card->intcnt = 0;
   /* Configure NICStAR */
   if (card->rct_size == 4096)
      ns_cfg_rctsize = NS_CFG_RCTSIZE_4096_ENTRIES;
@@ -868,6 +858,15 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev)
   card->efbie = 1;
+   card->intcnt = 0;
+   if (request_irq(pcidev->irq, &ns_irq_handler, IRQF_DISABLED | IRQF_SHARED, "nicstar", card) != 0)
+   {
+      printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);
+      error = 9;
+      ns_init_card_error(card, error);
+      return error;
+   }
   /* Register device */
   card->atmdev = atm_dev_register("nicstar", &atm_ops, -1, NULL);
   if (card->atmdev == NULL)
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 7d704968765f..509b6490413b 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -2927,7 +2927,7 @@ default_int_mode:
        return;
 }
-static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
+static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
 {
        ushort subsystem_vendor_id, subsystem_device_id, command;
        __u32 board_id, scratchpad = 0;
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 56e23042728a..b8af22e610df 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -610,7 +610,7 @@ static int loop_thread(void *data)
 static int loop_switch(struct loop_device *lo, struct file *file)
 {
        struct switch_request w;
-        struct bio *bio = bio_alloc(GFP_KERNEL, 1);
+        struct bio *bio = bio_alloc(GFP_KERNEL, 0);
        if (!bio)
                return -ENOMEM;
        init_completion(&w.wait);
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
index 8c3e62a17b4a..b91d45a41b2f 100644
--- a/drivers/bluetooth/hci_ll.c
+++ b/drivers/bluetooth/hci_ll.c
@@ -204,6 +204,19 @@ static void ll_device_want_to_wakeup(struct hci_uart *hu)
        spin_lock_irqsave(&ll->hcill_lock, flags);
        switch (ll->hcill_state) {
+        case HCILL_ASLEEP_TO_AWAKE:
+                /*
+                 * This state means that both the host and the BRF chip
+                 * have simultaneously sent a wake-up-indication packet.
+                 * Traditionaly, in this case, receiving a wake-up-indication
+                 * was enough and an additional wake-up-ack wasn't needed.
+                 * This has changed with the BRF6350, which does require an
+                 * explicit wake-up-ack. Other BRF versions, which do not
+                 * require an explicit ack here, do accept it, thus it is
+                 * perfectly safe to always send one.
+                 */
+                BT_DBG("dual wake-up-indication");
+                /* deliberate fall-through - do not add break */
        case HCILL_ASLEEP:
                /* acknowledge device wake up */
                if (send_hcill_cmd(HCILL_WAKE_UP_ACK, hu) < 0) {
@@ -211,16 +224,8 @@ static void ll_device_want_to_wakeup(struct hci_uart *hu)
                        goto out;
                }
                break;
-        case HCILL_ASLEEP_TO_AWAKE:
-                /*
-                 * this state means that a wake-up-indication
-                 * is already on its way to the device,
-                 * and will serve as the required wake-up-ack
-                 */
-                BT_DBG("dual wake-up-indication");
-                break;
        default:
-                /* any other state are illegal */
+                /* any other state is illegal */
                BT_ERR("received HCILL_WAKE_UP_IND in state %ld", ll->hcill_state);
                break;
        }
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 39564b76d4a3..c88424a0c89b 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -1046,12 +1046,6 @@ void tpm_remove_hardware(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(tpm_remove_hardware);
-static u8 savestate[] = {
-        0, 193,                 /* TPM_TAG_RQU_COMMAND */
-        0, 0, 0, 10,            /* blob length (in bytes) */
-        0, 0, 0, 152            /* TPM_ORD_SaveState */
-};
 /*
 * We are about to suspend. Save the TPM state
 * so that it can be restored.
@@ -1059,6 +1053,12 @@ static u8 savestate[] = {
 int tpm_pm_suspend(struct device *dev, pm_message_t pm_state)
 {
        struct tpm_chip *chip = dev_get_drvdata(dev);
+        u8 savestate[] = {
+                0, 193,         /* TPM_TAG_RQU_COMMAND */
+                0, 0, 0, 10,    /* blob length (in bytes) */
+                0, 0, 0, 152    /* TPM_ORD_SaveState */
+        };
        if (chip == NULL)
                return -ENODEV;
diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c
index 296f51002b55..12ceed54ab18 100644
--- a/drivers/connector/cn_queue.c
+++ b/drivers/connector/cn_queue.c
@@ -99,8 +99,8 @@ int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id
        spin_unlock_bh(&dev->queue_lock);
        if (found) {
-                atomic_dec(&dev->refcnt);
                cn_queue_free_callback(cbq);
+                atomic_dec(&dev->refcnt);
                return -EINVAL;
        }
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index 1bba99747f5b..5d3a04ba6ad2 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -603,5 +603,9 @@ MODULE_DESCRIPTION ("'cpufreq_conservative' - A dynamic cpufreq governor for "
                "optimised for use in a battery environment");
 MODULE_LICENSE ("GPL");
+#ifdef CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE
+fs_initcall(cpufreq_gov_dbs_init);
+#else
 module_init(cpufreq_gov_dbs_init);
+#endif
 module_exit(cpufreq_gov_dbs_exit);
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index 369f44595150..d2af20dda382 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -610,6 +610,9 @@ MODULE_DESCRIPTION("'cpufreq_ondemand' - A dynamic cpufreq governor for "
                   "Low Latency Frequency Transition capable processors");
 MODULE_LICENSE("GPL");
+#ifdef CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND
+fs_initcall(cpufreq_gov_dbs_init);
+#else
 module_init(cpufreq_gov_dbs_init);
+#endif
 module_exit(cpufreq_gov_dbs_exit);
diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c
index 51bedab6c808..f8cdde4bf6cd 100644
--- a/drivers/cpufreq/cpufreq_userspace.c
+++ b/drivers/cpufreq/cpufreq_userspace.c
@@ -231,5 +231,9 @@ MODULE_AUTHOR ("Dominik Brodowski <linux@brodo.de>, Russell King <rmk@arm.linux.
 MODULE_DESCRIPTION ("CPUfreq policy governor 'userspace'");
 MODULE_LICENSE ("GPL");
+#ifdef CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE
 fs_initcall(cpufreq_gov_userspace_init);
+#else
+module_init(cpufreq_gov_userspace_init);
+#endif
 module_exit(cpufreq_gov_userspace_exit);
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
index a337b693b6c9..5f7e71810489 100644
--- a/drivers/crypto/padlock-aes.c
+++ b/drivers/crypto/padlock-aes.c
@@ -429,8 +429,8 @@ static inline void padlock_xcrypt(const u8 *input, u8 *output, void *key,
 static void aes_crypt_copy(const u8 *in, u8 *out, u32 *key, struct cword *cword)
 {
-        u8 tmp[AES_BLOCK_SIZE * 2]
+        u8 buf[AES_BLOCK_SIZE * 2 + PADLOCK_ALIGNMENT - 1];
-                __attribute__ ((__aligned__(PADLOCK_ALIGNMENT)));
+        u8 *tmp = PTR_ALIGN(&buf[0], PADLOCK_ALIGNMENT);
        memcpy(tmp, in, AES_BLOCK_SIZE);
        padlock_xcrypt(tmp, out, key, cword);
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index 9c8b6d5eaec9..c09b036913bd 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -135,7 +135,7 @@ static int xfer_write(struct i2c_adapter *adap, unsigned char *buf, int length)
 * Generic i2c master transfer entrypoint.
 *
 * Note: We do not use Atmel's feature of storing the "internal device address".
- * Instead the "internal device address" has to be written using a seperate
+ * Instead the "internal device address" has to be written using a separate
 * i2c message.
 * http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel/2004-September/024411.html
 */
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index cb55cf2ba1e9..f2552b19ea60 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -619,13 +619,13 @@ omap_i2c_probe(struct platform_device *pdev)
 err_free_irq:
        free_irq(dev->irq, dev);
 err_unuse_clocks:
+        omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
        omap_i2c_disable_clocks(dev);
        omap_i2c_put_clocks(dev);
 err_free_mem:
        platform_set_drvdata(pdev, NULL);
        kfree(dev);
 err_release_region:
-        omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
        release_mem_region(mem->start, (mem->end - mem->start) + 1);
        return r;
diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c
index 0ab4f2627c26..7813127649a1 100644
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c
@@ -94,7 +94,7 @@ static s32 i2c_powermac_smbus_xfer(	struct i2c_adapter*	adap,
                break;
        /* Note that these are broken vs. the expected smbus API where
-         * on reads, the lenght is actually returned from the function,
+         * on reads, the length is actually returned from the function,
         * but I think the current API makes no sense and I don't want
         * any driver that I haven't verified for correctness to go
         * anywhere near a pmac i2c bus anyway ...
diff --git a/drivers/i2c/busses/i2c-sibyte.c b/drivers/i2c/busses/i2c-sibyte.c
index 0ca599d3b402..503a134ec803 100644
--- a/drivers/i2c/busses/i2c-sibyte.c
+++ b/drivers/i2c/busses/i2c-sibyte.c
@@ -200,11 +200,14 @@ static struct i2c_adapter sibyte_board_adapter[2] = {
 static int __init i2c_sibyte_init(void)
 {
-        printk("i2c-swarm.o: i2c SMBus adapter module for SiByte board\n");
+        pr_info("i2c-sibyte: i2c SMBus adapter module for SiByte board\n");
        if (i2c_sibyte_add_bus(&sibyte_board_adapter[0], K_SMB_FREQ_100KHZ) < 0)
                return -ENODEV;
-        if (i2c_sibyte_add_bus(&sibyte_board_adapter[1], K_SMB_FREQ_400KHZ) < 0)
+        if (i2c_sibyte_add_bus(&sibyte_board_adapter[1],
+                               K_SMB_FREQ_400KHZ) < 0) {
+                i2c_del_adapter(&sibyte_board_adapter[0]);
                return -ENODEV;
+        }
        return 0;
 }
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index c21ae20ae362..df540d5dfaf4 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -184,7 +184,7 @@ static ssize_t i2cdev_write (struct file *file, const char __user *buf, size_t c
 /* This address checking function differs from the one in i2c-core
   in that it considers an address with a registered device, but no
-   bounded driver, as NOT busy. */
+   bound driver, as NOT busy. */
 static int i2cdev_check_addr(struct i2c_adapter *adapter, unsigned int addr)
 {
        struct list_head *item;
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c
index 89df48fdc69d..899d56536e80 100644
--- a/drivers/ide/ide-acpi.c
+++ b/drivers/ide/ide-acpi.c
@@ -16,6 +16,7 @@
 #include <acpi/acpi.h>
 #include <linux/ide.h>
 #include <linux/pci.h>
+#include <linux/dmi.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acnames.h>
@@ -65,6 +66,39 @@ extern int ide_noacpi;
 extern int ide_noacpitfs;
 extern int ide_noacpionboot;
+static bool ide_noacpi_psx;
+static int no_acpi_psx(const struct dmi_system_id *id)
+{
+        ide_noacpi_psx = true;
+        printk(KERN_NOTICE"%s detected - disable ACPI _PSx.\n", id->ident);
+        return 0;
+}
+static const struct dmi_system_id ide_acpi_dmi_table[] = {
+        /* Bug 9673. */
+        /* We should check if this is because ACPI NVS isn't save/restored. */
+        {
+                .callback = no_acpi_psx,
+                .ident    = "HP nx9005",
+                .matches  = {
+                        DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies Ltd."),
+                        DMI_MATCH(DMI_BIOS_VERSION, "KAM1.60")
+                },
+        },
+        { }     /* terminate list */
+};
+static int ide_acpi_blacklist(void)
+{
+        static int done;
+        if (done)
+                return 0;
+        done = 1;
+        dmi_check_system(ide_acpi_dmi_table);
+        return 0;
+}
 /**
 * ide_get_dev_handle - finds acpi_handle and PCI device.function
 * @dev: device to locate
@@ -623,7 +657,7 @@ void ide_acpi_set_state(ide_hwif_t *hwif, int on)
 {
        int unit;
-        if (ide_noacpi)
+        if (ide_noacpi || ide_noacpi_psx)
                return;
        DEBPRINT("ENTER:\n");
@@ -668,6 +702,8 @@ void ide_acpi_init(ide_hwif_t *hwif)
        struct ide_acpi_drive_link      *master;
        struct ide_acpi_drive_link      *slave;
+        ide_acpi_blacklist();
        hwif->acpidata = kzalloc(sizeof(struct ide_acpi_hwif_link), GFP_KERNEL);
        if (!hwif->acpidata)
                return;
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index cef405ddaf0e..bb9693dabe41 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -612,12 +612,12 @@ u8 eighty_ninty_three (ide_drive_t *drive)
                printk(KERN_DEBUG "%s: skipping word 93 validity check\n",
                                  drive->name);
+        if (ide_dev_is_sata(id) && !ivb)
+                return 1;
        if (hwif->cbl != ATA_CBL_PATA80 && !ivb)
                goto no_80w;
-        if (ide_dev_is_sata(id))
-                return 1;
        /*
         * FIXME:
         * - force bit13 (80c cable present) check also for !ivb devices
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index 0895e753a35d..0151d7fdfb8a 100644
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -1,7 +1,8 @@
 /*
- *  linux/drivers/ide/pci/trm290.c              Version 1.02    Mar. 18, 2000
+ *  linux/drivers/ide/pci/trm290.c              Version 1.05    Dec. 26, 2007
 *
 *  Copyright (c) 1997-1998  Mark Lord
+ *  Copyright (c) 2007       MontaVista Software, Inc. <source@mvista.com>
 *  May be copied or modified under the terms of the GNU General Public License
 *
 *  June 22, 2004 - get rid of check_region
@@ -177,7 +178,7 @@ static void trm290_selectproc (ide_drive_t *drive)
        trm290_prepare_drive(drive, drive->using_dma);
 }
-static void trm290_ide_dma_exec_cmd(ide_drive_t *drive, u8 command)
+static void trm290_dma_exec_cmd(ide_drive_t *drive, u8 command)
 {
        BUG_ON(HWGROUP(drive)->handler != NULL);        /* paranoia check */
        ide_set_handler(drive, &ide_dma_intr, WAIT_CMD, NULL);
@@ -185,7 +186,7 @@ static void trm290_ide_dma_exec_cmd(ide_drive_t *drive, u8 command)
        outb(command, IDE_COMMAND_REG);
 }
-static int trm290_ide_dma_setup(ide_drive_t *drive)
+static int trm290_dma_setup(ide_drive_t *drive)
 {
        ide_hwif_t *hwif = drive->hwif;
        struct request *rq = hwif->hwgroup->rq;
@@ -215,7 +216,7 @@ static int trm290_ide_dma_setup(ide_drive_t *drive)
        return 0;
 }
-static void trm290_ide_dma_start(ide_drive_t *drive)
+static void trm290_dma_start(ide_drive_t *drive)
 {
 }
@@ -240,6 +241,14 @@ static int trm290_ide_dma_test_irq (ide_drive_t *drive)
        return (status == 0x00ff);
 }
+static void trm290_dma_host_on(ide_drive_t *drive)
+{
+}
+static void trm290_dma_host_off(ide_drive_t *drive)
+{
+}
 static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
 {
        unsigned int cfgbase = 0;
@@ -280,11 +289,13 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
        ide_setup_dma(hwif, (hwif->config_data + 4) ^ (hwif->channel ? 0x0080 : 0x0000), 3);
-        hwif->dma_setup = &trm290_ide_dma_setup;
+        hwif->dma_host_off      = &trm290_dma_host_off;
-        hwif->dma_exec_cmd = &trm290_ide_dma_exec_cmd;
+        hwif->dma_host_on       = &trm290_dma_host_on;
-        hwif->dma_start = &trm290_ide_dma_start;
+        hwif->dma_setup         = &trm290_dma_setup;
-        hwif->ide_dma_end = &trm290_ide_dma_end;
+        hwif->dma_exec_cmd      = &trm290_dma_exec_cmd;
-        hwif->ide_dma_test_irq = &trm290_ide_dma_test_irq;
+        hwif->dma_start         = &trm290_dma_start;
+        hwif->ide_dma_end       = &trm290_ide_dma_end;
+        hwif->ide_dma_test_irq  = &trm290_ide_dma_test_irq;
        hwif->selectproc = &trm290_selectproc;
 #if 1
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index bfc6061f1554..1dc2ac9f3d1c 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -38,8 +38,6 @@ EXPORT_SYMBOL(gameport_unregister_driver);
 EXPORT_SYMBOL(gameport_open);
 EXPORT_SYMBOL(gameport_close);
 EXPORT_SYMBOL(gameport_rescan);
-EXPORT_SYMBOL(gameport_cooked_read);
-EXPORT_SYMBOL(gameport_set_name);
 EXPORT_SYMBOL(gameport_set_phys);
 EXPORT_SYMBOL(gameport_start_polling);
 EXPORT_SYMBOL(gameport_stop_polling);
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 307c7b5c2b33..a0be978501ff 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -235,6 +235,10 @@ static void input_handle_event(struct input_dev *dev,
                if (value >= 0)
                        disposition = INPUT_PASS_TO_ALL;
                break;
+        case EV_PWR:
+                disposition = INPUT_PASS_TO_ALL;
+                break;
        }
        if (type != EV_SYN)
@@ -1266,6 +1270,10 @@ void input_set_capability(struct input_dev *dev, unsigned int type, unsigned int
                __set_bit(code, dev->ffbit);
                break;
+        case EV_PWR:
+                /* do nothing */
+                break;
        default:
                printk(KERN_ERR
                        "input_set_capability: unknown type %u (code %u)\n",
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index dfa6592c10f6..086d58c0ccbe 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -209,22 +209,22 @@ config KEYBOARD_HIL
          to your machine, so normally you should say Y here.
 config KEYBOARD_HP6XX
-        tristate "HP Jornada 6XX Keyboard support"
+        tristate "HP Jornada 6xx keyboard"
        depends on SH_HP6XX
        select INPUT_POLLDEV
        help
-          This adds support for the onboard keyboard found on
+          Say Y here if you have a HP Jornada 620/660/680/690 and want to
-          HP Jornada 620/660/680/690.
+          support the built-in keyboard.
          To compile this driver as a module, choose M here: the
          module will be called jornada680_kbd.
 config KEYBOARD_HP7XX
-        tristate "HP Jornada 7XX Keyboard Driver"
+        tristate "HP Jornada 7xx keyboard"
        depends on SA1100_JORNADA720_SSP && SA1100_SSP
        help
-          Say Y here to add support for the HP Jornada 7xx (710/720/728)
+          Say Y here if you have a HP Jornada 710/720/728 and want to
-          onboard keyboard.
+          support the built-in keyboard.
          To compile this driver as a module, choose M here: the
          module will be called jornada720_kbd.
diff --git a/drivers/input/keyboard/jornada680_kbd.c b/drivers/input/keyboard/jornada680_kbd.c
index bec1cf483723..a23633a2e1b4 100644
--- a/drivers/input/keyboard/jornada680_kbd.c
+++ b/drivers/input/keyboard/jornada680_kbd.c
@@ -16,14 +16,14 @@
 * published by the Free Software Foundation.
 */
-#include <linux/input.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/init.h>
+#include <linux/input.h>
 #include <linux/input-polldev.h>
+#include <linux/interrupt.h>
 #include <linux/jiffies.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/interrupt.h>
 #include <asm/delay.h>
 #include <asm/io.h>
@@ -43,22 +43,22 @@
 #define PLDR 0xa4000134
 static const unsigned short jornada_scancodes[] = {
-/* PTD1 */      KEY_CAPSLOCK, KEY_MACRO, KEY_LEFTCTRL, 0, KEY_ESC, 0, 0, 0,     /*  1  -> 8   */
+/* PTD1 */      KEY_CAPSLOCK, KEY_MACRO, KEY_LEFTCTRL, 0, KEY_ESC, KEY_KP5, 0, 0,                       /*  1  -> 8   */
-                KEY_F1, KEY_F2, KEY_F3, KEY_F8, KEY_F7, KEY_F2, KEY_F4, KEY_F5, /*  9  -> 16  */
+                KEY_F1, KEY_F2, KEY_F3, KEY_F8, KEY_F7, KEY_F6, KEY_F4, KEY_F5,                         /*  9  -> 16  */
-/* PTD5 */      KEY_SLASH, KEY_APOSTROPHE, KEY_ENTER, 0, KEY_Z, 0, 0, 0,        /*  17 -> 24  */
+/* PTD5 */      KEY_SLASH, KEY_APOSTROPHE, KEY_ENTER, 0, KEY_Z, 0, 0, 0,                                /*  17 -> 24  */
-                KEY_X, KEY_C, KEY_V, KEY_DOT, KEY_COMMA, KEY_M, KEY_B, KEY_N,   /*  25 -> 32  */
+                KEY_X, KEY_C, KEY_V, KEY_DOT, KEY_COMMA, KEY_M, KEY_B, KEY_N,                           /*  25 -> 32  */
-/* PTD7 */      KEY_KP2, KEY_KP6, 0, 0, 0, 0, 0, 0,                             /*  33 -> 40  */
+/* PTD7 */      KEY_KP2, KEY_KP6, KEY_KP3, 0, 0, 0, 0, 0,                                               /*  33 -> 40  */
-                0, 0, 0, KEY_KP4, 0, 0, KEY_LEFTALT, KEY_HANJA,                 /*  41 -> 48  */
+                KEY_F10, KEY_RO, KEY_F9, KEY_KP4, KEY_NUMLOCK, KEY_SCROLLLOCK, KEY_LEFTALT, KEY_HANJA,  /*  41 -> 48  */
-/* PTE0 */      0, 0, 0, 0, KEY_FINANCE, 0, 0, 0,                               /*  49 -> 56  */
+/* PTE0 */      KEY_KATAKANA, KEY_KP0, KEY_GRAVE, 0, KEY_FINANCE, 0, 0, 0,                              /*  49 -> 56  */
-                KEY_LEFTCTRL, 0, KEY_SPACE, KEY_KPDOT, KEY_VOLUMEUP, 249, 0, 0, /*  57 -> 64  */
+                KEY_KPMINUS, KEY_HIRAGANA, KEY_SPACE, KEY_KPDOT, KEY_VOLUMEUP, 249, 0, 0,               /*  57 -> 64  */
-/* PTE1 */      KEY_SEMICOLON, KEY_RIGHTBRACE, KEY_BACKSLASH, 0, KEY_A, 0, 0, 0,/*  65 -> 72  */
+/* PTE1 */      KEY_SEMICOLON, KEY_RIGHTBRACE, KEY_BACKSLASH, 0, KEY_A, 0, 0, 0,                        /*  65 -> 72  */
-                KEY_S, KEY_D, KEY_F, KEY_L, KEY_K, KEY_J, KEY_G, KEY_H,         /*  73 -> 80  */
+                KEY_S, KEY_D, KEY_F, KEY_L, KEY_K, KEY_J, KEY_G, KEY_H,                                 /*  73 -> 80  */
-/* PTE3 */      KEY_KP8, KEY_LEFTMETA, KEY_RIGHTSHIFT, 0, KEY_TAB, 0, 0,0,      /*  81 -> 88  */
+/* PTE3 */      KEY_KP8, KEY_LEFTMETA, KEY_RIGHTSHIFT, 0, KEY_TAB, 0, 0, 0,                             /*  81 -> 88  */
-                0, KEY_LEFTSHIFT, 0, 0, 0, 0, 0, 0,                             /*  89 -> 96  */
+                0, KEY_LEFTSHIFT, KEY_KP7, KEY_KP9, KEY_KP1, KEY_F11, KEY_KPPLUS, KEY_KPASTERISK,       /*  89 -> 96  */
-/* PTE6 */      KEY_P, KEY_LEFTBRACE, KEY_BACKSPACE, 0, KEY_Q, 0, 0, 0,         /*  97 -> 104 */
+/* PTE6 */      KEY_P, KEY_LEFTBRACE, KEY_BACKSPACE, 0, KEY_Q, 0, 0, 0,                                 /*  97 -> 104 */
-                KEY_W, KEY_E, KEY_R, KEY_O, KEY_I, KEY_U, KEY_T, KEY_R,         /* 105 -> 112 */
+                KEY_W, KEY_E, KEY_R, KEY_O, KEY_I, KEY_U, KEY_T, KEY_Y,                                 /* 105 -> 112 */
-/* PTE7 */      KEY_0, KEY_MINUS, KEY_EQUAL, 0, KEY_1, 0, 0, 0,                 /* 113 -> 120 */
+/* PTE7 */      KEY_0, KEY_MINUS, KEY_EQUAL, 0, KEY_1, 0, 0, 0,                                         /* 113 -> 120 */
-                KEY_2, KEY_3, KEY_4, KEY_9, KEY_8, KEY_7, KEY_5, KEY_6,         /* 121 -> 128 */
+                KEY_2, KEY_3, KEY_4, KEY_9, KEY_8, KEY_7, KEY_5, KEY_6,                                 /* 121 -> 128 */
 /* **** */      0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                0, 0, 0, 0, 0
 };
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c
index 410d78a774d0..1d59a2dc3c17 100644
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.c
@@ -391,6 +391,7 @@ static int __init spitzkbd_probe(struct platform_device *dev)
        for (i = 0; i < ARRAY_SIZE(spitzkbd_keycode); i++)
                set_bit(spitzkbd->keycode[i], input_dev->keybit);
        clear_bit(0, input_dev->keybit);
+        set_bit(KEY_SUSPEND, input_dev->keybit);
        set_bit(SW_LID, input_dev->swbit);
        set_bit(SW_TABLET_MODE, input_dev->swbit);
        set_bit(SW_HEADPHONE_INSERT, input_dev->swbit);
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 2b5ed119c9a9..b346a3b418ea 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -54,7 +54,7 @@ static const struct alps_model_info alps_model_data[] = {
        { { 0x20, 0x02, 0x0e }, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* XXX */
        { { 0x22, 0x02, 0x0a }, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT },
        { { 0x22, 0x02, 0x14 }, 0xff, 0xff, ALPS_PASS | ALPS_DUALPOINT }, /* Dell Latitude D600 */
-        { { 0x73, 0x02, 0x50 }, 0xcf, 0xff, ALPS_FW_BK_1 } /* Dell Vostro 1400 */
+        { { 0x73, 0x02, 0x50 }, 0xcf, 0xcf, ALPS_FW_BK_1 } /* Dell Vostro 1400 */
 };
 /*
diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c
index 9ec57d80186e..df81b0aaa9f8 100644
--- a/drivers/input/mouse/lifebook.c
+++ b/drivers/input/mouse/lifebook.c
@@ -225,8 +225,13 @@ static void lifebook_set_resolution(struct psmouse *psmouse, unsigned int resolu
 static void lifebook_disconnect(struct psmouse *psmouse)
 {
+        struct lifebook_data *priv = psmouse->private;
        psmouse_reset(psmouse);
-        kfree(psmouse->private);
+        if (priv) {
+                input_unregister_device(priv->dev2);
+                kfree(priv);
+        }
        psmouse->private = NULL;
 }
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 21a9c0b69a1f..b8628252e10c 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -1247,6 +1247,8 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv)
 err_pt_deactivate:
        if (parent && parent->pt_deactivate)
                parent->pt_deactivate(parent);
+        input_unregister_device(psmouse->dev);
+        input_dev = NULL; /* so we don't try to free it below */
 err_protocol_disconnect:
        if (psmouse->disconnect)
                psmouse->disconnect(psmouse);
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index 78c3ea75da2a..be83516c776c 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -1029,6 +1029,15 @@ static const struct input_device_id mousedev_ids[] = {
                                BIT_MASK(ABS_PRESSURE) |
                                BIT_MASK(ABS_TOOL_WIDTH) },
        },      /* A touchpad */
+        {
+                .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
+                        INPUT_DEVICE_ID_MATCH_KEYBIT |
+                        INPUT_DEVICE_ID_MATCH_ABSBIT,
+                .evbit = { BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_SYN) },
+                .keybit = { [BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) },
+                .absbit = { BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) },
+        },      /* Mouse-like device with absolute X and Y but ordinary
+                   clicks, like hp ILO2 High Performance mouse */
        { },    /* Terminating entry */
 };
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index fa8442b6241c..90e8e92dfe47 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -115,19 +115,17 @@ config TOUCHSCREEN_MK712
          module will be called mk712.
 config TOUCHSCREEN_HP600
-        tristate "HP Jornada 680/690 touchscreen"
+        tristate "HP Jornada 6xx touchscreen"
        depends on SH_HP6XX && SH_ADC
        help
-          Say Y here if you have a HP Jornada 680 or 690 and want to
+          Say Y here if you have a HP Jornada 620/660/680/690 and want to
          support the built-in touchscreen.
-          If unsure, say N.
          To compile this driver as a module, choose M here: the
          module will be called hp680_ts_input.
 config TOUCHSCREEN_HP7XX
-        tristate "HP Jornada 710/720/728 touchscreen"
+        tristate "HP Jornada 7xx touchscreen"
        depends on SA1100_JORNADA720_SSP
        help
          Say Y here if you have a HP Jornada 710/720/728 and want
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index 19055e7381f8..63f9664a066f 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -11,6 +11,7 @@
 *  - DMC TSC-10/25
 *  - IRTOUCHSYSTEMS/UNITOP
 *  - IdealTEK URTC1000
+ *  - General Touch
 *  - GoTop Super_Q2/GogoPen/PenPower tablets
 *
 * Copyright (C) 2004-2007 by Daniel Ritz <daniel.ritz@gmx.ch>
@@ -50,7 +51,7 @@
 #include <linux/usb/input.h>
-#define DRIVER_VERSION          "v0.5"
+#define DRIVER_VERSION          "v0.6"
 #define DRIVER_AUTHOR           "Daniel Ritz <daniel.ritz@gmx.ch>"
 #define DRIVER_DESC             "USB Touchscreen Driver"
@@ -65,17 +66,21 @@ struct usbtouch_device_info {
        int min_yc, max_yc;
        int min_press, max_press;
        int rept_size;
-        int flags;
        void (*process_pkt) (struct usbtouch_usb *usbtouch, unsigned char *pkt, int len);
+        /*
+         * used to get the packet len. possible return values:
+         * > 0: packet len
+         * = 0: skip one byte
+         * < 0: -return value more bytes needed
+         */
        int  (*get_pkt_len) (unsigned char *pkt, int len);
        int  (*read_data)   (struct usbtouch_usb *usbtouch, unsigned char *pkt);
        int  (*init)        (struct usbtouch_usb *usbtouch);
 };
-#define USBTOUCH_FLG_BUFFER     0x01
 /* a usbtouch device */
 struct usbtouch_usb {
        unsigned char *data;
@@ -94,15 +99,6 @@ struct usbtouch_usb {
 };
-#if defined(CONFIG_TOUCHSCREEN_USB_EGALAX) || defined(CONFIG_TOUCHSCREEN_USB_ETURBO) || defined(CONFIG_TOUCHSCREEN_USB_IDEALTEK)
-#define MULTI_PACKET
-#endif
-#ifdef MULTI_PACKET
-static void usbtouch_process_multi(struct usbtouch_usb *usbtouch,
-                                   unsigned char *pkt, int len);
-#endif
 /* device types */
 enum {
        DEVTPYE_DUMMY = -1,
@@ -186,6 +182,10 @@ static struct usb_device_id usbtouch_devices[] = {
 #ifdef CONFIG_TOUCHSCREEN_USB_EGALAX
+#ifndef MULTI_PACKET
+#define MULTI_PACKET
+#endif
 #define EGALAX_PKT_TYPE_MASK            0xFE
 #define EGALAX_PKT_TYPE_REPT            0x80
 #define EGALAX_PKT_TYPE_DIAG            0x0A
@@ -323,6 +323,9 @@ static int itm_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 * eTurboTouch part
 */
 #ifdef CONFIG_TOUCHSCREEN_USB_ETURBO
+#ifndef MULTI_PACKET
+#define MULTI_PACKET
+#endif
 static int eturbo_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 {
        unsigned int shift;
@@ -461,6 +464,9 @@ static int irtouch_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 * IdealTEK URTC1000 Part
 */
 #ifdef CONFIG_TOUCHSCREEN_USB_IDEALTEK
+#ifndef MULTI_PACKET
+#define MULTI_PACKET
+#endif
 static int idealtek_get_pkt_len(unsigned char *buf, int len)
 {
        if (buf[0] & 0x80)
@@ -525,6 +531,11 @@ static int gotop_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 /*****************************************************************************
 * the different device descriptors
 */
+#ifdef MULTI_PACKET
+static void usbtouch_process_multi(struct usbtouch_usb *usbtouch,
+                                   unsigned char *pkt, int len);
+#endif
 static struct usbtouch_device_info usbtouch_dev_info[] = {
 #ifdef CONFIG_TOUCHSCREEN_USB_EGALAX
        [DEVTYPE_EGALAX] = {
@@ -533,7 +544,6 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
                .min_yc         = 0x0,
                .max_yc         = 0x07ff,
                .rept_size      = 16,
-                .flags          = USBTOUCH_FLG_BUFFER,
                .process_pkt    = usbtouch_process_multi,
                .get_pkt_len    = egalax_get_pkt_len,
                .read_data      = egalax_read_data,
@@ -582,7 +592,6 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
                .min_yc         = 0x0,
                .max_yc         = 0x07ff,
                .rept_size      = 8,
-                .flags          = USBTOUCH_FLG_BUFFER,
                .process_pkt    = usbtouch_process_multi,
                .get_pkt_len    = eturbo_get_pkt_len,
                .read_data      = eturbo_read_data,
@@ -630,7 +639,6 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
                .min_yc         = 0x0,
                .max_yc         = 0x0fff,
                .rept_size      = 8,
-                .flags          = USBTOUCH_FLG_BUFFER,
                .process_pkt    = usbtouch_process_multi,
                .get_pkt_len    = idealtek_get_pkt_len,
                .read_data      = idealtek_read_data,
@@ -738,11 +746,14 @@ static void usbtouch_process_multi(struct usbtouch_usb *usbtouch,
        pos = 0;
        while (pos < buf_len) {
                /* get packet len */
-                pkt_len = usbtouch->type->get_pkt_len(buffer + pos, len);
+                pkt_len = usbtouch->type->get_pkt_len(buffer + pos,
+                                                        buf_len - pos);
-                /* unknown packet: drop everything */
+                /* unknown packet: skip one byte */
-                if (unlikely(!pkt_len))
+                if (unlikely(!pkt_len)) {
-                        goto out_flush_buf;
+                        pos++;
+                        continue;
+                }
                /* full packet: process */
                if (likely((pkt_len > 0) && (pkt_len <= buf_len - pos))) {
@@ -857,7 +868,7 @@ static int usbtouch_probe(struct usb_interface *intf,
        if (!usbtouch->data)
                goto out_free;
-        if (type->flags & USBTOUCH_FLG_BUFFER) {
+        if (type->get_pkt_len) {
                usbtouch->buffer = kmalloc(type->rept_size, GFP_KERNEL);
                if (!usbtouch->buffer)
                        goto out_free_buffers;
diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig
index 7eb9ecff8f4a..002d4f4e93c6 100644
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@ -2,6 +2,7 @@ config LGUEST
        tristate "Linux hypervisor example code"
        depends on X86_32 && EXPERIMENTAL && !X86_PAE && FUTEX && !(X86_VISWS || X86_VOYAGER)
        select HVC_DRIVER
+        select LGUEST_GUEST
        ---help---
          This is a very simple module which allows you to run
          multiple instances of the same Linux kernel, using the
@@ -15,5 +16,4 @@ config LGUEST_GUEST
        bool
        help
          The guest needs code built-in, even if the host has lguest
-          support as a module.  The drivers are tiny, so we build them
+          support as a module.
-          in too.
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index 883da72b5368..ef4c117ea35f 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -322,8 +322,9 @@ adbhid_input_keycode(int id, int scancode, int repeat)
                        input_sync(ahid->input);
                        input_report_key(ahid->input, KEY_CAPSLOCK, 0);
                        input_sync(ahid->input);
+                        return;
                }
-                return;
+                break;
 #ifdef CONFIG_PPC_PMAC
        case ADB_KEY_POWER_OLD: /* Power key on PBook 3400 needs remapping */
                switch(pmac_call_feature(PMAC_FTR_GET_MB_INFO,
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 8b8144f77a73..0d36c155695b 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -2800,12 +2800,12 @@ static void av7110_irq(struct saa7146_dev* dev, u32 *isr)
 }
-static struct saa7146_extension av7110_extension;
+static struct saa7146_extension av7110_extension_driver;
 #define MAKE_AV7110_INFO(x_var,x_name) \
 static struct saa7146_pci_extension_data x_var = { \
        .ext_priv = x_name, \
-        .ext = &av7110_extension }
+        .ext = &av7110_extension_driver }
 MAKE_AV7110_INFO(tts_1_X_fsc,"Technotrend/Hauppauge WinTV DVB-S rev1.X or Fujitsu Siemens DVB-C");
 MAKE_AV7110_INFO(ttt_1_X,    "Technotrend/Hauppauge WinTV DVB-T rev1.X");
@@ -2843,7 +2843,7 @@ static struct pci_device_id pci_tbl[] = {
 MODULE_DEVICE_TABLE(pci, pci_tbl);
-static struct saa7146_extension av7110_extension = {
+static struct saa7146_extension av7110_extension_driver = {
        .name           = "dvb",
        .flags          = SAA7146_USE_I2C_IRQ,
@@ -2860,14 +2860,14 @@ static struct saa7146_extension av7110_extension = {
 static int __init av7110_init(void)
 {
        int retval;
-        retval = saa7146_register_extension(&av7110_extension);
+        retval = saa7146_register_extension(&av7110_extension_driver);
        return retval;
 }
 static void __exit av7110_exit(void)
 {
-        saa7146_unregister_extension(&av7110_extension);
+        saa7146_unregister_extension(&av7110_extension_driver);
 }
 module_init(av7110_init);
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 10d6faf8ccda..6d2dd8764f81 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -1076,10 +1076,6 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
                ivtv_process_eeprom(itv);
        }
-        /* The mspx4xx chips need a longer delay for some reason */
-        if (!(itv->hw_flags & IVTV_HW_MSP34XX))
-                itv->i2c_algo.udelay = 5;
        if (itv->std == 0) {
                itv->std = V4L2_STD_NTSC_M;
        }
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 4fd187ac9d70..4f0a9157ecb1 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -1202,9 +1202,8 @@ static int saa7134_suspend(struct pci_dev *pci_dev , pm_message_t state)
 static int saa7134_resume(struct pci_dev *pci_dev)
 {
        struct saa7134_dev *dev = pci_get_drvdata(pci_dev);
-        unsigned int flags;
+        unsigned long flags;
        pci_restore_state(pci_dev);
        pci_set_power_state(pci_dev, PCI_D0);
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index a9eb1c516247..1707f98c322c 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -1504,9 +1504,12 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
        int ret, wbufsize, word_gap, words;
        const struct kvec *vec;
        unsigned long vec_seek;
+        unsigned long initial_adr;
+        int initial_len = len;
        wbufsize = cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize;
        adr += chip->start;
+        initial_adr = adr;
        cmd_adr = adr & ~(wbufsize-1);
        /* Let's determine this according to the interleave only once */
@@ -1519,7 +1522,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
                return ret;
        }
-        XIP_INVAL_CACHED_RANGE(map, adr, len);
+        XIP_INVAL_CACHED_RANGE(map, initial_adr, initial_len);
        ENABLE_VPP(map);
        xip_disable(map, chip, cmd_adr);
@@ -1610,7 +1613,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
        chip->state = FL_WRITING;
        ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
-                                   adr, len,
+                                   initial_adr, initial_len,
                                   chip->buffer_write_time);
        if (ret) {
                map_write(map, CMD(0x70), cmd_adr);
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index edda6e10ebe5..8fafac987e0b 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -385,6 +385,7 @@ static int __init el3_probe(int card_idx)
 #if defined(__ISAPNP__)
        static int pnp_cards;
        struct pnp_dev *idev = NULL;
+        int pnp_found = 0;
        if (nopnp == 1)
                goto no_pnp;
@@ -430,6 +431,7 @@ __again:
                        pnp_cards++;
                        netdev_boot_setup_check(dev);
+                        pnp_found = 1;
                        goto found;
                }
        }
@@ -560,6 +562,8 @@ no_pnp:
        lp = netdev_priv(dev);
 #if defined(__ISAPNP__)
        lp->dev = &idev->dev;
+        if (pnp_found)
+                lp->type = EL3_PNP;
 #endif
        err = el3_common_init(dev);
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 275e7510ebaf..684bab781015 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -243,14 +243,16 @@ enum eeprom_offset {
 enum Window3 {                  /* Window 3: MAC/config bits. */
        Wn3_Config = 0, Wn3_MAC_Ctrl = 6, Wn3_Options = 8,
 };
-union wn3_config {
+enum wn3_config {
-        int i;
+        Ram_size = 7,
-        struct w3_config_fields {
+        Ram_width = 8,
-                unsigned int ram_size:3, ram_width:1, ram_speed:2, rom_size:2;
+        Ram_speed = 0x30,
-                int pad8:8;
+        Rom_size = 0xc0,
-                unsigned int ram_split:2, pad18:2, xcvr:3, pad21:1, autoselect:1;
+        Ram_split_shift = 16,
-                int pad24:7;
+        Ram_split = 3 << Ram_split_shift,
-        } u;
+        Xcvr_shift = 20,
+        Xcvr = 7 << Xcvr_shift,
+        Autoselect = 0x1000000,
 };
 enum Window4 {
@@ -614,7 +616,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
        /* Read the station address from the EEPROM. */
        EL3WINDOW(0);
        for (i = 0; i < 0x18; i++) {
-                short *phys_addr = (short *) dev->dev_addr;
+                __be16 *phys_addr = (__be16 *) dev->dev_addr;
                int timer;
                outw(EEPROM_Read + i, ioaddr + Wn0EepromCmd);
                /* Pause for at least 162 us. for the read to take place. */
@@ -646,22 +648,22 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
        {
                char *ram_split[] = { "5:3", "3:1", "1:1", "3:5" };
-                union wn3_config config;
+                __u32 config;
                EL3WINDOW(3);
                vp->available_media = inw(ioaddr + Wn3_Options);
-                config.i = inl(ioaddr + Wn3_Config);
+                config = inl(ioaddr + Wn3_Config);
                if (corkscrew_debug > 1)
                        printk(KERN_INFO "  Internal config register is %4.4x, transceivers %#x.\n",
-                                config.i, inw(ioaddr + Wn3_Options));
+                                config, inw(ioaddr + Wn3_Options));
                printk(KERN_INFO "  %dK %s-wide RAM %s Rx:Tx split, %s%s interface.\n",
-                        8 << config.u.ram_size,
+                        8 << config & Ram_size,
-                        config.u.ram_width ? "word" : "byte",
+                        config & Ram_width ? "word" : "byte",
-                        ram_split[config.u.ram_split],
+                        ram_split[(config & Ram_split) >> Ram_split_shift],
-                        config.u.autoselect ? "autoselect/" : "",
+                        config & Autoselect ? "autoselect/" : "",
-                        media_tbl[config.u.xcvr].name);
+                        media_tbl[(config & Xcvr) >> Xcvr_shift].name);
-                dev->if_port = config.u.xcvr;
+                vp->default_media = (config & Xcvr) >> Xcvr_shift;
-                vp->default_media = config.u.xcvr;
+                vp->autoselect = config & Autoselect ? 1 : 0;
-                vp->autoselect = config.u.autoselect;
+                dev->if_port = vp->default_media;
        }
        if (vp->media_override != 7) {
                printk(KERN_INFO "  Media override to transceiver type %d (%s).\n",
@@ -694,14 +696,14 @@ static int corkscrew_open(struct net_device *dev)
 {
        int ioaddr = dev->base_addr;
        struct corkscrew_private *vp = netdev_priv(dev);
-        union wn3_config config;
+        __u32 config;
        int i;
        /* Before initializing select the active media port. */
        EL3WINDOW(3);
        if (vp->full_duplex)
                outb(0x20, ioaddr + Wn3_MAC_Ctrl);      /* Set the full-duplex bit. */
-        config.i = inl(ioaddr + Wn3_Config);
+        config = inl(ioaddr + Wn3_Config);
        if (vp->media_override != 7) {
                if (corkscrew_debug > 1)
@@ -727,12 +729,12 @@ static int corkscrew_open(struct net_device *dev)
        } else
                dev->if_port = vp->default_media;
-        config.u.xcvr = dev->if_port;
+        config = (config & ~Xcvr) | (dev->if_port << Xcvr_shift);
-        outl(config.i, ioaddr + Wn3_Config);
+        outl(config, ioaddr + Wn3_Config);
        if (corkscrew_debug > 1) {
                printk("%s: corkscrew_open() InternalConfig %8.8x.\n",
-                       dev->name, config.i);
+                       dev->name, config);
        }
        outw(TxReset, ioaddr + EL3_CMD);
@@ -901,7 +903,7 @@ static void corkscrew_timer(unsigned long data)
                        ok = 1;
                }
                if (!ok) {
-                        union wn3_config config;
+                        __u32 config;
                        do {
                                dev->if_port =
@@ -928,9 +930,9 @@ static void corkscrew_timer(unsigned long data)
                             ioaddr + Wn4_Media);
                        EL3WINDOW(3);
-                        config.i = inl(ioaddr + Wn3_Config);
+                        config = inl(ioaddr + Wn3_Config);
-                        config.u.xcvr = dev->if_port;
+                        config = (config & ~Xcvr) | (dev->if_port << Xcvr_shift);
-                        outl(config.i, ioaddr + Wn3_Config);
+                        outl(config, ioaddr + Wn3_Config);
                        outw(dev->if_port == 3 ? StartCoax : StopCoax,
                             ioaddr + EL3_CMD);
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index d9107e542dfa..9ae3166e3162 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -166,16 +166,6 @@ config NET_SB1000
          If you don't have this card, of course say N.
-config IP1000
-        tristate "IP1000 Gigabit Ethernet support"
-        depends on PCI && EXPERIMENTAL
-        select MII
-        ---help---
-          This driver supports IP1000 gigabit Ethernet cards.
-          To compile this driver as a module, choose M here: the module
-          will be called ipg.  This is recommended.
 source "drivers/net/arcnet/Kconfig"
 source "drivers/net/phy/Kconfig"
@@ -1986,12 +1976,19 @@ config E1000E
          <http://support.intel.com>
-          More specific information on configuring the driver is in
-          <file:Documentation/networking/e1000e.txt>.
          To compile this driver as a module, choose M here. The module
          will be called e1000e.
+config IP1000
+        tristate "IP1000 Gigabit Ethernet support"
+        depends on PCI && EXPERIMENTAL
+        select MII
+        ---help---
+          This driver supports IP1000 gigabit Ethernet cards.
+          To compile this driver as a module, choose M here: the module
+          will be called ipg.  This is recommended.
 source "drivers/net/ixp2000/Kconfig"
 config MYRI_SBUS
diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c
index 35b0a7dd4ef4..9200ee59d854 100644
--- a/drivers/net/atl1/atl1_main.c
+++ b/drivers/net/atl1/atl1_main.c
@@ -120,7 +120,7 @@ static int __devinit atl1_sw_init(struct atl1_adapter *adapter)
        struct atl1_hw *hw = &adapter->hw;
        struct net_device *netdev = adapter->netdev;
-        hw->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
+        hw->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;
        hw->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
        adapter->wol = 0;
@@ -688,7 +688,7 @@ static int atl1_change_mtu(struct net_device *netdev, int new_mtu)
 {
        struct atl1_adapter *adapter = netdev_priv(netdev);
        int old_mtu = netdev->mtu;
-        int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
+        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)) {
@@ -853,8 +853,8 @@ static u32 atl1_configure(struct atl1_adapter *adapter)
        /* set Interrupt Clear Timer */
        iowrite16(adapter->ict, hw->hw_addr + REG_CMBDISDMA_TIMER);
-        /* set MTU, 4 : VLAN */
+        /* set max frame size hw will accept */
-        iowrite32(hw->max_frame_size + 4, hw->hw_addr + REG_MTU);
+        iowrite32(hw->max_frame_size, hw->hw_addr + REG_MTU);
        /* jumbo size & rrd retirement timer */
        value = (((u32) hw->rx_jumbo_th & RXQ_JMBOSZ_TH_MASK)
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 25b8dbf6cfd7..b57bc9467dbe 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -979,7 +979,7 @@ static void alb_swap_mac_addr(struct bonding *bond, struct slave *slave1, struct
 /*
 * Send learning packets after MAC address swap.
 *
- * Called with RTNL and bond->lock held for read.
+ * Called with RTNL and no other locks
 */
 static void alb_fasten_mac_swap(struct bonding *bond, struct slave *slave1,
                                struct slave *slave2)
@@ -987,6 +987,8 @@ static void alb_fasten_mac_swap(struct bonding *bond, struct slave *slave1,
        int slaves_state_differ = (SLAVE_IS_OK(slave1) != SLAVE_IS_OK(slave2));
        struct slave *disabled_slave = NULL;
+        ASSERT_RTNL();
        /* fasten the change in the switch */
        if (SLAVE_IS_OK(slave1)) {
                alb_send_learning_packets(slave1, slave1->dev->dev_addr);
@@ -1031,7 +1033,7 @@ static void alb_fasten_mac_swap(struct bonding *bond, struct slave *slave1,
 * a slave that has @slave's permanet address as its current address.
 * We'll make sure that that slave no longer uses @slave's permanent address.
 *
- * Caller must hold bond lock
+ * Caller must hold RTNL and no other locks
 */
 static void alb_change_hw_addr_on_detach(struct bonding *bond, struct slave *slave)
 {
@@ -1542,7 +1544,12 @@ int bond_alb_init_slave(struct bonding *bond, struct slave *slave)
        return 0;
 }
-/* Caller must hold bond lock for write */
+/*
+ * Remove slave from tlb and rlb hash tables, and fix up MAC addresses
+ * if necessary.
+ *
+ * Caller must hold RTNL and no other locks
+ */
 void bond_alb_deinit_slave(struct bonding *bond, struct slave *slave)
 {
        if (bond->slave_cnt > 1) {
@@ -1601,9 +1608,6 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave
        struct slave *swap_slave;
        int i;
-        if (new_slave)
-                ASSERT_RTNL();
        if (bond->curr_active_slave == new_slave) {
                return;
        }
@@ -1649,6 +1653,8 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave
        write_unlock_bh(&bond->curr_slave_lock);
        read_unlock(&bond->lock);
+        ASSERT_RTNL();
        /* curr_active_slave must be set before calling alb_swap_mac_addr */
        if (swap_slave) {
                /* swap mac address */
@@ -1659,12 +1665,11 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave
                                       bond->alb_info.rlb_enabled);
        }
-        read_lock(&bond->lock);
        if (swap_slave) {
                alb_fasten_mac_swap(bond, swap_slave, new_slave);
+                read_lock(&bond->lock);
        } else {
-                /* fasten bond mac on new current slave */
+                read_lock(&bond->lock);
                alb_send_learning_packets(new_slave, bond->dev->dev_addr);
        }
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index b0b26036266b..49a198206e3d 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1746,7 +1746,9 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                 * has been cleared (if our_slave == old_current),
                 * but before a new active slave is selected.
                 */
+                write_unlock_bh(&bond->lock);
                bond_alb_deinit_slave(bond, slave);
+                write_lock_bh(&bond->lock);
        }
        if (oldcurrent == slave) {
@@ -1905,6 +1907,12 @@ static int bond_release_all(struct net_device *bond_dev)
                slave_dev = slave->dev;
                bond_detach_slave(bond, slave);
+                /* now that the slave is detached, unlock and perform
+                 * all the undo steps that should not be called from
+                 * within a lock.
+                 */
+                write_unlock_bh(&bond->lock);
                if ((bond->params.mode == BOND_MODE_TLB) ||
                    (bond->params.mode == BOND_MODE_ALB)) {
                        /* must be called only after the slave
@@ -1915,12 +1923,6 @@ static int bond_release_all(struct net_device *bond_dev)
                bond_compute_features(bond);
-                /* now that the slave is detached, unlock and perform
-                 * all the undo steps that should not be called from
-                 * within a lock.
-                 */
-                write_unlock_bh(&bond->lock);
                bond_destroy_slave_symlinks(bond_dev, slave_dev);
                bond_del_vlans_from_slave(bond, slave_dev);
@@ -2384,7 +2386,9 @@ void bond_mii_monitor(struct work_struct *work)
                rtnl_lock();
                read_lock(&bond->lock);
                __bond_mii_monitor(bond, 1);
-                rtnl_unlock();
+                read_unlock(&bond->lock);
+                rtnl_unlock();  /* might sleep, hold no other locks */
+                read_lock(&bond->lock);
        }
        delay = ((bond->params.miimon * HZ) / 1000) ? : 1;
@@ -3399,9 +3403,7 @@ static int bond_master_netdev_event(unsigned long event, struct net_device *bond
        case NETDEV_CHANGENAME:
                return bond_event_changename(event_bond);
        case NETDEV_UNREGISTER:
-                /*
+                bond_release_all(event_bond->dev);
-                 * TODO: remove a bond from the list?
-                 */
                break;
        default:
                break;
@@ -4540,18 +4542,27 @@ static void bond_free_all(void)
 /*
 * Convert string input module parms.  Accept either the
- * number of the mode or its string name.
+ * number of the mode or its string name.  A bit complicated because
+ * some mode names are substrings of other names, and calls from sysfs
+ * may have whitespace in the name (trailing newlines, for example).
 */
-int bond_parse_parm(char *mode_arg, struct bond_parm_tbl *tbl)
+int bond_parse_parm(const char *buf, struct bond_parm_tbl *tbl)
 {
-        int i;
+        int mode = -1, i, rv;
+        char modestr[BOND_MAX_MODENAME_LEN + 1] = { 0, };
+        rv = sscanf(buf, "%d", &mode);
+        if (!rv) {
+                rv = sscanf(buf, "%20s", modestr);
+                if (!rv)
+                        return -1;
+        }
        for (i = 0; tbl[i].modename; i++) {
-                if ((isdigit(*mode_arg) &&
+                if (mode == tbl[i].mode)
-                     tbl[i].mode == simple_strtol(mode_arg, NULL, 0)) ||
+                        return tbl[i].mode;
-                    (strcmp(mode_arg, tbl[i].modename) == 0)) {
+                if (strcmp(modestr, tbl[i].modename) == 0)
                        return tbl[i].mode;
-                }
        }
        return -1;
@@ -4865,9 +4876,22 @@ static struct lock_class_key bonding_netdev_xmit_lock_key;
 int bond_create(char *name, struct bond_params *params, struct bonding **newbond)
 {
        struct net_device *bond_dev;
+        struct bonding *bond, *nxt;
        int res;
        rtnl_lock();
+        down_write(&bonding_rwsem);
+        /* Check to see if the bond already exists. */
+        list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list)
+                if (strnicmp(bond->dev->name, name, IFNAMSIZ) == 0) {
+                        printk(KERN_ERR DRV_NAME
+                               ": cannot add bond %s; it already exists\n",
+                               name);
+                        res = -EPERM;
+                        goto out_rtnl;
+                }
        bond_dev = alloc_netdev(sizeof(struct bonding), name ? name : "",
                                ether_setup);
        if (!bond_dev) {
@@ -4906,10 +4930,12 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond
        netif_carrier_off(bond_dev);
+        up_write(&bonding_rwsem);
        rtnl_unlock(); /* allows sysfs registration of net device */
        res = bond_create_sysfs_entry(bond_dev->priv);
        if (res < 0) {
                rtnl_lock();
+                down_write(&bonding_rwsem);
                goto out_bond;
        }
@@ -4920,6 +4946,7 @@ out_bond:
 out_netdev:
        free_netdev(bond_dev);
 out_rtnl:
+        up_write(&bonding_rwsem);
        rtnl_unlock();
        return res;
 }
@@ -4940,6 +4967,9 @@ static int __init bonding_init(void)
 #ifdef CONFIG_PROC_FS
        bond_create_proc_dir();
 #endif
+        init_rwsem(&bonding_rwsem);
        for (i = 0; i < max_bonds; i++) {
                res = bond_create(NULL, &bonding_defaults, NULL);
                if (res)
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 11b76b352415..90a1f31e8e63 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -109,11 +109,10 @@ static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t
 {
        char command[IFNAMSIZ + 1] = {0, };
        char *ifname;
-        int res = count;
+        int rv, res = count;
        struct bonding *bond;
        struct bonding *nxt;
-        down_write(&(bonding_rwsem));
        sscanf(buffer, "%16s", command); /* IFNAMSIZ*/
        ifname = command + 1;
        if ((strlen(command) <= 1) ||
@@ -121,39 +120,28 @@ static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t
                goto err_no_cmd;
        if (command[0] == '+') {
-                /* Check to see if the bond already exists. */
-                list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list)
-                        if (strnicmp(bond->dev->name, ifname, IFNAMSIZ) == 0) {
-                                printk(KERN_ERR DRV_NAME
-                                        ": cannot add bond %s; it already exists\n",
-                                        ifname);
-                                res = -EPERM;
-                                goto out;
-                        }
                printk(KERN_INFO DRV_NAME
                        ": %s is being created...\n", ifname);
-                if (bond_create(ifname, &bonding_defaults, &bond)) {
+                rv = bond_create(ifname, &bonding_defaults, &bond);
-                        printk(KERN_INFO DRV_NAME
+                if (rv) {
-                        ": %s interface already exists. Bond creation failed.\n",
+                        printk(KERN_INFO DRV_NAME ": Bond creation failed.\n");
-                        ifname);
+                        res = rv;
-                        res = -EPERM;
                }
                goto out;
        }
        if (command[0] == '-') {
+                rtnl_lock();
+                down_write(&bonding_rwsem);
                list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list)
                        if (strnicmp(bond->dev->name, ifname, IFNAMSIZ) == 0) {
-                                rtnl_lock();
                                /* check the ref count on the bond's kobject.
                                 * If it's > expected, then there's a file open,
                                 * and we have to fail.
                                 */
                                if (atomic_read(&bond->dev->dev.kobj.kref.refcount)
                                                        > expected_refcount){
-                                        rtnl_unlock();
                                        printk(KERN_INFO DRV_NAME
                                                ": Unable remove bond %s due to open references.\n",
                                                ifname);
@@ -164,6 +152,7 @@ static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t
                                        ": %s is being deleted...\n",
                                        bond->dev->name);
                                bond_destroy(bond);
+                                up_write(&bonding_rwsem);
                                rtnl_unlock();
                                goto out;
                        }
@@ -171,6 +160,8 @@ static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t
                printk(KERN_ERR DRV_NAME
                        ": unable to delete non-existent bond %s\n", ifname);
                res = -ENODEV;
+                up_write(&bonding_rwsem);
+                rtnl_unlock();
                goto out;
        }
@@ -183,7 +174,6 @@ err_no_cmd:
         * get called forever, which is bad.
         */
 out:
-        up_write(&(bonding_rwsem));
        return res;
 }
 /* class attribute for bond_masters file.  This ends up in /sys/class/net */
@@ -271,6 +261,9 @@ static ssize_t bonding_store_slaves(struct device *d,
        /* Note:  We can't hold bond->lock here, as bond_create grabs it. */
+        rtnl_lock();
+        down_write(&(bonding_rwsem));
        sscanf(buffer, "%16s", command); /* IFNAMSIZ*/
        ifname = command + 1;
        if ((strlen(command) <= 1) ||
@@ -336,12 +329,10 @@ static ssize_t bonding_store_slaves(struct device *d,
                                dev->mtu = bond->dev->mtu;
                        }
                }
-                rtnl_lock();
                res = bond_enslave(bond->dev, dev);
                bond_for_each_slave(bond, slave, i)
                        if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0)
                                slave->original_mtu = original_mtu;
-                rtnl_unlock();
                if (res) {
                        ret = res;
                }
@@ -359,12 +350,10 @@ static ssize_t bonding_store_slaves(struct device *d,
                if (dev) {
                        printk(KERN_INFO DRV_NAME ": %s: Removing slave %s\n",
                                bond->dev->name, dev->name);
-                        rtnl_lock();
                        if (bond->setup_by_slave)
                                res = bond_release_and_destroy(bond->dev, dev);
                        else
                                res = bond_release(bond->dev, dev);
-                        rtnl_unlock();
                        if (res) {
                                ret = res;
                                goto out;
@@ -389,6 +378,8 @@ err_no_cmd:
        ret = -EPERM;
 out:
+        up_write(&(bonding_rwsem));
+        rtnl_unlock();
        return ret;
 }
@@ -423,7 +414,7 @@ static ssize_t bonding_store_mode(struct device *d,
                goto out;
        }
-        new_value = bond_parse_parm((char *)buf, bond_mode_tbl);
+        new_value = bond_parse_parm(buf, bond_mode_tbl);
        if (new_value < 0)  {
                printk(KERN_ERR DRV_NAME
                       ": %s: Ignoring invalid mode value %.*s.\n",
@@ -478,7 +469,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
                goto out;
        }
-        new_value = bond_parse_parm((char *)buf, xmit_hashtype_tbl);
+        new_value = bond_parse_parm(buf, xmit_hashtype_tbl);
        if (new_value < 0)  {
                printk(KERN_ERR DRV_NAME
                       ": %s: Ignoring invalid xmit hash policy value %.*s.\n",
@@ -518,7 +509,7 @@ static ssize_t bonding_store_arp_validate(struct device *d,
        int new_value;
        struct bonding *bond = to_bond(d);
-        new_value = bond_parse_parm((char *)buf, arp_validate_tbl);
+        new_value = bond_parse_parm(buf, arp_validate_tbl);
        if (new_value < 0) {
                printk(KERN_ERR DRV_NAME
                       ": %s: Ignoring invalid arp_validate value %s\n",
@@ -941,7 +932,7 @@ static ssize_t bonding_store_lacp(struct device *d,
                goto out;
        }
-        new_value = bond_parse_parm((char *)buf, bond_lacp_tbl);
+        new_value = bond_parse_parm(buf, bond_lacp_tbl);
        if ((new_value == 1) || (new_value == 0)) {
                bond->params.lacp_fast = new_value;
@@ -1075,7 +1066,10 @@ static ssize_t bonding_store_primary(struct device *d,
        struct slave *slave;
        struct bonding *bond = to_bond(d);
-        write_lock_bh(&bond->lock);
+        rtnl_lock();
+        read_lock(&bond->lock);
+        write_lock_bh(&bond->curr_slave_lock);
        if (!USES_PRIMARY(bond->params.mode)) {
                printk(KERN_INFO DRV_NAME
                       ": %s: Unable to set primary slave; %s is in mode %d\n",
@@ -1109,8 +1103,8 @@ static ssize_t bonding_store_primary(struct device *d,
                }
        }
 out:
-        write_unlock_bh(&bond->lock);
+        write_unlock_bh(&bond->curr_slave_lock);
+        read_unlock(&bond->lock);
        rtnl_unlock();
        return count;
@@ -1190,7 +1184,8 @@ static ssize_t bonding_store_active_slave(struct device *d,
        struct bonding *bond = to_bond(d);
        rtnl_lock();
-        write_lock_bh(&bond->lock);
+        read_lock(&bond->lock);
+        write_lock_bh(&bond->curr_slave_lock);
        if (!USES_PRIMARY(bond->params.mode)) {
                printk(KERN_INFO DRV_NAME
@@ -1247,7 +1242,8 @@ static ssize_t bonding_store_active_slave(struct device *d,
                }
        }
 out:
-        write_unlock_bh(&bond->lock);
+        write_unlock_bh(&bond->curr_slave_lock);
+        read_unlock(&bond->lock);
        rtnl_unlock();
        return count;
@@ -1418,8 +1414,6 @@ int bond_create_sysfs(void)
        int ret = 0;
        struct bonding *firstbond;
-        init_rwsem(&bonding_rwsem);
        /* get the netdev class pointer */
        firstbond = container_of(bond_dev_list.next, struct bonding, bond_list);
        if (!firstbond)
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index e1e4734e23ce..6d83be49899a 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -141,6 +141,8 @@ struct bond_parm_tbl {
        int mode;
 };
+#define BOND_MAX_MODENAME_LEN 20
 struct vlan_entry {
        struct list_head vlan_list;
        __be32 vlan_ip;
@@ -314,7 +316,7 @@ void bond_mii_monitor(struct work_struct *);
 void bond_loadbalance_arp_mon(struct work_struct *);
 void bond_activebackup_arp_mon(struct work_struct *);
 void bond_set_mode_ops(struct bonding *bond, int mode);
-int bond_parse_parm(char *mode_arg, struct bond_parm_tbl *tbl);
+int bond_parse_parm(const char *mode_arg, struct bond_parm_tbl *tbl);
 void bond_select_active_slave(struct bonding *bond);
 void bond_change_active_slave(struct bonding *bond, struct slave *new_active);
 void bond_register_arp(struct bonding *);
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index 6fd95a2c8cec..6e12d48351b8 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -459,7 +459,7 @@ static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
                return NETDEV_TX_OK;
        len = max(skb->len, ETH_ZLEN);
-        queue = skb->queue_mapping;
+        queue = skb_get_queue_mapping(skb);
 #ifdef CONFIG_NETDEVICES_MULTIQUEUE
        netif_stop_subqueue(dev, queue);
 #else
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index 47cce9cad30f..e233d04a2132 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -1316,9 +1316,10 @@ rio_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
                            ("%02x:cur:%08x next:%08x status:%08x frag1:%08x frag0:%08x",
                             i,
                             (u32) (np->tx_ring_dma + i * sizeof (*desc)),
-                             (u32) desc->next_desc,
+                             (u32)le64_to_cpu(desc->next_desc),
-                             (u32) desc->status, (u32) (desc->fraginfo >> 32),
+                             (u32)le64_to_cpu(desc->status),
-                             (u32) desc->fraginfo);
+                             (u32)(le64_to_cpu(desc->fraginfo) >> 32),
+                             (u32)le64_to_cpu(desc->fraginfo));
                        printk ("\n");
                }
                printk ("\n");
@@ -1435,7 +1436,7 @@ mii_write (struct net_device *dev, int phy_addr, int reg_num, u16 data)
 static int
 mii_wait_link (struct net_device *dev, int wait)
 {
-        BMSR_t bmsr;
+        __u16 bmsr;
        int phy_addr;
        struct netdev_private *np;
@@ -1443,8 +1444,8 @@ mii_wait_link (struct net_device *dev, int wait)
        phy_addr = np->phy_addr;
        do {
-                bmsr.image = mii_read (dev, phy_addr, MII_BMSR);
+                bmsr = mii_read (dev, phy_addr, MII_BMSR);
-                if (bmsr.bits.link_status)
+                if (bmsr & MII_BMSR_LINK_STATUS)
                        return 0;
                mdelay (1);
        } while (--wait > 0);
@@ -1453,70 +1454,72 @@ mii_wait_link (struct net_device *dev, int wait)
 static int
 mii_get_media (struct net_device *dev)
 {
-        ANAR_t negotiate;
+        __u16 negotiate;
-        BMSR_t bmsr;
+        __u16 bmsr;
-        BMCR_t bmcr;
+        __u16 mscr;
-        MSCR_t mscr;
+        __u16 mssr;
-        MSSR_t mssr;
        int phy_addr;
        struct netdev_private *np;
        np = netdev_priv(dev);
        phy_addr = np->phy_addr;
-        bmsr.image = mii_read (dev, phy_addr, MII_BMSR);
+        bmsr = mii_read (dev, phy_addr, MII_BMSR);
        if (np->an_enable) {
-                if (!bmsr.bits.an_complete) {
+                if (!(bmsr & MII_BMSR_AN_COMPLETE)) {
                        /* Auto-Negotiation not completed */
                        return -1;
                }
-                negotiate.image = mii_read (dev, phy_addr, MII_ANAR) &
+                negotiate = mii_read (dev, phy_addr, MII_ANAR) &
                        mii_read (dev, phy_addr, MII_ANLPAR);
-                mscr.image = mii_read (dev, phy_addr, MII_MSCR);
+                mscr = mii_read (dev, phy_addr, MII_MSCR);
-                mssr.image = mii_read (dev, phy_addr, MII_MSSR);
+                mssr = mii_read (dev, phy_addr, MII_MSSR);
-                if (mscr.bits.media_1000BT_FD & mssr.bits.lp_1000BT_FD) {
+                if (mscr & MII_MSCR_1000BT_FD && mssr & MII_MSSR_LP_1000BT_FD) {
                        np->speed = 1000;
                        np->full_duplex = 1;
                        printk (KERN_INFO "Auto 1000 Mbps, Full duplex\n");
-                } else if (mscr.bits.media_1000BT_HD & mssr.bits.lp_1000BT_HD) {
+                } else if (mscr & MII_MSCR_1000BT_HD && mssr & MII_MSSR_LP_1000BT_HD) {
                        np->speed = 1000;
                        np->full_duplex = 0;
                        printk (KERN_INFO "Auto 1000 Mbps, Half duplex\n");
-                } else if (negotiate.bits.media_100BX_FD) {
+                } else if (negotiate & MII_ANAR_100BX_FD) {
                        np->speed = 100;
                        np->full_duplex = 1;
                        printk (KERN_INFO "Auto 100 Mbps, Full duplex\n");
-                } else if (negotiate.bits.media_100BX_HD) {
+                } else if (negotiate & MII_ANAR_100BX_HD) {
                        np->speed = 100;
                        np->full_duplex = 0;
                        printk (KERN_INFO "Auto 100 Mbps, Half duplex\n");
-                } else if (negotiate.bits.media_10BT_FD) {
+                } else if (negotiate & MII_ANAR_10BT_FD) {
                        np->speed = 10;
                        np->full_duplex = 1;
                        printk (KERN_INFO "Auto 10 Mbps, Full duplex\n");
-                } else if (negotiate.bits.media_10BT_HD) {
+                } else if (negotiate & MII_ANAR_10BT_HD) {
                        np->speed = 10;
                        np->full_duplex = 0;
                        printk (KERN_INFO "Auto 10 Mbps, Half duplex\n");
                }
-                if (negotiate.bits.pause) {
+                if (negotiate & MII_ANAR_PAUSE) {
                        np->tx_flow &= 1;
                        np->rx_flow &= 1;
-                } else if (negotiate.bits.asymmetric) {
+                } else if (negotiate & MII_ANAR_ASYMMETRIC) {
                        np->tx_flow = 0;
                        np->rx_flow &= 1;
                }
                /* else tx_flow, rx_flow = user select  */
        } else {
-                bmcr.image = mii_read (dev, phy_addr, MII_BMCR);
+                __u16 bmcr = mii_read (dev, phy_addr, MII_BMCR);
-                if (bmcr.bits.speed100 == 1 && bmcr.bits.speed1000 == 0) {
+                switch (bmcr & (MII_BMCR_SPEED_100 | MII_BMCR_SPEED_1000)) {
+                case MII_BMCR_SPEED_1000:
+                        printk (KERN_INFO "Operating at 1000 Mbps, ");
+                        break;
+                case MII_BMCR_SPEED_100:
                        printk (KERN_INFO "Operating at 100 Mbps, ");
-                } else if (bmcr.bits.speed100 == 0 && bmcr.bits.speed1000 == 0) {
+                        break;
+                case 0:
                        printk (KERN_INFO "Operating at 10 Mbps, ");
-                } else if (bmcr.bits.speed100 == 0 && bmcr.bits.speed1000 == 1) {
-                        printk (KERN_INFO "Operating at 1000 Mbps, ");
                }
-                if (bmcr.bits.duplex_mode) {
+                if (bmcr & MII_BMCR_DUPLEX_MODE) {
                        printk ("Full duplex\n");
                } else {
                        printk ("Half duplex\n");
@@ -1537,10 +1540,10 @@ mii_get_media (struct net_device *dev)
 static int
 mii_set_media (struct net_device *dev)
 {
-        PHY_SCR_t pscr;
+        __u16 pscr;
-        BMCR_t bmcr;
+        __u16 bmcr;
-        BMSR_t bmsr;
+        __u16 bmsr;
-        ANAR_t anar;
+        __u16 anar;
        int phy_addr;
        struct netdev_private *np;
        np = netdev_priv(dev);
@@ -1549,76 +1552,77 @@ mii_set_media (struct net_device *dev)
        /* Does user set speed? */
        if (np->an_enable) {
                /* Advertise capabilities */
-                bmsr.image = mii_read (dev, phy_addr, MII_BMSR);
+                bmsr = mii_read (dev, phy_addr, MII_BMSR);
-                anar.image = mii_read (dev, phy_addr, MII_ANAR);
+                anar = mii_read (dev, phy_addr, MII_ANAR) &
-                anar.bits.media_100BX_FD = bmsr.bits.media_100BX_FD;
+                             ~MII_ANAR_100BX_FD &
-                anar.bits.media_100BX_HD = bmsr.bits.media_100BX_HD;
+                             ~MII_ANAR_100BX_HD &
-                anar.bits.media_100BT4 = bmsr.bits.media_100BT4;
+                             ~MII_ANAR_100BT4 &
-                anar.bits.media_10BT_FD = bmsr.bits.media_10BT_FD;
+                             ~MII_ANAR_10BT_FD &
-                anar.bits.media_10BT_HD = bmsr.bits.media_10BT_HD;
+                             ~MII_ANAR_10BT_HD;
-                anar.bits.pause = 1;
+                if (bmsr & MII_BMSR_100BX_FD)
-                anar.bits.asymmetric = 1;
+                        anar |= MII_ANAR_100BX_FD;
-                mii_write (dev, phy_addr, MII_ANAR, anar.image);
+                if (bmsr & MII_BMSR_100BX_HD)
+                        anar |= MII_ANAR_100BX_HD;
+                if (bmsr & MII_BMSR_100BT4)
+                        anar |= MII_ANAR_100BT4;
+                if (bmsr & MII_BMSR_10BT_FD)
+                        anar |= MII_ANAR_10BT_FD;
+                if (bmsr & MII_BMSR_10BT_HD)
+                        anar |= MII_ANAR_10BT_HD;
+                anar |= MII_ANAR_PAUSE | MII_ANAR_ASYMMETRIC;
+                mii_write (dev, phy_addr, MII_ANAR, anar);
                /* Enable Auto crossover */
-                pscr.image = mii_read (dev, phy_addr, MII_PHY_SCR);
+                pscr = mii_read (dev, phy_addr, MII_PHY_SCR);
-                pscr.bits.mdi_crossover_mode = 3;       /* 11'b */
+                pscr |= 3 << 5; /* 11'b */
-                mii_write (dev, phy_addr, MII_PHY_SCR, pscr.image);
+                mii_write (dev, phy_addr, MII_PHY_SCR, pscr);
                /* Soft reset PHY */
                mii_write (dev, phy_addr, MII_BMCR, MII_BMCR_RESET);
-                bmcr.image = 0;
+                bmcr = MII_BMCR_AN_ENABLE | MII_BMCR_RESTART_AN | MII_BMCR_RESET;
-                bmcr.bits.an_enable = 1;
+                mii_write (dev, phy_addr, MII_BMCR, bmcr);
-                bmcr.bits.restart_an = 1;
-                bmcr.bits.reset = 1;
-                mii_write (dev, phy_addr, MII_BMCR, bmcr.image);
                mdelay(1);
        } else {
                /* Force speed setting */
                /* 1) Disable Auto crossover */
-                pscr.image = mii_read (dev, phy_addr, MII_PHY_SCR);
+                pscr = mii_read (dev, phy_addr, MII_PHY_SCR);
-                pscr.bits.mdi_crossover_mode = 0;
+                pscr &= ~(3 << 5);
-                mii_write (dev, phy_addr, MII_PHY_SCR, pscr.image);
+                mii_write (dev, phy_addr, MII_PHY_SCR, pscr);
                /* 2) PHY Reset */
-                bmcr.image = mii_read (dev, phy_addr, MII_BMCR);
+                bmcr = mii_read (dev, phy_addr, MII_BMCR);
-                bmcr.bits.reset = 1;
+                bmcr |= MII_BMCR_RESET;
-                mii_write (dev, phy_addr, MII_BMCR, bmcr.image);
+                mii_write (dev, phy_addr, MII_BMCR, bmcr);
                /* 3) Power Down */
-                bmcr.image = 0x1940;    /* must be 0x1940 */
+                bmcr = 0x1940;  /* must be 0x1940 */
-                mii_write (dev, phy_addr, MII_BMCR, bmcr.image);
+                mii_write (dev, phy_addr, MII_BMCR, bmcr);
                mdelay (100);   /* wait a certain time */
                /* 4) Advertise nothing */
                mii_write (dev, phy_addr, MII_ANAR, 0);
                /* 5) Set media and Power Up */
-                bmcr.image = 0;
+                bmcr = MII_BMCR_POWER_DOWN;
-                bmcr.bits.power_down = 1;
                if (np->speed == 100) {
-                        bmcr.bits.speed100 = 1;
+                        bmcr |= MII_BMCR_SPEED_100;
-                        bmcr.bits.speed1000 = 0;
                        printk (KERN_INFO "Manual 100 Mbps, ");
                } else if (np->speed == 10) {
-                        bmcr.bits.speed100 = 0;
-                        bmcr.bits.speed1000 = 0;
                        printk (KERN_INFO "Manual 10 Mbps, ");
                }
                if (np->full_duplex) {
-                        bmcr.bits.duplex_mode = 1;
+                        bmcr |= MII_BMCR_DUPLEX_MODE;
                        printk ("Full duplex\n");
                } else {
-                        bmcr.bits.duplex_mode = 0;
                        printk ("Half duplex\n");
                }
 #if 0
                /* Set 1000BaseT Master/Slave setting */
-                mscr.image = mii_read (dev, phy_addr, MII_MSCR);
+                mscr = mii_read (dev, phy_addr, MII_MSCR);
-                mscr.bits.cfg_enable = 1;
+                mscr |= MII_MSCR_CFG_ENABLE;
-                mscr.bits.cfg_value = 0;
+                mscr &= ~MII_MSCR_CFG_VALUE = 0;
 #endif
-                mii_write (dev, phy_addr, MII_BMCR, bmcr.image);
+                mii_write (dev, phy_addr, MII_BMCR, bmcr);
                mdelay(10);
        }
        return 0;
@@ -1627,43 +1631,42 @@ mii_set_media (struct net_device *dev)
 static int
 mii_get_media_pcs (struct net_device *dev)
 {
-        ANAR_PCS_t negotiate;
+        __u16 negotiate;
-        BMSR_t bmsr;
+        __u16 bmsr;
-        BMCR_t bmcr;
        int phy_addr;
        struct netdev_private *np;
        np = netdev_priv(dev);
        phy_addr = np->phy_addr;
-        bmsr.image = mii_read (dev, phy_addr, PCS_BMSR);
+        bmsr = mii_read (dev, phy_addr, PCS_BMSR);
        if (np->an_enable) {
-                if (!bmsr.bits.an_complete) {
+                if (!(bmsr & MII_BMSR_AN_COMPLETE)) {
                        /* Auto-Negotiation not completed */
                        return -1;
                }
-                negotiate.image = mii_read (dev, phy_addr, PCS_ANAR) &
+                negotiate = mii_read (dev, phy_addr, PCS_ANAR) &
                        mii_read (dev, phy_addr, PCS_ANLPAR);
                np->speed = 1000;
-                if (negotiate.bits.full_duplex) {
+                if (negotiate & PCS_ANAR_FULL_DUPLEX) {
                        printk (KERN_INFO "Auto 1000 Mbps, Full duplex\n");
                        np->full_duplex = 1;
                } else {
                        printk (KERN_INFO "Auto 1000 Mbps, half duplex\n");
                        np->full_duplex = 0;
                }
-                if (negotiate.bits.pause) {
+                if (negotiate & PCS_ANAR_PAUSE) {
                        np->tx_flow &= 1;
                        np->rx_flow &= 1;
-                } else if (negotiate.bits.asymmetric) {
+                } else if (negotiate & PCS_ANAR_ASYMMETRIC) {
                        np->tx_flow = 0;
                        np->rx_flow &= 1;
                }
                /* else tx_flow, rx_flow = user select  */
        } else {
-                bmcr.image = mii_read (dev, phy_addr, PCS_BMCR);
+                __u16 bmcr = mii_read (dev, phy_addr, PCS_BMCR);
                printk (KERN_INFO "Operating at 1000 Mbps, ");
-                if (bmcr.bits.duplex_mode) {
+                if (bmcr & MII_BMCR_DUPLEX_MODE) {
                        printk ("Full duplex\n");
                } else {
                        printk ("Half duplex\n");
@@ -1684,9 +1687,9 @@ mii_get_media_pcs (struct net_device *dev)
 static int
 mii_set_media_pcs (struct net_device *dev)
 {
-        BMCR_t bmcr;
+        __u16 bmcr;
-        ESR_t esr;
+        __u16 esr;
-        ANAR_PCS_t anar;
+        __u16 anar;
        int phy_addr;
        struct netdev_private *np;
        np = netdev_priv(dev);
@@ -1695,41 +1698,37 @@ mii_set_media_pcs (struct net_device *dev)
        /* Auto-Negotiation? */
        if (np->an_enable) {
                /* Advertise capabilities */
-                esr.image = mii_read (dev, phy_addr, PCS_ESR);
+                esr = mii_read (dev, phy_addr, PCS_ESR);
-                anar.image = mii_read (dev, phy_addr, MII_ANAR);
+                anar = mii_read (dev, phy_addr, MII_ANAR) &
-                anar.bits.half_duplex =
+                        ~PCS_ANAR_HALF_DUPLEX &
-                        esr.bits.media_1000BT_HD | esr.bits.media_1000BX_HD;
+                        ~PCS_ANAR_FULL_DUPLEX;
-                anar.bits.full_duplex =
+                if (esr & (MII_ESR_1000BT_HD | MII_ESR_1000BX_HD))
-                        esr.bits.media_1000BT_FD | esr.bits.media_1000BX_FD;
+                        anar |= PCS_ANAR_HALF_DUPLEX;
-                anar.bits.pause = 1;
+                if (esr & (MII_ESR_1000BT_FD | MII_ESR_1000BX_FD))
-                anar.bits.asymmetric = 1;
+                        anar |= PCS_ANAR_FULL_DUPLEX;
-                mii_write (dev, phy_addr, MII_ANAR, anar.image);
+                anar |= PCS_ANAR_PAUSE | PCS_ANAR_ASYMMETRIC;
+                mii_write (dev, phy_addr, MII_ANAR, anar);
                /* Soft reset PHY */
                mii_write (dev, phy_addr, MII_BMCR, MII_BMCR_RESET);
-                bmcr.image = 0;
+                bmcr = MII_BMCR_AN_ENABLE | MII_BMCR_RESTART_AN |
-                bmcr.bits.an_enable = 1;
+                       MII_BMCR_RESET;
-                bmcr.bits.restart_an = 1;
+                mii_write (dev, phy_addr, MII_BMCR, bmcr);
-                bmcr.bits.reset = 1;
-                mii_write (dev, phy_addr, MII_BMCR, bmcr.image);
                mdelay(1);
        } else {
                /* Force speed setting */
                /* PHY Reset */
-                bmcr.image = 0;
+                bmcr = MII_BMCR_RESET;
-                bmcr.bits.reset = 1;
+                mii_write (dev, phy_addr, MII_BMCR, bmcr);
-                mii_write (dev, phy_addr, MII_BMCR, bmcr.image);
                mdelay(10);
-                bmcr.image = 0;
-                bmcr.bits.an_enable = 0;
                if (np->full_duplex) {
-                        bmcr.bits.duplex_mode = 1;
+                        bmcr = MII_BMCR_DUPLEX_MODE;
                        printk (KERN_INFO "Manual full duplex\n");
                } else {
-                        bmcr.bits.duplex_mode = 0;
+                        bmcr = 0;
                        printk (KERN_INFO "Manual half duplex\n");
                }
-                mii_write (dev, phy_addr, MII_BMCR, bmcr.image);
+                mii_write (dev, phy_addr, MII_BMCR, bmcr);
                mdelay(10);
                /*  Advertise nothing */
diff --git a/drivers/net/dl2k.h b/drivers/net/dl2k.h
index 014b77ce96df..d66c605b4075 100644
--- a/drivers/net/dl2k.h
+++ b/drivers/net/dl2k.h
@@ -298,23 +298,6 @@ enum _pcs_reg {
 };
 /* Basic Mode Control Register */
-typedef union t_MII_BMCR {
-        u16 image;
-        struct {
-                u16 _bit_5_0:6; // bit 5:0
-                u16 speed1000:1;        // bit 6
-                u16 col_test_enable:1;  // bit 7
-                u16 duplex_mode:1;      // bit 8
-                u16 restart_an:1;       // bit 9
-                u16 isolate:1;  // bit 10
-                u16 power_down:1;       // bit 11
-                u16 an_enable:1;        // bit 12
-                u16 speed100:1; // bit 13
-                u16 loopback:1; // bit 14
-                u16 reset:1;    // bit 15
-        } bits;
-} BMCR_t, *PBMCR_t;
 enum _mii_bmcr {
        MII_BMCR_RESET = 0x8000,
        MII_BMCR_LOOP_BACK = 0x4000,
@@ -333,28 +316,6 @@ enum _mii_bmcr {
 };
 /* Basic Mode Status Register */
-typedef union t_MII_BMSR {
-        u16 image;
-        struct {
-                u16 ext_capability:1;   // bit 0
-                u16 japper_detect:1;    // bit 1
-                u16 link_status:1;      // bit 2
-                u16 an_ability:1;       // bit 3
-                u16 remote_fault:1;     // bit 4
-                u16 an_complete:1;      // bit 5
-                u16 preamble_supp:1;    // bit 6
-                u16 _bit_7:1;   // bit 7
-                u16 ext_status:1;       // bit 8
-                u16 media_100BT2_HD:1;  // bit 9
-                u16 media_100BT2_FD:1;  // bit 10
-                u16 media_10BT_HD:1;    // bit 11
-                u16 media_10BT_FD:1;    // bit 12
-                u16 media_100BX_HD:1;   // bit 13
-                u16 media_100BX_FD:1;   // bit 14
-                u16 media_100BT4:1;     // bit 15
-        } bits;
-} BMSR_t, *PBMSR_t;
 enum _mii_bmsr {
        MII_BMSR_100BT4 = 0x8000,
        MII_BMSR_100BX_FD = 0x4000,
@@ -374,24 +335,6 @@ enum _mii_bmsr {
 };
 /* ANAR */
-typedef union t_MII_ANAR {
-        u16 image;
-        struct {
-                u16 selector:5; // bit 4:0
-                u16 media_10BT_HD:1;    // bit 5
-                u16 media_10BT_FD:1;    // bit 6
-                u16 media_100BX_HD:1;   // bit 7
-                u16 media_100BX_FD:1;   // bit 8
-                u16 media_100BT4:1;     // bit 9
-                u16 pause:1;    // bit 10
-                u16 asymmetric:1;       // bit 11
-                u16 _bit12:1;   // bit 12
-                u16 remote_fault:1;     // bit 13
-                u16 _bit14:1;   // bit 14
-                u16 next_page:1;        // bit 15
-        } bits;
-} ANAR_t, *PANAR_t;
 enum _mii_anar {
        MII_ANAR_NEXT_PAGE = 0x8000,
        MII_ANAR_REMOTE_FAULT = 0x4000,
@@ -407,24 +350,6 @@ enum _mii_anar {
 };
 /* ANLPAR */
-typedef union t_MII_ANLPAR {
-        u16 image;
-        struct {
-                u16 selector:5; // bit 4:0
-                u16 media_10BT_HD:1;    // bit 5
-                u16 media_10BT_FD:1;    // bit 6
-                u16 media_100BX_HD:1;   // bit 7
-                u16 media_100BX_FD:1;   // bit 8
-                u16 media_100BT4:1;     // bit 9
-                u16 pause:1;    // bit 10
-                u16 asymmetric:1;       // bit 11
-                u16 _bit12:1;   // bit 12
-                u16 remote_fault:1;     // bit 13
-                u16 _bit14:1;   // bit 14
-                u16 next_page:1;        // bit 15
-        } bits;
-} ANLPAR_t, *PANLPAR_t;
 enum _mii_anlpar {
        MII_ANLPAR_NEXT_PAGE = MII_ANAR_NEXT_PAGE,
        MII_ANLPAR_REMOTE_FAULT = MII_ANAR_REMOTE_FAULT,
@@ -439,18 +364,6 @@ enum _mii_anlpar {
 };
 /* Auto-Negotiation Expansion Register */
-typedef union t_MII_ANER {
-        u16 image;
-        struct {
-                u16 lp_negotiable:1;    // bit 0
-                u16 page_received:1;    // bit 1
-                u16 nextpagable:1;      // bit 2
-                u16 lp_nextpagable:1;   // bit 3
-                u16 pdetect_fault:1;    // bit 4
-                u16 _bit15_5:11;        // bit 15:5
-        } bits;
-} ANER_t, *PANER_t;
 enum _mii_aner {
        MII_ANER_PAR_DETECT_FAULT = 0x0010,
        MII_ANER_LP_NEXTPAGABLE = 0x0008,
@@ -460,19 +373,6 @@ enum _mii_aner {
 };
 /* MASTER-SLAVE Control Register */
-typedef union t_MII_MSCR {
-        u16 image;
-        struct {
-                u16 _bit_7_0:8; // bit 7:0
-                u16 media_1000BT_HD:1;  // bit 8
-                u16 media_1000BT_FD:1;  // bit 9
-                u16 port_type:1;        // bit 10
-                u16 cfg_value:1;        // bit 11
-                u16 cfg_enable:1;       // bit 12
-                u16 test_mode:3;        // bit 15:13
-        } bits;
-} MSCR_t, *PMSCR_t;
 enum _mii_mscr {
        MII_MSCR_TEST_MODE = 0xe000,
        MII_MSCR_CFG_ENABLE = 0x1000,
@@ -483,20 +383,6 @@ enum _mii_mscr {
 };
 /* MASTER-SLAVE Status Register */
-typedef union t_MII_MSSR {
-        u16 image;
-        struct {
-                u16 idle_err_count:8;   // bit 7:0
-                u16 _bit_9_8:2; // bit 9:8
-                u16 lp_1000BT_HD:1;     // bit 10
-                u16 lp_1000BT_FD:1;     // bit 11
-                u16 remote_rcv_status:1;        // bit 12
-                u16 local_rcv_status:1; // bit 13
-                u16 cfg_resolution:1;   // bit 14
-                u16 cfg_fault:1;        // bit 15
-        } bits;
-} MSSR_t, *PMSSR_t;
 enum _mii_mssr {
        MII_MSSR_CFG_FAULT = 0x8000,
        MII_MSSR_CFG_RES = 0x4000,
@@ -508,17 +394,6 @@ enum _mii_mssr {
 };
 /* IEEE Extened Status Register */
-typedef union t_MII_ESR {
-        u16 image;
-        struct {
-                u16 _bit_11_0:12;       // bit 11:0
-                u16 media_1000BT_HD:2;  // bit 12
-                u16 media_1000BT_FD:1;  // bit 13
-                u16 media_1000BX_HD:1;  // bit 14
-                u16 media_1000BX_FD:1;  // bit 15
-        } bits;
-} ESR_t, *PESR_t;
 enum _mii_esr {
        MII_ESR_1000BX_FD = 0x8000,
        MII_ESR_1000BX_HD = 0x4000,
@@ -526,6 +401,7 @@ enum _mii_esr {
        MII_ESR_1000BT_HD = 0x1000,
 };
 /* PHY Specific Control Register */
+#if 0
 typedef union t_MII_PHY_SCR {
        u16 image;
        struct {
@@ -543,6 +419,7 @@ typedef union t_MII_PHY_SCR {
                u16 xmit_fifo_depth:2;  // bit 15:14
        } bits;
 } PHY_SCR_t, *PPHY_SCR_t;
+#endif
 typedef enum t_MII_ADMIN_STATUS {
        adm_reset,
@@ -556,21 +433,6 @@ typedef enum t_MII_ADMIN_STATUS {
 /* PCS control and status registers bitmap as the same as MII */
 /* PCS Extended Status register bitmap as the same as MII */
 /* PCS ANAR */
-typedef union t_PCS_ANAR {
-        u16 image;
-        struct {
-                u16 _bit_4_0:5;         // bit 4:0
-                u16 full_duplex:1;      // bit 5
-                u16 half_duplex:1;      // bit 6
-                u16 asymmetric:1;       // bit 7
-                u16 pause:1;            // bit 8
-                u16 _bit_11_9:3;        // bit 11:9
-                u16 remote_fault:2;     // bit 13:12
-                u16 _bit_14:1;          // bit 14
-                u16 next_page:1;        // bit 15
-        } bits;
-} ANAR_PCS_t, *PANAR_PCS_t;
 enum _pcs_anar {
        PCS_ANAR_NEXT_PAGE = 0x8000,
        PCS_ANAR_REMOTE_FAULT = 0x3000,
@@ -580,21 +442,6 @@ enum _pcs_anar {
        PCS_ANAR_FULL_DUPLEX = 0x0020,
 };
 /* PCS ANLPAR */
-typedef union t_PCS_ANLPAR {
-        u16 image;
-        struct {
-                u16 _bit_4_0:5;         // bit 4:0
-                u16 full_duplex:1;      // bit 5
-                u16 half_duplex:1;      // bit 6
-                u16 asymmetric:1;       // bit 7
-                u16 pause:1;            // bit 8
-                u16 _bit_11_9:3;        // bit 11:9
-                u16 remote_fault:2;     // bit 13:12
-                u16 _bit_14:1;          // bit 14
-                u16 next_page:1;        // bit 15
-        } bits;
-} ANLPAR_PCS_t, *PANLPAR_PCS_t;
 enum _pcs_anlpar {
        PCS_ANLPAR_NEXT_PAGE = PCS_ANAR_NEXT_PAGE,
        PCS_ANLPAR_REMOTE_FAULT = PCS_ANAR_REMOTE_FAULT,
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 2b06e4b4dabc..b87402bc8308 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1991,13 +1991,12 @@ static int e100_poll(struct napi_struct *napi, int budget)
        struct nic *nic = container_of(napi, struct nic, napi);
        struct net_device *netdev = nic->netdev;
        unsigned int work_done = 0;
-        int tx_cleaned;
        e100_rx_clean(nic, &work_done, budget);
-        tx_cleaned = e100_tx_clean(nic);
+        e100_tx_clean(nic);
-        /* If no Rx and Tx cleanup work was done, exit polling mode. */
+        /* If budget not fully consumed, exit the polling mode */
-        if((!tx_cleaned && (work_done == 0)) || !netif_running(netdev)) {
+        if (work_done < budget) {
                netif_rx_complete(netdev, napi);
                e100_enable_irq(nic);
        }
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 4f37506ad374..0c9a6f7104d2 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3924,27 +3924,24 @@ e1000_clean(struct napi_struct *napi, int budget)
        /* Must NOT use netdev_priv macro here. */
        adapter = poll_dev->priv;
-        /* Keep link state information with original netdev */
-        if (!netif_carrier_ok(poll_dev))
-                goto quit_polling;
        /* e1000_clean is called per-cpu.  This lock protects
         * tx_ring[0] from being cleaned by multiple cpus
         * simultaneously.  A failure obtaining the lock means
         * tx_ring[0] is currently being cleaned anyway. */
        if (spin_trylock(&adapter->tx_queue_lock)) {
                tx_cleaned = e1000_clean_tx_irq(adapter,
-                                                &adapter->tx_ring[0]);
+                                                &adapter->tx_ring[0]);
                spin_unlock(&adapter->tx_queue_lock);
        }
        adapter->clean_rx(adapter, &adapter->rx_ring[0],
                          &work_done, budget);
-        /* If no Tx and not enough Rx work done, exit the polling mode */
+        if (tx_cleaned)
-        if ((!tx_cleaned && (work_done == 0)) ||
+                work_done = budget;
-           !netif_running(poll_dev)) {
-quit_polling:
+        /* If budget not fully consumed, exit the polling mode */
+        if (work_done < budget) {
                if (likely(adapter->itr_setting & 3))
                        e1000_set_itr(adapter);
                netif_rx_complete(poll_dev, napi);
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 4fd2e23720b6..2ab3bfbb8a63 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -1389,10 +1389,6 @@ static int e1000_clean(struct napi_struct *napi, int budget)
        /* Must NOT use netdev_priv macro here. */
        adapter = poll_dev->priv;
-        /* Keep link state information with original netdev */
-        if (!netif_carrier_ok(poll_dev))
-                goto quit_polling;
        /* e1000_clean is called per-cpu.  This lock protects
         * tx_ring from being cleaned by multiple cpus
         * simultaneously.  A failure obtaining the lock means
@@ -1404,10 +1400,11 @@ static int e1000_clean(struct napi_struct *napi, int budget)
        adapter->clean_rx(adapter, &work_done, budget);
-        /* If no Tx and not enough Rx work done, exit the polling mode */
+        if (tx_cleaned)
-        if ((!tx_cleaned && (work_done < budget)) ||
+                work_done = budget;
-           !netif_running(poll_dev)) {
-quit_polling:
+        /* If budget not fully consumed, exit the polling mode */
+        if (work_done < budget) {
                if (adapter->itr_setting & 3)
                        e1000_set_itr(adapter);
                netif_rx_complete(poll_dev, napi);
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index ecdd3fc8d70c..0b365b8d947b 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -1273,7 +1273,7 @@ rx_action:
        epic_rx_err(dev, ep);
-        if (netif_running(dev) && (work_done < budget)) {
+        if (work_done < budget) {
                unsigned long flags;
                int more;
diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c
index 8d2904fa5789..ab9637ab3a8d 100644
--- a/drivers/net/fec_8xx/fec_main.c
+++ b/drivers/net/fec_8xx/fec_main.c
@@ -476,11 +476,6 @@ static int fec_enet_rx_common(struct fec_enet_private *ep,
        __u16 pkt_len, sc;
        int curidx;
-        if (fpi->use_napi) {
-                if (!netif_running(dev))
-                        return 0;
-        }
        /*
         * First, grab all of the stats for the incoming packet.
         * These get messed up if we get called due to a busy condition.
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index a96583cceb5e..f84c752997a4 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5199,10 +5199,6 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                dev->dev_addr[3] = (np->orig_mac[0] >> 16) & 0xff;
                dev->dev_addr[4] = (np->orig_mac[0] >>  8) & 0xff;
                dev->dev_addr[5] = (np->orig_mac[0] >>  0) & 0xff;
-                /* set permanent address to be correct aswell */
-                np->orig_mac[0] = (dev->dev_addr[0] << 0) + (dev->dev_addr[1] << 8) +
-                        (dev->dev_addr[2] << 16) + (dev->dev_addr[3] << 24);
-                np->orig_mac[1] = (dev->dev_addr[4] << 0) + (dev->dev_addr[5] << 8);
                writel(txreg|NVREG_TRANSMITPOLL_MAC_ADDR_REV, base + NvRegTransmitPoll);
        }
        memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
@@ -5414,6 +5410,8 @@ static void __devexit nv_remove(struct pci_dev *pci_dev)
         */
        writel(np->orig_mac[0], base + NvRegMacAddrA);
        writel(np->orig_mac[1], base + NvRegMacAddrB);
+        writel(readl(base + NvRegTransmitPoll) & ~NVREG_TRANSMITPOLL_MAC_ADDR_REV,
+               base + NvRegTransmitPoll);
        /* free all structures */
        free_rings(dev);
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index f2a4d399a6e5..c83bd6560088 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -96,9 +96,6 @@ static int fs_enet_rx_napi(struct napi_struct *napi, int budget)
        u16 pkt_len, sc;
        int curidx;
-        if (!netif_running(dev))
-                return 0;
        /*
         * First, grab all of the stats for the incoming packet.
         * These get messed up if we get called due to a busy condition.
@@ -897,14 +894,21 @@ static void fs_get_regs(struct net_device *dev, struct ethtool_regs *regs,
 static int fs_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
        struct fs_enet_private *fep = netdev_priv(dev);
+        if (!fep->phydev)
+                return -ENODEV;
        return phy_ethtool_gset(fep->phydev, cmd);
 }
 static int fs_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
        struct fs_enet_private *fep = netdev_priv(dev);
-        phy_ethtool_sset(fep->phydev, cmd);
-        return 0;
+        if (!fep->phydev)
+                return -ENODEV;
+        return phy_ethtool_sset(fep->phydev, cmd);
 }
 static int fs_nway_reset(struct net_device *dev)
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
index dbd23bb65d1e..50f0c17451b1 100644
--- a/drivers/net/ipg.c
+++ b/drivers/net/ipg.c
@@ -857,21 +857,14 @@ static void init_tfdlist(struct net_device *dev)
 static void ipg_nic_txfree(struct net_device *dev)
 {
        struct ipg_nic_private *sp = netdev_priv(dev);
-        void __iomem *ioaddr = sp->ioaddr;
+        unsigned int released, pending, dirty;
-        unsigned int curr;
-        u64 txd_map;
-        unsigned int released, pending;
-        txd_map = (u64)sp->txd_map;
-        curr = ipg_r32(TFD_LIST_PTR_0) -
-                do_div(txd_map, sizeof(struct ipg_tx)) - 1;
        IPG_DEBUG_MSG("_nic_txfree\n");
        pending = sp->tx_current - sp->tx_dirty;
+        dirty = sp->tx_dirty % IPG_TFDLIST_LENGTH;
        for (released = 0; released < pending; released++) {
-                unsigned int dirty = sp->tx_dirty % IPG_TFDLIST_LENGTH;
                struct sk_buff *skb = sp->TxBuff[dirty];
                struct ipg_tx *txfd = sp->txd + dirty;
@@ -882,11 +875,8 @@ static void ipg_nic_txfree(struct net_device *dev)
                 * If the TFDDone bit is set, free the associated
                 * buffer.
                 */
-                if (dirty == curr)
+                if (!(txfd->tfc & cpu_to_le64(IPG_TFC_TFDDONE)))
-                        break;
+                        break;
-                /* Setup TFDDONE for compatible issue. */
-                txfd->tfc |= cpu_to_le64(IPG_TFC_TFDDONE);
                /* Free the transmit buffer. */
                if (skb) {
@@ -898,6 +888,7 @@ static void ipg_nic_txfree(struct net_device *dev)
                        sp->TxBuff[dirty] = NULL;
                }
+                dirty = (dirty + 1) % IPG_TFDLIST_LENGTH;
        }
        sp->tx_dirty += released;
@@ -1630,6 +1621,8 @@ static irqreturn_t ipg_interrupt_handler(int irq, void *dev_inst)
 #ifdef JUMBO_FRAME
        ipg_nic_rxrestore(dev);
 #endif
+        spin_lock(&sp->lock);
        /* Get interrupt source information, and acknowledge
         * some (i.e. TxDMAComplete, RxDMAComplete, RxEarly,
         * IntRequested, MacControlFrame, LinkEvent) interrupts
@@ -1647,9 +1640,7 @@ static irqreturn_t ipg_interrupt_handler(int irq, void *dev_inst)
        handled = 1;
        if (unlikely(!netif_running(dev)))
-                goto out;
+                goto out_unlock;
-        spin_lock(&sp->lock);
        /* If RFDListEnd interrupt, restore all used RFDs. */
        if (status & IPG_IS_RFD_LIST_END) {
@@ -1733,9 +1724,9 @@ out_enable:
        ipg_w16(IPG_IE_TX_DMA_COMPLETE | IPG_IE_RX_DMA_COMPLETE |
                IPG_IE_HOST_ERROR | IPG_IE_INT_REQUESTED | IPG_IE_TX_COMPLETE |
                IPG_IE_LINK_EVENT | IPG_IE_UPDATE_STATS, INT_ENABLE);
+out_unlock:
        spin_unlock(&sp->lock);
-out:
        return IRQ_RETVAL(handled);
 }
@@ -1943,10 +1934,7 @@ static int ipg_nic_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         */
        if (sp->tenmbpsmode)
                txfd->tfc |= cpu_to_le64(IPG_TFC_TXINDICATE);
-        else if (!((sp->tx_current - sp->tx_dirty + 1) >
+        txfd->tfc |= cpu_to_le64(IPG_TFC_TXDMAINDICATE);
-            IPG_FRAMESBETWEENTXDMACOMPLETES)) {
-                txfd->tfc |= cpu_to_le64(IPG_TFC_TXDMAINDICATE);
-        }
        /* Based on compilation option, determine if FCS is to be
         * appended to transmit frame by IPG.
         */
@@ -2003,7 +1991,7 @@ static int ipg_nic_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
        ipg_w32(IPG_DC_TX_DMA_POLL_NOW, DMA_CTRL);
        if (sp->tx_current == (sp->tx_dirty + IPG_TFDLIST_LENGTH))
-                netif_wake_queue(dev);
+                netif_stop_queue(dev);
        spin_unlock_irqrestore(&sp->lock, flags);
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index bf9085fe035a..d2fb88d5cda2 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1787,14 +1787,13 @@ ixgb_clean(struct napi_struct *napi, int budget)
 {
        struct ixgb_adapter *adapter = container_of(napi, struct ixgb_adapter, napi);
        struct net_device *netdev = adapter->netdev;
-        int tx_cleaned;
        int work_done = 0;
-        tx_cleaned = ixgb_clean_tx_irq(adapter);
+        ixgb_clean_tx_irq(adapter);
        ixgb_clean_rx_irq(adapter, &work_done, budget);
-        /* if no Tx and not enough Rx work done, exit the polling mode */
+        /* If budget not fully consumed, exit the polling mode */
-        if((!tx_cleaned && (work_done == 0)) || !netif_running(netdev)) {
+        if (work_done < budget) {
                netif_rx_complete(netdev, napi);
                ixgb_irq_enable(adapter);
        }
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 00bc525c6560..de3f45e4c5ae 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1470,19 +1470,16 @@ static int ixgbe_clean(struct napi_struct *napi, int budget)
        struct net_device *netdev = adapter->netdev;
        int tx_cleaned = 0, work_done = 0;
-        /* Keep link state information with original netdev */
-        if (!netif_carrier_ok(adapter->netdev))
-                goto quit_polling;
        /* In non-MSIX case, there is no multi-Tx/Rx queue */
        tx_cleaned = ixgbe_clean_tx_irq(adapter, adapter->tx_ring);
        ixgbe_clean_rx_irq(adapter, &adapter->rx_ring[0], &work_done,
                           budget);
-        /* If no Tx and not enough Rx work done, exit the polling mode */
+        if (tx_cleaned)
-        if ((!tx_cleaned && (work_done < budget)) ||
+                work_done = budget;
-            !netif_running(adapter->netdev)) {
-quit_polling:
+        /* If budget not fully consumed, exit the polling mode */
+        if (work_done < budget) {
                netif_rx_complete(netdev, napi);
                ixgbe_irq_enable(adapter);
        }
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c
index 6c0dd49149d0..484cb2ba717f 100644
--- a/drivers/net/ixp2000/ixpdev.c
+++ b/drivers/net/ixp2000/ixpdev.c
@@ -135,8 +135,6 @@ static int ixpdev_poll(struct napi_struct *napi, int budget)
        struct net_device *dev = ip->dev;
        int rx;
-        /* @@@ Have to stop polling when nds[0] is administratively
-         * downed while we are polling.  */
        rx = 0;
        do {
                ixp2000_reg_write(IXP2000_IRQ_THD_RAW_STATUS_A_0, 0x00ff);
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 662b8d16803c..fa147cd5d68c 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -242,7 +242,7 @@ static void loopback_setup(struct net_device *dev)
                | NETIF_F_NO_CSUM
                | NETIF_F_HIGHDMA
                | NETIF_F_LLTX
-                | NETIF_F_NETNS_LOCAL,
+                | NETIF_F_NETNS_LOCAL;
        dev->ethtool_ops        = &loopback_ethtool_ops;
        dev->header_ops         = &eth_header_ops;
        dev->init = loopback_dev_init;
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 2e4bcd5654c4..e8dc2f44fec9 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -384,6 +384,13 @@ static int macvlan_newlink(struct net_device *dev,
        if (lowerdev == NULL)
                return -ENODEV;
+        /* Don't allow macvlans on top of other macvlans - its not really
+         * wrong, but lockdep can't handle it and its not useful for anything
+         * you couldn't do directly on top of the real device.
+         */
+        if (lowerdev->rtnl_link_ops == dev->rtnl_link_ops)
+                return -ENODEV;
        if (!tb[IFLA_MTU])
                dev->mtu = lowerdev->mtu;
        else if (dev->mtu > lowerdev->mtu)
diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index 0c89b028a80c..cdaa8fc21809 100644
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -95,11 +95,14 @@ static inline void load_eaddr(struct net_device *dev)
 {
        int i;
        DECLARE_MAC_BUF(mac);
+        u64 macaddr;
-        for (i = 0; i < 6; i++)
-                dev->dev_addr[i] = o2meth_eaddr[i];
        DPRINTK("Loading MAC Address: %s\n", print_mac(mac, dev->dev_addr));
-        mace->eth.mac_addr = (*(unsigned long*)o2meth_eaddr) >> 16;
+        macaddr = 0;
+        for (i = 0; i < 6; i++)
+                macaddr |= dev->dev_addr[i] << ((5 - i) * 8);
+        mace->eth.mac_addr = macaddr;
 }
 /*
@@ -794,6 +797,7 @@ static int __init meth_probe(struct platform_device *pdev)
 #endif
        dev->irq             = MACE_ETHERNET_IRQ;
        dev->base_addr       = (unsigned long)&mace->eth;
+        memcpy(dev->dev_addr, o2meth_eaddr, 6);
        priv = netdev_priv(dev);
        spin_lock_init(&priv->meth_lock);
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 8def8657251f..c90958f6d3fe 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -1239,7 +1239,7 @@ static int myri10ge_poll(struct napi_struct *napi, int budget)
        /* process as many rx events as NAPI will allow */
        work_done = myri10ge_clean_rx_done(mgp, budget);
-        if (work_done < budget || !netif_running(netdev)) {
+        if (work_done < budget) {
                netif_rx_complete(netdev, napi);
                put_be32(htonl(3), mgp->irq_claim);
        }
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 87cde062fd63..c329a4f5840c 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -2266,7 +2266,7 @@ static int natsemi_poll(struct napi_struct *napi, int budget)
        /* Reenable interrupts providing nothing is trying to shut
         * the chip down. */
        spin_lock(&np->lock);
-        if (!np->hands_off && netif_running(dev))
+        if (!np->hands_off)
                natsemi_irq_enable(dev);
        spin_unlock(&np->lock);
diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c
index 5267e031daa0..78d34af13a1c 100644
--- a/drivers/net/netx-eth.c
+++ b/drivers/net/netx-eth.c
@@ -169,8 +169,8 @@ static void netx_eth_receive(struct net_device *ndev)
        ndev->last_rx = jiffies;
        skb->protocol = eth_type_trans(skb, ndev);
        netif_rx(skb);
-        dev->stats.rx_packets++;
+        ndev->stats.rx_packets++;
-        dev->stats.rx_bytes += len;
+        ndev->stats.rx_bytes += len;
 }
 static irqreturn_t
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index fbc2553275dc..a8f63c47b3cd 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -65,8 +65,8 @@
 #define _NETXEN_NIC_LINUX_MAJOR 3
 #define _NETXEN_NIC_LINUX_MINOR 4
-#define _NETXEN_NIC_LINUX_SUBVERSION 2
+#define _NETXEN_NIC_LINUX_SUBVERSION 18
-#define NETXEN_NIC_LINUX_VERSIONID  "3.4.2"
+#define NETXEN_NIC_LINUX_VERSIONID  "3.4.18"
 #define NETXEN_NUM_FLASH_SECTORS (64)
 #define NETXEN_FLASH_SECTOR_SIZE (64 * 1024)
@@ -309,23 +309,26 @@ struct netxen_ring_ctx {
        ((cmd_desc)->port_ctxid |= ((var) & 0xF0))
 #define netxen_set_cmd_desc_flags(cmd_desc, val)        \
-        ((cmd_desc)->flags_opcode &= ~cpu_to_le16(0x7f), \
+        (cmd_desc)->flags_opcode = ((cmd_desc)->flags_opcode & \
-        (cmd_desc)->flags_opcode |= cpu_to_le16((val) & 0x7f))
+                ~cpu_to_le16(0x7f)) | cpu_to_le16((val) & 0x7f)
 #define netxen_set_cmd_desc_opcode(cmd_desc, val)       \
-        ((cmd_desc)->flags_opcode &= ~cpu_to_le16(0x3f<<7), \
+        (cmd_desc)->flags_opcode = ((cmd_desc)->flags_opcode & \
-        (cmd_desc)->flags_opcode |= cpu_to_le16(((val & 0x3f)<<7)))
+                ~cpu_to_le16((u16)0x3f << 7)) | cpu_to_le16(((val) & 0x3f) << 7)
 #define netxen_set_cmd_desc_num_of_buff(cmd_desc, val)  \
-        ((cmd_desc)->num_of_buffers_total_length &= ~cpu_to_le32(0xff), \
+        (cmd_desc)->num_of_buffers_total_length = \
-        (cmd_desc)->num_of_buffers_total_length |= cpu_to_le32((val) & 0xff))
+                ((cmd_desc)->num_of_buffers_total_length & \
+                ~cpu_to_le32(0xff)) | cpu_to_le32((val) & 0xff)
 #define netxen_set_cmd_desc_totallength(cmd_desc, val)  \
-        ((cmd_desc)->num_of_buffers_total_length &= ~cpu_to_le32(0xffffff00), \
+        (cmd_desc)->num_of_buffers_total_length = \
-        (cmd_desc)->num_of_buffers_total_length |= cpu_to_le32(val << 8))
+                ((cmd_desc)->num_of_buffers_total_length & \
+                ~cpu_to_le32((u32)0xffffff << 8)) | \
+                cpu_to_le32(((val) & 0xffffff) << 8)
 #define netxen_get_cmd_desc_opcode(cmd_desc)    \
-        ((le16_to_cpu((cmd_desc)->flags_opcode) >> 7) & 0x003F)
+        ((le16_to_cpu((cmd_desc)->flags_opcode) >> 7) & 0x003f)
 #define netxen_get_cmd_desc_totallength(cmd_desc)       \
-        (le32_to_cpu((cmd_desc)->num_of_buffers_total_length) >> 8)
+        ((le32_to_cpu((cmd_desc)->num_of_buffers_total_length) >> 8) & 0xffffff)
 struct cmd_desc_type0 {
        u8 tcp_hdr_offset;      /* For LSO only */
@@ -412,29 +415,29 @@ struct rcv_desc {
 #define netxen_get_sts_desc_lro_last_frag(status_desc)  \
        (((status_desc)->lro & 0x80) >> 7)
-#define netxen_get_sts_port(status_desc)        \
+#define netxen_get_sts_port(sts_data)   \
-        (le64_to_cpu((status_desc)->status_desc_data) & 0x0F)
+        ((sts_data) & 0x0F)
-#define netxen_get_sts_status(status_desc)      \
+#define netxen_get_sts_status(sts_data) \
-        ((le64_to_cpu((status_desc)->status_desc_data) >> 4) & 0x0F)
+        (((sts_data) >> 4) & 0x0F)
-#define netxen_get_sts_type(status_desc)        \
+#define netxen_get_sts_type(sts_data)   \
-        ((le64_to_cpu((status_desc)->status_desc_data) >> 8) & 0x0F)
+        (((sts_data) >> 8) & 0x0F)
-#define netxen_get_sts_totallength(status_desc) \
+#define netxen_get_sts_totallength(sts_data)    \
-        ((le64_to_cpu((status_desc)->status_desc_data) >> 12) & 0xFFFF)
+        (((sts_data) >> 12) & 0xFFFF)
-#define netxen_get_sts_refhandle(status_desc)   \
+#define netxen_get_sts_refhandle(sts_data)      \
-        ((le64_to_cpu((status_desc)->status_desc_data) >> 28) & 0xFFFF)
+        (((sts_data) >> 28) & 0xFFFF)
-#define netxen_get_sts_prot(status_desc)        \
+#define netxen_get_sts_prot(sts_data)   \
-        ((le64_to_cpu((status_desc)->status_desc_data) >> 44) & 0x0F)
+        (((sts_data) >> 44) & 0x0F)
+#define netxen_get_sts_opcode(sts_data) \
+        (((sts_data) >> 58) & 0x03F)
 #define netxen_get_sts_owner(status_desc)       \
        ((le64_to_cpu((status_desc)->status_desc_data) >> 56) & 0x03)
-#define netxen_get_sts_opcode(status_desc)      \
+#define netxen_set_sts_owner(status_desc, val)  { \
-        ((le64_to_cpu((status_desc)->status_desc_data) >> 58) & 0x03F)
+        (status_desc)->status_desc_data = \
+                ((status_desc)->status_desc_data & \
-#define netxen_clear_sts_owner(status_desc)     \
+                ~cpu_to_le64(0x3ULL << 56)) | \
-        ((status_desc)->status_desc_data &=     \
+                cpu_to_le64((u64)((val) & 0x3) << 56); \
-        ~cpu_to_le64(((unsigned long long)3) << 56 ))
+}
-#define netxen_set_sts_owner(status_desc, val)  \
-        ((status_desc)->status_desc_data |=     \
-        cpu_to_le64(((unsigned long long)((val) & 0x3)) << 56 ))
 struct status_desc {
        /* Bit pattern: 0-3 port, 4-7 status, 8-11 type, 12-27 total_length
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 37589265297e..485ff9398910 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -1070,16 +1070,17 @@ netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
 {
        struct pci_dev *pdev = adapter->pdev;
        struct net_device *netdev = adapter->netdev;
-        int index = netxen_get_sts_refhandle(desc);
+        u64 sts_data = le64_to_cpu(desc->status_desc_data);
+        int index = netxen_get_sts_refhandle(sts_data);
        struct netxen_recv_context *recv_ctx = &(adapter->recv_ctx[ctxid]);
        struct netxen_rx_buffer *buffer;
        struct sk_buff *skb;
-        u32 length = netxen_get_sts_totallength(desc);
+        u32 length = netxen_get_sts_totallength(sts_data);
        u32 desc_ctx;
        struct netxen_rcv_desc_ctx *rcv_desc;
        int ret;
-        desc_ctx = netxen_get_sts_type(desc);
+        desc_ctx = netxen_get_sts_type(sts_data);
        if (unlikely(desc_ctx >= NUM_RCV_DESC_RINGS)) {
                printk("%s: %s Bad Rcv descriptor ring\n",
                       netxen_nic_driver_name, netdev->name);
@@ -1119,7 +1120,7 @@ netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
        skb = (struct sk_buff *)buffer->skb;
        if (likely(adapter->rx_csum &&
-                                netxen_get_sts_status(desc) == STATUS_CKSUM_OK)) {
+                                netxen_get_sts_status(sts_data) == STATUS_CKSUM_OK)) {
                adapter->stats.csummed++;
                skb->ip_summed = CHECKSUM_UNNECESSARY;
        } else
@@ -1209,7 +1210,6 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
                        break;
                }
                netxen_process_rcv(adapter, ctxid, desc);
-                netxen_clear_sts_owner(desc);
                netxen_set_sts_owner(desc, STATUS_OWNER_PHANTOM);
                consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1);
                count++;
@@ -1248,7 +1248,6 @@ int netxen_process_cmd_ring(unsigned long data)
        struct pci_dev *pdev;
        struct netxen_skb_frag *frag;
        u32 i;
-        struct sk_buff *skb = NULL;
        int done;
        spin_lock(&adapter->tx_lock);
@@ -1278,9 +1277,8 @@ int netxen_process_cmd_ring(unsigned long data)
        while ((last_consumer != consumer) && (count1 < MAX_STATUS_HANDLE)) {
                buffer = &adapter->cmd_buf_arr[last_consumer];
                pdev = adapter->pdev;
-                frag = &buffer->frag_array[0];
+                if (buffer->skb) {
-                skb = buffer->skb;
+                        frag = &buffer->frag_array[0];
-                if (skb && (cmpxchg(&buffer->skb, skb, 0) == skb)) {
                        pci_unmap_single(pdev, frag->dma, frag->length,
                                         PCI_DMA_TODEVICE);
                        frag->dma = 0ULL;
@@ -1293,8 +1291,8 @@ int netxen_process_cmd_ring(unsigned long data)
                        }
                        adapter->stats.skbfreed++;
-                        dev_kfree_skb_any(skb);
+                        dev_kfree_skb_any(buffer->skb);
-                        skb = NULL;
+                        buffer->skb = NULL;
                } else if (adapter->proc_cmd_buf_counter == 1) {
                        adapter->stats.txnullskb++;
                }
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index a80f0cd6b528..263b55e36c7a 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -732,11 +732,6 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
        unregister_netdev(netdev);
-        if (adapter->stop_port)
-                adapter->stop_port(adapter);
-        netxen_nic_disable_int(adapter);
        if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) {
                init_firmware_done++;
                netxen_free_hw_resources(adapter);
@@ -919,6 +914,9 @@ static int netxen_nic_close(struct net_device *netdev)
        netif_stop_queue(netdev);
        napi_disable(&adapter->napi);
+        if (adapter->stop_port)
+                adapter->stop_port(adapter);
        netxen_nic_disable_int(adapter);
        cmd_buff = adapter->cmd_buf_arr;
@@ -996,28 +994,6 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                return NETDEV_TX_OK;
        }
-        /*
-         * Everything is set up. Now, we just need to transmit it out.
-         * Note that we have to copy the contents of buffer over to
-         * right place. Later on, this can be optimized out by de-coupling the
-         * producer index from the buffer index.
-         */
-      retry_getting_window:
-        spin_lock_bh(&adapter->tx_lock);
-        if (adapter->total_threads >= MAX_XMIT_PRODUCERS) {
-                spin_unlock_bh(&adapter->tx_lock);
-                /*
-                 * Yield CPU
-                 */
-                if (!in_atomic())
-                        schedule();
-                else {
-                        for (i = 0; i < 20; i++)
-                                cpu_relax();    /*This a nop instr on i386 */
-                }
-                goto retry_getting_window;
-        }
-        local_producer = adapter->cmd_producer;
        /* There 4 fragments per descriptor */
        no_of_desc = (frag_count + 3) >> 2;
        if (netdev->features & NETIF_F_TSO) {
@@ -1031,16 +1007,19 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                        }
                }
        }
+        spin_lock_bh(&adapter->tx_lock);
+        if (adapter->total_threads >= MAX_XMIT_PRODUCERS) {
+                goto out_requeue;
+        }
+        local_producer = adapter->cmd_producer;
        k = adapter->cmd_producer;
        max_tx_desc_count = adapter->max_tx_desc_count;
        last_cmd_consumer = adapter->last_cmd_consumer;
        if ((k + no_of_desc) >=
            ((last_cmd_consumer <= k) ? last_cmd_consumer + max_tx_desc_count :
             last_cmd_consumer)) {
-                netif_stop_queue(netdev);
+                goto out_requeue;
-                adapter->flags |= NETXEN_NETDEV_STATUS;
-                spin_unlock_bh(&adapter->tx_lock);
-                return NETDEV_TX_BUSY;
        }
        k = get_index_range(k, max_tx_desc_count, no_of_desc);
        adapter->cmd_producer = k;
@@ -1093,6 +1072,8 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                                                  adapter->max_tx_desc_count);
                        hwdesc = &hw->cmd_desc_head[producer];
                        memset(hwdesc, 0, sizeof(struct cmd_desc_type0));
+                        pbuf = &adapter->cmd_buf_arr[producer];
+                        pbuf->skb = NULL;
                }
                frag = &skb_shinfo(skb)->frags[i - 1];
                len = frag->size;
@@ -1148,6 +1129,8 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                }
                /* copy the MAC/IP/TCP headers to the cmd descriptor list */
                hwdesc = &hw->cmd_desc_head[producer];
+                pbuf = &adapter->cmd_buf_arr[producer];
+                pbuf->skb = NULL;
                /* copy the first 64 bytes */
                memcpy(((void *)hwdesc) + 2,
@@ -1156,6 +1139,8 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                if (more_hdr) {
                        hwdesc = &hw->cmd_desc_head[producer];
+                        pbuf = &adapter->cmd_buf_arr[producer];
+                        pbuf->skb = NULL;
                        /* copy the next 64 bytes - should be enough except
                         * for pathological case
                         */
@@ -1167,16 +1152,8 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                }
        }
-        i = netxen_get_cmd_desc_totallength(&hw->cmd_desc_head[saved_producer]);
-        hw->cmd_desc_head[saved_producer].flags_opcode =
-                cpu_to_le16(hw->cmd_desc_head[saved_producer].flags_opcode);
-        hw->cmd_desc_head[saved_producer].num_of_buffers_total_length =
-          cpu_to_le32(hw->cmd_desc_head[saved_producer].
-                          num_of_buffers_total_length);
        spin_lock_bh(&adapter->tx_lock);
-        adapter->stats.txbytes += i;
+        adapter->stats.txbytes += skb->len;
        /* Code to update the adapter considering how many producer threads
           are currently working */
@@ -1189,14 +1166,17 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
        }
        adapter->stats.xmitfinished++;
-        spin_unlock_bh(&adapter->tx_lock);
        netdev->trans_start = jiffies;
-        DPRINTK(INFO, "wrote CMD producer %x to phantom\n", producer);
+        spin_unlock_bh(&adapter->tx_lock);
-        DPRINTK(INFO, "Done. Send\n");
        return NETDEV_TX_OK;
+out_requeue:
+        netif_stop_queue(netdev);
+        adapter->flags |= NETXEN_NETDEV_STATUS;
+        spin_unlock_bh(&adapter->tx_lock);
+        return NETDEV_TX_BUSY;
 }
 static void netxen_watchdog(unsigned long v)
@@ -1321,7 +1301,7 @@ static int netxen_nic_poll(struct napi_struct *napi, int budget)
                                                     budget / MAX_RCV_CTX);
        }
-        if (work_done >= budget && netxen_nic_rx_has_work(adapter) != 0)
+        if (work_done >= budget)
                done = 0;
        if (netxen_process_cmd_ring((unsigned long)adapter) == 0)
diff --git a/drivers/net/netxen/netxen_nic_niu.c b/drivers/net/netxen/netxen_nic_niu.c
index 5b9e1b300fab..d04ecb77d08c 100644
--- a/drivers/net/netxen/netxen_nic_niu.c
+++ b/drivers/net/netxen/netxen_nic_niu.c
@@ -736,12 +736,12 @@ int netxen_niu_disable_xg_port(struct netxen_adapter *adapter)
        __u32 mac_cfg;
        u32 port = physical_port[adapter->portnum];
-        if (port != 0)
+        if (port > NETXEN_NIU_MAX_XG_PORTS)
                return -EINVAL;
        mac_cfg = 0;
-        netxen_xg_soft_reset(mac_cfg);
+        if (netxen_nic_hw_write_wx(adapter,
-        if (netxen_nic_hw_write_wx(adapter, NETXEN_NIU_XGE_CONFIG_0,
+                NETXEN_NIU_XGE_CONFIG_0 + (0x10000 * port), &mac_cfg, 4))
-                                   &mac_cfg, 4))
                return -EIO;
        return 0;
 }
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index abfc61c3a38c..5f6beabf2d17 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -33,8 +33,8 @@
 #define DRV_MODULE_NAME         "niu"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "0.5"
+#define DRV_MODULE_VERSION      "0.6"
-#define DRV_MODULE_RELDATE      "October 5, 2007"
+#define DRV_MODULE_RELDATE      "January 5, 2008"
 static char version[] __devinitdata =
        DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
@@ -801,22 +801,90 @@ static int bcm8704_init_user_dev3(struct niu *np)
        return 0;
 }
-static int xcvr_init_10g(struct niu *np)
+static int mrvl88x2011_act_led(struct niu *np, int val)
+{
+        int     err;
+        err  = mdio_read(np, np->phy_addr, MRVL88X2011_USER_DEV2_ADDR,
+                MRVL88X2011_LED_8_TO_11_CTL);
+        if (err < 0)
+                return err;
+        err &= ~MRVL88X2011_LED(MRVL88X2011_LED_ACT,MRVL88X2011_LED_CTL_MASK);
+        err |=  MRVL88X2011_LED(MRVL88X2011_LED_ACT,val);
+        return mdio_write(np, np->phy_addr, MRVL88X2011_USER_DEV2_ADDR,
+                          MRVL88X2011_LED_8_TO_11_CTL, err);
+}
+static int mrvl88x2011_led_blink_rate(struct niu *np, int rate)
+{
+        int     err;
+        err = mdio_read(np, np->phy_addr, MRVL88X2011_USER_DEV2_ADDR,
+                        MRVL88X2011_LED_BLINK_CTL);
+        if (err >= 0) {
+                err &= ~MRVL88X2011_LED_BLKRATE_MASK;
+                err |= (rate << 4);
+                err = mdio_write(np, np->phy_addr, MRVL88X2011_USER_DEV2_ADDR,
+                                 MRVL88X2011_LED_BLINK_CTL, err);
+        }
+        return err;
+}
+static int xcvr_init_10g_mrvl88x2011(struct niu *np)
+{
+        int     err;
+        /* Set LED functions */
+        err = mrvl88x2011_led_blink_rate(np, MRVL88X2011_LED_BLKRATE_134MS);
+        if (err)
+                return err;
+        /* led activity */
+        err = mrvl88x2011_act_led(np, MRVL88X2011_LED_CTL_OFF);
+        if (err)
+                return err;
+        err = mdio_read(np, np->phy_addr, MRVL88X2011_USER_DEV3_ADDR,
+                        MRVL88X2011_GENERAL_CTL);
+        if (err < 0)
+                return err;
+        err |= MRVL88X2011_ENA_XFPREFCLK;
+        err = mdio_write(np, np->phy_addr, MRVL88X2011_USER_DEV3_ADDR,
+                         MRVL88X2011_GENERAL_CTL, err);
+        if (err < 0)
+                return err;
+        err = mdio_read(np, np->phy_addr, MRVL88X2011_USER_DEV1_ADDR,
+                        MRVL88X2011_PMA_PMD_CTL_1);
+        if (err < 0)
+                return err;
+        if (np->link_config.loopback_mode == LOOPBACK_MAC)
+                err |= MRVL88X2011_LOOPBACK;
+        else
+                err &= ~MRVL88X2011_LOOPBACK;
+        err = mdio_write(np, np->phy_addr, MRVL88X2011_USER_DEV1_ADDR,
+                         MRVL88X2011_PMA_PMD_CTL_1, err);
+        if (err < 0)
+                return err;
+        /* Enable PMD  */
+        return mdio_write(np, np->phy_addr, MRVL88X2011_USER_DEV1_ADDR,
+                          MRVL88X2011_10G_PMD_TX_DIS, MRVL88X2011_ENA_PMDTX);
+}
+static int xcvr_init_10g_bcm8704(struct niu *np)
 {
        struct niu_link_config *lp = &np->link_config;
        u16 analog_stat0, tx_alarm_status;
        int err;
-        u64 val;
-        val = nr64_mac(XMAC_CONFIG);
-        val &= ~XMAC_CONFIG_LED_POLARITY;
-        val |= XMAC_CONFIG_FORCE_LED_ON;
-        nw64_mac(XMAC_CONFIG, val);
-        /* XXX shared resource, lock parent XXX */
-        val = nr64(MIF_CONFIG);
-        val |= MIF_CONFIG_INDIRECT_MODE;
-        nw64(MIF_CONFIG, val);
        err = bcm8704_reset(np);
        if (err)
@@ -896,6 +964,38 @@ static int xcvr_init_10g(struct niu *np)
        return 0;
 }
+static int xcvr_init_10g(struct niu *np)
+{
+        int phy_id, err;
+        u64 val;
+        val = nr64_mac(XMAC_CONFIG);
+        val &= ~XMAC_CONFIG_LED_POLARITY;
+        val |= XMAC_CONFIG_FORCE_LED_ON;
+        nw64_mac(XMAC_CONFIG, val);
+        /* XXX shared resource, lock parent XXX */
+        val = nr64(MIF_CONFIG);
+        val |= MIF_CONFIG_INDIRECT_MODE;
+        nw64(MIF_CONFIG, val);
+        phy_id = phy_decode(np->parent->port_phy, np->port);
+        phy_id = np->parent->phy_probe_info.phy_id[phy_id][np->port];
+        /* handle different phy types */
+        switch (phy_id & NIU_PHY_ID_MASK) {
+        case NIU_PHY_ID_MRVL88X2011:
+                err = xcvr_init_10g_mrvl88x2011(np);
+                break;
+        default: /* bcom 8704 */
+                err = xcvr_init_10g_bcm8704(np);
+                break;
+        }
+        return 0;
+}
 static int mii_reset(struct niu *np)
 {
        int limit, err;
@@ -1082,19 +1182,68 @@ static int niu_link_status_common(struct niu *np, int link_up)
        return 0;
 }
-static int link_status_10g(struct niu *np, int *link_up_p)
+static int link_status_10g_mrvl(struct niu *np, int *link_up_p)
 {
-        unsigned long flags;
+        int err, link_up, pma_status, pcs_status;
-        int err, link_up;
        link_up = 0;
-        spin_lock_irqsave(&np->lock, flags);
+        err = mdio_read(np, np->phy_addr, MRVL88X2011_USER_DEV1_ADDR,
+                        MRVL88X2011_10G_PMD_STATUS_2);
+        if (err < 0)
+                goto out;
-        err = -EINVAL;
+        /* Check PMA/PMD Register: 1.0001.2 == 1 */
-        if (np->link_config.loopback_mode != LOOPBACK_DISABLED)
+        err = mdio_read(np, np->phy_addr, MRVL88X2011_USER_DEV1_ADDR,
+                        MRVL88X2011_PMA_PMD_STATUS_1);
+        if (err < 0)
+                goto out;
+        pma_status = ((err & MRVL88X2011_LNK_STATUS_OK) ? 1 : 0);
+        /* Check PMC Register : 3.0001.2 == 1: read twice */
+        err = mdio_read(np, np->phy_addr, MRVL88X2011_USER_DEV3_ADDR,
+                        MRVL88X2011_PMA_PMD_STATUS_1);
+        if (err < 0)
+                goto out;
+        err = mdio_read(np, np->phy_addr, MRVL88X2011_USER_DEV3_ADDR,
+                        MRVL88X2011_PMA_PMD_STATUS_1);
+        if (err < 0)
                goto out;
+        pcs_status = ((err & MRVL88X2011_LNK_STATUS_OK) ? 1 : 0);
+        /* Check XGXS Register : 4.0018.[0-3,12] */
+        err = mdio_read(np, np->phy_addr, MRVL88X2011_USER_DEV4_ADDR,
+                        MRVL88X2011_10G_XGXS_LANE_STAT);
+        if (err < 0)
+                goto out;
+        if (err == (PHYXS_XGXS_LANE_STAT_ALINGED | PHYXS_XGXS_LANE_STAT_LANE3 |
+                    PHYXS_XGXS_LANE_STAT_LANE2 | PHYXS_XGXS_LANE_STAT_LANE1 |
+                    PHYXS_XGXS_LANE_STAT_LANE0 | PHYXS_XGXS_LANE_STAT_MAGIC |
+                    0x800))
+                link_up = (pma_status && pcs_status) ? 1 : 0;
+        np->link_config.active_speed = SPEED_10000;
+        np->link_config.active_duplex = DUPLEX_FULL;
+        err = 0;
+out:
+        mrvl88x2011_act_led(np, (link_up ?
+                                 MRVL88X2011_LED_CTL_PCS_ACT :
+                                 MRVL88X2011_LED_CTL_OFF));
+        *link_up_p = link_up;
+        return err;
+}
+static int link_status_10g_bcom(struct niu *np, int *link_up_p)
+{
+        int err, link_up;
+        link_up = 0;
        err = mdio_read(np, np->phy_addr, BCM8704_PMA_PMD_DEV_ADDR,
                        BCM8704_PMD_RCV_SIGDET);
        if (err < 0)
@@ -1134,14 +1283,43 @@ static int link_status_10g(struct niu *np, int *link_up_p)
        err = 0;
 out:
+        *link_up_p = link_up;
+        return err;
+}
+static int link_status_10g(struct niu *np, int *link_up_p)
+{
+        unsigned long flags;
+        int err = -EINVAL;
+        spin_lock_irqsave(&np->lock, flags);
+        if (np->link_config.loopback_mode == LOOPBACK_DISABLED) {
+                int phy_id;
+                phy_id = phy_decode(np->parent->port_phy, np->port);
+                phy_id = np->parent->phy_probe_info.phy_id[phy_id][np->port];
+                /* handle different phy types */
+                switch (phy_id & NIU_PHY_ID_MASK) {
+                case NIU_PHY_ID_MRVL88X2011:
+                        err = link_status_10g_mrvl(np, link_up_p);
+                        break;
+                default: /* bcom 8704 */
+                        err = link_status_10g_bcom(np, link_up_p);
+                        break;
+                }
+        }
        spin_unlock_irqrestore(&np->lock, flags);
-        *link_up_p = link_up;
        return err;
 }
 static int link_status_1g(struct niu *np, int *link_up_p)
 {
+        struct niu_link_config *lp = &np->link_config;
        u16 current_speed, bmsr;
        unsigned long flags;
        u8 current_duplex;
@@ -1209,6 +1387,8 @@ static int link_status_1g(struct niu *np, int *link_up_p)
                                link_up = 0;
                }
        }
+        lp->active_speed = current_speed;
+        lp->active_duplex = current_duplex;
        err = 0;
 out:
@@ -2241,6 +2421,8 @@ static int niu_process_rx_pkt(struct niu *np, struct rx_ring_info *rp)
        skb->protocol = eth_type_trans(skb, np->dev);
        netif_receive_skb(skb);
+        np->dev->last_rx = jiffies;
        return num_rcr;
 }
@@ -2508,15 +2690,19 @@ static int niu_rx_error(struct niu *np, struct rx_ring_info *rp)
        u64 stat = nr64(RX_DMA_CTL_STAT(rp->rx_channel));
        int err = 0;
-        dev_err(np->device, PFX "%s: RX channel %u error, stat[%llx]\n",
-                np->dev->name, rp->rx_channel, (unsigned long long) stat);
-        niu_log_rxchan_errors(np, rp, stat);
        if (stat & (RX_DMA_CTL_STAT_CHAN_FATAL |
                    RX_DMA_CTL_STAT_PORT_FATAL))
                err = -EINVAL;
+        if (err) {
+                dev_err(np->device, PFX "%s: RX channel %u error, stat[%llx]\n",
+                        np->dev->name, rp->rx_channel,
+                        (unsigned long long) stat);
+                niu_log_rxchan_errors(np, rp, stat);
+        }
        nw64(RX_DMA_CTL_STAT(rp->rx_channel),
             stat & RX_DMA_CTL_WRITE_CLEAR_ERRS);
@@ -2749,13 +2935,16 @@ static int niu_device_error(struct niu *np)
        return -ENODEV;
 }
-static int niu_slowpath_interrupt(struct niu *np, struct niu_ldg *lp)
+static int niu_slowpath_interrupt(struct niu *np, struct niu_ldg *lp,
+                              u64 v0, u64 v1, u64 v2)
 {
-        u64 v0 = lp->v0;
-        u64 v1 = lp->v1;
-        u64 v2 = lp->v2;
        int i, err = 0;
+        lp->v0 = v0;
+        lp->v1 = v1;
+        lp->v2 = v2;
        if (v1 & 0x00000000ffffffffULL) {
                u32 rx_vec = (v1 & 0xffffffff);
@@ -2764,8 +2953,13 @@ static int niu_slowpath_interrupt(struct niu *np, struct niu_ldg *lp)
                        if (rx_vec & (1 << rp->rx_channel)) {
                                int r = niu_rx_error(np, rp);
-                                if (r)
+                                if (r) {
                                        err = r;
+                                } else {
+                                        if (!v0)
+                                                nw64(RX_DMA_CTL_STAT(rp->rx_channel),
+                                                     RX_DMA_CTL_STAT_MEX);
+                                }
                        }
                }
        }
@@ -2803,7 +2997,7 @@ static int niu_slowpath_interrupt(struct niu *np, struct niu_ldg *lp)
        if (err)
                niu_enable_interrupts(np, 0);
-        return -EINVAL;
+        return err;
 }
 static void niu_rxchan_intr(struct niu *np, struct rx_ring_info *rp,
@@ -2905,7 +3099,7 @@ static irqreturn_t niu_interrupt(int irq, void *dev_id)
        }
        if (unlikely((v0 & ((u64)1 << LDN_MIF)) || v1 || v2)) {
-                int err = niu_slowpath_interrupt(np, lp);
+                int err = niu_slowpath_interrupt(np, lp, v0, v1, v2);
                if (err)
                        goto out;
        }
@@ -5194,7 +5388,8 @@ static int niu_start_xmit(struct sk_buff *skb, struct net_device *dev)
                }
                kfree_skb(skb);
                skb = skb_new;
-        }
+        } else
+                skb_orphan(skb);
        align = ((unsigned long) skb->data & (16 - 1));
        headroom = align + sizeof(struct tx_pkt_hdr);
@@ -6282,7 +6477,8 @@ static int __devinit phy_record(struct niu_parent *parent,
        if (dev_id_1 < 0 || dev_id_2 < 0)
                return 0;
        if (type == PHY_TYPE_PMA_PMD || type == PHY_TYPE_PCS) {
-                if ((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM8704)
+                if (((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM8704) &&
+                    ((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_MRVL88X2011))
                        return 0;
        } else {
                if ((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM5464R)
diff --git a/drivers/net/niu.h b/drivers/net/niu.h
index 10e3f111b6d5..0e8626adc573 100644
--- a/drivers/net/niu.h
+++ b/drivers/net/niu.h
@@ -2538,6 +2538,39 @@ struct fcram_hash_ipv6 {
 #define NIU_PHY_ID_MASK                 0xfffff0f0
 #define NIU_PHY_ID_BCM8704              0x00206030
 #define NIU_PHY_ID_BCM5464R             0x002060b0
+#define NIU_PHY_ID_MRVL88X2011          0x01410020
+/* MRVL88X2011 register addresses */
+#define MRVL88X2011_USER_DEV1_ADDR      1
+#define MRVL88X2011_USER_DEV2_ADDR      2
+#define MRVL88X2011_USER_DEV3_ADDR      3
+#define MRVL88X2011_USER_DEV4_ADDR      4
+#define MRVL88X2011_PMA_PMD_CTL_1       0x0000
+#define MRVL88X2011_PMA_PMD_STATUS_1    0x0001
+#define MRVL88X2011_10G_PMD_STATUS_2    0x0008
+#define MRVL88X2011_10G_PMD_TX_DIS      0x0009
+#define MRVL88X2011_10G_XGXS_LANE_STAT  0x0018
+#define MRVL88X2011_GENERAL_CTL         0x8300
+#define MRVL88X2011_LED_BLINK_CTL       0x8303
+#define MRVL88X2011_LED_8_TO_11_CTL     0x8306
+/* MRVL88X2011 register control */
+#define MRVL88X2011_ENA_XFPREFCLK       0x0001
+#define MRVL88X2011_ENA_PMDTX           0x0000
+#define MRVL88X2011_LOOPBACK            0x1
+#define MRVL88X2011_LED_ACT             0x1
+#define MRVL88X2011_LNK_STATUS_OK       0x4
+#define MRVL88X2011_LED_BLKRATE_MASK    0x70
+#define MRVL88X2011_LED_BLKRATE_034MS   0x0
+#define MRVL88X2011_LED_BLKRATE_067MS   0x1
+#define MRVL88X2011_LED_BLKRATE_134MS   0x2
+#define MRVL88X2011_LED_BLKRATE_269MS   0x3
+#define MRVL88X2011_LED_BLKRATE_538MS   0x4
+#define MRVL88X2011_LED_CTL_OFF         0x0
+#define MRVL88X2011_LED_CTL_PCS_ACT     0x5
+#define MRVL88X2011_LED_CTL_MASK        0x7
+#define MRVL88X2011_LED(n,v)            ((v)<<((n)*4))
+#define MRVL88X2011_LED_STAT(n,v)       ((v)>>((n)*4))
 #define BCM8704_PMA_PMD_DEV_ADDR        1
 #define BCM8704_PCS_DEV_ADDR            2
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 288177716a49..36a7ba3134ce 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -187,14 +187,16 @@ enum Window1 {
 enum Window3 {                  /* Window 3: MAC/config bits. */
        Wn3_Config=0, Wn3_MAC_Ctrl=6, Wn3_Options=8,
 };
-union wn3_config {
+enum wn3_config {
-        int i;
+        Ram_size = 7,
-        struct w3_config_fields {
+        Ram_width = 8,
-                unsigned int ram_size:3, ram_width:1, ram_speed:2, rom_size:2;
+        Ram_speed = 0x30,
-                int pad8:8;
+        Rom_size = 0xc0,
-                unsigned int ram_split:2, pad18:2, xcvr:3, pad21:1, autoselect:1;
+        Ram_split_shift = 16,
-                int pad24:7;
+        Ram_split = 3 << Ram_split_shift,
-        } u;
+        Xcvr_shift = 20,
+        Xcvr = 7 << Xcvr_shift,
+        Autoselect = 0x1000000,
 };
 enum Window4 {          /* Window 4: Xcvr/media bits. */
@@ -342,7 +344,7 @@ static int tc574_config(struct pcmcia_device *link)
        kio_addr_t ioaddr;
        __be16 *phys_addr;
        char *cardname;
-        union wn3_config config;
+        __u32 config;
        DECLARE_MAC_BUF(mac);
        phys_addr = (__be16 *)dev->dev_addr;
@@ -401,9 +403,9 @@ static int tc574_config(struct pcmcia_device *link)
                outw(0<<11, ioaddr + RunnerRdCtrl);
                printk(KERN_INFO "  ASIC rev %d,", mcr>>3);
                EL3WINDOW(3);
-                config.i = inl(ioaddr + Wn3_Config);
+                config = inl(ioaddr + Wn3_Config);
-                lp->default_media = config.u.xcvr;
+                lp->default_media = (config & Xcvr) >> Xcvr_shift;
-                lp->autoselect = config.u.autoselect;
+                lp->autoselect = config & Autoselect ? 1 : 0;
        }
        init_timer(&lp->media);
@@ -464,8 +466,9 @@ static int tc574_config(struct pcmcia_device *link)
               dev->name, cardname, dev->base_addr, dev->irq,
               print_mac(mac, dev->dev_addr));
        printk(" %dK FIFO split %s Rx:Tx, %sMII interface.\n",
-                   8 << config.u.ram_size, ram_split[config.u.ram_split],
+                   8 << config & Ram_size,
-                   config.u.autoselect ? "autoselect " : "");
+                   ram_split[(config & Ram_split) >> Ram_split_shift],
+                   config & Autoselect ? "autoselect " : "");
        return 0;
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index ff92aca0a7b3..90498ffe26f2 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -455,9 +455,14 @@ static void pcnet32_netif_start(struct net_device *dev)
 {
 #ifdef CONFIG_PCNET32_NAPI
        struct pcnet32_private *lp = netdev_priv(dev);
+        ulong ioaddr = dev->base_addr;
+        u16 val;
 #endif
        netif_wake_queue(dev);
 #ifdef CONFIG_PCNET32_NAPI
+        val = lp->a.read_csr(ioaddr, CSR3);
+        val &= 0x00ff;
+        lp->a.write_csr(ioaddr, CSR3, val);
        napi_enable(&lp->napi);
 #endif
 }
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index a5791114b7bd..cf0774de6c41 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -2320,14 +2320,9 @@ static int ql_poll(struct napi_struct *napi, int budget)
        unsigned long hw_flags;
        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
-        if (!netif_carrier_ok(ndev))
-                goto quit_polling;
        ql_tx_rx_clean(qdev, &tx_cleaned, &rx_cleaned, budget);
-        if (tx_cleaned + rx_cleaned != budget ||
+        if (tx_cleaned + rx_cleaned != budget) {
-            !netif_running(ndev)) {
-quit_polling:
                spin_lock_irqsave(&qdev->hw_lock, hw_flags);
                __netif_rx_complete(ndev, napi);
                ql_update_small_bufq_prod_index(qdev);
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 5863190894cc..3acfeeabdee1 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2002,7 +2002,7 @@ static void rtl8169_set_magic_reg(void __iomem *ioaddr, unsigned mac_version)
        u32 clk;
        clk = RTL_R8(Config2) & PCI_Clock_66MHz;
-        for (i = 0; i < ARRAY_SIZE(cfg2_info); i++) {
+        for (i = 0; i < ARRAY_SIZE(cfg2_info); i++, p++) {
                if ((p->mac_version == mac_version) && (p->clk == clk)) {
                        RTL_W32(0x7c, p->val);
                        break;
@@ -2398,6 +2398,8 @@ static void rtl8169_wait_for_quiescence(struct net_device *dev)
        rtl8169_irq_mask_and_ack(ioaddr);
 #ifdef CONFIG_R8169_NAPI
+        tp->intr_mask = 0xffff;
+        RTL_W16(IntrMask, tp->intr_event);
        napi_enable(&tp->napi);
 #endif
 }
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 9d80f1cf73ac..f2ba944e035e 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -84,7 +84,7 @@
 #include "s2io.h"
 #include "s2io-regs.h"
-#define DRV_VERSION "2.0.26.10"
+#define DRV_VERSION "2.0.26.17"
 /* S2io Driver name & version. */
 static char s2io_driver_name[] = "Neterion";
@@ -2704,9 +2704,6 @@ static int s2io_poll(struct napi_struct *napi, int budget)
        struct XENA_dev_config __iomem *bar0 = nic->bar0;
        int i;
-        if (!is_s2io_card_up(nic))
-                return 0;
        mac_control = &nic->mac_control;
        config = &nic->config;
@@ -3851,8 +3848,6 @@ static int s2io_open(struct net_device *dev)
        netif_carrier_off(dev);
        sp->last_link_state = 0;
-        napi_enable(&sp->napi);
        if (sp->config.intr_type == MSI_X) {
                int ret = s2io_enable_msi_x(sp);
@@ -3895,7 +3890,6 @@ static int s2io_open(struct net_device *dev)
        return 0;
 hw_init_failed:
-        napi_disable(&sp->napi);
        if (sp->config.intr_type == MSI_X) {
                if (sp->entries) {
                        kfree(sp->entries);
@@ -3935,7 +3929,6 @@ static int s2io_close(struct net_device *dev)
                return 0;
        netif_stop_queue(dev);
-        napi_disable(&sp->napi);
        /* Reset card, kill tasklet and free Tx and Rx buffers. */
        s2io_card_down(sp);
@@ -6799,6 +6792,8 @@ static void do_s2io_card_down(struct s2io_nic * sp, int do_io)
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
        unsigned long flags;
        register u64 val64 = 0;
+        struct config_param *config;
+        config = &sp->config;
        if (!is_s2io_card_up(sp))
                return;
@@ -6810,6 +6805,10 @@ static void do_s2io_card_down(struct s2io_nic * sp, int do_io)
        }
        clear_bit(__S2IO_STATE_CARD_UP, &sp->state);
+        /* Disable napi */
+        if (config->napi)
+                napi_disable(&sp->napi);
        /* disable Tx and Rx traffic on the NIC */
        if (do_io)
                stop_nic(sp);
@@ -6903,6 +6902,11 @@ static int s2io_card_up(struct s2io_nic * sp)
                DBG_PRINT(INFO_DBG, "Buf in ring:%d is %d:\n", i,
                          atomic_read(&sp->rx_bufs_left[i]));
        }
+        /* Initialise napi */
+        if (config->napi)
+                napi_enable(&sp->napi);
        /* Maintain the state prior to the open */
        if (sp->promisc_flg)
                sp->promisc_flg = 0;
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index a74fc11a6482..bc15940ce1bc 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -944,7 +944,6 @@ static void tx_init(struct sky2_port *sky2)
        le = get_tx_le(sky2);
        le->addr = 0;
        le->opcode = OP_ADDR64 | HW_OWNER;
-        sky2->tx_addr64 = 0;
 }
 static inline struct tx_ring_info *tx_le_re(struct sky2_port *sky2,
@@ -978,13 +977,11 @@ static void sky2_rx_add(struct sky2_port *sky2,  u8 op,
                        dma_addr_t map, unsigned len)
 {
        struct sky2_rx_le *le;
-        u32 hi = upper_32_bits(map);
-        if (sky2->rx_addr64 != hi) {
+        if (sizeof(dma_addr_t) > sizeof(u32)) {
                le = sky2_next_rx(sky2);
-                le->addr = cpu_to_le32(hi);
+                le->addr = cpu_to_le32(upper_32_bits(map));
                le->opcode = OP_ADDR64 | HW_OWNER;
-                sky2->rx_addr64 = upper_32_bits(map + len);
        }
        le = sky2_next_rx(sky2);
@@ -1168,6 +1165,7 @@ static void sky2_vlan_rx_register(struct net_device *dev, struct vlan_group *grp
                             TX_VLAN_TAG_OFF);
        }
+        sky2_read32(hw, B0_Y2_SP_LISR);
        napi_enable(&hw->napi);
        netif_tx_unlock_bh(dev);
 }
@@ -1479,7 +1477,6 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
        struct tx_ring_info *re;
        unsigned i, len;
        dma_addr_t mapping;
-        u32 addr64;
        u16 mss;
        u8 ctrl;
@@ -1492,15 +1489,12 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
        len = skb_headlen(skb);
        mapping = pci_map_single(hw->pdev, skb->data, len, PCI_DMA_TODEVICE);
-        addr64 = upper_32_bits(mapping);
-        /* Send high bits if changed or crosses boundary */
+        /* Send high bits if needed */
-        if (addr64 != sky2->tx_addr64 ||
+        if (sizeof(dma_addr_t) > sizeof(u32)) {
-            upper_32_bits(mapping + len) != sky2->tx_addr64) {
                le = get_tx_le(sky2);
-                le->addr = cpu_to_le32(addr64);
+                le->addr = cpu_to_le32(upper_32_bits(mapping));
                le->opcode = OP_ADDR64 | HW_OWNER;
-                sky2->tx_addr64 = upper_32_bits(mapping + len);
        }
        /* Check for TCP Segmentation Offload */
@@ -1581,13 +1575,12 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
                mapping = pci_map_page(hw->pdev, frag->page, frag->page_offset,
                                       frag->size, PCI_DMA_TODEVICE);
-                addr64 = upper_32_bits(mapping);
-                if (addr64 != sky2->tx_addr64) {
+                if (sizeof(dma_addr_t) > sizeof(u32)) {
                        le = get_tx_le(sky2);
-                        le->addr = cpu_to_le32(addr64);
+                        le->addr = cpu_to_le32(upper_32_bits(mapping));
                        le->ctrl = 0;
                        le->opcode = OP_ADDR64 | HW_OWNER;
-                        sky2->tx_addr64 = addr64;
                }
                le = get_tx_le(sky2);
@@ -2043,6 +2036,7 @@ static int sky2_change_mtu(struct net_device *dev, int new_mtu)
        err = sky2_rx_start(sky2);
        sky2_write32(hw, B0_IMSK, imask);
+        sky2_read32(hw, B0_Y2_SP_LISR);
        napi_enable(&hw->napi);
        if (err)
@@ -3861,6 +3855,7 @@ static int sky2_debug_show(struct seq_file *seq, void *v)
                   last = sky2_read16(hw, Y2_QADDR(rxqaddr[port], PREF_UNIT_PUT_IDX)),
                   sky2_read16(hw, Y2_QADDR(rxqaddr[port], PREF_UNIT_LAST_IDX)));
+        sky2_read32(hw, B0_Y2_SP_LISR);
        napi_enable(&hw->napi);
        return 0;
 }
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index bc646a47edd2..ffe9b8a50a1b 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -1991,14 +1991,14 @@ struct sky2_port {
        u16                  tx_cons;           /* next le to check */
        u16                  tx_prod;           /* next le to use */
        u16                  tx_next;           /* debug only */
-        u32                  tx_addr64;
        u16                  tx_pending;
        u16                  tx_last_mss;
        u32                  tx_tcpsum;
        struct rx_ring_info  *rx_ring ____cacheline_aligned_in_smp;
        struct sky2_rx_le    *rx_le;
-        u32                  rx_addr64;
        u16                  rx_next;           /* next re to check */
        u16                  rx_put;            /* next le index to use */
        u16                  rx_pending;
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index 41f34bb91cad..6e8b18a3b3cc 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -911,7 +911,7 @@ static int     de4x5_init(struct net_device *dev);
 static int     de4x5_sw_reset(struct net_device *dev);
 static int     de4x5_rx(struct net_device *dev);
 static int     de4x5_tx(struct net_device *dev);
-static int     de4x5_ast(struct net_device *dev);
+static void    de4x5_ast(struct net_device *dev);
 static int     de4x5_txur(struct net_device *dev);
 static int     de4x5_rx_ovfc(struct net_device *dev);
@@ -984,11 +984,9 @@ static int     test_bad_enet(struct net_device *dev, int status);
 static int     an_exception(struct de4x5_private *lp);
 static char    *build_setup_frame(struct net_device *dev, int mode);
 static void    disable_ast(struct net_device *dev);
-static void    enable_ast(struct net_device *dev, u32 time_out);
 static long    de4x5_switch_mac_port(struct net_device *dev);
 static int     gep_rd(struct net_device *dev);
 static void    gep_wr(s32 data, struct net_device *dev);
-static void    timeout(struct net_device *dev, void (*fn)(u_long data), u_long data, u_long msec);
 static void    yawn(struct net_device *dev, int state);
 static void    de4x5_parse_params(struct net_device *dev);
 static void    de4x5_dbg_open(struct net_device *dev);
@@ -1139,6 +1137,8 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
        lp->gendev = gendev;
        spin_lock_init(&lp->lock);
        init_timer(&lp->timer);
+        lp->timer.function = (void (*)(unsigned long))de4x5_ast;
+        lp->timer.data = (unsigned long)dev;
        de4x5_parse_params(dev);
        /*
@@ -1311,7 +1311,7 @@ de4x5_open(struct net_device *dev)
    lp->state = OPEN;
    de4x5_dbg_open(dev);
-    if (request_irq(dev->irq, (void *)de4x5_interrupt, IRQF_SHARED,
+    if (request_irq(dev->irq, de4x5_interrupt, IRQF_SHARED,
                                                     lp->adapter_name, dev)) {
        printk("de4x5_open(): Requested IRQ%d is busy - attemping FAST/SHARE...", dev->irq);
        if (request_irq(dev->irq, de4x5_interrupt, IRQF_DISABLED | IRQF_SHARED,
@@ -1737,27 +1737,29 @@ de4x5_tx(struct net_device *dev)
    return 0;
 }
-static int
+static void
 de4x5_ast(struct net_device *dev)
 {
-    struct de4x5_private *lp = netdev_priv(dev);
+        struct de4x5_private *lp = netdev_priv(dev);
-    int next_tick = DE4X5_AUTOSENSE_MS;
+        int next_tick = DE4X5_AUTOSENSE_MS;
+        int dt;
-    disable_ast(dev);
+        if (lp->useSROM)
+                next_tick = srom_autoconf(dev);
+        else if (lp->chipset == DC21140)
+                next_tick = dc21140m_autoconf(dev);
+        else if (lp->chipset == DC21041)
+                next_tick = dc21041_autoconf(dev);
+        else if (lp->chipset == DC21040)
+                next_tick = dc21040_autoconf(dev);
+        lp->linkOK = 0;
-    if (lp->useSROM) {
+        dt = (next_tick * HZ) / 1000;
-        next_tick = srom_autoconf(dev);
-    } else if (lp->chipset == DC21140) {
-        next_tick = dc21140m_autoconf(dev);
-    } else if (lp->chipset == DC21041) {
-        next_tick = dc21041_autoconf(dev);
-    } else if (lp->chipset == DC21040) {
-        next_tick = dc21040_autoconf(dev);
-    }
-    lp->linkOK = 0;
-    enable_ast(dev, next_tick);
-    return 0;
+        if (!dt)
+                dt = 1;
+        mod_timer(&lp->timer, jiffies + dt);
 }
 static int
@@ -2174,7 +2176,7 @@ srom_search(struct net_device *dev, struct pci_dev *pdev)
        for (j=0, i=0; i<ETH_ALEN; i++) {
            j += (u_char) *((u_char *)&lp->srom + SROM_HWADD + i);
        }
-        if ((j != 0) && (j != 0x5fa)) {
+        if (j != 0 && j != 6 * 0xff) {
            last.chipset = device;
            last.bus = pb;
            last.irq = irq;
@@ -2371,30 +2373,19 @@ static struct pci_driver de4x5_pci_driver = {
 static int
 autoconf_media(struct net_device *dev)
 {
-    struct de4x5_private *lp = netdev_priv(dev);
+        struct de4x5_private *lp = netdev_priv(dev);
-    u_long iobase = dev->base_addr;
+        u_long iobase = dev->base_addr;
-    int next_tick = DE4X5_AUTOSENSE_MS;
-    lp->linkOK = 0;
+        disable_ast(dev);
-    lp->c_media = AUTO;                     /* Bogus last media */
-    disable_ast(dev);
-    inl(DE4X5_MFC);                         /* Zero the lost frames counter */
-    lp->media = INIT;
-    lp->tcount = 0;
-    if (lp->useSROM) {
+        lp->c_media = AUTO;                     /* Bogus last media */
-        next_tick = srom_autoconf(dev);
+        inl(DE4X5_MFC);                         /* Zero the lost frames counter */
-    } else if (lp->chipset == DC21040) {
+        lp->media = INIT;
-        next_tick = dc21040_autoconf(dev);
+        lp->tcount = 0;
-    } else if (lp->chipset == DC21041) {
-        next_tick = dc21041_autoconf(dev);
-    } else if (lp->chipset == DC21140) {
-        next_tick = dc21140m_autoconf(dev);
-    }
-    enable_ast(dev, next_tick);
+        de4x5_ast(dev);
-    return (lp->media);
+        return lp->media;
 }
 /*
@@ -4018,20 +4009,22 @@ DevicePresent(struct net_device *dev, u_long aprom_addr)
            outl(0, aprom_addr);       /* Reset Ethernet Address ROM Pointer */
        }
    } else {                           /* Read new srom */
-        u_short tmp, *p = (short *)((char *)&lp->srom + SROM_HWADD);
+        u_short tmp;
+        __le16 *p = (__le16 *)((char *)&lp->srom + SROM_HWADD);
        for (i=0; i<(ETH_ALEN>>1); i++) {
            tmp = srom_rd(aprom_addr, (SROM_HWADD>>1) + i);
-            *p = le16_to_cpu(tmp);
+            j += tmp;   /* for check for 0:0:0:0:0:0 or ff:ff:ff:ff:ff:ff */
-            j += *p++;
+            *p = cpu_to_le16(tmp);
        }
-        if ((j == 0) || (j == 0x2fffd)) {
+        if (j == 0 || j == 3 * 0xffff) {
-            return;
+                /* could get 0 only from all-0 and 3 * 0xffff only from all-1 */
+                return;
        }
-        p=(short *)&lp->srom;
+        p = (__le16 *)&lp->srom;
        for (i=0; i<(sizeof(struct de4x5_srom)>>1); i++) {
            tmp = srom_rd(aprom_addr, i);
-            *p++ = le16_to_cpu(tmp);
+            *p++ = cpu_to_le16(tmp);
        }
        de4x5_dbg_srom((struct de4x5_srom *)&lp->srom);
    }
@@ -5161,21 +5154,10 @@ build_setup_frame(struct net_device *dev, int mode)
 }
 static void
-enable_ast(struct net_device *dev, u32 time_out)
-{
-    timeout(dev, (void *)&de4x5_ast, (u_long)dev, time_out);
-    return;
-}
-static void
 disable_ast(struct net_device *dev)
 {
-    struct de4x5_private *lp = netdev_priv(dev);
+        struct de4x5_private *lp = netdev_priv(dev);
+        del_timer_sync(&lp->timer);
-    del_timer(&lp->timer);
-    return;
 }
 static long
@@ -5245,29 +5227,6 @@ gep_rd(struct net_device *dev)
 }
 static void
-timeout(struct net_device *dev, void (*fn)(u_long data), u_long data, u_long msec)
-{
-    struct de4x5_private *lp = netdev_priv(dev);
-    int dt;
-    /* First, cancel any pending timer events */
-    del_timer(&lp->timer);
-    /* Convert msec to ticks */
-    dt = (msec * HZ) / 1000;
-    if (dt==0) dt=1;
-    /* Set up timer */
-    init_timer(&lp->timer);
-    lp->timer.expires = jiffies + dt;
-    lp->timer.function = fn;
-    lp->timer.data = data;
-    add_timer(&lp->timer);
-    return;
-}
-static void
 yawn(struct net_device *dev, int state)
 {
    struct de4x5_private *lp = netdev_priv(dev);
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c
index 365331446387..6284afd14bbb 100644
--- a/drivers/net/tulip/interrupt.c
+++ b/drivers/net/tulip/interrupt.c
@@ -117,9 +117,6 @@ int tulip_poll(struct napi_struct *napi, int budget)
        int received = 0;
 #endif
-        if (!netif_running(dev))
-                goto done;
 #ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
 /* that one buffer is needed for mit activation; or might be a
@@ -151,7 +148,8 @@ int tulip_poll(struct napi_struct *napi, int budget)
                       if (tulip_debug > 5)
                               printk(KERN_DEBUG "%s: In tulip_rx(), entry %d %8.8x.\n",
                                      dev->name, entry, status);
-                       if (work_done++ >= budget)
+                       if (++work_done >= budget)
                               goto not_done;
                       if ((status & 0x38008300) != 0x0300) {
@@ -260,8 +258,6 @@ int tulip_poll(struct napi_struct *napi, int budget)
                * finally: amount of IO did not increase at all. */
       } while ((ioread32(tp->base_addr + CSR5) & RxIntr));
-done:
 #ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
          /* We use this simplistic scheme for IM. It's proven by
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index e5e2c9c4ebfe..ed600bf56e78 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -797,7 +797,8 @@ static int tulip_close (struct net_device *dev)
                tp->rx_ring[i].status = 0;      /* Not owned by Tulip chip. */
                tp->rx_ring[i].length = 0;
-                tp->rx_ring[i].buffer1 = 0xBADF00D0;    /* An invalid address. */
+                /* An invalid address. */
+                tp->rx_ring[i].buffer1 = cpu_to_le32(0xBADF00D0);
                if (skb) {
                        pci_unmap_single(tp->pdev, mapping, PKT_BUF_SZ,
                                         PCI_DMA_FROMDEVICE);
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 70befe33e454..8fc7274642eb 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -83,8 +83,8 @@ static int bufferoffsets[NUMDESCRIPTORS] = {128,2048,4096,6144};
 struct xircom_private {
        /* Send and receive buffers, kernel-addressable and dma addressable forms */
-        unsigned int *rx_buffer;
+        __le32 *rx_buffer;
-        unsigned int *tx_buffer;
+        __le32 *tx_buffer;
        dma_addr_t rx_dma_handle;
        dma_addr_t tx_dma_handle;
@@ -412,19 +412,20 @@ static int xircom_start_xmit(struct sk_buff *skb, struct net_device *dev)
                        /* FIXME: The specification tells us that the length we send HAS to be a multiple of
                           4 bytes. */
-                        card->tx_buffer[4*desc+1] = skb->len;
+                        card->tx_buffer[4*desc+1] = cpu_to_le32(skb->len);
-                        if (desc == NUMDESCRIPTORS-1)
+                        if (desc == NUMDESCRIPTORS - 1) /* bit 25: last descriptor of the ring */
-                                card->tx_buffer[4*desc+1] |= (1<<25);  /* bit 25: last descriptor of the ring */
+                                card->tx_buffer[4*desc+1] |= cpu_to_le32(1<<25);  
-                        card->tx_buffer[4*desc+1] |= 0xF0000000;
+                        card->tx_buffer[4*desc+1] |= cpu_to_le32(0xF0000000);
                                                 /* 0xF0... means want interrupts*/
                        card->tx_skb[desc] = skb;
                        wmb();
                        /* This gives the descriptor to the card */
-                        card->tx_buffer[4*desc] = 0x80000000;
+                        card->tx_buffer[4*desc] = cpu_to_le32(0x80000000);
                        trigger_transmit(card);
-                        if (((int)card->tx_buffer[nextdescriptor*4])<0) {       /* next descriptor is occupied... */
+                        if (card->tx_buffer[nextdescriptor*4] & cpu_to_le32(0x8000000)) {
+                                /* next descriptor is occupied... */
                                netif_stop_queue(dev);
                        }
                        card->transmit_used = nextdescriptor;
@@ -590,8 +591,7 @@ descriptors and programs the addresses into the card.
 */
 static void setup_descriptors(struct xircom_private *card)
 {
-        unsigned int val;
+        u32 address;
-        unsigned int address;
        int i;
        enter("setup_descriptors");
@@ -604,16 +604,16 @@ static void setup_descriptors(struct xircom_private *card)
        for (i=0;i<NUMDESCRIPTORS;i++ ) {
                /* Rx Descr0: It's empty, let the card own it, no errors -> 0x80000000 */
-                card->rx_buffer[i*4 + 0] = 0x80000000;
+                card->rx_buffer[i*4 + 0] = cpu_to_le32(0x80000000);
                /* Rx Descr1: buffer 1 is 1536 bytes, buffer 2 is 0 bytes */
-                card->rx_buffer[i*4 + 1] = 1536;
+                card->rx_buffer[i*4 + 1] = cpu_to_le32(1536);
-                if (i==NUMDESCRIPTORS-1)
+                if (i == NUMDESCRIPTORS - 1) /* bit 25 is "last descriptor" */
-                        card->rx_buffer[i*4 + 1] |= (1 << 25); /* bit 25 is "last descriptor" */
+                        card->rx_buffer[i*4 + 1] |= cpu_to_le32(1 << 25);
                /* Rx Descr2: address of the buffer
                   we store the buffer at the 2nd half of the page */
-                address = (unsigned long) card->rx_dma_handle;
+                address = card->rx_dma_handle;
                card->rx_buffer[i*4 + 2] = cpu_to_le32(address + bufferoffsets[i]);
                /* Rx Desc3: address of 2nd buffer -> 0 */
                card->rx_buffer[i*4 + 3] = 0;
@@ -621,9 +621,8 @@ static void setup_descriptors(struct xircom_private *card)
        wmb();
        /* Write the receive descriptor ring address to the card */
-        address = (unsigned long) card->rx_dma_handle;
+        address = card->rx_dma_handle;
-        val = cpu_to_le32(address);
+        outl(address, card->io_port + CSR3);    /* Receive descr list address */
-        outl(val, card->io_port + CSR3);        /* Receive descr list address */
        /* transmit descriptors */
@@ -633,13 +632,13 @@ static void setup_descriptors(struct xircom_private *card)
                /* Tx Descr0: Empty, we own it, no errors -> 0x00000000 */
                card->tx_buffer[i*4 + 0] = 0x00000000;
                /* Tx Descr1: buffer 1 is 1536 bytes, buffer 2 is 0 bytes */
-                card->tx_buffer[i*4 + 1] = 1536;
+                card->tx_buffer[i*4 + 1] = cpu_to_le32(1536);
-                if (i==NUMDESCRIPTORS-1)
+                if (i == NUMDESCRIPTORS - 1) /* bit 25 is "last descriptor" */
-                        card->tx_buffer[i*4 + 1] |= (1 << 25); /* bit 25 is "last descriptor" */
+                        card->tx_buffer[i*4 + 1] |= cpu_to_le32(1 << 25);
                /* Tx Descr2: address of the buffer
                   we store the buffer at the 2nd half of the page */
-                address = (unsigned long) card->tx_dma_handle;
+                address = card->tx_dma_handle;
                card->tx_buffer[i*4 + 2] = cpu_to_le32(address + bufferoffsets[i]);
                /* Tx Desc3: address of 2nd buffer -> 0 */
                card->tx_buffer[i*4 + 3] = 0;
@@ -647,9 +646,8 @@ static void setup_descriptors(struct xircom_private *card)
        wmb();
        /* wite the transmit descriptor ring to the card */
-        address = (unsigned long) card->tx_dma_handle;
+        address = card->tx_dma_handle;
-        val =cpu_to_le32(address);
+        outl(address, card->io_port + CSR4);    /* xmit descr list address */
-        outl(val, card->io_port + CSR4);        /* xmit descr list address */
        leave("setup_descriptors");
 }
@@ -1180,7 +1178,7 @@ static void investigate_read_descriptor(struct net_device *dev,struct xircom_pri
                int status;
                enter("investigate_read_descriptor");
-                status = card->rx_buffer[4*descnr];
+                status = le32_to_cpu(card->rx_buffer[4*descnr]);
                if ((status > 0)) {     /* packet received */
@@ -1210,7 +1208,7 @@ static void investigate_read_descriptor(struct net_device *dev,struct xircom_pri
                      out:
                        /* give the buffer back to the card */
-                        card->rx_buffer[4*descnr] =  0x80000000;
+                        card->rx_buffer[4*descnr] =  cpu_to_le32(0x80000000);
                        trigger_receive(card);
                }
@@ -1226,7 +1224,7 @@ static void investigate_write_descriptor(struct net_device *dev, struct xircom_p
                enter("investigate_write_descriptor");
-                status = card->tx_buffer[4*descnr];
+                status = le32_to_cpu(card->tx_buffer[4*descnr]);
 #if 0
                if (status & 0x8000) {  /* Major error */
                        printk(KERN_ERR "Major transmit error status %x \n", status);
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 1249f444039e..569028b2baf2 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -202,10 +202,10 @@ static int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
                buf,
                size,
                USB_CTRL_GET_TIMEOUT);
-        if (err >= 0 && err < size)
+        if (err == size)
-                err = -EINVAL;
-        if (!err)
                memcpy(data, buf, size);
+        else if (err >= 0)
+                err = -EINVAL;
        kfree(buf);
 out:
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 58a53a641754..569ad8bfd383 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -70,7 +70,7 @@
 #define KAWETH_TX_TIMEOUT               (5 * HZ)
 #define KAWETH_SCRATCH_SIZE             32
 #define KAWETH_FIRMWARE_BUF_SIZE        4096
-#define KAWETH_CONTROL_TIMEOUT          (30 * HZ)
+#define KAWETH_CONTROL_TIMEOUT          (30000)
 #define KAWETH_STATUS_BROKEN            0x0000001
 #define KAWETH_STATUS_CLOSING           0x0000002
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index f55a5951733a..5ea7411e1337 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -94,7 +94,7 @@ static int mcs7830_get_reg(struct usbnet *dev, u16 index, u16 size, void *data)
        ret = usb_control_msg(xdev, usb_rcvctrlpipe(xdev, 0), MCS7830_RD_BREQ,
                              MCS7830_RD_BMREQ, 0x0000, index, data,
-                              size, msecs_to_jiffies(MCS7830_CTRL_TIMEOUT));
+                              size, MCS7830_CTRL_TIMEOUT);
        return ret;
 }
@@ -105,7 +105,7 @@ static int mcs7830_set_reg(struct usbnet *dev, u16 index, u16 size, void *data)
        ret = usb_control_msg(xdev, usb_sndctrlpipe(xdev, 0), MCS7830_WR_BREQ,
                              MCS7830_WR_BMREQ, 0x0000, index, data,
-                              size, msecs_to_jiffies(MCS7830_CTRL_TIMEOUT));
+                              size, MCS7830_CTRL_TIMEOUT);
        return ret;
 }
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 33dc713b5301..c6f26e28e376 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -139,19 +139,21 @@ struct thingie {
 };
 struct TxFD {
-        u32 state;
+        __le32 state;
-        u32 next;
+        __le32 next;
-        u32 data;
+        __le32 data;
-        u32 complete;
+        __le32 complete;
        u32 jiffies; /* Allows sizeof(TxFD) == sizeof(RxFD) + extra hack */
+                     /* FWIW, datasheet calls that "dummy" and says that card
+                      * never looks at it; neither does the driver */
 };
 struct RxFD {
-        u32 state1;
+        __le32 state1;
-        u32 next;
+        __le32 next;
-        u32 data;
+        __le32 data;
-        u32 state2;
+        __le32 state2;
-        u32 end;
+        __le32 end;
 };
 #define DUMMY_SKB_SIZE          64
@@ -181,7 +183,7 @@ struct RxFD {
 #define SCC_REG_START(dpriv)    (SCC_START+(dpriv->dev_id)*SCC_OFFSET)
 struct dscc4_pci_priv {
-        u32 *iqcfg;
+        __le32 *iqcfg;
        int cfg_cur;
        spinlock_t lock;
        struct pci_dev *pdev;
@@ -197,8 +199,8 @@ struct dscc4_dev_priv {
        struct RxFD *rx_fd;
        struct TxFD *tx_fd;
-        u32 *iqrx;
+        __le32 *iqrx;
-        u32 *iqtx;
+        __le32 *iqtx;
        /* FIXME: check all the volatile are required */
        volatile u32 tx_current;
@@ -298,7 +300,7 @@ struct dscc4_dev_priv {
 #define BrrExpMask      0x00000f00
 #define BrrMultMask     0x0000003f
 #define EncodingMask    0x00700000
-#define Hold            0x40000000
+#define Hold            cpu_to_le32(0x40000000)
 #define SccBusy         0x10000000
 #define PowerUp         0x80000000
 #define Vis             0x00001000
@@ -307,14 +309,14 @@ struct dscc4_dev_priv {
 #define FrameRdo        0x40
 #define FrameCrc        0x20
 #define FrameRab        0x10
-#define FrameAborted    0x00000200
+#define FrameAborted    cpu_to_le32(0x00000200)
-#define FrameEnd        0x80000000
+#define FrameEnd        cpu_to_le32(0x80000000)
-#define DataComplete    0x40000000
+#define DataComplete    cpu_to_le32(0x40000000)
 #define LengthCheck     0x00008000
 #define SccEvt          0x02000000
 #define NoAck           0x00000200
 #define Action          0x00000001
-#define HiDesc          0x20000000
+#define HiDesc          cpu_to_le32(0x20000000)
 /* SCC events */
 #define RxEvt           0xf0000000
@@ -489,8 +491,8 @@ static void dscc4_release_ring(struct dscc4_dev_priv *dpriv)
        skbuff = dpriv->tx_skbuff;
        for (i = 0; i < TX_RING_SIZE; i++) {
                if (*skbuff) {
-                        pci_unmap_single(pdev, tx_fd->data, (*skbuff)->len,
+                        pci_unmap_single(pdev, le32_to_cpu(tx_fd->data),
-                                PCI_DMA_TODEVICE);
+                                (*skbuff)->len, PCI_DMA_TODEVICE);
                        dev_kfree_skb(*skbuff);
                }
                skbuff++;
@@ -500,7 +502,7 @@ static void dscc4_release_ring(struct dscc4_dev_priv *dpriv)
        skbuff = dpriv->rx_skbuff;
        for (i = 0; i < RX_RING_SIZE; i++) {
                if (*skbuff) {
-                        pci_unmap_single(pdev, rx_fd->data,
+                        pci_unmap_single(pdev, le32_to_cpu(rx_fd->data),
                                RX_MAX(HDLC_MAX_MRU), PCI_DMA_FROMDEVICE);
                        dev_kfree_skb(*skbuff);
                }
@@ -522,10 +524,10 @@ static inline int try_get_rx_skb(struct dscc4_dev_priv *dpriv,
        dpriv->rx_skbuff[dirty] = skb;
        if (skb) {
                skb->protocol = hdlc_type_trans(skb, dev);
-                rx_fd->data = pci_map_single(dpriv->pci_priv->pdev, skb->data,
+                rx_fd->data = cpu_to_le32(pci_map_single(dpriv->pci_priv->pdev,
-                                             len, PCI_DMA_FROMDEVICE);
+                                          skb->data, len, PCI_DMA_FROMDEVICE));
        } else {
-                rx_fd->data = (u32) NULL;
+                rx_fd->data = 0;
                ret = -1;
        }
        return ret;
@@ -587,7 +589,7 @@ static inline int dscc4_xpr_ack(struct dscc4_dev_priv *dpriv)
        do {
                if (!(dpriv->flags & (NeedIDR | NeedIDT)) ||
-                    (dpriv->iqtx[cur] & Xpr))
+                    (dpriv->iqtx[cur] & cpu_to_le32(Xpr)))
                        break;
                smp_rmb();
                schedule_timeout_uninterruptible(10);
@@ -650,8 +652,9 @@ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv,
                printk(KERN_DEBUG "%s: skb=0 (%s)\n", dev->name, __FUNCTION__);
                goto refill;
        }
-        pkt_len = TO_SIZE(rx_fd->state2);
+        pkt_len = TO_SIZE(le32_to_cpu(rx_fd->state2));
-        pci_unmap_single(pdev, rx_fd->data, RX_MAX(HDLC_MAX_MRU), PCI_DMA_FROMDEVICE);
+        pci_unmap_single(pdev, le32_to_cpu(rx_fd->data),
+                         RX_MAX(HDLC_MAX_MRU), PCI_DMA_FROMDEVICE);
        if ((skb->data[--pkt_len] & FrameOk) == FrameOk) {
                stats->rx_packets++;
                stats->rx_bytes += pkt_len;
@@ -679,7 +682,7 @@ refill:
        }
        dscc4_rx_update(dpriv, dev);
        rx_fd->state2 = 0x00000000;
-        rx_fd->end = 0xbabeface;
+        rx_fd->end = cpu_to_le32(0xbabeface);
 }
 static void dscc4_free1(struct pci_dev *pdev)
@@ -772,8 +775,8 @@ static int __devinit dscc4_init_one(struct pci_dev *pdev,
        }
        /* Global interrupt queue */
        writel((u32)(((IRQ_RING_SIZE >> 5) - 1) << 20), ioaddr + IQLENR1);
-        priv->iqcfg = (u32 *) pci_alloc_consistent(pdev,
+        priv->iqcfg = (__le32 *) pci_alloc_consistent(pdev,
-                IRQ_RING_SIZE*sizeof(u32), &priv->iqcfg_dma);
+                IRQ_RING_SIZE*sizeof(__le32), &priv->iqcfg_dma);
        if (!priv->iqcfg)
                goto err_free_irq_5;
        writel(priv->iqcfg_dma, ioaddr + IQCFG);
@@ -786,7 +789,7 @@ static int __devinit dscc4_init_one(struct pci_dev *pdev,
         */
        for (i = 0; i < dev_per_card; i++) {
                dpriv = priv->root + i;
-                dpriv->iqtx = (u32 *) pci_alloc_consistent(pdev,
+                dpriv->iqtx = (__le32 *) pci_alloc_consistent(pdev,
                        IRQ_RING_SIZE*sizeof(u32), &dpriv->iqtx_dma);
                if (!dpriv->iqtx)
                        goto err_free_iqtx_6;
@@ -794,7 +797,7 @@ static int __devinit dscc4_init_one(struct pci_dev *pdev,
        }
        for (i = 0; i < dev_per_card; i++) {
                dpriv = priv->root + i;
-                dpriv->iqrx = (u32 *) pci_alloc_consistent(pdev,
+                dpriv->iqrx = (__le32 *) pci_alloc_consistent(pdev,
                        IRQ_RING_SIZE*sizeof(u32), &dpriv->iqrx_dma);
                if (!dpriv->iqrx)
                        goto err_free_iqrx_7;
@@ -1156,8 +1159,8 @@ static int dscc4_start_xmit(struct sk_buff *skb, struct net_device *dev)
        dpriv->tx_skbuff[next] = skb;
        tx_fd = dpriv->tx_fd + next;
        tx_fd->state = FrameEnd | TO_STATE_TX(skb->len);
-        tx_fd->data = pci_map_single(ppriv->pdev, skb->data, skb->len,
+        tx_fd->data = cpu_to_le32(pci_map_single(ppriv->pdev, skb->data, skb->len,
-                                     PCI_DMA_TODEVICE);
+                                     PCI_DMA_TODEVICE));
        tx_fd->complete = 0x00000000;
        tx_fd->jiffies = jiffies;
        mb();
@@ -1508,7 +1511,7 @@ static irqreturn_t dscc4_irq(int irq, void *token)
        if (state & Cfg) {
                if (debug > 0)
                        printk(KERN_DEBUG "%s: CfgIV\n", DRV_NAME);
-                if (priv->iqcfg[priv->cfg_cur++%IRQ_RING_SIZE] & Arf)
+                if (priv->iqcfg[priv->cfg_cur++%IRQ_RING_SIZE] & cpu_to_le32(Arf))
                        printk(KERN_ERR "%s: %s failed\n", dev->name, "CFG");
                if (!(state &= ~Cfg))
                        goto out;
@@ -1541,7 +1544,7 @@ static void dscc4_tx_irq(struct dscc4_pci_priv *ppriv,
 try:
        cur = dpriv->iqtx_current%IRQ_RING_SIZE;
-        state = dpriv->iqtx[cur];
+        state = le32_to_cpu(dpriv->iqtx[cur]);
        if (!state) {
                if (debug > 4)
                        printk(KERN_DEBUG "%s: Tx ISR = 0x%08x\n", dev->name,
@@ -1580,7 +1583,7 @@ try:
                        tx_fd = dpriv->tx_fd + cur;
                        skb = dpriv->tx_skbuff[cur];
                        if (skb) {
-                                pci_unmap_single(ppriv->pdev, tx_fd->data,
+                                pci_unmap_single(ppriv->pdev, le32_to_cpu(tx_fd->data),
                                                 skb->len, PCI_DMA_TODEVICE);
                                if (tx_fd->state & FrameEnd) {
                                        stats->tx_packets++;
@@ -1711,7 +1714,7 @@ static void dscc4_rx_irq(struct dscc4_pci_priv *priv,
 try:
        cur = dpriv->iqrx_current%IRQ_RING_SIZE;
-        state = dpriv->iqrx[cur];
+        state = le32_to_cpu(dpriv->iqrx[cur]);
        if (!state)
                return;
        dpriv->iqrx[cur] = 0;
@@ -1755,7 +1758,7 @@ try:
                                        goto try;
                                rx_fd->state1 &= ~Hold;
                                rx_fd->state2 = 0x00000000;
-                                rx_fd->end = 0xbabeface;
+                                rx_fd->end = cpu_to_le32(0xbabeface);
                        //}
                        goto try;
                }
@@ -1834,7 +1837,7 @@ try:
                                        hdlc_stats(dev)->rx_over_errors++;
                                        rx_fd->state1 |= Hold;
                                        rx_fd->state2 = 0x00000000;
-                                        rx_fd->end = 0xbabeface;
+                                        rx_fd->end = cpu_to_le32(0xbabeface);
                                } else
                                        dscc4_rx_skb(dpriv, dev);
                        } while (1);
@@ -1904,8 +1907,9 @@ static struct sk_buff *dscc4_init_dummy_skb(struct dscc4_dev_priv *dpriv)
                skb_copy_to_linear_data(skb, version,
                                        strlen(version) % DUMMY_SKB_SIZE);
                tx_fd->state = FrameEnd | TO_STATE_TX(DUMMY_SKB_SIZE);
-                tx_fd->data = pci_map_single(dpriv->pci_priv->pdev, skb->data,
+                tx_fd->data = cpu_to_le32(pci_map_single(dpriv->pci_priv->pdev,
-                                             DUMMY_SKB_SIZE, PCI_DMA_TODEVICE);
+                                             skb->data, DUMMY_SKB_SIZE,
+                                             PCI_DMA_TODEVICE));
                dpriv->tx_skbuff[last] = skb;
        }
        return skb;
@@ -1937,8 +1941,8 @@ static int dscc4_init_ring(struct net_device *dev)
                tx_fd->state = FrameEnd | TO_STATE_TX(2*DUMMY_SKB_SIZE);
                tx_fd->complete = 0x00000000;
                /* FIXME: NULL should be ok - to be tried */
-                tx_fd->data = dpriv->tx_fd_dma;
+                tx_fd->data = cpu_to_le32(dpriv->tx_fd_dma);
-                (tx_fd++)->next = (u32)(dpriv->tx_fd_dma +
+                (tx_fd++)->next = cpu_to_le32(dpriv->tx_fd_dma +
                                        (++i%TX_RING_SIZE)*sizeof(*tx_fd));
        } while (i < TX_RING_SIZE);
@@ -1951,12 +1955,12 @@ static int dscc4_init_ring(struct net_device *dev)
                /* size set by the host. Multiple of 4 bytes please */
                rx_fd->state1 = HiDesc;
                rx_fd->state2 = 0x00000000;
-                rx_fd->end = 0xbabeface;
+                rx_fd->end = cpu_to_le32(0xbabeface);
                rx_fd->state1 |= TO_STATE_RX(HDLC_MAX_MRU);
                // FIXME: return value verifiee mais traitement suspect
                if (try_get_rx_skb(dpriv, dev) >= 0)
                        dpriv->rx_dirty++;
-                (rx_fd++)->next = (u32)(dpriv->rx_fd_dma +
+                (rx_fd++)->next = cpu_to_le32(dpriv->rx_fd_dma +
                                        (++i%RX_RING_SIZE)*sizeof(*rx_fd));
        } while (i < RX_RING_SIZE);
diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
index 574737b55f39..c9c878cd5c72 100644
--- a/drivers/net/wan/lmc/lmc_media.c
+++ b/drivers/net/wan/lmc/lmc_media.c
@@ -890,16 +890,8 @@ write_av9110 (lmc_softc_t * sc, u_int32_t n, u_int32_t m, u_int32_t v,
 static void
 lmc_ssi_watchdog (lmc_softc_t * const sc)
 {
-  u_int16_t mii17;
+  u_int16_t mii17 = lmc_mii_readreg (sc, 0, 17);
-  struct ssicsr2
+  if (((mii17 >> 3) & 7) == 7)
-  {
-    unsigned short dtr:1, dsr:1, rts:1, cable:3, crc:1, led0:1, led1:1,
-      led2:1, led3:1, fifo:1, ll:1, rl:1, tm:1, loop:1;
-  };
-  struct ssicsr2 *ssicsr;
-  mii17 = lmc_mii_readreg (sc, 0, 17);
-  ssicsr = (struct ssicsr2 *) &mii17;
-  if (ssicsr->cable == 7)
    {
      lmc_led_off (sc, LMC_MII16_LED2);
    }
diff --git a/drivers/net/wan/sbni.h b/drivers/net/wan/sbni.h
index 27715e70f28b..84264510a8ed 100644
--- a/drivers/net/wan/sbni.h
+++ b/drivers/net/wan/sbni.h
@@ -44,9 +44,15 @@ enum {
 #define PR_RES 0x80
 struct sbni_csr1 {
-        unsigned rxl    : 5;
+#ifdef __LITTLE_ENDIAN_BITFIELD
-        unsigned rate   : 2;
+        u8 rxl  : 5;
-        unsigned        : 1;
+        u8 rate : 2;
+        u8      : 1;
+#else
+        u8      : 1;
+        u8 rate : 2;
+        u8 rxl  : 5;
+#endif
 };
 /* fields in frame header */
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index a28ad230d63e..7b6fc1ab2b90 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -273,6 +273,8 @@ enum {
 #define B43_PHYTYPE_A                   0x00
 #define B43_PHYTYPE_B                   0x01
 #define B43_PHYTYPE_G                   0x02
+#define B43_PHYTYPE_N                   0x04
+#define B43_PHYTYPE_LP                  0x05
 /* PHYRegisters */
 #define B43_PHY_ILT_A_CTRL              0x0072
diff --git a/drivers/net/wireless/b43/main.h b/drivers/net/wireless/b43/main.h
index 284d17da17d1..08e2e56e48f4 100644
--- a/drivers/net/wireless/b43/main.h
+++ b/drivers/net/wireless/b43/main.h
@@ -39,11 +39,11 @@
 #define PAD_BYTES(nr_bytes)             P4D_BYTES( __LINE__ , (nr_bytes))
 /* Lightweight function to convert a frequency (in Mhz) to a channel number. */
-static inline u8 b43_freq_to_channel_a(int freq)
+static inline u8 b43_freq_to_channel_5ghz(int freq)
 {
        return ((freq - 5000) / 5);
 }
-static inline u8 b43_freq_to_channel_bg(int freq)
+static inline u8 b43_freq_to_channel_2ghz(int freq)
 {
        u8 channel;
@@ -54,19 +54,13 @@ static inline u8 b43_freq_to_channel_bg(int freq)
        return channel;
 }
-static inline u8 b43_freq_to_channel(struct b43_wldev *dev, int freq)
-{
-        if (dev->phy.type == B43_PHYTYPE_A)
-                return b43_freq_to_channel_a(freq);
-        return b43_freq_to_channel_bg(freq);
-}
 /* Lightweight function to convert a channel number to a frequency (in Mhz). */
-static inline int b43_channel_to_freq_a(u8 channel)
+static inline int b43_channel_to_freq_5ghz(u8 channel)
 {
        return (5000 + (5 * channel));
 }
-static inline int b43_channel_to_freq_bg(u8 channel)
+static inline int b43_channel_to_freq_2ghz(u8 channel)
 {
        int freq;
@@ -77,12 +71,6 @@ static inline int b43_channel_to_freq_bg(u8 channel)
        return freq;
 }
-static inline int b43_channel_to_freq(struct b43_wldev *dev, u8 channel)
-{
-        if (dev->phy.type == B43_PHYTYPE_A)
-                return b43_channel_to_freq_a(channel);
-        return b43_channel_to_freq_bg(channel);
-}
 static inline int b43_is_cck_rate(int rate)
 {
diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c
index 98cf70c5fd47..11f53cb1139e 100644
--- a/drivers/net/wireless/b43/rfkill.c
+++ b/drivers/net/wireless/b43/rfkill.c
@@ -138,8 +138,11 @@ void b43_rfkill_init(struct b43_wldev *dev)
        rfk->rfkill->user_claim_unsupported = 1;
        rfk->poll_dev = input_allocate_polled_device();
-        if (!rfk->poll_dev)
+        if (!rfk->poll_dev) {
-                goto err_free_rfk;
+                rfkill_free(rfk->rfkill);
+                goto err_freed_rfk;
+        }
        rfk->poll_dev->private = dev;
        rfk->poll_dev->poll = b43_rfkill_poll;
        rfk->poll_dev->poll_interval = 1000; /* msecs */
@@ -175,8 +178,7 @@ err_unreg_rfk:
 err_free_polldev:
        input_free_polled_device(rfk->poll_dev);
        rfk->poll_dev = NULL;
-err_free_rfk:
+err_freed_rfk:
-        rfkill_free(rfk->rfkill);
        rfk->rfkill = NULL;
 out_error:
        rfk->registered = 0;
@@ -195,6 +197,5 @@ void b43_rfkill_exit(struct b43_wldev *dev)
        rfkill_unregister(rfk->rfkill);
        input_free_polled_device(rfk->poll_dev);
        rfk->poll_dev = NULL;
-        rfkill_free(rfk->rfkill);
        rfk->rfkill = NULL;
 }
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
index 0bd6f8a348a8..3307ba1856b1 100644
--- a/drivers/net/wireless/b43/xmit.c
+++ b/drivers/net/wireless/b43/xmit.c
@@ -531,21 +531,32 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
        switch (chanstat & B43_RX_CHAN_PHYTYPE) {
        case B43_PHYTYPE_A:
                status.phymode = MODE_IEEE80211A;
-                status.freq = chanid;
+                B43_WARN_ON(1);
-                status.channel = b43_freq_to_channel_a(chanid);
+                /* FIXME: We don't really know which value the "chanid" contains.
-                break;
+                 *        So the following assignment might be wrong. */
-        case B43_PHYTYPE_B:
+                status.channel = chanid;
-                status.phymode = MODE_IEEE80211B;
+                status.freq = b43_channel_to_freq_5ghz(status.channel);
-                status.freq = chanid + 2400;
-                status.channel = b43_freq_to_channel_bg(chanid + 2400);
                break;
        case B43_PHYTYPE_G:
                status.phymode = MODE_IEEE80211G;
+                /* chanid is the radio channel cookie value as used
+                 * to tune the radio. */
                status.freq = chanid + 2400;
-                status.channel = b43_freq_to_channel_bg(chanid + 2400);
+                status.channel = b43_freq_to_channel_2ghz(status.freq);
+                break;
+        case B43_PHYTYPE_N:
+                status.phymode = 0xDEAD /*FIXME MODE_IEEE80211N*/;
+                /* chanid is the SHM channel cookie. Which is the plain
+                 * channel number in b43. */
+                status.channel = chanid;
+                if (chanstat & B43_RX_CHAN_5GHZ)
+                        status.freq = b43_freq_to_channel_5ghz(status.freq);
+                else
+                        status.freq = b43_freq_to_channel_2ghz(status.freq);
                break;
        default:
                B43_WARN_ON(1);
+                goto drop;
        }
        dev->stats.last_rx = jiffies;
diff --git a/drivers/net/wireless/b43/xmit.h b/drivers/net/wireless/b43/xmit.h
index 03bddd251618..6dc079382f7f 100644
--- a/drivers/net/wireless/b43/xmit.h
+++ b/drivers/net/wireless/b43/xmit.h
@@ -142,49 +142,56 @@ struct b43_rxhdr_fw4 {
 } __attribute__ ((__packed__));
 /* PHY RX Status 0 */
-#define B43_RX_PHYST0_GAINCTL   0x4000  /* Gain Control */
+#define B43_RX_PHYST0_GAINCTL           0x4000 /* Gain Control */
-#define B43_RX_PHYST0_PLCPHCF   0x0200
+#define B43_RX_PHYST0_PLCPHCF           0x0200
-#define B43_RX_PHYST0_PLCPFV    0x0100
+#define B43_RX_PHYST0_PLCPFV            0x0100
-#define B43_RX_PHYST0_SHORTPRMBL        0x0080  /* Received with Short Preamble */
+#define B43_RX_PHYST0_SHORTPRMBL        0x0080 /* Received with Short Preamble */
 #define B43_RX_PHYST0_LCRS              0x0040
-#define B43_RX_PHYST0_ANT               0x0020  /* Antenna */
+#define B43_RX_PHYST0_ANT               0x0020 /* Antenna */
-#define B43_RX_PHYST0_UNSRATE   0x0010
+#define B43_RX_PHYST0_UNSRATE           0x0010
 #define B43_RX_PHYST0_CLIP              0x000C
 #define B43_RX_PHYST0_CLIP_SHIFT        2
-#define B43_RX_PHYST0_FTYPE             0x0003  /* Frame type */
+#define B43_RX_PHYST0_FTYPE             0x0003 /* Frame type */
-#define  B43_RX_PHYST0_CCK              0x0000  /* Frame type: CCK */
+#define  B43_RX_PHYST0_CCK              0x0000 /* Frame type: CCK */
-#define  B43_RX_PHYST0_OFDM             0x0001  /* Frame type: OFDM */
+#define  B43_RX_PHYST0_OFDM             0x0001 /* Frame type: OFDM */
-#define  B43_RX_PHYST0_PRE_N    0x0002  /* Pre-standard N-PHY frame */
+#define  B43_RX_PHYST0_PRE_N            0x0002 /* Pre-standard N-PHY frame */
-#define  B43_RX_PHYST0_STD_N    0x0003  /* Standard N-PHY frame */
+#define  B43_RX_PHYST0_STD_N            0x0003 /* Standard N-PHY frame */
 /* PHY RX Status 2 */
-#define B43_RX_PHYST2_LNAG              0xC000  /* LNA Gain */
+#define B43_RX_PHYST2_LNAG              0xC000 /* LNA Gain */
 #define B43_RX_PHYST2_LNAG_SHIFT        14
-#define B43_RX_PHYST2_PNAG              0x3C00  /* PNA Gain */
+#define B43_RX_PHYST2_PNAG              0x3C00 /* PNA Gain */
 #define B43_RX_PHYST2_PNAG_SHIFT        10
-#define B43_RX_PHYST2_FOFF              0x03FF  /* F offset */
+#define B43_RX_PHYST2_FOFF              0x03FF /* F offset */
 /* PHY RX Status 3 */
-#define B43_RX_PHYST3_DIGG              0x1800  /* DIG Gain */
+#define B43_RX_PHYST3_DIGG              0x1800 /* DIG Gain */
 #define B43_RX_PHYST3_DIGG_SHIFT        11
-#define B43_RX_PHYST3_TRSTATE   0x0400  /* TR state */
+#define B43_RX_PHYST3_TRSTATE           0x0400 /* TR state */
 /* MAC RX Status */
-#define B43_RX_MAC_BEACONSENT   0x00008000      /* Beacon send flag */
+#define B43_RX_MAC_RXST_VALID           0x01000000 /* PHY RXST valid */
-#define B43_RX_MAC_KEYIDX               0x000007E0      /* Key index */
+#define B43_RX_MAC_TKIP_MICERR          0x00100000 /* TKIP MIC error */
-#define B43_RX_MAC_KEYIDX_SHIFT 5
+#define B43_RX_MAC_TKIP_MICATT          0x00080000 /* TKIP MIC attempted */
-#define B43_RX_MAC_DECERR               0x00000010      /* Decrypt error */
+#define B43_RX_MAC_AGGTYPE              0x00060000 /* Aggregation type */
-#define B43_RX_MAC_DEC          0x00000008      /* Decryption attempted */
+#define B43_RX_MAC_AGGTYPE_SHIFT        17
-#define B43_RX_MAC_PADDING              0x00000004      /* Pad bytes present */
+#define B43_RX_MAC_AMSDU                0x00010000 /* A-MSDU mask */
-#define B43_RX_MAC_RESP         0x00000002      /* Response frame transmitted */
+#define B43_RX_MAC_BEACONSENT           0x00008000 /* Beacon sent flag */
-#define B43_RX_MAC_FCSERR               0x00000001      /* FCS error */
+#define B43_RX_MAC_KEYIDX               0x000007E0 /* Key index */
+#define B43_RX_MAC_KEYIDX_SHIFT         5
+#define B43_RX_MAC_DECERR               0x00000010 /* Decrypt error */
+#define B43_RX_MAC_DEC                  0x00000008 /* Decryption attempted */
+#define B43_RX_MAC_PADDING              0x00000004 /* Pad bytes present */
+#define B43_RX_MAC_RESP                 0x00000002 /* Response frame transmitted */
+#define B43_RX_MAC_FCSERR               0x00000001 /* FCS error */
 /* RX channel */
-#define B43_RX_CHAN_GAIN                0xFC00  /* Gain */
+#define B43_RX_CHAN_40MHZ               0x1000 /* 40 Mhz channel width */
-#define B43_RX_CHAN_GAIN_SHIFT  10
+#define B43_RX_CHAN_5GHZ                0x0800 /* 5 Ghz band */
-#define B43_RX_CHAN_ID          0x03FC  /* Channel ID */
+#define B43_RX_CHAN_ID                  0x07F8 /* Channel ID */
-#define B43_RX_CHAN_ID_SHIFT    2
+#define B43_RX_CHAN_ID_SHIFT            3
-#define B43_RX_CHAN_PHYTYPE             0x0003  /* PHY type */
+#define B43_RX_CHAN_PHYTYPE             0x0007 /* PHY type */
 u8 b43_plcp_get_ratecode_cck(const u8 bitrate);
 u8 b43_plcp_get_ratecode_ofdm(const u8 bitrate);
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
index 040dc3e36410..cbf15d703201 100644
--- a/drivers/net/wireless/hostap/hostap_plx.c
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -608,7 +608,7 @@ static void prism2_plx_remove(struct pci_dev *pdev)
 MODULE_DEVICE_TABLE(pci, prism2_plx_id_table);
-static struct pci_driver prism2_plx_drv_id = {
+static struct pci_driver prism2_plx_driver = {
        .name           = "hostap_plx",
        .id_table       = prism2_plx_id_table,
        .probe          = prism2_plx_probe,
@@ -618,13 +618,13 @@ static struct pci_driver prism2_plx_drv_id = {
 static int __init init_prism2_plx(void)
 {
-        return pci_register_driver(&prism2_plx_drv_id);
+        return pci_register_driver(&prism2_plx_driver);
 }
 static void __exit exit_prism2_plx(void)
 {
-        pci_unregister_driver(&prism2_plx_drv_id);
+        pci_unregister_driver(&prism2_plx_driver);
 }
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 88062c1318a8..003f73f89efa 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -4935,7 +4935,7 @@ static int ipw_queue_reset(struct ipw_priv *priv)
 /**
 * Reclaim Tx queue entries no more used by NIC.
 *
- * When FW adwances 'R' index, all entries between old and
+ * When FW advances 'R' index, all entries between old and
 * new 'R' index need to be reclaimed. As result, some free space
 * forms. If there is enough free space (> low mark), wake Tx queue.
 *
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index b24425f74883..4f1efb108c28 100644
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -871,6 +871,10 @@ static int if_sdio_probe(struct sdio_func *func,
                if (sscanf(func->card->info[i],
                                "ID: %x", &model) == 1)
                        break;
+               if (!strcmp(func->card->info[i], "IBIS Wireless SDIO Card")) {
+                       model = 4;
+                       break;
+               }
        }
        if (i == func->card->num_info) {
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 50775f9234cc..18b1f9145389 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -257,7 +257,7 @@ static const struct rt2x00debug rt2500usb_rt2x00debug = {
 static void rt2500usb_config_mac_addr(struct rt2x00_dev *rt2x00dev,
                                      __le32 *mac)
 {
-        rt2500usb_register_multiwrite(rt2x00dev, MAC_CSR2, &mac,
+        rt2500usb_register_multiwrite(rt2x00dev, MAC_CSR2, mac,
                                      (3 * sizeof(__le16)));
 }
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index 2780df00623c..04663eb31950 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -124,7 +124,10 @@ void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
        struct data_entry *entry;
        struct data_desc *rxd;
        struct sk_buff *skb;
+        struct ieee80211_hdr *hdr;
        struct rxdata_entry_desc desc;
+        int header_size;
+        int align;
        u32 word;
        while (1) {
@@ -138,17 +141,26 @@ void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
                memset(&desc, 0x00, sizeof(desc));
                rt2x00dev->ops->lib->fill_rxdone(entry, &desc);
+                hdr = (struct ieee80211_hdr *)entry->data_addr;
+                header_size =
+                    ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_control));
+                /*
+                 * The data behind the ieee80211 header must be
+                 * aligned on a 4 byte boundary.
+                 */
+                align = header_size % 4;
                /*
                 * Allocate the sk_buffer, initialize it and copy
                 * all data into it.
                 */
-                skb = dev_alloc_skb(desc.size + NET_IP_ALIGN);
+                skb = dev_alloc_skb(desc.size + align);
                if (!skb)
                        return;
-                skb_reserve(skb, NET_IP_ALIGN);
+                skb_reserve(skb, align);
-                skb_put(skb, desc.size);
+                memcpy(skb_put(skb, desc.size), entry->data_addr, desc.size);
-                memcpy(skb->data, entry->data_addr, desc.size);
                /*
                 * Send the frame to rt2x00lib for further processing.
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 1f5675dd329f..568d73847dca 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -221,7 +221,9 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
        struct data_ring *ring = entry->ring;
        struct rt2x00_dev *rt2x00dev = ring->rt2x00dev;
        struct sk_buff *skb;
+        struct ieee80211_hdr *hdr;
        struct rxdata_entry_desc desc;
+        int header_size;
        int frame_size;
        if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags) ||
@@ -243,19 +245,37 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
         * Allocate a new sk buffer to replace the current one.
         * If allocation fails, we should drop the current frame
         * so we can recycle the existing sk buffer for the new frame.
+         * As alignment we use 2 and not NET_IP_ALIGN because we need
+         * to be sure we have 2 bytes room in the head. (NET_IP_ALIGN
+         * can be 0 on some hardware). We use these 2 bytes for frame
+         * alignment later, we assume that the chance that
+         * header_size % 4 == 2 is bigger then header_size % 2 == 0
+         * and thus optimize alignment by reserving the 2 bytes in
+         * advance.
         */
        frame_size = entry->ring->data_size + entry->ring->desc_size;
-        skb = dev_alloc_skb(frame_size + NET_IP_ALIGN);
+        skb = dev_alloc_skb(frame_size + 2);
        if (!skb)
                goto skip_entry;
-        skb_reserve(skb, NET_IP_ALIGN);
+        skb_reserve(skb, 2);
        skb_put(skb, frame_size);
        /*
-         * Trim the skb_buffer to only contain the valid
+         * The data behind the ieee80211 header must be
-         * frame data (so ignore the device's descriptor).
+         * aligned on a 4 byte boundary.
+         * After that trim the entire buffer down to only
+         * contain the valid frame data excluding the device
+         * descriptor.
         */
+        hdr = (struct ieee80211_hdr *)entry->skb->data;
+        header_size =
+            ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_control));
+        if (header_size % 4 == 0) {
+                skb_push(entry->skb, 2);
+                memmove(entry->skb->data, entry->skb->data + 2, skb->len - 2);
+        }
        skb_trim(entry->skb, desc.size);
        /*
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 01dbef19d651..ecae968ce091 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -1738,6 +1738,7 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
 {
        struct data_ring *ring;
        struct data_entry *entry;
+        struct data_entry *entry_done;
        struct data_desc *txd;
        u32 word;
        u32 reg;
@@ -1791,6 +1792,17 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
                    !rt2x00_get_field32(word, TXD_W0_VALID))
                        return;
+                entry_done = rt2x00_get_data_entry_done(ring);
+                while (entry != entry_done) {
+                        /* Catch up. Just report any entries we missed as
+                         * failed. */
+                        WARNING(rt2x00dev,
+                                "TX status report missed for entry %p\n",
+                                entry_done);
+                        rt2x00lib_txdone(entry_done, TX_FAIL_OTHER, 0);
+                        entry_done = rt2x00_get_data_entry_done(ring);
+                }
                /*
                 * Obtain the status about this packet.
                 */
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 2a8fc431099f..bca37bf0f545 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -852,11 +852,6 @@ static int xennet_poll(struct napi_struct *napi, int budget)
        spin_lock(&np->rx_lock);
-        if (unlikely(!netif_carrier_ok(dev))) {
-                spin_unlock(&np->rx_lock);
-                return 0;
-        }
        skb_queue_head_init(&rxq);
        skb_queue_head_init(&errq);
        skb_queue_head_init(&tmpq);
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 26cc4dcf4f0e..72e0bd5d80ac 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -465,6 +465,12 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_ICH7_31, quirk
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH8_0, quirk_ich6_lpc_acpi );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH8_2, quirk_ich6_lpc_acpi );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH8_3, quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH8_1, quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH8_4, quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH9_2, quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH9_4, quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH9_7, quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH9_8, quirk_ich6_lpc_acpi );
 /*
 * VIA ACPI: One IO region pointed to by longword at
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 3c5eb374adf8..6b9840cce0f4 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -76,6 +76,7 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res,
        int i = 0;
        int irq;
        int p, t;
+        static unsigned char warned;
        if (!valid_IRQ(gsi))
                return;
@@ -83,9 +84,10 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res,
        while (!(res->irq_resource[i].flags & IORESOURCE_UNSET) &&
               i < PNP_MAX_IRQ)
                i++;
-        if (i >= PNP_MAX_IRQ) {
+        if (i >= PNP_MAX_IRQ && !warned) {
                printk(KERN_ERR "pnpacpi: exceeded the max number of IRQ "
                                "resources: %d \n", PNP_MAX_IRQ);
+                warned = 1;
                return;
        }
        /*
@@ -169,6 +171,7 @@ static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res,
                                                int bus_master, int transfer)
 {
        int i = 0;
+        static unsigned char warned;
        while (i < PNP_MAX_DMA &&
               !(res->dma_resource[i].flags & IORESOURCE_UNSET))
@@ -183,9 +186,10 @@ static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res,
                }
                res->dma_resource[i].start = dma;
                res->dma_resource[i].end = dma;
-        } else {
+        } else if (!warned) {
                printk(KERN_ERR "pnpacpi: exceeded the max number of DMA "
                                "resources: %d \n", PNP_MAX_DMA);
+                warned = 1;
        }
 }
@@ -193,6 +197,7 @@ static void pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res,
                                               u64 io, u64 len, int io_decode)
 {
        int i = 0;
+        static unsigned char warned;
        while (!(res->port_resource[i].flags & IORESOURCE_UNSET) &&
               i < PNP_MAX_PORT)
@@ -207,9 +212,10 @@ static void pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res,
                }
                res->port_resource[i].start = io;
                res->port_resource[i].end = io + len - 1;
-        } else {
+        } else if (!warned) {
                printk(KERN_ERR "pnpacpi: exceeded the max number of IO "
                                "resources: %d \n", PNP_MAX_PORT);
+                warned = 1;
        }
 }
@@ -218,6 +224,7 @@ static void pnpacpi_parse_allocated_memresource(struct pnp_resource_table *res,
                                                int write_protect)
 {
        int i = 0;
+        static unsigned char warned;
        while (!(res->mem_resource[i].flags & IORESOURCE_UNSET) &&
               (i < PNP_MAX_MEM))
@@ -233,9 +240,10 @@ static void pnpacpi_parse_allocated_memresource(struct pnp_resource_table *res,
                res->mem_resource[i].start = mem;
                res->mem_resource[i].end = mem + len - 1;
-        } else {
+        } else if (!warned) {
                printk(KERN_ERR "pnpacpi: exceeded the max number of mem "
                                "resources: %d\n", PNP_MAX_MEM);
+                warned = 1;
        }
 }
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 9dd3952516c5..38a1ee2eacd8 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -13906,7 +13906,7 @@ static int advansys_release(struct Scsi_Host *shost)
 #define ASC_IOADR_TABLE_MAX_IX  11
-static PortAddr _asc_def_iop_base[ASC_IOADR_TABLE_MAX_IX] __devinitdata = {
+static PortAddr _asc_def_iop_base[ASC_IOADR_TABLE_MAX_IX] = {
        0x100, 0x0110, 0x120, 0x0130, 0x140, 0x0150, 0x0190,
        0x0210, 0x0230, 0x0250, 0x0330
 };
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 146d540f6281..288640756099 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -3041,7 +3041,6 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
        int cnt;
        int req_cnt;
        int seg_cnt;
-        dma_addr_t dma_handle;
        u8 dir;
        ENTER("qla1280_32bit_start_scsi");
@@ -3050,6 +3049,7 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
                cmd->cmnd[0]);
        /* Calculate number of entries and segments required. */
+        req_cnt = 1;
        seg_cnt = scsi_dma_map(cmd);
        if (seg_cnt) {
                /*
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index a5bcf1f390b3..8ecc0470b8f3 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1831,7 +1831,7 @@ probe_out:
        return ret;
 }
-static void __devexit
+static void
 qla2x00_remove_one(struct pci_dev *pdev)
 {
        scsi_qla_host_t *ha;
@@ -2965,7 +2965,7 @@ static struct pci_driver qla2xxx_pci_driver = {
        },
        .id_table       = qla2xxx_pci_tbl,
        .probe          = qla2x00_probe_one,
-        .remove         = __devexit_p(qla2x00_remove_one),
+        .remove         = qla2x00_remove_one,
        .err_handler    = &qla2xxx_err_handler,
 };
diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c
index 96258c60919d..63ee5cfbefbb 100644
--- a/drivers/ssb/scan.c
+++ b/drivers/ssb/scan.c
@@ -388,6 +388,17 @@ int ssb_bus_scan(struct ssb_bus *bus,
                case SSB_DEV_PCI:
                case SSB_DEV_PCIE:
 #ifdef CONFIG_SSB_DRIVER_PCICORE
+                        if (bus->bustype == SSB_BUSTYPE_PCI) {
+                                /* Ignore PCI cores on PCI-E cards.
+                                 * Ignore PCI-E cores on PCI cards. */
+                                if (dev->id.coreid == SSB_DEV_PCI) {
+                                        if (bus->host_pci->is_pcie)
+                                                continue;
+                                } else {
+                                        if (!bus->host_pci->is_pcie)
+                                                continue;
+                                }
+                        }
                        if (bus->pcicore.dev) {
                                ssb_printk(KERN_WARNING PFX
                                           "WARNING: Multiple PCI(E) cores found\n");
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 11a3a222dfc3..7c30cc8df71e 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -801,5 +801,5 @@ module_init(atmel_lcdfb_init);
 module_exit(atmel_lcdfb_exit);
 MODULE_DESCRIPTION("AT91/AT32 LCD Controller framebuffer driver");
-MODULE_AUTHOR("Nicolas Ferre <nicolas.ferre@rfo.atmel.com>");
+MODULE_AUTHOR("Nicolas Ferre <nicolas.ferre@atmel.com>");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 8d81ef019c6c..08d072552233 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -259,6 +259,10 @@ static const struct fb_videomode modedb[] = {
        /* 1366x768, 60 Hz, 47.403 kHz hsync, WXGA 16:9 aspect ratio */
        NULL, 60, 1366, 768, 13806, 120, 10, 14, 3, 32, 5,
        0, FB_VMODE_NONINTERLACED
+   }, {
+        /* 1280x800, 60 Hz, 47.403 kHz hsync, WXGA 16:10 aspect ratio */
+        NULL, 60, 1280, 800, 12048, 200, 64, 24, 1, 136, 3,
+        0, FB_VMODE_NONINTERLACED
    },
 };
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c
index b3128903d673..044a423a72cb 100644
--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@ -443,8 +443,6 @@ static int ps3fb_sync(struct fb_info *info, u32 frame)
        u32 ddr_line_length, xdr_line_length;
        u64 ddr_base, xdr_base;
-        acquire_console_sem();
        if (frame > par->num_frames - 1) {
                dev_dbg(info->device, "%s: invalid frame number (%u)\n",
                        __func__, frame);
@@ -464,7 +462,6 @@ static int ps3fb_sync(struct fb_info *info, u32 frame)
                         xdr_line_length);
 out:
-        release_console_sem();
        return error;
 }
@@ -479,7 +476,10 @@ static int ps3fb_release(struct fb_info *info, int user)
        if (atomic_dec_and_test(&ps3fb.f_count)) {
                if (atomic_read(&ps3fb.ext_flip)) {
                        atomic_set(&ps3fb.ext_flip, 0);
-                        ps3fb_sync(info, 0);    /* single buffer */
+                        if (!try_acquire_console_sem()) {
+                                ps3fb_sync(info, 0);    /* single buffer */
+                                release_console_sem();
+                        }
                }
        }
        return 0;
@@ -865,7 +865,9 @@ static int ps3fb_ioctl(struct fb_info *info, unsigned int cmd,
                        break;
                dev_dbg(info->device, "PS3FB_IOCTL_FSEL:%d\n", val);
+                acquire_console_sem();
                retval = ps3fb_sync(info, val);
+                release_console_sem();
                break;
        default:
@@ -885,7 +887,9 @@ static int ps3fbd(void *arg)
                set_current_state(TASK_INTERRUPTIBLE);
                if (ps3fb.is_kicked) {
                        ps3fb.is_kicked = 0;
+                        acquire_console_sem();
                        ps3fb_sync(info, 0);    /* single buffer */
+                        release_console_sem();
                }
                schedule();
        }
@@ -1234,12 +1238,6 @@ static int ps3fb_shutdown(struct ps3_system_bus_device *dev)
        ps3fb_flip_ctl(0, &ps3fb);      /* flip off */
        ps3fb.dinfo->irq.mask = 0;
-        if (info) {
-                unregister_framebuffer(info);
-                fb_dealloc_cmap(&info->cmap);
-                framebuffer_release(info);
-        }
        ps3av_register_flip_ctl(NULL, NULL);
        if (ps3fb.task) {
                struct task_struct *task = ps3fb.task;
@@ -1250,6 +1248,12 @@ static int ps3fb_shutdown(struct ps3_system_bus_device *dev)
                free_irq(ps3fb.irq_no, &dev->core);
                ps3_irq_plug_destroy(ps3fb.irq_no);
        }
+        if (info) {
+                unregister_framebuffer(info);
+                fb_dealloc_cmap(&info->cmap);
+                framebuffer_release(info);
+                info = dev->core.driver_data = NULL;
+        }
        iounmap((u8 __iomem *)ps3fb.dinfo);
        status = lv1_gpu_context_free(ps3fb.context_handle);
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 5857ccf5f6b1..ad35033f1a48 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -1026,7 +1026,7 @@ static int s3c2410fb_resume(struct platform_device *dev)
        clk_enable(info->clk);
        msleep(1);
-        s3c2410fb_init_registers(info);
+        s3c2410fb_init_registers(fbinfo);
        return 0;
 }
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index d1d6c0facd54..a14ef894d571 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -43,7 +43,7 @@ static struct fb_fix_screeninfo uvesafb_fix __devinitdata = {
 };
 static int mtrr         __devinitdata = 3; /* enable mtrr by default */
-static int blank        __devinitdata = 1; /* enable blanking by default */
+static int blank        = 1;               /* enable blanking by default */
 static int ypan         __devinitdata = 1; /* 0: scroll, 1: ypan, 2: ywrap */
 static int pmi_setpal   __devinitdata = 1; /* use PMI for palette changes */
 static int nocrtc       __devinitdata; /* ignore CRTC settings */
@@ -1549,7 +1549,7 @@ static void __devinit uvesafb_init_info(struct fb_info *info,
                info->fbops->fb_pan_display = NULL;
 }
-static void uvesafb_init_mtrr(struct fb_info *info)
+static void __devinit uvesafb_init_mtrr(struct fb_info *info)
 {
 #ifdef CONFIG_MTRR
        if (mtrr && !(info->fix.smem_start & (PAGE_SIZE - 1))) {
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 070217322c9f..33e50310e9e0 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -869,11 +869,9 @@ void w1_search_process(struct w1_master *dev, u8 search_type)
        w1_search_devices(dev, search_type, w1_slave_found);
        list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry) {
-                if (!test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags) && !--sl->ttl) {
+                if (!test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags) && !--sl->ttl)
                        w1_slave_detach(sl);
+                else if (test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags))
-                        dev->slave_count--;
-                } else if (test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags))
                        sl->ttl = dev->slave_ttl;
        }
diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c
index 6ea125eabeaa..c622a0e6c9ae 100644
--- a/drivers/watchdog/w83697hf_wdt.c
+++ b/drivers/watchdog/w83697hf_wdt.c
@@ -382,10 +382,8 @@ wdt_init(void)
                /* we will autodetect the W83697HF/HG watchdog */
                for (i = 0; ((!found) && (w83697hf_ioports[i] != 0)); i++) {
                        wdt_io = w83697hf_ioports[i];
-                        if (!w83697hf_check_wdt()) {
+                        if (!w83697hf_check_wdt())
                                found++;
-                                break;
-                        }
                }
        } else {
                if (!w83697hf_check_wdt())