From patchwork Sun Jun 19 13:31:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Cochran X-Patchwork-Id: 100962 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 993F9B7035 for ; Sun, 19 Jun 2011 23:32:06 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753946Ab1FSNcD (ORCPT ); Sun, 19 Jun 2011 09:32:03 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:60328 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753877Ab1FSNcA (ORCPT ); Sun, 19 Jun 2011 09:32:00 -0400 Received: by fxm17 with SMTP id 17so477680fxm.19 for ; Sun, 19 Jun 2011 06:31:59 -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=TWKjmJAbDSeZT9e0cJVQuvOjjU4sVoREg+2vun57NVk=; b=PtAya9xNpizy3pxIVNeajOhNpxn9ryM3xH1Ilae3WB6aYSPwRvVAtxxBpEC0IxM6mY 9+eH4K50mPG36Mcqe6wSPfEW8+9bq7L5XjtHfCIzexbyjt2WZzvsYY0ECFCoyU/bq7YT A282tC14Dj6OJAeNHsNsPWrQibFYjdd0SL2vM= 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=kFJz4+d1eWjj8kLOXfuBLLOf6BnPXc6XcPP460wg33aA/AaJY0h1WZmNd/UL6F0r3U jwv/fUtM61xpsnH4eJOun2+SK0zeRCOBuXj1tpBatblYvLHU7nv3tiyUsJCOfTJdZoHB ri+M9o5bAhwnohM8xKaMCq/7TFVjBdxDqTpQU= Received: by 10.223.145.24 with SMTP id b24mr4640943fav.89.1308490314192; Sun, 19 Jun 2011 06:31:54 -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.49 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 19 Jun 2011 06:31:53 -0700 (PDT) From: Richard Cochran To: Cc: David Miller , Eric Dumazet Subject: [PATCH 2/7] fec: fix race in transmit time stamping. Date: Sun, 19 Jun 2011 15:31:40 +0200 Message-Id: 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/fec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 965fe90..7ae3f28 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -324,10 +324,10 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *ndev) fep->cur_tx = bdp; - spin_unlock_irqrestore(&fep->hw_lock, flags); - skb_tx_timestamp(skb); + spin_unlock_irqrestore(&fep->hw_lock, flags); + return NETDEV_TX_OK; }