mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
igmp: net: Move igmp namespace init to correct file
When igmp related sysctl were namespacified their initializatin was erroneously put into the tcp socket namespace constructor. This patch moves the relevant code into the igmp namespace constructor to keep things consistent. Also sprinkle some #ifdefs to silence warnings Signed-off-by: Nikolay Borisov <kernel@kyup.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
fa50d974d1
commit
dcd87999d4
2 changed files with 14 additions and 6 deletions
|
@ -1224,7 +1224,9 @@ static void igmp_group_dropped(struct ip_mc_list *im)
|
|||
static void igmp_group_added(struct ip_mc_list *im)
|
||||
{
|
||||
struct in_device *in_dev = im->interface;
|
||||
#ifdef CONFIG_IP_MULTICAST
|
||||
struct net *net = dev_net(in_dev->dev);
|
||||
#endif
|
||||
|
||||
if (im->loaded == 0) {
|
||||
im->loaded = 1;
|
||||
|
@ -1316,7 +1318,9 @@ static void ip_mc_hash_remove(struct in_device *in_dev,
|
|||
void ip_mc_inc_group(struct in_device *in_dev, __be32 addr)
|
||||
{
|
||||
struct ip_mc_list *im;
|
||||
#ifdef CONFIG_IP_MULTICAST
|
||||
struct net *net = dev_net(in_dev->dev);
|
||||
#endif
|
||||
|
||||
ASSERT_RTNL();
|
||||
|
||||
|
@ -1643,7 +1647,9 @@ void ip_mc_down(struct in_device *in_dev)
|
|||
|
||||
void ip_mc_init_dev(struct in_device *in_dev)
|
||||
{
|
||||
#ifdef CONFIG_IP_MULTICAST
|
||||
struct net *net = dev_net(in_dev->dev);
|
||||
#endif
|
||||
ASSERT_RTNL();
|
||||
|
||||
#ifdef CONFIG_IP_MULTICAST
|
||||
|
@ -1662,7 +1668,9 @@ void ip_mc_init_dev(struct in_device *in_dev)
|
|||
void ip_mc_up(struct in_device *in_dev)
|
||||
{
|
||||
struct ip_mc_list *pmc;
|
||||
#ifdef CONFIG_IP_MULTICAST
|
||||
struct net *net = dev_net(in_dev->dev);
|
||||
#endif
|
||||
|
||||
ASSERT_RTNL();
|
||||
|
||||
|
@ -2923,6 +2931,12 @@ static int __net_init igmp_net_init(struct net *net)
|
|||
goto out_sock;
|
||||
}
|
||||
|
||||
/* Sysctl initialization */
|
||||
net->ipv4.sysctl_igmp_max_memberships = 20;
|
||||
net->ipv4.sysctl_igmp_max_msf = 10;
|
||||
/* IGMP reports for link-local multicast groups are enabled by default */
|
||||
net->ipv4.sysctl_igmp_llm_reports = 1;
|
||||
net->ipv4.sysctl_igmp_qrv = 2;
|
||||
return 0;
|
||||
|
||||
out_sock:
|
||||
|
|
|
@ -2399,12 +2399,6 @@ static int __net_init tcp_sk_init(struct net *net)
|
|||
net->ipv4.sysctl_tcp_fin_timeout = TCP_FIN_TIMEOUT;
|
||||
net->ipv4.sysctl_tcp_notsent_lowat = UINT_MAX;
|
||||
|
||||
net->ipv4.sysctl_igmp_max_memberships = 20;
|
||||
net->ipv4.sysctl_igmp_max_msf = 10;
|
||||
/* IGMP reports for link-local multicast groups are enabled by default */
|
||||
net->ipv4.sysctl_igmp_llm_reports = 1;
|
||||
net->ipv4.sysctl_igmp_qrv = 2;
|
||||
|
||||
return 0;
|
||||
fail:
|
||||
tcp_sk_exit(net);
|
||||
|
|
Loading…
Reference in a new issue