Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c

6 files changed, 111 insertions, 76 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index dfd0af0e0a16..c016bfe1defd 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -671,6 +671,9 @@ struct rt2x00_dev {
          * This will only be compiled in when required.
          */
 #ifdef CONFIG_RT2X00_LIB_RFKILL
+unsigned long rfkill_state;
+#define RFKILL_STATE_ALLOCATED          1
+#define RFKILL_STATE_REGISTERED         2
         struct rfkill *rfkill;
         struct input_polled_dev *poll_dev;
 #endif /* CONFIG_RT2X00_LIB_RFKILL */
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index b81efc9b058d..acf4d67ba43d 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -994,7 +994,7 @@ static void rt2x00lib_uninitialize(struct rt2x00_dev *rt2x00dev)
                 return;
 
         /*
-         * Unregister rfkill.
+         * Unregister extra components.
          */
         rt2x00rfkill_unregister(rt2x00dev);
 
@@ -1033,11 +1033,9 @@ static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev)
         __set_bit(DEVICE_INITIALIZED, &rt2x00dev->flags);
 
         /*
-         * Register the rfkill handler.
+         * Register the extra components.
          */
-        status = rt2x00rfkill_register(rt2x00dev);
-        if (status)
-                goto exit;
+        rt2x00rfkill_register(rt2x00dev);
 
         return 0;
 
@@ -1151,20 +1149,10 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
         }
 
         /*
-         * Register LED.
+         * Register extra components.
          */
         rt2x00leds_register(rt2x00dev);
-
-        /*
-         * Allocatie rfkill.
-         */
-        retval = rt2x00rfkill_allocate(rt2x00dev);
-        if (retval)
-                goto exit;
-
-        /*
-         * Open the debugfs entry.
-         */
+        rt2x00rfkill_allocate(rt2x00dev);
         rt2x00debug_register(rt2x00dev);
 
         __set_bit(DEVICE_PRESENT, &rt2x00dev->flags);
@@ -1193,13 +1181,9 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
         rt2x00lib_uninitialize(rt2x00dev);
 
         /*
-         * Close debugfs entry.
+         * Free extra components
          */
         rt2x00debug_deregister(rt2x00dev);
-
-        /*
-         * Free rfkill
-         */
         rt2x00rfkill_free(rt2x00dev);
 
         /*
@@ -1243,12 +1227,16 @@ int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
         __set_bit(DEVICE_STARTED_SUSPEND, &rt2x00dev->flags);
 
         /*
-         * Disable radio and unitialize all items
-         * that must be recreated on resume.
+         * Disable radio.
          */
         rt2x00lib_stop(rt2x00dev);
         rt2x00lib_uninitialize(rt2x00dev);
+
+        /*
+         * Suspend/disable extra components.
+         */
         rt2x00leds_suspend(rt2x00dev);
+        rt2x00rfkill_suspend(rt2x00dev);
         rt2x00debug_deregister(rt2x00dev);
 
 exit:
@@ -1292,9 +1280,10 @@ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
         NOTICE(rt2x00dev, "Waking up.\n");
 
         /*
-         * Open the debugfs entry and restore led handling.
+         * Restore/enable extra components.
          */
         rt2x00debug_register(rt2x00dev);
+        rt2x00rfkill_resume(rt2x00dev);
         rt2x00leds_resume(rt2x00dev);
 
         /*
diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h
index e4b4dd23d611..64fae7e3f73b 100644
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
@@ -148,28 +148,36 @@ static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
  * RFkill handlers.
  */
 #ifdef CONFIG_RT2X00_LIB_RFKILL
-int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev);
+void rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev);
 void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev);
-int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev);
+void rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev);
 void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev);
+void rt2x00rfkill_suspend(struct rt2x00_dev *rt2x00dev);
+void rt2x00rfkill_resume(struct rt2x00_dev *rt2x00dev);
 #else
-static inline int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev)
+static inline void rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev)
 {
-        return 0;
 }
 
 static inline void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev)
 {
 }
 
