From 3ac713b648282df164e22e93548562a35e845d89 Mon Sep 17 00:00:00 2001
From: vignesh babu <vignesh.babu@wipro.com>
Date: Fri, 24 Aug 2007 22:27:55 -0700
Subject: [PATCH] --- yaml --- r: 64535 b: refs/heads/master c:
 c3609d510f844100669965db8a9ff10ba029bb4a h: refs/heads/master i:   64533:
 c2a44a0ff4761568f1c60f56da9120a3be8d8b56   64531:
 5e6944585c6dc31d634c9953320a94495bd2fc43   64527:
 ee66db41e7544757340d9d6b9214aeefd6f0cdbd v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/neighbour.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bac9daf2a43d..7fb8afd3453e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26722873a460703e319462afa7ebb8ed3a036c07
+refs/heads/master: c3609d510f844100669965db8a9ff10ba029bb4a
diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c
index ca2a1533138a..f7de8f24d8dd 100644
--- a/trunk/net/core/neighbour.c
+++ b/trunk/net/core/neighbour.c
@@ -33,6 +33,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/random.h>
 #include <linux/string.h>
+#include <linux/log2.h>
 
 #define NEIGH_DEBUG 1
 
@@ -311,7 +312,7 @@ static void neigh_hash_grow(struct neigh_table *tbl, unsigned long new_entries)
 
 	NEIGH_CACHE_STAT_INC(tbl, hash_grows);
 
-	BUG_ON(new_entries & (new_entries - 1));
+	BUG_ON(!is_power_of_2(new_entries));
 	new_hash = neigh_hash_alloc(new_entries);
 	if (!new_hash)
 		return;