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

Timestamp:

2011-04-27T20:01:13Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a6dffb8

Parents:

628d548 (diff), 933cadf (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) (3 diffs)

uspace/lib/net/il/ip_client.c

@@ -123 +123 @@
                 return EOK;
 
-        /* TODO IPv6 */
-/*      case AF_INET6:
+        // TODO IPv6
+#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:
@@ -258 +259 @@
                 header_in->data_length = htons(data_length);
                 return EOK;
-        /* TODO IPv6 */
+        // TODO IPv6
         } else {
                 return EINVAL;