Skip to content

Commit 66f4bc8

Browse files
committed
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 <[email protected]>
2 parents ca9df7e + 8b671f9 commit 66f4bc8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/ethernet/sun/ldmvsw.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,13 +411,14 @@ static int vsw_port_remove(struct vio_dev *vdev)
411411

412412
if (port) {
413413
del_timer_sync(&port->vio.timer);
414+
del_timer_sync(&port->clean_timer);
414415

415416
napi_disable(&port->napi);
417+
unregister_netdev(port->dev);
416418

417419
list_del_rcu(&port->list);
418420

419421
synchronize_rcu();
420-
del_timer_sync(&port->clean_timer);
421422
spin_lock_irqsave(&port->vp->lock, flags);
422423
sunvnet_port_rm_txq_common(port);
423424
spin_unlock_irqrestore(&port->vp->lock, flags);
@@ -427,7 +428,6 @@ static int vsw_port_remove(struct vio_dev *vdev)
427428

428429
dev_set_drvdata(&vdev->dev, NULL);
429430

430-
unregister_netdev(port->dev);
431431
free_netdev(port->dev);
432432
}
433433

0 commit comments

Comments
 (0)