| commit | 8fc51479fb9f3b9b06e65ce266488bae55c2965a | |
| author | David S. Miller <davem@davemloft.net> | |
| Mon, 15 Mar 2010 22:23:30 +0000 (15 15:23 -0700) | ||
| committer | Greg Kroah-Hartman <gregkh@suse.de> | |
| Thu, 1 Apr 2010 23:02:06 +0000 (1 16:02 -0700) | ||
| tree | 821a40de7c30d9ce79c9ecf992cdd13641806e9c | treesnapshot (tar.gz zip) |
| parent | 45e74e6561f0da79a417be5424d2c1bf26ae79ba | commitdiff |
e100: Fix ring parameter change handling regression.
[ 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>
[ 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 | diffblobblamehistory |