Changeset ee2fa30a in mainline for uspace/srv/net

Timestamp:

2011-06-22T23:28:56Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b366a6f4

Parents:

ef09a7a

Message:

undo development effort which was neither finished nor properly debugged yet
(this unbreaks networking once again)

Location:

uspace/srv/net

Files:

• net/net.c (modified) (2 diffs)
• netif/lo/lo.c (modified) (1 diff)

uspace/srv/net/net/net.c

@@ -479 +479 @@
         
         /* Network interface layer startup */
+        services_t internet_service;
         if (netif->nil) {
                 setting = measured_strings_find(&netif->configuration, (uint8_t *) CONF_MTU, 0);
@@ -486 +487 @@
                 
                 int mtu = setting ? strtol((char *) setting->value, NULL, 10) : 0;
-                
-                rc = nil_device_req(netif->nil->sess, netif->id, mtu);
+                rc = nil_device_req(netif->nil->sess, netif->id, mtu,
+                    netif->driver->service);
                 if (rc != EOK)
                         return rc;
-        }
+                
+                internet_service = netif->nil->service;
+        } else
+                internet_service = netif->driver->service;
         
         /* Inter-network layer startup */
-        rc = ip_device_req(netif->il->sess, netif->id);
+        rc = ip_device_req(netif->il->sess, netif->id, internet_service);
         if (rc != EOK)
                 return rc;

uspace/srv/net/netif/lo/lo.c

@@ -225 +225 @@
 {
         /* Start the module */
-        return netif_module_start(SERVICE_NILDUMMY);
+        return netif_module_start();
 }