aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2009-10-12 05:27:55 +0000
committerDavid S. Miller <davem@davemloft.net>2009-10-13 00:23:06 -0700
commit4ce22537a28eeb6a29a2b4d1049c703a80c25bd1 (patch)
tree74b108d372fe00dc4cbf2fbd74a5e85197988585 /drivers/net
parent767e366fc9e667c1ef71af588d33b7ec27c5ed1d (diff)
ethoc: fix warning from 32bit build
drivers/net/ethoc.c: In function ‘ethoc_open’: drivers/net/ethoc.c:667: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethoc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 34d0c69e67f..1d338c6f531 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -663,7 +663,8 @@ static int ethoc_open(struct net_device *dev)
return ret;
/* calculate the number of TX/RX buffers, maximum 128 supported */
- num_bd = min(128, (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ);
+ num_bd = min_t(unsigned int,
+ 128, (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ);
priv->num_tx = max(min_tx, num_bd / 4);
priv->num_rx = num_bd - priv->num_tx;
ethoc_write(priv, TX_BD_NUM, priv->num_tx);