From: Hongxu Jia <hongxu....@windriver.com> Since commit [bc48858bc71d octeontx2-af: refactor function npc_install_flow for default entry] applied, the macro definition was moved to drivers/net/ ethernet/marvell/octeontx2/af/npc.h.
But the merge commit [4c8aa3594edc Merge branch 'v5.10/standard/base' into v5.10/standard/cn-sdkv4.18/cn96xx] incorrectly introduced the old definition again. Clean it up to fix the compile warning below. drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c:29: warning: "NIXLF_PROMISC_ENTRY" redefined 29 | #define NIXLF_PROMISC_ENTRY 2 Signed-off-by: Hongxu Jia <hongxu....@windriver.com> Signed-off-by: Ruiqiang Hao <ruiqiang....@windriver.com> --- drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c index b9cf9fb14e6e..97bde0486c80 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c @@ -24,10 +24,6 @@ #define RSVD_MCAM_ENTRIES_PER_PF 3 /* Broadcast, Promisc and AllMulticast */ #define RSVD_MCAM_ENTRIES_PER_NIXLF 1 /* Ucast for LFs */ -#define NIXLF_UCAST_ENTRY 0 -#define NIXLF_BCAST_ENTRY 1 -#define NIXLF_PROMISC_ENTRY 2 - #define NPC_PARSE_RESULT_DMAC_OFFSET 8 #define NPC_HW_TSTAMP_OFFSET 8ULL -- 2.31.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#10553): https://lists.yoctoproject.org/g/linux-yocto/message/10553 Mute This Topic: https://lists.yoctoproject.org/mt/86458889/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
