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

Timestamp:

2011-05-28T19:44:42Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0743493a

Parents:

40ffda8

git-author:

Jeff Rous <jeffrous@…> (2011-05-28 19:44:42)

git-committer:

Jakub Jermar <jakub@…> (2011-05-28 19:44:42)

Message:

ip: Rename the defines so they don't conflict with similar TCP 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;
-        SET_HEADER_LENGTH(header, (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)
-                SET_HEADER_FLAGS(header, IPFLAG_DONT_FRAGMENT);
+                SET_IP_HEADER_FLAGS(header, IPFLAG_DONT_FRAGMENT);
 
         return EOK;
@@ -227 +227 @@
                 *tos = header->tos;
         if (dont_fragment)
-                *dont_fragment = GET_HEADER_FLAGS(header) & 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);