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>

1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index ddac63cefbaa..0fa1776563a3 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -2321,14 +2321,11 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb,
                          NV_TX2_CHECKSUM_L3 | NV_TX2_CHECKSUM_L4 : 0;
 
         /* vlan tag */
-        if (likely(!np->vlangrp)) {
+        if (vlan_tx_tag_present(skb))
+                start_tx->txvlan = cpu_to_le32(NV_TX3_VLAN_TAG_PRESENT |
+                                        vlan_tx_tag_get(skb));
+        else
                 start_tx->txvlan = 0;
-        } else {
-                if (vlan_tx_tag_present(skb))
-                        start_tx->txvlan = cpu_to_le32(NV_TX3_VLAN_TAG_PRESENT | vlan_tx_tag_get(skb));
-                else
-                        start_tx->txvlan = 0;
-        }
 
         spin_lock_irqsave(&np->lock, flags);