From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 29 Sep 2008 20:28:21 +0000 (-0400)
Subject: ieee80211.h: remove superfluous ETH_P_PAE definition
X-Git-Tag: v2.6.28-rc1~717^2~165^2~9
X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=55ad175fb65a4a3a7e4d1aa13c460de281b4e8ac;p=linux-2.6-omap-h63xx.git

ieee80211.h: remove superfluous ETH_P_PAE definition

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index b31399e1fd8..6048579d0b2 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -190,10 +190,6 @@ const char *escape_essid(const char *essid, u8 essid_len);
 #endif
 #include <net/iw_handler.h>	/* new driver API */
 
-#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 */
 
 #ifndef ETH_P_80211_RAW