fm10k: report the receive timestamp in FM10K_CB(skb)->tstamp

This was accidentally removed when we defeatured the full 1588 Clock
support. We need to report the Rx descriptor timestamp value so that
applications built on top of the IES API can function properly.

Additionally, remove the FM10K_FLAG_RX_TS_ENABLED, as it is not used now
that 1588 functionality has been removed.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h
index 4d19e46f7c5573857327d280f97a352985583bea..75d2c8018815f378ac2c64ede197afb2d7ad2555 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k.h
+++ b/drivers/net/ethernet/intel/fm10k/fm10k.h
@@ -260,9 +260,8 @@ struct fm10k_intfc {
 #define FM10K_FLAG_RESET_REQUESTED             (u32)(BIT(0))
 #define FM10K_FLAG_RSS_FIELD_IPV4_UDP          (u32)(BIT(1))
 #define FM10K_FLAG_RSS_FIELD_IPV6_UDP          (u32)(BIT(2))
-#define FM10K_FLAG_RX_TS_ENABLED               (u32)(BIT(3))
-#define FM10K_FLAG_SWPRI_CONFIG                        (u32)(BIT(4))
-#define FM10K_FLAG_DEBUG_STATS                 (u32)(BIT(5))
+#define FM10K_FLAG_SWPRI_CONFIG                        (u32)(BIT(3))
+#define FM10K_FLAG_DEBUG_STATS                 (u32)(BIT(4))
        int xcast_mode;
 
        /* Tx fast path data */

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index 8f90c6db53ff9327a76f88cf9992294b7a00280e..5bb233a9614c1cc172d87a7f40bc68003f4af673 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -475,6 +475,8 @@ static unsigned int fm10k_process_skb_fields(struct fm10k_ring *rx_ring,
 
        fm10k_rx_checksum(rx_ring, rx_desc, skb);
 
+       FM10K_CB(skb)->tstamp = rx_desc->q.timestamp;
+
        FM10K_CB(skb)->fi.w.vlan = rx_desc->w.vlan;
 
        skb_record_rx_queue(skb, rx_ring->queue_index);