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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  net: Fix spinlock use in alloc_netdev_mq()

diff --git a/net/core/dev.c b/net/core/dev.c
index 43e61ba7bd956cd7afb2de093c989285abe25151..6a94475aee8594279eb90d94cc164c5169e533c5 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);
 }