This patch allows to enable the netconsole even if `serverip' is not set.
Because netconsole use the environment variable `ncip' to configure the destination IP, `serverip' don't need to be defined.
Signed-off-by: Simon Guinot sguinot@lacie.com --- Changes for v2: - restore NetOurIP check
Changes for v3: - add a "/* Fall through */" comment before the NETCONS case label
Changes for v4,5: none
Changes for v6: - enhance commit message
net/net.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/net/net.c b/net/net.c index e50bdf1..19ac019 100644 --- a/net/net.c +++ b/net/net.c @@ -1718,7 +1718,6 @@ static int net_check_prereq (proto_t protocol) #if defined(CONFIG_CMD_NFS) case NFS: #endif - case NETCONS: case TFTP: if (NetServerIP == 0) { puts ("*** ERROR: `serverip' not set\n"); @@ -1728,7 +1727,9 @@ static int net_check_prereq (proto_t protocol) defined(CONFIG_CMD_DNS) common: #endif + /* Fall through */
+ case NETCONS: if (NetOurIP == 0) { puts ("*** ERROR: `ipaddr' not set\n"); return (1);