From patchwork Wed Jan 23 14:52:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Wang X-Patchwork-Id: 214978 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 08C002C007B for ; Thu, 24 Jan 2013 01:52:59 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755384Ab3AWOwp (ORCPT ); Wed, 23 Jan 2013 09:52:45 -0500 Received: from mail-pa0-f51.google.com ([209.85.220.51]:62292 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755364Ab3AWOwo (ORCPT ); Wed, 23 Jan 2013 09:52:44 -0500 Received: by mail-pa0-f51.google.com with SMTP id fb11so4810858pad.24 for ; Wed, 23 Jan 2013 06:52:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=eq5N79npsN10ZC/dTKmoci9EFCWKOWc7g8Ozx41HwiE=; b=I+YgD60qrWJqfLlLd9PrPQhYBRa2/ACn3cuOydNgrLW0n3slQVFWI1S+CUVM/U3C2C bYD2tSUmALZnD32HmUZ3oq5nvLtyw+OwTB1oGskX0xbIDxhNCJaUU8jXcqqTLjQ58EfK Hu3QAybAoC0zAniQGUv1dI8s10tiw//cXdT2DKLU+Svn3aXim/sDP3Rw1CGD4EyAquOh JRSPYY17JjnnymqT3aDEWK28s3LVrrGthqAEsYKcDVzmZ5/9IjUrIgaYvb6TJ03fBS6r UDLA5Rk5Szpt+vM+vAsb1XaCDlHgWlUdoTiDfy6rPP8bdXN2g11yqDPAQrIQe7IY+VUH mhrA== X-Received: by 10.68.237.42 with SMTP id uz10mr4159068pbc.118.1358952764109; Wed, 23 Jan 2013 06:52:44 -0800 (PST) Received: from cr0.redhat.com ([14.205.38.12]) by mx.google.com with ESMTPS id oc8sm11779586pbb.39.2013.01.23.06.52.39 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 23 Jan 2013 06:52:42 -0800 (PST) From: Cong Wang To: netdev@vger.kernel.org Cc: Steffen Klassert , Herbert Xu , "David S. Miller" , Cong Wang Subject: [Patch net-next] af_key: remove a duplicated skb_orphan() Date: Wed, 23 Jan 2013 22:52:27 +0800 Message-Id: <1358952747-3772-1-git-send-email-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 1.7.7.6 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 --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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);