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

Commit 66da4241 authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by John W. Linville
Browse files

ath9k: Cleanup ath_vif struct 



Remove unused bssid from ath_vif and set av_bslot on beacon
alloc/return.

Signed-off-by: default avatarRajkumar Manoharan <rmanoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 59575d1c

drivers/net/wireless/ath/ath9k/ath9k.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -346,9 +346,7 @@ struct ath_vif { 
	int av_bslot;

	int av_bslot;

	bool is_bslot_active;

	bool is_bslot_active;

	__le64 tsf_adjust; /* TSF adjustment for staggered beacons */

	__le64 tsf_adjust; /* TSF adjustment for staggered beacons */

	enum nl80211_iftype av_opmode;

	struct ath_buf *av_bcbuf;

	struct ath_buf *av_bcbuf;

	u8 bssid[ETH_ALEN]; /* current BSSID from config_interface */

};

};





/*******************/

/*******************/

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -323,6 +323,7 @@ void ath_beacon_return(struct ath_softc *sc, struct ath_vif *avp) 
		if (avp->av_bslot != -1) {

		if (avp->av_bslot != -1) {

			sc->beacon.bslot[avp->av_bslot] = NULL;

			sc->beacon.bslot[avp->av_bslot] = NULL;

			sc->nbcnvifs--;

			sc->nbcnvifs--;

			avp->av_bslot = -1;

		}

		}





		bf = avp->av_bcbuf;

		bf = avp->av_bcbuf;

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

+0 −6
Original line number Original line Diff line number Diff line
@@ -1450,7 +1450,6 @@ static int ath9k_add_interface(struct ieee80211_hw *hw, 
	struct ath_softc *sc = hw->priv;

	struct ath_softc *sc = hw->priv;

	struct ath_hw *ah = sc->sc_ah;

	struct ath_hw *ah = sc->sc_ah;

	struct ath_common *common = ath9k_hw_common(ah);

	struct ath_common *common = ath9k_hw_common(ah);

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

	int ret = 0;

	int ret = 0;





	mutex_lock(&sc->mutex);

	mutex_lock(&sc->mutex);
@@ -1491,10 +1490,6 @@ static int ath9k_add_interface(struct ieee80211_hw *hw, 
	ath_dbg(common, ATH_DBG_CONFIG,

	ath_dbg(common, ATH_DBG_CONFIG,

		"Attach a VIF of type: %d\n", vif->type);

		"Attach a VIF of type: %d\n", vif->type);





	/* Set the VIF opmode */

	avp->av_opmode = vif->type;

	avp->av_bslot = -1;



	sc->nvifs++;

	sc->nvifs++;





	ath9k_do_vif_add_setup(hw, vif);

	ath9k_do_vif_add_setup(hw, vif);
@@ -1910,7 +1905,6 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw, 
	if (changed & BSS_CHANGED_BSSID) {

	if (changed & BSS_CHANGED_BSSID) {

		/* Set BSSID */

		/* Set BSSID */

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

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

		memcpy(avp->bssid, bss_conf->bssid, ETH_ALEN);

		common->curaid = 0;

		common->curaid = 0;

		ath9k_hw_write_associd(ah);

		ath9k_hw_write_associd(ah);