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

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

wl12xx: move ps_compl into wlvif 



move ps_compl 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 252efa4f

drivers/net/wireless/wl12xx/event.c

+3 −3
Original line number Diff line number Diff line
@@ -149,9 +149,9 @@ static int wl1271_event_ps_report(struct wl1271 *wl, 
			/* enable beacon early termination */

			ret = wl1271_acx_bet_enable(wl, wlvif, true);



		if (wl->ps_compl) {

			complete(wl->ps_compl);

			wl->ps_compl = NULL;

		if (wlvif->ps_compl) {

			complete(wlvif->ps_compl);

			wlvif->ps_compl = NULL;

		}

		break;

	default:

drivers/net/wireless/wl12xx/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1636,7 +1636,7 @@ static int wl1271_configure_suspend_sta(struct wl1271 *wl, 
	if (!test_bit(WL1271_FLAG_PSM, &wl->flags)) {

		DECLARE_COMPLETION_ONSTACK(compl);



		wl->ps_compl = &compl;

		wlvif->ps_compl = &compl;

		ret = wl1271_ps_set_mode(wl, wlvif, STATION_POWER_SAVE_MODE,

				   wlvif->basic_rate, true);

		if (ret < 0)

drivers/net/wireless/wl12xx/wl12xx.h

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,6 @@ struct wl1271 { 
	struct timer_list rx_streaming_timer;



	struct completion *elp_compl;

	struct completion *ps_compl;

	struct delayed_work elp_work;



	/* counter for ps-poll delivery failures */
@@ -651,6 +650,7 @@ struct wl12xx_vif { 
	/* Session counter for the chipset */

	int session_counter;



	struct completion *ps_compl;

	struct delayed_work pspoll_work;

};