Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fef1643bf0cdd092a52dc3378479e4811fd65152

Authored by Jasper Bryant-Greene
Committed by John W. Linville
1 parent 96c87607ac
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 2 changed files with 1 additions and 4 deletions Side-by-side Diff

include/linux/if_ether.h
Diff comments   View file @ fef1643
... ... @@ -74,6 +74,7 @@
74 74 #define ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport
75 75 * over Ethernet
76 76 */
  77 +#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
77 78 #define ETH_P_AOE 0x88A2 /* ATA over Ethernet */
78 79 #define ETH_P_TIPC 0x88CA /* TIPC */
79 80  
net/mac80211/ieee80211_i.h
Diff comments   View file @ fef1643
... ... @@ -32,10 +32,6 @@
32 32 /* ieee80211.o internal definitions, etc. These are not included into
33 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 35 struct ieee80211_local;
40 36  
41 37 /* Maximum number of broadcast/multicast frames to buffer when some of the