38 files changed, 316 insertions, 163 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index caf873c14bfb..e7e197e3a4ff 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -129,6 +129,7 @@ static struct acpi_ec {
        struct mutex lock;
        wait_queue_head_t wait;
        struct list_head list;
+        atomic_t irq_count;
        u8 handlers_installed;
 } *boot_ec, *first_ec;
@@ -181,6 +182,8 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)
 {
        int ret = 0;
+        atomic_set(&ec->irq_count, 0);
        if (unlikely(event == ACPI_EC_EVENT_OBF_1 &&
                     test_bit(EC_FLAGS_NO_OBF1_GPE, &ec->flags)))
                force_poll = 1;
@@ -227,6 +230,7 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)
                while (time_before(jiffies, delay)) {
                        if (acpi_ec_check_status(ec, event))
                                goto end;
+                        msleep(5);
                }
        }
        pr_err(PREFIX "acpi_ec_wait timeout,"
@@ -529,6 +533,13 @@ static u32 acpi_ec_gpe_handler(void *data)
        struct acpi_ec *ec = data;
        pr_debug(PREFIX "~~~> interrupt\n");
+        atomic_inc(&ec->irq_count);
+        if (atomic_read(&ec->irq_count) > 5) {
+                pr_err(PREFIX "GPE storm detected, disabling EC GPE\n");
+                acpi_disable_gpe(NULL, ec->gpe, ACPI_ISR);
+                clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);
+                return ACPI_INTERRUPT_HANDLED;
+        }
        clear_bit(EC_FLAGS_WAIT_GPE, &ec->flags);
        if (test_bit(EC_FLAGS_GPE_MODE, &ec->flags))
                wake_up(&ec->wait);
@@ -943,11 +954,7 @@ int __init acpi_ec_ecdt_probe(void)
                boot_ec->command_addr = ecdt_ptr->control.address;
                boot_ec->data_addr = ecdt_ptr->data.address;
                boot_ec->gpe = ecdt_ptr->gpe;
-                if (ACPI_FAILURE(acpi_get_handle(NULL, ecdt_ptr->id,
+                boot_ec->handle = ACPI_ROOT_OBJECT;
-                                &boot_ec->handle))) {
-                        pr_info("Failed to locate handle for boot EC\n");
-                        boot_ec->handle = ACPI_ROOT_OBJECT;
-                }
        } else {
                /* This workaround is needed only on some broken machines,
                 * which require early EC, but fail to provide ECDT */
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 7f19859580c7..7af414a3c63e 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -25,6 +25,7 @@
 */
+#include <linux/dmi.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -76,6 +77,101 @@ static struct acpi_prt_entry *acpi_pci_irq_find_prt_entry(int segment,
        return NULL;
 }
+/* http://bugzilla.kernel.org/show_bug.cgi?id=4773 */
+static struct dmi_system_id medion_md9580[] = {
+        {
+                .ident = "Medion MD9580-F laptop",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "MEDIONNB"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "A555"),
+                },
+        },
+        { }
+};
+/* http://bugzilla.kernel.org/show_bug.cgi?id=5044 */
+static struct dmi_system_id dell_optiplex[] = {
+        {
+                .ident = "Dell Optiplex GX1",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex GX1 600S+"),
+                },
+        },
+        { }
+};
+/* http://bugzilla.kernel.org/show_bug.cgi?id=10138 */
+static struct dmi_system_id hp_t5710[] = {
+        {
+                .ident = "HP t5710",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "hp t5000 series"),
+                        DMI_MATCH(DMI_BOARD_NAME, "098Ch"),
+                },
+        },
+        { }
+};
+struct prt_quirk {
+        struct dmi_system_id    *system;
+        unsigned int            segment;
+        unsigned int            bus;
+        unsigned int            device;
+        unsigned char           pin;
+        char                    *source;        /* according to BIOS */
+        char                    *actual_source;
+};
+/*
+ * These systems have incorrect _PRT entries.  The BIOS claims the PCI
+ * interrupt at the listed segment/bus/device/pin is connected to the first
+ * link device, but it is actually connected to the second.
+ */
+static struct prt_quirk prt_quirks[] = {
+        { medion_md9580, 0, 0, 9, 'A',
+                "\\_SB_.PCI0.ISA.LNKA",
+                "\\_SB_.PCI0.ISA.LNKB"},
+        { dell_optiplex, 0, 0, 0xd, 'A',
+                "\\_SB_.LNKB",
+                "\\_SB_.LNKA"},
+        { hp_t5710, 0, 0, 1, 'A',
+                "\\_SB_.PCI0.LNK1",
+                "\\_SB_.PCI0.LNK3"},
+};
+static void
+do_prt_fixups(struct acpi_prt_entry *entry, struct acpi_pci_routing_table *prt)
+{
+        int i;
+        struct prt_quirk *quirk;
+        for (i = 0; i < ARRAY_SIZE(prt_quirks); i++) {
+                quirk = &prt_quirks[i];
+                /* All current quirks involve link devices, not GSIs */
+                if (!prt->source)
+                        continue;
+                if (dmi_check_system(quirk->system) &&
+                    entry->id.segment == quirk->segment &&
+                    entry->id.bus == quirk->bus &&
+                    entry->id.device == quirk->device &&
+                    entry->pin + 'A' == quirk->pin &&
+                    !strcmp(prt->source, quirk->source) &&
+                    strlen(prt->source) >= strlen(quirk->actual_source)) {
+                        printk(KERN_WARNING PREFIX "firmware reports "
+                                "%04x:%02x:%02x[%c] connected to %s; "
+                                "changing to %s\n",
+                                entry->id.segment, entry->id.bus,
+                                entry->id.device, 'A' + entry->pin,
+                                prt->source, quirk->actual_source);
+                        strcpy(prt->source, quirk->actual_source);
+                }
+        }
+}
 static int
 acpi_pci_irq_add_entry(acpi_handle handle,
                       int segment, int bus, struct acpi_pci_routing_table *prt)
