[dpdk-stable] patch 'net/bnxt: remove redundant header file inclusion' has been queued to LTS release 17.11.10

[luca.boccassi at gmail.com]

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 c33a0f118c662d746455390c2fb822ead70f5082 Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Date: Wed, 9 Oct 2019 18:41:45 -0700
Subject: [PATCH] net/bnxt: remove redundant header file inclusion

[ upstream commit f7b1b6b12da22be3016154c1399d0415fae0f927 ]

bnxt.h header includes bnxt_cpr.h and bnxt_util.h.
There is no need to include these headers file explicitly.

This commit does not cause any functional change.

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt_cpr.c    | 1 -
 drivers/net/bnxt/bnxt_ethdev.c | 1 -
 drivers/net/bnxt/bnxt_hwrm.c   | 1 -
 drivers/net/bnxt/bnxt_irq.c    | 1 -
 drivers/net/bnxt/bnxt_ring.c   | 1 -
 drivers/net/bnxt/bnxt_rxq.c    | 1 -
 drivers/net/bnxt/bnxt_rxr.c    | 1 -
 drivers/net/bnxt/bnxt_txq.c    | 1 -
 drivers/net/bnxt/bnxt_txr.c    | 1 -
 9 files changed, 9 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_cpr.c b/drivers/net/bnxt/bnxt_cpr.c
index ba702df753..a00fdb4d30 100644
--- a/drivers/net/bnxt/bnxt_cpr.c
+++ b/drivers/net/bnxt/bnxt_cpr.c
@@ -34,7 +34,6 @@
 #include <rte_malloc.h>
 
 #include "bnxt.h"
-#include "bnxt_cpr.h"
 #include "bnxt_hwrm.h"
 #include "bnxt_ring.h"
 #include "hsi_struct_def_dpdk.h"
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 3b74ea4a0d..f1bac2fcaa 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -41,7 +41,6 @@
 #include <rte_cycles.h>
 
 #include "bnxt.h"
-#include "bnxt_cpr.h"
 #include "bnxt_filter.h"
 #include "bnxt_hwrm.h"
 #include "bnxt_irq.h"
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 3b94c5c96b..7d824aeb45 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -41,7 +41,6 @@
 #include <rte_version.h>
 
 #include "bnxt.h"
-#include "bnxt_cpr.h"
 #include "bnxt_filter.h"
 #include "bnxt_hwrm.h"
 #include "bnxt_rxq.h"
diff --git a/drivers/net/bnxt/bnxt_irq.c b/drivers/net/bnxt/bnxt_irq.c
index c332431dba..7d69505fab 100644
--- a/drivers/net/bnxt/bnxt_irq.c
+++ b/drivers/net/bnxt/bnxt_irq.c
@@ -36,7 +36,6 @@
 #include <rte_malloc.h>
 
 #include "bnxt.h"
-#include "bnxt_cpr.h"
 #include "bnxt_irq.h"
 #include "bnxt_ring.h"
 #include "hsi_struct_def_dpdk.h"
diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
index 59d1035fdf..b5527d25a6 100644
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -36,7 +36,6 @@
 #include <unistd.h>
 
 #include "bnxt.h"
-#include "bnxt_cpr.h"
 #include "bnxt_hwrm.h"
 #include "bnxt_ring.h"
 #include "bnxt_rxq.h"
diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index 5088e9dfdc..cdc5bbfc9f 100644
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -36,7 +36,6 @@
 #include <rte_malloc.h>
 
 #include "bnxt.h"
-#include "bnxt_cpr.h"
 #include "bnxt_filter.h"
 #include "bnxt_hwrm.h"
 #include "bnxt_ring.h"
diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index 4aaad3563e..95bba9d58f 100644
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -40,7 +40,6 @@
 #include <rte_memory.h>
 
 #include "bnxt.h"
-#include "bnxt_cpr.h"
 #include "bnxt_ring.h"
 #include "bnxt_rxr.h"
 #include "bnxt_rxq.h"
diff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c
index 99dddddfc5..4ecb037674 100644
--- a/drivers/net/bnxt/bnxt_txq.c
+++ b/drivers/net/bnxt/bnxt_txq.c
@@ -36,7 +36,6 @@
 #include <rte_malloc.h>
 
 #include "bnxt.h"
