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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ABD0ECDB474 for ; Tue, 17 Oct 2023 10:04:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=m4Vpj0bWplogkroMjJxpMCJYp8a6050h+Q3/gc9l2Rc=; b=thkR4022UtoMuP Y4E5QD49KvfB16p1Ix7sc4nekGuAE+m2jaepXDnHyUMZR/YcSasqUVEY4+w6P+UXw2kDBARaYM00s EgmTAh97eJikbi74klMAbKWQkFH7vId2FiK7PTXaKvGmRg4QfIJaKjZs5B3Yv4fGrxevKEWZeJMyd 3Dj3YKrnI2h1cXsouCRc0adQR/Oi8ns8enoUrPmqzBsc4ZDxv71Jv/0u1zoHPJkS6/Qbs89LsVTns dqSUKjTbYpt3bipHKkU3x+SMkYdHvOXvSlor7DtohkLKKQSjCLxLmf2+6x3B6TXg9WchW0bsEfL0F IUnugn1oOUW9G5dblTzQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qsgvN-00BuL4-0z; Tue, 17 Oct 2023 10:03:41 +0000 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qsgvJ-00BuKa-1p for linux-arm-kernel@lists.infradead.org; Tue, 17 Oct 2023 10:03:38 +0000 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-9bdf5829000so576083366b.0 for ; Tue, 17 Oct 2023 03:03:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697537011; x=1698141811; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=JTgb65Fpyt9Rg03VxFdA++ksbT9LLQtyEzJ7ObjtlZM=; b=kcK8m8pesEfG2DVYuPjLZ45p1t5RYFXE1pU5ysxuFkTfn0XL+xMn6BafbKFiV8Ackr RTSyc+wPSNn1Yd7uDqSzRDegYRe7wbk3rxNzURLymWWZtWLZXINX04lwl6lO1H2f4/0q g0k/PR7ulEBtfbHZv+J62kxLcFDjLrm39raegFn57PpIX4llbhQVHtllrDBEp9QUzBw/ aMsQa9M/op5LvJZTPCIWK9du2UvadRxVqwvyhHEYxvk/tBzSH5KPA6lIVorwQX3VoWdO KWn4lI0gpMHp+4vRNuL9f112ClG5CPM1PAGaKhG0tL05Q+bWEUrQgGd8Lbvq8W/yDQhS U+VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697537011; x=1698141811; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=JTgb65Fpyt9Rg03VxFdA++ksbT9LLQtyEzJ7ObjtlZM=; b=ZGrbhssgTruTtidFZgjaccN4btWX6O+OxLykiQFrJIVdZPYQCgQVrvAftTPaMwuLMp +O+QE7IxYhIvoi/pLDhkb/dS3xpKI68uo7rOfhfWcwz915VNGWZ8XJqoEQjxq462FH2i ISDUGjfO0qHoeVuzhb6JETZhrmyP1C7Hq3UChzaie4WCpepn7BUb0XUoUsd4NPlxW/dp w3RopOvYDOyAFuvlnelpMEZOsIImcYPAz47AE0gNquItmFOivH/CN2majeso5EKYzpn3 +TjrrSinZkaAsXez0O6ye5JlERelugkoszL/5+6qQyR0cpVkvYSQabq+UbZnUDMqVbU/ jdCA== X-Gm-Message-State: AOJu0YzLQlJq78rl21faLeZWIgAyA8gZ2v/iEOK1ysHiK8cCOdYN5Mw1 0lUBD90qbqYqBFNxqb1ZI9s= X-Google-Smtp-Source: AGHT+IHQUGjRVUWPVc5mpl2WQuY13s2RSyBWHkvsVca2HV4uweZh2gdmY/WWlUw6xlNRqYo617ccDQ== X-Received: by 2002:a17:907:3181:b0:9a1:cb2c:b55c with SMTP id xe1-20020a170907318100b009a1cb2cb55cmr1092951ejb.35.1697537010583; Tue, 17 Oct 2023 03:03:30 -0700 (PDT) Received: from skbuf ([188.26.57.160]) by smtp.gmail.com with ESMTPSA id sd8-20020a170906ce2800b009b8a4f9f20esm938801ejb.102.2023.10.17.03.03.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 03:03:30 -0700 (PDT) Date: Tue, 17 Oct 2023 13:03:28 +0300 From: Vladimir Oltean To: Florian Fainelli Cc: netdev@vger.kernel.org, Andrew Lunn , Florian Fainelli , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Broadcom internal kernel review list , "open list:ARM/Mediatek SoC support" , "moderated list:ARM/Mediatek SoC support" Subject: Re: [PATCH net-next v4 1/2] net: dsa: Use conduit and user terms Message-ID: <20231017100328.qmwi2dnqay7syoki@skbuf> References: <20231016164742.264613-1-florian.fainelli@broadcom.com> <20231016164742.264613-1-florian.fainelli@broadcom.com> <20231016164742.264613-2-florian.fainelli@broadcom.com> <20231016164742.264613-2-florian.fainelli@broadcom.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20231016164742.264613-2-florian.fainelli@broadcom.com> <20231016164742.264613-2-florian.fainelli@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231017_030337_627480_A9C447B7 X-CRM114-Status: GOOD ( 15.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Oct 16, 2023 at 09:47:41AM -0700, Florian Fainelli wrote: > Use more inclusive terms throughout the DSA subsystem by moving away > from "master" which is replaced by "conduit" and "slave" which is > replaced by "user". No functional changes. > > Signed-off-by: Florian Fainelli > --- Reviewed-by: Vladimir Oltean Note that you left the following unconverted: diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index d117e9b1a465..d27c6b70a2f6 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -1113,7 +1113,7 @@ mt7530_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) u32 val; /* When a new MTU is set, DSA always set the CPU port's MTU to the - * largest MTU of the slave ports. Because the switch only has a global + * largest MTU of the user ports. Because the switch only has a global * RX length register, only allowing CPU port here is enough. */ if (!dsa_is_cpu_port(ds, port)) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index be2491de173d..42b1acaca33a 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -2486,7 +2486,7 @@ static int mv88e6xxx_port_vlan_add(struct dsa_switch *ds, int port, else member = MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_TAGGED; - /* net/dsa/slave.c will call dsa_port_vlan_add() for the affected port + /* net/dsa/user.c will call dsa_port_vlan_add() for the affected port * and then the CPU port. Do not warn for duplicates for the CPU port. */ warn = !dsa_is_cpu_port(ds, port) && !dsa_is_dsa_port(ds, port); diff --git a/drivers/net/dsa/qca/qca8k-common.c b/drivers/net/dsa/qca/qca8k-common.c index d203e4a84441..9243eff8918d 100644 --- a/drivers/net/dsa/qca/qca8k-common.c +++ b/drivers/net/dsa/qca/qca8k-common.c @@ -761,7 +761,7 @@ int qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) int ret; /* We have only have a general MTU setting. - * DSA always set the CPU port's MTU to the largest MTU of the slave + * DSA always set the CPU port's MTU to the largest MTU of the user * ports. * Setting MTU just for the CPU port is sufficient to correctly set a * value for every port. diff --git a/drivers/net/dsa/realtek/rtl8365mb.c b/drivers/net/dsa/realtek/rtl8365mb.c index d171c18dd354..0875e4fc9f57 100644 --- a/drivers/net/dsa/realtek/rtl8365mb.c +++ b/drivers/net/dsa/realtek/rtl8365mb.c @@ -1144,7 +1144,7 @@ static int rtl8365mb_port_change_mtu(struct dsa_switch *ds, int port, int frame_size; /* When a new MTU is set, DSA always sets the CPU port's MTU to the - * largest MTU of the slave ports. Because the switch only has a global + * largest MTU of the user ports. Because the switch only has a global * RX length register, only allowing CPU port here is enough. */ if (!dsa_is_cpu_port(ds, port)) _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel