forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sit/gre6: don't try to add the same route two times

Browse source 
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>
This commit is contained in:
Nicolas Dichtel 2013-11-14 13:51:07 +01:00 • committed by David S. Miller
commit f7cb888633
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
net/ipv6/addrconf.c
View file

@ -2682,7 +2682,6 @@ static void addrconf_sit_config(struct net_device *dev)
struct in6_addr addr; struct in6_addr addr;
ipv6_addr_set(&addr, htonl(0xFE800000), 0, 0, 0); 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)) if (!ipv6_generate_eui64(addr.s6_addr + 8, dev))
addrconf_add_linklocal(idev, &addr); addrconf_add_linklocal(idev, &addr);
return; return;
@ -2709,8 +2708,6 @@ static void addrconf_gre_config(struct net_device *dev)
} }
ipv6_addr_set(&addr, htonl(0xFE800000), 0, 0, 0); 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)) if (!ipv6_generate_eui64(addr.s6_addr + 8, dev))
addrconf_add_linklocal(idev, &addr); addrconf_add_linklocal(idev, &addr);
} }