Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

bridge: fix rcu check warning in multicast port group

Use of RCU here with out marked pointer and function doesn't match prototype
with sparse.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
stephen hemminger 12 years ago
parent
f27070158d
commit
762a3d89eb
2 changed files with 3 additions and 2 deletions
Split View Show Diff Stats
  1. 2 1
      net/bridge/br_mdb.c
  2. 1 1
      net/bridge/br_private.h

+ 2 - 1
net/bridge/br_mdb.c
View File 

@@ -61,7 +61,8 @@ static int br_mdb_fill_info(struct sk_buff *skb, struct netlink_callback *cb,
 
 
 	for (i = 0; i < mdb->max; i++) {
 
 		struct net_bridge_mdb_entry *mp;
 
-		struct net_bridge_port_group *p, **pp;
 
+		struct net_bridge_port_group *p;
 
+		struct net_bridge_port_group __rcu **pp;
 
 		struct net_bridge_port *port;
 
 
 		hlist_for_each_entry_rcu(mp, &mdb->mhash[i], hlist[mdb->ver]) {

+ 1 - 1
net/bridge/br_private.h
View File 

@@ -466,7 +466,7 @@ extern void br_multicast_free_pg(struct rcu_head *head);
 
 extern struct net_bridge_port_group *br_multicast_new_port_group(
 
 				struct net_bridge_port *port,
 
 				struct br_ip *group,
 
-				struct net_bridge_port_group *next,
 
+				struct net_bridge_port_group __rcu *next,
 
 				unsigned char state);
 
 extern void br_mdb_init(void);
 
 extern void br_mdb_uninit(void);