projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'net-next/master' into mac80211-next
[cascardo/linux.git]
/
lib
/
rhashtable.c
diff --git
a/lib/rhashtable.c
b/lib/rhashtable.c
index
4396434
..
a60a6d3
100644
(file)
--- a/
lib/rhashtable.c
+++ b/
lib/rhashtable.c
@@
-26,6
+26,7
@@
#include <linux/random.h>
#include <linux/rhashtable.h>
#include <linux/err.h>
#include <linux/random.h>
#include <linux/rhashtable.h>
#include <linux/err.h>
+#include <linux/export.h>
#define HASH_DEFAULT_SIZE 64UL
#define HASH_MIN_SIZE 4U
#define HASH_DEFAULT_SIZE 64UL
#define HASH_MIN_SIZE 4U
@@
-584,7
+585,6
@@
void *rhashtable_walk_next(struct rhashtable_iter *iter)
struct bucket_table *tbl = iter->walker->tbl;
struct rhashtable *ht = iter->ht;
struct rhash_head *p = iter->p;
struct bucket_table *tbl = iter->walker->tbl;
struct rhashtable *ht = iter->ht;
struct rhash_head *p = iter->p;
- void *obj = NULL;
if (p) {
p = rht_dereference_bucket_rcu(p->next, tbl, iter->slot);
if (p) {
p = rht_dereference_bucket_rcu(p->next, tbl, iter->slot);
@@
-604,8
+604,7
@@
next:
if (!rht_is_a_nulls(p)) {
iter->skip++;
iter->p = p;
if (!rht_is_a_nulls(p)) {
iter->skip++;
iter->p = p;
- obj = rht_obj(ht, p);
- goto out;
+ return rht_obj(ht, p);
}
iter->skip = 0;
}
iter->skip = 0;
@@
-623,9
+622,7
@@
next:
iter->p = NULL;
iter->p = NULL;
-out:
-
- return obj;
+ return NULL;
}
EXPORT_SYMBOL_GPL(rhashtable_walk_next);
}
EXPORT_SYMBOL_GPL(rhashtable_walk_next);