igc: Remove timeout check from ptp_tx work

The Tx timestamp timeout is already checked by the watchdog_task
which runs periodically. In addition to that, from the ptp_tx work
perspective, if __IGC_PTP_TX_IN_PROGRESS flag is set we always want
handle the timestamp stored in hardware and update the skb. So remove
the timeout check in igc_ptp_tx_work() function.

Signed-off-by: Andre Guedes <andre.guedes@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/igc/igc_ptp.c b/drivers/net/ethernet/intel/igc/igc_ptp.c
index 791f406f13144a27f7c496a739484036d5e802b2..61852c99815d4453502962fa6829dbfd33936718 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_ptp.c
+++ b/drivers/net/ethernet/intel/igc/igc_ptp.c
@@ -422,12 +422,6 @@ static void igc_ptp_tx_work(struct work_struct *work)
        if (!test_bit(__IGC_PTP_TX_IN_PROGRESS, &adapter->state))
                return;
 
-       if (time_is_before_jiffies(adapter->ptp_tx_start +
-                                  IGC_PTP_TX_TIMEOUT)) {
-               igc_ptp_tx_timeout(adapter);
-               return;
-       }
-
        tsynctxctl = rd32(IGC_TSYNCTXCTL);
        if (WARN_ON_ONCE(!(tsynctxctl & IGC_TSYNCTXCTL_TXTT_0)))
                return;