LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Frederik Deweerdt <deweerdt@free.fr>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org, davem@davemloft.net
Subject: [-mm patch] remove tcp header from tcp_v4_check
Date: Fri, 12 Jan 2007 13:33:09 +0000	[thread overview]
Message-ID: <20070112133309.GF5941@slug> (raw)
In-Reply-To: <20070111222627.66bb75ab.akpm@osdl.org>

On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
> 
>   ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc4-mm1/
> 
Hi,

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)

Regards,
Frederik 


Index: 2.6.20-rc4-mm1/include/net/tcp.h
===================================================================
--- 2.6.20-rc4-mm1.orig/include/net/tcp.h	2007-01-12 11:19:16.000000000 +0100
+++ 2.6.20-rc4-mm1/include/net/tcp.h	2007-01-12 11:21:43.000000000 +0100
@@ -802,9 +802,8 @@
 /*
  * Calculate(/check) TCP checksum
  */
-static inline __sum16 tcp_v4_check(struct tcphdr *th, int len,
-			       __be32 saddr, __be32 daddr,
-			       __wsum base)
+static inline __sum16 tcp_v4_check(int len, __be32 saddr,
+				   __be32 daddr, __wsum base)
 {
 	return csum_tcpudp_magic(saddr,daddr,len,IPPROTO_TCP,base);
 }
Index: 2.6.20-rc4-mm1/net/ipv4/netfilter/ipt_REJECT.c
===================================================================
--- 2.6.20-rc4-mm1.orig/net/ipv4/netfilter/ipt_REJECT.c	2007-01-12 11:19:16.000000000 +0100
+++ 2.6.20-rc4-mm1/net/ipv4/netfilter/ipt_REJECT.c	2007-01-12 11:21:43.000000000 +0100
@@ -116,11 +116,11 @@
 
 	/* 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,
-						sizeof(struct tcphdr), 0));
+				   sizeof(struct tcphdr), 0));
 
 	/* Set DF, id = 0 */
 	nskb->nh.iph->frag_off = htons(IP_DF);
Index: 2.6.20-rc4-mm1/net/ipv4/tcp_ipv4.c
===================================================================
--- 2.6.20-rc4-mm1.orig/net/ipv4/tcp_ipv4.c	2007-01-12 11:19:16.000000000 +0100
+++ 2.6.20-rc4-mm1/net/ipv4/tcp_ipv4.c	2007-01-12 11:21:43.000000000 +0100
@@ -502,11 +502,11 @@
 	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 @@
 	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 @@
 	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 __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;
Index: 2.6.20-rc4-mm1/net/ipv4/netfilter/ip_nat_helper.c
===================================================================
--- 2.6.20-rc4-mm1.orig/net/ipv4/netfilter/ip_nat_helper.c	2007-01-12 11:19:56.000000000 +0100
+++ 2.6.20-rc4-mm1/net/ipv4/netfilter/ip_nat_helper.c	2007-01-12 11:21:43.000000000 +0100
@@ -183,7 +183,7 @@
 	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));
Index: 2.6.20-rc4-mm1/net/ipv4/netfilter/nf_nat_helper.c
===================================================================
--- 2.6.20-rc4-mm1.orig/net/ipv4/netfilter/nf_nat_helper.c	2007-01-12 11:20:50.000000000 +0100
+++ 2.6.20-rc4-mm1/net/ipv4/netfilter/nf_nat_helper.c	2007-01-12 11:21:43.000000000 +0100
@@ -176,7 +176,7 @@
 	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));

  parent reply	other threads:[~2007-01-12 13:35 UTC|newest]

