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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34319C433FE for ; Tue, 14 Dec 2021 21:10:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237825AbhLNVKg (ORCPT ); Tue, 14 Dec 2021 16:10:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237780AbhLNVKb (ORCPT ); Tue, 14 Dec 2021 16:10:31 -0500 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C7DEC061574; Tue, 14 Dec 2021 13:10:31 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id z7so6380896edc.11; Tue, 14 Dec 2021 13:10:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=z3KHK1Qz252qPTPlwp2DQrEAnJLSvMy6tiK8HNT5asM=; b=iHWjPUfRGNAjaO9Sk7Ciunx4Q6RDEm6wq/Gj1Yk5y095gUE5azHgzaJO0dB1iLebhW LVzS9X7jZraiuWQYO5KyZqb5C1qN5pU4YLAzDNazeGdSL3YQTFCW5MXwJsWRaWotTwkl BP4ocINuEZBSycL0JZH7W4m0llYvQbxxeOzS9E1trHNATAgRKC/0tVFo5mXEE0kxxLVj /uOvXKJWt35xyNIeWftbh/phEeJp1j6v02p3lzP+JldecHDfqD38FOqBhxHdE9t2ONgq FGbBepYL7lD6FIqg3wJegJLBIPrlI6NeuFD+rJTkd9M0cEBElpVccTUnwRi48SAiJPCn wnSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z3KHK1Qz252qPTPlwp2DQrEAnJLSvMy6tiK8HNT5asM=; b=ehKf/CGF0eS/ymC/7uClAp54Jz0f01xPanzeIDg8q1xdDPCUXngN/p/rax5hs9Zt25 VlSTGL519O2M3U2x0PjntvD1Ja1h7PVst1oUBqYYJR1EimPNyJeKjBEzyrIRVoKKoAWx qZr3xjmDxC1VKY4yT1WciPH+H052zczjFoEnS91QFHHuBP1j5xsxwzgoNtJyK25D3SOA cmld/K+dgLIr1qii7hvpOn5unI68KEbhSiD6598WyjnXeg9CTVCdoPLL2FMMCa8dypJi NxbJpZdzFgHq+wxI9xpdmV38iOQAhlxZidHWVRFaN4iCWZwnlc3UdkY6YJe4LnX25LBf Icpw== X-Gm-Message-State: AOAM5330VDBWnug14lYQPuGW8fg2kXtnEqP+Bm2zIGYHGhk1fIyitq7g ODVQ/G+qwx/JIJOZlZRhXJg= X-Google-Smtp-Source: ABdhPJwF57ZNeM045om8M2Nzq+dsHHHWyezW+86zBrE09tHZ5J/rqtsyqrzRq/AM7lx2owHeF0dVwA== X-Received: by 2002:a17:906:54d:: with SMTP id k13mr7717542eja.545.1639516228357; Tue, 14 Dec 2021 13:10:28 -0800 (PST) Received: from localhost.localdomain (93-42-71-246.ip85.fastwebnet.it. [93.42.71.246]) by smtp.googlemail.com with ESMTPSA id b4sm261034ejl.206.2021.12.14.13.10.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Dec 2021 13:10:28 -0800 (PST) From: Ansuel Smith To: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Jakub Kicinski , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Vladimir Oltean Subject: [net-next PATCH RFC v5 02/16] net: dsa: stop updating master MTU from master.c Date: Tue, 14 Dec 2021 22:09:57 +0100 Message-Id: <20211214211011.24850-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211214211011.24850-1-ansuelsmth@gmail.com> References: <20211214211011.24850-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vladimir Oltean The dev_set_mtu() call from dsa_master_setup() has been effectively superseded by the dsa_slave_change_mtu(slave_dev, ETH_DATA_LEN) that is done from dsa_slave_create() for each user port. This function also updates the master MTU according to the largest user port MTU from the tree. Therefore, updating the master MTU through a separate code path isn't needed. Signed-off-by: Vladimir Oltean Reviewed-by: Florian Fainelli --- net/dsa/master.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/net/dsa/master.c b/net/dsa/master.c index e8e19857621b..f4efb244f91d 100644 --- a/net/dsa/master.c +++ b/net/dsa/master.c @@ -330,28 +330,13 @@ static const struct attribute_group dsa_group = { .attrs = dsa_slave_attrs, }; -static void dsa_master_reset_mtu(struct net_device *dev) -{ - int err; - - rtnl_lock(); - err = dev_set_mtu(dev, ETH_DATA_LEN); - if (err) - netdev_dbg(dev, - "Unable to reset MTU to exclude DSA overheads\n"); - rtnl_unlock(); -} - static struct lock_class_key dsa_master_addr_list_lock_key; int dsa_master_setup(struct net_device *dev, struct dsa_port *cpu_dp) { - const struct dsa_device_ops *tag_ops = cpu_dp->tag_ops; struct dsa_switch *ds = cpu_dp->ds; struct device_link *consumer_link; - int mtu, ret; - - mtu = ETH_DATA_LEN + dsa_tag_protocol_overhead(tag_ops); + int ret; /* The DSA master must use SET_NETDEV_DEV for this to work. */ consumer_link = device_link_add(ds->dev, dev->dev.parent, @@ -361,13 +346,6 @@ int dsa_master_setup(struct net_device *dev, struct dsa_port *cpu_dp) "Failed to create a device link to DSA switch %s\n", dev_name(ds->dev)); - rtnl_lock(); - ret = dev_set_mtu(dev, mtu); - rtnl_unlock(); - if (ret) - netdev_warn(dev, "error %d setting MTU to %d to include DSA overhead\n", - ret, mtu); - /* If we use a tagging format that doesn't have an ethertype * field, make sure that all packets from this point on get * sent to the tag format's receive function. @@ -405,7 +383,6 @@ void dsa_master_teardown(struct net_device *dev) sysfs_remove_group(&dev->dev.kobj, &dsa_group); dsa_netdev_ops_set(dev, NULL); dsa_master_ethtool_teardown(dev); - dsa_master_reset_mtu(dev); dsa_master_set_promiscuity(dev, -1); dev->dsa_ptr = NULL; -- 2.33.1