[net-next 12/15] i40e: remove Tx work for ptp

STALE4512d SUPERSEDED: 1 (0M)

From: Jeff Kirsher <hidden>
Date: 2014-05-21 12:01:44
Subsystem: intel ethernet drivers, networking drivers, the rest · Maintainers: Tony Nguyen, Przemek Kitszel, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds

Revision v1 of 84 in this series; 1 review trailer.

Revisions (84)

2011-02-08 v1
2011-02-11 v2 [diff vs current]
2011-03-03 v1
2011-03-08 v1
2011-03-12 v1
2011-09-17 v1
2011-10-07 v1
2012-01-26 v1
2012-02-13 v1
2012-02-24 v1
2012-03-13 v1
2012-03-17 v1
2012-05-10 v1
2012-07-21 v1
2012-08-23 v1
2012-10-19 v1
2012-10-20 v1
2012-10-23 v1
2012-10-26 v1
2012-10-27 v2 [diff vs current]
2012-10-30 v1
2013-01-11 v1
2013-01-16 v2 [diff vs current]
2013-01-17 v1
2013-01-18 v2 [diff vs current]
2013-01-23 v1
2013-01-28 v1
2013-03-08 v1
2013-03-28 v1
2013-04-04 v1
2013-04-18 v1
2013-04-20 v1
2013-04-25 v2 [diff vs current]
2013-05-21 v1
2013-07-28 v1
2013-07-29 v1
2013-07-31 v2 [diff vs current]
2013-08-21 v1
2013-08-22 v2 [diff vs current]
2013-10-10 v1
2013-10-18 v1
2013-10-22 v2 [diff vs current]
2013-12-06 v1
2013-12-07 v1
2013-12-10 v1
2013-12-12 v1
2013-12-16 v2 [diff vs current]
2013-12-18 v1
2013-12-19 v1
2013-12-20 v2 [diff vs current]
2013-12-20 v3 [diff vs current]
2013-12-28 v4 [diff vs current]
2014-01-04 v5 [diff vs current]
2014-01-05 v1
2014-01-06 v1
2014-01-07 v1
2014-01-08 v2 [diff vs current]
2014-01-09 v1
2014-01-10 v1
2014-01-10 v2 [diff vs current]
2014-01-11 v3 [diff vs current]
2014-03-06 v1
2014-03-07 v2 [diff vs current]
2014-03-08 v1
2014-03-12 v1
2014-03-14 v1
2014-03-14 v2 [diff vs current]
2014-03-17 v1
2014-03-19 v2 [diff vs current]
2014-03-20 v3 [diff vs current]
2014-03-20 v1
2014-03-21 v1
2014-03-26 v1
2014-03-28 v2 [diff vs current]
2014-03-31 v1
2014-04-11 v1
2014-04-22 v1
2014-04-23 v1
2014-04-24 v1
2014-04-25 v2 [diff vs current]
2014-04-28 v1
2014-05-21 v1 current
2014-05-27 v1
2014-05-29 v1

From: Jesse Brandeburg <redacted>

The previous removal of the PTP Tx work functionality was
incomplete as noted by Jake Keller. This removal allows
us to rely on the Tx timesync interrupt.

CC: Jacob Keller <jacob.e.keller@intel.com>
Change-ID: Id4faaf275a3688053ebbf07bef08072f9fd11aa9
Signed-off-by: Jesse Brandeburg <redacted>
Tested-by: Kavindya Deegala <redacted>
Signed-off-by: Jeff Kirsher <redacted>
---
 drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 1 -
 drivers/net/ethernet/intel/i40e/i40e_ptp.c     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 7f3d342..861e1db 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c

@@ -112,7 +112,6 @@ static struct i40e_stats i40e_gstrings_stats[] = {
 	I40E_PF_STAT("rx_oversize", stats.rx_oversize),
 	I40E_PF_STAT("rx_jabber", stats.rx_jabber),
 	I40E_PF_STAT("VF_admin_queue_requests", vf_aq_requests),
-	I40E_PF_STAT("tx_hwtstamp_timeouts", tx_hwtstamp_timeouts),
 	I40E_PF_STAT("rx_hwtstamp_cleared", rx_hwtstamp_cleared),
 	/* LPI stats */
 	I40E_PF_STAT("tx_lpi_status", stats.tx_lpi_status),

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
index 1fedc7a..101f439 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c

@@ -48,7 +48,6 @@
 					I40E_PRTTSYN_CTL1_TSYNTYPE_SHIFT)
 #define I40E_PRTTSYN_CTL1_TSYNTYPE_V2  (0x2 << \
 					I40E_PRTTSYN_CTL1_TSYNTYPE_SHIFT)
-#define I40E_PTP_TX_TIMEOUT  (HZ * 15)
 
 /**
  * i40e_ptp_read - Read the PHC time from the device

-- 
1.9.0

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help