1 files changed, 12 insertions, 17 deletions

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 92d7b551dc55..31f5bbfc59bc 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1112,20 +1112,12 @@ struct tcp_md5sig_pool {
 #define TCP_MD5SIG_MAXKEYS      (~(u32)0)       /* really?! */
 
 /* - functions */
-extern int                      tcp_calc_md5_hash(char *md5_hash,
-                                                  struct tcp_md5sig_key *key,
-                                                  int bplen,
-                                                  struct tcphdr *th,
-                                                  unsigned int tcplen,
-                                                  struct tcp_md5sig_pool *hp);
-
-extern int                      tcp_v4_calc_md5_hash(char *md5_hash,
-                                                     struct tcp_md5sig_key *key,
-                                                     struct sock *sk,
-                                                     struct dst_entry *dst,
-                                                     struct request_sock *req,
-                                                     struct tcphdr *th,
-                                                     unsigned int tcplen);
+extern int                      tcp_v4_md5_hash_skb(char *md5_hash,
+                                                    struct tcp_md5sig_key *key,
+                                                    struct sock *sk,
+                                                    struct request_sock *req,
+                                                    struct sk_buff *skb);
+
 extern struct tcp_md5sig_key    *tcp_v4_md5_lookup(struct sock *sk,
                                                    struct sock *addr_sk);
 
@@ -1152,6 +1144,11 @@ extern void			tcp_free_md5sig_pool(void);
 
 extern struct tcp_md5sig_pool   *__tcp_get_md5sig_pool(int cpu);
 extern void                     __tcp_put_md5sig_pool(void);
+extern int tcp_md5_hash_header(struct tcp_md5sig_pool *, struct tcphdr *);
+extern int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *, struct sk_buff *,
+                                 unsigned header_len);
+extern int tcp_md5_hash_key(struct tcp_md5sig_pool *hp,
+                            struct tcp_md5sig_key *key);
 
 static inline
 struct tcp_md5sig_pool          *tcp_get_md5sig_pool(void)
@@ -1381,10 +1378,8 @@ struct tcp_sock_af_ops {
         int                     (*calc_md5_hash) (char *location,
                                                   struct tcp_md5sig_key *md5,
                                                   struct sock *sk,
-                                                  struct dst_entry *dst,
                                                   struct request_sock *req,
-                                                  struct tcphdr *th,
-                                                  unsigned int len);
+                                                  struct sk_buff *skb);
         int                     (*md5_add) (struct sock *sk,
                                             struct sock *addr_sk,
                                             u8 *newkey,