diff options
author | Marc Yang <yangyang@marvell.com> | 2011-03-25 22:47:02 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-04-04 16:20:01 -0400 |
commit | 6d2bd916afe6950b50f750cd82bbb9c6ff58611f (patch) | |
tree | b8e53e3b6dfcd1dbed899cd3b6afd60110dec450 /drivers/net/wireless/mwifiex/main.h | |
parent | b93f85f0fb019f527b68569aafb836c94b89a47e (diff) |
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/main.h')
-rw-r--r-- | drivers/net/wireless/mwifiex/main.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h index f6fe1054a65c..7bcb2e965aeb 100644 --- a/drivers/net/wireless/mwifiex/main.h +++ b/drivers/net/wireless/mwifiex/main.h | |||
@@ -687,8 +687,6 @@ struct mwifiex_adapter { | |||
687 | u8 event_body[MAX_EVENT_SIZE]; | 687 | u8 event_body[MAX_EVENT_SIZE]; |
688 | u32 hw_dot_11n_dev_cap; | 688 | u32 hw_dot_11n_dev_cap; |
689 | u8 hw_dev_mcs_support; | 689 | u8 hw_dev_mcs_support; |
690 | u32 usr_dot_11n_dev_cap; | ||
691 | u8 usr_dev_mcs_support; | ||
692 | u8 adhoc_11n_enabled; | 690 | u8 adhoc_11n_enabled; |
693 | u8 chan_offset; | 691 | u8 chan_offset; |
694 | struct mwifiex_dbg dbg; | 692 | struct mwifiex_dbg dbg; |