diff options
Diffstat (limited to 'net/bridge/br_mdb.c')
-rw-r--r-- | net/bridge/br_mdb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index 38991e03646d..9f97b850fc65 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c | |||
@@ -18,7 +18,6 @@ static int br_rports_fill_info(struct sk_buff *skb, struct netlink_callback *cb, | |||
18 | { | 18 | { |
19 | struct net_bridge *br = netdev_priv(dev); | 19 | struct net_bridge *br = netdev_priv(dev); |
20 | struct net_bridge_port *p; | 20 | struct net_bridge_port *p; |
21 | struct hlist_node *n; | ||
22 | struct nlattr *nest; | 21 | struct nlattr *nest; |
23 | 22 | ||
24 | if (!br->multicast_router || hlist_empty(&br->router_list)) | 23 | if (!br->multicast_router || hlist_empty(&br->router_list)) |
@@ -28,7 +27,7 @@ static int br_rports_fill_info(struct sk_buff *skb, struct netlink_callback *cb, | |||
28 | if (nest == NULL) | 27 | if (nest == NULL) |
29 | return -EMSGSIZE; | 28 | return -EMSGSIZE; |
30 | 29 | ||
31 | hlist_for_each_entry_rcu(p, n, &br->router_list, rlist) { | 30 | hlist_for_each_entry_rcu(p, &br->router_list, rlist) { |
32 | if (p && nla_put_u32(skb, MDBA_ROUTER_PORT, p->dev->ifindex)) | 31 | if (p && nla_put_u32(skb, MDBA_ROUTER_PORT, p->dev->ifindex)) |
33 | goto fail; | 32 | goto fail; |
34 | } | 33 | } |
@@ -61,12 +60,11 @@ static int br_mdb_fill_info(struct sk_buff *skb, struct netlink_callback *cb, | |||
61 | return -EMSGSIZE; | 60 | return -EMSGSIZE; |
62 | 61 | ||
63 | for (i = 0; i < mdb->max; i++) { | 62 | for (i = 0; i < mdb->max; i++) { |
64 | struct hlist_node *h; | ||
65 | struct net_bridge_mdb_entry *mp; | 63 | struct net_bridge_mdb_entry *mp; |
66 | struct net_bridge_port_group *p, **pp; | 64 | struct net_bridge_port_group *p, **pp; |
67 | struct net_bridge_port *port; | 65 | struct net_bridge_port *port; |
68 | 66 | ||
69 | hlist_for_each_entry_rcu(mp, h, &mdb->mhash[i], hlist[mdb->ver]) { | 67 | hlist_for_each_entry_rcu(mp, &mdb->mhash[i], hlist[mdb->ver]) { |
70 | if (idx < s_idx) | 68 | if (idx < s_idx) |
71 | goto skip; | 69 | goto skip; |
72 | 70 | ||