[src/trunk]: src/sys/netinet If we don't have ARP, don't set IN_IFF_TENTATIVE.

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

details:   https://anonhg.NetBSD.org/src/rev/1d0839d33965
branches:  trunk
changeset: 337971:1d0839d33965
user:      roy <roy%NetBSD.org@localhost>
date:      Tue May 05 08:52:51 2015 +0000

description:
If we don't have ARP, don't set IN_IFF_TENTATIVE.

diffstat:

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

diffs (43 lines):

diff -r c64c6493fff9 -r 1d0839d33965 sys/netinet/in.c
--- a/sys/netinet/in.c  Tue May 05 08:08:33 2015 +0000
+++ b/sys/netinet/in.c  Tue May 05 08:52:51 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in.c,v 1.154 2015/05/02 20:22:12 joerg Exp $   */
+/*     $NetBSD: in.c,v 1.155 2015/05/05 08:52:51 roy 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.154 2015/05/02 20:22:12 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.155 2015/05/05 08:52:51 roy Exp $");
 
 #include "arp.h"
 #include "opt_inet.h"
@@ -909,8 +909,10 @@
        if (hostIsNew && if_do_dad(ifp) && !in_nullhost(ia->ia_addr.sin_addr)) {
                if (ifp->if_link_state == LINK_STATE_DOWN)
                        ia->ia4_flags |= IN_IFF_DETACHED;
+#if NARP
                else
                        ia->ia4_flags |= IN_IFF_TENTATIVE;
+#endif
        }
 
        /*
@@ -1177,9 +1179,12 @@
                /* If detached then mark as tentative */
                if (ia->ia4_flags & IN_IFF_DETACHED) {
                        ia->ia4_flags &= ~IN_IFF_DETACHED;
+#if NARP
                        if (if_do_dad(ifp))
                                ia->ia4_flags |= IN_IFF_TENTATIVE;
-                       else if ((ia->ia4_flags & IN_IFF_TENTATIVE) == 0)
+                       else
+#endif
+                       if ((ia->ia4_flags & IN_IFF_TENTATIVE) == 0)
                                rt_newaddrmsg(RTM_NEWADDR, ifa, 0, NULL);
                }