iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

e100: Fix ring parameter change handling regression.

Browse Source 
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>
This commit is contained in:
David S. Miller 2010-03-15 15:23:30 -07:00
parent bec68ff163
commit 211a0d941b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/e100.c
View File

@ -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",