-static inline int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
+static inline void rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
 {
-        return 0;
 }
 
 static inline void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev)
 {
 }
+
+static inline void rt2x00rfkill_suspend(struct rt2x00_dev *rt2x00dev)
+{
+}
+
+static inline void rt2x00rfkill_resume(struct rt2x00_dev *rt2x00dev)
+{
+}
 #endif /* CONFIG_RT2X00_LIB_RFKILL */
 
 /*
diff --git a/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/drivers/net/wireless/rt2x00/rt2x00rfkill.c
index 67121427a5bd..fcef9885ab5e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00rfkill.c
+++ b/drivers/net/wireless/rt2x00/rt2x00rfkill.c
@@ -69,56 +69,81 @@ static void rt2x00rfkill_poll(struct input_polled_dev *poll_dev)
         }
 }
 
-int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev)
+void rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev)
 {
-        int retval;
-
-        if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
-                return 0;
+        if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags) ||
+            !test_bit(RFKILL_STATE_ALLOCATED, &rt2x00dev->rfkill_state))
+                return;
 
-        retval = rfkill_register(rt2x00dev->rfkill);
-        if (retval) {
+        if (rfkill_register(rt2x00dev->rfkill)) {
                 ERROR(rt2x00dev, "Failed to register rfkill handler.\n");
-                return retval;
+                return;
         }
 
-        retval = input_register_polled_device(rt2x00dev->poll_dev);
-        if (retval) {
+        if (input_register_polled_device(rt2x00dev->poll_dev)) {
                 ERROR(rt2x00dev, "Failed to register polled device.\n");
                 rfkill_unregister(rt2x00dev->rfkill);
-                return retval;
+                return;
         }
 
+        __set_bit(RFKILL_STATE_REGISTERED, &rt2x00dev->rfkill_state);
+
         /*
          * Force initial poll which will detect the initial device state,
          * and correctly sends the signal to the rfkill layer about this
          * state.
          */
         rt2x00rfkill_poll(rt2x00dev->poll_dev);
-
-        return 0;
 }
 
 void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev)
 {
-        if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
+        if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags) ||
+            !test_bit(RFKILL_STATE_REGISTERED, &rt2x00dev->rfkill_state))
                 return;
 
         input_unregister_polled_device(rt2x00dev->poll_dev);
         rfkill_unregister(rt2x00dev->rfkill);
+
+        __clear_bit(RFKILL_STATE_REGISTERED, &rt2x00dev->rfkill_state);
 }
 
-int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
+static struct input_polled_dev *
+rt2x00rfkill_allocate_polldev(struct rt2x00_dev *rt2x00dev)
 {
-        struct device *device = wiphy_dev(rt2x00dev->hw->wiphy);
+        struct input_polled_dev *poll_dev;
+
+        poll_dev = input_allocate_polled_device();
+        if (!poll_dev)
+                return NULL;
+
+        poll_dev->private = rt2x00dev;
+        poll_dev->poll = rt2x00rfkill_poll;
+        poll_dev->poll_interval = RFKILL_POLL_INTERVAL;
+
+        poll_dev->input->name = rt2x00dev->ops->name;
+        poll_dev->input->phys = wiphy_name(rt2x00dev->hw->wiphy);
+        poll_dev->input->id.bustype = BUS_HOST;
+        poll_dev->input->id.vendor = 0x1814;
+        poll_dev->input->id.product = rt2x00dev->chip.rt;
+        poll_dev->input->id.version = rt2x00dev->chip.rev;
+        poll_dev->input->dev.parent = wiphy_dev(rt2x00dev->hw->wiphy);
+        poll_dev->input->evbit[0] = BIT(EV_KEY);
+        set_bit(KEY_WLAN, poll_dev->input->keybit);
+
+        return poll_dev;
+}
 
