summaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2011-12-27 10:53:05 +0100
committerDavid S. Miller <davem@davemloft.net>2011-12-28 19:38:49 +0100
commit7ffbcecbeed91e5874e9a1cfc4c0cbb07dac3069 (patch)
treec9a6ac231343b25e9049689eb679bf1364602092 /net/ipv6
parentMerge branch 'nf-next' of git://1984.lsi.us.es/net-next (diff)
downloadlinux-7ffbcecbeed91e5874e9a1cfc4c0cbb07dac3069.tar.xz
linux-7ffbcecbeed91e5874e9a1cfc4c0cbb07dac3069.zip
ipv6: Remove optimistic DAD flag test in ipv6_add_addr()
The route we have here is for the address being added to the interface, ie. for input packet processing. Therefore using that route to determine whether an output nexthop gateway is known and resolved doesn't make any sense. So, simply remove this test, it never triggered anyways. Signed-off-by: David S. Miller <davem@davemloft.net> Acked-By: Neil Horman <nhorman@tuxdriver.com>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/addrconf.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 59a9d0e1da56..85421cce5e1a 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -650,16 +650,6 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr, int pfxlen,
ifa->rt = rt;
- /*
- * part one of RFC 4429, section 3.3
- * We should not configure an address as
- * optimistic if we do not yet know the link
- * layer address of our nexhop router
- */
-
- if (dst_get_neighbour_noref_raw(&rt->dst) == NULL)
- ifa->flags &= ~IFA_F_OPTIMISTIC;
-
ifa->idev = idev;
in6_dev_hold(idev);
/* For caller */