--- initial
+++ final
@@ -1,90 +1,90 @@
 static void qtnf_cmd_sta_info_parse(struct station_info *sinfo, const struct qlink_tlv_hdr *tlv, size_t resp_size) {
   const struct qlink_sta_stats *stats = NULL;
   const u8 *map = NULL;
   unsigned int map_len = 0;
   unsigned int stats_len = 0;
   u16 tlv_len;
 #define qtnf_sta_stat_avail(stat_name, bitn) (qtnf_utils_is_bit_set(map, bitn, map_len) && (offsetofend(struct qlink_sta_stats, stat_name) <= stats_len))
   while (resp_size >= sizeof(*tlv)) {
     tlv_len = le16_to_cpu(tlv->len);
     switch (le16_to_cpu(tlv->type)) {
     case QTN_TLV_ID_STA_STATS_MAP:
       map_len = tlv_len;
       map = tlv->val;
       break;
     case QTN_TLV_ID_STA_STATS:
       stats_len = tlv_len;
       stats = (const struct qlink_sta_stats *)tlv->val;
       break;
     default: break;
     }
     resp_size -= tlv_len + sizeof(*tlv);
     tlv = (const struct qlink_tlv_hdr *)(tlv->val + tlv_len);
   }
   if (!map || !stats) return;
   if (qtnf_sta_stat_avail(inactive_time, QLINK_STA_INFO_INACTIVE_TIME)) {
-    sinfo->filled |= BIT(NL80211_STA_INFO_INACTIVE_TIME);
+    sinfo->filled |= BIT_ULL(NL80211_STA_INFO_INACTIVE_TIME);
     sinfo->inactive_time = le32_to_cpu(stats->inactive_time);
   }
   if (qtnf_sta_stat_avail(connected_time, QLINK_STA_INFO_CONNECTED_TIME)) {
-    sinfo->filled |= BIT(NL80211_STA_INFO_CONNECTED_TIME);
+    sinfo->filled |= BIT_ULL(NL80211_STA_INFO_CONNECTED_TIME);
     sinfo->connected_time = le32_to_cpu(stats->connected_time);
   }
   if (qtnf_sta_stat_avail(signal, QLINK_STA_INFO_SIGNAL)) {
-    sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
+    sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL);
     sinfo->signal = stats->signal - QLINK_RSSI_OFFSET;
   }
   if (qtnf_sta_stat_avail(signal_avg, QLINK_STA_INFO_SIGNAL_AVG)) {
-    sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL_AVG);
+    sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG);
     sinfo->signal_avg = stats->signal_avg - QLINK_RSSI_OFFSET;
   }
   if (qtnf_sta_stat_avail(rxrate, QLINK_STA_INFO_RX_BITRATE)) {
-    sinfo->filled |= BIT(NL80211_STA_INFO_RX_BITRATE);
+    sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BITRATE);
     qtnf_sta_info_parse_rate(&sinfo->rxrate, &stats->rxrate);
   }
   if (qtnf_sta_stat_avail(txrate, QLINK_STA_INFO_TX_BITRATE)) {
-    sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);
+    sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);
     qtnf_sta_info_parse_rate(&sinfo->txrate, &stats->txrate);
   }
   if (qtnf_sta_stat_avail(sta_flags, QLINK_STA_INFO_STA_FLAGS)) {
-    sinfo->filled |= BIT(NL80211_STA_INFO_STA_FLAGS);
+    sinfo->filled |= BIT_ULL(NL80211_STA_INFO_STA_FLAGS);
     qtnf_sta_info_parse_flags(&sinfo->sta_flags, &stats->sta_flags);
   }
   if (qtnf_sta_stat_avail(rx_bytes, QLINK_STA_INFO_RX_BYTES)) {
-    sinfo->filled |= BIT(NL80211_STA_INFO_RX_BYTES);
+    sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BYTES);
     sinfo->rx_bytes = le64_to_cpu(stats->rx_bytes);
   }
   if (qtnf_sta_stat_avail(tx_bytes, QLINK_STA_INFO_TX_BYTES)) {
-    sinfo->filled |= BIT(NL80211_STA_INFO_TX_BYTES);
+    sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BYTES);
     sinfo->tx_bytes = le64_to_cpu(stats->tx_bytes);
   }
   if (qtnf_sta_stat_avail(rx_bytes, QLINK_STA_INFO_RX_BYTES64)) {
-    sinfo->filled |= BIT(NL80211_STA_INFO_RX_BYTES64);
+    sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BYTES64);
     sinfo->rx_bytes = le64_to_cpu(stats->rx_bytes);
   }
   if (qtnf_sta_stat_avail(tx_bytes, QLINK_STA_INFO_TX_BYTES64)) {
-    sinfo->filled |= BIT(NL80211_STA_INFO_TX_BYTES64);
+    sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BYTES64);
     sinfo->tx_bytes = le64_to_cpu(stats->tx_bytes);
   }
   if (qtnf_sta_stat_avail(rx_packets, QLINK_STA_INFO_RX_PACKETS)) {
-    sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS);
+    sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_PACKETS);
     sinfo->rx_packets = le32_to_cpu(stats->rx_packets);
   }
   if (qtnf_sta_stat_avail(tx_packets, QLINK_STA_INFO_TX_PACKETS)) {
-    sinfo->filled |= BIT(NL80211_STA_INFO_TX_PACKETS);
+    sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_PACKETS);
     sinfo->tx_packets = le32_to_cpu(stats->tx_packets);
   }
   if (qtnf_sta_stat_avail(rx_beacon, QLINK_STA_INFO_BEACON_RX)) {
-    sinfo->filled |= BIT(NL80211_STA_INFO_BEACON_RX);
+    sinfo->filled |= BIT_ULL(NL80211_STA_INFO_BEACON_RX);
     sinfo->rx_beacon = le64_to_cpu(stats->rx_beacon);
   }
   if (qtnf_sta_stat_avail(rx_dropped_misc, QLINK_STA_INFO_RX_DROP_MISC)) {
-    sinfo->filled |= BIT(NL80211_STA_INFO_RX_DROP_MISC);
+    sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_DROP_MISC);
     sinfo->rx_dropped_misc = le32_to_cpu(stats->rx_dropped_misc);
   }
   if (qtnf_sta_stat_avail(tx_failed, QLINK_STA_INFO_TX_FAILED)) {
-    sinfo->filled |= BIT(NL80211_STA_INFO_TX_FAILED);
+    sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_FAILED);
     sinfo->tx_failed = le32_to_cpu(stats->tx_failed);
   }
 #undef qtnf_sta_stat_avail
 }<sep>@@ @@
-	BIT(NL80211_STA_INFO_INACTIVE_TIME)
+	BIT_ULL(NL80211_STA_INFO_INACTIVE_TIME)

@@ @@
-	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_SIGNAL_AVG)
+	BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG)

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

@@ @@
-	BIT(NL80211_STA_INFO_CONNECTED_TIME)
+	BIT_ULL(NL80211_STA_INFO_CONNECTED_TIME)

@@ @@
-	BIT(NL80211_STA_INFO_STA_FLAGS)
+	BIT_ULL(NL80211_STA_INFO_STA_FLAGS)

@@ @@
-	BIT(NL80211_STA_INFO_RX_BYTES64)
+	BIT_ULL(NL80211_STA_INFO_RX_BYTES64)

@@ @@
-	BIT(NL80211_STA_INFO_TX_BYTES64)
+	BIT_ULL(NL80211_STA_INFO_TX_BYTES64)

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

@@ @@
-	BIT(NL80211_STA_INFO_BEACON_RX)
+	BIT_ULL(NL80211_STA_INFO_BEACON_RX)