diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2017-11-09 23:10:57 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-10 05:41:40 +0100 |
| commit | ff0fd34eaee9978f9ed7f6e2ac47f9590d4afac3 (patch) | |
| tree | a7ffb712cf3cdbbe5cd9d441469d11768b6447fc /net/bridge/br_mdb.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-ff0fd34eaee9978f9ed7f6e2ac47f9590d4afac3.tar.xz linux-ff0fd34eaee9978f9ed7f6e2ac47f9590d4afac3.zip | |
net: bridge: Rename mglist to host_joined
The boolean mglist indicates the host has joined a particular
multicast group on the bridge interface. It is badly named, obscuring
what is means. Rename it.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index 31ddff22563e..aa716a33cb71 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c @@ -655,7 +655,7 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry) call_rcu_bh(&p->rcu, br_multicast_free_pg); err = 0; - if (!mp->ports && !mp->mglist && + if (!mp->ports && !mp->host_joined && netif_running(br->dev)) mod_timer(&mp->timer, jiffies); break; |