diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-10 16:42:03 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:24:49 -0400 |
commit | 4209fb601c0a0e0a9d90c0008f350dd345c8b7de (patch) | |
tree | 97f5effcbda6aef0eca72fc0fb9250820d50312c | |
parent | 7e28ecc282574a7d72ace365fc9bc86e27ba880f (diff) |
[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 <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | 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 f84ca6668fb9..7c6fda6fe846 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) | |||
617 | } | 617 | } |
618 | 618 | ||
619 | skb_reset_mac_header(skb); | 619 | skb_reset_mac_header(skb); |
620 | skb->nh.raw = __pskb_pull(skb, offset); | 620 | __pskb_pull(skb, offset); |
621 | skb_reset_network_header(skb); | ||
621 | skb_postpull_rcsum(skb, skb->h.raw, offset); | 622 | skb_postpull_rcsum(skb, skb->h.raw, offset); |
622 | skb->pkt_type = PACKET_HOST; | 623 | skb->pkt_type = PACKET_HOST; |
623 | #ifdef CONFIG_NET_IPGRE_BROADCAST | 624 | #ifdef CONFIG_NET_IPGRE_BROADCAST |