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 A3DC1A04B1 for ; Fri, 28 Aug 2020 12:14:04 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9CCB8A3; Fri, 28 Aug 2020 12:14:04 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id C32421C10A for ; Fri, 28 Aug 2020 12:14:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598609641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3AXmZMjoWfN2EvUFKWnMomvMRtIUtNPJ+nE1sku9usc=; b=dqMtPxmDERGVm0/jgqSwpUKMoAE5ecBGwqZ9nLBV+ktFydIVelqWPakLLpIfZdnb1VVFbb ZLBpvRoTUX36Il81lP2RDYt9CE5U8YfaFMc1DxXHAiCP68n176aQDt1ZkxmsNUSgH0k/SJ VBOiDIwtoGBl3XdXYbhH4D1+3tqLCV0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-254-2SI1OkrxNfWjVZP40tBFYA-1; Fri, 28 Aug 2020 06:13:58 -0400 X-MC-Unique: 2SI1OkrxNfWjVZP40tBFYA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0B9D310ABDBF; Fri, 28 Aug 2020 10:13:57 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0BA5B19D7C; Fri, 28 Aug 2020 10:13:55 +0000 (UTC) From: Kevin Traynor To: Raslan Darawsheh Cc: Ferruh Yigit , dpdk stable Date: Fri, 28 Aug 2020 11:12:41 +0100 Message-Id: <20200828101308.223767-15-ktraynor@redhat.com> In-Reply-To: <20200828101308.223767-1-ktraynor@redhat.com> References: <20200828101308.223767-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net: fix pedantic build' has been queued to LTS release 18.11.10 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 LTS release 18.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/02/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/544af62d826c9ec383817c87df46bdf0e3a826ce Thanks. Kevin. --- >From 544af62d826c9ec383817c87df46bdf0e3a826ce 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 11d26ba35d..dabec32446 100644 --- a/lib/librte_net/rte_mpls.h +++ b/lib/librte_net/rte_mpls.h @@ -22,4 +22,5 @@ extern "C" { * MPLS header. */ +__extension__ struct mpls_hdr { uint16_t tag_msb; /**< Label(msb). */ -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-28 11:03:26.326443705 +0100 +++ 0015-net-fix-pedantic-build.patch 2020-08-28 11:03:25.943955610 +0100 @@ -1 +1 @@ -From e4f9eab7d948b952cc65e9e360576de3ff1f7a9e Mon Sep 17 00:00:00 2001 +From 544af62d826c9ec383817c87df46bdf0e3a826ce Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e4f9eab7d948b952cc65e9e360576de3ff1f7a9e ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index db91707e67..3e8cb90ec3 100644 +index 11d26ba35d..dabec32446 100644 @@ -33 +34 @@ - struct rte_mpls_hdr { + struct mpls_hdr {