diff options
| author | Patrick McHardy <kaber@trash.net> | 2014-01-03 07:16:15 -0500 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-01-07 17:55:46 -0500 |
| commit | 115a60b173af0170e0db26b9a3fd6a911fba70a3 (patch) | |
| tree | 83fac6bf34087f357d9fe30ff916dfa2448a5d40 /net/ipv4 | |
| parent | c9484874e7596d6c890e4130336f5379f6a59c5f (diff) | |
netfilter: nf_tables: add support for multi family tables
Add support to register chains to multiple hooks for different address
families for mixed IPv4/IPv6 tables.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/netfilter/nf_tables_arp.c | 1 | ||||
| -rw-r--r-- | net/ipv4/netfilter/nf_tables_ipv4.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/netfilter/nf_tables_arp.c b/net/ipv4/netfilter/nf_tables_arp.c index 31bb778cebb8..36d27fc7e859 100644 --- a/net/ipv4/netfilter/nf_tables_arp.c +++ b/net/ipv4/netfilter/nf_tables_arp.c | |||
| @@ -32,6 +32,7 @@ static struct nft_af_info nft_af_arp __read_mostly = { | |||
| 32 | .family = NFPROTO_ARP, | 32 | .family = NFPROTO_ARP, |
| 33 | .nhooks = NF_ARP_NUMHOOKS, | 33 | .nhooks = NF_ARP_NUMHOOKS, |
| 34 | .owner = THIS_MODULE, | 34 | .owner = THIS_MODULE, |
| 35 | .nops = 1, | ||
| 35 | .hooks = { | 36 | .hooks = { |
| 36 | [NF_ARP_IN] = nft_do_chain_arp, | 37 | [NF_ARP_IN] = nft_do_chain_arp, |
| 37 | [NF_ARP_OUT] = nft_do_chain_arp, | 38 | [NF_ARP_OUT] = nft_do_chain_arp, |
diff --git a/net/ipv4/netfilter/nf_tables_ipv4.c b/net/ipv4/netfilter/nf_tables_ipv4.c index ed7e15a93410..177c3bceb7ca 100644 --- a/net/ipv4/netfilter/nf_tables_ipv4.c +++ b/net/ipv4/netfilter/nf_tables_ipv4.c | |||
| @@ -52,6 +52,7 @@ static struct nft_af_info nft_af_ipv4 __read_mostly = { | |||
| 52 | .family = NFPROTO_IPV4, | 52 | .family = NFPROTO_IPV4, |
| 53 | .nhooks = NF_INET_NUMHOOKS, | 53 | .nhooks = NF_INET_NUMHOOKS, |
| 54 | .owner = THIS_MODULE, | 54 | .owner = THIS_MODULE, |
| 55 | .nops = 1, | ||
| 55 | .hooks = { | 56 | .hooks = { |
| 56 | [NF_INET_LOCAL_IN] = nft_do_chain_ipv4, | 57 | [NF_INET_LOCAL_IN] = nft_do_chain_ipv4, |
| 57 | [NF_INET_LOCAL_OUT] = nft_ipv4_output, | 58 | [NF_INET_LOCAL_OUT] = nft_ipv4_output, |
