ipv6: Move xfrm_lookup() call down into icmp6_dst_alloc().

And return error pointers.

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

1 files changed, 1 insertions, 8 deletions

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index e72c8af8578..f3e50c29add 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -516,14 +516,7 @@ void ndisc_send_skb(struct sk_buff *skb,
         type = icmp6h->icmp6_type;
 
         icmpv6_flow_init(sk, &fl6, type, saddr, daddr, dev->ifindex);
-
-        dst = icmp6_dst_alloc(dev, neigh, daddr);
-        if (!dst) {
-                kfree_skb(skb);
-                return;
-        }
-
-        dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
+        dst = icmp6_dst_alloc(dev, neigh, &fl6);
         if (IS_ERR(dst)) {
                 kfree_skb(skb);
                 return;