[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
@ -849,7 +849,7 @@ static void mrtsock_destruct(struct sock *sk)
|
||||
{
|
||||
rtnl_lock();
|
||||
if (sk == mroute_socket) {
|
||||
IPV4_DEVCONF_ALL(MC_FORWARDING)--;
|
||||
IPV4_DEVCONF_ALL(sk->sk_net, MC_FORWARDING)--;
|
||||
|
||||
write_lock_bh(&mrt_lock);
|
||||
mroute_socket=NULL;
|
||||
@ -898,7 +898,7 @@ int ip_mroute_setsockopt(struct sock *sk,int optname,char __user *optval,int opt
|
||||
mroute_socket=sk;
|
||||
write_unlock_bh(&mrt_lock);
|
||||
|
||||
IPV4_DEVCONF_ALL(MC_FORWARDING)++;
|
||||
IPV4_DEVCONF_ALL(sk->sk_net, MC_FORWARDING)++;
|
||||
}
|
||||
rtnl_unlock();
|
||||
return ret;
|
||||
|
Reference in New Issue
Block a user