diff options
| author | phk <phk@FreeBSD.org> | 1999-03-30 13:28:23 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1999-03-30 13:28:23 +0000 |
| commit | 4b075acb2951e25a5a0c5fedd65c6ad62e92ede9 (patch) | |
| tree | 71eb059b76cedd9c225b862f92e75b5e834aa9cb /sys/dev | |
| parent | 0ccb1feb7bb2b9e8aa8932bbb4ca6ac09c7812d1 (diff) | |
| download | FreeBSD-src-4b075acb2951e25a5a0c5fedd65c6ad62e92ede9.zip FreeBSD-src-4b075acb2951e25a5a0c5fedd65c6ad62e92ede9.tar.gz | |
Organize the various modes (CISCO/AUTO/DEMAND/LEASED) a little bit better,
centralize the code.
Remember to call TLF/TLS on the hardware in CISCO mode.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ar/if_ar.c | 9 | ||||
| -rw-r--r-- | sys/dev/ar/if_ar_isa.c | 9 | ||||
| -rw-r--r-- | sys/dev/sr/if_sr.c | 9 | ||||
| -rw-r--r-- | sys/dev/sr/if_sr_isa.c | 9 |
4 files changed, 4 insertions, 32 deletions
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c index a3fa4a2..043ad4c 100644 --- a/sys/dev/ar/if_ar.c +++ b/sys/dev/ar/if_ar.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ar.c,v 1.23 1998/10/22 05:58:38 bde Exp $ + * $Id: if_ar.c,v 1.24 1998/12/16 18:42:38 phk Exp $ */ /* @@ -600,13 +600,6 @@ arioctl(struct ifnet *ifp, u_long cmd, caddr_t data) TRC(printf("ar%d: arioctl.\n", ifp->if_unit);) - if(cmd == SIOCSIFFLAGS) { - if(ifp->if_flags & IFF_LINK2) - sp->pp_flags |= PP_CISCO; - else - sp->pp_flags &= ~PP_CISCO; - } - was_up = ifp->if_flags & IFF_RUNNING; error = sppp_ioctl(ifp, cmd, data); diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c index a3fa4a2..043ad4c 100644 --- a/sys/dev/ar/if_ar_isa.c +++ b/sys/dev/ar/if_ar_isa.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ar.c,v 1.23 1998/10/22 05:58:38 bde Exp $ + * $Id: if_ar.c,v 1.24 1998/12/16 18:42:38 phk Exp $ */ /* @@ -600,13 +600,6 @@ arioctl(struct ifnet *ifp, u_long cmd, caddr_t data) TRC(printf("ar%d: arioctl.\n", ifp->if_unit);) - if(cmd == SIOCSIFFLAGS) { - if(ifp->if_flags & IFF_LINK2) - sp->pp_flags |= PP_CISCO; - else - sp->pp_flags &= ~PP_CISCO; - } - was_up = ifp->if_flags & IFF_RUNNING; error = sppp_ioctl(ifp, cmd, data); diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c index b37e563..57e131b 100644 --- a/sys/dev/sr/if_sr.c +++ b/sys/dev/sr/if_sr.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.20 1999/01/18 21:23:47 julian Exp $ + * $Id: if_sr.c,v 1.21 1999/01/18 21:27:03 julian Exp $ */ /* @@ -1275,13 +1275,6 @@ srioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags &= ~IFF_LINK1; #endif - /* - * Next we can handle minor protocol point(s) - */ - if (ifp->if_flags & IFF_LINK2) - sp->pp_flags |= PP_CISCO; - else - sp->pp_flags &= ~PP_CISCO; } /* * Next, we'll allow the network service layer we've called process diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c index b37e563..57e131b 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.20 1999/01/18 21:23:47 julian Exp $ + * $Id: if_sr.c,v 1.21 1999/01/18 21:27:03 julian Exp $ */ /* @@ -1275,13 +1275,6 @@ srioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags &= ~IFF_LINK1; #endif - /* - * Next we can handle minor protocol point(s) - */ - if (ifp->if_flags & IFF_LINK2) - sp->pp_flags |= PP_CISCO; - else - sp->pp_flags &= ~PP_CISCO; } /* * Next, we'll allow the network service layer we've called process |