@@ -96,6 +192,8 @@ acpi_pci_irq_add_entry(acpi_handle handle,
        entry->id.function = prt->address & 0xFFFF;
        entry->pin = prt->pin;
+        do_prt_fixups(entry, prt);
        /*
         * Type 1: Dynamic
         * ---------------
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index a3cc8a98255c..d9316ab66347 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -840,17 +840,19 @@ static int is_processor_present(acpi_handle handle)
        status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
-        /*
-         * if a processor object does not have an _STA object,
-         * OSPM assumes that the processor is present.
-         */
-        if (status == AE_NOT_FOUND)
-                return 1;
        if (ACPI_SUCCESS(status) && (sta & ACPI_STA_DEVICE_PRESENT))
                return 1;
-        ACPI_EXCEPTION((AE_INFO, status, "Processor Device is not present"));
+        /*
+         * _STA is mandatory for a processor that supports hot plug
+         */
+        if (status == AE_NOT_FOUND)
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                "Processor does not support hot plug\n"));
+        else
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Processor Device is not present"));
        return 0;
 }
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c
index 76ee766c84f9..e08b3fa6639f 100644
--- a/drivers/acpi/utilities/utobject.c
+++ b/drivers/acpi/utilities/utobject.c
@@ -432,7 +432,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
         * element -- which is legal)
         */
        if (!internal_object) {
-                *obj_length = 0;
+                *obj_length = sizeof(union acpi_object);
                return_ACPI_STATUS(AE_OK);
        }
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 12cce69b5441..ace958cb3894 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -713,7 +713,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
        kfree(obj);
