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

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

wl12xx: make WL1271_FLAG_PSPOLL_FAILURE flag per-vif 



This flag should be set per-vif, rather than globally.

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

drivers/net/wireless/wl12xx/event.c

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ void wl1271_pspoll_work(struct work_struct *work) 
	if (unlikely(wl->state == WL1271_STATE_OFF))

		goto out;



	if (!test_and_clear_bit(WL1271_FLAG_PSPOLL_FAILURE, &wl->flags))

	if (!test_and_clear_bit(WLVIF_FLAG_PSPOLL_FAILURE, &wlvif->flags))

		goto out;



	if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))
@@ -89,7 +89,7 @@ static void wl1271_event_pspoll_delivery_fail(struct wl1271 *wl, 
					 wlvif->basic_rate, true);

		if (ret < 0)

			return;

		set_bit(WL1271_FLAG_PSPOLL_FAILURE, &wl->flags);

		set_bit(WLVIF_FLAG_PSPOLL_FAILURE, &wlvif->flags);

		ieee80211_queue_delayed_work(wl->hw, &wlvif->pspoll_work,

					     msecs_to_jiffies(delay));

	}

drivers/net/wireless/wl12xx/main.c

+1 −1
Original line number Diff line number Diff line
@@ -2524,7 +2524,7 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed) 
	 * incorrectly changed after the pspoll failure active window.

	 */

	if (changed & IEEE80211_CONF_CHANGE_PS)

		clear_bit(WL1271_FLAG_PSPOLL_FAILURE, &wl->flags);

		clear_bit(WLVIF_FLAG_PSPOLL_FAILURE, &wlvif->flags);



	if (conf->flags & IEEE80211_CONF_PS &&

	    !test_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags)) {

drivers/net/wireless/wl12xx/wl12xx.h

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,6 @@ enum wl12xx_flags { 
	WL1271_FLAG_ELP_REQUESTED,

	WL1271_FLAG_IRQ_RUNNING,

	WL1271_FLAG_IDLE,

	WL1271_FLAG_PSPOLL_FAILURE,

	WL1271_FLAG_FW_TX_BUSY,

	WL1271_FLAG_DUMMY_PACKET_PENDING,

	WL1271_FLAG_SUSPENDED,
@@ -339,6 +338,7 @@ enum wl12xx_vif_flags { 
	WLVIF_FLAG_PSM_REQUESTED,

	WLVIF_FLAG_STA_STATE_SENT,

	WLVIF_FLAG_RX_STREAMING_STARTED,

	WLVIF_FLAG_PSPOLL_FAILURE,

};



struct wl1271_link {