---

yaml --- r: 172141 b: refs/heads/master c: 51bf6bb h: refs/heads/master i: 172139: 93b5731 v: v3
git-mirror · Dec 3, 2009 · f258730 · f258730
1 parent eebd098
commit f258730
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cceea982ef78cf358b70f3412a6799f153211e14
+refs/heads/master: 51bf6bb424c14bfd3590a0de03fbd07fc800435e
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
@@ -6263,15 +6263,19 @@ bnx2_reset_task(struct work_struct *work)
 {
 	struct bnx2 *bp = container_of(work, struct bnx2, reset_task);
 
-	if (!netif_running(bp->dev))
+	rtnl_lock();
+	if (!netif_running(bp->dev)) {
+		rtnl_unlock();
 		return;
+	}
 
 	bnx2_netif_stop(bp);
 
 	bnx2_init_nic(bp, 1);
 
 	atomic_set(&bp->intr_sem, 1);
 	bnx2_netif_start(bp);
+	rtnl_unlock();
 }
 
 static void