aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_tunnel.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-04-10 23:46:21 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:24:47 -0400
commite2d1bca7e6134671bcb19810d004a252aa6a644d (patch)
tree5d8ee962cd69cd886aaedff8ac253590a985dd1c /net/ipv6/ip6_tunnel.c
parentc1d2bbe1cd6c7bbdc6d532cefebb66c7efb789ce (diff)
[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/ipv6/ip6_tunnel.c')
-rw-r--r--net/ipv6/ip6_tunnel.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 30df8e6c42cc..a1e4f39c6793 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -907,7 +907,8 @@ static int ip6_tnl_xmit2(struct sk_buff *skb,
907 init_tel_txopt(&opt, encap_limit); 907 init_tel_txopt(&opt, encap_limit);
908 ipv6_push_nfrag_opts(skb, &opt.ops, &proto, NULL); 908 ipv6_push_nfrag_opts(skb, &opt.ops, &proto, NULL);
909 } 909 }
910 skb->nh.raw = skb_push(skb, sizeof(struct ipv6hdr)); 910 skb_push(skb, sizeof(struct ipv6hdr));
911 skb_reset_network_header(skb);
911 ipv6h = skb->nh.ipv6h; 912 ipv6h = skb->nh.ipv6h;
912 *(__be32*)ipv6h = fl->fl6_flowlabel | htonl(0x60000000); 913 *(__be32*)ipv6h = fl->fl6_flowlabel | htonl(0x60000000);
913 dsfield = INET_ECN_encapsulate(0, dsfield); 914 dsfield = INET_ECN_encapsulate(0, dsfield);