diff options
| author | Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-10-12 21:47:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-13 13:57:56 +0200 |
| commit | b8d02c3cace37393bf9ff0a9eaa1ee39cda1d259 (patch) | |
| tree | 1027b4d4f71e3c7173b547453e5b560ca11c1da5 /net/bridge | |
| parent | bridge: vlan: use rcu for vlan_list traversal in br_fill_ifinfo (diff) | |
| download | linux-b8d02c3cace37393bf9ff0a9eaa1ee39cda1d259.tar.xz linux-b8d02c3cace37393bf9ff0a9eaa1ee39cda1d259.zip | |
bridge: vlan: drop unnecessary flush code
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>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_vlan.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index ffaa6d986505..85e67568092e 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -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)); } |