Changeset 8436590 in mainline for uspace/lib/net/generic/net_checksum.c

Timestamp:

2011-04-07T21:38:17Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

033cbf82

Parents:

3acb285 (diff), ccca251 (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/generic/net_checksum.c (modified) (6 diffs)

uspace/lib/net/generic/net_checksum.c

@@ -52 +52 @@
 uint16_t compact_checksum(uint32_t sum)
 {
-        // shorten to the 16 bits
+        /* Shorten to the 16 bits */
         while (sum >> 16)
                 sum = (sum & 0xffff) + (sum >> 16);
@@ -72 +72 @@
         size_t index;
 
-        // sum all the 16 bit fields
+        /* Sum all the 16 bit fields */
         for (index = 0; index + 1 < length; index += 2)
                 seed += (data[index] << 8) + data[index + 1];
 
-        // last odd byte with zero padding
+        /* Last odd byte with zero padding */
         if (index + 1 == length)
                 seed += data[index] << 8;
@@ -94 +94 @@
         size_t index;
 
-        // process full bytes
+        /* Process full bytes */
         while (length >= 8) {
-                // add the data
+                /* Add the data */
                 seed ^= (*data) << 24;
                 
-                // for each added bit
+                /* For each added bit */
                 for (index = 0; index < 8; ++index) {
-                        // if the first bit is set
+                        /* If the first bit is set */
                         if (seed & 0x80000000) {
-                                // shift and divide the checksum
+                                /* Shift and divide the checksum */
                                 seed = (seed << 1) ^ ((uint32_t) CRC_DIVIDER_BE);
                         } else {
-                                // shift otherwise
+                                /* Shift otherwise */
                                 seed <<= 1;
                         }
                 }
                 
-                // move to the next byte
+                /* Move to the next byte */
                 ++data;
                 length -= 8;
         }
 
-        // process the odd bits
+        /* Process the odd bits */
         if (length > 0) {
-                // add the data with zero padding
+                /* Add the data with zero padding */
                 seed ^= ((*data) & (0xff << (8 - length))) << 24;
                 
-                // for each added bit
+                /* For each added bit */
                 for (index = 0; index < length; ++index) {
-                        // if the first bit is set
+                        /* If the first bit is set */
                         if (seed & 0x80000000) {
-                                // shift and divide the checksum
+                                /* Shift and divide the checksum */
                                 seed = (seed << 1) ^ ((uint32_t) CRC_DIVIDER_BE);
                         } else {
-                                // shift otherwise
+                                /* Shift otherwise */
                                 seed <<= 1;
                         }
@@ -148 +148 @@
         size_t index;
 
-        // process full bytes
+        /* Process full bytes */
         while (length >= 8) {
-                // add the data
+                /* Add the data */
                 seed ^= (*data);
                 
-                // for each added bit
+                /* For each added bit */
                 for (index = 0; index < 8; ++index) {
-                        // if the last bit is set
+                        /* If the last bit is set */
                         if (seed & 1) {
-                                // shift and divide the checksum
+                                /* Shift and divide the checksum */
                                 seed = (seed >> 1) ^ ((uint32_t) CRC_DIVIDER_LE);
                         } else {
-                                // shift otherwise
+                                /* Shift otherwise */
                                 seed >>= 1;
                         }
                 }
                 
-                // move to the next byte
+                /* Move to the next byte */
                 ++data;
                 length -= 8;
         }
 
-        // process the odd bits
+        /* Process the odd bits */
         if (length > 0) {
-                // add the data with zero padding
+                /* Add the data with zero padding */
                 seed ^= (*data) >> (8 - length);
                 
                 for (index = 0; index < length; ++index) {
-                        // if the last bit is set
+                        /* If the last bit is set */
                         if (seed & 1) {
-                                // shift and divide the checksum
+                                /* Shift and divide the checksum */
                                 seed = (seed >> 1) ^ ((uint32_t) CRC_DIVIDER_LE);
                         } else {
-                                // shift otherwise
+                                /* Shift otherwise */
                                 seed >>= 1;
                         }
@@ -198 +198 @@
 uint16_t flip_checksum(uint16_t checksum)
 {
-        // flip, zero is returned as 0xFFFF (not flipped)
+        /* Flip, zero is returned as 0xFFFF (not flipped) */
         checksum = ~checksum;
         return checksum ? checksum : IP_CHECKSUM_ZERO;
@@ -216 +216 @@
 uint16_t ip_checksum(uint8_t *data, size_t length)
 {
-        // compute, compact and flip the data checksum
+        /* Compute, compact and flip the data checksum */
         return flip_checksum(compact_checksum(compute_checksum(0, data,
             length)));