aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJohn Fastabend <john.r.fastabend@intel.com>2010-05-18 12:00:11 -0400
committerDavid S. Miller <davem@davemloft.net>2010-05-18 22:44:20 -0400
commit33c66bd10fb0c07ba05a7b55b8ad0cd41cb0e68a (patch)
tree25c20db32e03dd97450eacef43ac341344fbe3e2 /drivers/net
parent7483d9ddaf8a68a055bf3f14b5cff2e16c0469ff (diff)
ixgbe: dcb, do not tag tc_prio_control frames
The network stack indicate packets should not be DCB tagged by setting the priority to TC_PRIO_CONTROL. One usage for this is lldp frames which are not suppossed to be tagged. Signed-off-by: John Fastabend <john.r.fastabend@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index d80bb1a77ecb..caf1114960ef 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -6075,7 +6075,8 @@ static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb,
6075 } 6075 }
6076 tx_flags <<= IXGBE_TX_FLAGS_VLAN_SHIFT; 6076 tx_flags <<= IXGBE_TX_FLAGS_VLAN_SHIFT;
6077 tx_flags |= IXGBE_TX_FLAGS_VLAN; 6077 tx_flags |= IXGBE_TX_FLAGS_VLAN;
6078 } else if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) { 6078 } else if (adapter->flags & IXGBE_FLAG_DCB_ENABLED &&
6079 skb->priority != TC_PRIO_CONTROL) {
6079 tx_flags |= ((skb->queue_mapping & 0x7) << 13); 6080 tx_flags |= ((skb->queue_mapping & 0x7) << 13);
6080 tx_flags <<= IXGBE_TX_FLAGS_VLAN_SHIFT; 6081 tx_flags <<= IXGBE_TX_FLAGS_VLAN_SHIFT;
6081 tx_flags |= IXGBE_TX_FLAGS_VLAN; 6082 tx_flags |= IXGBE_TX_FLAGS_VLAN;