[ros-diffs] [tfaber] 56404: [AFD] - Fix broken IP address pointer arithmetic (CID 14130) [PCNET] - Fix incorrectly truncated FullDuplex BOOLEAN

Author: tfaber
Date: Tue Apr 24 07:27:59 2012
New Revision: 56404

URL: http://svn.reactos.org/svn/reactos?rev=56404&view=rev
Log:
[AFD] - Fix broken IP address pointer arithmetic (CID 14130)
[PCNET] - Fix incorrectly truncated FullDuplex BOOLEAN

Modified:
    trunk/reactos/drivers/network/afd/afd/tdi.c
    trunk/reactos/drivers/network/dd/pcnet/pcnet.c

Modified: trunk/reactos/drivers/network/afd/afd/tdi.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/tdi...
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Tue Apr 24 07:27:59 2012
@@ -848,9 +848,7 @@

if (SnmpInfo.NumAddr != 1) {
                     /* Skip loopback address */
-                    PIPADDR_ENTRY IpAddressEntry = (PIPADDR_ENTRY)
-                        ((PCHAR)IpAddress) + sizeof(IPADDR_ENTRY);
-                    *Address = DN2H(IpAddressEntry->Addr);
+                    *Address = DN2H(IpAddress[1].Addr);
                 } else {
                     /* Select the first address returned */
                     *Address = DN2H(IpAddress->Addr);

Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/pc...
==============================================================================
--- trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Tue Apr 24 07:27:59 2012
@@ -1286,7 +1286,7 @@
   NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR5);
   NdisRawReadPortUshort(Adapter->PortOffset + BDP, &Data);

-  return Data & BCR5_LEDOUT;
+  return (Data & BCR5_LEDOUT) != 0;
 }

UINT