From: Jouni Malinen <jkmaline@cc.hut.fi>
Date: Mon, 15 Aug 2005 02:08:42 +0000 (-0700)
Subject: [PATCH] hostap: Remove extra defines
X-Git-Tag: firefly_0821_release~42151^2~18
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3ec0f4857df4c3dd0d0455ce5b2470b4be77fc77;p=firefly-linux-kernel-4.4.55.git

[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>
---

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 {