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.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 99B20C388F7 for ; Mon, 9 Nov 2020 13:26:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 42E9E2076E for ; Mon, 9 Nov 2020 13:26:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604928362; bh=tzG8aeK6c6SEBJMFTmnK1dxRhxpk02RmeRg9fVEBMGE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=N3xVUYyqQoW9s+LMFX2Rm+wZyXsjllYUnUvaovL+zGO5zkGWUYkh+hwlaCQQRIxcM yYFyfaEb3vd8Sey4gKvJqEIb3yAmlvthiGp20OZsA1bNW2KMEMRY5AVqj0ywuTRj7H XildOm2JqkRNGsfuc1vBpx5TOaM8o2jmtcA66gqA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387757AbgKINZ5 (ORCPT ); Mon, 9 Nov 2020 08:25:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:44540 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732531AbgKINRW (ORCPT ); Mon, 9 Nov 2020 08:17:22 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 39D75206D8; Mon, 9 Nov 2020 13:17:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604927841; bh=tzG8aeK6c6SEBJMFTmnK1dxRhxpk02RmeRg9fVEBMGE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tROMvRuYeznyxNG2U7QvR6L0Lkv+UaEKtLKJ+6N4NFLRg0yhcLlGT1ee4wnnIQQsN VCg3m47S8A53s89s+TzChycBGGqzAQfbA2a6qsbpiBtRPLYjXNpy9d0aKrUT/b0Q1w 8ulQ3Xdz3q6uq7D6icW6b8vK0uH9gcmgxD9a8twU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, DENG Qingfang , Jonathan McDowell , Andrew Lunn , Jakub Kicinski Subject: [PATCH 5.9 040/133] net: dsa: qca8k: Fix port MTU setting Date: Mon, 9 Nov 2020 13:55:02 +0100 Message-Id: <20201109125032.639079509@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125030.706496283@linuxfoundation.org> References: <20201109125030.706496283@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jonathan McDowell [ Upstream commit 99cab7107d914a71c57f5a4e6d34292425fbbb61 ] The qca8k only supports a switch-wide MTU setting, and the code to take the max of all ports was only looking at the port currently being set. Fix to examine all ports. Reported-by: DENG Qingfang Fixes: f58d2598cf70 ("net: dsa: qca8k: implement the port MTU callbacks") Signed-off-by: Jonathan McDowell Reviewed-by: Andrew Lunn Link: https://lore.kernel.org/r/20201030183315.GA6736@earth.li Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/dsa/qca8k.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c @@ -1219,8 +1219,8 @@ qca8k_port_change_mtu(struct dsa_switch priv->port_mtu[port] = new_mtu; for (i = 0; i < QCA8K_NUM_PORTS; i++) - if (priv->port_mtu[port] > mtu) - mtu = priv->port_mtu[port]; + if (priv->port_mtu[i] > mtu) + mtu = priv->port_mtu[i]; /* Include L2 header / FCS length */ qca8k_write(priv, QCA8K_MAX_FRAME_SIZE, mtu + ETH_HLEN + ETH_FCS_LEN);