diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2015-11-20 12:05:35 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2015-11-20 12:05:35 +0000 |
| commit | 20b20ec64a969573f17f10f061be5f27e0eaa155 (patch) | |
| tree | 140c6c683f6fec07a98bb185e109805c9ca5e409 /sys/net/if_pppoe.c | |
| parent | ef3ab27410d76fe9f38d1a96f056dde7466bc5df (diff) | |
sppp(4) is now only used for pppoe(4) which doesn't use framing, so remove
support for sppp with framing, simplifying things. Remove unused ifdefs while
there.
"sppp will go away before it gets used for something else" dlg@
Diffstat (limited to 'sys/net/if_pppoe.c')
| -rw-r--r-- | sys/net/if_pppoe.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/net/if_pppoe.c b/sys/net/if_pppoe.c index da2c09cc23c..39e42adfeb2 100644 --- a/sys/net/if_pppoe.c +++ b/sys/net/if_pppoe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pppoe.c,v 1.49 2015/10/25 11:58:11 mpi Exp $ */ +/* $OpenBSD: if_pppoe.c,v 1.50 2015/11/20 12:05:34 sthen Exp $ */ /* $NetBSD: if_pppoe.c,v 1.51 2003/11/28 08:56:48 keihan Exp $ */ /* @@ -223,8 +223,7 @@ pppoe_clone_create(struct if_clone *ifc, int unit) sc->sc_sppp.pp_if.if_flags = IFF_SIMPLEX | IFF_POINTOPOINT | IFF_MULTICAST; 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_flags |= PP_KEEPALIVE | /* use LCP keepalive */ - PP_NOFRAMING; /* no serial encapsulation */ + sc->sc_sppp.pp_flags |= PP_KEEPALIVE; /* use LCP keepalive */ sc->sc_sppp.pp_framebytes = PPPOE_HEADERLEN; /* framing added to ppp packets */ sc->sc_sppp.pp_if.if_ioctl = pppoe_ioctl; sc->sc_sppp.pp_if.if_start = pppoe_start; |