commit 9451a304ceeb96c45f91f88f2caa7364f5cee087
author Fabian Frederick <fabf@skynet.be> Mon Oct 27 19:11:56 2014 +0100
committer David S. Miller <davem@davemloft.net> Mon Oct 27 16:03:52 2014 -0400
tree af1ffc38684545b81218533bff1c9e680c7c2af5
parent 6b436d338177729ae5c5a58e0acc5f35df603f82

ipv6: replace min/casting by min_t

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/ipv6/addrconf.c

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 725c763..50b95b2 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2315,8 +2315,8 @@
 			else
 				stored_lft = 0;
 			if (!update_lft && !create && stored_lft) {
-				const u32 minimum_lft = min(
-					stored_lft, (u32)MIN_VALID_LIFETIME);
+				const u32 minimum_lft = min_t(u32,
+					stored_lft, MIN_VALID_LIFETIME);
 				valid_lft = max(valid_lft, minimum_lft);
 
 				/* RFC4862 Section 5.5.3e: