[incubator-nuttx-apps] branch master updated: dhcpc: Rename timeout Kconfig

[xi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git


The following commit(s) were added to refs/heads/master by this push:
     new 83505e217 dhcpc: Rename timeout Kconfig
83505e217 is described below

commit 83505e217b8d98a7048fd2fa4078cad93fb95a76
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Thu Jul 7 17:08:50 2022 +0900

    dhcpc: Rename timeout Kconfig
    
    NETUTILS_DHCPC_RECV_TIMEOUT -> NETUTILS_DHCPC_RECV_TIMEOUT_MS
    
    Recently its unit has been changed from second to millisecond. [1]
    Using the same Kconfig name for a different meaning is a pitfall
    for an upgrade. I was using 3ms timeout because of this.
    
    This commit renames it so that at least the default value
    is used for a careless user like me.
    
    [1]
    ```
    commit 8fd4b6105be2a535ecea2312858602d9ffa4e670
    Author: zrrong <zr...@bouffalolab.com>
    Date:   Fri May 27 11:35:23 2022 +0800
    
        netutils/dhcpc: Change the timeout unit to milliseconds
    ```
---
 netutils/dhcpc/Kconfig | 2 +-
 netutils/dhcpc/dhcpc.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/netutils/dhcpc/Kconfig b/netutils/dhcpc/Kconfig
index 52688e65e..5504c87a0 100644
--- a/netutils/dhcpc/Kconfig
+++ b/netutils/dhcpc/Kconfig
@@ -17,7 +17,7 @@ config NETUTILS_DHCPC_HOST_NAME
 	string "DHCP client host name"
 	default "nuttx"
 
-config NETUTILS_DHCPC_RECV_TIMEOUT
+config NETUTILS_DHCPC_RECV_TIMEOUT_MS
 	int "Number of receive timeout in millisecond"
 	default 3000
 	---help---
diff --git a/netutils/dhcpc/dhcpc.c b/netutils/dhcpc/dhcpc.c
index 69153e89e..2f6b918da 100644
--- a/netutils/dhcpc/dhcpc.c
+++ b/netutils/dhcpc/dhcpc.c
@@ -552,8 +552,8 @@ FAR void *dhcpc_open(FAR const char *interface, FAR const void *macaddr,
 
       /* Configure for read timeouts */
 
-      tv.tv_sec  = CONFIG_NETUTILS_DHCPC_RECV_TIMEOUT / 1000;
-      tv.tv_usec = (CONFIG_NETUTILS_DHCPC_RECV_TIMEOUT % 1000) * 1000;
+      tv.tv_sec  = CONFIG_NETUTILS_DHCPC_RECV_TIMEOUT_MS / 1000;
+      tv.tv_usec = (CONFIG_NETUTILS_DHCPC_RECV_TIMEOUT_MS % 1000) * 1000;
 
       ret = setsockopt(pdhcpc->sockfd, SOL_SOCKET, SO_RCVTIMEO, &tv,
                        sizeof(struct timeval));