From patchwork Sun Jun 19 13:31:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Cochran X-Patchwork-Id: 100963 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 89420B7033 for ; Sun, 19 Jun 2011 23:32:13 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753977Ab1FSNcH (ORCPT ); Sun, 19 Jun 2011 09:32:07 -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 S1753877Ab1FSNcF (ORCPT ); Sun, 19 Jun 2011 09:32:05 -0400 Received: by mail-fx0-f46.google.com with SMTP id 17so477619fxm.19 for ; Sun, 19 Jun 2011 06:32:04 -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=070yFGg2cB5eW0ROgBNpsw42yfVwWjr2+1dRRqFMKcI=; b=MppeD9VhNIJ032+8omoYiNf2VyQj+jVjvQk9cdE8C4Iwra3x9pI/6+8L85Vy4aNZO1 KxO9AYaIWJIpAzzK9B01cj5AT8RRNxVVrlGdkj+iAkRlgI7oOnsxWreUnCoCi5RQ4PJo RYM0YvSgL81vapC13tpySF8+ddspPLJxPjLGU= 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=hY9wuaNdJ1xzNcpAwmnn1k6vDLwW0+nduQTpGE1/nwI8uxLRWp6BMGU7cL412CHPx+ xqq6pa7NdGxPeyXHNh93ImUYKjGBfAVM6cXfD8dOcPEayTiU5b4INwb7qDfKutBI27+B zkFyVQR30Rgo5yR9eut7KA4qZoEK+TQSwzN64= Received: by 10.223.13.207 with SMTP id d15mr80457faa.38.1308490324804; Sun, 19 Jun 2011 06:32:04 -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.59 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 19 Jun 2011 06:32:03 -0700 (PDT) From: Richard Cochran To: Cc: David Miller , Eric Dumazet Subject: [PATCH 4/7] r6040: fix race in transmit time stamping. Date: Sun, 19 Jun 2011 15:31:42 +0200 Message-Id: <9e41f2b592070feccdf5300d34ac21fde5085ba2.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/r6040.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 5ee5f8f..00f06e9 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c @@ -836,6 +836,9 @@ static netdev_tx_t r6040_start_xmit(struct sk_buff *skb, descptr->buf = cpu_to_le32(pci_map_single(lp->pdev, skb->data, skb->len, PCI_DMA_TODEVICE)); descptr->status = DSC_OWNER_MAC; + + skb_tx_timestamp(skb); + /* Trigger the MAC to check the TX descriptor */ iowrite16(0x01, ioaddr + MTPR); lp->tx_insert_ptr = descptr->vndescp; @@ -846,8 +849,6 @@ static netdev_tx_t r6040_start_xmit(struct sk_buff *skb, spin_unlock_irqrestore(&lp->lock, flags); - skb_tx_timestamp(skb); - return NETDEV_TX_OK; }