Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox...

[sfrench/cifs-2.6.git] / drivers / infiniband / hw / mlx5 / devx.c

diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
index f2f11e652dcd2a751d10397c8c65d6be8a53b53e..66dc337e49a740fbfac9ee1f6b23aeb6f47cba13 100644 (file)
--- a/drivers/infiniband/hw/mlx5/devx.c
+++ b/drivers/infiniband/hw/mlx5/devx.c
@@ -284,7 +284,7 @@ static bool devx_is_obj_create_cmd(const void *in)
        case MLX5_CMD_OP_CREATE_FLOW_TABLE:
        case MLX5_CMD_OP_CREATE_FLOW_GROUP:
        case MLX5_CMD_OP_ALLOC_FLOW_COUNTER:
-       case MLX5_CMD_OP_ALLOC_ENCAP_HEADER:
+       case MLX5_CMD_OP_ALLOC_PACKET_REFORMAT_CONTEXT:
        case MLX5_CMD_OP_ALLOC_MODIFY_HEADER_CONTEXT:
        case MLX5_CMD_OP_CREATE_SCHEDULING_ELEMENT:
        case MLX5_CMD_OP_ADD_VXLAN_UDP_DPORT:
@@ -627,9 +627,9 @@ static void devx_obj_build_destroy_cmd(void *in, void *out, void *din,
                MLX5_SET(general_obj_in_cmd_hdr, din, opcode,
                         MLX5_CMD_OP_DEALLOC_FLOW_COUNTER);
                break;
-       case MLX5_CMD_OP_ALLOC_ENCAP_HEADER:
+       case MLX5_CMD_OP_ALLOC_PACKET_REFORMAT_CONTEXT:
                MLX5_SET(general_obj_in_cmd_hdr, din, opcode,
-                        MLX5_CMD_OP_DEALLOC_ENCAP_HEADER);
+                        MLX5_CMD_OP_DEALLOC_PACKET_REFORMAT_CONTEXT);
                break;
        case MLX5_CMD_OP_ALLOC_MODIFY_HEADER_CONTEXT:
                MLX5_SET(general_obj_in_cmd_hdr, din, opcode,