colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: cosmetic: Change IPaddr_t to struct in_addr

Browse Source 
This patch is simply clean-up to make the IPv4 type that is used match
what Linux uses. It also attempts to move all variables that are IP
addresses use good naming instead of CamelCase. No functional change.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Joe Hershberger
2015-04-08 01:41:01 -05:00
committed by Simon Glass
parent 2ea4cfdef6
commit 049a95a775
22 changed files with 362 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/net_utils.c
View File

@@ -12,23 +12,25 @@
#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;
addr.s_addr = 0;
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;
addr <<= 8;
addr |= (val & 0xFF);
addr.s_addr <<= 8;
addr.s_addr |= (val & 0xFF);
if (s) {
s = (*e) ? e+1 : e;
}
}
return (htonl(addr));
addr.s_addr = htonl(addr.s_addr);
return addr;
}