net/ice: fix vlan filter Tx issue

Message ID 20190114133530.137015-1-qiming.yang@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series net/ice: fix vlan filter Tx issue |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Qiming Yang Jan. 14, 2019, 1:35 p.m. UTC
  This patch fixed Tx error and allowed untagged packets in
when vlan filter on.

Fixes: e0dcf94a0d7f ("net/ice: support VLAN ops")

Signed-off-by: Qiming Yang <qiming.yang@intel.com>
---
 drivers/net/ice/ice_ethdev.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
  

Comments

Qi Zhang Jan. 14, 2019, 12:14 p.m. UTC | #1
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Qiming Yang
> Sent: Monday, January 14, 2019 9:36 PM
> To: dev@dpdk.org
> Cc: Yang, Qiming <qiming.yang@intel.com>
> Subject: [dpdk-dev] [PATCH] net/ice: fix vlan filter Tx issue
> 
> This patch fixed Tx error and allowed untagged packets in when vlan filter on.
> 
> Fixes: e0dcf94a0d7f ("net/ice: support VLAN ops")
> 
> Signed-off-by: Qiming Yang <qiming.yang@intel.com>

Acked-by: Qi Zhang <qi.z.zhang@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
  

Patch

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 0a81e04..4672d12 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2183,14 +2183,20 @@  ice_vsi_config_vlan_filter(struct ice_vsi *vsi, bool on)
 	if (ret) {
 		PMD_DRV_LOG(INFO, "Update VSI failed to %s vlan rx pruning",
 			    on ? "enable" : "disable");
-		ret = -EINVAL;
+		return -EINVAL;
 	} else {
 		vsi->info.valid_sections |=
 			rte_cpu_to_le_16(ICE_AQ_VSI_PROP_SW_VALID |
 					 ICE_AQ_VSI_PROP_SECURITY_VALID);
 	}
 
-	return ret;
+	/* consist with other drivers, allow untagged packet when vlan filter on */
+	if (on)
+		ret = ice_add_vlan_filter(vsi, 0);
+	else
+		ret = ice_remove_vlan_filter(vsi, 0);
+
+	return 0;
 }
 
 static int