-#include "bnxt_cpr.h"
 #include "bnxt_ring.h"
 #include "bnxt_txq.h"
 #include "bnxt_txr.h"
diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index e558413e35..abb705c5d1 100644
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -37,7 +37,6 @@
 #include <rte_malloc.h>
 
 #include "bnxt.h"
-#include "bnxt_cpr.h"
 #include "bnxt_ring.h"
 #include "bnxt_txq.h"
 #include "bnxt_txr.h"
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:28.738396461 +0000
+++ 0061-net-bnxt-remove-redundant-header-file-inclusion.patch	2019-12-19 14:32:26.129298301 +0000
@@ -1,21 +1,20 @@
-From f7b1b6b12da22be3016154c1399d0415fae0f927 Mon Sep 17 00:00:00 2001
+From c33a0f118c662d746455390c2fb822ead70f5082 Mon Sep 17 00:00:00 2001
 From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
 Date: Wed, 9 Oct 2019 18:41:45 -0700
 Subject: [PATCH] net/bnxt: remove redundant header file inclusion
 
+[ upstream commit f7b1b6b12da22be3016154c1399d0415fae0f927 ]
+
 bnxt.h header includes bnxt_cpr.h and bnxt_util.h.
 There is no need to include these headers file explicitly.
 
 This commit does not cause any functional change.
 
-Cc: stable at dpdk.org
-
 Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
 Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
 ---
  drivers/net/bnxt/bnxt_cpr.c    | 1 -
- drivers/net/bnxt/bnxt_ethdev.c | 2 --
- drivers/net/bnxt/bnxt_flow.c   | 1 -
+ drivers/net/bnxt/bnxt_ethdev.c | 1 -
  drivers/net/bnxt/bnxt_hwrm.c   | 1 -
  drivers/net/bnxt/bnxt_irq.c    | 1 -
  drivers/net/bnxt/bnxt_ring.c   | 1 -
@@ -23,14 +22,14 @@
  drivers/net/bnxt/bnxt_rxr.c    | 1 -
  drivers/net/bnxt/bnxt_txq.c    | 1 -
  drivers/net/bnxt/bnxt_txr.c    | 1 -
- 10 files changed, 11 deletions(-)
+ 9 files changed, 9 deletions(-)
 
 diff --git a/drivers/net/bnxt/bnxt_cpr.c b/drivers/net/bnxt/bnxt_cpr.c
-index f58372516a..118cf034d2 100644
+index ba702df753..a00fdb4d30 100644
 --- a/drivers/net/bnxt/bnxt_cpr.c
 +++ b/drivers/net/bnxt/bnxt_cpr.c
-@@ -8,7 +8,6 @@
- #include <rte_cycles.h>
+@@ -34,7 +34,6 @@
+ #include <rte_malloc.h>
  
  #include "bnxt.h"
 -#include "bnxt_cpr.h"
@@ -38,42 +37,22 @@
  #include "bnxt_ring.h"
  #include "hsi_struct_def_dpdk.h"
 diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
-index 4b39586479..84f7b87f31 100644
+index 3b74ea4a0d..f1bac2fcaa 100644
 --- a/drivers/net/bnxt/bnxt_ethdev.c
 +++ b/drivers/net/bnxt/bnxt_ethdev.c
-@@ -14,7 +14,6 @@
- #include <rte_alarm.h>
+@@ -41,7 +41,6 @@
+ #include <rte_cycles.h>
  
  #include "bnxt.h"
 -#include "bnxt_cpr.h"
  #include "bnxt_filter.h"
  #include "bnxt_hwrm.h"
  #include "bnxt_irq.h"
