Skip to content

Commit

Permalink
sit/gre6: don't try to add the same route two times
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
NicolasDichtel authored and davem330 committed Nov 14, 2013
1 parent f0e2acf commit f7cb888
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions net/ipv6/addrconf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}
Expand Down

0 comments on commit f7cb888

Please sign in to comment.