aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2009-05-26 18:50:25 +0000
committerDavid S. Miller <davem@davemloft.net>2009-05-27 03:25:59 -0700
commit4a9a2968a17eae42ef5dffca8b37534c864e30cc (patch)
tree8fa6f421a04491546a25f18a30e2133d50d83c64 /net/ipv4/tcp.c
parent745898eaf0eb7a04a56dec1188d9148259510863 (diff)
downloadmrst-s0i3-test-4a9a2968a17eae42ef5dffca8b37534c864e30cc.tar.gz
mrst-s0i3-test-4a9a2968a17eae42ef5dffca8b37534c864e30cc.tar.xz
mrst-s0i3-test-4a9a2968a17eae42ef5dffca8b37534c864e30cc.zip
tcp: Remove unnecessary window comparisons for GRO
The window has already been checked as part of the flag word so there is no need to check it explicitly. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
-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 ff6adecc54c..313960e4cfd 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2559,7 +2559,7 @@ found:
flush |= flags & TCP_FLAG_CWR;
flush |= (flags ^ tcp_flag_word(th2)) &
~(TCP_FLAG_CWR | TCP_FLAG_FIN | TCP_FLAG_PSH);
- flush |= (th->ack_seq ^ th2->ack_seq) | (th->window ^ th2->window);
+ flush |= th->ack_seq ^ th2->ack_seq;
for (i = sizeof(*th); !flush && i < thlen; i += 4)
flush |= *(u32 *)((u8 *)th + i) ^
*(u32 *)((u8 *)th2 + i);