Thread overview: 87+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-12  6:26 2.6.20-rc4-mm1 Andrew Morton
2007-01-12 10:20 ` Early ACPI lockup (was Re: 2.6.20-rc4-mm1) Frederik Deweerdt
2007-01-12 22:53   ` Len Brown
2007-01-12 23:10     ` Frederik Deweerdt
2007-01-12 23:36       ` Jiri Slaby
2007-01-13  0:08         ` Michal Piotrowski
2007-01-13  0:45           ` Frederik Deweerdt
2007-01-13  0:43         ` Jiri Slaby
2007-01-12 10:25 ` 2.6.20-rc4-mm1 Mariusz Kozlowski
2007-01-12 13:18   ` 2.6.20-rc4-mm1 Frederik Deweerdt
2007-01-12 15:13     ` 2.6.20-rc4-mm1 Mariusz Kozlowski
2007-01-12 15:16       ` 2.6.20-rc4-mm1 Michal Piotrowski
2007-01-12 16:12         ` 2.6.20-rc4-mm1 Mariusz Kozlowski
2007-01-12 10:52 ` 'struct task_struct' has no member named 'mems_allowed' (was: Re: 2.6.20-rc4-mm1) Sander
2007-01-12 11:28   ` Paul Jackson
2007-01-12 19:25     ` Christoph Lameter
2007-01-12 21:20       ` Paul Jackson
2007-01-12 21:28         ` Christoph Lameter
2007-01-12 21:58           ` Paul Jackson
2007-01-12 22:00             ` Christoph Lameter
2007-01-12 22:10               ` Paul Jackson
2007-01-12 22:11               ` Andrew Morton
2007-01-12 11:55 ` spurious sparse warnings from linux/aio.h (was: 2.6.20-rc4-mm1) Tilman Schmidt
2007-01-12 13:11   ` Suparna Bhattacharya
2007-01-12 17:46     ` spurious sparse warnings from linux/aio.h Tilman Schmidt
2007-01-12 13:33 ` Frederik Deweerdt [this message]
2007-01-12 13:55   ` [-mm patch] remove tcp header from tcp_v4_check (take #2) Frederik Deweerdt
2007-02-05  0:44     ` David Miller
2007-01-13  7:27 ` 2.6.20-rc4-mm1: status of sn9c102_pas202bca? Adrian Bunk
2007-01-15 11:34   ` Mauro Carvalho Chehab
2007-01-13  9:56 ` [-mm patch] make mmc_sysfs.c:mmc_key_type static Adrian Bunk
2007-01-13 22:38   ` Pierre Ossman
2007-01-13  9:56 ` [-mm patch] make gfs2_change_nlink_i() static Adrian Bunk
2007-01-15 10:31   ` Steven Whitehouse
2007-01-16 21:04   ` [Cluster-devel] " Wendy Cheng
2007-01-16 21:29     ` Adrian Bunk
2007-01-14  9:10 ` 2.6.20-rc4-mm1: different values for OHCI_QUIRK_ZFMICRO Adrian Bunk
2007-01-14 14:36   ` David Brownell
2007-02-20  0:06     ` Adrian Bunk
2007-03-29 22:06       ` Randy Dunlap
2007-03-29 22:24         ` David Brownell
2007-05-08 22:17           ` [PATCH] " Randy Dunlap
2007-05-08 22:34             ` David Brownell
2007-05-08 22:37             ` Greg KH
2007-03-30 15:18         ` 2.6.20-rc4-mm1: " Tony Olech
2007-01-14  9:48 ` 2.6.20-rc4-mm1 Thomas Gleixner
2007-01-14 10:46   ` 2.6.20-rc4-mm1 Thomas Gleixner
2007-01-14 14:40     ` 2.6.20-rc4-mm1 Thomas Gleixner
2007-01-14 22:05       ` 2.6.20-rc4-mm1 Jens Axboe
2007-01-14 22:31         ` 2.6.20-rc4-mm1 Thomas Gleixner
2007-01-14 22:30           ` 2.6.20-rc4-mm1 Jens Axboe
2007-01-15  8:22             ` 2.6.20-rc4-mm1 Ingo Molnar
2007-01-15 23:55               ` 2.6.20-rc4-mm1 Jens Axboe
2007-01-14 22:20       ` 2.6.20-rc4-mm1 Jens Axboe
2007-01-14 23:52 ` i810fb fails to load (was: 2.6.20-rc4-mm1) Tilman Schmidt
2007-01-15  0:22   ` Andrew Morton
2007-01-22 13:42     ` i810fb fails to load Thomas Hellström
2007-01-22 18:30       ` Tilman Schmidt
2007-01-22 21:50       ` Dave Airlie
2007-01-23  8:10         ` Thomas Hellström
2007-01-18 21:55 ` [-mm patch] fs/unionfs/: possible cleanups Adrian Bunk
2007-01-20 22:06   ` Josef Sipek
2007-01-19 18:40 ` [-mm patch] drivers/mtd/ubi/: " Adrian Bunk
2007-01-21 11:23   ` Artem Bityutskiy
2007-01-20 22:38 ` [-mm patch] oops in drivers/net/shaper.c Frederik Deweerdt
2007-01-21 19:13 ` [-mm patch] remove one remaining "#define BCM_TSO 1" Adrian Bunk
2007-01-22 18:17 ` [-mm patch] drivers/firewire/: cleanups Adrian Bunk
2007-01-22 19:41   ` Kristian Høgsberg
2007-01-22 20:04     ` Adrian Bunk
2007-01-22 20:04       ` Kristian Høgsberg
2007-01-22 20:44         ` Stefan Richter
2007-01-23  6:02 ` `make htmldocs` fails Don Mullis
2007-01-23  6:22   ` Randy Dunlap
2007-01-23  6:45     ` `make htmldocs` fails -- 2.6.20-rc4-mm1 Don Mullis
2007-01-23  6:35   ` `make htmldocs` fails Greg KH
2007-01-24 13:53 ` 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error Adrian Bunk
2007-01-24 14:12   ` Sergei Shtylyov
2007-02-17 19:26     ` Sergei Shtylyov
2007-02-17 19:32       ` Sergei Shtylyov
2007-02-26 13:22         ` Sergei Shtylyov
2007-02-26 17:26           ` Randy Dunlap
2007-02-26 21:14             ` Greg KH
2007-03-06 16:15               ` Sergei Shtylyov
2007-03-06 16:47                 ` Randy Dunlap
2007-03-09 12:54                   ` Tejun Heo
2007-01-24 22:36 ` [-mm patch] MTD_CK804XROM must depend on PCI Adrian Bunk
  -- strict thread matches above, loose matches on Subject: below --
2007-01-05  6:02 2.6.20-rc3-mm1 Andrew Morton
2007-01-11 18:28 ` [-mm patch] remove tcp header from tcp_v4_check Frederik Deweerdt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070112133309.GF5941@slug \
    --to=deweerdt@free.fr \
    --cc=akpm@osdl.org \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --subject='Re: [-mm patch] remove tcp header from tcp_v4_check' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).