Module Name: src
Committed By: ozaki-r
Date: Mon Jul 25 01:52:22 UTC 2016
Modified Files:
src/sys/netinet: if_arp.c
src/sys/netinet6: nd6_nbr.c
Log Message:
Use KASSERT for checking non-NULL of ifa->ifa_ifp
ifa->ifa_ifp should be always non-NULL, so doing the check only if
DIAGNOSTIC is ok.
To generate a diff of this commit:
cvs rdiff -u -r1.217 -r1.218 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.123 -r1.124 src/sys/netinet6/nd6_nbr.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.217 src/sys/netinet/if_arp.c:1.218
--- src/sys/netinet/if_arp.c:1.217 Fri Jul 8 04:33:30 2016
+++ src/sys/netinet/if_arp.c Mon Jul 25 01:52:21 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.217 2016/07/08 04:33:30 ozaki-r Exp $ */
+/* $NetBSD: if_arp.c,v 1.218 2016/07/25 01:52:21 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.217 2016/07/08 04:33:30 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.218 2016/07/25 01:52:21 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1560,8 +1560,7 @@ arp_dad_start(struct ifaddr *ifa)
CLLADDR(ifa->ifa_ifp->if_sadl));
return;
}
- if (ifa->ifa_ifp == NULL)
- panic("arp_dad_start: ifa->ifa_ifp == NULL");
+ KASSERT(ifa->ifa_ifp != NULL);
if (!(ifa->ifa_ifp->if_flags & IFF_UP))
return;
if (arp_dad_find(ifa) != NULL) {
Index: src/sys/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.123 src/sys/netinet6/nd6_nbr.c:1.124
--- src/sys/netinet6/nd6_nbr.c:1.123 Fri Jul 15 07:40:09 2016
+++ src/sys/netinet6/nd6_nbr.c Mon Jul 25 01:52:21 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_nbr.c,v 1.123 2016/07/15 07:40:09 ozaki-r Exp $ */
+/* $NetBSD: nd6_nbr.c,v 1.124 2016/07/25 01:52:21 ozaki-r Exp $ */
/* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.123 2016/07/15 07:40:09 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.124 2016/07/25 01:52:21 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1114,8 +1114,7 @@ nd6_dad_start(struct ifaddr *ifa, int xt
rt_newaddrmsg(RTM_NEWADDR, ifa, 0, NULL);
return;
}
- if (ifa->ifa_ifp == NULL)
- panic("nd6_dad_start: ifa->ifa_ifp == NULL");
+ KASSERT(ifa->ifa_ifp != NULL);
if (!(ifa->ifa_ifp->if_flags & IFF_UP))
return;
if (nd6_dad_find(ifa) != NULL) {
