diff --git a/[refs] b/[refs]
index 11f07ac21317..f626704cf80a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d57b73a73040525dfe22c56d823f146711ff971
+refs/heads/master: 3e5b1101f59fb3e17a8eb32cca100ae07fd7100e
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
index beb8718d905e..c74a6a1935b3 100644
--- a/trunk/net/mac80211/main.c
+++ b/trunk/net/mac80211/main.c
@@ -587,6 +587,11 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
 			if (!netif_running(sdata->dev))
 				continue;
 
+			if ((sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES) &&
+			    !(info->flags & IEEE80211_TX_CTL_INJECTED) &&
+			    (type == IEEE80211_FTYPE_DATA))
+				continue;
+
 			if (prev_dev) {
 				skb2 = skb_clone(skb, GFP_ATOMIC);
 				if (skb2) {