Return-path: Received: from mx2.redhat.com ([66.187.237.31]:35531 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763603AbZFPUlm (ORCPT ); Tue, 16 Jun 2009 16:41:42 -0400 Subject: Re: [PATCH v2] libertas: remove ps_supported flag, use fwcapinfo From: Dan Williams To: Andrey Yurovsky Cc: linux-wireless@vger.kernel.org, libertas-dev@lists.infradead.org In-Reply-To: <1245183601-5214-1-git-send-email-andrey@cozybit.com> References: <1245182438.28992.21.camel@130.81.190.10.in-addr.arpa> <1245183601-5214-1-git-send-email-andrey@cozybit.com> Content-Type: text/plain Date: Tue, 16 Jun 2009 16:41:33 -0400 Message-Id: <1245184893.28992.37.camel@130.81.190.10.in-addr.arpa> Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: On Tue, 2009-06-16 at 13:20 -0700, Andrey Yurovsky wrote: > 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: Andrey Yurovsky Acked-by: Dan Williams > --- > drivers/net/wireless/libertas/dev.h | 1 - > drivers/net/wireless/libertas/if_cs.c | 3 --- > drivers/net/wireless/libertas/if_sdio.c | 3 --- > drivers/net/wireless/libertas/if_spi.c | 1 - > drivers/net/wireless/libertas/if_usb.c | 3 ++- > drivers/net/wireless/libertas/wext.c | 2 +- > 6 files changed, 3 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h > index f9ec69e..578c697 100644 > --- a/drivers/net/wireless/libertas/dev.h > +++ b/drivers/net/wireless/libertas/dev.h > @@ -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; > diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c > index 2a5b083..f658fd6 100644 > --- a/drivers/net/wireless/libertas/if_cs.c > +++ b/drivers/net/wireless/libertas/if_cs.c > @@ -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; > > diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c > index 8cdb88c..89396a7 100644 > --- a/drivers/net/wireless/libertas/if_sdio.c > +++ b/drivers/net/wireless/libertas/if_sdio.c > @@ -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); > > diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c > index 923ed58..956566b 100644 > --- a/drivers/net/wireless/libertas/if_spi.c > +++ b/drivers/net/wireless/libertas/if_spi.c > @@ -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; > diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c > index ea3dc03..16653c1 100644 > --- a/drivers/net/wireless/libertas/if_usb.c > +++ b/drivers/net/wireless/libertas/if_usb.c > @@ -185,13 +185,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"); > } > } > diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c > index 8bc1907..e96451c 100644 > --- a/drivers/net/wireless/libertas/wext.c > +++ b/drivers/net/wireless/libertas/wext.c > @@ -712,7 +712,7 @@ 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 (!(priv->fwcapinfo & FW_CAPINFO_PS)) { > if (vwrq->disabled) > return 0; > else > -- > 1.5.6.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html