Module Name: src
Committed By: roy
Date: Fri Mar 17 16:15:12 UTC 2017
Modified Files:
src/sys/netinet: if_arp.c
Log Message:
If we're not doing DAD, don't set IN_IFF_TENTATIVE.
To generate a diff of this commit:
cvs rdiff -u -r1.246 -r1.247 src/sys/netinet/if_arp.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/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.246 src/sys/netinet/if_arp.c:1.247
--- src/sys/netinet/if_arp.c:1.246 Fri Mar 10 20:27:31 2017
+++ src/sys/netinet/if_arp.c Fri Mar 17 16:15:11 2017
@@ -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 @@ arp_ifinit(struct ifnet *ifp, struct ifa
} 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);
