aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge/netfilter/ebtable_broute.c
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-11-04 14:27:15 +0100
committerPatrick McHardy <kaber@trash.net>2008-11-04 14:27:15 +0100
commit6beceee5aa2cb94c4ae9f0784c7d3135d343f5b5 (patch)
tree9f6bd8ee8c966a2ad5eab64a2472c395ef29e2f4 /net/bridge/netfilter/ebtable_broute.c
parent511061e2dd1b84bb21bb97c9216a19606c29ac02 (diff)
downloadkernel_samsung_smdk4412-6beceee5aa2cb94c4ae9f0784c7d3135d343f5b5.zip
kernel_samsung_smdk4412-6beceee5aa2cb94c4ae9f0784c7d3135d343f5b5.tar.gz
kernel_samsung_smdk4412-6beceee5aa2cb94c4ae9f0784c7d3135d343f5b5.tar.bz2
netfilter: netns ebtables: part 2
* return ebt_table from ebt_register_table(), module code will save it into per-netns data for unregistration * duplicate ebt_table at the very beginning of registration -- it's added into list, so one ebt_table wouldn't end up in many lists (and each netns has different one) * introduce underscored tables in individial modules, this is temporary to not break bisection. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/bridge/netfilter/ebtable_broute.c')
-rw-r--r--net/bridge/netfilter/ebtable_broute.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/net/bridge/netfilter/ebtable_broute.c b/net/bridge/netfilter/ebtable_broute.c
index 1731ce8..3277d68 100644
--- a/net/bridge/netfilter/ebtable_broute.c
+++ b/net/bridge/netfilter/ebtable_broute.c
@@ -41,22 +41,23 @@ static int check(const struct ebt_table_info *info, unsigned int valid_hooks)
return 0;
}
-static struct ebt_table broute_table =
+static struct ebt_table __broute_table =
{
.name = "broute",
.table = &initial_table,
.valid_hooks = 1 << NF_BR_BROUTING,
- .lock = __RW_LOCK_UNLOCKED(broute_table.lock),
+ .lock = __RW_LOCK_UNLOCKED(__broute_table.lock),
.check = check,
.me = THIS_MODULE,
};
+static struct ebt_table *broute_table;
static int ebt_broute(struct sk_buff *skb)
{
int ret;
ret = ebt_do_table(NF_BR_BROUTING, skb, skb->dev, NULL,
- &broute_table);
+ broute_table);
if (ret == NF_DROP)
return 1; /* route it */
return 0; /* bridge it */
@@ -64,21 +65,19 @@ static int ebt_broute(struct sk_buff *skb)
static int __init ebtable_broute_init(void)
{
- int ret;
-
- ret = ebt_register_table(&init_net, &broute_table);
- if (ret < 0)
- return ret;
+ broute_table = ebt_register_table(&init_net, &__broute_table);
+ if (IS_ERR(broute_table))
+ return PTR_ERR(broute_table);
/* see br_input.c */
rcu_assign_pointer(br_should_route_hook, ebt_broute);
- return ret;
+ return 0;
}
static void __exit ebtable_broute_fini(void)
{
rcu_assign_pointer(br_should_route_hook, NULL);
synchronize_net();
- ebt_unregister_table(&broute_table);
+ ebt_unregister_table(broute_table);
}
module_init(ebtable_broute_init);