2 files changed, 3 insertions, 12 deletions

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 48fe76176a22..10b47d4cdfe4 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -722,13 +722,10 @@ int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
                  * specify a VLAN.  To be nice, add/update entry for every
                  * vlan on this port.
                  */
-                vid = find_first_bit(pv->vlan_bitmap, BR_VLAN_BITMAP_LEN);
-                while (vid < BR_VLAN_BITMAP_LEN) {
+                for_each_set_bit(vid, pv->vlan_bitmap, BR_VLAN_BITMAP_LEN) {
                         err = __br_fdb_add(ndm, p, addr, nlh_flags, vid);
                         if (err)
                                 goto out;
-                        vid = find_next_bit(pv->vlan_bitmap,
-                                            BR_VLAN_BITMAP_LEN, vid+1);
                 }
         }
 
@@ -813,11 +810,8 @@ int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
                  * vlan on this port.
                  */
                 err = -ENOENT;
-                vid = find_first_bit(pv->vlan_bitmap, BR_VLAN_BITMAP_LEN);
-                while (vid < BR_VLAN_BITMAP_LEN) {
+                for_each_set_bit(vid, pv->vlan_bitmap, BR_VLAN_BITMAP_LEN) {
                         err &= __br_fdb_delete(p, addr, vid);
-                        vid = find_next_bit(pv->vlan_bitmap,
-                                            BR_VLAN_BITMAP_LEN, vid+1);
                 }
         }
 out:
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index db12a0fcfe50..138284219c6d 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -136,10 +136,7 @@ static int br_fill_ifinfo(struct sk_buff *skb,
                         goto nla_put_failure;
 
                 pvid = br_get_pvid(pv);
-                for (vid = find_first_bit(pv->vlan_bitmap, BR_VLAN_BITMAP_LEN);
-                     vid < BR_VLAN_BITMAP_LEN;
-                     vid = find_next_bit(pv->vlan_bitmap,
-                                         BR_VLAN_BITMAP_LEN, vid+1)) {
+                for_each_set_bit(vid, pv->vlan_bitmap, BR_VLAN_BITMAP_LEN) {
                         vinfo.vid = vid;
                         vinfo.flags = 0;
                         if (vid == pvid)