From 8eb2c48b4c31a875ec848a1febb7a759ddcaf671 Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Tue, 15 May 2012 16:46:56 +0300 Subject: [PATCH] --- yaml --- r: 314139 b: refs/heads/master c: d1bcb53f91ed6838dccb04aa5cf71ea8a98770f2 h: refs/heads/master i: 314137: 2e24dc4d6fd41a6df2ebacb96ff979f9f0f8506c 314135: 43b125ebf4347fc23bb1df7050f8a58affb6f56b v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ti/wlcore/main.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7abfc3b0249b..724e546de0a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: feb47eb86b44fb420c7fe92726e5f359bcea4bdf +refs/heads/master: d1bcb53f91ed6838dccb04aa5cf71ea8a98770f2 diff --git a/trunk/drivers/net/wireless/ti/wlcore/main.c b/trunk/drivers/net/wireless/ti/wlcore/main.c index c08df334b9d5..b0607f6e4e4e 100644 --- a/trunk/drivers/net/wireless/ti/wlcore/main.c +++ b/trunk/drivers/net/wireless/ti/wlcore/main.c @@ -2557,8 +2557,9 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed) * frames, such as the deauth. To make sure those frames reach the air, * wait here until the TX queue is fully flushed. */ - if ((changed & IEEE80211_CONF_CHANGE_IDLE) && - (conf->flags & IEEE80211_CONF_IDLE)) + if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || + ((changed & IEEE80211_CONF_CHANGE_IDLE) && + (conf->flags & IEEE80211_CONF_IDLE))) wl1271_tx_flush(wl); mutex_lock(&wl->mutex);