Commit 211a0d94 authored by David S. Miller's avatar David S. Miller

e100: Fix ring parameter change handling regression.

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

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

and

commit 70abc8cb
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: default avatarDavid S. Miller <davem@davemloft.net>
parent bec68ff1
...@@ -2858,7 +2858,7 @@ static int __devinit e100_probe(struct pci_dev *pdev, ...@@ -2858,7 +2858,7 @@ static int __devinit e100_probe(struct pci_dev *pdev,
} }
nic->cbs_pool = pci_pool_create(netdev->name, nic->cbs_pool = pci_pool_create(netdev->name,
nic->pdev, nic->pdev,
nic->params.cbs.count * sizeof(struct cb), nic->params.cbs.max * sizeof(struct cb),
sizeof(u32), sizeof(u32),
0); 0);
DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %pM\n", DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %pM\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment