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

Now that everything works without LINK1 set, do not set it by default. 

While here, remove an unnecessary splnet()/splx() pair.
This commit is contained in:
martin 2001-12-10 00:24:12 +00:00
parent d585188042
commit 0099682916
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/net/if_pppoe.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_pppoe.c,v 1.9 2001/12/01 18:25:23 martin Exp $ */ /* $NetBSD: if_pppoe.c,v 1.10 2001/12/10 00:24:12 martin Exp $ */
/* /*
* Copyright (c) 2001 Martin Husemann. All rights reserved. * Copyright (c) 2001 Martin Husemann. All rights reserved.
@ -27,7 +27,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.9 2001/12/01 18:25:23 martin Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.10 2001/12/10 00:24:12 martin Exp $");
#include "pppoe.h" #include "pppoe.h"
#include "bpfilter.h" #include "bpfilter.h"
@ -200,8 +200,7 @@ pppoe_clone_create(ifc, unit)
sprintf(sc->sc_sppp.pp_if.if_xname, "pppoe%d", unit); sprintf(sc->sc_sppp.pp_if.if_xname, "pppoe%d", unit);
sc->sc_sppp.pp_if.if_softc = sc; sc->sc_sppp.pp_if.if_softc = sc;
sc->sc_sppp.pp_if.if_mtu = ETHERMTU - PPPOE_HEADERLEN - 2; /* two byte PPP protocol discriminator, then IP data */ sc->sc_sppp.pp_if.if_mtu = ETHERMTU - PPPOE_HEADERLEN - 2; /* two byte PPP protocol discriminator, then IP data */
sc->sc_sppp.pp_if.if_flags = IFF_SIMPLEX | IFF_POINTOPOINT sc->sc_sppp.pp_if.if_flags = IFF_SIMPLEX|IFF_POINTOPOINT|IFF_MULTICAST;
| IFF_MULTICAST | IFF_LINK1; /* auto "dial" */
sc->sc_sppp.pp_if.if_type = IFT_PPP; sc->sc_sppp.pp_if.if_type = IFT_PPP;
sc->sc_sppp.pp_if.if_hdrlen = sizeof(struct ether_header)+PPPOE_HEADERLEN; sc->sc_sppp.pp_if.if_hdrlen = sizeof(struct ether_header)+PPPOE_HEADERLEN;
sc->sc_sppp.pp_if.if_dlt = DLT_PPP_ETHER; sc->sc_sppp.pp_if.if_dlt = DLT_PPP_ETHER;
@ -800,9 +799,7 @@ pppoe_timeout(void *arg)
splx(x); splx(x);
break; break;
case PPPOE_STATE_CLOSING: case PPPOE_STATE_CLOSING:
x = splnet();
pppoe_disconnect(sc); pppoe_disconnect(sc);
splx(x);
break; break;
default: default:
return; /* all done, work in peace */ return; /* all done, work in peace */