[src/trunk]: src/sys/netinet Use callout_halt instead of callout_stop

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/70269d49a2a8
branches:  trunk
changeset: 813900:70269d49a2a8
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Thu Feb 25 06:00:01 2016 +0000

description:
Use callout_halt instead of callout_stop

diffstat:

 sys/netinet/in.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r fbf29f081140 -r 70269d49a2a8 sys/netinet/in.c
--- a/sys/netinet/in.c  Thu Feb 25 03:23:15 2016 +0000
+++ b/sys/netinet/in.c  Thu Feb 25 06:00:01 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in.c,v 1.163 2015/11/26 01:41:20 ozaki-r Exp $ */
+/*     $NetBSD: in.c,v 1.164 2016/02/25 06:00:01 ozaki-r Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.163 2015/11/26 01:41:20 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.164 2016/02/25 06:00:01 ozaki-r Exp $");
 
 #include "arp.h"
 
@@ -1620,7 +1620,7 @@
        }
 
        /* cancel timer */
-       if (callout_stop(&lle->lle_timer))
+       if (callout_halt(&lle->lle_timer, &lle->lle_lock))
                LLE_REMREF(lle);
 
        /* Drop hold queue */