summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2009-05-26 18:50:34 +0000
committerDavid S. Miller <davem@davemloft.net>2009-05-27 03:26:05 -0700
commita2a804cddfe65f18f903985e8a8d04c7c9eec354 (patch)
tree93c81d1a672b52ff8ec38fefa227ab894b37ec62
parent9aaa156cf9b7e9d9ed899f254283b91c4e3c36c8 (diff)
tcp: Do not check flush when comparing options for GRO
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>
-rw-r--r--net/ipv4/tcp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index c3dcec5efea5..0fb8b441f1f9 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -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);