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 A0BE3C35242 for ; Fri, 24 Jan 2020 14:33:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E9CB20661 for ; Fri, 24 Jan 2020 14:33:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579876413; bh=8AnTwY5ONooWX0+t+5YCGRCt2ET2oAdWrM/aRE2qLxM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mpuS77Le2kWhiRNo7ryBK2a1q4MJ0jXoP5MqT6vacUZ8zHay4/krtapyvP3cgxM+h wwp5JbH/RB+M546j4PU4mQYfV7OIkQU1R1fPFI+spcVKlWeU5Gyth3Y2NaAeORyANE zcFAi5v0Nk/S8ui9mUUD94fUsstwjmMMiPiDAbW8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391915AbgAXOdG (ORCPT ); Fri, 24 Jan 2020 09:33:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:40644 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404223AbgAXOT4 (ORCPT ); Fri, 24 Jan 2020 09:19:56 -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 93BB420838; Fri, 24 Jan 2020 14:19:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579875596; bh=8AnTwY5ONooWX0+t+5YCGRCt2ET2oAdWrM/aRE2qLxM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zhMVyPr1hWRQ4WTZ6vbbz+vyBD50oMZqa+p6/APDi4005ZXYE7HDlwrfjjGGs5iC1 yYd6JjDmnwaqiXEs/reYO+YPANOCprdAYsi3BWXAmktPU46TAkMMMoNfh239i1jPck f+uqWlWl40yp4y6DtW2BON7N/MuR+Kqxlscsv0fY= 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 085/107] net: stmmac: selftests: Mark as fail when received VLAN ID != expected Date: Fri, 24 Jan 2020 09:17:55 -0500 Message-Id: <20200124141817.28793-85-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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jose Abreu [ Upstream commit d39b68e5a736afa67d2e9cfb158efdd237d99dbd ] When the VLAN ID does not match the expected one it means filter failed in HW. Fix it. Fixes: 94e18382003c ("net: stmmac: selftests: Add selftest for VLAN TX Offload") Signed-off-by: Jose Abreu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c index 36ef8bee5fcfd..ba03a2d774344 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c @@ -853,8 +853,12 @@ static int stmmac_test_vlan_validate(struct sk_buff *skb, if (tpriv->vlan_id) { if (skb->vlan_proto != htons(proto)) goto out; - if (skb->vlan_tci != tpriv->vlan_id) + if (skb->vlan_tci != tpriv->vlan_id) { + /* Means filter did not work. */ + tpriv->ok = false; + complete(&tpriv->comp); goto out; + } } ehdr = (struct ethhdr *)skb_mac_header(skb); -- 2.20.1