xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Thanneeru Srinivasulu <tsrinivasulu@caviumnetworks.com>
Signed-off-by: Sunil Goutham <sgoutham@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Thanneeru Srinivasulu
2015-12-02 15:36:14 +05:30
committed by David S. Miller
parent 723cda5b05
commit a7b1f535a8
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/cavium/thunder/nic_main.c
View File

@@ -1074,8 +1074,7 @@ static void nic_remove(struct pci_dev *pdev)
if (nic->check_link) { if (nic->check_link) {
/* Destroy work Queue */ /* Destroy work Queue */
cancel_delayed_work(&nic->dwork); cancel_delayed_work_sync(&nic->dwork);
flush_workqueue(nic->check_link);
destroy_workqueue(nic->check_link); destroy_workqueue(nic->check_link);
} }

3
drivers/net/ethernet/cavium/thunder/thunder_bgx.c
View File

@@ -695,8 +695,7 @@ static void bgx_lmac_disable(struct bgx *bgx, u8 lmacid)
lmac = &bgx->lmac[lmacid]; lmac = &bgx->lmac[lmacid];
if (lmac->check_link) { if (lmac->check_link) {
/* Destroy work queue */ /* Destroy work queue */
cancel_delayed_work(&lmac->dwork); cancel_delayed_work_sync(&lmac->dwork);
flush_workqueue(lmac->check_link);
destroy_workqueue(lmac->check_link); destroy_workqueue(lmac->check_link);
} }