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 E1A29A0518 for ; Fri, 24 Jul 2020 14:12:01 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D65861C012; Fri, 24 Jul 2020 14:12:01 +0200 (CEST) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by dpdk.org (Postfix) with ESMTP id BA00E1C012 for ; Fri, 24 Jul 2020 14:12:00 +0200 (CEST) Received: by mail-wr1-f43.google.com with SMTP id y3so8096235wrl.4 for ; Fri, 24 Jul 2020 05:12:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=INl90raOkPVixKDZ29mNzCVWGX4BQ31HI0O4yro9Ibk=; b=Ki8e8xWT3OtVYZpJ3DRnmqhA3VwD2Uiv7eAlZL67yZddT5P8OLI3K8EXefXdTVbWhU N3IKqW7IJiXm78IsET3VAGjxVkKfF2e32HY1R4soZ72bj+m56DAmIwh81LG3O33BqAKU 1Xm0y1CV6uAOtM3UIXYhTsH2UKxfU3ypcLt4g54y4yLS4FGupw2xidEhLIJa8QjdXEXb 32ystn+Dx3RKaIQwG+m9P0cASvq7mCB/zpshwpShmSe7Wo0TudOhcAD1kmP1RC8d95Wx H9Yvi/yV0ypsDEuVgn93iiLIXgjL2mQcSuupjL+K/5LvoHhO83MfElwzu0ys5tlmeUTB dYSQ== 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=INl90raOkPVixKDZ29mNzCVWGX4BQ31HI0O4yro9Ibk=; b=bCoDmiBouC+R9E+/aPkzv8UYzHxTerX37jSC3E+N9MuIti7fJhSZ21/pHMQG0ciDru WxL56zIF4KblTH2mf4oEmjUsE6azUogIA5Zgu4NyrUIBfb54dWn1LHZNvg4myoBroQSA Ec3kz5Z3irz8Z0FnexywRoDpbS+VI/q/x3dlDFcYXUDJeE4qbTj2GxWQGj6U2+9VNRid SLyKwmU3DXeTSvNTOEiU/taGnRVzLcI7v4TNFkiUukfeINVXr6VCd5c+d8AT+cXdTZkv b8Yz46crp6PGPFPLxhrfsFn4r56JdmgmZ53Tz8Z/avti9UkkcLHU9+tbmA7/0zY7pkU2 d3Jw== X-Gm-Message-State: AOAM533Ani6mp7WfE9rpfoqvkx+5LXyo60tq5xhjRTpRI1KypObvr3Dd 9pnWReMcQE9BbpRTs5lzDFkDNHSUL8Gqgg== X-Google-Smtp-Source: ABdhPJy4o2+wdq9wx4bHdBaZeDS1G0ui05PEOBSw2kBam+3tgAYkYLdxXlRNA63q+xH69D5Q4LnXjA== X-Received: by 2002:adf:d08d:: with SMTP id y13mr8873017wrh.313.1595592720034; Fri, 24 Jul 2020 05:12:00 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a10sm15121702wmd.3.2020.07.24.05.11.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:11:59 -0700 (PDT) From: luca.boccassi@gmail.com To: Raslan Darawsheh Cc: Ferruh Yigit , dpdk stable Date: Fri, 24 Jul 2020 13:00:14 +0100 Message-Id: <20200724120030.1863487-176-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net: fix pedantic build' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From ba90ba0ca2285ab0a2af461eb2c3c3e10d0c5795 Mon Sep 17 00:00:00 2001 From: Raslan Darawsheh Date: Tue, 21 Jul 2020 11:31:55 +0300 Subject: [PATCH] net: fix pedantic build [ upstream commit e4f9eab7d948b952cc65e9e360576de3ff1f7a9e ] when trying to compile rte_mpls with pedantic enabled, on old compilers like 4.8 it will complain about bit field definition. error: type of bit-field 'bs' is a GCC extension [-Werror=pedantic] error: type of bit-field 'tc' is a GCC extension [-Werror=pedantic] error: type of bit-field 'tag_lsb' is a GCC extension [-Werror=pedantic] This fixes the compilation error by adding extension to the header definition. Fixes: e480cf487a0d ("net: add MPLS header structure") Signed-off-by: Raslan Darawsheh Reviewed-by: Ferruh Yigit --- lib/librte_net/rte_mpls.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_net/rte_mpls.h b/lib/librte_net/rte_mpls.h index 32b643121..14663f51b 100644 --- a/lib/librte_net/rte_mpls.h +++ b/lib/librte_net/rte_mpls.h @@ -21,6 +21,7 @@ extern "C" { /** * MPLS header. */ +__extension__ struct rte_mpls_hdr { uint16_t tag_msb; /**< Label(msb). */ #if RTE_BYTE_ORDER == RTE_BIG_ENDIAN -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:55.352782735 +0100 +++ 0176-net-fix-pedantic-build.patch 2020-07-24 12:53:48.599012273 +0100 @@ -1,8 +1,10 @@ -From e4f9eab7d948b952cc65e9e360576de3ff1f7a9e Mon Sep 17 00:00:00 2001 +From ba90ba0ca2285ab0a2af461eb2c3c3e10d0c5795 Mon Sep 17 00:00:00 2001 From: Raslan Darawsheh Date: Tue, 21 Jul 2020 11:31:55 +0300 Subject: [PATCH] net: fix pedantic build +[ upstream commit e4f9eab7d948b952cc65e9e360576de3ff1f7a9e ] + when trying to compile rte_mpls with pedantic enabled, on old compilers like 4.8 it will complain about bit field definition. @@ -14,7 +16,6 @@ definition. Fixes: e480cf487a0d ("net: add MPLS header structure") -Cc: stable@dpdk.org Signed-off-by: Raslan Darawsheh Reviewed-by: Ferruh Yigit @@ -23,7 +24,7 @@ 1 file changed, 1 insertion(+) diff --git a/lib/librte_net/rte_mpls.h b/lib/librte_net/rte_mpls.h -index db91707e6..3e8cb90ec 100644 +index 32b643121..14663f51b 100644 --- a/lib/librte_net/rte_mpls.h +++ b/lib/librte_net/rte_mpls.h @@ -21,6 +21,7 @@ extern "C" {