diff options
| author | Eliad Peller <eliad@wizery.com> | 2011-10-10 10:13:03 +0200 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-10-11 15:09:58 +0300 |
| commit | c29bb001e448ef57e077db9f1c5ae864e3f8abab (patch) | |
| tree | 63b3fbcddb7ce1b83dc58c71c31bb4a4a044538e /drivers/net/wireless/wl12xx/event.c | |
| parent | 53d40d0b863e22b697f8d85e1f95cb6f9d2d95b1 (diff) | |
| download | blackbird-op-linux-c29bb001e448ef57e077db9f1c5ae864e3f8abab.tar.gz blackbird-op-linux-c29bb001e448ef57e077db9f1c5ae864e3f8abab.zip | |
wl12xx: make WL1271_FLAG_PSM flag per-vif
move WL1271_FLAG_PSM and WL1271_FLAG_PSM_REQUESTED into
per-vif flags.
These flags should be set per-vif, rather than globally.
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/event.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/event.c b/drivers/net/wireless/wl12xx/event.c index cfb2835c118c..d8b183bba52b 100644 --- a/drivers/net/wireless/wl12xx/event.c +++ b/drivers/net/wireless/wl12xx/event.c @@ -84,7 +84,7 @@ static void wl1271_event_pspoll_delivery_fail(struct wl1271 *wl, "trying to work around it."); /* force active mode receive data from the AP */ - if (test_bit(WL1271_FLAG_PSM, &wl->flags)) { + if (test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) { ret = wl1271_ps_set_mode(wl, wlvif, STATION_ACTIVE_MODE, wlvif->basic_rate, true); if (ret < 0) @@ -116,7 +116,7 @@ static int wl1271_event_ps_report(struct wl1271 *wl, case EVENT_ENTER_POWER_SAVE_FAIL: wl1271_debug(DEBUG_PSM, "PSM entry failed"); - if (!test_bit(WL1271_FLAG_PSM, &wl->flags)) { + if (!test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) { /* remain in active mode */ wlvif->psm_entry_retry = 0; break; |
