1234567891011121314151617181920212223242526272829303132333435363738394041 |
- From 3401d42c7ea2d064d15c66698ff8eb96553179ce Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
- Date: Fri, 26 Oct 2018 12:50:39 +0200
- Subject: [PATCH] brcmutil: really fix decoding channel info for 160 MHz
- bandwidth
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- Previous commit /adding/ support for 160 MHz chanspecs was incomplete.
- It didn't set bandwidth info and didn't extract control channel info. As
- the result it was also using uninitialized "sb" var.
- This change has been tested for two chanspecs found to be reported by
- some devices/firmwares:
- 1) 60/160 (0xee32)
- Before: chnum:50 control_ch_num:36
- After: chnum:50 control_ch_num:60
- 2) 120/160 (0xed72)
- Before: chnum:114 control_ch_num:100
- After: chnum:114 control_ch_num:120
- Fixes: 330994e8e8ec ("brcmfmac: fix for proper support of 160MHz bandwidth")
- Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
- Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- ---
- drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c | 3 +++
- 1 file changed, 3 insertions(+)
- --- a/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c
- +++ b/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c
- @@ -193,6 +193,9 @@ static void brcmu_d11ac_decchspec(struct
- }
- break;
- case BRCMU_CHSPEC_D11AC_BW_160:
- + ch->bw = BRCMU_CHAN_BW_160;
- + ch->sb = brcmu_maskget16(ch->chspec, BRCMU_CHSPEC_D11AC_SB_MASK,
- + BRCMU_CHSPEC_D11AC_SB_SHIFT);
- switch (ch->sb) {
- case BRCMU_CHAN_SB_LLL:
- ch->control_ch_num -= CH_70MHZ_APART;
|