Skip to content

Commit

Permalink
ldmvsw: stop the clean timer at beginning of remove
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Shannon Nelson authored and David S. Miller committed May 15, 2017
1 parent b18e5e8 commit 8b671f9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/sun/ldmvsw.c
Original file line number Diff line number Diff line change
Expand Up @@ -411,14 +411,14 @@ 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);

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);
Expand Down

0 comments on commit 8b671f9

Please sign in to comment.