Merge remote-tracking branch 'alon/pull-libcacard.data' into staging

[qemu.git] / slirp / cksum.c

diff --git a/slirp/cksum.c b/slirp/cksum.c
index f8f7512b6b286636b84fd9fb3466ab4d0e5286e1..e43867da3781c2337460c9534af6ea313af84d94 100644 (file)
--- a/slirp/cksum.c
+++ b/slirp/cksum.c
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -41,46 +37,49 @@
  *
  * This routine is very heavily used in the network
  * code and should be modified for each CPU to be as fast as possible.
- * 
+ *
  * XXX Since we will never span more than 1 mbuf, we can optimise this
  */
 
 #define ADDCARRY(x)  (x > 65535 ? x -= 65535 : x)
-#define REDUCE {l_util.l = sum; sum = l_util.s[0] + l_util.s[1]; ADDCARRY(sum);}
+#define REDUCE {l_util.l = sum; sum = l_util.s[0] + l_util.s[1];        \
+        (void)ADDCARRY(sum);}
 
 int cksum(struct mbuf *m, int len)
 {
-       register u_int16_t *w;
+       register uint16_t *w;
        register int sum = 0;
        register int mlen = 0;
        int byte_swapped = 0;
 
        union {
-               u_int8_t        c[2];
-               u_int16_t       s;
+               uint8_t  c[2];
+               uint16_t s;
        } s_util;
        union {
-               u_int16_t s[2];
-               u_int32_t l;
+               uint16_t s[2];
+               uint32_t l;
        } l_util;
-       
+
        if (m->m_len == 0)
           goto cont;
-       w = mtod(m, u_int16_t *);
-       
+       w = mtod(m, uint16_t *);
+
        mlen = m->m_len;
-       
+
        if (len < mlen)
           mlen = len;
+#ifdef DEBUG
        len -= mlen;
+#endif
        /*
         * Force to even boundary.
         */
        if ((1 & (long) w) && (mlen > 0)) {
                REDUCE;
                sum <<= 8;
-               s_util.c[0] = *(u_int8_t *)w;
-               w = (u_int16_t *)((int8_t *)w + 1);
+               s_util.c[0] = *(uint8_t *)w;
+               w = (uint16_t *)((int8_t *)w + 1);
                mlen--;
                byte_swapped = 1;
        }
@@ -107,21 +106,20 @@ int cksum(struct mbuf *m, int len)
        while ((mlen -= 2) >= 0) {
                sum += *w++;
        }
-       
+
        if (byte_swapped) {
                REDUCE;
                sum <<= 8;
-               byte_swapped = 0;
                if (mlen == -1) {
-                       s_util.c[1] = *(u_int8_t *)w;
+                       s_util.c[1] = *(uint8_t *)w;
                        sum += s_util.s;
                        mlen = 0;
                } else
-                  
+
                   mlen = -1;
        } else if (mlen == -1)
-          s_util.c[0] = *(u_int8_t *)w;
-       
+          s_util.c[0] = *(uint8_t *)w;
+
 cont:
 #ifdef DEBUG
        if (len) {