| Message ID | 157435873481.1746063.7779522257910378266.stgit@mh-desktop.uk.solarflarecom.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] sfc: Only cancel the PPS workqueue if it exists | expand |
From: Martin Habets <mhabets@solarflare.com> Date: Thu, 21 Nov 2019 17:52:15 +0000 > The workqueue only exists for the primary PF. For other functions > we hit a WARN_ON in kernel/workqueue.c. > > Fixes: 7c236c43b838 ("sfc: Add support for IEEE-1588 PTP") > Signed-off-by: Martin Habets <mhabets@solarflare.com> Applied and queued up for -stable, thanks.
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c index 02ed6d1b716c..af15a737c675 100644 --- a/drivers/net/ethernet/sfc/ptp.c +++ b/drivers/net/ethernet/sfc/ptp.c @@ -1531,7 +1531,8 @@ void efx_ptp_remove(struct efx_nic *efx) (void)efx_ptp_disable(efx); cancel_work_sync(&efx->ptp_data->work); - cancel_work_sync(&efx->ptp_data->pps_work); + if (efx->ptp_data->pps_workwq) + cancel_work_sync(&efx->ptp_data->pps_work); skb_queue_purge(&efx->ptp_data->rxq); skb_queue_purge(&efx->ptp_data->txq);
The workqueue only exists for the primary PF. For other functions we hit a WARN_ON in kernel/workqueue.c. Fixes: 7c236c43b838 ("sfc: Add support for IEEE-1588 PTP") Signed-off-by: Martin Habets <mhabets@solarflare.com> --- drivers/net/ethernet/sfc/ptp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)