+void rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
+{
         if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
-                return 0;
+                return;
 
-        rt2x00dev->rfkill = rfkill_allocate(device, RFKILL_TYPE_WLAN);
+        rt2x00dev->rfkill =
+            rfkill_allocate(wiphy_dev(rt2x00dev->hw->wiphy), RFKILL_TYPE_WLAN);
         if (!rt2x00dev->rfkill) {
                 ERROR(rt2x00dev, "Failed to allocate rfkill handler.\n");
-                goto exit;
+                return;
         }
 
         rt2x00dev->rfkill->name = rt2x00dev->ops->name;
@@ -126,40 +151,49 @@ int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
         rt2x00dev->rfkill->state = -1;
         rt2x00dev->rfkill->toggle_radio = rt2x00rfkill_toggle_radio;
 
-        rt2x00dev->poll_dev = input_allocate_polled_device();
+        rt2x00dev->poll_dev = rt2x00rfkill_allocate_polldev(rt2x00dev);
         if (!rt2x00dev->poll_dev) {
                 ERROR(rt2x00dev, "Failed to allocate polled device.\n");
-                goto exit_free_rfkill;
+                rfkill_free(rt2x00dev->rfkill);
+                rt2x00dev->rfkill = NULL;
+                return;
         }
 
-        rt2x00dev->poll_dev->private = rt2x00dev;
-        rt2x00dev->poll_dev->poll = rt2x00rfkill_poll;
-        rt2x00dev->poll_dev->poll_interval = RFKILL_POLL_INTERVAL;
+        return;
+}
 
-        rt2x00dev->poll_dev->input->name = rt2x00dev->ops->name;
-        rt2x00dev->poll_dev->input->phys = wiphy_name(rt2x00dev->hw->wiphy);
-        rt2x00dev->poll_dev->input->id.bustype = BUS_HOST;
-        rt2x00dev->poll_dev->input->id.vendor = 0x1814;
-        rt2x00dev->poll_dev->input->id.product = rt2x00dev->chip.rt;
-        rt2x00dev->poll_dev->input->id.version = rt2x00dev->chip.rev;
-        rt2x00dev->poll_dev->input->dev.parent = device;
-        rt2x00dev->poll_dev->input->evbit[0] = BIT(EV_KEY);
-        set_bit(KEY_WLAN, rt2x00dev->poll_dev->input->keybit);
+void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev)
+{
+        if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags) ||
+            !test_bit(RFKILL_STATE_ALLOCATED, &rt2x00dev->rfkill_state))
+                return;
 
-        return 0;
+        input_free_polled_device(rt2x00dev->poll_dev);
+        rt2x00dev->poll_dev = NULL;
 
-exit_free_rfkill:
         rfkill_free(rt2x00dev->rfkill);
-
-exit:
-        return -ENOMEM;
+        rt2x00dev->rfkill = NULL;
 }
 
-void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev)
+void rt2x00rfkill_suspend(struct rt2x00_dev *rt2x00dev)
 {
-        if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
+        if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags) ||
+            !test_bit(RFKILL_STATE_ALLOCATED, &rt2x00dev->rfkill_state))
                 return;
 
         input_free_polled_device(rt2x00dev->poll_dev);
-        rfkill_free(rt2x00dev->rfkill);
+        rt2x00dev->poll_dev = NULL;
+}
+
+void rt2x00rfkill_resume(struct rt2x00_dev *rt2x00dev)
+{
+        if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags) ||
+            !test_bit(RFKILL_STATE_ALLOCATED, &rt2x00dev->rfkill_state))
+                return;
+
+        rt2x00dev->poll_dev = rt2x00rfkill_allocate_polldev(rt2x00dev);
+        if (!rt2x00dev->poll_dev) {
+                ERROR(rt2x00dev, "Failed to allocate polled device.\n");
+                return;
+        }
 }
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 4baa916b80cf..babb240cef3d 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2306,9 +2306,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 48938819ee2f..46b040bf62de 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1906,9 +1906,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;
@@ -2163,6 +2163,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 */