Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 560e334d authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: btcoexist: Fix Smatch warning 



The capability for 802.11ac will soon be added to these drivers. Once
that is done, a bitmask will be too large for the data storage.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8d9e464a

drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -505,7 +505,7 @@ static void halbtc_write_1byte(void *bt_context, u32 reg_addr, u32 data) 
}

}





static void halbtc_bitmask_write_1byte(void *bt_context, u32 reg_addr,

static void halbtc_bitmask_write_1byte(void *bt_context, u32 reg_addr,

				       u8 bit_mask, u8 data)

				       u32 bit_mask, u8 data)

{

{

	struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;

	struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;

	struct rtl_priv *rtlpriv = btcoexist->adapter;

	struct rtl_priv *rtlpriv = btcoexist->adapter;

drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -359,7 +359,7 @@ typedef u32 (*bfp_btc_r4)(void *btc_context, u32 reg_addr); 
typedef void (*bfp_btc_w1)(void *btc_context, u32 reg_addr, u32 data);

typedef void (*bfp_btc_w1)(void *btc_context, u32 reg_addr, u32 data);





typedef void (*bfp_btc_w1_bit_mak)(void *btc_context, u32 reg_addr,

typedef void (*bfp_btc_w1_bit_mak)(void *btc_context, u32 reg_addr,

				   u8 bit_mask, u8 data1b);

				   u32 bit_mask, u8 data1b);





typedef void (*bfp_btc_w2)(void *btc_context, u32 reg_addr, u16 data);

typedef void (*bfp_btc_w2)(void *btc_context, u32 reg_addr, u16 data);

drivers/net/wireless/rtlwifi/wifi.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1267,7 +1267,7 @@ struct rtl_mac { 
	u8 sgi_40;

	u8 sgi_40;

	u8 sgi_20;

	u8 sgi_20;

	u8 bw_40;

	u8 bw_40;

	u8 mode;		/* wireless mode */

	u16 mode;		/* wireless mode */

	u8 slot_time;

	u8 slot_time;

	u8 short_preamble;

	u8 short_preamble;

	u8 use_cts_protect;

	u8 use_cts_protect;