diff --git a/[refs] b/[refs] index 623bb34d0c77..deec6c003033 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9aaa156cf9b7e9d9ed899f254283b91c4e3c36c8 +refs/heads/master: a2a804cddfe65f18f903985e8a8d04c7c9eec354 diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c index c3dcec5efea5..0fb8b441f1f9 100644 --- a/trunk/net/ipv4/tcp.c +++ b/trunk/net/ipv4/tcp.c @@ -2570,7 +2570,7 @@ struct sk_buff **tcp_gro_receive(struct sk_buff **head, struct sk_buff *skb) 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);