mwifiex: change default tx/rx win_size for BA setup
PATCH 1/2 mwifiex: change default tx/rx win_size for BA setup
From: Avinash Patil <[email protected]>
This patch fixes an issue where RX throughput values observed were substantially lower than TX counterparts for PCIe8897 STA. PCIe8897 supports larger rx_win_size. After changing these values we see big improvement for TX and RX throughput values.
Different tx_win_size and rx_win_size are used for AP mode.
All BA setup related initialization has been moved to separate function.
--- drivers/net/wireless/mwifiex/11n.c | 22 ++++++++++++++++++++++ drivers/net/wireless/mwifiex/decl.h | 7 +++++-- drivers/net/wireless/mwifiex/main.h | 1 + drivers/net/wireless/mwifiex/wmm.c | 5 +---- 4 files changed, 29 insertions(+), 6 deletions(-)
drivers/net/wireless/mwifiex/11n.c +22 -0
@@ -679,3 +679,25 @@ void mwifiex_del_tx_ba_stream_tbl_by_ra(struct mwifiex_private *priv, u8 *ra)return ; } + +/* This function initializes the BlockACK setup information for given +* mwifiex_private structure. +*/ +void mwifiex_set_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_UAP_AMPDU_DEF_TXWINSIZE ; + priv->add_ba_param.rx_win_size = +MWIFIEX_UAP_AMPDU_DEF_RXWINSIZE ; + }else { + priv->add_ba_param.tx_win_size = +MWIFIEX_STA_AMPDU_DEF_TXWINSIZE ; + priv->add_ba_param.rx_win_size = +MWIFIEX_STA_AMPDU_DEF_RXWINSIZE ; + } + +return ; +}
drivers/net/wireless/mwifiex/decl.h +5 -2
@@ -41,8 +41,11 @@#define MWIFIEX_MAX_TX_BASTREAM_SUPPORTED 2#define MWIFIEX_MAX_RX_BASTREAM_SUPPORTED 16 -#define MWIFIEX_AMPDU_DEF_TXWINSIZE 32 -#define MWIFIEX_AMPDU_DEF_RXWINSIZE 16 +#define MWIFIEX_STA_AMPDU_DEF_TXWINSIZE 16 +#define MWIFIEX_STA_AMPDU_DEF_RXWINSIZE 32 +#define MWIFIEX_UAP_AMPDU_DEF_TXWINSIZE 32 +#define MWIFIEX_UAP_AMPDU_DEF_RXWINSIZE 16 +#define MWIFIEX_DEFAULT_BLOCK_ACK_TIMEOUT 0xffff#define MWIFIEX_RATE_BITMAP_MCS0 32
drivers/net/wireless/mwifiex/main.h +1 -0
@@ -924,6 +924,7 @@ void mwifiex_set_wmm_params(struct mwifiex_private *priv, struct mwifiex_uap_bss_param *bss_cfg, struct cfg80211_ap_settings *params); +void mwifiex_set_ba_params (struct mwifiex_private *priv);/* * This function checks if the queuing is RA based or not.
drivers/net/wireless/mwifiex/wmm.c +1 -4
@@ -436,10 +436,7 @@ mwifiex_wmm_init(struct mwifiex_adapter *adapter) = priv->aggr_prio_tbl[7].ampdu_user =BA_STREAM_NOT_ALLOWED ; - priv->add_ba_param.timeout =MWIFIEX_DEFAULT_BLOCK_ACK_TIMEOUT ; - priv->add_ba_param.tx_win_size =MWIFIEX_AMPDU_DEF_TXWINSIZE ; - priv->add_ba_param.rx_win_size =MWIFIEX_AMPDU_DEF_RXWINSIZE ; - +mwifiex_set_ba_params (priv);mwifiex_reset_11n_rx_seq_num (priv);atomic_set (&priv->wmm.tx_pkts_queued,0 );
Signature · 1 line
1.7.0.2
PATCH 2/2 mwifiex: use separate AMPDU tx/rx window sizes in 11ac networks
From: Avinash Patil <[email protected]>
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.
--- drivers/net/wireless/mwifiex/11ac.c | 22 ++++++++++++++++++++++ drivers/net/wireless/mwifiex/cfg80211.c | 5 +++++ drivers/net/wireless/mwifiex/decl.h | 4 ++++ drivers/net/wireless/mwifiex/join.c | 23 +++++++++++++++++++++++ drivers/net/wireless/mwifiex/main.h | 1 + 5 files changed, 55 insertions(+), 0 deletions(-)
drivers/net/wireless/mwifiex/11ac.c +22 -0
@@ -278,3 +278,25 @@ int mwifiex_cmd_11ac_cfg(struct mwifiex_private *priv,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 ; +}
drivers/net/wireless/mwifiex/cfg80211.c +5 -0
@@ -1381,6 +1381,11 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy, 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);if (params->inactivity_timeout >0 ) {
drivers/net/wireless/mwifiex/decl.h +4 -0
@@ -45,6 +45,10 @@#define MWIFIEX_STA_AMPDU_DEF_RXWINSIZE 32#define MWIFIEX_UAP_AMPDU_DEF_TXWINSIZE 32#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
drivers/net/wireless/mwifiex/join.c +23 -0
@@ -1295,6 +1295,14 @@ int mwifiex_associate(struct mwifiex_private *priv, (bss_desc->bss_mode != NL80211_IFTYPE_STATION))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 (¤t_bssid, &priv->curr_bss_params.bss_descriptor.mac_address,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" , 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, HostCmd_ACT_GEN_SET,0 , adhoc_ssid); }
@@ -1356,6 +1371,14 @@ int mwifiex_adhoc_join(struct mwifiex_private *priv,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" , priv->curr_bss_params.bss_descriptor.channel); dev_dbg(priv->adapter->dev, "info: curr_bss_params.band = %c\n",
drivers/net/wireless/mwifiex/main.h +1 -0
@@ -925,6 +925,7 @@ mwifiex_set_wmm_params(struct mwifiex_private *priv,struct mwifiex_uap_bss_param *bss_cfg, struct cfg80211_ap_settings *params);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.
Signature · 1 line
1.7.0.2