Merge branch 'topic/quirk-cleanup' into topic/hda

[linux-2.6-omap-h63xx.git] / net / core / datagram.c

diff --git a/net/core/datagram.c b/net/core/datagram.c
index ee631843c2f533de37101e92d05d447f85cf4d1f..5e2ac0c4b07cfdab7b2a5a2c74e2c2ddcd337328 100644 (file)
--- a/net/core/datagram.c
+++ b/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;
 }