diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-12 10:56:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-12 10:56:56 -0700 |
| commit | e32cf9a386236523be005a66dbee7cdcb5148b4d (patch) | |
| tree | 5853bdd81c7d74e7a3081464bb78525c37484dd8 /net/mac80211/ieee80211_i.h | |
| parent | 9163a0fc1f0c0980f117cc25f4fa6ba9b0750a36 (diff) | |
| parent | f8252e7b5a83deee0e477fc1e31e3f06ceb35d28 (diff) | |
| download | linux-e32cf9a386236523be005a66dbee7cdcb5148b4d.tar.bz2 | |
Merge tag 'mac80211-next-for-davem-2018-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Highlights:
* merge net-next, so I can finish the hwsim workqueue removal
* fix TXQ NULL pointer issue that was reported multiple times
* minstrel cleanups from Felix
* simplify lib80211 code by not using skcipher, note that this
will conflict with the crypto tree (and this new code here
should be used)
* use new netlink policy validation in nl80211
* fix up SAE (part of WPA3) in client-mode
* FTM responder support in the stack
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index f40a2167935f..10a05062e4a0 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -377,6 +377,7 @@ struct ieee80211_mgd_auth_data { u8 key[WLAN_KEY_LEN_WEP104]; u8 key_len, key_idx; bool done; + bool peer_confirmed; bool timeout_started; u16 sae_trans, sae_status; |