Skip to content

Commit ee3cac9

Browse files
idryzhovtmonjalo
authored andcommitted
kni: remove PCI related information
As there is no ethtool support in KNI anymore, PCI related information is no longer needed. Fixes: ea6b39b ("kni: remove ethtool support") Signed-off-by: Igor Ryzhov <[email protected]> Acked-by: Ferruh Yigit <[email protected]>
1 parent 87d2f3c commit ee3cac9

File tree

4 files changed

+0
-20
lines changed

4 files changed

+0
-20
lines changed

kernel/linux/kni/kni_dev.h

-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ struct kni_dev {
5050
wait_queue_head_t wq;
5151
struct mutex sync_lock;
5252

53-
/* PCI device id */
54-
uint16_t device_id;
55-
5653
/* kni device */
5754
struct net_device *net_dev;
5855

kernel/linux/kni/kni_misc.c

-6
Original file line numberDiff line numberDiff line change
@@ -377,12 +377,6 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,
377377
(unsigned long long) dev_info.resp_phys, kni->resp_q);
378378
pr_debug("mbuf_size: %u\n", kni->mbuf_size);
379379

380-
pr_debug("PCI: %02x:%02x.%02x %04x:%04x\n",
381-
dev_info.bus,
382-
dev_info.devid,
383-
dev_info.function,
384-
dev_info.vendor_id,
385-
dev_info.device_id);
386380
/* if user has provided a valid mac address */
387381
if (is_valid_ether_addr(dev_info.mac_addr))
388382
memcpy(net_dev->dev_addr, dev_info.mac_addr, ETH_ALEN);

lib/librte_eal/linux/eal/include/rte_kni_common.h

-7
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,6 @@ struct rte_kni_device_info {
111111
void * mbuf_va;
112112
phys_addr_t mbuf_phys;
113113

114-
/* PCI info */
115-
uint16_t vendor_id; /**< Vendor ID or PCI_ANY_ID. */
116-
uint16_t device_id; /**< Device ID or PCI_ANY_ID. */
117-
uint8_t bus; /**< Device bus */
118-
uint8_t devid; /**< Device ID */
119-
uint8_t function; /**< Device function. */
120-
121114
uint16_t group_id; /**< Group ID */
122115
uint32_t core_id; /**< core ID to bind for kernel thread */
123116

lib/librte_kni/rte_kni.c

-4
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,6 @@ rte_kni_alloc(struct rte_mempool *pktmbuf_pool,
252252

253253
strlcpy(dev_info.name, conf->name, RTE_KNI_NAMESIZE);
254254

255-
RTE_LOG(INFO, KNI, "pci: %02x:%02x:%02x \t %02x:%02x\n",
256-
dev_info.bus, dev_info.devid, dev_info.function,
257-
dev_info.vendor_id, dev_info.device_id);
258-
259255
ret = kni_reserve_mz(kni);
260256
if (ret < 0)
261257
goto mz_fail;

0 commit comments

Comments
 (0)