diff --git a/.gitmodules b/.gitmodules index 85f3bc5..60b0c79 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "dpdk"] path = dpdk url = https://dpdk.org/git/dpdk - branch = devel - commit = ac5a5eac11e4008f48f992ea2d6fafc0b9b74f34 + branch = master + commit = 0da7f445df445630c794897347ee360d6fe6348b # commit = 92924b207b124c156f7b6dff75110d6af83d971f \ No newline at end of file diff --git a/dpdk b/dpdk index 92924b2..0da7f44 160000 --- a/dpdk +++ b/dpdk @@ -1 +1 @@ -Subproject commit 92924b207b124c156f7b6dff75110d6af83d971f +Subproject commit 0da7f445df445630c794897347ee360d6fe6348b diff --git a/mtcp/src/dpdk_module.c b/mtcp/src/dpdk_module.c index 7a31d76..bdfbd3a 100644 --- a/mtcp/src/dpdk_module.c +++ b/mtcp/src/dpdk_module.c @@ -107,10 +107,13 @@ static struct rte_eth_conf port_conf = { .rxmode = { .mq_mode = ETH_MQ_RX_RSS, .max_rx_pkt_len = ETHER_MAX_LEN, - .offloads = (DEV_RX_OFFLOAD_CRC_STRIP | + .offloads = ( +#if (RTE_VER_YEAR <= 18) && (RTE_VER_MONTH <= 02) + DEV_RX_OFFLOAD_CRC_STRIP | +#endif DEV_RX_OFFLOAD_CHECKSUM #ifdef ENABLELRO - DEV_RX_OFFLOAD_TCP_LRO + | DEV_RX_OFFLOAD_TCP_LRO #endif ), .split_hdr_size = 0, @@ -134,7 +137,7 @@ static struct rte_eth_conf port_conf = { }, .txmode = { .mq_mode = ETH_MQ_TX_NONE, -#if (RTE_VER_YEAR >= 18) && (RTE_VER_MONTH > 02) +#if (RTE_VER_YEAR >= 18) && (RTE_VER_MONTH >= 02) .offloads = (DEV_TX_OFFLOAD_IPV4_CKSUM | DEV_TX_OFFLOAD_UDP_CKSUM | DEV_TX_OFFLOAD_TCP_CKSUM) @@ -690,7 +693,7 @@ dpdk_load_module(void) /* check port capabilities */ rte_eth_dev_info_get(portid, &dev_info[portid]); -#if (RTE_VER_YEAR >= 18) && (RTE_VER_MONTH > 02) +#if (RTE_VER_YEAR >= 18) && (RTE_VER_MONTH >= 02) /* re-adjust rss_hf */ port_conf.rx_adv_conf.rss_conf.rss_hf &= dev_info[portid].flow_type_rss_offloads; #endif