aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper Bryant-Greene <jasper@amiton.co.nz>2008-08-03 11:30:55 +1200
committerJohn W. Linville <linville@tuxdriver.com>2008-08-22 16:29:57 -0400
commitfef1643bf0cdd092a52dc3378479e4811fd65152 (patch)
tree2de4d3e7b5ffeab6140c083ed98c9c2f7f3700e2
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>
-rw-r--r--include/linux/if_ether.h1
-rw-r--r--net/mac80211/ieee80211_i.h4
2 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index e157c1399b6..5028e0b6082 100644
--- a/include/linux/if_ether.h
+++ b/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/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 3cad0172b45..168f845c173 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/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