net/e1000: fix LSC interrupt

[dpdk.git] / test / test / test_link_bonding_mode4.c

diff --git a/test/test/test_link_bonding_mode4.c b/test/test/test_link_bonding_mode4.c
index 8df28b4..8b64bbf 100644 (file)
--- a/test/test/test_link_bonding_mode4.c
+++ b/test/test/test_link_bonding_mode4.c
@@ -73,11 +73,11 @@
 #define MAX_PKT_BURST           (32)
 #define DEF_PKT_BURST           (16)
 
-#define BONDED_DEV_NAME         ("unit_test_mode4_bond_dev")
+#define BONDED_DEV_NAME         ("ut_mode4_bond_dev")
 
-#define SLAVE_DEV_NAME_FMT      ("unit_test_mode4_slave_%d")
-#define SLAVE_RX_QUEUE_FMT      ("unit_test_mode4_slave_%d_rx")
-#define SLAVE_TX_QUEUE_FMT      ("unit_test_mode4_slave_%d_tx")
+#define SLAVE_DEV_NAME_FMT      ("ut_mode4_slave_%d")
+#define SLAVE_RX_QUEUE_FMT      ("ut_mode4_slave_%d_rx")
+#define SLAVE_TX_QUEUE_FMT      ("ut_mode4_slave_%d_tx")
 
 #define INVALID_SOCKET_ID       (-1)
 #define INVALID_PORT_ID         (0xFF)
@@ -143,7 +143,7 @@ static struct rte_eth_conf default_pmd_conf = {
                .hw_ip_checksum = 0, /**< IP checksum offload enabled */
                .hw_vlan_filter = 0, /**< VLAN filtering disabled */
                .jumbo_frame    = 0, /**< Jumbo Frame Support disabled */
-               .hw_strip_crc   = 0, /**< CRC stripped by hardware */
+               .hw_strip_crc   = 1, /**< CRC stripped by hardware */
        },
        .txmode = {
                .mq_mode = ETH_MQ_TX_NONE,
@@ -193,7 +193,8 @@ static uint8_t lacpdu_rx_count[RTE_MAX_ETHPORTS] = {0, };
 static int
 slave_get_pkts(struct slave_conf *slave, struct rte_mbuf **buf, uint16_t size)
 {
-       return rte_ring_dequeue_burst(slave->tx_queue, (void **)buf, size);
+       return rte_ring_dequeue_burst(slave->tx_queue, (void **)buf,
+                       size, NULL);
 }
 
 /*
@@ -820,7 +821,7 @@ test_mode4_rx(void)
                TEST_ASSERT(cnt[0] == expected_pkts_cnt / 2 &&
                        cnt[1] == expected_pkts_cnt / 2,
                        "Expected %u packets with the same MAC and %u with different but "
-                       "got %u with the same and %u with diffrent MAC",
+                       "got %u with the same and %u with different MAC",
                        expected_pkts_cnt / 2, expected_pkts_cnt / 2, cnt[1], cnt[0]);
        } else if (retval > 0)
                free_pkts(pkts, retval);
@@ -924,7 +925,7 @@ test_mode4_rx(void)
                                break;
                }
 
-               TEST_ASSERT(j < 5, "Failed to agregate slave after link up");
+               TEST_ASSERT(j < 5, "Failed to aggregate slave after link up");
        }
 
        remove_slaves_and_stop_bonded_device();
@@ -1262,7 +1263,7 @@ test_mode4_expired(void)
                        retval = bond_handshake_reply(slave);
                        TEST_ASSERT(retval >= 0, "Handshake failed");
 
-                       /* Remove replay for slave that supose to be expired. */
+                       /* Remove replay for slave that suppose to be expired. */
                        if (slave == exp_slave) {
                                while (rte_ring_count(slave->rx_queue) > 0) {
                                        void *pkt = NULL;