Changeset 00aece0 in mainline for uspace/lib/net/generic/packet_remote.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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/generic/packet_remote.c (modified) (4 diffs)

uspace/lib/net/generic/packet_remote.c

@@ -66 +66 @@
     packet_id_t packet_id, size_t size)
 {
-        *packet = (packet_t *) as_get_mappable_page(size);
-        
         async_exch_t *exch = async_exchange_begin(sess);
         ipc_call_t answer;
         aid_t message = async_send_1(exch, NET_PACKET_GET, packet_id, &answer);
-        int rc = async_share_in_start_0_0(exch, *packet, size);
+        int rc = async_share_in_start_0_0(exch, size, (void *) packet);
         async_exchange_end(exch);
         
@@ -77 +75 @@
         async_wait_for(message, &result);
         
-        if (rc != EOK) {
-                munmap(*packet, size);
+        if (rc != EOK)
                 return rc;
-        }
+        
+        if (packet == (void *) -1)
+                return ENOMEM;
         
         rc = pm_add(*packet);
@@ -115 +114 @@
         
         *packet = pm_find(packet_id);
-        if (!*packet) {
+        if (*packet == NULL) {
                 async_exch_t *exch = async_exchange_begin(sess);
                 sysarg_t size;
@@ -130 +129 @@
         }
         
-        if ((*packet)->next) {
+        if ((*packet != NULL) && ((*packet)->next)) {
                 packet_t *next;
                 return packet_translate_remote(sess, &next, (*packet)->next);