1 files changed, 17 insertions, 2 deletions

diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
index 1fbe3c0b9f08..c9b0b676adda 100644
--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
@@ -158,8 +158,7 @@ ath5k_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 
         memcpy(&avf->lladdr, vif->addr, ETH_ALEN);
 
-        ath5k_mode_setup(sc, vif);
-
+        ath5k_update_bssid_mask_and_opmode(sc, vif);
         ret = 0;
 end:
         mutex_unlock(&sc->lock);
@@ -381,6 +380,7 @@ ath5k_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags,
         struct ath5k_softc *sc = hw->priv;
         struct ath5k_hw *ah = sc->ah;
         u32 mfilt[2], rfilt;
+        struct ath5k_vif_iter_data iter_data; /* to count STA interfaces */
 
         mutex_lock(&sc->lock);
 
@@ -454,6 +454,21 @@ ath5k_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags,
                 break;
         }
 
+        iter_data.hw_macaddr = NULL;
+        iter_data.n_stas = 0;
+        iter_data.need_set_hw_addr = false;
+        ieee80211_iterate_active_interfaces_atomic(sc->hw, ath5k_vif_iter,
+                                                   &iter_data);
+
+        /* Set up RX Filter */
+        if (iter_data.n_stas > 1) {
+                /* If you have multiple STA interfaces connected to
+                 * different APs, ARPs are not received (most of the time?)
+                 * Enabling PROMISC appears to fix that probem.
+                 */
+                rfilt |= AR5K_RX_FILTER_PROM;
+        }
+
         /* Set filters */
         ath5k_hw_set_rx_filter(ah, rfilt);