summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/main.h
diff options
context:
space:
mode:
authorMarc Yang2011-03-26 03:47:02 +0100
committerJohn W. Linville2011-04-04 22:20:01 +0200
commit6d2bd916afe6950b50f750cd82bbb9c6ff58611f (patch)
treeb8e53e3b6dfcd1dbed899cd3b6afd60110dec450 /drivers/net/wireless/mwifiex/main.h
parentmwifiex: remove macro SHORT_SLOT_TIME_DISABLED (diff)
downloadkernel-qcow2-linux-6d2bd916afe6950b50f750cd82bbb9c6ff58611f.tar.gz
kernel-qcow2-linux-6d2bd916afe6950b50f750cd82bbb9c6ff58611f.tar.xz
kernel-qcow2-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/main.h')
-rw-r--r--drivers/net/wireless/mwifiex/main.h2
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 {
u8 event_body[MAX_EVENT_SIZE];
u32 hw_dot_11n_dev_cap;
u8 hw_dev_mcs_support;
- u32 usr_dot_11n_dev_cap;
- u8 usr_dev_mcs_support;
u8 adhoc_11n_enabled;
u8 chan_offset;
struct mwifiex_dbg dbg;