Code Review
/
samplevnf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix minor compilation issue on recent gcc compilers
[samplevnf.git]
/
VNFs
/
DPPD-PROX
/
prox_port_cfg.h
diff --git
a/VNFs/DPPD-PROX/prox_port_cfg.h
b/VNFs/DPPD-PROX/prox_port_cfg.h
index
370b045
..
9d02599
100644
(file)
--- a/
VNFs/DPPD-PROX/prox_port_cfg.h
+++ b/
VNFs/DPPD-PROX/prox_port_cfg.h
@@
-1,5
+1,5
@@
/*
/*
-// Copyright (c) 2010-20
17
Intel Corporation
+// Copyright (c) 2010-20
20
Intel Corporation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@
-20,13
+20,20
@@
#include <rte_pci.h>
#include <rte_ether.h>
#include <rte_ethdev.h>
#include <rte_pci.h>
#include <rte_ether.h>
#include <rte_ethdev.h>
+#include <rte_version.h>
+#if RTE_VERSION >= RTE_VERSION_NUM(17,11,0,0)
+#include <rte_bus_pci.h>
+#endif
+#include <rte_pci.h>
+#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
#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 */
struct prox_port_cfg {
struct rte_mempool *pool[32]; /* Rx/Tx mempool */
@@
-44,10
+51,12
@@
struct prox_port_cfg {
uint32_t n_txd;
uint8_t link_up;
uint32_t link_speed;
uint32_t n_txd;
uint8_t link_up;
uint32_t link_speed;
+ uint32_t max_link_speed;
uint32_t mtu;
enum addr_type type;
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 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];
char short_name[MAX_NAME_SIZE];
char driver_name[MAX_NAME_SIZE];
char rx_ring[MAX_NAME_SIZE];
@@
-56,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;
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;
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;
};
extern rte_atomic32_t lsc;