Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22d0d2fa authored by Omer Efrat's avatar Omer Efrat Committed by Kalle Valo
Browse files

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: default avatarOmer Efrat <omer.efrat@tandemg.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent ae636fb1

drivers/net/wireless/ath/ath10k/mac.c

+2 −2
Original line number Diff line number Diff line
@@ -7725,7 +7725,7 @@ static void ath10k_sta_statistics(struct ieee80211_hw *hw, 
		return;



	sinfo->rx_duration = arsta->rx_duration;

	sinfo->filled |= 1ULL << NL80211_STA_INFO_RX_DURATION;

	sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_DURATION);



	if (!arsta->txrate.legacy && !arsta->txrate.nss)

		return;
@@ -7738,7 +7738,7 @@ static void ath10k_sta_statistics(struct ieee80211_hw *hw, 
		sinfo->txrate.bw = arsta->txrate.bw;

	}

	sinfo->txrate.flags = arsta->txrate.flags;

	sinfo->filled |= 1ULL << NL80211_STA_INFO_TX_BITRATE;

	sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);

}



static const struct ieee80211_ops ath10k_ops = {

drivers/net/wireless/ath/ath6kl/cfg80211.c

+7 −7
Original line number Diff line number Diff line
@@ -1811,20 +1811,20 @@ static int ath6kl_get_station(struct wiphy *wiphy, struct net_device *dev, 


	if (vif->target_stats.rx_byte) {

		sinfo->rx_bytes = vif->target_stats.rx_byte;

		sinfo->filled |= BIT(NL80211_STA_INFO_RX_BYTES64);

		sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BYTES64);

		sinfo->rx_packets = vif->target_stats.rx_pkt;

		sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS);

		sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_PACKETS);

	}



	if (vif->target_stats.tx_byte) {

		sinfo->tx_bytes = vif->target_stats.tx_byte;

		sinfo->filled |= BIT(NL80211_STA_INFO_TX_BYTES64);

		sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BYTES64);

		sinfo->tx_packets = vif->target_stats.tx_pkt;

		sinfo->filled |= BIT(NL80211_STA_INFO_TX_PACKETS);

		sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_PACKETS);

	}



	sinfo->signal = vif->target_stats.cs_rssi;

	sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);

	sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL);



	rate = vif->target_stats.tx_ucast_rate;
@@ -1857,12 +1857,12 @@ static int ath6kl_get_station(struct wiphy *wiphy, struct net_device *dev, 
		return 0;

	}



	sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);

	sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);



	if (test_bit(CONNECTED, &vif->flags) &&

	    test_bit(DTIM_PERIOD_AVAIL, &vif->flags) &&

	    vif->nw_type == INFRA_NETWORK) {

		sinfo->filled |= BIT(NL80211_STA_INFO_BSS_PARAM);

		sinfo->filled |= BIT_ULL(NL80211_STA_INFO_BSS_PARAM);

		sinfo->bss_param.flags = 0;

		sinfo->bss_param.dtim_period = vif->assoc_bss_dtim_period;

		sinfo->bss_param.beacon_interval = vif->assoc_bss_beacon_int;

drivers/net/wireless/ath/wil6210/cfg80211.c

+9 −9
Original line number Diff line number Diff line
@@ -302,14 +302,14 @@ int wil_cid_fill_sinfo(struct wil6210_vif *vif, int cid, 


	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);
@@ -322,7 +322,7 @@ int wil_cid_fill_sinfo(struct wil6210_vif *vif, int cid, 
	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;

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+20 −20
Original line number Diff line number Diff line
@@ -2434,7 +2434,7 @@ static void brcmf_convert_sta_flags(u32 fw_sta_flags, struct station_info *si) 
	struct nl80211_sta_flag_update *sfu;



	brcmf_dbg(TRACE, "flags %08x\n", fw_sta_flags);

	si->filled |= BIT(NL80211_STA_INFO_STA_FLAGS);

	si->filled |= BIT_ULL(NL80211_STA_INFO_STA_FLAGS);

	sfu = &si->sta_flags;

	sfu->mask = BIT(NL80211_STA_FLAG_WME) |

		    BIT(NL80211_STA_FLAG_AUTHENTICATED) |
@@ -2470,7 +2470,7 @@ static void brcmf_fill_bss_param(struct brcmf_if *ifp, struct station_info *si) 
		brcmf_err("Failed to get bss info (%d)\n", err);

		goto out_kfree;

	}

	si->filled |= BIT(NL80211_STA_INFO_BSS_PARAM);

	si->filled |= BIT_ULL(NL80211_STA_INFO_BSS_PARAM);

	si->bss_param.beacon_interval = le16_to_cpu(buf->bss_le.beacon_period);

	si->bss_param.dtim_period = buf->bss_le.dtim_period;

	capability = le16_to_cpu(buf->bss_le.capability);
@@ -2501,7 +2501,7 @@ brcmf_cfg80211_get_station_ibss(struct brcmf_if *ifp, 
		brcmf_err("BRCMF_C_GET_RATE error (%d)\n", err);

		return err;

	}

	sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);

	sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);

	sinfo->txrate.legacy = rate * 5;



	memset(&scbval, 0, sizeof(scbval));
