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=-5.7 required=3.0 tests=DATE_IN_PAST_03_06, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, 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 3C02DC33CB6 for ; Wed, 22 Jan 2020 13:25:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 07B962468A for ; Wed, 22 Jan 2020 13:25:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579699516; bh=m1ojr+3KUybYQi0kamHI+nKZrFOBunYE+YxiTEQEp3I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1BQGCfVXpfcj+E6hZj8KrGp3ptosrLolfhHyLrqPQ0CoXbHzuP+Yp80XWEvEoXSmT D6abOtWzaV2n1sN6+pANKlddwDY2Bp+vQP/p/QB6uREJ5U0ZUVIOFmaVeUGxF1uNz8 wJ/7Lf3zNMcw6u5G8McBZEQsLUk+Bf7s/4Sut768= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731217AbgAVNZP (ORCPT ); Wed, 22 Jan 2020 08:25:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:44824 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730771AbgAVNZN (ORCPT ); Wed, 22 Jan 2020 08:25:13 -0500 Received: from localhost (unknown [84.241.205.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5A21D2467B; Wed, 22 Jan 2020 13:25:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579699512; bh=m1ojr+3KUybYQi0kamHI+nKZrFOBunYE+YxiTEQEp3I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eR5yUvxVufW2YvyDiYoZ5OHyu3TV1f/MzFNnYTJZqU+HN+7WxQiatbhIl0dCwCBDp yzjnZI4EovTBaNgEGzvVuriG5hOQ5e1Yn4ti1y/p3FPj+YvjpJ6cDZm7jWVd1lTa/o mAv9UiBvfHLliJslo1Hwvc8M66nFJOE6dEB0sKaU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jose Abreu , "David S. Miller" Subject: [PATCH 5.4 168/222] net: stmmac: tc: Do not setup flower filtering if RSS is enabled Date: Wed, 22 Jan 2020 10:29:14 +0100 Message-Id: <20200122092845.739671803@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092833.339495161@linuxfoundation.org> References: <20200122092833.339495161@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 commit 7bd754c47dd3ad1b048c9641294b0234fcce2c58 upstream. 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: Greg Kroah-Hartman --- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 4 ++++ 1 file changed, 4 insertions(+) --- 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_pr { 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);