diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2022-10-13 20:15:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-10-15 07:59:04 +0200 |
| commit | 21df3a583e8e03d8f74fa2eedbcd7a2b3f5cabc1 (patch) | |
| tree | 9e45614f7f61432815bbcc2d1c9665185134662f /net/mac80211/mlme.c | |
| parent | 864f2d3482f4bd0c62b355e35ee8300be8ef488e (diff) | |
| download | linux-stable-21df3a583e8e03d8f74fa2eedbcd7a2b3f5cabc1.tar.gz linux-stable-21df3a583e8e03d8f74fa2eedbcd7a2b3f5cabc1.tar.bz2 linux-stable-21df3a583e8e03d8f74fa2eedbcd7a2b3f5cabc1.zip | |
mac80211: move CRC into struct ieee802_11_elems
commit c6e37ed498f958254b5459253199e816b6bfc52f upstream.
We're currently returning this value, but to prepare for
returning the allocated structure, move it into there.
Link: https://lore.kernel.org/r/20210920154009.479b8ebf999d.If0d4ba75ee38998dc3eeae25058aa748efcb2fc9@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Cc: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 1548f532dc1a..4414e82e71d1 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -4102,10 +4102,11 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, */ if (!ieee80211_is_s1g_beacon(hdr->frame_control)) ncrc = crc32_be(0, (void *)&mgmt->u.beacon.beacon_int, 4); - ncrc = ieee802_11_parse_elems_crc(variable, - len - baselen, false, &elems, - care_about_ies, ncrc, - mgmt->bssid, bssid); + ieee802_11_parse_elems_crc(variable, + len - baselen, false, &elems, + care_about_ies, ncrc, + mgmt->bssid, bssid); + ncrc = elems.crc; if (ieee80211_hw_check(&local->hw, PS_NULLFUNC_STACK) && ieee80211_check_tim(elems.tim, elems.tim_len, bss_conf->aid)) { |