Commit a269fbfc authored by Florian Westphal's avatar Florian Westphal Committed by Steffen Klassert
Browse files

xfrm: state: remove extract_input indirection from xfrm_state_afinfo 



In order to keep CONFIG_IPV6=m working, xfrm6_extract_header needs to be
duplicated.  It will be removed again in a followup change when the
remaining caller is moved to net/xfrm as well.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 6d64be3d

include/net/xfrm.h

+0 −3
Original line number Diff line number Diff line
@@ -362,8 +362,6 @@ struct xfrm_state_afinfo { 


	int			(*output)(struct net *net, struct sock *sk, struct sk_buff *skb);

	int			(*output_finish)(struct sock *sk, struct sk_buff *skb);

	int			(*extract_input)(struct xfrm_state *x,

						 struct sk_buff *skb);

	int			(*extract_output)(struct xfrm_state *x,

						  struct sk_buff *skb);

	int			(*transport_finish)(struct sk_buff *skb,
@@ -1587,7 +1585,6 @@ int xfrm4_protocol_deregister(struct xfrm4_protocol *handler, unsigned char prot 
int xfrm4_tunnel_register(struct xfrm_tunnel *handler, unsigned short family);

int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler, unsigned short family);

void xfrm4_local_error(struct sk_buff *skb, u32 mtu);

int xfrm6_extract_header(struct sk_buff *skb);

int xfrm6_extract_input(struct xfrm_state *x, struct sk_buff *skb);

int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi,

		  struct ip6_tnl *t);

net/ipv4/xfrm4_input.c

+0 −5
Original line number Diff line number Diff line
@@ -18,11 +18,6 @@ 
#include <net/ip.h>

#include <net/xfrm.h>



int xfrm4_extract_input(struct xfrm_state *x, struct sk_buff *skb)

{

	return xfrm4_extract_header(skb);

}



static int xfrm4_rcv_encap_finish2(struct net *net, struct sock *sk,

				   struct sk_buff *skb)

{

net/ipv4/xfrm4_state.c

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = { 
	.proto			= IPPROTO_IPIP,

	.output			= xfrm4_output,

	.output_finish		= xfrm4_output_finish,

	.extract_input		= xfrm4_extract_input,

	.transport_finish	= xfrm4_transport_finish,

	.local_error		= xfrm4_local_error,

};

net/ipv6/xfrm6_input.c

+0 −5
Original line number Diff line number Diff line
@@ -17,11 +17,6 @@ 
#include <net/ipv6.h>

#include <net/xfrm.h>



int xfrm6_extract_input(struct xfrm_state *x, struct sk_buff *skb)

{

	return xfrm6_extract_header(skb);

}



int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi,

		  struct ip6_tnl *t)

{

net/ipv6/xfrm6_output.c

+16 −1
Original line number Diff line number Diff line
@@ -94,6 +94,20 @@ static int xfrm6_tunnel_check_size(struct sk_buff *skb) 
	return ret;

}



static void __xfrm6_extract_header(struct sk_buff *skb)

{

	struct ipv6hdr *iph = ipv6_hdr(skb);



	XFRM_MODE_SKB_CB(skb)->ihl = sizeof(*iph);

	XFRM_MODE_SKB_CB(skb)->id = 0;

	XFRM_MODE_SKB_CB(skb)->frag_off = htons(IP_DF);

	XFRM_MODE_SKB_CB(skb)->tos = ipv6_get_dsfield(iph);

	XFRM_MODE_SKB_CB(skb)->ttl = iph->hop_limit;

	XFRM_MODE_SKB_CB(skb)->optlen = 0;

	memcpy(XFRM_MODE_SKB_CB(skb)->flow_lbl, iph->flow_lbl,

	       sizeof(XFRM_MODE_SKB_CB(skb)->flow_lbl));

}



int xfrm6_extract_output(struct xfrm_state *x, struct sk_buff *skb)

{

	int err;
@@ -104,7 +118,8 @@ int xfrm6_extract_output(struct xfrm_state *x, struct sk_buff *skb) 


	XFRM_MODE_SKB_CB(skb)->protocol = ipv6_hdr(skb)->nexthdr;



	return xfrm6_extract_header(skb);

	__xfrm6_extract_header(skb);

	return 0;

}



int xfrm6_output_finish(struct sock *sk, struct sk_buff *skb)