X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fratectrl_11n_ln.c;h=5e3e84182a0eb51aca6ccbd3756393dae6142946;hb=02b599d9b50943d471401f11b0d3d4afc6c8409a;hp=5e123764c4f3f8194b8df1a768c78d7236b477dc;hpb=b3ff42d8f3256da2bb5d51495f586cda0117e660;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 5e12376..5e3e841 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>
 
@@ -246,14 +245,14 @@ rcSibSetValidRates(const RATE_TABLE_11N *pRateTable,
 	A_UINT8 i, j, hi = 0;
 	A_UINT8 singleStream = (capflag & WLAN_RC_DS_FLAG) ? 0 : 1;
 	A_UINT32 valid;
-	struct atheros_node *pSib = ATH_NODE_ATHEROS(an);
        
 	/* Use intersection of working rates and valid rates */
 	for (i = 0; i < pRateSet->rs_nrates; i++) {
 		for (j = 0; j < pRateTable->rateCount; j++) {
 			A_UINT32 phy = pRateTable->info[j].phy;
-
 #ifdef MAGPIE_MERLIN
+			struct atheros_node *pSib = ATH_NODE_ATHEROS(an);
+
 			if (pSib->stbc) {
 				valid = pRateTable->info[j].validSTBC;
 			} else if (singleStream) {
@@ -300,14 +299,14 @@ rcSibSetValidHtRates(const RATE_TABLE_11N *pRateTable,
 	A_UINT8 i, j, hi = 0;
 	A_UINT8 singleStream = (capflag & WLAN_RC_DS_FLAG) ? 0 : 1;
 	A_UINT8 valid;
-	struct atheros_node *pSib = ATH_NODE_ATHEROS(an);
     
 	/* Use intersection of working rates and valid rates */
 	for (i = 0; i <  ((struct ieee80211_rateset *)pMcsSet)->rs_nrates; i++) {
 		for (j = 0; j < pRateTable->rateCount; j++) {
 			A_UINT32 phy = pRateTable->info[j].phy;
-
 #ifdef MAGPIE_MERLIN
+			struct atheros_node *pSib = ATH_NODE_ATHEROS(an);
+
 			if (pSib->stbc) {
 				valid = pRateTable->info[j].validSTBC;
 			} else if (singleStream) {
@@ -429,20 +428,7 @@ rcSibUpdate_ht(struct ath_softc_tgt *sc, struct ath_node_target *an,
 	rcSortValidRates(pRateTable, pRc);
 }
 
-void 
-rcSibUpdate_11n(struct ath_softc_tgt *sc, struct ath_node_target *pSib, 
-		A_UINT32 capflag, A_BOOL keepState, struct ieee80211_rate  *pRateSet)
-{
-	rcSibUpdate_ht(sc, 
-		       pSib, 
-		       ((capflag & ATH_RC_DS_FLAG)   ? WLAN_RC_DS_FLAG  : 0) |
-		       ((capflag & ATH_RC_HT40_SGI_FLAG)  ? WLAN_RC_HT40_SGI_FLAG : 0) | 
-		       ((capflag & ATH_RC_HT_FLAG)   ? WLAN_RC_HT_FLAG  : 0) |
-		       ((capflag & ATH_RC_CW40_FLAG) ? WLAN_RC_40_FLAG  : 0) |
-		       ((capflag & ATH_RC_TX_STBC_FLAG)   ? WLAN_RC_STBC_FLAG  : 0), 
-		       keepState,
-		       pRateSet);
-}
+
 
 /*
  * Return the median of three numbers
@@ -1161,7 +1147,7 @@ ath_rate_newstate(struct ath_softc_tgt *sc,
 	struct atheros_softc *asc = (struct atheros_softc *) sc->sc_rc;
 
 	asc->tx_chainmask = sc->sc_ic.ic_tx_chainmask;
-	ath_rate_newassoc(sc, ni, 1, capflag, rs);    
+	ath_rate_newassoc(sc, ATH_NODE_TARGET(ni), 1, capflag, rs);
 }
 
 static void
@@ -1211,29 +1197,12 @@ ath_rate_newassoc_11n(struct ath_softc_tgt *sc, struct ath_node_target *an, int
 		      unsigned int capflag, struct ieee80211_rate *rs)
 {
 	if (isnew) {
-		struct atheros_node *oan = ATH_NODE_ATHEROS(an);
-
-		oan->htcap = ((capflag & ATH_RC_DS_FLAG) ? WLAN_RC_DS_FLAG : 0) |
-			((capflag & ATH_RC_HT40_SGI_FLAG) ? WLAN_RC_HT40_SGI_FLAG : 0) | 
-			((capflag & ATH_RC_HT_FLAG)  ? WLAN_RC_HT_FLAG : 0) |
-			((capflag & ATH_RC_CW40_FLAG) ? WLAN_RC_40_FLAG : 0) |
-			((capflag & ATH_RC_WEP_TKIP_FLAG) ? WLAN_RC_WEP_TKIP_FLAG : 0);    
-    
 #ifdef MAGPIE_MERLIN
-		/* Rx STBC is a 2-bit mask. Needs to convert from ath definition to wlan definition. */
-        
-		oan->htcap |= (((capflag & ATH_RC_RX_STBC_FLAG) >> ATH_RC_RX_STBC_FLAG_S)
-			       << WLAN_RC_STBC_FLAG_S);
-                       
-		/* If only one chain is enabled, do not do stbc. */
-		if (sc->sc_txstbcsupport) {
-			oan->stbc = (capflag & ATH_RC_RX_STBC_FLAG) >> ATH_RC_RX_STBC_FLAG_S;
-		} else {
-			oan->stbc = 0;
-		}
-        
+		struct atheros_node *oan = ATH_NODE_ATHEROS(an);
+		/* Only MERLIN can send STBC */
+		oan->stbc = (capflag & ATH_RC_TX_STBC_FLAG) ? 1 : 0;
 #endif
-		rcSibUpdate_11n(sc, an, oan->htcap, 0, rs);
+		rcSibUpdate_ht(sc, an, capflag, 0, rs);
 	}
 }