Commit 419c3e2e authored by Andrew Morton's avatar Andrew Morton Committed by Stephen Hemminger

[IPV4]: Fix bootup lockup when !CONFIG_IP_MULTICAST.

parent 8f44c5c2
......@@ -1185,7 +1185,6 @@ void ip_mc_up(struct in_device *in_dev)
ASSERT_RTNL();
#ifdef CONFIG_IP_MULTICAST
in_dev->mc_lock = RW_LOCK_UNLOCKED;
in_dev->mr_gq_running = 0;
init_timer(&in_dev->mr_gq_timer);
in_dev->mr_gq_timer.data=(unsigned long) in_dev;
......@@ -1198,6 +1197,7 @@ void ip_mc_up(struct in_device *in_dev)
in_dev->mr_qrv = IGMP_Unsolicited_Report_Count;
#endif
in_dev->mc_lock = RW_LOCK_UNLOCKED;
ip_mc_inc_group(in_dev, IGMP_ALL_HOSTS);
for (i=in_dev->mc_list; i; i=i->next)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment