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

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

ath9k: move ath_tx_aggr_check() to the rate control module 



It is not used anywhere else and can be made static

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

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

+0 −1
Original line number Diff line number Diff line
@@ -345,7 +345,6 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb, 
void ath_tx_tasklet(struct ath_softc *sc);

void ath_tx_edma_tasklet(struct ath_softc *sc);

void ath_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb);

bool ath_tx_aggr_check(struct ath_softc *sc, struct ath_node *an, u8 tidno);

int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,

		      u16 tid, u16 *ssn);

void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);

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

+16 −0
Original line number Diff line number Diff line
@@ -1320,6 +1320,22 @@ static u8 ath_rc_build_ht_caps(struct ath_softc *sc, struct ieee80211_sta *sta, 
	return caps;

}



static bool ath_tx_aggr_check(struct ath_softc *sc, struct ath_node *an,

			      u8 tidno)

{

	struct ath_atx_tid *txtid;



	if (!(sc->sc_flags & SC_OP_TXAGGR))

		return false;



	txtid = ATH_AN_2_TID(an, tidno);



	if (!(txtid->state & (AGGR_ADDBA_COMPLETE | AGGR_ADDBA_PROGRESS)))

			return true;

	return false;

}





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

/* mac80211 Rate Control callbacks */

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

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

+0 −14
Original line number Diff line number Diff line
@@ -855,20 +855,6 @@ void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid 
	}

}



bool ath_tx_aggr_check(struct ath_softc *sc, struct ath_node *an, u8 tidno)

{

	struct ath_atx_tid *txtid;



	if (!(sc->sc_flags & SC_OP_TXAGGR))

		return false;



	txtid = ATH_AN_2_TID(an, tidno);



	if (!(txtid->state & (AGGR_ADDBA_COMPLETE | AGGR_ADDBA_PROGRESS)))

			return true;

	return false;

}



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

/* Queue Management */

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