summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/cmdevt.c
diff options
context:
space:
mode:
authorMarc Yang <yangyang@marvell.com>2011-03-25 19:47:02 -0700
committerJohn W. Linville <linville@tuxdriver.com>2011-04-04 16:20:01 -0400
commit6d2bd916afe6950b50f750cd82bbb9c6ff58611f (patch)
treeb8e53e3b6dfcd1dbed899cd3b6afd60110dec450 /drivers/net/wireless/mwifiex/cmdevt.c
parentb93f85f0fb019f527b68569aafb836c94b89a47e (diff)
downloadblackbird-op-linux-6d2bd916afe6950b50f750cd82bbb9c6ff58611f.tar.gz
blackbird-op-linux-6d2bd916afe6950b50f750cd82bbb9c6ff58611f.zip
mwifiex: use IEEE80211_HT_CAP_ macros for 11n cap_info
The hw_dot_11n_dev_cap reported by firmware hw_spec has different format than the 11n capabilities. Hence a lot of SET_ and RESET_ bit operation macros were used to convert the dev_cap format to 11n capability format. However the locally defined 11n ht_cap macros are not necessary as we can use IEEE80211_HT_CAP_ macros directly. The 32-bit dev_cap bitmap is added as comment to explain the mapping between firmware and 11n spec. Some unused macros and unnecessary adapter variables are also removed. Signed-off-by: Marc Yang <yangyang@marvell.com> Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com> Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex/cmdevt.c')
-rw-r--r--drivers/net/wireless/mwifiex/cmdevt.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/mwifiex/cmdevt.c
index 24a3b6b69f64..3865dd19e4f8 100644
--- a/drivers/net/wireless/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/mwifiex/cmdevt.c
@@ -1448,10 +1448,7 @@ int mwifiex_ret_get_hw_spec(struct mwifiex_private *priv,
}
adapter->hw_dot_11n_dev_cap = le32_to_cpu(hw_spec->dot_11n_dev_cap);
- adapter->usr_dot_11n_dev_cap = adapter->hw_dot_11n_dev_cap &
- DEFAULT_11N_CAP_MASK;
adapter->hw_dev_mcs_support = hw_spec->dev_mcs_support;
- adapter->usr_dev_mcs_support = adapter->hw_dev_mcs_support;
if (adapter->if_ops.update_mp_end_port)
adapter->if_ops.update_mp_end_port(adapter,
OpenPOWER on IntegriCloud