diff mbox

[U-Boot] net/bootp.c: fix tftp load if autoload environment var isn't set

Message ID 1316418886-13495-1-git-send-email-jacmet@sunsite.dk
State Accepted
Headers show

Commit Message

Peter Korsgaard Sept. 19, 2011, 7:54 a.m. UTC
Commit 093498669 (Put common autoload code into auto_load() function)
broke handling of autoload environment variable not being set.
The bootp/dhcp code will just keep on requesting IP address forever
and never start TFTP download.

Fix it by moving TftpStart() outside the conditional like it was before.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 net/bootp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Fabio Estevam Sept. 19, 2011, 1:47 p.m. UTC | #1
On Mon, Sep 19, 2011 at 4:54 AM, Peter Korsgaard <jacmet@sunsite.dk> wrote:
> Commit 093498669 (Put common autoload code into auto_load() function)
> broke handling of autoload environment variable not being set.
> The bootp/dhcp code will just keep on requesting IP address forever
> and never start TFTP download.
>
> Fix it by moving TftpStart() outside the conditional like it was before.
>
> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

This makes mx31pdk networking to work again at my company's network.

Tested-by: Fabio Estevam <fabio.estevam@freescale.com>

Thanks,

Fabio Estevam
Simon Glass Sept. 19, 2011, 3:02 p.m. UTC | #2
Hi Peter,

On Mon, Sep 19, 2011 at 6:47 AM, Fabio Estevam <festevam@gmail.com> wrote:
> On Mon, Sep 19, 2011 at 4:54 AM, Peter Korsgaard <jacmet@sunsite.dk> wrote:
>> Commit 093498669 (Put common autoload code into auto_load() function)
>> broke handling of autoload environment variable not being set.
>> The bootp/dhcp code will just keep on requesting IP address forever
>> and never start TFTP download.
>>
>> Fix it by moving TftpStart() outside the conditional like it was before.
>>
>> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
>
> This makes mx31pdk networking to work again at my company's network.
>
> Tested-by: Fabio Estevam <fabio.estevam@freescale.com>

I think we just had this discussion at the end of August. It would be
good to get to the bottom of why this commit is considered a change of
behaviour - it is something subtle that I cannot see.

But first: if autoload is not defined, it is supposed to default to
'y'. If you want it to be 'n' then you need to set it. It that what
you expect?

Regards,
Simon

>
> Thanks,
>
> Fabio Estevam
>
Peter Korsgaard Sept. 19, 2011, 3:29 p.m. UTC | #3
>>>>> "Simon" == Simon Glass <sjg@chromium.org> writes:

Hi,

 Simon> I think we just had this discussion at the end of August. It
 Simon> would be good to get to the bottom of why this commit is
 Simon> considered a change of behaviour - it is something subtle that I
 Simon> cannot see.

Because with that commit it no longer calls TftpStart() if the autoload
variable isn't set (it moved into the if (getenv..) conditional).

 Simon> But first: if autoload is not defined, it is supposed to default to
 Simon> 'y'. If you want it to be 'n' then you need to set it. It that what
 Simon> you expect?

Yes, no autoload should behave like autoload=y, E.G. call TftpStart().
Simon Glass Sept. 19, 2011, 3:48 p.m. UTC | #4
Hi Peter,

On Mon, Sep 19, 2011 at 8:29 AM, Peter Korsgaard <jacmet@sunsite.dk> wrote:
>>>>>> "Simon" == Simon Glass <sjg@chromium.org> writes:
>
> Hi,
>
>  Simon> I think we just had this discussion at the end of August. It
>  Simon> would be good to get to the bottom of why this commit is
>  Simon> considered a change of behaviour - it is something subtle that I
>  Simon> cannot see.
>
> Because with that commit it no longer calls TftpStart() if the autoload
> variable isn't set (it moved into the if (getenv..) conditional).

OK I see thank you.

>
>  Simon> But first: if autoload is not defined, it is supposed to default to
>  Simon> 'y'. If you want it to be 'n' then you need to set it. It that what
>  Simon> you expect?
>
> Yes, no autoload should behave like autoload=y, E.G. call TftpStart().

Acked-by: Simon Glass <sjg@chromium.org>

Regards,
Simon
>
> --
> Bye, Peter Korsgaard
>
Wolfgang Denk Sept. 19, 2011, 9:25 p.m. UTC | #5
Dear Peter Korsgaard,

In message <1316418886-13495-1-git-send-email-jacmet@sunsite.dk> you wrote:
> Commit 093498669 (Put common autoload code into auto_load() function)
> broke handling of autoload environment variable not being set.
> The bootp/dhcp code will just keep on requesting IP address forever
> and never start TFTP download.
> 
> Fix it by moving TftpStart() outside the conditional like it was before.
> 
> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
> ---
>  net/bootp.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/net/bootp.c b/net/bootp.c
index 3db08ea..a003c42 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -164,8 +164,8 @@  static void auto_load(void)
 			return;
 		}
 #endif
-	TftpStart();
 	}
+	TftpStart();
 }
 
 #if !defined(CONFIG_CMD_DHCP)