diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-15 21:36:09 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-15 21:36:09 +0200 |
| commit | 66f4bc819d71bb600f1c879c9a7161de1cc725f8 (patch) | |
| tree | af9a39f437355719c399dcb18ee70427c3818142 | |
| parent | net: netcp: fix check of requested timestamping filter (diff) | |
| parent | ldmvsw: stop the clean timer at beginning of remove (diff) | |
| download | linux-66f4bc819d71bb600f1c879c9a7161de1cc725f8.tar.xz linux-66f4bc819d71bb600f1c879c9a7161de1cc725f8.zip | |
Merge branch 'ldmsw-fixes'
Shannon Nelson says:
====================
ldmvsw: port removal stability
Under heavy reboot stress testing we found a couple of timing issues
when removing the device that could cause the kernel great heartburn,
addressed by these two patches.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/sun/ldmvsw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sun/ldmvsw.c b/drivers/net/ethernet/sun/ldmvsw.c index 5a90fed06260..5b56c24b6ed2 100644 --- a/drivers/net/ethernet/sun/ldmvsw.c +++ b/drivers/net/ethernet/sun/ldmvsw.c @@ -411,13 +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); @@ -427,7 +428,6 @@ static int vsw_port_remove(struct vio_dev *vdev) dev_set_drvdata(&vdev->dev, NULL); - unregister_netdev(port->dev); free_netdev(port->dev); } |