diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-10-10 15:44:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:55:54 -0700 |
| commit | 7b277b1a5fb147cb828e5d8b9780cee60f31a9bf (patch) | |
| tree | 21af4818d7ba9d646a281517f476d81d4245cc30 /net/ipv4/xfrm4_mode_tunnel.c | |
| parent | bee0b40c0621396326d1c17b81833f59118a2d80 (diff) | |
| download | kernel_goldelico_gta04-7b277b1a5fb147cb828e5d8b9780cee60f31a9bf.zip kernel_goldelico_gta04-7b277b1a5fb147cb828e5d8b9780cee60f31a9bf.tar.gz kernel_goldelico_gta04-7b277b1a5fb147cb828e5d8b9780cee60f31a9bf.tar.bz2 | |
[IPSEC]: Set skb->data to payload in x->mode->output
This patch changes the calling convention so that on entry from
x->mode->output and before entry into x->type->output skb->data
will point to the payload instead of the IP header.
This is essentially a redistribution of skb_push/skb_pull calls
with the aim of minimising them on the common path of tunnel +
ESP.
It'll also let us use the same calling convention between IPv4
and IPv6 with the next patch.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/xfrm4_mode_tunnel.c')
| -rw-r--r-- | net/ipv4/xfrm4_mode_tunnel.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c index 9963700..bac1a91 100644 --- a/net/ipv4/xfrm4_mode_tunnel.c +++ b/net/ipv4/xfrm4_mode_tunnel.c @@ -49,8 +49,7 @@ static int xfrm4_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) iph = ip_hdr(skb); skb->transport_header = skb->network_header; - skb_push(skb, x->props.header_len); - skb_reset_network_header(skb); + skb_set_network_header(skb, -x->props.header_len); top_iph = ip_hdr(skb); top_iph->ihl = 5; |