Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c83b8fab authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

bridge: Restart queries when last querier expires 



As it stands when we discover that a real querier (one that queries
with a non-zero source address) we stop querying.  However, even
after said querier has fallen off the edge of the earth, we will
never restart querying (unless the bridge itself is restarted).

This patch fixes this by kicking our own querier into gear when
the timer for other queriers expire.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 74857216

net/bridge/br_multicast.c

+18 −1
Original line number Original line Diff line number Diff line
@@ -36,6 +36,8 @@ 
#define mlock_dereference(X, br) \

#define mlock_dereference(X, br) \

	rcu_dereference_protected(X, lockdep_is_held(&br->multicast_lock))

	rcu_dereference_protected(X, lockdep_is_held(&br->multicast_lock))





static void br_multicast_start_querier(struct net_bridge *br);



#if IS_ENABLED(CONFIG_IPV6)

#if IS_ENABLED(CONFIG_IPV6)

static inline int ipv6_is_transient_multicast(const struct in6_addr *addr)

static inline int ipv6_is_transient_multicast(const struct in6_addr *addr)

{

{
@@ -740,6 +742,21 @@ static void br_multicast_local_router_expired(unsigned long data) 
{

{

}

}





static void br_multicast_querier_expired(unsigned long data)

{

	struct net_bridge_port *port = (void *)data;

	struct net_bridge *br = port->br;



	spin_lock(&br->multicast_lock);

	if (!netif_running(br->dev) || br->multicast_disabled)

		goto out;



	br_multicast_start_querier(br);



out:

	spin_unlock(&br->multicast_lock);

}



static void __br_multicast_send_query(struct net_bridge *br,

static void __br_multicast_send_query(struct net_bridge *br,

				      struct net_bridge_port *port,

				      struct net_bridge_port *port,

				      struct br_ip *ip)

				      struct br_ip *ip)
@@ -1562,7 +1579,7 @@ void br_multicast_init(struct net_bridge *br) 
	setup_timer(&br->multicast_router_timer,

	setup_timer(&br->multicast_router_timer,

		    br_multicast_local_router_expired, 0);

		    br_multicast_local_router_expired, 0);

	setup_timer(&br->multicast_querier_timer,

	setup_timer(&br->multicast_querier_timer,

		    br_multicast_local_router_expired, 0);

		    br_multicast_querier_expired, 0);

	setup_timer(&br->multicast_query_timer, br_multicast_query_expired,

	setup_timer(&br->multicast_query_timer, br_multicast_query_expired,

		    (unsigned long)br);

		    (unsigned long)br);

}

}