Commit 9451a304 authored by Fabian Frederick's avatar Fabian Frederick Committed by David S. Miller

ipv6: replace min/casting by min_t

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b436d33
...@@ -2315,8 +2315,8 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao) ...@@ -2315,8 +2315,8 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao)
else else
stored_lft = 0; stored_lft = 0;
if (!update_lft && !create && stored_lft) { if (!update_lft && !create && stored_lft) {
const u32 minimum_lft = min( const u32 minimum_lft = min_t(u32,
stored_lft, (u32)MIN_VALID_LIFETIME); stored_lft, MIN_VALID_LIFETIME);
valid_lft = max(valid_lft, minimum_lft); valid_lft = max(valid_lft, minimum_lft);
/* RFC4862 Section 5.5.3e: /* RFC4862 Section 5.5.3e:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment