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
/
e1000
/
e1000_main.c
diff --git
a/drivers/net/e1000/e1000_main.c
b/drivers/net/e1000/e1000_main.c
index 232ac2dcb4974bf6a99b086be598f647bd6332d2..a117f2a0252e8c884f6d890f912556924635cae9 100644
(file)
--- a/
drivers/net/e1000/e1000_main.c
+++ b/
drivers/net/e1000/e1000_main.c
@@
-3119,7
+3119,7
@@
static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
}
}
- if (unlikely(
adapter->vlgrp &&
vlan_tx_tag_present(skb))) {
+ if (unlikely(vlan_tx_tag_present(skb))) {
tx_flags |= E1000_TX_FLAGS_VLAN;
tx_flags |= (vlan_tx_tag_get(skb) << E1000_TX_FLAGS_VLAN_SHIFT);
}
This page took
0.039034 seconds
and
5
git commands to generate.