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>

diff --git a/drivers/net/wireless/wl12xx/wl1271_event.c b/drivers/net/wireless/wl12xx/wl1271_event.c
index 525ba1a5b8f8172c2d177edd7a7b5dd59a6081d6..2d60d225744a2b539ddb319dcf7376f37b0831d2 100644 (file)
--- 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)
        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/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index d50c0a9835a0cb9bf83ca2a186c0ae4f272c68f1..70c6b0d22353f99f8d3f8430dc518547ac6c9287 100644 (file)
--- 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,
 
        /* 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);