Re: [RFC PATCH net-next 4/6] net: dsa: rename dsa_port_offloads_bridge to dsa_port_offloads_bridge_dev

["Alvin Šipraga" <ALSI@bang-olufsen.dk>]

On 10/26/21 18:26, Vladimir Oltean wrote:
> Currently the majority of dsa_port_bridge_dev_get() calls in drivers is
> just to check whether a port is under the bridge device provided as
> argument by the DSA API.
> 
> We'd like to change that DSA API so that a more complex structure is
> provided as argument. To keep things more generic, and considering that
> the new complex structure will be provided by value and not by
> reference, direct comparisons between dp->bridge and the provided bridge
> will be broken. The generic way to do the checking would simply be to
> do something like dsa_port_offloads_bridge(dp, &bridge).
> 
> But there's a problem, we already have a function named that way, which
> actually takes a bridge_dev net_device as argument. Rename it so that we
> can use dsa_port_offloads_bridge for something else.
> 
> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
> ---

Reviewed-by: Alvin Šipraga <alsi@bang-olufsen.dk>

>   net/dsa/dsa_priv.h | 12 +++++++-----
>   net/dsa/slave.c    | 18 +++++++++---------
>   2 files changed, 16 insertions(+), 14 deletions(-)
> 
> diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
> index 62b719929ef4..daba10adbd22 100644
> --- a/net/dsa/dsa_priv.h
> +++ b/net/dsa/dsa_priv.h
> @@ -272,8 +272,9 @@ static inline bool dsa_port_offloads_bridge_port(struct dsa_port *dp,
>   	return dsa_port_to_bridge_port(dp) == dev;
>   }
>   
> -static inline bool dsa_port_offloads_bridge(struct dsa_port *dp,
> -					    const struct net_device *bridge_dev)
> +static inline bool
> +dsa_port_offloads_bridge_dev(struct dsa_port *dp,
> +			     const struct net_device *bridge_dev)
>   {
>   	/* DSA ports connected to a bridge, and event was emitted
>   	 * for the bridge.
> @@ -295,13 +296,14 @@ static inline bool dsa_tree_offloads_bridge_port(struct dsa_switch_tree *dst,
>   }
>   
>   /* Returns true if any port of this tree offloads the given bridge */
> -static inline bool dsa_tree_offloads_bridge(struct dsa_switch_tree *dst,
> -					    const struct net_device *bridge_dev)
> +static inline bool
> +dsa_tree_offloads_bridge_dev(struct dsa_switch_tree *dst,
> +			     const struct net_device *bridge_dev)
>   {
>   	struct dsa_port *dp;
>   
>   	list_for_each_entry(dp, &dst->ports, list)
> -		if (dsa_port_offloads_bridge(dp, bridge_dev))
> +		if (dsa_port_offloads_bridge_dev(dp, bridge_dev))
>   			return true;
>   
>   	return false;
> diff --git a/net/dsa/slave.c b/net/dsa/slave.c
> index ad873bb2f676..98fd5e972d28 100644
> --- a/net/dsa/slave.c
> +++ b/net/dsa/slave.c
> @@ -289,14 +289,14 @@ static int dsa_slave_port_attr_set(struct net_device *dev, const void *ctx,
>   		ret = dsa_port_set_state(dp, attr->u.stp_state, true);
>   		break;
>   	case SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING:
> -		if (!dsa_port_offloads_bridge(dp, attr->orig_dev))
> +		if (!dsa_port_offloads_bridge_dev(dp, attr->orig_dev))
>   			return -EOPNOTSUPP;
>   
>   		ret = dsa_port_vlan_filtering(dp, attr->u.vlan_filtering,
>   					      extack);
>   		break;
>   	case SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME:
> -		if (!dsa_port_offloads_bridge(dp, attr->orig_dev))
> +		if (!dsa_port_offloads_bridge_dev(dp, attr->orig_dev))
>   			return -EOPNOTSUPP;
>   
>   		ret = dsa_port_ageing_time(dp, attr->u.ageing_time);
> @@ -409,7 +409,7 @@ static int dsa_slave_port_obj_add(struct net_device *dev, const void *ctx,
>   		err = dsa_port_mdb_add(dp, SWITCHDEV_OBJ_PORT_MDB(obj));
>   		break;
>   	case SWITCHDEV_OBJ_ID_HOST_MDB:
> -		if (!dsa_port_offloads_bridge(dp, obj->orig_dev))
> +		if (!dsa_port_offloads_bridge_dev(dp, obj->orig_dev))
>   			return -EOPNOTSUPP;
>   
>   		err = dsa_port_host_mdb_add(dp, SWITCHDEV_OBJ_PORT_MDB(obj));
> @@ -421,13 +421,13 @@ static int dsa_slave_port_obj_add(struct net_device *dev, const void *ctx,
>   		err = dsa_slave_vlan_add(dev, obj, extack);
>   		break;
>   	case SWITCHDEV_OBJ_ID_MRP:
> -		if (!dsa_port_offloads_bridge(dp, obj->orig_dev))
> +		if (!dsa_port_offloads_bridge_dev(dp, obj->orig_dev))
>   			return -EOPNOTSUPP;
>   
>   		err = dsa_port_mrp_add(dp, SWITCHDEV_OBJ_MRP(obj));
>   		break;
>   	case SWITCHDEV_OBJ_ID_RING_ROLE_MRP:
> -		if (!dsa_port_offloads_bridge(dp, obj->orig_dev))
> +		if (!dsa_port_offloads_bridge_dev(dp, obj->orig_dev))
>   			return -EOPNOTSUPP;
>   
>   		err = dsa_port_mrp_add_ring_role(dp,
> @@ -483,7 +483,7 @@ static int dsa_slave_port_obj_del(struct net_device *dev, const void *ctx,
>   		err = dsa_port_mdb_del(dp, SWITCHDEV_OBJ_PORT_MDB(obj));
>   		break;
>   	case SWITCHDEV_OBJ_ID_HOST_MDB:
> -		if (!dsa_port_offloads_bridge(dp, obj->orig_dev))
> +		if (!dsa_port_offloads_bridge_dev(dp, obj->orig_dev))
>   			return -EOPNOTSUPP;
>   
>   		err = dsa_port_host_mdb_del(dp, SWITCHDEV_OBJ_PORT_MDB(obj));
> @@ -495,13 +495,13 @@ static int dsa_slave_port_obj_del(struct net_device *dev, const void *ctx,
>   		err = dsa_slave_vlan_del(dev, obj);
>   		break;
>   	case SWITCHDEV_OBJ_ID_MRP:
> -		if (!dsa_port_offloads_bridge(dp, obj->orig_dev))
> +		if (!dsa_port_offloads_bridge_dev(dp, obj->orig_dev))
>   			return -EOPNOTSUPP;
>   
>   		err = dsa_port_mrp_del(dp, SWITCHDEV_OBJ_MRP(obj));
>   		break;
>   	case SWITCHDEV_OBJ_ID_RING_ROLE_MRP:
> -		if (!dsa_port_offloads_bridge(dp, obj->orig_dev))
> +		if (!dsa_port_offloads_bridge_dev(dp, obj->orig_dev))
>   			return -EOPNOTSUPP;
>   
>   		err = dsa_port_mrp_del_ring_role(dp,
> @@ -2460,7 +2460,7 @@ static bool dsa_foreign_dev_check(const struct net_device *dev,
>   	struct dsa_switch_tree *dst = dp->ds->dst;
>   
>   	if (netif_is_bridge_master(foreign_dev))
> -		return !dsa_tree_offloads_bridge(dst, foreign_dev);
> +		return !dsa_tree_offloads_bridge_dev(dst, foreign_dev);
>   
>   	if (netif_is_bridge_port(foreign_dev))
>   		return !dsa_tree_offloads_bridge_port(dst, foreign_dev);
>