diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-08 03:09:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-08 03:09:11 -0400 |
| commit | 32bc6e095d75233e7c87cc6fa0e07942b124d194 (patch) | |
| tree | 8f83ef9a23d52d1305878b65dd98fc22b09b7f3e /net/ipv6/af_inet6.c | |
| parent | 5cf13911b1e72707b6f0eb39b2d819ec6e343d76 (diff) | |
| parent | 81b73dd92b97423b8f5324a59044da478c04f4c4 (diff) | |
Merge branch 'merge'
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; |