lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wl12xx: move ps_compl into wlvif

Browse Source 
move ps_compl into the per-interface data, rather than
being global.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
This commit is contained in:
Eliad Peller
2011-10-05 11:56:01 +02:00
committed by Luciano Coelho
parent 252efa4f97
commit 6ec45dc282
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/wl12xx/event.c
View File

@@ -149,9 +149,9 @@ static int wl1271_event_ps_report(struct wl1271 *wl,
/* enable beacon early termination */ /* enable beacon early termination */
ret = wl1271_acx_bet_enable(wl, wlvif, true); ret = wl1271_acx_bet_enable(wl, wlvif, true);
if (wl->ps_compl) { if (wlvif->ps_compl) {
complete(wl->ps_compl); complete(wlvif->ps_compl);
wl->ps_compl = NULL; wlvif->ps_compl = NULL;
} }
break; break;
default: default:

2
drivers/net/wireless/wl12xx/main.c
View File

@@ -1636,7 +1636,7 @@ static int wl1271_configure_suspend_sta(struct wl1271 *wl,
if (!test_bit(WL1271_FLAG_PSM, &wl->flags)) { if (!test_bit(WL1271_FLAG_PSM, &wl->flags)) {
DECLARE_COMPLETION_ONSTACK(compl); DECLARE_COMPLETION_ONSTACK(compl);
wl->ps_compl = &compl; wlvif->ps_compl = &compl;
ret = wl1271_ps_set_mode(wl, wlvif, STATION_POWER_SAVE_MODE, ret = wl1271_ps_set_mode(wl, wlvif, STATION_POWER_SAVE_MODE,
wlvif->basic_rate, true); wlvif->basic_rate, true);
if (ret < 0) if (ret < 0)

2
drivers/net/wireless/wl12xx/wl12xx.h
View File

@@ -509,7 +509,6 @@ struct wl1271 {
struct timer_list rx_streaming_timer; struct timer_list rx_streaming_timer;
struct completion *elp_compl; struct completion *elp_compl;
struct completion *ps_compl;
struct delayed_work elp_work; struct delayed_work elp_work;
/* counter for ps-poll delivery failures */ /* counter for ps-poll delivery failures */
@@ -651,6 +650,7 @@ struct wl12xx_vif {
/* Session counter for the chipset */ /* Session counter for the chipset */
int session_counter; int session_counter;
struct completion *ps_compl;
struct delayed_work pspoll_work; struct delayed_work pspoll_work;
}; };