Changeset 47f5a77 in mainline for uspace/srv/net/inetsrv/inet_std.h

Timestamp:

2013-07-17T08:46:06Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3a0a4d8

Parents:

cdc3afa (diff), 1d94e21 (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/srv/net/inetsrv/inet_std.h (modified) (3 diffs)

uspace/srv/net/inetsrv/inet_std.h

@@ -48 +48 @@
         /** Total Length */
         uint16_t tot_len;
-        /** Identification */
+        /** Identifier */
         uint16_t id;
         /** Flags, Fragment Offset */
@@ -90 +90 @@
 };
 
+/** Bits in ip6_frag_header_t.offsmf */
+enum flags_offsmt_bits {
+        /** More fragments */
+        OF_FLAG_M = 0,
+        /** Fragment offset, highest bit */
+        OF_FRAGOFF_h = 15,
+        /** Fragment offset, lowest bit */
+        OF_FRAGOFF_l = 3
+};
+
 /** IPv6 Datagram header (fixed part) */
 typedef struct {
@@ -114 +124 @@
         /** Reserved */
         uint8_t reserved;
-        /** Fragment Offset, Flags */
-        uint16_t foff_flags;
-        /** Identification */
+        /** Fragmentation offset, reserved and M flag */
+        uint16_t offsmf;
+        /** Identifier */
         uint32_t id;
 } ip6_header_fragment_t;