From 9d14756ff7520266659e0cb0e996edc1ced4d97a Mon Sep 17 00:00:00 2001 From: Jarek Poplawski Date: Wed, 27 Oct 2010 07:08:22 +0000 Subject: [PATCH] --- yaml --- r: 218474 b: refs/heads/master c: a71fb88145a03678fef3796930993e390db68a15 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c47a1496786a..57b21cd93104 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74b0b85b88aaa952023762e0280799aaae849841 +refs/heads/master: a71fb88145a03678fef3796930993e390db68a15 diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index beb3b7cecd52..bdb68a600382 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/drivers/net/bonding/bond_main.c @@ -493,9 +493,9 @@ static void bond_vlan_rx_register(struct net_device *bond_dev, struct slave *slave; int i; - write_lock(&bond->lock); + write_lock_bh(&bond->lock); bond->vlgrp = grp; - write_unlock(&bond->lock); + write_unlock_bh(&bond->lock); bond_for_each_slave(bond, slave, i) { struct net_device *slave_dev = slave->dev;