Changeset 89ac5513 in mainline for uspace/lib/c/include/net/ip_protocols.h

Timestamp:

2013-06-23T19:54:53Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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/c/include/net/ip_protocols.h (modified) (1 diff)

uspace/lib/c/include/net/ip_protocols.h

@@ -44 +44 @@
 /*@{*/
 
-#define IPPROTO_ICMP    1
-#define IPPROTO_TCP     6
-#define IPPROTO_UDP     17
+#define IPPROTO_ICMP    1
+#define IPPROTO_TCP     6
+#define IPPROTO_UDP     17
+#define IPPROTO_ICMPV6  58
 
 /*@}*/