mac80211: allow configure_filter callback to sleep

Over time, a whole bunch of drivers have come up
with their own scheme to delay the configure_filter
operation to a workqueue. To be able to simplify
things, allow configure_filter to sleep, and add
a new prepare_multicast callback that drivers that
need the multicast address list implement. This new
callback must be atomic, but most drivers either
don't care or just calculate a hash which can be
done atomically and then uploaded to the hardware
non-atomically.

A cursory look suggests that at76c50x-usb, ar9170,
mwl8k (which is actually very broken now), rt2x00,
wl1251, wl1271 and zd1211 should make use of this
new capability.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

20 files changed, 205 insertions, 120 deletions

diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index 5695911bc602..b80f514877d8 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -1328,16 +1328,39 @@ static void adm8211_bss_info_changed(struct ieee80211_hw *dev,
         }
 }
 
+static u64 adm8211_prepare_multicast(struct ieee80211_hw *hw,
+                                     int mc_count, struct dev_addr_list *mclist)
+{
+        unsigned int bit_nr, i;
+        u32 mc_filter[2];
+
+        mc_filter[1] = mc_filter[0] = 0;
+
+        for (i = 0; i < mc_count; i++) {
+                if (!mclist)
+                        break;
+                bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
+
+                bit_nr &= 0x3F;
+                mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
+                mclist = mclist->next;
+        }
+
+        return mc_filter[0] | ((u64)(mc_filter[1]) << 32);
+}
+
 static void adm8211_configure_filter(struct ieee80211_hw *dev,
                                      unsigned int changed_flags,
                                      unsigned int *total_flags,
-                                     int mc_count, struct dev_mc_list *mclist)
+                                     u64 multicast)
 {
         static const u8 bcast[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
         struct adm8211_priv *priv = dev->priv;
-        unsigned int bit_nr, new_flags;
+        unsigned int new_flags;
         u32 mc_filter[2];
-        int i;
+
+        mc_filter[0] = multicast;
+        mc_filter[1] = multicast >> 32;
 
         new_flags = 0;
 
@@ -1346,23 +1369,13 @@ static void adm8211_configure_filter(struct ieee80211_hw *dev,
                 priv->nar |= ADM8211_NAR_PR;
                 priv->nar &= ~ADM8211_NAR_MM;
                 mc_filter[1] = mc_filter[0] = ~0;
-        } else if ((*total_flags & FIF_ALLMULTI) || (mc_count > 32)) {
+        } else if (*total_flags & FIF_ALLMULTI || multicast == ~(0ULL)) {
                 new_flags |= FIF_ALLMULTI;
                 priv->nar &= ~ADM8211_NAR_PR;
                 priv->nar |= ADM8211_NAR_MM;
                 mc_filter[1] = mc_filter[0] = ~0;
         } else {
                 priv->nar &= ~(ADM8211_NAR_MM | ADM8211_NAR_PR);
-                mc_filter[1] = mc_filter[0] = 0;
-                for (i = 0; i < mc_count; i++) {
-                        if (!mclist)
-                                break;
-                        bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
-
-                        bit_nr &= 0x3F;
-                        mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
-                        mclist = mclist->next;
-                }
         }
 
         ADM8211_IDLE_RX();
@@ -1757,6 +1770,7 @@ static const struct ieee80211_ops adm8211_ops = {
         .remove_interface       = adm8211_remove_interface,
         .config                 = adm8211_config,
         .bss_info_changed       = adm8211_bss_info_changed,
+        .prepare_multicast      = adm8211_prepare_multicast,
         .configure_filter       = adm8211_configure_filter,
         .get_stats              = adm8211_get_stats,
         .get_tx_stats           = adm8211_get_tx_stats,
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 7218dbabad3e..a6e19545ac6a 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -1997,15 +1997,14 @@ static void at76_bss_info_changed(struct ieee80211_hw *hw,
 /* must be atomic */
 static void at76_configure_filter(struct ieee80211_hw *hw,
                                   unsigned int changed_flags,
-                                  unsigned int *total_flags, int mc_count,
-                                  struct dev_addr_list *mc_list)
+                                  unsigned int *total_flags, u64 multicast)
 {
         struct at76_priv *priv = hw->priv;
         int flags;
 
         at76_dbg(DBG_MAC80211, "%s(): changed_flags=0x%08x "
-                 "total_flags=0x%08x mc_count=%d",
-                 __func__, changed_flags, *total_flags, mc_count);
+                 "total_flags=0x%08x",
+                 __func__, changed_flags, *total_flags);
 
         flags = changed_flags & AT76_SUPPORTED_FILTERS;
         *total_flags = AT76_SUPPORTED_FILTERS;
diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c
index ea8c9419336d..6a9462e4fd87 100644
--- a/drivers/net/wireless/ath/ar9170/main.c
+++ b/drivers/net/wireless/ath/ar9170/main.c
@@ -2100,10 +2100,29 @@ unlock:
         mutex_unlock(&ar->mutex);
 }
 
+static u64 ar9170_op_prepare_multicast(struct ieee80211_hw *hw, int mc_count,
+                                       struct dev_addr_list *mclist)
+{
+        u64 mchash;
+        int i;
+
+        /* always get broadcast frames */
+        mchash = 1ULL << (0xff >> 2);
+
+        for (i = 0; i < mc_count; i++) {
+                if (WARN_ON(!mclist))
+                        break;
+                mchash |= 1ULL << (mclist->dmi_addr[5] >> 2);
+                mclist = mclist->next;
+        }
+
+        return mchash;
+}
+
 static void ar9170_op_configure_filter(struct ieee80211_hw *hw,
                                        unsigned int changed_flags,
                                        unsigned int *new_flags,
-                                       int mc_count, struct dev_mc_list *mclist)
+                                       u64 multicast)
 {
         struct ar9170 *ar = hw->priv;
 
@@ -2116,24 +2135,11 @@ static void ar9170_op_configure_filter(struct ieee80211_hw *hw,
          * then checking the error flags, later.
          */
 
-        if (changed_flags & FIF_ALLMULTI) {
-                if (*new_flags & FIF_ALLMULTI) {
-                        ar->want_mc_hash = ~0ULL;
-                } else {
-                        u64 mchash;
-                        int i;
-
-                        /* always get broadcast frames */
-                        mchash = 1ULL << (0xff >> 2);
+        if (changed_flags & FIF_ALLMULTI && *new_flags & FIF_ALLMULTI)
+                        multicast = ~0ULL;
 
-                        for (i = 0; i < mc_count; i++) {
-                                if (WARN_ON(!mclist))
-                                        break;
-                                mchash |= 1ULL << (mclist->dmi_addr[5] >> 2);
-                                mclist = mclist->next;
-                        }
-                ar->want_mc_hash = mchash;
-                }
+        if (multicast != ar->want_mc_hash) {
+                ar->want_mc_hash = multicast;
                 set_bit(AR9170_FILTER_CHANGED_MULTICAST, &ar->filter_changed);
         }
 
@@ -2543,6 +2549,7 @@ static const struct ieee80211_ops ar9170_ops = {
         .add_interface          = ar9170_op_add_interface,
         .remove_interface       = ar9170_op_remove_interface,
         .config                 = ar9170_op_config,
+        .prepare_multicast      = ar9170_op_prepare_multicast,
         .configure_filter       = ar9170_op_configure_filter,
         .conf_tx                = ar9170_conf_tx,
         .bss_info_changed       = ar9170_op_bss_info_changed,
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 2b3cf39dd4b1..3951b5b13424 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -229,10 +229,12 @@ static int ath5k_add_interface(struct ieee80211_hw *hw,
 static void ath5k_remove_interface(struct ieee80211_hw *hw,
                 struct ieee80211_if_init_conf *conf);
 static int ath5k_config(struct ieee80211_hw *hw, u32 changed);
+static u64 ath5k_prepare_multicast(struct ieee80211_hw *hw,
+                                   int mc_count, struct dev_addr_list *mc_list);
 static void ath5k_configure_filter(struct ieee80211_hw *hw,
                 unsigned int changed_flags,
                 unsigned int *new_flags,
-                int mc_count, struct dev_mc_list *mclist);
+                u64 multicast);
 static int ath5k_set_key(struct ieee80211_hw *hw,
                 enum set_key_cmd cmd,
                 struct ieee80211_vif *vif, struct ieee80211_sta *sta,
@@ -260,6 +262,7 @@ static const struct ieee80211_ops ath5k_hw_ops = {
         .add_interface  = ath5k_add_interface,
         .remove_interface = ath5k_remove_interface,
         .config         = ath5k_config,
+        .prepare_multicast = ath5k_prepare_multicast,
         .configure_filter = ath5k_configure_filter,
         .set_key        = ath5k_set_key,
         .get_stats      = ath5k_get_stats,
@@ -2853,6 +2856,37 @@ unlock:
         return ret;
 }
 
+static u64 ath5k_prepare_multicast(struct ieee80211_hw *hw,
+                                   int mc_count, struct dev_addr_list *mclist)
+{
+        u32 mfilt[2], val;
+        int i;
+        u8 pos;
+
+        mfilt[0] = 0;
+        mfilt[1] = 1;
+
+        for (i = 0; i < mc_count; i++) {
+                if (!mclist)
+                        break;
+                /* calculate XOR of eight 6-bit values */
+                val = get_unaligned_le32(mclist->dmi_addr + 0);
+                pos = (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
+                val = get_unaligned_le32(mclist->dmi_addr + 3);
+                pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
+                pos &= 0x3f;
+                mfilt[pos / 32] |= (1 << (pos % 32));
+                /* XXX: we might be able to just do this instead,
+                * but not sure, needs testing, if we do use this we'd
+                * neet to inform below to not reset the mcast */
+                /* ath5k_hw_set_mcast_filterindex(ah,
+                 *      mclist->dmi_addr[5]); */
+                mclist = mclist->next;
+        }
+
+        return ((u64)(mfilt[1]) << 32) | mfilt[0];
+}
+
 #define SUPPORTED_FIF_FLAGS \
         FIF_PROMISC_IN_BSS |  FIF_ALLMULTI | FIF_FCSFAIL | \
         FIF_PLCPFAIL | FIF_CONTROL | FIF_OTHER_BSS | \
@@ -2878,16 +2912,14 @@ unlock:
 static void ath5k_configure_filter(struct ieee80211_hw *hw,
                 unsigned int changed_flags,
                 unsigned int *new_flags,
-                int mc_count, struct dev_mc_list *mclist)
+                u64 multicast)
 {
         struct ath5k_softc *sc = hw->priv;
         struct ath5k_hw *ah = sc->ah;
-        u32 mfilt[2], val, rfilt;
-        u8 pos;
-        int i;
+        u32 mfilt[2], rfilt;
 
-        mfilt[0] = 0;
-        mfilt[1] = 0;
+        mfilt[0] = multicast;
+        mfilt[1] = multicast >> 32;
 
         /* Only deal with supported flags */
         changed_flags &= SUPPORTED_FIF_FLAGS;
@@ -2913,24 +2945,6 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,
         if (*new_flags & FIF_ALLMULTI) {
                 mfilt[0] =  ~0;
                 mfilt[1] =  ~0;
-        } else {
-                for (i = 0; i < mc_count; i++) {
-                        if (!mclist)
-                                break;
-                        /* calculate XOR of eight 6-bit values */
-                        val = get_unaligned_le32(mclist->dmi_addr + 0);
-                        pos = (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
-                        val = get_unaligned_le32(mclist->dmi_addr + 3);
-                        pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
-                        pos &= 0x3f;
-                        mfilt[pos / 32] |= (1 << (pos % 32));
-                        /* XXX: we might be able to just do this instead,
-                        * but not sure, needs testing, if we do use this we'd
-                        * neet to inform below to not reset the mcast */
-                        /* ath5k_hw_set_mcast_filterindex(ah,
-                         *      mclist->dmi_addr[5]); */
-                        mclist = mclist->next;
-                }
         }
 
         /* This is the best we can do */
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 3e09b9ac165b..2f9c149fd481 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -2394,8 +2394,7 @@ skip_chan_change:
 static void ath9k_configure_filter(struct ieee80211_hw *hw,
                                    unsigned int changed_flags,
                                    unsigned int *total_flags,
-                                   int mc_count,
-                                   struct dev_mc_list *mclist)
+                                   u64 multicast)
 {
         struct ath_wiphy *aphy = hw->priv;
         struct ath_softc *sc = aphy->sc;
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index c5bece090420..78ddbc7f836b 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -3679,7 +3679,7 @@ out_unlock:
 
 static void b43_op_configure_filter(struct ieee80211_hw *hw,
                                     unsigned int changed, unsigned int *fflags,
-                                    int mc_count, struct dev_addr_list *mc_list)
+                                    u64 multicast)
 {
         struct b43_wl *wl = hw_to_b43_wl(hw);
         struct b43_wldev *dev = wl->current_dev;
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index b1435594921a..b166a6f9f055 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -2836,9 +2836,7 @@ static void b43legacy_op_bss_info_changed(struct ieee80211_hw *hw,
 
 static void b43legacy_op_configure_filter(struct ieee80211_hw *hw,
                                           unsigned int changed,
-                                          unsigned int *fflags,
-                                          int mc_count,
-                                          struct dev_addr_list *mc_list)
+                                          unsigned int *fflags,u64 multicast)
 {
         struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
         struct b43legacy_wldev *dev = wl->current_dev;
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index c0efa6623c09..f1f6dabd8fbd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1514,7 +1514,7 @@ EXPORT_SYMBOL(iwl_irq_handle_error);
 void iwl_configure_filter(struct ieee80211_hw *hw,
                           unsigned int changed_flags,
                           unsigned int *total_flags,
-                          int mc_count, struct dev_addr_list *mc_list)
+                          u64 multicast)
 {
         struct iwl_priv *priv = hw->priv;
         __le32 *filter_flags = &priv->staging_rxon.filter_flags;
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 4ca025a34daf..62d90364b61d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -282,8 +282,7 @@ int iwl_set_decrypted_flag(struct iwl_priv *priv,
 void iwl_irq_handle_error(struct iwl_priv *priv);
 void iwl_configure_filter(struct ieee80211_hw *hw,
                           unsigned int changed_flags,
-                          unsigned int *total_flags,
-                          int mc_count, struct dev_addr_list *mc_list);
+                          unsigned int *total_flags, u64 multicast);
 int iwl_hw_nic_init(struct iwl_priv *priv);
 int iwl_setup_mac(struct iwl_priv *priv);
 int iwl_set_hw_params(struct iwl_priv *priv);
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c
index 4872345a2f61..019431d2f8a9 100644
--- a/drivers/net/wireless/libertas_tf/main.c
+++ b/drivers/net/wireless/libertas_tf/main.c
@@ -366,15 +366,35 @@ static int lbtf_op_config(struct ieee80211_hw *hw, u32 changed)
         return 0;
 }
 
+static u64 lbtf_op_prepare_multicast(struct ieee80211_hw *hw,
+                                     int mc_count, struct dev_addr_list *mclist)
+{
+        struct lbtf_private *priv = hw->priv;
+        int i;
+
+        if (!mc_count || mc_count > MRVDRV_MAX_MULTICAST_LIST_SIZE)
+                return mc_count;
+
+        priv->nr_of_multicastmacaddr = mc_count;
+        for (i = 0; i < mc_count; i++) {
+                if (!mclist)
+                        break;
+                memcpy(&priv->multicastlist[i], mclist->da_addr,
+                                ETH_ALEN);
+                mclist = mclist->next;
+        }
+
+        return mc_count;
+}
+
 #define SUPPORTED_FIF_FLAGS  (FIF_PROMISC_IN_BSS | FIF_ALLMULTI)
 static void lbtf_op_configure_filter(struct ieee80211_hw *hw,
                         unsigned int changed_flags,
                         unsigned int *new_flags,
-                        int mc_count, struct dev_mc_list *mclist)
+                        u64 multicast)
 {
         struct lbtf_private *priv = hw->priv;
         int old_mac_control = priv->mac_control;
-        int i;
         changed_flags &= SUPPORTED_FIF_FLAGS;
         *new_flags &= SUPPORTED_FIF_FLAGS;
 
@@ -386,20 +406,12 @@ static void lbtf_op_configure_filter(struct ieee80211_hw *hw,
         else
                 priv->mac_control &= ~CMD_ACT_MAC_PROMISCUOUS_ENABLE;
         if (*new_flags & (FIF_ALLMULTI) ||
-            mc_count > MRVDRV_MAX_MULTICAST_LIST_SIZE) {
+            multicast > MRVDRV_MAX_MULTICAST_LIST_SIZE) {
                 priv->mac_control |= CMD_ACT_MAC_ALL_MULTICAST_ENABLE;
                 priv->mac_control &= ~CMD_ACT_MAC_MULTICAST_ENABLE;
-        } else if (mc_count) {
+        } else if (multicast) {
                 priv->mac_control |= CMD_ACT_MAC_MULTICAST_ENABLE;
                 priv->mac_control &= ~CMD_ACT_MAC_ALL_MULTICAST_ENABLE;
-                priv->nr_of_multicastmacaddr = mc_count;
-                for (i = 0; i < mc_count; i++) {
-                        if (!mclist)
-                                break;
-                        memcpy(&priv->multicastlist[i], mclist->da_addr,
-                                        ETH_ALEN);
-                        mclist = mclist->next;
-                }
                 lbtf_cmd_set_mac_multicast_addr(priv);
         } else {
                 priv->mac_control &= ~(CMD_ACT_MAC_MULTICAST_ENABLE |
@@ -461,6 +473,7 @@ static const struct ieee80211_ops lbtf_ops = {
         .add_interface          = lbtf_op_add_interface,
         .remove_interface       = lbtf_op_remove_interface,
         .config                 = lbtf_op_config,
+        .prepare_multicast      = lbtf_op_prepare_multicast,
         .configure_filter       = lbtf_op_configure_filter,
         .bss_info_changed       = lbtf_op_bss_info_changed,
 };
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 930f5c7da4a6..6f6cd43592c8 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -582,9 +582,7 @@ static int mac80211_hwsim_config(struct ieee80211_hw *hw, u32 changed)
 
 static void mac80211_hwsim_configure_filter(struct ieee80211_hw *hw,
                                             unsigned int changed_flags,
-                                            unsigned int *total_flags,
-                                            int mc_count,
-                                            struct dev_addr_list *mc_list)
+                                            unsigned int *total_flags,u64 multicast)
 {
         struct mac80211_hwsim_data *data = hw->priv;
 
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 8a6d3afe4122..f84387083e73 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -3251,31 +3251,50 @@ mwl8k_configure_filter_exit:
         return rc;
 }
 
+static u64 mwl8k_prepare_multicast(struct ieee80211_hw *hw,
+                                   int mc_count, struct dev_addr_list *mclist)
+{
+        struct mwl8k_configure_filter_worker *worker;
+
+        worker = kzalloc(sizeof(*worker), GFP_ATOMIC);
+
+        if (!worker)
+                return 0;
+
+        /*
+         * XXX: This is _HORRIBLY_ broken!!
+         *
+         *      No locking, the mclist pointer might be invalid as soon as this
+         *      function returns, something in the list might be invalidated
+         *      once we get to the worker, etc...
+         */
+        worker->mc_count = mc_count;
+        worker->mclist = mclist;
+
+        return (u64)worker;
+}
+
 static void mwl8k_configure_filter(struct ieee80211_hw *hw,
                                    unsigned int changed_flags,
                                    unsigned int *total_flags,
-                                   int mc_count,
-                                   struct dev_addr_list *mclist)
+                                   u64 multicast)
 {
 
-        struct mwl8k_configure_filter_worker *worker;
+        struct mwl8k_configure_filter_worker *worker = (void *)multicast;
         struct mwl8k_priv *priv = hw->priv;
 
         /* Clear unsupported feature flags */
         *total_flags &= MWL8K_SUPPORTED_IF_FLAGS;
 
-        if (!(changed_flags & MWL8K_SUPPORTED_IF_FLAGS) && !mc_count)
+        if (!(changed_flags & MWL8K_SUPPORTED_IF_FLAGS))
                 return;
 
-        worker = kzalloc(sizeof(*worker), GFP_ATOMIC);
         if (worker == NULL)
                 return;
 
         worker->header.options = MWL8K_WQ_QUEUE_ONLY | MWL8K_WQ_TX_WAIT_EMPTY;
         worker->changed_flags = changed_flags;
         worker->total_flags = total_flags;
-        worker->mc_count = mc_count;
-        worker->mclist = mclist;
 
         mwl8k_queue_work(hw, &worker->header, priv->config_wq,
                          mwl8k_configure_filter_wt);
@@ -3441,6 +3460,7 @@ static const struct ieee80211_ops mwl8k_ops = {
         .remove_interface       = mwl8k_remove_interface,
         .config                 = mwl8k_config,
         .bss_info_changed       = mwl8k_bss_info_changed,
+        .prepare_multicast      = mwl8k_prepare_multicast,
         .configure_filter       = mwl8k_configure_filter,
         .set_rts_threshold      = mwl8k_set_rts_threshold,
         .conf_tx                = mwl8k_conf_tx,
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index 77203e346cda..4d486bf9f725 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -302,7 +302,7 @@ out:
 static void p54_configure_filter(struct ieee80211_hw *dev,
                                  unsigned int changed_flags,
                                  unsigned int *total_flags,
-                                 int mc_count, struct dev_mc_list *mclist)
+                                 u64 multicast)
 {
         struct p54_common *priv = dev->priv;
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 99e89596cef6..39d7d9baafdd 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -978,7 +978,7 @@ int rt2x00mac_config(struct ieee80211_hw *hw, u32 changed);
 void rt2x00mac_configure_filter(struct ieee80211_hw *hw,
                                 unsigned int changed_flags,
                                 unsigned int *total_flags,
-                                int mc_count, struct dev_addr_list *mc_list);
+                                u64 multicast);
 int rt2x00mac_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
                       bool set);
 #ifdef CONFIG_RT2X00_LIB_CRYPTO
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index cb7b6d459331..602f12699718 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -379,7 +379,7 @@ EXPORT_SYMBOL_GPL(rt2x00mac_config);
 void rt2x00mac_configure_filter(struct ieee80211_hw *hw,
                                 unsigned int changed_flags,
                                 unsigned int *total_flags,
-                                int mc_count, struct dev_addr_list *mc_list)
+                                u64 multicast)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
 
diff --git a/drivers/net/wireless/rtl818x/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180_dev.c
index 09f46abc730a..16429c49139c 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c
@@ -728,10 +728,16 @@ static void rtl8180_bss_info_changed(struct ieee80211_hw *dev,
                 priv->rf->conf_erp(dev, info);
 }
 
+static u64 rtl8180_prepare_multicast(struct ieee80211_hw *dev, int mc_count,
+                                     struct dev_addr_list *mc_list)
+{
+        return mc_count;
+}
+
 static void rtl8180_configure_filter(struct ieee80211_hw *dev,
                                      unsigned int changed_flags,
                                      unsigned int *total_flags,
-                                     int mc_count, struct dev_addr_list *mclist)
+                                     u64 multicast)
 {
         struct rtl8180_priv *priv = dev->priv;
 
@@ -741,7 +747,7 @@ static void rtl8180_configure_filter(struct ieee80211_hw *dev,
                 priv->rx_conf ^= RTL818X_RX_CONF_CTRL;
         if (changed_flags & FIF_OTHER_BSS)
                 priv->rx_conf ^= RTL818X_RX_CONF_MONITOR;
-        if (*total_flags & FIF_ALLMULTI || mc_count > 0)
+        if (*total_flags & FIF_ALLMULTI || multicast > 0)
                 priv->rx_conf |= RTL818X_RX_CONF_MULTICAST;
         else
                 priv->rx_conf &= ~RTL818X_RX_CONF_MULTICAST;
@@ -768,6 +774,7 @@ static const struct ieee80211_ops rtl8180_ops = {
         .remove_interface       = rtl8180_remove_interface,
         .config                 = rtl8180_config,
         .bss_info_changed       = rtl8180_bss_info_changed,
+        .prepare_multicast      = rtl8180_prepare_multicast,
         .configure_filter       = rtl8180_configure_filter,
 };
 
diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c
index 53f57dc52226..90f38357393c 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c
@@ -1192,10 +1192,16 @@ static void rtl8187_bss_info_changed(struct ieee80211_hw *dev,
                                  info->use_short_preamble);
 }
 
+static u64 rtl8187_prepare_multicast(struct ieee80211_hw *dev,
+                                     int mc_count, struct dev_addr_list *mc_list)
+{
+        return mc_count;
+}
+
 static void rtl8187_configure_filter(struct ieee80211_hw *dev,
                                      unsigned int changed_flags,
                                      unsigned int *total_flags,
-                                     int mc_count, struct dev_addr_list *mclist)
+                                     u64 multicast)
 {
         struct rtl8187_priv *priv = dev->priv;
 
@@ -1205,7 +1211,7 @@ static void rtl8187_configure_filter(struct ieee80211_hw *dev,
                 priv->rx_conf ^= RTL818X_RX_CONF_CTRL;
         if (changed_flags & FIF_OTHER_BSS)
                 priv->rx_conf ^= RTL818X_RX_CONF_MONITOR;
-        if (*total_flags & FIF_ALLMULTI || mc_count > 0)
+        if (*total_flags & FIF_ALLMULTI || multicast > 0)
                 priv->rx_conf |= RTL818X_RX_CONF_MULTICAST;
         else
                 priv->rx_conf &= ~RTL818X_RX_CONF_MULTICAST;
@@ -1268,6 +1274,7 @@ static const struct ieee80211_ops rtl8187_ops = {
         .remove_interface       = rtl8187_remove_interface,
         .config                 = rtl8187_config,
         .bss_info_changed       = rtl8187_bss_info_changed,
+        .prepare_multicast      = rtl8187_prepare_multicast,
         .configure_filter       = rtl8187_configure_filter,
         .conf_tx                = rtl8187_conf_tx
 };
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c
index 7148934e464d..5809ef5b18f8 100644
--- a/drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/drivers/net/wireless/wl12xx/wl1251_main.c
@@ -652,9 +652,7 @@ out:
 
 static void wl1251_op_configure_filter(struct ieee80211_hw *hw,
                                        unsigned int changed,
-                                       unsigned int *total,
-                                       int mc_count,
-                                       struct dev_addr_list *mc_list)
+                                       unsigned int *total,u64 multicast)
 {
         struct wl1251 *wl = hw->priv;
 
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 4102d590b798..754be8179307 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -793,9 +793,7 @@ out:
 
 static void wl1271_op_configure_filter(struct ieee80211_hw *hw,
                                        unsigned int changed,
-                                       unsigned int *total,
-                                       int mc_count,
-                                       struct dev_addr_list *mc_list)
+                                       unsigned int *total,u64 multicast)
 {
         struct wl1271 *wl = hw->priv;
 
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 55b7fbdc85dc..6d666359a42f 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -796,18 +796,40 @@ static void set_rx_filter_handler(struct work_struct *work)
                 dev_err(zd_mac_dev(mac), "set_rx_filter_handler error %d\n", r);
 }
 
+static u64 zd_op_prepare_multicast(struct ieee80211_hw *hw,
+                                   int mc_count, struct dev_addr_list *mclist)
+{
+        struct zd_mac *mac = zd_hw_mac(hw);
+        struct zd_mc_hash hash;
+        int i;
+
+        zd_mc_clear(&hash);
+
+        for (i = 0; i < mc_count; i++) {
+                if (!mclist)
+                        break;
+                dev_dbg_f(zd_mac_dev(mac), "mc addr %pM\n", mclist->dmi_addr);
+                zd_mc_add_addr(&hash, mclist->dmi_addr);
+                mclist = mclist->next;
+        }
+
+        return hash.low | ((u64)hash.high << 32);
+}
+
 #define SUPPORTED_FIF_FLAGS \
         (FIF_PROMISC_IN_BSS | FIF_ALLMULTI | FIF_FCSFAIL | FIF_CONTROL | \
         FIF_OTHER_BSS | FIF_BCN_PRBRESP_PROMISC)
 static void zd_op_configure_filter(struct ieee80211_hw *hw,
                         unsigned int changed_flags,
                         unsigned int *new_flags,
-                        int mc_count, struct dev_mc_list *mclist)
+                        u64 multicast)
 {
-        struct zd_mc_hash hash;
+        struct zd_mc_hash hash = {
+                .low = multicast,
+                .high = multicast >> 32,
+        };
         struct zd_mac *mac = zd_hw_mac(hw);
         unsigned long flags;
-        int i;
 
         /* Only deal with supported flags */
         changed_flags &= SUPPORTED_FIF_FLAGS;
@@ -819,25 +841,16 @@ static void zd_op_configure_filter(struct ieee80211_hw *hw,
         if (!changed_flags)
                 return;
 
-        if (*new_flags & (FIF_PROMISC_IN_BSS | FIF_ALLMULTI)) {
+        if (*new_flags & (FIF_PROMISC_IN_BSS | FIF_ALLMULTI))
                 zd_mc_add_all(&hash);
-        } else {
-                zd_mc_clear(&hash);
-                for (i = 0; i < mc_count; i++) {
-                        if (!mclist)
-                                break;
-                        dev_dbg_f(zd_mac_dev(mac), "mc addr %pM\n",
-                                  mclist->dmi_addr);
-                        zd_mc_add_addr(&hash, mclist->dmi_addr);
-                        mclist = mclist->next;
-                }
-        }
 
         spin_lock_irqsave(&mac->lock, flags);
         mac->pass_failed_fcs = !!(*new_flags & FIF_FCSFAIL);
         mac->pass_ctrl = !!(*new_flags & FIF_CONTROL);
         mac->multicast_hash = hash;
         spin_unlock_irqrestore(&mac->lock, flags);
+
+        /* XXX: these can be called here now, can sleep now! */
         queue_work(zd_workqueue, &mac->set_multicast_hash_work);
 
         if (changed_flags & FIF_CONTROL)
@@ -940,6 +953,7 @@ static const struct ieee80211_ops zd_ops = {
         .add_interface          = zd_op_add_interface,
         .remove_interface       = zd_op_remove_interface,
         .config                 = zd_op_config,
+        .prepare_multicast      = zd_op_prepare_multicast,
         .configure_filter       = zd_op_configure_filter,
         .bss_info_changed       = zd_op_bss_info_changed,
         .get_tsf                = zd_op_get_tsf,