diff --git a/[refs] b/[refs]
index fbae90862a48..82565207bd21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a6e9d0f2e5de4cc8dfa3e8e67c2decd02976cf3
+refs/heads/master: a21fa87e3a3a8390f17f53967baa574f4e1e1e76
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index edd46193af6f..f45fd2fedc24 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -2716,7 +2716,9 @@ static int prepare_for_handlers(struct ieee80211_rx_data *rx,
 		} else if (!ieee80211_bssid_match(bssid,
 					sdata->vif.addr)) {
 			if (!(status->rx_flags & IEEE80211_RX_IN_SCAN) &&
-			    !ieee80211_is_beacon(hdr->frame_control))
+			    !ieee80211_is_beacon(hdr->frame_control) &&
+			    !(ieee80211_is_action(hdr->frame_control) &&
+			      sdata->vif.p2p))
 				return 0;
 			status->rx_flags &= ~IEEE80211_RX_RA_MATCH;
 		}