diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-12 22:35:23 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-12 22:35:23 +0400 |
| commit | 861bca265e7808e2493590843b8585f6943af16f (patch) | |
| tree | f9c6d3beee927191856479888bc845859cd135cf /drivers/net/wireless/ath/ath9k/ath9k.h | |
| parent | 8b3e7be437a6b62118d0485ad971e724afe23fdf (diff) | |
| parent | e0e29b683d6784ef59bbc914eac85a04b650e63c (diff) | |
| download | linux-861bca265e7808e2493590843b8585f6943af16f.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/ath/ath9k/Kconfig
net/mac80211/iface.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ath9k.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index 579ed9c40b3f..18fcee4e9d68 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h @@ -251,9 +251,9 @@ struct ath_atx_tid { int tidno; int baw_head; /* first un-acked tx buffer */ int baw_tail; /* next unused tx buffer slot */ - int sched; - int paused; - u8 state; + bool sched; + bool paused; + bool active; }; struct ath_node { @@ -274,10 +274,6 @@ struct ath_node { #endif }; -#define AGGR_CLEANUP BIT(1) -#define AGGR_ADDBA_COMPLETE BIT(2) -#define AGGR_ADDBA_PROGRESS BIT(3) - struct ath_tx_control { struct ath_txq *txq; struct ath_node *an; |