From: Oleksij Rempel Date: Sun, 31 Mar 2013 14:24:57 +0000 (+0200) Subject: build fix: ath_hal_filltxdesc should use ath_tx_desc X-Git-Tag: 1.3.2~10^2~31 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=3d424dda33fba1bb9fd7e0ec2e00ea62da992e86;p=open-ath9k-htc-firmware.git build fix: ath_hal_filltxdesc should use ath_tx_desc Signed-off-by: Oleksij Rempel --- diff --git a/target_firmware/wlan/ah.h b/target_firmware/wlan/ah.h index 714df75..2a2efc6 100755 --- a/target_firmware/wlan/ah.h +++ b/target_firmware/wlan/ah.h @@ -437,9 +437,9 @@ struct ath_hal a_uint32_t rtsctsRate, a_uint32_t rtsctsDuration, a_uint32_t compicvLen, a_uint32_t compivLen, a_uint32_t comp); - HAL_BOOL __ahdecl(*ah_fillTxDesc)(struct ath_hal *, struct ath_desc *, + HAL_BOOL __ahdecl(*ah_fillTxDesc)(struct ath_hal *, struct ath_tx_desc *, a_uint32_t segLen, HAL_BOOL firstSeg, - HAL_BOOL lastSeg, const struct ath_desc *); + HAL_BOOL lastSeg, const struct ath_tx_desc *); HAL_BOOL __ahdecl (*ah_fillKeyTxDesc) (struct ath_hal *, struct ath_desc *, HAL_KEY_TYPE); HAL_STATUS __ahdecl(*ah_procTxDesc)(struct ath_hal *, struct ath_desc*); void __ahdecl(*ah_getTxIntrQueue)(struct ath_hal *, a_uint32_t *); diff --git a/target_firmware/wlan/ar5416_hw.c b/target_firmware/wlan/ar5416_hw.c index c0ae418..20ecbce 100644 --- a/target_firmware/wlan/ar5416_hw.c +++ b/target_firmware/wlan/ar5416_hw.c @@ -815,9 +815,9 @@ HAL_BOOL ar5416SetupTxDesc_20(struct ath_hal *ah, struct ath_desc *ds, #undef RTSCTS } -HAL_BOOL ar5416FillTxDesc_20(struct ath_hal *ah, struct ath_desc *ds, +HAL_BOOL ar5416FillTxDesc_20(struct ath_hal *ah, struct ath_tx_desc *ds, a_uint32_t segLen, HAL_BOOL firstSeg, HAL_BOOL lastSeg, - const struct ath_desc *ds0) + const struct ath_tx_desc *ds0) { struct ar5416_desc *ads = AR5416DESC(ds); diff --git a/target_firmware/wlan/ar5416desc.h b/target_firmware/wlan/ar5416desc.h index ce279cf..5d8a81a 100755 --- a/target_firmware/wlan/ar5416desc.h +++ b/target_firmware/wlan/ar5416desc.h @@ -468,9 +468,9 @@ extern HAL_BOOL ar5416SetupTxDesc_20(struct ath_hal *ah, struct ath_desc *ds, a_uint32_t keyIx, a_uint32_t antMode, a_uint32_t flags, a_uint32_t rtsctsRate, a_uint32_t rtsctsDuration, a_uint32_t compicvLen, a_uint32_t compivLen, a_uint32_t comp); -extern HAL_BOOL ar5416FillTxDesc_20(struct ath_hal *ah, struct ath_desc *ds, +extern HAL_BOOL ar5416FillTxDesc_20(struct ath_hal *ah, struct ath_tx_desc *ds, a_uint32_t segLen, HAL_BOOL firstSeg, HAL_BOOL lastSeg, - const struct ath_desc *ds0); + const struct ath_tx_desc *ds0); extern HAL_BOOL ar5416FillKeyTxDesc_20(struct ath_hal *ah, struct ath_desc *,HAL_KEY_TYPE); extern HAL_STATUS ar5416ProcTxDesc_20(struct ath_hal *ah, struct ath_desc *);