diff options
author | Joe Hershberger <joe.hershberger@ni.com> | 2015-04-08 01:41:21 -0500 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2015-04-18 11:11:35 -0600 |
commit | bc0571fc1067ff8a8fd16990ae65c1a2826ea90c (patch) | |
tree | 1381f5ebd824a415652755afd5adc65d362071b9 /common | |
parent | a34f2075633d7928e2988193b0caba5854e6ef20 (diff) | |
download | u-boot-bc0571fc1067ff8a8fd16990ae65c1a2826ea90c.tar.gz |
net: cosmetic: Fix checkpatch.pl failures in net.c
Finish eliminating CamelCase from net.c and other failures
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r-- | common/cmd_elf.c | 2 | ||||
-rw-r--r-- | common/cmd_net.c | 22 | ||||
-rw-r--r-- | common/spl/spl_net.c | 2 | ||||
-rw-r--r-- | common/update.c | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/common/cmd_elf.c b/common/cmd_elf.c index c745371506..22475dc3cb 100644 --- a/common/cmd_elf.c +++ b/common/cmd_elf.c @@ -170,7 +170,7 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * Check to see if we need to tftp the image ourselves before starting */ if ((argc == 2) && (strcmp(argv[1], "tftp") == 0)) { - if (NetLoop(TFTPGET) <= 0) + if (net_loop(TFTPGET) <= 0) return 1; printf("Automatic boot of VxWorks image at address 0x%08lx ...\n", addr); diff --git a/common/cmd_net.c b/common/cmd_net.c index a672d77d49..b2f3c7b709 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -158,8 +158,8 @@ static void netboot_update_env(void) setenv("domain", net_nis_domain); #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_TIMEOFFSET) - if (NetTimeOffset) { - sprintf(tmp, "%d", NetTimeOffset); + if (net_ntp_time_offset) { + sprintf(tmp, "%d", net_ntp_time_offset); setenv("timeoffset", tmp); } #endif @@ -227,14 +227,14 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc, } bootstage_mark(BOOTSTAGE_ID_NET_START); - size = NetLoop(proto); + size = net_loop(proto); if (size < 0) { bootstage_error(BOOTSTAGE_ID_NET_NETLOOP_OK); return CMD_RET_FAILURE; } bootstage_mark(BOOTSTAGE_ID_NET_NETLOOP_OK); - /* NetLoop ok, update environment */ + /* net_loop ok, update environment */ netboot_update_env(); /* done if no file was loaded (no errors though) */ @@ -267,7 +267,7 @@ static int do_ping(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (net_ping_ip.s_addr == 0) return CMD_RET_USAGE; - if (NetLoop(PING) < 0) { + if (net_loop(PING) < 0) { printf("ping failed; host %s is not alive\n", argv[1]); return CMD_RET_FAILURE; } @@ -310,7 +310,7 @@ int do_cdp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { int r; - r = NetLoop(CDP); + r = net_loop(CDP); if (r < 0) { printf("cdp failed; perhaps not a CISCO switch?\n"); return CMD_RET_FAILURE; @@ -349,11 +349,11 @@ int do_sntp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) toff = getenv("timeoffset"); if (toff == NULL) - NetTimeOffset = 0; + net_ntp_time_offset = 0; else - NetTimeOffset = simple_strtol(toff, NULL, 10); + net_ntp_time_offset = simple_strtol(toff, NULL, 10); - if (NetLoop(SNTP) < 0) { + if (net_loop(SNTP) < 0) { printf("SNTP failed: host %pI4 not responding\n", &net_ntp_server); return CMD_RET_FAILURE; @@ -399,7 +399,7 @@ int do_dns(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) else net_dns_env_var = NULL; - if (NetLoop(DNS) < 0) { + if (net_loop(DNS) < 0) { printf("dns lookup of %s failed, check setup\n", argv[1]); return CMD_RET_FAILURE; } @@ -421,7 +421,7 @@ static int do_link_local(cmd_tbl_t *cmdtp, int flag, int argc, { char tmp[22]; - if (NetLoop(LINKLOCAL) < 0) + if (net_loop(LINKLOCAL) < 0) return CMD_RET_FAILURE; net_gateway.s_addr = 0; diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c index af4952f680..217a435c73 100644 --- a/common/spl/spl_net.c +++ b/common/spl/spl_net.c @@ -28,7 +28,7 @@ void spl_net_load_image(const char *device) } if (device) setenv("ethact", device); - rv = NetLoop(BOOTP); + rv = net_loop(BOOTP); if (rv < 0) { printf("Problem booting with BOOTP\n"); hang(); diff --git a/common/update.c b/common/update.c index 1bf2f82138..1c6aa186d0 100644 --- a/common/update.c +++ b/common/update.c @@ -70,7 +70,7 @@ static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr) /* download the update file */ load_addr = addr; copy_filename(net_boot_file_name, filename, sizeof(net_boot_file_name)); - size = NetLoop(TFTPGET); + size = net_loop(TFTPGET); if (size < 0) rv = 1; |