Changeset f14291b in mainline for uspace/lib/net/il/ip_remote.c

Timestamp:

2010-10-19T20:55:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a93d79a

Parents:

1882525 (diff), a7a85d16 (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 mainline changes.

File:

• uspace/lib/net/il/ip_remote.c (modified) (3 diffs)

uspace/lib/net/il/ip_remote.c

@@ -40 +40 @@
  */
 
+#include <ip_remote.h>
+#include <ip_interface.h>
+#include <packet_client.h>
+#include <generic.h>
+
 #include <ipc/services.h>
-
-#include <net_messages.h>
-#include <net_modules.h>
-#include <net_device.h>
-#include <inet.h>
-#include <ip_interface.h>
-#include <packet/packet_client.h>
-#include <il_messages.h>
-#include <ip_messages.h>
-#include <ip_remote.h>
+#include <ipc/il.h>
+#include <ipc/ip.h>
+
+#include <net/modules.h>
+#include <net/device.h>
+#include <net/inet.h>
 
 /** Add a route to the device routing table.
@@ -72 +73 @@
 
 int ip_bind_service(services_t service, int protocol, services_t me,
-    async_client_conn_t receiver, tl_received_msg_t tl_received_msg)
+    async_client_conn_t receiver)
 {
         return (int) bind_service(service, (ipcarg_t) protocol, me, service,
@@ -127 +128 @@
                 return EINVAL;
         
-        if ((!device_id) || (header) || (headerlen))
+        if ((!device_id) || (!header) || (!headerlen))
                 return EBADMEM;