diff mbox series

[1/7] net/mlx5: fix wrong flow action macro usage

Message ID 20181008180150.39273-2-yskoh@mellanox.com (mailing list archive)
State Accepted, archived
Delegated to: Shahaf Shuler
Headers
Series net/mlx5: fixes for the new flow engine |

Checks

Context Check Description
ci/Intel-compilation success Compilation OK

Commit Message

Yongseok Koh Oct. 8, 2018, 6:02 p.m. UTC 
  Fixes: 5c83c536783c ("net/mlx5: add Direct Verbs final functions")
Cc: Ori Kam <orika@mellanox.com>

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.h    | 10 ----------
 drivers/net/mlx5/mlx5_flow_dv.c |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

Comments

Ori Kam Oct. 9, 2018, 7:45 a.m. UTC | #1 
> -----Original Message-----
> From: Yongseok Koh
> Sent: Monday, October 8, 2018 9:02 PM
> To: Shahaf Shuler <shahafs@mellanox.com>
> Cc: dev@dpdk.org; Yongseok Koh <yskoh@mellanox.com>; Ori Kam
> <orika@mellanox.com>
> Subject: [PATCH 1/7] net/mlx5: fix wrong flow action macro usage
> 
> Fixes: 5c83c536783c ("net/mlx5: add Direct Verbs final functions")
> Cc: Ori Kam <orika@mellanox.com>
> 
> Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5_flow.h    | 10 ----------
>  drivers/net/mlx5/mlx5_flow_dv.c |  2 +-
>  2 files changed, 1 insertion(+), 11 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
> index a91f9911d..79d4a2619 100644
> --- a/drivers/net/mlx5/mlx5_flow.h
> +++ b/drivers/net/mlx5/mlx5_flow.h
> @@ -65,16 +65,6 @@
>  	(MLX5_FLOW_LAYER_INNER_L2 | MLX5_FLOW_LAYER_INNER_L3 | \
>  	 MLX5_FLOW_LAYER_INNER_L4)
> 
> -/* Actions that modify the fate of matching traffic. */
> -#define MLX5_FLOW_FATE_DROP (1u << 0)
> -#define MLX5_FLOW_FATE_QUEUE (1u << 1)
> -#define MLX5_FLOW_FATE_RSS (1u << 2)
> -
> -/* Modify a packet. */
> -#define MLX5_FLOW_MOD_FLAG (1u << 0)
> -#define MLX5_FLOW_MOD_MARK (1u << 1)
> -#define MLX5_FLOW_MOD_COUNT (1u << 2)
> -
>  /* Actions */
>  #define MLX5_ACTION_DROP (1u << 0)
>  #define MLX5_ACTION_QUEUE (1u << 1)
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c
> index 7d325320a..5678dc35f 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -1251,7 +1251,7 @@ flow_dv_apply(struct rte_eth_dev *dev, struct
> rte_flow *flow,
>  	LIST_FOREACH(dev_flow, &flow->dev_flows, next) {
>  		struct mlx5_flow_dv *dv = &dev_flow->dv;
>  		if (dv->hrxq) {
> -			if (flow->actions & MLX5_FLOW_FATE_DROP)
> +			if (flow->actions & MLX5_ACTION_DROP)
>  				mlx5_hrxq_drop_release(dev);
>  			else
>  				mlx5_hrxq_release(dev, dv->hrxq);
> --
> 2.11.0

Acked-by: Ori Kam <orika@mellanox.com>

Thanks,
Ori Kam
diff mbox series

Patch

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index a91f9911d..79d4a2619 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -65,16 +65,6 @@ 
 	(MLX5_FLOW_LAYER_INNER_L2 | MLX5_FLOW_LAYER_INNER_L3 | \
 	 MLX5_FLOW_LAYER_INNER_L4)
 
-/* Actions that modify the fate of matching traffic. */
-#define MLX5_FLOW_FATE_DROP (1u << 0)
-#define MLX5_FLOW_FATE_QUEUE (1u << 1)
-#define MLX5_FLOW_FATE_RSS (1u << 2)
-
-/* Modify a packet. */
-#define MLX5_FLOW_MOD_FLAG (1u << 0)
-#define MLX5_FLOW_MOD_MARK (1u << 1)
-#define MLX5_FLOW_MOD_COUNT (1u << 2)
-
 /* Actions */
 #define MLX5_ACTION_DROP (1u << 0)
 #define MLX5_ACTION_QUEUE (1u << 1)
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 7d325320a..5678dc35f 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1251,7 +1251,7 @@  flow_dv_apply(struct rte_eth_dev *dev, struct rte_flow *flow,
 	LIST_FOREACH(dev_flow, &flow->dev_flows, next) {
 		struct mlx5_flow_dv *dv = &dev_flow->dv;
 		if (dv->hrxq) {
-			if (flow->actions & MLX5_FLOW_FATE_DROP)
+			if (flow->actions & MLX5_ACTION_DROP)
 				mlx5_hrxq_drop_release(dev);
 			else
 				mlx5_hrxq_release(dev, dv->hrxq);