Changeset a7a85d16 in mainline for uspace/srv/net/il/arp/arp.c

Timestamp:

2010-10-16T17:16:30Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

668f8cbf, e0e568ff, f14291b

Parents:

ef689ef0 (diff), c62ae1d6 (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/srv/net/il/arp/arp.c (modified) (3 diffs)

uspace/srv/net/il/arp/arp.c

@@ -46 +46 @@
 #include <ipc/services.h>
 #include <ipc/net.h>
+#include <ipc/arp.h>
+#include <ipc/il.h>
 #include <byteorder.h>
 #include <err.h>
@@ -58 +60 @@
 #include <packet_client.h>
 #include <packet_remote.h>
-#include <il_messages.h>
 #include <il_interface.h>
 #include <il_local.h>
-#include <arp_messages.h>
 
 #include "arp.h"
@@ -534 +534 @@
         }
         return EOK;
-}
-
-task_id_t arp_task_get_id(void){
-        return task_get_id();
 }