summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2000-02-13 03:32:07 +0000
committerpeter <peter@FreeBSD.org>2000-02-13 03:32:07 +0000
commita5441090deef0b9401bd8291ffdca1f66ca5362d (patch)
tree08db8fae584f4c3cdf2ad5b2ac80c1bd44801d5a
parent97c685efe694921d4948ef681efe38f0ad0bac8c (diff)
downloadFreeBSD-src-a5441090deef0b9401bd8291ffdca1f66ca5362d.zip
FreeBSD-src-a5441090deef0b9401bd8291ffdca1f66ca5362d.tar.gz
Clean up some loose ends in the network code, including the X.25 and ISO
#ifdefs. Clean out unused netisr's and leftover netisr linker set gunk. Tested on x86 and alpha, including world. Approved by: jkh
-rw-r--r--sys/alpha/alpha/machdep.c17
-rw-r--r--sys/alpha/tc/am7990.c10
-rw-r--r--sys/amd64/amd64/machdep.c15
-rw-r--r--sys/conf/NOTES10
-rw-r--r--sys/i386/conf/LINT10
-rw-r--r--sys/i386/conf/NOTES10
-rw-r--r--sys/i386/i386/machdep.c15
-rw-r--r--sys/net/if_ethersubr.c175
-rw-r--r--sys/net/if_fddisubr.c159
-rw-r--r--sys/net/if_loop.c12
-rw-r--r--sys/net/if_spppsubr.c23
-rw-r--r--sys/net/netisr.h21
-rw-r--r--sys/net/route.h1
-rw-r--r--sys/net/rtsock.c6
-rw-r--r--sys/netatalk/ddp_input.c8
-rw-r--r--sys/netatm/atm_subr.c7
-rw-r--r--sys/netinet/if_ether.c4
-rw-r--r--sys/netinet/in_proto.c15
-rw-r--r--sys/netinet/ip_input.c4
-rw-r--r--sys/netinet6/ip6_input.c3
-rw-r--r--sys/netipx/ipx_input.c4
-rw-r--r--sys/netnatm/natm.c9
-rw-r--r--sys/netns/ns_input.c3
-rw-r--r--sys/nfs/nfs_common.c18
-rw-r--r--sys/nfs/nfs_nqlease.c17
-rw-r--r--sys/nfs/nfs_srvcache.c3
-rw-r--r--sys/nfs/nfs_subs.c18
-rw-r--r--sys/nfs/nfs_syscalls.c12
-rw-r--r--sys/nfs/nqnfs.h7
-rw-r--r--sys/nfsclient/nfs_nfsiod.c12
-rw-r--r--sys/nfsclient/nfs_subs.c18
-rw-r--r--sys/nfsserver/nfs_srvcache.c3
-rw-r--r--sys/nfsserver/nfs_srvsubs.c18
-rw-r--r--sys/nfsserver/nfs_syscalls.c12
-rw-r--r--sys/pc98/i386/machdep.c10
-rw-r--r--sys/pc98/pc98/machdep.c10
36 files changed, 62 insertions, 637 deletions
diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c
index 04707f9..feec3f7 100644
--- a/sys/alpha/alpha/machdep.c
+++ b/sys/alpha/alpha/machdep.c
@@ -453,14 +453,17 @@ register_netisr(num, handler)
return (0);
}
-void
-netisr_sysinit(data)
- void *data;
+int
+unregister_netisr(num)
+ int num;
{
- const struct netisrtab *nit;
-
- nit = (const struct netisrtab *)data;
- register_netisr(nit->nit_num, nit->nit_isr);
+
+ if (num < 0 || num >= (sizeof(netisrs)/sizeof(*netisrs)) ) {
+ printf("unregister_netisr: bad isr number: %d\n", num);
+ return (EINVAL);
+ }
+ netisrs[num] = NULL;
+ return (0);
}
/*
diff --git a/sys/alpha/tc/am7990.c b/sys/alpha/tc/am7990.c
index 52d239b..1d3cb54 100644
--- a/sys/alpha/tc/am7990.c
+++ b/sys/alpha/tc/am7990.c
@@ -1019,16 +1019,6 @@ am7990_ioctl(ifp, cmd, data)
}
break;
-#if defined(CCITT) && defined(LLC)
- case SIOCSIFCONF_X25:
- ifp->if_flags |= IFF_UP;
- ifa->ifa_rtrequest = cons_rtrequest; /* XXX */
- error = x25_llcglue(PRC_IFUP, ifa->ifa_addr);
- if (error == 0)
- am7990_init(sc);
- break;
-#endif /* CCITT && LLC */
-
case SIOCSIFFLAGS:
if ((ifp->if_flags & IFF_UP) == 0 &&
(ifp->if_flags & IFF_RUNNING) != 0) {
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index dfe6a87..397efdc 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -452,14 +452,17 @@ register_netisr(num, handler)
return (0);
}
-void
-netisr_sysinit(data)
- void *data;
+int
+unregister_netisr(num)
+ int num;
{
- const struct netisrtab *nit;
- nit = (const struct netisrtab *)data;
- register_netisr(nit->nit_num, nit->nit_isr);
+ if (num < 0 || num >= (sizeof(netisrs)/sizeof(*netisrs)) ) {
+ printf("unregister_netisr: bad isr number: %d\n", num);
+ return (EINVAL);
+ }
+ netisrs[num] = NULL;
+ return (0);
}
/*
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index d8091a5..4dd1918 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -382,16 +382,6 @@ options NETATALK #Appletalk communications protocols
# These are currently broken but are shipped due to interest.
#options NS #Xerox NS protocols
-
-# These are currently broken and are no longer shipped due to lack
-# of interest.
-#options CCITT #X.25 network layer
-#options ISO
-#options TPIP #ISO TP class 4 over IP
-#options TPCONS #ISO TP class 0 over X.25
-#options LLC #X.25 link layer for Ethernets
-#options HDLC #X.25 link layer for serial lines
-#options EON #ISO CLNP over IP
#options NSIP #XNS over IP
# netgraph(4). Enable the base netgraph code with the NETGRAPH option.
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index d8091a5..4dd1918 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -382,16 +382,6 @@ options NETATALK #Appletalk communications protocols
# These are currently broken but are shipped due to interest.
#options NS #Xerox NS protocols
-
-# These are currently broken and are no longer shipped due to lack
-# of interest.
-#options CCITT #X.25 network layer
-#options ISO
-#options TPIP #ISO TP class 4 over IP
-#options TPCONS #ISO TP class 0 over X.25
-#options LLC #X.25 link layer for Ethernets
-#options HDLC #X.25 link layer for serial lines
-#options EON #ISO CLNP over IP
#options NSIP #XNS over IP
# netgraph(4). Enable the base netgraph code with the NETGRAPH option.
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index d8091a5..4dd1918 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -382,16 +382,6 @@ options NETATALK #Appletalk communications protocols
# These are currently broken but are shipped due to interest.
#options NS #Xerox NS protocols
-
-# These are currently broken and are no longer shipped due to lack
-# of interest.
-#options CCITT #X.25 network layer
-#options ISO
-#options TPIP #ISO TP class 4 over IP
-#options TPCONS #ISO TP class 0 over X.25
-#options LLC #X.25 link layer for Ethernets
-#options HDLC #X.25 link layer for serial lines
-#options EON #ISO CLNP over IP
#options NSIP #XNS over IP
# netgraph(4). Enable the base netgraph code with the NETGRAPH option.
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index dfe6a87..397efdc 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -452,14 +452,17 @@ register_netisr(num, handler)
return (0);
}
-void
-netisr_sysinit(data)
- void *data;
+int
+unregister_netisr(num)
+ int num;
{
- const struct netisrtab *nit;
- nit = (const struct netisrtab *)data;
- register_netisr(nit->nit_num, nit->nit_isr);
+ if (num < 0 || num >= (sizeof(netisrs)/sizeof(*netisrs)) ) {
+ printf("unregister_netisr: bad isr number: %d\n", num);
+ return (EINVAL);
+ }
+ netisrs[num] = NULL;
+ return (0);
}
/*
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 37c3d11..4042028 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -83,22 +83,6 @@ int ether_outputdebug = 0;
int ether_inputdebug = 0;
#endif
-#ifdef ISO
-#include <netiso/argo_debug.h>
-#include <netiso/iso.h>
-#include <netiso/iso_var.h>
-#include <netiso/iso_snpac.h>
-#endif
-
-/*#ifdef LLC
-#include <netccitt/dll.h>
-#include <netccitt/llc_var.h>
-#endif*/
-
-#if defined(LLC) && defined(CCITT)
-extern struct ifqueue pkintrq;
-#endif
-
#ifdef NETATALK
#include <netatalk/at.h>
#include <netatalk/at_var.h>
@@ -325,68 +309,6 @@ ether_output(ifp, m, dst, rt0)
}
break;
#endif /* NS */
-#ifdef ISO
- case AF_ISO: {
- int snpalen;
- struct llc *l;
- register struct sockaddr_dl *sdl;
-
- if (rt && (sdl = (struct sockaddr_dl *)rt->rt_gateway) &&
- sdl->sdl_family == AF_LINK && sdl->sdl_alen > 0) {
- bcopy(LLADDR(sdl), (caddr_t)edst, sizeof(edst));
- } else if (error =
- iso_snparesolve(ifp, (struct sockaddr_iso *)dst,
- (char *)edst, &snpalen))
- goto bad; /* Not Resolved */
- /* If broadcasting on a simplex interface, loopback a copy */
- if (*edst & 1)
- m->m_flags |= (M_BCAST|M_MCAST);
- M_PREPEND(m, 3, M_DONTWAIT);
- if (m == NULL)
- return (0);
- type = htons(m->m_pkthdr.len);
- l = mtod(m, struct llc *);
- l->llc_dsap = l->llc_ssap = LLC_ISO_LSAP;
- l->llc_control = LLC_UI;
- len += 3;
- IFDEBUG(D_ETHER)
- int i;
- printf("unoutput: sending pkt to: ");
- for (i=0; i<6; i++)
- printf("%x ", edst[i] & 0xff);
- printf("\n");
- ENDDEBUG
- } break;
-#endif /* ISO */
-#ifdef LLC
-/* case AF_NSAP: */
- case AF_CCITT: {
- register struct sockaddr_dl *sdl =
- (struct sockaddr_dl *) rt -> rt_gateway;
-
- if (sdl && sdl->sdl_family == AF_LINK
- && sdl->sdl_alen > 0) {
- bcopy(LLADDR(sdl), (char *)edst, sizeof(edst));
- } else goto bad; /* Not a link interface ? Funny ... */
- if (*edst & 1)
- loop_copy = 1;
- type = htons(m->m_pkthdr.len);
-#ifdef LLC_DEBUG
- {
- int i;
- register struct llc *l = mtod(m, struct llc *);
-
- printf("ether_output: sending LLC2 pkt to: ");
- for (i=0; i<6; i++)
- printf("%x ", edst[i] & 0xff);
- printf(" len 0x%x dsap 0x%x ssap 0x%x control 0x%x\n",
- type & 0xff, l->llc_dsap & 0xff, l->llc_ssap &0xff,
- l->llc_control & 0xff);
-
- }
-#endif /* LLC_DEBUG */
- } break;
-#endif /* LLC */
case pseudo_AF_HDRCMPLT:
hdrcmplt = 1;
@@ -497,7 +419,7 @@ ether_input(ifp, eh, m)
register struct ifqueue *inq;
u_short ether_type;
int s;
-#if defined (ISO) || defined (LLC) || defined(NETATALK)
+#if defined(NETATALK)
register struct llc *l;
#endif
@@ -601,12 +523,11 @@ ether_input(ifp, eh, m)
break;
}
#endif /* NS */
-#if defined (ISO) || defined (LLC) || defined(NETATALK)
+#if defined(NETATALK)
if (ether_type > ETHERMTU)
goto dropanyway;
l = mtod(m, struct llc *);
switch (l->llc_dsap) {
-#ifdef NETATALK
case LLC_SNAP_LSAP:
switch (l->llc_control) {
case LLC_UI:
@@ -634,94 +555,6 @@ ether_input(ifp, eh, m)
goto dropanyway;
}
break;
-#endif NETATALK
-#ifdef ISO
- case LLC_ISO_LSAP:
- switch (l->llc_control) {
- case LLC_UI:
- /* LLC_UI_P forbidden in class 1 service */
- if ((l->llc_dsap == LLC_ISO_LSAP) &&
- (l->llc_ssap == LLC_ISO_LSAP)) {
- /* LSAP for ISO */
- if (m->m_pkthdr.len > ether_type)
- m_adj(m, ether_type - m->m_pkthdr.len);
- m->m_data += 3; /* XXX */
- m->m_len -= 3; /* XXX */
- m->m_pkthdr.len -= 3; /* XXX */
- M_PREPEND(m, sizeof *eh, M_DONTWAIT);
- if (m == 0)
- return;
- *mtod(m, struct ether_header *) = *eh;
- IFDEBUG(D_ETHER)
- printf("clnp packet");
- ENDDEBUG
- schednetisr(NETISR_ISO);
- inq = &clnlintrq;
- break;
- }
- goto dropanyway;
-
- case LLC_XID:
- case LLC_XID_P:
- if(m->m_len < 6)
- goto dropanyway;
- l->llc_window = 0;
- l->llc_fid = 9;
- l->llc_class = 1;
- l->llc_dsap = l->llc_ssap = 0;
- /* Fall through to */
- case LLC_TEST:
- case LLC_TEST_P:
- {
- struct sockaddr sa;
- register struct ether_header *eh2;
- int i;
- u_char c = l->llc_dsap;
-
- l->llc_dsap = l->llc_ssap;
- l->llc_ssap = c;
- if (m->m_flags & (M_BCAST | M_MCAST))
- bcopy((caddr_t)ac->ac_enaddr,
- (caddr_t)eh->ether_dhost, 6);
- sa.sa_family = AF_UNSPEC;
- sa.sa_len = sizeof(sa);
- eh2 = (struct ether_header *)sa.sa_data;
- for (i = 0; i < 6; i++) {
- eh2->ether_shost[i] = c = eh->ether_dhost[i];
- eh2->ether_dhost[i] =
- eh->ether_dhost[i] = eh->ether_shost[i];
- eh->ether_shost[i] = c;
- }
- ifp->if_output(ifp, m, &sa, NULL);
- return;
- }
- default:
- m_freem(m);
- return;
- }
- break;
-#endif /* ISO */
-#ifdef LLC
- case LLC_X25_LSAP:
- {
- if (m->m_pkthdr.len > ether_type)
- m_adj(m, ether_type - m->m_pkthdr.len);
- M_PREPEND(m, sizeof(struct sdl_hdr) , M_DONTWAIT);
- if (m == 0)
- return;
- if ( !sdl_sethdrif(ifp, eh->ether_shost, LLC_X25_LSAP,
- eh->ether_dhost, LLC_X25_LSAP, 6,
- mtod(m, struct sdl_hdr *)))
- panic("ETHER cons addr failure");
- mtod(m, struct sdl_hdr *)->sdlhdr_len = ether_type;
-#ifdef LLC_DEBUG
- printf("llc packet\n");
-#endif /* LLC_DEBUG */
- schednetisr(NETISR_CCITT);
- inq = &llcintrq;
- break;
- }
-#endif /* LLC */
dropanyway:
default:
#ifdef NETGRAPH
@@ -731,14 +564,14 @@ ether_input(ifp, eh, m)
#endif /* NETGRAPH */
return;
}
-#else /* ISO || LLC || NETATALK */
+#else /* NETATALK */
#ifdef NETGRAPH
ngether_send(IFP2AC(ifp), eh, m);
#else /* NETGRAPH */
m_freem(m);
#endif /* NETGRAPH */
return;
-#endif /* ISO || LLC || NETATALK */
+#endif /* NETATALK */
}
s = splimp();
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index fc9a75c..b9c431a 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -81,18 +81,6 @@
#include <netdnet/dn.h>
#endif
-#ifdef ISO
-#include <netiso/argo_debug.h>
-#include <netiso/iso.h>
-#include <netiso/iso_var.h>
-#include <netiso/iso_snpac.h>
-#endif
-
-#ifdef LLC
-#include <netccitt/dll.h>
-#include <netccitt/llc_var.h>
-#endif
-
#ifdef NETATALK
#include <netatalk/at.h>
#include <netatalk/at_var.h>
@@ -105,10 +93,6 @@ extern u_char at_org_code[ 3 ];
extern u_char aarp_org_code[ 3 ];
#endif /* NETATALK */
-#if defined(LLC) && defined(CCITT)
-extern struct ifqueue pkintrq;
-#endif
-
#define senderr(e) { error = (e); goto bad;}
/*
@@ -247,66 +231,6 @@ fddi_output(ifp, m, dst, rt0)
(caddr_t)edst, sizeof (edst));
break;
#endif
-#ifdef ISO
- case AF_ISO: {
- int snpalen;
- struct llc *l;
- register struct sockaddr_dl *sdl;
-
- if (rt && (sdl = (struct sockaddr_dl *)rt->rt_gateway) &&
- sdl->sdl_family == AF_LINK && sdl->sdl_alen > 0) {
- bcopy(LLADDR(sdl), (caddr_t)edst, sizeof(edst));
- } else if (error =
- iso_snparesolve(ifp, (struct sockaddr_iso *)dst,
- (char *)edst, &snpalen))
- goto bad; /* Not Resolved */
- /* If broadcasting on a simplex interface, loopback a copy */
- if (*edst & 1)
- m->m_flags |= (M_BCAST|M_MCAST);
- M_PREPEND(m, 3, M_DONTWAIT);
- if (m == NULL)
- return (0);
- type = 0;
- l = mtod(m, struct llc *);
- l->llc_dsap = l->llc_ssap = LLC_ISO_LSAP;
- l->llc_control = LLC_UI;
- IFDEBUG(D_ETHER)
- int i;
- printf("unoutput: sending pkt to: ");
- for (i=0; i<6; i++)
- printf("%x ", edst[i] & 0xff);
- printf("\n");
- ENDDEBUG
- } break;
-#endif /* ISO */
-#ifdef LLC
-/* case AF_NSAP: */
- case AF_CCITT: {
- register struct sockaddr_dl *sdl =
- (struct sockaddr_dl *) rt -> rt_gateway;
-
- if (sdl && sdl->sdl_family != AF_LINK && sdl->sdl_alen <= 0)
- goto bad; /* Not a link interface ? Funny ... */
- bcopy(LLADDR(sdl), (char *)edst, sizeof(edst));
- if (*edst & 1)
- loop_copy = 1;
- type = 0;
-#ifdef LLC_DEBUG
- {
- int i;
- register struct llc *l = mtod(m, struct llc *);
-
- printf("fddi_output: sending LLC2 pkt to: ");
- for (i=0; i<6; i++)
- printf("%x ", edst[i] & 0xff);
- printf(" len 0x%x dsap 0x%x ssap 0x%x control 0x%x\n",
- type & 0xff, l->llc_dsap & 0xff, l->llc_ssap &0xff,
- l->llc_control & 0xff);
-
- }
-#endif /* LLC_DEBUG */
- } break;
-#endif /* LLC */
case pseudo_AF_HDRCMPLT:
{
@@ -583,89 +507,6 @@ fddi_input(ifp, fh, m)
break;
}
#endif /* INET || NS */
-#ifdef ISO
- case LLC_ISO_LSAP:
- switch (l->llc_control) {
- case LLC_UI:
- /* LLC_UI_P forbidden in class 1 service */
- if ((l->llc_dsap == LLC_ISO_LSAP) &&
- (l->llc_ssap == LLC_ISO_LSAP)) {
- /* LSAP for ISO */
- m->m_data += 3; /* XXX */
- m->m_len -= 3; /* XXX */
- m->m_pkthdr.len -= 3; /* XXX */
- M_PREPEND(m, sizeof *fh, M_DONTWAIT);
- if (m == 0)
- return;
- *mtod(m, struct fddi_header *) = *fh;
- IFDEBUG(D_ETHER)
- printf("clnp packet");
- ENDDEBUG
- schednetisr(NETISR_ISO);
- inq = &clnlintrq;
- break;
- }
- goto dropanyway;
-
- case LLC_XID:
- case LLC_XID_P:
- if(m->m_len < 6)
- goto dropanyway;
- l->llc_window = 0;
- l->llc_fid = 9;
- l->llc_class = 1;
- l->llc_dsap = l->llc_ssap = 0;
- /* Fall through to */
- case LLC_TEST:
- case LLC_TEST_P:
- {
- struct sockaddr sa;
- register struct ether_header *eh;
- struct arpcom *ac = (struct arpcom *) ifp;
- int i;
- u_char c = l->llc_dsap;
-
- l->llc_dsap = l->llc_ssap;
- l->llc_ssap = c;
- if (m->m_flags & (M_BCAST | M_MCAST))
- bcopy((caddr_t)ac->ac_enaddr,
- (caddr_t)eh->ether_dhost, 6);
- sa.sa_family = AF_UNSPEC;
- sa.sa_len = sizeof(sa);
- eh = (struct ether_header *)sa.sa_data;
- for (i = 0; i < 6; i++) {
- eh->ether_shost[i] = fh->fddi_dhost[i];
- eh->ether_dhost[i] = fh->fddi_shost[i];
- }
- eh->ether_type = 0;
- ifp->if_output(ifp, m, &sa, NULL);
- return;
- }
- default:
- m_freem(m);
- return;
- }
- break;
-#endif /* ISO */
-#ifdef LLC
- case LLC_X25_LSAP:
- {
- M_PREPEND(m, sizeof(struct sdl_hdr) , M_DONTWAIT);
- if (m == 0)
- return;
- if ( !sdl_sethdrif(ifp, fh->fddi_shost, LLC_X25_LSAP,
- fh->fddi_dhost, LLC_X25_LSAP, 6,
- mtod(m, struct sdl_hdr *)))
- panic("ETHER cons addr failure");
- mtod(m, struct sdl_hdr *)->sdlhdr_len = m->m_pkthdr.len - sizeof(struct sdl_hdr);
-#ifdef LLC_DEBUG
- printf("llc packet\n");
-#endif /* LLC_DEBUG */
- schednetisr(NETISR_CCITT);
- inq = &llcintrq;
- break;
- }
-#endif /* LLC */
default:
/* printf("fddi_input: unknown dsap 0x%x\n", l->llc_dsap); */
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index a4f37cd..3efef6d 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -80,11 +80,6 @@
#include <netns/ns_if.h>
#endif
-#ifdef ISO
-#include <netiso/iso.h>
-#include <netiso/iso_var.h>
-#endif
-
#ifdef NETATALK
#include <netatalk/at.h>
#include <netatalk/at_var.h>
@@ -183,7 +178,6 @@ contiguousfail:
case AF_INET6:
case AF_IPX:
case AF_NS:
- case AF_ISO:
case AF_APPLETALK:
break;
default:
@@ -286,12 +280,6 @@ if_simloop(ifp, m, dst, hlen)
isr = NETISR_NS;
break;
#endif
-#ifdef ISO
- case AF_ISO:
- ifq = &clnlintrq;
- isr = NETISR_ISO;
- break;
-#endif
#ifdef NETATALK
case AF_APPLETALK:
ifq = &atintrq2;
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index e02ef90..36ede2b 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -92,13 +92,6 @@
#include <netns/ns_if.h>
#endif
-#ifdef ISO
-#include <netiso/argo_debug.h>
-#include <netiso/iso.h>
-#include <netiso/iso_var.h>
-#include <netiso/iso_snpac.h>
-#endif
-
#include <net/if_sppp.h>
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
@@ -537,15 +530,6 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
}
break;
#endif
-#ifdef ISO
- case PPP_ISO:
- /* OSI NLCP not implemented yet */
- if (sp->pp_phase == PHASE_NETWORK) {
- schednetisr (NETISR_ISO);
- inq = &clnlintrq;
- }
- break;
-#endif
}
break;
case CISCO_MULTICAST:
@@ -770,13 +754,6 @@ sppp_output(struct ifnet *ifp, struct mbuf *m,
ETHERTYPE_IPX : PPP_IPX);
break;
#endif
-#ifdef ISO
- case AF_ISO: /* ISO OSI Protocol */
- if (sp->pp_mode == IFF_CISCO)
- goto nosupport;
- h->protocol = htons (PPP_ISO);
- break;
-#endif
nosupport:
default:
m_freem (m);
diff --git a/sys/net/netisr.h b/sys/net/netisr.h
index 563c4ec..3ae1d13 100644
--- a/sys/net/netisr.h
+++ b/sys/net/netisr.h
@@ -45,9 +45,6 @@
* level for the clock (so you can enter the network in routines called
* at timeout time).
*/
-#if defined(vax) || defined(tahoe)
-#define setsoftnet() mtpr(SIRR, 12)
-#endif
/*
* Each ``pup-level-1'' input queue has a bit in a ``netisr'' status
@@ -55,41 +52,29 @@
* interrupt used for scheduling the network code to calls
* on the lowest level routine of each protocol.
*/
-#define NETISR_RAW 0 /* same as AF_UNSPEC */
#define NETISR_IP 2 /* same as AF_INET */
-#define NETISR_IMP 3 /* same as AF_IMPLINK */
#define NETISR_NS 6 /* same as AF_NS */
-#define NETISR_ISO 7 /* same as AF_ISO */
-#define NETISR_CCITT 10 /* same as AF_CCITT */
#define NETISR_ATALK 16 /* same as AF_APPLETALK */
#define NETISR_ARP 18 /* same as AF_LINK */
#define NETISR_IPX 23 /* same as AF_IPX */
#define NETISR_USB 25 /* USB soft interrupt */
-#define NETISR_ISDN 26 /* same as AF_E164 */
#define NETISR_PPP 27 /* PPP soft interrupt */
#define NETISR_IPV6 28 /* same as AF_INET6 */
#define NETISR_NATM 29 /* same as AF_NATM */
#define NETISR_NETGRAPH 31 /* same as AF_NETGRAPH */
-#define schednetisr(anisr) { netisr |= 1<<(anisr); setsoftnet(); }
#ifndef LOCORE
#ifdef _KERNEL
+
extern volatile unsigned int netisr; /* scheduling bits for network */
+#define schednetisr(anisr) { netisr |= 1 << (anisr); setsoftnet(); }
typedef void netisr_t __P((void));
-struct netisrtab {
- int nit_num;
- netisr_t *nit_isr;
-};
-
int register_netisr __P((int, netisr_t *));
-void netisr_sysinit __P((void *));
+int unregister_netisr __P((int));
-#define NETISR_SET(num, isr) \
- static struct netisrtab nisr_##num = { num, isr }; \
- SYSINIT(nisr_##num, SI_SUB_CPU, SI_ORDER_ANY, netisr_sysinit, &nisr_##num)
#endif
#endif
diff --git a/sys/net/route.h b/sys/net/route.h
index 68d21fc..c9c5c3f 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -255,7 +255,6 @@ struct route_cb {
int ip6_count;
int ipx_count;
int ns_count;
- int iso_count;
int any_count;
};
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 265a1c7..e03eb61 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -142,9 +142,6 @@ rts_attach(struct socket *so, int proto, struct proc *p)
case AF_NS:
route_cb.ns_count++;
break;
- case AF_ISO:
- route_cb.iso_count++;
- break;
}
rp->rcb_faddr = &route_src;
route_cb.any_count++;
@@ -198,9 +195,6 @@ rts_detach(struct socket *so)
case AF_NS:
route_cb.ns_count--;
break;
- case AF_ISO:
- route_cb.iso_count--;
- break;
}
route_cb.any_count--;
}
diff --git a/sys/netatalk/ddp_input.c b/sys/netatalk/ddp_input.c
index ad15d81..f3ba14c 100644
--- a/sys/netatalk/ddp_input.c
+++ b/sys/netatalk/ddp_input.c
@@ -98,7 +98,13 @@ atintr( void )
return;
}
-NETISR_SET(NETISR_ATALK, atintr);
+static void
+netisr_atalk_setup(void *dummy __unused)
+{
+
+ register_netisr(NETISR_ATALK, atintr);
+}
+SYSINIT(atalk_setup, SI_SUB_CPU, SI_ORDER_ANY, netisr_atalk_setup, NULL);
static void
ddp_input( m, ifp, elh, phase )
diff --git a/sys/netatm/atm_subr.c b/sys/netatm/atm_subr.c
index a328a78..beed42b 100644
--- a/sys/netatm/atm_subr.c
+++ b/sys/netatm/atm_subr.c
@@ -126,6 +126,9 @@ atm_initialize()
#ifdef sgi
atm_intr_index = register_isr(atm_intr);
#endif
+#ifdef __FreeBSD__
+ register_netisr(NETISR_ATM, atm_intr);
+#endif
/*
* Initialize subsystems
@@ -926,10 +929,6 @@ atm_intr()
}
}
-#ifdef __FreeBSD__
-NETISR_SET(NETISR_ATM, atm_intr);
-#endif
-
/*
* Print a pdu buffer chain
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 8c92de3..c87b72d 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -161,6 +161,7 @@ arp_rtrequest(req, rt, sa)
arpinit_done = 1;
LIST_INIT(&llinfo_arp);
timeout(arptimer, (caddr_t)0, hz);
+ register_netisr(NETISR_ARP, arpintr);
}
if (rt->rt_flags & RTF_GATEWAY)
return;
@@ -458,9 +459,6 @@ arpintr()
}
}
-NETISR_SET(NETISR_ARP, arpintr);
-
-
#ifdef INET
/*
* ARP for Internet protocols on 10 Mb/s Ethernet.
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index e3243f8..2fdfddf 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -184,21 +184,6 @@ struct ipprotosw inetsw[] = {
&div_usrreqs,
},
#endif
-#ifdef TPIP
-{ SOCK_SEQPACKET,&inetdomain, IPPROTO_TP, PR_CONNREQUIRED|PR_WANTRCVD,
- tpip_input, 0, tpip_ctlinput, tp_ctloutput,
- tp_usrreq,
- tp_init, 0, tp_slowtimo, tp_drain,
-},
-#endif
-/* EON (ISO CLNL over IP) */
-#ifdef EON
-{ SOCK_RAW, &inetdomain, IPPROTO_EON, 0,
- eoninput, 0, eonctlinput, 0,
- 0,
- eonprotoinit, 0, 0, 0,
-},
-#endif
#ifdef IPXIP
{ SOCK_RAW, &inetdomain, IPPROTO_IDP, PR_ATOMIC|PR_ADDR,
ipxip_input, 0, ipxip_ctlinput, 0,
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index b1eb90d..26cfdc8 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -244,6 +244,8 @@ ip_init()
ip_id = time_second & 0xffff;
ipintrq.ifq_maxlen = ipqmaxlen;
+
+ register_netisr(NETISR_IP, ipintr);
}
static struct sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET };
@@ -770,8 +772,6 @@ ipintr(void)
}
}
-NETISR_SET(NETISR_IP, ipintr);
-
/*
* Take incoming datagram fragment and try to reassemble it into
* whole datagram. If a chain for reassembly of this datagram already
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 9c1ca0f..ca13eca 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -173,6 +173,7 @@ ip6_init()
pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW)
ip6_protox[pr->pr_protocol] = pr - inet6sw;
ip6intrq.ifq_maxlen = ip6qmaxlen;
+ register_netisr(NETISR_IPV6, ip6intr);
nd6_init();
frag6_init();
#ifdef IPV6FIREWALL
@@ -236,8 +237,6 @@ ip6intr()
}
}
-NETISR_SET(NETISR_IPV6, ip6intr);
-
extern struct route_in6 ip6_forward_rt;
void
diff --git a/sys/netipx/ipx_input.c b/sys/netipx/ipx_input.c
index 7494912..db6025d 100644
--- a/sys/netipx/ipx_input.c
+++ b/sys/netipx/ipx_input.c
@@ -92,8 +92,6 @@ static int ipxqmaxlen = IFQ_MAXLEN;
long ipx_pexseq;
const int ipxintrq_present = 1;
-NETISR_SET(NETISR_IPX, ipxintr);
-
static int ipx_do_route(struct ipx_addr *src, struct route *ro);
static void ipx_undo_route(struct route *ro);
static void ipx_forward(struct mbuf *m);
@@ -119,6 +117,8 @@ ipx_init()
ipx_hostmask.sipx_len = 12;
ipx_hostmask.sipx_addr.x_net = ipx_broadnet;
ipx_hostmask.sipx_addr.x_host = ipx_broadhost;
+
+ register_netisr(NETISR_IPX, ipxintr);
}
/*
diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c
index e7fca3d..99a567f 100644
--- a/sys/netnatm/natm.c
+++ b/sys/netnatm/natm.c
@@ -1,4 +1,5 @@
/* $NetBSD: natm.c,v 1.5 1996/11/09 03:26:26 chuck Exp $ */
+/* $FreeBSD$ */
/*
*
@@ -763,7 +764,13 @@ m->m_pkthdr.rcvif = NULL; /* null it out to be safe */
}
#if defined(__FreeBSD__)
-NETISR_SET(NETISR_NATM, natmintr);
+static void
+netisr_natm_setup(void *dummy __unused)
+{
+
+ register_netisr(NETISR_NATM, natmintr);
+}
+SYSINIT(natm_setup, SI_SUB_CPU, SI_ORDER_ANY, netisr_natm_setup, NULL);
#endif
diff --git a/sys/netns/ns_input.c b/sys/netns/ns_input.c
index 18b1025..a10f99b 100644
--- a/sys/netns/ns_input.c
+++ b/sys/netns/ns_input.c
@@ -96,6 +96,7 @@ ns_init()
ns_hostmask.sns_len = 12;
ns_hostmask.sns_addr.x_net = ns_broadnet;
ns_hostmask.sns_addr.x_host = ns_broadhost;
+ register_netisr(NETISR_NS, nsintr);
}
/*
@@ -239,8 +240,6 @@ bad:
goto next;
}
-NETISR_SET(NETISR_NS, nsintr);
-
u_char nsctlerrmap[PRC_NCMDS] = {
ECONNABORTED, ECONNABORTED, 0, 0,
0, 0, EHOSTDOWN, EHOSTUNREACH,
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index 28fce31..2e19721 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -74,9 +74,6 @@
#include <nfs/nfsrtt.h>
#include <netinet/in.h>
-#ifdef ISO
-#include <netiso/iso.h>
-#endif
/*
* Data items converted to xdr at startup, since they are constant
@@ -2027,21 +2024,6 @@ netaddr_match(family, haddr, nam)
inetaddr->sin_addr.s_addr == haddr->had_inetaddr)
return (1);
break;
-#ifdef ISO
- case AF_ISO:
- {
- register struct sockaddr_iso *isoaddr1, *isoaddr2;
-
- isoaddr1 = (struct sockaddr_iso *)nam;
- isoaddr2 = (struct sockaddr_iso *)haddr->had_nam;
- if (isoaddr1->siso_family == AF_ISO &&
- isoaddr1->siso_nlen > 0 &&
- isoaddr1->siso_nlen == isoaddr2->siso_nlen &&
- SAME_ISOADDR(isoaddr1, isoaddr2))
- return (1);
- break;
- }
-#endif /* ISO */
default:
break;
};
diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c
index fb02f2c..fea4a99 100644
--- a/sys/nfs/nfs_nqlease.c
+++ b/sys/nfs/nfs_nqlease.c
@@ -393,11 +393,6 @@ nqsrv_addhost(lph, slp, nam)
lph->lph_flag |= (LC_VALID | LC_UDP);
lph->lph_inetaddr = saddr->sin_addr.s_addr;
lph->lph_port = saddr->sin_port;
-#ifdef ISO
- } else if (nsso && nsso->so_proto->pr_protocol == ISOPROTO_CLTP) {
- lph->lph_nam = dup_sockaddr(nam, 1);
- lph->lph_flag |= (LC_VALID | LC_CLTP);
-#endif
} else {
lph->lph_flag |= (LC_VALID | LC_SREF);
slp->ns_sref++;
@@ -467,17 +462,11 @@ nqsrv_cmpnam(slp, nam, lph)
nsso = slp->ns_so;
if (nsso && nsso->so_proto->pr_protocol == IPPROTO_UDP) {
addr = nam;
-#ifdef ISO
- } else if (nsso && nsso->so_proto->pr_protocol == ISOPROTO_CLTP) {
- addr = nam;
-#endif
} else {
addr = slp->ns_nam;
}
if (lph->lph_flag & LC_UDP) {
ret = netaddr_match(AF_INET, &lph->lph_haddr, addr);
- } else if (lph->lph_flag & LC_CLTP) {
- ret = netaddr_match(AF_ISO, &lph->lph_claddr, addr);
} else {
if ((lph->lph_slp->ns_flag & SLP_VALID) == 0)
return (0);
@@ -531,8 +520,6 @@ nqsrv_send_eviction(vp, lp, slp, nam, cred)
saddr->sin_family = AF_INET;
saddr->sin_addr.s_addr = lph->lph_inetaddr;
saddr->sin_port = lph->lph_port;
- } else if (lph->lph_flag & LC_CLTP) {
- nam2 = lph->lph_nam;
} else if (lph->lph_slp->ns_flag & SLP_VALID) {
nam2 = (struct sockaddr *)0;
} else {
@@ -575,7 +562,7 @@ nqsrv_send_eviction(vp, lp, slp, nam, cred)
* nfs_sndlock if PR_CONNREQUIRED XXX
*/
- if ((lph->lph_flag & (LC_UDP | LC_CLTP)) == 0 &&
+ if ((lph->lph_flag & LC_UDP) == 0 &&
((lph->lph_slp->ns_flag & SLP_VALID) == 0 ||
nfs_slplock(lph->lph_slp, 0) == 0)) {
m_freem(m);
@@ -700,8 +687,6 @@ nqnfs_serverd()
i = 0;
ok = 1;
while (ok && (lph->lph_flag & LC_VALID)) {
- if (lph->lph_flag & LC_CLTP)
- FREE(lph->lph_nam, M_SONAME);
if (lph->lph_flag & LC_SREF)
nfsrv_slpderef(lph->lph_slp);
if (++i == len) {
diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c
index 6f9d42f..9eb168f 100644
--- a/sys/nfs/nfs_srvcache.c
+++ b/sys/nfs/nfs_srvcache.c
@@ -51,9 +51,6 @@
#include <sys/socketvar.h> /* for dup_sockaddr */
#include <netinet/in.h>
-#ifdef ISO
-#include <netiso/iso.h>
-#endif
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
#include <nfs/nfs.h>
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 28fce31..2e19721 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -74,9 +74,6 @@
#include <nfs/nfsrtt.h>
#include <netinet/in.h>
-#ifdef ISO
-#include <netiso/iso.h>
-#endif
/*
* Data items converted to xdr at startup, since they are constant
@@ -2027,21 +2024,6 @@ netaddr_match(family, haddr, nam)
inetaddr->sin_addr.s_addr == haddr->had_inetaddr)
return (1);
break;
-#ifdef ISO
- case AF_ISO:
- {
- register struct sockaddr_iso *isoaddr1, *isoaddr2;
-
- isoaddr1 = (struct sockaddr_iso *)nam;
- isoaddr2 = (struct sockaddr_iso *)haddr->had_nam;
- if (isoaddr1->siso_family == AF_ISO &&
- isoaddr1->siso_nlen > 0 &&
- isoaddr1->siso_nlen == isoaddr2->siso_nlen &&
- SAME_ISOADDR(isoaddr1, isoaddr2))
- return (1);
- break;
- }
-#endif /* ISO */
default:
break;
};
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index 15c6231..14ff8d1 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -59,9 +59,6 @@
#include <netinet/in.h>
#include <netinet/tcp.h>
-#ifdef ISO
-#include <netiso/iso.h>
-#endif
#include <nfs/xdr_subs.h>
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
@@ -339,15 +336,6 @@ nfssvc_addsock(fp, mynam, p)
FREE(mynam, M_SONAME);
return (EPERM);
}
-#ifdef ISO
- } else if (so->so_proto->pr_protocol == ISOPROTO_CLTP) {
- tslp = nfs_cltpsock;
- if (tslp->ns_flag & SLP_VALID) {
- if (mynam != NULL)
- FREE(mynam, M_SONAME);
- return (EPERM);
- }
-#endif /* ISO */
}
#endif
if (so->so_type == SOCK_STREAM)
diff --git a/sys/nfs/nqnfs.h b/sys/nfs/nqnfs.h
index 36e5006..15b5af5 100644
--- a/sys/nfs/nqnfs.h
+++ b/sys/nfs/nqnfs.h
@@ -96,17 +96,12 @@ struct nqhost {
union nethostaddr udp_haddr;
} un_udp;
struct {
- union nethostaddr connless_haddr;
- } un_connless;
- struct {
int dummy;
} un_conn;
} lph_un;
};
#define lph_haddr lph_un.un_udp.udp_haddr
#define lph_inetaddr lph_un.un_udp.udp_haddr.had_inetaddr
-#define lph_claddr lph_un.un_connless.connless_haddr
-#define lph_nam lph_un.un_connless.connless_haddr.had_nam
struct nqlease {
LIST_ENTRY(nqlease) lc_hash; /* Fhandle hash list */
@@ -128,7 +123,7 @@ struct nqlease {
#define LC_WANTED 0x0010 /* Lock wanted */
#define LC_EXPIREDWANTED 0x0020 /* Want lease when expired */
#define LC_UDP 0x0040 /* Host address for udp socket */
-#define LC_CLTP 0x0080 /* Host address for other connectionless */
+/* 0x0080 free */
#define LC_LOCAL 0x0100 /* Host is server */
#define LC_VACATED 0x0200 /* Host has vacated lease */
#define LC_WRITTEN 0x0400 /* Recently wrote to the leased file */
diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c
index 15c6231..14ff8d1 100644
--- a/sys/nfsclient/nfs_nfsiod.c
+++ b/sys/nfsclient/nfs_nfsiod.c
@@ -59,9 +59,6 @@
#include <netinet/in.h>
#include <netinet/tcp.h>
-#ifdef ISO
-#include <netiso/iso.h>
-#endif
#include <nfs/xdr_subs.h>
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
@@ -339,15 +336,6 @@ nfssvc_addsock(fp, mynam, p)
FREE(mynam, M_SONAME);
return (EPERM);
}
-#ifdef ISO
- } else if (so->so_proto->pr_protocol == ISOPROTO_CLTP) {
- tslp = nfs_cltpsock;
- if (tslp->ns_flag & SLP_VALID) {
- if (mynam != NULL)
- FREE(mynam, M_SONAME);
- return (EPERM);
- }
-#endif /* ISO */
}
#endif
if (so->so_type == SOCK_STREAM)
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 28fce31..2e19721 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -74,9 +74,6 @@
#include <nfs/nfsrtt.h>
#include <netinet/in.h>
-#ifdef ISO
-#include <netiso/iso.h>
-#endif
/*
* Data items converted to xdr at startup, since they are constant
@@ -2027,21 +2024,6 @@ netaddr_match(family, haddr, nam)
inetaddr->sin_addr.s_addr == haddr->had_inetaddr)
return (1);
break;
-#ifdef ISO
- case AF_ISO:
- {
- register struct sockaddr_iso *isoaddr1, *isoaddr2;
-
- isoaddr1 = (struct sockaddr_iso *)nam;
- isoaddr2 = (struct sockaddr_iso *)haddr->had_nam;
- if (isoaddr1->siso_family == AF_ISO &&
- isoaddr1->siso_nlen > 0 &&
- isoaddr1->siso_nlen == isoaddr2->siso_nlen &&
- SAME_ISOADDR(isoaddr1, isoaddr2))
- return (1);
- break;
- }
-#endif /* ISO */
default:
break;
};
diff --git a/sys/nfsserver/nfs_srvcache.c b/sys/nfsserver/nfs_srvcache.c
index 6f9d42f..9eb168f 100644
--- a/sys/nfsserver/nfs_srvcache.c
+++ b/sys/nfsserver/nfs_srvcache.c
@@ -51,9 +51,6 @@
#include <sys/socketvar.h> /* for dup_sockaddr */
#include <netinet/in.h>
-#ifdef ISO
-#include <netiso/iso.h>
-#endif
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
#include <nfs/nfs.h>
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 28fce31..2e19721 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -74,9 +74,6 @@
#include <nfs/nfsrtt.h>
#include <netinet/in.h>
-#ifdef ISO
-#include <netiso/iso.h>
-#endif
/*
* Data items converted to xdr at startup, since they are constant
@@ -2027,21 +2024,6 @@ netaddr_match(family, haddr, nam)
inetaddr->sin_addr.s_addr == haddr->had_inetaddr)
return (1);
break;
-#ifdef ISO
- case AF_ISO:
- {
- register struct sockaddr_iso *isoaddr1, *isoaddr2;
-
- isoaddr1 = (struct sockaddr_iso *)nam;
- isoaddr2 = (struct sockaddr_iso *)haddr->had_nam;
- if (isoaddr1->siso_family == AF_ISO &&
- isoaddr1->siso_nlen > 0 &&
- isoaddr1->siso_nlen == isoaddr2->siso_nlen &&
- SAME_ISOADDR(isoaddr1, isoaddr2))
- return (1);
- break;
- }
-#endif /* ISO */
default:
break;
};
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index 15c6231..14ff8d1 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -59,9 +59,6 @@
#include <netinet/in.h>
#include <netinet/tcp.h>
-#ifdef ISO
-#include <netiso/iso.h>
-#endif
#include <nfs/xdr_subs.h>
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
@@ -339,15 +336,6 @@ nfssvc_addsock(fp, mynam, p)
FREE(mynam, M_SONAME);
return (EPERM);
}
-#ifdef ISO
- } else if (so->so_proto->pr_protocol == ISOPROTO_CLTP) {
- tslp = nfs_cltpsock;
- if (tslp->ns_flag & SLP_VALID) {
- if (mynam != NULL)
- FREE(mynam, M_SONAME);
- return (EPERM);
- }
-#endif /* ISO */
}
#endif
if (so->so_type == SOCK_STREAM)
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index cbb3fb7..b145ded 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -465,16 +465,6 @@ register_netisr(num, handler)
return (0);
}
-void
-netisr_sysinit(data)
- void *data;
-{
- const struct netisrtab *nit;
-
- nit = (const struct netisrtab *)data;
- register_netisr(nit->nit_num, nit->nit_isr);
-}
-
/*
* Send an interrupt to process.
*
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index cbb3fb7..b145ded 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -465,16 +465,6 @@ register_netisr(num, handler)
return (0);
}
-void
-netisr_sysinit(data)
- void *data;
-{
- const struct netisrtab *nit;
-
- nit = (const struct netisrtab *)data;
- register_netisr(nit->nit_num, nit->nit_isr);
-}
-
/*
* Send an interrupt to process.
*
OpenPOWER on IntegriCloud