New upstream version 18.11-rc2

[deb_dpdk.git] / drivers / net / mlx5 / meson.build

diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index e8cbe3e..28938db 100644 (file)
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -96,8 +96,10 @@ if build
                'MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED' ],
                [ 'HAVE_IBV_MLX5_MOD_CQE_128B_COMP', 'infiniband/mlx5dv.h',
                'MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP' ],
+               [ 'HAVE_IBV_MLX5_MOD_CQE_128B_PAD', 'infiniband/mlx5dv.h',
+               'MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD' ],
                [ 'HAVE_IBV_FLOW_DV_SUPPORT', 'infiniband/mlx5dv.h',
-               'MLX5DV_FLOW_ACTION_TAG' ],
+               'mlx5dv_create_flow_action_packet_reformat' ],
                [ 'HAVE_IBV_DEVICE_MPLS_SUPPORT', 'infiniband/verbs.h',
                'IBV_FLOW_SPEC_MPLS' ],
                [ 'HAVE_IBV_WQ_FLAG_RX_END_PADDING', 'infiniband/verbs.h',
@@ -128,6 +130,8 @@ if build
                'IFLA_PHYS_SWITCH_ID' ],
                [ 'HAVE_IFLA_PHYS_PORT_NAME', 'linux/if_link.h',
                'IFLA_PHYS_PORT_NAME' ],
+               [ 'HAVE_IFLA_VXLAN_COLLECT_METADATA', 'linux/if_link.h',
+               'IFLA_VXLAN_COLLECT_METADATA' ],
                [ 'HAVE_TCA_CHAIN', 'linux/rtnetlink.h',
                'TCA_CHAIN' ],
                [ 'HAVE_TCA_FLOWER_ACT', 'linux/pkt_cls.h',
@@ -192,6 +196,38 @@ if build
                'TC_ACT_GOTO_CHAIN' ],
                [ 'HAVE_TC_ACT_VLAN', 'linux/tc_act/tc_vlan.h',
                'TCA_VLAN_PUSH_VLAN_PRIORITY' ],
+               [ 'HAVE_TCA_FLOWER_KEY_ENC_KEY_ID', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_ENC_KEY_ID' ],
+               [ 'HAVE_TCA_FLOWER_KEY_ENC_IPV4_SRC', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_ENC_IPV4_SRC' ],
+               [ 'HAVE_TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK' ],
+               [ 'HAVE_TCA_FLOWER_KEY_ENC_IPV4_DST', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_ENC_IPV4_DST' ],
+               [ 'HAVE_TCA_FLOWER_KEY_ENC_IPV4_DST_MASK', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_ENC_IPV4_DST_MASK' ],
+               [ 'HAVE_TCA_FLOWER_KEY_ENC_IPV6_SRC', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_ENC_IPV6_SRC' ],
+               [ 'HAVE_TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK' ],
+               [ 'HAVE_TCA_FLOWER_KEY_ENC_IPV6_DST', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_ENC_IPV6_DST' ],
+               [ 'HAVE_TCA_FLOWER_KEY_ENC_IPV6_DST_MASK', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_ENC_IPV6_DST_MASK' ],
+               [ 'HAVE_TCA_FLOWER_KEY_ENC_UDP_SRC_PORT', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_ENC_UDP_SRC_PORT' ],
+               [ 'HAVE_TCA_FLOWER_KEY_ENC_UDP_SRC_PORT_MASK', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_ENC_UDP_SRC_PORT_MASK' ],
+               [ 'HAVE_TCA_FLOWER_KEY_ENC_UDP_DST_PORT', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_ENC_UDP_DST_PORT' ],
+               [ 'HAVE_TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK' ],
+               [ 'HAVE_TC_ACT_TUNNEL_KEY', 'linux/tc_act/tc_tunnel_key.h',
+               'TCA_ACT_TUNNEL_KEY' ],
+               [ 'HAVE_TCA_TUNNEL_KEY_ENC_DST_PORT', 'linux/tc_act/tc_tunnel_key.h',
+               'TCA_TUNNEL_KEY_ENC_DST_PORT' ],
+               [ 'HAVE_TCA_TUNNEL_KEY_NO_CSUM', 'linux/tc_act/tc_tunnel_key.h',
+               'TCA_TUNNEL_KEY_NO_CSUM' ],
                [ 'HAVE_TC_ACT_PEDIT', 'linux/tc_act/tc_pedit.h',
                'TCA_PEDIT_KEY_EX_HDR_TYPE_UDP' ],
                [ 'HAVE_RDMA_NL_NLDEV', 'rdma/rdma_netlink.h',