From 83ed5fb0417e1e3308714bfb86ab666bbfd84d18 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Sat, 10 Jul 2010 22:45:17 +0000 Subject: [PATCH] --- yaml --- r: 203479 b: refs/heads/master c: d361fd599a991ff6c1d522a599c635b35d61ef30 h: refs/heads/master i: 203477: 145dab8f98bb34a1ece7cf25270165c555782566 203475: 1f7601013a581503f33a70b76925d9002157537a 203471: 389a2d7fa6d6b8bc2df9b2545c006f7a313e4d2d v: v3 --- [refs] | 2 +- trunk/net/core/sock.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d343924db640..b415db329bf4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ba42910073f8432934d61a6c08b1023c408fb62 +refs/heads/master: d361fd599a991ff6c1d522a599c635b35d61ef30 diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c index fef2434b7c8c..363bc260157c 100644 --- a/trunk/net/core/sock.c +++ b/trunk/net/core/sock.c @@ -1339,9 +1339,10 @@ EXPORT_SYMBOL(sock_wfree); void sock_rfree(struct sk_buff *skb) { struct sock *sk = skb->sk; + unsigned int len = skb->truesize; - atomic_sub(skb->truesize, &sk->sk_rmem_alloc); - sk_mem_uncharge(skb->sk, skb->truesize); + atomic_sub(len, &sk->sk_rmem_alloc); + sk_mem_uncharge(sk, len); } EXPORT_SYMBOL(sock_rfree);