Commit 211a0d94 authored Mar 15, 2010 by 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: David S. Miller <davem@davemloft.net>

parent bec68ff1

drivers/net/e100.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2858,7 +2858,7 @@ static int __devinit e100_probe(struct pci_dev *pdev,
		}
		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",

Admin message