ipv6: replace min/casting by min_t
authorFabian Frederick <fabf@skynet.be>
Mon, 27 Oct 2014 18:11:56 +0000 (19:11 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 27 Oct 2014 20:03:52 +0000 (16:03 -0400)
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/addrconf.c

index 725c763..50b95b2 100644 (file)
@@ -2315,8 +2315,8 @@ ok:
                        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: