Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbbaf949 authored by Toshiaki Makita's avatar Toshiaki Makita Committed by David S. Miller
Browse files

bridge: Call vlan_vid_del for all vids at nbp_vlan_flush 



We should call vlan_vid_del for all vids at nbp_vlan_flush to prevent
vid_info->refcount from being leaked when detaching a bridge port.

Signed-off-by: default avatarToshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 19236837

net/bridge/br_vlan.c

+4 −0
Original line number Diff line number Diff line
@@ -390,6 +390,7 @@ int nbp_vlan_delete(struct net_bridge_port *port, u16 vid) 
void nbp_vlan_flush(struct net_bridge_port *port)

{

	struct net_port_vlans *pv;

	u16 vid;



	ASSERT_RTNL();
@@ -397,6 +398,9 @@ void nbp_vlan_flush(struct net_bridge_port *port) 
	if (!pv)

		return;



	for_each_set_bit(vid, pv->vlan_bitmap, VLAN_N_VID)

		vlan_vid_del(port->dev, htons(ETH_P_8021Q), vid);



	__vlan_flush(pv);

}