Skip to content

Commit

Permalink
bridge: vlan: drop unnecessary flush code
Browse files Browse the repository at this point in the history
As Ido Schimmel pointed out the vlan_vid_del() code in nbp_vlan_flush is
unnecessary (and is actually a remnant of the old vlan code) so we can
remove it.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Nikolay Aleksandrov authored and David S. Miller committed Oct 13, 2015
1 parent e9c953e commit b8d02c3
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions net/bridge/br_vlan.c
Original file line number Diff line number Diff line change
Expand Up @@ -959,14 +959,7 @@ int nbp_vlan_delete(struct net_bridge_port *port, u16 vid)

void nbp_vlan_flush(struct net_bridge_port *port)
{
struct net_bridge_vlan_group *vg;
struct net_bridge_vlan *vlan;

ASSERT_RTNL();

vg = nbp_vlan_group(port);
list_for_each_entry(vlan, &vg->vlan_list, vlist)
vlan_vid_del(port->dev, port->br->vlan_proto, vlan->vid);

__vlan_flush(vg);
__vlan_flush(nbp_vlan_group(port));
}

0 comments on commit b8d02c3

Please sign in to comment.