diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-22 14:19:57 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-22 14:19:57 +0400 |
| commit | 930352862e9533fecc42c7ed20798a7c9e3aa874 (patch) | |
| tree | f234d6eb69c077f898e375aef30c9550dcf069d7 /include/linux/rhashtable.h | |
| parent | b46882b6eb713245916100ac5b58664cd242a08d (diff) | |
| parent | 7bbd03e0143b562ff7d96f7e71c016104020b550 (diff) | |
| download | linux-930352862e9533fecc42c7ed20798a7c9e3aa874.tar.xz | |
Merge branch 'topic/enum-info-cleanup' into for-next
this is a series of patches to just convert the plain info callback
for enum ctl elements to snd_ctl_elem_info(). Also, it includes the
extension of snd_ctl_elem_info(), for catching the unexpected string
cut-off and handling the zero items.
Diffstat (limited to 'include/linux/rhashtable.h')
| -rw-r--r-- | include/linux/rhashtable.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/rhashtable.h b/include/linux/rhashtable.h index 36826c0166c5..fb298e9d6d3a 100644 --- a/include/linux/rhashtable.h +++ b/include/linux/rhashtable.h @@ -44,6 +44,7 @@ struct rhashtable; * @head_offset: Offset of rhash_head in struct to be hashed * @hash_rnd: Seed to use while hashing * @max_shift: Maximum number of shifts while expanding + * @min_shift: Minimum number of shifts while shrinking * @hashfn: Function to hash key * @obj_hashfn: Function to hash object * @grow_decision: If defined, may return true if table should expand @@ -57,6 +58,7 @@ struct rhashtable_params { size_t head_offset; u32 hash_rnd; size_t max_shift; + size_t min_shift; rht_hashfn_t hashfn; rht_obj_hashfn_t obj_hashfn; bool (*grow_decision)(const struct rhashtable *ht, |