@@ -2512,7 +2512,7 @@ brcmf_cfg80211_get_station_ibss(struct brcmf_if *ifp, 
		return err;

	}

	rssi = le32_to_cpu(scbval.val);

	sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);

	sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL);

	sinfo->signal = rssi;



	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_GET_PKTCNTS, &pktcnt,
@@ -2521,10 +2521,10 @@ brcmf_cfg80211_get_station_ibss(struct brcmf_if *ifp, 
		brcmf_err("BRCMF_C_GET_GET_PKTCNTS error (%d)\n", err);

		return err;

	}

	sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS) |

			 BIT(NL80211_STA_INFO_RX_DROP_MISC) |

			 BIT(NL80211_STA_INFO_TX_PACKETS) |

			 BIT(NL80211_STA_INFO_TX_FAILED);

	sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_PACKETS) |

			 BIT_ULL(NL80211_STA_INFO_RX_DROP_MISC) |

			 BIT_ULL(NL80211_STA_INFO_TX_PACKETS) |

			 BIT_ULL(NL80211_STA_INFO_TX_FAILED);

	sinfo->rx_packets = le32_to_cpu(pktcnt.rx_good_pkt);

	sinfo->rx_dropped_misc = le32_to_cpu(pktcnt.rx_bad_pkt);

	sinfo->tx_packets = le32_to_cpu(pktcnt.tx_good_pkt);
@@ -2571,7 +2571,7 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev, 
		}

	}

	brcmf_dbg(TRACE, "version %d\n", le16_to_cpu(sta_info_le.ver));

	sinfo->filled = BIT(NL80211_STA_INFO_INACTIVE_TIME);

	sinfo->filled = BIT_ULL(NL80211_STA_INFO_INACTIVE_TIME);

	sinfo->inactive_time = le32_to_cpu(sta_info_le.idle) * 1000;

	sta_flags = le32_to_cpu(sta_info_le.flags);

	brcmf_convert_sta_flags(sta_flags, sinfo);
