diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-11 13:11:07 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-11 13:11:07 +0100 |
| commit | e64f16cf34175d9e662edfaa02bc7895c1b50b96 (patch) | |
| tree | 98b2387b169376b005f671635cfb953dbe675851 /include | |
| parent | 2881f2df35d15754874e90be112d67f33088326f (diff) | |
| parent | 39698df6f7623fca8f6bdb500625e8da2fcd54f5 (diff) | |
| download | barebox-e64f16cf34175d9e662edfaa02bc7895c1b50b96.tar.gz barebox-e64f16cf34175d9e662edfaa02bc7895c1b50b96.tar.xz | |
Merge branch 'for-next/net'
Diffstat (limited to 'include')
| -rw-r--r-- | include/net.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net.h b/include/net.h index 2a37a43a5c..13e335aac2 100644 --- a/include/net.h +++ b/include/net.h @@ -315,9 +315,9 @@ 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(char *host); +IPaddr_t resolv(const char *host); #else -static inline IPaddr_t resolv(char *host) +static inline IPaddr_t resolv(const char *host) { IPaddr_t ip = 0; string_to_ip(host, &ip); |