From patchwork Sat Dec 13 19:21:15 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 13851 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 09307DDFC4 for ; Sun, 14 Dec 2008 06:21:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752128AbYLMTVm (ORCPT ); Sat, 13 Dec 2008 14:21:42 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750919AbYLMTVj (ORCPT ); Sat, 13 Dec 2008 14:21:39 -0500 Received: from courier.cs.helsinki.fi ([128.214.9.1]:51986 "EHLO mail.cs.helsinki.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751652AbYLMTVY (ORCPT ); Sat, 13 Dec 2008 14:21:24 -0500 Received: from wrl-59.cs.helsinki.fi (wrl-59.cs.helsinki.fi [128.214.166.179]) (AUTH: PLAIN cs-relay, TLS: TLSv1/SSLv3,256bits,AES256-SHA) by mail.cs.helsinki.fi with esmtp; Sat, 13 Dec 2008 21:21:22 +0200 id 0008C288.49440B32.00007AD2 Received: by wrl-59.cs.helsinki.fi (Postfix, from userid 50795) id 95605A00A8; Sat, 13 Dec 2008 21:21:22 +0200 (EET) From: "=?ISO-8859-1?Q?Ilpo_J=E4rvinen?=" To: David Miller Cc: netdev@vger.kernel.org, "=?utf-8?q?Ilpo=20J=E4rvinen?=" Subject: [PATCH 04/11] ip6mr: use goto to common label instead of opencoding Date: Sat, 13 Dec 2008 21:21:15 +0200 Message-Id: <1229196082-4162-5-git-send-email-ilpo.jarvinen@helsinki.fi> X-Mailer: git-send-email 1.5.4.2.156.ge3c5 In-Reply-To: <1229196082-4162-4-git-send-email-ilpo.jarvinen@helsinki.fi> References: <1229196082-4162-1-git-send-email-ilpo.jarvinen@helsinki.fi> <1229196082-4162-2-git-send-email-ilpo.jarvinen@helsinki.fi> <1229196082-4162-3-git-send-email-ilpo.jarvinen@helsinki.fi> <1229196082-4162-4-git-send-email-ilpo.jarvinen@helsinki.fi> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Ilpo Järvinen --- net/ipv6/ip6mr.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 9eed242..3c51b2d 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -1501,8 +1501,7 @@ static int ip6mr_forward2(struct sk_buff *skb, struct mfc6_cache *c, int vifi) vif->dev->stats.tx_bytes += skb->len; vif->dev->stats.tx_packets++; ip6mr_cache_report(net, skb, vifi, MRT6MSG_WHOLEPKT); - kfree_skb(skb); - return 0; + goto out_free; } #endif