Subject: Re: [PATCH v2 net-next 8/8] bridge: Automatically manage promisc mode when vlan filtering is on.

From: "Michael S. Tsirkin" <[email-masked]>
Date: Thu, 15 May 2014 21:57:38 +0300

On Thu, May 15, 2014 at 12:56:56PM -0400, Vlad Yasevich wrote:
> If the user doesn't enable vlan filtering, we have to place all
> bridge ports in promsic mode

s/promsic/promisc/

> so that we retain the capability of
> of receiving tagged frames.

s/of of/of/

> When vlan filtering is enabled, the each port

s/the each port/each port/

> will be provided with
> necessary vlan configuration and would be able to receive tagged
> traffic without promiscuous mode set, thus allowing us to automatically
> turn promiscuity on or off depending on the configuration.
> 
> Signed-off-by: Vlad Yasevich <[email-masked]>

Acked-by: Michael S. Tsirkin <[email-masked]>

again I would smash this up, though it is less clear-cut here.

> ---
>  net/bridge/br_if.c      | 12 ++++++++----
>  net/bridge/br_private.h |  9 +++++++++
>  net/bridge/br_vlan.c    |  1 +
>  3 files changed, 18 insertions(+), 4 deletions(-)
> 
> diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
> index 1a3638e..33a83ea 100644
> --- a/net/bridge/br_if.c
> +++ b/net/bridge/br_if.c
> @@ -131,12 +131,16 @@ static void br_port_clear_promisc(struct net_bridge_port *p)
>  void br_manage_promisc(struct net_bridge *br)
>  {
>  	struct net_bridge_port *p;
> +	bool set_all = false;
> +
> +	/* If vlan filtering is disabled or bridge interface is placed
> +	 * into promiscuous mode, place all ports in promiscuous mode.
> +	 */
> +	if ((br->dev->flags & IFF_PROMISC) || !br_vlan_enabled(br))
> +		set_all = true;
>  
>  	list_for_each_entry(p, &br->port_list, list) {
> -		if (br->dev->flags & IFF_PROMISC) {
> -			/* PROMISC flag has been turned on for the bridge
> -			 * itself.  Turn on promisc on all ports.
> -			 */
> +		if (set_all) {
>  			br_port_set_promisc(p);
>  		} else {
>  			/* If the number of auto-ports is <= 1, then all other
> diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
> index 06976af..2b2286d 100644
> --- a/net/bridge/br_private.h
> +++ b/net/bridge/br_private.h
> @@ -642,6 +642,10 @@ static inline u16 br_get_pvid(const struct net_port_vlans *v)
>  	return v->pvid ?: VLAN_N_VID;
>  }
>  
> +static inline int br_vlan_enabled(struct net_bridge *br)
> +{
> +	return br->vlan_enabled;
> +}
>  #else
>  static inline bool br_allowed_ingress(struct net_bridge *br,
>  				      struct net_port_vlans *v,
> @@ -722,6 +726,11 @@ static inline u16 br_get_pvid(const struct net_port_vlans *v)
>  {
>  	return VLAN_N_VID;	/* Returns invalid vid */
>  }
> +
> +static inline int br_vlan_enabled(struct net_bridge *br);
> +{
> +	return 0;
> +}
>  #endif
>  
>  /* br_netfilter.c */
> diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
> index 4a37161..24c5cc5 100644
> --- a/net/bridge/br_vlan.c
> +++ b/net/bridge/br_vlan.c
> @@ -332,6 +332,7 @@ int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val)
>  		goto unlock;
>  
>  	br->vlan_enabled = val;
> +	br_manage_promisc(br);
>  
>  unlock:
>  	rtnl_unlock();
> -- 
> 1.9.0