[TCP]: remove tcp header from tcp_v4_check (take #2)

The tcphdr struct passed to tcp_v4_check is not used, the following
patch removes it from the parameter list.

This adds the netfilter modifications missing in the patch I sent
for rc3-mm1.

Signed-off-by: Frederik Deweerdt <frederik.deweerdt@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 9 insertions, 9 deletions

diff --git a/net/ipv4/netfilter/ip_nat_helper.c b/net/ipv4/netfilter/ip_nat_helper.c
index ee80feb4b2a9..2e5c4bc52a60 100644
--- a/net/ipv4/netfilter/ip_nat_helper.c
+++ b/net/ipv4/netfilter/ip_nat_helper.c
@@ -183,7 +183,7 @@ ip_nat_mangle_tcp_packet(struct sk_buff **pskb,
         datalen = (*pskb)->len - iph->ihl*4;
         if ((*pskb)->ip_summed != CHECKSUM_PARTIAL) {
                 tcph->check = 0;
-                tcph->check = tcp_v4_check(tcph, datalen,
+                tcph->check = tcp_v4_check(datalen,
                                            iph->saddr, iph->daddr,
                                            csum_partial((char *)tcph,
                                                         datalen, 0));
diff --git a/net/ipv4/netfilter/ipt_REJECT.c b/net/ipv4/netfilter/ipt_REJECT.c
index f0319e5ee437..c9cad23844d7 100644
--- a/net/ipv4/netfilter/ipt_REJECT.c
+++ b/net/ipv4/netfilter/ipt_REJECT.c
@@ -116,7 +116,7 @@ static void send_reset(struct sk_buff *oldskb, int hook)
 
         /* Adjust TCP checksum */
         tcph->check = 0;
-        tcph->check = tcp_v4_check(tcph, sizeof(struct tcphdr),
+        tcph->check = tcp_v4_check(sizeof(struct tcphdr),
                                    nskb->nh.iph->saddr,
                                    nskb->nh.iph->daddr,
                                    csum_partial((char *)tcph,
diff --git a/net/ipv4/netfilter/nf_nat_helper.c b/net/ipv4/netfilter/nf_nat_helper.c
index 98fbfc84d183..dc6738bdfab7 100644
--- a/net/ipv4/netfilter/nf_nat_helper.c
+++ b/net/ipv4/netfilter/nf_nat_helper.c
@@ -176,7 +176,7 @@ nf_nat_mangle_tcp_packet(struct sk_buff **pskb,
         datalen = (*pskb)->len - iph->ihl*4;
         if ((*pskb)->ip_summed != CHECKSUM_PARTIAL) {
                 tcph->check = 0;
-                tcph->check = tcp_v4_check(tcph, datalen,
+                tcph->check = tcp_v4_check(datalen,
                                            iph->saddr, iph->daddr,
                                            csum_partial((char *)tcph,
                                                         datalen, 0));
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 12de90a5047c..f061ec50d8bc 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -502,11 +502,11 @@ void tcp_v4_send_check(struct sock *sk, int len, struct sk_buff *skb)
         struct tcphdr *th = skb->h.th;
 
         if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                th->check = ~tcp_v4_check(th, len,
-                                          inet->saddr, inet->daddr, 0);
+                th->check = ~tcp_v4_check(len, inet->saddr,
+                                          inet->daddr, 0);
                 skb->csum_offset = offsetof(struct tcphdr, check);
         } else {
-                th->check = tcp_v4_check(th, len, inet->saddr, inet->daddr,
+                th->check = tcp_v4_check(len, inet->saddr, inet->daddr,
                                          csum_partial((char *)th,
                                                       th->doff << 2,
                                                       skb->csum));
@@ -525,7 +525,7 @@ int tcp_v4_gso_send_check(struct sk_buff *skb)
         th = skb->h.th;
 
         th->check = 0;
-        th->check = ~tcp_v4_check(th, skb->len, iph->saddr, iph->daddr, 0);
+        th->check = ~tcp_v4_check(skb->len, iph->saddr, iph->daddr, 0);
         skb->csum_offset = offsetof(struct tcphdr, check);
         skb->ip_summed = CHECKSUM_PARTIAL;
         return 0;
@@ -747,7 +747,7 @@ static int tcp_v4_send_synack(struct sock *sk, struct request_sock *req,
         if (skb) {
                 struct tcphdr *th = skb->h.th;
 
-                th->check = tcp_v4_check(th, skb->len,
+                th->check = tcp_v4_check(skb->len,
                                          ireq->loc_addr,
                                          ireq->rmt_addr,
                                          csum_partial((char *)th, skb->len,
@@ -1514,7 +1514,7 @@ static struct sock *tcp_v4_hnd_req(struct sock *sk, struct sk_buff *skb)
 static __sum16 tcp_v4_checksum_init(struct sk_buff *skb)
 {
         if (skb->ip_summed == CHECKSUM_COMPLETE) {
-                if (!tcp_v4_check(skb->h.th, skb->len, skb->nh.iph->saddr,
+                if (!tcp_v4_check(skb->len, skb->nh.iph->saddr,
                                   skb->nh.iph->daddr, skb->csum)) {
                         skb->ip_summed = CHECKSUM_UNNECESSARY;
                         return 0;