From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Date: Mon, 12 Oct 2015 19:47:04 +0000 (+0200)
Subject: bridge: vlan: drop unnecessary flush code
X-Git-Tag: v4.9.8~3303^2~141^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b8d02c3cace37393bf9ff0a9eaa1ee39cda1d259;p=platform%2Fkernel%2Flinux-rpi3.git

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>
---

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index ffaa6d9..85e6756 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));
 }