diff options
| author | Fabian Frederick <fabf@skynet.be> | 2014-10-27 14:11:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-27 16:03:52 -0400 |
| commit | 9451a304ceeb96c45f91f88f2caa7364f5cee087 (patch) | |
| tree | af1ffc38684545b81218533bff1c9e680c7c2af5 /net/ipv6/addrconf.c | |
| parent | 6b436d338177729ae5c5a58e0acc5f35df603f82 (diff) | |
ipv6: replace min/casting by min_t
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 725c763270a0..50b95b2db87c 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
| @@ -2315,8 +2315,8 @@ ok: | |||
| 2315 | else | 2315 | else |
| 2316 | stored_lft = 0; | 2316 | stored_lft = 0; |
| 2317 | if (!update_lft && !create && stored_lft) { | 2317 | if (!update_lft && !create && stored_lft) { |
| 2318 | const u32 minimum_lft = min( | 2318 | const u32 minimum_lft = min_t(u32, |
| 2319 | stored_lft, (u32)MIN_VALID_LIFETIME); | 2319 | stored_lft, MIN_VALID_LIFETIME); |
| 2320 | valid_lft = max(valid_lft, minimum_lft); | 2320 | valid_lft = max(valid_lft, minimum_lft); |
| 2321 | 2321 | ||
| 2322 | /* RFC4862 Section 5.5.3e: | 2322 | /* RFC4862 Section 5.5.3e: |