projects
/
deliverable
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f0e2acf
)
sit/gre6: don't try to add the same route two times
author
Nicolas Dichtel
<nicolas.dichtel@6wind.com>
Thu, 14 Nov 2013 12:51:07 +0000
(13:51 +0100)
committer
David S. Miller
<davem@davemloft.net>
Thu, 14 Nov 2013 21:59:16 +0000
(16:59 -0500)
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>
net/ipv6/addrconf.c
patch
|
blob
|
blame
|
history
diff --git
a/net/ipv6/addrconf.c
b/net/ipv6/addrconf.c
index 5969ca19a6c82d186d568ecb170e8fb747f55c5a..cdc14d0947f39c465234bdecf39aef34ce9898a9 100644
(file)
--- 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);
}
This page took
0.027969 seconds
and
5
git commands to generate.