Module Name: src
Committed By: roy
Date: Tue May 5 08:52:51 UTC 2015
Modified Files:
src/sys/netinet: in.c
Log Message:
If we don't have ARP, don't set IN_IFF_TENTATIVE.
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 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.154 src/sys/netinet/in.c:1.155
--- src/sys/netinet/in.c:1.154 Sat May 2 20:22:12 2015
+++ src/sys/netinet/in.c Tue May 5 08:52:51 2015
@@ -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 @@ in_ifinit(struct ifnet *ifp, struct in_i
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 @@ in_if_link_up(struct ifnet *ifp)
/* 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);
}
