]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ipv6: remove unnecessary check in addrconf_prefix_rcv_add_addr()
authorLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Mon, 16 Apr 2018 15:52:59 +0000 (17:52 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 16 Apr 2018 22:16:16 +0000 (18:16 -0400)
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>
net/ipv6/addrconf.c

index 78cef00c9596d7cf95dcc12e5cf05949b1987cbf..62b97722722c13373529e0a68dcd7c7637219fbd 100644 (file)
@@ -2529,7 +2529,6 @@ int addrconf_prefix_rcv_add_addr(struct net *net, struct net_device *dev,
                if (IS_ERR_OR_NULL(ifp))
                        return -1;
 
-               update_lft = 0;
                create = 1;
                spin_lock_bh(&ifp->lock);
                ifp->flags |= IFA_F_MANAGETEMPADDR;
@@ -2551,7 +2550,7 @@ int addrconf_prefix_rcv_add_addr(struct net *net, struct net_device *dev,
                        stored_lft = ifp->valid_lft - (now - ifp->tstamp) / HZ;
                else
                        stored_lft = 0;
-               if (!update_lft && !create && stored_lft) {
+               if (!create && stored_lft) {
                        const u32 minimum_lft = min_t(u32,
                                stored_lft, MIN_VALID_LIFETIME);
                        valid_lft = max(valid_lft, minimum_lft);