summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQi Zhang <qi.z.zhang@intel.com>2017-08-03 05:38:09 +0800
committerYuanhan Liu <yliu@fridaylinux.org>2017-08-29 14:55:38 +0800
commit88dc28f17582befcf173824ec0b98db4bcd2dd90 (patch)
tree062e8028261bd996095804d2448a3eaad31b84f5
parentde2ce6c722f158177b8bdce0481a1c5f0eefeab2 (diff)
downloaddpdk-stable-88dc28f17582befcf173824ec0b98db4bcd2dd90.zip
dpdk-stable-88dc28f17582befcf173824ec0b98db4bcd2dd90.tar.gz
dpdk-stable-88dc28f17582befcf173824ec0b98db4bcd2dd90.tar.xz
net/ixgbe: fix mask flag on flow rule creation
[ upstream commit d769655450ac31842b78837ddf9849a3aee707c6 ] After fail to create a flow and if this is the first flow, the mask_added flag should be reset, or it will prevent a new flow which require different mask be created, since the mask config remains impact. Fixes: 72c135a89f8 ("net/ixgbe: create consistent filter") Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
-rw-r--r--drivers/net/ixgbe/ixgbe_flow.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c
index 9aeb71e..3a5f979 100644
--- a/drivers/net/ixgbe/ixgbe_flow.c
+++ b/drivers/net/ixgbe/ixgbe_flow.c
@@ -2414,6 +2414,7 @@ ixgbe_flow_create(struct rte_eth_dev *dev,
struct ixgbe_eth_l2_tunnel_conf_ele *l2_tn_filter_ptr;
struct ixgbe_fdir_rule_ele *fdir_rule_ptr;
struct ixgbe_flow_mem *ixgbe_flow_mem_ptr;
+ uint8_t first_mask = FALSE;
flow = rte_zmalloc("ixgbe_rte_flow", sizeof(struct rte_flow), 0);
if (!flow) {
@@ -2510,6 +2511,7 @@ ixgbe_flow_create(struct rte_eth_dev *dev,
goto out;
fdir_info->mask_added = TRUE;
+ first_mask = TRUE;
} else {
/**
* Only support one global mask,
@@ -2540,8 +2542,15 @@ ixgbe_flow_create(struct rte_eth_dev *dev,
return flow;
}
- if (ret)
+ if (ret) {
+ /**
+ * clean the mask_added flag if fail to
+ * program
+ **/
+ if (first_mask)
+ fdir_info->mask_added = FALSE;
goto out;
+ }
}
goto out;