lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 28 Aug 2013 16:36:38 -0700 From: ebiederm@...ssion.com (Eric W. Biederman) To: Tim Gardner <tim.gardner@...onical.com> Cc: netdev@...r.kernel.org, linux-kernel@...r.kernel.org, "David S. Miller" <davem@...emloft.net>, Alexey Kuznetsov <kuznet@....inr.ac.ru>, James Morris <jmorris@...ei.org>, Hideaki YOSHIFUJI <yoshfuji@...ux-ipv6.org>, Patrick McHardy <kaber@...sh.net>, Gao feng <gaofeng@...fujitsu.com>, Joe Perches <joe@...ches.com> Subject: Re: [PATCH net-next 1/1] net: neighbour: Simplify ifdefs around neigh_app_ns() Tim Gardner <tim.gardner@...onical.com> writes: > Drop a couple of ifdef/endif pairs by moving the ifdef > surrounding neigh_app_ns() to the interior of neigh_app_ns(). Can we please just remove the CONFIG_ARPD option entirely. There really is no savings to keeping this option configurable and the option only removes a netlink notification. > Cc: "David S. Miller" <davem@...emloft.net> > Cc: Alexey Kuznetsov <kuznet@....inr.ac.ru> > Cc: James Morris <jmorris@...ei.org> > Cc: Hideaki YOSHIFUJI <yoshfuji@...ux-ipv6.org> > Cc: Patrick McHardy <kaber@...sh.net> > Cc: "Eric W. Biederman" <ebiederm@...ssion.com> > Cc: Gao feng <gaofeng@...fujitsu.com> > Cc: Joe Perches <joe@...ches.com> > Signed-off-by: Tim Gardner <tim.gardner@...onical.com> > --- > > This is an admittedly trivial change. I stumbled on it while trying to figure > out why Ubuntu doesn't have CONFIG_ARPD enabled. > > net/core/neighbour.c | 4 ++-- > net/ipv4/arp.c | 2 -- > net/ipv6/ndisc.c | 2 -- > 3 files changed, 2 insertions(+), 6 deletions(-) > > 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@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists