aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorenzo Bianconi <lorenzo.bianconi@redhat.com>2018-04-16 11:52:59 -0400
committerDavid S. Miller <davem@davemloft.net>2018-04-16 18:16:16 -0400
commitf85f94b87164e77e476218b83a5f67875d6b161c (patch)
tree2d987d6edaf52db7785d131289e6a06147f78969
parent9a00b697ce31e38c670a3042cf9f1e9cf28dabb5 (diff)
ipv6: remove unnecessary check in addrconf_prefix_rcv_add_addr()
Remove unnecessary check on update_lft variable in addrconf_prefix_rcv_add_addr routine since it is always set to 0. Moreover remove update_lft re-initialization to 0 Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/addrconf.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 78cef00c9596..62b97722722c 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2529,7 +2529,6 @@ int addrconf_prefix_rcv_add_addr(struct net *net, struct net_device *dev,
2529 if (IS_ERR_OR_NULL(ifp)) 2529 if (IS_ERR_OR_NULL(ifp))
2530 return -1; 2530 return -1;
2531 2531
2532 update_lft = 0;
2533 create = 1; 2532 create = 1;
2534 spin_lock_bh(&ifp->lock); 2533 spin_lock_bh(&ifp->lock);
2535 ifp->flags |= IFA_F_MANAGETEMPADDR; 2534 ifp->flags |= IFA_F_MANAGETEMPADDR;
@@ -2551,7 +2550,7 @@ int addrconf_prefix_rcv_add_addr(struct net *net, struct net_device *dev,
2551 stored_lft = ifp->valid_lft - (now - ifp->tstamp) / HZ; 2550 stored_lft = ifp->valid_lft - (now - ifp->tstamp) / HZ;
2552 else 2551 else
2553 stored_lft = 0; 2552 stored_lft = 0;
2554 if (!update_lft && !create && stored_lft) { 2553 if (!create && stored_lft) {
2555 const u32 minimum_lft = min_t(u32, 2554 const u32 minimum_lft = min_t(u32,
2556 stored_lft, MIN_VALID_LIFETIME); 2555 stored_lft, MIN_VALID_LIFETIME);
2557 valid_lft = max(valid_lft, minimum_lft); 2556 valid_lft = max(valid_lft, minimum_lft);