diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-26 16:05:52 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-26 16:05:52 -0400 |
| commit | 30e5a9a5ba853b896250f0665a2e10bbafa2f6bc (patch) | |
| tree | 31f4be512bc417c03f7479d6c69d24f50ecfb00b /net/mac80211/tdls.c | |
| parent | 148f025d41a8bf8fe7e72d1a86024b5e4d25f224 (diff) | |
| parent | 8828f81ad4a2f4e89ebe6e7793c06ed767c31d53 (diff) | |
Merge tag 'mac80211-next-for-davem-2019-04-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Various updates, notably:
* extended key ID support (from 802.11-2016)
* per-STA TX power control support
* mac80211 TX performance improvements
* HE (802.11ax) updates
* mesh link probing support
* enhancements of multi-BSSID support (also related to HE)
* OWE userspace processing support
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/tdls.c')
| -rw-r--r-- | net/mac80211/tdls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/tdls.c b/net/mac80211/tdls.c index d30690d79a58..24c37f91ca46 100644 --- a/net/mac80211/tdls.c +++ b/net/mac80211/tdls.c @@ -1056,7 +1056,7 @@ ieee80211_tdls_prep_mgmt_packet(struct wiphy *wiphy, struct net_device *dev, /* disable bottom halves when entering the Tx path */ local_bh_disable(); - __ieee80211_subif_start_xmit(skb, dev, flags); + __ieee80211_subif_start_xmit(skb, dev, flags, 0); local_bh_enable(); return ret; |