minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

net: Fix unused variable compile warning

Browse Source 
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 <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Joe Hershberger 2012-05-23 07:59:18 +00:00
parent a3e1a727fe
commit 1752f0fdc7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/bootp.c
View File

@ -18,7 +18,6 @@
#ifdef CONFIG_STATUS_LED #ifdef CONFIG_STATUS_LED
#include <status_led.h> #include <status_led.h>
#endif #endif
#include <linux/compiler.h>
#define BOOTP_VENDOR_MAGIC 0x63825363 /* RFC1048 Magic Cookie */ #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) static void BootpCopyNetParams(struct Bootp_t *bp)
{ {
__maybe_unused IPaddr_t tmp_ip;
NetCopyIP(&NetOurIP, &bp->bp_yiaddr);
#if !defined(CONFIG_BOOTP_SERVERIP) #if !defined(CONFIG_BOOTP_SERVERIP)
IPaddr_t tmp_ip;
NetCopyIP(&tmp_ip, &bp->bp_siaddr); NetCopyIP(&tmp_ip, &bp->bp_siaddr);
if (tmp_ip != 0) if (tmp_ip != 0)
NetCopyIP(&NetServerIP, &bp->bp_siaddr); NetCopyIP(&NetServerIP, &bp->bp_siaddr);
memcpy(NetServerEther, ((struct ethernet_hdr *)NetRxPacket)->et_src, 6); memcpy(NetServerEther, ((struct ethernet_hdr *)NetRxPacket)->et_src, 6);
#endif #endif
NetCopyIP(&NetOurIP, &bp->bp_yiaddr);
if (strlen(bp->bp_file) > 0) if (strlen(bp->bp_file) > 0)
copy_filename(BootFile, bp->bp_file, sizeof(BootFile)); copy_filename(BootFile, bp->bp_file, sizeof(BootFile));