diff options
author | Divy Le Ray <divy@chelsio.com> | 2007-03-31 03:23:13 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-04-03 22:31:09 -0400 |
commit | 9f238486f5438b2e44f760b11fa3a08714c1ddb6 (patch) | |
tree | 4db457aaedba5c4af8f6b397ef34dcc46462bf7b /drivers/net/cxgb3/cxgb3_main.c | |
parent | 59117d3f4e3f5a7980353d2f476e516c758ce921 (diff) |
cxgb3 - Safeguard TCAM size usage
Ensure that the TCAM active region size is at least 16.
Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_main.c')
-rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index d5538361055..b82544e0868 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c | |||
@@ -485,12 +485,14 @@ static ssize_t show_##name(struct device *d, struct device_attribute *attr, \ | |||
485 | static ssize_t set_nfilters(struct net_device *dev, unsigned int val) | 485 | static ssize_t set_nfilters(struct net_device *dev, unsigned int val) |
486 | { | 486 | { |
487 | struct adapter *adap = dev->priv; | 487 | struct adapter *adap = dev->priv; |
488 | int min_tids = is_offload(adap) ? MC5_MIN_TIDS : 0; | ||
488 | 489 | ||
489 | if (adap->flags & FULL_INIT_DONE) | 490 | if (adap->flags & FULL_INIT_DONE) |
490 | return -EBUSY; | 491 | return -EBUSY; |
491 | if (val && adap->params.rev == 0) | 492 | if (val && adap->params.rev == 0) |
492 | return -EINVAL; | 493 | return -EINVAL; |
493 | if (val > t3_mc5_size(&adap->mc5) - adap->params.mc5.nservers) | 494 | if (val > t3_mc5_size(&adap->mc5) - adap->params.mc5.nservers - |
495 | min_tids) | ||
494 | return -EINVAL; | 496 | return -EINVAL; |
495 | adap->params.mc5.nfilters = val; | 497 | adap->params.mc5.nfilters = val; |
496 | return 0; | 498 | return 0; |
@@ -508,7 +510,8 @@ static ssize_t set_nservers(struct net_device *dev, unsigned int val) | |||
508 | 510 | ||
509 | if (adap->flags & FULL_INIT_DONE) | 511 | if (adap->flags & FULL_INIT_DONE) |
510 | return -EBUSY; | 512 | return -EBUSY; |
511 | if (val > t3_mc5_size(&adap->mc5) - adap->params.mc5.nfilters) | 513 | if (val > t3_mc5_size(&adap->mc5) - adap->params.mc5.nfilters - |
514 | MC5_MIN_TIDS) | ||
512 | return -EINVAL; | 515 | return -EINVAL; |
513 | adap->params.mc5.nservers = val; | 516 | adap->params.mc5.nservers = val; |
514 | return 0; | 517 | return 0; |