From 2db56b3031cdb2201c21bccd9a624272ec0777f7 Mon Sep 17 00:00:00 2001
From: sascha <sascha@nomad.localdomain>
Date: Thu, 18 Oct 2007 12:06:50 +0200
Subject: [PATCH] When printing error messages about network parameters print
 the network device id with it.

---
 include/net.h | 2 --
 net/net.c     | 9 ++++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/net.h b/include/net.h
index 8a3187260..9d00ad3e7 100644
--- a/include/net.h
+++ b/include/net.h
@@ -54,8 +54,6 @@ enum eth_state_t {
 struct device_d;
 
 struct eth_device {
-	char name[NAMESIZE];
-//	unsigned char enetaddr[6];
 	int iobase;
 	int state;
 
diff --git a/net/net.c b/net/net.c
index ad9378724..fd2effe4c 100644
--- a/net/net.c
+++ b/net/net.c
@@ -81,6 +81,7 @@
 #include <environment.h>
 #include <param.h>
 #include <net.h>
+#include <driver.h>
 #include "bootp.h"
 #include "tftp.h"
 #include "rarp.h"
@@ -1352,6 +1353,8 @@ NetReceive(uchar * inpkt, int len)
 
 static int net_check_prereq (proto_t protocol)
 {
+	char *ethid = eth_get_current()->dev->id;
+
 	switch (protocol) {
 		/* Fall through */
 #ifdef CONFIG_NET_PING
@@ -1376,13 +1379,13 @@ static int net_check_prereq (proto_t protocol)
 	case NETCONS:
 	case TFTP:
 		if (NetServerIP == 0) {
-			puts ("*** ERROR: `serverip' not set\n");
+			printf("*** ERROR: `%s.serverip' not set\n", ethid);
 			return (1);
 		}
     common:
 
 		if (NetOurIP == 0) {
-			puts ("*** ERROR: `ipaddr' not set\n");
+			printf("*** ERROR: `%s.ipaddr' not set\n", ethid);
 			return (1);
 		}
 		/* Fall through */
@@ -1392,7 +1395,7 @@ static int net_check_prereq (proto_t protocol)
 	case BOOTP:
 	case CDP:
 		if (memcmp (NetOurEther, "\0\0\0\0\0\0", 6) == 0) {
-			puts ("*** ERROR: `ethaddr' not set\n");
+			printf("*** ERROR: `%s.ethaddr' not set\n", ethid);
 			return (1);
 		}
 		/* Fall through */