mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-16 10:20:30 +00:00
Code Issues Releases Activity

Don't clobber pp_flags when PP_KEEPALIVE must be set.

Browse Source
This commit is contained in:
John Hay 1998-01-30 19:49:54 +00:00
parent b1408ba741
commit 40f001c97d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=32904
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/sr/if_sr.c
View File

@ -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);
/*

7
sys/dev/sr/if_sr_isa.c
View File

@ -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);
/*

7
sys/i386/isa/if_sr.c
View File

@ -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);
/*