net: ipv6: mld: get rid of MLDV2_MRC and simplify calculation

[~andy/linux] / net / bridge / br_multicast.c

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 08e576ada0b2699922b85c9e2783773baee404dc..4accd0de6e8ed0a33c1fa9026630fe6b1ebcb247 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1203,7 +1203,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(mld2q)), 1UL);
        }
 
        br_multicast_query_received(br, port, !ipv6_addr_any(&ip6h->saddr),