Patchwork [U-Boot,v6,1/2] netconsole: remove `serverip' check

login
register
mail settings
Submitter Simon Guinot
Date May 7, 2011, 3:12 p.m.
Message ID <1304781172-29991-2-git-send-email-simon.guinot@sequanux.org>
Download mbox | patch
Permalink /patch/94498/
State Accepted
Headers show

Comments

Simon Guinot - May 7, 2011, 3:12 p.m.
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(-)

Patch

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);