Changeset 47f5a77 in mainline for uspace/srv/net/tcp/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/tcp/std.h (modified) (3 diffs)

uspace/srv/net/tcp/std.h

@@ -75 +75 @@
 };
 
-/** TCP IPv4 pseudo header */
+/** TCP over IPv4 checksum pseudo header */
 typedef struct {
         /** Source address */
@@ -89 +89 @@
 } tcp_phdr_t;
 
-/** TCP IPv6 pseudo header */
+/** TCP over IPv6 checksum pseudo header */
 typedef struct {
         /** Source address */
@@ -98 +98 @@
         uint32_t tcp_length;
         /** Zeroes */
-        uint8_t zero[3];
+        uint8_t zeroes[3];
         /** Next header */
         uint8_t next;