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

Commit c6089ccc authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

ath9k: Cleanup bss_info_changed callback 



* Remove a code chunk dealing with operating mode changes.
  As noted, all such policy changes are to be done in
  add_interface.

* Remove pointless check for empty BSSID.
  Also, remove mode checks - mac80211 does all the needed checks.

* Handle enabling/disabling beacon transmission properly.

* Handle beacon interval changes for AP mode.
  The original code depended on config_interface() to update
  the HW TSF. Since that callback has been removed, handle
  it properly.

* Remove unneeded code dealing with key/privacy.

* Set the chainmasks to 1x1 for IBSS when the BSSID is set.
  This was happening uncondionally before.

Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 827e69bf

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

+37 −77
Original line number Diff line number Diff line
@@ -2956,33 +2956,11 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw, 
	struct ath_hw *ah = sc->sc_ah;

	struct ath_common *common = ath9k_hw_common(ah);

	struct ath_vif *avp = (void *)vif->drv_priv;

	u32 rfilt = 0;

	int error, i;

	int error;



	mutex_lock(&sc->mutex);



	/*

	 * TODO: Need to decide which hw opmode to use for

	 *       multi-interface cases

	 * XXX: This belongs into add_interface!

	 */

	if (vif->type == NL80211_IFTYPE_AP &&

	    ah->opmode != NL80211_IFTYPE_AP) {

		ah->opmode = NL80211_IFTYPE_STATION;

		ath9k_hw_setopmode(ah);

		memcpy(common->curbssid, common->macaddr, ETH_ALEN);

		common->curaid = 0;

		ath9k_hw_write_associd(ah);

		/* Request full reset to get hw opmode changed properly */

		sc->sc_flags |= SC_OP_FULL_RESET;

	}



	if ((changed & BSS_CHANGED_BSSID) &&

	    !is_zero_ether_addr(bss_conf->bssid)) {

		switch (vif->type) {

		case NL80211_IFTYPE_STATION:

		case NL80211_IFTYPE_ADHOC:

		case NL80211_IFTYPE_MESH_POINT:

	if (changed & BSS_CHANGED_BSSID) {

		/* Set BSSID */

		memcpy(common->curbssid, bss_conf->bssid, ETH_ALEN);

		memcpy(avp->bssid, bss_conf->bssid, ETH_ALEN);
@@ -2992,54 +2970,48 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw, 
		/* Set aggregation protection mode parameters */

		sc->config.ath_aggr_prot = 0;



		/* Only legacy IBSS for now */

		if (vif->type == NL80211_IFTYPE_ADHOC)

			ath_update_chainmask(sc, 0);



		ath_print(common, ATH_DBG_CONFIG,

				  "RX filter 0x%x bssid %pM aid 0x%x\n",

				  rfilt, common->curbssid, common->curaid);

			  "BSSID: %pM aid: 0x%x\n",

			  common->curbssid, common->curaid);



		/* need to reconfigure the beacon */

		sc->sc_flags &= ~SC_OP_BEACONS ;



			break;

		default:

			break;

		}

	}



	if ((vif->type == NL80211_IFTYPE_ADHOC) ||

	    (vif->type == NL80211_IFTYPE_AP) ||

	    (vif->type == NL80211_IFTYPE_MESH_POINT)) {

	/* Enable transmission of beacons (AP, IBSS, MESH) */

	if ((changed & BSS_CHANGED_BEACON) ||

		    (changed & BSS_CHANGED_BEACON_ENABLED &&

		     bss_conf->enable_beacon)) {

	    ((changed & BSS_CHANGED_BEACON_ENABLED) && bss_conf->enable_beacon)) {

		ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);

		error = ath_beacon_alloc(aphy, vif);

		if (!error)

			ath_beacon_config(sc, vif);

	}



	/* Disable transmission of beacons */

	if ((changed & BSS_CHANGED_BEACON_ENABLED) && !bss_conf->enable_beacon)

		ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);



	if (changed & BSS_CHANGED_BEACON_INT) {

		sc->beacon_interval = bss_conf->beacon_int;

		/*

			 * Allocate and setup the beacon frame.

			 *

			 * Stop any previous beacon DMA.  This may be

			 * necessary, for example, when an ibss merge

			 * causes reconfiguration; we may be called

			 * with beacon transmission active.

		 * In case of AP mode, the HW TSF has to be reset

		 * when the beacon interval changes.

		 */

		if (vif->type == NL80211_IFTYPE_AP) {

			sc->sc_flags |= SC_OP_TSF_RESET;

			ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);



			error = ath_beacon_alloc(aphy, vif);

			if (!error)

				ath_beacon_config(sc, vif);

		} else {

			ath_beacon_config(sc, vif);

		}

	}



	/* Check for WLAN_CAPABILITY_PRIVACY ? */

	if ((avp->av_opmode != NL80211_IFTYPE_STATION)) {

		for (i = 0; i < IEEE80211_WEP_NKID; i++)

			if (ath9k_hw_keyisvalid(sc->sc_ah, (u16)i))

				ath9k_hw_keysetmac(sc->sc_ah,

						   (u16)i,

						   common->curbssid);

	}



	/* Only legacy IBSS for now */

	if (vif->type == NL80211_IFTYPE_ADHOC)

		ath_update_chainmask(sc, 0);



	if (changed & BSS_CHANGED_ERP_PREAMBLE) {

		ath_print(common, ATH_DBG_CONFIG, "BSS Changed PREAMBLE %d\n",

			  bss_conf->use_short_preamble);
@@ -3065,18 +3037,6 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw, 
		ath9k_bss_assoc_info(sc, vif, bss_conf);

	}



	/*

	 * The HW TSF has to be reset when the beacon interval changes.

	 * We set the flag here, and ath_beacon_config_ap() would take this

	 * into account when it gets called through the subsequent

	 * config_interface() call - with IFCC_BEACON in the changed field.

	 */



	if (changed & BSS_CHANGED_BEACON_INT) {

		sc->sc_flags |= SC_OP_TSF_RESET;

		sc->beacon_interval = bss_conf->beacon_int;

	}



	mutex_unlock(&sc->mutex);

}