* Patch by Matthew S. McClintock, 14 Apr 2004:

[u-boot] / net / nfs.c

diff --git a/net/nfs.c b/net/nfs.c
index ca2a108bae3e57dd42107a36c6d535b556ac0a7d..300c08fa9678e7424ecce80054acc4cdb67059d9 100644 (file)
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -192,7 +192,7 @@ rpc_req (int rpc_prog, int rpc_proc, uint32_t *data, int datalen)
 
        pktlen = (char *)p + datalen*sizeof(uint32_t) - (char *)&pkt;
 
-       memcpy ((char *)NetTxPacket+ETHER_HDR_SIZE+IP_HDR_SIZE, (char *)&pkt, pktlen);
+       memcpy ((char *)NetTxPacket + NetEthHdrSize() + IP_HDR_SIZE, (char *)&pkt, pktlen);
 
        if (rpc_prog == PROG_PORTMAP)
                sport = SUNRPC_PORT;
@@ -746,19 +746,14 @@ NfsStart (void)
                        print_IPaddr (NetOurGatewayIP) ;
                }
        }
-       putc ('\n');
-
-       printf ("Filename '%s/%s'.", nfs_path, nfs_filename);
+       printf ("\nFilename '%s/%s'.", nfs_path, nfs_filename);
 
        if (NetBootFileSize) {
                printf (" Size is 0x%x Bytes = ", NetBootFileSize<<9);
                print_size (NetBootFileSize<<9, "");
        }
-       putc ('\n');
-
-       printf ("Load address: 0x%lx\n", load_addr);
-
-       printf ("Loading: *\b");
+       printf ("\nLoad address: 0x%lx\n"
+               "Loading: *\b", load_addr);
 
        NetSetTimeout (NFS_TIMEOUT * CFG_HZ, NfsTimeout);
        NetSetHandler (NfsHandler);