* [patch net-next] neigh: use neigh_parms_net() to get struct neigh_parms->net pointer
@ 2013-12-10 22:55 Jiri Pirko
2013-12-10 22:59 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Jiri Pirko @ 2013-12-10 22:55 UTC (permalink / raw)
To: netdev; +Cc: davem
This fixes compile error when CONFIG_NET_NS is not set.
Introduced by:
commit 1d4c8c29841b9991cdf3c7cc4ba7f96a94f104ca
"neigh: restore old behaviour of default parms values"
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
---
net/core/neighbour.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index ce2b775..8be82a7 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2850,7 +2850,7 @@ static void neigh_proc_update(struct ctl_table *ctl, int write)
{
struct net_device *dev = ctl->extra1;
struct neigh_parms *p = ctl->extra2;
- struct net *net = p->net;
+ struct net *net = neigh_parms_net(p);
int index = (int *) ctl->data - p->data;
if (!write)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [patch net-next] neigh: use neigh_parms_net() to get struct neigh_parms->net pointer
2013-12-10 22:55 [patch net-next] neigh: use neigh_parms_net() to get struct neigh_parms->net pointer Jiri Pirko
@ 2013-12-10 22:59 ` David Miller
2013-12-10 23:09 ` Eric Dumazet
2013-12-10 23:11 ` Jiri Pirko
0 siblings, 2 replies; 5+ messages in thread
From: David Miller @ 2013-12-10 22:59 UTC (permalink / raw)
To: jiri; +Cc: netdev
From: Jiri Pirko <jiri@resnulli.us>
Date: Tue, 10 Dec 2013 23:55:07 +0100
> This fixes compile error when CONFIG_NET_NS is not set.
>
> Introduced by:
> commit 1d4c8c29841b9991cdf3c7cc4ba7f96a94f104ca
> "neigh: restore old behaviour of default parms values"
>
> Signed-off-by: Jiri Pirko <jiri@resnulli.us>
...
> - struct net *net = p->net;
> + struct net *net = neigh_parms_net(p);
Hey look at that, the interface already existed :-)
Applied, thanks Jiri.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [patch net-next] neigh: use neigh_parms_net() to get struct neigh_parms->net pointer
2013-12-10 22:59 ` David Miller
@ 2013-12-10 23:09 ` Eric Dumazet
2013-12-10 23:11 ` Eric Dumazet
2013-12-10 23:11 ` Jiri Pirko
1 sibling, 1 reply; 5+ messages in thread
From: Eric Dumazet @ 2013-12-10 23:09 UTC (permalink / raw)
To: David Miller; +Cc: jiri, netdev
On Tue, 2013-12-10 at 17:59 -0500, David Miller wrote:
> From: Jiri Pirko <jiri@resnulli.us>
> Date: Tue, 10 Dec 2013 23:55:07 +0100
>
> > This fixes compile error when CONFIG_NET_NS is not set.
> >
> > Introduced by:
> > commit 1d4c8c29841b9991cdf3c7cc4ba7f96a94f104ca
> > "neigh: restore old behaviour of default parms values"
> >
> > Signed-off-by: Jiri Pirko <jiri@resnulli.us>
> ...
> > - struct net *net = p->net;
> > + struct net *net = neigh_parms_net(p);
>
> Hey look at that, the interface already existed :-)
Yep, provided in commit e42ea986e4a4ca about 5 years ago ;)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [patch net-next] neigh: use neigh_parms_net() to get struct neigh_parms->net pointer
2013-12-10 22:59 ` David Miller
2013-12-10 23:09 ` Eric Dumazet
@ 2013-12-10 23:11 ` Jiri Pirko
1 sibling, 0 replies; 5+ messages in thread
From: Jiri Pirko @ 2013-12-10 23:11 UTC (permalink / raw)
To: David Miller; +Cc: netdev
Tue, Dec 10, 2013 at 11:59:29PM CET, davem@davemloft.net wrote:
>From: Jiri Pirko <jiri@resnulli.us>
>Date: Tue, 10 Dec 2013 23:55:07 +0100
>
>> This fixes compile error when CONFIG_NET_NS is not set.
>>
>> Introduced by:
>> commit 1d4c8c29841b9991cdf3c7cc4ba7f96a94f104ca
>> "neigh: restore old behaviour of default parms values"
>>
>> Signed-off-by: Jiri Pirko <jiri@resnulli.us>
> ...
>> - struct net *net = p->net;
>> + struct net *net = neigh_parms_net(p);
>
>Hey look at that, the interface already existed :-)
Yep. It was just my dumb head that missed that :)
>
>Applied, thanks Jiri.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-12-10 23:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-10 22:55 [patch net-next] neigh: use neigh_parms_net() to get struct neigh_parms->net pointer Jiri Pirko
2013-12-10 22:59 ` David Miller
2013-12-10 23:09 ` Eric Dumazet
2013-12-10 23:11 ` Eric Dumazet
2013-12-10 23:11 ` Jiri Pirko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).