Commit e0d6133c authored by Andrey Yurovsky's avatar Andrey Yurovsky Committed by John W. Linville
Browse files

libertas: remove ps_supported flag, use fwcapinfo 



Power save support depends on the firmware capabilities rather than the
card's hardware interface.  Use the FW_CAPINFO_PS bit in the firmware
capabilities mask throughout the driver in place of the redundant
ps_supported flag and don't make decisions about PS support in the
interface drivers (with the exception of a special case in the USB
driver).

V2: put the USB special case in the right place.

Signed-off-by: default avatarAndrey Yurovsky <andrey@cozybit.com>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f0f3d388

drivers/net/wireless/libertas/dev.h

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

				   Wlan802_11PowermodeMAX_PSP=enable */

	u32 psstate;

	char ps_supported;

	u8 needtowakeup;



	struct assoc_request * pending_assoc_req;

drivers/net/wireless/libertas/if_cs.c

+0 −3
Original line number Diff line number Diff line
@@ -933,9 +933,6 @@ static int if_cs_probe(struct pcmcia_device *p_dev) 
		goto out3;

	}



	/* The firmware for the CF card supports powersave */

	priv->ps_supported = 1;



	ret = 0;

	goto out;

drivers/net/wireless/libertas/if_sdio.c

+0 −3
Original line number Diff line number Diff line
@@ -1039,9 +1039,6 @@ static int if_sdio_probe(struct sdio_func *func, 
	if (ret)

		goto err_activate_card;



	if (priv->fwcapinfo & FW_CAPINFO_PS)

		priv->ps_supported = 1;



out:

	lbs_deb_leave_args(LBS_DEB_SDIO, "ret %d", ret);

drivers/net/wireless/libertas/if_spi.c

+0 −1
Original line number Diff line number Diff line
@@ -1118,7 +1118,6 @@ static int __devinit if_spi_probe(struct spi_device *spi) 
	priv->card = card;

	priv->hw_host_to_card = if_spi_host_to_card;

	priv->fw_ready = 1;

	priv->ps_supported = 1;



	/* Initialize interrupt handling stuff. */

	card->run_thread = 1;

drivers/net/wireless/libertas/if_usb.c

+2 −1
Original line number Diff line number Diff line
@@ -181,13 +181,14 @@ static void if_usb_setup_firmware(struct lbs_private *priv) 
	wake_method.action = cpu_to_le16(CMD_ACT_GET);

	if (lbs_cmd_with_response(priv, CMD_802_11_FW_WAKE_METHOD, &wake_method)) {

		lbs_pr_info("Firmware does not seem to support PS mode\n");

		priv->fwcapinfo &= ~FW_CAPINFO_PS;

	} else {

		if (le16_to_cpu(wake_method.method) == CMD_WAKE_METHOD_COMMAND_INT) {

			lbs_deb_usb("Firmware seems to support PS with wake-via-command\n");

			priv->ps_supported = 1;

		} else {

			/* The versions which boot up this way don't seem to

			   work even if we set it to the command interrupt */

			priv->fwcapinfo &= ~FW_CAPINFO_PS;

			lbs_pr_info("Firmware doesn't wake via command interrupt; disabling PS mode\n");

		}

	}