Bernd Schmidt wrote:
> diff -x log.build -x .* -dru linux-2.4/drivers/net/tulip/tulip_core.c
>linux-2.4-fixed/drivers/net/tulip/tulip_core.c
> --- linux-2.4/drivers/net/tulip/tulip_core.c Mon Oct 16 13:51:23 2000
> +++ linux-2.4-fixed/drivers/net/tulip/tulip_core.c Mon Oct 16 15:40:12 2000
[...]
> @@ -944,9 +946,9 @@
>
> /* Fill the final entry with our physical address. */
> eaddrs = (u16 *)dev->dev_addr;
> - *setup_frm++ = *setup_frm++ = eaddrs[0];
> - *setup_frm++ = *setup_frm++ = eaddrs[1];
> - *setup_frm++ = *setup_frm++ = eaddrs[2];
> + *setup_frm++ = eaddrs[0]; *setup_frm++ = eaddrs[0];
> + *setup_frm++ = eaddrs[1]; *setup_frm++ = eaddrs[1];
> + *setup_frm++ = eaddrs[2]; *setup_frm++ = eaddrs[2];
>
> spin_lock_irqsave(&tp->lock, flags);
>
Linus/Bernd, please drop this patch to drivers/net/tulip/tulip_core.c, I
have a much better change from prumpf for this already in my CVS...
> --- linux-2.4/drivers/scsi/aha152x.c Mon Oct 16 13:51:24 2000
> +++ linux-2.4-fixed/drivers/scsi/aha152x.c Mon Oct 16 14:51:29 2000
> @@ -1280,7 +1280,8 @@
> scsi_unregister(shpnt);
> registered_count--;
> release_region(shpnt->io_port, IO_RANGE);
> - aha152x_host[shpnt->irq - IRQ_MIN] = shpnt = 0;
> + aha152x_host[shpnt->irq - IRQ_MIN] = 0;
> + shpnt = 0;
> continue;
> }
Why this change?
Other than these two things, the changes look ok.
--
Jeff Garzik | The difference between laziness and
Building 1024 | prioritization is the end result.
MandrakeSoft |
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
Please read the FAQ at http://www.tux.org/lkml/
