From 459f9ef85b304617ec168398eb19b36352e3c98b Mon Sep 17 00:00:00 2001 From: Jasper Bryant-Greene Date: Sun, 3 Aug 2008 11:30:55 +1200 Subject: [PATCH] --- yaml --- r: 111200 b: refs/heads/master c: fef1643bf0cdd092a52dc3378479e4811fd65152 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/if_ether.h | 1 + trunk/net/mac80211/ieee80211_i.h | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index bf48b62f1858..48ce693c1cce 100644 --- 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 index e157c1399b61..5028e0b6082b 100644 --- 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 index 3cad0172b45e..168f845c1737 100644 --- 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