X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=VNFs%2FDPPD-PROX%2Fprox_port_cfg.h;h=9d02599982a89bb2c2ae4e20f18c75c7213074fc;hb=e37df4aac0c175b0ee30cbbf4325cb3e8774204b;hp=17616187f4b5eb97bcaddab7c540b3370d2869c1;hpb=d923180e4af2612361dd7d4bf1627092a4d552d8;p=samplevnf.git diff --git a/VNFs/DPPD-PROX/prox_port_cfg.h b/VNFs/DPPD-PROX/prox_port_cfg.h index 17616187..9d025999 100644 --- a/VNFs/DPPD-PROX/prox_port_cfg.h +++ b/VNFs/DPPD-PROX/prox_port_cfg.h @@ -1,5 +1,5 @@ /* -// Copyright (c) 2010-2017 Intel Corporation +// Copyright (c) 2010-2020 Intel Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,15 +17,23 @@ #ifndef _PROX_PORT_CFG_H #define _PROX_PORT_CFG_H +#include #include #include +#include +#if RTE_VERSION >= RTE_VERSION_NUM(17,11,0,0) +#include +#endif +#include +#include "prox_compat.h" #include "prox_globals.h" enum addr_type {PROX_PORT_MAC_HW, PROX_PORT_MAC_SET, PROX_PORT_MAC_RAND}; #define IPV4_CKSUM 1 #define UDP_CKSUM 2 +#define NB_MCAST_ADDR 16 struct prox_port_cfg { struct rte_mempool *pool[32]; /* Rx/Tx mempool */ @@ -43,10 +51,12 @@ struct prox_port_cfg { uint32_t n_txd; uint8_t link_up; uint32_t link_speed; + uint32_t max_link_speed; uint32_t mtu; enum addr_type type; - struct ether_addr eth_addr; /* port MAC address */ + prox_rte_ether_addr eth_addr; /* port MAC address */ char name[MAX_NAME_SIZE]; + char vdev[MAX_NAME_SIZE]; char short_name[MAX_NAME_SIZE]; char driver_name[MAX_NAME_SIZE]; char rx_ring[MAX_NAME_SIZE]; @@ -55,9 +65,28 @@ struct prox_port_cfg { struct rte_eth_conf port_conf; struct rte_eth_rxconf rx_conf; struct rte_eth_txconf tx_conf; + uint64_t requested_rx_offload; + uint64_t requested_tx_offload; + uint64_t disabled_tx_offload; + struct rte_eth_dev_info dev_info; struct { int tx_offload_cksum; } capabilities; + uint32_t max_rx_pkt_len; + uint32_t min_rx_bufsize; + uint16_t min_rx_desc; + uint16_t max_rx_desc; + uint16_t min_tx_desc; + uint16_t max_tx_desc; + uint32_t nb_mc_addr; + uint8_t available; + prox_rte_ether_addr mc_addr[NB_MCAST_ADDR]; + int dpdk_mapping; + uint32_t ip; + int fd; + uint32_t vlan_tag; + uint8_t prefix; + uint8_t is_vdev; }; extern rte_atomic32_t lsc;