Changeset 8436590 in mainline for uspace/lib/net/il/ip_client.c

Timestamp:

2011-04-07T21:38:17Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

033cbf82

Parents:

3acb285 (diff), ccca251 (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/il/ip_client.c (modified) (4 diffs)

uspace/lib/net/il/ip_client.c

@@ -124 +124 @@
 
         // TODO IPv6
-/*      case AF_INET6:
+#if 0
+        case AF_INET6:
                 if (addrlen != sizeof(struct sockaddr_in6))
                         return EINVAL;
@@ -130 +131 @@
                 address_in6 = (struct sockaddr_in6 *) addr;
                 return EOK;
-*/
+#endif
 
         default:
@@ -159 +160 @@
         size_t padding;
 
-        // compute the padding if IP options are set
-        // multiple of 4 bytes
+        /*
+         * Compute the padding if IP options are set
+         * multiple of 4 bytes
+         */
         padding =  ipopt_length % 4;
         if (padding) {
@@ -167 +170 @@
         }
 
-        // prefix the header
+        /* Prefix the header */
         data = (uint8_t *) packet_prefix(packet, sizeof(ip_header_t) + padding);
         if (!data)
                 return ENOMEM;
 
-        // add the padding
+        /* Add the padding */
         while (padding--)
                 data[sizeof(ip_header_t) + padding] = IPOPT_NOOP;
 
-        // set the header
+        /* Set the header */
         header = (ip_header_t *) data;
         header->header_length = IP_COMPUTE_HEADER_LENGTH(sizeof(ip_header_t) +