From: Kevin Hao <[email protected]> The codes which reference to bypass_queue_check label have been removed by the merge commit fef27b087273 ("Merge branch 'v5.15/standard/base' into v5.15/standard/cn-sdkv5.15/octeon"), so we also need to drop this dangling label in order to fix the build error like below: drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c: In function ‘otx2_add_flow’: drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c:1187:1: error: label ‘bypass_queue_check’ defined but not used [-Werror=unused-label] 1187 | bypass_queue_check: | ^~~~~~~~~~~~~~~~~~
Signed-off-by: Kevin Hao <[email protected]> --- Hi Bruce, Could you help me merge this into the following two branches? v5.15/standard/cn-sdkv5.15/octeon v5.15/standard/preempt-rt/cn-sdkv5.15/octeon drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c index 681e1eb27914..ea74ca46292e 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c @@ -1184,7 +1184,6 @@ int otx2_add_flow(struct otx2_nic *pfvf, struct ethtool_rxnfc *nfc) ring >= pfvf->hw.rx_queues && fsp->ring_cookie != RX_CLS_FLOW_DISC) return -EINVAL; -bypass_queue_check: if (fsp->location >= otx2_get_maxflows(flow_cfg)) return -EINVAL; -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13353): https://lists.yoctoproject.org/g/linux-yocto/message/13353 Mute This Topic: https://lists.yoctoproject.org/mt/102966893/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
