---

yaml --- r: 171151 b: refs/heads/master c: df7641a h: refs/heads/master i: 171149: a4d8ff2 171147: c8376d7 171143: 43ef15e 171135: e33ed17 v: v3
git-mirror · Nov 4, 2009 · 4ae4623 · 4ae4623
1 parent e995e88
commit 4ae4623
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d37f36ff9bc41067c71635d14b6a5834853a779
+refs/heads/master: df7641af498c1575f5e9719cb391a1fa8159db1b
diff --git a/trunk/drivers/net/tehuti.c b/trunk/drivers/net/tehuti.c
@@ -1878,7 +1878,7 @@ static void bdx_tx_push_desc_safe(struct bdx_priv *priv, void *data, int size)
 			udelay(50);	/* give hw a chance to clean fifo */
 			continue;
 		}
-		avail = MIN(avail, size);
+		avail = min(avail, size);
 		DBG("about to push  %d bytes starting %p size %d\n", avail,
 		    data, size);
 		bdx_tx_push_desc(priv, data, avail);

diff --git a/trunk/drivers/net/tehuti.h b/trunk/drivers/net/tehuti.h
@@ -76,8 +76,6 @@
 #define FIFO_SIZE  4096
 #define FIFO_EXTRA_SPACE            1024
 
-#define MIN(x, y)  ((x) < (y) ? (x) : (y))
-
 #if BITS_PER_LONG == 64
 #    define H32_64(x)  (u32) ((u64)(x) >> 32)
 #    define L32_64(x)  (u32) ((u64)(x) & 0xffffffff)