summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2011-05-20 11:27:24 +0000
committerDavid S. Miller <davem@davemloft.net>2011-05-21 02:05:22 -0400
commit0f6c6392dca9c4825c98322a1bf74991e4f0f54d (patch)
tree6100a2d32a99b3f735bbb41d9749362ead92fb22 /net
parent557eed603159b4e007c57d97fad1333ecebd3c2e (diff)
downloadlinux-3.10-0f6c6392dca9c4825c98322a1bf74991e4f0f54d.tar.gz
linux-3.10-0f6c6392dca9c4825c98322a1bf74991e4f0f54d.tar.bz2
linux-3.10-0f6c6392dca9c4825c98322a1bf74991e4f0f54d.zip
ipv6: copy prefsrc setting when copying route entry
commit c3968a857a6b6c3d2ef4ead35776b055fb664d74 ('ipv6: RTA_PREFSRC support for ipv6 route source address selection') added support for ipv6 prefsrc as an alternative to ipv6 addrlabels, but it did not work because the prefsrc entry was not copied. Cc: Daniel Walter <sahne@0x90.at> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/route.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index f1be5c5c85e..de2b1decd78 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1756,6 +1756,7 @@ static struct rt6_info * ip6_rt_copy(struct rt6_info *ort)
#ifdef CONFIG_IPV6_SUBTREES
memcpy(&rt->rt6i_src, &ort->rt6i_src, sizeof(struct rt6key));
#endif
+ memcpy(&rt->rt6i_prefsrc, &ort->rt6i_prefsrc, sizeof(struct rt6key));
rt->rt6i_table = ort->rt6i_table;
}
return rt;