Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fef1643b authored by Jasper Bryant-Greene's avatar Jasper Bryant-Greene Committed by John W. Linville
Browse files

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: default avatarJasper Bryant-Greene <jasper@amiton.co.nz>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 96c87607

include/linux/if_ether.h

+1 −0
Original line number Diff line number Diff line
@@ -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 			*/

net/mac80211/ieee80211_i.h

+0 −4
Original line number Diff line number Diff line
@@ -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