Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

[mv-sheeva.git] / net / ipv6 / addrconf.c

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 6b8ebc5da0e1344ad58994e327ba42cac44f3ac3..6a3bb6077e19715bf2732bbce3d1c09d06aed104 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -435,7 +435,7 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
        ipv6_dev_mc_inc(dev, &in6addr_linklocal_allnodes);
 
        /* Join all-router multicast group if forwarding is set */
-       if (ndev->cnf.forwarding && dev && (dev->flags & IFF_MULTICAST))
+       if (ndev->cnf.forwarding && (dev->flags & IFF_MULTICAST))
                ipv6_dev_mc_inc(dev, &in6addr_linklocal_allrouters);
 
        return ndev;