|
|
@@ -354,7 +354,10 @@ static struct cxgbi_ppm_pool *ppm_alloc_cpu_pool(unsigned int *total,
|
|
|
ppmax = max;
|
|
|
|
|
|
/* pool size must be multiple of unsigned long */
|
|
|
- bmap = BITS_TO_LONGS(ppmax);
|
|
|
+ bmap = ppmax / BITS_PER_TYPE(unsigned long);
|
|
|
+ if (!bmap)
|
|
|
+ return NULL;
|
|
|
+
|
|
|
ppmax = (bmap * sizeof(unsigned long)) << 3;
|
|
|
|
|
|
alloc_sz = sizeof(*pools) + sizeof(unsigned long) * bmap;
|
|
|
@@ -402,6 +405,10 @@ int cxgbi_ppm_init(void **ppm_pp, struct net_device *ndev,
|
|
|
if (reserve_factor) {
|
|
|
ppmax_pool = ppmax / reserve_factor;
|
|
|
pool = ppm_alloc_cpu_pool(&ppmax_pool, &pool_index_max);
|
|
|
+ if (!pool) {
|
|
|
+ ppmax_pool = 0;
|
|
|
+ reserve_factor = 0;
|
|
|
+ }
|
|
|
|
|
|
pr_debug("%s: ppmax %u, cpu total %u, per cpu %u.\n",
|
|
|
ndev->name, ppmax, ppmax_pool, pool_index_max);
|