1 files changed, 10 insertions, 3 deletions

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 2a85fdfebde2..7d226417ef46 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2797,10 +2797,17 @@ static int prepare_for_handlers(struct ieee80211_rx_data *rx,
                                 return 0;
                 } else if (!ieee80211_bssid_match(bssid,
                                         sdata->vif.addr)) {
+                        /*
+                         * Accept public action frames even when the
+                         * BSSID doesn't match, this is used for P2P
+                         * and location updates. Note that mac80211
+                         * itself never looks at these frames.
+                         */
+                        if (!(status->rx_flags & IEEE80211_RX_IN_SCAN) &&
+                            ieee80211_is_public_action(hdr, skb->len))
+                                return 1;
                         if (!(status->rx_flags & IEEE80211_RX_IN_SCAN) &&
-                            !ieee80211_is_beacon(hdr->frame_control) &&
-                            !(ieee80211_is_action(hdr->frame_control) &&
-                              sdata->vif.p2p))
+                            !ieee80211_is_beacon(hdr->frame_control))
                                 return 0;
                         status->rx_flags &= ~IEEE80211_RX_RA_MATCH;
                 }