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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 362F1C43381 for ; Fri, 15 Feb 2019 20:17:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 07001222A1 for ; Fri, 15 Feb 2019 20:17:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P8CxHcoV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391178AbfBOURG (ORCPT ); Fri, 15 Feb 2019 15:17:06 -0500 Received: from mail-yw1-f68.google.com ([209.85.161.68]:44521 "EHLO mail-yw1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391129AbfBOURE (ORCPT ); Fri, 15 Feb 2019 15:17:04 -0500 Received: by mail-yw1-f68.google.com with SMTP id x21so4164201ywx.11 for ; Fri, 15 Feb 2019 12:17:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yvlVxHi1enfHdQfIsGA96spLReXR8Coqlasvs8f91ac=; b=P8CxHcoVjYsbe5S/PEpDHdtSQ/QrPxEOpNXazelIYbn3Ns9loEz3nCpjpN+/dyxL9e 4RHzfjd4u1pKJCJAF0ri+tvAdlVZxn5hjGPcfLuurVTK3esdDYnA4aR3JotAN3TezBTa 1qYRqwVfVsjOG9/6bMwM8SdyUIdiSHwEkAdSrw24Z3b7cDltgJKxaBYI0VADc3yocPyV o//IKHx1ZRX8QFPvRlteKqM8mPe2vYgExTkoWyKndIUqDw98LFobnx1OmpT9VcMtyIJl Luw9+3tVKcPZYY9AciJtbR9NqOI2mMa+ASo2u/d07OBITbiltDqDYltEKoR4PAm6hXvS 0pIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yvlVxHi1enfHdQfIsGA96spLReXR8Coqlasvs8f91ac=; b=e83B9eGlKSu7DWMAXfMIFwgJOru0Jn6/h6IjZaKRafZfZM6noo3vYkynI/hkh+rpT5 OsByMUIQJRVF/uIau47s6RdL+aU8mrJkq2/GZZhN9oA3q90hoCN0LMU4jDYVZMbtbDKA 0DSMNGTEpzmMI9ZIMI8R/zP4yWsSdRqtg5ZcfHtf77RbSp0IG+I5PrWqP0Uzpc8P/t83 tVq5gwdpfbAgJpoZ+uUyOTcJZTQmSAsIvBYVgqwISbzde9SkstWTCkXFF24bXVjOUwfC b+aNI8HIOrdUVnLoBoCbLlLCUnzIqrdpuhj9K334QUUPqPmY1Dmff/tauNKV+SyBZm9y 066Q== X-Gm-Message-State: AHQUAuYxrzIYi6D0cg5xVF84O3B/Ed/l9h6USX4WJNJu3hzDJ1lunnAF LTTFZzwJK4IIs5ER4bfVVKsr0EyU X-Google-Smtp-Source: AHgI3IYwrKpxkbV0l9ODJaBB/kpKMLbWaxSWjEo78XGVpGCEu8n1PuSYh9opjRskXjwA4nViDqRppQ== X-Received: by 2002:a0d:ccd0:: with SMTP id o199mr2727799ywd.402.1550261823155; Fri, 15 Feb 2019 12:17:03 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id y67sm2889574ywf.89.2019.02.15.12.17.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 12:17:02 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, andrew@lunn.ch, vivien.didelot@gmail.com, Florian Fainelli Subject: [PATCH net 3/5] net: systemport: Fix reception of BPDUs Date: Fri, 15 Feb 2019 12:16:51 -0800 Message-Id: <20190215201653.20988-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190215201653.20988-1-f.fainelli@gmail.com> References: <20190215201653.20988-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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 28c9b0bdf2f6..bc3ac369cbe3 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -134,6 +134,10 @@ static void 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.17.1