From 258f0d5567ed0242f8161d42f7abfb0742fb4c29 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 20 Mar 2019 18:33:51 +0100 Subject: backports: Add rhashtable_lookup_get_insert_fast() rhashtable_lookup_get_insert_fast() was added in kernel 4.12 in Linux upstream commit f9fe1c12d12 ("rhashtable: Add rhashtable_lookup_get_insert_fast") It is now used by mac80211. For kernel < 4.9 we already backport the complete rhashtable implementation, so this is only needed for kernels more recent than 4.9. This is copied from upstreamn Linux kernel. Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/rhashtable.h | 31 ++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 backport/backport-include/linux/rhashtable.h diff --git a/backport/backport-include/linux/rhashtable.h b/backport/backport-include/linux/rhashtable.h new file mode 100644 index 00000000..8e493bc5 --- /dev/null +++ b/backport/backport-include/linux/rhashtable.h @@ -0,0 +1,31 @@ +#ifndef __BACKPORT_RHASHTABLE_H +#define __BACKPORT_RHASHTABLE_H +#include_next +#include + +#if LINUX_VERSION_IS_LESS(4,12,0) +/** + * rhashtable_lookup_get_insert_fast - lookup and insert object into hash table + * @ht: hash table + * @obj: pointer to hash head inside object + * @params: hash table parameters + * + * Just like rhashtable_lookup_insert_fast(), but this function returns the + * object if it exists, NULL if it did not and the insertion was successful, + * and an ERR_PTR otherwise. + */ +#define rhashtable_lookup_get_insert_fast LINUX_BACKPORT(rhashtable_lookup_get_insert_fast) +static inline void *rhashtable_lookup_get_insert_fast( + struct rhashtable *ht, struct rhash_head *obj, + const struct rhashtable_params params) +{ + const char *key = rht_obj(ht, obj); + + BUG_ON(ht->p.obj_hashfn); + + return __rhashtable_insert_fast(ht, key + ht->p.key_offset, obj, params, + false); +} +#endif + +#endif /* __BACKPORT_RHASHTABLE_H */ -- cgit v1.2.3