From 1752f0fdc7a3b914f6b651f68cb59dde102c9c92 Mon Sep 17 00:00:00 2001 From: Joe Hershberger Date: Wed, 23 May 2012 07:59:18 +0000 Subject: [PATCH] net: Fix unused variable compile warning If CONFIG_BOOTP_SERVERIP is not defined, unused variable warning is reported. This was fixed upstream using a compiler feature instead of a simple reorder of the statements. Signed-off-by: Joe Hershberger Acked-by: Simon Glass Acked-by: Mike Frysinger --- net/bootp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/bootp.c b/net/bootp.c index b36abac818..7e24b661de 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -18,7 +18,6 @@ #ifdef CONFIG_STATUS_LED #include #endif -#include #define BOOTP_VENDOR_MAGIC 0x63825363 /* RFC1048 Magic Cookie */ @@ -96,15 +95,15 @@ static int BootpCheckPkt(uchar *pkt, unsigned dest, unsigned src, unsigned len) */ static void BootpCopyNetParams(struct Bootp_t *bp) { - __maybe_unused IPaddr_t tmp_ip; - - NetCopyIP(&NetOurIP, &bp->bp_yiaddr); #if !defined(CONFIG_BOOTP_SERVERIP) + IPaddr_t tmp_ip; + NetCopyIP(&tmp_ip, &bp->bp_siaddr); if (tmp_ip != 0) NetCopyIP(&NetServerIP, &bp->bp_siaddr); memcpy(NetServerEther, ((struct ethernet_hdr *)NetRxPacket)->et_src, 6); #endif + NetCopyIP(&NetOurIP, &bp->bp_yiaddr); if (strlen(bp->bp_file) > 0) copy_filename(BootFile, bp->bp_file, sizeof(BootFile)); -- 2.30.2