Skip to content

Commit

Permalink
net: bcmgenet: Remove duplicate test for tx_coalesce_usecs_high
Browse files Browse the repository at this point in the history
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: 2f91307 ("net: bcmgenet: Implement TX coalescing control knobs")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Florian Fainelli authored and David S. Miller committed Sep 21, 2015
1 parent f9b9958 commit 852bcaf
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/net/ethernet/broadcom/genet/bcmgenet.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 852bcaf

Please sign in to comment.