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

xfrm: remove init_flags indirection from xfrm_state_afinfo 



There is only one implementation of this function; just call it directly.

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

include/net/xfrm.h

+0 −1
Original line number Diff line number Diff line
@@ -353,7 +353,6 @@ struct xfrm_state_afinfo { 
	const struct xfrm_type		*type_map[IPPROTO_MAX];

	const struct xfrm_type_offload	*type_offload_map[IPPROTO_MAX];



	int			(*init_flags)(struct xfrm_state *x);

	int			(*tmpl_sort)(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n);

	int			(*state_sort)(struct xfrm_state **dst, struct xfrm_state **src, int n);

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

net/ipv4/xfrm4_state.c

+0 −8
Original line number Diff line number Diff line
@@ -15,13 +15,6 @@ 
#include <linux/netfilter_ipv4.h>

#include <linux/export.h>



static int xfrm4_init_flags(struct xfrm_state *x)

{

	if (xs_net(x)->ipv4.sysctl_ip_no_pmtu_disc)

		x->props.flags |= XFRM_STATE_NOPMTUDISC;

	return 0;

}



int xfrm4_extract_header(struct sk_buff *skb)

{

	const struct iphdr *iph = ip_hdr(skb);
@@ -43,7 +36,6 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = { 
	.proto			= IPPROTO_IPIP,

	.eth_proto		= htons(ETH_P_IP),

	.owner			= THIS_MODULE,

	.init_flags		= xfrm4_init_flags,

	.output			= xfrm4_output,

	.output_finish		= xfrm4_output_finish,

	.extract_input		= xfrm4_extract_input,

net/xfrm/xfrm_state.c

+3 −14
Original line number Diff line number Diff line
@@ -2263,25 +2263,14 @@ int xfrm_state_mtu(struct xfrm_state *x, int mtu) 


int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload)

{

	const struct xfrm_state_afinfo *afinfo;

	const struct xfrm_mode *inner_mode;

	const struct xfrm_mode *outer_mode;

	int family = x->props.family;

	int err;



	err = -EAFNOSUPPORT;

	afinfo = xfrm_state_get_afinfo(family);

	if (!afinfo)

		goto error;



	err = 0;

	if (afinfo->init_flags)

		err = afinfo->init_flags(x);



	rcu_read_unlock();



	if (err)

		goto error;

	if (family == AF_INET &&

	    xs_net(x)->ipv4.sysctl_ip_no_pmtu_disc)

		x->props.flags |= XFRM_STATE_NOPMTUDISC;



	err = -EPROTONOSUPPORT;