remove unused llc from receive logic, protect use of llc header in tranmist

logic, fixes pr#9151
This commit is contained in:
chopps 2000-01-09 17:32:58 +00:00
parent eaa635b930
commit e8a27771a7

View File

@ -1,4 +1,4 @@
/* $NetBSD: hd64570.c,v 1.10 2000/01/09 14:47:43 chopps Exp $ */ /* $NetBSD: hd64570.c,v 1.11 2000/01/09 17:32:58 chopps Exp $ */
/* /*
* Copyright (c) 1999 Christian E. Hopps * Copyright (c) 1999 Christian E. Hopps
@ -793,7 +793,9 @@ sca_output(ifp, m, dst, rt0)
struct sockaddr *dst; struct sockaddr *dst;
struct rtentry *rt0; struct rtentry *rt0;
{ {
#ifdef ISO
struct hdlc_llc_header *llc; struct hdlc_llc_header *llc;
#endif
struct hdlc_header *hdlc; struct hdlc_header *hdlc;
struct ifqueue *ifq; struct ifqueue *ifq;
int s, error; int s, error;
@ -1513,7 +1515,6 @@ sca_frame_process(sca_port_t *scp)
{ {
struct ifqueue *ifq; struct ifqueue *ifq;
struct hdlc_header *hdlc; struct hdlc_header *hdlc;
struct hdlc_llc_header *llc;
struct cisco_pkt *cisco; struct cisco_pkt *cisco;
sca_desc_t *desc; sca_desc_t *desc;
struct mbuf *m; struct mbuf *m;
@ -1582,8 +1583,6 @@ sca_frame_process(sca_port_t *scp)
case HDLC_PROTOCOL_ISO: case HDLC_PROTOCOL_ISO:
if (m->m_pkthdr.len < sizeof(struct hdlc_llc_header)) if (m->m_pkthdr.len < sizeof(struct hdlc_llc_header))
goto dropit; goto dropit;
/* if not a std iso pdu drop it */
llc = (struct hdlc_llc_header *)hdlc;
m->m_pkthdr.rcvif = &scp->sp_if; m->m_pkthdr.rcvif = &scp->sp_if;
m->m_pkthdr.len -= sizeof(struct hdlc_llc_header); m->m_pkthdr.len -= sizeof(struct hdlc_llc_header);
m->m_data += sizeof(struct hdlc_llc_header); m->m_data += sizeof(struct hdlc_llc_header);