diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2017-11-08 14:15:11 +0000 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2017-11-08 14:45:54 +0000 |
| commit | 055c52583a2794da8ba1e85a48cce3832372b12f (patch) | |
| tree | 8ceb1cb78fbb46a0f341f8ee24feb3c6b5540013 /drivers/net/kni | |
| parent | f239aed5e674965691846e8ce3f187dd47523689 (diff) | |
New upstream version 17.11-rc3
Change-Id: I6a5baa40612fe0c20f30b5fa773a6cbbac63a685
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'drivers/net/kni')
| -rw-r--r-- | drivers/net/kni/Makefile | 3 | ||||
| -rw-r--r-- | drivers/net/kni/rte_eth_kni.c | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/kni/Makefile b/drivers/net/kni/Makefile index 46a1ad08..a3f51f92 100644 --- a/drivers/net/kni/Makefile +++ b/drivers/net/kni/Makefile @@ -38,6 +38,9 @@ LIB = librte_pmd_kni.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) LDLIBS += -lpthread +LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring +LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_kni +LDLIBS += -lrte_bus_vdev EXPORT_MAP := rte_pmd_kni_version.map diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c index 72a2733b..8f269532 100644 --- a/drivers/net/kni/rte_eth_kni.c +++ b/drivers/net/kni/rte_eth_kni.c @@ -40,7 +40,7 @@ #include <rte_kni.h> #include <rte_kvargs.h> #include <rte_malloc.h> -#include <rte_vdev.h> +#include <rte_bus_vdev.h> /* Only single queue supported */ #define KNI_MAX_QUEUE_PER_PORT 1 @@ -283,7 +283,7 @@ eth_kni_link_update(struct rte_eth_dev *dev __rte_unused, return 0; } -static void +static int eth_kni_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) { unsigned long rx_packets_total = 0, rx_bytes_total = 0; @@ -320,6 +320,8 @@ eth_kni_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) stats->opackets = tx_packets_total; stats->obytes = tx_bytes_total; stats->oerrors = tx_packets_err_total; + + return 0; } static void @@ -356,8 +358,6 @@ static const struct eth_dev_ops eth_kni_ops = { .stats_reset = eth_kni_stats_reset, }; -static struct rte_vdev_driver eth_kni_drv; - static struct rte_eth_dev * eth_kni_create(struct rte_vdev_device *vdev, struct eth_kni_args *args, @@ -395,8 +395,6 @@ eth_kni_create(struct rte_vdev_device *vdev, eth_dev->data = data; eth_dev->dev_ops = ð_kni_ops; - data->dev_flags = RTE_ETH_DEV_DETACHABLE; - internals->no_request_thread = args->no_request_thread; return eth_dev; |