[PATCH 15/42] build fix: use ath_tx_desc in ar5416Set11nRateScenario_20

Oleksij Rempel linux at rempel-privat.de
Mon Apr 1 02:51:07 EDT 2013


Signed-off-by: Oleksij Rempel <linux at rempel-privat.de>
---
 target_firmware/wlan/ah.h         | 2 +-
 target_firmware/wlan/ar5416_hw.c  | 4 ++--
 target_firmware/wlan/ar5416desc.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/target_firmware/wlan/ah.h b/target_firmware/wlan/ah.h
index 90acbbf..fdc2043 100755
--- a/target_firmware/wlan/ah.h
+++ b/target_firmware/wlan/ah.h
@@ -408,7 +408,7 @@ struct ath_hal
 					     HAL_KEY_TYPE keyType,
 					     a_uint32_t flags);
 	void      __ahdecl(*ah_set11nRateScenario)(struct ath_hal *ah,
-						   struct ath_desc *ds,
+						   struct ath_tx_desc *ds,
 						   a_uint32_t durUpdateEn,
 						   a_uint32_t rtsctsRate,
 						   a_uint32_t rtsctsDuration,
diff --git a/target_firmware/wlan/ar5416_hw.c b/target_firmware/wlan/ar5416_hw.c
index 6784e3b..d6aefcf 100644
--- a/target_firmware/wlan/ar5416_hw.c
+++ b/target_firmware/wlan/ar5416_hw.c
@@ -963,7 +963,7 @@ void ar5416Set11nTxDesc_20(struct ath_hal *ah, struct ath_desc *ds,
 
 #ifdef MAGPIE_MERLIN
 
-void ar5416Set11nRateScenario_20(struct ath_hal *ah, struct ath_desc *ds, 
+void ar5416Set11nRateScenario_20(struct ath_hal *ah, struct ath_tx_desc *ds,
 				 a_uint32_t durUpdateEn, a_uint32_t rtsctsRate,
 				 a_uint32_t rtsctsDuration,
 				 HAL_11N_RATE_SERIES series[], a_uint32_t nseries,
@@ -1020,7 +1020,7 @@ void ar5416Set11nRateScenario_20(struct ath_hal *ah, struct ath_desc *ds,
 
 #else
 
-void ar5416Set11nRateScenario_20(struct ath_hal *ah, struct ath_desc *ds, 
+void ar5416Set11nRateScenario_20(struct ath_hal *ah, struct ath_tx_desc *ds,
 				 a_uint32_t durUpdateEn, a_uint32_t rtsctsRate,
 				 a_uint32_t rtsctsDuration,
 				 HAL_11N_RATE_SERIES series[], a_uint32_t nseries,
diff --git a/target_firmware/wlan/ar5416desc.h b/target_firmware/wlan/ar5416desc.h
index 6655843..83f42b2 100755
--- a/target_firmware/wlan/ar5416desc.h
+++ b/target_firmware/wlan/ar5416desc.h
@@ -478,7 +478,7 @@ extern void ar5416IntrReqTxDesc_20(struct ath_hal *ah, struct ath_desc *ds);
 extern void ar5416Set11nTxDesc_20(struct ath_hal *ah, struct ath_desc *ds,
        a_uint32_t pktLen, HAL_PKT_TYPE type, a_uint32_t txPower,
        a_uint32_t keyIx, HAL_KEY_TYPE keyType, a_uint32_t flags);
-extern void ar5416Set11nRateScenario_20(struct ath_hal *ah, struct ath_desc *ds,
+extern void ar5416Set11nRateScenario_20(struct ath_hal *ah, struct ath_tx_desc *ds,
        a_uint32_t durUpdateEn, a_uint32_t rtsctsRate, a_uint32_t rtsctsDuration, HAL_11N_RATE_SERIES series[], 
        a_uint32_t nseries, a_uint32_t flags);
 extern void ar5416Set11nAggrFirst_20(struct ath_hal *ah, struct ath_desc *ds,
-- 
1.8.1.2




More information about the Ath9k_htc_fw mailing list