X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fmadwifi%2Fpatches%2F400-new_hal.patch;h=d994c3a2f037a328f10b7fc5eeae102d6530aa0d;hb=31a05e52cbf9b8c8dc312b0c59d7e6cb0f9cc804;hp=a586b2266ae426fc3f7d7913536257e3520dc0b4;hpb=b53d491d122b39a735cf797778e9f2473d924984;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/package/madwifi/patches/400-new_hal.patch b/package/madwifi/patches/400-new_hal.patch
index a586b2266a..d994c3a2f0 100644
--- a/package/madwifi/patches/400-new_hal.patch
+++ b/package/madwifi/patches/400-new_hal.patch
@@ -15,7 +15,7 @@
  	/*
  	 * Check if the MAC has multi-rate retry support.
  	 * We do this by trying to setup a fake extended
-@@ -7553,7 +7561,7 @@ ath_txq_setup(struct ath_softc *sc, int 
+@@ -7564,7 +7572,7 @@ ath_txq_setup(struct ath_softc *sc, int 
  	if (qtype == HAL_TX_QUEUE_UAPSD)
  		qi.tqi_qflags = HAL_TXQ_TXDESCINT_ENABLE;
  	else
@@ -122,3 +122,32 @@
  
  /*
   * The functions in this section are not intended to be invoked by MadWifi
+--- a/ath/if_ath_hal.h
++++ b/ath/if_ath_hal.h
+@@ -778,17 +778,6 @@ static inline HAL_STATUS ath_hal_getcapa
+ 	return ret;
+ }
+ 
+-static inline HAL_BOOL ath_hal_radar_wait(struct ath_hal *ah, HAL_CHANNEL *a1)
+-{
+-	HAL_BOOL ret;
+-	ATH_HAL_LOCK_IRQ(ah->ah_sc);
+-	ath_hal_set_function(__func__);
+-	ret = ah->ah_radarWait(ah, a1);
+-	ath_hal_set_function(NULL);
+-	ATH_HAL_UNLOCK_IRQ(ah->ah_sc);
+-	return ret;
+-}
+-
+ static inline HAL_BOOL ath_hal_setmcastfilterindex(struct ath_hal *ah,
+ 						   u_int32_t index)
+ {
+@@ -1268,8 +1257,6 @@ static inline void ath_hal_dump_map(stru
+ 	/* HAL_STATUS ah_getCapability(struct ath_hal *ah, HAL_CAPABILITY_TYPE a1, u_int32_t capability, u_int32_t *result) */
+ 	__print_symbol("%s=ah_getCapability\n",
+ 		       (unsigned long)ah->ah_getCapability);
+-	/* HAL_BOOL ah_radarWait(struct ath_hal *ah, HAL_CHANNEL *a1) */
+-	__print_symbol("%s=ah_radarWait\n", (unsigned long)ah->ah_radarWait);
+ 	/* HAL_BOOL ah_setMulticastFilterIndex(struct ath_hal *ah, u_int32_t index) */
+ 	__print_symbol("%s=ah_setMulticastFilterIndex\n",
+ 		       (unsigned long)ah->ah_setMulticastFilterIndex);