[dpdk-stable] patch 'net/bnxt: fix coding style' 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 d0a23459242dfab490d296a4bcb58a13f6eb527a Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Date: Wed, 9 Oct 2019 18:41:52 -0700
Subject: [PATCH] net/bnxt: fix coding style

[ upstream commit 996355970d3dbc1a7d3751a8cf63c1869b120638 ]

- Remove unnecessary new line
- Remove unnecessary blank lines
- Align rte_* header file inclusion at one place

Fixes: 37d6161a68ba ("net/bnxt: add ring group alloc/free")
Fixes: ec77c6298301 ("net/bnxt: add stats context allocation")

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt_ethdev.c |  1 -
 drivers/net/bnxt/bnxt_hwrm.c   | 11 +++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index f1bac2fcaa..0813865edc 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -2348,7 +2348,6 @@ bnxt_parse_fdir_filter(struct bnxt *bp,
 		return -EINVAL;
 	}
 
-
 	if (fdir_mode == RTE_FDIR_MODE_PERFECT_MAC_VLAN) {
 		rte_memcpy(filter->dst_macaddr,
 			fdir->input.flow.mac_vlan_flow.mac_addr.addr_bytes, 6);
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index a8d7c487f9..25b392eb4a 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -39,6 +39,7 @@
 #include <rte_malloc.h>
 #include <rte_memzone.h>
 #include <rte_version.h>
+#include <rte_io.h>
 
 #include "bnxt.h"
 #include "bnxt_filter.h"
@@ -51,8 +52,6 @@
 #include "bnxt_vnic.h"
 #include "hsi_struct_def_dpdk.h"
 
-#include <rte_io.h>
-
 struct bnxt_plcmodes_cfg {
 	uint32_t	flags;
 	uint16_t	jumbo_thresh;
@@ -1005,8 +1004,7 @@ int bnxt_hwrm_ring_grp_alloc(struct bnxt *bp, unsigned int idx)
 
 	HWRM_CHECK_RESULT();
 
-	bp->grp_info[idx].fw_grp_id =
-	    rte_le_to_cpu_16(resp->ring_group_id);
+	bp->grp_info[idx].fw_grp_id = rte_le_to_cpu_16(resp->ring_group_id);
 
 	HWRM_UNLOCK();
 
@@ -1064,8 +1062,7 @@ int bnxt_hwrm_stat_ctx_alloc(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,
 
 	req.update_period_ms = rte_cpu_to_le_32(0);
 
-	req.stats_dma_addr =
-	    rte_cpu_to_le_64(cpr->hw_stats_map);
+	req.stats_dma_addr = rte_cpu_to_le_64(cpr->hw_stats_map);
 
 	rc = bnxt_hwrm_send_message(bp, &req, sizeof(req));
 
@@ -2937,7 +2934,6 @@ int bnxt_hwrm_ctx_qstats(struct bnxt *bp, uint32_t cid, int idx,
 		stats->q_errors[idx] += rte_le_to_cpu_64(resp->tx_err_pkts);
 	}
 
-
 	HWRM_UNLOCK();
 
 	return rc;
@@ -3536,7 +3532,6 @@ int bnxt_hwrm_set_ntuple_filter(struct bnxt *bp,
 	      HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_DST_ID;
 	req.dst_id = rte_cpu_to_le_16(dst_id);
 
-
 	if (filter->ip_addr_type) {
 		req.ip_addr_type = filter->ip_addr_type;
 		enables |=
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:28.830799557 +0000
+++ 0063-net-bnxt-fix-coding-style.patch	2019-12-19 14:32:26.141298539 +0000
@@ -1,15 +1,16 @@
-From 996355970d3dbc1a7d3751a8cf63c1869b120638 Mon Sep 17 00:00:00 2001
+From d0a23459242dfab490d296a4bcb58a13f6eb527a Mon Sep 17 00:00:00 2001
 From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
 Date: Wed, 9 Oct 2019 18:41:52 -0700
 Subject: [PATCH] net/bnxt: fix coding style
 
+[ upstream commit 996355970d3dbc1a7d3751a8cf63c1869b120638 ]
+
 - Remove unnecessary new line
 - Remove unnecessary blank lines
 - Align rte_* header file inclusion at one place
 
 Fixes: 37d6161a68ba ("net/bnxt: add ring group alloc/free")
 Fixes: ec77c6298301 ("net/bnxt: add stats context allocation")
-Cc: stable at dpdk.org
 
 Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
 Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
@@ -19,10 +20,10 @@
  2 files changed, 3 insertions(+), 9 deletions(-)
 
 diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
-index 39bc06c6c7..90a97fac1b 100644
+index f1bac2fcaa..0813865edc 100644
 --- a/drivers/net/bnxt/bnxt_ethdev.c
 +++ b/drivers/net/bnxt/bnxt_ethdev.c
-@@ -3002,7 +3002,6 @@ bnxt_parse_fdir_filter(struct bnxt *bp,
+@@ -2348,7 +2348,6 @@ bnxt_parse_fdir_filter(struct bnxt *bp,
  		return -EINVAL;
  	}
  
@@ -31,10 +32,10 @@
  		rte_memcpy(filter->dst_macaddr,
  			fdir->input.flow.mac_vlan_flow.mac_addr.addr_bytes, 6);
 diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
-index f94fdde2b1..5b430b9415 100644
+index a8d7c487f9..25b392eb4a 100644
 --- a/drivers/net/bnxt/bnxt_hwrm.c
 +++ b/drivers/net/bnxt/bnxt_hwrm.c
-@@ -11,6 +11,7 @@
+@@ -39,6 +39,7 @@
  #include <rte_malloc.h>
  #include <rte_memzone.h>
  #include <rte_version.h>
@@ -42,16 +43,16 @@
  
  #include "bnxt.h"
  #include "bnxt_filter.h"
-@@ -23,8 +24,6 @@
+@@ -51,8 +52,6 @@
  #include "bnxt_vnic.h"
  #include "hsi_struct_def_dpdk.h"
  
 -#include <rte_io.h>
 -
- #define HWRM_SPEC_CODE_1_8_3		0x10803
- #define HWRM_VERSION_1_9_1		0x10901
- #define HWRM_VERSION_1_9_2		0x10903
-@@ -1483,8 +1482,7 @@ int bnxt_hwrm_ring_grp_alloc(struct bnxt *bp, unsigned int idx)
+ struct bnxt_plcmodes_cfg {
+ 	uint32_t	flags;
+ 	uint16_t	jumbo_thresh;
+@@ -1005,8 +1004,7 @@ int bnxt_hwrm_ring_grp_alloc(struct bnxt *bp, unsigned int idx)
  
  	HWRM_CHECK_RESULT();
  
@@ -61,7 +62,7 @@
  
  	HWRM_UNLOCK();
  
-@@ -1542,8 +1540,7 @@ int bnxt_hwrm_stat_ctx_alloc(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,
+@@ -1064,8 +1062,7 @@ int bnxt_hwrm_stat_ctx_alloc(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,
  
  	req.update_period_ms = rte_cpu_to_le_32(0);
  
@@ -69,17 +70,17 @@
 -	    rte_cpu_to_le_64(cpr->hw_stats_map);
 +	req.stats_dma_addr = rte_cpu_to_le_64(cpr->hw_stats_map);
  
- 	rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
+ 	rc = bnxt_hwrm_send_message(bp, &req, sizeof(req));
  
-@@ -3633,7 +3630,6 @@ int bnxt_hwrm_ctx_qstats(struct bnxt *bp, uint32_t cid, int idx,
- 		stats->q_obytes[idx] += rte_le_to_cpu_64(resp->tx_bcast_bytes);
+@@ -2937,7 +2934,6 @@ int bnxt_hwrm_ctx_qstats(struct bnxt *bp, uint32_t cid, int idx,
+ 		stats->q_errors[idx] += rte_le_to_cpu_64(resp->tx_err_pkts);
  	}
  
 -
  	HWRM_UNLOCK();
  
  	return rc;
-@@ -4218,7 +4214,6 @@ int bnxt_hwrm_set_ntuple_filter(struct bnxt *bp,
+@@ -3536,7 +3532,6 @@ int bnxt_hwrm_set_ntuple_filter(struct bnxt *bp,
  	      HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_DST_ID;
  	req.dst_id = rte_cpu_to_le_16(dst_id);