From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 692591B505 for ; Fri, 30 Nov 2018 00:13:51 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:19:42 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id wATNCW7i032075; Fri, 30 Nov 2018 01:13:47 +0200 From: Yongseok Koh To: Hyong Youb Kim Cc: John Daley , dpdk stable Date: Thu, 29 Nov 2018 15:10:38 -0800 Message-Id: <20181129231202.30436-44-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'net/enic: do not use non-standard integer types' has been queued to LTS release 17.11.5 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: , X-List-Received-Date: Thu, 29 Nov 2018 23:13:51 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.5 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/01/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. Yongseok --- >>From 07bccff33a53ddcb5ed083177150e5cc3377d5b8 Mon Sep 17 00:00:00 2001 From: Hyong Youb Kim 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 Reviewed-by: John Daley --- drivers/net/enic/base/vnic_devcmd.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/enic/base/vnic_devcmd.h b/drivers/net/enic/base/vnic_devcmd.h index 05d87b919..4d7a85d66 100644 --- a/drivers/net/enic/base/vnic_devcmd.h +++ b/drivers/net/enic/base/vnic_devcmd.h @@ -880,7 +880,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. */ @@ -946,9 +946,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 */ @@ -962,10 +962,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: @@ -1004,10 +1004,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.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:47.184182414 -0800 +++ 0044-net-enic-do-not-use-non-standard-integer-types.patch 2018-11-29 15:01:45.090960000 -0800 @@ -1,12 +1,13 @@ -From 329380b3a13fe00f97465a5e27bb9535157bbe33 Mon Sep 17 00:00:00 2001 +From 07bccff33a53ddcb5ed083177150e5cc3377d5b8 Mon Sep 17 00:00:00 2001 From: Hyong Youb Kim 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@dpdk.org Signed-off-by: Hyong Youb Kim Reviewed-by: John Daley @@ -15,10 +16,10 @@ 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/enic/base/vnic_devcmd.h b/drivers/net/enic/base/vnic_devcmd.h -index a22d8a76c..fffe307e0 100644 +index 05d87b919..4d7a85d66 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 { +@@ -880,7 +880,7 @@ struct filter_action_v2 { u32 rq_idx; u32 flags; /* use FILTER_ACTION_XXX_FLAG defines */ u16 filter_id; @@ -27,7 +28,7 @@ } __attribute__((packed)); /* Specifies the filter type. */ -@@ -941,9 +941,9 @@ enum { +@@ -946,9 +946,9 @@ enum { }; struct filter_tlv { @@ -40,7 +41,7 @@ }; /* Data for CMD_ADD_FILTER is 2 TLV and filter + action structs */ -@@ -957,10 +957,10 @@ struct filter_tlv { +@@ -962,10 +962,10 @@ struct filter_tlv { * drivers should use this instead of "sizeof (struct filter_v2)" when * computing length for TLV. */ @@ -53,7 +54,7 @@ switch (fp->type) { case FILTER_USNIC_ID: -@@ -999,10 +999,10 @@ enum { +@@ -1004,10 +1004,10 @@ enum { * drivers should use this instead of "sizeof (struct filter_action_v2)" * when computing length for TLV. */