From patchwork Sun Jun 19 13:31:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Cochran X-Patchwork-Id: 100961 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 EE7BDB7033 for ; Sun, 19 Jun 2011 23:32:05 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753944Ab1FSNcA (ORCPT ); Sun, 19 Jun 2011 09:32:00 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:55555 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753727Ab1FSNb7 (ORCPT ); Sun, 19 Jun 2011 09:31:59 -0400 Received: by mail-fx0-f46.google.com with SMTP id 17so477619fxm.19 for ; Sun, 19 Jun 2011 06:31:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:in-reply-to:references; bh=hLtvhjeb8EaBqfAtllGUCNN0Mlun2q2ZxKwEwLwiobs=; b=wuXVnRJxIeudYQyKql3/TDAz9R2KBIQxyqDR0DKSqFhBy17PtJVDMX0Iv9Nkgpi5M+ GKqMAnMOvuN0aRzqEI5g6QLKurBFXdcrMNeJhYc4ESRfyWGS5vhX0m3Vdt4/N66OVw5X oKbM77W8M/di9x6Zcsfg/VY6QM4+6xUM2UDDA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=UjJnQrUbQ+vNCTSiO8/5WPxGI3Ca8ezZoQmIugIL1aA2myVmfwtIqjFr4FlwOtKc10 D7PhAmQQWkVc5/TVU1MdTD8kGI7Dp4ISM7Nn63xjB0ZDsADUsJmzefznFGVxH83Gezbo YKHAWXjcQkJqBb/CccwY1/0P1G3fAe69bG254= Received: by 10.223.144.139 with SMTP id z11mr4688515fau.98.1308490318900; Sun, 19 Jun 2011 06:31:58 -0700 (PDT) Received: from localhost.localdomain (vs162244.vserver.de [62.75.162.244]) by mx.google.com with ESMTPS id m5sm1671014fai.1.2011.06.19.06.31.54 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 19 Jun 2011 06:31:58 -0700 (PDT) From: Richard Cochran To: Cc: David Miller , Eric Dumazet Subject: [PATCH 3/7] tg3: fix race in transmit time stamping. Date: Sun, 19 Jun 2011 15:31:41 +0200 Message-Id: <3028b6650f99e6581e1afbf810dc7fcc4be6941e.1308489767.git.richard.cochran@omicron.at> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Richard Cochran --- drivers/net/tg3.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 743d997..34ea37d 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -6088,11 +6088,11 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) entry = NEXT_TX(tnapi->tx_prod); } + skb_tx_timestamp(skb); + /* Packets are ready, update Tx producer idx local and on card. */ tw32_tx_mbox(tnapi->prodmbox, entry); - skb_tx_timestamp(skb); - tnapi->tx_prod = entry; if (unlikely(tg3_tx_avail(tnapi) <= (MAX_SKB_FRAGS + 1))) { netif_tx_stop_queue(txq);