net: bcmgenet: Remove duplicate test for tx_coalesce_usecs_high
authorFlorian Fainelli <f.fainelli@gmail.com>
Fri, 18 Sep 2015 21:16:53 +0000 (14:16 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 21 Sep 2015 23:26:12 +0000 (16:26 -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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/genet/bcmgenet.c

index 1e72722..efcb111 100644 (file)
@@ -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