diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2022-05-16 15:00:15 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2022-06-20 12:55:06 +0200 |
| commit | bfd8403adddd09f32033a14bf25be398291e7881 (patch) | |
| tree | b0cda44be80f40c82a83b9be634b596c63595f6d /net/mac80211/ht.c | |
| parent | wifi: mac80211: move interface config to new struct (diff) | |
| download | linux-bfd8403adddd09f32033a14bf25be398291e7881.tar.xz linux-bfd8403adddd09f32033a14bf25be398291e7881.zip | |
wifi: mac80211: reorg some iface data structs for MLD
Start reorganizing interface related data structures toward
MLD. The most complex part here is for the keys, since we
have to split the various kinds of GTKs off to the link but
still need to use (for WEP) the other keys as a fallback
even for multicast frames.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ht.c')
| -rw-r--r-- | net/mac80211/ht.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c index 171bd16b13f3..ac94dd69c0a2 100644 --- a/net/mac80211/ht.c +++ b/net/mac80211/ht.c @@ -9,7 +9,7 @@ * Copyright 2007, Michael Wu <flamingice@sourmilk.net> * Copyright 2007-2010, Intel Corporation * Copyright 2017 Intel Deutschland GmbH - * Copyright(c) 2020-2021 Intel Corporation + * Copyright(c) 2020-2022 Intel Corporation */ #include <linux/ieee80211.h> @@ -433,7 +433,7 @@ void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata, sdata->vif.type == NL80211_IFTYPE_MESH_POINT) memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN); else if (sdata->vif.type == NL80211_IFTYPE_STATION) - memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN); + memcpy(mgmt->bssid, sdata->deflink.u.mgd.bssid, ETH_ALEN); else if (sdata->vif.type == NL80211_IFTYPE_ADHOC) memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN); @@ -543,10 +543,11 @@ void ieee80211_request_smps_mgd_work(struct work_struct *work) { struct ieee80211_sub_if_data *sdata = container_of(work, struct ieee80211_sub_if_data, - u.mgd.request_smps_work); + deflink.u.mgd.request_smps_work); sdata_lock(sdata); - __ieee80211_request_smps_mgd(sdata, sdata->u.mgd.driver_smps_mode); + __ieee80211_request_smps_mgd(sdata, + sdata->deflink.u.mgd.driver_smps_mode); sdata_unlock(sdata); } @@ -558,12 +559,12 @@ void ieee80211_request_smps(struct ieee80211_vif *vif, if (WARN_ON_ONCE(vif->type != NL80211_IFTYPE_STATION)) return; - if (sdata->u.mgd.driver_smps_mode == smps_mode) + if (sdata->deflink.u.mgd.driver_smps_mode == smps_mode) return; - sdata->u.mgd.driver_smps_mode = smps_mode; + sdata->deflink.u.mgd.driver_smps_mode = smps_mode; ieee80211_queue_work(&sdata->local->hw, - &sdata->u.mgd.request_smps_work); + &sdata->deflink.u.mgd.request_smps_work); } /* this might change ... don't want non-open drivers using it */ EXPORT_SYMBOL_GPL(ieee80211_request_smps); |