remove unused variables in ah_set11nRateScenario

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

diff --git a/target_firmware/wlan/ah.h b/target_firmware/wlan/ah.h
index 6e97dfa2a05618f4a3f79a057ec74076fae2a86d..985fc7e5dcc8f87794814c290109d6056673495b 100755 (executable)
--- a/target_firmware/wlan/ah.h
+++ b/target_firmware/wlan/ah.h
@@ -394,8 +394,7 @@ struct ath_hal
                                             a_uint32_t txPower, a_uint32_t keyIx,
                                             HAL_KEY_TYPE keyType,
                                             a_uint32_t flags);
-       void      __ahdecl(*ah_set11nRateScenario)(struct ath_hal *ah,
-                                                  struct ath_tx_desc *ds,
+       void      __ahdecl(*ah_set11nRateScenario)(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 089f4f62a63f3661c994f069e5873d0329edaaff..68933c5d8266996fdb717d995b8baf7c858c268b 100644 (file)
--- a/target_firmware/wlan/ar5416_hw.c
+++ b/target_firmware/wlan/ar5416_hw.c
@@ -811,7 +811,7 @@ void ar5416Set11nTxDesc_20(struct ath_tx_desc *ds,
 
 #ifdef MAGPIE_MERLIN
 
-void ar5416Set11nRateScenario_20(struct ath_hal *ah, struct ath_tx_desc *ds,
+void ar5416Set11nRateScenario_20(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,
@@ -868,7 +868,7 @@ void ar5416Set11nRateScenario_20(struct ath_hal *ah, struct ath_tx_desc *ds,
 
 #else
 
-void ar5416Set11nRateScenario_20(struct ath_hal *ah, struct ath_tx_desc *ds,
+void ar5416Set11nRateScenario_20(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 30a7be2dfc6792d9848f1394525a32f3db7157e5..6b5fb1633f0f10fe77a5bd622be87b38b4884956 100755 (executable)
--- a/target_firmware/wlan/ar5416desc.h
+++ b/target_firmware/wlan/ar5416desc.h
@@ -472,7 +472,7 @@ extern  HAL_STATUS ar5416ProcTxDesc_20(struct ath_hal *ah, struct ath_tx_desc *)
 extern void ar5416Set11nTxDesc_20(struct ath_tx_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_tx_desc *ds,
+extern void ar5416Set11nRateScenario_20(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_tx_desc *ds,

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index 72cbda8cb335cce2d0a275bdbf0ca5e3f4a7ce4d..0cf6b753535c48e10bfd5b6cefa46def409ac9b1 100755 (executable)
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -563,7 +563,7 @@ static void ath_beacon_setup(struct ath_softc_tgt *sc,
        series[0].Rate = rate;
        series[0].ChSel = sc->sc_ic.ic_tx_chainmask;
        series[0].RateFlags = 0;
-       ah->ah_set11nRateScenario(ah, ds, 0, 0, 0, series, 4, 0);
+       ah->ah_set11nRateScenario(ds, 0, 0, 0, series, 4, 0);
 }
 
 static void ath_tgt_send_beacon(struct ath_softc_tgt *sc, adf_nbuf_t bc_hdr,

diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c
index 1806447895a3190432020e86c88052d0241f028d..5d9f540d7af54314c8415fb98428ce53e7e5f16a 100755 (executable)
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -444,7 +444,7 @@ static void ath_buf_set_rate(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
     rtsctsrate = rt->info[cix].rateCode |
            (bf->bf_shpream ? rt->info[cix].shortPreamble : 0);
 
-    ah->ah_set11nRateScenario(ah, ds, 1,
+    ah->ah_set11nRateScenario(ds, 1,
                                rtsctsrate, ctsduration,
                                series, 4,
                                flags);
@@ -1230,7 +1230,7 @@ ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t hdr_buf, adf_nbuf_t skb,
                series[i].ChSel = sc->sc_ic.ic_tx_chainmask;
                series[i].RateFlags = 0;
        }
-       ah->ah_set11nRateScenario(ah, ds, 0, ctsrate, ctsduration, series, 4, 0);
+       ah->ah_set11nRateScenario(ds, 0, ctsrate, ctsduration, series, 4, 0);
        ath_tgt_txqaddbuf(sc, txq, bf, bf->bf_lastds);
 
        return;
@@ -2153,6 +2153,6 @@ static void ath_bar_tx(struct ath_softc_tgt *sc,
                series[i].ChSel = sc->sc_ic.ic_tx_chainmask;
        }
 
-       ah->ah_set11nRateScenario(ah, bf->bf_desc, 0, 0, 0, series, 4, 4);
+       ah->ah_set11nRateScenario(bf->bf_desc, 0, 0, 0, series, 4, 4);
        ath_tgt_txq_add_ucast(sc, bf);
 }