Module Name: src
Committed By: ozaki-r
Date: Thu Feb 25 06:00:01 UTC 2016
Modified Files:
src/sys/netinet: in.c
Log Message:
Use callout_halt instead of callout_stop
To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/sys/netinet/in.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/in.c
diff -u src/sys/netinet/in.c:1.163 src/sys/netinet/in.c:1.164
--- src/sys/netinet/in.c:1.163 Thu Nov 26 01:41:20 2015
+++ src/sys/netinet/in.c Thu Feb 25 06:00:01 2016
@@ -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 @@ in_lltable_free_entry(struct lltable *ll
}
/* cancel timer */
- if (callout_stop(&lle->lle_timer))
+ if (callout_halt(&lle->lle_timer, &lle->lle_lock))
LLE_REMREF(lle);
/* Drop hold queue */
