diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2017-08-18 15:48:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-18 22:39:28 -0700 |
| commit | 825b18ab24a1762a07e8202999cd8eb8eb8d505d (patch) | |
| tree | c9c5e5a218f69cc2f20b3cbc0cb37456418e9774 /drivers/net/ethernet/netronome/nfp | |
| parent | 899a37ade8c6dd1619d510c1e3b4b99d508272a9 (diff) | |
| download | op-kernel-dev-825b18ab24a1762a07e8202999cd8eb8eb8d505d.zip op-kernel-dev-825b18ab24a1762a07e8202999cd8eb8eb8d505d.tar.gz | |
nfp: fix copy paste in names and messages regarding vNICs
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 4 |
1 files 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 d5e2361..acdad6f 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"); |
