tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

wireless-drivers: use BIT_ULL for NL80211_STA_INFO_ attribute types

The BIT macro uses unsigned long which some architectures handle as 32 bit
and therefore might cause macro's shift to overflow when used on a value
equals or larger than 32 (NL80211_STA_INFO_RX_DURATION and afterwards).

Since 'filled' member in station_info changed to u64, BIT_ULL macro
should be used with all NL80211_STA_INFO_* attribute types instead of BIT
to prevent future possible bugs when one will use BIT macro for higher
attributes by mistake.

This commit cleans up all usages of BIT macro with the above field
in wireless-drivers by changing it to BIT_ULL instead. In addition, there are
some places which don't use BIT nor BIT_ULL macros so align those as well.

Signed-off-by: Omer Efrat <omer.efrat@tandemg.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

authored by

Omer Efrat and committed by
Kalle Valo 22d0d2fa ae636fb1

+73 -73
+2 -2
drivers/net/wireless/ath/ath10k/mac.c
··· 7725 7725 return; 7726 7726 7727 7727 sinfo->rx_duration = arsta->rx_duration; 7728 - sinfo->filled |= 1ULL << NL80211_STA_INFO_RX_DURATION; 7728 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_DURATION); 7729 7729 7730 7730 if (!arsta->txrate.legacy && !arsta->txrate.nss) 7731 7731 return; ··· 7738 7738 sinfo->txrate.bw = arsta->txrate.bw; 7739 7739 } 7740 7740 sinfo->txrate.flags = arsta->txrate.flags; 7741 - sinfo->filled |= 1ULL << NL80211_STA_INFO_TX_BITRATE; 7741 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE); 7742 7742 } 7743 7743 7744 7744 static const struct ieee80211_ops ath10k_ops = {
+7 -7
drivers/net/wireless/ath/ath6kl/cfg80211.c
··· 1811 1811 1812 1812 if (vif->target_stats.rx_byte) { 1813 1813 sinfo->rx_bytes = vif->target_stats.rx_byte; 1814 - sinfo->filled |= BIT(NL80211_STA_INFO_RX_BYTES64); 1814 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BYTES64); 1815 1815 sinfo->rx_packets = vif->target_stats.rx_pkt; 1816 - sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS); 1816 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_PACKETS); 1817 1817 } 1818 1818 1819 1819 if (vif->target_stats.tx_byte) { 1820 1820 sinfo->tx_bytes = vif->target_stats.tx_byte; 1821 - sinfo->filled |= BIT(NL80211_STA_INFO_TX_BYTES64); 1821 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BYTES64); 1822 1822 sinfo->tx_packets = vif->target_stats.tx_pkt; 1823 - sinfo->filled |= BIT(NL80211_STA_INFO_TX_PACKETS); 1823 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_PACKETS); 1824 1824 } 1825 1825 1826 1826 sinfo->signal = vif->target_stats.cs_rssi; 1827 - sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); 1827 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL); 1828 1828 1829 1829 rate = vif->target_stats.tx_ucast_rate; 1830 1830 ··· 1857 1857 return 0; 1858 1858 } 1859 1859 1860 - sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE); 1860 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE); 1861 1861 1862 1862 if (test_bit(CONNECTED, &vif->flags) && 1863 1863 test_bit(DTIM_PERIOD_AVAIL, &vif->flags) && 1864 1864 vif->nw_type == INFRA_NETWORK) { 1865 - sinfo->filled |= BIT(NL80211_STA_INFO_BSS_PARAM); 1865 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_BSS_PARAM); 1866 1866 sinfo->bss_param.flags = 0; 1867 1867 sinfo->bss_param.dtim_period = vif->assoc_bss_dtim_period; 1868 1868 sinfo->bss_param.beacon_interval = vif->assoc_bss_beacon_int;
+9 -9
drivers/net/wireless/ath/wil6210/cfg80211.c
··· 302 302 303 303 sinfo->generation = wil->sinfo_gen; 304 304 305 - sinfo->filled = BIT(NL80211_STA_INFO_RX_BYTES) | 306 - BIT(NL80211_STA_INFO_TX_BYTES) | 307 - BIT(NL80211_STA_INFO_RX_PACKETS) | 308 - BIT(NL80211_STA_INFO_TX_PACKETS) | 309 - BIT(NL80211_STA_INFO_RX_BITRATE) | 310 - BIT(NL80211_STA_INFO_TX_BITRATE) | 311 - BIT(NL80211_STA_INFO_RX_DROP_MISC) | 312 - BIT(NL80211_STA_INFO_TX_FAILED); 305 + sinfo->filled = BIT_ULL(NL80211_STA_INFO_RX_BYTES) | 306 + BIT_ULL(NL80211_STA_INFO_TX_BYTES) | 307 + BIT_ULL(NL80211_STA_INFO_RX_PACKETS) | 308 + BIT_ULL(NL80211_STA_INFO_TX_PACKETS) | 309 + BIT_ULL(NL80211_STA_INFO_RX_BITRATE) | 310 + BIT_ULL(NL80211_STA_INFO_TX_BITRATE) | 311 + BIT_ULL(NL80211_STA_INFO_RX_DROP_MISC) | 312 + BIT_ULL(NL80211_STA_INFO_TX_FAILED); 313 313 314 314 sinfo->txrate.flags = RATE_INFO_FLAGS_60G; 315 315 sinfo->txrate.mcs = le16_to_cpu(reply.evt.bf_mcs); ··· 322 322 sinfo->tx_failed = stats->tx_errors; 323 323 324 324 if (test_bit(wil_vif_fwconnected, vif->status)) { 325 - sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); 325 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL); 326 326 if (test_bit(WMI_FW_CAPABILITY_RSSI_REPORTING, 327 327 wil->fw_capabilities)) 328 328 sinfo->signal = reply.evt.rssi;
+20 -20
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
··· 2434 2434 struct nl80211_sta_flag_update *sfu; 2435 2435 2436 2436 brcmf_dbg(TRACE, "flags %08x\n", fw_sta_flags); 2437 - si->filled |= BIT(NL80211_STA_INFO_STA_FLAGS); 2437 + si->filled |= BIT_ULL(NL80211_STA_INFO_STA_FLAGS); 2438 2438 sfu = &si->sta_flags; 2439 2439 sfu->mask = BIT(NL80211_STA_FLAG_WME) | 2440 2440 BIT(NL80211_STA_FLAG_AUTHENTICATED) | ··· 2470 2470 brcmf_err("Failed to get bss info (%d)\n", err); 2471 2471 goto out_kfree; 2472 2472 } 2473 - si->filled |= BIT(NL80211_STA_INFO_BSS_PARAM); 2473 + si->filled |= BIT_ULL(NL80211_STA_INFO_BSS_PARAM); 2474 2474 si->bss_param.beacon_interval = le16_to_cpu(buf->bss_le.beacon_period); 2475 2475 si->bss_param.dtim_period = buf->bss_le.dtim_period; 2476 2476 capability = le16_to_cpu(buf->bss_le.capability); ··· 2501 2501 brcmf_err("BRCMF_C_GET_RATE error (%d)\n", err); 2502 2502 return err; 2503 2503 } 2504 - sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE); 2504 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE); 2505 2505 sinfo->txrate.legacy = rate * 5; 2506 2506 2507 2507 memset(&scbval, 0, sizeof(scbval)); ··· 2512 2512 return err; 2513 2513 } 2514 2514 rssi = le32_to_cpu(scbval.val); 2515 - sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); 2515 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL); 2516 2516 sinfo->signal = rssi; 2517 2517 2518 2518 err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_GET_PKTCNTS, &pktcnt, ··· 2521 2521 brcmf_err("BRCMF_C_GET_GET_PKTCNTS error (%d)\n", err); 2522 2522 return err; 2523 2523 } 2524 - sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS) | 2525 - BIT(NL80211_STA_INFO_RX_DROP_MISC) | 2526 - BIT(NL80211_STA_INFO_TX_PACKETS) | 2527 - BIT(NL80211_STA_INFO_TX_FAILED); 2524 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_PACKETS) | 2525 + BIT_ULL(NL80211_STA_INFO_RX_DROP_MISC) | 2526 + BIT_ULL(NL80211_STA_INFO_TX_PACKETS) | 2527 + BIT_ULL(NL80211_STA_INFO_TX_FAILED); 2528 2528 sinfo->rx_packets = le32_to_cpu(pktcnt.rx_good_pkt); 2529 2529 sinfo->rx_dropped_misc = le32_to_cpu(pktcnt.rx_bad_pkt); 2530 2530 sinfo->tx_packets = le32_to_cpu(pktcnt.tx_good_pkt); ··· 2571 2571 } 2572 2572 } 2573 2573 brcmf_dbg(TRACE, "version %d\n", le16_to_cpu(sta_info_le.ver)); 2574 - sinfo->filled = BIT(NL80211_STA_INFO_INACTIVE_TIME); 2574 + sinfo->filled = BIT_ULL(NL80211_STA_INFO_INACTIVE_TIME); 2575 2575 sinfo->inactive_time = le32_to_cpu(sta_info_le.idle) * 1000; 2576 2576 sta_flags = le32_to_cpu(sta_info_le.flags); 2577 2577 brcmf_convert_sta_flags(sta_flags, sinfo); ··· 2581 2581 else 2582 2582 sinfo->sta_flags.set &= ~BIT(NL80211_STA_FLAG_TDLS_PEER); 2583 2583 if (sta_flags & BRCMF_STA_ASSOC) { 2584 - sinfo->filled |= BIT(NL80211_STA_INFO_CONNECTED_TIME); 2584 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_CONNECTED_TIME); 2585 2585 sinfo->connected_time = le32_to_cpu(sta_info_le.in); 2586 2586 brcmf_fill_bss_param(ifp, sinfo); 2587 2587 } 2588 2588 if (sta_flags & BRCMF_STA_SCBSTATS) { 2589 - sinfo->filled |= BIT(NL80211_STA_INFO_TX_FAILED); 2589 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_FAILED); 2590 2590 sinfo->tx_failed = le32_to_cpu(sta_info_le.tx_failures); 2591 - sinfo->filled |= BIT(NL80211_STA_INFO_TX_PACKETS); 2591 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_PACKETS); 2592 2592 sinfo->tx_packets = le32_to_cpu(sta_info_le.tx_pkts); 2593 2593 sinfo->tx_packets += le32_to_cpu(sta_info_le.tx_mcast_pkts); 2594 - sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS); 2594 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_PACKETS); 2595 2595 sinfo->rx_packets = le32_to_cpu(sta_info_le.rx_ucast_pkts); 2596 2596 sinfo->rx_packets += le32_to_cpu(sta_info_le.rx_mcast_pkts); 2597 2597 if (sinfo->tx_packets) { 2598 - sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE); 2598 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE); 2599 2599 sinfo->txrate.legacy = 2600 2600 le32_to_cpu(sta_info_le.tx_rate) / 100; 2601 2601 } 2602 2602 if (sinfo->rx_packets) { 2603 - sinfo->filled |= BIT(NL80211_STA_INFO_RX_BITRATE); 2603 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BITRATE); 2604 2604 sinfo->rxrate.legacy = 2605 2605 le32_to_cpu(sta_info_le.rx_rate) / 100; 2606 2606 } 2607 2607 if (le16_to_cpu(sta_info_le.ver) >= 4) { 2608 - sinfo->filled |= BIT(NL80211_STA_INFO_TX_BYTES); 2608 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BYTES); 2609 2609 sinfo->tx_bytes = le64_to_cpu(sta_info_le.tx_tot_bytes); 2610 - sinfo->filled |= BIT(NL80211_STA_INFO_RX_BYTES); 2610 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BYTES); 2611 2611 sinfo->rx_bytes = le64_to_cpu(sta_info_le.rx_tot_bytes); 2612 2612 } 2613 2613 total_rssi = 0; ··· 2623 2623 } 2624 2624 } 2625 2625 if (count_rssi) { 2626 - sinfo->filled |= BIT(NL80211_STA_INFO_CHAIN_SIGNAL); 2626 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL); 2627 2627 sinfo->chains = count_rssi; 2628 2628 2629 - sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); 2629 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL); 2630 2630 total_rssi /= count_rssi; 2631 2631 sinfo->signal = total_rssi; 2632 2632 } else if (test_bit(BRCMF_VIF_STATUS_CONNECTED, ··· 2639 2639 goto done; 2640 2640 } else { 2641 2641 rssi = le32_to_cpu(scb_val.val); 2642 - sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); 2642 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL); 2643 2643 sinfo->signal = rssi; 2644 2644 brcmf_dbg(CONN, "RSSI %d dBm\n", rssi); 2645 2645 }
+3 -3
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
··· 4216 4216 4217 4217 if (mvmsta->avg_energy) { 4218 4218 sinfo->signal_avg = mvmsta->avg_energy; 4219 - sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL_AVG); 4219 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG); 4220 4220 } 4221 4221 4222 4222 if (!fw_has_capa(&mvm->fw->ucode_capa, ··· 4240 4240 4241 4241 sinfo->rx_beacon = mvmvif->beacon_stats.num_beacons + 4242 4242 mvmvif->beacon_stats.accu_num_beacons; 4243 - sinfo->filled |= BIT(NL80211_STA_INFO_BEACON_RX); 4243 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_BEACON_RX); 4244 4244 if (mvmvif->beacon_stats.avg_signal) { 4245 4245 /* firmware only reports a value after RXing a few beacons */ 4246 4246 sinfo->rx_beacon_signal_avg = mvmvif->beacon_stats.avg_signal; 4247 - sinfo->filled |= BIT(NL80211_STA_INFO_BEACON_SIGNAL_AVG); 4247 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_BEACON_SIGNAL_AVG); 4248 4248 } 4249 4249 unlock: 4250 4250 mutex_unlock(&mvm->mutex);
+6 -6
drivers/net/wireless/marvell/libertas/cfg.c
··· 1559 1559 int ret; 1560 1560 size_t i; 1561 1561 1562 - sinfo->filled |= BIT(NL80211_STA_INFO_TX_BYTES) | 1563 - BIT(NL80211_STA_INFO_TX_PACKETS) | 1564 - BIT(NL80211_STA_INFO_RX_BYTES) | 1565 - BIT(NL80211_STA_INFO_RX_PACKETS); 1562 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BYTES) | 1563 + BIT_ULL(NL80211_STA_INFO_TX_PACKETS) | 1564 + BIT_ULL(NL80211_STA_INFO_RX_BYTES) | 1565 + BIT_ULL(NL80211_STA_INFO_RX_PACKETS); 1566 1566 sinfo->tx_bytes = priv->dev->stats.tx_bytes; 1567 1567 sinfo->tx_packets = priv->dev->stats.tx_packets; 1568 1568 sinfo->rx_bytes = priv->dev->stats.rx_bytes; ··· 1572 1572 ret = lbs_get_rssi(priv, &signal, &noise); 1573 1573 if (ret == 0) { 1574 1574 sinfo->signal = signal; 1575 - sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); 1575 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL); 1576 1576 } 1577 1577 1578 1578 /* Convert priv->cur_rate from hw_value to NL80211 value */ 1579 1579 for (i = 0; i < ARRAY_SIZE(lbs_rates); i++) { 1580 1580 if (priv->cur_rate == lbs_rates[i].hw_value) { 1581 1581 sinfo->txrate.legacy = lbs_rates[i].bitrate; 1582 - sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE); 1582 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE); 1583 1583 break; 1584 1584 } 1585 1585 }
+7 -7
drivers/net/wireless/marvell/mwifiex/cfg80211.c
··· 1353 1353 { 1354 1354 u32 rate; 1355 1355 1356 - sinfo->filled = BIT(NL80211_STA_INFO_RX_BYTES) | BIT(NL80211_STA_INFO_TX_BYTES) | 1357 - BIT(NL80211_STA_INFO_RX_PACKETS) | BIT(NL80211_STA_INFO_TX_PACKETS) | 1358 - BIT(NL80211_STA_INFO_TX_BITRATE) | 1359 - BIT(NL80211_STA_INFO_SIGNAL) | BIT(NL80211_STA_INFO_SIGNAL_AVG); 1356 + sinfo->filled = BIT_ULL(NL80211_STA_INFO_RX_BYTES) | BIT_ULL(NL80211_STA_INFO_TX_BYTES) | 1357 + BIT_ULL(NL80211_STA_INFO_RX_PACKETS) | BIT_ULL(NL80211_STA_INFO_TX_PACKETS) | 1358 + BIT_ULL(NL80211_STA_INFO_TX_BITRATE) | 1359 + BIT_ULL(NL80211_STA_INFO_SIGNAL) | BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG); 1360 1360 1361 1361 if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP) { 1362 1362 if (!node) 1363 1363 return -ENOENT; 1364 1364 1365 - sinfo->filled |= BIT(NL80211_STA_INFO_INACTIVE_TIME) | 1366 - BIT(NL80211_STA_INFO_TX_FAILED); 1365 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_INACTIVE_TIME) | 1366 + BIT_ULL(NL80211_STA_INFO_TX_FAILED); 1367 1367 sinfo->inactive_time = 1368 1368 jiffies_to_msecs(jiffies - node->stats.last_rx); 1369 1369 ··· 1413 1413 sinfo->txrate.legacy = rate * 5; 1414 1414 1415 1415 if (priv->bss_mode == NL80211_IFTYPE_STATION) { 1416 - sinfo->filled |= BIT(NL80211_STA_INFO_BSS_PARAM); 1416 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_BSS_PARAM); 1417 1417 sinfo->bss_param.flags = 0; 1418 1418 if (priv->curr_bss_params.bss_descriptor.cap_info_bitmap & 1419 1419 WLAN_CAPABILITY_SHORT_PREAMBLE)
+16 -16
drivers/net/wireless/quantenna/qtnfmac/commands.c
··· 640 640 return; 641 641 642 642 if (qtnf_sta_stat_avail(inactive_time, QLINK_STA_INFO_INACTIVE_TIME)) { 643 - sinfo->filled |= BIT(NL80211_STA_INFO_INACTIVE_TIME); 643 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_INACTIVE_TIME); 644 644 sinfo->inactive_time = le32_to_cpu(stats->inactive_time); 645 645 } 646 646 647 647 if (qtnf_sta_stat_avail(connected_time, 648 648 QLINK_STA_INFO_CONNECTED_TIME)) { 649 - sinfo->filled |= BIT(NL80211_STA_INFO_CONNECTED_TIME); 649 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_CONNECTED_TIME); 650 650 sinfo->connected_time = le32_to_cpu(stats->connected_time); 651 651 } 652 652 653 653 if (qtnf_sta_stat_avail(signal, QLINK_STA_INFO_SIGNAL)) { 654 - sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); 654 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL); 655 655 sinfo->signal = stats->signal - QLINK_RSSI_OFFSET; 656 656 } 657 657 658 658 if (qtnf_sta_stat_avail(signal_avg, QLINK_STA_INFO_SIGNAL_AVG)) { 659 - sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL_AVG); 659 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG); 660 660 sinfo->signal_avg = stats->signal_avg - QLINK_RSSI_OFFSET; 661 661 } 662 662 663 663 if (qtnf_sta_stat_avail(rxrate, QLINK_STA_INFO_RX_BITRATE)) { 664 - sinfo->filled |= BIT(NL80211_STA_INFO_RX_BITRATE); 664 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BITRATE); 665 665 qtnf_sta_info_parse_rate(&sinfo->rxrate, &stats->rxrate); 666 666 } 667 667 668 668 if (qtnf_sta_stat_avail(txrate, QLINK_STA_INFO_TX_BITRATE)) { 669 - sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE); 669 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE); 670 670 qtnf_sta_info_parse_rate(&sinfo->txrate, &stats->txrate); 671 671 } 672 672 673 673 if (qtnf_sta_stat_avail(sta_flags, QLINK_STA_INFO_STA_FLAGS)) { 674 - sinfo->filled |= BIT(NL80211_STA_INFO_STA_FLAGS); 674 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_STA_FLAGS); 675 675 qtnf_sta_info_parse_flags(&sinfo->sta_flags, &stats->sta_flags); 676 676 } 677 677 678 678 if (qtnf_sta_stat_avail(rx_bytes, QLINK_STA_INFO_RX_BYTES)) { 679 - sinfo->filled |= BIT(NL80211_STA_INFO_RX_BYTES); 679 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BYTES); 680 680 sinfo->rx_bytes = le64_to_cpu(stats->rx_bytes); 681 681 } 682 682 683 683 if (qtnf_sta_stat_avail(tx_bytes, QLINK_STA_INFO_TX_BYTES)) { 684 - sinfo->filled |= BIT(NL80211_STA_INFO_TX_BYTES); 684 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BYTES); 685 685 sinfo->tx_bytes = le64_to_cpu(stats->tx_bytes); 686 686 } 687 687 688 688 if (qtnf_sta_stat_avail(rx_bytes, QLINK_STA_INFO_RX_BYTES64)) { 689 - sinfo->filled |= BIT(NL80211_STA_INFO_RX_BYTES64); 689 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BYTES64); 690 690 sinfo->rx_bytes = le64_to_cpu(stats->rx_bytes); 691 691 } 692 692 693 693 if (qtnf_sta_stat_avail(tx_bytes, QLINK_STA_INFO_TX_BYTES64)) { 694 - sinfo->filled |= BIT(NL80211_STA_INFO_TX_BYTES64); 694 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BYTES64); 695 695 sinfo->tx_bytes = le64_to_cpu(stats->tx_bytes); 696 696 } 697 697 698 698 if (qtnf_sta_stat_avail(rx_packets, QLINK_STA_INFO_RX_PACKETS)) { 699 - sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS); 699 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_PACKETS); 700 700 sinfo->rx_packets = le32_to_cpu(stats->rx_packets); 701 701 } 702 702 703 703 if (qtnf_sta_stat_avail(tx_packets, QLINK_STA_INFO_TX_PACKETS)) { 704 - sinfo->filled |= BIT(NL80211_STA_INFO_TX_PACKETS); 704 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_PACKETS); 705 705 sinfo->tx_packets = le32_to_cpu(stats->tx_packets); 706 706 } 707 707 708 708 if (qtnf_sta_stat_avail(rx_beacon, QLINK_STA_INFO_BEACON_RX)) { 709 - sinfo->filled |= BIT(NL80211_STA_INFO_BEACON_RX); 709 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_BEACON_RX); 710 710 sinfo->rx_beacon = le64_to_cpu(stats->rx_beacon); 711 711 } 712 712 713 713 if (qtnf_sta_stat_avail(rx_dropped_misc, QLINK_STA_INFO_RX_DROP_MISC)) { 714 - sinfo->filled |= BIT(NL80211_STA_INFO_RX_DROP_MISC); 714 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_DROP_MISC); 715 715 sinfo->rx_dropped_misc = le32_to_cpu(stats->rx_dropped_misc); 716 716 } 717 717 718 718 if (qtnf_sta_stat_avail(tx_failed, QLINK_STA_INFO_TX_FAILED)) { 719 - sinfo->filled |= BIT(NL80211_STA_INFO_TX_FAILED); 719 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_FAILED); 720 720 sinfo->tx_failed = le32_to_cpu(stats->tx_failed); 721 721 } 722 722
+2 -2
drivers/net/wireless/rndis_wlan.c
··· 2480 2480 ret = rndis_query_oid(usbdev, RNDIS_OID_GEN_LINK_SPEED, &linkspeed, &len); 2481 2481 if (ret == 0) { 2482 2482 sinfo->txrate.legacy = le32_to_cpu(linkspeed) / 1000; 2483 - sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE); 2483 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE); 2484 2484 } 2485 2485 2486 2486 len = sizeof(rssi); ··· 2488 2488 &rssi, &len); 2489 2489 if (ret == 0) { 2490 2490 sinfo->signal = level_to_qual(le32_to_cpu(rssi)); 2491 - sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); 2491 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL); 2492 2492 } 2493 2493 } 2494 2494
+1 -1
drivers/net/wireless/ti/wlcore/main.c
··· 5821 5821 if (ret < 0) 5822 5822 goto out_sleep; 5823 5823 5824 - sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); 5824 + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL); 5825 5825 sinfo->signal = rssi_dbm; 5826 5826 5827 5827 out_sleep: