Re: [PATCH] ipv6: remove unnecessary check in addrconf_prefix_rcv_add_addr()

[David Miller]

From: Lorenzo Bianconi 
Date: Mon, 16 Apr 2018 17:52:59 +0200

> 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 

Applied to net-next, thanks.

Re: [PATCH] ipv6: remove unnecessary check in addrconf_prefix_rcv_add_addr()

[David Miller]

From: Lorenzo Bianconi 
Date: Mon, 16 Apr 2018 17:56:33 +0200

> I forgot 'net-next' tag in the subject. Dave should I send a v2?

Not necessary.

Re: [PATCH] ipv6: remove unnecessary check in addrconf_prefix_rcv_add_addr()

[Lorenzo Bianconi]

> 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 
> ---
>  net/ipv6/addrconf.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
> index dffa38004c13..b2c0175125db 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,
> 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);
> --
> 2.14.3
>

I forgot 'net-next' tag in the subject. Dave should I send a v2?

Regards,
Lorenzo

[PATCH] ipv6: remove unnecessary check in addrconf_prefix_rcv_add_addr()

[Lorenzo Bianconi]

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 
---
 net/ipv6/addrconf.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index dffa38004c13..b2c0175125db 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,
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);
-- 
2.14.3