From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by dpdk.org (Postfix) with ESMTP id EBE98B62 for ; Mon, 15 Oct 2018 13:52:02 +0200 (CEST) Received: by mail-wr1-f52.google.com with SMTP id n11-v6so20874044wru.13 for ; Mon, 15 Oct 2018 04:52:02 -0700 (PDT) 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=PgfAVIjc1HilhXYu4qv1k1xOv83odyhr3Gh0TTuYZvU=; b=jfb1ewivwMT9HCa1KcSM+smovf38LaWBJt9QFMcDljF7PXCJgguT9pk44SEsQx4zVA WUEBmsToDtpY0Y3soDRj46NzDKtRKXVWBevLyBH3m303Idt7Owei76VRJajYLvoW/Le4 b6sOSwQc/u4UpEDGmY0Yv59F0IB+5J3lOV4ASTd9QrVE0RcbjioTzxCizZ22GN1jIUoR qo2AU4qnKBbzNA5+0K9qs7y5+uRut161l2zc+FBJcW89bYuZbwGFTfMbA47plc+R8LdW Cct+qC7mlsimM9cx5iaG0KM3zkhJsA8hNpUElH9W69AworPHqRfb9Zwshje3V3GFbymb aSjQ== X-Gm-Message-State: ABuFfogrJsPrvRU6UAQFMPx/hPCMUVY9PI5ZlSrrcyLpz4FAwfa1Di9T 5YBEH/S3KWp6ZtKq5bjhkudld00V X-Google-Smtp-Source: ACcGV60aLRbjE6MAvAPvVjHjWCKaSZSllwqdUgqJJBpKmuh7Vet1VhIyIDg8SulkVwMlTqJWBzoiDg== X-Received: by 2002:a5d:4101:: with SMTP id l1-v6mr15351665wrp.45.1539604322538; Mon, 15 Oct 2018 04:52:02 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id c18-v6sm8218222wrr.74.2018.10.15.04.52.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Oct 2018 04:52:01 -0700 (PDT) From: Luca Boccassi To: Hyong Youb Kim Cc: John Daley , dpdk stable Date: Mon, 15 Oct 2018 12:51:27 +0100 Message-Id: <20181015115144.27626-7-bluca@debian.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181015115144.27626-1-bluca@debian.org> References: <20181003162121.16364-1-bluca@debian.org> <20181015115144.27626-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/enic: do not use non-standard integer types' has been queued to LTS release 16.11.9 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: Mon, 15 Oct 2018 11:52:03 -0000 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 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 | 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 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 --- - 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