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

Timestamp:

2010-09-19T13:33:47Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a786f9

Parents:

5203efb1 (diff), 7c8267b (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:

Marge from lp:~jakub/helenos/net.

File:

• uspace/lib/net/generic/packet_remote.c (modified) (1 diff)

uspace/lib/net/generic/packet_remote.c

@@ -70 +70 @@
         aid_t message = async_send_1(phone, NET_PACKET_GET, packet_id, &answer);
         *packet = (packet_t) as_get_mappable_page(size);
-        if (ERROR_OCCURRED(async_share_in_start_0_0(phone, *packet, size))
-            || ERROR_OCCURRED(pm_add(*packet))) {
+        if (ERROR_OCCURRED(async_share_in_start_0_0(phone, *packet, size)) ||
+            ERROR_OCCURRED(pm_add(*packet))) {
                 munmap(*packet, size);
                 async_wait_for(message, NULL);