aboutsummaryrefslogtreecommitdiff
path: root/net/core
diff options
context:
space:
mode:
authorJohn Dykstra <john.dykstra1@gmail.com>2009-05-08 14:57:01 -0700
committerDavid S. Miller <davem@davemloft.net>2009-05-08 14:57:01 -0700
commit61de71c67caec39df0a854a1ef5be0c6be385c2a (patch)
treec7bce44046a1e10577bc324740d97f3449107476 /net/core
parent17cb4006bc40eea949f62adbbad99d8b980c0678 (diff)
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>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/datagram.c4
1 files changed, 3 insertions, 1 deletions
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;
}