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

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

ath9k: remove duplicate WMM AC definitions 



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

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

+1 −3
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ struct ath_tx_control { 
struct ath_tx {

	u16 seq_no;

	u32 txqsetup;

	int hwq_map[ATH9K_WME_AC_VO+1];

	int hwq_map[WME_NUM_AC];

	spinlock_t txbuflock;

	struct list_head txbuf;

	struct ath_txq txq[ATH9K_NUM_TX_QUEUES];
@@ -680,8 +680,6 @@ void ath9k_set_wiphy_idle(struct ath_wiphy *aphy, bool idle); 
void ath_mac80211_stop_queue(struct ath_softc *sc, u16 skb_queue);

void ath_mac80211_start_queue(struct ath_softc *sc, u16 skb_queue);



int ath_tx_get_qnum(struct ath_softc *sc, int qtype, int haltype);



void ath_start_rfkill_poll(struct ath_softc *sc);

extern void ath9k_rfkill_poll_state(struct ieee80211_hw *hw);

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

+1 −2
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ int ath_beaconq_config(struct ath_softc *sc) 
		qi.tqi_cwmax = 0;

	} else {

		/* Adhoc mode; important thing is to use 2x cwmin. */

		qnum = ath_tx_get_qnum(sc, ATH9K_TX_QUEUE_DATA,

				       ATH9K_WME_AC_BE);

		qnum = sc->tx.hwq_map[WME_AC_BE];

		ath9k_hw_get_txq_props(ah, qnum, &qi_be);

		qi.tqi_aifs = qi_be.tqi_aifs;

		qi.tqi_cwmin = 4*qi_be.tqi_cwmin;

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

+4 −4
Original line number Diff line number Diff line
@@ -630,10 +630,10 @@ static const struct file_operations fops_wiphy = { 
	do {								\

		len += snprintf(buf + len, size - len,			\

				"%s%13u%11u%10u%10u\n", str,		\

		sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_BE]].elem, \

		sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_BK]].elem, \

		sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_VI]].elem, \

		sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_VO]].elem); \

		sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_BE]].elem, \

		sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_BK]].elem, \

		sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_VI]].elem, \

		sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_VO]].elem); \

} while(0)



static ssize_t read_file_xmit(struct file *file, char __user *user_buf,

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

+5 −5
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ static int ath9k_init_btcoex(struct ath_softc *sc) 
		r = ath_init_btcoex_timer(sc);

		if (r)

			return -1;

		qnum = ath_tx_get_qnum(sc, ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_BE);

		qnum = sc->tx.hwq_map[WME_AC_BE];

		ath9k_hw_init_btcoex_hw(sc->sc_ah, qnum);

		sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;

		break;
@@ -463,23 +463,23 @@ static int ath9k_init_queues(struct ath_softc *sc) 
	sc->config.cabqReadytime = ATH_CABQ_READY_TIME;

	ath_cabq_update(sc);



	if (!ath_tx_setup(sc, ATH9K_WME_AC_BK)) {

	if (!ath_tx_setup(sc, WME_AC_BK)) {

		ath_print(common, ATH_DBG_FATAL,

			  "Unable to setup xmit queue for BK traffic\n");

		goto err;

	}



	if (!ath_tx_setup(sc, ATH9K_WME_AC_BE)) {

	if (!ath_tx_setup(sc, WME_AC_BE)) {

		ath_print(common, ATH_DBG_FATAL,

			  "Unable to setup xmit queue for BE traffic\n");

		goto err;

	}

	if (!ath_tx_setup(sc, ATH9K_WME_AC_VI)) {

	if (!ath_tx_setup(sc, WME_AC_VI)) {

		ath_print(common, ATH_DBG_FATAL,

			  "Unable to setup xmit queue for VI traffic\n");

		goto err;

	}

	if (!ath_tx_setup(sc, ATH9K_WME_AC_VO)) {

	if (!ath_tx_setup(sc, WME_AC_VO)) {

		ath_print(common, ATH_DBG_FATAL,

			  "Unable to setup xmit queue for VO traffic\n");

		goto err;

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

+3 −8
Original line number Diff line number Diff line
@@ -577,13 +577,8 @@ enum ath9k_tx_queue { 


#define	ATH9K_NUM_TX_QUEUES 10



enum ath9k_tx_queue_subtype {

	ATH9K_WME_AC_BK = 0,

	ATH9K_WME_AC_BE,

	ATH9K_WME_AC_VI,

	ATH9K_WME_AC_VO,

	ATH9K_WME_UPSD

};

/* Used as a queue subtype instead of a WMM AC */

#define ATH9K_WME_UPSD	4



enum ath9k_tx_queue_flags {

	TXQ_FLAG_TXOKINT_ENABLE = 0x0001,
@@ -617,7 +612,7 @@ enum ath9k_pkt_type { 
struct ath9k_tx_queue_info {

	u32 tqi_ver;

	enum ath9k_tx_queue tqi_type;

	enum ath9k_tx_queue_subtype tqi_subtype;

	int tqi_subtype;

	enum ath9k_tx_queue_flags tqi_qflags;

	u32 tqi_priority;

	u32 tqi_aifs;