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

Commit a7b1f535 authored by Thanneeru Srinivasulu's avatar Thanneeru Srinivasulu Committed by David S. Miller
Browse files

net: thunderx: Wait for delayed work to finish before destroying it 



While VNIC or BGX driver teardown, wait for already scheduled delayed work to
finish before destroying it.

Signed-off-by: default avatarThanneeru Srinivasulu <tsrinivasulu@caviumnetworks.com>
Signed-off-by: default avatarSunil Goutham <sgoutham@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 723cda5b

drivers/net/ethernet/cavium/thunder/nic_main.c

+1 −2
Original line number Diff line number Diff line
@@ -1074,8 +1074,7 @@ static void nic_remove(struct pci_dev *pdev) 


	if (nic->check_link) {

		/* Destroy work Queue */

		cancel_delayed_work(&nic->dwork);

		flush_workqueue(nic->check_link);

		cancel_delayed_work_sync(&nic->dwork);

		destroy_workqueue(nic->check_link);

	}

drivers/net/ethernet/cavium/thunder/thunder_bgx.c

+1 −2
Original line number Diff line number Diff line
@@ -695,8 +695,7 @@ static void bgx_lmac_disable(struct bgx *bgx, u8 lmacid) 
	lmac = &bgx->lmac[lmacid];

	if (lmac->check_link) {

		/* Destroy work queue */

		cancel_delayed_work(&lmac->dwork);

		flush_workqueue(lmac->check_link);

		cancel_delayed_work_sync(&lmac->dwork);

		destroy_workqueue(lmac->check_link);

	}