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 177D4A04B1 for ; Mon, 23 Nov 2020 18:13:14 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 31987C91C; Mon, 23 Nov 2020 18:13:11 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 08615C91C for ; Mon, 23 Nov 2020 18:13:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606151587; 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=S/czl6Z3nZ7KWvM1XAWsGygvVctCeBYgmQJWzPwQwng=; b=X1EZgf17jMfP66Z4mWlI+n/IgXjET2H9MJcKE9z9RyE46dnIcEgLL5BTzpJ6emjQeSNdPc IRL7KkS2tLWh9XJ3SpBqnu8LGxBwRnpsoYKEhWy5WBtqsOzVfN9/WidRgE7dKyOz0soPbF 8HO4Noa1yczohosDEp884/xiUWPROWI= 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-464-YR7hlVboOhmNlvTygi0UUA-1; Mon, 23 Nov 2020 12:13:03 -0500 X-MC-Unique: YR7hlVboOhmNlvTygi0UUA-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 9B33684A5EC; Mon, 23 Nov 2020 17:13:02 +0000 (UTC) Received: from rh.redhat.com (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8862960C04; Mon, 23 Nov 2020 17:13:01 +0000 (UTC) From: Kevin Traynor To: Haiyue Wang Cc: Qi Zhang , dpdk stable Date: Mon, 23 Nov 2020 17:12:05 +0000 Message-Id: <20201123171222.79398-13-ktraynor@redhat.com> In-Reply-To: <20201123171222.79398-1-ktraynor@redhat.com> References: <20201123171222.79398-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'net/ixgbe: remove redundant MAC flag check' has been queued to LTS release 18.11.11 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.11 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/27/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/671fa14c8e11280a0fedaf238051bf209cd7f141 Thanks. Kevin. --- >From 671fa14c8e11280a0fedaf238051bf209cd7f141 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 c7059ea418..22d48866cc 100644 --- a/drivers/net/ixgbe/ixgbe_flow.c +++ b/drivers/net/ixgbe/ixgbe_flow.c @@ -871,13 +871,4 @@ ixgbe_parse_ethertype_filter(struct rte_eth_dev *dev, 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)); -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-23 17:10:14.305021791 +0000 +++ 0013-net-ixgbe-remove-redundant-MAC-flag-check.patch 2020-11-23 17:10:13.991061583 +0000 @@ -1 +1 @@ -From 5db5d3b72e7cd5c6c986ef72924eb9069c842063 Mon Sep 17 00:00:00 2001 +From 671fa14c8e11280a0fedaf238051bf209cd7f141 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 c7059ea418..22d48866cc 100644