diff options
| author | David S. Miller <davem@davemloft.net> | 2018-09-03 22:12:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-03 22:12:02 -0700 |
| commit | fc3e3bf55f48e5b18481075b0591ca938c9dba78 (patch) | |
| tree | 17541ce7f404c33f51048576d7cdeef436ee95e6 /net/wireless/util.c | |
| parent | a484ef3442d2f05fa59edf4f6d14a8169d1b94a6 (diff) | |
| parent | c6e57b3896fc76299913b8cfd82d853bee8a2c84 (diff) | |
Merge tag 'mac80211-for-davem-2018-09-03' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Here are quite a large number of fixes, notably:
* various A-MSDU building fixes (currently only affects mt76)
* syzkaller & spectre fixes in hwsim
* TXQ vs. teardown fix that was causing crashes
* embed WMM info in reg rule, bad code here had been causing crashes
* one compilation issue with fix from Arnd (rfkill-gpio includes)
* fixes for a race and bad data during/after channel switch
* nl80211: a validation fix, attribute type & unit fixes
along with other small fixes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/util.c')
| -rw-r--r-- | net/wireless/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index e0825a019e9f..959ed3acd240 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -1456,7 +1456,7 @@ bool ieee80211_chandef_to_operating_class(struct cfg80211_chan_def *chandef, u8 *op_class) { u8 vht_opclass; - u16 freq = chandef->center_freq1; + u32 freq = chandef->center_freq1; if (freq >= 2412 && freq <= 2472) { if (chandef->width > NL80211_CHAN_WIDTH_40) |