Add changes from the Linux-2.6 tree.

[linux-2.6.git] / include / net / transp_v6.h

diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h
index 8b075ab..409da3a 100644 (file)
--- a/include/net/transp_v6.h
+++ b/include/net/transp_v6.h
@@ -11,6 +11,7 @@
 
 extern struct proto rawv6_prot;
 extern struct proto udpv6_prot;
+extern struct proto udplitev6_prot;
 extern struct proto tcpv6_prot;
 
 struct flowi;
@@ -24,6 +25,7 @@ extern void                           ipv6_destopt_init(void);
 /* transport protocols */
 extern void                            rawv6_init(void);
 extern void                            udpv6_init(void);
+extern void                            udplitev6_init(void);
 extern void                            tcpv6_init(void);
 
 extern int                             udpv6_connect(struct sock *sk,
@@ -37,14 +39,14 @@ extern int                  datagram_recv_ctl(struct sock *sk,
 extern int                     datagram_send_ctl(struct msghdr *msg,
                                                  struct flowi *fl,
                                                  struct ipv6_txoptions *opt,
-                                                 int *hlimit);
+                                                 int *hlimit, int *tclass);
 
 #define                LOOPBACK4_IPV6          __constant_htonl(0x7f000006)
 
 /*
  *     address family specific functions
  */
-extern struct tcp_func ipv4_specific;
+extern struct inet_connection_sock_af_ops ipv4_specific;
 
 extern int inet6_destroy_sock(struct sock *sk);