From patchwork Fri Mar 14 17:34:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 330407 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 70D802C00BB for ; Sat, 15 Mar 2014 04:42:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755203AbaCNRmR (ORCPT ); Fri, 14 Mar 2014 13:42:17 -0400 Received: from mx3.wp.pl ([212.77.101.9]:19128 "EHLO mx3.wp.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754996AbaCNRmE (ORCPT ); Fri, 14 Mar 2014 13:42:04 -0400 Received: (wp-smtpd smtp.wp.pl 18729 invoked from network); 14 Mar 2014 18:35:21 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wp.pl; s=1024a; t=1394818522; bh=51tVWcw3xvfujPaaRH5XF0Qo7bF3AI2oxggIRg98Hhg=; h=From:To:Cc:Subject; b=VsSxfSCeGkF0o2v2MligyBYWUK551zAWxLlMB7AlL94vt2E6q1YBq6Lwg0FzYI+Vo BcTabei1h8/m8tKX9oseKWw2xiZzrgG4U1D0VnvszgCEOV9egdUjiCSYHxL/vfeVf7 nAfbFKeKcv3EqRqSpPhww56D8CLRMRRGyzWRYuFk= Received: from 89-69-164-220.dynamic.chello.pl (HELO smtp.wp.pl) (kubakici@[89.69.164.220]) (envelope-sender ) by smtp.wp.pl (WP-SMTPD) with SMTP for ; 14 Mar 2014 18:35:21 +0100 Received: by smtp.wp.pl (sSMTP sendmail emulation); Fri, 14 Mar 2014 18:35:20 +0100 From: Jakub Kicinski To: Jeff Kirsher Cc: Jakub Kicinski , netdev@vger.kernel.org, e1000-devel@lists.sourceforge.net Subject: [PATCH net-next 05/10] ixgbe: never generate both software and hardware timestamps Date: Fri, 14 Mar 2014 18:34:36 +0100 Message-Id: <1394818481-7652-6-git-send-email-kubakici@wp.pl> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1394818481-7652-1-git-send-email-kubakici@wp.pl> References: <1394818481-7652-1-git-send-email-kubakici@wp.pl> X-WP-DKIM-Status: good (id: wp.pl) X-WP-AV: skaner antywirusowy poczty Wirtualnej Polski S. A. X-WP-SPAM: NO 0000000 [0fPk] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 851c413..f6ac11c 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -7031,8 +7031,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; @@ -7043,6 +7041,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