kw_spi: add weak functions board_spi_claim/release_bus

[karo-tx-uboot.git] / net / tftp.c

diff --git a/net/tftp.c b/net/tftp.c
index bc7fe05465cb9b4c3b0a1e8a1d45264862be7fae..b2e08b4bfb3d3daba64328c24e84ecbe9afc6970 100644 (file)
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -177,7 +177,7 @@ store_block(unsigned block, uchar *src, unsigned len)
                rc = flash_write((char *)src, (ulong)(load_addr+offset), len);
                if (rc) {
                        flash_perror(rc);
-                       NetState = NETLOOP_FAIL;
+                       net_set_state(NETLOOP_FAIL);
                        return;
                }
        } else
@@ -300,7 +300,7 @@ static void tftp_complete(void)
        }
 #endif
        puts("\ndone\n");
-       NetState = NETLOOP_SUCCESS;
+       net_set_state(NETLOOP_SUCCESS);
 }
 
 static void
@@ -322,7 +322,7 @@ TftpSend(void)
         *      We will always be sending some sort of packet, so
         *      cobble together the packet headers now.
         */
-       pkt = (uchar *)(NetTxPacket + NetEthHdrSize() + IP_HDR_SIZE);
+       pkt = NetTxPacket + NetEthHdrSize() + IP_UDP_HDR_SIZE;
 
        switch (TftpState) {
        case STATE_SEND_RRQ:
@@ -627,7 +627,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
                        if (MasterClient && (TftpBlock >= TftpEndingBlock)) {
                                puts("\nMulticast tftp done\n");
                                mcast_cleanup();
-                               NetState = NETLOOP_SUCCESS;
+                               net_set_state(NETLOOP_SUCCESS);
                        }
                } else
 #endif
@@ -644,7 +644,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
                case TFTP_ERR_ACCESS_DENIED:
                        puts("Not retrying...\n");
                        eth_halt();
-                       NetState = NETLOOP_FAIL;
+                       net_set_state(NETLOOP_FAIL);
                        break;
                case TFTP_ERR_UNDEFINED:
                case TFTP_ERR_DISK_FULL:
@@ -778,7 +778,7 @@ void TftpStart(enum proto_t protocol)
        TftpTimeoutCountMax = TftpRRQTimeoutCountMax;
 
        NetSetTimeout(TftpTimeoutMSecs, TftpTimeout);
-       NetSetHandler(TftpHandler);
+       net_set_udp_handler(TftpHandler);
 #ifdef CONFIG_CMD_TFTPPUT
        net_set_icmp_handler(icmp_handler);
 #endif
@@ -840,7 +840,7 @@ TftpStartServer(void)
 #endif
 
        TftpState = STATE_RECV_WRQ;
-       NetSetHandler(TftpHandler);
+       net_set_udp_handler(TftpHandler);
 }
 #endif /* CONFIG_CMD_TFTPSRV */