diff options
| author | Jesse Gross <jesse@nicira.com> | 2010-10-20 13:56:03 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-21 08:26:52 (GMT) |
| commit | eab6d18d20fc5b5ba04a7e7fcd6f357197870e51 (patch) | |
| tree | 8a52538666747998dd16bc68a2102b05ebfe6873 /drivers/net/r8169.c | |
| parent | b738127dfb469bb9f595cdace30e7f881e8146b2 (diff) | |
| download | linux-fsl-qoriq-eab6d18d20fc5b5ba04a7e7fcd6f357197870e51.tar.xz | |
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/r8169.c')
| -rw-r--r-- | drivers/net/r8169.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 1760533..242748b 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -1034,7 +1034,7 @@ static int rtl8169_set_rx_csum(struct net_device *dev, u32 data) static inline u32 rtl8169_tx_vlan_tag(struct rtl8169_private *tp, struct sk_buff *skb) { - return (tp->vlgrp && vlan_tx_tag_present(skb)) ? + return (vlan_tx_tag_present(skb)) ? TxVlanTag | swab16(vlan_tx_tag_get(skb)) : 0x00; } |