aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <jkmaline@cc.hut.fi>2005-08-14 19:08:42 -0700
committerJeff Garzik <jgarzik@pobox.com>2005-08-14 23:07:30 -0400
commit3ec0f4857df4c3dd0d0455ce5b2470b4be77fc77 (patch)
treebadaa7f340e6ed65ecbb70837a8fbdb004f2d202
parent[PATCH] hostap: Use void *hw_priv instead of #ifdef in local data (diff)
downloadlinux-dev-3ec0f4857df4c3dd0d0455ce5b2470b4be77fc77.tar.xz
linux-dev-3ec0f4857df4c3dd0d0455ce5b2470b4be77fc77.zip
[PATCH] hostap: Remove extra defines
Remove unused defines that are already available from generic kernel header files. Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r--drivers/net/wireless/hostap/hostap_common.h8
-rw-r--r--drivers/net/wireless/hostap/hostap_wlan.h7
2 files changed, 0 insertions, 15 deletions
diff --git a/drivers/net/wireless/hostap/hostap_common.h b/drivers/net/wireless/hostap/hostap_common.h
index 3f86263a08fd..76f5ef1b59d3 100644
--- a/drivers/net/wireless/hostap/hostap_common.h
+++ b/drivers/net/wireless/hostap/hostap_common.h
@@ -7,14 +7,6 @@
#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
-#ifndef ETH_P_PAE
-#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
-#endif /* ETH_P_PAE */
-
-#define ETH_P_PREAUTH 0x88C7 /* IEEE 802.11i pre-authentication */
-
-
-
/* IEEE 802.11 defines */
#define WLAN_FC_PVER (BIT(1) | BIT(0))
diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h
index 7781e8264d64..cc061e1560d3 100644
--- a/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/drivers/net/wireless/hostap/hostap_wlan.h
@@ -18,13 +18,6 @@
* prism2_send_mgmt() sends these with dev_queue_xmit() to prism2_tx(). */
#define ETH_P_HOSTAP ETH_P_CONTROL
-#ifndef ARPHRD_IEEE80211
-#define ARPHRD_IEEE80211 801
-#endif
-#ifndef ARPHRD_IEEE80211_PRISM
-#define ARPHRD_IEEE80211_PRISM 802
-#endif
-
/* ARPHRD_IEEE80211_PRISM uses a bloated version of Prism2 RX frame header
* (from linux-wlan-ng) */
struct linux_wlan_ng_val {