Patchwork [2/2] ethoc: fix warning from 32bit build

login
register
mail settings
Submitter Alan Cox
Date Oct. 12, 2009, 3:27 p.m.
Message ID <20091012152753.5694.18204.stgit@localhost.localdomain>
Download mbox | patch
Permalink /patch/35776/
State Accepted
Delegated to: David Miller
Headers show

Comments

Alan Cox - Oct. 12, 2009, 3:27 p.m.
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>
---

 drivers/net/ethoc.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 96f5b2a..402a507 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -664,7 +664,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);