1 files changed, 11 insertions, 3 deletions

diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 7c9f52ae7..dda4a9112 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -965,8 +965,6 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                 SERVER_PORT = CLIENT_PORT - 1;
         }
 #endif
-        if (opt & OPT_o)
-                client_config.no_default_options = 1;
         while (list_O) {
                 char *optstr = llist_pop(&list_O);
                 unsigned n = bb_strtou(optstr, NULL, 0);
@@ -976,6 +974,16 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                 }
                 client_config.opt_mask[n >> 3] |= 1 << (n & 7);
         }
+        if (!(opt & OPT_o)) {
+                /*
+                unsigned i, n;
+                for (i = 0; (n = dhcp_optflags[i].code) != 0; i++) {
+                        if (dhcp_optflags[i].flags & OPTION_REQ) {
+                                client_config.opt_mask[n >> 3] |= 1 << (n & 7);
+                        }
+                }
+                */
+        }
         while (list_x) {
                 char *optstr = llist_pop(&list_x);
                 char *colon = strchr(optstr, ':');
@@ -1066,8 +1074,8 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                 retval = 0;
                 /* If we already timed out, fall through with retval = 0, else... */
                 if ((int)tv.tv_sec > 0) {
+                        log1("Waiting on select %u seconds", (int)tv.tv_sec);
                         timestamp_before_wait = (unsigned)monotonic_sec();
-                        log1("Waiting on select...");
                         retval = select(max_fd + 1, &rfds, NULL, NULL, &tv);
                         if (retval < 0) {
                                 /* EINTR? A signal was caught, don't panic */