Merge branch 'lwip_dev' of ssh://palacios@localhost/home/palacios/palacios into lwip_dev

Conflicts:
	build/RunPuppy.sh

diff --git a/build/RunPuppy.sh b/build/RunPuppy.sh
index c755b79..315707e 100755 (executable)
--- a/build/RunPuppy.sh
+++ b/build/RunPuppy.sh
@@ -1,4 +1,3 @@
 #!/bin/sh
-
 cp ../geekos/build/vmm.img ./
 /usr/local/qemu/bin/qemu-system-x86_64   -serial file:serial.out -m 1024 -fda vmm.img -cdrom /opt/vmm-tools/isos/puppy.iso

diff --git a/geekos/src/geekos/net.c b/geekos/src/geekos/net.c
index ceb41c1..9487d69 100644 (file)
--- a/geekos/src/geekos/net.c
+++ b/geekos/src/geekos/net.c
@@ -34,7 +34,8 @@ void Init_Network() {
   //temporay now we are using lwip sockets
   // init_socket_layer();
 
-#ifdef LWIP  
+#ifdef LWIP
+  
   struct ip_addr ipaddr, netmask, gateway;
   sys_sem_t sem;
   err_t err;