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

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

ath9k: Replace WME_NUM_TID with IEEE80211_NUM_TIDS 



Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c175db87

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -261,7 +261,7 @@ struct ath_atx_tid { 
struct ath_node {

struct ath_node {

	struct ieee80211_sta *sta; /* station struct we're part of */

	struct ieee80211_sta *sta; /* station struct we're part of */

	struct ieee80211_vif *vif; /* interface with which we're associated */

	struct ieee80211_vif *vif; /* interface with which we're associated */

	struct ath_atx_tid tid[WME_NUM_TID];

	struct ath_atx_tid tid[IEEE80211_NUM_TIDS];

	struct ath_atx_ac ac[IEEE80211_NUM_ACS];

	struct ath_atx_ac ac[IEEE80211_NUM_ACS];

	int ps_key;

	int ps_key;

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ 




/* Common header for Atheros 802.11n base driver cores */

/* Common header for Atheros 802.11n base driver cores */





#define WME_NUM_TID             16

#define WME_BA_BMP_SIZE         64

#define WME_BA_BMP_SIZE         64

#define WME_MAX_BA              WME_BA_BMP_SIZE

#define WME_MAX_BA              WME_BA_BMP_SIZE

#define ATH_TID_MAX_BUFS        (2 * WME_MAX_BA)

#define ATH_TID_MAX_BUFS        (2 * WME_MAX_BA)

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -1263,7 +1263,7 @@ void ath_tx_aggr_sleep(struct ieee80211_sta *sta, struct ath_softc *sc, 
	int tidno;

	int tidno;





	for (tidno = 0, tid = &an->tid[tidno];

	for (tidno = 0, tid = &an->tid[tidno];

	     tidno < WME_NUM_TID; tidno++, tid++) {

	     tidno < IEEE80211_NUM_TIDS; tidno++, tid++) {





		if (!tid->sched)

		if (!tid->sched)

			continue;

			continue;
@@ -1297,7 +1297,7 @@ void ath_tx_aggr_wakeup(struct ath_softc *sc, struct ath_node *an) 
	int tidno;

	int tidno;





	for (tidno = 0, tid = &an->tid[tidno];

	for (tidno = 0, tid = &an->tid[tidno];

	     tidno < WME_NUM_TID; tidno++, tid++) {

	     tidno < IEEE80211_NUM_TIDS; tidno++, tid++) {





		ac = tid->ac;

		ac = tid->ac;

		txq = ac->txq;

		txq = ac->txq;
@@ -2448,7 +2448,7 @@ void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an) 
	int tidno, acno;

	int tidno, acno;





	for (tidno = 0, tid = &an->tid[tidno];

	for (tidno = 0, tid = &an->tid[tidno];

	     tidno < WME_NUM_TID;

	     tidno < IEEE80211_NUM_TIDS;

	     tidno++, tid++) {

	     tidno++, tid++) {

		tid->an        = an;

		tid->an        = an;

		tid->tidno     = tidno;

		tid->tidno     = tidno;
@@ -2481,7 +2481,7 @@ void ath_tx_node_cleanup(struct ath_softc *sc, struct ath_node *an) 
	int tidno;

	int tidno;





	for (tidno = 0, tid = &an->tid[tidno];

	for (tidno = 0, tid = &an->tid[tidno];

	     tidno < WME_NUM_TID; tidno++, tid++) {

	     tidno < IEEE80211_NUM_TIDS; tidno++, tid++) {





		ac = tid->ac;

		ac = tid->ac;

		txq = ac->txq;

		txq = ac->txq;