* [PATCH net-next-2.6] Network Drop Monitor: Fix skb_kill_datagram
@ 2009-05-07 21:25 John Dykstra
2009-05-07 21:56 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: John Dykstra @ 2009-05-07 21:25 UTC (permalink / raw)
To: netdev, nhorman
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net-next-2.6] Network Drop Monitor: Fix skb_kill_datagram
2009-05-07 21:25 [PATCH net-next-2.6] Network Drop Monitor: Fix skb_kill_datagram John Dykstra
@ 2009-05-07 21:56 ` David Miller
2009-05-08 0:42 ` Neil Horman
0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2009-05-07 21:56 UTC (permalink / raw)
To: john.dykstra1; +Cc: netdev, nhorman
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?
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net-next-2.6] Network Drop Monitor: Fix skb_kill_datagram
2009-05-07 21:56 ` David Miller
@ 2009-05-08 0:42 ` Neil Horman
2009-05-08 21:57 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Neil Horman @ 2009-05-08 0:42 UTC (permalink / raw)
To: David Miller; +Cc: john.dykstra1, netdev
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>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net-next-2.6] Network Drop Monitor: Fix skb_kill_datagram
2009-05-08 0:42 ` Neil Horman
@ 2009-05-08 21:57 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2009-05-08 21:57 UTC (permalink / raw)
To: nhorman; +Cc: john.dykstra1, netdev
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-05-08 21:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-07 21:25 [PATCH net-next-2.6] Network Drop Monitor: Fix skb_kill_datagram John Dykstra
2009-05-07 21:56 ` David Miller
2009-05-08 0:42 ` Neil Horman
2009-05-08 21:57 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox