Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / net / ipv6 / udp_impl.h

diff --git a/net/ipv6/udp_impl.h b/net/ipv6/udp_impl.h
index 36b0c11a28a312dcad2bfa6f82d4bbd057dd307e..21be3a83e7bc4613a1959c12d17e469f82893a89 100644 (file)
--- a/net/ipv6/udp_impl.h
+++ b/net/ipv6/udp_impl.h
@@ -5,10 +5,9 @@
 #include <net/protocol.h>
 #include <net/addrconf.h>
 #include <net/inet_common.h>
+#include <net/transp_v6.h>
 
-extern const struct udp_get_port_ops udp_ipv6_ops;
-
-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 []);