From: Bernard Iremonger <bernard.iremonger@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v4 08/20] af_packet: remove pci device driver
Date: Wed, 21 Oct 2015 15:50:32 +0100 [thread overview]
Message-ID: <1445439044-2987-9-git-send-email-bernard.iremonger@intel.com> (raw)
In-Reply-To: <1445439044-2987-1-git-send-email-bernard.iremonger@intel.com>
initialise dev_flags, driver, kdrv, drv_name and numa_node fields in eth_dev data.
Signed-off-by: David Hunt <david.hunt@intel.com>
Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
drivers/net/af_packet/rte_eth_af_packet.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index bfde661..25bcb4e 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -5,7 +5,7 @@
*
* Originally based upon librte_pmd_pcap code:
*
- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
* Copyright(c) 2014 6WIND S.A.
* All rights reserved.
*
@@ -432,7 +432,6 @@ rte_pmd_init_internals(const char *name,
struct rte_kvargs *kvlist)
{
struct rte_eth_dev_data *data = NULL;
- struct rte_pci_device *pci_dev = NULL;
struct rte_kvargs_pair *pair = NULL;
struct ifreq ifr;
size_t ifnamelen;
@@ -470,10 +469,6 @@ rte_pmd_init_internals(const char *name,
if (data == NULL)
goto error_early;
- pci_dev = rte_zmalloc_socket(name, sizeof(*pci_dev), 0, numa_node);
- if (pci_dev == NULL)
- goto error_early;
-
*internals = rte_zmalloc_socket(name, sizeof(**internals),
0, numa_node);
if (*internals == NULL)
@@ -656,8 +651,8 @@ rte_pmd_init_internals(const char *name,
/*
* now put it all together
* - store queue data in internals,
- * - store numa_node info in pci_driver
- * - point eth_dev_data to internals and pci_driver
+ * - store numa_node in eth_dev
+ * - point eth_dev_data to internals
* - and point eth_dev structure to new eth_dev_data structure
*/
@@ -670,11 +665,13 @@ rte_pmd_init_internals(const char *name,
data->dev_link = pmd_link;
data->mac_addrs = &(*internals)->eth_addr;
- pci_dev->numa_node = numa_node;
-
(*eth_dev)->data = data;
(*eth_dev)->dev_ops = &ops;
- (*eth_dev)->pci_dev = pci_dev;
+ (*eth_dev)->driver = NULL;
+ (*eth_dev)->data->dev_flags = 0;
+ (*eth_dev)->data->drv_name = NULL;
+ (*eth_dev)->data->kdrv = RTE_KDRV_NONE;
+ (*eth_dev)->data->numa_node = numa_node;
return 0;
@@ -693,7 +690,6 @@ error:
}
rte_free(*internals);
error_early:
- rte_free(pci_dev);
rte_free(data);
return -1;
}
--
1.9.1
next prev parent reply other threads:[~2015-10-21 14:51 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <PATCH v4>
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 00/20] remove pci driver from vdevs Bernard Iremonger
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 01/20] librte_eal: add RTE_KDRV_NONE for vdevs Bernard Iremonger
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 02/20] librte_ether: add fields from rte_pci_driver to rte_eth_dev_data Bernard Iremonger
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 03/20] librte_ether: add function rte_eth_copy_dev_info() Bernard Iremonger
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 04/20] null: remove pci device driver Bernard Iremonger
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 05/20] ring: " Bernard Iremonger
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 06/20] bonding: " Bernard Iremonger
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 07/20] pcap: " Bernard Iremonger
2015-10-21 14:50 ` Bernard Iremonger [this message]
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 09/20] xenvirt: " Bernard Iremonger
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 10/20] mpipe: " Bernard Iremonger
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 11/20] ixgbe: copy pci device info to eth_dev data Bernard Iremonger
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 12/20] e1000: " Bernard Iremonger
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 13/20] i40e: " Bernard Iremonger
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 14/20] fm10k: " Bernard Iremonger
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 15/20] bnx2x: " Bernard Iremonger
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 16/20] cxgbe: " Bernard Iremonger
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 17/20] enic: " Bernard Iremonger
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 18/20] mlx4: " Bernard Iremonger
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 19/20] virtio: " Bernard Iremonger
2015-10-21 14:50 ` [dpdk-dev] [PATCH v4 20/20] vmxnet3: " Bernard Iremonger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445439044-2987-9-git-send-email-bernard.iremonger@intel.com \
--to=bernard.iremonger@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).