From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D4F82A04B1 for ; Thu, 5 Nov 2020 13:40:54 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BCD28C7FA; Thu, 5 Nov 2020 13:40:53 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 71A4CC7FA for ; Thu, 5 Nov 2020 13:40:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hVCE4semRW/yGL9dxMx8aetXQGGIHAlkfKPa4peQgGI=; b=MNKOx6bXnErLw5akB0BiwRWW/YowTp4OIuq6RkU10QAvOOl6krU+uCGIOriDjjdl4dH3a7 sWFbNVfx8gGuOUew8omap/IU2yXTE29UC3EeE4NhxYDykxVhgkOzlVJrbRYuRbLpvcVd0R 8xgMTT2tx115OxqkruSkigWX5i42V+E= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-365-CAyYmiBcM0-yyXzukcL-rg-1; Thu, 05 Nov 2020 07:40:47 -0500 X-MC-Unique: CAyYmiBcM0-yyXzukcL-rg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 05C64107464B; Thu, 5 Nov 2020 12:40:46 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id A57E35F9C0; Thu, 5 Nov 2020 12:40:44 +0000 (UTC) From: Kevin Traynor To: Guinan Sun Cc: Jesse Brandeburg , Qi Zhang , dpdk stable Date: Thu, 5 Nov 2020 12:39:16 +0000 Message-Id: <20201105124015.306404-9-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'net/i40e/base: fix function header arguments' has been queued to LTS release 18.11.11 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/10/20. 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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/b6486a7c0836f233494165afcefdc14c2ee7c7c4 Thanks. Kevin. --- >From b6486a7c0836f233494165afcefdc14c2ee7c7c4 Mon Sep 17 00:00:00 2001 From: Guinan Sun Date: Sat, 12 Sep 2020 03:00:34 +0000 Subject: [PATCH] net/i40e/base: fix function header arguments [ upstream commit 36fcba1ff56a99bd052cc8f1e24fb5fd4afe27ac ] Fix them by adding the argument descriptions. Fixes: 0d9d27bb8684 ("i40e/base: prepare local LLDP MIB in TLV") Signed-off-by: Jesse Brandeburg Signed-off-by: Guinan Sun Acked-by: Qi Zhang --- drivers/net/i40e/base/i40e_dcb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/base/i40e_dcb.c b/drivers/net/i40e/base/i40e_dcb.c index d99bd6e3f8..5a1f9903a5 100644 --- a/drivers/net/i40e/base/i40e_dcb.c +++ b/drivers/net/i40e/base/i40e_dcb.c @@ -1213,5 +1213,6 @@ enum i40e_status_code i40e_set_dcb_config(struct i40e_hw *hw) /** * i40e_dcb_config_to_lldp - Convert Dcbconfig to MIB format - * @hw: pointer to the hw struct + * @lldpmib: pointer to mib to be output + * @miblen: pointer to u16 for length of lldpmib * @dcbcfg: store for LLDPDU data * -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.436180044 +0000 +++ 0009-net-i40e-base-fix-function-header-arguments.patch 2020-11-05 12:38:54.157895955 +0000 @@ -1 +1 @@ -From 36fcba1ff56a99bd052cc8f1e24fb5fd4afe27ac Mon Sep 17 00:00:00 2001 +From b6486a7c0836f233494165afcefdc14c2ee7c7c4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 36fcba1ff56a99bd052cc8f1e24fb5fd4afe27ac ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index a07c61e673..388af3d64d 100644 +index d99bd6e3f8..5a1f9903a5 100644 @@ -22 +23 @@ -@@ -1268,5 +1268,6 @@ enum i40e_status_code i40e_set_dcb_config(struct i40e_hw *hw) +@@ -1213,5 +1213,6 @@ enum i40e_status_code i40e_set_dcb_config(struct i40e_hw *hw)