Browse Source

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>
Jakub Kicinski 8 years ago
parent
commit
825b18ab24
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/net/ethernet/netronome/nfp/nfp_net_main.c

+ 2 - 2
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,
 					NFP_PF_CSR_SLICE_SIZE,
 					&pf->ctrl_vnic_bar);
 					&pf->ctrl_vnic_bar);
 	if (IS_ERR(ctrl_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);
 		err = PTR_ERR(ctrl_bar);
 		goto err_app_clean;
 		goto err_app_clean;
 	}
 	}
@@ -504,7 +504,7 @@ static int nfp_net_pci_map_mem(struct nfp_pf *pf)
 	int err;
 	int err;
 
 
 	min_size = pf->max_data_vnics * NFP_PF_CSR_SLICE_SIZE;
 	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);
 				   min_size, &pf->data_vnic_bar);
 	if (IS_ERR(mem)) {
 	if (IS_ERR(mem)) {
 		nfp_err(pf->cpp, "Failed to find data vNIC memory symbol\n");
 		nfp_err(pf->cpp, "Failed to find data vNIC memory symbol\n");