diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-03-29 21:25:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-29 21:25:29 -0700 |
| commit | f0b5989745c3e0e92424d36869a97e4e8df7ab13 (patch) | |
| tree | 0e9759b9d6060bb94cad676b1b16e423d5ad2523 /include/linux/ieee80211.h | |
| parent | Merge branch 'DSA-mtu' (diff) | |
| parent | Linux 5.6 (diff) | |
| download | wireguard-linux-f0b5989745c3e0e92424d36869a97e4e8df7ab13.tar.xz wireguard-linux-f0b5989745c3e0e92424d36869a97e4e8df7ab13.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor comment conflict in mac80211.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/ieee80211.h')
| -rw-r--r-- | include/linux/ieee80211.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 33d907eec0b6..16268ef1cbcc 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -2111,14 +2111,14 @@ ieee80211_he_spr_size(const u8 *he_spr_ie) { struct ieee80211_he_spr *he_spr = (void *)he_spr_ie; u8 spr_len = sizeof(struct ieee80211_he_spr); - u32 he_spr_params; + u8 he_spr_params; /* Make sure the input is not NULL */ if (!he_spr_ie) return 0; /* Calc required length */ - he_spr_params = le32_to_cpu(he_spr->he_sr_control); + he_spr_params = he_spr->he_sr_control; if (he_spr_params & IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT) spr_len++; if (he_spr_params & IEEE80211_HE_SPR_SRG_INFORMATION_PRESENT) |