aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ti/wlcore/init.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-11-05 15:51:34 -0500
committerJohn W. Linville <linville@tuxdriver.com>2013-11-05 15:51:34 -0500
commitdce1ebabcb0ac12113487221663c2aba648dd244 (patch)
treeedcf745d82290450b794acc61f4b98616d639883 /drivers/net/wireless/ti/wlcore/init.c
parent33b443422eda3828814e8c4b17cf4202ec6ac529 (diff)
parent8d3c1fd8c3a4a4a1a319491cdd09bd7eca23ba3b (diff)
Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
Diffstat (limited to 'drivers/net/wireless/ti/wlcore/init.c')
-rw-r--r--drivers/net/wireless/ti/wlcore/init.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/ti/wlcore/init.c b/drivers/net/wireless/ti/wlcore/init.c
index 5c6f11e157d..7699f9d07e2 100644
--- a/drivers/net/wireless/ti/wlcore/init.c
+++ b/drivers/net/wireless/ti/wlcore/init.c
@@ -571,6 +571,12 @@ int wl1271_init_vif_specific(struct wl1271 *wl, struct ieee80211_vif *vif)
ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);
if (ret < 0)
return ret;
+
+ /* unmask ap events */
+ wl->event_mask |= wl->ap_event_mask;
+ ret = wl1271_event_unmask(wl);
+ if (ret < 0)
+ return ret;
/* first STA, no APs */
} else if (wl->sta_count == 0 && wl->ap_count == 0 && !is_ap) {
u8 sta_auth = wl->conf.conn.sta_sleep_auth;