Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

xfrm: policy: remove xfrm_policy_put_afinfo 



Alternative is to keep it an make the (unused) afinfo arg const to avoid
the compiler warnings once the afinfo structs get constified.

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

net/xfrm/xfrm_policy.c

+8 −13
Original line number Diff line number Diff line
@@ -116,11 +116,6 @@ static const struct xfrm_policy_afinfo *xfrm_policy_get_afinfo(unsigned short fa 
	return afinfo;

}



static void xfrm_policy_put_afinfo(struct xfrm_policy_afinfo *afinfo)

{

	rcu_read_unlock();

}



static inline struct dst_entry *__xfrm_dst_lookup(struct net *net,

						  int tos, int oif,

						  const xfrm_address_t *saddr,
@@ -136,7 +131,7 @@ static inline struct dst_entry *__xfrm_dst_lookup(struct net *net, 


	dst = afinfo->dst_lookup(net, tos, oif, saddr, daddr);



	xfrm_policy_put_afinfo(afinfo);

	rcu_read_unlock();



	return dst;

}
@@ -1436,7 +1431,7 @@ xfrm_get_saddr(struct net *net, int oif, xfrm_address_t *local, 
	if (unlikely(afinfo == NULL))

		return -EINVAL;

	err = afinfo->get_saddr(net, oif, local, remote);

	xfrm_policy_put_afinfo(afinfo);

	rcu_read_unlock();

	return err;

}
@@ -1546,7 +1541,7 @@ static int xfrm_get_tos(const struct flowi *fl, int family) 
	afinfo = xfrm_policy_get_afinfo(family);

	tos = afinfo ? afinfo->get_tos(fl) : 0;



	xfrm_policy_put_afinfo(afinfo);

	rcu_read_unlock();



	return tos;

}
@@ -1632,7 +1627,7 @@ static inline struct xfrm_dst *xfrm_alloc_dst(struct net *net, int family) 
	} else

		xdst = ERR_PTR(-ENOBUFS);



	xfrm_policy_put_afinfo(afinfo);

	rcu_read_unlock();



	return xdst;

}
@@ -1649,7 +1644,7 @@ static inline int xfrm_init_path(struct xfrm_dst *path, struct dst_entry *dst, 


	err = afinfo->init_path(path, dst, nfheader_len);



	xfrm_policy_put_afinfo(afinfo);

	rcu_read_unlock();



	return err;

}
@@ -1666,7 +1661,7 @@ static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, 


	err = afinfo->fill_dst(xdst, dev, fl);



	xfrm_policy_put_afinfo(afinfo);

	rcu_read_unlock();



	return err;

}
@@ -2215,7 +2210,7 @@ static struct dst_entry *make_blackhole(struct net *net, u16 family, 
	} else {

		ret = afinfo->blackhole_route(net, dst_orig);

	}

	xfrm_policy_put_afinfo(afinfo);

	rcu_read_unlock();



	return ret;

}
@@ -2465,7 +2460,7 @@ int __xfrm_decode_session(struct sk_buff *skb, struct flowi *fl, 


	afinfo->decode_session(skb, fl, reverse);

	err = security_xfrm_decode_session(skb, &fl->flowi_secid);

	xfrm_policy_put_afinfo(afinfo);

	rcu_read_unlock();

	return err;

}

EXPORT_SYMBOL(__xfrm_decode_session);