diff options
author | stephen hemminger <stephen@networkplumber.org> | 2013-08-04 20:19:38 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-08-04 21:41:52 -0400 |
commit | 762a3d89ebf5873f71b3839449ac6562049ef1ce (patch) | |
tree | b5a7874456d199ac69492ca3be6a4cb638ce73f7 /net/bridge | |
parent | f27070158d6754765f2f5fd1617e8e42a0ea2318 (diff) |
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>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/br_mdb.c | 3 | ||||
-rw-r--r-- | net/bridge/br_private.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index 0daae3ec2355..e4d5cd43b7fb 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c | |||
@@ -61,7 +61,8 @@ static int br_mdb_fill_info(struct sk_buff *skb, struct netlink_callback *cb, | |||
61 | 61 | ||
62 | for (i = 0; i < mdb->max; i++) { | 62 | for (i = 0; i < mdb->max; i++) { |
63 | struct net_bridge_mdb_entry *mp; | 63 | struct net_bridge_mdb_entry *mp; |
64 | struct net_bridge_port_group *p, **pp; | 64 | struct net_bridge_port_group *p; |
65 | struct net_bridge_port_group __rcu **pp; | ||
65 | struct net_bridge_port *port; | 66 | struct net_bridge_port *port; |
66 | 67 | ||
67 | hlist_for_each_entry_rcu(mp, &mdb->mhash[i], hlist[mdb->ver]) { | 68 | hlist_for_each_entry_rcu(mp, &mdb->mhash[i], hlist[mdb->ver]) { |
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 1514c9f4f102..d41283c57952 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h | |||
@@ -466,7 +466,7 @@ extern void br_multicast_free_pg(struct rcu_head *head); | |||
466 | extern struct net_bridge_port_group *br_multicast_new_port_group( | 466 | extern struct net_bridge_port_group *br_multicast_new_port_group( |
467 | struct net_bridge_port *port, | 467 | struct net_bridge_port *port, |
468 | struct br_ip *group, | 468 | struct br_ip *group, |
469 | struct net_bridge_port_group *next, | 469 | struct net_bridge_port_group __rcu *next, |
470 | unsigned char state); | 470 | unsigned char state); |
471 | extern void br_mdb_init(void); | 471 | extern void br_mdb_init(void); |
472 | extern void br_mdb_uninit(void); | 472 | extern void br_mdb_uninit(void); |