iwl4965: exclude 60M rate from probe request

This patch do the following 2 things:
1. Make sure we don't add rate 60M part of supported rate in proble request,
   some AP does not like that.
2. It is wrong to set priv->active_rate in this function, this will set
   it to all avialable rates which might overwrite the mode supported rate.
   priv->active_rate should be set by only from iwl_set_rate.

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>

diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 5408b5379a4bb396f3c0d3e963a845924d5bb1f6..a9415ca784ad0a0e369137d90a4b7d5e32d17859 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -1833,7 +1833,7 @@ static u16 iwl_fill_probe_req(struct iwl_priv *priv,
 {
        int len = 0;
        u8 *pos = NULL;
-       u16 active_rates, ret_rates, cck_rates;
+       u16 active_rates, ret_rates, cck_rates, active_rate_basic;
 
        /* Make sure there is enough space for the probe request,
         * two mandatory IEs and the data */
@@ -1883,17 +1883,19 @@ static u16 iwl_fill_probe_req(struct iwl_priv *priv,
        *pos++ = WLAN_EID_SUPP_RATES;
        *pos = 0;
 
-       priv->active_rate = priv->rates_mask;
-       active_rates = priv->active_rate;
-       priv->active_rate_basic = priv->rates_mask & IWL_BASIC_RATES_MASK;
+       /* exclude 60M rate */
+       active_rates = priv->rates_mask;
+       active_rates &= ~IWL_RATE_60M_MASK;
+
+       active_rate_basic = active_rates & IWL_BASIC_RATES_MASK;
 
        cck_rates = IWL_CCK_RATES_MASK & active_rates;
        ret_rates = iwl_supported_rate_to_ie(pos, cck_rates,
-                       priv->active_rate_basic, &left);
+                       active_rate_basic, &left);
        active_rates &= ~ret_rates;
 
        ret_rates = iwl_supported_rate_to_ie(pos, active_rates,
-                                priv->active_rate_basic, &left);
+                                active_rate_basic, &left);
        active_rates &= ~ret_rates;
 
        len += 2 + *pos;
@@ -1910,7 +1912,7 @@ static u16 iwl_fill_probe_req(struct iwl_priv *priv,
        *pos++ = WLAN_EID_EXT_SUPP_RATES;
        *pos = 0;
        iwl_supported_rate_to_ie(pos, active_rates,
-                                priv->active_rate_basic, &left);
+                                active_rate_basic, &left);
        if (*pos > 0)
                len += 2 + *pos;