Changeset b278b4e in mainline for uspace/lib/net/include/netif_interface.h

Timestamp:

2010-10-10T19:52:27Z (14 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.

File:

• uspace/lib/net/include/netif_interface.h (modified) (2 diffs)

uspace/lib/net/include/netif_interface.h

@@ -34 +34 @@
 #define __NET_NETIF_INTERFACE_H__
 
-#ifdef CONFIG_NETIF_NIL_BUNDLE
-
-#include <netif_local.h>
-#include <netif_nil_bundle.h>
-#include <packet/packet_server.h>
-
-#define netif_module_message    netif_nil_module_message
-#define netif_module_start      netif_nil_module_start
-#define netif_get_addr_req      netif_get_addr_req_local
-#define netif_probe_req         netif_probe_req_local
-#define netif_send_msg          netif_send_msg_local
-#define netif_start_req         netif_start_req_local
-#define netif_stop_req          netif_stop_req_local
-#define netif_stats_req         netif_stats_req_local
-#define netif_bind_service      netif_bind_service_local
-
-#else /* CONFIG_NETIF_NIL_BUNDLE */
-
 #include <netif_remote.h>
 #include <packet_client.h>
@@ -65 +47 @@
 #define netif_bind_service      netif_bind_service_remote
 
-#endif /* CONFIG_NETIF_NIL_BUNDLE */
-
 #endif