Skip to content

Commit

Permalink
wl1271: Update interface to temporarily disable dynamic PS
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Juuso Oikarinen authored and John W. Linville committed Jul 8, 2010
1 parent 9a547bf commit f532be6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireless/wl12xx/wl1271_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/wl12xx/wl1271_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit f532be6

Please sign in to comment.