summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_gre.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo2007-04-11 05:45:18 +0200
committerDavid S. Miller2007-04-26 07:24:46 +0200
commitc1d2bbe1cd6c7bbdc6d532cefebb66c7efb789ce (patch)
tree03a715961ba576a11cbc0e91c5d465e4c4d95d82 /net/ipv4/ip_gre.c
parent[IPV6]: Use skb->nh.ipv6h instead of casting skb->nh.raw (diff)
downloadkernel-qcow2-linux-c1d2bbe1cd6c7bbdc6d532cefebb66c7efb789ce.tar.gz
kernel-qcow2-linux-c1d2bbe1cd6c7bbdc6d532cefebb66c7efb789ce.tar.xz
kernel-qcow2-linux-c1d2bbe1cd6c7bbdc6d532cefebb66c7efb789ce.zip
[SK_BUFF]: Introduce skb_reset_network_header(skb)
For the common, open coded 'skb->nh.raw = skb->data' operation, so that we can later turn skb->nh.raw into a offset, reducing the size of struct sk_buff in 64bit land while possibly keeping it as a pointer on 32bit. This one touches just the most simple case, next will handle the slightly more "complex" cases. 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 88f8aae873f4..ced2c4baf174 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -474,7 +474,7 @@ out:
dst_release(skb2->dst);
skb2->dst = NULL;
skb_pull(skb2, skb->data - (u8*)eiph);
- skb2->nh.raw = skb2->data;
+ skb_reset_network_header(skb2);
/* Try to guess incoming interface */
memset(&fl, 0, sizeof(fl));