From 471aab27990264c3d947f12781a811f62cd048f1 Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Tue, 15 May 2012 17:08:56 +0300 Subject: [PATCH] --- yaml --- r: 314131 b: refs/heads/master c: b515d83a2998c991171e2c533ea06ff723d355a6 h: refs/heads/master i: 314129: e6ee87ff63c2bd8bd7324f2f1b78dd89fb32b179 314127: b6556f96d723e78292956bdf0511ee6c82a93765 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ti/wlcore/main.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3e7d115a5551..8f8f2cf2e199 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45b60f7ddd05e38a6835fb93e8dbcc6ef9bf12fa +refs/heads/master: b515d83a2998c991171e2c533ea06ff723d355a6 diff --git a/trunk/drivers/net/wireless/ti/wlcore/main.c b/trunk/drivers/net/wireless/ti/wlcore/main.c index 4be62c93808b..1974be0ccd58 100644 --- a/trunk/drivers/net/wireless/ti/wlcore/main.c +++ b/trunk/drivers/net/wireless/ti/wlcore/main.c @@ -3968,6 +3968,10 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw, if (!is_ap && (changed & BSS_CHANGED_ASSOC)) cancel_delayed_work_sync(&wl->connection_loss_work); + if (is_ap && (changed & BSS_CHANGED_BEACON_ENABLED) && + !bss_conf->enable_beacon) + wl1271_tx_flush(wl); + mutex_lock(&wl->mutex); if (unlikely(wl->state == WL1271_STATE_OFF))