From 4ae4623b8f5f416593d42e5e63f1d5d40a66c53a Mon Sep 17 00:00:00 2001 From: Thiago Farina Date: Tue, 3 Nov 2009 03:10:29 +0000 Subject: [PATCH] --- yaml --- r: 171151 b: refs/heads/master c: df7641af498c1575f5e9719cb391a1fa8159db1b h: refs/heads/master i: 171149: a4d8ff24149f21c820a45a00bdcae0dec22bd702 171147: c8376d78c55c665af3f1c7baafe780169518d96c 171143: 43ef15ed3b004f9573d0f638f71180ac518d8425 171135: e33ed1764242152e421788adf41b6c3513f86ec9 v: v3 --- [refs] | 2 +- trunk/drivers/net/tehuti.c | 2 +- trunk/drivers/net/tehuti.h | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e8738bf4fc58..0bf3eab8a067 100644 --- 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 index 79d4868e75a6..492bff68bf2d 100644 --- 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 index 4fc875e5dcdd..124141909e42 100644 --- 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)