Re: [TEST FIX] Re: SSH Hangs in 2.5.59 and 2.5.55 but not 2.4.x,

kuznet
2003-01-29T00:00:27Z

Hello!

The proposed fix is enclosed. Please, check.

Alexey

===== net/ipv4/tcp_output.c 1.19 vs edited =====
--- 1.19/net/ipv4/tcp_output.c Fri Oct 25 15:46:21 2002
+++ edited/net/ipv4/tcp_output.c Wed Jan 29 03:07:26 2003
@@ -786,13 +786,13 @@
/* Ok. We will be able to collapse the packet. */
__skb_unlink(next_skb, next_skb->list);

+ memcpy(skb_put(skb, next_skb_size), next_skb->data, next_skb_size);
+
if (next_skb->ip_summed == CHECKSUM_HW)
skb->ip_summed = CHECKSUM_HW;

- if (skb->ip_summed != CHECKSUM_HW) {
- memcpy(skb_put(skb, next_skb_size), next_skb->data, next_skb_size);
+ if (skb->ip_summed != CHECKSUM_HW)
skb->csum = csum_block_add(skb->csum, next_skb->csum, skb_size);
- }

/* Update sequence range on original skb. */
TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(next_skb)->end_seq;