Commit 74694e7b authored by Wei Yongjun's avatar Wei Yongjun Committed by David S. Miller
Browse files

bridge: using for_each_set_bit to simplify the code 



Using for_each_set_bit() to simplify the code.

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5096e3c4

net/bridge/br_fdb.c

+2 −8
Original line number Diff line number Diff line
@@ -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:

net/bridge/br_netlink.c

+1 −4
Original line number Diff line number Diff line
@@ -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)