diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-11 05:46:21 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 07:24:47 +0200 |
| commit | e2d1bca7e6134671bcb19810d004a252aa6a644d (patch) | |
| tree | 5d8ee962cd69cd886aaedff8ac253590a985dd1c /net/ipv4/ip_gre.c | |
| parent | [SK_BUFF]: Introduce skb_reset_network_header(skb) (diff) | |
| download | linux-e2d1bca7e6134671bcb19810d004a252aa6a644d.tar.xz linux-e2d1bca7e6134671bcb19810d004a252aa6a644d.zip | |
[SK_BUFF]: Use skb_reset_network_header in skb_push cases
skb_push updates and returns skb->data, so we can just call
skb_reset_network_header after the call to skb_push.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_gre.c')
| -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 ced2c4baf174..f84ca6668fb9 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -828,7 +828,8 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) } skb->h.raw = skb->nh.raw; - skb->nh.raw = skb_push(skb, gre_hlen); + skb_push(skb, gre_hlen); + skb_reset_network_header(skb); memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED | IPSKB_REROUTED); |