a few bridge code cleanups
Subsystems (4)
cover a few bridge code cleanups
Hi,
here is a few bridge cleanups - code alignment and conditional compilation for structure members.
Please review. Hope I didn't miss anything. Anyway if it breaks someone patch queue -- just drop this series then.
Cyrill
PATCH 1/2 net, bridge: align br_nf_ops assignment
No functional change -- just for easier reading.
--- net/bridge/br_netfilter.c | 96 ++++++++++++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 40 deletions(-)
net/bridge/br_netfilter.c +56 -40
@@ -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
Re: [patch 1/2] net, bridge: align br_nf_ops assignment
Quoted 7 lines · On Sat, 04 Jul 2009 10:11:57 +0400 Cyrill Gorcunov <[email protected]> wrote:
No functional change -- just for easier reading.
Signed-off-by Cyrill Gorcunov <[email protected]>--- net/bridge/br_netfilter.c | 96 ++++++++++++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 40 deletions(-)
Re: [patch 1/2] net, bridge: align br_nf_ops assignment
[Stephen Hemminger - Thu, Jul 09, 2009 at 12:55:00PM -0700]
| On Sat, 04 Jul 2009 10:11:57 +0400 | Cyrill Gorcunov <[email protected]> wrote: | | > No functional change -- just for easier reading. | > | > Signed-off-by: Cyrill Gorcunov <[email protected]> | > --- | > net/bridge/br_netfilter.c | 96 ++++++++++++++++++++++++++-------------------- | > 1 file changed, 56 insertions(+), 40 deletions(-) | > | | | Acked-by: Stephen Hemminger <[email protected]> | | -- |
Thanks for review Stephen. Will you pick them up?
-- Cyrill
PATCH 2/2 net, netns_xt: shrink netns_xt members
In reply to Cyrill GorcunovIn case if kernel was compiled without ebtables support there is no need to keep ebt_table pointers in netns_xt structure.
Make it config dependent.
---
Probably GCC will authomatically shrink the structure if the members are not in use. Please review.
include/net/netns/x_tables.h | 3 +++ 1 file changed, 3 insertions(+)
include/net/netns/x_tables.h +3 -0
@@ -8,8 +8,11 @@ struct ebt_table;struct netns_xt {struct list_head tables[NFPROTO_NUMPROTO ]; +#if defined(CONFIG_BRIDGE_NF_EBTABLES ) || \ + defined(CONFIG_BRIDGE_NF_EBTABLES_MODULE )struct ebt_table *broute_table;struct ebt_table *frame_filter;struct ebt_table *frame_nat; +#endif };#endif
Re: [patch 2/2] net, netns_xt: shrink netns_xt members
Quoted 33 lines · On Sat, 04 Jul 2009 10:11:58 +0400 Cyrill Gorcunov <[email protected]> wrote:
In case if kernel was compiled without ebtables support there is no need to keep
ebt_tablepointers innetns_xtstructure.Make it config dependent.
Signed-off-by Cyrill Gorcunov <[email protected]>---
Probably GCC will authomatically shrink the structure if the members are not in use. Please review.
include/net/netns/x_tables.h | 3 +++ 1 file changed, 3 insertions(+)Index:
linux-2.6.git/include/net/netns/x_tables.h
=====================================================================include/net/netns/x_tables.h +3
-1@@ -8,8 +8,11 @@ struct ebt_table;struct netns_xt {struct list_head tables[NFPROTO_NUMPROTO ]; +#if defined(CONFIG_BRIDGE_NF_EBTABLES ) || \ + defined(CONFIG_BRIDGE_NF_EBTABLES_MODULE )struct ebt_table *broute_table;struct ebt_table *frame_filter;struct ebt_table *frame_nat; +#endif };#endif --
Quoted 3 lines
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html