Date: Fri, 16 Jan 2004 09:31:26 -0800 (PST) From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 45448 for review Message-ID: <200401161731.i0GHVQmr089914@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=45448 Change 45448 by sam@sam_ebb on 2004/01/16 09:31:17 ETHERTYPE_EAPOL -> ETHERTYPE_PAE (from onoe-san) Affected files ... .. //depot/projects/netperf+sockets/sys/dev/awi/awi.c#5 edit .. //depot/projects/netperf+sockets/sys/net/ethernet.h#4 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_output.c#5 edit Differences ... ==== //depot/projects/netperf+sockets/sys/dev/awi/awi.c#5 (text+ko) ==== @@ -2161,9 +2161,8 @@ IEEE80211_ADDR_COPY(wh->i_addr2, eh->ether_shost); IEEE80211_ADDR_COPY(wh->i_addr3, eh->ether_dhost); } - /* NB: EAPOL frames have their own encryption policy */ - if (ic->ic_flags & IEEE80211_F_WEPON && - eh->ether_type != ETHERTYPE_EAPOL) + /* NB: PAE frames have their own encryption policy */ + if (ic->ic_flags & IEEE80211_F_WEPON && eh->ether_type != ETHERTYPE_PAE) wh->i_fc[1] |= IEEE80211_FC1_WEP; return m; } ==== //depot/projects/netperf+sockets/sys/net/ethernet.h#4 (text+ko) ==== @@ -319,7 +319,7 @@ #define ETHERTYPE_PPPOEDISC 0x8863 /* PPP Over Ethernet Discovery Stage */ #define ETHERTYPE_PPPOE 0x8864 /* PPP Over Ethernet Session Stage */ #define ETHERTYPE_LANPROBE 0x8888 /* HP LanProbe test? */ -#define ETHERTYPE_EAPOL 0x888E /* EAPOL/802.1x */ +#define ETHERTYPE_PAE 0x888E /* EAPOL PAE/802.1x */ #define ETHERTYPE_LOOPBACK 0x9000 /* Loopback: used to test interfaces */ #define ETHERTYPE_LBACK ETHERTYPE_LOOPBACK /* DEC MOP loopback */ #define ETHERTYPE_XNSSM 0x9001 /* 3Com (Formerly Bridge Communications), XNS Systems Management */ ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_output.c#5 (text+ko) ==== @@ -242,9 +242,8 @@ case IEEE80211_M_MONITOR: goto bad; } - /* NB: EAPOL frames have their own encryption policy */ - if (ic->ic_flags & IEEE80211_F_WEPON && - eh.ether_type != ETHERTYPE_EAPOL) + /* NB: PAE frames have their own encryption policy */ + if (ic->ic_flags & IEEE80211_F_WEPON && eh.ether_type != ETHERTYPE_PAE) wh->i_fc[1] |= IEEE80211_FC1_WEP; *pni = ni; return m;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401161731.i0GHVQmr089914>