2021-04-01 03:25:41

by Xu Jia

Subject: [PATCH net-next] net: ipv6: Refactor in rt6_age_examine_exception

The logic in rt6_age_examine_exception is confusing. The commit is
to refactor the code.

Signed-off-by: Xu Jia <[email protected]>
---
net/ipv6/route.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index ebb7519bec2a..f15c7605b11d 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2085,13 +2085,10 @@ static void rt6_age_examine_exception(struct rt6_exception_bucket *bucket,

if (rt->rt6i_flags & RTF_GATEWAY) {
struct neighbour *neigh;
- __u8 neigh_flags = 0;

neigh = __ipv6_neigh_lookup_noref(rt->dst.dev, &rt->rt6i_gateway);
- if (neigh)
- neigh_flags = neigh->flags;

- if (!(neigh_flags & NTF_ROUTER)) {
+ if (!(neigh && (neigh->flags & NTF_ROUTER))) {
RT6_TRACE("purging route %p via non-router but gateway\n",
rt);
rt6_remove_exception(bucket, rt6_ex);
--
2.25.1

2021-04-01 22:51:42

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net-next] net: ipv6: Refactor in rt6_age_examine_exception

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

On Thu, 1 Apr 2021 11:22:23 +0800 you wrote:
> The logic in rt6_age_examine_exception is confusing. The commit is
> to refactor the code.
>
> Signed-off-by: Xu Jia <[email protected]>
> ---
> net/ipv6/route.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)

Here is the summary with links:
- [net-next] net: ipv6: Refactor in rt6_age_examine_exception
https://git.kernel.org/netdev/net-next/c/b7a320c3a1ec

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html