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 3618AA0093 for ; Thu, 28 May 2020 18:25:33 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 298BB1DC30; Thu, 28 May 2020 18:25:33 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 864021DC19 for ; Thu, 28 May 2020 18:25:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683130; 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=MqT+xoIjOPFipnkbu87CIGjqapfJ0o44huARqJ55JO4=; b=cqrdOhJ2BLukWAMBnUNoYnTXrItJcOAR56W9oTIPScZy5lV9/n5lwUSuLrCDV2rgSQZpwy RVzKVBiwPBTnL7/ocZQusMJOXWh4bke5XTaDMN/ezbYMQWoy4X6I9m9T9TRdUexslZdCHR xXuYxWQg5OcGHEXkrX2dn6xniP+eTng= 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-374-PIJkfNGdP2mDMyvOFCKJPA-1; Thu, 28 May 2020 12:25:26 -0400 X-MC-Unique: PIJkfNGdP2mDMyvOFCKJPA-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4F88D1005510; Thu, 28 May 2020 16:25:25 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66E3D60C81; Thu, 28 May 2020 16:25:24 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Ferruh Yigit , dpdk stable Date: Thu, 28 May 2020 17:22:39 +0100 Message-Id: <20200528162322.7863-52-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/tap: remove unused assert' has been queued to LTS release 18.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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.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 06/03/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/206b15059a696044d796e430bfe010209d55c10d Thanks. Kevin. --- >From 206b15059a696044d796e430bfe010209d55c10d Mon Sep 17 00:00:00 2001 From: Yunjian Wang 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 Reviewed-by: Ferruh Yigit --- 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 9964f39db5..7b3954621e 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -20,5 +20,4 @@ #include -#include #include #include @@ -674,6 +673,4 @@ pmd_tx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) 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 @@ -8,5 +8,4 @@ */ -#include #include #include -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:01.818379086 +0100 +++ 0052-net-tap-remove-unused-assert.patch 2020-05-28 17:12:59.125555857 +0100 @@ -1 +1 @@ -From 252566dab58820ccdae67865646160c07af18e76 Mon Sep 17 00:00:00 2001 +From 206b15059a696044d796e430bfe010209d55c10d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 252566dab58820ccdae67865646160c07af18e76 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 2c9fb76b63..4b2168e440 100644 +index 9964f39db5..7b3954621e 100644 @@ -28 +29 @@ -@@ -672,6 +671,4 @@ pmd_tx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -674,6 +673,4 @@ pmd_tx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)