---

yaml --- r: 167001 b: refs/heads/master c: 639b62a h: refs/heads/master i: 166999: fde2f60 v: v3
git-mirror · Oct 7, 2009 · c1d6b2f · c1d6b2f
1 parent ff76186
commit c1d6b2f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);