diff --git a/[refs] b/[refs]
index 2b2a89f405a5..d0c0e08762bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4989ccb25cc2a6d03d3503a2c852644f9a750948
+refs/heads/master: 639b62a5284fab27122ec607fe341eb8e29411f4
diff --git a/trunk/drivers/net/ethoc.c b/trunk/drivers/net/ethoc.c
index b7311bc00258..747562037e23 100644
--- a/trunk/drivers/net/ethoc.c
+++ b/trunk/drivers/net/ethoc.c
@@ -655,7 +655,7 @@ static int ethoc_open(struct net_device *dev)
 
 	/* calculate the number of TX/RX buffers */
 	num_bd = (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ;
-	priv->num_tx = min(min_tx, num_bd / 4);
+	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);