2014-10-27 18:12:05

by Fabian Frédérick

Subject: [PATCH 1/1 net-next] ipv6: replace min/casting by min_t

Signed-off-by: Fabian Frederick <[email protected]>
---
net/ipv6/addrconf.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

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 @@ 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:
--
1.9.1

2014-10-27 20:04:32

by David Miller

Subject: Re: [PATCH 1/1 net-next] ipv6: replace min/casting by min_t

From: Fabian Frederick <[email protected]>
Date: Mon, 27 Oct 2014 19:11:56 +0100

> Signed-off-by: Fabian Frederick <[email protected]>

Applied.