merged. Bruce
In message: [linux-yocto][v5.10/standard/cn-sdkv5.4/octeon & v5.10/standard/preempt-rt/cn-sdkv5.4/octeon][PATCH] octeontx2-af: Fix build error in rvu_cgx.c on 20/01/2025 [email protected] wrote: > From: Jinfeng Wang <[email protected]> > > drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c:1061:5: error: > redefinition of 'rvu_mbox_handler_cgx_get_phy_fec_stats' > 1061 | int rvu_mbox_handler_cgx_get_phy_fec_stats(struct rvu *rvu, struct > msg_req *req, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c:1048:5: note: previous > definition of 'rvu_mbox_handler_cgx_get_phy_fec_stats' was here > 1048 | int rvu_mbox_handler_cgx_get_phy_fec_stats(struct rvu *rvu, struct > msg_req *req, > > Signed-off-by: Jinfeng Wang <[email protected]> > --- > drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c > b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c > index 5ccd1513c482..34da794d785f 100644 > --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c > +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c > @@ -1058,19 +1058,6 @@ int rvu_mbox_handler_cgx_get_phy_fec_stats(struct rvu > *rvu, struct msg_req *req, > return cgx_get_phy_fec_stats(rvu_cgx_pdata(cgx_id, rvu), lmac_id); > } > > -int rvu_mbox_handler_cgx_get_phy_fec_stats(struct rvu *rvu, struct msg_req > *req, > - struct msg_rsp *rsp) > -{ > - int pf = rvu_get_pf(req->hdr.pcifunc); > - u8 cgx_id, lmac_id; > - > - if (!is_pf_cgxmapped(rvu, pf)) > - return -EPERM; > - > - rvu_get_cgx_lmac_id(rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id); > - return cgx_get_phy_fec_stats(rvu_cgx_pdata(cgx_id, rvu), lmac_id); > -} > - > /* Finds cumulative status of NIX rx/tx counters from LF of a PF and those > * from its VFs as well. ie. NIX rx/tx counters at the CGX port level > */ > -- > 2.34.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14749): https://lists.yoctoproject.org/g/linux-yocto/message/14749 Mute This Topic: https://lists.yoctoproject.org/mt/110711401/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
