Changeset b278b4e in mainline for uspace/srv

Timestamp:

2010-10-10T19:52:27Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

10056483

Parents:

ae972834 (diff), eb51e31 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/net.

This is mostly removal of the bundle build support for the networking stack as
we don't want to manually maintain both bundled and modular configurations.

Location:

uspace/srv/net

Files:

• il/ip/ip.c (modified) (1 diff)
• net/net_bundle.c (deleted)
• net/net_standalone.c (modified) (1 diff)
• nil/eth/eth.c (modified) (2 diffs)
• nil/nildummy/nildummy.c (modified) (2 diffs)

uspace/srv/net/il/ip/ip.c

@@ -623 +623 @@
 int ip_connect_module(services_t service){
         return EOK;
-}
-
-int ip_bind_service(services_t service, int protocol, services_t me, async_client_conn_t receiver, tl_received_msg_t received_msg){
-        return ip_register(protocol, me, 0, received_msg);
 }
 

uspace/srv/net/net/net_standalone.c

@@ -94 +94 @@
  * @return EOK on success.
  * @return ENOTSUP if the message is not known.
- * @return Other error codes as defined for each bundled module
- *         message function.
+ * @return Other error codes.
  *
  */

uspace/srv/net/nil/eth/eth.c

@@ -788 +788 @@
 }
 
-#ifndef CONFIG_NETIF_NIL_BUNDLE
-
 /** Default thread for new connections.
  *
@@ -839 +837 @@
 }
 
-#endif /* CONFIG_NETIF_NIL_BUNDLE */
-
 /** @}
  */

uspace/srv/net/nil/nildummy/nildummy.c

@@ -410 +410 @@
 }
 
-#ifndef CONFIG_NETIF_NIL_BUNDLE
-
 /** Default thread for new connections.
  *
@@ -461 +459 @@
 }
 
-#endif /* CONFIG_NETIF_NIL_BUNDLE */
-
 /** @}
  */