diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-10-09 20:11:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-09 20:11:09 -0700 |
| commit | d93fa2ba64384a0bbee4ae7409d85fccb2cfcf14 (patch) | |
| tree | 8e55d9d74f46ce13e4299d23c23c72b9306798c1 /net/bridge/netfilter/ebtable_broute.c | |
| parent | ipv6: use rcu_dereference_bh() in ipv6_route_seq_next() (diff) | |
| parent | Merge branch 'ppc-bundle' (bundle from Michael Ellerman) (diff) | |
| download | linux-dev-d93fa2ba64384a0bbee4ae7409d85fccb2cfcf14.tar.xz linux-dev-d93fa2ba64384a0bbee4ae7409d85fccb2cfcf14.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/bridge/netfilter/ebtable_broute.c')
| -rw-r--r-- | net/bridge/netfilter/ebtable_broute.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/netfilter/ebtable_broute.c b/net/bridge/netfilter/ebtable_broute.c index 2585b100ebbb..276b60262981 100644 --- a/net/bridge/netfilter/ebtable_broute.c +++ b/net/bridge/netfilter/ebtable_broute.c @@ -65,8 +65,8 @@ static int ebt_broute(struct sk_buff *skb) static int __net_init broute_net_init(struct net *net) { - net->xt.broute_table = ebt_register_table(net, &broute_table, NULL); - return PTR_ERR_OR_ZERO(net->xt.broute_table); + return ebt_register_table(net, &broute_table, NULL, + &net->xt.broute_table); } static void __net_exit broute_net_exit(struct net *net) |