Patchwork [net-next] ipv6: remove unnecessory call rt6_clean_expires

login
register
mail settings
Submitter roy.qing.li@gmail.com
Date Sept. 20, 2012, 4:57 a.m.
Message ID <1348117053-4113-1-git-send-email-roy.qing.li@gmail.com>
Download mbox | patch
Permalink /patch/185308/
State Changes Requested
Delegated to: David Miller
Headers show

Comments

roy.qing.li@gmail.com - Sept. 20, 2012, 4:57 a.m.
From: Li RongQing <roy.qing.li@gmail.com>

ip6_dst_alloc will zero the from and rt6i_flags of dst cache,
so it is unnecessory to call rt6_clean_expires again.

Cc: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
---
 net/ipv6/route.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
David Miller - Sept. 20, 2012, 5:03 a.m.
From: roy.qing.li@gmail.com
Date: Thu, 20 Sep 2012 12:57:33 +0800

> From: Li RongQing <roy.qing.li@gmail.com>
> 
> ip6_dst_alloc will zero the from and rt6i_flags of dst cache,
> so it is unnecessory to call rt6_clean_expires again.
> 
> Cc: Gao feng <gaofeng@cn.fujitsu.com>
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>

You're modifying ip6_blackhole_route() and ip6_route_add().

Only the latter calls ip6_dst_alloc().

I know the change is OK, but your commit message is extremely
inaccurate, please fix it.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 0607ee3..fd5dabf 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -996,8 +996,7 @@  struct dst_entry *ip6_blackhole_route(struct net *net, struct dst_entry *dst_ori
 			in6_dev_hold(rt->rt6i_idev);
 
 		rt->rt6i_gateway = ort->rt6i_gateway;
-		rt->rt6i_flags = ort->rt6i_flags;
-		rt6_clean_expires(rt);
+		rt->rt6i_flags = ort->rt6i_flags & ~RTF_EXPIRES;
 		rt->rt6i_metric = 0;
 
 		memcpy(&rt->rt6i_dst, &ort->rt6i_dst, sizeof(struct rt6key));
@@ -1393,8 +1392,6 @@  int ip6_route_add(struct fib6_config *cfg)
 	if (cfg->fc_flags & RTF_EXPIRES)
 		rt6_set_expires(rt, jiffies +
 				clock_t_to_jiffies(cfg->fc_expires));
-	else
-		rt6_clean_expires(rt);
 
 	if (cfg->fc_protocol == RTPROT_UNSPEC)
 		cfg->fc_protocol = RTPROT_BOOT;
@@ -1803,12 +1800,10 @@  static struct rt6_info *ip6_rt_copy(struct rt6_info *ort,
 		rt->dst.lastuse = jiffies;
 
 		rt->rt6i_gateway = ort->rt6i_gateway;
-		rt->rt6i_flags = ort->rt6i_flags;
+		rt->rt6i_flags = ort->rt6i_flags & ~RTF_EXPIRES;
 		if ((ort->rt6i_flags & (RTF_DEFAULT | RTF_ADDRCONF)) ==
 		    (RTF_DEFAULT | RTF_ADDRCONF))
 			rt6_set_from(rt, ort);
-		else
-			rt6_clean_expires(rt);
 		rt->rt6i_metric = 0;
 
 #ifdef CONFIG_IPV6_SUBTREES