Commit 442b03c3 authored by Xin Long's avatar Xin Long Committed by Jakub Kicinski
Browse files

bridge: use __set_bit in __br_vlan_set_default_pvid 



The same optimization as the one in commit cc0be1ad ("net:
bridge: Slightly optimize 'find_portno()'") is needed for the
'changed' bitmap in __br_vlan_set_default_pvid().

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Link: https://lore.kernel.org/r/4e35f415226765e79c2a11d2c96fbf3061c486e2.1637782773.git.lucien.xin@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent bde3b0fd

net/bridge/br_vlan.c

+2 −2
Original line number Diff line number Diff line
@@ -1063,7 +1063,7 @@ int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid, 
		if (br_vlan_delete(br, old_pvid))

			br_vlan_notify(br, NULL, old_pvid, 0, RTM_DELVLAN);

		br_vlan_notify(br, NULL, pvid, 0, RTM_NEWVLAN);

		set_bit(0, changed);

		__set_bit(0, changed);

	}



	list_for_each_entry(p, &br->port_list, list) {
@@ -1085,7 +1085,7 @@ int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid, 
		if (nbp_vlan_delete(p, old_pvid))

			br_vlan_notify(br, p, old_pvid, 0, RTM_DELVLAN);

		br_vlan_notify(p->br, p, pvid, 0, RTM_NEWVLAN);

		set_bit(p->port_no, changed);

		__set_bit(p->port_no, changed);

	}



	br->default_pvid = pvid;