Changeset ae972834 in mainline for uspace/lib/net/generic/packet_client.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/packet_client.c (moved) (moved from uspace/lib/socket/packet/packet_client.c ) (3 diffs)

uspace/lib/net/generic/packet_client.c

@@ -41 +41 @@
 #include <sys/mman.h>
 
+#include <packet_client.h>
+
 #include <net_messages.h>
-#include <packet/packet.h>
-#include <packet/packet_header.h>
-#include <packet/packet_client.h>
+#include <net/packet.h>
+#include <net/packet_header.h>
 
 int packet_copy_data(packet_t packet, const void * data, size_t length)
@@ -181 +182 @@
 
         // get a new packet
-        copy = packet_get_4_local(phone, PACKET_DATA_LENGTH(packet),
+        copy = packet_get_4_remote(phone, PACKET_DATA_LENGTH(packet),
             PACKET_MAX_ADDRESS_LENGTH(packet), packet->max_prefix,
             PACKET_MIN_SUFFIX(packet));
@@ -199 +200 @@
                 return copy;
         } else {
-                pq_release_local(phone, copy->packet_id);
+                pq_release_remote(phone, copy->packet_id);
                 return NULL;
         }