projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
vlan: Don't check for vlan group before vlan_tx_tag_present.
[deliverable/linux.git]
/
drivers
/
net
/
ixgbevf
/
ixgbevf_main.c
diff --git
a/drivers/net/ixgbevf/ixgbevf_main.c
b/drivers/net/ixgbevf/ixgbevf_main.c
index 78bfbe42ca9b9cb6a4f6aa3114188b6868b3de64..dc03c9652389692982dbcff1be6693c5d76e2f6b 100644
(file)
--- a/
drivers/net/ixgbevf/ixgbevf_main.c
+++ b/
drivers/net/ixgbevf/ixgbevf_main.c
@@
-3134,7
+3134,7
@@
static int ixgbevf_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
tx_ring = &adapter->tx_ring[r_idx];
- if (
adapter->vlgrp &&
vlan_tx_tag_present(skb)) {
+ if (vlan_tx_tag_present(skb)) {
tx_flags |= vlan_tx_tag_get(skb);
tx_flags <<= IXGBE_TX_FLAGS_VLAN_SHIFT;
tx_flags |= IXGBE_TX_FLAGS_VLAN;
This page took
0.028607 seconds
and
5
git commands to generate.