svn commit: r187337 - user/sam/wifi/sys/dev/ath/ath_hal

[Sam Leffler]

Author: sam
Date: Fri Jan 16 19:01:38 2009
New Revision: 187337
URL: http://svn.freebsd.org/changeset/base/187337

Log:
  remove last vestives of AH_SUPPORT_11D (we always support 11d)

Modified:
  user/sam/wifi/sys/dev/ath/ath_hal/ah.c
  user/sam/wifi/sys/dev/ath/ath_hal/ah_regdomain.c

Modified: user/sam/wifi/sys/dev/ath/ath_hal/ah.c
==============================================================================
--- user/sam/wifi/sys/dev/ath/ath_hal/ah.c	Fri Jan 16 18:57:30 2009	(r187336)
+++ user/sam/wifi/sys/dev/ath/ath_hal/ah.c	Fri Jan 16 19:01:38 2009	(r187337)
@@ -449,11 +449,7 @@ ath_hal_getcapability(struct ath_hal *ah
 		}
 		return HAL_ENOTSUPP;
 	case HAL_CAP_11D:
-#ifdef AH_SUPPORT_11D
 		return HAL_OK;
-#else
-		return HAL_ENOTSUPP;
-#endif
 	case HAL_CAP_RXORN_FATAL:	/* HAL_INT_RXORN treated as fatal  */
 		return AH_PRIVATE(ah)->ah_rxornIsFatal ? HAL_OK : HAL_ENOTSUPP;
 	case HAL_CAP_HT:

Modified: user/sam/wifi/sys/dev/ath/ath_hal/ah_regdomain.c
==============================================================================
--- user/sam/wifi/sys/dev/ath/ath_hal/ah_regdomain.c	Fri Jan 16 18:57:30 2009	(r187336)
+++ user/sam/wifi/sys/dev/ath/ath_hal/ah_regdomain.c	Fri Jan 16 19:01:38 2009	(r187337)
@@ -2021,14 +2021,12 @@ isCountryCodeValid(struct ath_hal *ah, H
 		HALDEBUG(ah, HAL_DEBUG_REGDOMAIN, "%s: rd %d allowed\n",
 		    __func__, rd);
 		return AH_TRUE;
-#ifdef AH_SUPPORT_11D
 	} else	if ((rd & WORLD_SKU_MASK) == WORLD_SKU_PREFIX) {
 		int i;
 		for (i=0; i < N(allCountries); i++) {
 			if (cc == allCountries[i].countryCode)
 				return AH_TRUE;
 		}
-#endif
 	} else {
 		int i;
 		for (i = 0; i < N(allCountries); i++) {