Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c70eba74 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

igmp: fix new sparse errors 



Fix following sparse errors :

net/ipv4/igmp.c:1222:25: warning: cast from restricted __be32
net/ipv4/igmp.c:1234:31: warning: incorrect type in assignment (different address spaces)
net/ipv4/igmp.c:1234:31:    expected struct ip_mc_list [noderef] <asn:4>*next_hash
net/ipv4/igmp.c:1234:31:    got struct ip_mc_list *<noident>
net/ipv4/igmp.c:1250:31: warning: incorrect type in assignment (different address spaces)
net/ipv4/igmp.c:1250:31:    expected struct ip_mc_list [noderef] <asn:4>*next_hash
net/ipv4/igmp.c:1250:31:    got struct ip_mc_list *<noident>
net/ipv4/igmp.c:2380:37: warning: cast from restricted __be32

These were added by commit e9897071
("igmp: hash a hash table to speedup ip_check_mc_rcu()")

Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5eaedf31

net/ipv4/igmp.c

+4 −4
Original line number Diff line number Diff line
@@ -1219,7 +1219,7 @@ static void igmp_group_added(struct ip_mc_list *im) 


static u32 ip_mc_hash(const struct ip_mc_list *im)

{

	return hash_32((u32)im->multiaddr, MC_HASH_SZ_LOG);

	return hash_32((__force u32)im->multiaddr, MC_HASH_SZ_LOG);

}



static void ip_mc_hash_add(struct in_device *in_dev,
@@ -1231,7 +1231,7 @@ static void ip_mc_hash_add(struct in_device *in_dev, 
	mc_hash = rtnl_dereference(in_dev->mc_hash);

	if (mc_hash) {

		hash = ip_mc_hash(im);

		im->next_hash = rtnl_dereference(mc_hash[hash]);

		im->next_hash = mc_hash[hash];

		rcu_assign_pointer(mc_hash[hash], im);

		return;

	}
@@ -1247,7 +1247,7 @@ static void ip_mc_hash_add(struct in_device *in_dev, 


	for_each_pmc_rtnl(in_dev, im) {

		hash = ip_mc_hash(im);

		im->next_hash = rtnl_dereference(mc_hash[hash]);

		im->next_hash = mc_hash[hash];

		RCU_INIT_POINTER(mc_hash[hash], im);

	}
@@ -2377,7 +2377,7 @@ int ip_check_mc_rcu(struct in_device *in_dev, __be32 mc_addr, __be32 src_addr, u 


	mc_hash = rcu_dereference(in_dev->mc_hash);

	if (mc_hash) {

		u32 hash = hash_32((u32)mc_addr, MC_HASH_SZ_LOG);

		u32 hash = hash_32((__force u32)mc_addr, MC_HASH_SZ_LOG);



		for (im = rcu_dereference(mc_hash[hash]);

		     im != NULL;