summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2013-03-01 18:25:13 +0000
committerjoerg <joerg@NetBSD.org>2013-03-01 18:25:13 +0000
commite836e752a001c4cb3ca2b0c65f67f689b65afe2c (patch)
tree6504c85303398488c0413bc08d162135fecb46ee /sys/dev/ic
parentd27812a72c1ad2765dd7714ca41480171f6956da (diff)
Retire OSI network stack. OK core@
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/hd64570.c41
1 files changed, 2 insertions, 39 deletions
diff --git a/sys/dev/ic/hd64570.c b/sys/dev/ic/hd64570.c
index 677359c63f6..46ccb1d2ca6 100644
--- a/sys/dev/ic/hd64570.c
+++ b/sys/dev/ic/hd64570.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64570.c,v 1.43 2010/04/05 07:19:34 joerg Exp $ */
+/* $NetBSD: hd64570.c,v 1.44 2013/03/01 18:25:55 joerg Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
@@ -65,10 +65,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.43 2010/04/05 07:19:34 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.44 2013/03/01 18:25:55 joerg Exp $");
#include "opt_inet.h"
-#include "opt_iso.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,12 +91,6 @@ __KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.43 2010/04/05 07:19:34 joerg Exp $");
#endif
#endif
-#ifdef ISO
-#include <net/if_llc.h>
-#include <netiso/iso.h>
-#include <netiso/iso_var.h>
-#endif
-
#include <net/bpf.h>
#include <sys/cpu.h>
@@ -797,9 +790,6 @@ sca_output(
const struct sockaddr *dst,
struct rtentry *rt0)
{
-#ifdef ISO
- struct hdlc_llc_header *llc;
-#endif
struct hdlc_header *hdlc;
struct ifqueue *ifq = NULL;
int s, error, len;
@@ -854,21 +844,6 @@ sca_output(
hdlc->h_proto = htons(HDLC_PROTOCOL_IPV6);
break;
#endif
-#ifdef ISO
- case AF_ISO:
- /*
- * Add cisco llc serial line header. If there is no
- * space in the first mbuf, allocate another.
- */
- M_PREPEND(m, sizeof(struct hdlc_llc_header), M_DONTWAIT);
- if (m == 0)
- return (ENOBUFS);
- hdlc = mtod(m, struct hdlc_header *);
- llc = mtod(m, struct hdlc_llc_header *);
- llc->hl_dsap = llc->hl_ssap = LLC_ISO_LSAP;
- llc->hl_ffb = 0;
- break;
-#endif
default:
printf("%s: address family %d unsupported\n",
ifp->if_xname, dst->sa_family);
@@ -1622,18 +1597,6 @@ sca_frame_process(sca_port_t *scp)
schednetisr(NETISR_IPV6);
break;
#endif /* INET6 */
-#ifdef ISO
- case HDLC_PROTOCOL_ISO:
- if (m->m_pkthdr.len < sizeof(struct hdlc_llc_header))
- goto dropit;
- m->m_pkthdr.rcvif = &scp->sp_if;
- m->m_pkthdr.len -= sizeof(struct hdlc_llc_header);
- m->m_data += sizeof(struct hdlc_llc_header);
- m->m_len -= sizeof(struct hdlc_llc_header);
- ifq = &clnlintrq;
- schednetisr(NETISR_ISO);
- break;
-#endif /* ISO */
case CISCO_KEEPALIVE:
SCA_DPRINTF(SCA_DEBUG_CISCO,
("Received CISCO keepalive packet\n"));