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: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
index fcf7459b5d66d998a09650a5db1f7f4a94cdf520..b2791c893417b071782dbb317f6baae53c0ecf74 100644 (file)
--- a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
+++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
@@ -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,
-                                      u8 bit_mask, u8 data)
+                                      u32 bit_mask, u8 data)
 {
        struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;
        struct rtl_priv *rtlpriv = btcoexist->adapter;

diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
index 1345545f66bc6d5c3eb0879420320f58174601d0..0a903ea179ef5df67954b1c33c97a57a5c82eebe 100644 (file)
--- a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
+++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
@@ -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_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);
 

diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 541b077ae867a47223643312a12428a4571404ea..a943a245d680a18eecd5cc7ce468699ce64f8695 100644 (file)
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -1267,7 +1267,7 @@ struct rtl_mac {
        u8 sgi_40;
        u8 sgi_20;
        u8 bw_40;
-       u8 mode;                /* wireless mode */
+       u16 mode;               /* wireless mode */
        u8 slot_time;
        u8 short_preamble;
        u8 use_cts_protect;