From 6b621a103572bc60cea5e864eb047bb011fc7962 Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Thu, 11 Mar 2010 12:07:49 +0000 Subject: [PATCH] --- yaml --- r: 188134 b: refs/heads/master c: a1ca14ac54675d3bf48d442b5a7b9eba133f1888 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/phonet/pn_dev.c | 3 +-- trunk/net/phonet/pn_netlink.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fdfe7bc35f0a..94712c446c74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f28f9e43b3d81d1e69da0ebf77c8a6780cb5e0c8 +refs/heads/master: a1ca14ac54675d3bf48d442b5a7b9eba133f1888 diff --git a/trunk/net/phonet/pn_dev.c b/trunk/net/phonet/pn_dev.c index c597cc53a6fb..5c6ae0c701c0 100644 --- a/trunk/net/phonet/pn_dev.c +++ b/trunk/net/phonet/pn_dev.c @@ -107,8 +107,7 @@ static void phonet_device_destroy(struct net_device *dev) if (pnd) { u8 addr; - for (addr = find_first_bit(pnd->addrs, 64); addr < 64; - addr = find_next_bit(pnd->addrs, 64, 1+addr)) + for_each_set_bit(addr, pnd->addrs, 64) phonet_address_notify(RTM_DELADDR, dev, addr); kfree(pnd); } diff --git a/trunk/net/phonet/pn_netlink.c b/trunk/net/phonet/pn_netlink.c index 2e6c7eb8e76a..fe2e7088ee07 100644 --- a/trunk/net/phonet/pn_netlink.c +++ b/trunk/net/phonet/pn_netlink.c @@ -141,8 +141,7 @@ static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb) continue; addr_idx = 0; - for (addr = find_first_bit(pnd->addrs, 64); addr < 64; - addr = find_next_bit(pnd->addrs, 64, 1+addr)) { + for_each_set_bit(addr, pnd->addrs, 64) { if (addr_idx++ < addr_start_idx) continue;