Fix endianess problem in TFTP / NFS default filenames

Patch by Hiroshi Ito, 06 Dec 2004

diff --git a/CHANGELOG b/CHANGELOG
index b0b0c586a4ddd24ea92946e24fbaa86b13b5ae34..d54a159f8dfffce52ffde5eafb60395229382f97 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.3:
 ======================================================================
 
+* Fix endianess problem in TFTP / NFS default filenames
+  Patch by Hiroshi Ito, 06 Dec 2004
+
 * Ignore broadcast status bit in received frames in 8260 FCC ethernet
   loopback test code
   Patch by Murray Jensen, 18 Jul 2005

diff --git a/net/nfs.c b/net/nfs.c
index 2d94c08f7602abd7ea3ee24c6c7d593a938f0d19..1c697ad3464683e9c1df587280bbe28fe1c204ef 100644 (file)
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -703,13 +703,11 @@ NfsStart (void)
        }
 
        if (BootFile[0] == '\0') {
-               IPaddr_t OurIP = ntohl (NetOurIP);
-
                sprintf (default_filename, "/nfsroot/%02lX%02lX%02lX%02lX.img",
-                       OurIP & 0xFF,
-                       (OurIP >>  8) & 0xFF,
-                       (OurIP >> 16) & 0xFF,
-                       (OurIP >> 24) & 0xFF    );
+                       NetOurIP & 0xFF,
+                       (NetOurIP >>  8) & 0xFF,
+                       (NetOurIP >> 16) & 0xFF,
+                       (NetOurIP >> 24) & 0xFF );
                strcpy (nfs_path, default_filename);
 
                printf ("*** Warning: no boot file name; using '%s'\n",

diff --git a/net/tftp.c b/net/tftp.c
index 5a5ae22ac85b367ac7f83d190fbc31fac0f158b0..64a5576663c68ff6216d82b3d4a2eade05e7f2b0 100644 (file)
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -302,13 +302,11 @@ void
 TftpStart (void)
 {
        if (BootFile[0] == '\0') {
-               IPaddr_t OurIP = ntohl(NetOurIP);
-
                sprintf(default_filename, "%02lX%02lX%02lX%02lX.img",
-                       OurIP & 0xFF,
-                       (OurIP >>  8) & 0xFF,
-                       (OurIP >> 16) & 0xFF,
-                       (OurIP >> 24) & 0xFF    );
+                       NetOurIP & 0xFF,
+                       (NetOurIP >>  8) & 0xFF,
+                       (NetOurIP >> 16) & 0xFF,
+                       (NetOurIP >> 24) & 0xFF );
                tftp_filename = default_filename;
 
                printf ("*** Warning: no boot file name; using '%s'\n",