Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/netinet Protect ip_dad_count with if NARP > 0 to fix com...
details: https://anonhg.NetBSD.org/src/rev/407fbf4107de
branches: trunk
changeset: 360986:407fbf4107de
user: christos <christos%NetBSD.org@localhost>
date: Sun Apr 08 13:52:22 2018 +0000
description:
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 b84e9058c889 -r 407fbf4107de sys/netinet/in.c
--- a/sys/netinet/in.c Sun Apr 08 13:43:29 2018 +0000
+++ b/sys/netinet/in.c Sun Apr 08 13:52:22 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: in.c,v 1.227 2018/04/06 16:03:16 ozaki-r Exp $ */
+/* $NetBSD: in.c,v 1.228 2018/04/08 13:52:22 christos 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.227 2018/04/06 16:03:16 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.228 2018/04/08 13:52:22 christos 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;
/*
Home |
Main Index |
Thread Index |
Old Index