From ac50a05cafdf21ade918e17a0e98649965293da1 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Sat, 17 Oct 2009 09:58:29 +0200 Subject: [PATCH] pass filename to nfs and tftp start functions Signed-off-by: Sascha Hauer --- commands/net.c | 8 ++++---- net/nfs.c | 4 +--- net/nfs.h | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/commands/net.c b/commands/net.c index 4bdccd378..2b949f252 100644 --- a/commands/net.c +++ b/commands/net.c @@ -160,8 +160,8 @@ U_BOOT_CMD_END int net_store_fd; -extern void TftpStart(void); /* Begin TFTP get */ -extern void NfsStart(void); +extern void TftpStart(char *); /* Begin TFTP get */ +extern void NfsStart(char *); static int netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[]) @@ -196,10 +196,10 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[]) switch (proto) { case TFTP: - TftpStart(); + TftpStart(remotefile); break; case NFS: - NfsStart(); + NfsStart(remotefile); default: break; } diff --git a/net/nfs.c b/net/nfs.c index f24763dfe..da80c2216 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -648,10 +648,8 @@ NfsHandler (uchar *pkt, unsigned dest, unsigned src, unsigned len) void -NfsStart (void) +NfsStart (char *p) { - char *p = BootFile; - #ifdef NFS_DEBUG printf ("%s\n", __FUNCTION__); #endif diff --git a/net/nfs.h b/net/nfs.h index 712afa089..7c7a648e4 100644 --- a/net/nfs.h +++ b/net/nfs.h @@ -66,7 +66,7 @@ struct rpc_t { } reply; } u; }; -extern void NfsStart (void); /* Begin NFS */ +extern void NfsStart (char *); /* Begin NFS */ /**********************************************************************/