From 6044b6e008a45a29da35954fb18861292a06f941 Mon Sep 17 00:00:00 2001 From: YOSHIFUJI Hideaki Date: Mon, 6 Nov 2006 09:45:44 -0800 Subject: [PATCH] --- yaml --- r: 41031 b: refs/heads/master c: ea73ee23c43d6eb75f88c4fc9e1230b44673c0d2 h: refs/heads/master i: 41029: c390647609ba8b3f758e52909426d0584f731916 41027: 2dfc41965884b8153234a9aee9a8d3b348588175 41023: 903f660ce11a9c6e80db880d7d219189f49eddb8 v: v3 --- [refs] | 2 +- trunk/drivers/cpufreq/Kconfig | 1 - trunk/net/ipv6/route.c | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e443b57155de..5db11f8ba680 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6af6e1efb161ffe36e718b1fd58385710879af7c +refs/heads/master: ea73ee23c43d6eb75f88c4fc9e1230b44673c0d2 diff --git a/trunk/drivers/cpufreq/Kconfig b/trunk/drivers/cpufreq/Kconfig index 491779af8d55..2cc71b66231e 100644 --- a/trunk/drivers/cpufreq/Kconfig +++ b/trunk/drivers/cpufreq/Kconfig @@ -107,7 +107,6 @@ config CPU_FREQ_GOV_USERSPACE config CPU_FREQ_GOV_ONDEMAND tristate "'ondemand' cpufreq policy governor" - select CPU_FREQ_TABLE help 'ondemand' - This driver adds a dynamic cpufreq policy governor. The governor does a periodic polling and diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c index c953466b7afd..5132821e89aa 100644 --- a/trunk/net/ipv6/route.c +++ b/trunk/net/ipv6/route.c @@ -330,6 +330,8 @@ static int inline rt6_check_neigh(struct rt6_info *rt) read_lock_bh(&neigh->lock); if (neigh->nud_state & NUD_VALID) m = 2; + else if (!(neigh->nud_state & NUD_FAILED)) + m = 1; read_unlock_bh(&neigh->lock); } return m;