From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 305BDA0093
for <public@inbox.dpdk.org>; Tue, 19 May 2020 15:07:50 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 287271D603;
Tue, 19 May 2020 15:07:50 +0200 (CEST)
Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com
[209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 6F5EB1D603
for <stable@dpdk.org>; Tue, 19 May 2020 15:07:49 +0200 (CEST)
Received: by mail-wm1-f68.google.com with SMTP id n5so3510720wmd.0
for <stable@dpdk.org>; Tue, 19 May 2020 06:07:49 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=pCnJNDarqrTODSgEyls47KtQ9d7Kavud9X8o98EMrBM=;
b=Z8LUjOpzOJ2FayNQa/XPM0cLd3bUuNA5lLTnEYKHiqMdIkuKEhgCAJv1E2MFAOkpJk
g7QLlQiDg/7RzxebNSkEQ30bCDM04KeqzBtvqGOxNUbM92T9EOjJ+6Ih6+jdxG7mbtDR
Wp7ZQdr8bQpYXC9q0OVbv9oLj03MZsC/25Fg0FBLYGWgFst7RsPvPLTLEm0CvwX7106x
4+tmvYZOKafprEJFB49f4EQHznDr0qBKerZ/J0toXGOkuVs+tY0ApKBgqygnrRXzqSfv
yBSSTlKiEEXjLBFqAS4Vjn/ChEPOjgllTPBQX3byYLBeng641wCphYkdhlo6nWsgQugN
5YKw==
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=pCnJNDarqrTODSgEyls47KtQ9d7Kavud9X8o98EMrBM=;
b=HdRz5c+IGxsU3lbxvoWgfBvaoPAWmm6gHnbCsOpJV5DCeGn5KijEl1n/mEAbD/yg5W
/mrzwHiURfF36IPDJXkWf8YJ3Vk1ap18dh9VRb1mWOz/G+QYIgoHVzBSRV60Jm25n9ii
fydhQkzcCzwDs8ovujd975FAGFUtrf+iBPBkb4BiVblX/A66TMPgEbZv9heFWEZUrFqN
ZGHyuh6KNuwk4WbVUG8SrR/tLBiF9V23Ygu6pf3Z2bA6JurAQcMk1MJ947LE0c9Hd7VO
123GtK6AkldFy/7AGLYr/CLojv+Wu4jGk1YteciFJbQx45YEMdG/+s7m3n1sJ5rLbnwS
4CUw==
X-Gm-Message-State: AOAM532Ae7uS9sGFV8XMUai1Cjo0AOSQisQJ4lbF6CTf45efsPt1qY5J
XVTpPYMm/5wD6mvem/rBUpQ=
X-Google-Smtp-Source: ABdhPJxTJP0SW3+VczHsStddpjadPtiGLC8DcdATwhR3SA3WQLYjosvMAcEvqhIWDT3MZGzaU338Xw==
X-Received: by 2002:a05:600c:1403:: with SMTP id
g3mr5702237wmi.51.1589893669193;
Tue, 19 May 2020 06:07:49 -0700 (PDT)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id i4sm16408568wrv.23.2020.05.19.06.07.48
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 19 May 2020 06:07:48 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Yunjian Wang <wangyunjian@huawei.com>
Cc: Ferruh Yigit <ferruh.yigit@intel.com>,
dpdk stable <stable@dpdk.org>
Date: Tue, 19 May 2020 14:02:51 +0100
Message-Id: <20200519130549.112823-36-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com>
References: <20200519125804.104349-1-luca.boccassi@gmail.com>
<20200519130549.112823-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/tap: remove unused assert' has been queued
to stable release 19.11.3
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>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 19.11.3
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/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.
Thanks.
Luca Boccassi
---
>From d50174f38a68d63553455d863f9e43aaa12dff25 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Wed, 25 Mar 2020 11:04:56 +0800
Subject: [PATCH] net/tap: remove unused assert
[ upstream commit 252566dab58820ccdae67865646160c07af18e76 ]
The assert checks is not necessary, the gso_ctx is always non-NULL.
Fixes: 050316a88313 ("net/tap: support TSO (TCP Segment Offload)")
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
drivers/net/tap/rte_eth_tap.c | 3 ---
drivers/net/tap/tap_intr.c | 1 -
2 files changed, 4 deletions(-)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 2c9fb76b63..4b2168e440 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -19,7 +19,6 @@
#include <rte_ethdev.h>
#include <rte_errno.h>
-#include <assert.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
@@ -671,8 +670,6 @@ pmd_tx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
if (tso) {
struct rte_gso_ctx *gso_ctx = &txq->gso_ctx;
- assert(gso_ctx != NULL);
-
/* TCP segmentation implies TCP checksum offload */
mbuf_in->ol_flags |= PKT_TX_TCP_CKSUM;
diff --git a/drivers/net/tap/tap_intr.c b/drivers/net/tap/tap_intr.c
index 7af0010e37..58f36d3ccb 100644
--- a/drivers/net/tap/tap_intr.c
+++ b/drivers/net/tap/tap_intr.c
@@ -7,7 +7,6 @@
* Interrupts handling for tap driver.
*/
-#include <assert.h>
#include <errno.h>
#include <fcntl.h>
#include <signal.h>
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-05-19 14:04:46.049921587 +0100
+++ 0036-net-tap-remove-unused-assert.patch 2020-05-19 14:04:44.172647575 +0100
@@ -1,12 +1,13 @@
-From 252566dab58820ccdae67865646160c07af18e76 Mon Sep 17 00:00:00 2001
+From d50174f38a68d63553455d863f9e43aaa12dff25 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Wed, 25 Mar 2020 11:04:56 +0800
Subject: [PATCH] net/tap: remove unused assert
+[ upstream commit 252566dab58820ccdae67865646160c07af18e76 ]
+
The assert checks is not necessary, the gso_ctx is always non-NULL.
Fixes: 050316a88313 ("net/tap: support TSO (TCP Segment Offload)")
-Cc: stable@dpdk.org
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>