diff options
| author |   Dave Airlie <airlied@redhat.com> | 2014-03-18 19:12:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-03-18 19:12:31 +1000 |
| commit | bcc298bc924e0a990f853ba3e19f8b5a833cba7e (patch) | |
| tree | 1c87c8f73dc41fd11ee3dacb1b91a7cc8b4798bb /net/unix/af_unix.c | |
| parent | Merge branch 'drm-docs' of ssh://people.freedesktop.org/~danvet/drm into drm-next (diff) | |
| parent | Linux 3.14-rc7 (diff) | |
| download | wireguard-linux-bcc298bc924e0a990f853ba3e19f8b5a833cba7e.tar.xz wireguard-linux-bcc298bc924e0a990f853ba3e19f8b5a833cba7e.zip | |
Merge tag 'v3.14-rc7' into drm-next
Linux 3.14-rc7
Backmerge to help out Intel guys.
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); } |