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

Commit d0802abd authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho
Browse files

wl12xx: move ba fields into wlvif 



move ba_fields into the per-interface data, rather than
being global.

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 04324d99

drivers/net/wireless/wl12xx/debugfs.c

+0 −2
Original line number Diff line number Diff line
@@ -357,8 +357,6 @@ static ssize_t driver_state_read(struct file *file, char __user *user_buf, 
	DRIVER_STATE_PRINT_INT(noise);

	DRIVER_STATE_PRINT_LHEX(ap_hlid_map[0]);

	DRIVER_STATE_PRINT_INT(last_tx_hlid);

	DRIVER_STATE_PRINT_INT(ba_support);

	DRIVER_STATE_PRINT_HEX(ba_rx_bitmap);

	DRIVER_STATE_PRINT_HEX(ap_fw_ps_map);

	DRIVER_STATE_PRINT_LHEX(ap_ps_map);

	DRIVER_STATE_PRINT_HEX(quirks);

drivers/net/wireless/wl12xx/event.c

+4 −4
Original line number Diff line number Diff line
@@ -184,9 +184,9 @@ static void wl1271_event_rssi_trigger(struct wl1271 *wl, 
static void wl1271_stop_ba_event(struct wl1271 *wl, struct wl12xx_vif *wlvif)

{

	if (wlvif->bss_type != BSS_TYPE_AP_BSS) {

		if (!wl->ba_rx_bitmap)

		if (!wlvif->sta.ba_rx_bitmap)

			return;

		ieee80211_stop_rx_ba_session(wl->vif, wl->ba_rx_bitmap,

		ieee80211_stop_rx_ba_session(wl->vif, wlvif->sta.ba_rx_bitmap,

					     wl->vif->bss_conf.bssid);

	} else {

		int i;
@@ -306,9 +306,9 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox) 
		wl1271_debug(DEBUG_EVENT, "BA_SESSION_RX_CONSTRAINT_EVENT_ID. "

			     "ba_allowed = 0x%x", mbox->rx_ba_allowed);



		wl->ba_allowed = !!mbox->rx_ba_allowed;

		wlvif->ba_allowed = !!mbox->rx_ba_allowed;



		if (wl->vif && !wl->ba_allowed)

		if (wl->vif && !wlvif->ba_allowed)

			wl1271_stop_ba_event(wl, wlvif);

	}

drivers/net/wireless/wl12xx/init.c

+3 −4
Original line number Diff line number Diff line
@@ -486,18 +486,17 @@ int wl1271_init_ap_rates(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
static int wl1271_set_ba_policies(struct wl1271 *wl, struct wl12xx_vif *wlvif)

{

	/* Reset the BA RX indicators */

	wl->ba_rx_bitmap = 0;

	wl->ba_allowed = true;

	wlvif->ba_allowed = true;

	wl->ba_rx_session_count = 0;



	/* BA is supported in STA/AP modes */

	if (wlvif->bss_type != BSS_TYPE_AP_BSS &&

	    wlvif->bss_type != BSS_TYPE_STA_BSS) {

		wl->ba_support = false;

		wlvif->ba_support = false;

		return 0;

	}



	wl->ba_support = true;

	wlvif->ba_support = true;



	/* 802.11n initiator BA session setting */

	return wl12xx_acx_set_ba_initiator_policy(wl, wlvif);

drivers/net/wireless/wl12xx/main.c

+2 −2
Original line number Diff line number Diff line
@@ -4106,7 +4106,7 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw, 


	if (wlvif->bss_type == BSS_TYPE_STA_BSS) {

		hlid = wlvif->sta.hlid;

		ba_bitmap = &wl->ba_rx_bitmap;

		ba_bitmap = &wlvif->sta.ba_rx_bitmap;

	} else if (wlvif->bss_type == BSS_TYPE_AP_BSS) {

		struct wl1271_station *wl_sta;
@@ -4127,7 +4127,7 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw, 


	switch (action) {

	case IEEE80211_AMPDU_RX_START:

		if (!wl->ba_support || !wl->ba_allowed) {

		if (!wlvif->ba_support || !wlvif->ba_allowed) {

			ret = -ENOTSUPP;

			break;

		}

drivers/net/wireless/wl12xx/tx.c

+1 −1
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ void wl1271_tx_reset(struct wl1271 *wl, bool reset_tx_queues) 
			}

		}



		wl->ba_rx_bitmap = 0;

		wlvif->sta.ba_rx_bitmap = 0;

	}



	for (i = 0; i < NUM_TX_QUEUES; i++)