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

Commit 237b47ef authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Kalle Valo
Browse files

rtw88: Make RA_MASK macros ULL 

Clang warns about the definitions of these macros (full warnings trimmed
for brevity):

drivers/net/wireless/realtek/rtw88/main.c:524:15: warning: signed shift
result (0x3FF00000000) requires 43 bits to represent, but 'int' only has
32 bits [-Wshift-overflow]
                        ra_mask &= RA_MASK_VHT_RATES | RA_MASK_OFDM_IN_VHT;
                                   ^~~~~~~~~~~~~~~~~
drivers/net/wireless/realtek/rtw88/main.c:527:15: warning: signed shift
result (0xFF0000000) requires 37 bits to represent, but 'int' only has
32 bits [-Wshift-overflow]
                        ra_mask &= RA_MASK_HT_RATES | RA_MASK_OFDM_IN_HT_5G;
                                   ^~~~~~~~~~~~~~~~

Given that these are all used with ra_mask, which is of type u64, we can
just declare the macros to be ULL as well.

Fixes: e3037485 ("rtw88: new Realtek 802.11ac driver")
Link: https://github.com/ClangBuiltLinux/linux/issues/467


Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent aa8eaaaa

drivers/net/wireless/realtek/rtw88/main.c

+6 −6
Original line number Diff line number Diff line
@@ -462,15 +462,15 @@ static u8 get_rate_id(u8 wireless_set, enum rtw_bandwidth bw_mode, u8 tx_num) 


#define RA_MASK_CCK_RATES	0x0000f

#define RA_MASK_OFDM_RATES	0x00ff0

#define RA_MASK_HT_RATES_1SS	(0xff000 << 0)

#define RA_MASK_HT_RATES_2SS	(0xff000 << 8)

#define RA_MASK_HT_RATES_3SS	(0xff000 << 16)

#define RA_MASK_HT_RATES_1SS	(0xff000ULL << 0)

#define RA_MASK_HT_RATES_2SS	(0xff000ULL << 8)

#define RA_MASK_HT_RATES_3SS	(0xff000ULL << 16)

#define RA_MASK_HT_RATES	(RA_MASK_HT_RATES_1SS | \

				 RA_MASK_HT_RATES_2SS | \

				 RA_MASK_HT_RATES_3SS)

#define RA_MASK_VHT_RATES_1SS	(0x3ff000 << 0)

#define RA_MASK_VHT_RATES_2SS	(0x3ff000 << 10)

#define RA_MASK_VHT_RATES_3SS	(0x3ff000 << 20)

#define RA_MASK_VHT_RATES_1SS	(0x3ff000ULL << 0)

#define RA_MASK_VHT_RATES_2SS	(0x3ff000ULL << 10)

#define RA_MASK_VHT_RATES_3SS	(0x3ff000ULL << 20)

#define RA_MASK_VHT_RATES	(RA_MASK_VHT_RATES_1SS | \

				 RA_MASK_VHT_RATES_2SS | \

				 RA_MASK_VHT_RATES_3SS)