Changeset 7943c43 in mainline for uspace/lib/net/generic/packet_remote.c

Timestamp:

2012-01-16T22:45:38Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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) (2 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);
         
@@ -79 +77 @@
         if (rc != EOK)
                 return rc;
+        
+        if (packet == (void *) -1)
+                return ENOMEM;
         
         rc = pm_add(*packet);