diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-07 09:16:35 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-07 09:16:35 -0400 |
| commit | ad73c67e792c752ddc99f2b0587abae05255dd6d (patch) | |
| tree | e33d5d37a8c56b6fad753fa2d481f43cfb60ae1d /net/ipv6/af_inet6.c | |
| parent | 08eac93a689ca05c7b7413f6d362c7d38b5fd5b1 (diff) | |
| parent | 9f737633e6ee54fc174282d49b2559bd2208391d (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/ipv6/af_inet6.c')
| -rw-r--r-- | net/ipv6/af_inet6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 5a0ba58b86cc..ac85e9c532c2 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
| @@ -658,7 +658,7 @@ int inet6_sk_rebuild_header(struct sock *sk) | |||
| 658 | return err; | 658 | return err; |
| 659 | } | 659 | } |
| 660 | 660 | ||
| 661 | ip6_dst_store(sk, dst, NULL); | 661 | __ip6_dst_store(sk, dst, NULL); |
| 662 | } | 662 | } |
| 663 | 663 | ||
| 664 | return 0; | 664 | return 0; |