-@@ -27,7 +26,6 @@
- #include "bnxt_vnic.h"
- #include "hsi_struct_def_dpdk.h"
- #include "bnxt_nvm_defs.h"
--#include "bnxt_util.h"
- 
- #define DRV_MODULE_NAME		"bnxt"
- static const char bnxt_version[] =
-diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
-index bf198f8f23..5aeb001408 100644
---- a/drivers/net/bnxt/bnxt_flow.c
-+++ b/drivers/net/bnxt/bnxt_flow.c
-@@ -17,7 +17,6 @@
- #include "bnxt_ring.h"
- #include "bnxt_rxq.h"
- #include "bnxt_vnic.h"
--#include "bnxt_util.h"
- #include "hsi_struct_def_dpdk.h"
- 
- static int
 diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
-index 0d5362581e..f78beff711 100644
+index 3b94c5c96b..7d824aeb45 100644
 --- a/drivers/net/bnxt/bnxt_hwrm.c
 +++ b/drivers/net/bnxt/bnxt_hwrm.c
-@@ -13,7 +13,6 @@
+@@ -41,7 +41,6 @@
  #include <rte_version.h>
  
  #include "bnxt.h"
@@ -82,10 +61,10 @@
  #include "bnxt_hwrm.h"
  #include "bnxt_rxq.h"
 diff --git a/drivers/net/bnxt/bnxt_irq.c b/drivers/net/bnxt/bnxt_irq.c
-index 729d68d704..6c5bcfb623 100644
+index c332431dba..7d69505fab 100644
 --- a/drivers/net/bnxt/bnxt_irq.c
 +++ b/drivers/net/bnxt/bnxt_irq.c
-@@ -9,7 +9,6 @@
+@@ -36,7 +36,6 @@
  #include <rte_malloc.h>
  
  #include "bnxt.h"
@@ -94,10 +73,10 @@
  #include "bnxt_ring.h"
  #include "hsi_struct_def_dpdk.h"
 diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
-index 5bb2cdea91..886029c575 100644
+index 59d1035fdf..b5527d25a6 100644
 --- a/drivers/net/bnxt/bnxt_ring.c
 +++ b/drivers/net/bnxt/bnxt_ring.c
-@@ -9,7 +9,6 @@
+@@ -36,7 +36,6 @@
  #include <unistd.h>
  
  #include "bnxt.h"
@@ -106,10 +85,10 @@
  #include "bnxt_ring.h"
  #include "bnxt_rxq.h"
 diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
-index 9439fcd1fb..a46f96827c 100644
+index 5088e9dfdc..cdc5bbfc9f 100644
 --- a/drivers/net/bnxt/bnxt_rxq.c
 +++ b/drivers/net/bnxt/bnxt_rxq.c
-@@ -8,7 +8,6 @@
+@@ -36,7 +36,6 @@
  #include <rte_malloc.h>
  
  #include "bnxt.h"
@@ -118,10 +97,10 @@
  #include "bnxt_hwrm.h"
  #include "bnxt_ring.h"
 diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
-index bda4f4c1b9..f0f9b020b1 100644
+index 4aaad3563e..95bba9d58f 100644
 --- a/drivers/net/bnxt/bnxt_rxr.c
 +++ b/drivers/net/bnxt/bnxt_rxr.c
-@@ -12,7 +12,6 @@
+@@ -40,7 +40,6 @@
  #include <rte_memory.h>
  
  #include "bnxt.h"
@@ -130,10 +109,10 @@
  #include "bnxt_rxr.h"
  #include "bnxt_rxq.h"
 diff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c
-index 5ad4ee155e..ebb9199d2d 100644
+index 99dddddfc5..4ecb037674 100644
 --- a/drivers/net/bnxt/bnxt_txq.c
 +++ b/drivers/net/bnxt/bnxt_txq.c
-@@ -8,7 +8,6 @@
+@@ -36,7 +36,6 @@
  #include <rte_malloc.h>
  
  #include "bnxt.h"
@@ -142,10 +121,10 @@
  #include "bnxt_txq.h"
  #include "bnxt_txr.h"
 diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
-index 6e2ee86c05..16021407e8 100644
+index e558413e35..abb705c5d1 100644
 --- a/drivers/net/bnxt/bnxt_txr.c
 +++ b/drivers/net/bnxt/bnxt_txr.c
-@@ -9,7 +9,6 @@
+@@ -37,7 +37,6 @@
  #include <rte_malloc.h>
  
  #include "bnxt.h"