1 files changed, 2 insertions, 13 deletions

diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 07e2eadfe..e44086c2e 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -150,18 +150,6 @@ static int sprint_nip(char *dest, const char *pre, const uint8_t *ip)
         return sprintf(dest, "%s%u.%u.%u.%u", pre, ip[0], ip[1], ip[2], ip[3]);
 }
 
-/* really simple implementation, just count the bits */
-static int mton(uint32_t mask)
-{
-        int i = 0;
-        mask = ntohl(mask); /* 111110000-like bit pattern */
-        while (mask) {
-                i++;
-                mask <<= 1;
-        }
-        return i;
-}
-
 #if ENABLE_FEATURE_UDHCPC_SANITIZEOPT
 /* Check if a given name represents a valid DNS name */
 /* See RFC1035, 2.3.1 */
@@ -508,7 +496,8 @@ static void fill_envp(struct dhcp_packet *packet)
                                 /* Generate extra envvar for DHCP_SUBNET, $mask */
                                 uint32_t subnet;
                                 move_from_unaligned32(subnet, opt_item->data);
-                                putenvp(xasprintf("mask=%u", mton(subnet)));
+//FIXME: we do not check that subnet has bit pattern 11..10..0
+                                putenvp(xasprintf("mask=%u", bb_popcnt_32(subnet)));
                         }
                 } else {
                         unsigned ofs;