---

yaml --- r: 314131 b: refs/heads/master c: b515d83 h: refs/heads/master i: 314129: e6ee87f 314127: b6556f9 v: v3
git-mirror · Jun 5, 2012 · 471aab2 · 471aab2
1 parent b7343b7
commit 471aab2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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))