On Thu, Oct 2, 2014 at 4:54 PM, Vladislav Yasevich <vyasevich@xxxxxxxxx> wrote:
> +static void br_vlan_disable_default_pvid(struct net_bridge *br)
> +{
> + struct net_bridge_port *p;
> + u16 pvid = br->default_pvid;
> +
> + /* Disable default_pvid on all ports where it is still
> + * configured.
> + */
> +
This empty line is not necessary.
> + if (vlan_default_pvid(br_get_vlan_info(br), pvid))
> + br_vlan_delete(br, pvid);
> +
> + list_for_each_entry(p, &br->port_list, list) {
> + if (vlan_default_pvid(nbp_get_vlan_info(p), pvid))
> + nbp_vlan_delete(p, pvid);
> + }
> +
> + br->default_pvid = 0;
> +}
> +
> +static int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid)
> +{
> + struct net_bridge_port *p;
> + u16 old_pvid;
> + int err;
> + DECLARE_BITMAP(changed, BR_MAX_PORTS);
This bitmap will use 128 bytes on stack, why not using heap?
> +
> + bitmap_zero(changed, BR_MAX_PORTS);
> +
> + /* This function runs with filtering turned off so we can
> + * remove the old pvid configuration and add the new one after
> + * without impacting traffic.
> + */
> +
> + old_pvid = br->default_pvid;
Remove the empty line.
[...]
> +int nbp_vlan_init(struct net_bridge_port *p)
> +{
> + int rc = 0;
> +
> + if (p->br->default_pvid) {
> + rc = nbp_vlan_add(p, p->br->default_pvid,
> + BRIDGE_VLAN_INFO_PVID |
> + BRIDGE_VLAN_INFO_UNTAGGED);
> + }
> +
> + return rc;
> +}
'rc' can be removed.
