diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-12-07 14:10:10 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-07 14:10:10 -0500 |
| commit | ad9360b3e5d428d859256390906dff64f2ddc290 (patch) | |
| tree | bb4efb4a39034bd657f405f4e2583acfc1557bdc /net/mac80211/debugfs.c | |
| parent | Merge branch 'thunderx-cleanups' (diff) | |
| parent | mac80211: handle HW ROC expired properly (diff) | |
| download | linux-dev-ad9360b3e5d428d859256390906dff64f2ddc290.tar.xz linux-dev-ad9360b3e5d428d859256390906dff64f2ddc290.zip | |
Merge tag 'mac80211-next-for-davem-2015-12-07' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
This pull request got a bit bigger than I wanted, due to
needing to reshuffle and fix some bugs. I merged mac80211
to get the right base for some of these changes.
* new mac80211 API for upcoming driver changes: EOSP handling,
key iteration
* scan abort changes allowing to cancel an ongoing scan
* VHT IBSS 80+80 MHz support
* re-enable full AP client state tracking after fixes
* various small fixes (that weren't relevant for mac80211)
* various cleanups
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/debugfs.c')
| -rw-r--r-- | net/mac80211/debugfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c index 4d2aaebd4f97..abbdff03ce92 100644 --- a/net/mac80211/debugfs.c +++ b/net/mac80211/debugfs.c @@ -125,6 +125,7 @@ static const char *hw_flag_names[NUM_IEEE80211_HW_FLAGS + 1] = { FLAG(TDLS_WIDER_BW), FLAG(SUPPORTS_AMSDU_IN_AMPDU), FLAG(BEACON_TX_STATUS), + FLAG(NEEDS_UNIQUE_STA_ADDR), /* keep last for the build bug below */ (void *)0x1 |