iwlwifi: support "pure 40MHz" in RXON command

Fix the bug when using 11n "pure 40MHz" mode cause uCode
crashing by adding support for "pure 40MHz" in RX_ON command flag.
the "mode" field (bits 25:26) has value of 0-3
    0 = 20 MHz only
    1 = 40MHz only
    2 = Mixed
    3 = Reserved
Control Channel ID (bit 22) is valid only in Mixed mode.

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 4be7bd29ef6d..7df41163ded2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -293,10 +293,12 @@ restart:
         queue_work(priv->workqueue, &priv->restart);
 }
 
-static int is_fat_channel(__le32 rxon_flags)
+static bool is_fat_channel(__le32 rxon_flags)
 {
-        return (rxon_flags & RXON_FLG_CHANNEL_MODE_PURE_40_MSK) ||
-                (rxon_flags & RXON_FLG_CHANNEL_MODE_MIXED_MSK);
+        int chan_mod = le32_to_cpu(rxon_flags & RXON_FLG_CHANNEL_MODE_MSK)
+                                    >> RXON_FLG_CHANNEL_MODE_POS;
+        return ((chan_mod == CHANNEL_MODE_PURE_40) ||
+                  (chan_mod == CHANNEL_MODE_MIXED));
 }
 
 /*
@@ -1490,7 +1492,7 @@ static int iwl4965_send_tx_power(struct iwl_priv *priv)
         struct iwl4965_txpowertable_cmd cmd = { 0 };
         int ret;
         u8 band = 0;
-        u8 is_fat = 0;
+        bool is_fat = false;
         u8 ctrl_chan_high = 0;
 
         if (test_bit(STATUS_SCANNING, &priv->status)) {
@@ -1568,7 +1570,7 @@ static int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel)
 {
         int rc;
         u8 band = 0;
-        u8 is_fat = 0;
+        bool is_fat = false;
         u8 ctrl_chan_high = 0;
         struct iwl4965_channel_switch_cmd cmd = { 0 };
         const struct iwl_channel_info *ch_info;