3 files changed, 16 insertions, 20 deletions

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 9049a5caeb25..7661576b6f45 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -61,8 +61,8 @@ __xfrm4_selector_match(const struct xfrm_selector *sel, const struct flowi *fl)
 {
         const struct flowi4 *fl4 = &fl->u.ip4;
 
-        return  addr_match(&fl4->daddr, &sel->daddr, sel->prefixlen_d) &&
-                addr_match(&fl4->saddr, &sel->saddr, sel->prefixlen_s) &&
+        return  addr4_match(fl4->daddr, sel->daddr.a4, sel->prefixlen_d) &&
+                addr4_match(fl4->saddr, sel->saddr.a4, sel->prefixlen_s) &&
                 !((xfrm_flowi_dport(fl, &fl4->uli) ^ sel->dport) & sel->dport_mask) &&
                 !((xfrm_flowi_sport(fl, &fl4->uli) ^ sel->sport) & sel->sport_mask) &&
                 (fl4->flowi4_proto == sel->proto || !sel->proto) &&
@@ -1340,7 +1340,7 @@ static inline struct xfrm_dst *xfrm_alloc_dst(struct net *net, int family)
         case AF_INET:
                 dst_ops = &net->xfrm.xfrm4_dst_ops;
                 break;
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if IS_ENABLED(CONFIG_IPV6)
         case AF_INET6:
                 dst_ops = &net->xfrm.xfrm6_dst_ops;
                 break;
@@ -1499,7 +1499,7 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy,
                 goto free_dst;
 
         /* Copy neighbour for reachability confirmation */
-        dst_set_neighbour(dst0, neigh_clone(dst_get_neighbour(dst)));
+        dst_set_neighbour(dst0, neigh_clone(dst_get_neighbour_noref(dst)));
 
         xfrm_init_path((struct xfrm_dst *)dst0, dst, nfheader_len);
         xfrm_init_pmtu(dst_prev);
@@ -2445,7 +2445,7 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
                 case AF_INET:
                         xfrm_dst_ops = &net->xfrm.xfrm4_dst_ops;
                         break;
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if IS_ENABLED(CONFIG_IPV6)
                 case AF_INET6:
                         xfrm_dst_ops = &net->xfrm.xfrm6_dst_ops;
                         break;
@@ -2495,7 +2495,7 @@ static void __net_init xfrm_dst_ops_init(struct net *net)
         afinfo = xfrm_policy_afinfo[AF_INET];
         if (afinfo)
                 net->xfrm.xfrm4_dst_ops = *afinfo->dst_ops;
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if IS_ENABLED(CONFIG_IPV6)
         afinfo = xfrm_policy_afinfo[AF_INET6];
         if (afinfo)
                 net->xfrm.xfrm6_dst_ops = *afinfo->dst_ops;
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 9414b9c5b1e4..5b228f97d4b3 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1035,16 +1035,12 @@ static struct xfrm_state *__find_acq_core(struct net *net, struct xfrm_mark *m,
                         break;
 
                 case AF_INET6:
-                        ipv6_addr_copy((struct in6_addr *)x->sel.daddr.a6,
-                                       (const struct in6_addr *)daddr);
-                        ipv6_addr_copy((struct in6_addr *)x->sel.saddr.a6,
-                                       (const struct in6_addr *)saddr);
+                        *(struct in6_addr *)x->sel.daddr.a6 = *(struct in6_addr *)daddr;
+                        *(struct in6_addr *)x->sel.saddr.a6 = *(struct in6_addr *)saddr;
                         x->sel.prefixlen_d = 128;
                         x->sel.prefixlen_s = 128;
-                        ipv6_addr_copy((struct in6_addr *)x->props.saddr.a6,
-                                       (const struct in6_addr *)saddr);
-                        ipv6_addr_copy((struct in6_addr *)x->id.daddr.a6,
-                                       (const struct in6_addr *)daddr);
+                        *(struct in6_addr *)x->props.saddr.a6 = *(struct in6_addr *)saddr;
+                        *(struct in6_addr *)x->id.daddr.a6 = *(struct in6_addr *)daddr;
                         break;
                 }
 
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index d0a42df5160e..e0d747a2e803 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -28,7 +28,7 @@
 #include <net/netlink.h>
 #include <net/ah.h>
 #include <asm/uaccess.h>
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if IS_ENABLED(CONFIG_IPV6)
 #include <linux/in6.h>
 #endif
 
@@ -150,7 +150,7 @@ static int verify_newsa_info(struct xfrm_usersa_info *p,
                 break;
 
         case AF_INET6:
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if IS_ENABLED(CONFIG_IPV6)
                 break;
 #else
                 err = -EAFNOSUPPORT;
@@ -201,7 +201,7 @@ static int verify_newsa_info(struct xfrm_usersa_info *p,
                         goto out;
                 break;
 
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if IS_ENABLED(CONFIG_IPV6)
         case IPPROTO_DSTOPTS:
         case IPPROTO_ROUTING:
                 if (attrs[XFRMA_ALG_COMP]       ||
@@ -1160,7 +1160,7 @@ static int verify_newpolicy_info(struct xfrm_userpolicy_info *p)
                 break;
 
         case AF_INET6:
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if IS_ENABLED(CONFIG_IPV6)
                 break;
 #else
                 return  -EAFNOSUPPORT;
@@ -1231,7 +1231,7 @@ static int validate_tmpl(int nr, struct xfrm_user_tmpl *ut, u16 family)
                 switch (ut[i].family) {
                 case AF_INET:
                         break;
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if IS_ENABLED(CONFIG_IPV6)
                 case AF_INET6:
                         break;
 #endif
@@ -2604,7 +2604,7 @@ static struct xfrm_policy *xfrm_compile_policy(struct sock *sk, int opt,
                         return NULL;
                 }
                 break;
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if IS_ENABLED(CONFIG_IPV6)
         case AF_INET6:
                 if (opt != IPV6_XFRM_POLICY) {
                         *dir = -EOPNOTSUPP;