| Message ID | 20190925203152.21548-1-efremov@linux.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | brcmsmac: remove duplicated if condition | expand |
Denis Efremov <efremov@linux.com> wrote: > The nested 'li_mimo == &locale_bn' check is excessive and always > true. Thus it can be safely removed. > > Signed-off-by: Denis Efremov <efremov@linux.com> Patch applied to wireless-drivers-next.git, thanks. fa38b4fddc7c brcmsmac: remove duplicated if condition
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c index db783e94f929..5a6d9c86552a 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c @@ -496,13 +496,11 @@ brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm, u16 chanspec, * table and override CDD later */ if (li_mimo == &locale_bn) { - if (li_mimo == &locale_bn) { - maxpwr20 = QDB(16); - maxpwr40 = 0; + maxpwr20 = QDB(16); + maxpwr40 = 0; - if (chan >= 3 && chan <= 11) - maxpwr40 = QDB(16); - } + if (chan >= 3 && chan <= 11) + maxpwr40 = QDB(16); for (i = 0; i < BRCMS_NUM_RATES_MCS_1_STREAM; i++) { txpwr->mcs_20_siso[i] = (u8) maxpwr20;
The nested 'li_mimo == &locale_bn' check is excessive and always true. Thus it can be safely removed. Signed-off-by: Denis Efremov <efremov@linux.com> --- .../net/wireless/broadcom/brcm80211/brcmsmac/channel.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)