net/mlx5: call meter detach only if DR is supported
authorOphir Munk <ophirmu@mellanox.com>
Tue, 25 Aug 2020 09:31:11 +0000 (09:31 +0000)
committerFerruh Yigit <ferruh.yigit@intel.com>
Fri, 18 Sep 2020 16:55:06 +0000 (18:55 +0200)
Flow metering is supported only in direct rules (DR). Currently the APIs
of meter actions create and modify are under #ifdef
HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER, while detaching the meter action
is executed unconditionally. This commit adds the same ifdef to API
mlx5_flow_meter_detach().
This commit avoids compilation failure of non-Linux operating systems
which do not support DR.

Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>
drivers/net/mlx5/mlx5_flow_meter.c

index bf34687..b36bc7b 100644 (file)
@@ -1221,6 +1221,7 @@ error:
 void
 mlx5_flow_meter_detach(struct mlx5_flow_meter *fm)
 {
+#ifdef HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER
        MLX5_ASSERT(fm->ref_cnt);
        if (--fm->ref_cnt)
                return;
@@ -1230,6 +1231,9 @@ mlx5_flow_meter_detach(struct mlx5_flow_meter *fm)
        fm->ingress = 0;
        fm->egress = 0;
        fm->transfer = 0;
+#else
+       (void)fm;
+#endif
 }
 
 /**