diff options
-rw-r--r-- | include/linux/if_ether.h | 1 | ||||
-rw-r--r-- | net/mac80211/ieee80211_i.h | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index e157c1399b61..5028e0b6082b 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h | |||
@@ -74,6 +74,7 @@ | |||
74 | #define ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport | 74 | #define ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport |
75 | * over Ethernet | 75 | * over Ethernet |
76 | */ | 76 | */ |
77 | #define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ | ||
77 | #define ETH_P_AOE 0x88A2 /* ATA over Ethernet */ | 78 | #define ETH_P_AOE 0x88A2 /* ATA over Ethernet */ |
78 | #define ETH_P_TIPC 0x88CA /* TIPC */ | 79 | #define ETH_P_TIPC 0x88CA /* TIPC */ |
79 | 80 | ||
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 3cad0172b45e..168f845c1737 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -32,10 +32,6 @@ | |||
32 | /* ieee80211.o internal definitions, etc. These are not included into | 32 | /* ieee80211.o internal definitions, etc. These are not included into |
33 | * low-level drivers. */ | 33 | * low-level drivers. */ |
34 | 34 | ||
35 | #ifndef ETH_P_PAE | ||
36 | #define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ | ||
37 | #endif /* ETH_P_PAE */ | ||
38 | |||
39 | struct ieee80211_local; | 35 | struct ieee80211_local; |
40 | 36 | ||
41 | /* Maximum number of broadcast/multicast frames to buffer when some of the | 37 | /* Maximum number of broadcast/multicast frames to buffer when some of the |