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

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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

@@ -181 +181 @@
         /* Set the header */
         header = (ip_header_t *) data;
-        header->header_length = IP_COMPUTE_HEADER_LENGTH(sizeof(ip_header_t) +
-            ipopt_length);
+        SET_IP_HEADER_LENGTH(header,
+            (IP_COMPUTE_HEADER_LENGTH(sizeof(ip_header_t) + ipopt_length)));
         header->ttl = (ttl ? ttl : IPDEFTTL);
         header->tos = tos;
@@ -188 +188 @@
 
         if (dont_fragment)
-                header->flags = IPFLAG_DONT_FRAGMENT;
+                SET_IP_HEADER_FLAGS(header, IPFLAG_DONT_FRAGMENT);
 
         return EOK;
@@ -227 +227 @@
                 *tos = header->tos;
         if (dont_fragment)
-                *dont_fragment = header->flags & IPFLAG_DONT_FRAGMENT;
+                *dont_fragment = GET_IP_HEADER_FLAGS(header) & IPFLAG_DONT_FRAGMENT;
         if (ipopt_length) {
                 *ipopt_length = IP_HEADER_LENGTH(header) - sizeof(ip_header_t);