From 58f317d1823c34b41990f21931d143a6606f5507 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Mon, 24 Oct 2011 18:00:05 +0000
Subject: [PATCH] net: tftpput: Support selecting get/put for tftp

TftpStart should support starting either a get or a put.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 include/net.h | 2 +-
 net/bootp.c   | 2 +-
 net/tftp.c    | 3 +--
 net/tftp.h    | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/include/net.h b/include/net.h
index 495f60e72b..b408dea666 100644
--- a/include/net.h
+++ b/include/net.h
@@ -367,7 +367,7 @@ extern int		NetRestartWrap;		/* Tried all network devices	*/
 
 enum proto_t {
 	BOOTP, RARP, ARP, TFTPGET, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP,
-	TFTPSRV
+	TFTPSRV, TFTPPUT
 };
 
 /* from net/net.c */
diff --git a/net/bootp.c b/net/bootp.c
index 73470f2d46..b703f428ca 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -165,7 +165,7 @@ static void auto_load(void)
 		}
 #endif
 	}
-	TftpStart();
+	TftpStart(TFTPGET);
 }
 
 #if !defined(CONFIG_CMD_DHCP)
diff --git a/net/tftp.c b/net/tftp.c
index 6d46bbbe7c..7e3bb3dc24 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -595,8 +595,7 @@ TftpTimeout(void)
 }
 
 
-void
-TftpStart(void)
+void TftpStart(enum proto_t protocol)
 {
 	char *ep;             /* Environment pointer */
 
diff --git a/net/tftp.h b/net/tftp.h
index 3abdf7bc26..c51aa253c4 100644
--- a/net/tftp.h
+++ b/net/tftp.h
@@ -16,7 +16,7 @@
  */
 
 /* tftp.c */
-extern void	TftpStart (void);	/* Begin TFTP get */
+void TftpStart(enum proto_t protocol);	/* Begin TFTP get/put */
 
 #ifdef CONFIG_CMD_TFTPSRV
 extern void	TftpStartServer(void);	/* Wait for incoming TFTP put */
-- 
2.39.5