diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-04-15 16:21:34 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-15 16:21:34 -0400 |
| commit | 5c01d5669356e13f0fb468944c1dd4c6a7e978ad (patch) | |
| tree | fa43345288d7b25fac92b3b35360a177c4947313 /drivers/net/wireless/ath/ath9k/ath9k.h | |
| parent | fea069152614cdeefba4b2bf80afcddb9c217fc8 (diff) | |
| parent | a5e944f1d955f3819503348426763e21e0413ba6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/wl12xx/wl1271_main.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ath9k.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index 83c7ea4c007f..bdcd257ca7a4 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
| @@ -178,9 +178,6 @@ void ath_descdma_cleanup(struct ath_softc *sc, struct ath_descdma *dd, | |||
| 178 | #define BAW_WITHIN(_start, _bawsz, _seqno) \ | 178 | #define BAW_WITHIN(_start, _bawsz, _seqno) \ |
| 179 | ((((_seqno) - (_start)) & 4095) < (_bawsz)) | 179 | ((((_seqno) - (_start)) & 4095) < (_bawsz)) |
| 180 | 180 | ||
| 181 | #define ATH_DS_BA_SEQ(_ds) ((_ds)->ds_us.tx.ts_seqnum) | ||
| 182 | #define ATH_DS_BA_BITMAP(_ds) (&(_ds)->ds_us.tx.ba_low) | ||
| 183 | #define ATH_DS_TX_BA(_ds) ((_ds)->ds_us.tx.ts_flags & ATH9K_TX_BA) | ||
| 184 | #define ATH_AN_2_TID(_an, _tidno) (&(_an)->tid[(_tidno)]) | 181 | #define ATH_AN_2_TID(_an, _tidno) (&(_an)->tid[(_tidno)]) |
| 185 | 182 | ||
| 186 | #define ATH_TX_COMPLETE_POLL_INT 1000 | 183 | #define ATH_TX_COMPLETE_POLL_INT 1000 |
| @@ -483,7 +480,6 @@ struct ath_softc { | |||
| 483 | bool ps_enabled; | 480 | bool ps_enabled; |
| 484 | bool ps_idle; | 481 | bool ps_idle; |
| 485 | unsigned long ps_usecount; | 482 | unsigned long ps_usecount; |
| 486 | enum ath9k_int imask; | ||
| 487 | 483 | ||
| 488 | struct ath_config config; | 484 | struct ath_config config; |
| 489 | struct ath_rx rx; | 485 | struct ath_rx rx; |