ume         2006-12-12 19:41:41 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/net              if_ppp.c if_pppvar.h ppp_tty.c 
  Log:
  MFC: Use callout mechanism instead of timeout()/untimeout().
  
          sys/net/if_ppp.c:       1.119
          sys/net/if_pppvar.h:    1.26
          sys/net/ppp_tty.c:      1.72
  
  Revision   Changes    Path
  1.105.2.6  +1 -0      src/sys/net/if_ppp.c
  1.23.2.3   +1 -1      src/sys/net/if_pppvar.h
  1.66.2.3   +2 -2      src/sys/net/ppp_tty.c

ume         2006-12-05 18:54:21 UTC

  FreeBSD src repository

  Modified files:
    sys/net              if_ppp.c if_pppvar.h ppp_tty.c 
  Log:
  Use callout mechanism instead of timeout()/untimeout().
  
  MFC after:      1 week
  
  Revision  Changes    Path
  1.119     +1 -0      src/sys/net/if_ppp.c
  1.26      +1 -1      src/sys/net/if_pppvar.h
  1.72      +2 -2      src/sys/net/ppp_tty.c

Index: sys/net/if_ppp.c
diff -u -p sys/net/if_ppp.c.orig sys/net/if_ppp.c
--- sys/net/if_ppp.c.orig	Sun Nov 19 16:17:22 2006
+++ sys/net/if_ppp.c	Tue Dec  5 20:43:35 2006
@@ -218,6 +218,7 @@ ppp_clone_create(struct if_clone *ifc, i
 		return (ENOSPC);
 	}
 
+	callout_init(&sc->sc_timo_ch, 0);
 	ifp->if_softc = sc;
 	if_initname(ifp, ifc->ifc_name, unit);
 	ifp->if_mtu = PPP_MTU;
Index: sys/net/if_pppvar.h
diff -u sys/net/if_pppvar.h.orig sys/net/if_pppvar.h
--- sys/net/if_pppvar.h.orig	Sun Nov 19 16:17:22 2006
+++ sys/net/if_pppvar.h	Wed Dec  6 03:35:11 2006
@@ -57,7 +57,7 @@
 struct ppp_softc {
 	struct	ifnet *sc_ifp;		/* network-visible interface */
 /*hi*/	u_int	sc_flags;		/* control/status bits; see if_ppp.h */
-	struct	callout_handle sc_ch;	/* Used for scheduling timeouts */
+	struct	callout sc_timo_ch;	/* Used for scheduling timeouts */
 	void	*sc_devp;		/* pointer to device-dep structure */
 	void	(*sc_start)(struct ppp_softc *);	/* start output proc */
 	void	(*sc_ctlp)(struct ppp_softc *); /* rcvd control pkt */
Index: sys/net/ppp_tty.c
diff -u -p sys/net/ppp_tty.c.orig sys/net/ppp_tty.c
--- sys/net/ppp_tty.c.orig	Sat Aug 27 17:15:14 2005
+++ sys/net/ppp_tty.c	Tue Dec  5 20:43:35 2006
@@ -275,7 +275,7 @@ pppasyncrelinq(sc)
 	sc->sc_m = NULL;
     }
     if (sc->sc_flags & SC_TIMEOUT) {
-	untimeout(ppp_timeout, (void *) sc, sc->sc_ch);
+	callout_stop(&sc->sc_timo_ch);
 	sc->sc_flags &= ~SC_TIMEOUT;
     }
     splx(s);
@@ -693,7 +693,7 @@ pppasyncstart(sc)
      * drained the t_outq.
      */
     if (!idle && (sc->sc_flags & SC_TIMEOUT) == 0) {
-	sc->sc_ch = timeout(ppp_timeout, (void *) sc, 1);
+	callout_reset(&sc->sc_timo_ch, 1, ppp_timeout, sc);
 	sc->sc_flags |= SC_TIMEOUT;
     }