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

Commit 2d98c29b authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

net: bridge: convert MLDv2 Query MRC into msecs_to_jiffies for max_delay 



While looking into MLDv1/v2 code, I noticed that bridging code does
not convert it's max delay into jiffies for MLDv2 messages as we do
in core IPv6' multicast code.

RFC3810, 5.1.3. Maximum Response Code says:

  The Maximum Response Code field specifies the maximum time allowed
  before sending a responding Report. The actual time allowed, called
  the Maximum Response Delay, is represented in units of milliseconds,
  and is derived from the Maximum Response Code as follows: [...]

As we update timers that work with jiffies, we need to convert it.

Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
Cc: Linus Lüssing <linus.luessing@web.de>
Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0d63c27d

net/bridge/br_multicast.c

+2 −1
Original line number Diff line number Diff line
@@ -1254,7 +1254,8 @@ static int br_ip6_multicast_query(struct net_bridge *br, 
		mld2q = (struct mld2_query *)icmp6_hdr(skb);

		if (!mld2q->mld2q_nsrcs)

			group = &mld2q->mld2q_mca;

		max_delay = mld2q->mld2q_mrc ? MLDV2_MRC(ntohs(mld2q->mld2q_mrc)) : 1;



		max_delay = max(msecs_to_jiffies(MLDV2_MRC(ntohs(mld2q->mld2q_mrc))), 1UL);

	}



	br_multicast_query_received(br, port, &br->ip6_querier,