2 files changed, 22 insertions, 41 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 43cb8ff97939..4f0a18a0e664 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2312,7 +2312,7 @@ static void iwl3945_connection_init_rx_config(struct iwl3945_priv *priv)
 #endif
 
         ch_info = iwl3945_get_channel_info(priv, priv->band,
-                                       le16_to_cpu(priv->staging_rxon.channel));
+                                       le16_to_cpu(priv->active_rxon.channel));
 
         if (!ch_info)
                 ch_info = &priv->channel_info[0];
@@ -7006,26 +7006,18 @@ static void iwl3945_configure_filter(struct ieee80211_hw *hw,
                                  unsigned int *total_flags,
                                  int mc_count, struct dev_addr_list *mc_list)
 {
-        /*
-         * XXX: dummy
-         * see also iwl3945_connection_init_rx_config
-         */
         struct iwl3945_priv *priv = hw->priv;
-        int new_flags = 0;
-        if (changed_flags & (FIF_PROMISC_IN_BSS | FIF_OTHER_BSS)) {
-                if (*total_flags & (FIF_PROMISC_IN_BSS | FIF_OTHER_BSS)) {
-                        IWL_DEBUG_MAC80211("Enter: type %d (0x%x, 0x%x)\n",
-                                           IEEE80211_IF_TYPE_MNTR,
-                                           changed_flags, *total_flags);
-                        /* queue work 'cuz mac80211 is holding a lock which
-                         * prevents us from issuing (synchronous) f/w cmds */
-                        queue_work(priv->workqueue, &priv->set_monitor);
-                        new_flags &= FIF_PROMISC_IN_BSS |
-                                     FIF_OTHER_BSS |
-                                     FIF_ALLMULTI;
-                }
+
+        if (changed_flags & (*total_flags) & FIF_OTHER_BSS) {
+                IWL_DEBUG_MAC80211("Enter: type %d (0x%x, 0x%x)\n",
+                                   IEEE80211_IF_TYPE_MNTR,
+                                   changed_flags, *total_flags);
+                /* queue work 'cuz mac80211 is holding a lock which
+                 * prevents us from issuing (synchronous) f/w cmds */
+                queue_work(priv->workqueue, &priv->set_monitor);
         }
-        *total_flags = new_flags;
+        *total_flags &= FIF_OTHER_BSS | FIF_ALLMULTI |
+                        FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
 }
 
 static void iwl3945_mac_remove_interface(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 5eb2a3eaf677..ba0f28945eb1 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -758,7 +758,7 @@ static void iwl4965_connection_init_rx_config(struct iwl_priv *priv)
 #endif
 
         ch_info = iwl_get_channel_info(priv, priv->band,
-                                       le16_to_cpu(priv->staging_rxon.channel));
+                                       le16_to_cpu(priv->active_rxon.channel));
 
         if (!ch_info)
                 ch_info = &priv->channel_info[0];
@@ -794,9 +794,6 @@ static int iwl4965_set_mode(struct iwl_priv *priv, int mode)
 {
         priv->iw_mode = mode;
 
-        /* init channel/phymode to values given at driver init */
-        iwl_set_rxon_channel(priv, IEEE80211_BAND_2GHZ, 6);
-
         iwl4965_connection_init_rx_config(priv);
         memcpy(priv->staging_rxon.node_addr, priv->mac_addr, ETH_ALEN);
 
@@ -3025,26 +3022,18 @@ static void iwl4965_configure_filter(struct ieee80211_hw *hw,
                                  unsigned int *total_flags,
                                  int mc_count, struct dev_addr_list *mc_list)
 {
-        /*
-         * XXX: dummy
-         * see also iwl4965_connection_init_rx_config
-         */
         struct iwl_priv *priv = hw->priv;
-        int new_flags = 0;
-        if (changed_flags & (FIF_PROMISC_IN_BSS | FIF_OTHER_BSS)) {
-                if (*total_flags & (FIF_PROMISC_IN_BSS | FIF_OTHER_BSS)) {
-                        IWL_DEBUG_MAC80211("Enter: type %d (0x%x, 0x%x)\n",
-                                           IEEE80211_IF_TYPE_MNTR,
-                                           changed_flags, *total_flags);
-                        /* queue work 'cuz mac80211 is holding a lock which
-                         * prevents us from issuing (synchronous) f/w cmds */
-                        queue_work(priv->workqueue, &priv->set_monitor);
-                        new_flags &= FIF_PROMISC_IN_BSS |
-                                     FIF_OTHER_BSS |
-                                     FIF_ALLMULTI;
-                }
+
+        if (changed_flags & (*total_flags) & FIF_OTHER_BSS) {
+                IWL_DEBUG_MAC80211("Enter: type %d (0x%x, 0x%x)\n",
+                                   IEEE80211_IF_TYPE_MNTR,
+                                   changed_flags, *total_flags);
+                /* queue work 'cuz mac80211 is holding a lock which
+                 * prevents us from issuing (synchronous) f/w cmds */
+                queue_work(priv->workqueue, &priv->set_monitor);
         }
-        *total_flags = new_flags;
+        *total_flags &= FIF_OTHER_BSS | FIF_ALLMULTI |
+                        FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
 }
 
 static void iwl4965_mac_remove_interface(struct ieee80211_hw *hw,