aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/tehuti.c2
-rw-r--r--drivers/net/tehuti.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index 79d4868e75a6..492bff68bf2d 100644
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -1878,7 +1878,7 @@ static void bdx_tx_push_desc_safe(struct bdx_priv *priv, void *data, int size)
1878 udelay(50); /* give hw a chance to clean fifo */ 1878 udelay(50); /* give hw a chance to clean fifo */
1879 continue; 1879 continue;
1880 } 1880 }
1881 avail = MIN(avail, size); 1881 avail = min(avail, size);
1882 DBG("about to push %d bytes starting %p size %d\n", avail, 1882 DBG("about to push %d bytes starting %p size %d\n", avail,
1883 data, size); 1883 data, size);
1884 bdx_tx_push_desc(priv, data, avail); 1884 bdx_tx_push_desc(priv, data, avail);
diff --git a/drivers/net/tehuti.h b/drivers/net/tehuti.h
index 4fc875e5dcdd..124141909e42 100644
--- a/drivers/net/tehuti.h
+++ b/drivers/net/tehuti.h
@@ -76,8 +76,6 @@
76#define FIFO_SIZE 4096 76#define FIFO_SIZE 4096
77#define FIFO_EXTRA_SPACE 1024 77#define FIFO_EXTRA_SPACE 1024
78 78
79#define MIN(x, y) ((x) < (y) ? (x) : (y))
80
81#if BITS_PER_LONG == 64 79#if BITS_PER_LONG == 64
82# define H32_64(x) (u32) ((u64)(x) >> 32) 80# define H32_64(x) (u32) ((u64)(x) >> 32)
83# define L32_64(x) (u32) ((u64)(x) & 0xffffffff) 81# define L32_64(x) (u32) ((u64)(x) & 0xffffffff)