diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-10-18 04:28:53 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-10-18 04:28:53 (GMT) |
| commit | c4541b41c0e4b75b11125fed16db642fc03cb31c (patch) | |
| tree | 10627bc42cf56fd3f45aa93963d0852dfefa49ab /net/ipv4/xfrm4_tunnel.c | |
| parent | 04663d0b8b3c8ce3804106279420cfe5bdfcce3c (diff) | |
| download | linux-c4541b41c0e4b75b11125fed16db642fc03cb31c.tar.xz | |
[IPSEC]: Move tunnel parsing for IPv4 out of xfrm4_input
This patch moves the tunnel parsing for IPv4 out of xfrm4_input and into
xfrm4_tunnel. This change is in line with what IPv6 does and will allow
us to merge the two input functions.
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_tunnel.c')
| -rw-r--r-- | net/ipv4/xfrm4_tunnel.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/ipv4/xfrm4_tunnel.c b/net/ipv4/xfrm4_tunnel.c index 83e9580..3268451 100644 --- a/net/ipv4/xfrm4_tunnel.c +++ b/net/ipv4/xfrm4_tunnel.c @@ -48,20 +48,25 @@ static struct xfrm_type ipip_type = { .output = ipip_output }; +static int xfrm_tunnel_rcv(struct sk_buff *skb) +{ + return xfrm4_rcv_spi(skb, IPPROTO_IP, ip_hdr(skb)->saddr); +} + static int xfrm_tunnel_err(struct sk_buff *skb, u32 info) { return -ENOENT; } static struct xfrm_tunnel xfrm_tunnel_handler = { - .handler = xfrm4_rcv, + .handler = xfrm_tunnel_rcv, .err_handler = xfrm_tunnel_err, .priority = 2, }; #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) static struct xfrm_tunnel xfrm64_tunnel_handler = { - .handler = xfrm4_rcv, + .handler = xfrm_tunnel_rcv, .err_handler = xfrm_tunnel_err, .priority = 2, }; |