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 8C340CDB482 for ; Mon, 16 Oct 2023 16:42:14 +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-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ox8gOo5dhMz8l1DfyEkWNGs2ICc5txKIVN20xiJhjF8=; b=5AQE87rpDBE79p /AA4fmItUG7/sl1MxnM7LHCTyYHWPWnSitk71jc0lej832VnfmvrKKgKToX3tEO3NIzs7EabjZzY/ QWctFLVCW0FQ+LlJE2VGlJx8yctFPdTU8D2LhK1v7UJjc1ocsx0YMgbV81L9KgBiHASo75cVKtrTZ 5MM6KSqM02diLlFPJvvRddL9O2n9suLldw9R/m4l52QZaqGpbgqnUfe6dHEtrM81e8XUdtwfQMBbo JWrnEJmRFpcjAEl94paVadI6FrjO33fvWaU9lqfzx3xcQ81FbV5L4GGxT3QZBWDaIcWcDhZh6fPof 2iDzFIunnkCN2wTTv4AQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qsQf3-00A9tl-2O; Mon, 16 Oct 2023 16:41:45 +0000 Received: from mail-qt1-x834.google.com ([2607:f8b0:4864:20::834]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qsQf1-00A9t9-2N for linux-arm-kernel@lists.infradead.org; Mon, 16 Oct 2023 16:41:45 +0000 Received: by mail-qt1-x834.google.com with SMTP id d75a77b69052e-4194d89a6dfso33716681cf.0 for ; Mon, 16 Oct 2023 09:41:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697474501; x=1698079301; darn=lists.infradead.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=p4Tn0hTDyHkVTPWKQdaEhkQ4FlIC2s9fFr2Zb+BIJWk=; b=NaZseokE0WdmCytZj1N9RX7v8Th4tscSIrd3yyQjreD0q+gE+pVDQuLCfGe7AlZmSF RV34KsT6zo0dnSUDb1KjCBYUF8OeHXH0OEdzGx6SXbCVi5WSgYGKt8dl5rm7f6IZWvbz MVg2bsCVHYeTwdJYMtDbc9u3P411ZhCu8pEvOAIJWO29wNo2czfHZemmDZgDBwHYdwQW SHajw5OlCPFgqKlCbhj9+SijhEMG4/NmzfLABgy7UrSoBheA2Yj/CPyPZ0VkoqacJJ/C R/xaUTnoN967J7f9X/KLQmlPMrhmsNISeaSkrA7AxU42eYMkF+dwhw8tE4Ei2Gw1S6js nhLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697474501; x=1698079301; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=p4Tn0hTDyHkVTPWKQdaEhkQ4FlIC2s9fFr2Zb+BIJWk=; b=IKh5m/QYeRR9BVfuudZPVpTKXsmNqUPH2RWhima8OInh0MmE901Bx1VdZmEu3+tVU2 OXV3+HRvLUzL0O8wtOVEARp2NjdeG9qsvW3WpjXy+pIDYoFRksB3uiTr9nqXm+XEv2Sw Cgn2+kGOGEMsVcapzW63u4p/Gl3q/O5/o0DL1mrxNU8d+05WQVhHUO152KWQlhhzopEC rhl3ZvA706w8AegdOOW7t+upaP4I2icIBnig6i0eQfeWhwV9RnPGp/l6MsO9oKAMatVH h9jY3fsnNaPDRQGytbgyff1rz2WUQ4AqgGPWZrhwnanHDoLe/ipE97QWH46ro0ZA4wOA QT8A== X-Gm-Message-State: AOJu0YwTiDmWnQg3HpAOCYJxl9ThT5fqslCicnbMMX59I0kKCTaQ0E0q E0y+hjqFim5hYeAKH9THvMQ= X-Google-Smtp-Source: AGHT+IHqVpggNu+ii0SHrH08qvBi2XpiI/K0hmpxEmKsgbPNFoRSHIAP2DrOD7lqW1LrCmhEqgMNBw== X-Received: by 2002:ac8:7dd3:0:b0:410:9089:6b74 with SMTP id c19-20020ac87dd3000000b0041090896b74mr48344327qte.15.1697474500952; Mon, 16 Oct 2023 09:41:40 -0700 (PDT) Received: from [10.67.48.245] ([192.19.223.252]) by smtp.googlemail.com with ESMTPSA id bv10-20020a05622a0a0a00b004109d386323sm3138150qtb.66.2023.10.16.09.41.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 Oct 2023 09:41:40 -0700 (PDT) Message-ID: Date: Mon, 16 Oct 2023 09:41:35 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net-next v3 1/2] net: dsa: Use conduit and user terms Content-Language: en-US To: Vladimir Oltean , Florian Fainelli Cc: netdev@vger.kernel.org, Andrew Lunn , "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" References: <20231013215251.152912-1-florian.fainelli@broadcom.com> <20231013215251.152912-1-florian.fainelli@broadcom.com> <20231013215251.152912-2-florian.fainelli@broadcom.com> <20231013215251.152912-2-florian.fainelli@broadcom.com> <20231016132334.b5pz7kw5oitk32z2@skbuf> From: Florian Fainelli In-Reply-To: <20231016132334.b5pz7kw5oitk32z2@skbuf> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231016_094143_777797_51857D11 X-CRM114-Status: GOOD ( 20.35 ) 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 10/16/23 06:23, Vladimir Oltean wrote: > On Fri, Oct 13, 2023 at 02:52:50PM -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 >> --- >> diff --git a/Documentation/networking/dsa/configuration.rst b/Documentation/networking/dsa/configuration.rst >> index d2934c40f0f1..e6c9719874b0 100644 >> --- a/Documentation/networking/dsa/configuration.rst >> +++ b/Documentation/networking/dsa/configuration.rst >> -Past this point, the DSA slave network devices get delivered regular Ethernet >> +Past this point, the DSA user network devices get delivered regular Ethernet >> frames that can be processed by the networking stack. >> >> -Slave network devices >> +User network devices >> --------------------- > > Please adjust section underline width. Done. > > Do we want a sentence in the documentation that clarifies that "user interfaces" > and "conduit interfaces" used to be called "slave interfaces" and "master interfaces" > (for 15 years), so that old time users don't get confused as to what happened? Sure, we can do that. > >> @@ -863,7 +863,7 @@ int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering, >> } >> >> /* This enforces legacy behavior for switch drivers which assume they can't >> - * receive VLAN configuration when enslaved to a bridge with vlan_filtering=0 >> + * receive VLAN configuration when enuserd to a bridge with vlan_filtering=0 > > when joining a bridge > >> */ >> bool dsa_port_skip_vlan_configuration(struct dsa_port *dp) >> { >> @@ -1057,7 +1057,7 @@ static int dsa_switch_event(struct notifier_block *nb, >> err = dsa_switch_tag_8021q_vlan_del(ds, info); >> break; >> case DSA_NOTIFIER_MASTER_STATE_CHANGE: > > As Stephen points out, maybe you want to change this notifier name as well. > >> - err = dsa_switch_master_state_change(ds, info); >> + err = dsa_switch_conduit_state_change(ds, info); >> break; >> default: >> err = -EOPNOTSUPP; >> diff --git a/net/dsa/tag.h b/net/dsa/tag.h >> index 32d12f4a9d73..f6b9c73718df 100644 >> --- a/net/dsa/tag.h >> +++ b/net/dsa/tag.h >> @@ -9,7 +9,7 @@ >> #include >> >> #include "port.h" >> -#include "slave.h" >> +#include "user.h" >> >> struct dsa_tag_driver { >> const struct dsa_device_ops *ops; >> @@ -29,7 +29,7 @@ static inline int dsa_tag_protocol_overhead(const struct dsa_device_ops *ops) >> return ops->needed_headroom + ops->needed_tailroom; >> } >> >> -static inline struct net_device *dsa_master_find_slave(struct net_device *dev, >> +static inline struct net_device *dsa_conduit_find_user(struct net_device *dev, >> int device, int port) > > Please adjust alignment. checkpatch did not complain and my editor shows me the alignment appears to be proper, what am I missing? > >> { >> struct dsa_port *cpu_dp = dev->dsa_ptr; >> diff --git a/net/dsa/tag_8021q.c b/net/dsa/tag_8021q.c >> index cbdfc392f7e0..71b26ae6db39 100644 >> --- a/net/dsa/tag_8021q.c >> +++ b/net/dsa/tag_8021q.c >> @@ -468,10 +468,10 @@ struct sk_buff *dsa_8021q_xmit(struct sk_buff *skb, struct net_device *netdev, >> } >> EXPORT_SYMBOL_GPL(dsa_8021q_xmit); >> >> -struct net_device *dsa_tag_8021q_find_port_by_vbid(struct net_device *master, >> +struct net_device *dsa_tag_8021q_find_port_by_vbid(struct net_device *conduit, >> int vbid) > > Alignment. Likewise. > >> { >> - struct dsa_port *cpu_dp = master->dsa_ptr; >> + struct dsa_port *cpu_dp = conduit->dsa_ptr; >> struct dsa_switch_tree *dst = cpu_dp->dst; >> struct dsa_port *dp; >> >> diff --git a/net/dsa/tag_8021q.h b/net/dsa/tag_8021q.h >> index b75cbaa028ef..41f7167ac520 100644 >> --- a/net/dsa/tag_8021q.h >> +++ b/net/dsa/tag_8021q.h >> @@ -16,7 +16,7 @@ struct sk_buff *dsa_8021q_xmit(struct sk_buff *skb, struct net_device *netdev, >> void dsa_8021q_rcv(struct sk_buff *skb, int *source_port, int *switch_id, >> int *vbid); >> >> -struct net_device *dsa_tag_8021q_find_port_by_vbid(struct net_device *master, >> +struct net_device *dsa_tag_8021q_find_port_by_vbid(struct net_device *conduit, >> int vbid); > > Alignment. Likewise. -- Florian _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel