From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 51833C1CC for ; Wed, 21 Oct 2015 16:51:04 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 21 Oct 2015 07:51:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,712,1437462000"; d="scan'208";a="799185740" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga001.jf.intel.com with ESMTP; 21 Oct 2015 07:51:03 -0700 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t9LEp25F010708; Wed, 21 Oct 2015 15:51:02 +0100 Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id t9LEp2De003085; Wed, 21 Oct 2015 15:51:02 +0100 Received: (from bairemon@localhost) by sivswdev01.ir.intel.com with id t9LEp21K003081; Wed, 21 Oct 2015 15:51:02 +0100 From: Bernard Iremonger To: dev@dpdk.org Date: Wed, 21 Oct 2015 15:50:32 +0100 Message-Id: <1445439044-2987-9-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1445439044-2987-1-git-send-email-bernard.iremonger@intel.com> References: <1445439044-2987-1-git-send-email-bernard.iremonger@intel.com> Subject: [dpdk-dev] [PATCH v4 08/20] af_packet: remove pci device driver X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Oct 2015 14:51:04 -0000 initialise dev_flags, driver, kdrv, drv_name and numa_node fields in eth_dev data. Signed-off-by: David Hunt Signed-off-by: Bernard Iremonger --- 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