X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fmain.c;h=d112e222278a1b2e1134a47a96a6bcdf1ef6579d;hb=20ddb33d7c999c03239f76e76e202c50b4740f8c;hp=ba1b4d679d9a67b49efcf6509ba9d6e7eaf8f836;hpb=57e3d7d1e671a261befef967b4a441e5d7dc2303;p=palacios.releases.git

diff --git a/palacios/src/geekos/main.c b/palacios/src/geekos/main.c
index ba1b4d6..d112e22 100644
--- a/palacios/src/geekos/main.c
+++ b/palacios/src/geekos/main.c
@@ -3,7 +3,8 @@
  * Copyright (c) 2001,2003,2004 David H. Hovemeyer <daveho@cs.umd.edu>
  * Copyright (c) 2003, Jeffrey K. Hollingsworth <hollings@cs.umd.edu>
  * Copyright (c) 2004, Iulian Neamtiu <neamtiu@cs.umd.edu>
- * $Revision: 1.40 $
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu>
+ * $Revision: 1.47 $
  * 
  * This is free software.  You are permitted to use,
  * redistribute, and modify it as specified in the file "COPYING".
@@ -39,10 +40,14 @@
 #include <geekos/pci.h>
 
 
+#include <geekos/net.h>
+
 
 #define SPEAKER_PORT 0x61
 
 
+
+
 void Spin()
 {
   // hack - competing thread
@@ -217,6 +222,9 @@ void Main(struct Boot_Info* bootInfo)
 
   Init_Stubs();
 
+  Init_Network();
+
+
   //  Init_IDE();
 
   // Print("Done; stalling\n");
@@ -261,6 +269,7 @@ void Main(struct Boot_Info* bootInfo)
   }
 #endif
 
+
   {
     RunVMM(bootInfo);
   }