From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <sthemmin@microsoft.com>
Subject: [dpdk-dev] [PATCH 4/8] cxgbe: don't refer to eth_dev->pci_dev
Date: Sat, 7 Jan 2017 10:17:52 -0800 [thread overview]
Message-ID: <20170107181756.1944-5-sthemmin@microsoft.com> (raw)
In-Reply-To: <20170107181756.1944-1-sthemmin@microsoft.com>
Later patches remove pci_dev from the ethernet device structure.
Fix the cxgbe code to just use it's own name when forming zone name.
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
drivers/net/cxgbe/sge.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/net/cxgbe/sge.c b/drivers/net/cxgbe/sge.c
index 736f08ce..e935dc42 100644
--- a/drivers/net/cxgbe/sge.c
+++ b/drivers/net/cxgbe/sge.c
@@ -1644,8 +1644,7 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
/* Size needs to be multiple of 16, including status entry. */
iq->size = cxgbe_roundup(iq->size, 16);
- snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
- eth_dev->driver->pci_drv.driver.name,
+ snprintf(z_name, sizeof(z_name), "cxgbe_%s_%d_%d",
fwevtq ? "fwq_ring" : "rx_ring",
eth_dev->data->port_id, queue_id);
snprintf(z_name_sw, sizeof(z_name_sw), "%s_sw_ring", z_name);
@@ -1697,8 +1696,7 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
fl->size = s->fl_starve_thres - 1 + 2 * 8;
fl->size = cxgbe_roundup(fl->size, 8);
- snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
- eth_dev->driver->pci_drv.driver.name,
+ snprintf(z_name, sizeof(z_name), "cxgbe_%s_%d_%d",
fwevtq ? "fwq_ring" : "fl_ring",
eth_dev->data->port_id, queue_id);
snprintf(z_name_sw, sizeof(z_name_sw), "%s_sw_ring", z_name);
@@ -1893,8 +1891,7 @@ int t4_sge_alloc_eth_txq(struct adapter *adap, struct sge_eth_txq *txq,
/* Add status entries */
nentries = txq->q.size + s->stat_len / sizeof(struct tx_desc);
- snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
- eth_dev->driver->pci_drv.driver.name, "tx_ring",
+ snprintf(z_name, sizeof(z_name), "cxgbe_%d_%d",
eth_dev->data->port_id, queue_id);
snprintf(z_name_sw, sizeof(z_name_sw), "%s_sw_ring", z_name);
--
2.11.0
next prev parent reply other threads:[~2017-01-07 18:18 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-07 18:17 [dpdk-dev] [PATCH v2 0/8] device abstraction and VMBUS support infrastructure Stephen Hemminger
2017-01-07 18:17 ` [dpdk-dev] [PATCH 1/8] ethdev: increase length ethernet device internal name Stephen Hemminger
2017-01-07 18:17 ` [dpdk-dev] [PATCH 2/8] i40e: don't refer to eth_dev->pci_dev Stephen Hemminger
2017-01-10 12:08 ` Jan Blunck
2017-01-10 17:57 ` Stephen Hemminger
2017-01-11 7:55 ` Jan Blunck
2017-01-07 18:17 ` [dpdk-dev] [PATCH 3/8] vmxnet3: " Stephen Hemminger
2017-01-10 12:10 ` Jan Blunck
2017-01-07 18:17 ` Stephen Hemminger [this message]
2017-01-10 12:12 ` [dpdk-dev] [PATCH 4/8] cxgbe: " Jan Blunck
2017-01-07 18:17 ` [dpdk-dev] [PATCH 5/8] nfp: " Stephen Hemminger
2017-01-10 12:13 ` Jan Blunck
2017-01-07 18:17 ` [dpdk-dev] [PATCH 6/8] qat: " Stephen Hemminger
2017-01-10 12:15 ` Jan Blunck
2017-01-07 18:17 ` [dpdk-dev] [PATCH 7/8] ethdev: break ethernet driver and pci_driver connection Stephen Hemminger
2017-01-10 13:59 ` Ferruh Yigit
2017-01-10 17:58 ` Ferruh Yigit
2017-01-10 18:02 ` [dpdk-dev] [PATCH 1/2] add rte_bus->probe Ferruh Yigit
2017-01-10 18:02 ` [dpdk-dev] [PATCH 2/2] separate bus and functionality driver structs Ferruh Yigit
2017-01-11 4:53 ` [dpdk-dev] [PATCH 1/2] add rte_bus->probe Shreyansh Jain
2017-01-11 15:03 ` Ferruh Yigit
2017-01-12 5:28 ` Shreyansh Jain
2017-01-10 16:11 ` [dpdk-dev] [PATCH 7/8] ethdev: break ethernet driver and pci_driver connection Jan Blunck
2017-01-10 18:03 ` Stephen Hemminger
2017-01-07 18:17 ` [dpdk-dev] [PATCH 8/8] eal: VMBUS infrastructure Stephen Hemminger
2017-01-10 17:27 ` Jan Blunck
2017-01-10 18:05 ` Stephen Hemminger
2017-01-11 14:49 ` Jan Blunck
2017-01-11 21:13 ` Jan Blunck
2017-01-12 1:20 ` Stephen Hemminger
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=20170107181756.1944-5-sthemmin@microsoft.com \
--to=stephen@networkplumber.org \
--cc=dev@dpdk.org \
--cc=sthemmin@microsoft.com \
/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).