On Sun, 2008-08-03 at 11:30 +1200, Jasper Bryant-Greene wrote: > ETH_P_PAE belongs in if_ether.h with the other ETH_P_* definitions. This > patch moves it there. This needs to cross netdev, but other than that > Signed-off-by: Jasper Bryant-Greene <jasper@xxxxxxxxxxxx> Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > --- > > diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h > index e157c13..5028e0b 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 a4f9a83..be4d99e 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 */ > - > #define WLAN_FC_DATA_PRESENT(fc) (((fc) & 0x4c) == 0x08) > > #define IEEE80211_FC(type, subtype) cpu_to_le16(type | subtype) > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html >
Attachment:
signature.asc
Description: This is a digitally signed message part
