Changeset ae972834 in mainline for uspace/lib/net/generic/socket_core.c

Timestamp:

2010-10-08T21:47:40Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b278b4e

Parents:

c0e74b1 (diff), 368fb2c (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/generic/socket_core.c (moved) (moved from uspace/lib/socket/generic/socket_core.c ) (2 diffs)

uspace/lib/net/generic/socket_core.c

@@ -46 +46 @@
 #include <adt/dynamic_fifo.h>
 #include <adt/int_map.h>
-#include <packet/packet.h>
-#include <packet/packet_client.h>
+#include <net/packet.h>
+#include <packet_client.h>
+#include <packet_remote.h>
 #include <net/modules.h>
 #include <socket_core.h>
@@ -91 +92 @@
         // release all received packets
         while((packet_id = dyn_fifo_pop(&socket->received)) >= 0){
-                pq_release_local(packet_phone, packet_id);
+                pq_release_remote(packet_phone, packet_id);
         }
         dyn_fifo_destroy(&socket->received);