Changeset ef689ef0 in mainline for uspace/lib/net/include/nil_interface.h

Timestamp:

2010-10-14T22:08:50Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a7a85d16

Parents:

10056483 (diff), f63a591d (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.

File:

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

uspace/lib/net/include/nil_interface.h

@@ -39 +39 @@
 #include <ipc/ipc.h>
 
-#include <net_messages.h>
-#include <adt/measured_strings.h>
-#include <net/packet.h>
+#include <generic.h>
 #include <nil_messages.h>
-#include <net_device.h>
+#include <nil_remote.h>
 
 #define nil_bind_service(service, device_id, me, receiver) \
@@ -67 +65 @@
             netif_service)
 
-
-#include <nil_remote.h>
-#include <packet/packet_server.h>
-
 #define nil_device_state_msg  nil_device_state_msg_remote
 #define nil_received_msg      nil_received_msg_remote