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

Commit b2c57eee authored by David Woodhouse's avatar David Woodhouse Committed by David S. Miller
Browse files

libertas: allow for PS mode to be disabled when firmware doesn't support it 



Otherwise, we go into an endless busy loop trying to enable PS mode when
the command queue is empty, dealing with the error response, and then
trying to enable PS mode again because the command queue is empty.... it
doesn't really save much power.

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b47ef243

drivers/net/wireless/libertas/dev.h

+1 −0
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ struct lbs_private { 
	u16 psmode;		/* Wlan802_11PowermodeCAM=disable

				   Wlan802_11PowermodeMAX_PSP=enable */

	u32 psstate;

	char ps_supported;

	u8 needtowakeup;



	struct PS_CMD_ConfirmSleep lbs_ps_confirm_sleep;

drivers/net/wireless/libertas/host.h

+5 −0
Original line number Diff line number Diff line
@@ -209,6 +209,11 @@ 
#define	CMD_TYPE_MAX_PSP		0x0001

#define CMD_TYPE_FAST_PSP		0x0002



/* Options for CMD_802_11_FW_WAKE_METHOD */

#define CMD_WAKE_METHOD_UNCHANGED	0x0000

#define CMD_WAKE_METHOD_COMMAND_INT	0x0001

#define CMD_WAKE_METHOD_GPIO		0x0002



/* Define action or option for CMD_BT_ACCESS */

enum cmd_bt_access_opts {

	/* The bt commands start at 5 instead of 1 because the old dft commands

drivers/net/wireless/libertas/wext.c

+7 −0
Original line number Diff line number Diff line
@@ -734,6 +734,13 @@ static int lbs_set_power(struct net_device *dev, struct iw_request_info *info, 


	lbs_deb_enter(LBS_DEB_WEXT);



	if (!priv->ps_supported) {

		if (vwrq->disabled)

			return 0;

		else

			return -EINVAL;

	}



	/* PS is currently supported only in Infrastructure mode

	 * Remove this check if it is to be supported in IBSS mode also

	 */