X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fbridge%2Fbr_if.c;h=080277bac10da76adc01e09b9f9f096bf9e51f55;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=43d03734e48b2b116d980e8dec6cc31708d4e85b;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 43d03734e..080277bac 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -147,9 +147,9 @@ static struct net_device *new_bridge_dev(const char *name)
 	br = netdev_priv(dev);
 	br->dev = dev;
 
-	br->lock = SPIN_LOCK_UNLOCKED;
+	spin_lock_init(&br->lock);
 	INIT_LIST_HEAD(&br->port_list);
-	br->hash_lock = SPIN_LOCK_UNLOCKED;
+	spin_lock_init(&br->hash_lock);
 
 	br->bridge_id.prio[0] = 0x80;
 	br->bridge_id.prio[1] = 0x00;