diff options
| author | Daniel Borkmann <dborkman@redhat.com> | 2013-09-04 00:19:39 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-04 14:53:20 -0400 |
| commit | e3f5b17047dec4acd8957dad053e70d87f18d97e (patch) | |
| tree | d7386719180cff0e7ab8c98cc530c5ac7ec7c62a /net/bridge/br_multicast.c | |
| parent | 6c567b78c8a7da26e5e6f5bd458882ad9967233a (diff) | |
| download | op-kernel-dev-e3f5b17047dec4acd8957dad053e70d87f18d97e.zip op-kernel-dev-e3f5b17047dec4acd8957dad053e70d87f18d97e.tar.gz | |
net: ipv6: mld: get rid of MLDV2_MRC and simplify calculation
Get rid of MLDV2_MRC and use our new macros for mantisse and
exponent to calculate Maximum Response Delay out of the Maximum
Response Code.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_multicast.c')
| -rw-r--r-- | net/bridge/br_multicast.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 08e576a..4accd0d 100644 --- 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), |
