From owner-svn-src-user@FreeBSD.ORG  Fri Jan 23 18:58:44 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 3739010656C2;
	Fri, 23 Jan 2009 18:58:44 +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 257438FC27;
	Fri, 23 Jan 2009 18:58:44 +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 n0NIwiLa050649;
	Fri, 23 Jan 2009 18:58:44 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0NIwixd050648;
	Fri, 23 Jan 2009 18:58:44 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200901231858.n0NIwixd050648@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Fri, 23 Jan 2009 18:58:44 +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: r187641 - 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, 23 Jan 2009 18:58:44 -0000

Author: sam
Date: Fri Jan 23 18:58:43 2009
New Revision: 187641
URL: http://svn.freebsd.org/changeset/base/187641

Log:
  o we now include <net80211/_ieee80211.h> so these defintions will never
    be used
  o while here kill nearby XR define that'll never used

Modified:
  user/sam/wifi/sys/dev/ath/ath_hal/ah_internal.h

Modified: user/sam/wifi/sys/dev/ath/ath_hal/ah_internal.h
==============================================================================
--- user/sam/wifi/sys/dev/ath/ath_hal/ah_internal.h	Fri Jan 23 18:42:45 2009	(r187640)
+++ user/sam/wifi/sys/dev/ath/ath_hal/ah_internal.h	Fri Jan 23 18:58:43 2009	(r187641)
@@ -342,22 +342,6 @@ struct ath_hal_private {
     (IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN + IEEE80211_WEP_CRCLEN))
 #endif /* _NET_IF_IEEE80211_H_ */
 
-#ifndef _NET80211__IEEE80211_H_
-enum {
-	IEEE80211_T_DS,			/* direct sequence spread spectrum */
-	IEEE80211_T_FH,			/* frequency hopping */
-	IEEE80211_T_OFDM,		/* frequency division multiplexing */
-	IEEE80211_T_TURBO,		/* high rate DS */
-	IEEE80211_T_HT,			/* HT - full GI */
-};
-#define	IEEE80211_T_CCK	IEEE80211_T_DS	/* more common nomenclatur */
-#endif /* _NET_IF_IEEE80211_H_ */
-
-/* NB: these are defined privately until XR support is announced */
-enum {
-	ATHEROS_T_XR	= IEEE80211_T_HT+1,	/* extended range */
-};
-
 #define HAL_TXQ_USE_LOCKOUT_BKOFF_DIS	0x00000001
 
 #define INIT_AIFS		2