diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-10 23:45:18 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:24:46 -0400 |
commit | c1d2bbe1cd6c7bbdc6d532cefebb66c7efb789ce (patch) | |
tree | 03a715961ba576a11cbc0e91c5d465e4c4d95d82 /net/ipv4/ipip.c | |
parent | 57effc70a5be9f7804e9a99964eb7265367effca (diff) |
[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/ipip.c')
-rw-r--r-- | net/ipv4/ipip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 3ec5ce0f5498..5f886c892861 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c | |||
@@ -405,7 +405,7 @@ out: | |||
405 | dst_release(skb2->dst); | 405 | dst_release(skb2->dst); |
406 | skb2->dst = NULL; | 406 | skb2->dst = NULL; |
407 | skb_pull(skb2, skb->data - (u8*)eiph); | 407 | skb_pull(skb2, skb->data - (u8*)eiph); |
408 | skb2->nh.raw = skb2->data; | 408 | skb_reset_network_header(skb2); |
409 | 409 | ||
410 | /* Try to guess incoming interface */ | 410 | /* Try to guess incoming interface */ |
411 | memset(&fl, 0, sizeof(fl)); | 411 | memset(&fl, 0, sizeof(fl)); |
@@ -487,7 +487,7 @@ static int ipip_rcv(struct sk_buff *skb) | |||
487 | secpath_reset(skb); | 487 | secpath_reset(skb); |
488 | 488 | ||
489 | skb->mac.raw = skb->nh.raw; | 489 | skb->mac.raw = skb->nh.raw; |
490 | skb->nh.raw = skb->data; | 490 | skb_reset_network_header(skb); |
491 | skb->protocol = htons(ETH_P_IP); | 491 | skb->protocol = htons(ETH_P_IP); |
492 | skb->pkt_type = PACKET_HOST; | 492 | skb->pkt_type = PACKET_HOST; |
493 | 493 | ||