[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAK8P3a1mwnDFeD3xnQ6bm1x8C6yX=YEccxN2jknvTbRiCfD=Bg@mail.gmail.com>
Date: Fri, 14 Jun 2019 16:01:09 +0200
From: Arnd Bergmann <arnd@...db.de>
To: Randy Dunlap <rdunlap@...radead.org>
Cc: Matteo Croce <mcroce@...hat.com>,
David Miller <davem@...emloft.net>,
netdev <netdev@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>,
Andrew Morton <akpm@...ux-foundation.org>,
David Ahern <dsahern@...il.com>,
LKML <linux-kernel@...r.kernel.org>,
Linux FS-devel Mailing List <linux-fsdevel@...r.kernel.org>
Subject: Re: [PATCH net] mpls: fix af_mpls dependencies
On Wed, Jun 12, 2019 at 9:41 AM Randy Dunlap <rdunlap@...radead.org> wrote:
> On 6/11/19 5:08 PM, Matteo Croce wrote:
> > On Wed, Jun 12, 2019 at 1:07 AM Randy Dunlap <rdunlap@...radead.org> wrote:
> > * Configure standard kernel features (expert users)
> > *
> > Configure standard kernel features (expert users) (EXPERT) [Y/?] y
> > Multiple users, groups and capabilities support (MULTIUSER) [Y/n/?] y
> > sgetmask/ssetmask syscalls support (SGETMASK_SYSCALL) [N/y/?] n
> > Sysfs syscall support (SYSFS_SYSCALL) [N/y/?] n
> > Sysctl syscall support (SYSCTL_SYSCALL) [N/y/?] (NEW)
>
> So I still say that MPLS_ROUTING should depend on PROC_SYSCTL,
> not select it.
It clearly shouldn't select PROC_SYSCTL, but I think it should not
have a 'depends on' statement either. I think the correct fix for the
original problem would have been something like
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -2659,6 +2659,9 @@ static int mpls_net_init(struct net *net)
net->mpls.ip_ttl_propagate = 1;
net->mpls.default_ttl = 255;
+ if (!IS_ENABLED(CONFIG_PROC_SYSCTL))
+ return 0;
+
table = kmemdup(mpls_table, sizeof(mpls_table), GFP_KERNEL);
if (table == NULL)
return -ENOMEM;
Powered by blists - more mailing lists