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

wifi: mac80211: move interface config to new struct 



We'll use bss_conf for per-link configuration later, so
move out all the non-link-specific data out into a new
struct ieee80211_vif_cfg used in the vif.

Some adjustments were done with the following spatch:

    @@
    expression sdata;
    struct ieee80211_vif *vifp;
    identifier var = { assoc, ibss_joined, aid, arp_addr_list, arp_addr_cnt, ssid, ssid_len, s1g, ibss_creator };
    @@
    (
    -sdata->vif.bss_conf.var
    +sdata->vif.cfg.var
    |
    -vifp->bss_conf.var
    +vifp->cfg.var
    )

    @bss_conf@
    struct ieee80211_bss_conf *bss_conf;
    identifier var = { assoc, ibss_joined, aid, arp_addr_list, arp_addr_cnt, ssid, ssid_len, s1g, ibss_creator };
    @@
    -bss_conf->var
    +vif_cfg->var

(though more manual fixups were needed, e.g. replacing
"vif_cfg->" by "vif->cfg." in many files.)

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

drivers/net/wireless/ath/ar5523/ar5523.c

+5 −5
Original line number Diff line number Diff line
@@ -1256,14 +1256,14 @@ static int ar5523_create_connection(struct ar5523 *ar, 
				sizeof(create), 0);

}



static int ar5523_write_associd(struct ar5523 *ar,

				struct ieee80211_bss_conf *bss)

static int ar5523_write_associd(struct ar5523 *ar, struct ieee80211_vif *vif)

