brcmfmac: improve code handling bandwidth of firmware reported channels
PATCH 1/2 brcmfmac: improve code handling bandwidth of firmware reported channels
From: Rafał Miłecki <[email protected]>
1) Use switch to simplify/improve the code & avoid some duplication
2) Add warning for unsupported values
--- .../wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +10 -3
@@ -6049,11 +6049,18 @@ static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg,/* assuming the chanspecs order is HT20, * HT40 upper, HT40 lower, and VHT80. */ -if (ch.bw ==BRCMU_CHAN_BW_80 ) { +switch (ch.bw) { +case BRCMU_CHAN_BW_80 : channel->flags &= ~IEEE80211_CHAN_NO_80MHZ ; - }else if (ch.bw ==BRCMU_CHAN_BW_40 ) { +break ; +case BRCMU_CHAN_BW_40 :brcmf_update_bw40_channel_flag (channel, &ch); - }else { +break ; +default : +wiphy_warn (wiphy,"Firmware reported unsupported bandwidth %d\n" , + ch.bw); +/* fall through */ +case BRCMU_CHAN_BW_20 :/* enable the channel and disable other bandwidths * for now as mentioned order assure they are enabled * for subsequent chanspecs.
Signature · 1 line
2.20.1
PATCH 2/2 brcmfmac: support firmware reporting 160 MHz channels
From: Rafał Miłecki <[email protected]>
So far 160 MHz channels were treated as 20 MHz ones which was breaking support for 40/80 MHz due to the brcmf_construct_chaninfo() logic and its assumptions.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +3 -0
@@ -6050,6 +6050,9 @@ static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg,* HT40 upper, HT40 lower, and VHT80. */ switch (ch.bw) { +case BRCMU_CHAN_BW_160 : + channel->flags &= ~IEEE80211_CHAN_NO_160MHZ ; +break ;case BRCMU_CHAN_BW_80 : channel->flags &= ~IEEE80211_CHAN_NO_80MHZ ;break ;
Signature · 1 line
2.20.1
Quoted 6 lines · Rafał Miłecki
From: Rafał Miłecki <[email protected]>
1) Use switch to simplify/improve the code & avoid some duplication
2) Add warning for unsupported valuesSigned-off-by Rafał Miłecki <[email protected]>
2 patches applied to wireless-drivers-next.git, thanks.
f4e183293b87 brcmfmac: improve code handling bandwidth of firmware reported channels 30519cbe339a brcmfmac: support firmware reporting 160 MHz channels
Signature · 3 lines
https://patchwork.kernel.org/patch/10806865/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches