--- src/sys/net/sppp/if_sppp.h	2003/06/17 04:28:48	1.2
+++ src/sys/net/sppp/if_sppp.h	2004/09/16 03:54:37	1.3
@@ -17,7 +17,7 @@
  * From: Version 2.0, Fri Oct  6 20:39:21 MSK 1995
  *
  * $FreeBSD: src/sys/net/if_sppp.h,v 1.16.2.3 2002/04/24 18:45:25 joerg Exp $
- * $DragonFly: src/sys/net/if_sppp.h,v 1.1 2003/06/16 06:33:48 dillon Exp $
+ * $DragonFly$
  */
 
 #ifndef _NET_IF_SPPP_H_
@@ -157,8 +157,8 @@ struct sppp {
 #define CONF_ENABLE_IPV6  0x02	/* IPv6 administratively enabled */
 	time_t	pp_last_recv;	/* time last packet has been received */
 	time_t	pp_last_sent;	/* time last packet has been sent */
-	struct callout_handle ch[IDX_COUNT]; /* per-proto and if callouts */
-	struct callout_handle pap_my_to_ch; /* PAP needs one more... */
+	struct callout timeout[IDX_COUNT]; /* per-proto and if callouts */
+	struct callout pap_my_to;	/* PAP needs one more... */
 	struct slcp lcp;		/* LCP params */
 	struct sipcp ipcp;		/* IPCP params */
 	struct sipcp ipv6cp;		/* IPv6CP params */