diff options
| -rw-r--r-- | board/freescale/p1010rdb/README | 1 | ||||
| -rw-r--r-- | board/keymile/km_arm/fpga_config.c | 1 | ||||
| -rw-r--r-- | common/cmd_pxe.c | 4 | ||||
| -rw-r--r-- | doc/README.link-local | 1 | ||||
| -rw-r--r-- | net/link_local.c | 5 |
5 files changed, 3 insertions, 9 deletions
diff --git a/board/freescale/p1010rdb/README b/board/freescale/p1010rdb/README index fcd8541cadc..022c023ae24 100644 --- a/board/freescale/p1010rdb/README +++ b/board/freescale/p1010rdb/README @@ -209,4 +209,3 @@ Place uImage, p1010rdb.dtb and rootfs files in the TFTP disk area. Please contact your local field applications engineer or sales representative to obtain related documents, such as P1010-RDB User Guide for details. - diff --git a/board/keymile/km_arm/fpga_config.c b/board/keymile/km_arm/fpga_config.c index fcc5fe6c65e..66a3baf0f71 100644 --- a/board/keymile/km_arm/fpga_config.c +++ b/board/keymile/km_arm/fpga_config.c @@ -253,4 +253,3 @@ int toggle_eeprom_spi_bus(void) return 0; } - diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index 2b1115d7276..77a7dd17ac1 100644 --- a/common/cmd_pxe.c +++ b/common/cmd_pxe.c @@ -26,7 +26,6 @@ #define MAX_TFTP_PATH_LEN 127 - /* * Like getenv, but prints an error if envvar isn't defined in the * environment. It always returns what getenv does, so it can be used in @@ -175,8 +174,6 @@ static int do_get_fat(char *file_path, char *file_addr) return -ENOENT; } - - /* * As in pxelinux, paths to files referenced from files we retrieve are * relative to the location of bootfile. get_relfile takes such a path and @@ -365,7 +362,6 @@ do_pxe_get(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (argc != 1) return CMD_RET_USAGE; - pxefile_addr_str = from_env("pxefile_addr_r"); if (!pxefile_addr_str) diff --git a/doc/README.link-local b/doc/README.link-local index e623e5659f8..9586eca269d 100644 --- a/doc/README.link-local +++ b/doc/README.link-local @@ -73,4 +73,3 @@ If both fail or are disabled, static settings are used. "setenv netmask $snetmask; " \ "setenv gatewayip $sgatewayip; " \ "fi;\0" \ - diff --git a/net/link_local.c b/net/link_local.c index 582d0115b76..8e7665f0907 100644 --- a/net/link_local.c +++ b/net/link_local.c @@ -229,8 +229,9 @@ void link_local_receive_arp(struct arp_hdr *arp, int len) * XXX Don't bother with ethernet link just yet if ((fds[0].revents & POLLIN) == 0) { if (fds[0].revents & POLLERR) { - // FIXME: links routinely go down; - // this shouldn't necessarily exit. + /* + * FIXME: links routinely go down; + */ bb_error_msg("iface %s is down", eth_get_name()); if (ready) { run(argv, "deconfig", &ip); |