diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-24 22:35:12 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-24 22:35:12 -0800 |
commit | 1b0db64fb7693c1a131b7bcc38f7bc63fb396850 (patch) | |
tree | f393ebcc4496de2424d3f624c3623194e19c8b22 /drivers/net/wireless/wl12xx/ps.c | |
parent | 26f70e1202b3c66c4f63b8b25e0419dd0b3a91e3 (diff) | |
parent | 5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce (diff) |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/wl12xx/ps.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/ps.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/wl12xx/ps.c b/drivers/net/wireless/wl12xx/ps.c index 60a3738eadb..2d3086ae633 100644 --- a/drivers/net/wireless/wl12xx/ps.c +++ b/drivers/net/wireless/wl12xx/ps.c @@ -139,8 +139,7 @@ int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode, return ret; } - ret = wl1271_cmd_ps_mode(wl, STATION_POWER_SAVE_MODE, - rates, send); + ret = wl1271_cmd_ps_mode(wl, STATION_POWER_SAVE_MODE); if (ret < 0) return ret; @@ -163,8 +162,7 @@ int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode, if (ret < 0) return ret; - ret = wl1271_cmd_ps_mode(wl, STATION_ACTIVE_MODE, - rates, send); + ret = wl1271_cmd_ps_mode(wl, STATION_ACTIVE_MODE); if (ret < 0) return ret; |