diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-24 15:41:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-24 15:41:54 -0800 |
| commit | 3b3e808cd883dd2e39c85e6d8debc0020b5ef5e7 (patch) | |
| tree | 3ace0f3dd1626149f457fc7328b9b58ecd29bcda /net/mac80211/sta_info.h | |
| parent | 13ef6ae8c0d96c00476ab9c81671e39a9f714e2b (diff) | |
| parent | 370f51d5edac83bfdb9a078d7098f06403dfa4bc (diff) | |
Merge tag 'mac80211-next-for-net-next-2020-02-24' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
A new set of changes:
* lots of small documentation fixes, from Jérôme Pouiller
* beacon protection (BIGTK) support from Jouni Malinen
* some initial code for TID configuration, from Tamizh chelvam
* I reverted some new API before it's actually used, because
it's wrong to mix controlled port and preauth
* a few other cleanups/fixes
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/sta_info.h')
| -rw-r--r-- | net/mac80211/sta_info.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index c00e285..364a354 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -533,7 +533,9 @@ struct sta_info { u8 addr[ETH_ALEN]; struct ieee80211_local *local; struct ieee80211_sub_if_data *sdata; - struct ieee80211_key __rcu *gtk[NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS]; + struct ieee80211_key __rcu *gtk[NUM_DEFAULT_KEYS + + NUM_DEFAULT_MGMT_KEYS + + NUM_DEFAULT_BEACON_KEYS]; struct ieee80211_key __rcu *ptk[NUM_DEFAULT_KEYS]; u8 ptk_idx; struct rate_control_ref *rate_ctrl; |