==== //depot/user/rwatson/netperf/sys/nfsserver/nfs.h#3 - /home/rwatson/p4/rwatson_netperf/sys/nfsserver/nfs.h ====
@@ -132,7 +132,7 @@
 struct vattr;
 struct nameidata;
 
-extern struct callout_handle nfsrv_timer_handle;
+extern struct callout nfsrv_callout;
 extern struct nfsrvstats nfsrvstats;
 
 extern int	nfsrv_ticks;
==== //depot/user/rwatson/netperf/sys/nfsserver/nfs_serv.c#3 - /home/rwatson/p4/rwatson_netperf/sys/nfsserver/nfs_serv.c ====
==== //depot/user/rwatson/netperf/sys/nfsserver/nfs_srvsock.c#5 - /home/rwatson/p4/rwatson_netperf/sys/nfsserver/nfs_srvsock.c ====
@@ -96,7 +96,7 @@
  */
 #define	NFS_CWNDSCALE	256
 #define	NFS_MAXCWND	(NFS_CWNDSCALE * 32)
-struct callout_handle	nfsrv_timer_handle;
+struct callout	nfsrv_callout;
 
 static void	nfs_realign(struct mbuf **pm, int hsiz);	/* XXX SHARED */
 static int	nfsrv_getstream(struct nfssvc_sock *, int);
@@ -779,5 +779,5 @@
 			nfsrv_wakenfsd(slp);
 	}
 	splx(s);
-	nfsrv_timer_handle = timeout(nfsrv_timer, NULL, nfsrv_ticks);
+	callout_reset(&nsrv_callout, nfsrv_ticks, nfsrv_timer, NULL);
 }
==== //depot/user/rwatson/netperf/sys/nfsserver/nfs_srvsubs.c#3 - /home/rwatson/p4/rwatson_netperf/sys/nfsserver/nfs_srvsubs.c ====
@@ -545,6 +545,7 @@
 		nfsrv_init(0);		/* Init server data structures */
 		nfsrv_initcache();	/* Init the server request cache */
 
+		callout_init(&nfsrv_callout, 0);
 		nfsrv_timer(0);
 
 		nfs_prev_nfssvc_sy_narg = sysent[SYS_nfssvc].sy_narg;
@@ -555,7 +556,7 @@
 
 		case MOD_UNLOAD:
 
-		untimeout(nfsrv_timer, (void *)NULL, nfsrv_timer_handle);
+		callout_stop(nfsrv_callout);
 		sysent[SYS_nfssvc].sy_narg = nfs_prev_nfssvc_sy_narg;
 		sysent[SYS_nfssvc].sy_call = nfs_prev_nfssvc_sy_call;
 		break;