Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Remove leftover use of AF_NS and NS option
details: https://anonhg.NetBSD.org/src/rev/0599dfa21bf8
branches: trunk
changeset: 338369:0599dfa21bf8
user: ozaki-r <ozaki-r%NetBSD.org@localhost>
date: Wed May 20 09:17:17 2015 +0000
description:
Remove leftover use of AF_NS and NS option
Unnecessary NETISR_NS is also removed.
diffstat:
sys/arch/acorn32/podulebus/if_ie.c | 9 ++-------
sys/arch/amiga/dev/if_es.c | 25 ++-----------------------
sys/arch/amiga/dev/if_qn.c | 25 ++-----------------------
sys/arch/arm/at91/at91emac.c | 11 +++--------
sys/arch/arm/ep93xx/epe.c | 9 ++-------
sys/arch/sun2/dev/if_ec.c | 9 ++-------
sys/arch/sun3/dev/if_ie.c | 26 ++------------------------
sys/arch/x68k/dev/if_ne_intio.c | 9 ++-------
sys/arch/x68k/dev/if_ne_neptune.c | 9 ++-------
sys/dev/cadence/if_cemac.c | 9 ++-------
sys/net/if_ecosubr.c | 6 +++---
sys/net/if_ethersubr.c | 6 +++---
sys/net/if_fddisubr.c | 16 +++++++---------
sys/net/if_hippisubr.c | 6 +++---
sys/net/if_tokensubr.c | 8 ++++----
sys/net/netisr.h | 3 +--
16 files changed, 42 insertions(+), 144 deletions(-)
diffs (truncated from 572 to 300 lines):
diff -r f85d9dfbaecd -r 0599dfa21bf8 sys/arch/acorn32/podulebus/if_ie.c
--- a/sys/arch/acorn32/podulebus/if_ie.c Wed May 20 07:24:49 2015 +0000
+++ b/sys/arch/acorn32/podulebus/if_ie.c Wed May 20 09:17:17 2015 +0000
@@ -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 @@
#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"
diff -r f85d9dfbaecd -r 0599dfa21bf8 sys/arch/amiga/dev/if_es.c
--- a/sys/arch/amiga/dev/if_es.c Wed May 20 07:24:49 2015 +0000
+++ b/sys/arch/amiga/dev/if_es.c Wed May 20 09:17:17 2015 +0000
@@ -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 @@
#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 @@
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;
diff -r f85d9dfbaecd -r 0599dfa21bf8 sys/arch/amiga/dev/if_qn.c
--- a/sys/arch/amiga/dev/if_qn.c Wed May 20 07:24:49 2015 +0000
+++ b/sys/arch/amiga/dev/if_qn.c Wed May 20 09:17:17 2015 +0000
@@ -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 @@
#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 @@
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);
diff -r f85d9dfbaecd -r 0599dfa21bf8 sys/arch/arm/at91/at91emac.c
--- a/sys/arch/arm/at91/at91emac.c Wed May 20 07:24:49 2015 +0000
+++ b/sys/arch/arm/at91/at91emac.c Wed May 20 09:17:17 2015 +0000
@@ -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 @@
#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>
diff -r f85d9dfbaecd -r 0599dfa21bf8 sys/arch/arm/ep93xx/epe.c
--- a/sys/arch/arm/ep93xx/epe.c Wed May 20 07:24:49 2015 +0000
+++ b/sys/arch/arm/ep93xx/epe.c Wed May 20 09:17:17 2015 +0000
@@ -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 @@
#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>
diff -r f85d9dfbaecd -r 0599dfa21bf8 sys/arch/sun2/dev/if_ec.c
--- a/sys/arch/sun2/dev/if_ec.c Wed May 20 07:24:49 2015 +0000
+++ b/sys/arch/sun2/dev/if_ec.c Wed May 20 09:17:17 2015 +0000
@@ -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 @@
#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>
diff -r f85d9dfbaecd -r 0599dfa21bf8 sys/arch/sun3/dev/if_ie.c
--- a/sys/arch/sun3/dev/if_ie.c Wed May 20 07:24:49 2015 +0000
+++ b/sys/arch/sun3/dev/if_ie.c Wed May 20 09:17:17 2015 +0000
@@ -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 @@
#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 @@
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;
diff -r f85d9dfbaecd -r 0599dfa21bf8 sys/arch/x68k/dev/if_ne_intio.c
--- a/sys/arch/x68k/dev/if_ne_intio.c Wed May 20 07:24:49 2015 +0000
+++ b/sys/arch/x68k/dev/if_ne_intio.c Wed May 20 09:17:17 2015 +0000
@@ -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"
Home |
Main Index |
Thread Index |
Old Index