Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6-omap-h63xx.git] / net / ipv6 / udp_impl.h

diff --git a/net/ipv6/udp_impl.h b/net/ipv6/udp_impl.h
index ec98788991280c586d813be9f839068f4290d598..21be3a83e7bc4613a1959c12d17e469f82893a89 100644 (file)
--- a/net/ipv6/udp_impl.h
+++ b/net/ipv6/udp_impl.h
@@ -5,15 +5,16 @@
 #include <net/protocol.h>
 #include <net/addrconf.h>
 #include <net/inet_common.h>
+#include <net/transp_v6.h>
 
-extern int     __udp6_lib_rcv(struct sk_buff **, struct hlist_head [], int );
+extern int     __udp6_lib_rcv(struct sk_buff *, struct hlist_head [], int );
 extern void    __udp6_lib_err(struct sk_buff *, struct inet6_skb_parm *,
                               int , int , int , __be32 , struct hlist_head []);
 
 extern int     udpv6_getsockopt(struct sock *sk, int level, int optname,
-                                char __user *optval, int __user *optlen);
+                                char __user *optval, int __user *optlen);
 extern int     udpv6_setsockopt(struct sock *sk, int level, int optname,
-                                char __user *optval, int optlen);
+                                char __user *optval, int optlen);
 #ifdef CONFIG_COMPAT
 extern int     compat_udpv6_setsockopt(struct sock *sk, int level, int optname,
                                        char __user *optval, int optlen);
@@ -24,7 +25,7 @@ extern int    udpv6_sendmsg(struct kiocb *iocb, struct sock *sk,
                              struct msghdr *msg, size_t len);
 extern int     udpv6_recvmsg(struct kiocb *iocb, struct sock *sk,
                              struct msghdr *msg, size_t len,
-                             int noblock, int flags, int *addr_len);
+                             int noblock, int flags, int *addr_len);
 extern int     udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb);
 extern int     udpv6_destroy_sock(struct sock *sk);