summaryrefslogtreecommitdiffstats
path: root/sys/dev/sr
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1998-12-16 18:42:38 +0000
committerphk <phk@FreeBSD.org>1998-12-16 18:42:38 +0000
commit4674dad527e098e67d75cc31e7d53776b25cc495 (patch)
tree107318c0be34d58d31886d9714d346ab46b94cea /sys/dev/sr
parent28d6420f45416c97f037bc61378036eaa76779f7 (diff)
downloadFreeBSD-src-4674dad527e098e67d75cc31e7d53776b25cc495.zip
FreeBSD-src-4674dad527e098e67d75cc31e7d53776b25cc495.tar.gz
Straigthen out the use of the tls and tlf callbacks.
Not tested on the if_sr, if_cx and if_ar drivers, but expected to work just the same as it used to. Any users of these drivers (or even better: donors of hardware for them) please contact phk@freebsd.org so we can test the next batch of changes to if_sppp.
Diffstat (limited to 'sys/dev/sr')
-rw-r--r--sys/dev/sr/if_sr.c16
-rw-r--r--sys/dev/sr/if_sr_isa.c16
2 files changed, 2 insertions, 30 deletions
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 85cbb70..e7a2083 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.15 1998/06/21 14:53:12 bde Exp $
+ * $Id: if_sr.c,v 1.16 1998/10/22 05:58:39 bde Exp $
*/
/*
@@ -1311,13 +1311,6 @@ srioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
sc->ifsppp.pp_flags |= PP_KEEPALIVE;
sppp_attach(&sc->ifsppp.pp_if);
- /*
- * Shortcut the sppp tls/tlf actions to
- * up/down events since our lower layer is
- * always ready.
- */
- sc->ifsppp.pp_tls = sc->ifsppp.pp_up;
- sc->ifsppp.pp_tlf = sc->ifsppp.pp_down;
}
sc->attached = sc->protocol;
@@ -1502,13 +1495,6 @@ sr_up(struct sr_softc *sc)
sc->ifsppp.pp_flags |= PP_KEEPALIVE;
sppp_attach(&sc->ifsppp.pp_if);
- /*
- * Shortcut the sppp tls/tlf actions to
- * up/down events since our lower layer is
- * always ready.
- */
- sc->ifsppp.pp_tls = sc->ifsppp.pp_up;
- sc->ifsppp.pp_tlf = sc->ifsppp.pp_down;
}
sc->attached = sc->protocol;
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 85cbb70..e7a2083 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.15 1998/06/21 14:53:12 bde Exp $
+ * $Id: if_sr.c,v 1.16 1998/10/22 05:58:39 bde Exp $
*/
/*
@@ -1311,13 +1311,6 @@ srioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
sc->ifsppp.pp_flags |= PP_KEEPALIVE;
sppp_attach(&sc->ifsppp.pp_if);
- /*
- * Shortcut the sppp tls/tlf actions to
- * up/down events since our lower layer is
- * always ready.
- */
- sc->ifsppp.pp_tls = sc->ifsppp.pp_up;
- sc->ifsppp.pp_tlf = sc->ifsppp.pp_down;
}
sc->attached = sc->protocol;
@@ -1502,13 +1495,6 @@ sr_up(struct sr_softc *sc)
sc->ifsppp.pp_flags |= PP_KEEPALIVE;
sppp_attach(&sc->ifsppp.pp_if);
- /*
- * Shortcut the sppp tls/tlf actions to
- * up/down events since our lower layer is
- * always ready.
- */
- sc->ifsppp.pp_tls = sc->ifsppp.pp_up;
- sc->ifsppp.pp_tlf = sc->ifsppp.pp_down;
}
sc->attached = sc->protocol;
OpenPOWER on IntegriCloud