Skip to content

Commit 0c30195

Browse files
committed
support dpdk-17.11.2 and don't support core2 march
1 parent e30ba4d commit 0c30195

25 files changed

+5
-7
lines changed

ans/ans_kni.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,8 @@ static struct rte_mempool ** kni_pktmbuf_pool;
121121

122122
//static struct kni_interface_stats kni_stats[RTE_MAX_ETHPORTS];
123123

124-
125124
/* Callback for request of configuring network interface up/down */
126-
static int ans_kni_config_iface(uint8_t port_id, uint8_t if_up)
125+
static int ans_kni_config_iface(uint16_t port_id, uint8_t if_up)
127126
{
128127
int ret = 0;
129128

@@ -140,9 +139,8 @@ static int ans_kni_config_iface(uint8_t port_id, uint8_t if_up)
140139
return ret;
141140
}
142141

143-
144142
/* Callback Functions */
145-
static int ans_kni_change_mtu(uint8_t port_id, unsigned new_mtu)
143+
static int ans_kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
146144
{
147145
int ret;
148146

ans/ans_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ static int ans_init_ports(unsigned short nb_ports, struct ans_user_config *user
449449
rte_eth_dev_info_get(portid, &dev_info);
450450
printf("\t port name %s: \n", dev_info.driver_name );
451451
printf("\t max_rx_queues %d: max_tx_queues:%d \n", dev_info.max_rx_queues, dev_info.max_tx_queues);
452-
printf("\t rx_offload_capa 0x%x: tx_offload_capa:0x%x \n", dev_info.rx_offload_capa, dev_info.tx_offload_capa);
452+
printf("\t rx_offload_capa 0x%lx: tx_offload_capa:0x%lx \n", dev_info.rx_offload_capa, dev_info.tx_offload_capa);
453453

454454
nb_rx_queue = ans_get_port_rx_queues_nb(portid, user_conf);
455455

examples/http_server/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ CFLAGS += -O3 \
5151
LDLIBS += $(RTE_ANS)/librte_anssock/librte_anssock.a \
5252
-L$(RTE_SDK)/$(RTE_TARGET)/lib \
5353
-Wl,--whole-archive -Wl,-lrte_mbuf -Wl,-lrte_mempool_ring -Wl,-lrte_mempool -Wl,-lrte_ring -Wl,-lrte_eal -Wl,--no-whole-archive -Wl,-export-dynamic \
54-
-lrt -pthread -ldl
54+
-lrt -pthread -ldl -lnuma
5555

5656
OBJS = http_server.o
5757
TARGET = http_server

examples/https_server/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ CFLAGS += -O3 -DLOAD_CERTIFICATE\
5151
LDLIBS += $(RTE_ANS)/librte_anssock/librte_anssock.a \
5252
-L$(RTE_SDK)/$(RTE_TARGET)/lib \
5353
-Wl,--whole-archive -Wl,-lrte_mbuf -Wl,-lrte_mempool_ring -Wl,-lrte_mempool -Wl,-lrte_ring -Wl,-lrte_eal -Wl,--no-whole-archive -Wl,-export-dynamic \
54-
-lrt -pthread -ldl \
54+
-lrt -pthread -ldl -lnuma \
5555
-lnsl -lresolv -rdynamic -lssl -lcrypto
5656

5757

librte_ans/librte_ans_broadwell.a

-32 Bytes
Binary file not shown.

librte_ans/librte_ans_core2.a

-552 KB
Binary file not shown.

librte_ans/librte_ans_haswell.a

-32 Bytes
Binary file not shown.

librte_ans/librte_ans_ivybridge.a

-48 Bytes
Binary file not shown.

librte_ans/librte_ans_knl.a

16 Bytes
Binary file not shown.
-48 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)