ar9170: update hardware definitions
PATCH 2/6 ar9170: update hardware definitions
This patch only contains a few uncritical updates for the hardware definition header.
Signed-off-by Christian Lamparter <[email protected]>
---
drivers/net/wireless/ath/ar9170/hw.h +3 -2
@@ -207,7 +207,8 @@ enum ar9170_cmd {#define AR9170_MAC_REG_AC1_AC0_TXOP (AR9170_MAC_REG_BASE + 0xB44)#define AR9170_MAC_REG_AC3_AC2_TXOP (AR9170_MAC_REG_BASE + 0xB48) -#define AR9170_MAC_REG_AMPDU_SET (AR9170_MAC_REG_BASE + 0xba0) +#define AR9170_MAC_REG_AMPDU_FACTOR (AR9170_MAC_REG_BASE + 0xB9C) +#define AR9170_MAC_REG_AMPDU_DENSITY (AR9170_MAC_REG_BASE + 0xBA0)#define AR9170_MAC_REG_ACK_TABLE (AR9170_MAC_REG_BASE + 0xC00)#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)#define AR9170_RX_ERROR_FATAL 0x80struct ar9170_cmd_tx_status { -__le16 unkn;u8 dst[ETH_ALEN ];__le32 rate;__le16 status;
@@ -394,6 +394,7 @@ struct ar9170_cmd_ba_failed_count {struct ar9170_cmd_response {u8 flag;u8 type; +__le16 padding;union {struct ar9170_cmd_tx_status tx_status;
drivers/net/wireless/ath/ar9170/mac.c +1 -1
@@ -84,7 +84,7 @@ static int ar9170_set_ampdu_density(struct ar9170 *ar, u8 mpdudensity) val =0x140a00 | (mpdudensity ? (mpdudensity +1 ) :0 );ar9170_regwrite_begin (ar); -ar9170_regwrite (AR9170_MAC_REG_AMPDU_SET , val); +ar9170_regwrite (AR9170_MAC_REG_AMPDU_DENSITY , val);ar9170_regwrite_finish ();return ar9170_regwrite_result ();
PATCH RESEND 2/4 ar9170: update hardware definitions
This patch only contains a few uncritical updates for the hardware definition header.
Signed-off-by Christian Lamparter <[email protected]>
---
drivers/net/wireless/ath/ar9170/hw.h +3 -2
@@ -207,7 +207,8 @@ enum ar9170_cmd {#define AR9170_MAC_REG_AC1_AC0_TXOP (AR9170_MAC_REG_BASE + 0xB44)#define AR9170_MAC_REG_AC3_AC2_TXOP (AR9170_MAC_REG_BASE + 0xB48) -#define AR9170_MAC_REG_AMPDU_SET (AR9170_MAC_REG_BASE + 0xba0) +#define AR9170_MAC_REG_AMPDU_FACTOR (AR9170_MAC_REG_BASE + 0xB9C) +#define AR9170_MAC_REG_AMPDU_DENSITY (AR9170_MAC_REG_BASE + 0xBA0)#define AR9170_MAC_REG_ACK_TABLE (AR9170_MAC_REG_BASE + 0xC00)#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)#define AR9170_RX_ERROR_FATAL 0x80struct ar9170_cmd_tx_status { -__le16 unkn;u8 dst[ETH_ALEN ];__le32 rate;__le16 status;
@@ -394,6 +394,7 @@ struct ar9170_cmd_ba_failed_count {struct ar9170_cmd_response {u8 flag;u8 type; +__le16 padding;union {struct ar9170_cmd_tx_status tx_status;
drivers/net/wireless/ath/ar9170/mac.c +1 -1
@@ -84,7 +84,7 @@ static int ar9170_set_ampdu_density(struct ar9170 *ar, u8 mpdudensity) val =0x140a00 | (mpdudensity ? (mpdudensity +1 ) :0 );ar9170_regwrite_begin (ar); -ar9170_regwrite (AR9170_MAC_REG_AMPDU_SET , val); +ar9170_regwrite (AR9170_MAC_REG_AMPDU_DENSITY , val);ar9170_regwrite_finish ();return ar9170_regwrite_result ();