diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2002-06-19 23:52:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-06-19 23:52:57 -0700 |
| commit | f72a32ff7890fdab2c5e91c74105d3557c7afa6c (patch) | |
| tree | c6220c5d042377b29b095f09668d63890b3646bd | |
| parent | 2f8e8c5b2b4ec0a5fc36f3d75306cb9aaa2f05a3 (diff) | |
[PATCH] Trivial TAP_TUN patch to remove minmax macros
In favour of those now in kernel.h..
| -rw-r--r-- | drivers/net/tun.c | 2 | ||||
| -rw-r--r-- | include/linux/if_tun.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 00d67044060e..9e9fa188551d 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -275,7 +275,7 @@ static __inline__ ssize_t tun_put_user(struct tun_struct *tun, total += sizeof(pi); } - len = MIN(skb->len, len); + len = min(skb->len, len); skb_copy_datagram_iovec(skb, 0, iv, len); total += len; diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h index 0cfd69202430..2af535344624 100644 --- a/include/linux/if_tun.h +++ b/include/linux/if_tun.h @@ -50,10 +50,6 @@ struct tun_struct { #endif }; -#ifndef MIN -#define MIN(a,b) ( (a)<(b) ? (a):(b) ) -#endif - #endif /* __KERNEL__ */ /* Read queue size */ |