net: add rte prefix to ether defines

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

diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c
index dac23ac..d764dad 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -126,7 +126,7 @@ bond_print_lacp(struct lacpdu *l)
 #define MODE4_DEBUG(fmt, ...) do { } while (0)
 #endif
 
-static const struct ether_addr lacp_mac_addr = {
+static const struct rte_ether_addr lacp_mac_addr = {
        .addr_bytes = { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x02 }
 };
 
@@ -322,7 +322,7 @@ rx_machine(struct bond_dev_private *internals, uint16_t slave_id,
                agg = &bond_mode_8023ad_ports[port->aggregator_port_id];
                bool match = port->actor.system_priority ==
                        lacp->partner.port_params.system_priority &&
-                       is_same_ether_addr(&agg->actor.system,
+                       rte_is_same_ether_addr(&agg->actor.system,
                        &lacp->partner.port_params.system) &&
                        port->actor.port_priority ==
                        lacp->partner.port_params.port_priority &&
@@ -575,9 +575,9 @@ tx_machine(struct bond_dev_private *internals, uint16_t slave_id)
        hdr = rte_pktmbuf_mtod(lacp_pkt, struct lacpdu_header *);
 
        /* Source and destination MAC */
-       ether_addr_copy(&lacp_mac_addr, &hdr->eth_hdr.d_addr);
+       rte_ether_addr_copy(&lacp_mac_addr, &hdr->eth_hdr.d_addr);
        rte_eth_macaddr_get(slave_id, &hdr->eth_hdr.s_addr);
-       hdr->eth_hdr.ether_type = rte_cpu_to_be_16(ETHER_TYPE_SLOW);
+       hdr->eth_hdr.ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_SLOW);
 
        lacpdu = &hdr->lacpdu;
        memset(lacpdu, 0, sizeof(*lacpdu));
@@ -592,7 +592,8 @@ tx_machine(struct bond_dev_private *internals, uint16_t slave_id)
        memcpy(&hdr->lacpdu.actor.port_params, &port->actor,
                        sizeof(port->actor));
        agg = &bond_mode_8023ad_ports[port->aggregator_port_id];
-       ether_addr_copy(&agg->actor.system, &hdr->lacpdu.actor.port_params.system);
+       rte_ether_addr_copy(&agg->actor.system,
+                       &hdr->lacpdu.actor.port_params.system);
        lacpdu->actor.state = port->actor_state;
 
        /* PARTNER */
@@ -664,7 +665,7 @@ max_index(uint64_t *a, int n)
  * @param port_pos                     Port to assign.
  */
 static void
-selection_logic(struct bond_dev_private *internals, uint8_t slave_id)
+selection_logic(struct bond_dev_private *internals, uint16_t slave_id)
 {
        struct port *agg, *port;
        uint16_t slaves_count, new_agg_id, i, j = 0;
@@ -694,9 +695,10 @@ selection_logic(struct bond_dev_private *internals, uint8_t slave_id)
                 * ID (MAC address). */
                if ((agg->actor.key == port->actor.key &&
                        agg->partner.system_priority == port->partner.system_priority &&
-                       is_same_ether_addr(&agg->partner.system, &port->partner.system) == 1
+                       rte_is_same_ether_addr(&agg->partner.system,
+                                       &port->partner.system) == 1
                        && (agg->partner.key == port->partner.key)) &&
-                       is_zero_ether_addr(&port->partner.system) != 1 &&
+                       rte_is_zero_ether_addr(&port->partner.system) != 1 &&
                        (agg->actor.key &
                                rte_cpu_to_be_16(BOND_LINK_FULL_DUPLEX_KEY)) != 0) {
 
@@ -781,7 +783,7 @@ link_speed_key(uint16_t speed) {
 }
 
 static void
-rx_machine_update(struct bond_dev_private *internals, uint8_t slave_id,
+rx_machine_update(struct bond_dev_private *internals, uint16_t slave_id,
                struct rte_mbuf *lacp_pkt) {
        struct lacpdu_header *lacp;
        struct lacpdu_actor_partner_params *partner;
@@ -791,7 +793,7 @@ rx_machine_update(struct bond_dev_private *internals, uint8_t slave_id,
                RTE_ASSERT(lacp->lacpdu.subtype == SLOW_SUBTYPE_LACP);
 
                partner = &lacp->lacpdu.partner;
-               if (is_same_ether_addr(&partner->port_params.system,
+               if (rte_is_same_ether_addr(&partner->port_params.system,
                        &internals->mode4.mac_addr)) {
                        /* This LACP frame is sending to the bonding port
                         * so pass it to rx_machine.
@@ -810,10 +812,10 @@ bond_mode_8023ad_periodic_cb(void *arg)
        struct bond_dev_private *internals = bond_dev->data->dev_private;
        struct port *port;
        struct rte_eth_link link_info;
-       struct ether_addr slave_addr;
+       struct rte_ether_addr slave_addr;
        struct rte_mbuf *lacp_pkt = NULL;
-
-       uint8_t i, slave_id;
+       uint16_t slave_id;
+       uint16_t i;
 
 
        /* Update link status on each port */
@@ -842,8 +844,8 @@ bond_mode_8023ad_periodic_cb(void *arg)
                        SM_FLAG_SET(port, NTT);
                }
 
-               if (!is_same_ether_addr(&port->actor.system, &slave_addr)) {
-                       ether_addr_copy(&slave_addr, &port->actor.system);
+               if (!rte_is_same_ether_addr(&port->actor.system, &slave_addr)) {
+                       rte_ether_addr_copy(&slave_addr, &port->actor.system);
                        if (port->aggregator_port_id == slave_id)
                                SM_FLAG_SET(port, NTT);
                }
@@ -1044,7 +1046,7 @@ void
 bond_mode_8023ad_mac_address_update(struct rte_eth_dev *bond_dev)
 {
        struct bond_dev_private *internals = bond_dev->data->dev_private;
-       struct ether_addr slave_addr;
+       struct rte_ether_addr slave_addr;
        struct port *slave, *agg_slave;
        uint16_t slave_id, i, j;
 
@@ -1055,10 +1057,10 @@ bond_mode_8023ad_mac_address_update(struct rte_eth_dev *bond_dev)
                slave = &bond_mode_8023ad_ports[slave_id];
                rte_eth_macaddr_get(slave_id, &slave_addr);
 
-               if (is_same_ether_addr(&slave_addr, &slave->actor.system))
+               if (rte_is_same_ether_addr(&slave_addr, &slave->actor.system))
                        continue;
 
-               ether_addr_copy(&slave_addr, &slave->actor.system);
+               rte_ether_addr_copy(&slave_addr, &slave->actor.system);
                /* Do nothing if this port is not an aggregator. In other case
                 * Set NTT flag on every port that use this aggregator. */
                if (slave->aggregator_port_id != slave_id)
@@ -1156,7 +1158,7 @@ int
 bond_mode_8023ad_enable(struct rte_eth_dev *bond_dev)
 {
        struct bond_dev_private *internals = bond_dev->data->dev_private;
-       uint8_t i;
+       uint16_t i;
 
        for (i = 0; i < internals->active_slave_count; i++)
                bond_mode_8023ad_activate_slave(bond_dev,