diff options
| author | John W. Linville | 2013-11-05 21:49:02 +0100 |
|---|---|---|
| committer | John W. Linville | 2013-11-05 21:49:02 +0100 |
| commit | 353c78152c10027b8da5de446bad3472f977fcdc (patch) | |
| tree | 8663ca32b912e8b3df428f570b7fd376aa3aa0cb /net/mac80211/rx.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| parent | nl80211: fix channel switch parsing (diff) | |
| download | kernel-qcow2-linux-353c78152c10027b8da5de446bad3472f977fcdc.tar.gz kernel-qcow2-linux-353c78152c10027b8da5de446bad3472f977fcdc.tar.xz kernel-qcow2-linux-353c78152c10027b8da5de446bad3472f977fcdc.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
net/wireless/reg.c
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 5 |
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; |