diff --git a/[refs] b/[refs]
index 13a6b98f1f87..e89b41c02524 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edc6ccb7b992bd9ea5db4555c8f0bf74c656f964
+refs/heads/master: 697e6a0fb0c8783695d4b4a5d7131476b296d623
diff --git a/trunk/net/mac80211/status.c b/trunk/net/mac80211/status.c
index 0ebcdda24200..9e171b178276 100644
--- a/trunk/net/mac80211/status.c
+++ b/trunk/net/mac80211/status.c
@@ -69,6 +69,14 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
 	 */
 	goto drop;
 
+	/*
+	 * This skb 'survived' a round-trip through the driver, and
+	 * hopefully the driver didn't mangle it too badly. However,
+	 * we can definitely not rely on the the control information
+	 * being correct. Clear it so we don't get junk there.
+	 */
+	memset(&info->control, 0, sizeof(info->control));
+
 	sta->tx_filtered_count++;
 
 	/*