Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert IPX changes that I committed accidentally.

Browse Source
This commit is contained in:
christos 1998-12-10 17:48:40 +00:00
parent 6e4aaaaaa8
commit 52f565dcfd
1 changed files with 7 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
sys/net/if_ppp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ppp.c,v 1.48 1998/12/10 11:01:01 christos Exp $ */ /* $NetBSD: if_ppp.c,v 1.49 1998/12/10 17:48:40 christos Exp $ */
/* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */ /* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */
/* /*
@ -110,11 +110,6 @@
#include <netinet/ip.h> #include <netinet/ip.h>
#endif #endif
#if IPX
#include <netipx/ipx.h>
#include <netipx/ipx_if.h>
#endif
#include "bpfilter.h" #include "bpfilter.h"
#if NBPFILTER > 0 #if NBPFILTER > 0
#include <sys/time.h> #include <sys/time.h>
@ -569,20 +564,13 @@ pppsioctl(ifp, cmd, data)
break; break;
case SIOCSIFADDR: case SIOCSIFADDR:
case SIOCSIFDSTADDR: if (ifa->ifa_addr->sa_family != AF_INET)
switch(ifa->ifa_addr->sa_family) {
#ifdef INET
case AF_INET:
break;
#endif
#ifdef IPX
case AF_IPX:
break;
#endif
default:
error = EAFNOSUPPORT; error = EAFNOSUPPORT;
break; break;
}
case SIOCSIFDSTADDR:
if (ifa->ifa_addr->sa_family != AF_INET)
error = EAFNOSUPPORT;
break; break;
case SIOCSIFMTU: case SIOCSIFMTU:
@ -695,19 +683,6 @@ pppoutput(ifp, m0, dst, rtp)
if (ip->ip_tos & IPTOS_LOWDELAY) if (ip->ip_tos & IPTOS_LOWDELAY)
m0->m_flags |= M_HIGHPRI; m0->m_flags |= M_HIGHPRI;
break; break;
#endif
#ifdef IPX
case AF_IPX:
/*
* This is pretty bogus.. We dont have an ipxcp module in pppd
* yet to configure the link parameters. Sigh. I guess a
* manual ifconfig would do.... -Peter
*/
address = PPP_ALLSTATIONS;
control = PPP_UI;
protocol = PPP_IPX;
mode = NPMODE_PASS;
break;
#endif #endif
case AF_UNSPEC: case AF_UNSPEC:
address = PPP_ADDRESS(dst->sa_data); address = PPP_ADDRESS(dst->sa_data);
@ -1475,25 +1450,6 @@ ppp_inproc(sc, m)
break; break;
#endif #endif
#ifdef IPX
case PPP_IPX:
/*
* IPX packet - take off the ppp header and pass it up to IPX.
*/
if ((sc->sc_if.if_flags & IFF_UP) == 0
/* XXX: || sc->sc_npmode[NP_IPX] != NPMODE_PASS*/) {
/* interface is down - drop the packet. */
m_freem(m);
return;
}
m->m_pkthdr.len -= PPP_HDRLEN;
m->m_data += PPP_HDRLEN;
m->m_len -= PPP_HDRLEN;
schednetisr(NETISR_IPX);
inq = &ipxintrq;
break;
#endif
default: default:
/* /*
* Some other protocol - place on input queue for read(). * Some other protocol - place on input queue for read().