Changes in / [1d4262e:e6f6260] in mainline

Files:

• boot/Makefile.common (modified) (2 diffs)
• uspace/Makefile (modified) (2 diffs)
• uspace/app/init/init.c (modified) (1 diff)
• uspace/drv/infrastructure/rootvirt/devices.def (modified) (1 diff)
• uspace/drv/nic/lo/Makefile (added)
• uspace/drv/nic/lo/lo.c (added)
• uspace/drv/nic/lo/lo.ma (added)
• uspace/srv/net/loopip/Makefile (deleted)
• uspace/srv/net/loopip/loopip.c (deleted)

boot/Makefile.common

@@ -112 +112 @@
         $(USPACE_PATH)/srv/net/ethip/ethip \
         $(USPACE_PATH)/srv/net/inet/inet \
-        $(USPACE_PATH)/srv/net/loopip/loopip \
         $(USPACE_PATH)/srv/net/tcp/tcp \
         $(USPACE_PATH)/srv/net/udp/udp \
@@ -124 +123 @@
         test/test2 \
         test/test3 \
+        nic/lo \
         nic/ne2k \
         nic/e1k \

uspace/Makefile

@@ -78 +78 @@
         srv/net/ethip \
         srv/net/inet \
-        srv/net/loopip \
         srv/net/tcp \
         srv/net/udp \
@@ -122 +121 @@
         drv/bus/usb/usbmid \
         drv/bus/usb/vhc \
+        drv/nic/lo \
         drv/nic/ne2k \
         drv/nic/e1k \

uspace/app/init/init.c

@@ -305 +305 @@
         srv_start("/srv/s3c24ts");
         
-        spawn("/srv/loopip");
         spawn("/srv/ethip");
         spawn("/srv/inet");

uspace/drv/infrastructure/rootvirt/devices.def

@@ -4 +4 @@
  * Unless the list is empty, the last item shall be followed by a comma.
  */
+
+/* Loopback network interface */
+{
+    .name = "lo",
+    .match_id = "virtual&loopback"
+},
 
 #ifdef CONFIG_TEST_DRIVERS