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

Subsystems: networking [general], networking [ipv4/ipv6], the rest

STALE3043d

4 messages, 2 authors, 2018-04-16 · open the first message on its own page

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

From: Lorenzo Bianconi <hidden>
Date: 2018-04-16 15:53:28

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 <redacted>
---
 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

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

From: Lorenzo Bianconi <hidden>
Date: 2018-04-16 15:56:34

quoted hunk
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 <redacted>
---
 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

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

From: David Miller <davem@davemloft.net>
Date: 2018-04-16 17:00:52

From: Lorenzo Bianconi <redacted>
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()

From: David Miller <davem@davemloft.net>
Date: 2018-04-16 22:16:43

From: Lorenzo Bianconi <redacted>
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 <redacted>
Applied to net-next, thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help