diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-19 18:54:37 +0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-19 18:54:37 +0400 |
| commit | b80d6c781e7eb16e24c2a04a88ab6b230bcbbb35 (patch) | |
| tree | aeb0885a6a3499ef96b2472be323965db8e1295e /net/unix/af_unix.c | |
| parent | 262ca2b08fbdb9346e66ef30424b2226a00e0ffc (diff) | |
| parent | 0b99836f238f37a8632a3ab4f9a8cc2346a36d40 (diff) | |
| download | linux-b80d6c781e7eb16e24c2a04a88ab6b230bcbbb35.tar.xz | |
Merge branch 'topic/dp-aux-rework' into drm-intel-next-queued
Conflicts:
drivers/gpu/drm/i915/intel_dp.c
A bit a mess with reverts which differe in details between -fixes and
-next and some other unrelated shuffling.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 29fc8bee9702..ce6ec6c2f4de 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -163,9 +163,8 @@ static inline void unix_set_secdata(struct scm_cookie *scm, struct sk_buff *skb) static inline unsigned int unix_hash_fold(__wsum n) { - unsigned int hash = (__force unsigned int)n; + unsigned int hash = (__force unsigned int)csum_fold(n); - hash ^= hash>>16; hash ^= hash>>8; return hash&(UNIX_HASH_SIZE-1); } |