diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-31 06:16:31 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-31 06:16:31 -0400 |
| commit | 9ddd84f872898373c51469f9c931d5aa89fdc807 (patch) | |
| tree | d81f9e396801f04d55924c0d3bbd903fe60ebcda /net/unix/af_unix.c | |
| parent | 749d32237bf39e6576dd95bfdf24e4378e51716c (diff) | |
| parent | a4b7f21d7b42b33609df3f86992a8deff80abfaf (diff) | |
Merge branch 'for-next' into for-linus
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) | |||
| 163 | 163 | ||
| 164 | static inline unsigned int unix_hash_fold(__wsum n) | 164 | static inline unsigned int unix_hash_fold(__wsum n) |
| 165 | { | 165 | { |
| 166 | unsigned int hash = (__force unsigned int)n; | 166 | unsigned int hash = (__force unsigned int)csum_fold(n); |
| 167 | 167 | ||
| 168 | hash ^= hash>>16; | ||
| 169 | hash ^= hash>>8; | 168 | hash ^= hash>>8; |
| 170 | return hash&(UNIX_HASH_SIZE-1); | 169 | return hash&(UNIX_HASH_SIZE-1); |
| 171 | } | 170 | } |