xenvirt: remove fake pci interface

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

diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c
index d3ab5b9..e37ce06 100644 (file)
--- a/drivers/net/mlx5/mlx5_mac.c
+++ b/drivers/net/mlx5/mlx5_mac.c
@@ -120,8 +120,8 @@ hash_rxq_del_mac_flow(struct hash_rxq *hash_rxq, unsigned int mac_index,
              (*mac)[0], (*mac)[1], (*mac)[2], (*mac)[3], (*mac)[4], (*mac)[5],
              mac_index,
              vlan_index);
-       claim_zero(ibv_destroy_flow(hash_rxq->mac_flow
-                                   [mac_index][vlan_index]));
+       claim_zero(ibv_exp_destroy_flow(hash_rxq->mac_flow
+                                       [mac_index][vlan_index]));
        hash_rxq->mac_flow[mac_index][vlan_index] = NULL;
 }
 
@@ -237,14 +237,14 @@ static int
 hash_rxq_add_mac_flow(struct hash_rxq *hash_rxq, unsigned int mac_index,
                      unsigned int vlan_index)
 {
-       struct ibv_flow *flow;
+       struct ibv_exp_flow *flow;
        struct priv *priv = hash_rxq->priv;
        const uint8_t (*mac)[ETHER_ADDR_LEN] =
                        (const uint8_t (*)[ETHER_ADDR_LEN])
                        priv->mac[mac_index].addr_bytes;
        FLOW_ATTR_SPEC_ETH(data, hash_rxq_flow_attr(hash_rxq, NULL, 0));
-       struct ibv_flow_attr *attr = &data->attr;
-       struct ibv_flow_spec_eth *spec = &data->spec;
+       struct ibv_exp_flow_attr *attr = &data->attr;
+       struct ibv_exp_flow_spec_eth *spec = &data->spec;
        unsigned int vlan_enabled = !!priv->vlan_filter_n;
        unsigned int vlan_id = priv->vlan_filter[vlan_index];
 
@@ -259,10 +259,10 @@ hash_rxq_add_mac_flow(struct hash_rxq *hash_rxq, unsigned int mac_index,
        assert(((uint8_t *)attr + sizeof(*attr)) == (uint8_t *)spec);
        hash_rxq_flow_attr(hash_rxq, attr, sizeof(data));
        /* The first specification must be Ethernet. */
-       assert(spec->type == IBV_FLOW_SPEC_ETH);
+       assert(spec->type == IBV_EXP_FLOW_SPEC_ETH);
        assert(spec->size == sizeof(*spec));
-       *spec = (struct ibv_flow_spec_eth){
-               .type = IBV_FLOW_SPEC_ETH,
+       *spec = (struct ibv_exp_flow_spec_eth){
+               .type = IBV_EXP_FLOW_SPEC_ETH,
                .size = sizeof(*spec),
                .val = {
                        .dst_mac = {
@@ -286,7 +286,7 @@ hash_rxq_add_mac_flow(struct hash_rxq *hash_rxq, unsigned int mac_index,
              vlan_id);
        /* Create related flow. */
        errno = 0;
-       flow = ibv_create_flow(hash_rxq->qp, attr);
+       flow = ibv_exp_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",
@@ -410,6 +410,8 @@ priv_mac_addr_add(struct priv *priv, unsigned int mac_index,
                        (*mac)[3], (*mac)[4], (*mac)[5]
                }
        };
+       if (!priv_allow_flow_type(priv, HASH_RXQ_FLOW_TYPE_MAC))
+               goto end;
        for (i = 0; (i != priv->hash_rxqs_n); ++i) {
                ret = hash_rxq_mac_addr_add(&(*priv->hash_rxqs)[i], mac_index);
                if (!ret)
@@ -420,6 +422,7 @@ priv_mac_addr_add(struct priv *priv, unsigned int mac_index,
                                              mac_index);
                return ret;
        }
+end:
        BITFIELD_SET(priv->mac_configured, mac_index);
        return 0;
 }
@@ -439,6 +442,8 @@ priv_mac_addrs_enable(struct priv *priv)
        unsigned int i;
        int ret;
 
+       if (!priv_allow_flow_type(priv, HASH_RXQ_FLOW_TYPE_MAC))
+               return 0;
        for (i = 0; (i != priv->hash_rxqs_n); ++i) {
                ret = hash_rxq_mac_addrs_add(&(*priv->hash_rxqs)[i]);
                if (!ret)