iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipv6: remove unnecessary check in addrconf_prefix_rcv_add_addr()

Browse Source 
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>
This commit is contained in:
Lorenzo Bianconi 2018-04-16 17:52:59 +02:00 committed by David S. Miller
parent 9a00b697ce
commit f85f94b871
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/ipv6/addrconf.c
View File

@ -2529,7 +2529,6 @@ int addrconf_prefix_rcv_add_addr(struct net *net, struct net_device *dev,
if (IS_ERR_OR_NULL(ifp)) if (IS_ERR_OR_NULL(ifp))
return -1; return -1;
update_lft = 0;
create = 1; create = 1;
spin_lock_bh(&ifp->lock); spin_lock_bh(&ifp->lock);
ifp->flags |= IFA_F_MANAGETEMPADDR; 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; stored_lft = ifp->valid_lft - (now - ifp->tstamp) / HZ;
else else
stored_lft = 0; stored_lft = 0;
if (!update_lft && !create && stored_lft) { if (!create && stored_lft) {
const u32 minimum_lft = min_t(u32, const u32 minimum_lft = min_t(u32,
stored_lft, MIN_VALID_LIFETIME); stored_lft, MIN_VALID_LIFETIME);
valid_lft = max(valid_lft, minimum_lft); valid_lft = max(valid_lft, minimum_lft);