2007-10-13 08:19:55

by Marcus Meissner

Subject: [PATCH] tokenring/3c359.c: fixed array index problem

Hi,

I tried to send this to netdev and various maintainers, but
they seem not to have seen it.

Please add to -mm and have it merged somewhere.


The xl_laa array is just 6 bytes long, so we should substract
10 from the index, like is also done some lines above already.

Signed-Off-By: Marcus Meissner <[email protected]>
---
drivers/net/tokenring/3c359.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index 7224d36..5d31519 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -760,7 +760,7 @@ static int xl_open_hw(struct net_device *dev)
if (xl_priv->xl_laa[0]) { /* If using a LAA address */
for (i=10;i<16;i++) {
writel( (MEM_BYTE_WRITE | 0xD0000 | xl_priv->srb) + i, xl_mmio + MMIO_MAC_ACCESS_CMD) ;
- writeb(xl_priv->xl_laa[i],xl_mmio + MMIO_MACDATA) ;
+ writeb(xl_priv->xl_laa[i-10],xl_mmio + MMIO_MACDATA) ;
}
memcpy(dev->dev_addr,xl_priv->xl_laa,dev->addr_len) ;
} else { /* Regular hardware address */
--
1.5.2.4

--
Working, but not speaking, for the following german company:
SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nuernberg)

2007-10-17 01:15:46

by Jeff Garzik

Subject: Re: [PATCH] tokenring/3c359.c: fixed array index problem

Marcus Meissner wrote:
> Hi,
>
> I tried to send this to netdev and various maintainers, but
> they seem not to have seen it.
>
> Please add to -mm and have it merged somewhere.
>
>
> The xl_laa array is just 6 bytes long, so we should substract
> 10 from the index, like is also done some lines above already.
>
> Signed-Off-By: Marcus Meissner <[email protected]>
> ---
> drivers/net/tokenring/3c359.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)

applied