--- initial
+++ final
@@ -1,43 +1,43 @@
 int wil_cid_fill_sinfo(struct wil6210_vif *vif, int cid, struct station_info *sinfo) {
   struct wil6210_priv *wil = vif_to_wil(vif);
   struct wmi_notify_req_cmd cmd = {
       .cid = cid,
       .interval_usec = 0,
   };
   struct {
     struct wmi_cmd_hdr wmi;
     struct wmi_notify_req_done_event evt;
   } __packed reply;
   struct wil_net_stats *stats = &wil->sta[cid].stats;
   int rc;
   memset(&reply, 0, sizeof(reply));
   rc = wmi_call(wil, WMI_NOTIFY_REQ_CMDID, vif->mid, &cmd, sizeof(cmd), WMI_NOTIFY_REQ_DONE_EVENTID, &reply, sizeof(reply), 20);
   if (rc) return rc;
   wil_dbg_wmi(wil,
               "Link status for CID %d MID %d: {\n"
               "  MCS %d TSF 0x%016llx\n"
               "  BF status 0x%08x RSSI %d SQI %d%%\n"
               "  Tx Tpt %d goodput %d Rx goodput %d\n"
               "  Sectors(rx:tx) my %d:%d peer %d:%d\n"
               "}\n",
               cid, vif->mid, le16_to_cpu(reply.evt.bf_mcs), le64_to_cpu(reply.evt.tsf), reply.evt.status, reply.evt.rssi, reply.evt.sqi, le32_to_cpu(reply.evt.tx_tpt), le32_to_cpu(reply.evt.tx_goodput), le32_to_cpu(reply.evt.rx_goodput), le16_to_cpu(reply.evt.my_rx_sector), le16_to_cpu(reply.evt.my_tx_sector), le16_to_cpu(reply.evt.other_rx_sector), le16_to_cpu(reply.evt.other_tx_sector));
   sinfo->generation = wil->sinfo_gen;
-  sinfo->filled = BIT(NL80211_STA_INFO_RX_BYTES) | BIT(NL80211_STA_INFO_TX_BYTES) | BIT(NL80211_STA_INFO_RX_PACKETS) | BIT(NL80211_STA_INFO_TX_PACKETS) | BIT(NL80211_STA_INFO_RX_BITRATE) | BIT(NL80211_STA_INFO_TX_BITRATE) | BIT(NL80211_STA_INFO_RX_DROP_MISC) | BIT(NL80211_STA_INFO_TX_FAILED);
+  sinfo->filled = BIT_ULL(NL80211_STA_INFO_RX_BYTES) | BIT_ULL(NL80211_STA_INFO_TX_BYTES) | BIT_ULL(NL80211_STA_INFO_RX_PACKETS) | BIT_ULL(NL80211_STA_INFO_TX_PACKETS) | BIT_ULL(NL80211_STA_INFO_RX_BITRATE) | BIT_ULL(NL80211_STA_INFO_TX_BITRATE) | BIT_ULL(NL80211_STA_INFO_RX_DROP_MISC) | BIT_ULL(NL80211_STA_INFO_TX_FAILED);
   sinfo->txrate.flags = RATE_INFO_FLAGS_60G;
   sinfo->txrate.mcs = le16_to_cpu(reply.evt.bf_mcs);
   sinfo->rxrate.mcs = stats->last_mcs_rx;
   sinfo->rx_bytes = stats->rx_bytes;
   sinfo->rx_packets = stats->rx_packets;
   sinfo->rx_dropped_misc = stats->rx_dropped;
   sinfo->tx_bytes = stats->tx_bytes;
   sinfo->tx_packets = stats->tx_packets;
   sinfo->tx_failed = stats->tx_errors;
   if (test_bit(wil_vif_fwconnected, vif->status)) {
-    sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
+    sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL);
     if (test_bit(WMI_FW_CAPABILITY_RSSI_REPORTING, wil->fw_capabilities))
       sinfo->signal = reply.evt.rssi;
     else
       sinfo->signal = reply.evt.sqi;
   }
   return rc;
 }<sep>@@ @@
-	BIT(NL80211_STA_INFO_RX_BYTES)
+	BIT_ULL(NL80211_STA_INFO_RX_BYTES)

@@ @@
-	BIT(NL80211_STA_INFO_TX_BYTES)
+	BIT_ULL(NL80211_STA_INFO_TX_BYTES)

@@ @@
-	BIT(NL80211_STA_INFO_SIGNAL)
+	BIT_ULL(NL80211_STA_INFO_SIGNAL)

@@ @@
-	BIT(NL80211_STA_INFO_TX_BITRATE)
+	BIT_ULL(NL80211_STA_INFO_TX_BITRATE)

@@ @@
-	BIT(NL80211_STA_INFO_RX_PACKETS)
+	BIT_ULL(NL80211_STA_INFO_RX_PACKETS)

@@ @@
-	BIT(NL80211_STA_INFO_TX_PACKETS)
+	BIT_ULL(NL80211_STA_INFO_TX_PACKETS)

@@ @@
-	BIT(NL80211_STA_INFO_TX_FAILED)
+	BIT_ULL(NL80211_STA_INFO_TX_FAILED)

@@ @@
-	BIT(NL80211_STA_INFO_RX_BITRATE)
+	BIT_ULL(NL80211_STA_INFO_RX_BITRATE)

@@ @@
-	BIT(NL80211_STA_INFO_RX_DROP_MISC)
+	BIT_ULL(NL80211_STA_INFO_RX_DROP_MISC)