From: Oleksij Rempel <linux@rempel-privat.de>
Date: Sun, 5 May 2013 19:38:23 +0000 (+0200)
Subject: nuke ath_hal_*xstbcsupport
X-Git-Tag: 1.4.0~13^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=refs%2Fpull%2F34%2Fhead;p=librecmc%2Fopen-ath9k-htc-firmware.git

nuke ath_hal_*xstbcsupport

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

diff --git a/target_firmware/wlan/ah.c b/target_firmware/wlan/ah.c
index ada5ab2..30c9594 100755
--- a/target_firmware/wlan/ah.c
+++ b/target_firmware/wlan/ah.c
@@ -67,12 +67,6 @@ ath_hal_getcapability(struct ath_hal *ah, HAL_CAPABILITY_TYPE type,
 		return pCap->halBssIdMaskSupport ? HAL_OK : HAL_ENOTSUPP;
 	case HAL_CAP_VEOL:
 		return pCap->halVEOLSupport ? HAL_OK : HAL_ENOTSUPP;
-#ifdef MAGPIE_MERLIN
-	case HAL_CAP_RX_STBC:
-		return HAL_ENOTSUPP;
-	case HAL_CAP_TX_STBC:
-		return HAL_ENOTSUPP;
-#endif
 	default:
 		return HAL_EINVAL;
 	}
diff --git a/target_firmware/wlan/ah.h b/target_firmware/wlan/ah.h
index 385d1fd..4901097 100755
--- a/target_firmware/wlan/ah.h
+++ b/target_firmware/wlan/ah.h
@@ -75,8 +75,6 @@ typedef enum {
 	HAL_CAP_VEOL        = 0,
 	HAL_CAP_BSSIDMASK   = 1,
 	HAL_CAP_TSF_ADJUST  = 2,
-	HAL_CAP_RX_STBC     = 3,
-	HAL_CAP_TX_STBC     = 4,
 	HAL_CAP_HT          = 5,
 	HAL_CAP_RTS_AGGR_LIMIT = 6,
 } HAL_CAPABILITY_TYPE;
diff --git a/target_firmware/wlan/ah_internal.h b/target_firmware/wlan/ah_internal.h
index a43c8eb..6506049 100755
--- a/target_firmware/wlan/ah_internal.h
+++ b/target_firmware/wlan/ah_internal.h
@@ -126,8 +126,6 @@ typedef struct {
 		halChanHalfRate         : 1,
 		halChanQuarterRate      : 1,
 		halHTSupport            : 1,
-		halRxStbcSupport        : 1,
-		halTxStbcSupport        : 1,
 		halGTTSupport           : 1,
 		halFastCCSupport        : 1,
 		halExtChanDfsSupport    : 1,
diff --git a/target_firmware/wlan/ar5416_hw.c b/target_firmware/wlan/ar5416_hw.c
index 8da2ee6..5d9b3f3 100644
--- a/target_firmware/wlan/ar5416_hw.c
+++ b/target_firmware/wlan/ar5416_hw.c
@@ -298,31 +298,7 @@ HAL_STATUS ar5416GetCapability(struct ath_hal *ah, HAL_CAPABILITY_TYPE type,
 			       a_uint32_t capability, a_uint32_t *result)
 
 {
-        HAL_CAPABILITIES *pCap = &AH_PRIVATE(ah)->ah_caps;
-#ifndef MAGPIE_MERLIN // K2
-        pCap->halRxStbcSupport = 1;  /* K2 supports STBC Rx only */
-        pCap->halTxStbcSupport = 0;
-#else
-        pCap->halRxStbcSupport = 1;  /* number of streams for STBC recieve. */
-        pCap->halTxStbcSupport = 1;
-#endif
-
-	switch (type) {
-#ifdef MAGPIE_MERLIN
-	case HAL_CAP_RX_STBC:
-	{
-		*result = pCap->halRxStbcSupport;
-		return HAL_OK;
-	}
-	case HAL_CAP_TX_STBC:
-	{
-		*result = pCap->halTxStbcSupport;
-		return HAL_OK;
-	}
-#endif
-        default:
-                return ath_hal_getcapability(ah, type, capability, result);
-	}
+	return ath_hal_getcapability(ah, type, capability, result);
 }
 
 /****************/
diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index b8874bf..4c9e98b 100755
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -1146,16 +1146,6 @@ static void ath_init_tgt(void *Context, A_UINT16 Command,
 	if (ath_hal_htsupported(ah))
 		sc->sc_imask |= HAL_INT_CST;
 
-#ifdef MAGPIE_MERLIN
-	{
-		a_uint32_t stbcsupport;
-		if (ath_hal_txstbcsupport(ah, &stbcsupport))
-			sc->sc_txstbcsupport = stbcsupport;
-
-		if (ath_hal_rxstbcsupport(ah, &stbcsupport))
-			sc->sc_rxstbcsupport = stbcsupport;
-	}
-#endif
 	adf_os_setup_intr(sc->sc_dev, ath_intr);
 	ath_hal_intrset(ah, sc->sc_imask);
 
diff --git a/target_firmware/wlan/if_athvar.h b/target_firmware/wlan/if_athvar.h
index f2412c0..c3a6fbe 100755
--- a/target_firmware/wlan/if_athvar.h
+++ b/target_firmware/wlan/if_athvar.h
@@ -366,8 +366,6 @@ struct ath_softc_tgt
 	struct ath_ratectrl    *sc_rc;
 
 	a_uint32_t            sc_invalid : 1,
-		sc_txstbcsupport       : 1,
-		sc_rxstbcsupport       : 2,
 		sc_tx_draining         : 1,
 		sc_enable_coex         : 1;
 
@@ -547,10 +545,6 @@ a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *av
     ((*(_ah)->ah_stopPcuReceive)((_ah)))
 #define ath_hal_htsupported(_ah) \
     (ath_hal_getcapability(_ah, HAL_CAP_HT, 0, NULL) == HAL_OK)
-#define ath_hal_rxstbcsupport(_ah, _rxstbc) \
-    (ath_hal_getcapability(_ah, HAL_CAP_RX_STBC, 0, _rxstbc) == HAL_OK)
-#define ath_hal_txstbcsupport(_ah, _txstbc) \
-    (ath_hal_getcapability(_ah, HAL_CAP_TX_STBC, 0, _txstbc) == HAL_OK)
 #define ath_hal_getrtsaggrlimit(_ah, _pv) \
     (ath_hal_getcapability(_ah, HAL_CAP_RTS_AGGR_LIMIT, 0, _pv) == HAL_OK)
 #define ath_hal_puttxbuf(_ah, _q, _bufaddr) \