From patchwork Thu Jul 8 19:21:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 58271 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 2C555B6F04 for ; Fri, 9 Jul 2010 05:20:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757106Ab0GHTUs (ORCPT ); Thu, 8 Jul 2010 15:20:48 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:43051 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755887Ab0GHTUr (ORCPT ); Thu, 8 Jul 2010 15:20:47 -0400 Received: by pvc7 with SMTP id 7so448144pvc.19 for ; Thu, 08 Jul 2010 12:20:47 -0700 (PDT) Received: by 10.142.133.20 with SMTP id g20mr10435977wfd.3.1278616847200; Thu, 08 Jul 2010 12:20:47 -0700 (PDT) Received: from arkham.kudzu.us (cpe-72-177-2-76.austin.res.rr.com [72.177.2.76]) by mx.google.com with ESMTPS id v38sm1414wfh.12.2010.07.08.12.20.44 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 08 Jul 2010 12:20:46 -0700 (PDT) Received: by arkham.kudzu.us (sSMTP sendmail emulation); Thu, 08 Jul 2010 14:21:26 -0500 Date: Thu, 8 Jul 2010 14:21:26 -0500 From: Jon Mason To: David Miller Cc: netdev@vger.kernel.org, Sreenivasa Honnur , Ramkrishna Vepa Subject: [PATCH 2/6 net-next-2.6] vxge: Use fifo based trans_start time Message-ID: <20100708192125.GB15167@exar.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use the fifo based netdev_queue->trans_start time in vxge_xmit, instead of the device based netdev->trans_start time. Signed-off-by: Jon Mason Signed-off-by: Sreenivasa Honnur Signed-off-by: Ramkrishna Vepa --- drivers/net/vxge/vxge-main.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c index e78703d..b8eed71 100644 --- a/drivers/net/vxge/vxge-main.c +++ b/drivers/net/vxge/vxge-main.c @@ -802,6 +802,7 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev) unsigned long flags = 0; int vpath_no = 0; int do_spin_tx_lock = 1; + struct netdev_queue *txq; vxge_debug_entryexit(VXGE_TRACE, "%s: %s:%d", dev->name, __func__, __LINE__); @@ -968,8 +969,10 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev) VXGE_HW_FIFO_TXD_TX_CKO_UDP_EN); vxge_hw_fifo_txdl_post(fifo_hw, dtr); + #ifdef NETIF_F_LLTX - dev->trans_start = jiffies; /* NETIF_F_LLTX driver :( */ + txq = netdev_get_tx_queue(dev, vpath_no); + txq->trans_start = jiffies; #endif spin_unlock_irqrestore(&fifo->tx_lock, flags);