Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-flexiantxendom0-3.2.10.git] / net / ipv6 / route.c

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 92be12b..24c456e 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1090,7 +1090,7 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
        struct net *net = dev_net(dev);
 
        if (unlikely(!idev))
-               return NULL;
+               return ERR_PTR(-ENODEV);
 
        rt = ip6_dst_alloc(&net->ipv6.ip6_dst_ops, dev, 0);
        if (unlikely(!rt)) {