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 6364CA0521; Tue, 28 Jul 2020 08:39:26 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A6F6E1C1FC; Tue, 28 Jul 2020 08:35:55 +0200 (CEST) Received: from mail-wm1-f99.google.com (mail-wm1-f99.google.com [209.85.128.99]) by dpdk.org (Postfix) with ESMTP id BC3AF1C0BC for ; Tue, 28 Jul 2020 08:35:33 +0200 (CEST) Received: by mail-wm1-f99.google.com with SMTP id f18so17000379wml.3 for ; Mon, 27 Jul 2020 23:35:33 -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=XnKUdg5sYY0JIaFkIXoKJkfOufRl0In5BNOm12EKHVBZi/PmZBdWaUrFE336wD6fS3 aP3Fut6EBCHVc47IUPxJ4f4W8gLR26pbvVSjrFY9ltXM+ohwZhUtxmZlk2z0qiVBec3g c1tsz+Hh7TJfRtuwfI3B7yB9lO/jJ9GRR1Q2A= 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=Tuv8U0nDF4lPKwoRX78y1hl2ywqRSpLHIynhp3x7LvJ8yw0SWS+iXirlXR4WPqK7Ap aevyaQfmW5TkdtvEt7cGlyYTbfc6u+q/0Tzz/SnYQ7hqT9A1aTR51A2dGF5ch7qYnBxk rwwtydWUt5wgDS2fy+pZVb7jOm0nyL2wTr4qUgKN2IvXLqCP8V+n6UviyN1ame66yt7d m0FmR1kCPOgfDpyChTgyyZi9s2o/v+rhG30OzbVpOZTjiM3OGjn/8Fe5JYl1DRhrlN5Y GYKEX1Ez3k0fvM369T8pCiWWZwdAFGgC3uAR3DbDNiCrSbKHy01V/yfGI8jB48E4exNM 7n1g== X-Gm-Message-State: AOAM533w7BZg9CBkvrE5uuK7niX0fmtAGSIVRABrVB7+NqSXiOjdCVTh GoYCgdtdEKz9dS8eEUZQnRM08zyvLaw9WMu4rDpaM7E1ct3m6LoXKAy3bNfipHj6Wz9aa9sxjlN WzdtpCnFtLi7IQyKjUi0FM+/7bqWIFVIbzvwIWze6I1DpUXYyx+XHzPvKvxaqWOodqW6SoKLEAg 28yw== X-Google-Smtp-Source: ABdhPJxLi4unO1yLnsfkRsXHdNhei393Il6rXpnYrFwqswU+RrjgQqRKJTcoTJrUh4rSRs17MZ6ADgWJsAMz X-Received: by 2002:a1c:24d5:: with SMTP id k204mr58859wmk.159.1595918133283; Mon, 27 Jul 2020 23:35:33 -0700 (PDT) Received: from localhost.localdomain ([192.19.223.252]) by smtp-relay.gmail.com with ESMTPS id r16sm30828wmh.29.2020.07.27.23.35.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Jul 2020 23:35:33 -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: Mon, 27 Jul 2020 23:34:39 -0700 Message-Id: <20200728063439.23114-23-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) In-Reply-To: <20200728063439.23114-1-ajit.khaparde@broadcom.com> References: <20200728063439.23114-1-ajit.khaparde@broadcom.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v4 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)