openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mwifiex: HT capability information handling 

1) Initialise HT capabilities in cfg80211 properly.
2) Cfg80211 stack may modify "sband->ht_cap" to disable
40Mhz operation in 2.4GHz band (after recent patch
"cfg80211: module_param to disable HT40 in 2.4GHz band")
Therefore read "sband->ht_cap" instead of an adapter variable
"hw_dot_11n_dev_cap" to get HT capabilities.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Amitkumar Karwar 2011-04-27 19:13:12 -07:00 committed by John W. Linville
parent adc8959573
commit a46b7b5c13
4 changed files with 64 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
drivers/net/wireless/mwifiex/11n.c
View File

@ -29,95 +29,38 @@
* Fills HT capability information field, AMPDU Parameters field, HT extended * Fills HT capability information field, AMPDU Parameters field, HT extended
* capability field, and supported MCS set fields. * capability field, and supported MCS set fields.
* *
* Only the following HT capability information fields are used, all other * HT capability information field, AMPDU Parameters field, supported MCS set
* fields are always turned off. * fields are retrieved from cfg80211 stack
*
* Bit 1 : Supported channel width (0: 20MHz, 1: Both 20 and 40 MHz)
* Bit 4 : Greenfield support (0: Not supported, 1: Supported)
* Bit 5 : Short GI for 20 MHz support (0: Not supported, 1: Supported)
* Bit 6 : Short GI for 40 MHz support (0: Not supported, 1: Supported)
* Bit 7 : Tx STBC (0: Not supported, 1: Supported)
* Bit 8-9 : Rx STBC (0: Not supported, X: Support for up to X spatial streams)
* Bit 10 : Delayed BA support (0: Not supported, 1: Supported)
* Bit 11 : Maximum AMSDU length (0: 3839 octets, 1: 7935 octets)
* Bit 14 : 40-Mhz intolerant support (0: Not supported, 1: Supported)
*
* In addition, the following AMPDU Parameters are set -
* - Maximum AMPDU length exponent (set to 3)
* - Minimum AMPDU start spacing (set to 0 - No restrictions)
*
* MCS is set for 1x1, with MSC32 for infra mode or ad-hoc mode with 40 MHz
* support.
* *
* RD responder bit to set to clear in the extended capability header. * RD responder bit to set to clear in the extended capability header.
*/ */
void void
mwifiex_fill_cap_info(struct mwifiex_private *priv, mwifiex_fill_cap_info(struct mwifiex_private *priv, u8 radio_type,
struct mwifiex_ie_types_htcap *ht_cap) struct mwifiex_ie_types_htcap *ht_cap)
{ {
struct mwifiex_adapter *adapter = priv->adapter;
u8 *mcs;
int rx_mcs_supp;
uint16_t ht_cap_info = le16_to_cpu(ht_cap->ht_cap.cap_info);
uint16_t ht_ext_cap = le16_to_cpu(ht_cap->ht_cap.extended_ht_cap_info); uint16_t ht_ext_cap = le16_to_cpu(ht_cap->ht_cap.extended_ht_cap_info);
struct ieee80211_supported_band *sband =
priv->wdev->wiphy->bands[radio_type];
/* Convert dev_cap to IEEE80211_HT_CAP */ ht_cap->ht_cap.ampdu_params_info =
if (ISSUPP_CHANWIDTH40(adapter->hw_dot_11n_dev_cap)) (sband->ht_cap.ampdu_factor &
ht_cap_info |= IEEE80211_HT_CAP_SUP_WIDTH_20_40; IEEE80211_HT_AMPDU_PARM_FACTOR)|
else ((sband->ht_cap.ampdu_density <<
ht_cap_info &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40; IEEE80211_HT_AMPDU_PARM_DENSITY_SHIFT) &
IEEE80211_HT_AMPDU_PARM_DENSITY);
if (ISSUPP_SHORTGI20(adapter->hw_dot_11n_dev_cap)) memcpy((u8 *) &ht_cap->ht_cap.mcs, &sband->ht_cap.mcs,
ht_cap_info |= IEEE80211_HT_CAP_SGI_20; sizeof(sband->ht_cap.mcs));
else
ht_cap_info &= ~IEEE80211_HT_CAP_SGI_20;
if (ISSUPP_SHORTGI40(adapter->hw_dot_11n_dev_cap))
ht_cap_info |= IEEE80211_HT_CAP_SGI_40;
else
ht_cap_info &= ~IEEE80211_HT_CAP_SGI_40;
if (ISSUPP_TXSTBC(adapter->hw_dot_11n_dev_cap))
ht_cap_info |= IEEE80211_HT_CAP_TX_STBC;
else
ht_cap_info &= ~IEEE80211_HT_CAP_TX_STBC;
if (ISSUPP_RXSTBC(adapter->hw_dot_11n_dev_cap))
ht_cap_info |= 1 << IEEE80211_HT_CAP_RX_STBC_SHIFT;
else
ht_cap_info &= ~(3 << IEEE80211_HT_CAP_RX_STBC_SHIFT);
if (ISSUPP_GREENFIELD(adapter->hw_dot_11n_dev_cap))
ht_cap_info |= IEEE80211_HT_CAP_GRN_FLD;
else
ht_cap_info &= ~IEEE80211_HT_CAP_GRN_FLD;
ht_cap_info &= ~IEEE80211_HT_CAP_MAX_AMSDU;
ht_cap_info |= IEEE80211_HT_CAP_SM_PS;
ht_cap->ht_cap.ampdu_params_info |= IEEE80211_HT_AMPDU_PARM_FACTOR;
ht_cap->ht_cap.ampdu_params_info &= ~IEEE80211_HT_AMPDU_PARM_DENSITY;
rx_mcs_supp = GET_RXMCSSUPP(adapter->hw_dev_mcs_support);
mcs = (u8 *)&ht_cap->ht_cap.mcs;
/* Set MCS for 1x1 */
memset(mcs, 0xff, rx_mcs_supp);
/* Clear all the other values */
memset(&mcs[rx_mcs_supp], 0,
sizeof(struct ieee80211_mcs_info) - rx_mcs_supp);
if (priv->bss_mode == NL80211_IFTYPE_STATION || if (priv->bss_mode == NL80211_IFTYPE_STATION ||
(ht_cap_info & IEEE80211_HT_CAP_SUP_WIDTH_20_40)) (sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40))
/* Set MCS32 for infra mode or ad-hoc mode with 40MHz support */ /* Set MCS32 for infra mode or ad-hoc mode with 40MHz support */
SETHT_MCS32(ht_cap->ht_cap.mcs.rx_mask); SETHT_MCS32(ht_cap->ht_cap.mcs.rx_mask);
/* Clear RD responder bit */ /* Clear RD responder bit */
ht_ext_cap &= ~IEEE80211_HT_EXT_CAP_RD_RESPONDER; ht_ext_cap &= ~IEEE80211_HT_EXT_CAP_RD_RESPONDER;
ht_cap->ht_cap.cap_info = cpu_to_le16(ht_cap_info); ht_cap->ht_cap.cap_info = cpu_to_le16(sband->ht_cap.cap);
ht_cap->ht_cap.extended_ht_cap_info = cpu_to_le16(ht_ext_cap); ht_cap->ht_cap.extended_ht_cap_info = cpu_to_le16(ht_ext_cap);
} }
@ -391,10 +334,15 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,
struct mwifiex_ie_types_2040bssco *bss_co_2040; struct mwifiex_ie_types_2040bssco *bss_co_2040;
struct mwifiex_ie_types_extcap *ext_cap; struct mwifiex_ie_types_extcap *ext_cap;
int ret_len = 0; int ret_len = 0;
struct ieee80211_supported_band *sband;
u8 radio_type;
if (!buffer || !*buffer) if (!buffer || !*buffer)
return ret_len; return ret_len;
radio_type = mwifiex_band_to_radio_type((u8) bss_desc->bss_band);
sband = priv->wdev->wiphy->bands[radio_type];
if (bss_desc->bcn_ht_cap) { if (bss_desc->bcn_ht_cap) {
ht_cap = (struct mwifiex_ie_types_htcap *) *buffer; ht_cap = (struct mwifiex_ie_types_htcap *) *buffer;
memset(ht_cap, 0, sizeof(struct mwifiex_ie_types_htcap)); memset(ht_cap, 0, sizeof(struct mwifiex_ie_types_htcap));
@ -406,7 +354,7 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,
sizeof(struct ieee_types_header), sizeof(struct ieee_types_header),
le16_to_cpu(ht_cap->header.len)); le16_to_cpu(ht_cap->header.len));
mwifiex_fill_cap_info(priv, ht_cap); mwifiex_fill_cap_info(priv, radio_type, ht_cap);
*buffer += sizeof(struct mwifiex_ie_types_htcap); *buffer += sizeof(struct mwifiex_ie_types_htcap);
ret_len += sizeof(struct mwifiex_ie_types_htcap); ret_len += sizeof(struct mwifiex_ie_types_htcap);
@ -428,8 +376,8 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,
sizeof(struct ieee_types_header), sizeof(struct ieee_types_header),
le16_to_cpu(ht_info->header.len)); le16_to_cpu(ht_info->header.len));
if (!ISSUPP_CHANWIDTH40 if (!(sband->ht_cap.cap &
(priv->adapter->hw_dot_11n_dev_cap)) IEEE80211_HT_CAP_SUP_WIDTH_20_40))
ht_info->ht_info.ht_param &= ht_info->ht_info.ht_param &=
~(IEEE80211_HT_PARAM_CHAN_WIDTH_ANY | ~(IEEE80211_HT_PARAM_CHAN_WIDTH_ANY |
IEEE80211_HT_PARAM_CHA_SEC_OFFSET); IEEE80211_HT_PARAM_CHA_SEC_OFFSET);
@ -451,7 +399,7 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,
chan_list->chan_scan_param[0].radio_type = chan_list->chan_scan_param[0].radio_type =
mwifiex_band_to_radio_type((u8) bss_desc->bss_band); mwifiex_band_to_radio_type((u8) bss_desc->bss_band);
if (ISSUPP_CHANWIDTH40(priv->adapter->hw_dot_11n_dev_cap) if ((sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)
&& (bss_desc->bcn_ht_info->ht_param & && (bss_desc->bcn_ht_info->ht_param &
IEEE80211_HT_PARAM_CHAN_WIDTH_ANY)) IEEE80211_HT_PARAM_CHAN_WIDTH_ANY))
SET_SECONDARYCHAN(chan_list->chan_scan_param[0]. SET_SECONDARYCHAN(chan_list->chan_scan_param[0].

2
drivers/net/wireless/mwifiex/11n.h
View File

@ -38,7 +38,7 @@ int mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,
u8 **buffer); u8 **buffer);
void mwifiex_cfg_tx_buf(struct mwifiex_private *priv, void mwifiex_cfg_tx_buf(struct mwifiex_private *priv,
struct mwifiex_bssdescriptor *bss_desc); struct mwifiex_bssdescriptor *bss_desc);
void mwifiex_fill_cap_info(struct mwifiex_private *, void mwifiex_fill_cap_info(struct mwifiex_private *, u8 radio_type,
struct mwifiex_ie_types_htcap *); struct mwifiex_ie_types_htcap *);
int mwifiex_set_get_11n_htcap_cfg(struct mwifiex_private *priv, int mwifiex_set_get_11n_htcap_cfg(struct mwifiex_private *priv,
u16 action, int *htcap_cfg); u16 action, int *htcap_cfg);

