]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ipv6: fib: Restore NTF_ROUTER exception in fib6_age()
authorThomas Graf <tgraf@suug.ch>
Thu, 7 Jun 2012 06:51:04 +0000 (06:51 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Jul 2012 16:03:46 +0000 (09:03 -0700)
[ Upstream commit 8bd74516b1bd9308c17f67583134d93f777203ca ]

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv6/ip6_fib.c

index 93717435013e0a146c10bc8cf3ea4cbddb627f9b..92bb9cba5c39acc55fba6e3eb71a0695602bc807 100644 (file)
@@ -1560,7 +1560,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;