From patchwork Thu Feb 14 11:47:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffen Klassert X-Patchwork-Id: 220419 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5EDA42C0089 for ; Thu, 14 Feb 2013 22:47:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934282Ab3BNLry (ORCPT ); Thu, 14 Feb 2013 06:47:54 -0500 Received: from a.mx.secunet.com ([195.81.216.161]:44522 "EHLO a.mx.secunet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759344Ab3BNLrx (ORCPT ); Thu, 14 Feb 2013 06:47:53 -0500 Received: from localhost (alg1 [127.0.0.1]) by a.mx.secunet.com (Postfix) with ESMTP id 3C94E1A0071; Thu, 14 Feb 2013 12:47:52 +0100 (CET) X-Virus-Scanned: by secunet Received: from mail-srv1.secumail.de (unknown [10.53.40.200]) by a.mx.secunet.com (Postfix) with ESMTP id 40C641A0075; Thu, 14 Feb 2013 12:47:47 +0100 (CET) Received: from gauss.dd.secunet.de ([10.182.7.102]) by mail-srv1.secumail.de with Microsoft SMTPSVC(6.0.3790.4675); Thu, 14 Feb 2013 12:47:47 +0100 Received: by gauss.dd.secunet.de (Postfix, from userid 1000) id D9BDF5C04EF; Thu, 14 Feb 2013 12:47:46 +0100 (CET) From: Steffen Klassert To: David Miller Cc: Herbert Xu , Steffen Klassert , netdev@vger.kernel.org Subject: [PATCH 1/7] af_key: remove a duplicated skb_orphan() Date: Thu, 14 Feb 2013 12:47:21 +0100 Message-Id: <1360842447-3344-2-git-send-email-steffen.klassert@secunet.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360842447-3344-1-git-send-email-steffen.klassert@secunet.com> References: <1360842447-3344-1-git-send-email-steffen.klassert@secunet.com> X-OriginalArrivalTime: 14 Feb 2013 11:47:47.0156 (UTC) FILETIME=[1BBEC140:01CE0AA9] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Cong Wang skb_set_owner_r() will call skb_orphan(), I don't see any reason to call it twice. Cc: Steffen Klassert Cc: Herbert Xu Cc: "David S. Miller" Signed-off-by: Cong Wang Signed-off-by: Steffen Klassert --- net/key/af_key.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/key/af_key.c b/net/key/af_key.c index 5b426a6..6a6e684 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -203,7 +203,6 @@ static int pfkey_broadcast_one(struct sk_buff *skb, struct sk_buff **skb2, } if (*skb2 != NULL) { if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf) { - skb_orphan(*skb2); skb_set_owner_r(*skb2, sk); skb_queue_tail(&sk->sk_receive_queue, *skb2); sk->sk_data_ready(sk, (*skb2)->len);