Merge remote-tracking branch 'iommu/next'

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

diff --git a/net/ipv4/netfilter/nf_log_arp.c b/net/ipv4/netfilter/nf_log_arp.c
index e7ad950cf9ef9a7f7b4e92ac146e1f92f6c20c19..8945c26538149110c979ce58abd4f56461908718 100644 (file)
--- a/net/ipv4/netfilter/nf_log_arp.c
+++ b/net/ipv4/netfilter/nf_log_arp.c
@@ -62,7 +62,7 @@ static void dump_arp_packet(struct nf_log_buf *m,
        /* If it's for Ethernet and the lengths are OK, then log the ARP
         * payload.
         */
-       if (ah->ar_hrd != htons(1) ||
+       if (ah->ar_hrd != htons(ARPHRD_ETHER) ||
            ah->ar_hln != ETH_ALEN ||
            ah->ar_pln != sizeof(__be32))
                return;
@@ -111,8 +111,7 @@ static struct nf_logger nf_arp_logger __read_mostly = {
 
 static int __net_init nf_log_arp_net_init(struct net *net)
 {
-       nf_log_set(net, NFPROTO_ARP, &nf_arp_logger);
-       return 0;
+       return nf_log_set(net, NFPROTO_ARP, &nf_arp_logger);
 }
 
 static void __net_exit nf_log_arp_net_exit(struct net *net)