diff options
| author | David S. Miller <davem@davemloft.net> | 2019-07-31 08:59:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-31 08:59:41 -0700 |
| commit | ac5fe22636e2d934056cebcf5d2c9ff7fade6514 (patch) | |
| tree | 64917c15a1af48394064f88f789edd2276afd1fb /net/mac80211/debugfs.c | |
| parent | 164f0de315ce3ea703f431cd01fd533e3f3fe358 (diff) | |
| parent | f39b07fdfb688724fedabf5507e15eaf398f2500 (diff) | |
Merge tag 'mac80211-next-for-davem-2019-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
We have a reasonably large number of changes:
* lots more HE (802.11ax) support, particularly things
relevant for the the AP side, but also mesh support
* debugfs cleanups from Greg
* some more work on extended key ID
* start using genl parallel_ops, as preparation for
weaning ourselves off RTNL and getting parallelism
* various other changes all over
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/debugfs.c')
| -rw-r--r-- | net/mac80211/debugfs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c index 2e7f75938c51..568b3b276931 100644 --- a/net/mac80211/debugfs.c +++ b/net/mac80211/debugfs.c @@ -271,8 +271,7 @@ static const char *hw_flag_names[] = { FLAG(TX_STATUS_NO_AMPDU_LEN), FLAG(SUPPORTS_MULTI_BSSID), FLAG(SUPPORTS_ONLY_HE_MULTI_BSSID), - FLAG(EXT_KEY_ID_NATIVE), - FLAG(NO_AMPDU_KEYBORDER_SUPPORT), + FLAG(AMPDU_KEYBORDER_SUPPORT), #undef FLAG }; |