diff options
| -rw-r--r-- | net/phonet/pn_dev.c | 3 | ||||
| -rw-r--r-- | net/phonet/pn_netlink.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c index c597cc53a6fb..5c6ae0c701c0 100644 --- a/net/phonet/pn_dev.c +++ b/net/phonet/pn_dev.c | |||
| @@ -107,8 +107,7 @@ static void phonet_device_destroy(struct net_device *dev) | |||
| 107 | if (pnd) { | 107 | if (pnd) { |
| 108 | u8 addr; | 108 | u8 addr; |
| 109 | 109 | ||
| 110 | for (addr = find_first_bit(pnd->addrs, 64); addr < 64; | 110 | for_each_set_bit(addr, pnd->addrs, 64) |
| 111 | addr = find_next_bit(pnd->addrs, 64, 1+addr)) | ||
| 112 | phonet_address_notify(RTM_DELADDR, dev, addr); | 111 | phonet_address_notify(RTM_DELADDR, dev, addr); |
| 113 | kfree(pnd); | 112 | kfree(pnd); |
| 114 | } | 113 | } |
diff --git a/net/phonet/pn_netlink.c b/net/phonet/pn_netlink.c index 2e6c7eb8e76a..fe2e7088ee07 100644 --- a/net/phonet/pn_netlink.c +++ b/net/phonet/pn_netlink.c | |||
| @@ -141,8 +141,7 @@ static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb) | |||
| 141 | continue; | 141 | continue; |
| 142 | 142 | ||
| 143 | addr_idx = 0; | 143 | addr_idx = 0; |
| 144 | for (addr = find_first_bit(pnd->addrs, 64); addr < 64; | 144 | for_each_set_bit(addr, pnd->addrs, 64) { |
| 145 | addr = find_next_bit(pnd->addrs, 64, 1+addr)) { | ||
| 146 | if (addr_idx++ < addr_start_idx) | 145 | if (addr_idx++ < addr_start_idx) |
| 147 | continue; | 146 | continue; |
| 148 | 147 | ||
