Module Name: src
Committed By: joerg
Date: Sat May 2 20:22:12 UTC 2015
Modified Files:
src/sys/netinet: in.c ip_input.c
Log Message:
Fix !ARP build.
To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/sys/netinet/in.c
cvs rdiff -u -r1.321 -r1.322 src/sys/netinet/ip_input.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.153 src/sys/netinet/in.c:1.154
--- src/sys/netinet/in.c:1.153 Sat May 2 15:22:03 2015
+++ src/sys/netinet/in.c Sat May 2 20:22:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in.c,v 1.153 2015/05/02 15:22:03 roy Exp $ */
+/* $NetBSD: in.c,v 1.154 2015/05/02 20:22:12 joerg Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,8 +91,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.153 2015/05/02 15:22:03 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.154 2015/05/02 20:22:12 joerg Exp $");
+#include "arp.h"
#include "opt_inet.h"
#include "opt_inet_conf.h"
#include "opt_mrouting.h"
@@ -663,8 +664,10 @@ in_purgeaddr(struct ifaddr *ifa)
struct ifnet *ifp = ifa->ifa_ifp;
struct in_ifaddr *ia = (void *) ifa;
- /* stop DAD processing */
+#if NARP
+ /* stop DAD processing */
arp_dad_stop(ifa);
+#endif
in_ifscrub(ifp, ia);
in_ifremlocal(ifa);
@@ -979,10 +982,12 @@ in_ifinit(struct ifnet *ifp, struct in_i
ia->ia_allhosts = in_addmulti(&addr, ifp);
}
+#if NARP
if (hostIsNew && if_do_dad(ifp) &&
!in_nullhost(ia->ia_addr.sin_addr) &&
ia->ia4_flags & IN_IFF_TENTATIVE)
arp_dad_start((struct ifaddr *)ia);
+#endif
return (error);
bad:
@@ -1178,11 +1183,13 @@ in_if_link_up(struct ifnet *ifp)
rt_newaddrmsg(RTM_NEWADDR, ifa, 0, NULL);
}
+#if NARP
if (ia->ia4_flags & IN_IFF_TENTATIVE) {
/* Clear the duplicated flag as we're starting DAD. */
ia->ia4_flags &= ~IN_IFF_DUPLICATED;
arp_dad_start(ifa);
}
+#endif
}
}
@@ -1208,8 +1215,10 @@ in_if_link_down(struct ifnet *ifp)
continue;
ia = (struct in_ifaddr *)ifa;
+#if NARP
/* Stop DAD processing */
arp_dad_stop(ifa);
+#endif
/*
* Mark the address as detached.
Index: src/sys/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.321 src/sys/netinet/ip_input.c:1.322
--- src/sys/netinet/ip_input.c:1.321 Sat May 2 14:41:32 2015
+++ src/sys/netinet/ip_input.c Sat May 2 20:22:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.321 2015/05/02 14:41:32 roy Exp $ */
+/* $NetBSD: ip_input.c,v 1.322 2015/05/02 20:22:12 joerg Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.321 2015/05/02 14:41:32 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.322 2015/05/02 20:22:12 joerg Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -1645,6 +1645,7 @@ sysctl_net_inet_ip_setup(struct sysctllo
sysctl_net_inet_ip_stats, 0, NULL, 0,
CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS,
CTL_EOL);
+#if NARP
sysctl_createv(clog, 0, NULL, NULL,
CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
CTLTYPE_INT, "dad_count",
@@ -1653,6 +1654,7 @@ sysctl_net_inet_ip_setup(struct sysctllo
NULL, 0, &ip_dad_count, 0,
CTL_NET, PF_INET, IPPROTO_IP,
IPCTL_DAD_COUNT, CTL_EOL);
+#endif
/* anonportalgo RFC6056 subtree */
const struct sysctlnode *portalgo_node;
