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[131/156] e100: Fix ring parameter change handling regression.
    2.6.33-stable review patch.  If anyone has any objections, please let us know.

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

    From: David S. Miller <davem@davemloft.net>

    [ Upstream commit 211a0d941b1924e667483f822a55e2cc694cd212 ]

    When the PCI pool changes were added to fix resume failures:

    commit 98468efddb101f8a29af974101c17ba513b07be1
    e100: Use pci pool to work around GFP_ATOMIC order 5 memory allocation failu

    and

    commit 70abc8cb90e679d8519721e2761d8366a18212a6
    e100: Fix broken cbs accounting due to missing memset.

    This introduced a problem that can happen if the TX ring size
    is increased. We need to size the PCI pool using cbs->max
    instead of the default cbs->count value.

    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/e100.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/net/e100.c
    +++ b/drivers/net/e100.c
    @@ -2854,7 +2854,7 @@ static int __devinit e100_probe(struct p
    }
    nic->cbs_pool = pci_pool_create(netdev->name,
    nic->pdev,
    - nic->params.cbs.count * sizeof(struct cb),
    + nic->params.cbs.max * sizeof(struct cb),
    sizeof(u32),
    0);
    DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %pM\n",



    \
     
     \ /
      Last update: 2010-03-31 01:31    [W:3.047 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site