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

xfrm: policy: remove last remnants of pernet inexact list 



xfrm_net still contained the no-longer-used inexact policy list heads,
remove them.

Fixes: a54ad727 ("xfrm: policy: remove remaining use of inexact list")
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent b8469721

include/net/netns/xfrm.h

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ struct netns_xfrm { 
	struct hlist_head	*policy_byidx;

	unsigned int		policy_idx_hmask;

	unsigned int		idx_generator;

	struct hlist_head	policy_inexact[XFRM_POLICY_MAX];

	struct xfrm_policy_hash	policy_bydst[XFRM_POLICY_MAX];

	unsigned int		policy_count[XFRM_POLICY_MAX * 2];

	struct work_struct	policy_hash_work;

net/xfrm/xfrm_policy.c

+0 −3
Original line number Diff line number Diff line
@@ -4206,7 +4206,6 @@ static int __net_init xfrm_policy_init(struct net *net) 


		net->xfrm.policy_count[dir] = 0;

		net->xfrm.policy_count[XFRM_POLICY_MAX + dir] = 0;

		INIT_HLIST_HEAD(&net->xfrm.policy_inexact[dir]);



		htab = &net->xfrm.policy_bydst[dir];

		htab->table = xfrm_hash_alloc(sz);
@@ -4260,8 +4259,6 @@ static void xfrm_policy_fini(struct net *net) 
	for (dir = 0; dir < XFRM_POLICY_MAX; dir++) {

		struct xfrm_policy_hash *htab;



		WARN_ON(!hlist_empty(&net->xfrm.policy_inexact[dir]));



		htab = &net->xfrm.policy_bydst[dir];

		sz = (htab->hmask + 1) * sizeof(struct hlist_head);

		WARN_ON(!hlist_empty(htab->table));