diff options
author | John W. Linville <linville@tuxdriver.com> | 2006-08-04 14:24:15 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-08-04 14:24:15 -0400 |
commit | 71bfe47f023c55c322607939b786ce0a44627dfc (patch) | |
tree | f59c37feb00f1df2e0f4ec282ae9c80ad6bb0cdc /net/ipv6/udp.c | |
parent | 73c1ac1e3b6c989b9b5f7b2313ac590a1c3b6d6a (diff) | |
parent | efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48 (diff) | |
download | op-kernel-dev-71bfe47f023c55c322607939b786ce0a44627dfc.zip op-kernel-dev-71bfe47f023c55c322607939b786ce0a44627dfc.tar.gz |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'net/ipv6/udp.c')
-rw-r--r-- | net/ipv6/udp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index ccc57f4..3d54f24 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) |