]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
rtw88: fix GENMASK_ULL for u64
authorYan-Hsuan Chuang <yhchuang@realtek.com>
Thu, 24 Oct 2019 09:19:48 +0000 (17:19 +0800)
committerSeth Forshee <seth.forshee@canonical.com>
Fri, 20 Mar 2020 21:31:26 +0000 (16:31 -0500)
BugLink: https://bugs.launchpad.net/bugs/1780590
This fixes compile warning:

    In file included from include/linux/bitops.h:5:0,
                     from include/linux/kernel.h:12,
                     from include/asm-generic/bug.h:19,
                     from arch/mips/include/asm/bug.h:42,
                     from include/linux/bug.h:5,
                     from include/net/mac80211.h:16,
                     from drivers/net/wireless/realtek/rtw88/main.h:8,
                     from drivers/net/wireless/realtek/rtw88/main.c:5:
    drivers/net/wireless/realtek/rtw88/main.c: In function 'rtw_update_rate_mask':
      include/linux/bits.h:23:11: warning: right shift count is negative
      [-Wshift-count-negative]
       (~UL(0) >> (BITS_PER_LONG - 1 - (h))))
               ^
    drivers/net/wireless/realtek/rtw88/main.c:622:17: note: in expansion of macro 'GENMASK'
      u64 cfg_mask = GENMASK(63, 0);
                     ^~~~~~~

Reported-by: kbuild test robot <lkp@intel.com>
Fixes: f39e9bd49a3d ("rtw88: add set_bitrate_mask support")
Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
(cherry picked from commit 5c70e97142542c4d22e8892568c035bc95049258)
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
drivers/net/wireless/realtek/rtw88/main.c

index b469ed0c7e1228b9ce2960755057d9c61d9ec4bc..d9cf0724fe0a616718174aa1fc2ba373aa6e2d57 100644 (file)
@@ -627,7 +627,7 @@ static u64 rtw_update_rate_mask(struct rtw_dev *rtwdev,
 {
        struct rtw_hal *hal = &rtwdev->hal;
        const struct cfg80211_bitrate_mask *mask = si->mask;
-       u64 cfg_mask = GENMASK(63, 0);
+       u64 cfg_mask = GENMASK_ULL(63, 0);
        u8 rssi_level, band;
 
        if (wireless_set != WIRELESS_CCK) {