From patchwork Sat Jul 4 06:11:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cyrill Gorcunov X-Patchwork-Id: 29458 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 D1660B6F1E for ; Sat, 4 Jul 2009 16:28:45 +1000 (EST) Received: by ozlabs.org (Postfix) id C4172DDD0C; Sat, 4 Jul 2009 16:28:45 +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 5CD27DDD0B for ; Sat, 4 Jul 2009 16:28:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752673AbZGDG2g (ORCPT ); Sat, 4 Jul 2009 02:28:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752383AbZGDG2f (ORCPT ); Sat, 4 Jul 2009 02:28:35 -0400 Received: from mail-bw0-f207.google.com ([209.85.218.207]:64536 "EHLO mail-bw0-f207.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751477AbZGDG2e (ORCPT ); Sat, 4 Jul 2009 02:28:34 -0400 Received: by mail-bw0-f207.google.com with SMTP id 3so714060bwz.37 for ; Fri, 03 Jul 2009 23:28:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:received:message-id :user-agent:date:from:to:cc:subject:references:content-disposition; bh=gTIA54G//nBRlKaySTMsxeHKO10ZZ5/hqpmLnPDANdc=; b=I7Ylwb+R56AJuOrAZvirdddiJonY/0YrPi0pjn/O/IzGpTXAQwzYZPFIqKkWS6xUgL JKb5HstyFh6jpFuF5T/umyw6cuGrojvIqPxDzKGgWTJvnaeaMTVjNczhFXcigc3Ep8fx TrDBdSOyiuo7gHR5A/NMIdNJ/wq9AUn4VAs/8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:user-agent:date:from:to:cc:subject:references :content-disposition; b=tbCKsxRKl+Tg5YbN+TGaLfooxV2s8gJJIkcAQpmvumhBFY9xcvFFAfQF1Bgt0jhBU9 uf+MMyyfiJyvg7H7UwdwpiJpgdwGlDDXv2Z8q1NPu2o9aFX+cnDVC9fUr1Dl5dNzvGSi oTx87OOu6mV7GvENaY89OE9/O6Gye30QE16dc= Received: by 10.204.69.133 with SMTP id z5mr2013051bki.163.1246688604213; Fri, 03 Jul 2009 23:23:24 -0700 (PDT) Received: from gorcunov (95-28-133-220.broadband.corbina.ru [95.28.133.220]) by mx.google.com with ESMTPS id g28sm7558383fkg.15.2009.07.03.23.23.22 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 03 Jul 2009 23:23:22 -0700 (PDT) Received: by gorcunov (Postfix, from userid 1000) id 06776160E; Sat, 4 Jul 2009 10:23:21 +0400 (MSD) Message-Id: <20090704062320.774818680@openvz.org> User-Agent: quilt/0.47-1 Date: Sat, 04 Jul 2009 10:11:57 +0400 From: Cyrill Gorcunov To: shemminger@linux-foundation.org, kaber@trash.net, bridge@lists.linux-foundation.org, netdev@vger.kernel.org Cc: Cyrill Gorcunov Subject: [patch 1/2] net, bridge: align br_nf_ops assignment References: <20090704061156.658235360@openvz.org> Content-Disposition: inline; filename=net-br-br_nf_ops-cleanup Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org No functional change -- just for easier reading. Signed-off-by: Cyrill Gorcunov Acked-by: Stephen Hemminger --- net/bridge/br_netfilter.c | 96 ++++++++++++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 40 deletions(-) -- 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 Index: linux-2.6.git/net/bridge/br_netfilter.c ===================================================================== --- linux-2.6.git.orig/net/bridge/br_netfilter.c +++ linux-2.6.git/net/bridge/br_netfilter.c @@ -905,46 +905,62 @@ static unsigned int ip_sabotage_in(unsig * For br_nf_post_routing, we need (prio = NF_BR_PRI_LAST), because * ip_refrag() can return NF_STOLEN. */ static struct nf_hook_ops br_nf_ops[] __read_mostly = { - { .hook = br_nf_pre_routing, - .owner = THIS_MODULE, - .pf = PF_BRIDGE, - .hooknum = NF_BR_PRE_ROUTING, - .priority = NF_BR_PRI_BRNF, }, - { .hook = br_nf_local_in, - .owner = THIS_MODULE, - .pf = PF_BRIDGE, - .hooknum = NF_BR_LOCAL_IN, - .priority = NF_BR_PRI_BRNF, }, - { .hook = br_nf_forward_ip, - .owner = THIS_MODULE, - .pf = PF_BRIDGE, - .hooknum = NF_BR_FORWARD, - .priority = NF_BR_PRI_BRNF - 1, }, - { .hook = br_nf_forward_arp, - .owner = THIS_MODULE, - .pf = PF_BRIDGE, - .hooknum = NF_BR_FORWARD, - .priority = NF_BR_PRI_BRNF, }, - { .hook = br_nf_local_out, - .owner = THIS_MODULE, - .pf = PF_BRIDGE, - .hooknum = NF_BR_LOCAL_OUT, - .priority = NF_BR_PRI_FIRST, }, - { .hook = br_nf_post_routing, - .owner = THIS_MODULE, - .pf = PF_BRIDGE, - .hooknum = NF_BR_POST_ROUTING, - .priority = NF_BR_PRI_LAST, }, - { .hook = ip_sabotage_in, - .owner = THIS_MODULE, - .pf = PF_INET, - .hooknum = NF_INET_PRE_ROUTING, - .priority = NF_IP_PRI_FIRST, }, - { .hook = ip_sabotage_in, - .owner = THIS_MODULE, - .pf = PF_INET6, - .hooknum = NF_INET_PRE_ROUTING, - .priority = NF_IP6_PRI_FIRST, }, + { + .hook = br_nf_pre_routing, + .owner = THIS_MODULE, + .pf = PF_BRIDGE, + .hooknum = NF_BR_PRE_ROUTING, + .priority = NF_BR_PRI_BRNF, + }, + { + .hook = br_nf_local_in, + .owner = THIS_MODULE, + .pf = PF_BRIDGE, + .hooknum = NF_BR_LOCAL_IN, + .priority = NF_BR_PRI_BRNF, + }, + { + .hook = br_nf_forward_ip, + .owner = THIS_MODULE, + .pf = PF_BRIDGE, + .hooknum = NF_BR_FORWARD, + .priority = NF_BR_PRI_BRNF - 1, + }, + { + .hook = br_nf_forward_arp, + .owner = THIS_MODULE, + .pf = PF_BRIDGE, + .hooknum = NF_BR_FORWARD, + .priority = NF_BR_PRI_BRNF, + }, + { + .hook = br_nf_local_out, + .owner = THIS_MODULE, + .pf = PF_BRIDGE, + .hooknum = NF_BR_LOCAL_OUT, + .priority = NF_BR_PRI_FIRST, + }, + { + .hook = br_nf_post_routing, + .owner = THIS_MODULE, + .pf = PF_BRIDGE, + .hooknum = NF_BR_POST_ROUTING, + .priority = NF_BR_PRI_LAST, + }, + { + .hook = ip_sabotage_in, + .owner = THIS_MODULE, + .pf = PF_INET, + .hooknum = NF_INET_PRE_ROUTING, + .priority = NF_IP_PRI_FIRST, + }, + { + .hook = ip_sabotage_in, + .owner = THIS_MODULE, + .pf = PF_INET6, + .hooknum = NF_INET_PRE_ROUTING, + .priority = NF_IP6_PRI_FIRST, + }, }; #ifdef CONFIG_SYSCTL