Commit:     4209fb601c0a0e0a9d90c0008f350dd345c8b7de
Parent:     7e28ecc282574a7d72ace365fc9bc86e27ba880f
Author:     Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
AuthorDate: Sat Mar 10 18:42:03 2007 -0300
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Apr 25 22:24:49 2007 -0700

    [SK_BUFF]: Use skb_reset_network_header where the return of __pskb_pull was 
being used
    It returns skb->data, so we can just use skb_reset_network_header after it.
    Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 net/ipv4/ip_gre.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index f84ca66..7c6fda6 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -617,7 +617,8 @@ static int ipgre_rcv(struct sk_buff *skb)
-               skb->nh.raw = __pskb_pull(skb, offset);
+               __pskb_pull(skb, offset);
+               skb_reset_network_header(skb);
                skb_postpull_rcsum(skb, skb->h.raw, offset);
                skb->pkt_type = PACKET_HOST;
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

Reply via email to