xfrm: Handle blackhole route creation via afinfo.

That way we don't have to potentially do this in every xfrm_lookup()
caller.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 22 deletions

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index ac16f3b2a029..35a4ad90a0f5 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1025,18 +1025,12 @@ struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi *fl,
                 return ERR_PTR(err);
         if (final_dst)
                 ipv6_addr_copy(&fl->fl6_dst, final_dst);
-        if (can_sleep) {
+        if (can_sleep)
                 fl->flags |= FLOWI_FLAG_CAN_SLEEP;
-                err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, 0);
-                if (err == -EREMOTE)
-                        return ip6_dst_blackhole(sock_net(sk), dst);
-                if (err)
-                        return ERR_PTR(err);
-        } else {
-                err = xfrm_lookup(sock_net(sk), &dst, fl, sk, 0);
-                if (err)
-                        return ERR_PTR(err);
-        }
+
+        err = xfrm_lookup(sock_net(sk), &dst, fl, sk, 0);
+        if (err)
+                return ERR_PTR(err);
         return dst;
 }
 EXPORT_SYMBOL_GPL(ip6_dst_lookup_flow);
@@ -1070,18 +1064,12 @@ struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi *fl,
                 return ERR_PTR(err);
         if (final_dst)
                 ipv6_addr_copy(&fl->fl6_dst, final_dst);
-        if (can_sleep) {
+        if (can_sleep)
                 fl->flags |= FLOWI_FLAG_CAN_SLEEP;
-                err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, 0);
-                if (err == -EREMOTE)
-                        return ip6_dst_blackhole(sock_net(sk), dst);
-                if (err)
-                        return ERR_PTR(err);
-        } else {
-                err = xfrm_lookup(sock_net(sk), &dst, fl, sk, 0);
-                if (err)
-                        return ERR_PTR(err);
-        }
+
+        err = xfrm_lookup(sock_net(sk), &dst, fl, sk, 0);
+        if (err)
+                return ERR_PTR(err);
         return dst;
 }
 EXPORT_SYMBOL_GPL(ip6_sk_dst_lookup_flow);