Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66f4bc81 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents ca9df7ed 8b671f90

drivers/net/ethernet/sun/ldmvsw.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	}