From 055c52583a2794da8ba1e85a48cce3832372b12f Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 8 Nov 2017 14:15:11 +0000 Subject: New upstream version 17.11-rc3 Change-Id: I6a5baa40612fe0c20f30b5fa773a6cbbac63a685 Signed-off-by: Luca Boccassi --- examples/tep_termination/main.c | 6 +++--- examples/tep_termination/vxlan_setup.c | 6 +++--- examples/tep_termination/vxlan_setup.h | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'examples/tep_termination') diff --git a/examples/tep_termination/main.c b/examples/tep_termination/main.c index aee36c6e..a14d2e37 100644 --- a/examples/tep_termination/main.c +++ b/examples/tep_termination/main.c @@ -98,7 +98,7 @@ #define MBUF_HEADROOM_UINT32(mbuf) (*(uint32_t *)((uint8_t *)(mbuf) \ + sizeof(struct rte_mbuf))) -#define INVALID_PORT_ID 0xFF +#define INVALID_PORT_ID 0xFFFF /* Size of buffers used for snprintfs. */ #define MAX_PRINT_BUFF 6072 @@ -184,7 +184,7 @@ static uint32_t burst_rx_retry_num = BURST_RX_RETRIES; static char dev_basename[MAX_BASENAME_SZ] = "vhost-net"; static unsigned lcore_ids[RTE_MAX_LCORE]; -uint8_t ports[RTE_MAX_ETHPORTS]; +uint16_t ports[RTE_MAX_ETHPORTS]; static unsigned nb_ports; /**< The number of ports specified in command line */ @@ -1161,7 +1161,7 @@ main(int argc, char *argv[]) unsigned lcore_id, core_id = 0; unsigned nb_ports, valid_nb_ports; int ret; - uint8_t portid; + uint16_t portid; uint16_t queue_id; static pthread_t tid; char thread_name[RTE_MAX_THREAD_NAME_LEN]; diff --git a/examples/tep_termination/vxlan_setup.c b/examples/tep_termination/vxlan_setup.c index 050bb32d..1ad4ca3c 100644 --- a/examples/tep_termination/vxlan_setup.c +++ b/examples/tep_termination/vxlan_setup.c @@ -129,7 +129,7 @@ const uint16_t tenant_id_conf[] = { * coming from the mbuf_pool passed as parameter */ int -vxlan_port_init(uint8_t port, struct rte_mempool *mbuf_pool) +vxlan_port_init(uint16_t port, struct rte_mempool *mbuf_pool) { int retval; uint16_t q; @@ -202,7 +202,7 @@ vxlan_port_init(uint8_t port, struct rte_mempool *mbuf_pool) rte_eth_macaddr_get(port, &ports_eth_addr[port]); RTE_LOG(INFO, PORT, "Port %u MAC: %02"PRIx8" %02"PRIx8" %02"PRIx8 " %02"PRIx8" %02"PRIx8" %02"PRIx8"\n", - (unsigned)port, + port, ports_eth_addr[port].addr_bytes[0], ports_eth_addr[port].addr_bytes[1], ports_eth_addr[port].addr_bytes[2], @@ -414,7 +414,7 @@ vxlan_unlink(struct vhost_dev *vdev) /* Transmit packets after encapsulating */ int -vxlan_tx_pkts(uint8_t port_id, uint16_t queue_id, +vxlan_tx_pkts(uint16_t port_id, uint16_t queue_id, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) { int ret = 0; uint16_t i; diff --git a/examples/tep_termination/vxlan_setup.h b/examples/tep_termination/vxlan_setup.h index 8d264619..2e3550d3 100644 --- a/examples/tep_termination/vxlan_setup.h +++ b/examples/tep_termination/vxlan_setup.h @@ -37,14 +37,14 @@ extern uint16_t nb_devices; extern uint16_t udp_port; extern uint8_t filter_idx; -extern uint8_t ports[RTE_MAX_ETHPORTS]; +extern uint16_t ports[RTE_MAX_ETHPORTS]; extern struct ether_addr ports_eth_addr[RTE_MAX_ETHPORTS]; extern uint32_t enable_stats; extern struct device_statistics dev_statistics[MAX_DEVICES]; extern uint8_t rx_decap; extern uint8_t tx_encap; -typedef int (*ol_port_configure_t)(uint8_t port, +typedef int (*ol_port_configure_t)(uint16_t port, struct rte_mempool *mbuf_pool); typedef int (*ol_tunnel_setup_t)(struct vhost_dev *vdev, @@ -52,7 +52,7 @@ typedef int (*ol_tunnel_setup_t)(struct vhost_dev *vdev, typedef void (*ol_tunnel_destroy_t)(struct vhost_dev *vdev); -typedef int (*ol_tx_handle_t)(uint8_t port_id, uint16_t queue_id, +typedef int (*ol_tx_handle_t)(uint16_t port_id, uint16_t queue_id, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); typedef int (*ol_rx_handle_t)(int vid, struct rte_mbuf **pkts, @@ -70,7 +70,7 @@ struct ol_switch_ops { }; int -vxlan_port_init(uint8_t port, struct rte_mempool *mbuf_pool); +vxlan_port_init(uint16_t port, struct rte_mempool *mbuf_pool); int vxlan_link(struct vhost_dev *vdev, struct rte_mbuf *m); @@ -79,7 +79,7 @@ void vxlan_unlink(struct vhost_dev *vdev); int -vxlan_tx_pkts(uint8_t port_id, uint16_t queue_id, +vxlan_tx_pkts(uint16_t port_id, uint16_t queue_id, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); int vxlan_rx_pkts(int vid, struct rte_mbuf **pkts, uint32_t count); -- cgit 1.2.3-korg