Re: [PATCH net-next v3 1/2] net: dsa: Use conduit and user terms

[Florian Fainelli]

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 <florian.fainelli@xxxxxxxxxxxx>
> > ---
> > 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 <net/dsa.h>
> >   
> >   #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