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

Ping-Ke Shih · Ping-Ke Shih · commit b6c10a193637 · 2024-12-12T11:06:19.000+08:00
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
@@ -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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1769,10 +1769,10 @@ u8 _rx_dck_channel_calc(struct rtw89_dev rtwdev, const struct rtw89_chan chan)`
`1769`	`1769`	`target_ch = chan->channel - 33;`
`1770`	`1770`	`}`
`1771`	`1771`	`} else if (chan->band_type == RTW89_BAND_6G) {`
`1772`		`- if (chan->channel >= 1 && chan->channel <= 125)`
`1773`		`- target_ch = chan->channel + 32;`
`1774`		`- else`
	`1772`	`+ if (chan->channel > 125)`
`1775`	`1773`	`target_ch = chan->channel - 32;`
	`1774`	`+ else`
	`1775`	`+ target_ch = chan->channel + 32;`
`1776`	`1776`	`} else {`
`1777`	`1777`	`target_ch = chan->channel;`
`1778`	`1778`	`}`