From patchwork Thu Oct 4 18:14:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 189234 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 2621E2C03CB for ; Fri, 5 Oct 2012 04:16:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755238Ab2JDSQo (ORCPT ); Thu, 4 Oct 2012 14:16:44 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:59018 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753384Ab2JDSPQ (ORCPT ); Thu, 4 Oct 2012 14:15:16 -0400 Received: by mail-we0-f174.google.com with SMTP id t9so510561wey.19 for ; Thu, 04 Oct 2012 11:15:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=qT2qkUpRfqP0grhn5/1t4wuPl85sTBHxLTZKQTS7RQQ=; b=Ork5BfYApuLB+XetxBhxGUL2YsOjWHdo8zG39O0Z9kUrE+uwWY9OxuXqt5hSv6sLoH K6oNdO9nB0HN87zXeLRPjaLVNcme9if9DgrBYb5huxV/qbWZkfqpBVt+SFWWSSYEVhYQ 4Vtd/pLkaMAqQi1+8+PmqP5ea6rGuwchZ5FaYy25e3YnOUaeL4mHde0QWLE12AuKIOJZ /ymy/1zKmAB88Jm/AvIb/Vt3Iq1P+I76rrf0EKG8jrBoa8USEO3IsidVnQRGc3/lsv5s 4kny/vcrupn7C7uFPMq2S/+fkVidm+EdAf6OMPUcr65NZvzJEXQ5lsgvcE9raxbl92EQ RT9w== Received: by 10.180.79.34 with SMTP id g2mr14646864wix.19.1349374515798; Thu, 04 Oct 2012 11:15:15 -0700 (PDT) Received: from localhost (nat-2.starnet.cz. [92.62.224.2]) by mx.google.com with ESMTPS id cn6sm16007859wib.9.2012.10.04.11.15.15 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 04 Oct 2012 11:15:15 -0700 (PDT) From: Michal Simek To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Michal Simek , Anirudha Sarangi , John Linn , Grant Likely , Rob Herring , "David S. Miller" Subject: [PATCH 09/11] net: ll_temac: Move frag loading to frag loop Date: Thu, 4 Oct 2012 20:14:55 +0200 Message-Id: <1349374497-9540-9-git-send-email-monstr@monstr.eu> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1349374497-9540-1-git-send-email-monstr@monstr.eu> References: <1349374497-9540-1-git-send-email-monstr@monstr.eu> X-Gm-Message-State: ALoCoQlmrMlAJhGHrqzCZmVWhMesQxemWkhl4t1VlPLFmU5RPVCOGwGd0693f485OyX+DHMAMmiR Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Load frag value when necessary. Signed-off-by: Michal Simek CC: Anirudha Sarangi CC: John Linn CC: Grant Likely CC: Rob Herring CC: David S. Miller --- drivers/net/ethernet/xilinx/ll_temac_main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index 8bafa15..fec42d9 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c @@ -686,7 +686,6 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) skb_frag_t *frag; num_frag = skb_shinfo(skb)->nr_frags; - frag = &skb_shinfo(skb)->frags[0]; start_p = lp->tx_bd_p + sizeof(*lp->tx_bd_v) * lp->tx_bd_tail; cur_p = &lp->tx_bd_v[lp->tx_bd_tail]; @@ -715,6 +714,7 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) cur_p->app4 = (unsigned long)skb; for (ii = 0; ii < num_frag; ii++) { + frag = &skb_shinfo(skb)->frags[ii]; lp->tx_bd_tail++; if (lp->tx_bd_tail >= TX_BD_NUM) lp->tx_bd_tail = 0; @@ -725,7 +725,6 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) skb_frag_size(frag), DMA_TO_DEVICE); cur_p->len = skb_frag_size(frag); cur_p->app0 = 0; - frag++; } cur_p->app0 |= STS_CTRL_APP0_EOP;