diff options
| -rw-r--r-- | sys/net/if_ethersubr.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 5d013140805..8e6de698d74 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ethersubr.c,v 1.38 2000/09/07 04:48:58 deraadt Exp $ */ +/* $OpenBSD: if_ethersubr.c,v 1.39 2000/10/18 16:16:33 jason Exp $ */ /* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */ /* @@ -149,9 +149,6 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>. #include <netatalk/at_var.h> #include <netatalk/at_extern.h> -#define llc_snap_org_code llc_un.type_snap.org_code -#define llc_snap_ether_type llc_un.type_snap.ether_type - extern u_char at_org_code[ 3 ]; extern u_char aarp_org_code[ 3 ]; #endif /* NETATALK */ @@ -381,9 +378,9 @@ ether_output(ifp, m0, dst, rt0) */ llc.llc_dsap = llc.llc_ssap = LLC_SNAP_LSAP; llc.llc_control = LLC_UI; - bcopy(at_org_code, llc.llc_snap_org_code, + bcopy(at_org_code, llc.llc_snap.org_code, sizeof(at_org_code)); - llc.llc_snap_ether_type = htons( ETHERTYPE_AT ); + llc.llc_snap.ether_type = htons( ETHERTYPE_AT ); bcopy(&llc, mtod(m, caddr_t), AT_LLC_SIZE); etype = htons(m->m_pkthdr.len); } else { @@ -684,9 +681,9 @@ decapsulate: */ if (l->llc_control == LLC_UI && l->llc_ssap == LLC_SNAP_LSAP && - Bcmp(&(l->llc_snap_org_code)[0], + Bcmp(&(l->llc_snap.org_code)[0], at_org_code, sizeof(at_org_code)) == 0 && - ntohs(l->llc_snap_ether_type) == ETHERTYPE_AT) { + ntohs(l->llc_snap.ether_type) == ETHERTYPE_AT) { inq = &atintrq2; m_adj(m, AT_LLC_SIZE); schednetisr(NETISR_ATALK); @@ -695,9 +692,9 @@ decapsulate: if (l->llc_control == LLC_UI && l->llc_ssap == LLC_SNAP_LSAP && - Bcmp(&(l->llc_snap_org_code)[0], + Bcmp(&(l->llc_snap.org_code)[0], aarp_org_code, sizeof(aarp_org_code)) == 0 && - ntohs(l->llc_snap_ether_type) == ETHERTYPE_AARP) { + ntohs(l->llc_snap.ether_type) == ETHERTYPE_AARP) { m_adj(m, AT_LLC_SIZE); /* XXX Really this should use netisr too */ aarpinput((struct arpcom *)ifp, m); |