diff options
| author | jhay <jhay@FreeBSD.org> | 1998-01-30 19:49:54 +0000 |
|---|---|---|
| committer | jhay <jhay@FreeBSD.org> | 1998-01-30 19:49:54 +0000 |
| commit | f8d9e49665df146dda9526a685214685ce634ab2 (patch) | |
| tree | c4099469a11f4a8ba1b991136ee749b7dfb48a10 /sys/dev/sr/if_sr_isa.c | |
| parent | 8d9008121631d5e2cb9069de471bc02c92537696 (diff) | |
| download | FreeBSD-src-f8d9e49665df146dda9526a685214685ce634ab2.zip FreeBSD-src-f8d9e49665df146dda9526a685214685ce634ab2.tar.gz | |
Don't clobber pp_flags when PP_KEEPALIVE must be set.
Diffstat (limited to 'sys/dev/sr/if_sr_isa.c')
| -rw-r--r-- | sys/dev/sr/if_sr_isa.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c index c27467a..76113b8 100644 --- a/sys/dev/sr/if_sr_isa.c +++ b/sys/dev/sr/if_sr_isa.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_sr.c,v 1.9 1997/09/02 01:18:16 bde Exp $ + * $Id: if_sr.c,v 1.10 1998/01/08 23:41:02 eivind Exp $ */ /* @@ -1294,6 +1294,7 @@ srioctl(struct ifnet *ifp, int cmd, caddr_t data) case N2_USE_PPP: default: sppp_detach(ifp); + sc->ifsppp.pp_flags &= ~PP_KEEPALIVE; } sc->attached = 0; @@ -1307,7 +1308,7 @@ srioctl(struct ifnet *ifp, int cmd, caddr_t data) #endif case N2_USE_PPP: default: - sc->ifsppp.pp_flags = PP_KEEPALIVE; + sc->ifsppp.pp_flags |= PP_KEEPALIVE; sppp_attach(&sc->ifsppp.pp_if); /* @@ -1498,7 +1499,7 @@ sr_up(struct sr_softc *sc) #endif case N2_USE_PPP: default: - sc->ifsppp.pp_flags = PP_KEEPALIVE; + sc->ifsppp.pp_flags |= PP_KEEPALIVE; sppp_attach(&sc->ifsppp.pp_if); /* |
