From 0fbe484566deb32b729f24eacc2a0a0ae4034e1b Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@etherboot.org>
Date: Fri, 21 Mar 2008 00:06:28 +0000
Subject: [PATCH] [IPv4] Add a config option for IPv4

IPv4 may not always be dragged into the link, so add a specific
configuration option for it.
---
 src/config.h      | 10 ++++++++++
 src/core/config.c | 23 ++++++++++++-----------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/config.h b/src/config.h
index e004f23d..9a447ad5 100644
--- a/src/config.h
+++ b/src/config.h
@@ -74,6 +74,16 @@
 
 /* @END isa.h */
 
+/* @BEGIN general.h
+ *
+ * Network protocols
+ *
+ */
+
+#define	NET_PROTO_IPV4		/* IPv4 protocol */
+
+/* @END general.h */
+
 /* @BEGIN general.h
  *
  * Download protocols
diff --git a/src/core/config.c b/src/core/config.c
index 24db3557..ffd11256 100644
--- a/src/core/config.c
+++ b/src/core/config.c
@@ -53,40 +53,42 @@
 #ifdef CONSOLE_FIRMWARE
 REQUIRE_OBJECT ( bios_console );
 #endif
-
 #ifdef CONSOLE_SERIAL
 REQUIRE_OBJECT ( serial );
 #endif
-
 #ifdef CONSOLE_DIRECT_VGA
 REQUIRE_OBJECT ( video_subr );
 #endif
-
 #ifdef CONSOLE_BTEXT
 REQUIRE_OBJECT ( btext );
 #endif
-
 #ifdef CONSOLE_PC_KBD
 REQUIRE_OBJECT ( pc_kbd );
 #endif
-
 #ifdef CONSOLE_SYSLOG
 REQUIRE_OBJECT ( syslog );
 #endif
 
 /*
- * Timers
+ * Drag in all requested timers
  */
-
 #ifdef TIMER_BIOS
 REQUIRE_OBJECT ( timer_bios );
 #endif
-
 #ifdef TIMER_RDTSC
 REQUIRE_OBJECT ( timer_rdtsc );
 #endif
+
 /*
- * Drag in all requested protocols
+ * Drag in all requested network protocols
+ *
+ */
+#ifdef NET_PROTO_IPV4
+REQUIRE_OBJECT ( ipv4 );
+#endif
+
+/*
+ * Drag in all requested download protocols
  *
  */
 #ifdef DOWNLOAD_PROTO_TFTP
@@ -112,13 +114,12 @@ REQUIRE_OBJECT ( slam );
 #endif
 
 /*
- * Drag in any required resolvers
+ * Drag in all requested resolvers
  *
  */
 #ifdef DNS_RESOLVER
 REQUIRE_OBJECT ( dns );
 #endif
-
 #ifdef NMB_RESOLVER
 REQUIRE_OBJECT ( nmb );
 #endif