1 files changed, 12 insertions, 12 deletions

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 07c585756d2a..6c9aa642a2ba 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2786,10 +2786,10 @@ static bool xfrm_migrate_selector_match(const struct xfrm_selector *sel_cmp,
 {
         if (sel_cmp->proto == IPSEC_ULPROTO_ANY) {
                 if (sel_tgt->family == sel_cmp->family &&
-                    xfrm_addr_cmp(&sel_tgt->daddr, &sel_cmp->daddr,
-                                  sel_cmp->family) == 0 &&
-                    xfrm_addr_cmp(&sel_tgt->saddr, &sel_cmp->saddr,
-                                  sel_cmp->family) == 0 &&
+                    xfrm_addr_equal(&sel_tgt->daddr, &sel_cmp->daddr,
+                                    sel_cmp->family) &&
+                    xfrm_addr_equal(&sel_tgt->saddr, &sel_cmp->saddr,
+                                    sel_cmp->family) &&
                     sel_tgt->prefixlen_d == sel_cmp->prefixlen_d &&
                     sel_tgt->prefixlen_s == sel_cmp->prefixlen_s) {
                         return true;
@@ -2847,10 +2847,10 @@ static int migrate_tmpl_match(const struct xfrm_migrate *m, const struct xfrm_tm
                 switch (t->mode) {
                 case XFRM_MODE_TUNNEL:
                 case XFRM_MODE_BEET:
-                        if (xfrm_addr_cmp(&t->id.daddr, &m->old_daddr,
-                                          m->old_family) == 0 &&
-                            xfrm_addr_cmp(&t->saddr, &m->old_saddr,
-                                          m->old_family) == 0) {
+                        if (xfrm_addr_equal(&t->id.daddr, &m->old_daddr,
+                                            m->old_family) &&
+                            xfrm_addr_equal(&t->saddr, &m->old_saddr,
+                                            m->old_family)) {
                                 match = 1;
                         }
                         break;
@@ -2916,10 +2916,10 @@ static int xfrm_migrate_check(const struct xfrm_migrate *m, int num_migrate)
                 return -EINVAL;
 
         for (i = 0; i < num_migrate; i++) {
-                if ((xfrm_addr_cmp(&m[i].old_daddr, &m[i].new_daddr,
-                                   m[i].old_family) == 0) &&
-                    (xfrm_addr_cmp(&m[i].old_saddr, &m[i].new_saddr,
-                                   m[i].old_family) == 0))
+                if (xfrm_addr_equal(&m[i].old_daddr, &m[i].new_daddr,
+                                    m[i].old_family) &&
+                    xfrm_addr_equal(&m[i].old_saddr, &m[i].new_saddr,
+                                    m[i].old_family))
                         return -EINVAL;
                 if (xfrm_addr_any(&m[i].new_daddr, m[i].new_family) ||
                     xfrm_addr_any(&m[i].new_saddr, m[i].new_family))