Commit 74a61ebf authored Sep 21, 2009 by Mike McCormack Committed by David S. Miller Sep 22, 2009

sky2: Set SKY2_HW_RAM_BUFFER in sky2_init



The SKY2_HW_RAM_BUFFER bit in hw->flags was checked in sky2_mac_init(),
 before being set later in sky2_up().

Setting SKY2_HW_RAM_BUFFER in sky2_init() where other hw->flags are set
 should avoid this problem recurring.

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 55865c66

drivers/net/sky2.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1497,7 +1497,6 @@ static int sky2_up(struct net_device *dev)
		if (ramsize > 0) {
		u32 rxspace;

		hw->flags \|= SKY2_HW_RAM_BUFFER;
		pr_debug(PFX "%s: ram buffer %dK\n", dev->name, ramsize);
		if (ramsize < 16)
		rxspace = ramsize / 2;
		@@ -2926,6 +2925,9 @@ static int __devinit sky2_init(struct sky2_hw *hw)
		++hw->ports;
		}

		if (sky2_read8(hw, B2_E_0))
		hw->flags \|= SKY2_HW_RAM_BUFFER;

		return 0;
		}