[PATCH net-next-2.6] Network Drop Monitor: Fix skb_kill_datagram

[PATCH net-next-2.6] Network Drop Monitor: Fix skb_kill_datagram

[John Dykstra]

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>
---
 net/core/datagram.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/net/core/datagram.c b/net/core/datagram.c
index 22ea437..e2a36f0 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;
 }
 
-- 
1.5.4.3

Re: [PATCH net-next-2.6] Network Drop Monitor: Fix skb_kill_datagram

[David Miller]

From: John Dykstra <john.dykstra1@gmail.com>
Date: Thu, 07 May 2009 21:25:54 +0000

> 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>

Neil, ACK?

Re: [PATCH net-next-2.6] Network Drop Monitor: Fix skb_kill_datagram

[Neil Horman]

On Thu, May 07, 2009 at 02:56:49PM -0700, David Miller wrote:
> From: John Dykstra <john.dykstra1@gmail.com>
> Date: Thu, 07 May 2009 21:25:54 +0000
> 
> > 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>
> 
> Neil, ACK?
> 

Yes, I think it looks good, thank you Jonh, Dave!

Acked-by: Neil Horman <nhorman@tuxdriver.com>

Re: [PATCH net-next-2.6] Network Drop Monitor: Fix skb_kill_datagram

[David Miller]

From: Neil Horman <nhorman@tuxdriver.com>
Date: Thu, 7 May 2009 20:42:00 -0400

> On Thu, May 07, 2009 at 02:56:49PM -0700, David Miller wrote:
>> From: John Dykstra <john.dykstra1@gmail.com>
>> Date: Thu, 07 May 2009 21:25:54 +0000
>> 
>> > 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>
>> 
>> Neil, ACK?
>> 
> 
> Yes, I think it looks good, thank you Jonh, Dave!
> 
> Acked-by: Neil Horman <nhorman@tuxdriver.com>

Applied, thanks everyone.