From patchwork Thu Jan 28 21:25:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 8154561 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0D131BEEE5 for ; Thu, 28 Jan 2016 21:58:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3DCAC2021B for ; Thu, 28 Jan 2016 21:58:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7829A20218 for ; Thu, 28 Jan 2016 21:58:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aOuYe-00023K-IR; Thu, 28 Jan 2016 21:56:52 +0000 Received: from mail-pa0-x22a.google.com ([2607:f8b0:400e:c03::22a]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aOu7r-000620-0U for linux-arm-kernel@lists.infradead.org; Thu, 28 Jan 2016 21:29:12 +0000 Received: by mail-pa0-x22a.google.com with SMTP id uo6so29723076pac.1 for ; Thu, 28 Jan 2016 13:28:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LIKuVkbkin7dIQ3kJ1hFaPtf/q6fENJxGrKbSWcLlug=; b=sQKP93wHr1IZfTR0HySB2EMZDPTm9rssOlUY8EmKDTAQlxOarWKed+TBo1kRL0AB2k wQcMRkK5D2H6AGTTufCAv+yNDMG5KvOl6q1kLeWCXEdjZ5ndIZd31FLGLma/FXvB8Hku 7k9Ek5TmPXI6nDLkd5ULhkLzBR+Or6FB1c6c3iyhG+W1AfJHzZIbZz84TbDmUKa/s7aW R4HUaU+QDfIyxaK0gQPzcihBPrYBzzdLtUu2VnE2xNVLGbHCgBh5Dug8xs0mb365ud8P tpo8/PKRmc1M/kKuc90mRisX10PwtvKx3bvr1dL4ab7qczwzibHGso1KHprdgm86gmsl 9mEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LIKuVkbkin7dIQ3kJ1hFaPtf/q6fENJxGrKbSWcLlug=; b=OeysCbij8qW6V122LTPdpC3a6ttY7s01NBpHto8eOKjpFDqHinY2AiqtU8OCPWmavK O9IwGE80ic4JUfG2c6D60xALcL5G99MJic9N2g6kXNXivDYtZIMu/kyX7lBhzsTXuIV+ NM1UwwbUdf8egunX0NI2W71j5S/S04/DRSnQxzzgUB1/E5C8viQWBx5K9aqrlT2Tjtqf KO/VAa5w6i2qWfqGEmLaX9PCJyzrOXMB1HWT1FnaUve6fxzlZjOX/KbbG+BEJpR6QD/c rtO4xRw+8rs8REwm2DAqwGxXV7GeGldkmiqbVIuR1+i7kB+4W/VSV4JnX81G/typusqx dYcg== X-Gm-Message-State: AG10YOQ3qHeuqZkOg/27nX4WgYGo89SHcRUfw6N0mhorLmLTsmRzkZYwi8b1BP52vPpNoA== X-Received: by 10.66.191.195 with SMTP id ha3mr8065068pac.58.1454016532621; Thu, 28 Jan 2016 13:28:52 -0800 (PST) Received: from localhost.localdomain (wsip-70-184-93-199.ph.ph.cox.net. [70.184.93.199]) by smtp.googlemail.com with ESMTPSA id c90sm18583190pfd.31.2016.01.28.13.28.50 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 28 Jan 2016 13:28:51 -0800 (PST) From: Troy Kisky To: netdev@vger.kernel.org, davem@davemloft.net, B38611@freescale.com Subject: [PATCH net-next 26/40] net: fec: set cbd_esc only once Date: Thu, 28 Jan 2016 14:25:50 -0700 Message-Id: <1454016364-30985-27-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1454016364-30985-1-git-send-email-troy.kisky@boundarydevices.com> References: <1454016364-30985-1-git-send-email-troy.kisky@boundarydevices.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160128_132911_266235_2CA220B5 X-CRM114-Status: UNSURE ( 9.80 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fabio.estevam@freescale.com, andrew@lunn.ch, linux@arm.linux.org.uk, Troy Kisky , laci@boundarydevices.com, l.stach@pengutronix.de, shawnguo@kernel.org, linux-arm-kernel@lists.infradead.org, tremyfr@gmail.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Troy Kisky --- drivers/net/ethernet/freescale/fec_main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 380c8e2..cf53e21 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -569,6 +569,8 @@ fec_enet_txq_put_data_tso(struct fec_enet_priv_tx_q *txq, struct sk_buff *skb, estatus |= FEC_TX_BD_FTYPE(txq->bd.qid); if (skb->ip_summed == CHECKSUM_PARTIAL) estatus |= BD_ENET_TX_PINS | BD_ENET_TX_IINS; + if (is_last) + estatus |= BD_ENET_TX_INT; ebdp->cbd_bdu = 0; ebdp->cbd_esc = estatus; } @@ -576,12 +578,8 @@ fec_enet_txq_put_data_tso(struct fec_enet_priv_tx_q *txq, struct sk_buff *skb, /* Handle the last BD specially */ if (last_tcp) status |= (BD_ENET_TX_LAST | BD_ENET_TX_TC); - if (is_last) { + if (is_last) status |= BD_ENET_TX_INTR; - if (fep->bufdesc_ex) - ebdp->cbd_esc |= BD_ENET_TX_INT; - } - bdp->cbd_sc = status; return 0;