From f583938f467c443fe40a44d0643d595c16936b5c Mon Sep 17 00:00:00 2001 From: Juuso Oikarinen Date: Thu, 8 Jul 2010 17:50:05 +0300 Subject: [PATCH] --- yaml --- r: 203523 b: refs/heads/master c: f532be6d48a12cd1b27c4efa38d22e0cbfa512d1 h: refs/heads/master i: 203521: 11ad5a4b03f20152969eef95b5340a21cb62a084 203519: d7b61bed4698b3cdeec3420fd755d948ab3ffb8a v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/wl1271_event.c | 4 ++-- trunk/drivers/net/wireless/wl12xx/wl1271_main.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 846cc9030358..4390ecf8f4c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a547bf9a83ce7211d4290956d9fca8044a409de +refs/heads/master: f532be6d48a12cd1b27c4efa38d22e0cbfa512d1 diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_event.c b/trunk/drivers/net/wireless/wl12xx/wl1271_event.c index 525ba1a5b8f8..2d60d225744a 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1271_event.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1271_event.c @@ -229,9 +229,9 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox) if (vector & SOFT_GEMINI_SENSE_EVENT_ID && wl->bss_type == BSS_TYPE_STA_BSS) { if (mbox->soft_gemini_sense_info) - ieee80211_disable_dyn_ps(wl->vif, true); + ieee80211_disable_dyn_ps(wl->vif); else - ieee80211_disable_dyn_ps(wl->vif, false); + ieee80211_enable_dyn_ps(wl->vif); } /* diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c index d50c0a9835a0..70c6b0d22353 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c @@ -939,7 +939,7 @@ static void wl1271_op_remove_interface(struct ieee80211_hw *hw, /* enable dyn ps just in case (if left on due to fw crash etc) */ if (wl->bss_type == BSS_TYPE_STA_BSS) - ieee80211_disable_dyn_ps(wl->vif, false); + ieee80211_enable_dyn_ps(wl->vif); if (test_and_clear_bit(WL1271_FLAG_SCANNING, &wl->flags)) { mutex_unlock(&wl->mutex); @@ -1779,7 +1779,7 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw, wl->aid = 0; /* re-enable dynamic ps - just in case */ - ieee80211_disable_dyn_ps(wl->vif, false); + ieee80211_enable_dyn_ps(wl->vif); /* revert back to minimum rates for the current band */ wl1271_set_band_rate(wl);