diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-26 20:17:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-26 20:17:35 -0700 |
| commit | 745bd6f44cd3413f429ed3e2c7744c8abf8630d5 (patch) | |
| tree | 29ccc5ac8cb3faca99f132e85fcb0b382e7cdcb1 /net/mac80211/he.c | |
| parent | 0e3481195b155da4b9b94ad4d64bbf531ce62d16 (diff) | |
| parent | 60689de46c7f6a0028c8b37b6f03db68cbfad8ed (diff) | |
Merge tag 'mac80211-next-for-net-next-2020-04-25' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
One batch of changes, containing:
* hwsim improvements from Jouni and myself, to be able to
test more scenarios easily
* some more HE (802.11ax) support
* some initial S1G (sub 1 GHz) work for fractional MHz channels
* some (action) frame registration updates to help DPP support
* along with other various improvements/fixes
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/he.c')
| -rw-r--r-- | net/mac80211/he.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/net/mac80211/he.c b/net/mac80211/he.c index 1087f715338b..f520552b22be 100644 --- a/net/mac80211/he.c +++ b/net/mac80211/he.c @@ -57,17 +57,14 @@ ieee80211_he_cap_ie_to_sta_he_cap(struct ieee80211_sub_if_data *sdata, void ieee80211_he_op_ie_to_bss_conf(struct ieee80211_vif *vif, - const struct ieee80211_he_operation *he_op_ie_elem) + const struct ieee80211_he_operation *he_op_ie) { - struct ieee80211_he_operation *he_operation = - &vif->bss_conf.he_operation; - - if (!he_op_ie_elem) { - memset(he_operation, 0, sizeof(*he_operation)); + memset(&vif->bss_conf.he_oper, 0, sizeof(vif->bss_conf.he_oper)); + if (!he_op_ie) return; - } - vif->bss_conf.he_operation = *he_op_ie_elem; + vif->bss_conf.he_oper.params = __le32_to_cpu(he_op_ie->he_oper_params); + vif->bss_conf.he_oper.nss_set = __le16_to_cpu(he_op_ie->he_mcs_nss_set); } void |