ipv6: drop the judgement in rt6_alloc_cow()
Subsystems (3)
PATCH 1/1 ipv6: drop the judgement in rt6_alloc_cow()
Now rt6_alloc_cow() is only called by ip6_pol_route() when rt->rt6i_flags doesn't contain both RTF_NONEXTHOP and RTF_GATEWAY, and rt->rt6i_flags hasn't been changed in ip6_rt_copy(). So there is no neccessary to judge whether rt->rt6i_flags contains RTF_GATEWAY or not.
--- net/ipv6/route.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
net/ipv6/route.c +3 -5
@@ -871,11 +871,9 @@ static struct rt6_info *rt6_alloc_cow(struct rt6_info *ort, rt =ip6_rt_copy (ort, daddr);if (rt) { -if (!(rt->rt6i_flags &RTF_GATEWAY )) { -if (ort->rt6i_dst.plen !=128 && -ipv6_addr_equal (&ort->rt6i_dst.addr, daddr)) - rt->rt6i_flags |=RTF_ANYCAST ; - } +if (ort->rt6i_dst.plen !=128 && +ipv6_addr_equal (&ort->rt6i_dst.addr, daddr)) + rt->rt6i_flags |=RTF_ANYCAST ; rt->rt6i_flags |=RTF_CACHE ;
Signature · 1 line
1.8.3.1
Quoted 6 lines · Duan Jiong
Now
rt6_alloc_cow()is only called byip6_pol_route()whenrt->rt6i_flagsdoesn't contain bothRTF_NONEXTHOPandRTF_GATEWAY, andrt->rt6i_flagshasn't been changed inip6_rt_copy(). So there is no neccessary to judge whetherrt->rt6i_flagscontainsRTF_GATEWAYor not.
This is ok.
Thanks,
Hannes
From: Hannes Frederic Sowa <[email protected]>
Date: Tue, 5 Nov 2013 22:23:44 +0100
Quoted 11 lines · Duan Jiong
Quoted 6 lines
Now
rt6_alloc_cow()is only called byip6_pol_route()whenrt->rt6i_flagsdoesn't contain bothRTF_NONEXTHOPandRTF_GATEWAY, andrt->rt6i_flagshasn't been changed inip6_rt_copy(). So there is no neccessary to judge whetherrt->rt6i_flagscontainsRTF_GATEWAYor not.This is ok.
Applied, thanks everyone.