git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/ngbe: fix debug logs
[dpdk.git]
/
examples
/
l3fwd-acl
/
main.c
diff --git
a/examples/l3fwd-acl/main.c
b/examples/l3fwd-acl/main.c
index
2205063
..
2d2ecc7
100644
(file)
--- a/
examples/l3fwd-acl/main.c
+++ b/
examples/l3fwd-acl/main.c
@@
-123,19
+123,19
@@
static uint16_t nb_lcore_params = sizeof(lcore_params_array_default) /
static struct rte_eth_conf port_conf = {
.rxmode = {
static struct rte_eth_conf port_conf = {
.rxmode = {
- .mq_mode = ETH_MQ_RX_RSS,
+ .mq_mode =
RTE_
ETH_MQ_RX_RSS,
.split_hdr_size = 0,
.split_hdr_size = 0,
- .offloads =
DEV
_RX_OFFLOAD_CHECKSUM,
+ .offloads =
RTE_ETH
_RX_OFFLOAD_CHECKSUM,
},
.rx_adv_conf = {
.rss_conf = {
.rss_key = NULL,
},
.rx_adv_conf = {
.rss_conf = {
.rss_key = NULL,
- .rss_hf =
ETH_RSS_IP |
ETH_RSS_UDP |
-
ETH_RSS_TCP |
ETH_RSS_SCTP,
+ .rss_hf =
RTE_ETH_RSS_IP | RTE_
ETH_RSS_UDP |
+
RTE_ETH_RSS_TCP | RTE_
ETH_RSS_SCTP,
},
},
.txmode = {
},
},
.txmode = {
- .mq_mode = ETH_MQ_TX_NONE,
+ .mq_mode =
RTE_
ETH_MQ_TX_NONE,
},
};
},
};
@@
-801,8
+801,8
@@
send_packets(struct rte_mbuf **m, uint32_t *res, int num)
}
/*
}
/*
- * Parse
s IPV6 address, exep
cts the following format:
- * XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:XXXX (where X
- is a hexe
decimal digit).
+ * Parse
IPv6 address, expe
cts the following format:
+ * XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:XXXX (where X
is a hexa
decimal digit).
*/
static int
parse_ipv6_addr(const char *in, const char **end, uint32_t v[IPV6_ADDR_U32],
*/
static int
parse_ipv6_addr(const char *in, const char **end, uint32_t v[IPV6_ADDR_U32],
@@
-1935,7
+1935,7
@@
check_all_ports_link_status(uint32_t port_mask)
continue;
}
/* clear all_ports_up flag if any link down */
continue;
}
/* clear all_ports_up flag if any link down */
- if (link.link_status == ETH_LINK_DOWN) {
+ if (link.link_status ==
RTE_
ETH_LINK_DOWN) {
all_ports_up = 0;
break;
}
all_ports_up = 0;
break;
}
@@
-1959,7
+1959,7
@@
check_all_ports_link_status(uint32_t port_mask)
}
/*
}
/*
- * build-up default vaues for dest MACs.
+ * build-up default va
l
ues for dest MACs.
*/
static void
set_default_dest_mac(void)
*/
static void
set_default_dest_mac(void)
@@
-2002,10
+2002,8
@@
config_port_max_pkt_len(struct rte_eth_conf *conf,
dev_info->max_mtu);
conf->rxmode.mtu = max_pkt_len - overhead_len;
dev_info->max_mtu);
conf->rxmode.mtu = max_pkt_len - overhead_len;
- if (conf->rxmode.mtu > RTE_ETHER_MTU) {
- conf->txmode.offloads |= DEV_TX_OFFLOAD_MULTI_SEGS;
- conf->rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
- }
+ if (conf->rxmode.mtu > RTE_ETHER_MTU)
+ conf->txmode.offloads |= RTE_ETH_TX_OFFLOAD_MULTI_SEGS;
return 0;
}
return 0;
}
@@
-2089,9
+2087,9
@@
main(int argc, char **argv)
"Invalid max packet length: %u (port %u)\n",
max_pkt_len, portid);
"Invalid max packet length: %u (port %u)\n",
max_pkt_len, portid);
- if (dev_info.tx_offload_capa &
DEV
_TX_OFFLOAD_MBUF_FAST_FREE)
+ if (dev_info.tx_offload_capa &
RTE_ETH
_TX_OFFLOAD_MBUF_FAST_FREE)
local_port_conf.txmode.offloads |=
local_port_conf.txmode.offloads |=
-
DEV
_TX_OFFLOAD_MBUF_FAST_FREE;
+
RTE_ETH
_TX_OFFLOAD_MBUF_FAST_FREE;
local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
dev_info.flow_type_rss_offloads;
local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
dev_info.flow_type_rss_offloads;