---

yaml --- r: 111200 b: refs/heads/master c: fef1643 h: refs/heads/master v: v3
git-mirror · Aug 22, 2008 · 459f9ef · 459f9ef
1 parent f7002c5
commit 459f9ef
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96c87607ac8f9b0e641d11ba6e57f8ec0214ea1c
+refs/heads/master: fef1643bf0cdd092a52dc3378479e4811fd65152
diff --git a/trunk/include/linux/if_ether.h b/trunk/include/linux/if_ether.h
@@ -74,6 +74,7 @@
 #define ETH_P_ATMFATE	0x8884		/* Frame-based ATM Transport
 					 * over Ethernet
 					 */
+#define ETH_P_PAE	0x888E		/* Port Access Entity (IEEE 802.1X) */
 #define ETH_P_AOE	0x88A2		/* ATA over Ethernet		*/
 #define ETH_P_TIPC	0x88CA		/* TIPC 			*/
 

diff --git a/trunk/net/mac80211/ieee80211_i.h b/trunk/net/mac80211/ieee80211_i.h
@@ -32,10 +32,6 @@
 /* ieee80211.o internal definitions, etc. These are not included into
  * low-level drivers. */
 
-#ifndef ETH_P_PAE
-#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
-#endif /* ETH_P_PAE */
-
 struct ieee80211_local;
 
 /* Maximum number of broadcast/multicast frames to buffer when some of the