From: Ping-Ke Shih <pkshih@realtek.com>
Date: Mon, 9 Dec 2024 04:20:19 +0000 (+0800)
Subject: wifi: rtw89: 8852c: rfk: refine target channel calculation in _rx_dck_channel_calc()
X-Git-Tag: v6.14-rc1~162^2~181^2~2^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6c10a19363787ffdffe08049b9e0b71c101d401;p=thirdparty%2Fkernel%2Flinux.git

wifi: rtw89: 8852c: rfk: refine target channel calculation in _rx_dck_channel_calc()

The channel is not possibly 0, so original code is fine. Still want to
avoid Coverity warning, so ensure -32 offset for the channel number which
is larger than 125 only. Actually, don't change logic at all.

Addresses-Coverity-ID: 1628150 ("Overflowed constant")

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20241209042020.21290-1-pkshih@realtek.com
---

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c b/drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c
index bd17c0a1c6846..b92e2ce4f4adc 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c
@@ -1769,10 +1769,10 @@ u8 _rx_dck_channel_calc(struct rtw89_dev *rtwdev, const struct rtw89_chan *chan)
 			target_ch = chan->channel - 33;
 		}
 	} else if (chan->band_type == RTW89_BAND_6G) {
-		if (chan->channel >= 1 && chan->channel <= 125)
-			target_ch = chan->channel + 32;
-		else
+		if (chan->channel > 125)
 			target_ch = chan->channel - 32;
+		else
+			target_ch = chan->channel + 32;
 	} else {
 		target_ch = chan->channel;
 	}