Changeset ef689ef0 in mainline for uspace/lib/packet/generic/packet_server.c

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/packet/generic/packet_server.c (moved) (moved from uspace/lib/socket/packet/packet_server.c ) (1 diff)

uspace/lib/packet/generic/packet_server.c

@@ -46 +46 @@
 #include <ipc/ipc.h>
 #include <ipc/packet.h>
+#include <ipc/net.h>
+
 #include <net/packet.h>
 #include <net/packet_header.h>
-#include <packet/packet_server.h>
-
-#include <net_messages.h>
-#include <packet/packet_local.h>
+
+#include <packet_server.h>
+#include <packet_local.h>
 
 #define FREE_QUEUES_COUNT       7