kni: remove PCI related information

As there is no ethtool support in KNI anymore,
PCI related information is no longer needed.

Fixes: ea6b39b5b847 ("kni: remove ethtool support")
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>

diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h
index 44a5a61f727961eddeb24735a252792f7187e18c..d57bce647e4ad6af7e5b9c3d2893d0c63839932e 100644 (file)
--- a/kernel/linux/kni/kni_dev.h
+++ b/kernel/linux/kni/kni_dev.h
@@ -50,9 +50,6 @@ struct kni_dev {
        wait_queue_head_t wq;
        struct mutex sync_lock;
 
-       /* PCI device id */
-       uint16_t device_id;
-
        /* kni device */
        struct net_device *net_dev;
 

diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c
index af18c67c422f906ddc0188c4b8eb9edf07ee2e38..1fc5eeb9c8ca4f51e3d7e391b186135dc4126876 100644 (file)
--- a/kernel/linux/kni/kni_misc.c
+++ b/kernel/linux/kni/kni_misc.c
@@ -377,12 +377,6 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,
                (unsigned long long) dev_info.resp_phys, kni->resp_q);
        pr_debug("mbuf_size:    %u\n", kni->mbuf_size);
 
-       pr_debug("PCI: %02x:%02x.%02x %04x:%04x\n",
-                                       dev_info.bus,
-                                       dev_info.devid,
-                                       dev_info.function,
-                                       dev_info.vendor_id,
-                                       dev_info.device_id);
        /* if user has provided a valid mac address */
        if (is_valid_ether_addr(dev_info.mac_addr))
                memcpy(net_dev->dev_addr, dev_info.mac_addr, ETH_ALEN);

diff --git a/lib/librte_eal/linux/eal/include/rte_kni_common.h b/lib/librte_eal/linux/eal/include/rte_kni_common.h
index 5db5a13335ed478f5260b2b5a5a9d4c970ac04f9..91a1c1408820dfcb7a78acab1fe90e7d8588ae34 100644 (file)
--- a/lib/librte_eal/linux/eal/include/rte_kni_common.h
+++ b/lib/librte_eal/linux/eal/include/rte_kni_common.h
@@ -111,13 +111,6 @@ struct rte_kni_device_info {
        void * mbuf_va;
        phys_addr_t mbuf_phys;
 
-       /* PCI info */
-       uint16_t vendor_id;           /**< Vendor ID or PCI_ANY_ID. */
-       uint16_t device_id;           /**< Device ID or PCI_ANY_ID. */
-       uint8_t bus;                  /**< Device bus */
-       uint8_t devid;                /**< Device ID */
-       uint8_t function;             /**< Device function. */
-
        uint16_t group_id;            /**< Group ID */
        uint32_t core_id;             /**< core ID to bind for kernel thread */
 

diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
index a0f1e37671593458f0ba33c2fc371b64abb3da89..e29d0cc7df3cc4a67070e6a400f911f1fce1bc19 100644 (file)
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -252,10 +252,6 @@ rte_kni_alloc(struct rte_mempool *pktmbuf_pool,
 
        strlcpy(dev_info.name, conf->name, RTE_KNI_NAMESIZE);
 
-       RTE_LOG(INFO, KNI, "pci: %02x:%02x:%02x \t %02x:%02x\n",
-               dev_info.bus, dev_info.devid, dev_info.function,
-                       dev_info.vendor_id, dev_info.device_id);
-
        ret = kni_reserve_mz(kni);
        if (ret < 0)
                goto mz_fail;