From: Oleksij Rempel <linux@rempel-privat.de>
Date: Sun, 7 Apr 2013 15:26:04 +0000 (+0200)
Subject: build fix: pSib used only with MAGPIE_MERLIN
X-Git-Tag: 1.3.2~7^2~3
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=da4c8e0e756b52d431f422508213c5d9fa1332e1;hp=7adecf60f6cde7bebd0e5381c9657fd5aef6f003;p=open-ath9k-htc-firmware.git

build fix: pSib used only with MAGPIE_MERLIN

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

diff --git a/target_firmware/wlan/ratectrl_11n_ln.c b/target_firmware/wlan/ratectrl_11n_ln.c
index 4d7f60f..de86550 100755
--- a/target_firmware/wlan/ratectrl_11n_ln.c
+++ b/target_firmware/wlan/ratectrl_11n_ln.c
@@ -246,14 +246,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 +300,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) {