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

[deliverable/linux.git] / net / ipv4 / netfilter / nf_tables_arp.c

diff --git a/net/ipv4/netfilter/nf_tables_arp.c b/net/ipv4/netfilter/nf_tables_arp.c
index cd84d4295a2027642f46523fd105068144abfdfd..805c8ddfe86022e6b47df2026d5c5830c613b0ff 100644 (file)
--- a/net/ipv4/netfilter/nf_tables_arp.c
+++ b/net/ipv4/netfilter/nf_tables_arp.c
@@ -21,7 +21,7 @@ nft_do_chain_arp(void *priv,
 {
        struct nft_pktinfo pkt;
 
-       nft_set_pktinfo(&pkt, skb, state);
+       nft_set_pktinfo_unspec(&pkt, skb, state);
 
        return nft_do_chain(&pkt, priv);
 }
@@ -80,7 +80,10 @@ static int __init nf_tables_arp_init(void)
 {
        int ret;
 
-       nft_register_chain_type(&filter_arp);
+       ret = nft_register_chain_type(&filter_arp);
+       if (ret < 0)
+               return ret;
+
        ret = register_pernet_subsys(&nf_tables_arp_net_ops);
        if (ret < 0)
                nft_unregister_chain_type(&filter_arp);