diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-28 10:56:03 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-28 10:56:03 -0500 |
| commit | 79d38f7d6cf545ff838dd5227869f3916d1d100d (patch) | |
| tree | 859c8071aab68fd32f36ffb9ebc04cf12db6e5e0 /drivers/net/wireless/ath/ath9k/common.h | |
| parent | 03f52a0a554210d5049eeed9f1bb29047dc807cb (diff) | |
| parent | 0751f8654602e4255f0b9c17784d8100d5896010 (diff) | |
| download | op-kernel-dev-79d38f7d6cf545ff838dd5227869f3916d1d100d.zip op-kernel-dev-79d38f7d6cf545ff838dd5227869f3916d1d100d.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/pcie/tx.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/common.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/common.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath9k/common.h b/drivers/net/wireless/ath/ath9k/common.h index ad14fec..76b5439 100644 --- a/drivers/net/wireless/ath/ath9k/common.h +++ b/drivers/net/wireless/ath/ath9k/common.h @@ -28,13 +28,6 @@ #define WME_MAX_BA WME_BA_BMP_SIZE #define ATH_TID_MAX_BUFS (2 * WME_MAX_BA) -/* These must match mac80211 skb queue mapping numbers */ -#define WME_AC_VO 0 -#define WME_AC_VI 1 -#define WME_AC_BE 2 -#define WME_AC_BK 3 -#define WME_NUM_AC 4 - #define ATH_RSSI_DUMMY_MARKER 0x127 #define ATH_RSSI_LPF_LEN 10 #define RSSI_LPF_THRESHOLD -20 |
