Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-microblaze.git] / net / netfilter / nf_tables_inet.c

diff --git a/net/netfilter/nf_tables_inet.c b/net/netfilter/nf_tables_inet.c
index f713cc2..e30c7da 100644 (file)
--- a/net/netfilter/nf_tables_inet.c
+++ b/net/netfilter/nf_tables_inet.c
@@ -9,6 +9,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/ip.h>
+#include <linux/ipv6.h>
 #include <linux/netfilter_ipv4.h>
 #include <linux/netfilter_ipv6.h>
 #include <net/netfilter/nf_tables.h>
@@ -16,56 +17,27 @@
 #include <net/netfilter/nf_tables_ipv6.h>
 #include <net/ip.h>
 
-static void nft_inet_hook_ops_init(struct nf_hook_ops *ops, unsigned int n)
+static unsigned int nft_do_chain_inet(void *priv, struct sk_buff *skb,
+                                     const struct nf_hook_state *state)
 {
-       struct nft_af_info *afi;
-
-       if (n == 1)
-               afi = &nft_af_ipv4;
-       else
-               afi = &nft_af_ipv6;
-
-       ops->pf = afi->family;
-       if (afi->hooks[ops->hooknum])
-               ops->hook = afi->hooks[ops->hooknum];
-}
-
-static struct nft_af_info nft_af_inet __read_mostly = {
-       .family         = NFPROTO_INET,
-       .nhooks         = NF_INET_NUMHOOKS,
-       .owner          = THIS_MODULE,
-       .nops           = 2,
-       .hook_ops_init  = nft_inet_hook_ops_init,
-};
-
-static int __net_init nf_tables_inet_init_net(struct net *net)
-{
-       net->nft.inet = kmalloc(sizeof(struct nft_af_info), GFP_KERNEL);
-       if (net->nft.inet == NULL)
-               return -ENOMEM;
-       memcpy(net->nft.inet, &nft_af_inet, sizeof(nft_af_inet));
-
-       if (nft_register_afinfo(net, net->nft.inet) < 0)
-               goto err;
-
-       return 0;
-
-err:
-       kfree(net->nft.inet);
-       return -ENOMEM;
-}
-
-static void __net_exit nf_tables_inet_exit_net(struct net *net)
-{
-       nft_unregister_afinfo(net, net->nft.inet);
-       kfree(net->nft.inet);
+       struct nft_pktinfo pkt;
+
+       nft_set_pktinfo(&pkt, skb, state);
+
+       switch (state->pf) {
+       case NFPROTO_IPV4:
+               nft_set_pktinfo_ipv4(&pkt, skb);
+               break;
+       case NFPROTO_IPV6:
+               nft_set_pktinfo_ipv6(&pkt, skb);
+               break;
+       default:
+               break;
+       }
+
+       return nft_do_chain(&pkt, priv);
 }
 
-static struct pernet_operations nf_tables_inet_net_ops = {
-       .init   = nf_tables_inet_init_net,
-       .exit   = nf_tables_inet_exit_net,
-};
-
 static const struct nf_chain_type filter_inet = {
        .name           = "filter",
        .type           = NFT_CHAIN_T_DEFAULT,
@@ -76,26 +48,22 @@ static const struct nf_chain_type filter_inet = {
                          (1 << NF_INET_FORWARD) |
                          (1 << NF_INET_PRE_ROUTING) |
                          (1 << NF_INET_POST_ROUTING),
+       .hooks          = {
+               [NF_INET_LOCAL_IN]      = nft_do_chain_inet,
+               [NF_INET_LOCAL_OUT]     = nft_do_chain_inet,
+               [NF_INET_FORWARD]       = nft_do_chain_inet,
+               [NF_INET_PRE_ROUTING]   = nft_do_chain_inet,
+               [NF_INET_POST_ROUTING]  = nft_do_chain_inet,
+        },
 };
 
 static int __init nf_tables_inet_init(void)
 {
-       int ret;
-
-       ret = nft_register_chain_type(&filter_inet);
-       if (ret < 0)
-               return ret;
-
-       ret = register_pernet_subsys(&nf_tables_inet_net_ops);
-       if (ret < 0)
-               nft_unregister_chain_type(&filter_inet);
-
-       return ret;
+       return nft_register_chain_type(&filter_inet);
 }
 
 static void __exit nf_tables_inet_exit(void)
 {
-       unregister_pernet_subsys(&nf_tables_inet_net_ops);
        nft_unregister_chain_type(&filter_inet);
 }
 
@@ -104,4 +72,4 @@ module_exit(nf_tables_inet_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");
-MODULE_ALIAS_NFT_FAMILY(1);
+MODULE_ALIAS_NFT_CHAIN(1, "filter");