Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5db29f0 authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

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: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 881571c1

drivers/net/ethernet/intel/fm10k/fm10k.h

+2 −3
Original line number Diff line number Diff line
@@ -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 */

drivers/net/ethernet/intel/fm10k/fm10k_main.c

+2 −0
Original line number Diff line number Diff line
@@ -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);