aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-07 13:46:27 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-07 13:46:27 -0400
commitcba8784ae0a9f7d0f1f87e0607e7ae66fc45666c (patch)
tree58a53f6b8db0ec64e93ebece1c1f07aa54502544 /net
parent9cf9d28e9bf991af21fc4bbf33281b66843b094b (diff)
parent0bf52b981770cbf006323bab5177f2858a196766 (diff)
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()
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 43e61ba7bd95..6a94475aee85 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4007,9 +4007,7 @@ static void dev_unicast_flush(struct net_device *dev)
4007 4007
4008static void dev_unicast_init(struct net_device *dev) 4008static void dev_unicast_init(struct net_device *dev)
4009{ 4009{
4010 netif_addr_lock_bh(dev);
4011 __hw_addr_init(&dev->uc); 4010 __hw_addr_init(&dev->uc);
4012 netif_addr_unlock_bh(dev);
4013} 4011}
4014 4012
4015 4013