summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-10 16:48:37 +0100
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 07:24:39 +0200
commit31713c333ddbb66d694829082620b69b71c4b09a (patch)
tree71de8475b04972ef9bdf1d7b4fec0ebf6243cc32
parent[TCP]: Do the layer header setting in tcp_collapse relative to skb->data (diff)
downloadlinux-31713c333ddbb66d694829082620b69b71c4b09a.tar.xz
linux-31713c333ddbb66d694829082620b69b71c4b09a.zip
[TCP]: Use skb_set_mac_header in tcp_collapse
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/tcp_input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index e5d1c2c8cea7..1ec05bd673a7 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3633,7 +3633,7 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list,
if (!nskb)
return;
- nskb->mac.raw = nskb->data + (skb->mac.raw - skb->head);
+ 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);