iwlwifi: fix incorrect monitor mode operation

[linux-2.6] / drivers / net / wireless / iwlwifi / iwl4965-base.c

diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index f1cf4b1fd5acb6deaf9624e4e36a99809c9b49fc..ba0f28945eb1f37c11241867545030a16dd676fb 100644 (file)
--- 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);
 
@@ -1606,14 +1603,12 @@ static void iwl4965_irq_tasklet(struct iwl_priv *priv)
                IWL_DEBUG(IWL_DL_RF_KILL, "RF_KILL bit toggled to %s.\n",
                                hw_rf_kill ? "disable radio":"enable radio");
 
-               /* Queue restart only if RF_KILL switch was set to "kill"
-                *   when we loaded driver, and is now set to "enable".
-                * After we're Alive, RF_KILL gets handled by
-                *   iwl4965_rx_card_state_notif() */
-               if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) {
+               /* driver only loads ucode once setting the interface up.
+                * the driver as well won't allow loading if RFKILL is set
+                * therefore no need to restart the driver from this handler
+                */
+               if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status))
                        clear_bit(STATUS_RF_KILL_HW, &priv->status);
-                       queue_work(priv->workqueue, &priv->restart);
-               }
 
                handled |= CSR_INT_BIT_RF_KILL;
        }
@@ -2566,7 +2561,7 @@ static void iwl_bg_scan_completed(struct work_struct *work)
  *
  *****************************************************************************/
 
-#define UCODE_READY_TIMEOUT    (2 * HZ)
+#define UCODE_READY_TIMEOUT    (4 * HZ)
 
 static int iwl4965_mac_start(struct ieee80211_hw *hw)
 {
@@ -2619,21 +2614,19 @@ static int iwl4965_mac_start(struct ieee80211_hw *hw)
 
        /* Wait for START_ALIVE from Run Time ucode. Otherwise callbacks from
         * mac80211 will not be run successfully. */
-       if (priv->ucode_type == UCODE_RT) {
-               ret = wait_event_interruptible_timeout(priv->wait_command_queue,
-                               test_bit(STATUS_READY, &priv->status),
-                               UCODE_READY_TIMEOUT);
-               if (!ret) {
-                       if (!test_bit(STATUS_READY, &priv->status)) {
-                               IWL_ERROR("START_ALIVE timeout after %dms.\n",
-                                       jiffies_to_msecs(UCODE_READY_TIMEOUT));
-                               ret = -ETIMEDOUT;
-                               goto out_release_irq;
-                       }
+       ret = wait_event_interruptible_timeout(priv->wait_command_queue,
+                       test_bit(STATUS_READY, &priv->status),
+                       UCODE_READY_TIMEOUT);
+       if (!ret) {
+               if (!test_bit(STATUS_READY, &priv->status)) {
+                       IWL_ERROR("START_ALIVE timeout after %dms.\n",
+                               jiffies_to_msecs(UCODE_READY_TIMEOUT));
+                       ret = -ETIMEDOUT;
+                       goto out_release_irq;
                }
-
-               priv->is_open = 1;
        }
+
+       priv->is_open = 1;
        IWL_DEBUG_MAC80211("leave\n");
        return 0;
 
@@ -3029,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,