aboutsummaryrefslogtreecommitdiffstats
path: root/net/netlink
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2015-03-25 09:07:45 -0400
committerPablo Neira Ayuso <pablo@netfilter.org>2015-03-25 12:18:33 -0400
commit49f7b33e63fec9d16e7ee62ba8f8ab4159cbdc26 (patch)
tree63ebd033f56bab0eb9f6fe3ebda773b87ddda1ea /net/netlink
parent14d14a5d2957a4a047b4dbabb6d5ef28a7a70b33 (diff)
rhashtable: provide len to obj_hashfn
nftables sets will be converted to use so called setextensions, moving the key to a non-fixed position. To hash it, the obj_hashfn must be used, however it so far doesn't receive the length parameter. Pass the key length to obj_hashfn() and convert existing users. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netlink')
-rw-r--r--net/netlink/af_netlink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 4caa809dbbe0..19909d0786a2 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -3127,7 +3127,7 @@ static struct pernet_operations __net_initdata netlink_net_ops = {
3127 .exit = netlink_net_exit, 3127 .exit = netlink_net_exit,
3128}; 3128};
3129 3129
3130static inline u32 netlink_hash(const void *data, u32 seed) 3130static inline u32 netlink_hash(const void *data, u32 len, u32 seed)
3131{ 3131{
3132 const struct netlink_sock *nlk = data; 3132 const struct netlink_sock *nlk = data;
3133 struct netlink_compare_arg arg; 3133 struct netlink_compare_arg arg;