]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
tcp: Do not check flush when comparing options for GRO
authorHerbert Xu <herbert@gondor.apana.org.au>
Tue, 26 May 2009 18:50:34 +0000 (18:50 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 27 May 2009 10:26:05 +0000 (03:26 -0700)
There is no need to repeatedly check flush when comparing TCP
options for GRO as it will be false 99% of the time where it
matters.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp.c

index c3dcec5efea58b5004c25a28ebc9fc2d4a4e3503..0fb8b441f1f9bf2c48a17a846ca054956e081276 100644 (file)
@@ -2570,7 +2570,7 @@ found:
        flush |= (flags ^ tcp_flag_word(th2)) &
                  ~(TCP_FLAG_CWR | TCP_FLAG_FIN | TCP_FLAG_PSH);
        flush |= th->ack_seq ^ th2->ack_seq;
-       for (i = sizeof(*th); !flush && i < thlen; i += 4)
+       for (i = sizeof(*th); i < thlen; i += 4)
                flush |= *(u32 *)((u8 *)th + i) ^
                         *(u32 *)((u8 *)th2 + i);