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

Commit 03f06b7e authored by Juuso Oikarinen's avatar Juuso Oikarinen Committed by Luciano Coelho
Browse files

wl1271: Move setting of wake-up conditions to ps.c from cmd.c 



This removes a fixme. Also, it removes a redundant setting of the wake-up
conditions when exiting power save mode, which should improve performance.

Signed-off-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
parent 2f63b011

drivers/net/wireless/wl12xx/wl1271_cmd.c

+0 −7
Original line number Diff line number Diff line
@@ -395,13 +395,6 @@ int wl1271_cmd_ps_mode(struct wl1271 *wl, u8 ps_mode, bool send) 
	struct wl1271_cmd_ps_params *ps_params = NULL;

	int ret = 0;



	/* FIXME: this should be in ps.c */

	ret = wl1271_acx_wake_up_conditions(wl);

	if (ret < 0) {

		wl1271_error("couldn't set wake up conditions");

		goto out;

	}



	wl1271_debug(DEBUG_CMD, "cmd set ps mode");



	ps_params = kzalloc(sizeof(*ps_params), GFP_KERNEL);

drivers/net/wireless/wl12xx/wl1271_ps.c

+6 −0
Original line number Diff line number Diff line
@@ -129,6 +129,12 @@ int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode, 
	case STATION_POWER_SAVE_MODE:

		wl1271_debug(DEBUG_PSM, "entering psm");



		ret = wl1271_acx_wake_up_conditions(wl);

		if (ret < 0) {

			wl1271_error("couldn't set wake up conditions");

			return ret;

		}



		ret = wl1271_cmd_ps_mode(wl, STATION_POWER_SAVE_MODE, send);

		if (ret < 0)

			return ret;