diff --git a/[refs] b/[refs]
index d119a63c7a7a..94639c74be30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f7054e32fab251af5cab116da0ef6624a1a0c8b
+refs/heads/master: 5b3d71d90ec554a2b145db7fcb245e64bf28dda7
diff --git a/trunk/net/mac80211/ieee80211.c b/trunk/net/mac80211/ieee80211.c
index 177040218232..5dcc2d61551f 100644
--- a/trunk/net/mac80211/ieee80211.c
+++ b/trunk/net/mac80211/ieee80211.c
@@ -299,9 +299,11 @@ static int ieee80211_stop(struct net_device *dev)
 	sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
 	list_for_each_entry(sta, &local->sta_list, list) {
-		for (i = 0; i <  STA_TID_NUM; i++)
-			ieee80211_sta_stop_rx_ba_session(sta->dev, sta->addr,
-						i, WLAN_BACK_RECIPIENT,
+		if (sta->dev == dev)
+			for (i = 0; i <  STA_TID_NUM; i++)
+				ieee80211_sta_stop_rx_ba_session(sta->dev,
+						sta->addr, i,
+						WLAN_BACK_RECIPIENT,
 						WLAN_REASON_QSTA_LEAVE_QBSS);
 	}