diff options
| author | Neil Horman <nhorman@tuxdriver.com> | 2010-07-20 06:45:56 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-20 13:28:05 -0700 |
| commit | 70d4bf6d467a330ccc947df9b2608e329d9e7708 (patch) | |
| tree | 477dff26ac865f785e9197065e4807daeb89958c /net | |
| parent | 4b706372f18de53970e4c6887a96459590fef80a (diff) | |
| download | linux-3.10-70d4bf6d467a330ccc947df9b2608e329d9e7708.tar.gz linux-3.10-70d4bf6d467a330ccc947df9b2608e329d9e7708.tar.bz2 linux-3.10-70d4bf6d467a330ccc947df9b2608e329d9e7708.zip | |
drop_monitor: convert some kfree_skb call sites to consume_skb
Convert a few calls from kfree_skb to consume_skb
Noticed while I was working on dropwatch that I was detecting lots of internal
skb drops in several places. While some are legitimate, several were not,
freeing skbs that were at the end of their life, rather than being discarded due
to an error. This patch converts those calls sites from using kfree_skb to
consume_skb, which quiets the in-kernel drop_monitor code from detecting them as
drops. Tested successfully by myself
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netlink/af_netlink.c | 9 | ||||
| -rw-r--r-- | net/unix/af_unix.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 7aeaa83193d..8648a9922aa 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -1076,14 +1076,15 @@ int netlink_broadcast_filtered(struct sock *ssk, struct sk_buff *skb, u32 pid, sk_for_each_bound(sk, node, &nl_table[ssk->sk_protocol].mc_list) do_one_broadcast(sk, &info); - kfree_skb(skb); + consume_skb(skb); netlink_unlock_table(); - kfree_skb(info.skb2); - - if (info.delivery_failure) + if (info.delivery_failure) { + kfree_skb(info.skb2); return -ENOBUFS; + } else + consume_skb(info.skb2); if (info.delivered) { if (info.congested && (allocation & __GFP_WAIT)) diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 75ba48b0d12..4414a18c63b 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -1906,7 +1906,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock, break; } - kfree_skb(skb); + consume_skb(skb); if (siocb->scm->fp) break; |