staging: rtl8723bs: replace ternary min comparison with min()
PATCH v4 1/1 staging: rtl8723bs: replace ternary min comparison with min()
Change type of local variable wpa_ie_len from int to u8. wpa_ie_len gets its value either from elems->wpa_ie_len or elems->rsn_ie_len which are both u8, and thus there's no reason to cast them to int.
This allows rewriting ternary min comparison using the min() function from linux/minmax.h as now both sides are unsigned.
Rewrite as well wpa_ie_len + 2 to wpa_ie_len + 2u, to keep the expression unsigned and avoid overflows.
---
v4:
-Rebased changes on main tree rather than previous patches.
v3:
-Applied feedback from David Laight and Dan Carpenter -Reorder include alphabetically
-Made wpa_ie_len unsigned
-Rewrote title and body to reflect change from min_t() to min(), as
min_t() is now unnecessary after changes, and should be avoided.
v2:
-Drop unrelated style changes and fix style issues by running checkpatch. -Keep min_t() to make the signedness of the comparison explicit.
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +4 -2
@@ -8,6 +8,7 @@#include <rtw_wifi_regd.h> #include <hal_btcoex.h> #include <linux/kernel.h> +#include <linux/minmax.h> #include <linux/unaligned.h> static struct mlme_handler mlme_sta_tbl[] = {
@@ -936,7 +937,8 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)struct sta_info *pstat;unsigned char *p, *pos, *wpa_ie;unsigned char WMM_IE [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x00 ,0x01 }; -int i, ie_len, wpa_ie_len, left; +int i, ie_len, left; +u8 wpa_ie_len;unsigned char supportRate[16 ];int supportRateNum;unsigned short status =WLAN_STATUS_SUCCESS ;
@@ -1158,7 +1160,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) pstat->flags |=WLAN_STA_WPS ; copy_len =0 ; }else { - copy_len = ((wpa_ie_len+2 ) >sizeof (pstat->wpa_ie)) ? (sizeof (pstat->wpa_ie)):(wpa_ie_len+2 ); + copy_len =min (sizeof (pstat->wpa_ie), wpa_ie_len +2u ); }
Signature · 1 line
2.52.0
Quoted 5 lines · William Hansen-Baird
Change type of local variable
wpa_ie_lenfrom int to u8.wpa_ie_lengets its value either fromelems->wpa_ie_lenorelems->rsn_ie_lenwhich are both u8, and thus there's no reason to cast them to int.
Quoted 8 lines
This allows rewriting ternary min comparison using the
min()function fromlinux/minmax.has now both sides are unsigned.Rewrite as well
wpa_ie_len+ 2 towpa_ie_len+ 2u, to keep the expression unsigned and avoid overflows.Signed-off-by William Hansen-Baird <[email protected]>---
LGTM.
regards,
dan carpenter