summaryrefslogtreecommitdiffstats
path: root/net/ipv6/udp.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-03 17:35:48 -0400
committerJeff Garzik <jeff@garzik.org>2006-08-03 17:35:48 -0400
commit36a2c6b28003dd0592b8ece5e9409991e0820f50 (patch)
treec5b52547b2658a8a3b898b8224b835a7e8396017 /net/ipv6/udp.c
parent95916edd02e3a7752315422f386c55723d4a3637 (diff)
parentf1d39b291e2263f5e2f2ec5d4061802f76d8ae67 (diff)
downloadkernel-crypto-36a2c6b28003dd0592b8ece5e9409991e0820f50.tar.gz
kernel-crypto-36a2c6b28003dd0592b8ece5e9409991e0820f50.tar.xz
kernel-crypto-36a2c6b28003dd0592b8ece5e9409991e0820f50.zip
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'net/ipv6/udp.c')
-rw-r--r--net/ipv6/udp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index ccc57f434cd..3d54f246411 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -782,7 +782,7 @@ do_udp_sendmsg:
connected = 0;
}
- err = ip6_dst_lookup(sk, &dst, fl);
+ err = ip6_sk_dst_lookup(sk, &dst, fl);
if (err)
goto out;
if (final_p)