[src/netbsd-8]: src/sys/netinet Pull up following revision(s) (requested by o...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d5f0296d6317
branches:  netbsd-8
changeset: 434842:d5f0296d6317
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Apr 09 04:04:21 2018 +0000

description:
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

diffstat:

 sys/netinet/in.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r d72edda90032 -r d5f0296d6317 sys/netinet/in.c
--- a/sys/netinet/in.c  Sun Apr 08 06:22:03 2018 +0000
+++ b/sys/netinet/in.c  Mon Apr 09 04:04:21 2018 +0000
@@ -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 @@
        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;
 
        /*