diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-13 15:55:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-13 15:55:20 -0400 |
| commit | 421355de876b9f3fcc7e4cb6026e416fb12a5068 (patch) | |
| tree | fb814456af86c75e1eb9e330994dda461fc5b4f7 /drivers/net/ethoc.c | |
| parent | aace495933a981274b6491d71b915165a61defdc (diff) | |
| parent | 0fe7463a35aadfaf22d1ca58325ab3851b8d757c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/ethoc.c')
| -rw-r--r-- | drivers/net/ethoc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index 0c229a5fa82a..a25f8ed8109d 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c | |||
| @@ -663,7 +663,8 @@ static int ethoc_open(struct net_device *dev) | |||
| 663 | return ret; | 663 | return ret; |
| 664 | 664 | ||
| 665 | /* calculate the number of TX/RX buffers, maximum 128 supported */ | 665 | /* calculate the number of TX/RX buffers, maximum 128 supported */ |
| 666 | num_bd = min(128, (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ); | 666 | num_bd = min_t(unsigned int, |
| 667 | 128, (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ); | ||
| 667 | priv->num_tx = max(min_tx, num_bd / 4); | 668 | priv->num_tx = max(min_tx, num_bd / 4); |
| 668 | priv->num_rx = num_bd - priv->num_tx; | 669 | priv->num_rx = num_bd - priv->num_tx; |
| 669 | ethoc_write(priv, TX_BD_NUM, priv->num_tx); | 670 | ethoc_write(priv, TX_BD_NUM, priv->num_tx); |