Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
New upstream version 17.11-rc3
[deb_dpdk.git]
/
drivers
/
net
/
szedata2
/
rte_eth_szedata2.c
diff --git
a/drivers/net/szedata2/rte_eth_szedata2.c
b/drivers/net/szedata2/rte_eth_szedata2.c
index
9c0d57c
..
403cfdb
100644
(file)
--- a/
drivers/net/szedata2/rte_eth_szedata2.c
+++ b/
drivers/net/szedata2/rte_eth_szedata2.c
@@
-71,7
+71,7
@@
struct szedata2_rx_queue {
struct szedata *sze;
uint8_t rx_channel;
struct szedata2_rx_queue {
struct szedata *sze;
uint8_t rx_channel;
- uint
8
_t in_port;
+ uint
16
_t in_port;
struct rte_mempool *mb_pool;
volatile uint64_t rx_pkts;
volatile uint64_t rx_bytes;
struct rte_mempool *mb_pool;
volatile uint64_t rx_pkts;
volatile uint64_t rx_bytes;
@@
-1042,7
+1042,7
@@
eth_dev_info(struct rte_eth_dev *dev,
dev_info->speed_capa = ETH_LINK_SPEED_100G;
}
dev_info->speed_capa = ETH_LINK_SPEED_100G;
}
-static
void
+static
int
eth_stats_get(struct rte_eth_dev *dev,
struct rte_eth_stats *stats)
{
eth_stats_get(struct rte_eth_dev *dev,
struct rte_eth_stats *stats)
{
@@
-1077,6
+1077,8
@@
eth_stats_get(struct rte_eth_dev *dev,
stats->ibytes = rx_total_bytes;
stats->obytes = tx_total_bytes;
stats->oerrors = tx_err_total;
stats->ibytes = rx_total_bytes;
stats->obytes = tx_total_bytes;
stats->oerrors = tx_err_total;
+
+ return 0;
}
static void
}
static void
@@
-1538,7
+1540,7
@@
rte_szedata2_eth_dev_init(struct rte_eth_dev *dev)
return -EINVAL;
}
snprintf(rsc_filename, PATH_MAX,
return -EINVAL;
}
snprintf(rsc_filename, PATH_MAX,
- "%s/" PCI_PRI_FMT "/resource%u", pci_get_sysfs_path(),
+ "%s/" PCI_PRI_FMT "/resource%u",
rte_
pci_get_sysfs_path(),
pci_addr->domain, pci_addr->bus,
pci_addr->devid, pci_addr->function, PCI_RESOURCE_NUMBER);
fd = open(rsc_filename, O_RDWR);
pci_addr->domain, pci_addr->bus,
pci_addr->devid, pci_addr->function, PCI_RESOURCE_NUMBER);
fd = open(rsc_filename, O_RDWR);