bridge: use __set_bit in __br_vlan_set_default_pvid
authorXin Long <lucien.xin@gmail.com>
Wed, 24 Nov 2021 19:39:33 +0000 (14:39 -0500)
committerJakub Kicinski <kuba@kernel.org>
Sat, 27 Nov 2021 00:47:56 +0000 (16:47 -0800)
The same optimization as the one in commit cc0be1ad686f ("net:
bridge: Slightly optimize 'find_portno()'") is needed for the
'changed' bitmap in __br_vlan_set_default_pvid().

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Link: https://lore.kernel.org/r/4e35f415226765e79c2a11d2c96fbf3061c486e2.1637782773.git.lucien.xin@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/bridge/br_vlan.c

index 49e105e..84ba456 100644 (file)
@@ -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;