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 493D5A04DB for ; Tue, 17 Nov 2020 12:15:52 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 431584C90; Tue, 17 Nov 2020 12:15:51 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by dpdk.org (Postfix) with ESMTP id 8D7E94C90 for ; Tue, 17 Nov 2020 12:15:49 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id j7so22758913wrp.3 for ; Tue, 17 Nov 2020 03:15:49 -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=4og3c/NkQUMFY+oYNwPQr01reP6aeAdVrqzxPxcPC9A=; b=Ra7uBzKJsvy3tBjLibdeF7wMsELQkQSxyg3NDOQsPpLbDyCnbd5PtThgU43ESv3ais QeIbxxCc4vkvIBQIFHPOmwr+ox+hN7myUahYJxcL5tleWJXtW/UBMYzFG/SZw44EDzl6 ZuebvAU/rqHGVkxxyC8u4TzQ0qEnRwClvbre5OC4n0VJjaiiufrCpj6Xa+1NcVm0rjGQ UQi7cjYDXA06EWTEPPIRQb2wh5VdQKjcALS1t7mPZs2bkbgoaZ8QeMfMEN7zViHkfVEC 1M6goaYauWi12KXteEHfRIs44GE6ejF9CviY2ypR4P4XngN5Ps0RiKm7UPwr0o9BTVq7 jfAg== 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=4og3c/NkQUMFY+oYNwPQr01reP6aeAdVrqzxPxcPC9A=; b=r0uySxyCuoO0wqzU5XpO7IBBDbO0u2A/hSiXhkRosRygAGZwvelEpvjB1nf97RAPKz M33pf530G6SwWyrm6QIZR2boC0t8BjuVWh6AS8ZfvhGgtahMGfHQmvg7WSPHHzj4S4+9 7Yz7tZHogjaWR7oaSUeSQrfkbzGraLReTF1C+p9vmzMHrnmDm18zBDBZ6yg926syLGq3 9KHOgVJ4LPy5NCznnhXFVhMS0mpt+K0FG+rzwF9x/IqFyUJIdgWodRWANfVB9QFvwhqY MbUI/2ihMkG1dCkgwFbwjeTiRGp71th2ri5VFNYVIUy57wM1kPB9mwDhTm4HeliztcJo tH4A== X-Gm-Message-State: AOAM5332VBi9+fL8uEKiNs1eu33qMKYTu0Bj8svje/IfMO9V934wnAJA vX2eERfilZvsNTJeypnPZaDh3d34ThEQ0QK6 X-Google-Smtp-Source: ABdhPJxh6pFkTX8Nkz+ocp621CJEOR9S9jPbUYLy1/mx2HHEjneslIVWYzdaRAfOtlAW9IZHBvMWow== X-Received: by 2002:adf:f143:: with SMTP id y3mr23490526wro.138.1605611748347; Tue, 17 Nov 2020 03:15:48 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i16sm27635615wru.92.2020.11.17.03.15.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 03:15:47 -0800 (PST) From: luca.boccassi@gmail.com To: Haiyue Wang Cc: Qi Zhang , dpdk stable Date: Tue, 17 Nov 2020 11:14:01 +0000 Message-Id: <20201117111416.1961049-27-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201117111416.1961049-1-luca.boccassi@gmail.com> References: <20201109185030.3478760-2-luca.boccassi@gmail.com> <20201117111416.1961049-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe: remove redundant MAC flag check' has been queued to stable release 19.11.6 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.6 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/19/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/2eeeb5240669e0669dcc2f6dc437af489564e8dd Thanks. Luca Boccassi --- >From 2eeeb5240669e0669dcc2f6dc437af489564e8dd Mon Sep 17 00:00:00 2001 From: Haiyue Wang Date: Thu, 12 Nov 2020 10:00:06 +0800 Subject: [PATCH] net/ixgbe: remove redundant MAC flag check [ upstream commit 5db5d3b72e7cd5c6c986ef72924eb9069c842063 ] The flag of RTE_ETHTYPE_FLAGS_MAC has been checked twice, so remove the first error message "Not supported by ethertype filter" which is not so specific, and keep the error message "mac compare is unsupported" which aligns to the definition of RTE_ETHTYPE_FLAGS_MAC. Fixes: eb3539fc8550 ("net/ixgbe: parse ethertype filter") Signed-off-by: Haiyue Wang Acked-by: Qi Zhang --- drivers/net/ixgbe/ixgbe_flow.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c index b2a2bfc02f..faf67f1dfe 100644 --- a/drivers/net/ixgbe/ixgbe_flow.c +++ b/drivers/net/ixgbe/ixgbe_flow.c @@ -870,15 +870,6 @@ ixgbe_parse_ethertype_filter(struct rte_eth_dev *dev, if (ret) return ret; - /* Ixgbe doesn't support MAC address. */ - if (filter->flags & RTE_ETHTYPE_FLAGS_MAC) { - memset(filter, 0, sizeof(struct rte_eth_ethertype_filter)); - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM, - NULL, "Not supported by ethertype filter"); - return -rte_errno; - } - if (filter->queue >= dev->data->nb_rx_queues) { memset(filter, 0, sizeof(struct rte_eth_ethertype_filter)); rte_flow_error_set(error, EINVAL, -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-17 11:13:14.123322061 +0000 +++ 0027-net-ixgbe-remove-redundant-MAC-flag-check.patch 2020-11-17 11:13:12.929116770 +0000 @@ -1 +1 @@ -From 5db5d3b72e7cd5c6c986ef72924eb9069c842063 Mon Sep 17 00:00:00 2001 +From 2eeeb5240669e0669dcc2f6dc437af489564e8dd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5db5d3b72e7cd5c6c986ef72924eb9069c842063 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index dff04c462c..39f6ed73f6 100644 +index b2a2bfc02f..faf67f1dfe 100644