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

2 files changed, 1 insertions, 2 deletions

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index b853f06cc148..16c33e308121 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -257,7 +257,6 @@ static struct inet6_dev *ip6_mc_find_dev_rcu(struct net *net,
 
                 if (rt) {
                         dev = rt->dst.dev;
-                        dev_hold(dev);
                         dst_release(&rt->dst);
                 }
         } else
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 92be12bb8d23..24c456e8aa1d 100644
--- 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)) {