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 E0B26A04F6 for ; Thu, 19 Dec 2019 15:38:10 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D03011BF7B; Thu, 19 Dec 2019 15:38:10 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by dpdk.org (Postfix) with ESMTP id E023C1BFC3 for ; Thu, 19 Dec 2019 15:38:08 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id w15so6237777wru.4 for ; Thu, 19 Dec 2019 06:38:08 -0800 (PST) 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=NzZjiX8Vi44+xUzPlRVELyTDvhOpTrXKWBefrJpB14A=; b=FQtOJdcZkJGfoRr/K/RYRjxJEPgRnyVgYw9Ozwg/DqkNH3WUS2VTOgp7E+j8uBnRQP Q35Em0ddm4jEBv6DVa1WlDXCGYBcYEseDszYYH2vRbdESRF9zgj2LsUGoYei3LpiG1Au foFbxhxGPk6ox++FgE/Jfwz/Rd8WHylx8fnDYG1tAbwBulwhVzvGu5xIVNw8REiSap6w 6r5DiWNj7A8z15OePYTHmcKur8L56u9wvX9DZLhNMwHmoCkJ6tWlsGdDUZhhTpPW2fAD mefZX4zYivE9OgKIb3ZypeKzcsz781PsoOKG8C8yNXpjAtYCYQWigacld9TbDN+n6803 gsEQ== 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=NzZjiX8Vi44+xUzPlRVELyTDvhOpTrXKWBefrJpB14A=; b=UFvUmUzxbFcl+/RgjI4uXZgfv+EvYbsoTNL5q1/6TJ1o/xxUVeA+3jlNvPFmPWS9O5 Ny3+dffwapdgbFjMDl5nczpADZ6P8MLpzfRa2QGqwLS6rjPiG5Bfg3lft2B2hal0jEuD B8axcN6My+SRZcrc4rnVEe155X5QU7Ac1PZnwvNOEw8DCzkzL1XQy/6M23SSQj6TuJ4Z 8glySuIXUEw3GPf9kpPsFF7ljdDnqvgcwUC5eV8hGWniKsxLULAztLU567+XIKP8qttR jOaf4LZUQ4hBMozJUluP5LcTmkLAhIhvnTddgR5NfM86YBVlS19/wHkQffsRwn7kU1l1 tQxg== X-Gm-Message-State: APjAAAXo2qqW7jQmdpwp9MtBT0tjZ6fXg6+H0OjdElD8WZLkdaPk/Y0N bHhMcdR8krcmZDpoNgaWwBQ= X-Google-Smtp-Source: APXvYqygrWkqGMDuzvXBGhP7HGy8vjaQLPI5vXnJl/1gkTGKG9dzYdJkXKHDzTjemixnUND5jOFNrA== X-Received: by 2002:adf:e2cf:: with SMTP id d15mr9744778wrj.225.1576766288618; Thu, 19 Dec 2019 06:38:08 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id n14sm6232119wmi.26.2019.12.19.06.38.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:38:08 -0800 (PST) From: luca.boccassi@gmail.com To: Ciara Power Cc: Thomas Monjalon , dpdk stable Date: Thu, 19 Dec 2019 14:33:48 +0000 Message-Id: <20191219143447.21506-81-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'ethdev: fix include of ethernet header file' has been queued to LTS release 17.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 17.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 12/21/19. 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 33fe8e8a0ddba6eb58ac527eb70edb95cc9a9060 Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Wed, 23 Oct 2019 13:53:00 +0100 Subject: [PATCH] ethdev: fix include of ethernet header file [ upstream commit 22a076367369a04391a7b16d60a2905cf5c1da46 ] The include for rte_ether.h in each of these files should not use quotes, as the header file is not in the librte_ethdev directory. These are now updated to use <> symbols, to search directories pre-designated by the compiler. Fixes: 57668ed7bc08 ("net: move ethernet definitions to the net library") Signed-off-by: Ciara Power Acked-by: Thomas Monjalon --- lib/librte_ether/rte_eth_ctrl.h | 2 +- lib/librte_ether/rte_ethdev.c | 2 +- lib/librte_ether/rte_ethdev.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/librte_ether/rte_eth_ctrl.h b/lib/librte_ether/rte_eth_ctrl.h index 8386904243..c1c97bd638 100644 --- a/lib/librte_ether/rte_eth_ctrl.h +++ b/lib/librte_ether/rte_eth_ctrl.h @@ -36,7 +36,7 @@ #include #include -#include "rte_ether.h" +#include /** * @file diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 7998a3af4d..d8595ab34a 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -63,8 +63,8 @@ #include #include #include +#include -#include "rte_ether.h" #include "rte_ethdev.h" #include "ethdev_profile.h" diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 0d56cde76d..16a150842e 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -182,8 +182,8 @@ extern "C" { #include #include #include +#include -#include "rte_ether.h" #include "rte_eth_ctrl.h" #include "rte_dev_info.h" -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:29.588454409 +0000 +++ 0081-ethdev-fix-include-of-ethernet-header-file.patch 2019-12-19 14:32:26.197299650 +0000 @@ -1,8 +1,10 @@ -From 22a076367369a04391a7b16d60a2905cf5c1da46 Mon Sep 17 00:00:00 2001 +From 33fe8e8a0ddba6eb58ac527eb70edb95cc9a9060 Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Wed, 23 Oct 2019 13:53:00 +0100 Subject: [PATCH] ethdev: fix include of ethernet header file +[ upstream commit 22a076367369a04391a7b16d60a2905cf5c1da46 ] + The include for rte_ether.h in each of these files should not use quotes, as the header file is not in the librte_ethdev directory. @@ -10,57 +12,56 @@ pre-designated by the compiler. Fixes: 57668ed7bc08 ("net: move ethernet definitions to the net library") -Cc: stable@dpdk.org Signed-off-by: Ciara Power Acked-by: Thomas Monjalon --- - lib/librte_ethdev/rte_eth_ctrl.h | 2 +- - lib/librte_ethdev/rte_ethdev.c | 2 +- - lib/librte_ethdev/rte_ethdev.h | 2 +- + lib/librte_ether/rte_eth_ctrl.h | 2 +- + lib/librte_ether/rte_ethdev.c | 2 +- + lib/librte_ether/rte_ethdev.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/lib/librte_ethdev/rte_eth_ctrl.h b/lib/librte_ethdev/rte_eth_ctrl.h -index be4b4af65b..1416c371fb 100644 ---- a/lib/librte_ethdev/rte_eth_ctrl.h -+++ b/lib/librte_ethdev/rte_eth_ctrl.h -@@ -7,7 +7,7 @@ +diff --git a/lib/librte_ether/rte_eth_ctrl.h b/lib/librte_ether/rte_eth_ctrl.h +index 8386904243..c1c97bd638 100644 +--- a/lib/librte_ether/rte_eth_ctrl.h ++++ b/lib/librte_ether/rte_eth_ctrl.h +@@ -36,7 +36,7 @@ #include #include -#include "rte_ether.h" +#include - #include "rte_flow.h" /** -diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c -index 78da293979..7743205d38 100644 ---- a/lib/librte_ethdev/rte_ethdev.c -+++ b/lib/librte_ethdev/rte_ethdev.c -@@ -37,8 +37,8 @@ + * @file +diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c +index 7998a3af4d..d8595ab34a 100644 +--- a/lib/librte_ether/rte_ethdev.c ++++ b/lib/librte_ether/rte_ethdev.c +@@ -63,8 +63,8 @@ + #include + #include #include - #include - #include +#include -#include "rte_ether.h" #include "rte_ethdev.h" - #include "rte_ethdev_driver.h" #include "ethdev_profile.h" -diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h -index 33c528bb8e..c36c1b631f 100644 ---- a/lib/librte_ethdev/rte_ethdev.h -+++ b/lib/librte_ethdev/rte_ethdev.h -@@ -156,8 +156,8 @@ extern "C" { + +diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h +index 0d56cde76d..16a150842e 100644 +--- a/lib/librte_ether/rte_ethdev.h ++++ b/lib/librte_ether/rte_ethdev.h +@@ -182,8 +182,8 @@ extern "C" { #include #include #include +#include -#include "rte_ether.h" + #include "rte_eth_ctrl.h" #include "rte_dev_info.h" - extern int rte_eth_dev_logtype; -- 2.20.1