net/mlx5: support upstream rdma-core

[dpdk.git] / drivers / net / mlx5 / mlx5_rxmode.c

diff --git a/drivers/net/mlx5/mlx5_rxmode.c b/drivers/net/mlx5/mlx5_rxmode.c
index db2e05b..e9ea2aa 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxmode.c
+++ b/drivers/net/mlx5/mlx5_rxmode.c
@@ -122,10 +122,10 @@ hash_rxq_special_flow_enable_vlan(struct hash_rxq *hash_rxq,
                                  unsigned int vlan_index)
 {
        struct priv *priv = hash_rxq->priv;
-       struct ibv_exp_flow *flow;
+       struct ibv_flow *flow;
        FLOW_ATTR_SPEC_ETH(data, priv_flow_attr(priv, NULL, 0, hash_rxq->type));
-       struct ibv_exp_flow_attr *attr = &data->attr;
-       struct ibv_exp_flow_spec_eth *spec = &data->spec;
+       struct ibv_flow_attr *attr = &data->attr;
+       struct ibv_flow_spec_eth *spec = &data->spec;
        const uint8_t *mac;
        const uint8_t *mask;
        unsigned int vlan_enabled = (priv->vlan_filter_n &&
@@ -146,13 +146,13 @@ hash_rxq_special_flow_enable_vlan(struct hash_rxq *hash_rxq,
        assert(((uint8_t *)attr + sizeof(*attr)) == (uint8_t *)spec);
        priv_flow_attr(priv, attr, sizeof(data), hash_rxq->type);
        /* The first specification must be Ethernet. */
-       assert(spec->type == IBV_EXP_FLOW_SPEC_ETH);
+       assert(spec->type == IBV_FLOW_SPEC_ETH);
        assert(spec->size == sizeof(*spec));
 
        mac = special_flow_init[flow_type].dst_mac_val;
        mask = special_flow_init[flow_type].dst_mac_mask;
-       *spec = (struct ibv_exp_flow_spec_eth){
-               .type = IBV_EXP_FLOW_SPEC_ETH,
+       *spec = (struct ibv_flow_spec_eth){
+               .type = IBV_FLOW_SPEC_ETH,
                .size = sizeof(*spec),
                .val = {
                        .dst_mac = {
@@ -175,7 +175,7 @@ hash_rxq_special_flow_enable_vlan(struct hash_rxq *hash_rxq,
        };
 
        errno = 0;
-       flow = ibv_exp_create_flow(hash_rxq->qp, attr);
+       flow = ibv_create_flow(hash_rxq->qp, attr);
        if (flow == NULL) {
                /* It's not clear whether errno is always set in this case. */
                ERROR("%p: flow configuration failed, errno=%d: %s",
@@ -207,12 +207,12 @@ hash_rxq_special_flow_disable_vlan(struct hash_rxq *hash_rxq,
                                   enum hash_rxq_flow_type flow_type,
                                   unsigned int vlan_index)
 {
-       struct ibv_exp_flow *flow =
+       struct ibv_flow *flow =
                hash_rxq->special_flow[flow_type][vlan_index];
 
        if (flow == NULL)
                return;
-       claim_zero(ibv_exp_destroy_flow(flow));
+       claim_zero(ibv_destroy_flow(flow));
        hash_rxq->special_flow[flow_type][vlan_index] = NULL;
        DEBUG("%p: special flow %s (index %d) VLAN %u (index %u) disabled",
              (void *)hash_rxq, hash_rxq_flow_type_str(flow_type), flow_type,