[PATCH] Trivial TAP_TUN patch to remove minmax macros

In favour of those now in kernel.h..

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 00d67044060e027b80cca1b6a5a198268df5679d..9e9fa188551d7abd39f62b0afed7fd219ee4ff3d 100644 (file)
--- 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 0cfd692024306609fd59603dcc4f353ae1a37957..2af535344624075aba85ba7d0d5518ec274739da 100644 (file)
--- 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 */