Skip to content

Commit 645546a

Browse files
Florian Westphalklassert
authored andcommitted
xfrm: policy: remove last remnants of pernet inexact list
xfrm_net still contained the no-longer-used inexact policy list heads, remove them. Fixes: a54ad72 ("xfrm: policy: remove remaining use of inexact list") Signed-off-by: Florian Westphal <[email protected]> Signed-off-by: Steffen Klassert <[email protected]>
1 parent b846972 commit 645546a

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

include/net/netns/xfrm.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ struct netns_xfrm {
5151
struct hlist_head *policy_byidx;
5252
unsigned int policy_idx_hmask;
5353
unsigned int idx_generator;
54-
struct hlist_head policy_inexact[XFRM_POLICY_MAX];
5554
struct xfrm_policy_hash policy_bydst[XFRM_POLICY_MAX];
5655
unsigned int policy_count[XFRM_POLICY_MAX * 2];
5756
struct work_struct policy_hash_work;

net/xfrm/xfrm_policy.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4206,7 +4206,6 @@ static int __net_init xfrm_policy_init(struct net *net)
42064206

42074207
net->xfrm.policy_count[dir] = 0;
42084208
net->xfrm.policy_count[XFRM_POLICY_MAX + dir] = 0;
4209-
INIT_HLIST_HEAD(&net->xfrm.policy_inexact[dir]);
42104209

42114210
htab = &net->xfrm.policy_bydst[dir];
42124211
htab->table = xfrm_hash_alloc(sz);
@@ -4260,8 +4259,6 @@ static void xfrm_policy_fini(struct net *net)
42604259
for (dir = 0; dir < XFRM_POLICY_MAX; dir++) {
42614260
struct xfrm_policy_hash *htab;
42624261

4263-
WARN_ON(!hlist_empty(&net->xfrm.policy_inexact[dir]));
4264-
42654262
htab = &net->xfrm.policy_bydst[dir];
42664263
sz = (htab->hmask + 1) * sizeof(struct hlist_head);
42674264
WARN_ON(!hlist_empty(htab->table));

0 commit comments

Comments
 (0)