summaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2013-11-14 13:51:07 +0100
committerDavid S. Miller <davem@davemloft.net>2013-11-14 16:59:16 -0500
commitf7cb8886335dea39fa31bb701700361f1aa7a6ea (patch)
tree611bd3b7043c2decf2d3ee3277b51cbcfa8df0db /net/ipv6
parentf0e2acfa30920fc9b902734baba71e58f2fd844a (diff)
downloadop-kernel-dev-f7cb8886335dea39fa31bb701700361f1aa7a6ea.zip
op-kernel-dev-f7cb8886335dea39fa31bb701700361f1aa7a6ea.tar.gz
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/ipv6')
-rw-r--r--net/ipv6/addrconf.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 5969ca1..cdc14d0 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2682,7 +2682,6 @@ static void addrconf_sit_config(struct net_device *dev)
struct in6_addr addr;
ipv6_addr_set(&addr, htonl(0xFE800000), 0, 0, 0);
- addrconf_prefix_route(&addr, 64, dev, 0, 0);
if (!ipv6_generate_eui64(addr.s6_addr + 8, dev))
addrconf_add_linklocal(idev, &addr);
return;
@@ -2709,8 +2708,6 @@ static void addrconf_gre_config(struct net_device *dev)
}
ipv6_addr_set(&addr, htonl(0xFE800000), 0, 0, 0);
- addrconf_prefix_route(&addr, 64, dev, 0, 0);
-
if (!ipv6_generate_eui64(addr.s6_addr + 8, dev))
addrconf_add_linklocal(idev, &addr);
}
OpenPOWER on IntegriCloud