Merge remote-tracking branch 'omap_dss2/for-next'

[deliverable/linux.git] / net / ipv6 / netfilter / nf_tables_ipv6.c

diff --git a/net/ipv6/netfilter/nf_tables_ipv6.c b/net/ipv6/netfilter/nf_tables_ipv6.c
index 30b22f4dff55e7cfc5f83a3549192f54615c8701..d6e4ba5de916a3e57782764a4e3ac9fcf54e341d 100644 (file)
--- a/net/ipv6/netfilter/nf_tables_ipv6.c
+++ b/net/ipv6/netfilter/nf_tables_ipv6.c
@@ -22,9 +22,7 @@ static unsigned int nft_do_chain_ipv6(void *priv,
 {
        struct nft_pktinfo pkt;
 
-       /* malformed packet, drop it */
-       if (nft_set_pktinfo_ipv6(&pkt, skb, state) < 0)
-               return NF_DROP;
+       nft_set_pktinfo_ipv6(&pkt, skb, state);
 
        return nft_do_chain(&pkt, priv);
 }
@@ -102,7 +100,10 @@ static int __init nf_tables_ipv6_init(void)
 {
        int ret;
 
-       nft_register_chain_type(&filter_ipv6);
+       ret = nft_register_chain_type(&filter_ipv6);
+       if (ret < 0)
+               return ret;
+
        ret = register_pernet_subsys(&nf_tables_ipv6_net_ops);
        if (ret < 0)
                nft_unregister_chain_type(&filter_ipv6);