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 E608BA051C for ; Tue, 11 Feb 2020 12:28:22 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DDA0C2B9C; Tue, 11 Feb 2020 12:28:22 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by dpdk.org (Postfix) with ESMTP id B2F2C2B9C for ; Tue, 11 Feb 2020 12:28:21 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id t23so3049459wmi.1 for ; Tue, 11 Feb 2020 03:28:21 -0800 (PST) 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=0GhuF1gq/FWNDrD4VCjZc0WmsUK9oz//iunyuPhUA6o=; b=raOacgXKiZPQhVqiP+/jFJ9fQ+4wa02s9+3UNTwTTVWQTWgTQ9Gpew1kec5+14fkt4 K0Z+CH4xVBQ2n616BMF0LsvktYlUjuiraFTcOF7Nq1knBX4HN86HUC88vu4vecEfYlsl 3DxVGcKs9/WrQuwcVfVXBrG41vbHuAuWuq3gSMV5irXR6s/8nYSgjJIRB+Wip0qEMguG p7Sps0+wrW+EQdUJILFZYOE3fV672jsxK0xY9oWrbmUV7BsFMtxcigOKNqrFxD+ByWW8 VCQGPNGr1u9tDdBi0T7xX1WUIb8iek1yM58XyxAlyxg5Lmoplyvz7Tpztpzc+6liE3vY l3qg== 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=0GhuF1gq/FWNDrD4VCjZc0WmsUK9oz//iunyuPhUA6o=; b=TKfj/6ORWiGZ0BAiifqPjs6xOe3PCTbVPK5ZvdMIKfwEPkE2J5ruj//SFxjLMZwqyi nxnUVUVkwIKIoNCK3xW2EB0mJgN4ygMPRL5XZVK1lnTzNocmR7AkBc8G6iIzc4s9oZMv 3adamu0mXjMAhQ470PAkjV+y4ET5mATI7+ubaqCZgPuFkjzhTh7cPrADNEcjzzyV2xGK VA+itw9mX8k8YRzIHedBCdHu1qC9RTDUvaqPR4cNb36VZi0voAprsfmOBlbNmRgV1oor N5/7iSWoLofPUM9z0KIZLU3QZSAXtd1KJaklBiyjGIjqyIhLt570foUvZIIVbBhx1TVz UH+g== X-Gm-Message-State: APjAAAUM8AZWueH0lCNtujxbvGDFwCJsR3Ue1cWUN6UtYMA2CCjwvprd c07sxek/DxYw2l9yY33r7jQ= X-Google-Smtp-Source: APXvYqzQpRprQEXs93YpX0KuUzr1GiznTEBs3+zE1/HpSf0nY6GnF+OVzonkqDtY91IyJpZDI6rT5A== X-Received: by 2002:a7b:c74c:: with SMTP id w12mr4992230wmk.1.1581420501410; Tue, 11 Feb 2020 03:28:21 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id w15sm5097352wrs.80.2020.02.11.03.28.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:28:20 -0800 (PST) From: luca.boccassi@gmail.com To: Ricardo Roldan Cc: Ferruh Yigit , dpdk stable Date: Tue, 11 Feb 2020 11:20:22 +0000 Message-Id: <20200211112216.3929-76-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'ethdev: fix callback unregister with wildcard argument list' has been queued to stable release 19.11.1 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 stable release 19.11.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 02/13/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 adb2c4d1bb7702e5ea7e6f27339edf9aef89c80d Mon Sep 17 00:00:00 2001 From: Ricardo Roldan Date: Tue, 7 Jan 2020 16:51:36 +0100 Subject: [PATCH] ethdev: fix callback unregister with wildcard argument list [ upstream commit ba1e69f121b97b4c8673a48c98072accdbc5af46 ] The function was checking -1 against the callback data instead of the given cb_arg parameter. Fixes: af75078fece3 ("first public release") Signed-off-by: Ricardo Roldan Reviewed-by: Ferruh Yigit --- lib/librte_ethdev/rte_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 6e9cb243ea..aec2d0f704 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -4039,7 +4039,7 @@ rte_eth_dev_callback_unregister(uint16_t port_id, next = TAILQ_NEXT(cb, next); if (cb->cb_fn != cb_fn || cb->event != event || - (cb->cb_arg != (void *)-1 && cb->cb_arg != cb_arg)) + (cb_arg != (void *)-1 && cb->cb_arg != cb_arg)) continue; /* -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:41.623362981 +0000 +++ 0076-ethdev-fix-callback-unregister-with-wildcard-argumen.patch 2020-02-11 11:17:38.500003217 +0000 @@ -1,13 +1,14 @@ -From ba1e69f121b97b4c8673a48c98072accdbc5af46 Mon Sep 17 00:00:00 2001 +From adb2c4d1bb7702e5ea7e6f27339edf9aef89c80d Mon Sep 17 00:00:00 2001 From: Ricardo Roldan Date: Tue, 7 Jan 2020 16:51:36 +0100 Subject: [PATCH] ethdev: fix callback unregister with wildcard argument list +[ upstream commit ba1e69f121b97b4c8673a48c98072accdbc5af46 ] + The function was checking -1 against the callback data instead of the given cb_arg parameter. Fixes: af75078fece3 ("first public release") -Cc: stable@dpdk.org Signed-off-by: Ricardo Roldan Reviewed-by: Ferruh Yigit