Skip to contentSkip to conversation

tokenring/3c359.c: fixed array index problem

PATCH Applied Marcus Meissner 2 participants 2 messages Oct 13, 2007 – Oct 17, 2007 Network drivers

lore
Share & tools
lore

Marcus Meissner

author
#0 lore raw

PATCH 1/1 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(-)
drivers/net/tokenring/3c359.c +1 -1
index 7224d36..5d31519 100644
@@ -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 */
Signature · 5 lines
1.5.2.4

-- 
Working, but not speaking, for the following german company:
SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nuernberg)
Applied
#1 lore raw
Quoted 8 lines · Marcus Meissner

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.

Quoted 7 lines

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