---

yaml --- r: 41031 b: refs/heads/master c: ea73ee2 h: refs/heads/master i: 41029: c390647 41027: 2dfc419 41023: 903f660 v: v3
git-mirror · Nov 22, 2006 · 6044b6e · 6044b6e
1 parent ed54fc6
commit 6044b6e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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;