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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190130173829.GD3207@t480s.localdomain>
Date:   Wed, 30 Jan 2019 17:38:29 -0500
From:   Vivien Didelot <vivien.didelot@...il.com>
To:     Florian Fainelli <f.fainelli@...il.com>
Cc:     netdev@...r.kernel.org, Florian Fainelli <f.fainelli@...il.com>,
        andrew@...n.ch, davem@...emloft.net, idosch@...lanox.com,
        jiri@...lanox.com, ilias.apalodimas@...aro.org,
        ivan.khoronzhuk@...aro.org, roopa@...ulusnetworks.com,
        nikolay@...ulusnetworks.com
Subject: Re: [PATCH net-next v2 08/12] net: dsa: Add
 ndo_vlan_rx_{add,kill}_vid implementation

Hi Florian,

On Tue, 29 Jan 2019 16:55:44 -0800, Florian Fainelli <f.fainelli@...il.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