netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next] net: bcmgenet: Remove duplicate test for tx_coalesce_usecs_high
@ 2015-09-18 21:16 Florian Fainelli
  2015-09-21 23:26 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Florian Fainelli @ 2015-09-18 21:16 UTC (permalink / raw)
  To: netdev
  Cc: julia.lawall, kbuild-all, Florian Fainelli, davem, jaedon.shin,
	pgynther

We were checking twice for ec->tx_coalesce_usecs_high, remove the
duplicate test.

Reported-by: Julia Lawall <julia.lawall@lip6.fr>
Reported-by: kbuild-all@01.org
Fixes: 2f9130709d2c19 ("net: bcmgenet: Implement TX coalescing control knobs")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 1e72722abbf1..efcb1119076f 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -608,8 +608,7 @@ static int bcmgenet_set_coalesce(struct net_device *dev,
 	 * transmitted, or when the ring is emtpy.
 	 */
 	if (ec->tx_coalesce_usecs || ec->tx_coalesce_usecs_high ||
-	    ec->tx_coalesce_usecs_irq || ec->tx_coalesce_usecs_high ||
-	    ec->tx_coalesce_usecs_low)
+	    ec->tx_coalesce_usecs_irq || ec->tx_coalesce_usecs_low)
 		return -EOPNOTSUPP;
 
 	/* Program all TX queues with the same values, as there is no
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH net-next] net: bcmgenet: Remove duplicate test for tx_coalesce_usecs_high
  2015-09-18 21:16 [PATCH net-next] net: bcmgenet: Remove duplicate test for tx_coalesce_usecs_high Florian Fainelli
@ 2015-09-21 23:26 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-09-21 23:26 UTC (permalink / raw)
  To: f.fainelli; +Cc: netdev, julia.lawall, kbuild-all, jaedon.shin, pgynther

From: Florian Fainelli <f.fainelli@gmail.com>
Date: Fri, 18 Sep 2015 14:16:53 -0700

> We were checking twice for ec->tx_coalesce_usecs_high, remove the
> duplicate test.
> 
> Reported-by: Julia Lawall <julia.lawall@lip6.fr>
> Reported-by: kbuild-all@01.org
> Fixes: 2f9130709d2c19 ("net: bcmgenet: Implement TX coalescing control knobs")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Applied, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-09-21 23:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-18 21:16 [PATCH net-next] net: bcmgenet: Remove duplicate test for tx_coalesce_usecs_high Florian Fainelli
2015-09-21 23:26 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).