remove unused variable in ah_setupTxDesc

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>

diff --git a/target_firmware/wlan/ah.h b/target_firmware/wlan/ah.h
index 7b4037876a5bcc06d9e8845d0a165b602e71a933..73e43e70fbd868eb2728f25e5cbc258c4dce716f 100755 (executable)
--- a/target_firmware/wlan/ah.h
+++ b/target_firmware/wlan/ah.h
@@ -417,14 +417,12 @@ struct ath_hal
        void      __ahdecl(*ah_set11nVirtualMoreFrag)(struct ath_hal *ah,
                                                      struct ath_tx_desc *ds, a_uint32_t vmf);
            
-       HAL_BOOL  __ahdecl(*ah_setupTxDesc)(struct ath_hal *, struct ath_tx_desc *,
+       HAL_BOOL  __ahdecl(*ah_setupTxDesc)(struct ath_tx_desc *,
                                            a_uint32_t pktLen, a_uint32_t hdrLen,
                                            HAL_PKT_TYPE type, a_uint32_t txPower,
                                            a_uint32_t txRate0, a_uint32_t txTries0,
-                                           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);
+                                           a_uint32_t keyIx, a_uint32_t flags,
+                                           a_uint32_t rtsctsRate, a_uint32_t rtsctsDuration);
        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_tx_desc *);

diff --git a/target_firmware/wlan/ar5416_hw.c b/target_firmware/wlan/ar5416_hw.c
index 12addf95b8154a0377d5cc525556550feff772e4..ffd30daa5628dd24b5f018e6a58c366e25a2f2fb 100644 (file)
--- a/target_firmware/wlan/ar5416_hw.c
+++ b/target_firmware/wlan/ar5416_hw.c
@@ -599,20 +599,16 @@ HAL_BOOL ar5416StopTxDma(struct ath_hal*ah, a_uint32_t q)
         return (i != 0);
 }
 
-HAL_BOOL ar5416SetupTxDesc_20(struct ath_hal *ah, struct ath_tx_desc *ds,
+HAL_BOOL ar5416SetupTxDesc_20(struct ath_tx_desc *ds,
                              a_uint32_t pktLen,
                              a_uint32_t hdrLen,
                              HAL_PKT_TYPE type,
                              a_uint32_t txPower,
                              a_uint32_t txRate0, a_uint32_t txTries0,
                              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)
+                             a_uint32_t rtsctsDuration)
 {
 #define RTSCTS  (HAL_TXDESC_RTSENA|HAL_TXDESC_CTSENA)
 

diff --git a/target_firmware/wlan/ar5416desc.h b/target_firmware/wlan/ar5416desc.h
index 9406b64a363b28cc11b500f6d6b98a5ccd2fa0c3..42c6ab7c6756f0a2508dfe45db057b0bec2320a8 100755 (executable)
--- a/target_firmware/wlan/ar5416desc.h
+++ b/target_firmware/wlan/ar5416desc.h
@@ -458,12 +458,11 @@ extern  void ar5416SetRxFilter(struct ath_hal *ah, a_uint32_t bits);
 extern  HAL_BOOL ar5416UpdateCTSForBursting_20(struct ath_hal *, struct ath_desc *,
          struct ath_desc *,struct ath_desc *, struct ath_desc *,
          a_uint32_t, a_uint32_t);
-extern  HAL_BOOL ar5416SetupTxDesc_20(struct ath_hal *ah, struct ath_tx_desc *ds,
+extern  HAL_BOOL ar5416SetupTxDesc_20(struct ath_tx_desc *ds,
         a_uint32_t pktLen, a_uint32_t hdrLen, HAL_PKT_TYPE type, a_uint32_t txPower,
         a_uint32_t txRate0, a_uint32_t txTries0,
-        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);
+        a_uint32_t keyIx, a_uint32_t flags,
+        a_uint32_t rtsctsRate, a_uint32_t rtsctsDuration);
 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_tx_desc *ds0);

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index 8cbda3b2674891446718a842ede4c8016b7aff54..89c42d4f45b8f2e7c1884fa56d6096b727bbe604 100755 (executable)
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -542,20 +542,16 @@ static void ath_beacon_setup(struct ath_softc_tgt *sc,
        rt  = sc->sc_currates;
        rate = rt->info[rix].rateCode;
 
-       ah->ah_setupTxDesc(ah, ds
+       ah->ah_setupTxDesc(ds
                            , adf_nbuf_len(skb) + IEEE80211_CRC_LEN
                            , sizeof(struct ieee80211_frame)
                            , HAL_PKT_TYPE_BEACON
                            , MAX_RATE_POWER
                            , rate, 1
                            , HAL_TXKEYIX_INVALID
-                           , 0
                            , flags
                            , 0
-                           , 0
-                           , 0
-                           , 0
-                           , ATH_COMP_PROC_NO_COMP_NO_CCS);
+                           , 0);
 
        ah->ah_fillTxDesc(ah, ds
                           , asf_roundup(adf_nbuf_len(skb), 4)

diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c
index b7df875d57f321fc439db48956b8b0415ccce591..cececaf59cf1d40862a8bd887c00286fe108f877 100755 (executable)
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -1052,7 +1052,7 @@ ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t hdr_buf, adf_nbuf_t skb,
        struct ath_vap_target *avp;
        struct ath_hal *ah = sc->sc_ah;
        a_uint8_t rix, txrate, ctsrate, cix = 0xff, *data;
-       a_uint32_t ivlen = 0, icvlen = 0, subtype, flags, ctsduration;
+       a_uint32_t subtype, flags, ctsduration;
        a_int32_t i, iswep, ismcast, hdrlen, pktlen, try0, len;
        struct ath_tx_desc *ds=NULL;
        struct ath_txq *txq=NULL;
@@ -1201,20 +1201,16 @@ ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t hdr_buf, adf_nbuf_t skb,
 
        flags |= HAL_TXDESC_INTREQ;
 
-       ah->ah_setupTxDesc(ah, ds
+       ah->ah_setupTxDesc(ds
                            , pktlen
                            , hdrlen
                            , atype
                            , 60
                            , txrate, try0
                            , keyix
-                           , 0
                            , flags
                            , ctsrate
-                           , ctsduration
-                           , icvlen
-                           , ivlen
-                           , ATH_COMP_PROC_NO_COMP_NO_CCS);
+                           , ctsduration);
 
        bf->bf_flags = flags;
 
@@ -2129,7 +2125,7 @@ static void ath_bar_tx(struct ath_softc_tgt *sc,
        adf_nbuf_dmamap_info(bf->bf_dmamap, &bf->bf_dmamap_info);
 
        ds = bf->bf_desc;
-       ah->ah_setupTxDesc(ah, ds
+       ah->ah_setupTxDesc(ds
                            , adf_nbuf_len(skb) + IEEE80211_CRC_LEN
                            , 0
                            , HAL_PKT_TYPE_NORMAL
@@ -2137,11 +2133,9 @@ static void ath_bar_tx(struct ath_softc_tgt *sc,
                            , min_rate
                            , ATH_TXMAXTRY
                            , bf->bf_keyix
-                           , 0
                            , HAL_TXDESC_INTREQ
                            | HAL_TXDESC_CLRDMASK
-                           , 0, 0, 0, 0
-                           , ATH_COMP_PROC_NO_COMP_NO_CCS);
+                           , 0, 0);
 
        skbhead = bf->bf_skbhead;
        bf->bf_isaggr = 0;