summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/main_dpdk.cpp29
-rwxr-xr-xsrc/pal/linux_dpdk/dpdk180/rte_config.h3
2 files changed, 17 insertions, 15 deletions
diff --git a/src/main_dpdk.cpp b/src/main_dpdk.cpp
index a0258ef1..cafea343 100755
--- a/src/main_dpdk.cpp
+++ b/src/main_dpdk.cpp
@@ -4575,7 +4575,6 @@ void CTRexExtendedDriverBase1G::update_global_config_fdir(port_cfg_t * cfg){
cfg->update_global_config_fdir_10g_1g();
}
-
int CTRexExtendedDriverBase1G::configure_rx_filter_rules(CPhyEthIF * _if){
uint16_t hops = get_rx_check_hops();
@@ -4587,15 +4586,15 @@ int CTRexExtendedDriverBase1G::configure_rx_filter_rules(CPhyEthIF * _if){
int i;
// IPv4: bytes being compared are {TTL, Protocol}
uint16_t ff_rules_v4[4]={
- 0xFF06 - v4_hops,
- 0xFE11 - v4_hops,
- 0xFF11 - v4_hops,
- 0xFE06 - v4_hops,
+ (uint16_t)(0xFF06 - v4_hops),
+ (uint16_t)(0xFE11 - v4_hops),
+ (uint16_t)(0xFF11 - v4_hops),
+ (uint16_t)(0xFE06 - v4_hops),
} ;
// IPv6: bytes being compared are {NextHdr, HopLimit}
uint16_t ff_rules_v6[2]={
- 0x3CFF - hops,
- 0x3CFE - hops,
+ (uint16_t)(0x3CFF - hops),
+ (uint16_t)(0x3CFE - hops),
} ;
uint16_t *ff_rules;
uint16_t num_rules;
@@ -4733,17 +4732,17 @@ int CTRexExtendedDriverBase10G::configure_rx_filter_rules(CPhyEthIF * _if){
// IPv4: bytes being compared are {TTL, Protocol}
uint16_t ff_rules_v4[4]={
- 0xFF11 - v4_hops,
- 0xFE11 - v4_hops,
- 0xFF06 - v4_hops,
- 0xFE06 - v4_hops,
+ (uint16_t)(0xFF11 - v4_hops),
+ (uint16_t)(0xFE11 - v4_hops),
+ (uint16_t)(0xFF06 - v4_hops),
+ (uint16_t)(0xFE06 - v4_hops),
} ;
// IPv6: bytes being compared are {NextHdr, HopLimit}
uint16_t ff_rules_v6[4]={
- 0x3CFF - hops,
- 0x3CFE - hops,
- 0x3CFF - hops,
- 0x3CFE - hops,
+ (uint16_t)(0x3CFF - hops),
+ (uint16_t)(0x3CFE - hops),
+ (uint16_t)(0x3CFF - hops),
+ (uint16_t)(0x3CFE - hops),
} ;
const rte_l4type ff_rules_type[4]={
RTE_FDIR_L4TYPE_UDP,
diff --git a/src/pal/linux_dpdk/dpdk180/rte_config.h b/src/pal/linux_dpdk/dpdk180/rte_config.h
index 68dd7a7b..0603ed06 100755
--- a/src/pal/linux_dpdk/dpdk180/rte_config.h
+++ b/src/pal/linux_dpdk/dpdk180/rte_config.h
@@ -1,5 +1,8 @@
#ifndef __RTE_CONFIG_H
#define __RTE_CONFIG_H
+
+#define typeof __typeof__
+
#undef RTE_EXEC_ENV
#define RTE_EXEC_ENV "linuxapp"
#undef RTE_EXEC_ENV_LINUXAPP