mbuf: remove build option to disable refcnt

[dpdk.git] / lib / librte_pmd_bond / rte_eth_bond_pmd.c

diff --git a/lib/librte_pmd_bond/rte_eth_bond_pmd.c b/lib/librte_pmd_bond/rte_eth_bond_pmd.c
index 6f7ae46..7dee5f2 100644 (file)
--- a/lib/librte_pmd_bond/rte_eth_bond_pmd.c
+++ b/lib/librte_pmd_bond/rte_eth_bond_pmd.c
@@ -1051,7 +1051,6 @@ bond_ethdev_tx_burst_8023ad(void *queue, struct rte_mbuf **bufs,
        return num_tx_total;
 }
 
-#ifdef RTE_MBUF_REFCNT
 static uint16_t
 bond_ethdev_tx_burst_broadcast(void *queue, struct rte_mbuf **bufs,
                uint16_t nb_pkts)
@@ -1111,7 +1110,6 @@ bond_ethdev_tx_burst_broadcast(void *queue, struct rte_mbuf **bufs,
 
        return max_nb_of_tx_pkts;
 }
-#endif
 
 void
 link_properties_set(struct rte_eth_dev *bonded_eth_dev,
@@ -1209,9 +1207,7 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
        switch (internals->mode) {
        case BONDING_MODE_ROUND_ROBIN:
        case BONDING_MODE_BALANCE:
-#ifdef RTE_MBUF_REFCNT
        case BONDING_MODE_BROADCAST:
-#endif
                for (i = 0; i < internals->slave_count; i++) {
                        if (mac_address_set(&rte_eth_devices[internals->slaves[i].port_id],
                                        bonded_eth_dev->data->mac_addrs)) {
@@ -1225,7 +1221,7 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev)
                bond_mode_8023ad_mac_address_update(bonded_eth_dev);
                break;
        case BONDING_MODE_ACTIVE_BACKUP:
-       case BONDING_MODE_ADAPTIVE_TRANSMIT_LOAD_BALANCING:
+       case BONDING_MODE_TLB:
        case BONDING_MODE_ALB:
        default:
                for (i = 0; i < internals->slave_count; i++) {
@@ -1272,12 +1268,10 @@ bond_ethdev_mode_set(struct rte_eth_dev *eth_dev, int mode)
                eth_dev->tx_pkt_burst = bond_ethdev_tx_burst_balance;
                eth_dev->rx_pkt_burst = bond_ethdev_rx_burst;
                break;
-#ifdef RTE_MBUF_REFCNT
        case BONDING_MODE_BROADCAST:
                eth_dev->tx_pkt_burst = bond_ethdev_tx_burst_broadcast;
                eth_dev->rx_pkt_burst = bond_ethdev_rx_burst;
                break;
-#endif
        case BONDING_MODE_8023AD:
                if (bond_mode_8023ad_enable(eth_dev) != 0)
                        return -1;
@@ -1288,7 +1282,7 @@ bond_ethdev_mode_set(struct rte_eth_dev *eth_dev, int mode)
                                "Using mode 4, it is necessary to do TX burst and RX burst "
                                "at least every 100ms.\n");
                break;
-       case BONDING_MODE_ADAPTIVE_TRANSMIT_LOAD_BALANCING:
+       case BONDING_MODE_TLB:
                eth_dev->tx_pkt_burst = bond_ethdev_tx_burst_tlb;
                eth_dev->rx_pkt_burst = bond_ethdev_rx_burst_active_backup;
                break;
@@ -1514,7 +1508,7 @@ bond_ethdev_start(struct rte_eth_dev *eth_dev)
        if (internals->mode == BONDING_MODE_8023AD)
                bond_mode_8023ad_start(eth_dev);
 
-       if (internals->mode == BONDING_MODE_ADAPTIVE_TRANSMIT_LOAD_BALANCING ||
+       if (internals->mode == BONDING_MODE_TLB ||
                        internals->mode == BONDING_MODE_ALB)
                bond_tlb_enable(internals);
 
@@ -1547,7 +1541,7 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev)
                }
        }
 
-       if (internals->mode == BONDING_MODE_ADAPTIVE_TRANSMIT_LOAD_BALANCING ||
+       if (internals->mode == BONDING_MODE_TLB ||
                        internals->mode == BONDING_MODE_ALB) {
                bond_tlb_disable(internals);
                for (i = 0; i < internals->active_slave_count; i++)
@@ -1796,9 +1790,7 @@ bond_ethdev_promiscuous_enable(struct rte_eth_dev *eth_dev)
        /* Promiscuous mode is propagated to all slaves */
        case BONDING_MODE_ROUND_ROBIN:
        case BONDING_MODE_BALANCE:
-#ifdef RTE_MBUF_REFCNT
        case BONDING_MODE_BROADCAST:
-#endif
                for (i = 0; i < internals->slave_count; i++)
                        rte_eth_promiscuous_enable(internals->slaves[i].port_id);
                break;
@@ -1807,7 +1799,7 @@ bond_ethdev_promiscuous_enable(struct rte_eth_dev *eth_dev)
                break;
        /* Promiscuous mode is propagated only to primary slave */
        case BONDING_MODE_ACTIVE_BACKUP:
-       case BONDING_MODE_ADAPTIVE_TRANSMIT_LOAD_BALANCING:
+       case BONDING_MODE_TLB:
        case BONDING_MODE_ALB:
        default:
                rte_eth_promiscuous_enable(internals->current_primary_port);
@@ -1826,9 +1818,7 @@ bond_ethdev_promiscuous_disable(struct rte_eth_dev *dev)
        /* Promiscuous mode is propagated to all slaves */
        case BONDING_MODE_ROUND_ROBIN:
        case BONDING_MODE_BALANCE:
-#ifdef RTE_MBUF_REFCNT
        case BONDING_MODE_BROADCAST:
-#endif
                for (i = 0; i < internals->slave_count; i++)
                        rte_eth_promiscuous_disable(internals->slaves[i].port_id);
                break;
@@ -1837,7 +1827,7 @@ bond_ethdev_promiscuous_disable(struct rte_eth_dev *dev)
                break;
        /* Promiscuous mode is propagated only to primary slave */
        case BONDING_MODE_ACTIVE_BACKUP:
-       case BONDING_MODE_ADAPTIVE_TRANSMIT_LOAD_BALANCING:
+       case BONDING_MODE_TLB:
        case BONDING_MODE_ALB:
        default:
                rte_eth_promiscuous_disable(internals->current_primary_port);