lkml.org 
[lkml]   [2019]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.3 07/95] sfc: Only cancel the PPS workqueue if it exists
    Date
    From: Martin Habets <mhabets@solarflare.com>

    [ Upstream commit 723eb53690041740a13ac78efeaf6804f5d684c9 ]

    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>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/sfc/ptp.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- 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);

    \
     
     \ /
      Last update: 2019-11-27 22:20    [W:2.095 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site