From d7b215ec93e2f3e5faa3957ca374c8553e4711af Mon Sep 17 00:00:00 2001 From: Jay Vosburgh Date: Thu, 17 Jan 2008 16:25:03 -0800 Subject: [PATCH] --- yaml --- r: 75559 b: refs/heads/master c: 5655662dab4ef044be7efd155f2f5fef2e486545 h: refs/heads/master i: 75557: d448f9bf4e7d6802e23126d5a5f82428ff4233f1 75555: 4dc82cb3659434e460faee274ffaf3ed866f9737 75551: 4f4d086275ebad32a17dbb54ece0d0dfdec082db v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_main.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1e39abe7873d..240a2088152e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 027ea0416c955778ceca7ef82e48a1dd6b4617c9 +refs/heads/master: 5655662dab4ef044be7efd155f2f5fef2e486545 diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index 2c6da4969382..49a198206e3d 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/drivers/net/bonding/bond_main.c @@ -2386,7 +2386,9 @@ void bond_mii_monitor(struct work_struct *work) rtnl_lock(); read_lock(&bond->lock); __bond_mii_monitor(bond, 1); - rtnl_unlock(); + read_unlock(&bond->lock); + rtnl_unlock(); /* might sleep, hold no other locks */ + read_lock(&bond->lock); } delay = ((bond->params.miimon * HZ) / 1000) ? : 1;