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 #include #include +#include #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;