Module Name: src
Committed By: maxv
Date: Tue Apr 24 08:22:17 UTC 2018
Modified Files:
src/sys/netinet6: nd6_rtr.c
Log Message:
Remove nullcheck, m is not allowed to be null.
To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 src/sys/netinet6/nd6_rtr.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/netinet6/nd6_rtr.c
diff -u src/sys/netinet6/nd6_rtr.c:1.139 src/sys/netinet6/nd6_rtr.c:1.140
--- src/sys/netinet6/nd6_rtr.c:1.139 Tue Apr 24 08:07:05 2018
+++ src/sys/netinet6/nd6_rtr.c Tue Apr 24 08:22:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_rtr.c,v 1.139 2018/04/24 08:07:05 maxv Exp $ */
+/* $NetBSD: nd6_rtr.c,v 1.140 2018/04/24 08:22:16 maxv Exp $ */
/* $KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.139 2018/04/24 08:07:05 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.140 2018/04/24 08:22:16 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -1118,12 +1118,10 @@ prelist_update(struct nd_prefixctl *newp
int ss;
char ip6buf[INET6_ADDRSTRLEN];
+ KASSERT(m != NULL);
ND6_ASSERT_WLOCK();
- auth = 0;
- if (m) {
- auth = (m->m_flags & M_AUTHIPHDR) ? 1 : 0;
- }
+ auth = (m->m_flags & M_AUTHIPHDR) ? 1 : 0;
if ((pr = nd6_prefix_lookup(newprc)) != NULL) {
/*
