| Message ID | 1617247343-48200-1-git-send-email-xujia39@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b7a320c3a1ecb20d24173b668288441dbb7fe7dd |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: ipv6: Refactor in rt6_age_examine_exception | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 5 of 5 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 1 this patch: 1 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 14 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 1 this patch: 1 |
| netdev/header_inline | success | Link |
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 <xujia39@huawei.com> > --- > 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
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);
The logic in rt6_age_examine_exception is confusing. The commit is to refactor the code. Signed-off-by: Xu Jia <xujia39@huawei.com> --- net/ipv6/route.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)