Commit 0f622485 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

parents b8d9e572 6352c87f

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/ath6kl/cfg80211.c

+4 −5
Original line number Diff line number Diff line
@@ -1384,11 +1384,8 @@ static int ath6kl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed) 
	return 0;

}



/*

 * The type nl80211_tx_power_setting replaces the following

 * data type from 2.6.36 onwards

*/

static int ath6kl_cfg80211_set_txpower(struct wiphy *wiphy,

				       struct wireless_dev *wdev,

				       enum nl80211_tx_power_setting type,

				       int mbm)

{
@@ -1423,7 +1420,9 @@ static int ath6kl_cfg80211_set_txpower(struct wiphy *wiphy, 
	return 0;

}



static int ath6kl_cfg80211_get_txpower(struct wiphy *wiphy, int *dbm)

static int ath6kl_cfg80211_get_txpower(struct wiphy *wiphy,

				       struct wireless_dev *wdev,

				       int *dbm)

{

	struct ath6kl *ar = (struct ath6kl *)wiphy_priv(wiphy);

	struct ath6kl_vif *vif;

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);

	}