summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSascha Hauer <sha@pengutronix.de>2009-10-17 08:49:45 +0200
committerSascha Hauer <sha@pengutronix.de>2009-10-17 08:49:45 +0200
commit551d0886878cfb6dc4e58e2283fa65748819c605 (patch)
treead6cfc4f7811fe712bd6af55994a7e6a2162b805 /net
parente2c295465484e496b05f9cb72b1340e48968b79a (diff)
downloadbarebox-551d0886878cfb6dc4e58e2283fa65748819c605.tar.gz
barebox-551d0886878cfb6dc4e58e2283fa65748819c605.tar.xz
tftp: remove default filename. We always have a filename given
Signed-off-by: Sascha Hauer <sha@pengutronix.de>
Diffstat (limited to 'net')
-rw-r--r--net/tftp.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/net/tftp.c b/net/tftp.c
index 6a6cd6a16b..7a5b8075ff 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -53,8 +53,6 @@ static int TftpState;
#define TFTP_BLOCK_SIZE 512 /* default TFTP block size */
#define TFTP_SEQUENCE_SIZE ((ulong)(1<<16)) /* sequence number is 16 bit */
-#define DEFAULT_NAME_LEN (8 + 4 + 1)
-static char default_filename[DEFAULT_NAME_LEN];
static char *tftp_filename;
extern int net_store_fd;
@@ -286,19 +284,7 @@ TftpStart (void)
char *ep; /* Environment pointer */
#endif
- if (BootFile[0] == '\0') {
- sprintf(default_filename, "%02lX%02lX%02lX%02lX.img",
- NetOurIP & 0xFF,
- (NetOurIP >> 8) & 0xFF,
- (NetOurIP >> 16) & 0xFF,
- (NetOurIP >> 24) & 0xFF );
- tftp_filename = default_filename;
-
- printf ("*** Warning: no boot file name; using '%s'\n",
- tftp_filename);
- } else {
- tftp_filename = BootFile;
- }
+ tftp_filename = BootFile;
puts ("TFTP from server "); print_IPaddr (NetServerIP);
puts ("; our IP address is "); print_IPaddr (NetOurIP);