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

2012-03-18 23:29:41 -04:00
parent 81a430ac1b c16fa4f2ad
commit 4da0bd7365
111 changed files with 2159 additions and 2917 deletions
--- 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
--- 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)) {