diff options
| author | David S. Miller <davem@davemloft.net> | 2020-03-20 08:57:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-20 08:57:38 -0700 |
| commit | 0d7043f355d0045bd38b025630a7defefa3ec07f (patch) | |
| tree | 27ff984e5d4dda3bfefd57bb9122e28711350fde /net/mac80211/mlme.c | |
| parent | ffe10e679cec9a99f19049459cb27c2fbb1e913a (diff) | |
| parent | 8fa180bb4aceaa25233ea61032eab5b025fb522f (diff) | |
Merge tag 'mac80211-next-for-net-next-2020-03-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Another set of changes:
* HE ranging (fine timing measurement) API support
* hwsim gets virtio support, for use with wmediumd,
to be able to simulate with multiple machines
* eapol-over-nl80211 improvements to exclude preauth
* IBSS reset support, to recover connections from
userspace
* and various others.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 8a2f2fa21916..16d75da0996a 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -5458,6 +5458,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, sdata->control_port_no_encrypt = req->crypto.control_port_no_encrypt; sdata->control_port_over_nl80211 = req->crypto.control_port_over_nl80211; + sdata->control_port_no_preauth = req->crypto.control_port_no_preauth; sdata->encrypt_headroom = ieee80211_cs_headroom(local, &req->crypto, sdata->vif.type); |