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, 3 insertions, 4 deletions

diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 4b59e53890b2..d5e796832fdd 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -430,7 +430,7 @@ static inline void wrb_fill(struct be_eth_wrb *wrb, u64 addr, int len)
 }
 
 static void wrb_fill_hdr(struct be_eth_hdr_wrb *hdr, struct sk_buff *skb,
-                bool vlan, u32 wrb_cnt, u32 len)
+                u32 wrb_cnt, u32 len)
 {
         memset(hdr, 0, sizeof(*hdr));
 
@@ -449,7 +449,7 @@ static void wrb_fill_hdr(struct be_eth_hdr_wrb *hdr, struct sk_buff *skb,
                         AMAP_SET_BITS(struct amap_eth_hdr_wrb, udpcs, hdr, 1);
         }
 
-        if (vlan && vlan_tx_tag_present(skb)) {
+        if (vlan_tx_tag_present(skb)) {
                 AMAP_SET_BITS(struct amap_eth_hdr_wrb, vlan, hdr, 1);
                 AMAP_SET_BITS(struct amap_eth_hdr_wrb, vlan_tag,
                         hdr, vlan_tx_tag_get(skb));
@@ -532,8 +532,7 @@ static int make_tx_wrbs(struct be_adapter *adapter,
                 queue_head_inc(txq);
         }
 
-        wrb_fill_hdr(hdr, first_skb, adapter->vlan_grp ? true : false,
-                wrb_cnt, copied);
+        wrb_fill_hdr(hdr, first_skb, wrb_cnt, copied);
         be_dws_cpu_to_le(hdr, sizeof(*hdr));
 
         return copied;