diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-07-23 20:37:21 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-07-23 20:37:21 +0000 |
| commit | 898f58429e8cf0dadba3e51d0a95dfb448473320 (patch) | |
| tree | 914d6c6ae914cf546ff8e6ced738fbeb7b5f2b4c /sys | |
| parent | d9b1dcb4075c28b48d11ddb5c3e1458c9daccb48 (diff) | |
define ETHERTYPE_IPX
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/if_ethersubr.c | 13 | ||||
| -rw-r--r-- | sys/netipx/ipx_if.h | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index e145dae24af..5e89be42c8e 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ethersubr.c,v 1.20 1997/07/23 20:20:10 mickey Exp $ */ +/* $OpenBSD: if_ethersubr.c,v 1.21 1997/07/23 20:37:19 mickey Exp $ */ /* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */ /* @@ -90,7 +90,6 @@ #include <netatalk/at_var.h> #include <netatalk/at_extern.h> -/* Should we include <netatalk/phase2.h> here instead? */ #define llc_snap_org_code llc_un.type_snap.org_code #define llc_snap_ether_type llc_un.type_snap.ether_type @@ -98,7 +97,6 @@ extern u_char at_org_code[ 3 ]; extern u_char aarp_org_code[ 3 ]; #endif /* NETATALK */ - #if defined(CCITT) #include <sys/socketvar.h> #endif @@ -243,7 +241,7 @@ ether_output(ifp, m0, dst, rt0) #endif #ifdef IPX case AF_IPX: - etype = htons(satosipx(dst)->sipx_type); + etype = ETHERTYPE_IPX; bcopy((caddr_t)&satosipx(dst)->sipx_addr.ipx_host, (caddr_t)edst, sizeof (edst)); if (!bcmp((caddr_t)edst, (caddr_t)&ipx_thishost, sizeof(edst))) @@ -496,7 +494,7 @@ decapsulate: #endif #ifdef IPX - case ETHERTYPE_II: + case ETHERTYPE_IPX: schednetisr(NETISR_IPX); inq = &ipxintrq; break; @@ -533,7 +531,6 @@ decapsulate: * gets handled by stripping off the SNAP header * and going back up to decapsulate. */ -#ifdef NETATALK if (l->llc_control == LLC_UI && l->llc_ssap == LLC_SNAP_LSAP && Bcmp(&(l->llc_snap_org_code)[0], @@ -544,7 +541,7 @@ decapsulate: schednetisr(NETISR_ATALK); break; } -#endif /* NETATALK */ + if (l->llc_control == LLC_UI && l->llc_ssap == LLC_SNAP_LSAP && Bcmp(&(l->llc_snap_org_code)[0], @@ -555,7 +552,7 @@ decapsulate: aarpinput((struct arpcom *)ifp, m); return; } -#endif +#endif /* NETATALK */ if (l->llc_control == LLC_UI && l->llc_dsap == LLC_SNAP_LSAP && l->llc_ssap == LLC_SNAP_LSAP) { diff --git a/sys/netipx/ipx_if.h b/sys/netipx/ipx_if.h index 53dc1d074cf..8a48efae9ca 100644 --- a/sys/netipx/ipx_if.h +++ b/sys/netipx/ipx_if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ipx_if.h,v 1.2 1996/10/26 09:34:50 mickey Exp $ */ +/* $OpenBSD: ipx_if.h,v 1.3 1997/07/23 20:37:20 mickey Exp $ */ /*- * @@ -79,6 +79,7 @@ struct ipx_aliasreq { #define ETHERTYPE_SNAP 0x0005 /* Ethernet_SNAP, internal use only */ #define ETHERTYPE_8022TR 0x0011 /* Ethernet_802.2 w/ trailers */ #define ETHERTYPE_II 0x8137 /* Ethernet_II */ +#define ETHERTYPE_IPX ETHERTYPE_II #ifdef IPXIP struct ipxip_req { |