cxgb4: offload VLAN flows regardless of VLAN ethtype

[mirror_ubuntu-bionic-kernel.git] / drivers / net / ethernet / chelsio / cxgb4 / cxgb4_tc_flower.c

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
index a452d5a1b0f3fb4c602793679b1e80295ea13e29..aa66b0fbe6c180f111aec490892eb98c7fe7797c 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
@@ -211,6 +211,9 @@ static void cxgb4_process_flow_match(struct net_device *dev,
                fs->val.ivlan = vlan_tci;
                fs->mask.ivlan = vlan_tci_mask;
 
+               fs->val.ivlan_vld = 1;
+               fs->mask.ivlan_vld = 1;
+
                /* Chelsio adapters use ivlan_vld bit to match vlan packets
                 * as 802.1Q. Also, when vlan tag is present in packets,
                 * ethtype match is used then to match on ethtype of inner
@@ -221,8 +224,6 @@ static void cxgb4_process_flow_match(struct net_device *dev,
                 * ethtype value with ethtype of inner header.
                 */
                if (fs->val.ethtype == ETH_P_8021Q) {
-                       fs->val.ivlan_vld = 1;
-                       fs->mask.ivlan_vld = 1;
                        fs->val.ethtype = 0;
                        fs->mask.ethtype = 0;
                }