Re: [PATCH net-next v2 08/12] net: dsa: Add ndo_vlan_rx_{add,kill}_vid implementation

[Vivien Didelot]

Hi Florian,

On Tue, 29 Jan 2019 16:55:44 -0800, Florian Fainelli <f.faine...@gmail.com> 
wrote:

> -     if (br_vlan_enabled(dp->bridge_dev))
> +     /* Can be called from dsa_slave_port_obj_add() or
> +      * dsa_slave_vlan_rx_add_vid()
> +      */
> +     if ((dp->bridge_dev && br_vlan_enabled(dp->bridge_dev)) ||
> +         !dp->bridge_dev)

        if (!dp->bridge_dev || br_vlan_enabled(dp->bridge_dev))

This would be sufficient.

>  
>       return 0;
> @@ -270,7 +274,11 @@ int dsa_port_vlan_del(struct dsa_port *dp,
>       if (netif_is_bridge_master(vlan->obj.orig_dev))
>               return -EOPNOTSUPP;
>  
> -     if (br_vlan_enabled(dp->bridge_dev))
> +     /* Can be called from dsa_slave_port_obj_del() or
> +      * dsa_slave_vlan_rx_kill_vid()
> +      */
> +     if ((dp->bridge_dev && br_vlan_enabled(dp->bridge_dev)) ||
> +         !dp->bridge_dev)

Same here.


Thanks,

        Vivien