42
drivers/net/wireless/mwifiex/cfg80211.c
View File

@ -1150,9 +1150,9 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev,
* *
* The following default values are set - * The following default values are set -
* - HT Supported = True * - HT Supported = True
* - Maximum AMPDU length factor = 0x3 * - Maximum AMPDU length factor = IEEE80211_HT_MAX_AMPDU_64K
* - Minimum AMPDU spacing = 0x6 * - Minimum AMPDU spacing = IEEE80211_HT_MPDU_DENSITY_NONE
* - HT Capabilities map = IEEE80211_HT_CAP_SUP_WIDTH_20_40 (0x0002) * - HT Capabilities supported by firmware
* - MCS information, Rx mask = 0xff * - MCS information, Rx mask = 0xff
* - MCD information, Tx parameters = IEEE80211_HT_MCS_TX_DEFINED (0x01) * - MCD information, Tx parameters = IEEE80211_HT_MCS_TX_DEFINED (0x01)
*/ */
@ -1166,13 +1166,41 @@ mwifiex_setup_ht_caps(struct ieee80211_sta_ht_cap *ht_info,
struct mwifiex_adapter *adapter = priv->adapter; struct mwifiex_adapter *adapter = priv->adapter;
ht_info->ht_supported = true; ht_info->ht_supported = true;
ht_info->ampdu_factor = 0x3; ht_info->ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;
ht_info->ampdu_density = 0x6; ht_info->ampdu_density = IEEE80211_HT_MPDU_DENSITY_NONE;
memset(&ht_info->mcs, 0, sizeof(ht_info->mcs)); memset(&ht_info->mcs, 0, sizeof(ht_info->mcs));
ht_info->cap = IEEE80211_HT_CAP_SUP_WIDTH_20_40;
rx_mcs_supp = GET_RXMCSSUPP(priv->adapter->hw_dev_mcs_support); /* Fill HT capability information */
if (ISSUPP_CHANWIDTH40(adapter->hw_dot_11n_dev_cap))
ht_info->cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;
else
ht_info->cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
if (ISSUPP_SHORTGI20(adapter->hw_dot_11n_dev_cap))
ht_info->cap |= IEEE80211_HT_CAP_SGI_20;
else
ht_info->cap &= ~IEEE80211_HT_CAP_SGI_20;
if (ISSUPP_SHORTGI40(adapter->hw_dot_11n_dev_cap))
ht_info->cap |= IEEE80211_HT_CAP_SGI_40;
else
ht_info->cap &= ~IEEE80211_HT_CAP_SGI_40;
if (ISSUPP_RXSTBC(adapter->hw_dot_11n_dev_cap))
ht_info->cap |= 1 << IEEE80211_HT_CAP_RX_STBC_SHIFT;
else
ht_info->cap &= ~(3 << IEEE80211_HT_CAP_RX_STBC_SHIFT);
if (ISSUPP_TXSTBC(adapter->hw_dot_11n_dev_cap))
ht_info->cap |= IEEE80211_HT_CAP_TX_STBC;
else
ht_info->cap &= ~IEEE80211_HT_CAP_TX_STBC;
ht_info->cap &= ~IEEE80211_HT_CAP_MAX_AMSDU;
ht_info->cap |= IEEE80211_HT_CAP_SM_PS;
rx_mcs_supp = GET_RXMCSSUPP(adapter->hw_dev_mcs_support);
/* Set MCS for 1x1 */ /* Set MCS for 1x1 */
memset(mcs, 0xff, rx_mcs_supp); memset(mcs, 0xff, rx_mcs_supp);
/* Clear all the other values */ /* Clear all the other values */

4
drivers/net/wireless/mwifiex/scan.c
View File

@ -1007,7 +1007,9 @@ mwifiex_scan_setup_scan_config(struct mwifiex_private *priv,
ht_cap->header.type = cpu_to_le16(WLAN_EID_HT_CAPABILITY); ht_cap->header.type = cpu_to_le16(WLAN_EID_HT_CAPABILITY);
ht_cap->header.len = ht_cap->header.len =
cpu_to_le16(sizeof(struct ieee80211_ht_cap)); cpu_to_le16(sizeof(struct ieee80211_ht_cap));
mwifiex_fill_cap_info(priv, ht_cap); radio_type =
mwifiex_band_to_radio_type(priv->adapter->config_bands);
mwifiex_fill_cap_info(priv, radio_type, ht_cap);
tlv_pos += sizeof(struct mwifiex_ie_types_htcap); tlv_pos += sizeof(struct mwifiex_ie_types_htcap);
} }