Module Name: src
Committed By: snj
Date: Mon Apr 9 04:04:21 UTC 2018
Modified Files:
src/sys/netinet [netbsd-8]: in.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #701):
sys/netinet/in.c: 1.228
Protect ip_dad_count with if NARP > 0 to fix compilation
To generate a diff of this commit:
cvs rdiff -u -r1.203.2.12 -r1.203.2.13 src/sys/netinet/in.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/in.c
diff -u src/sys/netinet/in.c:1.203.2.12 src/sys/netinet/in.c:1.203.2.13
--- src/sys/netinet/in.c:1.203.2.12 Sun Apr 8 06:09:12 2018
+++ src/sys/netinet/in.c Mon Apr 9 04:04:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in.c,v 1.203.2.12 2018/04/08 06:09:12 snj Exp $ */
+/* $NetBSD: in.c,v 1.203.2.13 2018/04/09 04:04:21 snj Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.203.2.12 2018/04/08 06:09:12 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.203.2.13 2018/04/09 04:04:21 snj Exp $");
#include "arp.h"
@@ -1150,7 +1150,11 @@ in_ifinit(struct ifnet *ifp, struct in_i
if (ifp->if_link_state == LINK_STATE_DOWN) {
ia->ia4_flags |= IN_IFF_DETACHED;
ia->ia4_flags &= ~IN_IFF_TENTATIVE;
- } else if (hostIsNew && if_do_dad(ifp) && ip_dad_count > 0)
+ } else if (hostIsNew && if_do_dad(ifp)
+#if NARP > 0
+ && ip_dad_count > 0
+#endif
+ )
ia->ia4_flags |= IN_IFF_TRYTENTATIVE;
/*
