Patchwork ipv6: fib: Restore NTF_ROUTER exception in fib6_age()

login
register
mail settings
Submitter Thomas Graf
Date June 7, 2012, 4:51 p.m.
Message ID <6e43964ac82665f0257ac4f53c17b3b3403edcc3.1339087863.git.tgraf@suug.ch>
Download mbox | patch
Permalink /patch/163649/
State Accepted
Delegated to: David Miller
Headers show

Comments

Thomas Graf - June 7, 2012, 4:51 p.m.
Commit 5339ab8b1dd82 (ipv6: fib: Convert fib6_age() to
dst_neigh_lookup().) seems to have mistakenly inverted the
exception for cached NTF_ROUTER routes.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
---
 net/ipv6/ip6_fib.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
David Miller - June 7, 2012, 8:03 p.m.
From: Thomas Graf <tgraf@suug.ch>
Date: Thu,  7 Jun 2012 18:51:04 +0200

> Commit 5339ab8b1dd82 (ipv6: fib: Convert fib6_age() to
> dst_neigh_lookup().) seems to have mistakenly inverted the
> exception for cached NTF_ROUTER routes.
> 
> Signed-off-by: Thomas Graf <tgraf@suug.ch>

Thanks for fixing this, applied.
--
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/ip6_fib.c b/net/ipv6/ip6_fib.c
index 0c220a4..74c21b9 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1561,7 +1561,7 @@  static int fib6_age(struct rt6_info *rt, void *arg)
 				neigh_flags = neigh->flags;
 				neigh_release(neigh);
 			}
-			if (neigh_flags & NTF_ROUTER) {
+			if (!(neigh_flags & NTF_ROUTER)) {
 				RT6_TRACE("purging route %p via non-router but gateway\n",
 					  rt);
 				return -1;