From patchwork Thu May 7 21:25:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Dykstra X-Patchwork-Id: 26989 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 092C6B6F56 for ; Fri, 8 May 2009 07:26:13 +1000 (EST) Received: by ozlabs.org (Postfix) id EE0D0DDD1C; Fri, 8 May 2009 07:26:12 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 8B593DDD1B for ; Fri, 8 May 2009 07:26:12 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753823AbZEGVZ5 (ORCPT ); Thu, 7 May 2009 17:25:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752138AbZEGVZ5 (ORCPT ); Thu, 7 May 2009 17:25:57 -0400 Received: from rv-out-0506.google.com ([209.85.198.234]:23562 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753540AbZEGVZ4 (ORCPT ); Thu, 7 May 2009 17:25:56 -0400 Received: by rv-out-0506.google.com with SMTP id f9so800922rvb.1 for ; Thu, 07 May 2009 14:25:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:content-type :date:message-id:mime-version:x-mailer:content-transfer-encoding; bh=ykM5JRQNE2OaTmFSkM/S5+osh/flExnKdOMTZKt67tw=; b=dkd20Z610zFGH5J3XECxenZf5zKu5CM/IyS4IsqxdiF8zPIdKQxBpxmPVobqpA/Z3W hssHhmx4940vux27hPm9/Y5mux7E/xXw47vIKlCAs6bU16KKPAXlJt/ex+gIYXap3tiK Fu6JNql/jGfyJeHNsrJoP6D48u4+PTRnm0FdM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; b=wXyWRv04hf95CoKKZ7L/g/7b+LZZm9KRaJP7zsUp4ZB25hLcrIwJ9vTPnFbG6RIKwn ploTCoaJx0jE0p4pT/FoaEX2vxjT6E/TqoPFsnuk+etWC3JQ88F7l6QTCUO1St5WDBGQ Us/1Htii2f3XQ8Vw7KJv459Ei8cQXG/WksL0g= Received: by 10.142.139.14 with SMTP id m14mr1183316wfd.244.1241731556847; Thu, 07 May 2009 14:25:56 -0700 (PDT) Received: from ?192.168.221.201? (c-24-118-80-156.hsd1.mn.comcast.net [24.118.80.156]) by mx.google.com with ESMTPS id 9sm410004wfc.36.2009.05.07.14.25.56 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 07 May 2009 14:25:56 -0700 (PDT) Subject: [PATCH net-next-2.6] Network Drop Monitor: Fix skb_kill_datagram From: John Dykstra To: netdev , nhorman@tuxdriver.com Date: Thu, 07 May 2009 21:25:54 +0000 Message-Id: <1241731554.6567.25.camel@Maple> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Acked-by: Neil Horman --- 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; }