diff options
author | peter <peter@FreeBSD.org> | 2000-02-13 03:32:07 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2000-02-13 03:32:07 +0000 |
commit | a5441090deef0b9401bd8291ffdca1f66ca5362d (patch) | |
tree | 08db8fae584f4c3cdf2ad5b2ac80c1bd44801d5a /sys/i386 | |
parent | 97c685efe694921d4948ef681efe38f0ad0bac8c (diff) | |
download | FreeBSD-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
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/conf/LINT | 10 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 10 | ||||
-rw-r--r-- | sys/i386/i386/machdep.c | 15 |
3 files changed, 9 insertions, 26 deletions
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); } /* |