-        if (device->cap._BCL && device->cap._BCM && device->cap._BQC && max_level > 0){
+        if (device->cap._BCL && device->cap._BCM && max_level > 0) {
                int result;
                static int count = 0;
                char *name;
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index c662d686154a..47c57a4294b7 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -331,8 +331,8 @@ module_param(fs_keystream, int, 0);
 #define FS_DEBUG_QSIZE   0x00001000
-#define func_enter() fs_dprintk (FS_DEBUG_FLOW, "fs: enter %s\n", __FUNCTION__)
+#define func_enter() fs_dprintk(FS_DEBUG_FLOW, "fs: enter %s\n", __func__)
-#define func_exit()  fs_dprintk (FS_DEBUG_FLOW, "fs: exit  %s\n", __FUNCTION__)
+#define func_exit()  fs_dprintk(FS_DEBUG_FLOW, "fs: exit  %s\n", __func__)
 static struct fs_dev *fs_boards = NULL;
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index f97e050338f0..9427a61f62b0 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -95,8 +95,8 @@
 #if 1
 #define ASSERT(expr)     if (!(expr)) { \
                             printk(FORE200E "assertion failed! %s[%d]: %s\n", \
-                                    __FUNCTION__, __LINE__, #expr); \
+                                    __func__, __LINE__, #expr); \
-                             panic(FORE200E "%s", __FUNCTION__); \
+                             panic(FORE200E "%s", __func__); \
                         }
 #else
 #define ASSERT(expr)     do {} while (0)
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index eee54c0cde68..b967919fb7e2 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -555,7 +555,7 @@ idt77252_tx_dump(struct idt77252_dev *card)
        struct vc_map *vc;
        int i;
-        printk("%s\n", __FUNCTION__);
+        printk("%s\n", __func__);
        for (i = 0; i < card->tct_size; i++) {
                vc = card->vcs[i];
                if (!vc)
@@ -1035,7 +1035,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
        skb = sb_pool_skb(card, le32_to_cpu(rsqe->word_2));
        if (skb == NULL) {
                printk("%s: NULL skb in %s, rsqe: %08x %08x %08x %08x\n",
-                       card->name, __FUNCTION__,
+                       card->name, __func__,
                       le32_to_cpu(rsqe->word_1), le32_to_cpu(rsqe->word_2),
                       le32_to_cpu(rsqe->word_3), le32_to_cpu(rsqe->word_4));
                return;
@@ -1873,7 +1873,7 @@ add_rx_skb(struct idt77252_dev *card, int queue,
                        return;
                if (sb_pool_add(card, skb, queue)) {
-                        printk("%s: SB POOL full\n", __FUNCTION__);
+                        printk("%s: SB POOL full\n", __func__);
                        goto outfree;
                }
@@ -1883,7 +1883,7 @@ add_rx_skb(struct idt77252_dev *card, int queue,
                IDT77252_PRV_PADDR(skb) = paddr;
                if (push_rx_skb(card, skb, queue)) {
-                        printk("%s: FB QUEUE full\n", __FUNCTION__);
+                        printk("%s: FB QUEUE full\n", __func__);
                        goto outunmap;
                }
        }
@@ -3821,12 +3821,12 @@ static int __init idt77252_init(void)
 {
        struct sk_buff *skb;
-        printk("%s: at %p\n", __FUNCTION__, idt77252_init);
+        printk("%s: at %p\n", __func__, idt77252_init);
        if (sizeof(skb->cb) < sizeof(struct atm_skb_data) +
                              sizeof(struct idt77252_skb_prv)) {
                printk(KERN_ERR "%s: skb->cb is too small (%lu < %lu)\n",
-                       __FUNCTION__, (unsigned long) sizeof(skb->cb),
+                       __func__, (unsigned long) sizeof(skb->cb),
                       (unsigned long) sizeof(struct atm_skb_data) +
                                       sizeof(struct idt77252_skb_prv));
                return -EIO;
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index 9e61fca46117..41ca721d2523 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -528,8 +528,7 @@ static int block_event_to_scatterlist(const struct vioblocklpevent *bevent,
                numsg = VIOMAXBLOCKDMA;
        *total_len = 0;
-        memset(sg, 0, sizeof(sg[0]) * VIOMAXBLOCKDMA);
+        sg_init_table(sg, VIOMAXBLOCKDMA);
        for (i = 0; (i < numsg) && (rw_data->dma_info[i].len > 0); ++i) {
                sg_dma_address(&sg[i]) = rw_data->dma_info[i].token;
                sg_dma_len(&sg[i]) = rw_data->dma_info[i].len;
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index f16c94cbf488..8b884f87d8b7 100644
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -149,6 +149,9 @@ static struct usb_device_id blacklist_ids[] = {
        { USB_DEVICE(0x0400, 0x0807), .driver_info = HCI_BROKEN_ISOC },
        { USB_DEVICE(0x0400, 0x080a), .driver_info = HCI_BROKEN_ISOC },
+        /* CONWISE Technology based adapters with buggy SCO support */
+        { USB_DEVICE(0x0e5e, 0x6622), .driver_info = HCI_BROKEN_ISOC },
        /* Belkin F8T012 and F8T013 devices */
        { USB_DEVICE(0x050d, 0x0012), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
        { USB_DEVICE(0x050d, 0x0013), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index 573abe440842..2fa43183d375 100644
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -335,7 +335,7 @@ static int __devinit amd756_probe(struct pci_dev *pdev,
        u8 temp;
        
        /* driver_data might come from user-space, so check it */
-        if (id->driver_data > ARRAY_SIZE(chipname))
+        if (id->driver_data >= ARRAY_SIZE(chipname))
                return -EINVAL;
        if (amd756_ioport) {
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 501f00cea782..e47aca0ca5ae 100644
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -1,6 +1,13 @@
 #
 # Makefile for miscellaneous I2C chip drivers.
 #
+# Think twice before you add a new driver to this directory.
+# Device drivers are better grouped according to the functionality they
+# implement rather than to the bus they are connected to. In particular:
+# * Hardware monitoring chip drivers go to drivers/hwmon
+# * RTC chip drivers go to drivers/rtc
+# * I/O expander drivers go to drivers/gpio
+#
 obj-$(CONFIG_DS1682)            += ds1682.o
 obj-$(CONFIG_SENSORS_EEPROM)    += eeprom.o
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 96da22e9a5a4..fd84b2a36338 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -90,12 +90,16 @@ static int i2c_device_probe(struct device *dev)
 {
        struct i2c_client       *client = to_i2c_client(dev);
        struct i2c_driver       *driver = to_i2c_driver(dev->driver);
+        int status;
        if (!driver->probe)
                return -ENODEV;
        client->driver = driver;
        dev_dbg(dev, "probe\n");
-        return driver->probe(client);
+        status = driver->probe(client);
+        if (status)
+                client->driver = NULL;
+        return status;
 }
 static int i2c_device_remove(struct device *dev)
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 9cef6fcf587b..d4ad6992f776 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -981,13 +981,13 @@ isdn_readbchan_tty(int di, int channel, struct tty_struct *tty, int cisco_hack)
 }
-static __inline int
+static inline int
 isdn_minor2drv(int minor)
 {
        return (dev->drvmap[minor]);
 }
-static __inline int
+static inline int
 isdn_minor2chan(int minor)
 {
        return (dev->chanmap[minor]);
diff --git a/drivers/isdn/i4l/isdn_v110.c b/drivers/isdn/i4l/isdn_v110.c
index 5484d3c38a57..c5d02b6aafab 100644
--- a/drivers/isdn/i4l/isdn_v110.c
+++ b/drivers/isdn/i4l/isdn_v110.c
@@ -62,7 +62,7 @@ static unsigned char V110_OffMatrix_38400[] =
 * and to 67452301 when keylen = 2. This is necessary because ordering on
 * the isdn line is the other way.
 */
-static __inline unsigned char
+static inline unsigned char
 FlipBits(unsigned char c, int keylen)
 {
        unsigned char b = c;
diff --git a/drivers/macintosh/via-pmu-backlight.c b/drivers/macintosh/via-pmu-backlight.c
index 741a2e3f4fc6..a348bb0791d3 100644
--- a/drivers/macintosh/via-pmu-backlight.c
+++ b/drivers/macintosh/via-pmu-backlight.c
@@ -17,7 +17,7 @@
 static struct backlight_ops pmu_backlight_data;
 static DEFINE_SPINLOCK(pmu_backlight_lock);
-static int sleeping;
+static int sleeping, uses_pmu_bl;
 static u8 bl_curve[FB_BACKLIGHT_LEVELS];
 static void pmu_backlight_init_curve(u8 off, u8 min, u8 max)
@@ -128,7 +128,7 @@ void pmu_backlight_set_sleep(int sleep)
        spin_lock_irqsave(&pmu_backlight_lock, flags);
        sleeping = sleep;
-        if (pmac_backlight) {
+        if (pmac_backlight && uses_pmu_bl) {
                if (sleep) {
                        struct adb_request req;
@@ -166,6 +166,7 @@ void __init pmu_backlight_init()
                printk(KERN_ERR "PMU Backlight registration failed\n");
                return;
        }
+        uses_pmu_bl = 1;
        bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
        pmu_backlight_init_curve(0x7F, 0x46, 0x0E);
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index ebec663d5d37..d6365a9f0637 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2528,7 +2528,7 @@ EXPORT_SYMBOL(pmu_wait_complete);
 EXPORT_SYMBOL(pmu_suspend);
 EXPORT_SYMBOL(pmu_resume);
 EXPORT_SYMBOL(pmu_unlock);
-#if defined(CONFIG_SUSPEND) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PPC32)
 EXPORT_SYMBOL(pmu_enable_irled);
 EXPORT_SYMBOL(pmu_battery_count);
 EXPORT_SYMBOL(pmu_batteries);
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index a0f0e605d630..fe7b5ec09708 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2366,15 +2366,15 @@ config GELIC_NET
          module will be called ps3_gelic.
 config GELIC_WIRELESS
-       bool "PS3 Wireless support"
+        bool "PS3 Wireless support"
-       depends on GELIC_NET
+        depends on GELIC_NET
-       select WIRELESS_EXT
+        select WIRELESS_EXT
-       help
+        help
-        This option adds the support for the wireless feature of PS3.
+          This option adds the support for the wireless feature of PS3.
-        If you have the wireless-less model of PS3 or have no plan to
+          If you have the wireless-less model of PS3 or have no plan to
-        use wireless feature, disabling this option saves memory.  As
+          use wireless feature, disabling this option saves memory.  As
-        the driver automatically distinguishes the models, you can
+          the driver automatically distinguishes the models, you can
-        safely enable this option even if you have a wireless-less model.
+          safely enable this option even if you have a wireless-less model.
 config GIANFAR
        tristate "Gianfar Ethernet"
@@ -2519,7 +2519,7 @@ config CHELSIO_T3
 config EHEA
        tristate "eHEA Ethernet support"
-        depends on IBMEBUS && INET
+        depends on IBMEBUS && INET && SPARSEMEM
        select INET_LRO
        ---help---
          This driver supports the IBM pSeries eHEA ethernet adapter.
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c
index 5136d94923aa..b1448637107f 100644
--- a/drivers/net/ac3200.c
+++ b/drivers/net/ac3200.c
@@ -369,7 +369,7 @@ MODULE_PARM_DESC(mem, "Memory base address(es)");
 MODULE_DESCRIPTION("Ansel AC3200 EISA ethernet driver");
 MODULE_LICENSE("GPL");
-int __init init_module(void)
+static int __init ac3200_module_init(void)
 {
        struct net_device *dev;
        int this_dev, found = 0;
@@ -404,8 +404,7 @@ static void cleanup_card(struct net_device *dev)
        iounmap(ei_status.mem);
 }
-void __exit
+static void __exit ac3200_module_exit(void)
-cleanup_module(void)
 {
        int this_dev;
@@ -418,4 +417,6 @@ cleanup_module(void)
                }
        }
 }
+module_init(ac3200_module_init);
+module_exit(ac3200_module_exit);
 #endif /* MODULE */
diff --git a/drivers/net/apne.c b/drivers/net/apne.c
index c12cbdf368b1..47a8275d3962 100644
--- a/drivers/net/apne.c
+++ b/drivers/net/apne.c
@@ -569,7 +569,7 @@ static irqreturn_t apne_interrupt(int irq, void *dev_id)
 #ifdef MODULE
 static struct net_device *apne_dev;
-int __init init_module(void)
+static int __init apne_module_init(void)
 {
        apne_dev = apne_probe(-1);
        if (IS_ERR(apne_dev))
@@ -577,7 +577,7 @@ int __init init_module(void)
        return 0;
 }
-void __exit cleanup_module(void)
+static void __exit apne_module_exit(void)
 {
        unregister_netdev(apne_dev);
@@ -591,7 +591,8 @@ void __exit cleanup_module(void)
        free_netdev(apne_dev);
 }
+module_init(apne_module_init);
+module_exit(apne_module_exit);
 #endif
 static int init_pcmcia(void)
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index 6ab2c2d4d673..fef5560bc7a2 100644
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -1252,7 +1252,7 @@ module_param(irq, int, 0);
 module_param(dma, int, 0);
-int __init init_module(void)
+static int __init ltpc_module_init(void)
 {
        if(io == 0)
                printk(KERN_NOTICE
@@ -1263,6 +1263,7 @@ int __init init_module(void)
                return PTR_ERR(dev_ltpc);
        return 0;
 }
+module_init(ltpc_module_init);
 #endif
 static void __exit ltpc_cleanup(void)
diff --git a/drivers/net/arcnet/capmode.c b/drivers/net/arcnet/capmode.c
index cc4610db6395..02cb8f1c1148 100644
--- a/drivers/net/arcnet/capmode.c
+++ b/drivers/net/arcnet/capmode.c
@@ -80,17 +80,19 @@ void arcnet_cap_init(void)
 #ifdef MODULE
-int __init init_module(void)
+static int __init capmode_module_init(void)
 {
        printk(VERSION);
        arcnet_cap_init();
        return 0;
 }
-void cleanup_module(void)
+static void __exit capmode_module_exit(void)
 {
        arcnet_unregister_proto(&capmode_proto);
 }
+module_init(capmode_module_init);
+module_exit(capmode_module_exit);
 MODULE_LICENSE("GPL");
 #endif                          /* MODULE */
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index b74dbeef8050..13c293b286de 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -336,8 +336,6 @@ struct lance_addr {
 /***************************** Prototypes *****************************/
-static int addr_accessible( volatile void *regp, int wordflag, int
-                            writeflag );
 static unsigned long lance_probe1( struct net_device *dev, struct lance_addr
                                   *init_rec );
 static int lance_open( struct net_device *dev );
@@ -406,7 +404,8 @@ struct net_device * __init atarilance_probe(int unit)
 /* Derived from hwreg_present() in atari/config.c: */
-static int __init addr_accessible( volatile void *regp, int wordflag, int writeflag )
+static noinline int __init addr_accessible(volatile void *regp, int wordflag,
+                                           int writeflag)
 {
        int             ret;
        long    flags;
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 36ba6dc96acc..cdf3090a1885 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2782,16 +2782,13 @@ static void __devexit e100_remove(struct pci_dev *pdev)
        }
 }
-#ifdef CONFIG_PM
 static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
 {
        struct net_device *netdev = pci_get_drvdata(pdev);
        struct nic *nic = netdev_priv(netdev);
        if (netif_running(netdev))
-                napi_disable(&nic->napi);
+                e100_down(nic);
-        del_timer_sync(&nic->watchdog);
-        netif_carrier_off(nic->netdev);
        netif_device_detach(netdev);
        pci_save_state(pdev);
@@ -2804,14 +2801,13 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
                pci_enable_wake(pdev, PCI_D3cold, 0);
        }
-        free_irq(pdev->irq, netdev);
        pci_disable_device(pdev);
        pci_set_power_state(pdev, PCI_D3hot);
        return 0;
 }
+#ifdef CONFIG_PM
 static int e100_resume(struct pci_dev *pdev)
 {
        struct net_device *netdev = pci_get_drvdata(pdev);
@@ -2832,26 +2828,7 @@ static int e100_resume(struct pci_dev *pdev)
 static void e100_shutdown(struct pci_dev *pdev)
 {
-        struct net_device *netdev = pci_get_drvdata(pdev);
+        e100_suspend(pdev, PMSG_SUSPEND);
-        struct nic *nic = netdev_priv(netdev);
-        if (netif_running(netdev))
-                napi_disable(&nic->napi);
-        del_timer_sync(&nic->watchdog);
-        netif_carrier_off(nic->netdev);
-        if ((nic->flags & wol_magic) | e100_asf(nic)) {
-                pci_enable_wake(pdev, PCI_D3hot, 1);
-                pci_enable_wake(pdev, PCI_D3cold, 1);
-        } else {
-                pci_enable_wake(pdev, PCI_D3hot, 0);
-                pci_enable_wake(pdev, PCI_D3cold, 0);
-        }
-        free_irq(pdev->irq, netdev);
-        pci_disable_device(pdev);
-        pci_set_power_state(pdev, PCI_D3hot);
 }
 /* ------------------ PCI Error Recovery infrastructure  -------------- */
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index 0809a6a5a286..46a90e9ec563 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -900,7 +900,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
                if (RSV_GETBIT(rxstat, RSV_LENCHECKERR))
                        ndev->stats.rx_frame_errors++;
        } else {
-                skb = dev_alloc_skb(len);
+                skb = dev_alloc_skb(len + NET_IP_ALIGN);
                if (!skb) {
                        if (netif_msg_rx_err(priv))
                                dev_err(&ndev->dev,
@@ -908,6 +908,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
                        ndev->stats.rx_dropped++;
                } else {
                        skb->dev = ndev;
+                        skb_reserve(skb, NET_IP_ALIGN);
                        /* copy the packet from the receive buffer */
                        enc28j60_mem_read(priv, priv->next_pk_ptr + sizeof(rsv),
                                        len, skb_put(skb, len));
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 23d0a4afe0e1..c2095ce531c9 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2133,7 +2133,7 @@ static void ixgbe_watchdog(unsigned long data)
                                (link_speed == IXGBE_LINK_SPEED_10GB_FULL ?
                                 "10 Gbps" :
                                 (link_speed == IXGBE_LINK_SPEED_1GB_FULL ?
-                                  "1 Gpbs" : "unknown speed")),
+                                  "1 Gbps" : "unknown speed")),
                                ((FLOW_RX && FLOW_TX) ? "RX/TX" :
                                 (FLOW_RX ? "RX" :
                                 (FLOW_TX ? "TX" : "None"))));
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index b528ce77c406..771139e283af 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -2104,6 +2104,7 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR(  "Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani"
                " and Dale Farnsworth");
 MODULE_DESCRIPTION("Ethernet driver for Marvell MV643XX");
+MODULE_ALIAS("platform:mv643xx_eth");
 /*
 * The second part is the low level driver of the gigE ethernet ports.
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index e8a63e483a2b..ce95c5d168fe 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -1268,7 +1268,7 @@ static irqreturn_t ax_interrupt(int irq, void *dev_id)
                }
        }
    
-        if (interrupts && ei_debug) 
+        if (interrupts && ei_debug > 3) 
        {
                handled = 1;
                if (nr_serviced >= MAX_SERVICE) 
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index f4ca0591231d..3ac8529bb92c 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -67,6 +67,7 @@ config REALTEK_PHY
 config FIXED_PHY
        bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+        depends on PHYLIB=y
        ---help---
          Adds the platform "fixed" MDIO Bus to cover the boards that use
          PHYs that are not connected to the real MDIO bus.
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c
index 7ed632db00d7..d926168bc780 100644
--- a/drivers/net/phy/davicom.c
+++ b/drivers/net/phy/davicom.c
@@ -37,6 +37,7 @@
 #define MII_DM9161_SCR          0x10
 #define MII_DM9161_SCR_INIT     0x0610
+#define MII_DM9161_SCR_RMII     0x0100
 /* DM9161 Interrupt Register */
 #define MII_DM9161_INTR 0x15
@@ -103,7 +104,7 @@ static int dm9161_config_aneg(struct phy_device *phydev)
 static int dm9161_config_init(struct phy_device *phydev)
 {
-        int err;
+        int err, temp;
        /* Isolate the PHY */
        err = phy_write(phydev, MII_BMCR, BMCR_ISOLATE);
@@ -111,9 +112,19 @@ static int dm9161_config_init(struct phy_device *phydev)
        if (err < 0)
                return err;
-        /* Do not bypass the scrambler/descrambler */
+        switch (phydev->interface) {
-        err = phy_write(phydev, MII_DM9161_SCR, MII_DM9161_SCR_INIT);
+        case PHY_INTERFACE_MODE_MII:
+                temp = MII_DM9161_SCR_INIT;
+                break;
+        case PHY_INTERFACE_MODE_RMII:
+                temp =  MII_DM9161_SCR_INIT | MII_DM9161_SCR_RMII;
+                break;
+        default:
+                return -EINVAL;
+        }
+        /* Do not bypass the scrambler/descrambler */
+        err = phy_write(phydev, MII_DM9161_SCR, temp);
        if (err < 0)
                return err;
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index 86e5dba079fe..3d10ca050b79 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -302,14 +302,14 @@ pppol2tp_session_find(struct pppol2tp_tunnel *tunnel, u16 session_id)
        struct pppol2tp_session *session;
        struct hlist_node *walk;
-        read_lock(&tunnel->hlist_lock);
+        read_lock_bh(&tunnel->hlist_lock);
        hlist_for_each_entry(session, walk, session_list, hlist) {
                if (session->tunnel_addr.s_session == session_id) {
-                        read_unlock(&tunnel->hlist_lock);
+                        read_unlock_bh(&tunnel->hlist_lock);
                        return session;
                }
        }
-        read_unlock(&tunnel->hlist_lock);
+        read_unlock_bh(&tunnel->hlist_lock);
        return NULL;
 }
@@ -320,14 +320,14 @@ static struct pppol2tp_tunnel *pppol2tp_tunnel_find(u16 tunnel_id)
 {
        struct pppol2tp_tunnel *tunnel = NULL;
-        read_lock(&pppol2tp_tunnel_list_lock);
+        read_lock_bh(&pppol2tp_tunnel_list_lock);
        list_for_each_entry(tunnel, &pppol2tp_tunnel_list, list) {
                if (tunnel->stats.tunnel_id == tunnel_id) {
-                        read_unlock(&pppol2tp_tunnel_list_lock);
+                        read_unlock_bh(&pppol2tp_tunnel_list_lock);
                        return tunnel;
                }
        }
-        read_unlock(&pppol2tp_tunnel_list_lock);
+        read_unlock_bh(&pppol2tp_tunnel_list_lock);
        return NULL;
 }
@@ -342,10 +342,11 @@ static struct pppol2tp_tunnel *pppol2tp_tunnel_find(u16 tunnel_id)
 static void pppol2tp_recv_queue_skb(struct pppol2tp_session *session, struct sk_buff *skb)
 {
        struct sk_buff *skbp;
+        struct sk_buff *tmp;
        u16 ns = PPPOL2TP_SKB_CB(skb)->ns;
-        spin_lock(&session->reorder_q.lock);
+        spin_lock_bh(&session->reorder_q.lock);
-        skb_queue_walk(&session->reorder_q, skbp) {
+        skb_queue_walk_safe(&session->reorder_q, skbp, tmp) {
                if (PPPOL2TP_SKB_CB(skbp)->ns > ns) {
                        __skb_insert(skb, skbp->prev, skbp, &session->reorder_q);
                        PRINTK(session->debug, PPPOL2TP_MSG_SEQ, KERN_DEBUG,
@@ -360,7 +361,7 @@ static void pppol2tp_recv_queue_skb(struct pppol2tp_session *session, struct sk_
        __skb_queue_tail(&session->reorder_q, skb);
 out:
-        spin_unlock(&session->reorder_q.lock);
+        spin_unlock_bh(&session->reorder_q.lock);
 }
 /* Dequeue a single skb.
@@ -371,10 +372,9 @@ static void pppol2tp_recv_dequeue_skb(struct pppol2tp_session *session, struct s
        int length = PPPOL2TP_SKB_CB(skb)->length;
        struct sock *session_sock = NULL;
-        /* We're about to requeue the skb, so unlink it and return resources
+        /* We're about to requeue the skb, so return resources
         * to its current owner (a socket receive buffer).
         */
-        skb_unlink(skb, &session->reorder_q);
        skb_orphan(skb);
        tunnel->stats.rx_packets++;
@@ -442,7 +442,7 @@ static void pppol2tp_recv_dequeue(struct pppol2tp_session *session)
         * expect to send up next, dequeue it and any other
         * in-sequence packets behind it.
         */
-        spin_lock(&session->reorder_q.lock);
+        spin_lock_bh(&session->reorder_q.lock);
        skb_queue_walk_safe(&session->reorder_q, skb, tmp) {
                if (time_after(jiffies, PPPOL2TP_SKB_CB(skb)->expires)) {
                        session->stats.rx_seq_discards++;
@@ -470,13 +470,18 @@ static void pppol2tp_recv_dequeue(struct pppol2tp_session *session)
                                goto out;
                        }
                }
-                spin_unlock(&session->reorder_q.lock);
+                __skb_unlink(skb, &session->reorder_q);
+                /* Process the skb. We release the queue lock while we
+                 * do so to let other contexts process the queue.
+                 */
+                spin_unlock_bh(&session->reorder_q.lock);
                pppol2tp_recv_dequeue_skb(session, skb);
-                spin_lock(&session->reorder_q.lock);
+                spin_lock_bh(&session->reorder_q.lock);
        }
 out:
-        spin_unlock(&session->reorder_q.lock);
+        spin_unlock_bh(&session->reorder_q.lock);
 }
 /* Internal receive frame. Do the real work of receiving an L2TP data frame
@@ -1059,7 +1064,7 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
        /* Get routing info from the tunnel socket */
        dst_release(skb->dst);
-        skb->dst = sk_dst_get(sk_tun);
+        skb->dst = dst_clone(__sk_dst_get(sk_tun));
        skb_orphan(skb);
        skb->sk = sk_tun;
@@ -1107,7 +1112,7 @@ static void pppol2tp_tunnel_closeall(struct pppol2tp_tunnel *tunnel)
        PRINTK(tunnel->debug, PPPOL2TP_MSG_CONTROL, KERN_INFO,
               "%s: closing all sessions...\n", tunnel->name);
-        write_lock(&tunnel->hlist_lock);
+        write_lock_bh(&tunnel->hlist_lock);
        for (hash = 0; hash < PPPOL2TP_HASH_SIZE; hash++) {
 again:
                hlist_for_each_safe(walk, tmp, &tunnel->session_hlist[hash]) {
@@ -1129,7 +1134,7 @@ again:
                         * disappear as we're jumping between locks.
                         */
                        sock_hold(sk);
-                        write_unlock(&tunnel->hlist_lock);
+                        write_unlock_bh(&tunnel->hlist_lock);
                        lock_sock(sk);
                        if (sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND)) {
@@ -1154,11 +1159,11 @@ again:
                         * list so we are guaranteed to make forward
                         * progress.
                         */
-                        write_lock(&tunnel->hlist_lock);
+                        write_lock_bh(&tunnel->hlist_lock);
                        goto again;
                }
        }
-        write_unlock(&tunnel->hlist_lock);
+        write_unlock_bh(&tunnel->hlist_lock);
 }
 /* Really kill the tunnel.
@@ -1167,9 +1172,9 @@ again:
 static void pppol2tp_tunnel_free(struct pppol2tp_tunnel *tunnel)
 {
        /* Remove from socket list */
-        write_lock(&pppol2tp_tunnel_list_lock);
+        write_lock_bh(&pppol2tp_tunnel_list_lock);
        list_del_init(&tunnel->list);
-        write_unlock(&pppol2tp_tunnel_list_lock);
+        write_unlock_bh(&pppol2tp_tunnel_list_lock);
        atomic_dec(&pppol2tp_tunnel_count);
        kfree(tunnel);
@@ -1245,9 +1250,9 @@ static void pppol2tp_session_destruct(struct sock *sk)
                                /* Delete the session socket from the
                                 * hash
                                 */
-                                write_lock(&tunnel->hlist_lock);
+                                write_lock_bh(&tunnel->hlist_lock);
                                hlist_del_init(&session->hlist);
-                                write_unlock(&tunnel->hlist_lock);
+                                write_unlock_bh(&tunnel->hlist_lock);
                                atomic_dec(&pppol2tp_session_count);
                        }
@@ -1392,9 +1397,9 @@ static struct sock *pppol2tp_prepare_tunnel_socket(int fd, u16 tunnel_id,
        /* Add tunnel to our list */
        INIT_LIST_HEAD(&tunnel->list);
-        write_lock(&pppol2tp_tunnel_list_lock);
+        write_lock_bh(&pppol2tp_tunnel_list_lock);
        list_add(&tunnel->list, &pppol2tp_tunnel_list);
-        write_unlock(&pppol2tp_tunnel_list_lock);
+        write_unlock_bh(&pppol2tp_tunnel_list_lock);
        atomic_inc(&pppol2tp_tunnel_count);
        /* Bump the reference count. The tunnel context is deleted
@@ -1599,11 +1604,11 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
        sk->sk_user_data = session;
        /* Add session to the tunnel's hash list */
-        write_lock(&tunnel->hlist_lock);
+        write_lock_bh(&tunnel->hlist_lock);
        hlist_add_head(&session->hlist,
                       pppol2tp_session_id_hash(tunnel,
                                                session->tunnel_addr.s_session));
-        write_unlock(&tunnel->hlist_lock);
+        write_unlock_bh(&tunnel->hlist_lock);
        atomic_inc(&pppol2tp_session_count);
@@ -2205,7 +2210,7 @@ static struct pppol2tp_session *next_session(struct pppol2tp_tunnel *tunnel, str
        int next = 0;
        int i;
-        read_lock(&tunnel->hlist_lock);
+        read_lock_bh(&tunnel->hlist_lock);
        for (i = 0; i < PPPOL2TP_HASH_SIZE; i++) {
                hlist_for_each_entry(session, walk, &tunnel->session_hlist[i], hlist) {
                        if (curr == NULL) {
@@ -2223,7 +2228,7 @@ static struct pppol2tp_session *next_session(struct pppol2tp_tunnel *tunnel, str
                }
        }
 out:
-        read_unlock(&tunnel->hlist_lock);
+        read_unlock_bh(&tunnel->hlist_lock);
        if (!found)
                session = NULL;
@@ -2234,13 +2239,13 @@ static struct pppol2tp_tunnel *next_tunnel(struct pppol2tp_tunnel *curr)
 {
        struct pppol2tp_tunnel *tunnel = NULL;
-        read_lock(&pppol2tp_tunnel_list_lock);
+        read_lock_bh(&pppol2tp_tunnel_list_lock);
        if (list_is_last(&curr->list, &pppol2tp_tunnel_list)) {
                goto out;
        }
        tunnel = list_entry(curr->list.next, struct pppol2tp_tunnel, list);
 out:
-        read_unlock(&pppol2tp_tunnel_list_lock);
+        read_unlock_bh(&pppol2tp_tunnel_list_lock);
        return tunnel;
 }
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 6179a0a2032c..c72787adeba3 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -1088,7 +1088,7 @@ static int s2io_print_pci_mode(struct s2io_nic *nic)
 *  '-1' on failure
 */
-int init_tti(struct s2io_nic *nic, int link)
+static int init_tti(struct s2io_nic *nic, int link)
 {
        struct XENA_dev_config __iomem *bar0 = nic->bar0;
        register u64 val64 = 0;
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 77d9dd7ea34f..567c62757e9d 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -910,7 +910,8 @@ static void de_set_media (struct de_private *de)
        unsigned media = de->media_type;
        u32 macmode = dr32(MacMode);
-        BUG_ON(de_is_running(de));
+        if (de_is_running(de))
+                printk(KERN_WARNING "%s: chip is running while changing media!\n", de->dev->name);
        if (de->de21040)
                dw32(CSR11, FULL_DUPLEX_MAGIC);
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 15d5c58e57bc..e59255a155a9 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -751,7 +751,7 @@ upload_data( struct net_device  *dev,  unsigned  framelen,  unsigned  frameno,
 }
-static __inline void
+static inline void
 send_complete( struct net_local  *nl )
 {
 #ifdef CONFIG_SBNI_MULTILINE
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index bdc6a1cc2103..f0ef7081bdeb 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -578,7 +578,7 @@ int lbs_process_rx_command(struct lbs_private *priv)
                goto done;
        }
        if (respcmd != CMD_RET(curcmd) &&
-            respcmd != CMD_802_11_ASSOCIATE && curcmd != CMD_RET_802_11_ASSOCIATE) {
+            respcmd != CMD_RET_802_11_ASSOCIATE && curcmd != CMD_802_11_ASSOCIATE) {
                lbs_pr_info("Invalid CMD_RESP %x to command %x!\n", respcmd, curcmd);
                spin_unlock_irqrestore(&priv->driver_lock, flags);
                ret = -1;
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index e808db98f2f5..93ea212fedd5 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2302,9 +2302,9 @@ static void rt61pci_configure_filter(struct ieee80211_hw *hw,
         * Apply some rules to the filters:
         * - Some filters imply different filters to be set.
         * - Some things we can't filter out at all.
+         * - Multicast filter seems to kill broadcast traffic so never use it.
         */
-        if (mc_count)
+        *total_flags |= FIF_ALLMULTI;
-                *total_flags |= FIF_ALLMULTI;
        if (*total_flags & FIF_OTHER_BSS ||
            *total_flags & FIF_PROMISC_IN_BSS)
                *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 4fac2d414d84..8103d41a1543 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1869,9 +1869,9 @@ static void rt73usb_configure_filter(struct ieee80211_hw *hw,
         * Apply some rules to the filters:
         * - Some filters imply different filters to be set.
         * - Some things we can't filter out at all.
+         * - Multicast filter seems to kill broadcast traffic so never use it.
         */
-        if (mc_count)
+        *total_flags |= FIF_ALLMULTI;
-                *total_flags |= FIF_ALLMULTI;
        if (*total_flags & FIF_OTHER_BSS ||
            *total_flags & FIF_PROMISC_IN_BSS)
                *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
@@ -2098,6 +2098,7 @@ static struct usb_device_id rt73usb_device_table[] = {
        /* D-Link */
        { USB_DEVICE(0x07d1, 0x3c03), USB_DEVICE_DATA(&rt73usb_ops) },
        { USB_DEVICE(0x07d1, 0x3c04), USB_DEVICE_DATA(&rt73usb_ops) },
+        { USB_DEVICE(0x07d1, 0x3c07), USB_DEVICE_DATA(&rt73usb_ops) },
        /* Gemtek */
        { USB_DEVICE(0x15a9, 0x0004), USB_DEVICE_DATA(&rt73usb_ops) },
        /* Gigabyte */
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 4065139753b6..37993206ae5d 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -17,7 +17,6 @@
 #include <linux/slab.h>
 #include <linux/pnp.h>
 #include <linux/io.h>
-#include <linux/dmi.h>
 #include <linux/kallsyms.h>
 #include "base.h"
@@ -109,42 +108,73 @@ static void quirk_sb16audio_resources(struct pnp_dev *dev)
                       "pnp: SB audio device quirk - increasing port range\n");
 }
-static void quirk_supermicro_h8dce_system(struct pnp_dev *dev)
+#include <linux/pci.h>
+static void quirk_system_pci_resources(struct pnp_dev *dev)
 {
-        int i;
+        struct pci_dev *pdev = NULL;
-        static struct dmi_system_id supermicro_h8dce[] = {
+        resource_size_t pnp_start, pnp_end, pci_start, pci_end;
-                {
+        int i, j;
-                        .ident = "Supermicro H8DCE",
-                        .matches = {
-                                DMI_MATCH(DMI_SYS_VENDOR, "Supermicro"),
-                                DMI_MATCH(DMI_PRODUCT_NAME, "H8DCE"),
-                        },
-                },
-                { }
-        };
-        if (!dmi_check_system(supermicro_h8dce))
-                return;
        /*
-         * On the Supermicro H8DCE, there's a system device with resources
+         * Some BIOSes have PNP motherboard devices with resources that
-         * that overlap BAR 6 of the built-in SATA PCI adapter.  If the PNP
+         * partially overlap PCI BARs.  The PNP system driver claims these
-         * system device claims them, the sata_nv driver won't be able to.
+         * motherboard resources, which prevents the normal PCI driver from
-         * More details at:
+         * requesting them later.
-         *     https://bugzilla.redhat.com/show_bug.cgi?id=280641
+         *
-         *     https://bugzilla.redhat.com/show_bug.cgi?id=313491
+         * This patch disables the PNP resources that conflict with PCI BARs
-         *     http://lkml.org/lkml/2008/1/9/449
+         * so they won't be claimed by the PNP system driver.
-         *     http://thread.gmane.org/gmane.linux.acpi.devel/27312
         */
-        for (i = 0; i < PNP_MAX_MEM; i++) {
+        for_each_pci_dev(pdev) {
-                if (pnp_mem_valid(dev, i) && pnp_mem_len(dev, i) &&
+                for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
-                    (pnp_mem_start(dev, i) & 0xdfef0000) == 0xdfef0000) {
+                        if (!(pci_resource_flags(pdev, i) & IORESOURCE_MEM) ||
-                        dev_warn(&dev->dev, "disabling 0x%llx-0x%llx to prevent"
+                            pci_resource_len(pdev, i) == 0)
-                                " conflict with sata_nv PCI device\n",
+                                continue;
-                                (unsigned long long) pnp_mem_start(dev, i),
-                                (unsigned long long) (pnp_mem_start(dev, i) +
+                        pci_start = pci_resource_start(pdev, i);
-                                        pnp_mem_len(dev, i) - 1));
+                        pci_end = pci_resource_end(pdev, i);
-                        pnp_mem_flags(dev, i) = 0;
+                        for (j = 0; j < PNP_MAX_MEM; j++) {
+                                if (!pnp_mem_valid(dev, j) ||
+                                    pnp_mem_len(dev, j) == 0)
+                                        continue;
+                                pnp_start = pnp_mem_start(dev, j);
+                                pnp_end = pnp_mem_end(dev, j);
+                                /*
+                                 * If the PNP region doesn't overlap the PCI
+                                 * region at all, there's no problem.
+                                 */
+                                if (pnp_end < pci_start || pnp_start > pci_end)
+                                        continue;
+                                /*
+                                 * If the PNP region completely encloses (or is
+                                 * at least as large as) the PCI region, that's
+                                 * also OK.  For example, this happens when the
+                                 * PNP device describes a bridge with PCI
+                                 * behind it.
+                                 */
+                                if (pnp_start <= pci_start &&
+                                    pnp_end >= pci_end)
+                                        continue;
+                                /*
+                                 * Otherwise, the PNP region overlaps *part* of
+                                 * the PCI region, and that might prevent a PCI
+                                 * driver from requesting its resources.
+                                 */
+                                dev_warn(&dev->dev, "mem resource "
+                                        "(0x%llx-0x%llx) overlaps %s BAR %d "
+                                        "(0x%llx-0x%llx), disabling\n",
+                                        (unsigned long long) pnp_start,
+                                        (unsigned long long) pnp_end,
+                                        pci_name(pdev), i,
+                                        (unsigned long long) pci_start,
+                                        (unsigned long long) pci_end);
+                                pnp_mem_flags(dev, j) = 0;
+                        }
                }
        }
 }
@@ -169,8 +199,8 @@ static struct pnp_fixup pnp_fixups[] = {
        {"CTL0043", quirk_sb16audio_resources},
        {"CTL0044", quirk_sb16audio_resources},
        {"CTL0045", quirk_sb16audio_resources},
-        {"PNP0c01", quirk_supermicro_h8dce_system},
+        {"PNP0c01", quirk_system_pci_resources},
-        {"PNP0c02", quirk_supermicro_h8dce_system},
+        {"PNP0c02", quirk_system_pci_resources},
        {""}
 };