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
eal: replace libc-based random generation with LFSR
[dpdk.git]
/
app
/
test-pmd
/
config.c
diff --git
a/app/test-pmd/config.c
b/app/test-pmd/config.c
index
f9cb129
..
ab458c8
100644
(file)
--- a/
app/test-pmd/config.c
+++ b/
app/test-pmd/config.c
@@
-108,10
+108,10
@@
const struct rss_type_info rss_type_table[] = {
};
static void
};
static void
-print_ethaddr(const char *name, struct ether_addr *eth_addr)
+print_ethaddr(const char *name, struct
rte_
ether_addr *eth_addr)
{
{
- char buf[ETHER_ADDR_FMT_SIZE];
-
ether_format_addr(buf,
ETHER_ADDR_FMT_SIZE, eth_addr);
+ char buf[
RTE_
ETHER_ADDR_FMT_SIZE];
+
rte_ether_format_addr(buf, RTE_
ETHER_ADDR_FMT_SIZE, eth_addr);
printf("%s%s", name, buf);
}
printf("%s%s", name, buf);
}
@@
-391,7
+391,7
@@
void
port_infos_display(portid_t port_id)
{
struct rte_port *port;
port_infos_display(portid_t port_id)
{
struct rte_port *port;
- struct ether_addr mac_addr;
+ struct
rte_
ether_addr mac_addr;
struct rte_eth_link link;
struct rte_eth_dev_info dev_info;
int vlan_offload;
struct rte_eth_link link;
struct rte_eth_dev_info dev_info;
int vlan_offload;
@@
-538,7
+538,7
@@
port_summary_header_display(void)
void
port_summary_display(portid_t port_id)
{
void
port_summary_display(portid_t port_id)
{
- struct ether_addr mac_addr;
+ struct
rte_
ether_addr mac_addr;
struct rte_eth_link link;
struct rte_eth_dev_info dev_info;
char name[RTE_ETH_NAME_MAX_LEN];
struct rte_eth_link link;
struct rte_eth_dev_info dev_info;
char name[RTE_ETH_NAME_MAX_LEN];
@@
-2519,7
+2519,8
@@
set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs)
* Check that each segment length is greater or equal than
* the mbuf data sise.
* Check also that the total packet length is greater or equal than the
* Check that each segment length is greater or equal than
* the mbuf data sise.
* Check also that the total packet length is greater or equal than the
- * size of an empty UDP/IP packet (sizeof(struct ether_hdr) + 20 + 8).
+ * size of an empty UDP/IP packet (sizeof(struct rte_ether_hdr) +
+ * 20 + 8).
*/
tx_pkt_len = 0;
for (i = 0; i < nb_segs; i++) {
*/
tx_pkt_len = 0;
for (i = 0; i < nb_segs; i++) {
@@
-2530,10
+2531,10
@@
set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs)
}
tx_pkt_len = (uint16_t)(tx_pkt_len + seg_lengths[i]);
}
}
tx_pkt_len = (uint16_t)(tx_pkt_len + seg_lengths[i]);
}
- if (tx_pkt_len < (sizeof(struct ether_hdr) + 20 + 8)) {
+ if (tx_pkt_len < (sizeof(struct
rte_
ether_hdr) + 20 + 8)) {
printf("total packet length=%u < %d - give up\n",
(unsigned) tx_pkt_len,
printf("total packet length=%u < %d - give up\n",
(unsigned) tx_pkt_len,
- (int)(sizeof(struct ether_hdr) + 20 + 8));
+ (int)(sizeof(struct
rte_
ether_hdr) + 20 + 8));
return;
}
return;
}
@@
-3453,7
+3454,7
@@
set_vf_rate_limit(portid_t port_id, uint16_t vf, uint16_t rate, uint64_t q_msk)
static int
mcast_addr_pool_extend(struct rte_port *port)
{
static int
mcast_addr_pool_extend(struct rte_port *port)
{
- struct ether_addr *mc_pool;
+ struct
rte_
ether_addr *mc_pool;
size_t mc_pool_size;
/*
size_t mc_pool_size;
/*
@@
-3470,9
+3471,9
@@
mcast_addr_pool_extend(struct rte_port *port)
* The previous test guarantees that port->mc_addr_nb is a multiple
* of MCAST_POOL_INC.
*/
* The previous test guarantees that port->mc_addr_nb is a multiple
* of MCAST_POOL_INC.
*/
- mc_pool_size = sizeof(struct ether_addr) * (port->mc_addr_nb +
+ mc_pool_size = sizeof(struct
rte_
ether_addr) * (port->mc_addr_nb +
MCAST_POOL_INC);
MCAST_POOL_INC);
- mc_pool = (struct ether_addr *) realloc(port->mc_addr_pool,
+ mc_pool = (struct
rte_
ether_addr *) realloc(port->mc_addr_pool,
mc_pool_size);
if (mc_pool == NULL) {
printf("allocation of pool of %u multicast addresses failed\n",
mc_pool_size);
if (mc_pool == NULL) {
printf("allocation of pool of %u multicast addresses failed\n",
@@
-3501,7
+3502,7
@@
mcast_addr_pool_remove(struct rte_port *port, uint32_t addr_idx)
}
memmove(&port->mc_addr_pool[addr_idx],
&port->mc_addr_pool[addr_idx + 1],
}
memmove(&port->mc_addr_pool[addr_idx],
&port->mc_addr_pool[addr_idx + 1],
- sizeof(struct ether_addr) * (port->mc_addr_nb - addr_idx));
+ sizeof(struct
rte_
ether_addr) * (port->mc_addr_nb - addr_idx));
}
static void
}
static void
@@
-3520,7
+3521,7
@@
eth_port_multicast_addr_list_set(portid_t port_id)
}
void
}
void
-mcast_addr_add(portid_t port_id, struct ether_addr *mc_addr)
+mcast_addr_add(portid_t port_id, struct
rte_
ether_addr *mc_addr)
{
struct rte_port *port;
uint32_t i;
{
struct rte_port *port;
uint32_t i;
@@
-3535,7
+3536,7
@@
mcast_addr_add(portid_t port_id, struct ether_addr *mc_addr)
* in the pool of multicast addresses.
*/
for (i = 0; i < port->mc_addr_nb; i++) {
* in the pool of multicast addresses.
*/
for (i = 0; i < port->mc_addr_nb; i++) {
- if (is_same_ether_addr(mc_addr, &port->mc_addr_pool[i])) {
+ if (
rte_
is_same_ether_addr(mc_addr, &port->mc_addr_pool[i])) {
printf("multicast address already filtered by port\n");
return;
}
printf("multicast address already filtered by port\n");
return;
}
@@
-3543,12
+3544,12
@@
mcast_addr_add(portid_t port_id, struct ether_addr *mc_addr)
if (mcast_addr_pool_extend(port) != 0)
return;
if (mcast_addr_pool_extend(port) != 0)
return;
- ether_addr_copy(mc_addr, &port->mc_addr_pool[i]);
+
rte_
ether_addr_copy(mc_addr, &port->mc_addr_pool[i]);
eth_port_multicast_addr_list_set(port_id);
}
void
eth_port_multicast_addr_list_set(port_id);
}
void
-mcast_addr_remove(portid_t port_id, struct ether_addr *mc_addr)
+mcast_addr_remove(portid_t port_id, struct
rte_
ether_addr *mc_addr)
{
struct rte_port *port;
uint32_t i;
{
struct rte_port *port;
uint32_t i;
@@
-3562,7
+3563,7
@@
mcast_addr_remove(portid_t port_id, struct ether_addr *mc_addr)
* Search the pool of multicast MAC addresses for the removed address.
*/
for (i = 0; i < port->mc_addr_nb; i++) {
* Search the pool of multicast MAC addresses for the removed address.
*/
for (i = 0; i < port->mc_addr_nb; i++) {
- if (is_same_ether_addr(mc_addr, &port->mc_addr_pool[i]))
+ if (
rte_
is_same_ether_addr(mc_addr, &port->mc_addr_pool[i]))
break;
}
if (i == port->mc_addr_nb) {
break;
}
if (i == port->mc_addr_nb) {