[IPV4]: Switch users of ipv4_devconf(_all) to use the pernet one
These are scattered over the code, but almost all the "critical" places already have the proper struct net at hand except for snmp proc showing function and routing rtnl handler. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
9355bbd685
commit
586f121152
@@ -1258,9 +1258,9 @@ static void devinet_copy_dflt_conf(struct net *net, int i)
|
||||
static void inet_forward_change(struct net *net)
|
||||
{
|
||||
struct net_device *dev;
|
||||
int on = IPV4_DEVCONF_ALL(FORWARDING);
|
||||
int on = IPV4_DEVCONF_ALL(net, FORWARDING);
|
||||
|
||||
IPV4_DEVCONF_ALL(ACCEPT_REDIRECTS) = !on;
|
||||
IPV4_DEVCONF_ALL(net, ACCEPT_REDIRECTS) = !on;
|
||||
IPV4_DEVCONF_DFLT(net, FORWARDING) = on;
|
||||
|
||||
read_lock(&dev_base_lock);
|
||||
@@ -1360,7 +1360,7 @@ static int devinet_sysctl_forward(ctl_table *ctl, int write,
|
||||
if (write && *valp != val) {
|
||||
struct net *net = ctl->extra2;
|
||||
|
||||
if (valp == &IPV4_DEVCONF_ALL(FORWARDING))
|
||||
if (valp == &IPV4_DEVCONF_ALL(net, FORWARDING))
|
||||
inet_forward_change(net);
|
||||
else if (valp != &IPV4_DEVCONF_DFLT(net, FORWARDING))
|
||||
rt_cache_flush(0);
|
||||
|
Reference in New Issue
Block a user