Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755097Ab3H1SvP (ORCPT ); Wed, 28 Aug 2013 14:51:15 -0400 Received: from perches-mx.perches.com ([206.117.179.246]:50260 "EHLO labridge.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754535Ab3H1SvO (ORCPT ); Wed, 28 Aug 2013 14:51:14 -0400 Message-ID: <1377715873.1928.47.camel@joe-AO722> Subject: Re: [PATCH net-next 1/1] net: neighbour: Simplify ifdefs around neigh_app_ns() From: Joe Perches To: Tim Gardner Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy , "Eric W. Biederman" , Gao feng Date: Wed, 28 Aug 2013 11:51:13 -0700 In-Reply-To: <1377714286-51816-1-git-send-email-tim.gardner@canonical.com> References: <1377714286-51816-1-git-send-email-tim.gardner@canonical.com> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.6.4-0ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2085 Lines: 66 On Wed, 2013-08-28 at 12:24 -0600, Tim Gardner wrote: > Drop a couple of ifdef/endif pairs by moving the ifdef > surrounding neigh_app_ns() to the interior of neigh_app_ns(). [] > This is an admittedly trivial change. I stumbled on it while trying to figure > out why Ubuntu doesn't have CONFIG_ARPD enabled. I'd be more inclined to make neigh_app_ns static inline in the .h file and remove the EXPORT_SYMBOL > diff --git a/net/core/neighbour.c b/net/core/neighbour.c > index 60533db..049dd9e 100644 > --- a/net/core/neighbour.c > +++ b/net/core/neighbour.c > @@ -2759,13 +2759,13 @@ errout: > rtnl_set_sk_err(net, RTNLGRP_NEIGH, err); > } > > -#ifdef CONFIG_ARPD > void neigh_app_ns(struct neighbour *n) > { > +#ifdef CONFIG_ARPD > __neigh_notify(n, RTM_GETNEIGH, NLM_F_REQUEST); > +#endif /* CONFIG_ARPD */ > } > EXPORT_SYMBOL(neigh_app_ns); > -#endif /* CONFIG_ARPD */ > > #ifdef CONFIG_SYSCTL > static int zero; > diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c > index 4429b01..7808093 100644 > --- 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; > } > } > diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c > index 04d31c2..d5693ad 100644 > --- a/net/ipv6/ndisc.c > +++ b/net/ipv6/ndisc.c > @@ -663,9 +663,7 @@ static void ndisc_solicit(struct neighbour *neigh, struct sk_buff *skb) > } > ndisc_send_ns(dev, neigh, target, target, saddr); > } else if ((probes -= neigh->parms->app_probes) < 0) { > -#ifdef CONFIG_ARPD > neigh_app_ns(neigh); > -#endif > } else { > addrconf_addr_solict_mult(target, &mcaddr); > ndisc_send_ns(dev, NULL, target, &mcaddr, saddr); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/