Module Name: src
Committed By: ozaki-r
Date: Wed May 20 09:17:18 UTC 2015
Modified Files:
src/sys/arch/acorn32/podulebus: if_ie.c
src/sys/arch/amiga/dev: if_es.c if_qn.c
src/sys/arch/arm/at91: at91emac.c
src/sys/arch/arm/ep93xx: epe.c
src/sys/arch/sun2/dev: if_ec.c
src/sys/arch/sun3/dev: if_ie.c
src/sys/arch/x68k/dev: if_ne_intio.c if_ne_neptune.c
src/sys/dev/cadence: if_cemac.c
src/sys/net: if_ecosubr.c if_ethersubr.c if_fddisubr.c if_hippisubr.c
if_tokensubr.c netisr.h
Log Message:
Remove leftover use of AF_NS and NS option
Unnecessary NETISR_NS is also removed.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/acorn32/podulebus/if_ie.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/amiga/dev/if_es.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/amiga/dev/if_qn.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/at91/at91emac.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/ep93xx/epe.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sun2/dev/if_ec.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/sun3/dev/if_ie.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x68k/dev/if_ne_intio.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x68k/dev/if_ne_neptune.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/cadence/if_cemac.c
cvs rdiff -u -r1.41 -r1.42 src/sys/net/if_ecosubr.c \
src/sys/net/if_hippisubr.c
cvs rdiff -u -r1.207 -r1.208 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.88 -r1.89 src/sys/net/if_fddisubr.c
cvs rdiff -u -r1.66 -r1.67 src/sys/net/if_tokensubr.c
cvs rdiff -u -r1.42 -r1.43 src/sys/net/netisr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn32/podulebus/if_ie.c
diff -u src/sys/arch/acorn32/podulebus/if_ie.c:1.34 src/sys/arch/acorn32/podulebus/if_ie.c:1.35
--- src/sys/arch/acorn32/podulebus/if_ie.c:1.34 Sat Oct 25 10:58:12 2014
+++ src/sys/arch/acorn32/podulebus/if_ie.c Wed May 20 09:17:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.34 2014/10/25 10:58:12 skrll Exp $ */
+/* $NetBSD: if_ie.c,v 1.35 2015/05/20 09:17:17 ozaki-r Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.34 2014/10/25 10:58:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.35 2015/05/20 09:17:17 ozaki-r Exp $");
#define IGNORE_ETHER1_IDROM_CHECKSUM
@@ -94,11 +94,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.
#include <netinet/if_inarp.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
/* Import our data structres */
#include "if_iereg.h"
Index: src/sys/arch/amiga/dev/if_es.c
diff -u src/sys/arch/amiga/dev/if_es.c:1.52 src/sys/arch/amiga/dev/if_es.c:1.53
--- src/sys/arch/amiga/dev/if_es.c:1.52 Wed Jan 22 00:25:16 2014
+++ src/sys/arch/amiga/dev/if_es.c Wed May 20 09:17:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_es.c,v 1.52 2014/01/22 00:25:16 christos Exp $ */
+/* $NetBSD: if_es.c,v 1.53 2015/05/20 09:17:17 ozaki-r Exp $ */
/*
* Copyright (c) 1995 Michael L. Hitch
@@ -33,7 +33,7 @@
#include "opt_ns.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.52 2014/01/22 00:25:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.53 2015/05/20 09:17:17 ozaki-r Exp $");
#include <sys/param.h>
@@ -60,11 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.
#include <netinet/if_inarp.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <machine/cpu.h>
#include <amiga/amiga/device.h>
#include <amiga/amiga/isr.h>
@@ -969,22 +964,6 @@ esioctl(struct ifnet *ifp, u_long cmd, v
arp_ifinit(ifp, ifa);
break;
#endif
-#ifdef NS
- case AF_NS:
- {
- register struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
-
- if (ns_nullhost(*ina))
- ina->x_host =
- *(union ns_host *)LLADDR(ifp->if_sadl);
- else
- bcopy(ina->x_host.c_host,
- LLADDR(ifp->if_sadl), ETHER_ADDR_LEN);
- /* Set new address. */
- esinit(sc);
- break;
- }
-#endif
default:
esinit(sc);
break;
Index: src/sys/arch/amiga/dev/if_qn.c
diff -u src/sys/arch/amiga/dev/if_qn.c:1.39 src/sys/arch/amiga/dev/if_qn.c:1.40
--- src/sys/arch/amiga/dev/if_qn.c:1.39 Sat Oct 27 17:17:29 2012
+++ src/sys/arch/amiga/dev/if_qn.c Wed May 20 09:17:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qn.c,v 1.39 2012/10/27 17:17:29 chs Exp $ */
+/* $NetBSD: if_qn.c,v 1.40 2015/05/20 09:17:17 ozaki-r Exp $ */
/*
* Copyright (c) 1995 Mika Kortelainen
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.39 2012/10/27 17:17:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.40 2015/05/20 09:17:17 ozaki-r Exp $");
#include "qn.h"
#if NQN > 0
@@ -107,11 +107,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.
#include <netinet/if_inarp.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <machine/cpu.h>
#include <amiga/amiga/device.h>
#include <amiga/amiga/isr.h>
@@ -828,22 +823,6 @@ qnioctl(register struct ifnet *ifp, u_lo
arp_ifinit(ifp, ifa);
break;
#endif
-#ifdef NS
- case AF_NS:
- {
- register struct ns_addr *ina = &(IA_SNS(ifa)->sns_addr);
-
- if (ns_nullhost(*ina))
- ina->x_host =
- *(union ns_host *)LLADDR(ifp->if_sadl);
- else
- bcopy(ina->x_host.c_host,
- LLADDR(ifp->if_sadl), ETHER_ADDR_LEN);
- qnstop(sc);
- qninit(sc);
- break;
- }
-#endif
default:
log(LOG_INFO, "qn:sa_family:default (not tested)\n");
qnstop(sc);
Index: src/sys/arch/arm/at91/at91emac.c
diff -u src/sys/arch/arm/at91/at91emac.c:1.13 src/sys/arch/arm/at91/at91emac.c:1.14
--- src/sys/arch/arm/at91/at91emac.c:1.13 Mon Nov 12 18:00:36 2012
+++ src/sys/arch/arm/at91/at91emac.c Wed May 20 09:17:17 2015
@@ -1,5 +1,5 @@
-/* $Id: at91emac.c,v 1.13 2012/11/12 18:00:36 skrll Exp $ */
-/* $NetBSD: at91emac.c,v 1.13 2012/11/12 18:00:36 skrll Exp $ */
+/* $Id: at91emac.c,v 1.14 2015/05/20 09:17:17 ozaki-r Exp $ */
+/* $NetBSD: at91emac.c,v 1.14 2015/05/20 09:17:17 ozaki-r Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.13 2012/11/12 18:00:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.14 2015/05/20 09:17:17 ozaki-r Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -68,11 +68,6 @@ __KERNEL_RCSID(0, "$NetBSD: at91emac.c,v
#include <netinet/if_inarp.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <net/bpf.h>
#include <net/bpfdesc.h>
Index: src/sys/arch/arm/ep93xx/epe.c
diff -u src/sys/arch/arm/ep93xx/epe.c:1.31 src/sys/arch/arm/ep93xx/epe.c:1.32
--- src/sys/arch/arm/ep93xx/epe.c:1.31 Sat Mar 8 18:08:48 2014
+++ src/sys/arch/arm/ep93xx/epe.c Wed May 20 09:17:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: epe.c,v 1.31 2014/03/08 18:08:48 skrll Exp $ */
+/* $NetBSD: epe.c,v 1.32 2015/05/20 09:17:17 ozaki-r Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.31 2014/03/08 18:08:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.32 2015/05/20 09:17:17 ozaki-r Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -65,11 +65,6 @@ __KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.31
#include <netinet/if_inarp.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <net/bpf.h>
#include <net/bpfdesc.h>
Index: src/sys/arch/sun2/dev/if_ec.c
diff -u src/sys/arch/sun2/dev/if_ec.c:1.22 src/sys/arch/sun2/dev/if_ec.c:1.23
--- src/sys/arch/sun2/dev/if_ec.c:1.22 Mon Apr 13 21:18:42 2015
+++ src/sys/arch/sun2/dev/if_ec.c Wed May 20 09:17:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ec.c,v 1.22 2015/04/13 21:18:42 riastradh Exp $ */
+/* $NetBSD: if_ec.c,v 1.23 2015/05/20 09:17:17 ozaki-r Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.22 2015/04/13 21:18:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.23 2015/05/20 09:17:17 ozaki-r Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -65,11 +65,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.
#include <netinet/if_inarp.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <net/bpf.h>
#include <net/bpfdesc.h>
Index: src/sys/arch/sun3/dev/if_ie.c
diff -u src/sys/arch/sun3/dev/if_ie.c:1.55 src/sys/arch/sun3/dev/if_ie.c:1.56
--- src/sys/arch/sun3/dev/if_ie.c:1.55 Mon Apr 5 07:19:32 2010
+++ src/sys/arch/sun3/dev/if_ie.c Wed May 20 09:17:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.55 2010/04/05 07:19:32 joerg Exp $ */
+/* $NetBSD: if_ie.c,v 1.56 2015/05/20 09:17:17 ozaki-r Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum.
@@ -98,7 +98,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.55 2010/04/05 07:19:32 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.56 2015/05/20 09:17:17 ozaki-r Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -130,11 +130,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.
#include <netinet/if_inarp.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
@@ -1520,23 +1515,6 @@ ieioctl(struct ifnet *ifp, u_long cmd, v
arp_ifinit(ifp, ifa);
break;
#endif
-#ifdef NS
- /* XXX - This code is probably wrong. */
- case AF_NS:
- {
- struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
-
- if (ns_nullhost(*ina))
- ina->x_host =
- *(union ns_host *)LLADDR(ifp->if_sadl);
- else
- memcpy(LLADDR(ifp->if_sadl),
- ina->x_host.c_host, ETHER_ADDR_LEN);
- /* Set new address. */
- ieinit(sc);
- break;
- }
-#endif /* NS */
default:
ieinit(sc);
break;
Index: src/sys/arch/x68k/dev/if_ne_intio.c
diff -u src/sys/arch/x68k/dev/if_ne_intio.c:1.17 src/sys/arch/x68k/dev/if_ne_intio.c:1.18
--- src/sys/arch/x68k/dev/if_ne_intio.c:1.17 Sun Oct 16 03:10:18 2011
+++ src/sys/arch/x68k/dev/if_ne_intio.c Wed May 20 09:17:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_intio.c,v 1.17 2011/10/16 03:10:18 isaki Exp $ */
+/* $NetBSD: if_ne_intio.c,v 1.18 2015/05/20 09:17:18 ozaki-r Exp $ */
/*
* Copyright (c) 2001 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_intio.c,v 1.17 2011/10/16 03:10:18 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_intio.c,v 1.18 2015/05/20 09:17:18 ozaki-r Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -55,11 +55,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ne_intio.
#include <netinet/if_inarp.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#if BPFILTER > 0
#include <net/bpf.h>
#include <net/bpfdesc.h>
Index: src/sys/arch/x68k/dev/if_ne_neptune.c
diff -u src/sys/arch/x68k/dev/if_ne_neptune.c:1.20 src/sys/arch/x68k/dev/if_ne_neptune.c:1.21
--- src/sys/arch/x68k/dev/if_ne_neptune.c:1.20 Wed Mar 3 13:39:57 2010
+++ src/sys/arch/x68k/dev/if_ne_neptune.c Wed May 20 09:17:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_neptune.c,v 1.20 2010/03/03 13:39:57 tsutsui Exp $ */
+/* $NetBSD: if_ne_neptune.c,v 1.21 2015/05/20 09:17:18 ozaki-r Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_neptune.c,v 1.20 2010/03/03 13:39:57 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_neptune.c,v 1.21 2015/05/20 09:17:18 ozaki-r Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -59,11 +59,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ne_neptun
#include <netinet/if_inarp.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <machine/bus.h>
#include <dev/ic/dp8390reg.h>
Index: src/sys/dev/cadence/if_cemac.c
diff -u src/sys/dev/cadence/if_cemac.c:1.1 src/sys/dev/cadence/if_cemac.c:1.2
--- src/sys/dev/cadence/if_cemac.c:1.1 Fri Jan 23 12:34:09 2015
+++ src/sys/dev/cadence/if_cemac.c Wed May 20 09:17:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cemac.c,v 1.1 2015/01/23 12:34:09 hkenken Exp $ */
+/* $NetBSD: if_cemac.c,v 1.2 2015/05/20 09:17:18 ozaki-r Exp $ */
/*
* Copyright (c) 2015 Genetec Corporation. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.1 2015/01/23 12:34:09 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.2 2015/05/20 09:17:18 ozaki-r Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -75,11 +75,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v
#include <netinet/if_inarp.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <net/bpf.h>
#include <net/bpfdesc.h>
Index: src/sys/net/if_ecosubr.c
diff -u src/sys/net/if_ecosubr.c:1.41 src/sys/net/if_ecosubr.c:1.42
--- src/sys/net/if_ecosubr.c:1.41 Sun Nov 16 16:20:01 2014
+++ src/sys/net/if_ecosubr.c Wed May 20 09:17:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ecosubr.c,v 1.41 2014/11/16 16:20:01 ozaki-r Exp $ */
+/* $NetBSD: if_ecosubr.c,v 1.42 2015/05/20 09:17:18 ozaki-r Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ecosubr.c,v 1.41 2014/11/16 16:20:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ecosubr.c,v 1.42 2015/05/20 09:17:18 ozaki-r Exp $");
#include "opt_inet.h"
@@ -191,7 +191,7 @@ eco_output(struct ifnet *ifp, struct mbu
} else
senderr(EHOSTUNREACH);
}
- if ((rt->rt_flags & RTF_GATEWAY) && dst->sa_family != AF_NS) {
+ if ((rt->rt_flags & RTF_GATEWAY)) {
if (rt->rt_gwroute == 0)
goto lookup;
if (((rt = rt->rt_gwroute)->rt_flags & RTF_UP) == 0) {
Index: src/sys/net/if_hippisubr.c
diff -u src/sys/net/if_hippisubr.c:1.41 src/sys/net/if_hippisubr.c:1.42
--- src/sys/net/if_hippisubr.c:1.41 Thu Jun 5 23:48:16 2014
+++ src/sys/net/if_hippisubr.c Wed May 20 09:17:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hippisubr.c,v 1.41 2014/06/05 23:48:16 rmind Exp $ */
+/* $NetBSD: if_hippisubr.c,v 1.42 2015/05/20 09:17:18 ozaki-r Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hippisubr.c,v 1.41 2014/06/05 23:48:16 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hippisubr.c,v 1.42 2015/05/20 09:17:18 ozaki-r Exp $");
#include "opt_inet.h"
@@ -112,7 +112,7 @@ hippi_output(struct ifnet *ifp, struct m
} else
senderr(EHOSTUNREACH);
}
- if ((rt->rt_flags & RTF_GATEWAY) && dst->sa_family != AF_NS) {
+ if ((rt->rt_flags & RTF_GATEWAY)) {
if (rt->rt_gwroute == 0)
goto lookup;
if (((rt = rt->rt_gwroute)->rt_flags & RTF_UP) == 0) {
Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.207 src/sys/net/if_ethersubr.c:1.208
--- src/sys/net/if_ethersubr.c:1.207 Mon Apr 13 22:46:57 2015
+++ src/sys/net/if_ethersubr.c Wed May 20 09:17:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.207 2015/04/13 22:46:57 riastradh Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.208 2015/05/20 09:17:18 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.207 2015/04/13 22:46:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.208 2015/05/20 09:17:18 ozaki-r Exp $");
#include "opt_inet.h"
#include "opt_atalk.h"
@@ -255,7 +255,7 @@ ether_output(struct ifnet * const ifp0,
} else
senderr(EHOSTUNREACH);
}
- if ((rt->rt_flags & RTF_GATEWAY) && dst->sa_family != AF_NS) {
+ if ((rt->rt_flags & RTF_GATEWAY)) {
if (rt->rt_gwroute == NULL)
goto lookup;
if (((rt = rt->rt_gwroute)->rt_flags & RTF_UP) == 0) {
Index: src/sys/net/if_fddisubr.c
diff -u src/sys/net/if_fddisubr.c:1.88 src/sys/net/if_fddisubr.c:1.89
--- src/sys/net/if_fddisubr.c:1.88 Sat Jun 7 09:34:02 2014
+++ src/sys/net/if_fddisubr.c Wed May 20 09:17:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fddisubr.c,v 1.88 2014/06/07 09:34:02 martin Exp $ */
+/* $NetBSD: if_fddisubr.c,v 1.89 2015/05/20 09:17:18 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.88 2014/06/07 09:34:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.89 2015/05/20 09:17:18 ozaki-r Exp $");
#include "opt_gateway.h"
#include "opt_inet.h"
@@ -462,10 +462,8 @@ fddi_input(struct ifnet *ifp, struct mbu
#if defined(INET) || defined(INET6)
pktqueue_t *pktq = NULL;
#endif
-#if defined(NS) || defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(DECNET) || defined(IPX) || defined(NETATALK)
struct ifqueue *inq = NULL;
-#endif
-#if defined(NS) || defined(DECNET) || defined(IPX) || defined(NETATALK)
int isr = 0;
int s;
#endif
@@ -508,7 +506,7 @@ fddi_input(struct ifnet *ifp, struct mbu
l = (struct llc *)(fh+1);
switch (l->llc_dsap) {
-#if defined(INET) || defined(INET6) || defined(NS) || defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(INET) || defined(INET6) || defined(DECNET) || defined(IPX) || defined(NETATALK)
case LLC_SNAP_LSAP:
{
uint16_t etype;
@@ -559,7 +557,7 @@ fddi_input(struct ifnet *ifp, struct mbu
case ETHERTYPE_ARP:
#if !defined(__bsdi__) || _BSDI_VERSION >= 199401
-#if defined(NS) || defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(DECNET) || defined(IPX) || defined(NETATALK)
isr = NETISR_ARP;
inq = &arpintrq;
#endif
@@ -611,7 +609,7 @@ fddi_input(struct ifnet *ifp, struct mbu
default:
ifp->if_noproto++;
-#if defined(INET) || defined(INET6) || defined(NS) || defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(INET) || defined(INET6) || defined(DECNET) || defined(IPX) || defined(NETATALK)
dropanyway:
#endif
m_freem(m);
@@ -626,7 +624,7 @@ fddi_input(struct ifnet *ifp, struct mbu
return;
}
#endif
-#if defined(NS) || defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(DECNET) || defined(IPX) || defined(NETATALK)
if (!inq) {
m_freem(m);
}
Index: src/sys/net/if_tokensubr.c
diff -u src/sys/net/if_tokensubr.c:1.66 src/sys/net/if_tokensubr.c:1.67
--- src/sys/net/if_tokensubr.c:1.66 Fri Nov 28 08:29:00 2014
+++ src/sys/net/if_tokensubr.c Wed May 20 09:17:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tokensubr.c,v 1.66 2014/11/28 08:29:00 ozaki-r Exp $ */
+/* $NetBSD: if_tokensubr.c,v 1.67 2015/05/20 09:17:18 ozaki-r Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -92,7 +92,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.66 2014/11/28 08:29:00 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.67 2015/05/20 09:17:18 ozaki-r Exp $");
#include "opt_inet.h"
#include "opt_atalk.h"
@@ -451,7 +451,7 @@ token_input(struct ifnet *ifp, struct mb
l = (struct llc *)(mtod(m, uint8_t *) + lan_hdr_len);
switch (l->llc_dsap) {
-#if defined(INET) || defined(NS) || defined(DECNET)
+#if defined(INET) || defined(DECNET)
case LLC_SNAP_LSAP:
{
uint16_t etype;
@@ -501,7 +501,7 @@ token_input(struct ifnet *ifp, struct mb
default:
/* printf("token_input: unknown dsap 0x%x\n", l->llc_dsap); */
ifp->if_noproto++;
-#if defined(INET) || defined(NS) || defined(DECNET)
+#if defined(INET) || defined(DECNET)
dropanyway:
#endif
m_freem(m);
Index: src/sys/net/netisr.h
diff -u src/sys/net/netisr.h:1.42 src/sys/net/netisr.h:1.43
--- src/sys/net/netisr.h:1.42 Fri Mar 1 18:25:57 2013
+++ src/sys/net/netisr.h Wed May 20 09:17:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netisr.h,v 1.42 2013/03/01 18:25:57 joerg Exp $ */
+/* $NetBSD: netisr.h,v 1.43 2015/05/20 09:17:18 ozaki-r Exp $ */
/*
* Copyright (c) 1980, 1986, 1989, 1993
@@ -102,7 +102,6 @@
* on the lowest level routine of each protocol.
*/
#define NETISR_IP 2 /* same as AF_INET */
-#define NETISR_NS 6 /* same as AF_NS */
#define NETISR_CCITT 10 /* same as AF_CCITT */
#define NETISR_ATALK 16 /* same as AF_APPLETALK */
#define NETISR_IPX 23 /* same as AF_IPX */
