---

yaml --- r: 266350 b: refs/heads/master c: c6930b0 h: refs/heads/master v: v3
git-mirror · Sep 23, 2011 · 2e29733 · 2e29733
1 parent 7f9a82e
commit 2e29733
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26b4bf2e0f0dbafa4dd575b03ffcb12710ef5611
+refs/heads/master: c6930b07b3d0a8c529e1d9287bd5994319cf447d
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
@@ -2355,6 +2355,8 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
 	if (changed & IEEE80211_CONF_CHANGE_CHANNEL &&
 	    ((wl->band != conf->channel->band) ||
 	     (wl->channel != channel))) {
+		/* send all pending packets */
+		wl1271_tx_work_locked(wl);
 		wl->band = conf->channel->band;
 		wl->channel = channel;