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.

4 files changed, 4 insertions, 46 deletions

diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 374aed9..a3fa4a2 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.22 1998/08/24 02:28:15 bde Exp $
+ * $Id: if_ar.c,v 1.23 1998/10/22 05:58:38 bde Exp $
  */
 
 /*
@@ -357,13 +357,6 @@ arattach(struct isa_device *id)
 		sppp_attach((struct ifnet *)&sc->ifsppp);
 		if_attach(ifp);
 
-		/*
-		 * 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;
-
 #if NBPFILTER > 0
 		bpfattach(ifp, DLT_PPP, PPP_HEADER_LEN);
 #endif
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index 374aed9..a3fa4a2 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.22 1998/08/24 02:28:15 bde Exp $
+ * $Id: if_ar.c,v 1.23 1998/10/22 05:58:38 bde Exp $
  */
 
 /*
@@ -357,13 +357,6 @@ arattach(struct isa_device *id)
 		sppp_attach((struct ifnet *)&sc->ifsppp);
 		if_attach(ifp);
 
-		/*
-		 * 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;
-
 #if NBPFILTER > 0
 		bpfattach(ifp, DLT_PPP, PPP_HEADER_LEN);
 #endif
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;