From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 04E90A0518; Fri, 24 Jul 2020 07:37:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EC16C1C196; Fri, 24 Jul 2020 07:34:47 +0200 (CEST) Received: from mail-ua1-f99.google.com (mail-ua1-f99.google.com [209.85.222.99]) by dpdk.org (Postfix) with ESMTP id D5F501C1CB for ; Fri, 24 Jul 2020 07:34:06 +0200 (CEST) Received: by mail-ua1-f99.google.com with SMTP id u6so2580408uau.8 for ; Thu, 23 Jul 2020 22:34:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9pLkqIBt1N/Wcwpd8QY6ki6GoJEoytzyw7DXr/qd+ww=; b=OM1DuU16AZ/OnMwV6d/Ey0Dex03diuLKunQwNq3S+r146NJCysd94jz8rfV4lS0RDu cBy7HOuvW3encvzjq8sB5SDpUUOGyiHHkxkUncuMBKv6mLuMDj9YjAOO1v81sYlZCl0R BFKRII8uEYy6U6+xOEtmy3conbANQ/k5VrIfA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9pLkqIBt1N/Wcwpd8QY6ki6GoJEoytzyw7DXr/qd+ww=; b=YECL4gp1J3/PvTH6nuUvLt/7Q8rfhp+TAwRezc5N3MQTJA2Vg4eUnaoNTc4Bg5OsUk CfiAG6z3bDUdCa4rQD4nSfAqyFzLGWxHUxYhTXZRYUcmY4RLPiD/A3hpBZ5rB+Gf4mhL zF9OUtkJo06YWwHLn8g5yjeXe9nUeUOGucAR86EWVPqq2yMiXdeBK4nvBTADzy6z3ctQ hy62BlSJZRfPGsq4vsQLlx2BmyFX7yWkrspd0hz8D1o6LfPLsQc4bPC7EdeJE4y7Tuzm ka7q8i7HZilJXO6Xwg2Iu49tbjhHMh4GfkMXZZl41F6ta8IdtWqX2V8NeCsSBM7E1yRt RFVA== X-Gm-Message-State: AOAM531HtshwOaahx7aXkWjia2COS+X8FJ4CLOFM1K+sNUoAInMSe1xl 0G+z6l01P0TyJYqCYh3A8REG8oZ9jtqfRQaycFVP0YGD6kH2hpbLYQ99hnxkcFze+7Ma/vkXtVB +0JAduz1E0eP+G6QZzpvEnNhSXNTDmtq0s5Xnpm+H3qIqHb/+87CEpEM2momQO9mxyX5jVyrj0J wSjA== X-Google-Smtp-Source: ABdhPJzQbRvdsm2g5DnP0iHLikl3OZdCL/ZdH99if6A/DDto2XtWHXqEyrmdDznRVoBtseQjo+E8soOlv//f X-Received: by 2002:ab0:4e98:: with SMTP id l24mr6889854uah.15.1595568846253; Thu, 23 Jul 2020 22:34:06 -0700 (PDT) Received: from localhost.localdomain ([192.19.223.252]) by smtp-relay.gmail.com with ESMTPS id h17sm592840vsk.0.2020.07.23.22.34.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jul 2020 22:34:06 -0700 (PDT) X-Relaying-Domain: broadcom.com From: Ajit Khaparde To: dev@dpdk.org Cc: ferruh.yigit@intel.com, stephen@networkplumber.org, Somnath Kotur , Venkat Duvvuru Date: Thu, 23 Jul 2020 22:32:35 -0700 Message-Id: <20200724053235.71069-23-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) In-Reply-To: <20200724053235.71069-1-ajit.khaparde@broadcom.com> References: <20200723115639.22357-1-somnath.kotur@broadcom.com> <20200724053235.71069-1-ajit.khaparde@broadcom.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v3 22/22] net/bnxt: fix build error with extra cflags X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" When we compile PMD with CFLAGS set to -O -g, build fails because of uninitialized error. This patch fixes it. Fixes: 1e46b3962620 ("net/bnxt: fill cfa action in Tx descriptor") Bugzilla ID: 509 Cc: stephen@networkplumber.org Signed-off-by: Ajit Khaparde Reviewed-by: Somnath Kotur Reviewed-by: Venkat Duvvuru --- drivers/net/bnxt/bnxt_txr.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c index 1113aca44..c7a2de67c 100644 --- a/drivers/net/bnxt/bnxt_txr.c +++ b/drivers/net/bnxt/bnxt_txr.c @@ -111,7 +111,7 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt, uint32_t outer_tpid_bd = 0; struct tx_bd_long *txbd; struct tx_bd_long_hi *txbd1 = NULL; - uint32_t vlan_tag_flags, cfa_action; + uint32_t vlan_tag_flags; bool long_bd = false; unsigned short nr_bds = 0; struct rte_mbuf *m_seg; @@ -187,13 +187,6 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt, txbd->flags_type |= TX_BD_LONG_TYPE_TX_BD_LONG; vlan_tag_flags = 0; - if (BNXT_TRUFLOW_EN(txq->bp)) { - if (txq->vfr_tx_cfa_action) - cfa_action = txq->vfr_tx_cfa_action; - else - cfa_action = txq->bp->tx_cfa_action; - } - /* HW can accelerate only outer vlan in QinQ mode */ if (tx_buf->mbuf->ol_flags & PKT_TX_QINQ_PKT) { vlan_tag_flags = TX_BD_LONG_CFA_META_KEY_VLAN_TAG | @@ -222,8 +215,10 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt, txbd1->lflags = 0; txbd1->cfa_meta = vlan_tag_flags; - if (BNXT_TRUFLOW_EN(txq->bp)) - txbd1->cfa_action = cfa_action; + if (txq->vfr_tx_cfa_action) + txbd1->cfa_action = txq->vfr_tx_cfa_action; + else + txbd1->cfa_action = txq->bp->tx_cfa_action; if (tx_pkt->ol_flags & PKT_TX_TCP_SEG) { uint16_t hdr_size; -- 2.21.1 (Apple Git-122.3)