diff options
| author | Mike McCormack <mikem@ring3k.org> | 2009-09-21 08:08:52 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-23 01:00:11 +0400 |
| commit | 74a61ebf653c6abe459f228eb40e9f24f7ef1fb7 (patch) | |
| tree | 8fa91d0ae6a6fe3130ab5bdb6b68115d205138df | |
| parent | 55865c66d24b8f1a885a1a03836d219286d41818 (diff) | |
| download | linux-74a61ebf653c6abe459f228eb40e9f24f7ef1fb7.tar.xz | |
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>
| -rw-r--r-- | drivers/net/sky2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 4bb52e9cd371..68d256b9638c 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -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; } |