Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=31713c333ddbb66d694829082620b69b71c4b09a
Commit:     31713c333ddbb66d694829082620b69b71c4b09a
Parent:     c51957dafa6f960c5c6372aa3da6c8fa71c13730
Author:     Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
AuthorDate: Sat Mar 10 12:48:37 2007 -0300
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Apr 25 22:24:39 2007 -0700

    [TCP]: Use skb_set_mac_header in tcp_collapse
    
    Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/ipv4/tcp_input.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index e5d1c2c..1ec05bd 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);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to