ipv4: Fix build with multicast disabled. (d9aa9380) · Commits · 戴 / test

net/ipv4/igmp.c: In function 'ip_mc_inc_group': net/ipv4/igmp.c:1228: error: implicit declaration of function 'for_each_pmc_rtnl' net/ipv4/igmp.c:1228: error: expected ';' before '{' token net/ipv4/igmp.c: In function 'ip_mc_unmap': net/ipv4/igmp.c:1333: error: expected ';' before 'igmp_group_dropped' ... Move for_each_pmc_rcu and for_each_pmc_rtnl macro definitions outside of multicast ifdef protection. Reported-by:

Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/ipv4/igmp.c

+10 −10

Original line number	Diff line number	Diff line
		@@ -163,6 +163,16 @@ static void ip_ma_put(struct ip_mc_list *im)
		}
		}

		#define for_each_pmc_rcu(in_dev, pmc) \
		for (pmc = rcu_dereference(in_dev->mc_list); \
		pmc != NULL; \
		pmc = rcu_dereference(pmc->next_rcu))

		#define for_each_pmc_rtnl(in_dev, pmc) \
		for (pmc = rtnl_dereference(in_dev->mc_list); \
		pmc != NULL; \
		pmc = rtnl_dereference(pmc->next_rcu))

		#ifdef CONFIG_IP_MULTICAST

		/*
		@@ -502,16 +512,6 @@ empty_source:
		return skb;
		}

		#define for_each_pmc_rcu(in_dev, pmc) \
		for (pmc = rcu_dereference(in_dev->mc_list); \
		pmc != NULL; \
		pmc = rcu_dereference(pmc->next_rcu))

		#define for_each_pmc_rtnl(in_dev, pmc) \
		for (pmc = rtnl_dereference(in_dev->mc_list); \
		pmc != NULL; \
		pmc = rtnl_dereference(pmc->next_rcu))

		static int igmpv3_send_report(struct in_device in_dev, struct ip_mc_list pmc)
		{
		struct sk_buff *skb = NULL;

Admin message