From: Jakub Kicinski <jakub.kicinski@netronome.com>
To: netdev@vger.kernel.org
Cc: oss-drivers@netronome.com, Jakub Kicinski <jakub.kicinski@netronome.com>
Subject: [PATCH net-next 11/12] nfp: fix copy paste in names and messages regarding vNICs
Date: Fri, 18 Aug 2017 15:48:21 -0700 [thread overview]
Message-ID: <20170818224822.8409-12-jakub.kicinski@netronome.com> (raw)
In-Reply-To: <20170818224822.8409-1-jakub.kicinski@netronome.com>
Data and control vNICs currently use the same area name and
error message. This could lead to confusion. Make sure
the error message says "ctrl" in case of control and the
data area is called "nfp.bar0".
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
---
drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
index d5e2361f0e86..acdad6f20251 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
@@ -388,7 +388,7 @@ nfp_net_pf_app_init(struct nfp_pf *pf, u8 __iomem *qc_bar, unsigned int stride)
NFP_PF_CSR_SLICE_SIZE,
&pf->ctrl_vnic_bar);
if (IS_ERR(ctrl_bar)) {
- nfp_err(pf->cpp, "Failed to find data vNIC memory symbol\n");
+ nfp_err(pf->cpp, "Failed to find ctrl vNIC memory symbol\n");
err = PTR_ERR(ctrl_bar);
goto err_app_clean;
}
@@ -504,7 +504,7 @@ static int nfp_net_pci_map_mem(struct nfp_pf *pf)
int err;
min_size = pf->max_data_vnics * NFP_PF_CSR_SLICE_SIZE;
- mem = nfp_net_pf_map_rtsym(pf, "net.ctrl", "_pf%d_net_bar0",
+ mem = nfp_net_pf_map_rtsym(pf, "net.bar0", "_pf%d_net_bar0",
min_size, &pf->data_vnic_bar);
if (IS_ERR(mem)) {
nfp_err(pf->cpp, "Failed to find data vNIC memory symbol\n");
--
2.11.0
next prev parent reply other threads:[~2017-08-18 22:49 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-18 22:48 [PATCH net-next 00/12] nfp: add basic ethtool callbacks to representors Jakub Kicinski
2017-08-18 22:48 ` [PATCH net-next 01/12] nfp: link basic ethtool ops " Jakub Kicinski
2017-08-18 22:48 ` [PATCH net-next 02/12] nfp: provide ethtool_drvinfo on representors Jakub Kicinski
2017-08-18 22:48 ` [PATCH net-next 03/12] nfp: allow retreiving management FW logs " Jakub Kicinski
2017-08-18 22:48 ` [PATCH net-next 04/12] nfp: don't report standard netdev statistics in ethtool Jakub Kicinski
2017-08-18 22:48 ` [PATCH net-next 05/12] nfp: add helper for printing ethtool strings Jakub Kicinski
2017-08-18 22:48 ` [PATCH net-next 06/12] nfp: split software and hardware vNIC statistics Jakub Kicinski
2017-08-18 22:48 ` [PATCH net-next 07/12] nfp: store pointer to MAC statistics in nfp_port Jakub Kicinski
2017-08-18 22:48 ` [PATCH net-next 08/12] nfp: report MAC statistics in ethtool Jakub Kicinski
2017-08-18 22:48 ` [PATCH net-next 09/12] nfp: add pointer to vNIC config memory to nfp_port structure Jakub Kicinski
2017-08-18 22:48 ` [PATCH net-next 10/12] nfp: add ethtool statistics for representors Jakub Kicinski
2017-08-18 22:48 ` Jakub Kicinski [this message]
2017-08-18 22:48 ` [PATCH net-next 12/12] nfp: don't reuse pointers in ring dumping Jakub Kicinski
2017-08-19 1:04 ` [PATCH net-next 00/12] nfp: add basic ethtool callbacks to representors David Miller
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=20170818224822.8409-12-jakub.kicinski@netronome.com \
--to=jakub.kicinski@netronome.com \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.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).