Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[platform/adaptation/renesas_rcar/renesas_kernel.git] / net / ipv4 / arp.c

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 4429b01..7808093 100644 (file)
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -368,9 +368,7 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb)
        } else {
                probes -= neigh->parms->app_probes;
                if (probes < 0) {
-#ifdef CONFIG_ARPD
                        neigh_app_ns(neigh);
-#endif
                        return;
                }
        }