X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Far5416_hw.c;h=dfa34fd7449cea3420a6b93533cdcc15e231f99c;hb=de2501e279f2a8a9963c9fe75b0b6486fc767915;hp=8da2ee636e01ec2f07ba421c7b40828cb1b453ef;hpb=b96af9eeae27b1bdea0a30876919578604953be1;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/ar5416_hw.c b/target_firmware/wlan/ar5416_hw.c
index 8da2ee6..dfa34fd 100644
--- a/target_firmware/wlan/ar5416_hw.c
+++ b/target_firmware/wlan/ar5416_hw.c
@@ -33,12 +33,10 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "opt_ah.h"
 #include "ah.h"
 #include "ah_internal.h"
 #include "ar5416.h"
 #include "ar5416reg.h"
-#include "ar5416phy.h"
 #include "ar5416desc.h"
 
 #define N(a) (sizeof(a)/sizeof(a[0]))
@@ -298,31 +296,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);
 }
 
 /****************/