[PATCH net-next] net: bcmgenet: Remove duplicate test for tx_coalesce_usecs_high
From: Florian Fainelli <f.fainelli@gmail.com>
Date: 2015-09-18 21:17:01
Subsystems: broadcom genet ethernet driver, networking drivers, the rest
2 messages, 2 authors, 2015-09-21 · open the first message on its own page
From: Florian Fainelli <f.fainelli@gmail.com>
Date: 2015-09-18 21:17:01
We were checking twice for ec->tx_coalesce_usecs_high, remove the
duplicate test.
Reported-by: Julia Lawall <redacted>
Reported-by: <redacted>
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
From: David Miller <davem@davemloft.net>
Date: 2015-09-21 23:26:41
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 <redacted>
Reported-by: <redacted>
Fixes: 2f9130709d2c19 ("net: bcmgenet: Implement TX coalescing control knobs")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>Applied, thanks.