Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Remove leftover IPX-related stuffs
details: https://anonhg.NetBSD.org/src/rev/a26f5372ba4a
branches: trunk
changeset: 338448:a26f5372ba4a
user: ozaki-r <ozaki-r%NetBSD.org@localhost>
date: Mon May 25 08:29:01 2015 +0000
description:
Remove leftover IPX-related stuffs
No objection on tech-kern and tech-net.
diffstat:
sys/dev/pcmcia/if_xi.c | 11 +--------
sys/net/if_ethersubr.c | 27 +------------------------
sys/net/if_fddisubr.c | 36 ++++++----------------------------
sys/net/if_loop.c | 22 +-------------------
sys/net/if_spppsubr.c | 31 +----------------------------
sys/net/netisr.h | 3 +-
sys/netsmb/netbios.h | 8 +------
sys/rump/net/lib/libnet/opt/opt_ipx.h | 3 --
8 files changed, 17 insertions(+), 124 deletions(-)
diffs (truncated from 391 to 300 lines):
diff -r 5f67c9aac150 -r a26f5372ba4a sys/dev/pcmcia/if_xi.c
--- a/sys/dev/pcmcia/if_xi.c Mon May 25 07:17:17 2015 +0000
+++ b/sys/dev/pcmcia/if_xi.c Mon May 25 08:29:01 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xi.c,v 1.74 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_xi.c,v 1.75 2015/05/25 08:29:01 ozaki-r Exp $ */
/* OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp */
/*
@@ -55,10 +55,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.74 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.75 2015/05/25 08:29:01 ozaki-r Exp $");
#include "opt_inet.h"
-#include "opt_ipx.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,12 +83,6 @@
#include <netinet/if_inarp.h>
#endif
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
-
#include <net/bpf.h>
#include <net/bpfdesc.h>
diff -r 5f67c9aac150 -r a26f5372ba4a sys/net/if_ethersubr.c
--- a/sys/net/if_ethersubr.c Mon May 25 07:17:17 2015 +0000
+++ b/sys/net/if_ethersubr.c Mon May 25 08:29:01 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.208 2015/05/20 09:17:18 ozaki-r Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.209 2015/05/25 08:29:01 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,11 +61,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.208 2015/05/20 09:17:18 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.209 2015/05/25 08:29:01 ozaki-r Exp $");
#include "opt_inet.h"
#include "opt_atalk.h"
-#include "opt_ipx.h"
#include "opt_mbuftrace.h"
#include "opt_mpls.h"
#include "opt_gateway.h"
@@ -153,11 +152,6 @@
#include <netinet/ip_carp.h>
#endif
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
#ifdef NETATALK
#include <netatalk/at.h>
#include <netatalk/at_var.h>
@@ -370,17 +364,6 @@
}
break;
#endif /* NETATALK */
-#ifdef IPX
- case AF_IPX:
- etype = htons(ETHERTYPE_IPX);
- memcpy(edst,
- &(((const struct sockaddr_ipx *)dst)->sipx_addr.x_host),
- sizeof(edst));
- /* If broadcasting on a simplex interface, loopback a copy */
- if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
- mcopy = m_copy(m, 0, (int)M_COPYALL);
- break;
-#endif
case pseudo_AF_HDRCMPLT:
hdrcmplt = 1;
memcpy(esrc,
@@ -856,12 +839,6 @@
pktq = ip6_pktq;
break;
#endif
-#ifdef IPX
- case ETHERTYPE_IPX:
- isr = NETISR_IPX;
- inq = &ipxintrq;
- break;
-#endif
#ifdef NETATALK
case ETHERTYPE_ATALK:
isr = NETISR_ATALK;
diff -r 5f67c9aac150 -r a26f5372ba4a sys/net/if_fddisubr.c
--- a/sys/net/if_fddisubr.c Mon May 25 07:17:17 2015 +0000
+++ b/sys/net/if_fddisubr.c Mon May 25 08:29:01 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fddisubr.c,v 1.89 2015/05/20 09:17:18 ozaki-r Exp $ */
+/* $NetBSD: if_fddisubr.c,v 1.90 2015/05/25 08:29:01 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -96,12 +96,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.89 2015/05/20 09:17:18 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.90 2015/05/25 08:29:01 ozaki-r Exp $");
#include "opt_gateway.h"
#include "opt_inet.h"
#include "opt_atalk.h"
-#include "opt_ipx.h"
#include "opt_mbuftrace.h"
@@ -135,11 +134,6 @@
#endif
#include <net/if_fddi.h>
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
#ifdef INET6
#ifndef INET
#include <netinet/in.h>
@@ -316,16 +310,6 @@
break;
}
#endif /* AF_ARP */
-#ifdef IPX
- case AF_IPX:
- etype = htons(ETHERTYPE_IPX);
- memcpy(edst, &(((struct sockaddr_ipx *)dst)->sipx_addr.x_host),
- sizeof (edst));
- /* If broadcasting on a simplex interface, loopback a copy */
- if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
- mcopy = m_copy(m, 0, (int)M_COPYALL);
- break;
-#endif
#ifdef NETATALK
case AF_APPLETALK: {
struct at_ifaddr *aa;
@@ -462,7 +446,7 @@
#if defined(INET) || defined(INET6)
pktqueue_t *pktq = NULL;
#endif
-#if defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(DECNET) || defined(NETATALK)
struct ifqueue *inq = NULL;
int isr = 0;
int s;
@@ -506,7 +490,7 @@
l = (struct llc *)(fh+1);
switch (l->llc_dsap) {
-#if defined(INET) || defined(INET6) || defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(INET) || defined(INET6) || defined(DECNET) || defined(NETATALK)
case LLC_SNAP_LSAP:
{
uint16_t etype;
@@ -557,7 +541,7 @@
case ETHERTYPE_ARP:
#if !defined(__bsdi__) || _BSDI_VERSION >= 199401
-#if defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(DECNET) || defined(NETATALK)
isr = NETISR_ARP;
inq = &arpintrq;
#endif
@@ -567,12 +551,6 @@
return;
#endif
#endif
-#ifdef IPX
- case ETHERTYPE_IPX:
- isr = NETISR_IPX;
- inq = &ipxintrq;
- break;
-#endif
#ifdef INET6
case ETHERTYPE_IPV6:
#ifdef GATEWAY
@@ -609,7 +587,7 @@
default:
ifp->if_noproto++;
-#if defined(INET) || defined(INET6) || defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(INET) || defined(INET6) || defined(DECNET) || defined(NETATALK)
dropanyway:
#endif
m_freem(m);
@@ -624,7 +602,7 @@
return;
}
#endif
-#if defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(DECNET) || defined(NETATALK)
if (!inq) {
m_freem(m);
}
diff -r 5f67c9aac150 -r a26f5372ba4a sys/net/if_loop.c
--- a/sys/net/if_loop.c Mon May 25 07:17:17 2015 +0000
+++ b/sys/net/if_loop.c Mon May 25 08:29:01 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_loop.c,v 1.81 2015/04/03 07:55:18 ozaki-r Exp $ */
+/* $NetBSD: if_loop.c,v 1.82 2015/05/25 08:29:01 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,11 +65,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.81 2015/04/03 07:55:18 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.82 2015/05/25 08:29:01 ozaki-r Exp $");
#include "opt_inet.h"
#include "opt_atalk.h"
-#include "opt_ipx.h"
#include "opt_mbuftrace.h"
#include "opt_mpls.h"
#include "opt_net_mpsafe.h"
@@ -107,11 +106,6 @@
#include <netinet/ip6.h>
#endif
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
#ifdef MPLS
#include <netmpls/mpls.h>
#include <netmpls/mpls_var.h>
@@ -308,12 +302,6 @@
pktq = ip6_pktq;
break;
#endif
-#ifdef IPX
- case AF_IPX:
- ifq = &ipxintrq;
- isr = NETISR_IPX;
- break;
-#endif
#ifdef NETATALK
case AF_APPLETALK:
ifq = &atintrq2;
@@ -386,12 +374,6 @@
pktq = ip6_pktq;
break;
#endif
-#ifdef IPX
- case AF_IPX:
- ifq = &ipxintrq;
- isr = NETISR_IPX;
- break;
-#endif
#ifdef NETATALK
case AF_APPLETALK:
ifq = &atintrq2;
diff -r 5f67c9aac150 -r a26f5372ba4a sys/net/if_spppsubr.c
--- a/sys/net/if_spppsubr.c Mon May 25 07:17:17 2015 +0000
+++ b/sys/net/if_spppsubr.c Mon May 25 08:29:01 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.133 2015/05/02 14:41:32 roy Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.134 2015/05/25 08:29:01 ozaki-r Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,11 +41,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.133 2015/05/02 14:41:32 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.134 2015/05/25 08:29:01 ozaki-r Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
-#include "opt_ipx.h"
#include "opt_modular.h"
#include "opt_compat_netbsd.h"
#endif
@@ -85,11 +84,6 @@
#include <netinet6/scope6_var.h>
#endif
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
Home |
Main Index |
Thread Index |
Old Index