tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

octeontx2: hide unused label

A previous patch introduces a build-time warning when CONFIG_DCB
is disabled:

drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c: In function 'otx2_probe':
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c:3217:1: error: label 'err_free_zc_bmap' defined but not used [-Werror=unused-label]
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c: In function 'otx2vf_probe':
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c:740:1: error: label 'err_free_zc_bmap' defined but not used [-Werror=unused-label]

Add the same #ifdef check around it.

Fixes: efabce290151 ("octeontx2-pf: AF_XDP zero copy receive support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Suman Ghosh <sumang@marvell.com>
Link: https://patch.msgid.link/20250219162239.1376865-1-arnd@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Arnd Bergmann and committed by
Jakub Kicinski ca57d1c5 8279a8da

+4
+2
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
··· 3214 3214 3215 3215 return 0; 3216 3216 3217 + #ifdef CONFIG_DCB 3217 3218 err_free_zc_bmap: 3218 3219 bitmap_free(pf->af_xdp_zc_qidx); 3220 + #endif 3219 3221 err_sriov_cleannup: 3220 3222 otx2_sriov_vfcfg_cleanup(pf); 3221 3223 err_pf_sriov_init:
+2
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
··· 737 737 738 738 return 0; 739 739 740 + #ifdef CONFIG_DCB 740 741 err_free_zc_bmap: 741 742 bitmap_free(vf->af_xdp_zc_qidx); 743 + #endif 742 744 err_unreg_devlink: 743 745 otx2_unregister_dl(vf); 744 746 err_shutdown_tc: