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
/
amd8111e.c
diff --git
a/drivers/net/amd8111e.c
b/drivers/net/amd8111e.c
index 58a0ab4923ee64013886fc056a1e63c0fa1192f5..2ca880b4c0dbea4499b681c55a4f46d8331caadb 100644
(file)
--- a/
drivers/net/amd8111e.c
+++ b/
drivers/net/amd8111e.c
@@
-1315,7
+1315,7
@@
static netdev_tx_t amd8111e_start_xmit(struct sk_buff *skb,
lp->tx_ring[tx_index].tx_flags = 0;
#if AMD8111E_VLAN_TAG_USED
lp->tx_ring[tx_index].tx_flags = 0;
#if AMD8111E_VLAN_TAG_USED
- if
((lp->vlgrp != NULL) && vlan_tx_tag_present(skb))
{
+ if
(vlan_tx_tag_present(skb))
{
lp->tx_ring[tx_index].tag_ctrl_cmd |=
cpu_to_le16(TCC_VLAN_INSERT);
lp->tx_ring[tx_index].tag_ctrl_info =
lp->tx_ring[tx_index].tag_ctrl_cmd |=
cpu_to_le16(TCC_VLAN_INSERT);
lp->tx_ring[tx_index].tag_ctrl_info =
This page took
0.024852 seconds
and
5
git commands to generate.