diff options
| author | Shannon Nelson <shannon.nelson@oracle.com> | 2017-05-15 10:51:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-15 15:36:08 -0400 |
| commit | 8b671f906c2debc4f2393438c4e7668936522e99 (patch) | |
| tree | af9a39f437355719c399dcb18ee70427c3818142 | |
| parent | b18e5e86b44be0dca399d8e2383f97c8077392ce (diff) | |
| download | linux-8b671f906c2debc4f2393438c4e7668936522e99.tar.bz2 | |
ldmvsw: stop the clean timer at beginning of remove
Stop the clean timer earlier to be sure there's no asynchronous
interference while stopping the port.
Orabug: 25748241
Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/sun/ldmvsw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sun/ldmvsw.c b/drivers/net/ethernet/sun/ldmvsw.c index 309747c7b8ae..5b56c24b6ed2 100644 --- a/drivers/net/ethernet/sun/ldmvsw.c +++ b/drivers/net/ethernet/sun/ldmvsw.c @@ -411,6 +411,7 @@ static int vsw_port_remove(struct vio_dev *vdev) if (port) { del_timer_sync(&port->vio.timer); + del_timer_sync(&port->clean_timer); napi_disable(&port->napi); unregister_netdev(port->dev); @@ -418,7 +419,6 @@ static int vsw_port_remove(struct vio_dev *vdev) list_del_rcu(&port->list); synchronize_rcu(); - del_timer_sync(&port->clean_timer); spin_lock_irqsave(&port->vp->lock, flags); sunvnet_port_rm_txq_common(port); spin_unlock_irqrestore(&port->vp->lock, flags); |