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

Commit bbd839a4 authored by Maxim Altshul's avatar Maxim Altshul Committed by Greg Kroah-Hartman
Browse files

wlcore: Pass win_size taken from ieee80211_sta to FW 



commit 42c7372a111630dab200c2f959424f5ec3bf79a4 upstream.

When starting a new BA session, we must pass the win_size to the FW.

To do this we take max_rx_aggregation_subframes (BA RX win size)
which is stored in ieee80211_sta structure (e.g per link and not per HW)

We will use the value stored per link when passing the win_size to
firmware through the ACX_BA_SESSION_RX_SETUP command.

Signed-off-by: default avatarMaxim Altshul <maxim.altshul@ti.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5d7ab833

drivers/net/wireless/ti/wlcore/acx.c

+3 −2
Original line number Diff line number Diff line
@@ -1419,7 +1419,8 @@ int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl, 


/* setup BA session receiver setting in the FW. */

int wl12xx_acx_set_ba_receiver_session(struct wl1271 *wl, u8 tid_index,

				       u16 ssn, bool enable, u8 peer_hlid)

				       u16 ssn, bool enable, u8 peer_hlid,

				       u8 win_size)

{

	struct wl1271_acx_ba_receiver_setup *acx;

	int ret;
@@ -1435,7 +1436,7 @@ int wl12xx_acx_set_ba_receiver_session(struct wl1271 *wl, u8 tid_index, 
	acx->hlid = peer_hlid;

	acx->tid = tid_index;

	acx->enable = enable;

	acx->win_size = wl->conf.ht.rx_ba_win_size;

	acx->win_size =	win_size;

	acx->ssn = ssn;



	ret = wlcore_cmd_configure_failsafe(wl, ACX_BA_SESSION_RX_SETUP, acx,

drivers/net/wireless/ti/wlcore/acx.h

+2 −1
Original line number Diff line number Diff line
@@ -1113,7 +1113,8 @@ int wl1271_acx_set_ht_information(struct wl1271 *wl, 
int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl,

				       struct wl12xx_vif *wlvif);

int wl12xx_acx_set_ba_receiver_session(struct wl1271 *wl, u8 tid_index,

				       u16 ssn, bool enable, u8 peer_hlid);

				       u16 ssn, bool enable, u8 peer_hlid,

				       u8 win_size);

int wl12xx_acx_tsf_info(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			u64 *mactime);

int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif,

drivers/net/wireless/ti/wlcore/main.c

+4 −2
Original line number Diff line number Diff line
@@ -5285,7 +5285,9 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw, 
		}



		ret = wl12xx_acx_set_ba_receiver_session(wl, tid, *ssn, true,

							 hlid);

				hlid,

				params->buf_size);



		if (!ret) {

			*ba_bitmap |= BIT(tid);

			wl->ba_rx_session_count++;
@@ -5306,7 +5308,7 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw, 
		}



		ret = wl12xx_acx_set_ba_receiver_session(wl, tid, 0, false,

							 hlid);

							 hlid, 0);

		if (!ret) {

			*ba_bitmap &= ~BIT(tid);

			wl->ba_rx_session_count--;