{

	struct ieee80211_bss_conf *bss = &vif->bss_conf;

	struct ar5523_cmd_set_associd associd;



	memset(&associd, 0, sizeof(associd));

	associd.defaultrateix = cpu_to_be32(0);	/* XXX */

	associd.associd = cpu_to_be32(bss->aid);

	associd.associd = cpu_to_be32(vif->cfg.aid);

	associd.timoffset = cpu_to_be32(0x3b);	/* XXX */

	memcpy(associd.bssid, bss->bssid, ETH_ALEN);

	return ar5523_cmd_write(ar, WDCMSG_WRITE_ASSOCID, &associd,
@@ -1284,7 +1284,7 @@ static void ar5523_bss_info_changed(struct ieee80211_hw *hw, 
	if (!(changed & BSS_CHANGED_ASSOC))

		goto out_unlock;



	if (bss->assoc) {

	if (vif->cfg.assoc) {

		error = ar5523_create_connection(ar, vif, bss);

		if (error) {

			ar5523_err(ar, "could not create connection\n");
@@ -1297,7 +1297,7 @@ static void ar5523_bss_info_changed(struct ieee80211_hw *hw, 
			goto out_unlock;

		}



		error = ar5523_write_associd(ar, bss);

		error = ar5523_write_associd(ar, vif);

		if (error) {

			ar5523_err(ar, "could not set association\n");

			goto out_unlock;

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

+15 −14
Original line number Diff line number Diff line
@@ -1509,8 +1509,8 @@ static int ath10k_vdev_start_restart(struct ath10k_vif *arvif, 
		arg.channel.chan_radar =

			!!(chandef->chan->flags & IEEE80211_CHAN_RADAR);

	} else if (arvif->vdev_type == WMI_VDEV_TYPE_IBSS) {

		arg.ssid = arvif->vif->bss_conf.ssid;

		arg.ssid_len = arvif->vif->bss_conf.ssid_len;

		arg.ssid = arvif->vif->cfg.ssid;

		arg.ssid_len = arvif->vif->cfg.ssid_len;

	}



	ath10k_dbg(ar, ATH10K_DBG_MAC,
@@ -1823,8 +1823,7 @@ static void ath10k_control_beaconing(struct ath10k_vif *arvif, 
}



static void ath10k_control_ibss(struct ath10k_vif *arvif,

				struct ieee80211_bss_conf *info,

				const u8 self_peer[ETH_ALEN])

				struct ieee80211_vif *vif)

{

	struct ath10k *ar = arvif->ar;

	u32 vdev_param;
@@ -1832,7 +1831,7 @@ static void ath10k_control_ibss(struct ath10k_vif *arvif, 


	lockdep_assert_held(&arvif->ar->conf_mutex);



	if (!info->ibss_joined) {

	if (!vif->cfg.ibss_joined) {

		if (is_zero_ether_addr(arvif->bssid))

			return;
@@ -2163,7 +2162,7 @@ static void ath10k_peer_assoc_h_basic(struct ath10k *ar, 
	lockdep_assert_held(&ar->conf_mutex);



	if (vif->type == NL80211_IFTYPE_STATION)

		aid = vif->bss_conf.aid;

		aid = vif->cfg.aid;

	else

		aid = sta->aid;
@@ -2193,7 +2192,8 @@ static void ath10k_peer_assoc_h_crypto(struct ath10k *ar, 
		return;



	bss = cfg80211_get_bss(ar->hw->wiphy, def.chan, info->bssid,

			       info->ssid_len ? info->ssid : NULL, info->ssid_len,

			       vif->cfg.ssid_len ? vif->cfg.ssid : NULL,

			       vif->cfg.ssid_len,

			       IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY);

	if (bss) {

		const struct cfg80211_bss_ies *ies;
@@ -3118,11 +3118,11 @@ static void ath10k_bss_assoc(struct ieee80211_hw *hw, 


	ath10k_dbg(ar, ATH10K_DBG_MAC,

		   "mac vdev %d up (associated) bssid %pM aid %d\n",

		   arvif->vdev_id, bss_conf->bssid, bss_conf->aid);

		   arvif->vdev_id, bss_conf->bssid, vif->cfg.aid);



	WARN_ON(arvif->is_up);



	arvif->aid = bss_conf->aid;

	arvif->aid = vif->cfg.aid;

	ether_addr_copy(arvif->bssid, bss_conf->bssid);



	ret = ath10k_wmi_pdev_set_param(ar,
@@ -6082,7 +6082,7 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw, 
	mutex_lock(&ar->conf_mutex);



	if (changed & BSS_CHANGED_IBSS)

		ath10k_control_ibss(arvif, info, vif->addr);

		ath10k_control_ibss(arvif, vif);



	if (changed & BSS_CHANGED_BEACON_INT) {

		arvif->beacon_interval = info->beacon_int;
@@ -6147,9 +6147,10 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw, 


	if (changed & BSS_CHANGED_SSID &&

	    vif->type == NL80211_IFTYPE_AP) {

		arvif->u.ap.ssid_len = info->ssid_len;

		if (info->ssid_len)

			memcpy(arvif->u.ap.ssid, info->ssid, info->ssid_len);

		arvif->u.ap.ssid_len = vif->cfg.ssid_len;

		if (vif->cfg.ssid_len)

			memcpy(arvif->u.ap.ssid, vif->cfg.ssid,

			       vif->cfg.ssid_len);

		arvif->u.ap.hidden_ssid = info->hidden_ssid;

	}
@@ -6226,7 +6227,7 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw, 
	}



	if (changed & BSS_CHANGED_ASSOC) {

		if (info->assoc) {

		if (vif->cfg.assoc) {

			/* Workaround: Make sure monitor vdev is not running

			 * when associating to prevent some firmware revisions

			 * (e.g. 10.1 and 10.2) from crashing.

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

+12 −10
Original line number Diff line number Diff line
@@ -1539,7 +1539,7 @@ static void ath11k_peer_assoc_h_basic(struct ath11k *ar, 
	lockdep_assert_held(&ar->conf_mutex);



	if (vif->type == NL80211_IFTYPE_STATION)

		aid = vif->bss_conf.aid;

		aid = vif->cfg.aid;

	else

		aid = sta->aid;
@@ -2749,7 +2749,7 @@ static void ath11k_bss_assoc(struct ieee80211_hw *hw, 


	WARN_ON(arvif->is_up);



	arvif->aid = bss_conf->aid;

	arvif->aid = vif->cfg.aid;

	ether_addr_copy(arvif->bssid, bss_conf->bssid);



	ret = ath11k_wmi_vdev_up(ar, arvif->vdev_id, arvif->aid, arvif->bssid);
@@ -2764,7 +2764,7 @@ static void ath11k_bss_assoc(struct ieee80211_hw *hw, 


	ath11k_dbg(ar->ab, ATH11K_DBG_MAC,

		   "mac vdev %d up (associated) bssid %pM aid %d\n",

		   arvif->vdev_id, bss_conf->bssid, bss_conf->aid);

		   arvif->vdev_id, bss_conf->bssid, vif->cfg.aid);



	spin_lock_bh(&ar->ab->base_lock);
@@ -3185,9 +3185,10 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw, 


	if (changed & BSS_CHANGED_SSID &&

	    vif->type == NL80211_IFTYPE_AP) {

		arvif->u.ap.ssid_len = info->ssid_len;

		if (info->ssid_len)

			memcpy(arvif->u.ap.ssid, info->ssid, info->ssid_len);

		arvif->u.ap.ssid_len = vif->cfg.ssid_len;

		if (vif->cfg.ssid_len)

			memcpy(arvif->u.ap.ssid, vif->cfg.ssid,

			       vif->cfg.ssid_len);

		arvif->u.ap.hidden_ssid = info->hidden_ssid;

	}
@@ -3275,7 +3276,7 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw, 
	}



	if (changed & BSS_CHANGED_ASSOC) {

		if (info->assoc)

		if (vif->cfg.assoc)

			ath11k_bss_assoc(hw, vif, info);

		else

			ath11k_bss_disassoc(hw, vif);
@@ -3406,14 +3407,15 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw, 
		ath11k_mac_fils_discovery(arvif, info);



	if (changed & BSS_CHANGED_ARP_FILTER) {

		ipv4_cnt = min(info->arp_addr_cnt, ATH11K_IPV4_MAX_COUNT);

		memcpy(arvif->arp_ns_offload.ipv4_addr, info->arp_addr_list,

		ipv4_cnt = min(vif->cfg.arp_addr_cnt, ATH11K_IPV4_MAX_COUNT);

		memcpy(arvif->arp_ns_offload.ipv4_addr,

		       vif->cfg.arp_addr_list,

		       ipv4_cnt * sizeof(u32));

		memcpy(arvif->arp_ns_offload.mac_addr, vif->addr, ETH_ALEN);

		arvif->arp_ns_offload.ipv4_count = ipv4_cnt;



		ath11k_dbg(ar->ab, ATH11K_DBG_MAC, "mac arp_addr_cnt %d vif->addr %pM, offload_addr %pI4\n",

			   info->arp_addr_cnt,

			   vif->cfg.arp_addr_cnt,

			   vif->addr, arvif->arp_ns_offload.ipv4_addr);

	}

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

+6 −6
Original line number Diff line number Diff line
@@ -278,9 +278,9 @@ ath5k_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	}



	if (changes & BSS_CHANGED_ASSOC) {

		avf->assoc = bss_conf->assoc;

		if (bss_conf->assoc)

			ah->assoc = bss_conf->assoc;

		avf->assoc = vif->cfg.assoc;

		if (vif->cfg.assoc)

			ah->assoc = vif->cfg.assoc;

		else

			ah->assoc = ath5k_any_vif_assoc(ah);
@@ -288,11 +288,11 @@ ath5k_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
			ath5k_set_beacon_filter(hw, ah->assoc);

		ath5k_hw_set_ledstate(ah, ah->assoc ?

			AR5K_LED_ASSOC : AR5K_LED_INIT);

		if (bss_conf->assoc) {

		if (vif->cfg.assoc) {

			ATH5K_DBG(ah, ATH5K_DEBUG_ANY,

				  "Bss Info ASSOC %d, bssid: %pM\n",

				  bss_conf->aid, common->curbssid);

			common->curaid = bss_conf->aid;

				  vif->cfg.aid, common->curbssid);

			common->curaid = vif->cfg.aid;

			ath5k_hw_set_bssid(ah);

			/* Once ANI is available you would start it here */

		}

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

+6 −5
Original line number Diff line number Diff line
@@ -585,8 +585,9 @@ static void ath9k_beacon_config_adhoc(struct ath_softc *sc, 


static void ath9k_cache_beacon_config(struct ath_softc *sc,

				      struct ath_chanctx *ctx,

				      struct ieee80211_bss_conf *bss_conf)

				      struct ieee80211_vif *vif)

{

	struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;

	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

	struct ath_beacon_config *cur_conf = &ctx->beacon;
@@ -596,7 +597,7 @@ static void ath9k_cache_beacon_config(struct ath_softc *sc, 
	cur_conf->beacon_interval = bss_conf->beacon_int;

	cur_conf->dtim_period = bss_conf->dtim_period;

	cur_conf->dtim_count = 1;

	cur_conf->ibss_creator = bss_conf->ibss_creator;

	cur_conf->ibss_creator = vif->cfg.ibss_creator;



	/*

	 * It looks like mac80211 may end up using beacon interval of zero in
@@ -649,7 +650,7 @@ void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *main_vif, 
	cur_conf->enable_beacon = beacons;



	if (sc->sc_ah->opmode == NL80211_IFTYPE_STATION) {

		ath9k_cache_beacon_config(sc, ctx, &main_vif->bss_conf);

		ath9k_cache_beacon_config(sc, ctx, main_vif);



		ath9k_set_beacon(sc);

		set_bit(ATH_OP_BEACONS, &common->op_flags);
@@ -657,7 +658,7 @@ void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *main_vif, 
	}



	/* Update the beacon configuration. */

	ath9k_cache_beacon_config(sc, ctx, &main_vif->bss_conf);

	ath9k_cache_beacon_config(sc, ctx, main_vif);



	/*

	 * Configure the HW beacon registers only when we have a valid
@@ -670,7 +671,7 @@ void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *main_vif, 
		 * IBSS interface.

		 */

		if (sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC &&

		    !enabled && beacons && !main_vif->bss_conf.ibss_creator) {

		    !enabled && beacons && !main_vif->cfg.ibss_creator) {

			spin_lock_irqsave(&sc->sc_pm_lock, flags);

			sc->ps_flags |= PS_BEACON_SYNC | PS_WAIT_FOR_BEACON;

			spin_unlock_irqrestore(&sc->sc_pm_lock, flags);