From 052939f32d58a87605d549430cc6e58e93c7a42d Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Wed, 5 Nov 2008 01:38:06 -0800 Subject: [PATCH] --- yaml --- r: 121721 b: refs/heads/master c: 270acefafeb74ce2fe93d35b75733870bf1e11e7 h: refs/heads/master i: 121719: f16019f688f2aa233d106e7c85692d96a50e2ba6 v: v3 --- [refs] | 2 +- trunk/net/core/datagram.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e7c877745357..a5216d91f51b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d99a7bd210a14001007fc5233597c78877f0a11c +refs/heads/master: 270acefafeb74ce2fe93d35b75733870bf1e11e7 diff --git a/trunk/net/core/datagram.c b/trunk/net/core/datagram.c index ee631843c2f5..5e2ac0c4b07c 100644 --- a/trunk/net/core/datagram.c +++ b/trunk/net/core/datagram.c @@ -209,7 +209,7 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, void skb_free_datagram(struct sock *sk, struct sk_buff *skb) { kfree_skb(skb); - sk_mem_reclaim(sk); + sk_mem_reclaim_partial(sk); } /** @@ -248,8 +248,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags) spin_unlock_bh(&sk->sk_receive_queue.lock); } - kfree_skb(skb); - sk_mem_reclaim(sk); + skb_free_datagram(sk, skb); return err; }