diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-07 08:12:40 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-07 08:12:40 +0100 |
| commit | bba3ddf8ef75a6102f48e6017e18f2e703cd3459 (patch) | |
| tree | fd0a87102d26c91d08c03476650afdc66c9b36c5 /include | |
| parent | 4f23fb1070262255443d5fe0c5db757b1b8ea2c2 (diff) | |
| parent | a0e2d2fa05384cf9b9c1f00448e1ca175b7b3afb (diff) | |
| download | barebox-bba3ddf8ef75a6102f48e6017e18f2e703cd3459.tar.gz barebox-bba3ddf8ef75a6102f48e6017e18f2e703cd3459.tar.xz | |
Merge branch 'for-next/net'
Diffstat (limited to 'include')
| -rw-r--r-- | include/net.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/net.h b/include/net.h index a09cb155a8..6912a557b5 100644 --- a/include/net.h +++ b/include/net.h @@ -330,13 +330,11 @@ int string_to_ethaddr(const char *str, u8 enetaddr[6]); void ethaddr_to_string(const u8 enetaddr[6], char *str); #ifdef CONFIG_NET_RESOLV -IPaddr_t resolv(const char *host); +int resolv(const char *host, IPaddr_t *ip); #else -static inline IPaddr_t resolv(const char *host) +static inline int resolv(const char *host, IPaddr_t *ip) { - IPaddr_t ip = 0; - string_to_ip(host, &ip); - return ip; + return string_to_ip(host, ip); } #endif |