diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-11-20 16:09:30 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-11-20 16:09:30 -0500 |
| commit | 9a638ddfb09e5aa17158842c95526e1aa79f92e6 (patch) | |
| tree | 7edf2e128b23f711cf28273dca3ff69f3706925a /net/mac80211/iface.c | |
| parent | b4c1b70823721e9edb19a839188e4dae50ce878d (diff) | |
| parent | 75769c80e381653994293b5aa5a8cfec50088f9f (diff) | |
| download | op-kernel-dev-9a638ddfb09e5aa17158842c95526e1aa79f92e6.zip op-kernel-dev-9a638ddfb09e5aa17158842c95526e1aa79f92e6.tar.gz | |
Merge tag 'mac80211-next-for-john-2014-11-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg <johannes@sipsolutions.net> says:
"It has been a while since my last pull request, so we accumulated
another relatively large set of changes:
* TDLS off-channel support set from Arik/Liad, with some support
patches I did
* custom regulatory fixes from Arik
* minstrel VHT fix (and a small optimisation) from Felix
* add back radiotap vendor namespace support (myself)
* random MAC address scanning for cfg80211/mac80211/hwsim (myself)
* CSA improvements (Luca)
* WoWLAN Net Detect (wake on network found) support (Luca)
* and lots of other smaller changes from many people"
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 9df26ad..538fe4e 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1208,6 +1208,8 @@ static void ieee80211_iface_work(struct work_struct *work) WLAN_BACK_RECIPIENT, 0, false); mutex_unlock(&local->sta_mtx); + } else if (skb->pkt_type == IEEE80211_SDATA_QUEUE_TDLS_CHSW) { + ieee80211_process_tdls_channel_switch(sdata, skb); } else if (ieee80211_is_action(mgmt->frame_control) && mgmt->u.action.category == WLAN_CATEGORY_BACK) { int len = skb->len; |
