diff options
author | Yogesh Ashok Powar <yogeshp@marvell.com> | 2011-03-24 23:49:38 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-04-04 16:20:00 -0400 |
commit | 0022801c893e953ebff8e0ad00cc22716055babf (patch) | |
tree | 2303759359ec0a7c4e56a8e26c3d720e1edaa330 /drivers/net/wireless/mwifiex | |
parent | 1ed76487ce115110171480deabd3cd4656f9803e (diff) |
mwifiex: remove helper functions for displaying 11n capabilities
'iw list' is sufficient to retrieve the information which
was displayed by these functions.
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')
-rw-r--r-- | drivers/net/wireless/mwifiex/11n.c | 96 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/11n.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/cmdevt.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/fw.h | 16 |
4 files changed, 0 insertions, 116 deletions
diff --git a/drivers/net/wireless/mwifiex/11n.c b/drivers/net/wireless/mwifiex/11n.c index 0e04a21be0a3..7b7b86d1ea3e 100644 --- a/drivers/net/wireless/mwifiex/11n.c +++ b/drivers/net/wireless/mwifiex/11n.c | |||
@@ -140,102 +140,6 @@ mwifiex_fill_cap_info(struct mwifiex_private *priv, | |||
140 | } | 140 | } |
141 | 141 | ||
142 | /* | 142 | /* |
143 | * Shows HT capability information fields. | ||
144 | * | ||
145 | * The following HT capability information fields are supported. | ||
146 | * - Maximum AMSDU length (3839 bytes or 7935 bytes) | ||
147 | * - Beam forming support | ||
148 | * - Greenfield preamble support | ||
149 | * - AMPDU support | ||
150 | * - MIMO Power Save support | ||
151 | * - Rx STBC support | ||
152 | * - Tx STBC support | ||
153 | * - Short GI for 20 MHz support | ||
154 | * - Short GI for 40 MHz support | ||
155 | * - LDPC coded packets receive support | ||
156 | * - Number of delayed BA streams | ||
157 | * - Number of immediate BA streams | ||
158 | * - 10 MHz channel width support | ||
159 | * - 20 MHz channel width support | ||
160 | * - 40 MHz channel width support | ||
161 | * - Presence of Tx antenna A/B/C/D | ||
162 | * - Presence of Rx antenna A/B/C/D | ||
163 | */ | ||
164 | void | ||
165 | mwifiex_show_dot_11n_dev_cap(struct mwifiex_adapter *adapter, u32 cap) | ||
166 | { | ||
167 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: Max MSDU len = %s octets\n", | ||
168 | (ISSUPP_MAXAMSDU(cap) ? "7935" : "3839")); | ||
169 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: Beam forming %s\n", | ||
170 | (ISSUPP_BEAMFORMING(cap) ? "supported" : "not supported")); | ||
171 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: Greenfield preamble %s\n", | ||
172 | (ISSUPP_GREENFIELD(cap) ? "supported" : "not supported")); | ||
173 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: AMPDU %s\n", | ||
174 | (ISSUPP_AMPDU(cap) ? "supported" : "not supported")); | ||
175 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: MIMO Power Save %s\n", | ||
176 | (ISSUPP_MIMOPS(cap) ? "supported" : "not supported")); | ||
177 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: Rx STBC %s\n", | ||
178 | (ISSUPP_RXSTBC(cap) ? "supported" : "not supported")); | ||
179 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: Tx STBC %s\n", | ||
180 | (ISSUPP_TXSTBC(cap) ? "supported" : "not supported")); | ||
181 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: Short GI for 40 Mhz %s\n", | ||
182 | (ISSUPP_SHORTGI40(cap) ? "supported" : "not supported")); | ||
183 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: Short GI for 20 Mhz %s\n", | ||
184 | (ISSUPP_SHORTGI20(cap) ? "supported" : "not supported")); | ||
185 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: LDPC coded packet receive %s\n", | ||
186 | (ISSUPP_RXLDPC(cap) ? "supported" : "not supported")); | ||
187 | dev_dbg(adapter->dev, | ||
188 | "info: GET_HW_SPEC: Number of Delayed Block Ack streams = %d\n", | ||
189 | GET_DELAYEDBACK(cap)); | ||
190 | dev_dbg(adapter->dev, | ||
191 | "info: GET_HW_SPEC: Number of Immediate Block Ack streams = %d\n", | ||
192 | GET_IMMEDIATEBACK(cap)); | ||
193 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: 40 Mhz channel width %s\n", | ||
194 | (ISSUPP_CHANWIDTH40(cap) ? "supported" : "not supported")); | ||
195 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: 20 Mhz channel width %s\n", | ||
196 | (ISSUPP_CHANWIDTH20(cap) ? "supported" : "not supported")); | ||
197 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: 10 Mhz channel width %s\n", | ||
198 | (ISSUPP_CHANWIDTH10(cap) ? "supported" : "not supported")); | ||
199 | |||
200 | if (ISSUPP_RXANTENNAA(cap)) | ||
201 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: Prescence of Rx antennea A\n"); | ||
202 | |||
203 | if (ISSUPP_RXANTENNAB(cap)) | ||
204 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: Prescence of Rx antennea B\n"); | ||
205 | |||
206 | if (ISSUPP_RXANTENNAC(cap)) | ||
207 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: Prescence of Rx antennea C\n"); | ||
208 | |||
209 | if (ISSUPP_RXANTENNAD(cap)) | ||
210 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: Prescence of Rx antennea D\n"); | ||
211 | |||
212 | if (ISSUPP_TXANTENNAA(cap)) | ||
213 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: Prescence of Tx antennea A\n"); | ||
214 | |||
215 | if (ISSUPP_TXANTENNAB(cap)) | ||
216 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: Prescence of Tx antennea B\n"); | ||
217 | |||
218 | if (ISSUPP_TXANTENNAC(cap)) | ||
219 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: Prescence of Tx antennea C\n"); | ||
220 | |||
221 | if (ISSUPP_TXANTENNAD(cap)) | ||
222 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: Prescence of Tx antennea D\n"); | ||
223 | |||
224 | return; | ||
225 | } | ||
226 | |||
227 | /* | ||
228 | * Shows HT MCS support field. | ||
229 | */ | ||
230 | void | ||
231 | mwifiex_show_dev_mcs_support(struct mwifiex_adapter *adapter, u8 support) | ||
232 | { | ||
233 | dev_dbg(adapter->dev, "info: GET_HW_SPEC: MCSs for %dx%d MIMO\n", | ||
234 | GET_RXMCSSUPP(support), GET_TXMCSSUPP(support)); | ||
235 | return; | ||
236 | } | ||
237 | |||
238 | /* | ||
239 | * This function returns the pointer to an entry in BA Stream | 143 | * This function returns the pointer to an entry in BA Stream |
240 | * table which matches the requested BA status. | 144 | * table which matches the requested BA status. |
241 | */ | 145 | */ |
diff --git a/drivers/net/wireless/mwifiex/11n.h b/drivers/net/wireless/mwifiex/11n.h index 769a27f2b2c3..71a853e61b61 100644 --- a/drivers/net/wireless/mwifiex/11n.h +++ b/drivers/net/wireless/mwifiex/11n.h | |||
@@ -24,8 +24,6 @@ | |||
24 | #include "11n_rxreorder.h" | 24 | #include "11n_rxreorder.h" |
25 | #include "wmm.h" | 25 | #include "wmm.h" |
26 | 26 | ||
27 | void mwifiex_show_dot_11n_dev_cap(struct mwifiex_adapter *adapter, u32 cap); | ||
28 | void mwifiex_show_dev_mcs_support(struct mwifiex_adapter *adapter, u8 support); | ||
29 | int mwifiex_ret_11n_delba(struct mwifiex_private *priv, | 27 | int mwifiex_ret_11n_delba(struct mwifiex_private *priv, |
30 | struct host_cmd_ds_command *resp); | 28 | struct host_cmd_ds_command *resp); |
31 | int mwifiex_ret_11n_addba_req(struct mwifiex_private *priv, | 29 | int mwifiex_ret_11n_addba_req(struct mwifiex_private *priv, |
diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/mwifiex/cmdevt.c index 3a8fe1e122fb..24a3b6b69f64 100644 --- a/drivers/net/wireless/mwifiex/cmdevt.c +++ b/drivers/net/wireless/mwifiex/cmdevt.c | |||
@@ -1452,8 +1452,6 @@ int mwifiex_ret_get_hw_spec(struct mwifiex_private *priv, | |||
1452 | DEFAULT_11N_CAP_MASK; | 1452 | DEFAULT_11N_CAP_MASK; |
1453 | adapter->hw_dev_mcs_support = hw_spec->dev_mcs_support; | 1453 | adapter->hw_dev_mcs_support = hw_spec->dev_mcs_support; |
1454 | adapter->usr_dev_mcs_support = adapter->hw_dev_mcs_support; | 1454 | adapter->usr_dev_mcs_support = adapter->hw_dev_mcs_support; |
1455 | mwifiex_show_dot_11n_dev_cap(adapter, adapter->hw_dot_11n_dev_cap); | ||
1456 | mwifiex_show_dev_mcs_support(adapter, adapter->hw_dev_mcs_support); | ||
1457 | 1455 | ||
1458 | if (adapter->if_ops.update_mp_end_port) | 1456 | if (adapter->if_ops.update_mp_end_port) |
1459 | adapter->if_ops.update_mp_end_port(adapter, | 1457 | adapter->if_ops.update_mp_end_port(adapter, |
diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h index e5dae45b11d2..d1a5a10c2a8e 100644 --- a/drivers/net/wireless/mwifiex/fw.h +++ b/drivers/net/wireless/mwifiex/fw.h | |||
@@ -196,30 +196,14 @@ enum MWIFIEX_802_11_WEP_STATUS { | |||
196 | 196 | ||
197 | #define DEFAULT_11N_CAP_MASK (HWSPEC_SHORTGI20_SUPP | HWSPEC_RXSTBC_SUPP) | 197 | #define DEFAULT_11N_CAP_MASK (HWSPEC_SHORTGI20_SUPP | HWSPEC_RXSTBC_SUPP) |
198 | #define ISSUPP_11NENABLED(FwCapInfo) (FwCapInfo & BIT(11)) | 198 | #define ISSUPP_11NENABLED(FwCapInfo) (FwCapInfo & BIT(11)) |
199 | #define ISSUPP_MAXAMSDU(Dot11nDevCap) (Dot11nDevCap & BIT(31)) | ||
200 | #define ISSUPP_BEAMFORMING(Dot11nDevCap) (Dot11nDevCap & BIT(30)) | ||
201 | #define ISSUPP_GREENFIELD(Dot11nDevCap) (Dot11nDevCap & BIT(29)) | 199 | #define ISSUPP_GREENFIELD(Dot11nDevCap) (Dot11nDevCap & BIT(29)) |
202 | #define ISSUPP_AMPDU(Dot11nDevCap) (Dot11nDevCap & BIT(28)) | ||
203 | #define ISSUPP_MIMOPS(Dot11nDevCap) (Dot11nDevCap & BIT(27)) | ||
204 | #define ISSUPP_RXSTBC(Dot11nDevCap) (Dot11nDevCap & BIT(26)) | 200 | #define ISSUPP_RXSTBC(Dot11nDevCap) (Dot11nDevCap & BIT(26)) |
205 | #define ISSUPP_TXSTBC(Dot11nDevCap) (Dot11nDevCap & BIT(25)) | 201 | #define ISSUPP_TXSTBC(Dot11nDevCap) (Dot11nDevCap & BIT(25)) |
206 | #define ISSUPP_SHORTGI40(Dot11nDevCap) (Dot11nDevCap & BIT(24)) | 202 | #define ISSUPP_SHORTGI40(Dot11nDevCap) (Dot11nDevCap & BIT(24)) |
207 | #define ISSUPP_SHORTGI20(Dot11nDevCap) (Dot11nDevCap & BIT(23)) | 203 | #define ISSUPP_SHORTGI20(Dot11nDevCap) (Dot11nDevCap & BIT(23)) |
208 | #define ISSUPP_RXLDPC(Dot11nDevCap) (Dot11nDevCap & BIT(22)) | ||
209 | #define GET_DELAYEDBACK(Dot11nDevCap) (((Dot11nDevCap >> 20) & 0x03)) | 204 | #define GET_DELAYEDBACK(Dot11nDevCap) (((Dot11nDevCap >> 20) & 0x03)) |
210 | #define GET_IMMEDIATEBACK(Dot11nDevCap) (((Dot11nDevCap >> 18) & 0x03)) | ||
211 | #define ISSUPP_CHANWIDTH40(Dot11nDevCap) (Dot11nDevCap & BIT(17)) | 205 | #define ISSUPP_CHANWIDTH40(Dot11nDevCap) (Dot11nDevCap & BIT(17)) |
212 | #define ISSUPP_CHANWIDTH20(Dot11nDevCap) (Dot11nDevCap & BIT(16)) | ||
213 | #define ISSUPP_CHANWIDTH10(Dot11nDevCap) (Dot11nDevCap & BIT(15)) | ||
214 | #define ISENABLED_40MHZ_INTOLARENT(Dot11nDevCap) (Dot11nDevCap & BIT(8)) | 206 | #define ISENABLED_40MHZ_INTOLARENT(Dot11nDevCap) (Dot11nDevCap & BIT(8)) |
215 | #define ISSUPP_RXANTENNAD(Dot11nDevCap) (Dot11nDevCap & BIT(7)) | ||
216 | #define ISSUPP_RXANTENNAC(Dot11nDevCap) (Dot11nDevCap & BIT(6)) | ||
217 | #define ISSUPP_RXANTENNAB(Dot11nDevCap) (Dot11nDevCap & BIT(5)) | ||
218 | #define ISSUPP_RXANTENNAA(Dot11nDevCap) (Dot11nDevCap & BIT(4)) | ||
219 | #define ISSUPP_TXANTENNAD(Dot11nDevCap) (Dot11nDevCap & BIT(3)) | ||
220 | #define ISSUPP_TXANTENNAC(Dot11nDevCap) (Dot11nDevCap & BIT(2)) | ||
221 | #define ISSUPP_TXANTENNAB(Dot11nDevCap) (Dot11nDevCap & BIT(1)) | ||
222 | #define ISSUPP_TXANTENNAA(Dot11nDevCap) (Dot11nDevCap & BIT(0)) | ||
223 | #define SETSUPP_CHANWIDTH40(Dot11nDevCap) (Dot11nDevCap |= BIT(17)) | 207 | #define SETSUPP_CHANWIDTH40(Dot11nDevCap) (Dot11nDevCap |= BIT(17)) |
224 | #define RESETSUPP_CHANWIDTH40(Dot11nDevCap) (Dot11nDevCap &= ~BIT(17)) | 208 | #define RESETSUPP_CHANWIDTH40(Dot11nDevCap) (Dot11nDevCap &= ~BIT(17)) |
225 | #define GET_TXMCSSUPP(DevMCSSupported) (DevMCSSupported >> 4) | 209 | #define GET_TXMCSSUPP(DevMCSSupported) (DevMCSSupported >> 4) |