Module Name: src
Committed By: ozaki-r
Date: Mon May 25 08:29:01 UTC 2015
Modified Files:
src/sys/dev/pcmcia: if_xi.c
src/sys/net: if_ethersubr.c if_fddisubr.c if_loop.c if_spppsubr.c
netisr.h
src/sys/netsmb: netbios.h
Removed Files:
src/sys/rump/net/lib/libnet/opt: opt_ipx.h
Log Message:
Remove leftover IPX-related stuffs
No objection on tech-kern and tech-net.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/pcmcia/if_xi.c
cvs rdiff -u -r1.208 -r1.209 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.89 -r1.90 src/sys/net/if_fddisubr.c
cvs rdiff -u -r1.81 -r1.82 src/sys/net/if_loop.c
cvs rdiff -u -r1.133 -r1.134 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.43 -r1.44 src/sys/net/netisr.h
cvs rdiff -u -r1.7 -r1.8 src/sys/netsmb/netbios.h
cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnet/opt/opt_ipx.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/dev/pcmcia/if_xi.c
diff -u src/sys/dev/pcmcia/if_xi.c:1.74 src/sys/dev/pcmcia/if_xi.c:1.75
--- src/sys/dev/pcmcia/if_xi.c:1.74 Sun Aug 10 16:44:36 2014
+++ src/sys/dev/pcmcia/if_xi.c Mon May 25 08:29:01 2015
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.
#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>
Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.208 src/sys/net/if_ethersubr.c:1.209
--- src/sys/net/if_ethersubr.c:1.208 Wed May 20 09:17:18 2015
+++ src/sys/net/if_ethersubr.c Mon May 25 08:29:01 2015
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_ethersubr
#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 @@ ether_output(struct ifnet * const ifp0,
}
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 @@ ether_input(struct ifnet *ifp, struct mb
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;
Index: src/sys/net/if_fddisubr.c
diff -u src/sys/net/if_fddisubr.c:1.89 src/sys/net/if_fddisubr.c:1.90
--- src/sys/net/if_fddisubr.c:1.89 Wed May 20 09:17:18 2015
+++ src/sys/net/if_fddisubr.c Mon May 25 08:29:01 2015
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_fddisubr.
#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 @@ fddi_output(struct ifnet *ifp0, struct m
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 @@ fddi_input(struct ifnet *ifp, struct mbu
#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 @@ fddi_input(struct ifnet *ifp, struct mbu
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 @@ fddi_input(struct ifnet *ifp, struct mbu
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 @@ fddi_input(struct ifnet *ifp, struct mbu
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 @@ fddi_input(struct ifnet *ifp, struct mbu
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 @@ fddi_input(struct ifnet *ifp, struct mbu
return;
}
#endif
-#if defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(DECNET) || defined(NETATALK)
if (!inq) {
m_freem(m);
}
Index: src/sys/net/if_loop.c
diff -u src/sys/net/if_loop.c:1.81 src/sys/net/if_loop.c:1.82
--- src/sys/net/if_loop.c:1.81 Fri Apr 3 07:55:18 2015
+++ src/sys/net/if_loop.c Mon May 25 08:29:01 2015
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_loop.c,v
#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 @@ looutput(struct ifnet *ifp, struct mbuf
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 @@ lostart(struct ifnet *ifp)
pktq = ip6_pktq;
break;
#endif
-#ifdef IPX
- case AF_IPX:
- ifq = &ipxintrq;
- isr = NETISR_IPX;
- break;
-#endif
#ifdef NETATALK
case AF_APPLETALK:
ifq = &atintrq2;
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.133 src/sys/net/if_spppsubr.c:1.134
--- src/sys/net/if_spppsubr.c:1.133 Sat May 2 14:41:32 2015
+++ src/sys/net/if_spppsubr.c Mon May 25 08:29:01 2015
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_spppsubr.
#include <netinet6/scope6_var.h>
#endif
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
#include <net/if_sppp.h>
#include <net/if_spppvar.h>
@@ -548,12 +542,6 @@ sppp_input(struct ifnet *ifp, struct mbu
pktq = ip6_pktq;
break;
#endif
-#ifdef IPX
- case ETHERTYPE_IPX:
- isr = NETISR_IPX;
- inq = &ipxintrq;
- break;
-#endif
}
goto queue_pkt;
default: /* Invalid PPP packet. */
@@ -624,15 +612,6 @@ sppp_input(struct ifnet *ifp, struct mbu
}
break;
#endif
-#ifdef IPX
- case PPP_IPX:
- /* IPX IPXCP not implemented yet */
- if (sp->pp_phase == SPPP_PHASE_NETWORK) {
- isr = NETISR_IPX;
- inq = &ipxintrq;
- }
- break;
-#endif
}
queue_pkt:
@@ -829,12 +808,6 @@ sppp_output(struct ifnet *ifp, struct mb
}
break;
#endif
-#ifdef IPX
- case AF_IPX: /* Novell IPX Protocol */
- protocol = htons((sp->pp_flags & PP_CISCO) ?
- ETHERTYPE_IPX : PPP_IPX);
- break;
-#endif
default:
m_freem(m);
++ifp->if_oerrors;
Index: src/sys/net/netisr.h
diff -u src/sys/net/netisr.h:1.43 src/sys/net/netisr.h:1.44
--- src/sys/net/netisr.h:1.43 Wed May 20 09:17:18 2015
+++ src/sys/net/netisr.h Mon May 25 08:29:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netisr.h,v 1.43 2015/05/20 09:17:18 ozaki-r Exp $ */
+/* $NetBSD: netisr.h,v 1.44 2015/05/25 08:29:01 ozaki-r Exp $ */
/*
* Copyright (c) 1980, 1986, 1989, 1993
@@ -104,7 +104,6 @@
#define NETISR_IP 2 /* same as AF_INET */
#define NETISR_CCITT 10 /* same as AF_CCITT */
#define NETISR_ATALK 16 /* same as AF_APPLETALK */
-#define NETISR_IPX 23 /* same as AF_IPX */
#define NETISR_IPV6 24 /* same as AF_INET6 */
#define NETISR_ISDN 26 /* same as AF_E164 */
#define NETISR_NATM 27 /* same as AF_NATM */
Index: src/sys/netsmb/netbios.h
diff -u src/sys/netsmb/netbios.h:1.7 src/sys/netsmb/netbios.h:1.8
--- src/sys/netsmb/netbios.h:1.7 Sun Dec 11 06:25:32 2005
+++ src/sys/netsmb/netbios.h Mon May 25 08:29:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbios.h,v 1.7 2005/12/11 06:25:32 christos Exp $ */
+/* $NetBSD: netbios.h,v 1.8 2015/05/25 08:29:01 ozaki-r Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -43,12 +43,6 @@
#include <netinet/in.h>
#endif
-#ifndef NetBSD
-#ifndef _NETIPX_IPX_H_
-#include <netipx/ipx.h>
-#endif
-#endif
-
#define AF_NETBIOS AF_NS /* XXX: should go to socket.h */
#define PF_NETBIOS AF_NETBIOS
