diff options
| author | Bing Zhao <bzhao@marvell.com> | 2009-02-04 22:22:39 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-02-27 14:51:38 -0500 |
| commit | f5ac2b9eb58f5efad83f2d0e7fa464e8980ecfc9 (patch) | |
| tree | efb94aef654467afa75b9ae021797aa57ecaa15c /drivers/net/wireless/libertas | |
| parent | f11c179eea77b8afc2fb7cb4b9a8815b85e3c16f (diff) | |
| download | linux-3.10-f5ac2b9eb58f5efad83f2d0e7fa464e8980ecfc9.tar.gz linux-3.10-f5ac2b9eb58f5efad83f2d0e7fa464e8980ecfc9.tar.bz2 linux-3.10-f5ac2b9eb58f5efad83f2d0e7fa464e8980ecfc9.zip | |
libertas: fix power save issue in libertas_sdio module
The problem: "iwconfig ethX power on" returns error
The cause: "ps_supported" flag was never set for SD8385/8686
The fix: check firmware capabilities returned by GET_HW_SPEC command.
Set "ps_supported" to 1 if FW_CAPINFO_PS bit is on. This fix applies
to SDIO interface only.
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas')
| -rw-r--r-- | drivers/net/wireless/libertas/defs.h | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/libertas/if_sdio.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h index 6388b05df4f..e8dfde39abf 100644 --- a/drivers/net/wireless/libertas/defs.h +++ b/drivers/net/wireless/libertas/defs.h @@ -265,6 +265,7 @@ static inline void lbs_deb_hex(unsigned int grp, const char *prompt, u8 *buf, in #define CMD_F_HOSTCMD (1 << 0) #define FW_CAPINFO_WPA (1 << 0) +#define FW_CAPINFO_PS (1 << 1) #define FW_CAPINFO_FIRMWARE_UPGRADE (1 << 13) #define FW_CAPINFO_BOOT2_UPGRADE (1<<14) #define FW_CAPINFO_PERSISTENT_CONFIG (1<<15) diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c index 4519d7314f4..987836865ea 100644 --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c @@ -209,6 +209,9 @@ static int if_sdio_handle_event(struct if_sdio_card *card, event = sdio_readb(card->func, IF_SDIO_EVENT, &ret); if (ret) goto out; + + /* right shift 3 bits to get the event id */ + event >>= 3; } else { if (size < 4) { lbs_deb_sdio("event packet too small (%d bytes)\n", @@ -921,6 +924,9 @@ 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); |