Source-Changes-HG archive

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

[src/trunk]: src/sys/net Calling rtinit(sa_family = AF_LINK, RTM_DELETE, 0) i...



details:   https://anonhg.NetBSD.org/src/rev/0d32169efce8
branches:  trunk
changeset: 324539:0d32169efce8
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jul 09 14:54:01 2018 +0000

description:
Calling rtinit(sa_family = AF_LINK, RTM_DELETE, 0) is guaranteed not to
work. Remove bogus call leaving a KASSERT behind.

diffstat:

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

diffs (27 lines):

diff -r f351a6fefabc -r 0d32169efce8 sys/net/if.c
--- a/sys/net/if.c      Mon Jul 09 14:07:37 2018 +0000
+++ b/sys/net/if.c      Mon Jul 09 14:54:01 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if.c,v 1.429 2018/07/03 03:37:03 ozaki-r Exp $ */
+/*     $NetBSD: if.c,v 1.430 2018/07/09 14:54:01 christos Exp $        */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.429 2018/07/03 03:37:03 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.430 2018/07/09 14:54:01 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -595,7 +595,7 @@
        KASSERT(ifp->if_sadl != NULL);
 
        s = splsoftnet();
-       rtinit(ifa, RTM_DELETE, 0);
+       KASSERT(ifa->ifa_addr->sa_family == AF_LINK);
        ifa_remove(ifp, ifa);
        if_deactivate_sadl(ifp);
        splx(s);



Home | Main Index | Thread Index | Old Index