net: bcmgenet: remove bogus tx queue checks
authorFlorian Fainelli <f.fainelli@gmail.com>
Thu, 20 Mar 2014 17:53:22 +0000 (10:53 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Mar 2014 21:36:12 +0000 (17:36 -0400)
netdev_pick_tx already takes care of making sure that a given
skb->queue_mapping value will remain within the number of advertised
hardware queue number, there is no need to re-do this again in the
driver.

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 0a9f6df819bb2591511e76929fa5d0d05bb90ace..cfcb046f4de5a9b5272b485dba8d9b5765ddfa8c 100644 (file)
@@ -1125,14 +1125,6 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)
        else
                index -= 1;
 
-       if ((index != DESC_INDEX) && (index > priv->hw_params->tx_queues - 1)) {
-               netdev_err(dev, "%s: queue_mapping %d is invalid\n",
-                               __func__, skb_get_queue_mapping(skb));
-               dev->stats.tx_errors++;
-               dev->stats.tx_dropped++;
-               ret = NETDEV_TX_OK;
-               goto out;
-       }
        nr_frags = skb_shinfo(skb)->nr_frags;
        ring = &priv->tx_rings[index];