igc: handle the IGC_PTP_ENABLED flag correctly

[ Upstream commit 26a3910afd111f7c1a96dace6dc02f3225063896 ]

All functions in igc_ptp.c called from igc_main.c should check the
IGC_PTP_ENABLED flag. Adding check for this flag to stop and reset
functions.

Fixes: 5f2958052c58 ("igc: Add basic skeleton for PTP")
Signed-off-by: Christopher S M Hall <christopher.s.hall@intel.com>
Reviewed-by: Corinna Vinschen <vinschen@redhat.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Mor Bar-Gabay <morx.bar.gabay@intel.com>
Acked-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/intel/igc/igc_ptp.c b/drivers/net/ethernet/intel/igc/igc_ptp.c
index 25b238c6a675c9cb945c1bd69642cef5521f11c7..d99f597a83be5ebdb9aa5f8144eb378d178bb98f 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_ptp.c
+++ b/drivers/net/ethernet/intel/igc/igc_ptp.c
@@ -578,8 +578,12 @@ void igc_ptp_suspend(struct igc_adapter *adapter)
  **/
 void igc_ptp_stop(struct igc_adapter *adapter)
 {
+       if (!(adapter->ptp_flags & IGC_PTP_ENABLED))
+               return;
+
        igc_ptp_suspend(adapter);
 
+       adapter->ptp_flags &= ~IGC_PTP_ENABLED;
        if (adapter->ptp_clock) {
                ptp_clock_unregister(adapter->ptp_clock);
                netdev_info(adapter->netdev, "PHC removed\n");
@@ -598,6 +602,9 @@ void igc_ptp_reset(struct igc_adapter *adapter)
        struct igc_hw *hw = &adapter->hw;
        unsigned long flags;
 
+       if (!(adapter->ptp_flags & IGC_PTP_ENABLED))
+               return;
+
        /* reset the tstamp_config */
        igc_ptp_set_timestamp_mode(adapter, &adapter->tstamp_config);