lkml.org 
[lkml]   [2010]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[16/45] sky2: Set SKY2_HW_RAM_BUFFER in sky2_init
    2.6.27-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Mike McCormack <mikem@ring3k.org>

    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@ring3k.org>
    Acked-by: Stephen Hemminger <shemminger@vyatta.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/sky2.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/net/sky2.c
    +++ b/drivers/net/sky2.c
    @@ -1438,7 +1438,6 @@ static int sky2_up(struct net_device *de
    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 sk
    ++hw->ports;
    }

    + if (sky2_read8(hw, B2_E_0))
    + hw->flags |= SKY2_HW_RAM_BUFFER;
    +
    return 0;
    }




    \
     
     \ /
      Last update: 2010-03-31 02:43    [W:0.024 / U:0.276 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site