Re: gnumach patches

[Thomas Schwinge]

> 2005-09-26  Thomas Schwinge  <tschwinge@gnu.org>
> 
>       * linux/src/drivers/net/ne2k-pci.c (ne_block_input)
>       (ne_block_output): Fix previous patch.

Here is a better version:

2005-11-05  Thomas Schwinge  <tschwinge@gnu.org>

        * linux/src/drivers/net/ne2k-pci.c (ne_block_input, ne_block_output):
        Fix previous patch.

--- old-gnumach-1-branch.1.ne2k-pci-fixes/linux/src/drivers/net/ne2k-pci.c      
2005-09-26 11:48:05.433286440 +0200
+++ new-gnumach-1-branch.1.ne2k-pci-fixes/linux/src/drivers/net/ne2k-pci.c      
2005-09-26 11:48:05.439285528 +0200
@@ -541,11 +541,10 @@
        insl(NE_BASE + NE_DATAPORT, buf, count>>2);
        if (count & 3) {
                buf += count & ~3;
-               if (count & 2)
-                       {
-                               *buf = *(u16 *) buf + 1;
-                               *buf = inw(NE_BASE + NE_DATAPORT);
-                       }
+               if (count & 2) {
+                       *((u16 *) buf) = inw(NE_BASE + NE_DATAPORT);
+                       buf = (void *) buf + sizeof (u16);
+               }
                if (count & 1)
                        *buf = inb(NE_BASE + NE_DATAPORT);
        }
@@ -607,8 +606,10 @@
        outsl(NE_BASE + NE_DATAPORT, buf, count>>2);
        if (count & 3) {
                buf += count & ~3;
-               if (count & 2)
-                       outw(*buf++, NE_BASE + NE_DATAPORT);
+               if (count & 2) {
+                       outw(*((u16 *) buf), NE_BASE + NE_DATAPORT);
+                       buf = (void *) buf + sizeof (u16);
+               }
 
        }
 #else


Thanks for taking care of this!


Regards,
 Thomas