Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c9144e7 authored by Raju Rangoju's avatar Raju Rangoju Committed by Greg Kroah-Hartman
Browse files

cxgb4: offload VLAN flows regardless of VLAN ethtype 



[ Upstream commit b5730061d1056abf317caea823b94d6e12b5b4f6 ]

VLAN flows never get offloaded unless ivlan_vld is set in filter spec.
It's not compulsory for vlan_ethtype to be set.

So, always enable ivlan_vld bit for offloading VLAN flows regardless of
vlan_ethtype is set or not.

Fixes: ad9af3e0 (cxgb4: add tc flower match support for vlan)
Signed-off-by: default avatarRaju Rangoju <rajur@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3cde0a25

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c

+3 −2
Original line number Diff line number Diff line
@@ -228,6 +228,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
@@ -238,8 +241,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;

		}