diff options
| author | Prashant Sreedharan | 2015-01-14 20:34:17 +0100 |
|---|---|---|
| committer | David S. Miller | 2015-01-14 23:05:51 +0100 |
| commit | db84bf43ef23157cbb40ce8626475187f5ae90c3 (patch) | |
| tree | 081715d4e53dbfc7a6d404355a165b6dbcc766b9 /drivers/net/ethernet | |
| parent | tg3: tg3_timer() should grab tp->lock before checking for tp->irq_sync (diff) | |
| download | kernel-qcow2-linux-db84bf43ef23157cbb40ce8626475187f5ae90c3.tar.gz kernel-qcow2-linux-db84bf43ef23157cbb40ce8626475187f5ae90c3.tar.xz kernel-qcow2-linux-db84bf43ef23157cbb40ce8626475187f5ae90c3.zip | |
tg3: tg3_reset_task() needs to use rtnl_lock to synchronize
Currently tg3_reset_task() uses only tp->lock for synchronizing with code
paths like tg3_open() etc. But since tp->lock is released before doing
synchronize_irq(), rtnl_lock should be taken in tg3_reset_task() to
synchronize it with other code paths.
Reported-by: Peter Hurley <peter@hurleysoftware.com>
Tested-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Prashant Sreedharan <prashant@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 2dbd4aea01f3..9247ae1412cc 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -11103,11 +11103,13 @@ static void tg3_reset_task(struct work_struct *work) struct tg3 *tp = container_of(work, struct tg3, reset_task); int err; + rtnl_lock(); tg3_full_lock(tp, 0); if (!netif_running(tp->dev)) { tg3_flag_clear(tp, RESET_TASK_PENDING); tg3_full_unlock(tp); + rtnl_unlock(); return; } @@ -11140,6 +11142,7 @@ out: tg3_phy_start(tp); tg3_flag_clear(tp, RESET_TASK_PENDING); + rtnl_unlock(); } static int tg3_request_irq(struct tg3 *tp, int irq_num) |