AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[TCP]: Do the layer header setting in tcp_collapse relative to skb->data

Browse Source 
That is equal to skb->head before skb_reserve, to help in the layer header
changes.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnaldo Carvalho de Melo 2007-03-10 12:47:22 -03:00 committed by David S. Miller
parent 39f69c6f92
commit c51957dafa
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/ipv4/tcp_input.c
View File

@ -3632,11 +3632,13 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list,
nskb = alloc_skb(copy+header, GFP_ATOMIC);
if (!nskb)
return;
nskb->mac.raw = nskb->data + (skb->mac.raw - skb->head);
nskb->nh.raw = nskb->data + (skb->nh.raw - skb->head);
nskb->h.raw = nskb->data + (skb->h.raw - skb->head);
skb_reserve(nskb, header);
memcpy(nskb->head, skb->head, header);
nskb->nh.raw = nskb->head + (skb->nh.raw-skb->head);
nskb->h.raw = nskb->head + (skb->h.raw-skb->head);
nskb->mac.raw = nskb->head + (skb->mac.raw-skb->head);
memcpy(nskb->cb, skb->cb, sizeof(skb->cb));
TCP_SKB_CB(nskb)->seq = TCP_SKB_CB(nskb)->end_seq = start;
__skb_insert(nskb, skb->prev, skb, list);