diff options
| author | Eric Dumazet <edumazet@google.com> | 2016-11-17 18:48:30 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-17 19:28:56 +0100 |
| commit | 29c58472ec2af073c4f858a61236fbedfc2923ac (patch) | |
| tree | 4807f37e4dba51999dc397a80962569ed7ad7162 /net/sched/sch_fq.c | |
| parent | net/mlx5e: remove napi_hash_del() calls (diff) | |
| download | linux-29c58472ec2af073c4f858a61236fbedfc2923ac.tar.xz linux-29c58472ec2af073c4f858a61236fbedfc2923ac.zip | |
net_sched: sch_fq: use hash_ptr()
When I wrote sch_fq.c, hash_ptr() on 64bit arches was awful,
and I chose hash_32().
Linus Torvalds and George Spelvin fixed this issue, so we can
use hash_ptr() to get more entropy on 64bit arches with Terabytes
of memory, and avoid the cast games.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_fq.c')
| -rw-r--r-- | net/sched/sch_fq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c index 18e752439f6f..86309a3156a5 100644 --- a/net/sched/sch_fq.c +++ b/net/sched/sch_fq.c @@ -245,7 +245,7 @@ static struct fq_flow *fq_classify(struct sk_buff *skb, struct fq_sched_data *q) skb_orphan(skb); } - root = &q->fq_root[hash_32((u32)(long)sk, q->fq_trees_log)]; + root = &q->fq_root[hash_ptr(sk, q->fq_trees_log)]; if (q->flows >= (2U << q->fq_trees_log) && q->inactive_flows > q->flows/2) @@ -599,7 +599,7 @@ static void fq_rehash(struct fq_sched_data *q, kmem_cache_free(fq_flow_cachep, of); continue; } - nroot = &new_array[hash_32((u32)(long)of->sk, new_log)]; + nroot = &new_array[hash_ptr(of->sk, new_log)]; np = &nroot->rb_node; parent = NULL; |