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

[Sam Leffler]

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