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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 A324EC43381 for ; Wed, 13 Mar 2019 19:21:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 67045213A2 for ; Wed, 13 Mar 2019 19:21:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504889; bh=k617cXzdAmrycfruo8uwgeryZV7Ni4xeeeI36rUgBSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DIAYIIRV8Hx8EPGCUukBQIZo6gogNKSjTxuytwtForBtb04nLWl7GOA8EidGd53FJ frPiSbXPpI6jjuMF6GF1cl6U8FX1yTp9xF4A1Nm+VSUP+stvzZkTyetJIHfHaiPKAs f5veCSkidlQLHHHfsAIJavilsSf36DANwUGWo+bs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728970AbfCMTV1 (ORCPT ); Wed, 13 Mar 2019 15:21:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:48880 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729022AbfCMTSV (ORCPT ); Wed, 13 Mar 2019 15:18:21 -0400 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 BA625213A2; Wed, 13 Mar 2019 19:18:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504701; bh=k617cXzdAmrycfruo8uwgeryZV7Ni4xeeeI36rUgBSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A6SkWsLDuFpqgoqN86WE758nkDhI8phWHFa02nc6moaI03F/FzXYKPvs4yjboGkOh crffCJgU4vBY6f1rh9Pa2bNUg4mdroHDZbbjvUk7m+XnDJ/ZfTZD0yxwzh69tzbkaB yyuKtfvo7NVlc9YlixHYEwCj26EhAdWwV1j6vs18= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Florian Fainelli , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 05/15] net: systemport: Fix reception of BPDUs Date: Wed, 13 Mar 2019 15:17:51 -0400 Message-Id: <20190313191806.160547-5-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190313191806.160547-1-sashal@kernel.org> References: <20190313191806.160547-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Florian Fainelli [ Upstream commit a40061ea2e39494104602b3048751341bda374a1 ] SYSTEMPORT has its RXCHK parser block that attempts to validate the packet structures, unfortunately setting the L2 header check bit will cause Bridge PDUs (BPDUs) to be incorrectly rejected because they look like LLC/SNAP packets with a non-IPv4 or non-IPv6 Ethernet Type. Fixes: 4e8aedfe78c7 ("net: systemport: Turn on offloads by default") Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/bcmsysport.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index 143b9a384af8..53b3c1a5851c 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -126,6 +126,10 @@ static int bcm_sysport_set_rx_csum(struct net_device *dev, priv->rx_chk_en = !!(wanted & NETIF_F_RXCSUM); reg = rxchk_readl(priv, RXCHK_CONTROL); + /* Clear L2 header checks, which would prevent BPDUs + * from being received. + */ + reg &= ~RXCHK_L2_HDR_DIS; if (priv->rx_chk_en) reg |= RXCHK_EN; else -- 2.19.1