X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=net%2Fsntp.c;h=95e75422c107dcdbd9eb8f25f021c0d21ba77e4a;hb=10a3367955bc2033b288915f8f10d0e507fe2fa1;hp=9e11eb49626c1c8d3f40f95af6ffdfa4b8910782;hpb=ea287debe1980182adbe8c63b71bb82193dad5b7;p=u-boot

diff --git a/net/sntp.c b/net/sntp.c
index 9e11eb4962..95e75422c1 100644
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -12,7 +12,7 @@
 
 #include "sntp.h"
 
-#if ((CONFIG_COMMANDS & CFG_CMD_NET) && (CONFIG_COMMANDS & CFG_CMD_SNTP))
+#if defined(CONFIG_CMD_NET) && defined(CONFIG_CMD_SNTP)
 
 #define SNTP_TIMEOUT 10
 
@@ -52,28 +52,27 @@ SntpTimeout (void)
 static void
 SntpHandler (uchar *pkt, unsigned dest, unsigned src, unsigned len)
 {
-	struct sntp_pkt_t rpkt;
+	struct sntp_pkt_t *rpktp = (struct sntp_pkt_t *)pkt;
 	struct rtc_time tm;
+	ulong seconds;
 
 	debug ("%s\n", __FUNCTION__);
 
 	if (dest != SntpOurPort) return;
 
-	memcpy ((unsigned char *)&rpkt, pkt, len);
+	/*
+	 * As the RTC's used in U-Boot sepport second resolution only
+	 * we simply ignore the sub-second field.
+	 */
+	memcpy (&seconds, &rpktp->transmit_timestamp, sizeof(ulong));
 
-#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP)
-to_tm(ntohl(rpkt.transmit_timestamp), &tm);
-printf ("Date: %4d-%02d-%02d Time: %2d:%02d:%02d\n",
-tm.tm_year, tm.tm_mon, tm.tm_mday,
-tm.tm_hour, tm.tm_min, tm.tm_sec);
-	to_tm(ntohl(rpkt.transmit_timestamp) - 2208988800u + NetTimeOffset, &tm);
-#if (CONFIG_COMMANDS & CFG_CMD_DATE)
+	to_tm(ntohl(seconds) - 2208988800UL + NetTimeOffset, &tm);
+#if defined(CONFIG_CMD_DATE)
 	rtc_set (&tm);
 #endif
 	printf ("Date: %4d-%02d-%02d Time: %2d:%02d:%02d\n",
 		tm.tm_year, tm.tm_mon, tm.tm_mday,
 		tm.tm_hour, tm.tm_min, tm.tm_sec);
-#endif
 
 	NetState = NETLOOP_SUCCESS;
 }
@@ -90,4 +89,4 @@ SntpStart (void)
 	SntpSend ();
 }
 
-#endif /* CONFIG_COMMANDS & CFG_CMD_SNTP */
+#endif