---

yaml --- r: 103542 b: refs/heads/master c: f1f28aa h: refs/heads/master v: v3
git-mirror · Jul 15, 2008 · f119320 · f119320
1 parent d843013
commit f119320
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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;