From: John Dykstra <john.dykstra1@gmail.com>
Date: Fri, 8 May 2009 21:57:01 +0000 (-0700)
Subject: Network Drop Monitor: Fix skb_kill_datagram
X-Git-Tag: v2.6.31-rc1~330^2~445
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=61de71c67caec39df0a854a1ef5be0c6be385c2a;p=~shefty%2Frdma-dev.git

Network Drop Monitor: Fix skb_kill_datagram

Commit ead2ceb0ec9f85cff19c43b5cdb2f8a054484431 ("Network Drop Monitor:
Adding kfree_skb_clean for non-drops and modifying end-of-line points
for skbs") established new conventions for identifying dropped packets.

Align skb_kill_datagram() with these conventions so that packets that
get dropped just before the copy to userspace are properly tracked.

Signed-off-by: John Dykstra <john.dykstra1@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/datagram.c b/net/core/datagram.c
index 22ea437c502..e2a36f05cdf 100644
--- a/net/core/datagram.c
+++ b/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;
 }