[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>

1 files changed, 26 insertions, 0 deletions

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;