Merge branch 'next' into for-linus

[cascardo/linux.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index 43e61ba..6a94475 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4007,9 +4007,7 @@ static void dev_unicast_flush(struct net_device *dev)
 
 static void dev_unicast_init(struct net_device *dev)
 {
-       netif_addr_lock_bh(dev);
        __hw_addr_init(&dev->uc);
-       netif_addr_unlock_bh(dev);
 }