From: Jiri Pirko <jiri@resnulli.us>
Date: Tue, 10 Dec 2013 22:55:07 +0000 (+0100)
Subject: neigh: use neigh_parms_net() to get struct neigh_parms->net pointer
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=77d47afbf3c58350c3708b609005358bbd33e085;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

neigh: use neigh_parms_net() to get struct neigh_parms->net pointer

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index ce2b77515a9e..8be82a7f0e0f 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)