Hi Joe,
On Tue, Mar 27, 2012 at 4:43 PM, Joe Hershberger <joe.hershber...@ni.com> wrote:
> If CONFIG_BOOTP_SERVERIP is not defined, unused
> variable warning is reported. This was fixed in
> origin using a compiler feature instead of a
> simple reorder of the statements.
What do you mean by 'origin'? You can use more columns in your commit messages.
>
> Signed-off-by: Joe Hershberger <joe.hershber...@ni.com>
> Cc: Joe Hershberger <joe.hershber...@gmail.com>
> Cc: Simon Glass <s...@chromium.org>
> Cc: Mike Frysinger <vap...@gentoo.org>
With commit message fixed:
Acked-by: Simon Glass <s...@chromium.org>
> ---
> net/bootp.c | 7 +++----
> 1 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/net/bootp.c b/net/bootp.c
> index 0cf8beb..650ae4d 100644
> --- a/net/bootp.c
> +++ b/net/bootp.c
> @@ -20,7 +20,6 @@
> #ifdef CONFIG_STATUS_LED
> #include <status_led.h>
> #endif
> -#include <linux/compiler.h>
>
> #define BOOTP_VENDOR_MAGIC 0x63825363 /* RFC1048 Magic Cookie */
>
> @@ -98,15 +97,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));
>
> --
> 1.6.0.2
>
Regards,
Simon
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
