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

Commit ba4903f9 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: implement .tx_last_beacon() 



Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 75517329

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

+3 −0
Original line number Diff line number Diff line
@@ -397,6 +397,9 @@ struct ath_beacon { 
	struct ath_descdma bdma;

	struct ath_txq *cabq;

	struct list_head bbuf;



	bool tx_processed;

	bool tx_last;

};



void ath_beacon_tasklet(unsigned long data);

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

+12 −0
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ 


#define FUDGE 2



static void ath9k_reset_beacon_status(struct ath_softc *sc)

{

	sc->beacon.tx_processed = false;

	sc->beacon.tx_last = false;

}



/*

 *  This function will modify certain transmit queue properties depending on

 *  the operating mode of the station (AP or AdHoc).  Parameters are AIFS
@@ -72,6 +78,8 @@ static void ath_beacon_setup(struct ath_softc *sc, struct ath_vif *avp, 
	struct ieee80211_supported_band *sband;

	u8 rate = 0;



	ath9k_reset_beacon_status(sc);



	ds = bf->bf_desc;

	flags = ATH9K_TXDESC_NOACK;
@@ -134,6 +142,8 @@ static struct ath_buf *ath_beacon_generate(struct ieee80211_hw *hw, 
	struct ieee80211_tx_info *info;

	int cabq_depth;



	ath9k_reset_beacon_status(sc);



	avp = (void *)vif->drv_priv;

	cabq = sc->beacon.cabq;
@@ -644,6 +654,8 @@ static void ath_beacon_config_adhoc(struct ath_softc *sc, 
	struct ath_common *common = ath9k_hw_common(ah);

	u32 tsf, delta, intval, nexttbtt;



	ath9k_reset_beacon_status(sc);



	tsf = ath9k_hw_gettsf32(ah) + TU_TO_USEC(FUDGE);

	intval = TU_TO_USEC(conf->beacon_interval & ATH9K_BEACON_PERIOD);

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

+40 −0
Original line number Diff line number Diff line
@@ -2324,6 +2324,45 @@ static bool ath9k_tx_frames_pending(struct ieee80211_hw *hw) 
	return false;

}



int ath9k_tx_last_beacon(struct ieee80211_hw *hw)

{

	struct ath_softc *sc = hw->priv;

	struct ath_hw *ah = sc->sc_ah;

	struct ieee80211_vif *vif;

	struct ath_vif *avp;

	struct ath_buf *bf;

	struct ath_tx_status ts;

	int status;



	vif = sc->beacon.bslot[0];

	if (!vif)

		return 0;



	avp = (void *)vif->drv_priv;

	if (!avp->is_bslot_active)

		return 0;



	if (!sc->beacon.tx_processed) {

		tasklet_disable(&sc->bcon_tasklet);



		bf = avp->av_bcbuf;

		if (!bf || !bf->bf_mpdu)

			goto skip;



		status = ath9k_hw_txprocdesc(ah, bf->bf_desc, &ts);

		if (status == -EINPROGRESS)

			goto skip;



		sc->beacon.tx_processed = true;

		sc->beacon.tx_last = !(ts.ts_status & ATH9K_TXERR_MASK);



skip:

		tasklet_enable(&sc->bcon_tasklet);

	}



	return sc->beacon.tx_last;

}



struct ieee80211_ops ath9k_ops = {

	.tx 		    = ath9k_tx,

	.start 		    = ath9k_start,
@@ -2348,4 +2387,5 @@ struct ieee80211_ops ath9k_ops = { 
	.set_coverage_class = ath9k_set_coverage_class,

	.flush		    = ath9k_flush,

	.tx_frames_pending  = ath9k_tx_frames_pending,

	.tx_last_beacon = ath9k_tx_last_beacon,

};