diff options
| author | David S. Miller <davem@davemloft.net> | 2020-03-20 18:57:38 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-20 18:57:38 +0300 |
| commit | 0d7043f355d0045bd38b025630a7defefa3ec07f (patch) | |
| tree | 27ff984e5d4dda3bfefd57bb9122e28711350fde /net/mac80211/util.c | |
| parent | ffe10e679cec9a99f19049459cb27c2fbb1e913a (diff) | |
| parent | 8fa180bb4aceaa25233ea61032eab5b025fb522f (diff) | |
| download | linux-0d7043f355d0045bd38b025630a7defefa3ec07f.tar.xz | |
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/util.c')
| -rw-r--r-- | net/mac80211/util.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index ea7d277a8c45..20436c86b9bf 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -912,8 +912,12 @@ static void ieee80211_parse_extension_element(u32 *crc, break; case WLAN_EID_EXT_HE_OPERATION: if (len >= sizeof(*elems->he_operation) && - len == ieee80211_he_oper_size(data) - 1) + len == ieee80211_he_oper_size(data) - 1) { + if (crc) + *crc = crc32_be(*crc, (void *)elem, + elem->datalen + 2); elems->he_operation = data; + } break; case WLAN_EID_EXT_UORA: if (len == 1) |