diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-21 00:13:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-21 00:13:03 -0700 |
| commit | c21fd1a8c68ce3f49b00caf10337169262cfb8ad (patch) | |
| tree | 37bb9c0511ece948cc3913f4df21166768379f5e /net/ipv6/route.c | |
| parent | 1a4022f88d40e1255920b017556092ab926d7f66 (diff) | |
| parent | 5d414521663295ce25c90164f4d41a07ac846468 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
sctp: Fix build failure.
garp: use kfree_rcu()
ipv6: copy prefsrc setting when copying route entry
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index f1be5c5c85ef..de2b1decd786 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; |