diff --git a/[refs] b/[refs] index 01bcd67582c8..a9be19fa67e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d436d68630a74ba3c898ff1b53591ddc4eb7f2bf +refs/heads/master: 680a5a5086443b9547b32b04f40af8f9d717f711 diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c index 8c184c4a3811..3804e7df626b 100644 --- a/trunk/net/core/sock.c +++ b/trunk/net/core/sock.c @@ -1476,7 +1476,7 @@ void __sk_mem_reclaim(struct sock *sk) { struct proto *prot = sk->sk_prot; - atomic_sub(sk->sk_forward_alloc / SK_MEM_QUANTUM, + atomic_sub(sk->sk_forward_alloc >> SK_MEM_QUANTUM_SHIFT, prot->memory_allocated); sk->sk_forward_alloc &= SK_MEM_QUANTUM - 1;