xfrm: policy: use recently added helper in more places

No logical change intended.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index b79ac453ea37690b44af062248aff2cc0be87b5b..94859b2182ec075db31c6da38aff2679d9018a99 100644 (file)
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1276,11 +1276,7 @@ static void xfrm_hash_rebuild(struct work_struct *work)
                struct xfrm_pol_inexact_bin *bin;
                u8 dbits, sbits;
 
-               if (policy->walk.dead)
-                       continue;
-
-               dir = xfrm_policy_id2dir(policy->index);
-               if (dir >= XFRM_POLICY_MAX)
+               if (xfrm_policy_is_dead_or_sk(policy))
                        continue;
 
                if ((dir & XFRM_POLICY_MASK) == XFRM_POLICY_OUT) {
@@ -1331,13 +1327,8 @@ static void xfrm_hash_rebuild(struct work_struct *work)
 
        /* re-insert all policies by order of creation */
        list_for_each_entry_reverse(policy, &net->xfrm.policy_all, walk.all) {
-               if (policy->walk.dead)
-                       continue;
-               dir = xfrm_policy_id2dir(policy->index);
-               if (dir >= XFRM_POLICY_MAX) {
-                       /* skip socket policies */
+               if (xfrm_policy_is_dead_or_sk(policy))
                        continue;
-               }
 
                hlist_del_rcu(&policy->bydst);