Skip to content

Commit

Permalink
bridge: rename struct bridge_mcast_query/querier
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Linus Lüssing authored and David S. Miller committed Jun 11, 2014
1 parent c4d4c25 commit 90010b3
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 95 deletions.
4 changes: 2 additions & 2 deletions net/bridge/br_mdb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit 90010b3

Please sign in to comment.