diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2005-02-10 03:40:17 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2005-02-10 03:40:17 +0000 |
| commit | 5950726b53c4f79837be8cde13c705feb316c50e (patch) | |
| tree | 9c020b2f059632514b48619fd7f5c9cd2f7096fc | |
| parent | 310fe11715f87bf19aec652c96475cf4b4e3d383 (diff) | |
remove #if 0'ed code (which was experimental and should never be used)
| -rw-r--r-- | sys/netinet6/nd6_nbr.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index a9a824f1dc6..1bc31662d73 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_nbr.c,v 1.36 2005/01/18 23:26:52 mpf Exp $ */ +/* $OpenBSD: nd6_nbr.c,v 1.37 2005/02/10 03:40:16 itojun Exp $ */ /* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */ /* @@ -1241,33 +1241,8 @@ nd6_dad_timer(ifa) } if (dp->dad_ns_icount) { -#if 0 /* heuristics */ - /* - * if - * - we have sent many(?) DAD NS, and - * - the number of NS we sent equals to the - * number of NS we've got, and - * - we've got no NA - * we may have a faulty network card/driver which - * loops back multicasts to myself. - */ - if (3 < dp->dad_count - && dp->dad_ns_icount == dp->dad_count - && dp->dad_na_icount == 0) { - log(LOG_INFO, "DAD questionable for %s(%s): " - "network card loops back multicast?\n", - ip6_sprintf(&ia->ia_addr.sin6_addr), - ifa->ifa_ifp->if_xname); - /* XXX consider it a duplicate or not? */ - /* duplicate++; */ - } else { - /* We've seen NS, means DAD has failed. */ - duplicate++; - } -#else /* We've seen NS, means DAD has failed. */ duplicate++; -#endif } if (duplicate) { |