Commit ff29a86e authored Mar 15, 2014 by Jakub Kicinski Committed by Jeff Kirsher Mar 31, 2014

ixgbe: never generate both software and hardware timestamps



skb_tx_timestamp() does not report software time stamp
if SKBTX_IN_PROGRESS is set. According to timestamping.txt
software time stamps are a fallback and should not be
generated if hardware time stamp is provided.

Move call to skb_tx_timestamp() after setting
SKBTX_IN_PROGRESS.

Signed-off-by: Jakub Kicinski <kubakici@wp.pl>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 181e7d5d

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -7042,8 +7042,6 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,
		tx_flags \|= IXGBE_TX_FLAGS_SW_VLAN;
		}

		skb_tx_timestamp(skb);

		if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
		skb_shinfo(skb)->tx_flags \|= SKBTX_IN_PROGRESS;
		tx_flags \|= IXGBE_TX_FLAGS_TSTAMP;
		@@ -7054,6 +7052,8 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,
		schedule_work(&adapter->ptp_tx_work);
		}

		skb_tx_timestamp(skb);

		#ifdef CONFIG_PCI_IOV
		/*
		* Use the l2switch_enable flag - would be false if the DMA