Commit 8b671f90 authored by Shannon Nelson's avatar Shannon Nelson Committed by David S. Miller

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: default avatarShannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b18e5e86
...@@ -411,6 +411,7 @@ static int vsw_port_remove(struct vio_dev *vdev) ...@@ -411,6 +411,7 @@ static int vsw_port_remove(struct vio_dev *vdev)
if (port) { if (port) {
del_timer_sync(&port->vio.timer); del_timer_sync(&port->vio.timer);
del_timer_sync(&port->clean_timer);
napi_disable(&port->napi); napi_disable(&port->napi);
unregister_netdev(port->dev); unregister_netdev(port->dev);
...@@ -418,7 +419,6 @@ static int vsw_port_remove(struct vio_dev *vdev) ...@@ -418,7 +419,6 @@ static int vsw_port_remove(struct vio_dev *vdev)
list_del_rcu(&port->list); list_del_rcu(&port->list);
synchronize_rcu(); synchronize_rcu();
del_timer_sync(&port->clean_timer);
spin_lock_irqsave(&port->vp->lock, flags); spin_lock_irqsave(&port->vp->lock, flags);
sunvnet_port_rm_txq_common(port); sunvnet_port_rm_txq_common(port);
spin_unlock_irqrestore(&port->vp->lock, flags); spin_unlock_irqrestore(&port->vp->lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment