projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c51957d
)
[TCP]: Use skb_set_mac_header in tcp_collapse
author
Arnaldo Carvalho de Melo
<acme@redhat.com>
Sat, 10 Mar 2007 15:48:37 +0000
(12:48 -0300)
committer
David S. Miller
<davem@sunset.davemloft.net>
Thu, 26 Apr 2007 05:24:39 +0000
(22:24 -0700)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp_input.c
patch
|
blob
|
history
diff --git
a/net/ipv4/tcp_input.c
b/net/ipv4/tcp_input.c
index e5d1c2c8cea70ea2a4e6db12df4d3d03d033b7a0..1ec05bd673a78645147ce8c49db3b7c801943dd4 100644
(file)
--- 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);