From owner-svn-src-user@FreeBSD.ORG  Fri Jan 16 19:01:39 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3915F106564A;
	Fri, 16 Jan 2009 19:01:38 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E28538FC17;
	Fri, 16 Jan 2009 19:01:38 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0GJ1cTk015906;
	Fri, 16 Jan 2009 19:01:38 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0GJ1c0L015904;
	Fri, 16 Jan 2009 19:01:38 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200901161901.n0GJ1c0L015904@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Fri, 16 Jan 2009 19:01:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187337 - user/sam/wifi/sys/dev/ath/ath_hal
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2009 19:01:39 -0000

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++) {