From f1193209f5cc2ca102d10f5573f519ff18026613 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 15 Jul 2008 00:08:33 -0700
Subject: [PATCH] --- yaml --- r: 103542 b: refs/heads/master c:
 f1f28aa3510ddb84c966bac65611bb866c77a092 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/netdevice.h | 1 +
 trunk/net/core/dev.c            | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0fa63ecbe2a2..e8c80596e298 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f66ac03d497c162c70cd0ccc802ce1777073cdf3
+refs/heads/master: f1f28aa3510ddb84c966bac65611bb866c77a092
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index ba5c4639ea91..fd0365219181 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -609,6 +609,7 @@ struct net_device
 	unsigned char		addr_len;	/* hardware address length	*/
 	unsigned short          dev_id;		/* for shared network cards */
 
+	spinlock_t		addr_list_lock;
 	struct dev_addr_list	*uc_list;	/* Secondary unicast mac addresses */
 	int			uc_count;	/* Number of installed ucasts	*/
 	int			uc_promisc;
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index feaab4898a5b..d933d1bfa6fa 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -3836,6 +3836,7 @@ int register_netdevice(struct net_device *dev)
 	BUG_ON(!dev_net(dev));
 	net = dev_net(dev);
 
+	spin_lock_init(&dev->addr_list_lock);
 	netdev_init_queue_locks(dev);
 
 	dev->iflink = -1;