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

Timestamp:

2010-09-22T19:07:02Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ec1bdc8

Parents:

dc94cb2 (diff), 921a860 (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_remote.c (modified) (5 diffs)

uspace/lib/net/generic/packet_remote.c

@@ -64 +64 @@
  *
  */
-static int packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size){
+static int
+packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size)
+{
         ERROR_DECLARE;
         
         ipc_call_t answer;
         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)) ||
@@ -91 +94 @@
         
         *packet = pm_find(packet_id);
-        if (!(*packet)) {
+        if (!*packet) {
                 ipcarg_t size;
                 
-                ERROR_PROPAGATE(async_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id, &size));
+                ERROR_PROPAGATE(async_req_1_1(phone, NET_PACKET_GET_SIZE,
+                    packet_id, &size));
                 ERROR_PROPAGATE(packet_return(phone, packet, packet_id, size));
         }
-        if ((** packet).next) {
+        if ((*packet)->next) {
                 packet_t next;
                 
-                return packet_translate_remote(phone, &next, (** packet).next);
+                return packet_translate_remote(phone, &next, (*packet)->next);
         }
         
@@ -114 +118 @@
         ipcarg_t size;
         
-        if (ERROR_OCCURRED(async_req_4_2(phone, NET_PACKET_CREATE_4, max_content,
-            addr_len, max_prefix, max_suffix, &packet_id, &size)))
+        if (ERROR_OCCURRED(async_req_4_2(phone, NET_PACKET_CREATE_4,
+            max_content, addr_len, max_prefix, max_suffix, &packet_id, &size)))
                 return NULL;
         
@@ -121 +125 @@
         packet_t packet = pm_find(packet_id);
         if (!packet) {
-                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id, size)))
+                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id,
+                    size)))
                         return NULL;
         }
@@ -141 +146 @@
         packet_t packet = pm_find(packet_id);
         if (!packet) {
-                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id, size)))
+                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id,
+                    size)))
                         return NULL;
         }