Changeset 28135 in vbox

Timestamp:

Apr 9, 2010 10:09:00 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

59858

Message:

DevE1000: Fixed signed/unsigned compare warnings caused by type propagation (uint8_t -> signed int).

File:

• trunk/src/VBox/Devices/Network/DevE1000.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Network/DevE1000.cpp

@@ -1954 +1954 @@
     switch (uEtherType)
     {
-        /* @todo
+        /** @todo
          * It is not safe to bypass checksum verification for packets coming
          * from real wire. We currently unable to tell where packets are
@@ -2865 +2865 @@
 
     /* IPv4 checksum offset. */
-    if (RT_UNLIKELY( pCtx->dw2.fIP && pCtx->ip.u8CSO - pCtx->ip.u8CSS != RT_UOFFSETOF(RTNETIPV4, ip_sum) ))
+    if (RT_UNLIKELY( pCtx->dw2.fIP && (size_t)pCtx->ip.u8CSO - pCtx->ip.u8CSS != RT_UOFFSETOF(RTNETIPV4, ip_sum) ))
     {
         E1kLog(("e1kSetupGsoCtx: IPCSO=%#x IPCSS=%#x\n", pCtx->ip.u8CSO, pCtx->ip.u8CSS));
@@ -2872 +2872 @@
 
     /* TCP/UDP checksum offsets. */
-    if (RT_UNLIKELY( pCtx->tu.u8CSO - pCtx->tu.u8CSS != ( pCtx->dw2.fTCP
-                                                         ? RT_UOFFSETOF(RTNETTCP, th_sum)
-                                                         : RT_UOFFSETOF(RTNETUDP, uh_sum) ) ))
+    if (RT_UNLIKELY(   (size_t)pCtx->tu.u8CSO - pCtx->tu.u8CSS
+                    != ( pCtx->dw2.fTCP
+                         ? RT_UOFFSETOF(RTNETTCP, th_sum)
+                         : RT_UOFFSETOF(RTNETUDP, uh_sum) ) ))
     {
         E1kLog(("e1kSetupGsoCtx: TUCSO=%#x TUCSS=%#x TCP=%d\n", pCtx->ip.u8CSO, pCtx->ip.u8CSS, pCtx->dw2.fTCP));
@@ -4410 +4411 @@
             case 0x04: /* IODATA */
                 rc = e1kRegRead(pState, pState->uSelectedReg, pu32, cb);
-                /* @todo wrong return code triggers assertions in the debug build; fix please */
+                /** @todo wrong return code triggers assertions in the debug build; fix please */
                 if (rc == VINF_IOM_HC_MMIO_READ)
                     rc = VINF_IOM_HC_IOPORT_READ;
@@ -4464 +4465 @@
                 E1kLog2(("%s e1kIOPortOut: IODATA(4), writing to selected register %#010x, value=%#010x\n", szInst, pState->uSelectedReg, u32));
                 rc = e1kRegWrite(pState, pState->uSelectedReg, &u32, cb);
-                /* @todo wrong return code triggers assertions in the debug build; fix please */
+                /** @todo wrong return code triggers assertions in the debug build; fix please */
                 if (rc == VINF_IOM_HC_MMIO_WRITE)
                     rc = VINF_IOM_HC_IOPORT_WRITE;