aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavid S. Miller <davem@nuts.davemloft.net>2005-01-13 04:19:03 -0800
committerDavid S. Miller <davem@nuts.davemloft.net>2005-01-13 04:19:03 -0800
commit453269c56af16eabea712fdbc304cd290a78a2fb (patch)
tree5c06bebc9d1587df140497c823a940eefab7691f /drivers
parent430c4e0f8dcc84fa4e44dec76a8da79fd267dfed (diff)
downloadhistory-453269c56af16eabea712fdbc304cd290a78a2fb.tar.gz
[TUN]: Make type explicit in min() usage.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/tun.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 87a4e0008d4207..492354bc4c92f9 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -365,7 +365,8 @@ static ssize_t tun_chr_readv(struct file *file, const struct iovec *iv,
* - we are multicast promiscous.
* - we belong to the multicast group.
*/
- memcpy(addr, skb->data, min(sizeof addr, skb->len));
+ memcpy(addr, skb->data,
+ min_t(size_t, sizeof addr, skb->len));
bit_nr = ether_crc(sizeof addr, addr) >> 26;
if ((tun->if_flags & IFF_PROMISC) ||
memcmp(addr, tun->dev_addr, sizeof addr) == 0 ||