[ICSK]: Rename struct tcp_func to struct inet_connection_sock_af_ops

And move it to struct inet_connection_sock. DCCP will use it in the
upcoming changesets.

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 28 insertions, 52 deletions

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 0e1da6602e05..4e1434007f44 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -295,8 +295,6 @@ struct tcp_sock {
 
         struct sk_buff_head     out_of_order_queue; /* Out of order segments go here */
 
-        struct tcp_func         *af_specific;   /* Operations which are AF_INET{4,6} specific   */
-
         __u32   rcv_wnd;        /* Current receiver window              */
         __u32   rcv_wup;        /* rcv_nxt on last window update sent   */
         __u32   write_seq;      /* Tail(+1) of data held in tcp send buffer */
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index ccc81a1c550c..9e20d201e951 100644
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -15,6 +15,7 @@
 #ifndef _INET_CONNECTION_SOCK_H
 #define _INET_CONNECTION_SOCK_H
 
+#include <linux/compiler.h>
 #include <linux/ip.h>
 #include <linux/string.h>
 #include <linux/timer.h>
@@ -29,6 +30,29 @@ struct inet_bind_bucket;
 struct inet_hashinfo;
 struct tcp_congestion_ops;
 
+/*
+ * Pointers to address related TCP functions
+ * (i.e. things that depend on the address family)
+ */
+struct inet_connection_sock_af_ops {
+        int         (*queue_xmit)(struct sk_buff *skb, int ipfragok);
+        void        (*send_check)(struct sock *sk, int len,
+                                  struct sk_buff *skb);
+        int         (*rebuild_header)(struct sock *sk);
+        int         (*conn_request)(struct sock *sk, struct sk_buff *skb);
+        struct sock *(*syn_recv_sock)(struct sock *sk, struct sk_buff *skb,
+                                      struct request_sock *req,
+                                      struct dst_entry *dst);
+        int         (*remember_stamp)(struct sock *sk);
+        __u16       net_header_len;
+        int         (*setsockopt)(struct sock *sk, int level, int optname, 
+                                  char __user *optval, int optlen);
+        int         (*getsockopt)(struct sock *sk, int level, int optname, 
+                                  char __user *optval, int __user *optlen);
+        void        (*addr2sockaddr)(struct sock *sk, struct sockaddr *);
+        int sockaddr_len;
+};
+
 /** inet_connection_sock - INET connection oriented sock
  *
  * @icsk_accept_queue:     FIFO of established children 
@@ -37,6 +61,7 @@ struct tcp_congestion_ops;
  * @icsk_retransmit_timer: Resend (no ack)
  * @icsk_rto:              Retransmit timeout
  * @icsk_ca_ops            Pluggable congestion control hook
+ * @icsk_af_ops            Operations which are AF_INET{4,6} specific
  * @icsk_ca_state:         Congestion control state
  * @icsk_retransmits:      Number of unrecovered [RTO] timeouts
  * @icsk_pending:          Scheduled timer event
@@ -55,6 +80,7 @@ struct inet_connection_sock {
         struct timer_list         icsk_delack_timer;
         __u32                     icsk_rto;
         struct tcp_congestion_ops *icsk_ca_ops;
+        struct inet_connection_sock_af_ops *icsk_af_ops;
         __u8                      icsk_ca_state;
         __u8                      icsk_retransmits;
         __u8                      icsk_pending;
diff --git a/include/net/tcp.h b/include/net/tcp.h
index d78025f9fbea..83b117a25c2a 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -225,53 +225,6 @@ extern atomic_t tcp_sockets_allocated;
 extern int tcp_memory_pressure;
 
 /*
- *      Pointers to address related TCP functions
- *      (i.e. things that depend on the address family)
- */
-
-struct tcp_func {
-        int                     (*queue_xmit)           (struct sk_buff *skb,
-                                                         int ipfragok);
-
-        void                    (*send_check)           (struct sock *sk,
-                                                         struct tcphdr *th,
-                                                         int len,
-                                                         struct sk_buff *skb);
-
-        int                     (*rebuild_header)       (struct sock *sk);
-
-        int                     (*conn_request)         (struct sock *sk,
-                                                         struct sk_buff *skb);
-
-        struct sock *           (*syn_recv_sock)        (struct sock *sk,
-                                                         struct sk_buff *skb,
-                                                         struct request_sock *req,
-                                                         struct dst_entry *dst);
-    
-        int                     (*remember_stamp)       (struct sock *sk);
-
-        __u16                   net_header_len;
-
-        int                     (*setsockopt)           (struct sock *sk, 
-                                                         int level, 
-                                                         int optname, 
-                                                         char __user *optval, 
-                                                         int optlen);
-
-        int                     (*getsockopt)           (struct sock *sk, 
-                                                         int level, 
-                                                         int optname, 
-                                                         char __user *optval, 
-                                                         int __user *optlen);
-
-
-        void                    (*addr2sockaddr)        (struct sock *sk,
-                                                         struct sockaddr *);
-
-        int sockaddr_len;
-};
-
-/*
  * The next routines deal with comparing 32 bit unsigned ints
  * and worry about wraparound (automatic with unsigned arithmetic).
  */
@@ -405,8 +358,7 @@ extern void			tcp_parse_options(struct sk_buff *skb,
  *      TCP v4 functions exported for the inet6 API
  */
 
-extern void                     tcp_v4_send_check(struct sock *sk, 
-                                                  struct tcphdr *th, int len, 
+extern void                     tcp_v4_send_check(struct sock *sk, int len,
                                                   struct sk_buff *skb);
 
 extern int                      tcp_v4_conn_request(struct sock *sk,
diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h
index 4e86f2de6638..61f724c1036f 100644
--- a/include/net/transp_v6.h
+++ b/include/net/transp_v6.h
@@ -44,7 +44,7 @@ extern int			datagram_send_ctl(struct msghdr *msg,
 /*
  *      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);