X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fratectrl_11n_ln.c;h=277b1843c1f669770bc1c68f96edbf7071f36620;hb=c0a01322c392cf9ed6a81a20752ecbdad0e93144;hp=57ac34a240bd710cf7b52a64bfbe7ab261b5631f;hpb=a8a319cd891d6579316755c2b65728735d0f8a97;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/ratectrl_11n_ln.c b/target_firmware/wlan/ratectrl_11n_ln.c
index 57ac34a..277b184 100755
--- a/target_firmware/wlan/ratectrl_11n_ln.c
+++ b/target_firmware/wlan/ratectrl_11n_ln.c
@@ -47,7 +47,6 @@
 #include <adf_os_atomic.h>
 #include <adf_nbuf.h>
 #include <adf_net.h>
-#include <adf_net_types.h>
 
 #include <ieee80211_var.h>
 
@@ -57,8 +56,6 @@
 #include "ratectrl.h"
 #include "ratectrl11n.h"
 
-INLINE A_RSSI median(A_RSSI a, A_RSSI b, A_RSSI c);
-
 static void ath_rate_newassoc_11n(struct ath_softc_tgt *sc, struct ath_node_target *an, int isnew, 
 				  unsigned int capflag, struct ieee80211_rate *rs);
 
@@ -123,13 +120,6 @@ rcSetValidTxMask(TX_RATE_CTRL *pRc, A_UINT8 index, A_BOOL validTxRate)
 
 }
 
-static INLINE A_BOOL
-rcIsValidTxMask(TX_RATE_CTRL *pRc, A_UINT8 index)
-{
-	ASSERT(index < pRc->rateTableSize);
-	return (pRc->validRateIndex[index]);
-}
-
 /* Iterators for validTxRateMask */
 static INLINE A_BOOL
 rcGetNextValidTxRate(const RATE_TABLE_11N *pRateTable, TX_RATE_CTRL *pRc, 
@@ -429,32 +419,6 @@ rcSibUpdate_ht(struct ath_softc_tgt *sc, struct ath_node_target *an,
 	rcSortValidRates(pRateTable, pRc);
 }
 
-
-
-/*
- * Return the median of three numbers
- */
-INLINE A_RSSI median(A_RSSI a, A_RSSI b, A_RSSI c)
-{
-	if (a >= b) {
-		if (b >= c) {
-			return b;
-		} else if (a > c) {
-			return c;
-		} else {
-			return a;
-		}
-	} else {
-		if (a >= c) {
-			return a;
-		} else if (b >= c) {
-			return c;
-		} else {
-			return b;
-		}
-	}
-}
-
 static A_UINT8
 rcRateFind_ht(struct ath_softc_tgt *sc, struct atheros_node *pSib,
 	      const RATE_TABLE_11N *pRateTable, A_BOOL probeAllowed, A_BOOL *isProbing)
@@ -1076,12 +1040,6 @@ ath_rate_attach(struct ath_softc_tgt *sc)
 	return &asc->arc;
 }
 
-void
-ath_rate_detach(struct ath_ratectrl *rc)
-{
-	adf_os_mem_free(rc);
-}
-
 void
 ath_rate_findrate(struct ath_softc_tgt *sc,
                   struct ath_node_target *an,
@@ -1206,33 +1164,3 @@ ath_rate_newassoc_11n(struct ath_softc_tgt *sc, struct ath_node_target *an, int
 		rcSibUpdate_ht(sc, an, capflag, 0, rs);
 	}
 }
-
-void ath_rate_mcs2rate(struct ath_softc_tgt *sc,a_uint8_t sgi, a_uint8_t ht40, 
-		       a_uint8_t rateCode, a_uint32_t *txrate, a_uint32_t *rxrate)
-{
-	int idx;
-	struct atheros_softc *asc = (struct atheros_softc*)sc->sc_rc;
-	RATE_TABLE_11N *pRateTable = (RATE_TABLE_11N *)asc->hwRateTable[sc->sc_curmode];
-	a_uint32_t rateKbps = 0;
-   
-	*txrate = asc->currentTxRateKbps;
-
-	/* look  11NA table for rateKbps*/
-	for (idx = 0; idx < pRateTable->rateCount && !rateKbps; ++idx) {   
-		if (pRateTable->info[idx].rateCode == rateCode) {
-			if(ht40 && sgi) {
-				if(pRateTable->info[idx].valid == TRUE_40 &&
-				   pRateTable->info[idx].phy == WLAN_RC_PHY_HT_40_DS_HGI)
-					rateKbps = pRateTable->info[idx].rateKbps;
-			} else if (ht40) {
-				if (pRateTable->info[idx].valid == TRUE_40)/* HT40 only*/
-					rateKbps = pRateTable->info[idx].rateKbps;
-			} else { 
-				if (pRateTable->info[idx].valid != FALSE)
-					rateKbps = pRateTable->info[idx].rateKbps;
-			}
-		}
-	}
-    
-	*rxrate = rateKbps;
-}