sfc: don't fail probe if MAE/TC setup fails

Edward Cree · kuba-moo · commit 54c9016eb8ed · 2023-08-17T11:31:07.000-07:00
Existing comment in the source explains why we don't want efx_init_tc() failure to be fatal. Cited commit erroneously consolidated failure paths causing the probe to be failed in this case. Fixes: 7e056e2 ("sfc: obtain device mac address based on firmware handle for ef100") Reviewed-by: Martin Habets <habetsm.xilinx@gmail.com> Signed-off-by: Edward Cree <ecree.xilinx@gmail.com> Link: https://lore.kernel.org/r/aa7f589dd6028bd1ad49f0a85f37ab33c09b2b45.1692114888.git.ecree.xilinx@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/drivers/net/ethernet/sfc/ef100_nic.c b/drivers/net/ethernet/sfc/ef100_nic.c
@@ -1194,7 +1194,7 @@ int ef100_probe_netdev_pf(struct efx_nic *efx)
 		net_dev->features |= NETIF_F_HW_TC;
 		efx->fixed_features |= NETIF_F_HW_TC;
 	}
-	return rc;
+	return 0;
 }
 
 int ef100_probe_vf(struct efx_nic *efx)

Original file line number	Diff line number	Diff line change
`@@ -1194,7 +1194,7 @@ int ef100_probe_netdev_pf(struct efx_nic *efx)`
`1194`	`1194`	`net_dev->features \|= NETIF_F_HW_TC;`
`1195`	`1195`	`efx->fixed_features \|= NETIF_F_HW_TC;`
`1196`	`1196`	`}`
`1197`		`- return rc;`
	`1197`	`+ return 0;`
`1198`	`1198`	`}`
`1199`	`1199`
`1200`	`1200`	`int ef100_probe_vf(struct efx_nic *efx)`