@@ -2581,33 +2581,33 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev, 
	else

		sinfo->sta_flags.set &= ~BIT(NL80211_STA_FLAG_TDLS_PEER);

	if (sta_flags & BRCMF_STA_ASSOC) {

		sinfo->filled |= BIT(NL80211_STA_INFO_CONNECTED_TIME);

		sinfo->filled |= BIT_ULL(NL80211_STA_INFO_CONNECTED_TIME);

		sinfo->connected_time = le32_to_cpu(sta_info_le.in);

		brcmf_fill_bss_param(ifp, sinfo);

	}

	if (sta_flags & BRCMF_STA_SCBSTATS) {

		sinfo->filled |= BIT(NL80211_STA_INFO_TX_FAILED);

		sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_FAILED);

		sinfo->tx_failed = le32_to_cpu(sta_info_le.tx_failures);

		sinfo->filled |= BIT(NL80211_STA_INFO_TX_PACKETS);

		sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_PACKETS);

		sinfo->tx_packets = le32_to_cpu(sta_info_le.tx_pkts);

		sinfo->tx_packets += le32_to_cpu(sta_info_le.tx_mcast_pkts);

		sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS);

		sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_PACKETS);

		sinfo->rx_packets = le32_to_cpu(sta_info_le.rx_ucast_pkts);

		sinfo->rx_packets += le32_to_cpu(sta_info_le.rx_mcast_pkts);

		if (sinfo->tx_packets) {

			sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);

			sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);

			sinfo->txrate.legacy =

				le32_to_cpu(sta_info_le.tx_rate) / 100;

		}

		if (sinfo->rx_packets) {

			sinfo->filled |= BIT(NL80211_STA_INFO_RX_BITRATE);

			sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BITRATE);

			sinfo->rxrate.legacy =

				le32_to_cpu(sta_info_le.rx_rate) / 100;

		}

		if (le16_to_cpu(sta_info_le.ver) >= 4) {

			sinfo->filled |= BIT(NL80211_STA_INFO_TX_BYTES);

			sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BYTES);

			sinfo->tx_bytes = le64_to_cpu(sta_info_le.tx_tot_bytes);

			sinfo->filled |= BIT(NL80211_STA_INFO_RX_BYTES);

			sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BYTES);

			sinfo->rx_bytes = le64_to_cpu(sta_info_le.rx_tot_bytes);

		}

		total_rssi = 0;
@@ -2623,10 +2623,10 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev, 
			}

		}

		if (count_rssi) {

			sinfo->filled |= BIT(NL80211_STA_INFO_CHAIN_SIGNAL);

			sinfo->filled |= BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL);

			sinfo->chains = count_rssi;



			sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);

			sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL);

			total_rssi /= count_rssi;

			sinfo->signal = total_rssi;

		} else if (test_bit(BRCMF_VIF_STATUS_CONNECTED,
@@ -2639,7 +2639,7 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev, 
				goto done;

			} else {

				rssi = le32_to_cpu(scb_val.val);

				sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);

				sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL);

				sinfo->signal = rssi;

				brcmf_dbg(CONN, "RSSI %d dBm\n", rssi);

			}

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+3 −3
Original line number Diff line number Diff line
@@ -4216,7 +4216,7 @@ static void iwl_mvm_mac_sta_statistics(struct ieee80211_hw *hw, 


	if (mvmsta->avg_energy) {

		sinfo->signal_avg = mvmsta->avg_energy;

		sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL_AVG);

		sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG);

	}



	if (!fw_has_capa(&mvm->fw->ucode_capa,
@@ -4240,11 +4240,11 @@ static void iwl_mvm_mac_sta_statistics(struct ieee80211_hw *hw, 


	sinfo->rx_beacon = mvmvif->beacon_stats.num_beacons +

			   mvmvif->beacon_stats.accu_num_beacons;

	sinfo->filled |= BIT(NL80211_STA_INFO_BEACON_RX);

	sinfo->filled |= BIT_ULL(NL80211_STA_INFO_BEACON_RX);

	if (mvmvif->beacon_stats.avg_signal) {

		/* firmware only reports a value after RXing a few beacons */

		sinfo->rx_beacon_signal_avg = mvmvif->beacon_stats.avg_signal;

		sinfo->filled |= BIT(NL80211_STA_INFO_BEACON_SIGNAL_AVG);

		sinfo->filled |= BIT_ULL(NL80211_STA_INFO_BEACON_SIGNAL_AVG);

	}

 unlock:

	mutex_unlock(&mvm->mutex);