evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mwifiex: use separate AMPDU tx/rx window sizes in 11ac networks

Browse source 
Newer 11ac enabled chipsets have more TX and RX buffers in FW
and hardware; so they may support larger TX and RX window sizes
for BA. Reset BA settings during association, adhoc join/start
or start_ap() if we are joining/creating 11ac network.

Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Sagar Bijwe <bsagar@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>
This commit is contained in:
Avinash Patil 2013-03-27 19:10:32 -07:00 • committed by John W. Linville
parent 04abc0a330
commit 2b6254dacf
5 changed files with 55 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/net/wireless/mwifiex/11ac.c
View file

@ -278,3 +278,25 @@ int mwifiex_cmd_11ac_cfg(struct mwifiex_private *priv,
return 0; return 0;
} }
/* This function initializes the BlockACK setup information for given
* mwifiex_private structure for 11ac enabled networks.
*/
void mwifiex_set_11ac_ba_params(struct mwifiex_private *priv)
{
priv->add_ba_param.timeout = MWIFIEX_DEFAULT_BLOCK_ACK_TIMEOUT;
if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP) {
priv->add_ba_param.tx_win_size =
MWIFIEX_11AC_UAP_AMPDU_DEF_TXWINSIZE;
priv->add_ba_param.rx_win_size =
MWIFIEX_11AC_UAP_AMPDU_DEF_RXWINSIZE;
} else {
priv->add_ba_param.tx_win_size =
MWIFIEX_11AC_STA_AMPDU_DEF_TXWINSIZE;
priv->add_ba_param.rx_win_size =
MWIFIEX_11AC_STA_AMPDU_DEF_RXWINSIZE;
}
return;
}

5
drivers/net/wireless/mwifiex/cfg80211.c
View file

@ -1381,6 +1381,11 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
priv->ap_11ac_enabled); priv->ap_11ac_enabled);
} }
if (priv->ap_11ac_enabled)
mwifiex_set_11ac_ba_params(priv);
else
mwifiex_set_ba_params(priv);
mwifiex_set_wmm_params(priv, bss_cfg, params); mwifiex_set_wmm_params(priv, bss_cfg, params);
if (params->inactivity_timeout > 0) { if (params->inactivity_timeout > 0) {

4
drivers/net/wireless/mwifiex/decl.h
View file

@ -45,6 +45,10 @@
#define MWIFIEX_STA_AMPDU_DEF_RXWINSIZE 32 #define MWIFIEX_STA_AMPDU_DEF_RXWINSIZE 32
#define MWIFIEX_UAP_AMPDU_DEF_TXWINSIZE 32 #define MWIFIEX_UAP_AMPDU_DEF_TXWINSIZE 32
#define MWIFIEX_UAP_AMPDU_DEF_RXWINSIZE 16 #define MWIFIEX_UAP_AMPDU_DEF_RXWINSIZE 16
#define MWIFIEX_11AC_STA_AMPDU_DEF_TXWINSIZE 32
#define MWIFIEX_11AC_STA_AMPDU_DEF_RXWINSIZE 48
#define MWIFIEX_11AC_UAP_AMPDU_DEF_TXWINSIZE 48
#define MWIFIEX_11AC_UAP_AMPDU_DEF_RXWINSIZE 32
#define MWIFIEX_DEFAULT_BLOCK_ACK_TIMEOUT 0xffff #define MWIFIEX_DEFAULT_BLOCK_ACK_TIMEOUT 0xffff

23
drivers/net/wireless/mwifiex/join.c
View file

@ -1295,6 +1295,14 @@ int mwifiex_associate(struct mwifiex_private *priv,
(bss_desc->bss_mode != NL80211_IFTYPE_STATION)) (bss_desc->bss_mode != NL80211_IFTYPE_STATION))
return -1; return -1;
if (ISSUPP_11ACENABLED(priv->adapter->fw_cap_info) &&
!bss_desc->disable_11n && !bss_desc->disable_11ac &&
(priv->adapter->config_bands & BAND_GAC ||
priv->adapter->config_bands & BAND_AAC))
mwifiex_set_11ac_ba_params(priv);
else
mwifiex_set_ba_params(priv);
memcpy(&current_bssid, memcpy(&current_bssid,
&priv->curr_bss_params.bss_descriptor.mac_address, &priv->curr_bss_params.bss_descriptor.mac_address,
sizeof(current_bssid)); sizeof(current_bssid));
@ -1323,6 +1331,13 @@ mwifiex_adhoc_start(struct mwifiex_private *priv,
dev_dbg(priv->adapter->dev, "info: curr_bss_params.band = %d\n", dev_dbg(priv->adapter->dev, "info: curr_bss_params.band = %d\n",
priv->curr_bss_params.band); priv->curr_bss_params.band);
if (ISSUPP_11ACENABLED(priv->adapter->fw_cap_info) &&
(priv->adapter->config_bands & BAND_GAC ||
priv->adapter->config_bands & BAND_AAC))
mwifiex_set_11ac_ba_params(priv);
else
mwifiex_set_ba_params(priv);
return mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_AD_HOC_START, return mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_AD_HOC_START,
HostCmd_ACT_GEN_SET, 0, adhoc_ssid); HostCmd_ACT_GEN_SET, 0, adhoc_ssid);
} }
@ -1356,6 +1371,14 @@ int mwifiex_adhoc_join(struct mwifiex_private *priv,
return -1; return -1;
} }
if (ISSUPP_11ACENABLED(priv->adapter->fw_cap_info) &&
!bss_desc->disable_11n && !bss_desc->disable_11ac &&
(priv->adapter->config_bands & BAND_GAC ||
priv->adapter->config_bands & BAND_AAC))
mwifiex_set_11ac_ba_params(priv);
else
mwifiex_set_ba_params(priv);
dev_dbg(priv->adapter->dev, "info: curr_bss_params.channel = %d\n", dev_dbg(priv->adapter->dev, "info: curr_bss_params.channel = %d\n",
priv->curr_bss_params.bss_descriptor.channel); priv->curr_bss_params.bss_descriptor.channel);
dev_dbg(priv->adapter->dev, "info: curr_bss_params.band = %c\n", dev_dbg(priv->adapter->dev, "info: curr_bss_params.band = %c\n",

1
drivers/net/wireless/mwifiex/main.h
View file

@ -925,6 +925,7 @@ mwifiex_set_wmm_params(struct mwifiex_private *priv,
struct mwifiex_uap_bss_param *bss_cfg, struct mwifiex_uap_bss_param *bss_cfg,
struct cfg80211_ap_settings *params); struct cfg80211_ap_settings *params);
void mwifiex_set_ba_params(struct mwifiex_private *priv); void mwifiex_set_ba_params(struct mwifiex_private *priv);
void mwifiex_set_11ac_ba_params(struct mwifiex_private *priv);
/* /*
* This function checks if the queuing is RA based or not. * This function checks if the queuing is RA based or not.