From 1fd9cc4afa318e9212214ded9f58e6ddff0d522d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20L=C3=BCssing?= Date: Sun, 16 Jun 2013 23:20:34 +0200 Subject: [PATCH] --- yaml --- r: 377401 b: refs/heads/master c: 32de868cbc6bee010d2cee95b5071b25ecbec8c3 h: refs/heads/master i: 377399: 403f0da24764ec12b38d312a5a4619a80c6c24a1 v: v3 --- [refs] | 2 +- trunk/net/bridge/br_multicast.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6ecb55b528c4..93f3d5f6a231 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 788dfcacacfbdd51f9c92065bd8e136686f07a29 +refs/heads/master: 32de868cbc6bee010d2cee95b5071b25ecbec8c3 diff --git a/trunk/net/bridge/br_multicast.c b/trunk/net/bridge/br_multicast.c index 81f2389f78eb..d6448e35e027 100644 --- a/trunk/net/bridge/br_multicast.c +++ b/trunk/net/bridge/br_multicast.c @@ -465,8 +465,9 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br, skb_set_transport_header(skb, skb->len); mldq = (struct mld_msg *) icmp6_hdr(skb); - interval = ipv6_addr_any(group) ? br->multicast_last_member_interval : - br->multicast_query_response_interval; + interval = ipv6_addr_any(group) ? + br->multicast_query_response_interval : + br->multicast_last_member_interval; mldq->mld_type = ICMPV6_MGM_QUERY; mldq->mld_code = 0;