From 32a4288760fa261202617c3a1740f9cb4b3fc558 Mon Sep 17 00:00:00 2001 From: John Dykstra Date: Fri, 8 May 2009 14:57:01 -0700 Subject: [PATCH] --- yaml --- r: 150197 b: refs/heads/master c: 61de71c67caec39df0a854a1ef5be0c6be385c2a h: refs/heads/master i: 150195: 93e7e95643a47f6d8459bfa11a319eeff5d2bc1f v: v3 --- [refs] | 2 +- trunk/net/core/datagram.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 24dda2f196a9..4c3c869e2a30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17cb4006bc40eea949f62adbbad99d8b980c0678 +refs/heads/master: 61de71c67caec39df0a854a1ef5be0c6be385c2a diff --git a/trunk/net/core/datagram.c b/trunk/net/core/datagram.c index 22ea437c5023..e2a36f05cdf7 100644 --- a/trunk/net/core/datagram.c +++ b/trunk/net/core/datagram.c @@ -260,7 +260,9 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags) spin_unlock_bh(&sk->sk_receive_queue.lock); } - skb_free_datagram(sk, skb); + kfree_skb(skb); + sk_mem_reclaim_partial(sk); + return err; }