net: atlantic: make hw_get_regs optional

[linux-2.6-microblaze.git] / drivers / net / macvlan.c

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index e7289d6..d45600e 100644 (file)
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -123,7 +123,8 @@ static struct macvlan_dev *macvlan_hash_lookup(const struct macvlan_port *port,
        struct macvlan_dev *vlan;
        u32 idx = macvlan_eth_hash(addr);
 
-       hlist_for_each_entry_rcu(vlan, &port->vlan_hash[idx], hlist) {
+       hlist_for_each_entry_rcu(vlan, &port->vlan_hash[idx], hlist,
+                                lockdep_rtnl_is_held()) {
                if (ether_addr_equal_64bits(vlan->dev->dev_addr, addr))
                        return vlan;
        }
@@ -1704,7 +1705,7 @@ static int macvlan_device_event(struct notifier_block *unused,
                                                struct macvlan_dev,
                                                list);
 
-               if (macvlan_sync_address(vlan->dev, dev->dev_addr))
+               if (vlan && macvlan_sync_address(vlan->dev, dev->dev_addr))
                        return NOTIFY_BAD;
 
                break;