Module Name: src
Committed By: ozaki-r
Date: Wed Sep 9 01:22:28 UTC 2015
Modified Files:
src/sys/netinet: if_arp.c
Log Message:
Revert v1.176 for further proper fix
To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/sys/netinet/if_arp.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/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.178 src/sys/netinet/if_arp.c:1.179
--- src/sys/netinet/if_arp.c:1.178 Mon Sep 7 01:18:27 2015
+++ src/sys/netinet/if_arp.c Wed Sep 9 01:22:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.178 2015/09/07 01:18:27 ozaki-r Exp $ */
+/* $NetBSD: if_arp.c,v 1.179 2015/09/09 01:22:28 ozaki-r Exp $ */
/*-
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.178 2015/09/07 01:18:27 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.179 2015/09/09 01:22:28 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1427,20 +1427,7 @@ static void arptfree(struct llentry *la)
{
struct rtentry *rt = la->la_rt;
-#ifdef notyet
- /*
- * This is racy; arptfree() is called without a lock from
- * arptimer(), and something can delete the route before
- * we get here. This happens for me when a ppp interface
- * gets deleted.
- */
KASSERT(rt != NULL);
-#else
- if (rt == NULL) {
- aprint_error("%s: llentry without rt\n", __func__);
- return;
- }
-#endif
if (la->la_rt != NULL) {
rtfree(la->la_rt);
