Commit e8c18412 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: cfg80211: annotate iftype_data pointer with sparse 



There were are a number of cases in mac80211 and iwlwifi (at
least) that used the sband->iftype_data pointer directly,
instead of using the accessors to find the right array entry
to use.

Make sparse warn when such a thing is done.

To not have a lot of casts, add two helper functions/macros

 - ieee80211_set_sband_iftype_data()
 - for_each_sband_iftype_data()

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 05f13622

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

+9 −6
Original line number Diff line number Diff line
@@ -5893,8 +5893,9 @@ static void ath11k_mac_setup_he_cap(struct ath11k *ar, 
					       ar->mac.iftype[NL80211_BAND_2GHZ],

					       NL80211_BAND_2GHZ);

		band = &ar->mac.sbands[NL80211_BAND_2GHZ];

		band->iftype_data = ar->mac.iftype[NL80211_BAND_2GHZ];

		band->n_iftype_data = count;

		_ieee80211_set_sband_iftype_data(band,

						 ar->mac.iftype[NL80211_BAND_2GHZ],

						 count);

	}



	if (cap->supported_bands & WMI_HOST_WLAN_5G_CAP) {
@@ -5902,8 +5903,9 @@ static void ath11k_mac_setup_he_cap(struct ath11k *ar, 
					       ar->mac.iftype[NL80211_BAND_5GHZ],

					       NL80211_BAND_5GHZ);

		band = &ar->mac.sbands[NL80211_BAND_5GHZ];

		band->iftype_data = ar->mac.iftype[NL80211_BAND_5GHZ];

		band->n_iftype_data = count;

		_ieee80211_set_sband_iftype_data(band,

						 ar->mac.iftype[NL80211_BAND_5GHZ],

						 count);

	}



	if (cap->supported_bands & WMI_HOST_WLAN_5G_CAP &&
@@ -5912,8 +5914,9 @@ static void ath11k_mac_setup_he_cap(struct ath11k *ar, 
					       ar->mac.iftype[NL80211_BAND_6GHZ],

					       NL80211_BAND_6GHZ);

		band = &ar->mac.sbands[NL80211_BAND_6GHZ];

		band->iftype_data = ar->mac.iftype[NL80211_BAND_6GHZ];

		band->n_iftype_data = count;

		_ieee80211_set_sband_iftype_data(band,

						 ar->mac.iftype[NL80211_BAND_6GHZ],

						 count);

	}

}

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

+6 −6
Original line number Diff line number Diff line
@@ -4647,8 +4647,8 @@ static void ath12k_mac_setup_sband_iftype_data(struct ath12k *ar, 
							  ar->mac.iftype[band],

							  band);

		sband = &ar->mac.sbands[band];

		sband->iftype_data = ar->mac.iftype[band];

		sband->n_iftype_data = count;

		_ieee80211_set_sband_iftype_data(sband, ar->mac.iftype[band],

						 count);

	}



	if (cap->supported_bands & WMI_HOST_WLAN_5G_CAP) {
@@ -4657,8 +4657,8 @@ static void ath12k_mac_setup_sband_iftype_data(struct ath12k *ar, 
							  ar->mac.iftype[band],

							  band);

		sband = &ar->mac.sbands[band];

		sband->iftype_data = ar->mac.iftype[band];

		sband->n_iftype_data = count;

		_ieee80211_set_sband_iftype_data(sband, ar->mac.iftype[band],

						 count);

	}



	if (cap->supported_bands & WMI_HOST_WLAN_5G_CAP &&
@@ -4668,8 +4668,8 @@ static void ath12k_mac_setup_sband_iftype_data(struct ath12k *ar, 
							  ar->mac.iftype[band],

							  band);

		sband = &ar->mac.sbands[band];

		sband->iftype_data = ar->mac.iftype[band];

		sband->n_iftype_data = count;

		_ieee80211_set_sband_iftype_data(sband, ar->mac.iftype[band],

						 count);

	}

}

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

+2 −2
Original line number Diff line number Diff line
@@ -1077,8 +1077,8 @@ static void iwl_init_he_hw_capab(struct iwl_trans *trans, 


	memcpy(iftype_data, iwl_he_eht_capa, sizeof(iwl_he_eht_capa));



	sband->iftype_data = iftype_data;

	sband->n_iftype_data = ARRAY_SIZE(iwl_he_eht_capa);

	_ieee80211_set_sband_iftype_data(sband, iftype_data,

					 ARRAY_SIZE(iwl_he_eht_capa));



	for (i = 0; i < sband->n_iftype_data; i++)

		iwl_nvm_fixup_sband_iftd(trans, data, sband, &iftype_data[i],

drivers/net/wireless/mediatek/mt76/mt7915/init.c

+3 −6
Original line number Diff line number Diff line
@@ -1127,8 +1127,7 @@ void mt7915_set_stream_he_caps(struct mt7915_phy *phy) 
		n = mt7915_init_he_caps(phy, NL80211_BAND_2GHZ, data);



		band = &phy->mt76->sband_2g.sband;

		band->iftype_data = data;

		band->n_iftype_data = n;

		_ieee80211_set_sband_iftype_data(band, data, n);

	}



	if (phy->mt76->cap.has_5ghz) {
@@ -1136,8 +1135,7 @@ void mt7915_set_stream_he_caps(struct mt7915_phy *phy) 
		n = mt7915_init_he_caps(phy, NL80211_BAND_5GHZ, data);



		band = &phy->mt76->sband_5g.sband;

		band->iftype_data = data;

		band->n_iftype_data = n;

		_ieee80211_set_sband_iftype_data(band, data, n);

	}



	if (phy->mt76->cap.has_6ghz) {
@@ -1145,8 +1143,7 @@ void mt7915_set_stream_he_caps(struct mt7915_phy *phy) 
		n = mt7915_init_he_caps(phy, NL80211_BAND_6GHZ, data);



		band = &phy->mt76->sband_6g.sband;

		band->iftype_data = data;

		band->n_iftype_data = n;

		_ieee80211_set_sband_iftype_data(band, data, n);

	}

}

drivers/net/wireless/mediatek/mt76/mt7921/main.c

+3 −6
Original line number Diff line number Diff line
@@ -196,8 +196,7 @@ void mt7921_set_stream_he_caps(struct mt792x_phy *phy) 
		n = mt7921_init_he_caps(phy, NL80211_BAND_2GHZ, data);



		band = &phy->mt76->sband_2g.sband;

		band->iftype_data = data;

		band->n_iftype_data = n;

		_ieee80211_set_sband_iftype_data(band, data, n);

	}



	if (phy->mt76->cap.has_5ghz) {
@@ -205,16 +204,14 @@ void mt7921_set_stream_he_caps(struct mt792x_phy *phy) 
		n = mt7921_init_he_caps(phy, NL80211_BAND_5GHZ, data);



		band = &phy->mt76->sband_5g.sband;

		band->iftype_data = data;

		band->n_iftype_data = n;

		_ieee80211_set_sband_iftype_data(band, data, n);



		if (phy->mt76->cap.has_6ghz) {

			data = phy->iftype[NL80211_BAND_6GHZ];

			n = mt7921_init_he_caps(phy, NL80211_BAND_6GHZ, data);



			band = &phy->mt76->sband_6g.sband;

			band->iftype_data = data;

			band->n_iftype_data = n;

			_ieee80211_set_sband_iftype_data(band, data, n);

		}

	}

}