bnx2: Protect tx timeout reset with rtnl_lock().

To prevent race conditions with other reset events.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 4cae2a86e7418162771eac8143cfc1009fec2c76..03eb51f1c6940ecbd72c4242a4711d51b1bcccc4 100644 (file)
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -6263,8 +6263,11 @@ 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);
 
@@ -6272,6 +6275,7 @@ bnx2_reset_task(struct work_struct *work)
 
        atomic_set(&bp->intr_sem, 1);
        bnx2_netif_start(bp);
+       rtnl_unlock();
 }
 
 static void