From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ktraynor@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28])
by dpdk.org (Postfix) with ESMTP id 2C4691B952
for <stable@dpdk.org>; Fri, 14 Dec 2018 18:52:41 +0100 (CET)
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id 8B99288E5A;
Fri, 14 Dec 2018 17:52:40 +0000 (UTC)
Received: from ktraynor.remote.csb (ovpn-116-106.ams2.redhat.com
[10.36.116.106])
by smtp.corp.redhat.com (Postfix) with ESMTP id 7ADCA60BF7;
Fri, 14 Dec 2018 17:52:39 +0000 (UTC)
From: Kevin Traynor <ktraynor@redhat.com>
To: Asaf Penso <asafp@mellanox.com>
Cc: Ferruh Yigit <ferruh.yigit@intel.com>,
dpdk stable <stable@dpdk.org>
Date: Fri, 14 Dec 2018 17:51:48 +0000
Message-Id: <20181214175203.24908-4-ktraynor@redhat.com>
In-Reply-To: <20181214175203.24908-1-ktraynor@redhat.com>
References: <20181214175203.24908-1-ktraynor@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.5.110.25]); Fri, 14 Dec 2018 17:52:40 +0000 (UTC)
Subject: [dpdk-stable] patch 'net/mlx5: fix function documentation' has been
queued to stable release 18.08.1
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Dec 2018 17:52:41 -0000
Hi,
FYI, your patch has been queued to stable release 18.08.1
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/18/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.
Kevin Traynor
---
>>From 6f37e89edd00ef821ad5f67de93aec551cfa7c54 Mon Sep 17 00:00:00 2001
From: Asaf Penso <asafp@mellanox.com>
Date: Thu, 29 Nov 2018 11:39:32 +0000
Subject: [PATCH] net/mlx5: fix function documentation
[ upstream commit 16a25aa1b73f1a2249979c226c9ced24802e87a6 ]
tso and vlan parameters were removed from the signature
of txq_mbuf_to_swp function.
The documentation of the function was not updated accordingly.
Remove the tso and vlan documentation to match the function signature.
Fixes: 8f6d9e13a98c ("net/mlx5: remove redundant checks")
Signed-off-by: Asaf Penso <asafp@mellanox.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
drivers/net/mlx5/mlx5_rxtx.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h
index 9281750e9..d5ce21b2b 100644
--- a/drivers/net/mlx5/mlx5_rxtx.h
+++ b/drivers/net/mlx5/mlx5_rxtx.h
@@ -733,8 +733,4 @@ mlx5_tx_dbrec(struct mlx5_txq_data *txq, volatile struct mlx5_wqe *wqe)
* @param buf
* Pointer to the mbuf.
- * @param tso
- * TSO offloads enabled.
- * @param vlan
- * VLAN offloads enabled
* @param offsets
* Pointer to the SWP header offsets.
--
2.19.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2018-12-14 17:49:47.810841443 +0000
+++ 0004-net-mlx5-fix-function-documentation.patch 2018-12-14 17:49:47.000000000 +0000
@@ -1,8 +1,10 @@
-From 16a25aa1b73f1a2249979c226c9ced24802e87a6 Mon Sep 17 00:00:00 2001
+From 6f37e89edd00ef821ad5f67de93aec551cfa7c54 Mon Sep 17 00:00:00 2001
From: Asaf Penso <asafp@mellanox.com>
Date: Thu, 29 Nov 2018 11:39:32 +0000
Subject: [PATCH] net/mlx5: fix function documentation
+[ upstream commit 16a25aa1b73f1a2249979c226c9ced24802e87a6 ]
+
tso and vlan parameters were removed from the signature
of txq_mbuf_to_swp function.
@@ -11,7 +13,6 @@
Remove the tso and vlan documentation to match the function signature.
Fixes: 8f6d9e13a98c ("net/mlx5: remove redundant checks")
-Cc: stable@dpdk.org
Signed-off-by: Asaf Penso <asafp@mellanox.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
@@ -20,10 +21,10 @@
1 file changed, 4 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h
-index f47d327cf..75194a3fa 100644
+index 9281750e9..d5ce21b2b 100644
--- a/drivers/net/mlx5/mlx5_rxtx.h
+++ b/drivers/net/mlx5/mlx5_rxtx.h
-@@ -734,8 +734,4 @@ mlx5_tx_dbrec(struct mlx5_txq_data *txq, volatile struct mlx5_wqe *wqe)
+@@ -733,8 +733,4 @@ mlx5_tx_dbrec(struct mlx5_txq_data *txq, volatile struct mlx5_wqe *wqe)
* @param buf
* Pointer to the mbuf.
- * @param tso