diff options
| author | Ian Maund <imaund@codeaurora.org> | 2014-04-23 16:23:49 -0700 |
|---|---|---|
| committer | Ian Maund <imaund@codeaurora.org> | 2014-04-23 16:23:49 -0700 |
| commit | 356fb13538b7d5f3ce25446b2ba0e0410381eedc (patch) | |
| tree | f6a9438a26c0340e753e0aa7295ca99f7d2fe07c /net/unix/af_unix.c | |
| parent | 1cd71605bad7daa748a05b2b0b0d3ade72a93e27 (diff) | |
| parent | 8f0c10ea2ec6e1086fbb73ff8bcbbf1ed8584b11 (diff) | |
Merge upstream linux-stable v3.10.36 into msm-3.10
* commit 'v3.10.36': (494 commits)
Linux 3.10.36
netfilter: nf_conntrack_dccp: fix skb_header_pointer API usages
mm: close PageTail race
net: mvneta: rename MVNETA_GMAC2_PSC_ENABLE to MVNETA_GMAC2_PCS_ENABLE
x86: fix boot on uniprocessor systems
Input: cypress_ps2 - don't report as a button pads
Input: synaptics - add manual min/max quirk for ThinkPad X240
Input: synaptics - add manual min/max quirk
Input: mousedev - fix race when creating mixed device
ext4: atomically set inode->i_flags in ext4_set_inode_flags()
Linux 3.10.35
sched/autogroup: Fix race with task_groups list
e100: Fix "disabling already-disabled device" warning
xhci: Fix resume issues on Renesas chips in Samsung laptops
Input: wacom - make sure touch_max is set for touch devices
KVM: VMX: fix use after free of vmx->loaded_vmcs
KVM: x86: handle invalid root_hpa everywhere
KVM: MMU: handle invalid root_hpa at __direct_map
Input: elantech - improve clickpad detection
ARM: highbank: avoid L2 cache smc calls when PL310 is not present
...
Change-Id: Ib68f565291702c53df09e914e637930c5d3e5310
Signed-off-by: Ian Maund <imaund@codeaurora.org>
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 3a942dd5aa8..0e702f17e76 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -161,9 +161,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); } |