From 2d72ec8dabd02c1fae159f5222e5a2d0d0a07db3 Mon Sep 17 00:00:00 2001 From: Conor Walsh Date: Mon, 15 Nov 2021 17:58:54 +0000 Subject: [PATCH] net/bnxt: remove some unused variables Reported by clang 13. Bugzilla ID: 881 Fixes: b87abb2e55cb ("net/bnxt: support marking packet") Fixes: 88badb3aef94 ("net/bnxt: add helper functions for blob/regfile ops") Cc: stable@dpdk.org Reported-by: Liang Longfeng Signed-off-by: Conor Walsh Acked-by: Somnath Kotur Acked-by: Ajit Khaparde Reviewed-by: David Marchand --- drivers/net/bnxt/bnxt_rxr.c | 22 ---------------------- drivers/net/bnxt/tf_ulp/ulp_utils.c | 3 --- 2 files changed, 25 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index 8bc8ddc353..157297bc64 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -823,9 +823,6 @@ void bnxt_set_mark_in_mbuf(struct bnxt *bp, struct rte_mbuf *mbuf) { uint32_t cfa_code = 0; - uint8_t meta_fmt = 0; - uint16_t flags2 = 0; - uint32_t meta = 0; cfa_code = rte_le_to_cpu_16(rxcmp1->cfa_code); if (!cfa_code) @@ -834,25 +831,6 @@ void bnxt_set_mark_in_mbuf(struct bnxt *bp, if (cfa_code && !bp->mark_table[cfa_code].valid) return; - flags2 = rte_le_to_cpu_16(rxcmp1->flags2); - meta = rte_le_to_cpu_32(rxcmp1->metadata); - if (meta) { - meta >>= BNXT_RX_META_CFA_CODE_SHIFT; - - /* The flags field holds extra bits of info from [6:4] - * which indicate if the flow is in TCAM or EM or EEM - */ - meta_fmt = (flags2 & BNXT_CFA_META_FMT_MASK) >> - BNXT_CFA_META_FMT_SHFT; - - /* meta_fmt == 4 => 'b100 => 'b10x => EM. - * meta_fmt == 5 => 'b101 => 'b10x => EM + VLAN - * meta_fmt == 6 => 'b110 => 'b11x => EEM - * meta_fmt == 7 => 'b111 => 'b11x => EEM + VLAN. - */ - meta_fmt >>= BNXT_CFA_META_FMT_EM_EEM_SHFT; - } - mbuf->hash.fdir.hi = bp->mark_table[cfa_code].mark_id; mbuf->ol_flags |= RTE_MBUF_F_RX_FDIR | RTE_MBUF_F_RX_FDIR_ID; } diff --git a/drivers/net/bnxt/tf_ulp/ulp_utils.c b/drivers/net/bnxt/tf_ulp/ulp_utils.c index df3afaa6fd..c60d81d14a 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_utils.c +++ b/drivers/net/bnxt/tf_ulp/ulp_utils.c @@ -200,7 +200,6 @@ ulp_bs_push_msb(uint8_t *bs, uint16_t pos, uint8_t len, uint8_t *val) { int i; int cnt = (len + 7) / 8; - int tlen = len; /* Handle any remainder bits */ int tmp = len % 8; @@ -211,12 +210,10 @@ ulp_bs_push_msb(uint8_t *bs, uint16_t pos, uint8_t len, uint8_t *val) ulp_bs_put_msb(bs, pos, tmp, val[0]); pos += tmp; - tlen -= tmp; for (i = 1; i < cnt; i++) { ulp_bs_put_msb(bs, pos, 8, val[i]); pos += 8; - tlen -= 8; } return len; -- 2.39.5