diff options
-rw-r--r-- | net/ipv6/addrconf.c | 10 |
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, | |||
650 | 650 | ||
651 | ifa->rt = rt; | 651 | ifa->rt = rt; |
652 | 652 | ||
653 | /* | ||
654 | * part one of RFC 4429, section 3.3 | ||
655 | * We should not configure an address as | ||
656 | * optimistic if we do not yet know the link | ||
657 | * layer address of our nexhop router | ||
658 | */ | ||
659 | |||
660 | if (dst_get_neighbour_noref_raw(&rt->dst) == NULL) | ||
661 | ifa->flags &= ~IFA_F_OPTIMISTIC; | ||
662 | |||
663 | ifa->idev = idev; | 653 | ifa->idev = idev; |
664 | in6_dev_hold(idev); | 654 | in6_dev_hold(idev); |
665 | /* For caller */ | 655 | /* For caller */ |