git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
hmap.c
diff --git
a/lib/hmap.c
b/lib/hmap.c
index
97c6959
..
f15e72c
100644
(file)
--- a/
lib/hmap.c
+++ b/
lib/hmap.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2012 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2012
, 2013
Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-90,8
+90,7
@@
resize(struct hmap *hmap, size_t new_mask)
struct hmap tmp;
size_t i;
struct hmap tmp;
size_t i;
- ovs_assert(!(new_mask & (new_mask + 1)));
- ovs_assert(new_mask != SIZE_MAX);
+ ovs_assert(is_pow2(new_mask + 1));
hmap_init(&tmp);
if (new_mask) {
hmap_init(&tmp);
if (new_mask) {