aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@web.de>2009-06-01 15:41:36 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-06-03 14:05:12 -0400
commitb9ad462e34b6eb8380c8534684326bb395b29c9f (patch)
treebcc6e016f0e12edbc64b73bcfe656aa89d850bbf /drivers/net/wireless
parentf46f0dc3f1e7bda2621617d5a379f8983ad1d5f8 (diff)
ar9170: update hardware definitions
This patch only contains a few uncritical updates for the hardware definition header. Signed-off-by: Christian Lamparter <chunkeey@web.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath/ar9170/hw.h5
-rw-r--r--drivers/net/wireless/ath/ar9170/mac.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ar9170/hw.h b/drivers/net/wireless/ath/ar9170/hw.h
index 3293e0fb24fb..3c8004fb7307 100644
--- a/drivers/net/wireless/ath/ar9170/hw.h
+++ b/drivers/net/wireless/ath/ar9170/hw.h
@@ -207,7 +207,8 @@ enum ar9170_cmd {
207#define AR9170_MAC_REG_AC1_AC0_TXOP (AR9170_MAC_REG_BASE + 0xB44) 207#define AR9170_MAC_REG_AC1_AC0_TXOP (AR9170_MAC_REG_BASE + 0xB44)
208#define AR9170_MAC_REG_AC3_AC2_TXOP (AR9170_MAC_REG_BASE + 0xB48) 208#define AR9170_MAC_REG_AC3_AC2_TXOP (AR9170_MAC_REG_BASE + 0xB48)
209 209
210#define AR9170_MAC_REG_AMPDU_SET (AR9170_MAC_REG_BASE + 0xba0) 210#define AR9170_MAC_REG_AMPDU_FACTOR (AR9170_MAC_REG_BASE + 0xB9C)
211#define AR9170_MAC_REG_AMPDU_DENSITY (AR9170_MAC_REG_BASE + 0xBA0)
211 212
212#define AR9170_MAC_REG_ACK_TABLE (AR9170_MAC_REG_BASE + 0xC00) 213#define AR9170_MAC_REG_ACK_TABLE (AR9170_MAC_REG_BASE + 0xC00)
213#define AR9170_MAC_REG_AMPDU_RX_THRESH (AR9170_MAC_REG_BASE + 0xC50) 214#define AR9170_MAC_REG_AMPDU_RX_THRESH (AR9170_MAC_REG_BASE + 0xC50)
@@ -376,7 +377,6 @@ static inline u8 ar9170_get_decrypt_type(struct ar9170_rx_macstatus *t)
376#define AR9170_RX_ERROR_FATAL 0x80 377#define AR9170_RX_ERROR_FATAL 0x80
377 378
378struct ar9170_cmd_tx_status { 379struct ar9170_cmd_tx_status {
379 __le16 unkn;
380 u8 dst[ETH_ALEN]; 380 u8 dst[ETH_ALEN];
381 __le32 rate; 381 __le32 rate;
382 __le16 status; 382 __le16 status;
@@ -394,6 +394,7 @@ struct ar9170_cmd_ba_failed_count {
394struct ar9170_cmd_response { 394struct ar9170_cmd_response {
395 u8 flag; 395 u8 flag;
396 u8 type; 396 u8 type;
397 __le16 padding;
397 398
398 union { 399 union {
399 struct ar9170_cmd_tx_status tx_status; 400 struct ar9170_cmd_tx_status tx_status;
diff --git a/drivers/net/wireless/ath/ar9170/mac.c b/drivers/net/wireless/ath/ar9170/mac.c
index 72c7b5d8957c..706262fb0924 100644
--- a/drivers/net/wireless/ath/ar9170/mac.c
+++ b/drivers/net/wireless/ath/ar9170/mac.c
@@ -84,7 +84,7 @@ static int ar9170_set_ampdu_density(struct ar9170 *ar, u8 mpdudensity)
84 val = 0x140a00 | (mpdudensity ? (mpdudensity + 1) : 0); 84 val = 0x140a00 | (mpdudensity ? (mpdudensity + 1) : 0);
85 85
86 ar9170_regwrite_begin(ar); 86 ar9170_regwrite_begin(ar);
87 ar9170_regwrite(AR9170_MAC_REG_AMPDU_SET, val); 87 ar9170_regwrite(AR9170_MAC_REG_AMPDU_DENSITY, val);
88 ar9170_regwrite_finish(); 88 ar9170_regwrite_finish();
89 89
90 return ar9170_regwrite_result(); 90 return ar9170_regwrite_result();