GIT: unionfs2-2.6.27.y: sky2: Set SKY2_HW_RAM_BUFFER in sky2_init

[Erez Zadok]

commit 698051b7655e0289f7a49b4a7e363cb6cec10735
Author: Mike McCormack <mikem at ring3k.org>
Date:   Mon Sep 21 04:08:52 2009 +0000

    sky2: Set SKY2_HW_RAM_BUFFER in sky2_init
    
    commit 74a61ebf653c6abe459f228eb40e9f24f7ef1fb7 upstream.
    
    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 at ring3k.org>
    Acked-by: Stephen Hemminger <shemminger at vyatta.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 42963a9..aa9ff46 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1438,7 +1438,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;
@@ -2846,6 +2845,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;
 }