Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b6254da authored by Avinash Patil's avatar Avinash Patil Committed by John W. Linville
Browse files

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



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: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarSagar Bijwe <bsagar@marvell.com>
Signed-off-by: default avatarYogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 04abc0a3

drivers/net/wireless/mwifiex/11ac.c

+22 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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(&current_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
Original line number Diff line number Diff line
@@ -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.