diff options
| author | Linus Lüssing <linus.luessing@web.de> | 2014-06-07 16:26:26 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-11 06:50:46 (GMT) |
| commit | 90010b36ebbedc6c3b7f09d384fecc5f18d77031 (patch) | |
| tree | d7078d569c543cdb1d2d0a00078774207857b729 /net/bridge/br_mdb.c | |
| parent | c4d4c255d85310dc720c5535c164ca0f6d5b3b81 (diff) | |
| download | linux-90010b36ebbedc6c3b7f09d384fecc5f18d77031.tar.xz | |
bridge: rename struct bridge_mcast_query/querier
The current naming of these two structs is very random, in that
reversing their naming would not make any semantical difference.
This patch tries to make the naming less confusing by giving them a more
specific, distinguishable naming.
This is also useful for the upcoming patches reintroducing the
"struct bridge_mcast_querier" but for storing information about the
selected querier (no matter if our own or a foreign querier).
Signed-off-by: Linus Lüssing <linus.luessing@web.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_mdb.c')
| -rw-r--r-- | net/bridge/br_mdb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index b7b1914..5df0526 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c @@ -418,13 +418,13 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry) ip.proto = entry->addr.proto; if (ip.proto == htons(ETH_P_IP)) { - if (timer_pending(&br->ip4_querier.timer)) + if (timer_pending(&br->ip4_other_query.timer)) return -EBUSY; ip.u.ip4 = entry->addr.u.ip4; #if IS_ENABLED(CONFIG_IPV6) } else { - if (timer_pending(&br->ip6_querier.timer)) + if (timer_pending(&br->ip6_other_query.timer)) return -EBUSY; ip.u.ip6 = entry->addr.u.ip6; |