[dpdk-stable] patch 'net/enic: do not use non-standard integer types' has been queued to LTS release 16.11.9

[Luca Boccassi]

Hi,

FYI, your patch has been queued to LTS release 16.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/17/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Luca Boccassi

---
>From 91c15970a4602c7721c4d1b291e7c12d6b7bf213 Mon Sep 17 00:00:00 2001
From: Hyong Youb Kim <hyonkim at cisco.com>
Date: Tue, 25 Sep 2018 19:54:17 -0700
Subject: [PATCH] net/enic: do not use non-standard integer types

[ upstream commit 329380b3a13fe00f97465a5e27bb9535157bbe33 ]

Bugzilla ID: 39
Fixes: 9913fbb91df0 ("enic/base: common code")
Fixes: 322b355f2183 ("net/enic/base: bring NIC interface functions up to date")

Signed-off-by: Hyong Youb Kim <hyonkim at cisco.com>
Reviewed-by: John Daley <johndale at cisco.com>
---
 drivers/net/enic/base/vnic_devcmd.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/enic/base/vnic_devcmd.h b/drivers/net/enic/base/vnic_devcmd.h
index 785fd6fdfd..a94962621a 100644
--- a/drivers/net/enic/base/vnic_devcmd.h
+++ b/drivers/net/enic/base/vnic_devcmd.h
@@ -895,9 +895,9 @@ enum {
 };
 
 struct filter_tlv {
-	u_int32_t type;
-	u_int32_t length;
-	u_int32_t val[0];
+	uint32_t type;
+	uint32_t length;
+	uint32_t val[0];
 };
 
 /* Data for CMD_ADD_FILTER is 2 TLV and filter + action structs */
@@ -911,10 +911,10 @@ struct filter_tlv {
  * drivers should use this instead of "sizeof (struct filter_v2)" when
  * computing length for TLV.
  */
-static inline u_int32_t
+static inline uint32_t
 vnic_filter_size(struct filter_v2 *fp)
 {
-	u_int32_t size;
+	uint32_t size;
 
 	switch (fp->type) {
 	case FILTER_USNIC_ID:
-- 
2.19.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-10-15 12:48:34.789704164 +0100
+++ 0007-net-enic-do-not-use-non-standard-integer-types.patch	2018-10-15 12:48:34.513096018 +0100
@@ -1,33 +1,25 @@
-From 329380b3a13fe00f97465a5e27bb9535157bbe33 Mon Sep 17 00:00:00 2001
+From 91c15970a4602c7721c4d1b291e7c12d6b7bf213 Mon Sep 17 00:00:00 2001
 From: Hyong Youb Kim <hyonkim at cisco.com>
 Date: Tue, 25 Sep 2018 19:54:17 -0700
 Subject: [PATCH] net/enic: do not use non-standard integer types
 
+[ upstream commit 329380b3a13fe00f97465a5e27bb9535157bbe33 ]
+
 Bugzilla ID: 39
 Fixes: 9913fbb91df0 ("enic/base: common code")
 Fixes: 322b355f2183 ("net/enic/base: bring NIC interface functions up to date")
-Cc: stable at dpdk.org
 
 Signed-off-by: Hyong Youb Kim <hyonkim at cisco.com>
 Reviewed-by: John Daley <johndale at cisco.com>
 ---
- drivers/net/enic/base/vnic_devcmd.h | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
+ drivers/net/enic/base/vnic_devcmd.h | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/net/enic/base/vnic_devcmd.h b/drivers/net/enic/base/vnic_devcmd.h
-index a22d8a76c5..fffe307e02 100644
+index 785fd6fdfd..a94962621a 100644
 --- a/drivers/net/enic/base/vnic_devcmd.h
 +++ b/drivers/net/enic/base/vnic_devcmd.h
-@@ -875,7 +875,7 @@ struct filter_action_v2 {
- 	u32 rq_idx;
- 	u32 flags;                     /* use FILTER_ACTION_XXX_FLAG defines */
- 	u16 filter_id;
--	u_int8_t reserved[32];         /* for future expansion */
-+	uint8_t reserved[32];         /* for future expansion */
- } __attribute__((packed));
- 
- /* Specifies the filter type. */
-@@ -941,9 +941,9 @@ enum {
+@@ -895,9 +895,9 @@ enum {
  };
  
  struct filter_tlv {
@@ -40,7 +32,7 @@
  };
  
  /* Data for CMD_ADD_FILTER is 2 TLV and filter + action structs */
-@@ -957,10 +957,10 @@ struct filter_tlv {
+@@ -911,10 +911,10 @@ struct filter_tlv {
   * drivers should use this instead of "sizeof (struct filter_v2)" when
   * computing length for TLV.
   */
@@ -53,19 +45,6 @@
  
  	switch (fp->type) {
  	case FILTER_USNIC_ID:
-@@ -999,10 +999,10 @@ enum {
-  * drivers should use this instead of "sizeof (struct filter_action_v2)"
-  * when computing length for TLV.
-  */
--static inline u_int32_t
-+static inline uint32_t
- vnic_action_size(struct filter_action_v2 *fap)
- {
--	u_int32_t size;
-+	uint32_t size;
- 
- 	switch (fap->type) {
- 	case FILTER_ACTION_RQ_STEERING:
 -- 
 2.19.1