[SK_BUFF]: Introduce skb_set_transport_header

[linux-2.6-omap-h63xx.git] / net / ipv4 / tcp_input.c

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 1ec05bd673a78645147ce8c49db3b7c801943dd4..2776a8b013396e5f443897a59a4c427a8396e120 100644 (file)
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3633,9 +3633,10 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list,
                if (!nskb)
                        return;
 
-               skb_set_mac_header(nskb, 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_set_mac_header(nskb, skb_mac_header(skb) - skb->head);
+               skb_set_network_header(nskb,
+                                      skb_network_header(skb) - skb->head);
+               skb_set_transport_header(nskb, skb->h.raw - skb->head);
 
                skb_reserve(nskb, header);
                memcpy(nskb->head, skb->head, header);