| Message ID | 20240504111916.31445-1-pkshih@realtek.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Ping-Ke Shih |
| Headers | show |
| Series | wifi: rtlwifi: 8192d: initialize rate_mask in rtl92de_update_hal_rate_mask() | expand |
Ping-Ke Shih <pkshih@realtek.com> wrote: > le32p_replace_bits() only updates partial bits of rate_mask, and gcc warns > below. Set initial value to avoid warnings, and prevent random value of > missed bits (bit 6 of rate_mask.macid_and_short_gi). > > In file included from ./include/linux/fortify-string.h:5, > from ./include/linux/string.h:369, > from ./include/linux/bitmap.h:13, > from ./include/linux/cpumask.h:13, > from ./include/linux/sched.h:16, > from drivers/net/wireless/realtek/rtlwifi/rtl8192d/../wifi.h:9, > from drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c:4: > In function 'le32p_replace_bits', > inlined from 'rtl92de_update_hal_rate_mask.isra' at drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c:986:2: > ./include/linux/bitfield.h:189:15: warning: 'rate_mask' is used uninitialized [-Wuninitialized] > 189 | *p = (*p & ~to(field)) | type##_encode_bits(val, field); \ > | ^~ > ./include/linux/bitfield.h:196:9: note: in expansion of macro '____MAKE_OP' > 196 | ____MAKE_OP(le##size,u##size,cpu_to_le##size,le##size##_to_cpu) \ > | ^~~~~~~~~~~ > ./include/linux/bitfield.h:201:1: note: in expansion of macro '__MAKE_OP' > 201 | __MAKE_OP(32) > | ^~~~~~~~~ > drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c: In function 'rtl92de_update_hal_rate_mask.isra': > drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c:863:37: note: 'rate_mask' declared here > 863 | struct rtl92d_rate_mask_h2c rate_mask; > | ^~~~~~~~~ > > Fixes: 014bba73b525 ("wifi: rtlwifi: Adjust rtl8192d-common for USB") > Cc: Bitterblue Smith <rtl8821cerfe2@gmail.com> > Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> 1 patch(es) applied to rtw-next branch of rtw.git, thanks. 82b85a836a59 wifi: rtlwifi: 8192d: initialize rate_mask in rtl92de_update_hal_rate_mask() --- This is to quickly fix GCC warning [1] to prevent blocking pull-request. [1] https://lore.kernel.org/linux-wireless/03e00a7f47c86323f34748853ba38859b4d52695.camel@realtek.com/T/#mdcc6bc74e1600b4c6f4ac3b97a5324ef07816db4 --- https://github.com/pkshih/rtw.git
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c index 920bfb4eaaef..6570d5e168e9 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c @@ -857,10 +857,10 @@ static void rtl92de_update_hal_rate_mask(struct ieee80211_hw *hw, { struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); + struct rtl92d_rate_mask_h2c rate_mask = {}; struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_phy *rtlphy = &rtlpriv->phy; struct rtl_sta_info *sta_entry = NULL; - struct rtl92d_rate_mask_h2c rate_mask; enum wireless_mode wirelessmode; bool shortgi = false; u8 curshortgi_40mhz;
le32p_replace_bits() only updates partial bits of rate_mask, and gcc warns below. Set initial value to avoid warnings, and prevent random value of missed bits (bit 6 of rate_mask.macid_and_short_gi). In file included from ./include/linux/fortify-string.h:5, from ./include/linux/string.h:369, from ./include/linux/bitmap.h:13, from ./include/linux/cpumask.h:13, from ./include/linux/sched.h:16, from drivers/net/wireless/realtek/rtlwifi/rtl8192d/../wifi.h:9, from drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c:4: In function 'le32p_replace_bits', inlined from 'rtl92de_update_hal_rate_mask.isra' at drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c:986:2: ./include/linux/bitfield.h:189:15: warning: 'rate_mask' is used uninitialized [-Wuninitialized] 189 | *p = (*p & ~to(field)) | type##_encode_bits(val, field); \ | ^~ ./include/linux/bitfield.h:196:9: note: in expansion of macro '____MAKE_OP' 196 | ____MAKE_OP(le##size,u##size,cpu_to_le##size,le##size##_to_cpu) \ | ^~~~~~~~~~~ ./include/linux/bitfield.h:201:1: note: in expansion of macro '__MAKE_OP' 201 | __MAKE_OP(32) | ^~~~~~~~~ drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c: In function 'rtl92de_update_hal_rate_mask.isra': drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c:863:37: note: 'rate_mask' declared here 863 | struct rtl92d_rate_mask_h2c rate_mask; | ^~~~~~~~~ Fixes: 014bba73b525 ("wifi: rtlwifi: Adjust rtl8192d-common for USB") Cc: Bitterblue Smith <rtl8821cerfe2@gmail.com> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> --- drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)