X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=app%2Ftest%2Ftest_link_bonding.c;h=c5bd78d512c98b3bfc42677d243d3a1e42cecf9d;hb=1b306359e58cb7b90c7d4130a9e74ab5c340298a;hp=4523de67cffbc3cea76b5a9fe3ae28fc7965b8f0;hpb=f2ef6f21ee2e967cef0de6af7526f8509462d049;p=dpdk.git diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c index 4523de67cf..c5bd78d512 100644 --- a/app/test/test_link_bonding.c +++ b/app/test/test_link_bonding.c @@ -57,7 +57,7 @@ #include "test.h" -#define TEST_MAX_NUMBER_OF_PORTS (16) +#define TEST_MAX_NUMBER_OF_PORTS (6) #define RX_RING_SIZE 128 #define RX_FREE_THRESH 32 @@ -1319,11 +1319,11 @@ generate_test_burst(struct rte_mbuf **pkts_burst, uint16_t burst_size, if (toggle_dst_mac) initialize_eth_header(test_params->pkt_eth_hdr, (struct ether_addr *)src_mac, (struct ether_addr *)dst_mac_1, - vlan, vlan_id); + ipv4, vlan, vlan_id); else initialize_eth_header(test_params->pkt_eth_hdr, (struct ether_addr *)src_mac, (struct ether_addr *)dst_mac_0, - vlan, vlan_id); + ipv4, vlan, vlan_id); if (toggle_udp_port) @@ -2094,7 +2094,7 @@ test_activebackup_tx_burst(void) "Failed to initialize bonded device with slaves"); initialize_eth_header(test_params->pkt_eth_hdr, - (struct ether_addr *)src_mac, (struct ether_addr *)dst_mac_0, 0, 0); + (struct ether_addr *)src_mac, (struct ether_addr *)dst_mac_0, 1, 0, 0); pktlen = initialize_udp_header(test_params->pkt_udp_hdr, src_port, dst_port_0, 16); pktlen = initialize_ipv4_header(test_params->pkt_ipv4_hdr, src_addr, @@ -2637,7 +2637,7 @@ test_balance_l2_tx_burst(void) "Failed to set balance xmit policy."); initialize_eth_header(test_params->pkt_eth_hdr, - (struct ether_addr *)src_mac, (struct ether_addr *)dst_mac_0, 0, 0); + (struct ether_addr *)src_mac, (struct ether_addr *)dst_mac_0, 1, 0, 0); pktlen = initialize_udp_header(test_params->pkt_udp_hdr, src_port, dst_port_0, 16); pktlen = initialize_ipv4_header(test_params->pkt_ipv4_hdr, src_addr, @@ -2651,7 +2651,7 @@ test_balance_l2_tx_burst(void) "failed to generate packet burst"); initialize_eth_header(test_params->pkt_eth_hdr, - (struct ether_addr *)src_mac, (struct ether_addr *)dst_mac_1, 0, 0); + (struct ether_addr *)src_mac, (struct ether_addr *)dst_mac_1, 1, 0, 0); /* Generate a burst 2 of packets to transmit */ TEST_ASSERT_EQUAL(generate_packet_burst(test_params->mbuf_pool, &pkts_burst[1][0], @@ -3488,7 +3488,7 @@ test_broadcast_tx_burst(void) "Failed to intialise bonded device"); initialize_eth_header(test_params->pkt_eth_hdr, - (struct ether_addr *)src_mac, (struct ether_addr *)dst_mac_0, 0, 0); + (struct ether_addr *)src_mac, (struct ether_addr *)dst_mac_0, 1, 0, 0); pktlen = initialize_udp_header(test_params->pkt_udp_hdr, src_port, dst_port_0, 16); @@ -4068,11 +4068,11 @@ test_tlb_tx_burst(void) if (i % 2 == 0) { initialize_eth_header(test_params->pkt_eth_hdr, (struct ether_addr *)src_mac, - (struct ether_addr *)dst_mac_0, 0, 0); + (struct ether_addr *)dst_mac_0, 1, 0, 0); } else { initialize_eth_header(test_params->pkt_eth_hdr, (struct ether_addr *)test_params->default_slave_mac, - (struct ether_addr *)dst_mac_0, 0, 0); + (struct ether_addr *)dst_mac_0, 1, 0, 0); } pktlen = initialize_udp_header(test_params->pkt_udp_hdr, src_port, dst_port_0, 16);