Commit f72a32ff authored by Rusty Russell's avatar Rusty Russell Committed by Linus Torvalds

[PATCH] Trivial TAP_TUN patch to remove minmax macros

In favour of those now in kernel.h..
parent 2f8e8c5b
...@@ -275,7 +275,7 @@ static __inline__ ssize_t tun_put_user(struct tun_struct *tun, ...@@ -275,7 +275,7 @@ static __inline__ ssize_t tun_put_user(struct tun_struct *tun,
total += sizeof(pi); total += sizeof(pi);
} }
len = MIN(skb->len, len); len = min(skb->len, len);
skb_copy_datagram_iovec(skb, 0, iv, len); skb_copy_datagram_iovec(skb, 0, iv, len);
total += len; total += len;
......
...@@ -50,10 +50,6 @@ struct tun_struct { ...@@ -50,10 +50,6 @@ struct tun_struct {
#endif #endif
}; };
#ifndef MIN
#define MIN(a,b) ( (a)<(b) ? (a):(b) )
#endif
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
/* Read queue size */ /* Read queue size */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment