From a834d267b1ca352963552050dfa76ec1676784ef Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Mon, 10 Oct 2011 10:13:16 +0200 Subject: [PATCH] --- yaml --- r: 278691 b: refs/heads/master c: f750c82045d8f5d0d6d59e517eb485ffbbe014b2 h: refs/heads/master i: 278689: 3c3c4d955772ae0683f8e18689a6b869657baa07 278687: 3e8945066a8a4ae98c18b7695e7c066d992b6819 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index edeb4b21c929..772fedf3a0f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5a359f873f50cc123d5ca97637caa30fa095bb9 +refs/heads/master: f750c82045d8f5d0d6d59e517eb485ffbbe014b2 diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c index cd2722562e60..6e6ac63fb8cd 100644 --- a/trunk/drivers/net/wireless/wl12xx/main.c +++ b/trunk/drivers/net/wireless/wl12xx/main.c @@ -2115,6 +2115,10 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw, ieee80211_vif_type_p2p(vif), vif->addr); mutex_lock(&wl->mutex); + ret = wl1271_ps_elp_wakeup(wl); + if (ret < 0) + goto out_unlock; + if (wl->vif) { wl1271_debug(DEBUG_MAC80211, "multiple vifs are not supported yet"); @@ -2195,6 +2199,8 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw, else wl->sta_count++; out: + wl1271_ps_elp_sleep(wl); +out_unlock: mutex_unlock(&wl->mutex); mutex_lock(&wl_list_mutex);