diff options
| author | David S. Miller <davem@davemloft.net> | 2014-12-10 15:17:52 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-10 15:17:52 -0500 |
| commit | b95bf1e0ea724f4004faae0cc6685c06379157c3 (patch) | |
| tree | 30e47760509e3e41d802cc6d279a6205b77faac9 /net | |
| parent | 7d339890e79fd9a0508f2781e318b57dfb44b810 (diff) | |
| parent | 0cb6c969ed9de43687abdfc63714b6fe4385d2fc (diff) | |
| download | talos-op-linux-b95bf1e0ea724f4004faae0cc6685c06379157c3.tar.gz talos-op-linux-b95bf1e0ea724f4004faae0cc6685c06379157c3.zip | |
Merge branch 'kill_arch_fast_hash'
Daniel Borkmann says:
====================
Kill arch_fast_hash
Due to the size of changes I have based this against net-next,
also given 3.18 is already out. I've split this into 3 parts,
the first two to remove existing users (so they can optionally
go to stable) and the last one to kill the remaining library bits.
Let me know if there are any issues.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netlink/af_netlink.c | 2 | ||||
| -rw-r--r-- | net/openvswitch/flow_table.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index cc9bcf008b03..ef5f77b44ec7 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -3129,7 +3129,7 @@ static int __init netlink_proto_init(void) .head_offset = offsetof(struct netlink_sock, node), .key_offset = offsetof(struct netlink_sock, portid), .key_len = sizeof(u32), /* portid */ - .hashfn = arch_fast_hash, + .hashfn = jhash, .max_shift = 16, /* 64K */ .grow_decision = rht_grow_above_75, .shrink_decision = rht_shrink_below_30, diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c index e0a7fefc1edf..5899bf161c61 100644 --- a/net/openvswitch/flow_table.c +++ b/net/openvswitch/flow_table.c @@ -25,7 +25,7 @@ #include <linux/if_vlan.h> #include <net/llc_pdu.h> #include <linux/kernel.h> -#include <linux/hash.h> +#include <linux/jhash.h> #include <linux/jiffies.h> #include <linux/llc.h> #include <linux/module.h> @@ -366,7 +366,7 @@ static u32 flow_hash(const struct sw_flow_key *key, int key_start, /* Make sure number of hash bytes are multiple of u32. */ BUILD_BUG_ON(sizeof(long) % sizeof(u32)); - return arch_fast_hash2(hash_key, hash_u32s, 0); + return jhash2(hash_key, hash_u32s, 0); } static int flow_key_start(const struct sw_flow_key *key) |
