From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29820C35242 for ; Fri, 24 Jan 2020 14:36:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E7903214AF for ; Fri, 24 Jan 2020 14:36:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579876580; bh=gwglXmvrIi4VDRmJR5DkNs9Ge87mVzgPfw3jUvzxi4s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nOkcPmwW+IAuqJaXRdxcY9Fk/4u1CdJriZ2V4D+iq4X7U8LmgMbNSc7AW0+NgOGcf 0LOqE0tyUoXK57s9LjVC1b0HXshYeRZ67BBizenjqpD0O5t5Dj5TVOp+lhbiqKjnZU PnQVpRiTYL6lmScUax9J/Tt/mEouHRuQqK2aqS2Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388294AbgAXOgS (ORCPT ); Fri, 24 Jan 2020 09:36:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:39442 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391437AbgAXOTP (ORCPT ); Fri, 24 Jan 2020 09:19:15 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1B04D22527; Fri, 24 Jan 2020 14:19:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579875554; bh=gwglXmvrIi4VDRmJR5DkNs9Ge87mVzgPfw3jUvzxi4s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K5wcELfc2gYDqKxlPYmJEMV80CvZ15DNCx0lk6p04MrAwBFV2jaY7EAQ/57nRstsR lg6/+mpfd6xnMnhj3yl97QiFcyTYEnGXycAU/ac+OBXR2CzJoIol8EIGRhzEzHAjyQ MGwJGFroEBy9MLuxno1X5ITjaayPgvEjoF8EXVfo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jose Abreu , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 049/107] net: stmmac: tc: Do not setup flower filtering if RSS is enabled Date: Fri, 24 Jan 2020 09:17:19 -0500 Message-Id: <20200124141817.28793-49-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200124141817.28793-1-sashal@kernel.org> References: <20200124141817.28793-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jose Abreu [ Upstream commit 7bd754c47dd3ad1b048c9641294b0234fcce2c58 ] RSS, when enabled, will bypass the L3 and L4 filtering causing it not to work. Add a check before trying to setup the filters. Fixes: 425eabddaf0f ("net: stmmac: Implement L3/L4 Filters using TC Flower") Signed-off-by: Jose Abreu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c index f9a9a9d822333..1d135b02ea021 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c @@ -579,6 +579,10 @@ static int tc_setup_cls(struct stmmac_priv *priv, { int ret = 0; + /* When RSS is enabled, the filtering will be bypassed */ + if (priv->rss.enable) + return -EBUSY; + switch (cls->command) { case FLOW_CLS_REPLACE: ret = tc_add_flow(priv, cls); -- 2.20.1