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

Commit 8b2c9824 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: clarify interface iteration and make it configurable 



During hardware restart, all interfaces are iterated even
though they haven't been re-added to the driver, document
this behaviour. The same also happens during resume, which
is even more confusing since all of the interfaces were
previously removed from the driver. Make this optional so
drivers relying on the current behaviour can still use it,
but to let drivers that don't want this behaviour disable
it.

Also convert all API users, keeping the old semantics
except in hwsim, where the new normal ones are desired.

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

drivers/net/wireless/ath/ath5k/base.c

+6 −4
Original line number Diff line number Diff line
@@ -511,8 +511,9 @@ ath5k_update_bssid_mask_and_opmode(struct ath5k_hw *ah, 
		ath5k_vif_iter(&iter_data, vif->addr, vif);



	/* Get list of all active MAC addresses */

	ieee80211_iterate_active_interfaces_atomic(ah->hw, ath5k_vif_iter,

						   &iter_data);

	ieee80211_iterate_active_interfaces_atomic(

		ah->hw, IEEE80211_IFACE_ITER_RESUME_ALL,

		ath5k_vif_iter, &iter_data);

	memcpy(ah->bssidmask, iter_data.mask, ETH_ALEN);



	ah->opmode = iter_data.opmode;
@@ -3045,8 +3046,9 @@ ath5k_any_vif_assoc(struct ath5k_hw *ah) 
	iter_data.need_set_hw_addr = false;

	iter_data.found_active = true;



	ieee80211_iterate_active_interfaces_atomic(ah->hw, ath5k_vif_iter,

						   &iter_data);

	ieee80211_iterate_active_interfaces_atomic(

		ah->hw, IEEE80211_IFACE_ITER_RESUME_ALL,

		ath5k_vif_iter, &iter_data);

	return iter_data.any_assoc;

}

drivers/net/wireless/ath/ath5k/mac80211-ops.c

+3 −2
Original line number Diff line number Diff line
@@ -452,8 +452,9 @@ ath5k_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags, 
	iter_data.hw_macaddr = NULL;

	iter_data.n_stas = 0;

	iter_data.need_set_hw_addr = false;

	ieee80211_iterate_active_interfaces_atomic(ah->hw, ath5k_vif_iter,

						   &iter_data);

	ieee80211_iterate_active_interfaces_atomic(

		ah->hw, IEEE80211_IFACE_ITER_RESUME_ALL,

		ath5k_vif_iter, &iter_data);



	/* Set up RX Filter */

	if (iter_data.n_stas > 1) {

drivers/net/wireless/ath/ath9k/htc_drv_beacon.c

+3 −3
Original line number Diff line number Diff line
@@ -587,9 +587,9 @@ static bool ath9k_htc_check_beacon_config(struct ath9k_htc_priv *priv, 
	    (priv->num_sta_vif > 1) &&

	    (vif->type == NL80211_IFTYPE_STATION)) {

		beacon_configured = false;

		ieee80211_iterate_active_interfaces_atomic(priv->hw,

							   ath9k_htc_beacon_iter,

							   &beacon_configured);

		ieee80211_iterate_active_interfaces_atomic(

			priv->hw, IEEE80211_IFACE_ITER_RESUME_ALL,

			ath9k_htc_beacon_iter, &beacon_configured);



		if (beacon_configured) {

			ath_dbg(common, CONFIG,

drivers/net/wireless/ath/ath9k/htc_drv_main.c

+12 −8
Original line number Diff line number Diff line
@@ -127,7 +127,8 @@ static void ath9k_htc_vif_reconfig(struct ath9k_htc_priv *priv) 
	priv->rearm_ani = false;

	priv->reconfig_beacon = false;



	ieee80211_iterate_active_interfaces_atomic(priv->hw,

	ieee80211_iterate_active_interfaces_atomic(

		priv->hw, IEEE80211_IFACE_ITER_RESUME_ALL,

		ath9k_htc_vif_iter, priv);

	if (priv->rearm_ani)

		ath9k_htc_start_ani(priv);
@@ -165,8 +166,9 @@ static void ath9k_htc_set_bssid_mask(struct ath9k_htc_priv *priv, 
		ath9k_htc_bssid_iter(&iter_data, vif->addr, vif);



	/* Get list of all active MAC addresses */

	ieee80211_iterate_active_interfaces_atomic(priv->hw, ath9k_htc_bssid_iter,

						   &iter_data);

	ieee80211_iterate_active_interfaces_atomic(

		priv->hw, IEEE80211_IFACE_ITER_RESUME_ALL,

		ath9k_htc_bssid_iter, &iter_data);



	memcpy(common->bssidmask, iter_data.mask, ETH_ALEN);

	ath_hw_setbssidmask(common);
@@ -1144,7 +1146,8 @@ static void ath9k_htc_remove_interface(struct ieee80211_hw *hw, 
	 */

	if ((vif->type == NL80211_IFTYPE_AP) && (priv->num_ap_vif == 0)) {

		priv->rearm_ani = false;

		ieee80211_iterate_active_interfaces_atomic(priv->hw,

		ieee80211_iterate_active_interfaces_atomic(

			priv->hw, IEEE80211_IFACE_ITER_RESUME_ALL,

			ath9k_htc_vif_iter, priv);

		if (!priv->rearm_ani)

			ath9k_htc_stop_ani(priv);
@@ -1466,7 +1469,8 @@ static void ath9k_htc_bss_iter(void *data, u8 *mac, struct ieee80211_vif *vif) 
static void ath9k_htc_choose_set_bssid(struct ath9k_htc_priv *priv)

{

	if (priv->num_sta_assoc_vif == 1) {

		ieee80211_iterate_active_interfaces_atomic(priv->hw,

		ieee80211_iterate_active_interfaces_atomic(

			priv->hw, IEEE80211_IFACE_ITER_RESUME_ALL,

			ath9k_htc_bss_iter, priv);

		ath9k_htc_set_bssid(priv);

	}

drivers/net/wireless/ath/ath9k/main.c

+9 −6
Original line number Diff line number Diff line
@@ -924,8 +924,9 @@ void ath9k_calculate_iter_data(struct ieee80211_hw *hw, 
		ath9k_vif_iter(iter_data, vif->addr, vif);



	/* Get list of all active MAC addresses */

	ieee80211_iterate_active_interfaces_atomic(sc->hw, ath9k_vif_iter,

						   iter_data);

	ieee80211_iterate_active_interfaces_atomic(

		sc->hw, IEEE80211_IFACE_ITER_RESUME_ALL,

		ath9k_vif_iter, iter_data);

}



/* Called with sc->mutex held. */
@@ -975,7 +976,8 @@ static void ath9k_calculate_summary_state(struct ieee80211_hw *hw, 
	if (ah->opmode == NL80211_IFTYPE_STATION &&

	    old_opmode == NL80211_IFTYPE_AP &&

	    test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) {

		ieee80211_iterate_active_interfaces_atomic(sc->hw,

		ieee80211_iterate_active_interfaces_atomic(

			sc->hw, IEEE80211_IFACE_ITER_RESUME_ALL,

			ath9k_sta_vif_iter, sc);

	}

}
@@ -1505,7 +1507,8 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw, 
				clear_bit(SC_OP_BEACONS, &sc->sc_flags);

		}



		ieee80211_iterate_active_interfaces_atomic(sc->hw,

		ieee80211_iterate_active_interfaces_atomic(

			sc->hw, IEEE80211_IFACE_ITER_RESUME_ALL,

			ath9k_bss_assoc_iter, sc);



		if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags) &&