Commit 26a3910a authored by Christopher S M Hall's avatar Christopher S M Hall Committed by Tony Nguyen
Browse files

igc: handle the IGC_PTP_ENABLED flag correctly 



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: 5f295805 ("igc: Add basic skeleton for PTP")
Signed-off-by: default avatarChristopher S M Hall <christopher.s.hall@intel.com>
Reviewed-by: default avatarCorinna Vinschen <vinschen@redhat.com>
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarMor Bar-Gabay <morx.bar.gabay@intel.com>
Acked-by: default avatarVinicius Costa Gomes <vinicius.gomes@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent cd7f7328

drivers/net/ethernet/intel/igc/igc_ptp.c

+7 −0
Original line number Diff line number Diff line
@@ -1244,8 +1244,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");
@@ -1266,6 +1270,9 @@ void igc_ptp_reset(struct igc_adapter *adapter) 
	unsigned long flags;

	u32 timadj;



	if (!(adapter->ptp_flags & IGC_PTP_ENABLED))

		return;



	/* reset the tstamp_config */

	igc_ptp_set_timestamp_mode(adapter, &adapter->tstamp_config);