Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netinet Revert v1.176 for further proper fix



details:   https://anonhg.NetBSD.org/src/rev/d6c946172eaa
branches:  trunk
changeset: 340497:d6c946172eaa
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Wed Sep 09 01:22:28 2015 +0000

description:
Revert v1.176 for further proper fix

diffstat:

 sys/netinet/if_arp.c |  17 ++---------------
 1 files changed, 2 insertions(+), 15 deletions(-)

diffs (39 lines):

diff -r 5ae9fa1b5faa -r d6c946172eaa sys/netinet/if_arp.c
--- a/sys/netinet/if_arp.c      Tue Sep 08 18:33:12 2015 +0000
+++ b/sys/netinet/if_arp.c      Wed Sep 09 01:22:28 2015 +0000
@@ -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 @@
 {
        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);



Home | Main Index | Thread Index | Old Index