diff --git a/[refs] b/[refs] index 97d91c748663..c72e1fd6e719 100644 --- 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 index 4cae2a86e741..03eb51f1c694 100644 --- a/trunk/drivers/net/bnx2.c +++ b/trunk/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