diff options
author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2013-11-14 07:51:07 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-11-14 16:59:16 -0500 |
commit | f7cb8886335dea39fa31bb701700361f1aa7a6ea (patch) | |
tree | 611bd3b7043c2decf2d3ee3277b51cbcfa8df0db /net | |
parent | f0e2acfa30920fc9b902734baba71e58f2fd844a (diff) |
sit/gre6: don't try to add the same route two times
addrconf_add_linklocal() already adds the link local route, so there is no
reason to add it before calling this function.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv6/addrconf.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 5969ca19a6c8..cdc14d0947f3 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -2682,7 +2682,6 @@ static void addrconf_sit_config(struct net_device *dev) | |||
2682 | struct in6_addr addr; | 2682 | struct in6_addr addr; |
2683 | 2683 | ||
2684 | ipv6_addr_set(&addr, htonl(0xFE800000), 0, 0, 0); | 2684 | ipv6_addr_set(&addr, htonl(0xFE800000), 0, 0, 0); |
2685 | addrconf_prefix_route(&addr, 64, dev, 0, 0); | ||
2686 | if (!ipv6_generate_eui64(addr.s6_addr + 8, dev)) | 2685 | if (!ipv6_generate_eui64(addr.s6_addr + 8, dev)) |
2687 | addrconf_add_linklocal(idev, &addr); | 2686 | addrconf_add_linklocal(idev, &addr); |
2688 | return; | 2687 | return; |
@@ -2709,8 +2708,6 @@ static void addrconf_gre_config(struct net_device *dev) | |||
2709 | } | 2708 | } |
2710 | 2709 | ||
2711 | ipv6_addr_set(&addr, htonl(0xFE800000), 0, 0, 0); | 2710 | ipv6_addr_set(&addr, htonl(0xFE800000), 0, 0, 0); |
2712 | addrconf_prefix_route(&addr, 64, dev, 0, 0); | ||
2713 | |||
2714 | if (!ipv6_generate_eui64(addr.s6_addr + 8, dev)) | 2711 | if (!ipv6_generate_eui64(addr.s6_addr + 8, dev)) |
2715 | addrconf_add_linklocal(idev, &addr); | 2712 | addrconf_add_linklocal(idev, &addr); |
2716 | } | 2713 | } |