From patchwork Thu Mar 1 09:17:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: santosh nayak X-Patchwork-Id: 143966 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 0D2671007D2 for ; Thu, 1 Mar 2012 20:18:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965727Ab2CAJSh (ORCPT ); Thu, 1 Mar 2012 04:18:37 -0500 Received: from mail-pw0-f46.google.com ([209.85.160.46]:46069 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965347Ab2CAJSd (ORCPT ); Thu, 1 Mar 2012 04:18:33 -0500 Received: by pbcup15 with SMTP id up15so661532pbc.19 for ; Thu, 01 Mar 2012 01:18:33 -0800 (PST) Received-SPF: pass (google.com: domain of santoshprasadnayak@gmail.com designates 10.68.132.198 as permitted sender) client-ip=10.68.132.198; Authentication-Results: mr.google.com; spf=pass (google.com: domain of santoshprasadnayak@gmail.com designates 10.68.132.198 as permitted sender) smtp.mail=santoshprasadnayak@gmail.com; dkim=pass header.i=santoshprasadnayak@gmail.com Received: from mr.google.com ([10.68.132.198]) by 10.68.132.198 with SMTP id ow6mr17194617pbb.161.1330593513011 (num_hops = 1); Thu, 01 Mar 2012 01:18:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=58hswqmYdvjrRMEYGy6nVO0NjKWDSwDysaHw7EmQWXQ=; b=iEU36iFNBeZuYzpsiTl2GNma9dLX66aIPFhPIJMqXjDluyORy7/4Ti6pFlgHkaDZT7 3unY9KRloIntv3lLvfaIHFyaemBkXWq8cULg26EsnLm/y6yPl4IvqClRM0n4zunxo+CC vbFeJOWL9J0agB+QkdcIpfC6Gcw40QXIHzXLA= Received: by 10.68.132.198 with SMTP id ow6mr14233751pbb.161.1330593512926; Thu, 01 Mar 2012 01:18:32 -0800 (PST) Received: from localhost.localdomain ([64.103.156.75]) by mx.google.com with ESMTPS id i3sm1601129pbe.33.2012.03.01.01.18.28 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Mar 2012 01:18:32 -0800 (PST) From: santosh nayak To: bart.de.schuymer@pandora.be Cc: pablo@netfilter.org, kaber@trash.net, shemminger@vyatta.com, davem@davemloft.net, netfilter-devel@vger.kernel.org, netfilter@vger.kernel.org, coreteam@netfilter.org, bridge@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Santosh Nayak Subject: [PATCH 3/3] netfilter: Remove redundant code. Date: Thu, 1 Mar 2012 14:47:46 +0530 Message-Id: <1330593466-19317-1-git-send-email-santoshprasadnayak@gmail.com> X-Mailer: git-send-email 1.7.4.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Santosh Nayak Remove the redundant code. Signed-off-by: Santosh Nayak --- net/bridge/netfilter/ebtables.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index 9c0f177..1efc234 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -226,10 +226,8 @@ unsigned int ebt_do_table (unsigned int hook, struct sk_buff *skb, if (EBT_MATCH_ITERATE(point, ebt_do_match, skb, &acpar) != 0) goto letscontinue; - if (acpar.hotdrop) { - read_unlock_bh(&table->lock); - return NF_DROP; - } + if (acpar.hotdrop) + goto out; /* increase counter */ (*(counter_base + i)).pcnt++; @@ -253,10 +251,8 @@ unsigned int ebt_do_table (unsigned int hook, struct sk_buff *skb, read_unlock_bh(&table->lock); return NF_ACCEPT; } - if (verdict == EBT_DROP) { - read_unlock_bh(&table->lock); - return NF_DROP; - } + if (verdict == EBT_DROP) + goto out; if (verdict == EBT_RETURN) { letsreturn: #ifdef CONFIG_NETFILTER_DEBUG @@ -281,8 +277,7 @@ letsreturn: #ifdef CONFIG_NETFILTER_DEBUG if (verdict < 0) { BUGPRINT("bogus standard verdict\n"); - read_unlock_bh(&table->lock); - return NF_DROP; + goto out; } #endif /* jump to a udc */ @@ -294,8 +289,7 @@ letsreturn: #ifdef CONFIG_NETFILTER_DEBUG if (chaininfo->distinguisher) { BUGPRINT("jump to non-chain\n"); - read_unlock_bh(&table->lock); - return NF_DROP; + goto out; } #endif nentries = chaininfo->nentries;