1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 21109b59fcfc..1232e9164bf1 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -834,6 +834,7 @@ static netdev_tx_t be_xmit(struct sk_buff *skb,
         u32 start = txq->head, eth_hdr_len;
         bool dummy_wrb, stopped = false;
         bool skip_hw_vlan = false;
+        struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data;
 
         eth_hdr_len = ntohs(skb->protocol) == ETH_P_8021Q ?
                 VLAN_ETH_HLEN : ETH_HLEN;
@@ -846,6 +847,13 @@ static netdev_tx_t be_xmit(struct sk_buff *skb,
                 pskb_trim(skb, eth_hdr_len + ntohs(ip->tot_len));
         }
 
+        /* If vlan tag is already inlined in the packet, skip HW VLAN
+         * tagging in UMC mode
+         */
+        if ((adapter->function_mode & UMC_ENABLED) &&
+            veh->h_vlan_proto == htons(ETH_P_8021Q))
+                        skip_hw_vlan = true;
+
         /* HW has a bug wherein it will calculate CSUM for VLAN
          * pkts even though it is disabled.
          * Manually insert VLAN in pkt.