iwlwifi: enhance WPA authenication stability

This patch enhanced WPA authenication stability by avoiding scan
immediately followed by association. We don't do any scanning right
after association in next several seconds. This will allow WPA
authentication to take place without any interruption.

Signed-off-by: Mohamed Abbas <mabbas@linux.intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 17 insertions, 7 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index e15986c33d0b..670f611adf9f 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -2905,7 +2905,8 @@ static int iwl4965_tx_skb(struct iwl4965_priv *priv,
                 IWL_DEBUG_TX("Sending REASSOC frame\n");
 #endif
 
-        if (!iwl4965_is_associated(priv) &&
+        /* drop all data frame if we are not associated */
+        if (!iwl4965_is_associated(priv) && !priv->assoc_id &&
             ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA)) {
                 IWL_DEBUG_DROP("Dropping - !iwl4965_is_associated\n");
                 goto drop_unlock;
@@ -4055,6 +4056,7 @@ static void iwl4965_rx_scan_results_notif(struct iwl4965_priv *priv,
                                         (priv->last_scan_jiffies, jiffies)));
 
         priv->last_scan_jiffies = jiffies;
+        priv->next_scan_jiffies = 0;
 }
 
 /* Service SCAN_COMPLETE_NOTIFICATION (0x84) */
@@ -4097,6 +4099,7 @@ static void iwl4965_rx_scan_complete_notif(struct iwl4965_priv *priv,
         }
 
         priv->last_scan_jiffies = jiffies;
+        priv->next_scan_jiffies = 0;
         IWL_DEBUG_INFO("Setting scan to off\n");
 
         clear_bit(STATUS_SCANNING, &priv->status);
@@ -7228,6 +7231,8 @@ static void iwl4965_bg_rx_replenish(struct work_struct *data)
         mutex_unlock(&priv->mutex);
 }
 
+#define IWL_DELAY_NEXT_SCAN (HZ*2)
+
 static void iwl4965_bg_post_associate(struct work_struct *data)
 {
         struct iwl4965_priv *priv = container_of(data, struct iwl4965_priv,
@@ -7343,6 +7348,8 @@ static void iwl4965_bg_post_associate(struct work_struct *data)
 #ifdef CONFIG_IWL4965_QOS
         iwl4965_activate_qos(priv, 0);
 #endif /* CONFIG_IWL4965_QOS */
+        /* we have just associated, don't start scan too early */
+        priv->next_scan_jiffies = jiffies + IWL_DELAY_NEXT_SCAN;
         mutex_unlock(&priv->mutex);
 }
 
@@ -7811,7 +7818,6 @@ static void iwl4965_mac_erp_ie_changed(struct ieee80211_hw *hw,
                 iwl4965_send_rxon_assoc(priv);
 }
 
-#define IWL_DELAY_NEXT_SCAN (HZ*2)
 static int iwl4965_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len)
 {
         int rc = 0;
@@ -7835,16 +7841,20 @@ static int iwl4965_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len)
                 goto out_unlock;
         }
 
+        /* we don't schedule scan within next_scan_jiffies period */
+        if (priv->next_scan_jiffies &&
+                        time_after(priv->next_scan_jiffies, jiffies)) {
+                rc = -EAGAIN;
+                goto out_unlock;
+        }
         /* if we just finished scan ask for delay */
-        if (priv->last_scan_jiffies &&
-            time_after(priv->last_scan_jiffies + IWL_DELAY_NEXT_SCAN,
-                       jiffies)) {
+        if (priv->last_scan_jiffies && time_after(priv->last_scan_jiffies +
+                                IWL_DELAY_NEXT_SCAN, jiffies)) {
                 rc = -EAGAIN;
                 goto out_unlock;
         }
         if (len) {
-                IWL_DEBUG_SCAN("direct scan for  "
-                               "%s [%d]\n ",
+                IWL_DEBUG_SCAN("direct scan for %s [%d]\n ",
                                iwl4965_escape_essid(ssid, len), (int)len);
 
                 priv->one_direct_scan = 1;