[src/trunk]: src/sys/netinet If we're not doing DAD, don't set IN_IFF_TENTATIVE.

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

details:   https://anonhg.NetBSD.org/src/rev/5b92768a2765
branches:  trunk
changeset: 352126:5b92768a2765
user:      roy <roy%NetBSD.org@localhost>
date:      Fri Mar 17 16:15:11 2017 +0000

description:
If we're not doing DAD, don't set IN_IFF_TENTATIVE.

diffstat:

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

diffs (27 lines):

diff -r 041e09da864d -r 5b92768a2765 sys/netinet/if_arp.c
--- a/sys/netinet/if_arp.c      Fri Mar 17 16:13:44 2017 +0000
+++ b/sys/netinet/if_arp.c      Fri Mar 17 16:15:11 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_arp.c,v 1.246 2017/03/10 20:27:31 roy Exp $ */
+/*     $NetBSD: if_arp.c,v 1.247 2017/03/17 16:15:11 roy 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.246 2017/03/10 20:27:31 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.247 2017/03/17 16:15:11 roy Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -1515,7 +1515,7 @@
        } else {
                ia->ia_dad_start = arp_dad_start;
                ia->ia_dad_stop = arp_dad_stop;
-               if (ia->ia4_flags & IN_IFF_TRYTENTATIVE)
+               if (ia->ia4_flags & IN_IFF_TRYTENTATIVE && ip_dad_count > 0)
                        ia->ia4_flags |= IN_IFF_TENTATIVE;
                else
                        arpannounce1(ifa);