diff options
author | Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2010-07-08 10:50:05 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-07-08 16:35:52 -0400 |
commit | f532be6d48a12cd1b27c4efa38d22e0cbfa512d1 (patch) | |
tree | f70db5d2b125f85e8151d11d8c70419dac4348fe | |
parent | 9a547bf9a83ce7211d4290956d9fca8044a409de (diff) |
wl1271: Update interface to temporarily disable dynamic PS
The mac80211 interface to temporarily disable dynamic PS changed, make
corresponding changes to the driver.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Saravanan Dhanabal <ext-saravanan.dhanabal@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_event.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_main.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_event.c b/drivers/net/wireless/wl12xx/wl1271_event.c index 525ba1a5b8f8..2d60d225744a 100644 --- a/drivers/net/wireless/wl12xx/wl1271_event.c +++ b/drivers/net/wireless/wl12xx/wl1271_event.c | |||
@@ -229,9 +229,9 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox) | |||
229 | if (vector & SOFT_GEMINI_SENSE_EVENT_ID && | 229 | if (vector & SOFT_GEMINI_SENSE_EVENT_ID && |
230 | wl->bss_type == BSS_TYPE_STA_BSS) { | 230 | wl->bss_type == BSS_TYPE_STA_BSS) { |
231 | if (mbox->soft_gemini_sense_info) | 231 | if (mbox->soft_gemini_sense_info) |
232 | ieee80211_disable_dyn_ps(wl->vif, true); | 232 | ieee80211_disable_dyn_ps(wl->vif); |
233 | else | 233 | else |
234 | ieee80211_disable_dyn_ps(wl->vif, false); | 234 | ieee80211_enable_dyn_ps(wl->vif); |
235 | } | 235 | } |
236 | 236 | ||
237 | /* | 237 | /* |
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index d50c0a9835a0..70c6b0d22353 100644 --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c | |||
@@ -939,7 +939,7 @@ static void wl1271_op_remove_interface(struct ieee80211_hw *hw, | |||
939 | 939 | ||
940 | /* enable dyn ps just in case (if left on due to fw crash etc) */ | 940 | /* enable dyn ps just in case (if left on due to fw crash etc) */ |
941 | if (wl->bss_type == BSS_TYPE_STA_BSS) | 941 | if (wl->bss_type == BSS_TYPE_STA_BSS) |
942 | ieee80211_disable_dyn_ps(wl->vif, false); | 942 | ieee80211_enable_dyn_ps(wl->vif); |
943 | 943 | ||
944 | if (test_and_clear_bit(WL1271_FLAG_SCANNING, &wl->flags)) { | 944 | if (test_and_clear_bit(WL1271_FLAG_SCANNING, &wl->flags)) { |
945 | mutex_unlock(&wl->mutex); | 945 | mutex_unlock(&wl->mutex); |
@@ -1779,7 +1779,7 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw, | |||
1779 | wl->aid = 0; | 1779 | wl->aid = 0; |
1780 | 1780 | ||
1781 | /* re-enable dynamic ps - just in case */ | 1781 | /* re-enable dynamic ps - just in case */ |
1782 | ieee80211_disable_dyn_ps(wl->vif, false); | 1782 | ieee80211_enable_dyn_ps(wl->vif); |
1783 | 1783 | ||
1784 | /* revert back to minimum rates for the current band */ | 1784 | /* revert back to minimum rates for the current band */ |
1785 | wl1271_set_band_rate(wl); | 1785 | wl1271_set_band_rate(wl); |