net/mlx5: add C++ include guard to public header

[dpdk.git] / drivers / net / bonding / rte_eth_bond_api.c

diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c
index 5140ef1..8840d9e 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -204,7 +204,7 @@ slave_vlan_filter_set(uint16_t bonded_port_id, uint16_t slave_port_id)
 
        bonded_eth_dev = &rte_eth_devices[bonded_port_id];
        if ((bonded_eth_dev->data->dev_conf.rxmode.offloads &
-                       DEV_RX_OFFLOAD_VLAN_FILTER) == 0)
+                       RTE_ETH_RX_OFFLOAD_VLAN_FILTER) == 0)
                return 0;
 
        internals = bonded_eth_dev->data->dev_private;
@@ -375,7 +375,7 @@ eth_bond_slave_inherit_dev_info_rx_next(struct bond_dev_private *internals,
         * value. Thus, the new internal value of default Rx queue offloads
         * has to be masked by rx_queue_offload_capa to make sure that only
         * commonly supported offloads are preserved from both the previous
-        * value and the value being inhereted from the new slave device.
+        * value and the value being inherited from the new slave device.
         */
        rxconf_i->offloads = (rxconf_i->offloads | rxconf->offloads) &
                             internals->rx_queue_offload_capa;
@@ -413,7 +413,7 @@ eth_bond_slave_inherit_dev_info_tx_next(struct bond_dev_private *internals,
         * value. Thus, the new internal value of default Tx queue offloads
         * has to be masked by tx_queue_offload_capa to make sure that only
         * commonly supported offloads are preserved from both the previous
-        * value and the value being inhereted from the new slave device.
+        * value and the value being inherited from the new slave device.
         */
        txconf_i->offloads = (txconf_i->offloads | txconf->offloads) &
                             internals->tx_queue_offload_capa;
@@ -592,7 +592,7 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id)
                        return -1;
                }
 
-                if (link_props.link_status == ETH_LINK_UP) {
+               if (link_props.link_status == RTE_ETH_LINK_UP) {
                        if (internals->active_slave_count == 0 &&
                            !internals->user_defined_primary_port)
                                bond_ethdev_primary_set(internals,
@@ -668,7 +668,7 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id,
                }
 
        if (slave_idx < 0) {
-               RTE_BOND_LOG(ERR, "Couldn't find slave in port list, slave count %d",
+               RTE_BOND_LOG(ERR, "Couldn't find slave in port list, slave count %u",
                                internals->slave_count);
                return -1;
        }
@@ -727,7 +727,7 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id,
                internals->tx_offload_capa = 0;
                internals->rx_queue_offload_capa = 0;
                internals->tx_queue_offload_capa = 0;
-               internals->flow_type_rss_offloads = ETH_RSS_PROTO_MASK;
+               internals->flow_type_rss_offloads = RTE_ETH_RSS_PROTO_MASK;
                internals->reta_size = 0;
                internals->candidate_max_rx_pktlen = 0;
                internals->max_rx_pktlen = 0;