aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/ar9003_mac.h
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-01-21 01:35:23 +0100
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2019-07-24 12:28:05 +0200
commit2b51de0377ff9d7c2aec37e41f8a6baf912003d5 (patch)
treecc28e125e9c1ca27365c7d495cc4afd59ed4198d /drivers/net/wireless/ath/ath9k/ar9003_mac.h
parent934b9a3ebaca33355f1ecab121a7cbaf08e76c83 (diff)
downloadkernel_samsung_smdk4412-2b51de0377ff9d7c2aec37e41f8a6baf912003d5.tar.gz
kernel_samsung_smdk4412-2b51de0377ff9d7c2aec37e41f8a6baf912003d5.tar.bz2
kernel_samsung_smdk4412-2b51de0377ff9d7c2aec37e41f8a6baf912003d5.zip
Backport ath from 3.4 kernel
net/wireless and mac80211 are already backported from a 3.4 kernel, so it makes sense to also get ath from 3.4 (3.4.113). Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ar9003_mac.h')
-rw-r--r--drivers/net/wireless/ath/ath9k/ar9003_mac.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.h b/drivers/net/wireless/ath/ath9k/ar9003_mac.h
index c50449387bf..cbf60b090bd 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.h
@@ -92,7 +92,8 @@ struct ar9003_txc {
u32 ctl20; /* DMA control 20 */
u32 ctl21; /* DMA control 21 */
u32 ctl22; /* DMA control 22 */
- u32 pad[9]; /* pad to cache line (128 bytes/32 dwords) */
+ u32 ctl23; /* DMA control 23 */
+ u32 pad[8]; /* pad to cache line (128 bytes/32 dwords) */
} __packed __aligned(4);
struct ar9003_txs {
@@ -118,5 +119,5 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah,
void ath9k_hw_reset_txstatus_ring(struct ath_hw *ah);
void ath9k_hw_setup_statusring(struct ath_hw *ah, void *ts_start,
u32 ts_paddr_start,
- u8 size);
+ u16 size);
#endif