[PATCH] sky2: bad memory reference on dual port cards
Sky2 driver will oops referencing bad memory if used on a dual port card. The problem is accessing past end of MIB counter space. Applies for both 2.6.17 and 2.6.16 (with fuzz) Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
94843566d7
commit
43f2f10444
|
@ -577,8 +577,8 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
|
|||
reg = gma_read16(hw, port, GM_PHY_ADDR);
|
||||
gma_write16(hw, port, GM_PHY_ADDR, reg | GM_PAR_MIB_CLR);
|
||||
|
||||
for (i = 0; i < GM_MIB_CNT_SIZE; i++)
|
||||
gma_read16(hw, port, GM_MIB_CNT_BASE + 8 * i);
|
||||
for (i = GM_MIB_CNT_BASE; i <= GM_MIB_CNT_END; i += 4)
|
||||
gma_read16(hw, port, i);
|
||||
gma_write16(hw, port, GM_PHY_ADDR, reg);
|
||||
|
||||
/* transmit control */
|
||||
|
|
|
@ -1375,7 +1375,7 @@ enum {
|
|||
GM_PHY_ADDR = 0x0088, /* 16 bit r/w GPHY Address Register */
|
||||
/* MIB Counters */
|
||||
GM_MIB_CNT_BASE = 0x0100, /* Base Address of MIB Counters */
|
||||
GM_MIB_CNT_SIZE = 256,
|
||||
GM_MIB_CNT_END = 0x025C, /* Last MIB counter */
|
||||
};
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue