Skip to content

Commit 82b85a8

Browse files
author
Ping-Ke Shih
committed
wifi: rtlwifi: 8192d: initialize rate_mask in rtl92de_update_hal_rate_mask()
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; | ^~~~~~~~~ Compile tested only. Fixes: 014bba7 ("wifi: rtlwifi: Adjust rtl8192d-common for USB") Cc: Bitterblue Smith <[email protected]> Signed-off-by: Ping-Ke Shih <[email protected]> Link: https://msgid.link/[email protected]
1 parent b3e11ee commit 82b85a8

File tree

1 file changed

+1
-1
lines changed
  • drivers/net/wireless/realtek/rtlwifi/rtl8192d

1 file changed

+1
-1
lines changed

drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -857,10 +857,10 @@ static void rtl92de_update_hal_rate_mask(struct ieee80211_hw *hw,
857857
{
858858
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
859859
struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
860+
struct rtl92d_rate_mask_h2c rate_mask = {};
860861
struct rtl_priv *rtlpriv = rtl_priv(hw);
861862
struct rtl_phy *rtlphy = &rtlpriv->phy;
862863
struct rtl_sta_info *sta_entry = NULL;
863-
struct rtl92d_rate_mask_h2c rate_mask;
864864
enum wireless_mode wirelessmode;
865865
bool shortgi = false;
866866
u8 curshortgi_40mhz;

0 commit comments

Comments
 (0)