sync with udhcp bug fixes

git-svn-id: svn://busybox.net/trunk/busybox@6597 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 5 insertions, 4 deletions

diff --git a/networking/udhcp/script.c b/networking/udhcp/script.c
index 2eb4459dd..48ff8e07e 100644
--- a/networking/udhcp/script.c
+++ b/networking/udhcp/script.c
@@ -68,10 +68,11 @@ static int sprintip(char *dest, char *pre, unsigned char *ip)
 static int mton(struct in_addr *mask)
 {
         int i;
-        /* note: mask will always be in network byte order, so
-         * there are no endian issues */
-        for (i = 31; i >= 0 && !((mask->s_addr >> i) & 1); i--);
-        return i + 1;
+        unsigned long bits = ntohl(mask->s_addr);
+        /* too bad one can't check the carry bit, etc in c bit
+         * shifting */
+        for (i = 0; i < 32 && !((bits >> i) & 1); i++);
+        return 32 - i;
 }