net/bnxt: fix speed autonegotiation

[dpdk.git] / drivers / net / sfc / sfc_repr.c

diff --git a/drivers/net/sfc/sfc_repr.c b/drivers/net/sfc/sfc_repr.c
index a9dab6f..9d88d55 100644 (file)
--- a/drivers/net/sfc/sfc_repr.c
+++ b/drivers/net/sfc/sfc_repr.c
@@ -405,7 +405,7 @@ sfc_repr_check_conf(struct sfc_repr *sr, uint16_t nb_rx_queues,
        }
 
        switch (conf->rxmode.mq_mode) {
-       case ETH_MQ_RX_RSS:
+       case RTE_ETH_MQ_RX_RSS:
                if (nb_rx_queues != 1) {
                        sfcr_err(sr, "Rx RSS is not supported with %u queues",
                                 nb_rx_queues);
@@ -420,7 +420,7 @@ sfc_repr_check_conf(struct sfc_repr *sr, uint16_t nb_rx_queues,
                        ret = -EINVAL;
                }
                break;
-       case ETH_MQ_RX_NONE:
+       case RTE_ETH_MQ_RX_NONE:
                break;
        default:
                sfcr_err(sr, "Rx mode MQ modes other than RSS not supported");
@@ -428,7 +428,7 @@ sfc_repr_check_conf(struct sfc_repr *sr, uint16_t nb_rx_queues,
                break;
        }
 
-       if (conf->txmode.mq_mode != ETH_MQ_TX_NONE) {
+       if (conf->txmode.mq_mode != RTE_ETH_MQ_TX_NONE) {
                sfcr_err(sr, "Tx mode MQ modes not supported");
                ret = -EINVAL;
        }
@@ -553,8 +553,8 @@ sfc_repr_dev_link_update(struct rte_eth_dev *dev,
                sfc_port_link_mode_to_info(EFX_LINK_UNKNOWN, &link);
        } else {
                memset(&link, 0, sizeof(link));
-               link.link_status = ETH_LINK_UP;
-               link.link_speed = ETH_SPEED_NUM_UNKNOWN;
+               link.link_status = RTE_ETH_LINK_UP;
+               link.link_speed = RTE_ETH_SPEED_NUM_UNKNOWN;
        }
 
        return rte_eth_linkstatus_set(dev, &link);
@@ -899,7 +899,6 @@ static const struct eth_dev_ops sfc_repr_dev_ops = {
 
 struct sfc_repr_init_data {
        uint16_t                pf_port_id;
-       uint16_t                repr_id;
        uint16_t                switch_domain_id;
        efx_mport_sel_t         mport_sel;
        efx_pcie_interface_t    intf;
@@ -957,7 +956,7 @@ sfc_repr_eth_dev_init(struct rte_eth_dev *dev, void *init_params)
        }
 
        ret = sfc_repr_proxy_add_port(repr_data->pf_port_id,
-                                     repr_data->repr_id,
+                                     srs->switch_port_id,
                                      dev->data->port_id,
                                      &repr_data->mport_sel);
        if (ret != 0) {
@@ -984,7 +983,7 @@ sfc_repr_eth_dev_init(struct rte_eth_dev *dev, void *init_params)
        dev->process_private = sr;
 
        srs->pf_port_id = repr_data->pf_port_id;
-       srs->repr_id = repr_data->repr_id;
+       srs->repr_id = srs->switch_port_id;
        srs->switch_domain_id = repr_data->switch_domain_id;
 
        dev->data->dev_flags |= RTE_ETH_DEV_REPRESENTOR;
@@ -1012,7 +1011,7 @@ fail_mac_addrs:
 
 fail_alloc_sr:
        (void)sfc_repr_proxy_del_port(repr_data->pf_port_id,
-                                     repr_data->repr_id);
+                                     srs->switch_port_id);
 
 fail_create_port:
 fail_mae_assign_switch_port:
@@ -1065,7 +1064,6 @@ sfc_repr_create(struct rte_eth_dev *parent,
        if (dev == NULL) {
                memset(&repr_data, 0, sizeof(repr_data));
                repr_data.pf_port_id = parent->data->port_id;
-               repr_data.repr_id = entity->vf;
                repr_data.switch_domain_id = switch_domain_id;
                repr_data.mport_sel = *mport_sel;
                repr_data.intf = entity->intf;