2 files changed, 18 insertions, 18 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 0ccce338a66e..350d2962524c 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -4619,13 +4619,13 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
 
 #define PUT_SINFO(attr, memb, type) do {                                \
         BUILD_BUG_ON(sizeof(type) == sizeof(u64));                      \
-        if (sinfo->filled & (1ULL << NL80211_STA_INFO_ ## attr) &&      \
+        if (sinfo->filled & BIT_ULL(NL80211_STA_INFO_ ## attr) &&       \
             nla_put_ ## type(msg, NL80211_STA_INFO_ ## attr,            \
                              sinfo->memb))                              \
                 goto nla_put_failure;                                   \
         } while (0)
 #define PUT_SINFO_U64(attr, memb) do {                                  \
-        if (sinfo->filled & (1ULL << NL80211_STA_INFO_ ## attr) &&      \
+        if (sinfo->filled & BIT_ULL(NL80211_STA_INFO_ ## attr) &&       \
             nla_put_u64_64bit(msg, NL80211_STA_INFO_ ## attr,           \
                               sinfo->memb, NL80211_STA_INFO_PAD))       \
                 goto nla_put_failure;                                   \
@@ -4634,14 +4634,14 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
         PUT_SINFO(CONNECTED_TIME, connected_time, u32);
         PUT_SINFO(INACTIVE_TIME, inactive_time, u32);
 
-        if (sinfo->filled & (BIT(NL80211_STA_INFO_RX_BYTES) |
-                             BIT(NL80211_STA_INFO_RX_BYTES64)) &&
+        if (sinfo->filled & (BIT_ULL(NL80211_STA_INFO_RX_BYTES) |
+                             BIT_ULL(NL80211_STA_INFO_RX_BYTES64)) &&
             nla_put_u32(msg, NL80211_STA_INFO_RX_BYTES,
                         (u32)sinfo->rx_bytes))
                 goto nla_put_failure;
 
-        if (sinfo->filled & (BIT(NL80211_STA_INFO_TX_BYTES) |
-                             BIT(NL80211_STA_INFO_TX_BYTES64)) &&
+        if (sinfo->filled & (BIT_ULL(NL80211_STA_INFO_TX_BYTES) |
+                             BIT_ULL(NL80211_STA_INFO_TX_BYTES64)) &&
             nla_put_u32(msg, NL80211_STA_INFO_TX_BYTES,
                         (u32)sinfo->tx_bytes))
                 goto nla_put_failure;
@@ -4661,24 +4661,24 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
         default:
                 break;
         }
-        if (sinfo->filled & BIT(NL80211_STA_INFO_CHAIN_SIGNAL)) {
+        if (sinfo->filled & BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL)) {
                 if (!nl80211_put_signal(msg, sinfo->chains,
                                         sinfo->chain_signal,
                                         NL80211_STA_INFO_CHAIN_SIGNAL))
                         goto nla_put_failure;
         }
-        if (sinfo->filled & BIT(NL80211_STA_INFO_CHAIN_SIGNAL_AVG)) {
+        if (sinfo->filled & BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL_AVG)) {
                 if (!nl80211_put_signal(msg, sinfo->chains,
                                         sinfo->chain_signal_avg,
                                         NL80211_STA_INFO_CHAIN_SIGNAL_AVG))
                         goto nla_put_failure;
         }
-        if (sinfo->filled & BIT(NL80211_STA_INFO_TX_BITRATE)) {
+        if (sinfo->filled & BIT_ULL(NL80211_STA_INFO_TX_BITRATE)) {
                 if (!nl80211_put_sta_rate(msg, &sinfo->txrate,
                                           NL80211_STA_INFO_TX_BITRATE))
                         goto nla_put_failure;
         }
-        if (sinfo->filled & BIT(NL80211_STA_INFO_RX_BITRATE)) {
+        if (sinfo->filled & BIT_ULL(NL80211_STA_INFO_RX_BITRATE)) {
                 if (!nl80211_put_sta_rate(msg, &sinfo->rxrate,
                                           NL80211_STA_INFO_RX_BITRATE))
                         goto nla_put_failure;
@@ -4694,7 +4694,7 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
         PUT_SINFO(PEER_PM, peer_pm, u32);
         PUT_SINFO(NONPEER_PM, nonpeer_pm, u32);
 
-        if (sinfo->filled & BIT(NL80211_STA_INFO_BSS_PARAM)) {
+        if (sinfo->filled & BIT_ULL(NL80211_STA_INFO_BSS_PARAM)) {
                 bss_param = nla_nest_start(msg, NL80211_STA_INFO_BSS_PARAM);
                 if (!bss_param)
                         goto nla_put_failure;
@@ -4713,7 +4713,7 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
 
                 nla_nest_end(msg, bss_param);
         }
-        if ((sinfo->filled & BIT(NL80211_STA_INFO_STA_FLAGS)) &&
+        if ((sinfo->filled & BIT_ULL(NL80211_STA_INFO_STA_FLAGS)) &&
             nla_put(msg, NL80211_STA_INFO_STA_FLAGS,
                     sizeof(struct nl80211_sta_flag_update),
                     &sinfo->sta_flags))
@@ -10266,7 +10266,7 @@ static int cfg80211_cqm_rssi_update(struct cfg80211_registered_device *rdev,
                 if (err)
                         return err;
 
-                if (sinfo.filled & BIT(NL80211_STA_INFO_BEACON_SIGNAL_AVG))
+                if (sinfo.filled & BIT_ULL(NL80211_STA_INFO_BEACON_SIGNAL_AVG))
                         wdev->cqm_config->last_rssi_event_value =
                                 (s8) sinfo.rx_beacon_signal_avg;
         }
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 05186a47878f..167f7025ac98 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -1278,7 +1278,7 @@ static int cfg80211_wext_giwrate(struct net_device *dev,
         if (err)
                 return err;
 
-        if (!(sinfo.filled & BIT(NL80211_STA_INFO_TX_BITRATE)))
+        if (!(sinfo.filled & BIT_ULL(NL80211_STA_INFO_TX_BITRATE)))
                 return -EOPNOTSUPP;
 
         rate->value = 100000 * cfg80211_calculate_bitrate(&sinfo.txrate);
@@ -1320,7 +1320,7 @@ static struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev)
 
         switch (rdev->wiphy.signal_type) {
         case CFG80211_SIGNAL_TYPE_MBM:
-                if (sinfo.filled & BIT(NL80211_STA_INFO_SIGNAL)) {
+                if (sinfo.filled & BIT_ULL(NL80211_STA_INFO_SIGNAL)) {
                         int sig = sinfo.signal;
                         wstats.qual.updated |= IW_QUAL_LEVEL_UPDATED;
                         wstats.qual.updated |= IW_QUAL_QUAL_UPDATED;
@@ -1334,7 +1334,7 @@ static struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev)
                         break;
                 }
         case CFG80211_SIGNAL_TYPE_UNSPEC:
-                if (sinfo.filled & BIT(NL80211_STA_INFO_SIGNAL)) {
+                if (sinfo.filled & BIT_ULL(NL80211_STA_INFO_SIGNAL)) {
                         wstats.qual.updated |= IW_QUAL_LEVEL_UPDATED;
                         wstats.qual.updated |= IW_QUAL_QUAL_UPDATED;
                         wstats.qual.level = sinfo.signal;
@@ -1347,9 +1347,9 @@ static struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev)
         }
 
         wstats.qual.updated |= IW_QUAL_NOISE_INVALID;
-        if (sinfo.filled & BIT(NL80211_STA_INFO_RX_DROP_MISC))
+        if (sinfo.filled & BIT_ULL(NL80211_STA_INFO_RX_DROP_MISC))
                 wstats.discard.misc = sinfo.rx_dropped_misc;
-        if (sinfo.filled & BIT(NL80211_STA_INFO_TX_FAILED))
+        if (sinfo.filled & BIT_ULL(NL80211_STA_INFO_TX_FAILED))
                 wstats.discard.retries = sinfo.tx_failed;
 
         return &wstats;