summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorsam <sam@FreeBSD.org>2007-09-18 20:30:40 +0000
committersam <sam@FreeBSD.org>2007-09-18 20:30:40 +0000
commit1f33ce6db98e41c07754378fdde8a0ecf551f9d1 (patch)
treecdfc5472dfdac4cf12f3878b15acba0cdf09e79c /sys
parent995bfd1477d1c3d1836b1ff0885ffc89fe5e5b24 (diff)
downloadFreeBSD-src-1f33ce6db98e41c07754378fdde8a0ecf551f9d1.zip
FreeBSD-src-1f33ce6db98e41c07754378fdde8a0ecf551f9d1.tar.gz
remove IFM_IEEE80211_HT40PLUS and IFM_IEEE80211_HT40MINUS; they
never got used so nuke 'em before we branch Approved by: re (blanket wireless)
Diffstat (limited to 'sys')
-rw-r--r--sys/net/if_media.h4
-rw-r--r--sys/net80211/ieee80211.c4
2 files changed, 0 insertions, 8 deletions
diff --git a/sys/net/if_media.h b/sys/net/if_media.h
index eb77d2b..0e888a8 100644
--- a/sys/net/if_media.h
+++ b/sys/net/if_media.h
@@ -211,8 +211,6 @@ uint64_t ifmedia_baudrate(int);
#define IFM_IEEE80211_IBSSMASTER 0x00000800 /* Operate as an IBSS master */
#define IFM_IEEE80211_TURBO 0x00001000 /* Operate in turbo mode */
#define IFM_IEEE80211_MONITOR 0x00002000 /* Operate in monitor mode */
-#define IFM_IEEE80211_HT40PLUS 0x00004000 /* Operate in 11n HT40+ mode */
-#define IFM_IEEE80211_HT40MINUS 0x00008000 /* Operate in 11n HT40- mode */
/* operating mode for multi-mode devices */
#define IFM_IEEE80211_11A 0x00010000 /* 5Ghz, OFDM mode */
@@ -500,8 +498,6 @@ struct ifmedia_description {
{ IFM_IEEE80211_IBSSMASTER, "ibss-master" }, \
{ IFM_IEEE80211_TURBO, "turbo" }, \
{ IFM_IEEE80211_MONITOR, "monitor" }, \
- { IFM_IEEE80211_HT40MINUS, "ht-" }, \
- { IFM_IEEE80211_HT40PLUS, "ht+" }, \
{ 0, NULL }, \
}
diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c
index cc570f3..7e929b1 100644
--- a/sys/net80211/ieee80211.c
+++ b/sys/net80211/ieee80211.c
@@ -931,10 +931,6 @@ media_status(enum ieee80211_opmode opmode, const struct ieee80211_channel *chan)
if (IEEE80211_IS_CHAN_TURBO(chan))
status |= IFM_IEEE80211_TURBO;
- if (IEEE80211_IS_CHAN_HT40U(chan))
- status |= IFM_IEEE80211_HT40PLUS;
- if (IEEE80211_IS_CHAN_HT40D(chan))
- status |= IFM_IEEE80211_HT40MINUS;
return status;
}
OpenPOWER on IntegriCloud