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

Commit d4ff0ef6 authored by Holger Schurig's avatar Holger Schurig Committed by John W. Linville
Browse files

libertas: misc power saving adjusts 



* firmware for the CF card supports power saving
* the driver currenly only accept "iwconfig ethX power on|off", so
  I fixed what the range wext ioctl reports.
* initialize value/flags in lbs_get_power()
* get rid of unused parameter psmode in lbs_ps_confirm_sleep()
* some minor debug output tweaks

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c49c3b77

drivers/net/wireless/libertas/cmd.c

+2 −8
Original line number Diff line number Diff line
@@ -1927,10 +1927,6 @@ static int sendconfirmsleep(struct lbs_private *priv, u8 *cmdptr, u16 size) 
	int ret = 0;



	lbs_deb_enter(LBS_DEB_HOST);



	lbs_deb_host("SEND_SLEEPC_CMD: before download, cmd size %d\n",

	       size);



	lbs_deb_hex(LBS_DEB_HOST, "sleep confirm command", cmdptr, size);



	ret = priv->hw_host_to_card(priv, MVMS_CMD, cmdptr, size);
@@ -1953,8 +1949,6 @@ static int sendconfirmsleep(struct lbs_private *priv, u8 *cmdptr, u16 size) 
			       priv->intcounter);

		}

		spin_unlock_irqrestore(&priv->driver_lock, flags);



		lbs_deb_host("SEND_SLEEPC_CMD: sent confirm sleep\n");

	}



	lbs_deb_leave_args(LBS_DEB_HOST, "ret %d", ret);
@@ -2006,10 +2000,10 @@ void lbs_ps_wakeup(struct lbs_private *priv, int wait_option) 
 *  @param psmode  	Power Saving mode

 *  @return 	   	n/a

 */

void lbs_ps_confirm_sleep(struct lbs_private *priv, u16 psmode)

void lbs_ps_confirm_sleep(struct lbs_private *priv)

{

	unsigned long flags =0;

	u8 allowed = 1;

	int allowed = 1;



	lbs_deb_enter(LBS_DEB_HOST);

drivers/net/wireless/libertas/cmdresp.c

+9 −9
Original line number Diff line number Diff line
@@ -656,11 +656,9 @@ int lbs_process_event(struct lbs_private *priv) 
	eventcause = priv->eventcause >> SBI_EVENT_CAUSE_SHIFT;

	spin_unlock_irq(&priv->driver_lock);



	lbs_deb_cmd("event cause %d\n", eventcause);



	switch (eventcause) {

	case MACREG_INT_CODE_LINK_SENSED:

		lbs_deb_cmd("EVENT: MACREG_INT_CODE_LINK_SENSED\n");

		lbs_deb_cmd("EVENT: link sensed\n");

		break;



	case MACREG_INT_CODE_DEAUTHENTICATED:
@@ -679,7 +677,7 @@ int lbs_process_event(struct lbs_private *priv) 
		break;



	case MACREG_INT_CODE_PS_SLEEP:

		lbs_deb_cmd("EVENT: sleep\n");

		lbs_deb_cmd("EVENT: ps sleep\n");



		/* handle unexpected PS SLEEP event */

		if (priv->psstate == PS_STATE_FULL_POWER) {
@@ -689,17 +687,17 @@ int lbs_process_event(struct lbs_private *priv) 
		}

		priv->psstate = PS_STATE_PRE_SLEEP;



		lbs_ps_confirm_sleep(priv, (u16) priv->psmode);

		lbs_ps_confirm_sleep(priv);



		break;



	case MACREG_INT_CODE_HOST_AWAKE:

		lbs_deb_cmd("EVENT: HOST_AWAKE\n");

		lbs_deb_cmd("EVENT: host awake\n");

		lbs_send_confirmwake(priv);

		break;



	case MACREG_INT_CODE_PS_AWAKE:

		lbs_deb_cmd("EVENT: awake\n");

		lbs_deb_cmd("EVENT: ps awake\n");

		/* handle unexpected PS AWAKE event */

		if (priv->psstate == PS_STATE_FULL_POWER) {

			lbs_deb_cmd(
@@ -730,14 +728,16 @@ int lbs_process_event(struct lbs_private *priv) 
		lbs_deb_cmd("EVENT: MULTICAST MIC ERROR\n");

		handle_mic_failureevent(priv, MACREG_INT_CODE_MIC_ERR_MULTICAST);

		break;



	case MACREG_INT_CODE_MIB_CHANGED:

		lbs_deb_cmd("EVENT: MIB CHANGED\n");

		break;

	case MACREG_INT_CODE_INIT_DONE:

		lbs_deb_cmd("EVENT: INIT DONE\n");

		break;



	case MACREG_INT_CODE_ADHOC_BCN_LOST:

		lbs_deb_cmd("EVENT: ADHOC beacon lost\n");

		break;



	case MACREG_INT_CODE_RSSI_LOW:

		lbs_pr_alert("EVENT: rssi low\n");

		break;

drivers/net/wireless/libertas/decl.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ int lbs_set_regiontable(struct lbs_private *priv, u8 region, u8 band); 
int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *);



void lbs_ps_sleep(struct lbs_private *priv, int wait_option);

void lbs_ps_confirm_sleep(struct lbs_private *priv, u16 psmode);

void lbs_ps_confirm_sleep(struct lbs_private *priv);

void lbs_ps_wakeup(struct lbs_private *priv, int wait_option);



struct chan_freq_power *lbs_find_cfp_by_band_and_channel(

drivers/net/wireless/libertas/if_cs.c

+3 −0
Original line number Diff line number Diff line
@@ -882,6 +882,9 @@ 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/main.c

+1 −1
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ static int lbs_thread(void *data) 
				lbs_deb_thread("main_thread: PRE_SLEEP--intcounter=%d currenttxskb=%p dnld_sent=%d cur_cmd=%p, confirm now\n",

					       priv->intcounter, priv->currenttxskb, priv->dnld_sent, priv->cur_cmd);



				lbs_ps_confirm_sleep(priv, (u16) priv->psmode);

				lbs_ps_confirm_sleep(priv);

			} else {

				/* workaround for firmware sending

				 * deauth/linkloss event immediately