Hi Nemo, > -----Original Message----- > From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Yu Nemo Wenbin > Sent: Thursday, December 03, 2015 5:23 AM > To: dev at dpdk.org > Subject: [dpdk-dev] [PATCH v2] hash: move rte_hash_set_cmp_func() to > ver DPDK_2.2. > > Also modified the comments of rte_hash_set_cmp_func(). > > Signed-off-by: Yu Nemo Wenbin <yuwb_bjy at ctbri.com.cn> > --- > lib/librte_hash/rte_hash.h | 4 ++-- > lib/librte_hash/rte_hash_version.map | 8 +++++++- > 2 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/lib/librte_hash/rte_hash.h b/lib/librte_hash/rte_hash.h > index 8378a42..dfca5ef 100644 > --- a/lib/librte_hash/rte_hash.h > +++ b/lib/librte_hash/rte_hash.h > @@ -66,7 +66,7 @@ typedef uint32_t hash_sig_t; > typedef uint32_t (*rte_hash_function)(const void *key, uint32_t key_len, > uint32_t init_val); > > -/** Type of function used to compare the key. It works like the memcmp() > */ > +/** Type of function used to compare the hash key. */ > typedef int (*rte_hash_cmp_eq_t)(const void *key1, const void *key2, > size_t key_len); > > /** > @@ -108,7 +108,7 @@ rte_hash_create(const struct rte_hash_parameters > *params); > > /** > * Set the rte_hash_set_cmp_func. > - * Set the new hash compare function if the default one is not suitable > enough. > + * Set a new hash compare function other than the default one. > * > * @note Function pointer does not work with multi-process, so don't use > it > * in multi-process mode. > diff --git a/lib/librte_hash/rte_hash_version.map > b/lib/librte_hash/rte_hash_version.map > index 3bc1e2c..1aa94f9 100644 > --- a/lib/librte_hash/rte_hash_version.map > +++ b/lib/librte_hash/rte_hash_version.map > @@ -30,6 +30,12 @@ DPDK_2.1 { > rte_hash_lookup_data; > rte_hash_lookup_with_hash_data; > rte_hash_reset; > - rte_hash_set_cmp_func; > > } DPDK_2.0; > + > +DPDK_2.2 { > + global: > + > + rte_hash_set_cmp_func; > + > +} DPDK_2.1; > -- > 1.9.1
I see you are basing off the v1 of this patch. You need to send all the changes in one go. So, include the missing code in rte_cuckoo_hash.c, and include rte_hash_set_cmp_func in rte_hash_version.map, but don't remove it from DPDK_2.1, as it does not exist now. In other words, create a patch from the current head of mainline, send it as a v3, include the changes you made from v1->v2 and v2->v3 and send it again (and don't forget to use --in-reply-to). Plus, remove the "to ver DPDK_2.2" part from the tile of the patch. Thanks! Pablo
