aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJasper Bryant-Greene <jasper@amiton.co.nz>2008-08-02 19:30:55 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-08-22 16:29:57 -0400
commitfef1643bf0cdd092a52dc3378479e4811fd65152 (patch)
tree2de4d3e7b5ffeab6140c083ed98c9c2f7f3700e2 /include
parent96c87607ac8f9b0e641d11ba6e57f8ec0214ea1c (diff)
move ETH_P_PAE from ieee80211_i.h to if_ether.h
ETH_P_PAE belongs in if_ether.h with the other ETH_P_* definitions. This patch moves it there. Signed-off-by: Jasper Bryant-Greene <jasper@amiton.co.nz> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/if_ether.h1
1 files changed, 1 insertions, 0 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