Changeset a39cfb8 in mainline for uspace/lib/net/tl/tl_common.c

Timestamp:

2011-04-14T07:54:33Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

e05d6c3

Parents:

3f3afb9 (diff), 34e8bab (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 development

File:

• uspace/lib/net/tl/tl_common.c (modified) (6 diffs)

uspace/lib/net/tl/tl_common.c

@@ -255 +255 @@
         int length;
 
-        // detach the first packet and release the others
+        /* Detach the first packet and release the others */
         next = pq_detach(packet);
         if (next)
@@ -262 +262 @@
         length = packet_get_addr(packet, &src, NULL);
         if ((length > 0) && (!error) && (icmp_phone >= 0) &&
-            // set both addresses to the source one (avoids the source address
-            // deletion before setting the destination one)
+            /*
+             * Set both addresses to the source one (avoids the source address
+             * deletion before setting the destination one)
+             */
             (packet_set_addr(packet, src, src, (size_t) length) == EOK)) {
                 return EOK;
@@ -299 +301 @@
                 return EINVAL;
 
-        // get the data length
+        /* Get the data length */
         if (!async_data_write_receive(&callid, &length))
                 return EINVAL;
 
-        // get a new packet
+        /* Get a new packet */
         *packet = packet_get_4_remote(packet_phone, length, dimension->addr_len,
             prefix + dimension->prefix, dimension->suffix);
@@ -309 +311 @@
                 return ENOMEM;
 
-        // allocate space in the packet
+        /* Allocate space in the packet */
         data = packet_suffix(*packet, length);
         if (!data) {
@@ -316 +318 @@
         }
 
-        // read the data into the packet
+        /* Read the data into the packet */
         rc = async_data_write_finalize(callid, data, length);
         if (rc != EOK) {
@@ -323 +325 @@
         }
         
-        // set the packet destination address
+        /* Set the packet destination address */
         rc = packet_set_addr(*packet, NULL, (uint8_t *) addr, addrlen);
         if (rc != EOK) {