summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-09-11 09:05:32 +0200
committerWolfgang Denk <wd@denx.de>2009-09-11 10:10:12 +0200
commitd8d8724be06df43772162dc344ae20dfa814dc72 (patch)
treefe6545d16d41462603b18ab96885c8742953dc96 /net
parent51003b89816848cbe86a8fe48f970ba8b14005f5 (diff)
downloadtalos-obmc-uboot-d8d8724be06df43772162dc344ae20dfa814dc72.tar.gz
talos-obmc-uboot-d8d8724be06df43772162dc344ae20dfa814dc72.zip
net/bootp.c: fix compile warning
Fix warning: bootp.c:695: warning: dereferencing type-punned pointer will break strict-aliasing rules Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'net')
-rw-r--r--net/bootp.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/bootp.c b/net/bootp.c
index 0799ae2b0f..309385278f 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -683,6 +683,9 @@ static void DhcpOptionsProcess (uchar * popt, Bootp_t *bp)
{
uchar *end = popt + BOOTP_HDR_SIZE;
int oplen, size;
+#if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_TIMEOFFSET)
+ int *to_ptr;
+#endif
while (popt < end && *popt != 0xff) {
oplen = *(popt + 1);
@@ -692,7 +695,8 @@ static void DhcpOptionsProcess (uchar * popt, Bootp_t *bp)
break;
#if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_TIMEOFFSET)
case 2: /* Time offset */
- NetCopyLong ((ulong *)&NetTimeOffset, (ulong *) (popt + 2));
+ to_ptr = &NetTimeOffset;
+ NetCopyLong ((ulong *)to_ptr, (ulong *)(popt + 2));
NetTimeOffset = ntohl (NetTimeOffset);
break;
#endif
OpenPOWER on IntegriCloud