mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-25 16:11:45 +00:00
[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>
This commit is contained in:
parent
04663d0b8b
commit
c4541b41c0
3 changed files with 26 additions and 27 deletions
|
@ -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,
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue