aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/mlx4
diff options
context:
space:
mode:
authorJesse Gross <jesse@nicira.com>2010-10-20 09:56:03 -0400
committerDavid S. Miller <davem@davemloft.net>2010-10-21 04:26:52 -0400
commiteab6d18d20fc5b5ba04a7e7fcd6f357197870e51 (patch)
tree8a52538666747998dd16bc68a2102b05ebfe6873 /drivers/net/mlx4
parentb738127dfb469bb9f595cdace30e7f881e8146b2 (diff)
vlan: Don't check for vlan group before vlan_tx_tag_present.
Many (but not all) drivers check to see whether there is a vlan group configured before using a tag stored in the skb. There's not much point in this check since it just throws away data that should only be present in the expected circumstances. However, it will soon be legal and expected to get a vlan tag when no vlan group is configured, so remove this check from all drivers to avoid dropping the tags. Signed-off-by: Jesse Gross <jesse@nicira.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/mlx4')
-rw-r--r--drivers/net/mlx4/en_tx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/mlx4/en_tx.c
index 98dd620042a8..a680cd4a5ab6 100644
--- a/drivers/net/mlx4/en_tx.c
+++ b/drivers/net/mlx4/en_tx.c
@@ -583,7 +583,7 @@ u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb)
583 /* If we support per priority flow control and the packet contains 583 /* If we support per priority flow control and the packet contains
584 * a vlan tag, send the packet to the TX ring assigned to that priority 584 * a vlan tag, send the packet to the TX ring assigned to that priority
585 */ 585 */
586 if (priv->prof->rx_ppp && priv->vlgrp && vlan_tx_tag_present(skb)) { 586 if (priv->prof->rx_ppp && vlan_tx_tag_present(skb)) {
587 vlan_tag = vlan_tx_tag_get(skb); 587 vlan_tag = vlan_tx_tag_get(skb);
588 return MLX4_EN_NUM_TX_RINGS + (vlan_tag >> 13); 588 return MLX4_EN_NUM_TX_RINGS + (vlan_tag >> 13);
589 } 589 }
@@ -634,7 +634,7 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
634 634
635 tx_ind = skb->queue_mapping; 635 tx_ind = skb->queue_mapping;
636 ring = &priv->tx_ring[tx_ind]; 636 ring = &priv->tx_ring[tx_ind];
637 if (priv->vlgrp && vlan_tx_tag_present(skb)) 637 if (vlan_tx_tag_present(skb))
638 vlan_tag = vlan_tx_tag_get(skb); 638 vlan_tag = vlan_tx_tag_get(skb);
639 639
640 /* Check available TXBBs And 2K spare for prefetch */ 640 /* Check available TXBBs And 2K spare for prefetch */