Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Conflicts:
	net/wireless/reg.c

1 files changed, 4 insertions, 1 deletions

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 0011ac815097..caecef870c0e 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2593,13 +2593,16 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
                                 break;
 
                         if (sdata->vif.type != NL80211_IFTYPE_STATION &&
-                            sdata->vif.type != NL80211_IFTYPE_ADHOC)
+                            sdata->vif.type != NL80211_IFTYPE_ADHOC &&
+                            sdata->vif.type != NL80211_IFTYPE_MESH_POINT)
                                 break;
 
                         if (sdata->vif.type == NL80211_IFTYPE_STATION)
                                 bssid = sdata->u.mgd.bssid;
                         else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
                                 bssid = sdata->u.ibss.bssid;
+                        else if (sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
+                                bssid = mgmt->sa;
                         else
                                 break;