From: Ruiqiang Hao <ruiqiang....@windriver.com>
commit 19a5373f76cb("Merge branch 'v5.15/standard/preempt-rt/base' into
v5.15/standard/preempt-rt/cn-sdkv5.4/octeon") introduced some duplicated
code, resulting in compilation errors. Therefore, we removed this code
to restore the original function.
Signed-off-by: Ruiqiang Hao <ruiqiang....@windriver.com>
---
.../ethernet/marvell/octeontx2/af/rvu_nix.c | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
index 6141f981dbe9..c21c58074b99 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
@@ -4165,7 +4165,6 @@ static int set_flowkey_fields(struct nix_rx_flowkey_alg
*alg, u32 flow_cfg)
struct nix_rx_flowkey_alg *field;
struct nix_rx_flowkey_alg tmp;
u32 key_type, valid_key;
- u32 l3_l4_src_dst;
int l4_key_offset = 0;
u32 l3_l4_src_dst;
@@ -5599,24 +5598,6 @@ void rvu_nix_lf_teardown(struct rvu *rvu, u16 pcifunc,
int blkaddr, int nixlf)
nix_ctx_free(rvu, pfvf);
- sa_base = rvu_read64(rvu, blkaddr, NIX_AF_LFX_RX_IPSEC_SA_BASE(nixlf));
- if (FIELD_GET(RX_SA_BASE, sa_base)) {
- err = rvu_cpt_ctx_flush(rvu, pcifunc);
- if (err)
- dev_err(rvu->dev,
- "CPT ctx flush failed with error: %d\n", err);
- }
-
- if (is_block_implemented(rvu->hw, BLKADDR_CPT0)) {
- /* reset the configuration related to inline ipsec */
- rvu_write64(rvu, blkaddr, NIX_AF_LFX_RX_IPSEC_CFG0(nixlf),
- 0x0);
- rvu_write64(rvu, blkaddr, NIX_AF_LFX_RX_IPSEC_CFG1(nixlf),
- 0x0);
- rvu_write64(rvu, blkaddr, NIX_AF_LFX_RX_IPSEC_SA_BASE(nixlf),
- 0x0);
- }
-
nix_free_all_bandprof(rvu, pcifunc);
sa_base = rvu_read64(rvu, blkaddr, NIX_AF_LFX_RX_IPSEC_SA_BASE(nixlf));
--
2.45.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14011):
https://lists.yoctoproject.org/g/linux-yocto/message/14011
Mute This Topic: https://lists.yoctoproject.org/mt/106587274/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
