Skip to content

Commit

Permalink
igmp: fix new sparse errors
Browse files Browse the repository at this point in the history
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 e989707
("igmp: hash a hash table to speedup ip_check_mc_rcu()")

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Jun 12, 2013
1 parent 5eaedf3 commit c70eba7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions net/ipv4/igmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
}
Expand All @@ -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);
}

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit c70eba7

Please sign in to comment.