]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
net: bootp: Fix compile error processing ntpserver option
authorChris Packham <judge.packham@gmail.com>
Thu, 3 May 2018 08:19:03 +0000 (20:19 +1200)
committerTom Rini <trini@konsulko.com>
Tue, 15 May 2018 01:28:38 +0000 (21:28 -0400)
When the following configuration is set

  # CONFIG_CMD_DHCP is not set
  CONFIG_CMD_BOOTP=y
  CONFIG_BOOTP_NTPSERVER=y

The following compile error is observed

  error: used struct type value where scalar is required
    if (net_ntp_server)
        ^~~~~~~~~~~~~~

Resolve this by checking net_ntp_server.s_addr instead.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
net/bootp.c

index efa959971c279fe4e74d04ec0007d0cb1ef52e34..9d7cb5d30c140e0aadedc6371304ba955b85944f 100644 (file)
@@ -333,7 +333,7 @@ static void bootp_process_vendor(u8 *ext, int size)
                debug("net_nis_domain : %s\n", net_nis_domain);
 
 #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_NTPSERVER)
-       if (net_ntp_server)
+       if (net_ntp_server.s_addr)
                debug("net_ntp_server : %pI4\n", &net_ntp_server);
 #endif
 }