projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: kconfig: Make FSP_TEMP_RAM_ADDR depend on HAVE_FSP
[oweals/u-boot.git]
/
lib
/
net_utils.c
diff --git
a/lib/net_utils.c
b/lib/net_utils.c
index 8d66163159c60d706b80c9f37d2594878d456a52..cfae842752414ebb7a24d3ed5229245a114e02da 100644
(file)
--- a/
lib/net_utils.c
+++ b/
lib/net_utils.c
@@
-12,23
+12,25
@@
#include <common.h>
#include <common.h>
-
IPaddr_t
string_to_ip(const char *s)
+
struct in_addr
string_to_ip(const char *s)
{
{
-
IPaddr_t
addr;
+
struct in_addr
addr;
char *e;
int i;
char *e;
int i;
+ addr.s_addr = 0;
if (s == NULL)
if (s == NULL)
- return
(0)
;
+ return
addr
;
- for (addr
=0, i=0; i<
4; ++i) {
+ for (addr
.s_addr = 0, i = 0; i <
4; ++i) {
ulong val = s ? simple_strtoul(s, &e, 10) : 0;
ulong val = s ? simple_strtoul(s, &e, 10) : 0;
- addr <<= 8;
- addr |= (val & 0xFF);
+ addr
.s_addr
<<= 8;
+ addr
.s_addr
|= (val & 0xFF);
if (s) {
s = (*e) ? e+1 : e;
}
}
if (s) {
s = (*e) ? e+1 : e;
}
}
- return (htonl(addr));
+ addr.s_addr = htonl(addr.s_addr);
+ return addr;
}
}